diff options
Diffstat (limited to 'vcl')
233 files changed, 658 insertions, 1191 deletions
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm index f33599fa086e..4264f8802126 100755 --- a/vcl/aqua/source/app/vclnsapp.mm +++ b/vcl/aqua/source/app/vclnsapp.mm @@ -39,6 +39,8 @@ #include "vcl/cmdevt.hxx" #include "rtl/ustrbuf.hxx" +#include "vcl/impimagetree.hxx" + #include "premac.h" #import "Carbon/Carbon.h" #import "apple_remote/RemoteControl.h" @@ -416,6 +418,7 @@ #else // the clean version follows return pSalData->maFrames.front()->CallCallback( SALEVENT_SHUTDOWN, NULL ) ? NSTerminateCancel : NSTerminateNow; #endif + ImplImageTreeSingletonRef()->shutDown(); return NSTerminateNow; } diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index 493ad850abe8..21b8bc5c96d9 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -323,14 +323,17 @@ void AquaClipboard::fireLostClipboardOwnershipEvent(Reference<XClipboardOwner> o void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type) { - DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent); - NSData* pBoardData = NULL; - - if (dp.get() != NULL) - { - pBoardData = (NSData*)dp->getSystemData(); - [sender setData: pBoardData forType: type]; - } + if( mXClipboardContent.is() ) + { + DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent); + NSData* pBoardData = NULL; + + if (dp.get() != NULL) + { + pBoardData = (NSData*)dp->getSystemData(); + [sender setData: pBoardData forType: type]; + } + } } @@ -341,20 +344,21 @@ void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type) void SAL_CALL AquaClipboard::flushClipboard() throw(RuntimeException) { - if (mXClipboardContent.is()) + if (mXClipboardContent.is()) { Sequence<DataFlavor> flavorList = mXClipboardContent->getTransferDataFlavors(); sal_uInt32 nFlavors = flavorList.getLength(); for (sal_uInt32 i = 0; i < nFlavors; i++) - { + { NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i]); if (sysType != NULL) - { + { provideDataForType(mPasteboard, sysType); - } - } + } + } + mXClipboardContent.clear(); } } diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx index 6a223a9bcec1..dbcd0c94c784 100644 --- a/vcl/aqua/source/dtrans/test_aquacb.cxx +++ b/vcl/aqua/source/dtrans/test_aquacb.cxx @@ -75,7 +75,7 @@ TestTransferable::TestTransferable() : { DataFlavor df; - df.MimeType = OUString::createFromAscii( "text/html" ); + df.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/html")); df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 ); m_seqDFlv[0] = df; diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx index 6f21be3f5c49..f79da3559b35 100644 --- a/vcl/aqua/source/gdi/salatslayout.cxx +++ b/vcl/aqua/source/gdi/salatslayout.cxx @@ -751,9 +751,10 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons // initial measurement of text break position UniCharArrayOffset nBreakPos = mnMinCharPos; const ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth ); + if( nATSUMaxWidth <= 0xFFFF ) // #i108584# avoid ATSU rejecting the parameter + return mnMinCharPos; // or do ATSUMaxWidth=0x10000; OSStatus eStatus = ATSUBreakLine( maATSULayout, mnMinCharPos, nATSUMaxWidth, false, &nBreakPos ); - if( (eStatus != noErr) && (eStatus != kATSULineBreakInWord) ) return STRING_LEN; @@ -778,7 +779,7 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons if( eStatus != noErr ) return nBreakPos; const ATSUTextMeasurement nATSURemWidth = nATSUMaxWidth - (nRight - nLeft); - if( nATSURemWidth <= 0 ) + if( nATSURemWidth <= 0xFFFF ) // #i108584# avoid ATSU rejecting the parameter return nBreakPos; UniCharArrayOffset nBreakPosInWord = nBreakPos; eStatus = ATSUBreakLine( maATSULayout, nBreakPos, nATSURemWidth, false, &nBreakPosInWord ); diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 27573318228c..e280a583b3d5 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -1170,6 +1170,8 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) getResolution( nDPIX, nDPIY ); aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont ); + aStyleSettings.SetToolbarIconSize( nDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL ); + // TODO: better mapping of aqua<->ooo font settings aStyleSettings.SetAppFont( aAppFont ); aStyleSettings.SetHelpFont( aAppFont ); diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx index 706e831869a1..41d3899366bf 100644 --- a/vcl/inc/vcl/button.hxx +++ b/vcl/inc/vcl/button.hxx @@ -87,14 +87,14 @@ public: static XubString GetStandardText( StandardButtonType eButton ); static XubString GetStandardHelpText( StandardButtonType eButton ); - BOOL SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL ); - const Image GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; + BOOL SetModeImage( const Image& rImage ); + const Image GetModeImage( ) const; BOOL HasImage() const; void SetImageAlign( ImageAlign eAlign ); ImageAlign GetImageAlign() const; - BOOL SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL ); - BitmapEx GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; + BOOL SetModeBitmap( const BitmapEx& rBitmap ); + BitmapEx GetModeBitmap( ) const; void EnableImageDisplay( BOOL bEnable ); BOOL IsImageDisplayEnabled(); @@ -298,7 +298,6 @@ private: Rectangle maStateRect; Rectangle maMouseRect; Image maImage; - Image maImageHC; BOOL mbChecked; BOOL mbSaveValue; BOOL mbRadioCheck; @@ -374,8 +373,8 @@ public: void EnableRadioCheck( BOOL bRadioCheck = TRUE ) { mbRadioCheck = bRadioCheck; } BOOL IsRadioCheckEnabled() const { return mbRadioCheck; } - BOOL SetModeRadioImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL ); - const Image& GetModeRadioImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; + BOOL SetModeRadioImage( const Image& rImage ); + const Image& GetModeRadioImage( ) const; void SetState( BOOL bCheck ); void Check( BOOL bCheck = TRUE ); diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index d14cc750d6ea..42061cfa09ea 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -118,7 +118,6 @@ class VCL_DLLPUBLIC FixedBitmap : public Control { private: Bitmap maBitmap; - Bitmap maBitmapHC; using Control::ImplInitSettings; using Window::ImplInit; @@ -145,8 +144,8 @@ public: void SetBitmap( const Bitmap& rBitmap ); using OutputDevice::GetBitmap; const Bitmap& GetBitmap() const { return maBitmap; } - BOOL SetModeBitmap( const Bitmap& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL ); - const Bitmap& GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; + BOOL SetModeBitmap( const Bitmap& rBitmap ); + const Bitmap& GetModeBitmap( ) const; }; // -------------- @@ -157,7 +156,6 @@ class VCL_DLLPUBLIC FixedImage : public Control { private: Image maImage; - Image maImageHC; BOOL mbInUserDraw; private: @@ -188,8 +186,8 @@ public: void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } - BOOL SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL ); - const Image& GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; + BOOL SetModeImage( const Image& rImage ); + const Image& GetModeImage( ) const; Point CalcImagePos( const Point& rPos, const Size& rObjSize, const Size& rWinSize ); diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx index 110e57233550..b468978f247e 100644 --- a/vcl/inc/vcl/ilstbox.hxx +++ b/vcl/inc/vcl/ilstbox.hxx @@ -60,7 +60,7 @@ enum LB_EVENT_TYPE // ----------------- // - ImplEntryType - // ----------------- - + struct ImplEntryType { XubString maStr; @@ -102,7 +102,7 @@ struct ImplEntryType // ----------------- // - ImplEntryList - // ----------------- - + class ImplEntryList : private List { private: @@ -385,7 +385,7 @@ public: // --------------- // - ImplListBox - // --------------- - + class ImplListBox : public Control { private: @@ -508,7 +508,7 @@ public: // ----------------------------- // - ImplListBoxFloatingWindow - // ----------------------------- - + class ImplListBoxFloatingWindow : public FloatingWindow { private: @@ -551,7 +551,7 @@ public: // ----------- // - ImplWin - // ----------- - + class ImplWin : public Control { private: @@ -559,7 +559,6 @@ private: USHORT mnItemPos; // wegen UserDraw muss ich wissen, welches Item ich darstelle. XubString maString; Image maImage; - Image maImageHC; Rectangle maFocusRect; Size maUserItemSize; @@ -595,8 +594,8 @@ public: const Image& GetImage() const { return maImage; } void SetImage( const Image& rImg ) { maImage = rImg; } - BOOL SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL ); - const Image& GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; + BOOL SetModeImage( const Image& rImage ); + const Image& GetModeImage( ) const; virtual void MBDown(); diff --git a/vcl/inc/vcl/imgctrl.hxx b/vcl/inc/vcl/imgctrl.hxx index 4b68d89130b4..5867a6ff16d0 100644 --- a/vcl/inc/vcl/imgctrl.hxx +++ b/vcl/inc/vcl/imgctrl.hxx @@ -42,7 +42,6 @@ class VCL_DLLPUBLIC ImageControl : public FixedImage { private: BitmapEx maBmp; - BitmapEx maBmpHC; ::sal_Int16 mnScaleMode; public: @@ -61,8 +60,8 @@ public: void SetBitmap( const BitmapEx& rBmp ); using OutputDevice::GetBitmap; const BitmapEx& GetBitmap() const { return maBmp; } - BOOL SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL ); - const BitmapEx& GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; + BOOL SetModeBitmap( const BitmapEx& rBitmap ); + const BitmapEx& GetModeBitmap( ) const; }; #endif // _SV_IMGCTRL_HXX diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/vcl/impimagetree.hxx index 849e98bb234c..4afa807cf28a 100644 --- a/vcl/inc/vcl/impimagetree.hxx +++ b/vcl/inc/vcl/impimagetree.hxx @@ -58,7 +58,7 @@ public: bool loadImage( rtl::OUString const & name, rtl::OUString const & style, - BitmapEx & bitmap, bool localized = false ); + BitmapEx & bitmap, bool localized = false, bool loadMissing = false ); void shutDown(); // a crude form of life cycle control (called from DeInitVCL; otherwise, @@ -66,6 +66,10 @@ public: // be too late for the destructors of the bitmaps in m_iconCache) private: + bool doLoadImage( + rtl::OUString const & name, rtl::OUString const & style, + BitmapEx & bitmap, bool localized); + typedef std::list< std::pair< rtl::OUString, diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx index 7b02444ed4d7..42eaeef2a7e4 100644 --- a/vcl/inc/vcl/msgbox.hxx +++ b/vcl/inc/vcl/msgbox.hxx @@ -71,7 +71,6 @@ protected: FixedImage* mpFixedImage; XubString maMessText; Image maImage; - Image maImageHC; USHORT mnSoundType; BOOL mbHelpBtn; BOOL mbSound; @@ -101,8 +100,8 @@ public: void SetImage( const Image& rImage ) { maImage = rImage; } const Image& GetImage() const { return maImage; } - BOOL SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL ); - const Image& GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; + BOOL SetModeImage( const Image& rImage ); + const Image& GetModeImage( ) const; void SetDefaultCheckBoxText(); void SetCheckBoxText( const XubString& rText ) { maCheckBoxText = rText;} @@ -127,7 +126,6 @@ public: InfoBox( Window* pParent, const ResId & rResId ); static Image GetStandardImage(); - static Image GetStandardImageHC(); }; // -------------- @@ -147,7 +145,6 @@ public: void SetDefaultCheckBoxText(); static Image GetStandardImage(); - static Image GetStandardImageHC(); }; // ------------ @@ -165,7 +162,6 @@ public: ErrorBox( Window* pParent, const ResId& rResId ); static Image GetStandardImage(); - static Image GetStandardImageHC(); }; // ------------ @@ -185,7 +181,6 @@ public: void SetDefaultCheckBoxText(); static Image GetStandardImage(); - static Image GetStandardImageHC(); }; #endif // _SV_MSGBOX_HXX diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/vcl/prndlg.hxx index f741cb6cd0d3..7549d1e5ea5e 100644 --- a/vcl/inc/vcl/prndlg.hxx +++ b/vcl/inc/vcl/prndlg.hxx @@ -61,7 +61,6 @@ namespace vcl rtl::OUString maReplacementString; rtl::OUString maToolTipString; - bool useHCColorReplacement() const; public: PrintPreviewWindow( Window* pParent, const ResId& ); virtual ~PrintPreviewWindow(); @@ -169,9 +168,7 @@ namespace vcl FixedImage maCollateImage; Image maCollateImg; - Image maCollateHCImg; Image maNoCollateImg; - Image maNoCollateHCImg; long mnCollateUIMode; diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index 3229b6f1654d..69ac3f540b65 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -231,7 +231,6 @@ struct ImplSVWinData Window* mpTrackWin; // window, that is in tracking mode AutoTimer* mpTrackTimer; // tracking timer ImageList* mpMsgBoxImgList; // ImageList for MessageBox - ImageList* mpMsgBoxHCImgList; // ImageList for MessageBox (high contrast mode) Window* mpAutoScrollWin; // window, that is in AutoScrollMode mode USHORT mnTrackFlags; // tracking flags USHORT mnAutoScrollFlags; // auto scroll flags @@ -255,9 +254,7 @@ struct ImplSVCtrlData ImageList* mpSplitHArwImgList; // ImageList for Horizontale SplitWindows (Arrows) ImageList* mpSplitVArwImgList; // ImageList for Vertikale SplitWindows (Arrows) Image* mpDisclosurePlus; - Image* mpDisclosurePlusHC; Image* mpDisclosureMinus; - Image* mpDisclosureMinusHC; ImplTBDragMgr* mpTBDragMgr; // DragMgr for ToolBox USHORT mnCheckStyle; // CheckBox-Style for ImageList-Update USHORT mnRadioStyle; // Radio-Style for ImageList-Update diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc index 059ed1524b7c..50e334deaa3b 100644 --- a/vcl/inc/vcl/svids.hrc +++ b/vcl/inc/vcl/svids.hrc @@ -43,7 +43,6 @@ #define SV_RESID_BITMAP_RADIO 1010 #define SV_RESID_BITMAP_MSGBOX 1020 -#define SV_RESID_BITMAP_MSGBOX_HC 1021 #define SV_RESID_BITMAP_PIN 1030 @@ -55,12 +54,9 @@ #define SV_RESID_BITMAP_SCROLLMSK 1050 #define SV_RESID_BITMAP_SCROLLBMP 1051 #define SV_RESID_BITMAP_CLOSEDOC 1052 -#define SV_RESID_BITMAP_CLOSEDOCHC 1053 #define SV_DISCLOSURE_PLUS 1060 #define SV_DISCLOSURE_MINUS 1061 -#define SV_DISCLOSURE_PLUS_HC 1062 -#define SV_DISCLOSURE_MINUS_HC 1063 #define SV_RESID_MENU_EDIT 2000 #define SV_MENU_EDIT_UNDO 1 @@ -142,8 +138,6 @@ #define SV_PRINT_BUTTONLINE 14 #define SV_PRINT_COLLATE_IMG 15 #define SV_PRINT_NOCOLLATE_IMG 16 -#define SV_PRINT_COLLATE_HC_IMG 17 -#define SV_PRINT_NOCOLLATE_HC_IMG 18 #define SV_PRINT_NOPAGES 19 #define SV_PRINT_STATUS_TXT 20 #define SV_PRINT_LOCATION_TXT 21 @@ -234,8 +228,6 @@ #define SV_ICON_LARGE_START 24000 #define SV_ICON_SMALL_START 25000 -#define SV_ICON_LARGE_HC_START 26000 -#define SV_ICON_SMALL_HC_START 27000 #define SV_ICON_ID_OFFICE 1 #define SV_ICON_ID_TEXT 2 diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx index 25925a89b1d7..5463246ec8a0 100644 --- a/vcl/inc/vcl/tabctrl.hxx +++ b/vcl/inc/vcl/tabctrl.hxx @@ -103,6 +103,7 @@ private: protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); virtual void FillLayoutData() const; diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst index e6f636522acb..f64757f2c9e1 100644 --- a/vcl/prj/build.lst +++ b/vcl/prj/build.lst @@ -1,4 +1,4 @@ -vc vcl : l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl NULL +vc vcl : l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc cpputools shell svl NULL vc vcl usr1 - all vc_mkout NULL vc vcl\inc nmake - all vc_inc NULL vc vcl\source\glyphs nmake - all vc_glyphs vc_inc NULL diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index 0a6e9241e3a2..1657be61c4ff 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -58,7 +58,7 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap) { // TODO - if we want more flexibility we could add a branding path // in an rc file perhaps fallback to "about.bmp" - rtl::OUString aBaseName = ( rtl::OUString::createFromAscii( "/" ) + + rtl::OUString aBaseName = ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString::createFromAscii( pName ) ); rtl::OUString aPng( RTL_CONSTASCII_USTRINGPARAM(".png") ); @@ -67,9 +67,9 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap) rtl::OLocale aLoc( pLoc ); rtl::OUString aName = aBaseName + aPng; - rtl::OUString aLocaleName = ( aBaseName + rtl::OUString::createFromAscii ("-") + + rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("-")) + aLoc.getLanguage() + - rtl::OUString::createFromAscii ("_") + + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("_")) + aLoc.getCountry() + aPng ); return ( loadPng ("$BRAND_BASE_DIR/program/edition", aLocaleName, rBitmap) || diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 1530a0649689..d8146275e4b4 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -1310,7 +1310,7 @@ void MiscSettings::SetDisablePrinting( BOOL bEnable ) vcl::SettingsConfigItem::get()-> setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DesktopManagement" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisablePrinting" ) ), - rtl::OUString::createFromAscii( bEnable ? "true" : "false" ) ); + bEnable ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false" )) ); mpData->mnDisablePrinting = bEnable ? 1 : 0; } } @@ -1366,7 +1366,7 @@ void MiscSettings::SetEnableATToolSupport( BOOL bEnable ) vcl::SettingsConfigItem::get()-> setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accessibility" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableATToolSupport" ) ), - rtl::OUString::createFromAscii( bEnable ? "true" : "false" ) ); + bEnable ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false" )) ); mpData->mnEnableATT = bEnable ? 1 : 0; } } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index db166af1b295..f29c7c87ac96 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -324,14 +324,14 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) new AccessBridgeCurrentContext( com::sun::star::uno::getCurrentContext() ) ); pSVData->mxAccessBridge = xFactory->createInstanceWithArguments( - OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessBridge")), arguments ); } else { pSVData->mxAccessBridge = xFactory->createInstanceWithArguments( - OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessBridge")), arguments ); } @@ -453,11 +453,11 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled) String aTitle; String aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr)); - if( 0 == e.Message.compareTo(::rtl::OUString::createFromAscii("ClassNotFound"), 13) ) + if( 0 == e.Message.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassNotFound")), 13) ) { aTitle = String(ResId(SV_ACCESSERROR_MISSING_BRIDGE, *pResMgr)); } - else if( 0 == e.Message.compareTo(::rtl::OUString::createFromAscii("NoSuchMethod"), 12) ) + else if( 0 == e.Message.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NoSuchMethod")), 12) ) { aTitle = String(ResId(SV_ACCESSERROR_WRONG_VERSION, *pResMgr)); } diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 4f76193d4b90..d08994c9d6de 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -392,11 +392,6 @@ void DeInitVCL() delete pSVData->maWinData.mpMsgBoxImgList; pSVData->maWinData.mpMsgBoxImgList = NULL; } - if ( pSVData->maWinData.mpMsgBoxHCImgList ) - { - delete pSVData->maWinData.mpMsgBoxHCImgList; - pSVData->maWinData.mpMsgBoxHCImgList = NULL; - } if ( pSVData->maCtrlData.mpCheckImgList ) { delete pSVData->maCtrlData.mpCheckImgList; @@ -437,21 +432,11 @@ void DeInitVCL() delete pSVData->maCtrlData.mpDisclosurePlus; pSVData->maCtrlData.mpDisclosurePlus = NULL; } - if ( pSVData->maCtrlData.mpDisclosurePlusHC ) - { - delete pSVData->maCtrlData.mpDisclosurePlusHC; - pSVData->maCtrlData.mpDisclosurePlusHC = NULL; - } if ( pSVData->maCtrlData.mpDisclosureMinus ) { delete pSVData->maCtrlData.mpDisclosureMinus; pSVData->maCtrlData.mpDisclosureMinus = NULL; } - if ( pSVData->maCtrlData.mpDisclosureMinusHC ) - { - delete pSVData->maCtrlData.mpDisclosureMinusHC; - pSVData->maCtrlData.mpDisclosureMinusHC = NULL; - } if ( pSVData->mpDefaultWin ) { delete pSVData->mpDefaultWin; diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index 4cd397151081..b33d252f6bb1 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -106,7 +106,7 @@ uno::Reference< lang::XMultiServiceFactory > vcl::unohelper::GetMultiServiceFact { pSVData->maAppData.mxMSF = ::cppu::createRegistryServiceFactory( aTempFileName, rtl::OUString(), sal_False ); uno::Reference < registry::XImplementationRegistration > xReg( - pSVData->maAppData.mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" )), uno::UNO_QUERY ); + pSVData->maAppData.mxMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))), uno::UNO_QUERY ); if( xReg.is() ) { @@ -119,7 +119,7 @@ uno::Reference< lang::XMultiServiceFactory > vcl::unohelper::GetMultiServiceFact try { xReg->registerImplementation( - OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),aComponentPathString, NULL ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),aComponentPathString, NULL ); } catch( ::com::sun::star::uno::Exception & ) { @@ -145,7 +145,7 @@ uno::Reference < i18n::XBreakIterator > vcl::unohelper::CreateBreakIterator() uno::Reference< lang::XMultiServiceFactory > xMSF = GetMultiServiceFactory(); if ( xMSF.is() ) { - uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ); + uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ); if ( xI.is() ) { uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XBreakIterator >*)0) ); @@ -161,7 +161,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte uno::Reference< lang::XMultiServiceFactory > xMSF = GetMultiServiceFactory(); if ( xMSF.is() ) { - uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.CharacterClassification" ) ); + uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")) ); if ( xI.is() ) { uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XCharacterClassification >*)0) ); @@ -177,7 +177,7 @@ uno::Reference < i18n::XCollator > vcl::unohelper::CreateCollator() uno::Reference< lang::XMultiServiceFactory > xMSF = GetMultiServiceFactory(); if ( xMSF.is() ) { - uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ) ); + uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Collator")) ); if ( xI.is() ) { uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XCollator >*)0) ); diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index b46e33686b9b..cd1fbec0502b 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -145,7 +145,7 @@ rtl::OUString GenericClipboard::getImplementationName_static() Sequence< rtl::OUString > GenericClipboard::getSupportedServiceNames_static() { Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.clipboard.SystemClipboard"); + aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")); return aRet; } @@ -282,7 +282,7 @@ Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Seq Sequence< OUString > SAL_CALL Clipboard_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.clipboard.SystemClipboard"); + aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")); return aRet; } @@ -335,13 +335,13 @@ public: static Sequence< OUString > getSupportedServiceNames_static() { Sequence< OUString > aRet( 1 ); - aRet[0] = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.GenericDragSource" ); + aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.GenericDragSource")); return aRet; } static OUString getImplementationName_static() { - return OUString::createFromAscii( "com.sun.star.datatransfer.dnd.VclGenericDragSource" ); + return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.VclGenericDragSource")); } }; @@ -447,13 +447,13 @@ public: static Sequence< OUString > getSupportedServiceNames_static() { Sequence< OUString > aRet( 1 ); - aRet[0] = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.GenericDropTarget" ); + aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.GenericDropTarget")); return aRet; } static OUString getImplementationName_static() { - return OUString::createFromAscii( "com.sun.star.datatransfer.dnd.VclGenericDropTarget" ); + return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.VclGenericDropTarget")); } }; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index a2bbfb67baf4..51f602542ae1 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -81,9 +81,7 @@ public: BOOL mbSmallSymbol; Image maImage; - Image maImageHC; BitmapEx* mpBitmapEx; - BitmapEx* mpBitmapExHC; ImageAlign meImageAlign; SymbolAlign meSymbolAlign; @@ -99,7 +97,6 @@ ImplCommonButtonData::ImplCommonButtonData() mbSmallSymbol = FALSE; mpBitmapEx = NULL; - mpBitmapExHC = NULL; meImageAlign = IMAGEALIGN_TOP; meSymbolAlign = SYMBOLALIGN_LEFT; } @@ -108,7 +105,6 @@ ImplCommonButtonData::ImplCommonButtonData() ImplCommonButtonData::~ImplCommonButtonData() { delete mpBitmapEx; - delete mpBitmapExHC; } // ======================================================================= @@ -203,51 +199,24 @@ XubString Button::GetStandardHelpText( StandardButtonType /* eButton */ ) return aHelpText; } // ----------------------------------------------------------------------- -BOOL Button::SetModeImage( const Image& rImage, BmpColorMode eMode ) +BOOL Button::SetModeImage( const Image& rImage ) { - if( eMode == BMP_COLOR_NORMAL ) + if ( rImage != mpButtonData->maImage ) { - if ( rImage != mpButtonData->maImage ) - { - delete mpButtonData->mpBitmapEx; - - mpButtonData->mpBitmapEx = NULL; - mpButtonData->maImage = rImage; - - StateChanged( STATE_CHANGE_DATA ); - } - } - else if( eMode == BMP_COLOR_HIGHCONTRAST ) - { - if( rImage != mpButtonData->maImageHC ) - { - delete mpButtonData->mpBitmapExHC; + delete mpButtonData->mpBitmapEx; - mpButtonData->mpBitmapExHC = NULL; - mpButtonData->maImageHC = rImage; + mpButtonData->mpBitmapEx = NULL; + mpButtonData->maImage = rImage; - StateChanged( STATE_CHANGE_DATA ); - } + StateChanged( STATE_CHANGE_DATA ); } - else - return FALSE; - return TRUE; } // ----------------------------------------------------------------------- -const Image Button::GetModeImage( BmpColorMode eMode ) const +const Image Button::GetModeImage( ) const { - if( eMode == BMP_COLOR_NORMAL ) - { - return mpButtonData->maImage; - } - else if( eMode == BMP_COLOR_HIGHCONTRAST ) - { - return mpButtonData->maImageHC; - } - else - return Image(); + return mpButtonData->maImage; } // ----------------------------------------------------------------------- @@ -273,43 +242,24 @@ ImageAlign Button::GetImageAlign() const } // ----------------------------------------------------------------------- -BOOL Button::SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode ) +BOOL Button::SetModeBitmap( const BitmapEx& rBitmap ) { - if ( SetModeImage( rBitmap, eMode ) ) + if ( SetModeImage( rBitmap ) ) { - if( eMode == BMP_COLOR_NORMAL ) - { - if ( !mpButtonData->mpBitmapEx ) - mpButtonData->mpBitmapEx = new BitmapEx( rBitmap ); - } - else if ( eMode == BMP_COLOR_HIGHCONTRAST ) - { - if ( !mpButtonData->mpBitmapExHC ) - mpButtonData->mpBitmapExHC = new BitmapEx( rBitmap ); - } - else - return FALSE; - + if ( !mpButtonData->mpBitmapEx ) + mpButtonData->mpBitmapEx = new BitmapEx( rBitmap ); return TRUE; } return FALSE; } // ----------------------------------------------------------------------- -BitmapEx Button::GetModeBitmap( BmpColorMode eMode ) const +BitmapEx Button::GetModeBitmap( ) const { BitmapEx aBmp; - if ( eMode == BMP_COLOR_NORMAL ) - { - if ( mpButtonData->mpBitmapEx ) - aBmp = *( mpButtonData->mpBitmapEx ); - } - else if ( eMode == BMP_COLOR_HIGHCONTRAST ) - { - if ( mpButtonData->mpBitmapExHC ) - aBmp = *( mpButtonData->mpBitmapExHC ); - } + if ( mpButtonData->mpBitmapEx ) + aBmp = *( mpButtonData->mpBitmapEx ); return aBmp; } @@ -423,15 +373,6 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, Image *pImage = &(mpButtonData->maImage); BitmapEx *pBitmapEx = mpButtonData->mpBitmapEx; - if( !!(mpButtonData->maImageHC) ) - { - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - pImage = &(mpButtonData->maImageHC); - pBitmapEx = mpButtonData->mpBitmapExHC; - } - } - if ( pBitmapEx && ( pDev->GetOutDevType() == OUTDEV_PRINTER ) ) { // Die Groesse richtet sich nach dem Bildschirm, soll auf @@ -483,21 +424,21 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, if ( bDrawText ) { - if ( ( eImageAlign == IMAGEALIGN_LEFT_TOP ) || - ( eImageAlign == IMAGEALIGN_LEFT ) || - ( eImageAlign == IMAGEALIGN_LEFT_BOTTOM ) || - ( eImageAlign == IMAGEALIGN_RIGHT_TOP ) || - ( eImageAlign == IMAGEALIGN_RIGHT ) || - ( eImageAlign == IMAGEALIGN_RIGHT_BOTTOM ) ) + if ( ( eImageAlign == IMAGEALIGN_LEFT_TOP ) || + ( eImageAlign == IMAGEALIGN_LEFT ) || + ( eImageAlign == IMAGEALIGN_LEFT_BOTTOM ) || + ( eImageAlign == IMAGEALIGN_RIGHT_TOP ) || + ( eImageAlign == IMAGEALIGN_RIGHT ) || + ( eImageAlign == IMAGEALIGN_RIGHT_BOTTOM ) ) { aRect.Right() -= ( aImageSize.Width() + nImageSep ); } - else if ( ( eImageAlign == IMAGEALIGN_TOP_LEFT ) || - ( eImageAlign == IMAGEALIGN_TOP ) || - ( eImageAlign == IMAGEALIGN_TOP_RIGHT ) || - ( eImageAlign == IMAGEALIGN_BOTTOM_LEFT ) || - ( eImageAlign == IMAGEALIGN_BOTTOM ) || - ( eImageAlign == IMAGEALIGN_BOTTOM_RIGHT ) ) + else if ( ( eImageAlign == IMAGEALIGN_TOP_LEFT ) || + ( eImageAlign == IMAGEALIGN_TOP ) || + ( eImageAlign == IMAGEALIGN_TOP_RIGHT ) || + ( eImageAlign == IMAGEALIGN_BOTTOM_LEFT ) || + ( eImageAlign == IMAGEALIGN_BOTTOM ) || + ( eImageAlign == IMAGEALIGN_BOTTOM_RIGHT ) ) { aRect.Bottom() -= ( aImageSize.Height() + nImageSep ); } @@ -518,7 +459,7 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, } } - aMax.Width() = aTSSize.Width() > aImageSize.Width() ? aTSSize.Width() : aImageSize.Width(); + aMax.Width() = aTSSize.Width() > aImageSize.Width() ? aTSSize.Width() : aImageSize.Width(); aMax.Height() = aTSSize.Height() > aImageSize.Height() ? aTSSize.Height() : aImageSize.Height(); // Now calculate the output area for the image and the text acording to the image align flags @@ -684,9 +625,9 @@ void Button::ImplSetFocusRect( const Rectangle &rFocusRect ) aFocusRect.Bottom()++; } - if ( aFocusRect.Left() < aOutputRect.Left() ) aFocusRect.Left() = aOutputRect.Left(); - if ( aFocusRect.Top() < aOutputRect.Top() ) aFocusRect.Top() = aOutputRect.Top(); - if ( aFocusRect.Right() > aOutputRect.Right() ) aFocusRect.Right() = aOutputRect.Right(); + if ( aFocusRect.Left() < aOutputRect.Left() ) aFocusRect.Left() = aOutputRect.Left(); + if ( aFocusRect.Top() < aOutputRect.Top() ) aFocusRect.Top() = aOutputRect.Top(); + if ( aFocusRect.Right() > aOutputRect.Right() ) aFocusRect.Right() = aOutputRect.Right(); if ( aFocusRect.Bottom() > aOutputRect.Bottom() ) aFocusRect.Bottom() = aOutputRect.Bottom(); mpButtonData->maFocusRect = aFocusRect; @@ -725,6 +666,7 @@ SymbolAlign Button::ImplGetSymbolAlign() const { return mpButtonData->meSymbolAlign; } + // ----------------------------------------------------------------------- void Button::ImplSetSmallSymbol( BOOL bSmall ) { @@ -855,10 +797,10 @@ WinBits PushButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) if ( !(nStyle & WB_NOGROUP) && (!pPrevWindow || - ((pPrevWindow->GetType() != WINDOW_PUSHBUTTON) && - (pPrevWindow->GetType() != WINDOW_OKBUTTON) && + ((pPrevWindow->GetType() != WINDOW_PUSHBUTTON ) && + (pPrevWindow->GetType() != WINDOW_OKBUTTON ) && (pPrevWindow->GetType() != WINDOW_CANCELBUTTON) && - (pPrevWindow->GetType() != WINDOW_HELPBUTTON)) ) ) + (pPrevWindow->GetType() != WINDOW_HELPBUTTON )) ) ) nStyle |= WB_GROUP; return nStyle; } @@ -2312,9 +2254,6 @@ void RadioButton::ImplInitSettings( BOOL bFont, } } -//--------------------------------------------------------------------- -//--- 12.03.2003 18:46:14 --------------------------------------------- - void RadioButton::DrawRadioButtonState( ) { ImplDrawRadioButtonState( ); @@ -2405,13 +2344,7 @@ if ( bNativeOK == FALSE ) if ( !bEnabled ) nButtonStyle |= IMAGE_DRAW_DISABLE; - // check for HC mode Image *pImage = &maImage; - if( !!maImageHC ) - { - if( rStyleSettings.GetHighContrastMode() ) - pImage = &maImageHC; - } Point aImagePos( aImageRect.TopLeft() ); aImagePos.X() += (aImageRect.GetWidth()-aImageSize.Width())/2; @@ -3107,38 +3040,21 @@ void RadioButton::Toggle() // ----------------------------------------------------------------------- -BOOL RadioButton::SetModeRadioImage( const Image& rImage, BmpColorMode eMode ) -{ - if( eMode == BMP_COLOR_NORMAL ) +BOOL RadioButton::SetModeRadioImage( const Image& rImage ) { if ( rImage != maImage ) { maImage = rImage; StateChanged( STATE_CHANGE_DATA ); } -} - else if( eMode == BMP_COLOR_HIGHCONTRAST ) - { - if( maImageHC != rImage ) - { - maImageHC = rImage; - StateChanged( STATE_CHANGE_DATA ); - } - } - else - return FALSE; - return TRUE; } // ----------------------------------------------------------------------- -const Image& RadioButton::GetModeRadioImage( BmpColorMode eMode ) const +const Image& RadioButton::GetModeRadioImage( ) const { - if( eMode == BMP_COLOR_HIGHCONTRAST ) - return maImageHC; - else - return maImage; + return maImage; } // ----------------------------------------------------------------------- @@ -3291,10 +3207,11 @@ Image RadioButton::GetRadioImage( const AllSettings& rSettings, USHORT nFlags ) ResMgr* pResMgr = ImplGetResMgr(); pSVData->maCtrlData.mpRadioImgList = new ImageList(); if( pResMgr ) - LoadThemedImageList( rStyleSettings, + LoadThemedImageList( rStyleSettings, pSVData->maCtrlData.mpRadioImgList, - ResId( SV_RESID_BITMAP_RADIO+nStyle, *pResMgr ), 6 ); - pSVData->maCtrlData.mnRadioStyle = nStyle; + ResId( SV_RESID_BITMAP_RADIO+nStyle, *pResMgr ), 6 + ); + pSVData->maCtrlData.mnRadioStyle = nStyle; } USHORT nId; @@ -3378,13 +3295,13 @@ Size RadioButton::CalcMinimumSize( long nMaxWidth ) const if ( aSize.Height() < aTextSize.Height() ) aSize.Height() = aTextSize.Height(); } - else if ( !maImage ) - { +// else if ( !maImage ) +// { /* da ansonsten im Writer die Control zu weit oben haengen aSize.Width() += 2; aSize.Height() += 2; */ - } +// } return CalcWindowSize( aSize ); } @@ -4465,18 +4382,11 @@ void DisclosureButton::ImplDrawCheckBoxState() ImplSVCtrlData& rCtrlData( ImplGetSVData()->maCtrlData ); if( ! rCtrlData.mpDisclosurePlus ) rCtrlData.mpDisclosurePlus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS ) ) ); - if( ! rCtrlData.mpDisclosurePlusHC ) - rCtrlData.mpDisclosurePlusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS_HC ) ) ); if( ! rCtrlData.mpDisclosureMinus ) rCtrlData.mpDisclosureMinus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS ) ) ); - if( ! rCtrlData.mpDisclosureMinusHC ) - rCtrlData.mpDisclosureMinusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS_HC ) ) ); Image* pImg = NULL; - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - pImg = IsChecked() ? rCtrlData.mpDisclosureMinusHC : rCtrlData.mpDisclosurePlusHC; - else - pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus; + pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus; DBG_ASSERT( pImg, "no disclosure image" ); if( ! pImg ) @@ -4512,5 +4422,4 @@ void DisclosureButton::KeyInput( const KeyEvent& rKEvt ) Button::KeyInput( rKEvt ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index b4a6c26c4c1b..e65925db282c 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -213,7 +213,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) Window* pLBParent = this; if ( mpFloatWin ) pLBParent = mpFloatWin; - mpImplLB = new ImplListBox( pLBParent, nListStyle|WB_SIMPLEMODE ); + mpImplLB = new ImplListBox( pLBParent, nListStyle|WB_SIMPLEMODE|WB_AUTOHSCROLL ); mpImplLB->SetPosPixel( Point() ); mpImplLB->SetSelectHdl( LINK( this, ComboBox, ImplSelectHdl ) ); mpImplLB->SetCancelHdl( LINK( this, ComboBox, ImplCancelHdl ) ); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 0ef45ccabd94..15ce9476cdd1 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -796,7 +796,7 @@ Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const // if ( !xBI.is() ) { Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - Reference < XInterface > xI = xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ); + Reference < XInterface > xI = xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ); if ( xI.is() ) { Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XBreakIterator >*)0) ); @@ -816,7 +816,7 @@ Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenceChec // if ( !xISC.is() ) { Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - Reference < XInterface > xI = xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.InputSequenceChecker" ) ); + Reference < XInterface > xI = xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.InputSequenceChecker")) ); if ( xI.is() ) { Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XExtendedInputSequenceChecker >*)0) ); @@ -878,12 +878,12 @@ void Edit::ImplInsertText( const XubString& rStr, const Selection* pNewSel, sal_ // determine if input-sequence-checking should be applied or not // - static OUString sModule( OUString::createFromAscii( "/org.openoffice.Office.Common/I18N" ) ); - static OUString sRelNode( OUString::createFromAscii( "CTL" ) ); - static OUString sCTLSequenceChecking( OUString::createFromAscii( "CTLSequenceChecking" ) ); - static OUString sCTLSequenceCheckingRestricted( OUString::createFromAscii( "CTLSequenceCheckingRestricted" ) ); - static OUString sCTLSequenceCheckingTypeAndReplace( OUString::createFromAscii( "CTLSequenceCheckingTypeAndReplace" ) ); - static OUString sCTLFont( OUString::createFromAscii( "CTLFont" ) ); + static OUString sModule( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/I18N") ); + static OUString sRelNode( RTL_CONSTASCII_USTRINGPARAM("CTL") ); + static OUString sCTLSequenceChecking( RTL_CONSTASCII_USTRINGPARAM("CTLSequenceChecking") ); + static OUString sCTLSequenceCheckingRestricted( RTL_CONSTASCII_USTRINGPARAM("CTLSequenceCheckingRestricted") ); + static OUString sCTLSequenceCheckingTypeAndReplace( RTL_CONSTASCII_USTRINGPARAM("CTLSequenceCheckingTypeAndReplace") ); + static OUString sCTLFont( RTL_CONSTASCII_USTRINGPARAM("CTLFont") ); // sal_Bool bCTLSequenceChecking = sal_False; sal_Bool bCTLSequenceCheckingRestricted = sal_False; diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index fafe06e47c89..e0455630e496 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -758,11 +758,6 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, ULONG /* nDrawFlags */, USHORT nStyle = 0; Bitmap* pBitmap = &maBitmap; Color aCol; - if( !!maBitmapHC ) - { - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - pBitmap = &maBitmapHC; - } if( nStyle & IMAGE_DRAW_COLORTRANSFORM ) { @@ -884,28 +879,17 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap ) // ----------------------------------------------------------------------- -BOOL FixedBitmap::SetModeBitmap( const Bitmap& rBitmap, BmpColorMode eMode ) +BOOL FixedBitmap::SetModeBitmap( const Bitmap& rBitmap ) { - if( eMode == BMP_COLOR_NORMAL ) - SetBitmap( rBitmap ); - else if( eMode == BMP_COLOR_HIGHCONTRAST ) - { - maBitmapHC = rBitmap; - StateChanged( STATE_CHANGE_DATA ); - } - else - return FALSE; + SetBitmap( rBitmap ); return TRUE; } // ----------------------------------------------------------------------- -const Bitmap& FixedBitmap::GetModeBitmap( BmpColorMode eMode) const +const Bitmap& FixedBitmap::GetModeBitmap( ) const { - if( eMode == BMP_COLOR_HIGHCONTRAST ) - return maBitmapHC; - else - return maBitmap; + return maBitmap; } // ======================================================================= @@ -1009,11 +993,6 @@ void FixedImage::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, Image *pImage = &maImage; Color aCol; - if( !!maImageHC ) - { - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - pImage = &maImageHC; - } // Haben wir ueberhaupt ein Image if ( !(!(*pImage)) ) @@ -1044,7 +1023,7 @@ void FixedImage::Paint( const Rectangle& ) Size FixedImage::GetOptimalSize( WindowSizeType ) const { - const Image* pImage = GetSettings().GetStyleSettings().GetHighContrastMode() ? &maImageHC : &maImage; + const Image* pImage = &maImage; return pImage->GetSizePixel(); } @@ -1139,31 +1118,17 @@ void FixedImage::SetImage( const Image& rImage ) // ----------------------------------------------------------------------- -BOOL FixedImage::SetModeImage( const Image& rImage, BmpColorMode eMode ) +BOOL FixedImage::SetModeImage( const Image& rImage ) { - if( eMode == BMP_COLOR_NORMAL ) - SetImage( rImage ); - else if( eMode == BMP_COLOR_HIGHCONTRAST ) - { - if( maImageHC != rImage ) - { - maImageHC = rImage; - StateChanged( STATE_CHANGE_DATA ); - } - } - else - return FALSE; + SetImage( rImage ); return TRUE; } // ----------------------------------------------------------------------- -const Image& FixedImage::GetModeImage( BmpColorMode eMode ) const +const Image& FixedImage::GetModeImage( ) const { - if( eMode == BMP_COLOR_HIGHCONTRAST ) - return maImageHC; - else - return maImage; + return maImage; } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 73d303b871ea..5b062d6ea8ef 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -135,6 +135,7 @@ GroupBox::GroupBox( Window* pParent, const ResId& rResId ) : void GroupBox::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout ) { + OSL_TRACE("GroupBox::ImplDraw Y %d, X %d", rPos.Y(), rPos.X() ); long nTop; long nTextOff; const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index b89bd2bde25a..9d4958abfd88 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2711,25 +2711,17 @@ ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) : // ----------------------------------------------------------------------- -BOOL ImplWin::SetModeImage( const Image& rImage, BmpColorMode eMode ) +BOOL ImplWin::SetModeImage( const Image& rImage ) { - if( eMode == BMP_COLOR_NORMAL ) - SetImage( rImage ); - else if( eMode == BMP_COLOR_HIGHCONTRAST ) - maImageHC = rImage; - else - return FALSE; + SetImage( rImage ); return TRUE; } // ----------------------------------------------------------------------- -const Image& ImplWin::GetModeImage( BmpColorMode eMode ) const +const Image& ImplWin::GetModeImage( ) const { - if( eMode == BMP_COLOR_HIGHCONTRAST ) - return maImageHC; - else - return maImage; + return maImage; } // ----------------------------------------------------------------------- @@ -2746,7 +2738,6 @@ void ImplWin::MouseButtonDown( const MouseEvent& ) { if( IsEnabled() ) { -// Control::MouseButtonDown( rMEvt ); MBDown(); } } @@ -2908,12 +2899,6 @@ void ImplWin::DrawEntry( BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImageP // check for HC mode Image *pImage = &maImage; - if( !!maImageHC ) - { - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - pImage = &maImageHC; - } - if ( !IsZoom() ) { DrawImage( aPtImg, *pImage, nStyle ); @@ -3147,6 +3132,11 @@ Size ImplListBoxFloatingWindow::CalcFloatSize() long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize(); aFloatSz.Width() += nSBWidth; } + + long nDesktopWidth = GetDesktopRectPixel().getWidth(); + if (aFloatSz.Width() > nDesktopWidth) + // Don't exceed the desktop width. + aFloatSz.Width() = nDesktopWidth; } if ( aFloatSz.Height() > nMaxHeight ) @@ -3173,6 +3163,13 @@ Size ImplListBoxFloatingWindow::CalcFloatSize() aFloatSz.Height() = nInnerHeight + nTop + nBottom; } + if (aFloatSz.Width() < aSz.Width()) + { + // The max width of list box entries exceeds the window width. + // Account for the scroll bar height. + long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize(); + aFloatSz.Height() += nSBWidth; + } return aFloatSz; } diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index dfb74ecc4880..c5ae529f9b26 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -91,12 +91,6 @@ void ImageControl::UserDraw( const UserDrawEvent& rUDEvt ) { USHORT nStyle = 0; BitmapEx* pBitmap = &maBmp; - if( !!maBmpHC ) - { - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - pBitmap = &maBmpHC; - } - if ( !*pBitmap ) { String sText( GetText() ); @@ -201,28 +195,17 @@ void ImageControl::SetBitmap( const BitmapEx& rBmp ) // ----------------------------------------------------------------------- -BOOL ImageControl::SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode ) +BOOL ImageControl::SetModeBitmap( const BitmapEx& rBitmap ) { - if( eMode == BMP_COLOR_NORMAL ) - SetBitmap( rBitmap ); - else if( eMode == BMP_COLOR_HIGHCONTRAST ) - { - maBmpHC = rBitmap; - StateChanged( STATE_CHANGE_DATA ); - } - else - return FALSE; + SetBitmap( rBitmap ); return TRUE; } // ----------------------------------------------------------------------- -const BitmapEx& ImageControl::GetModeBitmap( BmpColorMode eMode ) const +const BitmapEx& ImageControl::GetModeBitmap( ) const { - if( eMode == BMP_COLOR_HIGHCONTRAST ) - return maBmpHC; - else - return maBmp; + return maBmp; } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 8cc7bb221a09..4d9b215ceb21 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -174,6 +174,18 @@ const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) c // ----------------------------------------------------------------------- +WinBits TabControl::ImplInitStyle( WinBits nStyle ) +{ + if ( !(nStyle & WB_NOTABSTOP) ) + nStyle |= WB_TABSTOP; + if ( !(nStyle & WB_NOGROUP) ) + nStyle |= WB_GROUP; + + return nStyle; +} + +// ----------------------------------------------------------------------- + void TabControl::ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ) { @@ -230,6 +242,7 @@ TabControl::TabControl( Window* pParent, WinBits nStyle ) : Control( WINDOW_TABCONTROL ) { ImplInit( pParent, nStyle ); + OSL_TRACE("*** TABCONTROL no notabs? %s", ( GetStyle() & WB_NOBORDER ) ? "true" : "false" ); } // ----------------------------------------------------------------------- @@ -695,7 +708,13 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId ) if ( pPage ) { - pPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() ); + if ( ( GetStyle() & WB_NOBORDER ) ) + { + Rectangle aRectNoTab( (const Point&)Point( 0, 0 ), GetSizePixel() ); + pPage->SetPosSizePixel( aRectNoTab.TopLeft(), aRectNoTab.GetSize() ); + } + else + pPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() ); // activate page here so the conbtrols can be switched // also set the help id of the parent window to that of the tab page @@ -755,6 +774,12 @@ BOOL TabControl::ImplPosCurTabPage() ImplTabItem* pItem = ImplGetItem( GetCurPageId() ); if ( pItem && pItem->mpTabPage ) { + if ( ( GetStyle() & WB_NOBORDER ) ) + { + Rectangle aRectNoTab( (const Point&)Point( 0, 0 ), GetSizePixel() ); + pItem->mpTabPage->SetPosSizePixel( aRectNoTab.TopLeft(), aRectNoTab.GetSize() ); + return TRUE; + } Rectangle aRect = ImplGetTabRect( TAB_PAGERECT ); pItem->mpTabPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() ); return TRUE; @@ -1163,7 +1188,8 @@ void TabControl::KeyInput( const KeyEvent& rKEvt ) void TabControl::Paint( const Rectangle& rRect ) { - ImplPaint( rRect, false ); + if ( !( GetStyle() & WB_NOBORDER ) ) + ImplPaint( rRect, false ); } // ----------------------------------------------------------------------- @@ -1191,7 +1217,6 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) // Draw the TabPage border const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); Rectangle aCurRect; - long nTopOff = 1; aRect.Left() -= TAB_OFFSET; aRect.Top() -= TAB_OFFSET; aRect.Right() += TAB_OFFSET; @@ -1233,6 +1258,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) } else { + long nTopOff = 1; if ( !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO) ) SetLineColor( rStyleSettings.GetLightColor() ); else @@ -1600,6 +1626,10 @@ void TabControl::StateChanged( StateChangedType nType ) ImplInitSettings( FALSE, FALSE, TRUE ); Invalidate(); } + else if ( nType == STATE_CHANGE_STYLE ) + { + SetStyle( ImplInitStyle( GetStyle() ) ); + } } // ----------------------------------------------------------------------- diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index a94e46659a41..26a0100c3db8 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -2048,7 +2048,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail, return; // emit the line head - mpPtr += sprintf( mpPtr, pLineHead); + mpPtr += sprintf( mpPtr, "%s", pLineHead); // emit the vector values ValVector::value_type aVal = 0; for( ValVector::const_iterator it = rVector.begin();;) { @@ -2061,7 +2061,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail, // emit the last value mpPtr += dbl2str( mpPtr, aVal); // emit the line tail - mpPtr += sprintf( mpPtr, pLineTail); + mpPtr += sprintf( mpPtr, "%s", pLineTail); } // -------------------------------------------------------------------- diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 3555b701ef8a..001d7790cb20 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -1842,7 +1842,7 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t ) { #if OSL_DEBUG_LEVEL > 1 if( t->tables[i] ) - fprintf( stderr, "font file %s has bad table offset %d (tagnum=%d)\n", t->fname, (sal_uInt8*)t->tables[i]-t->ptr, i ); + fprintf( stderr, "font file %s has bad table offset %" SAL_PRI_PTRDIFFT "d (tagnum=%d)\n", t->fname, (sal_uInt8*)t->tables[i]-t->ptr, i ); #endif t->tlens[i] = 0; t->tables[i] = NULL; @@ -2058,7 +2058,7 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO fprintf(outf, h02, modname, modver, modextra); fprintf(outf, h09, ttf->psname); - fprintf(outf, h10); + fprintf(outf, "%s", h10); fprintf(outf, h11, fname); /* fprintf(outf, h12, 4000000); */ @@ -2073,17 +2073,17 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO */ fprintf(outf, h17, rtl_crc32(0, ttf->ptr, ttf->fsize), nGlyphs, rtl_crc32(0, glyphArray, nGlyphs * 2), rtl_crc32(0, encoding, nGlyphs)); - fprintf(outf, h13); + fprintf(outf, "%s", h13); fprintf(outf, h14, XUnits(UPEm, GetInt16(table, 36, 1)), XUnits(UPEm, GetInt16(table, 38, 1)), XUnits(UPEm, GetInt16(table, 40, 1)), XUnits(UPEm, GetInt16(table, 42, 1))); - fprintf(outf, h15); + fprintf(outf, "%s", h15); for (i = 0; i < nGlyphs; i++) { fprintf(outf, h16, encoding[i], i); } fprintf(outf, h30, nGlyphs+1); - fprintf(outf, h31); - fprintf(outf, h32); + fprintf(outf, "%s", h31); + fprintf(outf, "%s", h32); for (i = 0; i < nGlyphs; i++) { fprintf(outf, h33, i); @@ -2131,14 +2131,14 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO } if (n > 0) fprintf(outf, "\tfill\n"); /* if glyph is not a whitespace character */ - fprintf(outf, h34); + fprintf(outf, "%s", h34); free(pa); free(path); } - fprintf(outf, h35); + fprintf(outf, "%s", h35); - fprintf(outf, h40); + fprintf(outf, "%s", h40); fprintf(outf, h41, fname); return SF_OK; diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx index e11671e0f2c6..6add986538f5 100644 --- a/vcl/source/gdi/bitmap2.cxx +++ b/vcl/source/gdi/bitmap2.cxx @@ -216,7 +216,8 @@ BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset, BOOL bIs // set decoded bytes to memory stream, // from which we will read the bitmap data - pIStm = pMemStm = new SvMemoryStream; + pMemStm = new SvMemoryStream; + pIStm = pMemStm; pMemStm->SetBuffer( (char*) pData, nUncodedSize, FALSE, nUncodedSize ); nOffset = 0; } diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx index c47b3ca4908d..2660f4e4cfcc 100644 --- a/vcl/source/gdi/bmpconv.cxx +++ b/vcl/source/gdi/bmpconv.cxx @@ -119,7 +119,7 @@ Any SAL_CALL BmpConverter::getValue( const OUString& ) throw( UnknownPropertyExc sal_Bool SAL_CALL BmpConverter::hasMethod( const OUString& rName ) throw() { - return rName.equalsIgnoreAsciiCase( OUString::createFromAscii( "convert-bitmap-depth" ) ); + return rName.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("convert-bitmap-depth")) ); } sal_Bool SAL_CALL BmpConverter::hasProperty( const OUString& ) throw() @@ -136,7 +136,7 @@ Any SAL_CALL BmpConverter::invoke( { Any aRet; - if( rFunction.equalsIgnoreAsciiCase( OUString::createFromAscii( "convert-bitmap-depth" ) ) ) + if( rFunction.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("convert-bitmap-depth")) ) ) { Reference< XBitmap > xBM; sal_uInt16 nTargetDepth = 0; diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index c8be4e9145d3..fa866ba8130a 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -139,7 +139,7 @@ void SettingsConfigItem::getValues() for( int j = 0; j < aNames.getLength(); j++ ) { #if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "found settings data for \"%s\"\n", + OSL_TRACE( "found settings data for \"%s\"\n", OUStringToOString( aNames.getConstArray()[j], RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif @@ -165,7 +165,7 @@ void SettingsConfigItem::getValues() if( pLine->getLength() ) m_aSettings[ aKeyName ][ pFrom[i] ] = *pLine; #if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, " \"%s\"=\"%.30s\"\n", + OSL_TRACE( " \"%s\"=\"%.30s\"\n", OUStringToOString( aKeys.getConstArray()[i], RTL_TEXTENCODING_ASCII_US ).getStr(), OUStringToOString( *pLine, RTL_TEXTENCODING_ASCII_US ).getStr() ); diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index fdb6ab0e6b4a..7c10fb46c647 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -523,7 +523,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S uno::Reference< rendering::XBitmapCanvas > xBitmapCanvas( xBitmap, uno::UNO_QUERY ); if( xBitmapCanvas.is() ) { args[0] = uno::Any( xBitmapCanvas ); - xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "com.sun.star.rendering.MtfRenderer" ), + xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.MtfRenderer")), args ), uno::UNO_QUERY ); if( xMtfRenderer.is() ) { diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index e74d41967a7d..5341433d0bdd 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -797,7 +797,7 @@ Image ImageList::GetImage( USHORT nId ) const { std::vector<ImageAryData *>::iterator aIter; for( aIter = mpImplData->maImages.begin(); - aIter != mpImplData->maImages.end(); aIter++) + aIter != mpImplData->maImages.end(); ++aIter) { if ((*aIter)->mnId == nId) { diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 63b30b483fcb..cbd53dc1b201 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -388,7 +388,7 @@ void ImpGraphic::ImplClear() ::ucbhelper::Content aCnt( mpSwapFile->aSwapURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); - aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), + aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1069,7 +1069,7 @@ BOOL ImpGraphic::ImplReadEmbedded( SvStream& rIStm, BOOL bSwap ) ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); - aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), + aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1253,7 +1253,7 @@ BOOL ImpGraphic::ImplSwapOut() ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); - aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), + aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1355,7 +1355,7 @@ BOOL ImpGraphic::ImplSwapIn() ::ucbhelper::Content aCnt( aSwapURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); - aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), + aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 54fa97e5f46f..403eb638b63c 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -151,6 +151,32 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style) bool ImplImageTree::loadImage( rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap, + bool localized, bool loadMissing ) +{ + bool found = false; + try { + found = doLoadImage(name, style, bitmap, localized); + } catch (css::uno::RuntimeException &) { + if (!loadMissing) + throw; + } + if (found || !loadMissing) + return found; + + try { + OSL_TRACE( + "ImplImageTree::loadImage exception couldn't load \"%s\", fetching missing_icon.png", + rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr()); + found = doLoadImage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("res/missing_icon.png")), + style, bitmap, false); + } catch (css::uno::RuntimeException &) { + throw; + } + return found; +} + +bool ImplImageTree::doLoadImage( + rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap, bool localized) { setStyle(style); @@ -273,7 +299,7 @@ void ImplImageTree::resetZips() { u.GetMainURL(INetURLObject::NO_DECODE), css::uno::Reference< css::container::XNameAccess >())); } - if ( m_style.equals(::rtl::OUString::createFromAscii("default")) ) + if ( m_style.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"))) ) { rtl::OUString url( RTL_CONSTASCII_USTRINGPARAM( diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 25afe9946ccb..3c999ef9762a 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1442,19 +1442,35 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) rIStm >> mnLen; rIStm >> nAryLen; + if ( mnIndex > mnLen ) + { + mnIndex = 0; + mpDXAry = 0; + return; + } + if( nAryLen ) { // #i9762#, #106172# Ensure that DX array is at least mnLen entries long - const ULONG nIntAryLen( Max(nAryLen, static_cast<sal_uInt32>(mnLen)) ); - mpDXAry = new sal_Int32[ nIntAryLen ]; - - ULONG i; - for( i = 0UL; i < nAryLen; i++ ) - rIStm >> mpDXAry[ i ]; + if ( mnLen >= nAryLen ) + { + mpDXAry = new (std::nothrow)sal_Int32[ mnLen ]; + if ( mpDXAry ) + { + ULONG i; + for( i = 0UL; i < nAryLen; i++ ) + rIStm >> mpDXAry[ i ]; - // #106172# setup remainder - for( ; i < nIntAryLen; i++ ) - mpDXAry[ i ] = 0; + // #106172# setup remainder + for( ; i < mnLen; i++ ) + mpDXAry[ i ] = 0; + } + } + else + { + mpDXAry = NULL; + return; + } } else mpDXAry = NULL; diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index 0389d8364b2c..08c27603e193 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -2488,6 +2488,9 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt, const bool bDashUsed(LINE_DASH == aInfo.GetStyle()); const bool bLineWidthUsed(aInfo.GetWidth() > 1); + if ( mbInitLineColor ) + ImplInitLineColor(); + if(bDashUsed || bLineWidthUsed) { basegfx::B2DPolygon aLinePolygon; @@ -2498,9 +2501,6 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt, } else { - if ( mbInitLineColor ) - ImplInitLineColor(); - mpGraphics->DrawLine( aStartPt.X(), aStartPt.Y(), aEndPt.X(), aEndPt.Y(), this ); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index b3e5362be198..10f4e693d48b 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -7366,7 +7366,14 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT // try to handle ligatures and such if( i < nGlyphs-1 ) { - pUnicodesPerGlyph[i] = nChars = pCharPosAry[i+1] - pCharPosAry[i]; + nChars = pCharPosAry[i+1] - pCharPosAry[i]; + // #i115618# fix for simple RTL+CTL cases + // TODO: sanitize for RTL ligatures, more complex CTL, etc. + if( nChars < 0 ) + nChars = -nChars; + else if( nChars == 0 ) + nChars = 1; + pUnicodesPerGlyph[i] = nChars; for( int n = 1; n < nChars; n++ ) aUnicodes.push_back( rText.GetChar( sal::static_int_cast<xub_StrLen>(pCharPosAry[i]+n) ) ); } @@ -11802,7 +11809,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa rNewWidget.m_nTextStyle = TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK; - rNewWidget.m_aValue = OUString::createFromAscii( rBox.Checked ? "Yes" : "Off" ); + rNewWidget.m_aValue = rBox.Checked ? OUString(RTL_CONSTASCII_USTRINGPARAM("Yes")) : OUString(RTL_CONSTASCII_USTRINGPARAM("Off" )); // create default appearance before m_aRect gets transformed createDefaultCheckBoxAppearance( rNewWidget, rBox ); } diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 95b8419a8131..1c755fe0e7c4 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -201,7 +201,7 @@ public: return *this; } - bool operator==( const BitmapID& rComp ) + bool operator==( const BitmapID& rComp ) const { return (m_aPixelSize == rComp.m_aPixelSize && m_nSize == rComp.m_nSize && @@ -228,7 +228,7 @@ public: sal_Int32 m_nObject; bool m_bTrueColor; - JPGEmit() : m_pStream( NULL ) {} + JPGEmit() : m_pStream( NULL ), m_bTrueColor( false ) {} ~JPGEmit() { delete m_pStream; } }; diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index a2094c97a77c..94605be2686d 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -158,7 +158,6 @@ private: bool ReadNextChunk(); void ReadRemainingChunks(); - void SkipRemainingChunks(); void ImplSetPixel( sal_uInt32 y, sal_uInt32 x, const BitmapColor & ); void ImplSetPixel( sal_uInt32 y, sal_uInt32 x, BYTE nPalIndex ); @@ -201,7 +200,9 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) mpInflateInBuf ( NULL ), mpScanPrior ( NULL ), mpTransTab ( NULL ), + mpScanCurrent ( NULL ), mpColorTable ( (sal_uInt8*) mpDefaultColorTable ), + mnPass ( 0 ), mbzCodecInUse ( sal_False ), mbStatus( TRUE), mbIDAT( FALSE ), @@ -334,30 +335,6 @@ void PNGReaderImpl::ReadRemainingChunks() // ------------------------------------------------------------------------ -// move position of mrPNGStream to the end of the file -void PNGReaderImpl::SkipRemainingChunks() -{ - // nothing to skip if the last chunk was read - if( !maChunkSeq.empty() && (maChunkSeq.back().nType == PNGCHUNK_IEND) ) - return; - - // read from the stream until the IEND chunk is found - const sal_Size nStreamPos = mrPNGStream.Tell(); - while( !mrPNGStream.IsEof() && (mrPNGStream.GetError() == ERRCODE_NONE) ) - { - mrPNGStream >> mnChunkLen >> mnChunkType; - if( mnChunkLen < 0 ) - break; - if( nStreamPos + mnChunkLen >= mnStreamSize ) - break; - mrPNGStream.SeekRel( mnChunkLen + 4 ); // skip data + CRC - if( mnChunkType == PNGCHUNK_IEND ) - break; - } -} - -// ------------------------------------------------------------------------ - const std::vector< vcl::PNGReader::ChunkData >& PNGReaderImpl::GetAllChunks() { ReadRemainingChunks(); @@ -412,7 +389,9 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint ) case PNGCHUNK_IDAT : { - if ( !mbIDAT ) // the gfx is finished, but there may be left a zlibCRC of about 4Bytes + if ( !mpInflateInBuf ) // taking care that the header has properly been read + mbStatus = FALSE; + else if ( !mbIDAT ) // the gfx is finished, but there may be left a zlibCRC of about 4Bytes ImplReadIDAT(); } break; @@ -523,7 +502,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) mbIDAT = mbAlphaChannel = mbTransparent = FALSE; mbGrayScale = mbRGBTriple = FALSE; mnTargetDepth = mnPngDepth; - mnScansize = ( ( maOrigSize.Width() * mnPngDepth ) + 7 ) >> 3; + sal_uInt64 nScansize64 = ( ( static_cast< sal_uInt64 >( maOrigSize.Width() ) * mnPngDepth ) + 7 ) >> 3; // valid color types are 0,2,3,4 & 6 switch ( mnColorType ) @@ -553,7 +532,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) case 2 : // each pixel is an RGB triple { mbRGBTriple = TRUE; - mnScansize *= 3; + nScansize64 *= 3; switch ( mnPngDepth ) { case 16 : // we have to reduce the bitmap @@ -586,7 +565,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) case 4 : // each pixel is a grayscale sample followed by an alpha sample { - mnScansize *= 2; + nScansize64 *= 2; mbAlphaChannel = TRUE; switch ( mnPngDepth ) { @@ -604,7 +583,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) case 6 : // each pixel is an RGB triple followed by an alpha sample { mbRGBTriple = TRUE; - mnScansize *= 4; + nScansize64 *= 4; mbAlphaChannel = TRUE; switch (mnPngDepth ) { @@ -622,16 +601,24 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) return FALSE; } - mnBPP = mnScansize / maOrigSize.Width(); + mnBPP = static_cast< sal_uInt32 >( nScansize64 / maOrigSize.Width() ); if ( !mnBPP ) mnBPP = 1; - mnScansize++; // each scanline includes one filterbyte + nScansize64++; // each scanline includes one filterbyte + + if ( nScansize64 > SAL_MAX_UINT32 ) + return FALSE; + + mnScansize = static_cast< sal_uInt32 >( nScansize64 ); // TODO: switch between both scanlines instead of copying - mpInflateInBuf = new BYTE[ mnScansize ]; + mpInflateInBuf = new (std::nothrow) BYTE[ mnScansize ]; mpScanCurrent = mpInflateInBuf; - mpScanPrior = new BYTE[ mnScansize ]; + mpScanPrior = new (std::nothrow) BYTE[ mnScansize ]; + + if ( !mpInflateInBuf || !mpScanPrior ) + return FALSE; // calculate target size from original size and the preview hint if( rPreviewSizeHint.Width() || rPreviewSizeHint.Height() ) diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 972540f6c7b7..2860eea20d96 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -2090,6 +2090,7 @@ PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, USHORT nMaxPoints ) mnMaxPoints(nMaxPoints), mnPoints(0), mnPoly(0), + mnHeight(0), bHasOffline(false) { mpPointAry = new Point[ mnMaxPoints ]; diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 32f5ea768066..3e2d839093bc 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -687,7 +687,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s (m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ) : 0 ); OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range"); if( nIndex < 0 || nIndex >= nCount ) - throw lang::IndexOutOfBoundsException(::rtl::OUString::createFromAscii("Palette index out of range"), + throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Palette index out of range")), static_cast<rendering::XBitmapPalette*>(this)); const BitmapColor aCol = m_pBmpAcc->GetPaletteColor(sal::static_int_cast<USHORT>(nIndex)); @@ -709,7 +709,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range"); if( nIndex < 0 || nIndex >= nCount ) - throw lang::IndexOutOfBoundsException(::rtl::OUString::createFromAscii("Palette index out of range"), + throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Palette index out of range")), static_cast<rendering::XBitmapPalette*>(this)); return sal_False; // read-only implementation diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index 6d2360dae6cb..a6792b202b3d 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -80,68 +80,3 @@ String SV_BUTTONTEXT_ABORT { Text [ en-US ] = "~Abort"; }; - -/* HelpTexte, die wir derzeit nicht mehr verwenden: -SV_BUTTONHELPTEXT_OK -{ - Text = "Schließt dieses Dialogfeld und speichert alle vorgenommenen Änderungen." ; -}; - -SV_BUTTONHELPTEXT_CANCEL -{ - Text = "Schließt dieses Dialogfeld, ohne Ihre Änderungen zu speichern." ; -}; - -SV_BUTTONHELPTEXT_HELP -{ - Text = "Zeigt Hilfe zu diesem Fenster an." ; -}; - -SV_BUTTONHELPTEXT_MORE -{ - Text = "Zeigt weitere EinstellmÖglichkeiten an oder versteckt diese wieder." ; -}; - -Finnische-Texte: -OK OK -CANCEL Peruuta -HELP ~Ohje -MORE ~Enemmän -YES ~Kyllä -NO ~Ei -RETRY ~Yritäuudelleen -*/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src index a42a9531d9ee..59d7ea3d443e 100644 --- a/vcl/source/src/helptext.src +++ b/vcl/source/src/helptext.src @@ -138,26 +138,3 @@ String SV_SHORTCUT_SPLITTER { Text [ en-US ] = "Split window separator" ; }; - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index fdb1e755c86a..871cd6af2b29 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -35,27 +35,27 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET) { - File = "check.bmp"; + File = "check.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_WINOFFSET) { - File = "checkwin.bmp"; + File = "checkwin.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_OS2OFFSET) { - File = "checkos2.bmp"; + File = "checkos2.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MACOFFSET) { - File = "checkmac.bmp"; + File = "checkmac.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_UNIXOFFSET) { - File = "checkunx.bmp"; + File = "checkunx.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET) @@ -65,39 +65,39 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET) Bitmap (SV_RESID_BITMAP_SCROLLBMP) { - File = "scrbmp.bmp"; + File = "scrbmp.png"; }; Bitmap (SV_RESID_BITMAP_SCROLLMSK) { - File = "scrmsk.bmp"; + File = "scrmsk.png"; }; // ----------------------------------------------------------------------- Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET) { - File = "radio.bmp"; + File = "radio.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_WINOFFSET) { - File = "radiowin.bmp"; + File = "radiowin.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_OS2OFFSET) { - File = "radioos2.bmp"; + File = "radioos2.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MACOFFSET) { - File = "radiomac.bmp"; + File = "radiomac.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_UNIXOFFSET) { - File = "radiounx.bmp"; + File = "radiounx.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET) @@ -105,63 +105,41 @@ Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET) File = "radiomono.bmp"; }; -// ----------------------------------------------------------------------- - Bitmap SV_RESID_BITMAP_MSGBOX { File = "msgbox.png"; }; -// ----------------------------------------------------------------------- - -Bitmap SV_RESID_BITMAP_MSGBOX_HC -{ - File = "msgbox_hc.png"; -}; - -// ----------------------------------------------------------------------- - Bitmap SV_RESID_BITMAP_PIN { - File = "pin.bmp"; + File = "pin.png"; }; -// ----------------------------------------------------------------------- - Bitmap SV_RESID_BITMAP_CLOSEDOC { - File = "closedoc.bmp"; -}; - -Bitmap SV_RESID_BITMAP_CLOSEDOCHC -{ - File = "closedochc.bmp"; + File = "closedoc.png"; }; -// ----------------------------------------------------------------------- - Bitmap SV_RESID_BITMAP_SPLITHPIN { - File = "splhpin.bmp"; + File = "splhpin.png"; }; Bitmap SV_RESID_BITMAP_SPLITVPIN { - File = "splvpin.bmp"; + File = "splvpin.png"; }; Bitmap SV_RESID_BITMAP_SPLITHARW { - File = "splharw.bmp"; + File = "splharw.png"; }; Bitmap SV_RESID_BITMAP_SPLITVARW { - File = "splvarw.bmp"; + File = "splvarw.png"; }; -// ----------------------------------------------------------------------- - Bitmap (SV_ICON_SIZE48_START) { File = "mainapp_48_8.png" ; @@ -460,16 +438,6 @@ Bitmap (SV_ICON_SMALL_START) File = "mainapp_16.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START) -{ - File = "mainapp_32_h.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START) -{ - File = "mainapp_16_h.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_OFFICE) { File = "mainapp_32.png" ; @@ -480,16 +448,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_OFFICE) File = "mainapp_16.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_OFFICE) -{ - File = "mainapp_32_h.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_OFFICE) -{ - File = "mainapp_16_h" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_TEXT) { File = "lx03251.png" ; @@ -500,16 +458,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEXT) File = "sx03251.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_TEXT) -{ - File = "lxh03251.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_TEXT) -{ - File = "sxh03251.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_TEXT_TEMPLATE) { File = "lx03255.png" ; @@ -520,16 +468,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEXT_TEMPLATE) File = "sx03255.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_TEXT_TEMPLATE) -{ - File = "lxh03255.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_TEXT_TEMPLATE) -{ - File = "sxh03255.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_SPREADSHEET) { File = "lx03250.png" ; @@ -540,16 +478,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_SPREADSHEET) File = "sx03250.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_SPREADSHEET) -{ - File = "lxh03250.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_SPREADSHEET) -{ - File = "sxh03250.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_SPREADSHEET_TEMPLATE) { File = "lx03254.png" ; @@ -560,16 +488,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_SPREADSHEET_TEMPLATE) File = "sx03254.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_SPREADSHEET_TEMPLATE) -{ - File = "lxh03254.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_SPREADSHEET_TEMPLATE) -{ - File = "sxh03254.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DRAWING) { File = "lx03246.png" ; @@ -580,16 +498,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DRAWING) File = "sx03246.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_DRAWING) -{ - File = "lxh03246.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_DRAWING) -{ - File = "sxh03246.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DRAWING_TEMPLATE) { File = "lx03252.png" ; @@ -600,16 +508,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DRAWING_TEMPLATE) File = "sx03252.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_DRAWING_TEMPLATE) -{ - File = "lxh03252.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_DRAWING_TEMPLATE) -{ - File = "sxh03252.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION) { File = "lx03249.png" ; @@ -620,16 +518,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION) File = "sx03249.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRESENTATION) -{ - File = "lxh03249.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRESENTATION) -{ - File = "sxh03249.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION_TEMPLATE) { File = "lx03253.png" ; @@ -640,16 +528,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION_TEMPLATE) File = "sx03253.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRESENTATION_TEMPLATE) -{ - File = "lxh03253.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRESENTATION_TEMPLATE) -{ - File = "sxh03253.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION_COMPRESSED) { File = "lx03241.png" ; @@ -660,16 +538,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION_COMPRESSED) File = "sx03241.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRESENTATION_COMPRESSED) -{ - File = "lxh03241.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRESENTATION_COMPRESSED) -{ - File = "sxh03241.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_MASTER_DOCUMENT) { File = "lx03248.png" ; @@ -680,16 +548,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_MASTER_DOCUMENT) File = "sx03248.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_MASTER_DOCUMENT) -{ - File = "lxh03248.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_MASTER_DOCUMENT) -{ - File = "sxh03248.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_HTML_DOCUMENT) { File = "lx03139.png" ; @@ -700,16 +558,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_HTML_DOCUMENT) File = "sx03139.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_HTML_DOCUMENT) -{ - File = "lxh03139.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_HTML_DOCUMENT) -{ - File = "sxh03139.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_CHART) { File = "lx03128.png" ; @@ -720,16 +568,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_CHART) File = "sx03128.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_CHART) -{ - File = "lxh03128.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_CHART) -{ - File = "sxh03128.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DATABASE) { File = "lx03245.png" ; @@ -740,16 +578,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DATABASE) File = "sx03245.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_DATABASE) -{ - File = "lxh03245.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_DATABASE) -{ - File = "sxh03245.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_FORMULA) { File = "lx03247.png" ; @@ -760,16 +588,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_FORMULA) File = "sx03247.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_FORMULA) -{ - File = "lxh03247.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_FORMULA) -{ - File = "sxh03247.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_TEMPLATE) { File = "lx03242.png" ; @@ -780,16 +598,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEMPLATE) File = "sx03242.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_TEMPLATE) -{ - File = "lxh03242.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_TEMPLATE) -{ - File = "sxh03242.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_MACRO) { File = "lx03216.png" ; @@ -800,16 +608,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_MACRO) File = "sx03216.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_MACRO) -{ - File = "lxh03216.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_MACRO) -{ - File = "sxh03216.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRINTERADMIN) { File = "printeradmin_32.png" ; @@ -820,33 +618,13 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRINTERADMIN) File = "printeradmin_16.png" ; }; -Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRINTERADMIN) -{ - File = "printeradmin_32_h.png" ; -}; - -Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRINTERADMIN) -{ - File = "printeradmin_16_h.png" ; -}; - Bitmap SV_DISCLOSURE_PLUS { File = "plus.png"; }; -Bitmap SV_DISCLOSURE_PLUS_HC -{ - File = "plus_sch.png"; -}; - Bitmap SV_DISCLOSURE_MINUS { File = "minus.png"; }; -Bitmap SV_DISCLOSURE_MINUS_HC -{ - File = "minus_sch.png"; -}; - diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src index 58f0a477c848..01d3c64f7fdb 100644 --- a/vcl/source/src/print.src +++ b/vcl/source/src/print.src @@ -397,16 +397,6 @@ ModalDialog SV_DLG_PRINT { ImageBitmap = Bitmap { File = "ncollate.png" ; }; }; - - Image SV_PRINT_COLLATE_HC_IMG - { - ImageBitmap = Bitmap { File = "collate_h.png" ; }; - }; - - Image SV_PRINT_NOCOLLATE_HC_IMG - { - ImageBitmap = Bitmap { File = "ncollate_h.png" ; }; - }; }; TabPage SV_PRINT_TAB_OPT diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 641686756b74..d60dbb83b6c5 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -45,7 +45,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() static ::osl::Module aDialogLibrary; if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) ) fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() ) - aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") ); + aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) ); if ( fp ) return fp(); return 0; diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index e6722c3d90d3..2a7e9b07d1f2 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -562,7 +562,6 @@ public: Size getMinSize(); Image maImage; - Image maImageHC; }; DecoToolBox::DecoToolBox( Window* pParent, WinBits nStyle ) : @@ -640,8 +639,7 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce ) Color aEraseColor( 255, 255, 255, 255 ); BitmapEx aBmpExDst( maImage.GetBitmapEx() ); - BitmapEx aBmpExSrc( GetSettings().GetStyleSettings().GetHighContrastMode() ? - maImageHC.GetBitmapEx() : aBmpExDst ); + BitmapEx aBmpExSrc( aBmpExDst ); aEraseColor.SetTransparency( 255 ); aBmpExDst.Erase( aEraseColor ); @@ -5165,18 +5163,14 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) : if( pResMgr ) { BitmapEx aBitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) ); - BitmapEx aBitmapHC( ResId( SV_RESID_BITMAP_CLOSEDOCHC, *pResMgr ) ); - aCloser.maImage = Image( aBitmap ); - aCloser.maImageHC = Image( aBitmapHC ); aCloser.SetOutStyle( TOOLBOX_STYLE_FLAT ); aCloser.SetBackground(); aCloser.SetPaintTransparent( TRUE ); aCloser.SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - aCloser.InsertItem( IID_DOCUMENTCLOSE, - GetSettings().GetStyleSettings().GetHighContrastMode() ? aCloser.maImageHC : aCloser.maImage, 0 ); + aCloser.InsertItem( IID_DOCUMENTCLOSE, aCloser.maImage, 0 ); aCloser.SetSelectHdl( LINK( this, MenuBarWindow, CloserHdl ) ); aCloser.AddEventListener( LINK( this, MenuBarWindow, ToolboxEventHdl ) ); aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, XubString( ResId( SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr ) ) ); diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 7a21ab627381..07eafcac357a 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -54,14 +54,11 @@ static void ImplInitMsgBoxImageList() { ResMgr* pResMgr = ImplGetResMgr(); pSVData->maWinData.mpMsgBoxImgList = new ImageList(4); - pSVData->maWinData.mpMsgBoxHCImgList = new ImageList(4); if( pResMgr ) { Color aNonAlphaMask( 0xC0, 0xC0, 0xC0 ); pSVData->maWinData.mpMsgBoxImgList->InsertFromHorizontalBitmap ( ResId( SV_RESID_BITMAP_MSGBOX, *pResMgr ), 4, &aNonAlphaMask ); - pSVData->maWinData.mpMsgBoxHCImgList->InsertFromHorizontalBitmap - ( ResId( SV_RESID_BITMAP_MSGBOX_HC, *pResMgr ), 4, &aNonAlphaMask ); } } } @@ -209,7 +206,7 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : void MessBox::ImplLoadRes( const ResId& ) { - SetText( ReadStringRes() ); + SetText( ReadStringRes() ); SetMessText( ReadStringRes() ); SetHelpText( ReadStringRes() ); } @@ -312,9 +309,6 @@ void MessBox::ImplPosControls() IMPL_DIALOG_OFFSET-2+IMPL_MSGBOX_OFFSET_EXTRA_Y ), aImageSize ); mpFixedImage->SetImage( maImage ); - // forward the HC image - if( !!maImageHC ) - mpFixedImage->SetModeImage( maImageHC, BMP_COLOR_HIGHCONTRAST ); mpFixedImage->Show(); nMaxWidth -= aImageSize.Width()+IMPL_SEP_MSGBOX_IMAGE; } @@ -465,37 +459,41 @@ void MessBox::SetDefaultCheckBoxText() // ----------------------------------------------------------------------- -BOOL MessBox::SetModeImage( const Image& rImage, BmpColorMode eMode ) +BOOL MessBox::SetModeImage( const Image& rImage ) { - if( eMode == BMP_COLOR_NORMAL ) - SetImage( rImage ); - else if( eMode == BMP_COLOR_HIGHCONTRAST ) - maImageHC = rImage; - else - return FALSE; + SetImage( rImage ); return TRUE; } // ----------------------------------------------------------------------- -const Image& MessBox::GetModeImage( BmpColorMode eMode ) const +const Image& MessBox::GetModeImage( ) const { - if( eMode == BMP_COLOR_HIGHCONTRAST ) - return maImageHC; - else - return maImage; + return maImage; } // ----------------------------------------------------------------------- +Size MessBox::GetOptimalSize(WindowSizeType eType) const +{ + switch( eType ) { + case WINDOWSIZE_MINIMUM: + // FIXME: base me on the font size ? + return Size( 250, 100 ); + default: + return Window::GetOptimalSize( eType ); + } +} + +// ============================================================================ + void InfoBox::ImplInitInfoBoxData() { // Default Text is the display title from the application if ( !GetText().Len() ) SetText( Application::GetDisplayName() ); - SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? - InfoBox::GetStandardImageHC() : InfoBox::GetStandardImage() ); + SetImage( InfoBox::GetStandardImage() ); mnSoundType = ((USHORT)SOUND_INFO)+1; } @@ -523,15 +521,7 @@ Image InfoBox::GetStandardImage() return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 4 ); } -// ----------------------------------------------------------------------- - -Image InfoBox::GetStandardImageHC() -{ - ImplInitMsgBoxImageList(); - return ImplGetSVData()->maWinData.mpMsgBoxHCImgList->GetImage( 4 ); -} - -// ----------------------------------------------------------------------- +// ============================================================================ void WarningBox::ImplInitWarningBoxData() { @@ -577,7 +567,7 @@ Image WarningBox::GetStandardImage() return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 3 ); } -// ----------------------------------------------------------------------- +// ============================================================================ void ErrorBox::ImplInitErrorBoxData() { @@ -585,8 +575,7 @@ void ErrorBox::ImplInitErrorBoxData() if ( !GetText().Len() ) SetText( Application::GetDisplayName() ); - SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? - ErrorBox::GetStandardImageHC() : ErrorBox::GetStandardImage() ); + SetImage( ErrorBox::GetStandardImage() ); mnSoundType = ((USHORT)SOUND_ERROR)+1; } @@ -615,15 +604,7 @@ Image ErrorBox::GetStandardImage() return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 1 ); } -// ----------------------------------------------------------------------- - -Image ErrorBox::GetStandardImageHC() -{ - ImplInitMsgBoxImageList(); - return ImplGetSVData()->maWinData.mpMsgBoxHCImgList->GetImage( 1 ); -} - -// ----------------------------------------------------------------------- +// ============================================================================ void QueryBox::ImplInitQueryBoxData() { @@ -631,8 +612,7 @@ void QueryBox::ImplInitQueryBoxData() if ( !GetText().Len() ) SetText( Application::GetDisplayName() ); - SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? - QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() ); + SetImage( QueryBox::GetStandardImage() ); mnSoundType = ((USHORT)SOUND_QUERY)+1; } @@ -669,25 +649,4 @@ Image QueryBox::GetStandardImage() return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 2 ); } -// ----------------------------------------------------------------------- - -Image QueryBox::GetStandardImageHC() -{ - ImplInitMsgBoxImageList(); - return ImplGetSVData()->maWinData.mpMsgBoxHCImgList->GetImage( 2 ); -} - -// ----------------------------------------------------------------------- - -Size MessBox::GetOptimalSize(WindowSizeType eType) const -{ - switch( eType ) { - case WINDOWSIZE_MINIMUM: - // FIXME: base me on the font size ? - return Size( 250, 100 ); - default: - return Window::GetOptimalSize( eType ); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 98e7c279559a..887ca0ea8600 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -73,89 +73,19 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent, const Re { SetPaintTransparent( TRUE ); SetBackground(); - if( useHCColorReplacement() ) - maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() ); - else - maPageVDev.SetBackground( Color( COL_WHITE ) ); + maPageVDev.SetBackground( Color( COL_WHITE ) ); } PrintDialog::PrintPreviewWindow::~PrintPreviewWindow() { } -bool PrintDialog::PrintPreviewWindow::useHCColorReplacement() const -{ - bool bRet = false; - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - try - { - // get service provider - Reference< XMultiServiceFactory > xSMgr( unohelper::GetMultiServiceFactory() ); - // create configuration hierachical access name - if( xSMgr.is() ) - { - try - { - Reference< XMultiServiceFactory > xConfigProvider( - Reference< XMultiServiceFactory >( - xSMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationProvider" ))), - UNO_QUERY ) - ); - if( xConfigProvider.is() ) - { - Sequence< Any > aArgs(1); - PropertyValue aVal; - aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); - aVal.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/Accessibility" ) ); - aArgs.getArray()[0] <<= aVal; - Reference< XNameAccess > xConfigAccess( - Reference< XNameAccess >( - xConfigProvider->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationAccess" )), - aArgs ), - UNO_QUERY ) - ); - if( xConfigAccess.is() ) - { - try - { - sal_Bool bValue = sal_False; - Any aAny = xConfigAccess->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsForPagePreviews" ) ) ); - if( aAny >>= bValue ) - bRet = bool(bValue); - } - catch( NoSuchElementException& ) - { - } - catch( WrappedTargetException& ) - { - } - } - } - } - catch( Exception& ) - { - } - } - } - catch( WrappedTargetException& ) - { - } - } - return bRet; -} - void PrintDialog::PrintPreviewWindow::DataChanged( const DataChangedEvent& i_rDCEvt ) { // react on settings changed if( i_rDCEvt.GetType() == DATACHANGED_SETTINGS ) { - if( useHCColorReplacement() ) - maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() ); - else - maPageVDev.SetBackground( Color( COL_WHITE ) ); + maPageVDev.SetBackground( Color( COL_WHITE ) ); } Window::DataChanged( i_rDCEvt ); } @@ -304,10 +234,6 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi #endif SetQuickHelpText( aBuf.makeStringAndClear() ); maMtf = i_rNewPreview; - if( useHCColorReplacement() ) - { - maMtf.ReplaceColors( Color( COL_BLACK ), Color( COL_WHITE ), 30 ); - } maOrigSize = i_rOrigSize; maReplacementString = i_rReplacement; @@ -598,9 +524,7 @@ PrintDialog::JobTabPage::JobTabPage( Window* i_pParent, const ResId& rResId ) , maCollateBox( this, VclResId( SV_PRINT_COLLATE ) ) , maCollateImage( this, VclResId( SV_PRINT_COLLATE_IMAGE ) ) , maCollateImg( VclResId( SV_PRINT_COLLATE_IMG ) ) - , maCollateHCImg( VclResId( SV_PRINT_COLLATE_HC_IMG ) ) , maNoCollateImg( VclResId( SV_PRINT_NOCOLLATE_IMG ) ) - , maNoCollateHCImg( VclResId( SV_PRINT_NOCOLLATE_HC_IMG ) ) , mnCollateUIMode( 0 ) , maLayout( NULL, true ) { @@ -729,7 +653,8 @@ void PrintDialog::JobTabPage::storeToSettings() maCopyCountField.GetText() ); pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ), - rtl::OUString::createFromAscii( maCollateBox.IsChecked() ? "true" : "false" ) ); + maCollateBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) ); } void PrintDialog::JobTabPage::Resize() @@ -785,7 +710,8 @@ void PrintDialog::OutputOptPage::storeToSettings() SettingsConfigItem* pItem = SettingsConfigItem::get(); pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToFile" ) ), - rtl::OUString::createFromAscii( maToFileBox.IsChecked() ? "true" : "false" ) ); + maToFileBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) + : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) ); } void PrintDialog::OutputOptPage::Resize() @@ -1730,21 +1656,12 @@ void PrintDialog::checkControlDependencies() maJobPage.maCollateBox.Enable( FALSE ); Image aImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateImg : maJobPage.maNoCollateImg ); - Image aHCImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateHCImg : maJobPage.maNoCollateHCImg ); - bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode(); Size aImgSize( aImg.GetSizePixel() ); - Size aHCImgSize( aHCImg.GetSizePixel() ); - - if( aHCImgSize.Width() > aImgSize.Width() ) - aImgSize.Width() = aHCImgSize.Width(); - if( aHCImgSize.Height() > aImgSize.Height() ) - aImgSize.Height() = aHCImgSize.Height(); // adjust size of image maJobPage.maCollateImage.SetSizePixel( aImgSize ); - maJobPage.maCollateImage.SetImage( bHC ? aHCImg : aImg ); - maJobPage.maCollateImage.SetModeImage( aHCImg, BMP_COLOR_HIGHCONTRAST ); + maJobPage.maCollateImage.SetImage( aImg ); maJobPage.maLayout.resize(); // enable setup button only for printers that can be setup diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 0fafed0dd061..08b86cb81113 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -2371,12 +2371,12 @@ BOOL ToolBox::AlwaysLocked() utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( vcl::unohelper::GetMultiServiceFactory(), - OUString::createFromAscii( "/org.openoffice.Office.UI.GlobalSettings/Toolbars" ) ); // note: case sensisitive ! + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.UI.GlobalSettings/Toolbars")) ); // note: case sensisitive ! if ( aNode.isValid() ) { // feature enabled ? BOOL bStatesEnabled = BOOL(); - ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString::createFromAscii( "StatesEnabled" ) ); + ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("StatesEnabled")) ); if( aValue >>= bStatesEnabled ) { if( bStatesEnabled == TRUE ) @@ -2384,10 +2384,10 @@ BOOL ToolBox::AlwaysLocked() // now read the locking state utl::OConfigurationNode aNode2 = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( vcl::unohelper::GetMultiServiceFactory(), - OUString::createFromAscii( "/org.openoffice.Office.UI.GlobalSettings/Toolbars/States" ) ); // note: case sensisitive ! + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.UI.GlobalSettings/Toolbars/States")) ); // note: case sensisitive ! BOOL bLocked = BOOL(); - ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString::createFromAscii( "Locked" ) ); + ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Locked")) ); if( aValue2 >>= bLocked ) nAlwaysLocked = (bLocked == TRUE) ? 1 : 0; } @@ -2412,11 +2412,9 @@ void ToolBox::ImplUpdateImageList() { if (mpData->mpImageListProvider != NULL) { - BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode(); try { - ImageListType eType = bHC ? vcl::HIGHCONTRAST_YES : vcl::HIGHCONTRAST_NO; - + ImageListType eType = vcl::HIGHCONTRAST_NO; if (eType != mpData->meImageListType) { vcl::IImageListProvider* pImageListProvider = mpData->mpImageListProvider; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index ffc447b09172..1ecd97d40756 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -286,8 +286,6 @@ bool Window::ImplCheckUIFont( const Font& rFont ) void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl ) { - // reset high contrast to false, so the system can either update it - // or AutoDetectSystemHC can kick in (see below) StyleSettings aTmpSt( rSettings.GetStyleSettings() ); aTmpSt.SetHighContrastMode( FALSE ); rSettings.SetStyleSettings( aTmpSt ); @@ -471,7 +469,6 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl ) rSettings.SetStyleSettings( aStyleSettings ); - // auto detect HC mode; if the system already set it to "yes" // (see above) then accept that if( !rSettings.GetStyleSettings().GetHighContrastMode() ) @@ -479,10 +476,10 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl ) sal_Bool bTmp = sal_False, bAutoHCMode = sal_True; utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( vcl::unohelper::GetMultiServiceFactory(), - OUString::createFromAscii( "org.openoffice.Office.Common/Accessibility" ) ); // note: case sensisitive ! + OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Accessibility")) ); // note: case sensisitive ! if ( aNode.isValid() ) { - ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString::createFromAscii( "AutoDetectSystemHC" ) ); + ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("AutoDetectSystemHC")) ); if( aValue >>= bTmp ) bAutoHCMode = bTmp; } @@ -493,6 +490,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl ) { aStyleSettings = rSettings.GetStyleSettings(); aStyleSettings.SetHighContrastMode( TRUE ); + aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST ); rSettings.SetStyleSettings( aStyleSettings ); } } @@ -502,6 +500,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl ) if( pEnvHC && *pEnvHC ) { aStyleSettings.SetHighContrastMode( TRUE ); + aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST ); rSettings.SetStyleSettings( aStyleSettings ); } @@ -8576,22 +8575,22 @@ Reference< XDragSource > Window::GetDragSource() Sequence< Any > aDragSourceAL( 2 ), aDropTargetAL( 2 ); OUString aDragSourceSN, aDropTargetSN; #if defined WNT - aDragSourceSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDragSource" ); - aDropTargetSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDropTarget" ); + aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource")); + aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget")); aDragSourceAL[ 1 ] = makeAny( (sal_uInt32) pEnvData->hWnd ); aDropTargetAL[ 0 ] = makeAny( (sal_uInt32) pEnvData->hWnd ); #elif defined QUARTZ /* FIXME: Mac OS X specific dnd interface does not exist! * * Using Windows based dnd as a temporary solution */ - aDragSourceSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDragSource" ); - aDropTargetSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDropTarget" ); + aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource")); + aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget")); aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) ); aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) ); #elif defined UNX aDropTargetAL.realloc( 3 ); aDragSourceAL.realloc( 3 ); - aDragSourceSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.X11DragSource" ); - aDropTargetSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.X11DropTarget" ); + aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DragSource")); + aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DropTarget")); aDragSourceAL[ 0 ] = makeAny( Application::GetDisplayConnection() ); aDragSourceAL[ 2 ] = makeAny( vcl::createBmpConverter() ); @@ -8664,10 +8663,10 @@ Reference< XClipboard > Window::GetClipboard() if( xFactory.is() ) { - mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboardExt" ) ), UNO_QUERY ); + mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboardExt")) ), UNO_QUERY ); if( !mpWindowImpl->mpFrameData->mxClipboard.is() ) - mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ) ), UNO_QUERY ); + mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")) ), UNO_QUERY ); #if defined(UNX) && !defined(QUARTZ) // unix clipboard needs to be initialized if( mpWindowImpl->mpFrameData->mxClipboard.is() ) @@ -8678,7 +8677,7 @@ Reference< XClipboard > Window::GetClipboard() { Sequence< Any > aArgumentList( 3 ); aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() ); - aArgumentList[ 1 ] = makeAny( OUString::createFromAscii( "CLIPBOARD" ) ); + aArgumentList[ 1 ] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ); aArgumentList[ 2 ] = makeAny( vcl::createBmpConverter() ); xInit->initialize( aArgumentList ); @@ -8721,19 +8720,19 @@ Reference< XClipboard > Window::GetPrimarySelection() #if defined(UNX) && !defined(QUARTZ) Sequence< Any > aArgumentList( 3 ); aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() ); - aArgumentList[ 1 ] = makeAny( OUString::createFromAscii( "PRIMARY" ) ); + aArgumentList[ 1 ] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("PRIMARY")) ); aArgumentList[ 2 ] = makeAny( vcl::createBmpConverter() ); mpWindowImpl->mpFrameData->mxSelection = Reference< XClipboard >( xFactory->createInstanceWithArguments( - OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ), aArgumentList ), UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")), aArgumentList ), UNO_QUERY ); # else static Reference< XClipboard > s_xSelection; if ( !s_xSelection.is() ) - s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboardExt" ) ), UNO_QUERY ); + s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboardExt")) ), UNO_QUERY ); if ( !s_xSelection.is() ) - s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ) ), UNO_QUERY ); + s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboard")) ), UNO_QUERY ); mpWindowImpl->mpFrameData->mxSelection = s_xSelection; # endif diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx index 51ec6685f0ca..94807c051e59 100644 --- a/vcl/test/canvasbitmaptest.cxx +++ b/vcl/test/canvasbitmaptest.cxx @@ -123,7 +123,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString::createFromAscii( "CanvasBitmap test harness" ) ); + SetText( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CanvasBitmap test harness")) ); SetSizePixel( Size( 1024, 1024 ) ); EnablePaint( true ); Show(); diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx index 31bc02ffd8ef..31d7f01b3aa8 100644 --- a/vcl/test/dndtest.cxx +++ b/vcl/test/dndtest.cxx @@ -139,7 +139,7 @@ public: { DataFlavor df; - df.MimeType = OUString::createFromAscii( "text/plain;charset=utf-16" ); + df.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")); df.DataType = getCppuType( static_cast < OUString * > ( 0 ) ); m_aFlavorList[0] = df; @@ -163,7 +163,7 @@ void MyApp::Main() osl_getCommandArg( n, &aArg.pData ); - if( aArg.compareTo( OUString::createFromAscii( "-r" ), 2 ) == 0 ) + if( aArg.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("-r")), 2 ) == 0 ) { if ( n + 1 < nmax ) osl_getCommandArg( ++n, &aRegistry.pData ); @@ -210,7 +210,7 @@ void MyApp::Main() MyListBox aListBox( &aMainWin ); aListBox.SetPosSizePixel( 10, 10, 100, 100 ); - aListBox.InsertEntry( OUString::createFromAscii( "TestItem" )); + aListBox.InsertEntry( OUString(RTL_CONSTASCII_USTRINGPARAM("TestItem"))); aListBox.Show(); Execute(); @@ -296,7 +296,7 @@ void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEve printf( "XDragGestureListener::dragGestureRecognized called ( Window: %p, %"SAL_PRIdINT32", %"SAL_PRIdINT32" ).\n", m_pWindow, dge.DragOriginX, dge.DragOriginY ); Reference< XDragSource > xDragSource( dge.DragSource, UNO_QUERY ); - xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString::createFromAscii( "TestString" ) ), this ); + xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString(RTL_CONSTASCII_USTRINGPARAM("TestString")) ), this ); printf( "XDragSource::startDrag returned.\n" ); } @@ -385,7 +385,7 @@ void SAL_CALL MyDragAndDropListener::disposing( const EventObject& ) throw(Runti // ----------------------------------------------------------------------- MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, - OUString::createFromAscii( "dragging over this box should result in another window id in the drag log." ) ) + OUString(RTL_CONSTASCII_USTRINGPARAM("dragging over this box should result in another window id in the drag log.")) ) { Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this ); diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index 9896456f91ec..43bca43ac626 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -787,13 +787,13 @@ ooo_atk_util_get_type (void) static const GTypeInfo typeInfo = { - type_query.class_size, + static_cast<guint16>(type_query.class_size), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) ooo_atk_util_class_init, (GClassFinalizeFunc) NULL, NULL, - type_query.instance_size, + static_cast<guint16>(type_query.instance_size), 0, (GInstanceInitFunc) NULL, NULL diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index be6d646fdc29..c265f79585e8 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -296,13 +296,13 @@ ooo_window_wrapper_get_type (void) static const GTypeInfo typeInfo = { - type_query.class_size, + static_cast<guint16>(type_query.class_size), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) ooo_window_wrapper_class_init, (GClassFinalizeFunc) NULL, NULL, - type_query.instance_size, + static_cast<guint16>(type_query.instance_size), 0, (GInstanceInitFunc) NULL, NULL diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 950dbcbea0b6..95cc936df35f 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -316,17 +316,17 @@ long GtkSalDisplay::Dispatch( XEvent* pEvent ) return GDK_FILTER_CONTINUE; } -GdkCursor* GtkSalDisplay::getFromXPM( const char *pBitmap, - const char *pMask, +GdkCursor* GtkSalDisplay::getFromXPM( const unsigned char *pBitmap, + const unsigned char *pMask, int nWidth, int nHeight, int nXHot, int nYHot ) { GdkScreen *pScreen = gdk_display_get_default_screen( m_pGdkDisplay ); GdkDrawable *pDrawable = GDK_DRAWABLE( gdk_screen_get_root_window (pScreen) ); GdkBitmap *pBitmapPix = gdk_bitmap_create_from_data - ( pDrawable, pBitmap, nWidth, nHeight ); + ( pDrawable, reinterpret_cast<const char*>(pBitmap), nWidth, nHeight ); GdkBitmap *pMaskPix = gdk_bitmap_create_from_data - ( pDrawable, pMask, nWidth, nHeight ); + ( pDrawable, reinterpret_cast<const char*>(pMask), nWidth, nHeight ); GdkColormap *pColormap = gdk_drawable_get_colormap( pDrawable ); GdkColor aWhite = { 0, 0xffff, 0xffff, 0xffff }; diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index b307f955cc2a..985fb155bf94 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -268,7 +268,7 @@ public: void SetSize( int n) { delete [] pData; m_idx = 0; m_size = n; pData = new NWPixmapCacheData[m_size]; } - int GetSize() { return m_size; } + int GetSize() const { return m_size; } BOOL Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap ); void Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap ); @@ -918,7 +918,13 @@ BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType, // draw upper half in off state const_cast<ImplControlValue&>(aValue).setTristateVal( BUTTONVALUE_OFF ); XLIB_Region aRegion = XCreateRegion(); - XRectangle aXRect = { aCtrlRect.Left(), aCtrlRect.Top(), aCtrlRect.GetWidth(), aCtrlRect.GetHeight() }; + XRectangle aXRect = + { + static_cast<short>(aCtrlRect.Left()), + static_cast<short>(aCtrlRect.Top()), + static_cast<unsigned short>(aCtrlRect.GetWidth()), + static_cast<unsigned short>(aCtrlRect.GetHeight()) + }; const unsigned short nH = aXRect.height/2; aXRect.height -= nH; XUnionRectWithRegion( &aXRect, aRegion, aRegion ); @@ -3581,8 +3587,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) aStyleSet.SetPreferredSymbolsStyleName( OUString::createFromAscii( pIconThemeName ) ); g_free( pIconThemeName ); - // FIXME: need some way of fetching toolbar icon size. -// aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_SMALL ); + aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); const cairo_font_options_t* pNewOptions = NULL; if( GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ) ) diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 860bf980df19..e062dfe89f72 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -1114,13 +1114,6 @@ void GtkSalFrame::SetIcon( USHORT nIcon ) USHORT nOffsets[2] = { SV_ICON_SMALL_START, SV_ICON_LARGE_START }; USHORT nIndex; - // Use high contrast icons where appropriate - if( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - nOffsets[0] = SV_ICON_LARGE_HC_START; - nOffsets[1] = SV_ICON_SMALL_HC_START; - } - for( nIndex = 0; nIndex < sizeof(nOffsets)/ sizeof(USHORT); nIndex++ ) { // #i44723# workaround gcc temporary problem @@ -2145,6 +2138,8 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle ) void GtkSalFrame::grabPointer( BOOL bGrab, BOOL bOwnerEvents ) { + static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" ); + if( m_pWindow ) { if( bGrab ) @@ -2167,9 +2162,10 @@ void GtkSalFrame::grabPointer( BOOL bGrab, BOOL bOwnerEvents ) { const int nMask = ( GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK ); - gdk_pointer_grab( m_pWindow->window, bOwnerEvents, - (GdkEventMask) nMask, NULL, m_pCurrentCursor, - GDK_CURRENT_TIME ); + if( !pEnv || !*pEnv ) + gdk_pointer_grab( m_pWindow->window, bOwnerEvents, + (GdkEventMask) nMask, NULL, m_pCurrentCursor, + GDK_CURRENT_TIME ); } else { @@ -2179,23 +2175,25 @@ void GtkSalFrame::grabPointer( BOOL bGrab, BOOL bOwnerEvents ) // // this is of course a bad hack, especially as we cannot // set the right cursor this way - XGrabPointer( getDisplay()->GetDisplay(), - GDK_WINDOW_XWINDOW( m_pWindow->window), - bOwnerEvents, - PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, - GrabModeAsync, - None, - None, - CurrentTime - ); + if( !pEnv || !*pEnv ) + XGrabPointer( getDisplay()->GetDisplay(), + GDK_WINDOW_XWINDOW( m_pWindow->window), + bOwnerEvents, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, + GrabModeAsync, + None, + None, + CurrentTime + ); } } else { // Two GdkDisplays may be open - gdk_display_pointer_ungrab( getGdkDisplay(), GDK_CURRENT_TIME); + if( !pEnv || !*pEnv ) + gdk_display_pointer_ungrab( getGdkDisplay(), GDK_CURRENT_TIME); } } } @@ -3788,11 +3786,18 @@ uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText() uno::Reference<accessibility::XAccessibleEditableText> xText; Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin; if (!pFocusWin) - return xText; + return xText; - uno::Reference< accessibility::XAccessible > xAccessible( pFocusWin->GetAccessible( true ) ); - if (xAccessible.is()) - xText = FindFocus(xAccessible->getAccessibleContext()); + try + { + uno::Reference< accessibility::XAccessible > xAccessible( pFocusWin->GetAccessible( true ) ); + if (xAccessible.is()) + xText = FindFocus(xAccessible->getAccessibleContext()); + } + catch(const uno::Exception& e) + { + g_warning( "Exception in getting input method surrounding text" ); + } return xText; } diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx index 2a717352d84c..7e3f0b7880dc 100644 --- a/vcl/unx/headless/svpgdi.cxx +++ b/vcl/unx/headless/svpgdi.cxx @@ -63,7 +63,7 @@ rDevice aBuf.append( "debug" ); mkdir( aBuf.getStr(), 0777 ); aBuf.append( "/" ); - aBuf.append( sal_Int64(reinterpret_cast<sal_uInt32>(rDevice.get())), 16 ); + aBuf.append( sal_Int64(reinterpret_cast<sal_IntPtr>(rDevice.get())), 16 ); mkdir( aBuf.getStr(), 0777 ); aBuf.append( "/bmp" ); aBuf.append( sal_Int32(dbgStreamNum++) ); diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx index 87a64286c908..9038e3cd42fb 100644 --- a/vcl/unx/headless/svpprn.cxx +++ b/vcl/unx/headless/svpprn.cxx @@ -883,7 +883,7 @@ BOOL PspSalPrinter::StartJob( nMode = S_IRUSR | S_IWUSR; ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; - it = pJobSetup->maValueMap.find( ::rtl::OUString::createFromAscii( "FAX#" ) ); + it = pJobSetup->maValueMap.find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAX#")) ); if( it != pJobSetup->maValueMap.end() ) m_aFaxNr = it->second; diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx index 5ea635703189..4f02ea7c5ecf 100644 --- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkdata.hxx @@ -60,7 +60,7 @@ class GtkSalDisplay : public SalDisplay GdkDisplay* m_pGdkDisplay; GdkCursor *m_aCursors[ POINTER_COUNT ]; bool m_bStartupCompleted; - GdkCursor* getFromXPM( const char *pBitmap, const char *pMask, + GdkCursor* getFromXPM( const unsigned char *pBitmap, const unsigned char *pMask, int nWidth, int nHeight, int nXHot, int nYHot ); public: GtkSalDisplay( GdkDisplay* pDisplay ); diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 9293b801d95b..099833a18976 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1831,6 +1831,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) StyleSettings aStyleSettings( rSettings.GetStyleSettings() ); bool bSetTitleFont = false; + aStyleSettings.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); + // WM settings KConfig *pConfig = KGlobal::config(); if ( pConfig ) diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 7cdbb0e824a2..107a2a2757b8 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -185,6 +185,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) // General settings QPalette pal = kapp->palette(); + style.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); + style.SetActiveColor(toColor(pal.color(QPalette::Active, QPalette::Window))); style.SetDeactiveColor(toColor(pal.color(QPalette::Inactive, QPalette::Window))); diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index e130afbecd15..936167f8c879 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -441,6 +441,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, //setup parameters from the OO values option.minimum = sbVal->mnMin; option.maximum = sbVal->mnMax - sbVal->mnVisibleSize; + option.maximum = qMax( option.maximum, option.minimum ); // bnc#619772 option.sliderValue = sbVal->mnCur; option.sliderPosition = sbVal->mnCur; option.pageStep = sbVal->mnVisibleSize; diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index f2eecf0d9cbd..cf38f4bb5c1a 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -803,7 +803,7 @@ void SalDisplay::initScreen( int nScreen ) const } rSD.m_hInvert50 = XCreateBitmapFromData( pDisp_, rSD.m_aRefWindow, - invert50_bits, + reinterpret_cast<const char*>(invert50_bits), invert50_width, invert50_height ); } @@ -1856,7 +1856,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent *pEvent, #define MAKE_BITMAP( name ) \ XCreateBitmapFromData( pDisp_, \ DefaultRootWindow( pDisp_ ), \ - name##_bits, \ + reinterpret_cast<const char*>(name##_bits), \ name##_width, \ name##_height ) @@ -2218,10 +2218,13 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle ) int SalDisplay::CaptureMouse( SalFrame *pCapture ) { + static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" ); + if( !pCapture ) { m_pCapture = NULL; - XUngrabPointer( GetDisplay(), CurrentTime ); + if( !pEnv || !*pEnv ) + XUngrabPointer( GetDisplay(), CurrentTime ); XFlush( GetDisplay() ); return 0; } @@ -2230,20 +2233,23 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture ) // FIXME: get rid of X11SalFrame const SystemEnvData* pEnvData = pCapture->GetSystemData(); - int ret = XGrabPointer( GetDisplay(), - (XLIB_Window)pEnvData->aWindow, - False, - PointerMotionMask| ButtonPressMask|ButtonReleaseMask, - GrabModeAsync, - GrabModeAsync, - None, - static_cast<X11SalFrame*>(pCapture)->GetCursor(), - CurrentTime ); - - if( ret != GrabSuccess ) - { - DBG_ASSERT( 1, "SalDisplay::CaptureMouse could not grab pointer\n"); - return -1; + if( !pEnv || !*pEnv ) + { + int ret = XGrabPointer( GetDisplay(), + (XLIB_Window)pEnvData->aWindow, + False, + PointerMotionMask| ButtonPressMask|ButtonReleaseMask, + GrabModeAsync, + GrabModeAsync, + None, + static_cast<X11SalFrame*>(pCapture)->GetCursor(), + CurrentTime ); + + if( ret != GrabSuccess ) + { + DBG_ASSERT( 1, "SalDisplay::CaptureMouse could not grab pointer\n"); + return -1; + } } m_pCapture = pCapture; diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx index 955d7098192f..d0680b599615 100644 --- a/vcl/unx/source/app/wmadaptor.cxx +++ b/vcl/unx/source/app/wmadaptor.cxx @@ -1060,7 +1060,7 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const if( aCountry.getLength() ) { - aLocaleString += ::rtl::OUString::createFromAscii( "_" ); + aLocaleString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")); aLocaleString += aCountry; } if( aVariant.getLength() ) diff --git a/vcl/unx/source/dtrans/X11_clipboard.cxx b/vcl/unx/source/dtrans/X11_clipboard.cxx index f4922f57cf72..afe7c17595e8 100644 --- a/vcl/unx/source/dtrans/X11_clipboard.cxx +++ b/vcl/unx/source/dtrans/X11_clipboard.cxx @@ -79,7 +79,7 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : else { m_rSelectionManager.registerHandler( XA_PRIMARY, *this ); - m_rSelectionManager.registerHandler( m_rSelectionManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ), *this ); + m_rSelectionManager.registerHandler( m_rSelectionManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ), *this ); } } @@ -97,7 +97,7 @@ X11Clipboard::~X11Clipboard() else { m_rSelectionManager.deregisterHandler( XA_PRIMARY ); - m_rSelectionManager.deregisterHandler( m_rSelectionManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ) ); + m_rSelectionManager.deregisterHandler( m_rSelectionManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ) ); } } @@ -108,7 +108,7 @@ void X11Clipboard::fireChangedContentsEvent() { ClearableMutexGuard aGuard( m_rSelectionManager.getMutex() ); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "X11Clipboard::fireChangedContentsEvent for %s (%d listeners)\n", + fprintf( stderr, "X11Clipboard::fireChangedContentsEvent for %s (%" SAL_PRI_SIZET "u listeners)\n", OUStringToOString( m_rSelectionManager.getString( m_aSelection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(), m_aListeners.size() ); #endif ::std::list< Reference< XClipboardListener > > listeners( m_aListeners ); @@ -182,7 +182,7 @@ void SAL_CALL X11Clipboard::setContents( else { m_rSelectionManager.requestOwnership( XA_PRIMARY ); - m_rSelectionManager.requestOwnership( m_rSelectionManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ) ); + m_rSelectionManager.requestOwnership( m_rSelectionManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ) ); } // notify old owner on loss of ownership @@ -261,7 +261,7 @@ Reference< XInterface > X11Clipboard::getReference() throw() OUString SAL_CALL X11Clipboard::getImplementationName( ) throw(RuntimeException) { - return OUString::createFromAscii(X11_CLIPBOARD_IMPLEMENTATION_NAME); + return OUString(RTL_CONSTASCII_USTRINGPARAM(X11_CLIPBOARD_IMPLEMENTATION_NAME)); } // ------------------------------------------------------------------------ diff --git a/vcl/unx/source/dtrans/X11_droptarget.cxx b/vcl/unx/source/dtrans/X11_droptarget.cxx index ab12c917297a..ce4851ace375 100644 --- a/vcl/unx/source/dtrans/X11_droptarget.cxx +++ b/vcl/unx/source/dtrans/X11_droptarget.cxx @@ -203,7 +203,7 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw() OUString DropTarget::getImplementationName() throw() { - return OUString::createFromAscii(XDND_DROPTARGET_IMPLEMENTATION_NAME); + return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_DROPTARGET_IMPLEMENTATION_NAME)); } // ------------------------------------------------------------------------ diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx index 18d120d4961b..118162c06422 100644 --- a/vcl/unx/source/dtrans/X11_selection.cxx +++ b/vcl/unx/source/dtrans/X11_selection.cxx @@ -286,7 +286,7 @@ SelectionManager::SelectionManager() : m_aDragRunning.reset(); } -XLIB_Cursor SelectionManager::createCursor( const char* pPointerData, const char* pMaskData, int width, int height, int hotX, int hotY ) +XLIB_Cursor SelectionManager::createCursor( const unsigned char* pPointerData, const unsigned char* pMaskData, int width, int height, int hotX, int hotY ) { Pixmap aPointer; Pixmap aMask; @@ -303,13 +303,13 @@ XLIB_Cursor SelectionManager::createCursor( const char* pPointerData, const char aPointer = XCreateBitmapFromData( m_pDisplay, m_aWindow, - pPointerData, + reinterpret_cast<const char*>(pPointerData), width, height ); aMask = XCreateBitmapFromData( m_pDisplay, m_aWindow, - pMaskData, + reinterpret_cast<const char*>(pMaskData), width, height ); XLIB_Cursor aCursor = @@ -1237,7 +1237,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp bSuccess = getPasteData( selection, nSelectedType, rData ); } #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "getPasteData for selection %s and data type %s returns %s, returned sequence has length %ld\n", + fprintf( stderr, "getPasteData for selection %s and data type %s returns %s, returned sequence has length %" SAL_PRIdINT32 "\n", OUStringToOString( getString( selection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(), OUStringToOString( rType, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), bSuccess ? "true" : "false", @@ -4164,7 +4164,7 @@ void SelectionManagerHolder::startDrag( OUString SelectionManagerHolder::getImplementationName() throw() { - return OUString::createFromAscii(XDND_IMPLEMENTATION_NAME); + return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_IMPLEMENTATION_NAME)); } // ------------------------------------------------------------------------ diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/source/dtrans/X11_selection.hxx index f5534dab81f5..fb01b95a4335 100644 --- a/vcl/unx/source/dtrans/X11_selection.hxx +++ b/vcl/unx/source/dtrans/X11_selection.hxx @@ -402,7 +402,7 @@ namespace x11 { void sendDropPosition( bool bForce, XLIB_Time eventXLIB_Time ); bool updateDragAction( int modifierState ); int getXdndVersion( XLIB_Window aXLIB_Window, XLIB_Window& rProxy ); - XLIB_Cursor createCursor( const char* pPointerData, const char* pMaskData, int width, int height, int hotX, int hotY ); + XLIB_Cursor createCursor( const unsigned char* pPointerData, const unsigned char* pMaskData, int width, int height, int hotX, int hotY ); // coordinates on root XLIB_Window void updateDragWindow( int nX, int nY, XLIB_Window aRoot ); diff --git a/vcl/unx/source/dtrans/X11_service.cxx b/vcl/unx/source/dtrans/X11_service.cxx index cfb1fc623c44..3eab180f8fec 100644 --- a/vcl/unx/source/dtrans/X11_service.cxx +++ b/vcl/unx/source/dtrans/X11_service.cxx @@ -50,21 +50,21 @@ using namespace x11; Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.clipboard.SystemClipboard"); + aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")); return aRet; } Sequence< OUString > SAL_CALL x11::Xdnd_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.dnd.X11DragSource"); + aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DragSource")); return aRet; } Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.dnd.X11DropTarget"); + aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DropTarget")); return aRet; } @@ -105,7 +105,7 @@ Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& else { // default atom is clipboard selection - nSelection = rManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ); + nSelection = rManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ); } ::std::hash_map< Atom, Reference< XClipboard > >& rMap( m_aInstances[ aDisplayName ] ); diff --git a/vcl/unx/source/dtrans/X11_transferable.cxx b/vcl/unx/source/dtrans/X11_transferable.cxx index aaf90e4d8ec6..cb5511f6bf3d 100644 --- a/vcl/unx/source/dtrans/X11_transferable.cxx +++ b/vcl/unx/source/dtrans/X11_transferable.cxx @@ -75,13 +75,13 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) Sequence< sal_Int8 > aData; bool bSuccess = m_rManager.getPasteData( m_aSelection ? m_aSelection : XA_PRIMARY, rFlavor.MimeType, aData ); if( ! bSuccess && m_aSelection == 0 ) - bSuccess = m_rManager.getPasteData( m_rManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ), rFlavor.MimeType, aData ); + bSuccess = m_rManager.getPasteData( m_rManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ), rFlavor.MimeType, aData ); if( ! bSuccess ) { throw UnsupportedFlavorException( rFlavor.MimeType, static_cast < XTransferable * > ( this ) ); } - if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "text/plain;charset=utf-16" ) ) ) + if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")) ) ) { int nLen = aData.getLength()/2; if( ((sal_Unicode*)aData.getConstArray())[nLen-1] == 0 ) @@ -107,7 +107,7 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() Sequence< DataFlavor > aFlavorList; bool bSuccess = m_rManager.getPasteDataTypes( m_aSelection ? m_aSelection : XA_PRIMARY, aFlavorList ); if( ! bSuccess && m_aSelection == 0 ) - bSuccess = m_rManager.getPasteDataTypes( m_rManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ), aFlavorList ); + bSuccess = m_rManager.getPasteDataTypes( m_rManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ), aFlavorList ); return aFlavorList; } @@ -119,7 +119,7 @@ sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFla { if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) ) { - if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "text/plain;charset=utf-16" ) ) && + if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")) ) && aFlavor.DataType == getCppuType( (OUString*)0 ) ) return false; } diff --git a/vcl/unx/source/dtrans/config.cxx b/vcl/unx/source/dtrans/config.cxx index 5add04288aa9..74b8ca8eba05 100644 --- a/vcl/unx/source/dtrans/config.cxx +++ b/vcl/unx/source/dtrans/config.cxx @@ -67,7 +67,7 @@ sal_Int32 SelectionManager::getSelectionTimeout() DtransX11ConfigItem aCfg; m_nSelectionTimeout = aCfg.getSelectionTimeout(); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "initialized selection timeout to %ld seconds\n", m_nSelectionTimeout ); + fprintf( stderr, "initialized selection timeout to %" SAL_PRIdINT32 " seconds\n", m_nSelectionTimeout ); #endif } return m_nSelectionTimeout; @@ -88,7 +88,7 @@ DtransX11ConfigItem::DtransX11ConfigItem() : aKeys.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SELECTION_PROPERTY ) ); Sequence< Any > aValues = GetProperties( aKeys ); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "found %ld properties for %s\n", aValues.getLength(), SELECTION_PROPERTY ); + fprintf( stderr, "found %" SAL_PRIdINT32 " properties for %s\n", aValues.getLength(), SELECTION_PROPERTY ); #endif Any* pValue = aValues.getArray(); for( int i = 0; i < aValues.getLength(); i++, pValue++ ) diff --git a/vcl/unx/source/dtrans/copydata_curs.h b/vcl/unx/source/dtrans/copydata_curs.h index b7cb1557c7a3..a882a541a6d7 100644 --- a/vcl/unx/source/dtrans/copydata_curs.h +++ b/vcl/unx/source/dtrans/copydata_curs.h @@ -29,7 +29,7 @@ #define copydata_curs_height 32 #define copydata_curs_x_hot 1 #define copydata_curs_y_hot 1 -static char copydata_curs_bits[] = { +static unsigned char copydata_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, diff --git a/vcl/unx/source/dtrans/copydata_mask.h b/vcl/unx/source/dtrans/copydata_mask.h index d0cd40bc78fd..9cd73b08d106 100644 --- a/vcl/unx/source/dtrans/copydata_mask.h +++ b/vcl/unx/source/dtrans/copydata_mask.h @@ -29,7 +29,7 @@ #define copydata_mask_height 32 #define copydata_mask_x_hot 1 #define copydata_mask_y_hot 1 -static char copydata_mask_bits[] = { +static unsigned char copydata_mask_bits[] = { 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, diff --git a/vcl/unx/source/dtrans/linkdata_curs.h b/vcl/unx/source/dtrans/linkdata_curs.h index 02d5709600a8..054ef55ef2bb 100644 --- a/vcl/unx/source/dtrans/linkdata_curs.h +++ b/vcl/unx/source/dtrans/linkdata_curs.h @@ -29,7 +29,7 @@ #define linkdata_curs_height 32 #define linkdata_curs_x_hot 1 #define linkdata_curs_y_hot 1 -static char linkdata_curs_bits[] = { +static unsigned char linkdata_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, diff --git a/vcl/unx/source/dtrans/linkdata_mask.h b/vcl/unx/source/dtrans/linkdata_mask.h index 5bf28eac1bd5..429c603066dc 100644 --- a/vcl/unx/source/dtrans/linkdata_mask.h +++ b/vcl/unx/source/dtrans/linkdata_mask.h @@ -29,7 +29,7 @@ #define linkdata_mask_height 32 #define linkdata_mask_x_hot 1 #define linkdata_mask_y_hot 1 -static char linkdata_mask_bits[] = { +static unsigned char linkdata_mask_bits[] = { 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, diff --git a/vcl/unx/source/dtrans/movedata_curs.h b/vcl/unx/source/dtrans/movedata_curs.h index cbc3b6b73c1e..642bbd176e4b 100644 --- a/vcl/unx/source/dtrans/movedata_curs.h +++ b/vcl/unx/source/dtrans/movedata_curs.h @@ -29,7 +29,7 @@ #define movedata_curs_height 32 #define movedata_curs_x_hot 1 #define movedata_curs_y_hot 1 -static char movedata_curs_bits[] = { +static unsigned char movedata_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, diff --git a/vcl/unx/source/dtrans/movedata_mask.h b/vcl/unx/source/dtrans/movedata_mask.h index 716e626f778b..f06c80f1728c 100644 --- a/vcl/unx/source/dtrans/movedata_mask.h +++ b/vcl/unx/source/dtrans/movedata_mask.h @@ -29,7 +29,7 @@ #define movedata_mask_height 32 #define movedata_mask_x_hot 1 #define movedata_mask_y_hot 1 -static char movedata_mask_bits[] = { +static unsigned char movedata_mask_bits[] = { 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, diff --git a/vcl/unx/source/dtrans/nodrop_curs.h b/vcl/unx/source/dtrans/nodrop_curs.h index 96b0c51178e6..5c501d3876c4 100644 --- a/vcl/unx/source/dtrans/nodrop_curs.h +++ b/vcl/unx/source/dtrans/nodrop_curs.h @@ -29,7 +29,7 @@ #define nodrop_curs_height 32 #define nodrop_curs_x_hot 9 #define nodrop_curs_y_hot 9 -static char nodrop_curs_bits[] = { +static unsigned char nodrop_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00, 0x7c, 0xf8, 0x00, 0x00, 0x1c, 0xfc, 0x00, 0x00, 0x1e, 0xfe, 0x01, 0x00, 0x0e, 0xdf, 0x01, 0x00, 0x8e, 0xcf, 0x01, 0x00, diff --git a/vcl/unx/source/dtrans/nodrop_mask.h b/vcl/unx/source/dtrans/nodrop_mask.h index b5bd992c7a4c..bd315dc28df1 100644 --- a/vcl/unx/source/dtrans/nodrop_mask.h +++ b/vcl/unx/source/dtrans/nodrop_mask.h @@ -29,7 +29,7 @@ #define nodrop_mask_height 32 #define nodrop_mask_x_hot 9 #define nodrop_mask_y_hot 9 -static char nodrop_mask_bits[] = { +static unsigned char nodrop_mask_bits[] = { 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00, 0xfc, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x7e, 0xfe, 0x01, 0x00, 0x3f, 0xff, 0x03, 0x00, 0x9f, 0xff, 0x03, 0x00, 0xdf, 0xff, 0x03, 0x00, diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/source/fontmanager/fontmanager.cxx index cb43af0351c6..623ac6d0db30 100644 --- a/vcl/unx/source/fontmanager/fontmanager.cxx +++ b/vcl/unx/source/fontmanager/fontmanager.cxx @@ -705,7 +705,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr } #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "found %d/%d kern pairs for %s\n", + fprintf( stderr, "found %" SAL_PRI_SIZET "u/%" SAL_PRI_SIZET "u kern pairs for %s\n", m_pMetrics->m_aXKernPairs.size(), m_pMetrics->m_aYKernPairs.size(), OUStringToOString( pProvider->getString( ATOM_FAMILYNAME, m_nFamilyName ), RTL_TEXTENCODING_MS_1252 ).getStr() ); @@ -2405,7 +2405,7 @@ void PrintFontManager::initialize() #if OSL_DEBUG_LEVEL > 1 aStep3 = times( &tms ); - fprintf( stderr, "PrintFontManager::initialize: collected %d fonts (%d builtin, %d cached)\n", m_aFonts.size(), nBuiltinFonts, nCached ); + fprintf( stderr, "PrintFontManager::initialize: collected %" SAL_PRI_SIZET "u fonts (%d builtin, %d cached)\n", m_aFonts.size(), nBuiltinFonts, nCached ); double fTick = (double)sysconf( _SC_CLK_TCK ); fprintf( stderr, "Step 1 took %lf seconds\n", (double)(aStep1 - aStart)/fTick ); fprintf( stderr, "Step 2 took %lf seconds\n", (double)(aStep2 - aStep1)/fTick ); diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx index 136bb753d219..596c9d04a1c4 100644 --- a/vcl/unx/source/gdi/salprnpsp.cxx +++ b/vcl/unx/source/gdi/salprnpsp.cxx @@ -976,7 +976,7 @@ BOOL PspSalPrinter::StartJob( nMode = S_IRUSR | S_IWUSR; ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; - it = pJobSetup->maValueMap.find( ::rtl::OUString::createFromAscii( "FAX#" ) ); + it = pJobSetup->maValueMap.find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAX#")) ); if( it != pJobSetup->maValueMap.end() ) m_aFaxNr = it->second; diff --git a/vcl/unx/source/inc/airbrush_curs.h b/vcl/unx/source/inc/airbrush_curs.h index 3a5555f34384..a78666bb243d 100644 --- a/vcl/unx/source/inc/airbrush_curs.h +++ b/vcl/unx/source/inc/airbrush_curs.h @@ -29,7 +29,7 @@ #define airbrush_curs_height 32 #define airbrush_curs_x_hot 5 #define airbrush_curs_y_hot 22 -static char airbrush_curs_bits[] = { +static unsigned char airbrush_curs_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00, 0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00, diff --git a/vcl/unx/source/inc/airbrush_mask.h b/vcl/unx/source/inc/airbrush_mask.h index 35e55b834f77..82d70f05bbb7 100644 --- a/vcl/unx/source/inc/airbrush_mask.h +++ b/vcl/unx/source/inc/airbrush_mask.h @@ -29,7 +29,7 @@ #define airbrush_mask_height 32 #define airbrush_mask_x_hot 5 #define airbrush_mask_y_hot 22 -static char airbrush_mask_bits[] = { +static unsigned char airbrush_mask_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00, 0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00, diff --git a/vcl/unx/source/inc/ase_curs.h b/vcl/unx/source/inc/ase_curs.h index bd968c4e6f17..0a7c9bfd29c2 100644 --- a/vcl/unx/source/inc/ase_curs.h +++ b/vcl/unx/source/inc/ase_curs.h @@ -29,7 +29,7 @@ #define ase_curs_height 32 #define ase_curs_x_hot 19 #define ase_curs_y_hot 16 -static char ase_curs_bits[] = { +static unsigned char ase_curs_bits[] = { 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, diff --git a/vcl/unx/source/inc/ase_mask.h b/vcl/unx/source/inc/ase_mask.h index 6f765158c400..4ded0773a72a 100644 --- a/vcl/unx/source/inc/ase_mask.h +++ b/vcl/unx/source/inc/ase_mask.h @@ -29,7 +29,7 @@ #define ase_mask_height 32 #define ase_mask_x_hot 19 #define ase_mask_y_hot 16 -static char ase_mask_bits[] = { +static unsigned char ase_mask_bits[] = { 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, diff --git a/vcl/unx/source/inc/asn_curs.h b/vcl/unx/source/inc/asn_curs.h index 81f5b0bfee63..68ab521de1a5 100644 --- a/vcl/unx/source/inc/asn_curs.h +++ b/vcl/unx/source/inc/asn_curs.h @@ -29,7 +29,7 @@ #define asn_curs_height 32 #define asn_curs_x_hot 16 #define asn_curs_y_hot 12 -static char asn_curs_bits[] = { +static unsigned char asn_curs_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x80,0x03, 0x00,0x00,0xc0,0x07,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,0x20, 0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00, diff --git a/vcl/unx/source/inc/asn_mask.h b/vcl/unx/source/inc/asn_mask.h index 10f6fb7ff0c9..0e7a30e5a190 100644 --- a/vcl/unx/source/inc/asn_mask.h +++ b/vcl/unx/source/inc/asn_mask.h @@ -29,7 +29,7 @@ #define asn_mask_height 32 #define asn_mask_x_hot 16 #define asn_mask_y_hot 12 -static char asn_mask_bits[] = { +static unsigned char asn_mask_bits[] = { 0x00,0x00,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07, 0x00,0x00,0xe0,0x0f,0x00,0x00,0xe0,0x0f,0x00,0x00,0xf0,0x1f,0x00,0x00,0xf0, 0x1f,0x00,0x00,0x20,0x08,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00, diff --git a/vcl/unx/source/inc/asne_curs.h b/vcl/unx/source/inc/asne_curs.h index f01ca8814b76..8ba58f9639e2 100644 --- a/vcl/unx/source/inc/asne_curs.h +++ b/vcl/unx/source/inc/asne_curs.h @@ -29,7 +29,7 @@ #define asne_curs_height 32 #define asne_curs_x_hot 21 #define asne_curs_y_hot 10 -static char asne_curs_bits[] = { +static unsigned char asne_curs_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x80, 0x3f,0x00,0x00,0xc0,0x3f,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x1c,0x00,0x00, 0x00,0x1c,0x00,0x00,0x70,0x18,0x00,0x00,0xf8,0x08,0x00,0x00,0xf8,0x00,0x00, diff --git a/vcl/unx/source/inc/asne_mask.h b/vcl/unx/source/inc/asne_mask.h index 62fc2d1c94e6..6408f127b1f4 100644 --- a/vcl/unx/source/inc/asne_mask.h +++ b/vcl/unx/source/inc/asne_mask.h @@ -29,7 +29,7 @@ #define asne_mask_height 32 #define asne_mask_x_hot 21 #define asne_mask_y_hot 10 -static char asne_mask_bits[] = { +static unsigned char asne_mask_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0x00,0x80,0x7f,0x00,0x00,0xc0, 0x7f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xc0,0x7f,0x00,0x00,0x00,0x3f,0x00,0x00, 0x70,0x3e,0x00,0x00,0xf8,0x3c,0x00,0x00,0xfc,0x1d,0x00,0x00,0xfc,0x09,0x00, diff --git a/vcl/unx/source/inc/asns_curs.h b/vcl/unx/source/inc/asns_curs.h index db0ff615e309..3e039241ba61 100644 --- a/vcl/unx/source/inc/asns_curs.h +++ b/vcl/unx/source/inc/asns_curs.h @@ -29,7 +29,7 @@ #define asns_curs_height 32 #define asns_curs_x_hot 15 #define asns_curs_y_hot 15 -static char asns_curs_bits[] = { +static unsigned char asns_curs_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0, 0x03,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00,0x10,0x04,0x00,0x00, diff --git a/vcl/unx/source/inc/asns_mask.h b/vcl/unx/source/inc/asns_mask.h index 2d8c689c64a8..2a753501bc9d 100644 --- a/vcl/unx/source/inc/asns_mask.h +++ b/vcl/unx/source/inc/asns_mask.h @@ -29,7 +29,7 @@ #define asns_mask_height 32 #define asns_mask_x_hot 15 #define asns_mask_y_hot 15 -static char asns_mask_bits[] = { +static unsigned char asns_mask_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00, 0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0, 0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x0f,0x00,0x00,0xf8,0x0f,0x00,0x00, diff --git a/vcl/unx/source/inc/asnswe_curs.h b/vcl/unx/source/inc/asnswe_curs.h index 276d1dbce8ce..599511e1d433 100644 --- a/vcl/unx/source/inc/asnswe_curs.h +++ b/vcl/unx/source/inc/asnswe_curs.h @@ -29,7 +29,7 @@ #define asnswe_curs_height 32 #define asnswe_curs_x_hot 15 #define asnswe_curs_y_hot 15 -static char asnswe_curs_bits[] = { +static unsigned char asnswe_curs_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0, 0x03,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00,0x10,0x04,0x00,0x00, diff --git a/vcl/unx/source/inc/asnswe_mask.h b/vcl/unx/source/inc/asnswe_mask.h index 6e1f22650b1e..a0bcb3c5310e 100644 --- a/vcl/unx/source/inc/asnswe_mask.h +++ b/vcl/unx/source/inc/asnswe_mask.h @@ -29,7 +29,7 @@ #define asnswe_mask_height 32 #define asnswe_mask_x_hot 15 #define asnswe_mask_y_hot 15 -static char asnswe_mask_bits[] = { +static unsigned char asnswe_mask_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00, 0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0, 0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x0f,0x00,0x00,0xf8,0x0f,0x00,0x00, diff --git a/vcl/unx/source/inc/asnw_curs.h b/vcl/unx/source/inc/asnw_curs.h index 706e021463c9..139cd4e2ea5e 100644 --- a/vcl/unx/source/inc/asnw_curs.h +++ b/vcl/unx/source/inc/asnw_curs.h @@ -29,7 +29,7 @@ #define asnw_curs_height 32 #define asnw_curs_x_hot 10 #define asnw_curs_y_hot 10 -static char asnw_curs_bits[] = { +static unsigned char asnw_curs_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0xfc,0x01,0x00, 0x00,0xfc,0x03,0x00,0x00,0xfc,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x38,0x00, 0x00,0x00,0x18,0x0e,0x00,0x00,0x10,0x1f,0x00,0x00,0x00,0x1f,0x00,0x00,0x00, diff --git a/vcl/unx/source/inc/asnw_mask.h b/vcl/unx/source/inc/asnw_mask.h index 189dab48fc82..6f7da9a88661 100644 --- a/vcl/unx/source/inc/asnw_mask.h +++ b/vcl/unx/source/inc/asnw_mask.h @@ -29,7 +29,7 @@ #define asnw_mask_height 32 #define asnw_mask_x_hot 10 #define asnw_mask_y_hot 10 -static char asnw_mask_bits[] = { +static unsigned char asnw_mask_bits[] = { 0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0xfe,0x01,0x00,0x00,0xfe,0x03,0x00, 0x00,0xfe,0x07,0x00,0x00,0xfe,0x03,0x00,0x00,0xfc,0x00,0x00,0x00,0x7c,0x0e, 0x00,0x00,0x3c,0x1f,0x00,0x00,0xb8,0x3f,0x00,0x00,0x90,0x3f,0x00,0x00,0x80, diff --git a/vcl/unx/source/inc/ass_curs.h b/vcl/unx/source/inc/ass_curs.h index f7cd7e7d5110..ea98bf5b0404 100644 --- a/vcl/unx/source/inc/ass_curs.h +++ b/vcl/unx/source/inc/ass_curs.h @@ -29,7 +29,7 @@ #define ass_curs_height 32 #define ass_curs_x_hot 15 #define ass_curs_y_hot 19 -static char ass_curs_bits[] = { +static unsigned char ass_curs_bits[] = { 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, diff --git a/vcl/unx/source/inc/ass_mask.h b/vcl/unx/source/inc/ass_mask.h index 6ac71c7b32a5..ccb91615d34a 100644 --- a/vcl/unx/source/inc/ass_mask.h +++ b/vcl/unx/source/inc/ass_mask.h @@ -29,7 +29,7 @@ #define ass_mask_height 32 #define ass_mask_x_hot 15 #define ass_mask_y_hot 19 -static char ass_mask_bits[] = { +static unsigned char ass_mask_bits[] = { 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, diff --git a/vcl/unx/source/inc/asse_curs.h b/vcl/unx/source/inc/asse_curs.h index 1dd325ac0606..0df55658c10a 100644 --- a/vcl/unx/source/inc/asse_curs.h +++ b/vcl/unx/source/inc/asse_curs.h @@ -29,7 +29,7 @@ #define asse_curs_height 32 #define asse_curs_x_hot 21 #define asse_curs_y_hot 21 -static char asse_curs_bits[] = { +static unsigned char asse_curs_bits[] = { 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, diff --git a/vcl/unx/source/inc/asse_mask.h b/vcl/unx/source/inc/asse_mask.h index 7685aaa21c17..1835e939f275 100644 --- a/vcl/unx/source/inc/asse_mask.h +++ b/vcl/unx/source/inc/asse_mask.h @@ -29,7 +29,7 @@ #define asse_mask_height 32 #define asse_mask_x_hot 21 #define asse_mask_y_hot 21 -static char asse_mask_bits[] = { +static unsigned char asse_mask_bits[] = { 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, diff --git a/vcl/unx/source/inc/assw_curs.h b/vcl/unx/source/inc/assw_curs.h index 1f8d53ff9b72..5956aa5bf40b 100644 --- a/vcl/unx/source/inc/assw_curs.h +++ b/vcl/unx/source/inc/assw_curs.h @@ -29,7 +29,7 @@ #define assw_curs_height 32 #define assw_curs_x_hot 21 #define assw_curs_y_hot 21 -static char assw_curs_bits[] = { +static unsigned char assw_curs_bits[] = { 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, diff --git a/vcl/unx/source/inc/assw_mask.h b/vcl/unx/source/inc/assw_mask.h index 243c62c25e10..3023b2a6061f 100644 --- a/vcl/unx/source/inc/assw_mask.h +++ b/vcl/unx/source/inc/assw_mask.h @@ -29,7 +29,7 @@ #define assw_mask_height 32 #define assw_mask_x_hot 21 #define assw_mask_y_hot 21 -static char assw_mask_bits[] = { +static unsigned char assw_mask_bits[] = { 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, diff --git a/vcl/unx/source/inc/asw_curs.h b/vcl/unx/source/inc/asw_curs.h index 80f741496bae..8064570cb8fe 100644 --- a/vcl/unx/source/inc/asw_curs.h +++ b/vcl/unx/source/inc/asw_curs.h @@ -29,7 +29,7 @@ #define asw_curs_height 32 #define asw_curs_x_hot 12 #define asw_curs_y_hot 15 -static char asw_curs_bits[] = { +static unsigned char asw_curs_bits[] = { 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, diff --git a/vcl/unx/source/inc/asw_mask.h b/vcl/unx/source/inc/asw_mask.h index 18765d5fc452..245c42e7d790 100644 --- a/vcl/unx/source/inc/asw_mask.h +++ b/vcl/unx/source/inc/asw_mask.h @@ -29,7 +29,7 @@ #define asw_mask_height 32 #define asw_mask_x_hot 12 #define asw_mask_y_hot 15 -static char asw_mask_bits[] = { +static unsigned char asw_mask_bits[] = { 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,0xc0, diff --git a/vcl/unx/source/inc/aswe_curs.h b/vcl/unx/source/inc/aswe_curs.h index b2965e42f4a2..ed83d450c269 100644 --- a/vcl/unx/source/inc/aswe_curs.h +++ b/vcl/unx/source/inc/aswe_curs.h @@ -29,7 +29,7 @@ #define aswe_curs_height 32 #define aswe_curs_x_hot 15 #define aswe_curs_y_hot 15 -static char aswe_curs_bits[] = { +static unsigned char aswe_curs_bits[] = { 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, diff --git a/vcl/unx/source/inc/aswe_mask.h b/vcl/unx/source/inc/aswe_mask.h index 76c73193d35f..d2a97d7fa4c8 100644 --- a/vcl/unx/source/inc/aswe_mask.h +++ b/vcl/unx/source/inc/aswe_mask.h @@ -29,7 +29,7 @@ #define aswe_mask_height 32 #define aswe_mask_x_hot 15 #define aswe_mask_y_hot 15 -static char aswe_mask_bits[] = { +static unsigned char aswe_mask_bits[] = { 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, diff --git a/vcl/unx/source/inc/chain_curs.h b/vcl/unx/source/inc/chain_curs.h index 77a1dd23d664..ea319fb6b128 100644 --- a/vcl/unx/source/inc/chain_curs.h +++ b/vcl/unx/source/inc/chain_curs.h @@ -29,7 +29,7 @@ #define chain_curs_height 32 #define chain_curs_x_hot 0 #define chain_curs_y_hot 2 -static char chain_curs_bits[] = { +static unsigned char chain_curs_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x03,0x00,0x00, 0x00,0x05,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x21,0x00, 0x00,0x00,0x41,0x00,0x00,0x00,0x81,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x01, diff --git a/vcl/unx/source/inc/chain_mask.h b/vcl/unx/source/inc/chain_mask.h index e06b038d19be..688835ecbd3e 100644 --- a/vcl/unx/source/inc/chain_mask.h +++ b/vcl/unx/source/inc/chain_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define chain_mask_width 32 #define chain_mask_height 32 -static char chain_mask_bits[] = { +static unsigned char chain_mask_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x03,0x00,0x00, 0x00,0x07,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x3f,0x00, 0x00,0x00,0x7f,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0xff, diff --git a/vcl/unx/source/inc/chainnot_curs.h b/vcl/unx/source/inc/chainnot_curs.h index ae695e69fd85..e327586e3110 100644 --- a/vcl/unx/source/inc/chainnot_curs.h +++ b/vcl/unx/source/inc/chainnot_curs.h @@ -29,7 +29,7 @@ #define chainnot_curs_height 32 #define chainnot_curs_x_hot 2 #define chainnot_curs_y_hot 2 -static char chainnot_curs_bits[] = { +static unsigned char chainnot_curs_bits[] = { 0x00,0x00,0x00,0x00,0x80,0x1f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xf0,0xf0,0x00, 0x00,0x38,0xc0,0x01,0x00,0x7c,0x80,0x03,0x00,0xec,0x00,0x03,0x00,0xce,0x01, 0x07,0x00,0x86,0x03,0x06,0x00,0x06,0x07,0x06,0x00,0x06,0x0e,0x06,0x00,0x06, diff --git a/vcl/unx/source/inc/chainnot_mask.h b/vcl/unx/source/inc/chainnot_mask.h index b5311f762fec..6666599ad64c 100644 --- a/vcl/unx/source/inc/chainnot_mask.h +++ b/vcl/unx/source/inc/chainnot_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define chainnot_mask_width 32 #define chainnot_mask_height 32 -static char chainnot_mask_bits[] = { +static unsigned char chainnot_mask_bits[] = { 0x80,0x1f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xf0,0xff,0x00,0x00,0xf8,0xff,0x01, 0x00,0xfc,0xf0,0x03,0x00,0xfe,0xc0,0x07,0x00,0xfe,0x81,0x07,0x00,0xff,0x83, 0x0f,0x00,0xcf,0x07,0x0f,0x00,0x8f,0x0f,0x0f,0x00,0x0f,0x1f,0x0f,0x00,0x0f, diff --git a/vcl/unx/source/inc/chart_curs.h b/vcl/unx/source/inc/chart_curs.h index 9210452713cf..f1fbd5557ad4 100644 --- a/vcl/unx/source/inc/chart_curs.h +++ b/vcl/unx/source/inc/chart_curs.h @@ -29,7 +29,7 @@ #define chart_curs_height 32 #define chart_curs_x_hot 15 #define chart_curs_y_hot 16 -static char chart_curs_bits[] = { +static unsigned char chart_curs_bits[] = { 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,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00, diff --git a/vcl/unx/source/inc/chart_mask.h b/vcl/unx/source/inc/chart_mask.h index b8cf5a69f889..53f4ae125bda 100644 --- a/vcl/unx/source/inc/chart_mask.h +++ b/vcl/unx/source/inc/chart_mask.h @@ -29,7 +29,7 @@ #define chart_mask_height 32 #define chart_mask_x_hot 15 #define chart_mask_y_hot 16 -static char chart_mask_bits[] = { +static unsigned char chart_mask_bits[] = { 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,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00, diff --git a/vcl/unx/source/inc/copydata_curs.h b/vcl/unx/source/inc/copydata_curs.h index b7cb1557c7a3..a882a541a6d7 100644 --- a/vcl/unx/source/inc/copydata_curs.h +++ b/vcl/unx/source/inc/copydata_curs.h @@ -29,7 +29,7 @@ #define copydata_curs_height 32 #define copydata_curs_x_hot 1 #define copydata_curs_y_hot 1 -static char copydata_curs_bits[] = { +static unsigned char copydata_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, diff --git a/vcl/unx/source/inc/copydata_mask.h b/vcl/unx/source/inc/copydata_mask.h index d0cd40bc78fd..9cd73b08d106 100644 --- a/vcl/unx/source/inc/copydata_mask.h +++ b/vcl/unx/source/inc/copydata_mask.h @@ -29,7 +29,7 @@ #define copydata_mask_height 32 #define copydata_mask_x_hot 1 #define copydata_mask_y_hot 1 -static char copydata_mask_bits[] = { +static unsigned char copydata_mask_bits[] = { 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, diff --git a/vcl/unx/source/inc/copydlnk_curs.h b/vcl/unx/source/inc/copydlnk_curs.h index 8b3418ce7336..353297212083 100644 --- a/vcl/unx/source/inc/copydlnk_curs.h +++ b/vcl/unx/source/inc/copydlnk_curs.h @@ -29,7 +29,7 @@ #define copydlnk_curs_height 32 #define copydlnk_curs_x_hot 1 #define copydlnk_curs_y_hot 1 -static char copydlnk_curs_bits[] = { +static unsigned char copydlnk_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, diff --git a/vcl/unx/source/inc/copydlnk_mask.h b/vcl/unx/source/inc/copydlnk_mask.h index 3ad9e0a1b1e7..b6ac40003814 100644 --- a/vcl/unx/source/inc/copydlnk_mask.h +++ b/vcl/unx/source/inc/copydlnk_mask.h @@ -29,7 +29,7 @@ #define copydlnk_mask_height 32 #define copydlnk_mask_x_hot 1 #define copydlnk_mask_y_hot 1 -static char copydlnk_mask_bits[] = { +static unsigned char copydlnk_mask_bits[] = { 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, diff --git a/vcl/unx/source/inc/copyfile_curs.h b/vcl/unx/source/inc/copyfile_curs.h index 7ea2cb393944..da1366c71c6c 100644 --- a/vcl/unx/source/inc/copyfile_curs.h +++ b/vcl/unx/source/inc/copyfile_curs.h @@ -29,7 +29,7 @@ #define copyfile_curs_height 32 #define copyfile_curs_x_hot 9 #define copyfile_curs_y_hot 9 -static char copyfile_curs_bits[] = { +static unsigned char copyfile_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00, diff --git a/vcl/unx/source/inc/copyfile_mask.h b/vcl/unx/source/inc/copyfile_mask.h index 200d280c8cd8..5679ee8c2da8 100644 --- a/vcl/unx/source/inc/copyfile_mask.h +++ b/vcl/unx/source/inc/copyfile_mask.h @@ -29,7 +29,7 @@ #define copyfile_mask_height 32 #define copyfile_mask_x_hot 9 #define copyfile_mask_y_hot 9 -static char copyfile_mask_bits[] = { +static unsigned char copyfile_mask_bits[] = { 0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, diff --git a/vcl/unx/source/inc/copyfiles_curs.h b/vcl/unx/source/inc/copyfiles_curs.h index 4842d5fe72ad..c761f67ae370 100644 --- a/vcl/unx/source/inc/copyfiles_curs.h +++ b/vcl/unx/source/inc/copyfiles_curs.h @@ -29,7 +29,7 @@ #define copyfiles_curs_height 32 #define copyfiles_curs_x_hot 8 #define copyfiles_curs_y_hot 9 -static char copyfiles_curs_bits[] = { +static unsigned char copyfiles_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0xe0, 0x2f, 0x00, 0x00, 0xe8, 0x0f, 0x00, 0x00, 0xe8, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0x6a, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/copyfiles_mask.h b/vcl/unx/source/inc/copyfiles_mask.h index b1cbb4a10032..e6be0c5f105d 100644 --- a/vcl/unx/source/inc/copyfiles_mask.h +++ b/vcl/unx/source/inc/copyfiles_mask.h @@ -29,7 +29,7 @@ #define copyfiles_mask_height 32 #define copyfiles_mask_x_hot 8 #define copyfiles_mask_y_hot 9 -static char copyfiles_mask_bits[] = { +static unsigned char copyfiles_mask_bits[] = { 0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0xfc, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, diff --git a/vcl/unx/source/inc/copyflnk_curs.h b/vcl/unx/source/inc/copyflnk_curs.h index def45ab47a8b..9fdf78685365 100644 --- a/vcl/unx/source/inc/copyflnk_curs.h +++ b/vcl/unx/source/inc/copyflnk_curs.h @@ -29,7 +29,7 @@ #define copyflnk_curs_height 32 #define copyflnk_curs_x_hot 9 #define copyflnk_curs_y_hot 9 -static char copyflnk_curs_bits[] = { +static unsigned char copyflnk_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, diff --git a/vcl/unx/source/inc/copyflnk_mask.h b/vcl/unx/source/inc/copyflnk_mask.h index ac05eaa13a64..3b678164e0c6 100644 --- a/vcl/unx/source/inc/copyflnk_mask.h +++ b/vcl/unx/source/inc/copyflnk_mask.h @@ -29,7 +29,7 @@ #define copyflnk_mask_height 32 #define copyflnk_mask_x_hot 9 #define copyflnk_mask_y_hot 9 -static char copyflnk_mask_bits[] = { +static unsigned char copyflnk_mask_bits[] = { 0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, diff --git a/vcl/unx/source/inc/crook_curs.h b/vcl/unx/source/inc/crook_curs.h index 5cb4874c219f..97db1feaa394 100644 --- a/vcl/unx/source/inc/crook_curs.h +++ b/vcl/unx/source/inc/crook_curs.h @@ -29,7 +29,7 @@ #define crook_curs_height 32 #define crook_curs_x_hot 15 #define crook_curs_y_hot 14 -static char crook_curs_bits[] = { +static unsigned char crook_curs_bits[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7c, 0x3e, 0xff, 0x7f, 0xbb, 0xdd, 0xfe, diff --git a/vcl/unx/source/inc/crook_mask.h b/vcl/unx/source/inc/crook_mask.h index 97b47601ebe5..534ad6da53fd 100644 --- a/vcl/unx/source/inc/crook_mask.h +++ b/vcl/unx/source/inc/crook_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define crook_mask_width 32 #define crook_mask_height 32 -static char crook_mask_bits[] = { +static unsigned char crook_mask_bits[] = { 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, 0x83, 0xc1, 0x00, 0x80, 0xc7, 0xe3, 0x01, 0xc0, 0xef, 0xf7, 0x03, diff --git a/vcl/unx/source/inc/crop_curs.h b/vcl/unx/source/inc/crop_curs.h index 3e8424657453..5647de80b196 100644 --- a/vcl/unx/source/inc/crop_curs.h +++ b/vcl/unx/source/inc/crop_curs.h @@ -29,7 +29,7 @@ #define crop_curs_height 32 #define crop_curs_x_hot 9 #define crop_curs_y_hot 9 -static char crop_curs_bits[] = { +static unsigned char crop_curs_bits[] = { 0xff, 0x0f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff, 0x07, 0x60, 0xf8, 0xff, 0xf7, 0x6f, 0xfb, 0xff, 0xf7, 0x6f, 0xfb, 0xff, 0x37, 0x60, 0xf8, 0xff, 0xb7, 0x6f, 0xff, 0xff, 0xb7, 0x6f, 0xff, 0xff, diff --git a/vcl/unx/source/inc/crop_mask.h b/vcl/unx/source/inc/crop_mask.h index 84c37341918c..f7d3c87201c3 100644 --- a/vcl/unx/source/inc/crop_mask.h +++ b/vcl/unx/source/inc/crop_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define crop_mask_width 32 #define crop_mask_height 32 -static char crop_mask_bits[] = { +static unsigned char crop_mask_bits[] = { 0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, 0x01, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xf8, 0x01, 0x00, diff --git a/vcl/unx/source/inc/detective_curs.h b/vcl/unx/source/inc/detective_curs.h index 181b6e0d3e28..b2e3e2a375b9 100644 --- a/vcl/unx/source/inc/detective_curs.h +++ b/vcl/unx/source/inc/detective_curs.h @@ -29,7 +29,7 @@ #define detective_curs_height 32 #define detective_curs_x_hot 12 #define detective_curs_y_hot 13 -static char detective_curs_bits[] = { +static unsigned char detective_curs_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x38,0x00, 0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c, 0x00,0x00,0x00,0x83,0x01,0x00,0x80,0x00,0x02,0x00,0x80,0x10,0x02,0x00,0x40, diff --git a/vcl/unx/source/inc/detective_mask.h b/vcl/unx/source/inc/detective_mask.h index db93906579a4..e731aff3c989 100644 --- a/vcl/unx/source/inc/detective_mask.h +++ b/vcl/unx/source/inc/detective_mask.h @@ -29,7 +29,7 @@ #define detective_mask_height 32 #define detective_mask_x_hot 12 #define detective_mask_y_hot 13 -static char detective_mask_bits[] = { +static unsigned char detective_mask_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x38,0x00, 0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c, 0x00,0x00,0x00,0xff,0x01,0x00,0x80,0xff,0x03,0x00,0x80,0xff,0x03,0x00,0xc0, diff --git a/vcl/unx/source/inc/drawarc_curs.h b/vcl/unx/source/inc/drawarc_curs.h index 1db1b3a61840..08a3e324dae6 100644 --- a/vcl/unx/source/inc/drawarc_curs.h +++ b/vcl/unx/source/inc/drawarc_curs.h @@ -29,7 +29,7 @@ #define drawarc_curs_height 32 #define drawarc_curs_x_hot 7 #define drawarc_curs_y_hot 7 -static char drawarc_curs_bits[] = { +static unsigned char drawarc_curs_bits[] = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawarc_mask.h b/vcl/unx/source/inc/drawarc_mask.h index 9c5ddd61b471..b4e42dc824c6 100644 --- a/vcl/unx/source/inc/drawarc_mask.h +++ b/vcl/unx/source/inc/drawarc_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawarc_mask_width 32 #define drawarc_mask_height 32 -static char drawarc_mask_bits[] = { +static unsigned char drawarc_mask_bits[] = { 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawbezier_curs.h b/vcl/unx/source/inc/drawbezier_curs.h index ad96981c9bb3..a84a2da70333 100644 --- a/vcl/unx/source/inc/drawbezier_curs.h +++ b/vcl/unx/source/inc/drawbezier_curs.h @@ -29,7 +29,7 @@ #define drawbezier_curs_height 32 #define drawbezier_curs_x_hot 7 #define drawbezier_curs_y_hot 7 -static char drawbezier_curs_bits[] = { +static unsigned char drawbezier_curs_bits[] = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawbezier_mask.h b/vcl/unx/source/inc/drawbezier_mask.h index 791d170d4045..13bac21a4594 100644 --- a/vcl/unx/source/inc/drawbezier_mask.h +++ b/vcl/unx/source/inc/drawbezier_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawbezier_mask_width 32 #define drawbezier_mask_height 32 -static char drawbezier_mask_bits[] = { +static unsigned char drawbezier_mask_bits[] = { 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawcaption_curs.h b/vcl/unx/source/inc/drawcaption_curs.h index 45d14a75d18a..9905c240002d 100644 --- a/vcl/unx/source/inc/drawcaption_curs.h +++ b/vcl/unx/source/inc/drawcaption_curs.h @@ -29,7 +29,7 @@ #define drawcaption_curs_height 32 #define drawcaption_curs_x_hot 8 #define drawcaption_curs_y_hot 8 -static char drawcaption_curs_bits[] = { +static unsigned char drawcaption_curs_bits[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x81, 0x02, 0xff, 0xff, diff --git a/vcl/unx/source/inc/drawcaption_mask.h b/vcl/unx/source/inc/drawcaption_mask.h index 87c6ff83916c..98c0bc5aaf38 100644 --- a/vcl/unx/source/inc/drawcaption_mask.h +++ b/vcl/unx/source/inc/drawcaption_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawcaption_mask_width 32 #define drawcaption_mask_height 32 -static char drawcaption_mask_bits[] = { +static unsigned char drawcaption_mask_bits[] = { 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, diff --git a/vcl/unx/source/inc/drawcirclecut_curs.h b/vcl/unx/source/inc/drawcirclecut_curs.h index 1554aeb08090..c36720ad659e 100644 --- a/vcl/unx/source/inc/drawcirclecut_curs.h +++ b/vcl/unx/source/inc/drawcirclecut_curs.h @@ -29,7 +29,7 @@ #define drawcirclecut_curs_height 32 #define drawcirclecut_curs_x_hot 7 #define drawcirclecut_curs_y_hot 7 -static char drawcirclecut_curs_bits[] = { +static unsigned char drawcirclecut_curs_bits[] = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawcirclecut_mask.h b/vcl/unx/source/inc/drawcirclecut_mask.h index 3e5ebe03e164..885c210bda34 100644 --- a/vcl/unx/source/inc/drawcirclecut_mask.h +++ b/vcl/unx/source/inc/drawcirclecut_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawcirclecut_mask_width 32 #define drawcirclecut_mask_height 32 -static char drawcirclecut_mask_bits[] = { +static unsigned char drawcirclecut_mask_bits[] = { 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawconnect_curs.h b/vcl/unx/source/inc/drawconnect_curs.h index 2f657f1ba426..40f4e6dc3905 100644 --- a/vcl/unx/source/inc/drawconnect_curs.h +++ b/vcl/unx/source/inc/drawconnect_curs.h @@ -29,7 +29,7 @@ #define drawconnect_curs_height 32 #define drawconnect_curs_x_hot 7 #define drawconnect_curs_y_hot 7 -static char drawconnect_curs_bits[] = { +static unsigned char drawconnect_curs_bits[] = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawconnect_mask.h b/vcl/unx/source/inc/drawconnect_mask.h index 6b48aa5c8945..270cdbac3fe6 100644 --- a/vcl/unx/source/inc/drawconnect_mask.h +++ b/vcl/unx/source/inc/drawconnect_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawconnect_mask_width 32 #define drawconnect_mask_height 32 -static char drawconnect_mask_bits[] = { +static unsigned char drawconnect_mask_bits[] = { 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawcrook_curs.h b/vcl/unx/source/inc/drawcrook_curs.h index 8af64195ed51..e89e91322432 100644 --- a/vcl/unx/source/inc/drawcrook_curs.h +++ b/vcl/unx/source/inc/drawcrook_curs.h @@ -29,7 +29,7 @@ #define drawcrook_curs_height 32 #define drawcrook_curs_x_hot 15 #define drawcrook_curs_y_hot 14 -static char drawcrook_curs_bits[] = { +static unsigned char drawcrook_curs_bits[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7c, 0x3e, 0xff, 0x7f, 0xbb, 0xdd, 0xfe, diff --git a/vcl/unx/source/inc/drawcrook_mask.h b/vcl/unx/source/inc/drawcrook_mask.h index 037889ade041..b42d2591d123 100644 --- a/vcl/unx/source/inc/drawcrook_mask.h +++ b/vcl/unx/source/inc/drawcrook_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawcrook_mask_width 32 #define drawcrook_mask_height 32 -static char drawcrook_mask_bits[] = { +static unsigned char drawcrook_mask_bits[] = { 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, 0x83, 0xc1, 0x00, 0x80, 0xc7, 0xe3, 0x01, 0xc0, 0xef, 0xf7, 0x03, diff --git a/vcl/unx/source/inc/drawcrop_curs.h b/vcl/unx/source/inc/drawcrop_curs.h index e356a91102d5..903c5b314418 100644 --- a/vcl/unx/source/inc/drawcrop_curs.h +++ b/vcl/unx/source/inc/drawcrop_curs.h @@ -29,7 +29,7 @@ #define drawcrop_curs_height 32 #define drawcrop_curs_x_hot 9 #define drawcrop_curs_y_hot 9 -static char drawcrop_curs_bits[] = { +static unsigned char drawcrop_curs_bits[] = { 0xff, 0x0f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff, 0x07, 0x60, 0xf8, 0xff, 0xf7, 0x6f, 0xfb, 0xff, 0xf7, 0x6f, 0xfb, 0xff, 0x37, 0x60, 0xf8, 0xff, 0xb7, 0x6f, 0xff, 0xff, 0xb7, 0x6f, 0xff, 0xff, diff --git a/vcl/unx/source/inc/drawcrop_mask.h b/vcl/unx/source/inc/drawcrop_mask.h index 7bfb31382793..eea6b4448146 100644 --- a/vcl/unx/source/inc/drawcrop_mask.h +++ b/vcl/unx/source/inc/drawcrop_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawcrop_mask_width 32 #define drawcrop_mask_height 32 -static char drawcrop_mask_bits[] = { +static unsigned char drawcrop_mask_bits[] = { 0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, 0x01, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xf8, 0x01, 0x00, diff --git a/vcl/unx/source/inc/drawellipse_curs.h b/vcl/unx/source/inc/drawellipse_curs.h index 32d2259dc7d7..5928139b81f3 100644 --- a/vcl/unx/source/inc/drawellipse_curs.h +++ b/vcl/unx/source/inc/drawellipse_curs.h @@ -29,7 +29,7 @@ #define drawellipse_curs_height 32 #define drawellipse_curs_x_hot 7 #define drawellipse_curs_y_hot 7 -static char drawellipse_curs_bits[] = { +static unsigned char drawellipse_curs_bits[] = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawellipse_mask.h b/vcl/unx/source/inc/drawellipse_mask.h index 5218ac419c97..72ceedfb57ee 100644 --- a/vcl/unx/source/inc/drawellipse_mask.h +++ b/vcl/unx/source/inc/drawellipse_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawellipse_mask_width 32 #define drawellipse_mask_height 32 -static char drawellipse_mask_bits[] = { +static unsigned char drawellipse_mask_bits[] = { 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawfreehand_curs.h b/vcl/unx/source/inc/drawfreehand_curs.h index 7e577fe08940..644d5bbb639d 100644 --- a/vcl/unx/source/inc/drawfreehand_curs.h +++ b/vcl/unx/source/inc/drawfreehand_curs.h @@ -29,7 +29,7 @@ #define drawfreehand_curs_height 32 #define drawfreehand_curs_x_hot 8 #define drawfreehand_curs_y_hot 8 -static char drawfreehand_curs_bits[] = { +static unsigned char drawfreehand_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xfd, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawfreehand_mask.h b/vcl/unx/source/inc/drawfreehand_mask.h index ed06a873d0e2..959a54e827fe 100644 --- a/vcl/unx/source/inc/drawfreehand_mask.h +++ b/vcl/unx/source/inc/drawfreehand_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawfreehand_mask_width 32 #define drawfreehand_mask_height 32 -static char drawfreehand_mask_bits[] = { +static unsigned char drawfreehand_mask_bits[] = { 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, diff --git a/vcl/unx/source/inc/drawline_curs.h b/vcl/unx/source/inc/drawline_curs.h index 1d9e3f642704..84f78ccec876 100644 --- a/vcl/unx/source/inc/drawline_curs.h +++ b/vcl/unx/source/inc/drawline_curs.h @@ -29,7 +29,7 @@ #define drawline_curs_height 32 #define drawline_curs_x_hot 7 #define drawline_curs_y_hot 7 -static char drawline_curs_bits[] = { +static unsigned char drawline_curs_bits[] = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawline_mask.h b/vcl/unx/source/inc/drawline_mask.h index b9e66306d964..80784ca860b6 100644 --- a/vcl/unx/source/inc/drawline_mask.h +++ b/vcl/unx/source/inc/drawline_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawline_mask_width 32 #define drawline_mask_height 32 -static char drawline_mask_bits[] = { +static unsigned char drawline_mask_bits[] = { 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 0xbf, 0xfe, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawmirror_curs.h b/vcl/unx/source/inc/drawmirror_curs.h index 4c93e574e2f6..b68907138e42 100644 --- a/vcl/unx/source/inc/drawmirror_curs.h +++ b/vcl/unx/source/inc/drawmirror_curs.h @@ -29,7 +29,7 @@ #define drawmirror_curs_height 32 #define drawmirror_curs_x_hot 14 #define drawmirror_curs_y_hot 12 -static char drawmirror_curs_bits[] = { +static unsigned char drawmirror_curs_bits[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0x03, 0xf8, 0xf5, 0xff, 0xfb, 0xfb, 0xee, 0xff, 0x0b, 0xfa, 0xf5, 0xff, 0xeb, 0xfa, 0xfa, 0xff, 0xeb, 0xfa, 0xfa, 0xff, 0xeb, 0x7a, 0xfd, 0xff, 0xeb, 0x7a, 0xfd, 0xff, diff --git a/vcl/unx/source/inc/drawmirror_mask.h b/vcl/unx/source/inc/drawmirror_mask.h index cfcd0f7abf3b..231f109a24ae 100644 --- a/vcl/unx/source/inc/drawmirror_mask.h +++ b/vcl/unx/source/inc/drawmirror_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawmirror_mask_width 32 #define drawmirror_mask_height 32 -static char drawmirror_mask_bits[] = { +static unsigned char drawmirror_mask_bits[] = { 0x00, 0x00, 0x04, 0x00, 0xfe, 0x0f, 0x0e, 0x00, 0xfe, 0x0f, 0x1f, 0x00, 0xfe, 0x8f, 0x3f, 0x00, 0xfe, 0x0f, 0x1f, 0x00, 0xfe, 0x8f, 0x0f, 0x00, 0xbe, 0x8f, 0x0f, 0x00, 0xbe, 0xcf, 0x07, 0x00, 0xbe, 0xcf, 0x87, 0x00, diff --git a/vcl/unx/source/inc/drawpie_curs.h b/vcl/unx/source/inc/drawpie_curs.h index 26dae0f57de8..1cc5933c88b3 100644 --- a/vcl/unx/source/inc/drawpie_curs.h +++ b/vcl/unx/source/inc/drawpie_curs.h @@ -29,7 +29,7 @@ #define drawpie_curs_height 32 #define drawpie_curs_x_hot 7 #define drawpie_curs_y_hot 7 -static char drawpie_curs_bits[] = { +static unsigned char drawpie_curs_bits[] = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawpie_mask.h b/vcl/unx/source/inc/drawpie_mask.h index 403321f7648d..880be6043497 100644 --- a/vcl/unx/source/inc/drawpie_mask.h +++ b/vcl/unx/source/inc/drawpie_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawpie_mask_width 32 #define drawpie_mask_height 32 -static char drawpie_mask_bits[] = { +static unsigned char drawpie_mask_bits[] = { 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawpolygon_curs.h b/vcl/unx/source/inc/drawpolygon_curs.h index 40805ec5b857..a101b1bff576 100644 --- a/vcl/unx/source/inc/drawpolygon_curs.h +++ b/vcl/unx/source/inc/drawpolygon_curs.h @@ -29,7 +29,7 @@ #define drawpolygon_curs_height 32 #define drawpolygon_curs_x_hot 7 #define drawpolygon_curs_y_hot 7 -static char drawpolygon_curs_bits[] = { +static unsigned char drawpolygon_curs_bits[] = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawpolygon_mask.h b/vcl/unx/source/inc/drawpolygon_mask.h index 6f8eed316e70..660bee287c09 100644 --- a/vcl/unx/source/inc/drawpolygon_mask.h +++ b/vcl/unx/source/inc/drawpolygon_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawpolygon_mask_width 32 #define drawpolygon_mask_height 32 -static char drawpolygon_mask_bits[] = { +static unsigned char drawpolygon_mask_bits[] = { 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawrect_curs.h b/vcl/unx/source/inc/drawrect_curs.h index ac5d544122fd..553df540aa29 100644 --- a/vcl/unx/source/inc/drawrect_curs.h +++ b/vcl/unx/source/inc/drawrect_curs.h @@ -29,7 +29,7 @@ #define drawrect_curs_height 32 #define drawrect_curs_x_hot 7 #define drawrect_curs_y_hot 7 -static char drawrect_curs_bits[] = { +static unsigned char drawrect_curs_bits[] = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawrect_mask.h b/vcl/unx/source/inc/drawrect_mask.h index 03e765e0547a..3bb39e1d98a8 100644 --- a/vcl/unx/source/inc/drawrect_mask.h +++ b/vcl/unx/source/inc/drawrect_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawrect_mask_width 32 #define drawrect_mask_height 32 -static char drawrect_mask_bits[] = { +static unsigned char drawrect_mask_bits[] = { 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawtext_curs.h b/vcl/unx/source/inc/drawtext_curs.h index d33eb6860219..67726d6e5a2d 100644 --- a/vcl/unx/source/inc/drawtext_curs.h +++ b/vcl/unx/source/inc/drawtext_curs.h @@ -29,7 +29,7 @@ #define drawtext_curs_height 32 #define drawtext_curs_x_hot 8 #define drawtext_curs_y_hot 8 -static char drawtext_curs_bits[] = { +static unsigned char drawtext_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xfd, 0x00, 0x00, diff --git a/vcl/unx/source/inc/drawtext_mask.h b/vcl/unx/source/inc/drawtext_mask.h index 5f6d4bcfa453..ce1fc2c41053 100644 --- a/vcl/unx/source/inc/drawtext_mask.h +++ b/vcl/unx/source/inc/drawtext_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define drawtext_mask_width 32 #define drawtext_mask_height 32 -static char drawtext_mask_bits[] = { +static unsigned char drawtext_mask_bits[] = { 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00, diff --git a/vcl/unx/source/inc/fill_curs.h b/vcl/unx/source/inc/fill_curs.h index c08ae8a70f00..c8dfbb274f13 100644 --- a/vcl/unx/source/inc/fill_curs.h +++ b/vcl/unx/source/inc/fill_curs.h @@ -29,7 +29,7 @@ #define fill_curs_height 32 #define fill_curs_x_hot 10 #define fill_curs_y_hot 22 -static char fill_curs_bits[] = { +static unsigned char fill_curs_bits[] = { 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,0x03,0x00,0x00,0x80,0x02,0x00,0x00,0x5c,0x0c,0x00,0x00, diff --git a/vcl/unx/source/inc/fill_mask.h b/vcl/unx/source/inc/fill_mask.h index 5a1432dccdd1..32b25ae67660 100644 --- a/vcl/unx/source/inc/fill_mask.h +++ b/vcl/unx/source/inc/fill_mask.h @@ -29,7 +29,7 @@ #define fill_mask_height 32 #define fill_mask_x_hot 10 #define fill_mask_y_hot 22 -static char fill_mask_bits[] = { +static unsigned char fill_mask_bits[] = { 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,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xdc,0x0f,0x00,0x00, diff --git a/vcl/unx/source/inc/hshear_curs.h b/vcl/unx/source/inc/hshear_curs.h index 91a89ab99a04..edaa9fe7958b 100644 --- a/vcl/unx/source/inc/hshear_curs.h +++ b/vcl/unx/source/inc/hshear_curs.h @@ -29,7 +29,7 @@ #define hshear_curs_height 32 #define hshear_curs_x_hot 15 #define hshear_curs_y_hot 15 -static char hshear_curs_bits[] = { +static unsigned char hshear_curs_bits[] = { 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, diff --git a/vcl/unx/source/inc/hshear_mask.h b/vcl/unx/source/inc/hshear_mask.h index 15a6e92b412c..5c6f9a017e5a 100644 --- a/vcl/unx/source/inc/hshear_mask.h +++ b/vcl/unx/source/inc/hshear_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define hshear_mask_width 32 #define hshear_mask_height 32 -static char hshear_mask_bits[] = { +static unsigned char hshear_mask_bits[] = { 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, diff --git a/vcl/unx/source/inc/invert50.h b/vcl/unx/source/inc/invert50.h index 12f64dff5ce7..b1f4c1e86d18 100644 --- a/vcl/unx/source/inc/invert50.h +++ b/vcl/unx/source/inc/invert50.h @@ -27,7 +27,7 @@ ************************************************************************/ #define invert50_width 32 #define invert50_height 32 -static char invert50_bits[] = { +static unsigned char invert50_bits[] = { #if 1 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, 0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55, diff --git a/vcl/unx/source/inc/linkdata_curs.h b/vcl/unx/source/inc/linkdata_curs.h index 02d5709600a8..054ef55ef2bb 100644 --- a/vcl/unx/source/inc/linkdata_curs.h +++ b/vcl/unx/source/inc/linkdata_curs.h @@ -29,7 +29,7 @@ #define linkdata_curs_height 32 #define linkdata_curs_x_hot 1 #define linkdata_curs_y_hot 1 -static char linkdata_curs_bits[] = { +static unsigned char linkdata_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, diff --git a/vcl/unx/source/inc/linkdata_mask.h b/vcl/unx/source/inc/linkdata_mask.h index 5bf28eac1bd5..429c603066dc 100644 --- a/vcl/unx/source/inc/linkdata_mask.h +++ b/vcl/unx/source/inc/linkdata_mask.h @@ -29,7 +29,7 @@ #define linkdata_mask_height 32 #define linkdata_mask_x_hot 1 #define linkdata_mask_y_hot 1 -static char linkdata_mask_bits[] = { +static unsigned char linkdata_mask_bits[] = { 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, diff --git a/vcl/unx/source/inc/linkfile_curs.h b/vcl/unx/source/inc/linkfile_curs.h index 38731cdde471..5f68af135810 100644 --- a/vcl/unx/source/inc/linkfile_curs.h +++ b/vcl/unx/source/inc/linkfile_curs.h @@ -29,7 +29,7 @@ #define linkfile_curs_height 32 #define linkfile_curs_x_hot 9 #define linkfile_curs_y_hot 9 -static char linkfile_curs_bits[] = { +static unsigned char linkfile_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00, diff --git a/vcl/unx/source/inc/linkfile_mask.h b/vcl/unx/source/inc/linkfile_mask.h index 0b36e8a28c41..fad8d6ad7624 100644 --- a/vcl/unx/source/inc/linkfile_mask.h +++ b/vcl/unx/source/inc/linkfile_mask.h @@ -29,7 +29,7 @@ #define linkfile_mask_height 32 #define linkfile_mask_x_hot 9 #define linkfile_mask_y_hot 9 -static char linkfile_mask_bits[] = { +static unsigned char linkfile_mask_bits[] = { 0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, diff --git a/vcl/unx/source/inc/magnify_curs.h b/vcl/unx/source/inc/magnify_curs.h index d25680bca7ec..4db8bb382b15 100644 --- a/vcl/unx/source/inc/magnify_curs.h +++ b/vcl/unx/source/inc/magnify_curs.h @@ -29,7 +29,7 @@ #define magnify_curs_height 32 #define magnify_curs_x_hot 12 #define magnify_curs_y_hot 13 -static char magnify_curs_bits[] = { +static unsigned char magnify_curs_bits[] = { 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,0x7c,0x00,0x00,0x00,0x83, 0x01,0x00,0x80,0x00,0x02,0x00,0x40,0x00,0x04,0x00,0x40,0x00,0x04,0x00,0x20, diff --git a/vcl/unx/source/inc/magnify_mask.h b/vcl/unx/source/inc/magnify_mask.h index 723a913eeb20..a7b5b027362d 100644 --- a/vcl/unx/source/inc/magnify_mask.h +++ b/vcl/unx/source/inc/magnify_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define magnify_mask_width 32 #define magnify_mask_height 32 -static char magnify_mask_bits[] = { +static unsigned char magnify_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x80, 0xff, 0x03, 0x00, 0xc0, 0x83, 0x07, 0x00, diff --git a/vcl/unx/source/inc/mirror_curs.h b/vcl/unx/source/inc/mirror_curs.h index 6f7ea2de78f5..c2488a6fd725 100644 --- a/vcl/unx/source/inc/mirror_curs.h +++ b/vcl/unx/source/inc/mirror_curs.h @@ -29,7 +29,7 @@ #define mirror_curs_height 32 #define mirror_curs_x_hot 14 #define mirror_curs_y_hot 12 -static char mirror_curs_bits[] = { +static unsigned char mirror_curs_bits[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0x03, 0xf8, 0xf5, 0xff, 0xfb, 0xfb, 0xee, 0xff, 0x0b, 0xfa, 0xf5, 0xff, 0xeb, 0xfa, 0xfa, 0xff, 0xeb, 0xfa, 0xfa, 0xff, 0xeb, 0x7a, 0xfd, 0xff, 0xeb, 0x7a, 0xfd, 0xff, diff --git a/vcl/unx/source/inc/mirror_mask.h b/vcl/unx/source/inc/mirror_mask.h index d39742976c93..60e8f1593b2b 100644 --- a/vcl/unx/source/inc/mirror_mask.h +++ b/vcl/unx/source/inc/mirror_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define mirror_mask_width 32 #define mirror_mask_height 32 -static char mirror_mask_bits[] = { +static unsigned char mirror_mask_bits[] = { 0x00, 0x00, 0x04, 0x00, 0xfe, 0x0f, 0x0e, 0x00, 0xfe, 0x0f, 0x1f, 0x00, 0xfe, 0x8f, 0x3f, 0x00, 0xfe, 0x0f, 0x1f, 0x00, 0xfe, 0x8f, 0x0f, 0x00, 0xbe, 0x8f, 0x0f, 0x00, 0xbe, 0xcf, 0x07, 0x00, 0xbe, 0xcf, 0x87, 0x00, diff --git a/vcl/unx/source/inc/movebezierweight_curs.h b/vcl/unx/source/inc/movebezierweight_curs.h index 1c83a1f72ca0..df99aab7ea0f 100644 --- a/vcl/unx/source/inc/movebezierweight_curs.h +++ b/vcl/unx/source/inc/movebezierweight_curs.h @@ -29,7 +29,7 @@ #define movebezierweight_curs_height 32 #define movebezierweight_curs_x_hot 0 #define movebezierweight_curs_y_hot 0 -static char movebezierweight_curs_bits[] = { +static unsigned char movebezierweight_curs_bits[] = { 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xf1, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff, 0x81, 0xff, 0xff, 0xff, 0x01, 0xff, 0xff, 0xff, 0x01, 0xfe, 0xff, 0xff, diff --git a/vcl/unx/source/inc/movebezierweight_mask.h b/vcl/unx/source/inc/movebezierweight_mask.h index 392657c42f19..831f427a9086 100644 --- a/vcl/unx/source/inc/movebezierweight_mask.h +++ b/vcl/unx/source/inc/movebezierweight_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define movebezierweight_mask_width 32 #define movebezierweight_mask_height 32 -static char movebezierweight_mask_bits[] = { +static unsigned char movebezierweight_mask_bits[] = { 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, diff --git a/vcl/unx/source/inc/movedata_curs.h b/vcl/unx/source/inc/movedata_curs.h index cbc3b6b73c1e..642bbd176e4b 100644 --- a/vcl/unx/source/inc/movedata_curs.h +++ b/vcl/unx/source/inc/movedata_curs.h @@ -29,7 +29,7 @@ #define movedata_curs_height 32 #define movedata_curs_x_hot 1 #define movedata_curs_y_hot 1 -static char movedata_curs_bits[] = { +static unsigned char movedata_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, diff --git a/vcl/unx/source/inc/movedata_mask.h b/vcl/unx/source/inc/movedata_mask.h index 716e626f778b..f06c80f1728c 100644 --- a/vcl/unx/source/inc/movedata_mask.h +++ b/vcl/unx/source/inc/movedata_mask.h @@ -29,7 +29,7 @@ #define movedata_mask_height 32 #define movedata_mask_x_hot 1 #define movedata_mask_y_hot 1 -static char movedata_mask_bits[] = { +static unsigned char movedata_mask_bits[] = { 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, diff --git a/vcl/unx/source/inc/movedlnk_curs.h b/vcl/unx/source/inc/movedlnk_curs.h index 62ff813f9366..c163488d8d26 100644 --- a/vcl/unx/source/inc/movedlnk_curs.h +++ b/vcl/unx/source/inc/movedlnk_curs.h @@ -29,7 +29,7 @@ #define movedlnk_curs_height 32 #define movedlnk_curs_x_hot 1 #define movedlnk_curs_y_hot 1 -static char movedlnk_curs_bits[] = { +static unsigned char movedlnk_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, diff --git a/vcl/unx/source/inc/movedlnk_mask.h b/vcl/unx/source/inc/movedlnk_mask.h index 4852cbbbc4a5..8f3fa3cb92f6 100644 --- a/vcl/unx/source/inc/movedlnk_mask.h +++ b/vcl/unx/source/inc/movedlnk_mask.h @@ -29,7 +29,7 @@ #define movedlnk_mask_height 32 #define movedlnk_mask_x_hot 1 #define movedlnk_mask_y_hot 1 -static char movedlnk_mask_bits[] = { +static unsigned char movedlnk_mask_bits[] = { 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, diff --git a/vcl/unx/source/inc/movefile_curs.h b/vcl/unx/source/inc/movefile_curs.h index 7ec7075a4733..54c3ce91df96 100644 --- a/vcl/unx/source/inc/movefile_curs.h +++ b/vcl/unx/source/inc/movefile_curs.h @@ -29,7 +29,7 @@ #define movefile_curs_height 32 #define movefile_curs_x_hot 9 #define movefile_curs_y_hot 9 -static char movefile_curs_bits[] = { +static unsigned char movefile_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00, diff --git a/vcl/unx/source/inc/movefile_mask.h b/vcl/unx/source/inc/movefile_mask.h index 355b571420ea..566b3fdeb8de 100644 --- a/vcl/unx/source/inc/movefile_mask.h +++ b/vcl/unx/source/inc/movefile_mask.h @@ -29,7 +29,7 @@ #define movefile_mask_height 32 #define movefile_mask_x_hot 9 #define movefile_mask_y_hot 9 -static char movefile_mask_bits[] = { +static unsigned char movefile_mask_bits[] = { 0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, diff --git a/vcl/unx/source/inc/movefiles_curs.h b/vcl/unx/source/inc/movefiles_curs.h index a469b10dbb4f..95ec95bd8302 100644 --- a/vcl/unx/source/inc/movefiles_curs.h +++ b/vcl/unx/source/inc/movefiles_curs.h @@ -29,7 +29,7 @@ #define movefiles_curs_height 32 #define movefiles_curs_x_hot 8 #define movefiles_curs_y_hot 9 -static char movefiles_curs_bits[] = { +static unsigned char movefiles_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0xe0, 0x2f, 0x00, 0x00, 0xe8, 0x0f, 0x00, 0x00, 0xe8, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0x6a, 0x7e, 0x00, 0x00, diff --git a/vcl/unx/source/inc/movefiles_mask.h b/vcl/unx/source/inc/movefiles_mask.h index 09553289eff0..03a56a169218 100644 --- a/vcl/unx/source/inc/movefiles_mask.h +++ b/vcl/unx/source/inc/movefiles_mask.h @@ -29,7 +29,7 @@ #define movefiles_mask_height 32 #define movefiles_mask_x_hot 8 #define movefiles_mask_y_hot 9 -static char movefiles_mask_bits[] = { +static unsigned char movefiles_mask_bits[] = { 0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0xfc, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, diff --git a/vcl/unx/source/inc/moveflnk_curs.h b/vcl/unx/source/inc/moveflnk_curs.h index 0986e445d95f..1f1fea56dead 100644 --- a/vcl/unx/source/inc/moveflnk_curs.h +++ b/vcl/unx/source/inc/moveflnk_curs.h @@ -29,7 +29,7 @@ #define moveflnk_curs_height 32 #define moveflnk_curs_x_hot 9 #define moveflnk_curs_y_hot 9 -static char moveflnk_curs_bits[] = { +static unsigned char moveflnk_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, diff --git a/vcl/unx/source/inc/moveflnk_mask.h b/vcl/unx/source/inc/moveflnk_mask.h index c73e4b16fc34..f8312aba525e 100644 --- a/vcl/unx/source/inc/moveflnk_mask.h +++ b/vcl/unx/source/inc/moveflnk_mask.h @@ -29,7 +29,7 @@ #define moveflnk_mask_height 32 #define moveflnk_mask_x_hot 9 #define moveflnk_mask_y_hot 9 -static char moveflnk_mask_bits[] = { +static unsigned char moveflnk_mask_bits[] = { 0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, diff --git a/vcl/unx/source/inc/movepoint_curs.h b/vcl/unx/source/inc/movepoint_curs.h index 1331b81e68aa..8ccf2d581455 100644 --- a/vcl/unx/source/inc/movepoint_curs.h +++ b/vcl/unx/source/inc/movepoint_curs.h @@ -29,7 +29,7 @@ #define movepoint_curs_height 32 #define movepoint_curs_x_hot 0 #define movepoint_curs_y_hot 0 -static char movepoint_curs_bits[] = { +static unsigned char movepoint_curs_bits[] = { 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xf1, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff, 0x81, 0xff, 0xff, 0xff, 0x01, 0xff, 0xff, 0xff, 0x01, 0xfe, 0xff, 0xff, diff --git a/vcl/unx/source/inc/movepoint_mask.h b/vcl/unx/source/inc/movepoint_mask.h index e7355183ec2c..547dfb03a87e 100644 --- a/vcl/unx/source/inc/movepoint_mask.h +++ b/vcl/unx/source/inc/movepoint_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define movepoint_mask_width 32 #define movepoint_mask_height 32 -static char movepoint_mask_bits[] = { +static unsigned char movepoint_mask_bits[] = { 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, diff --git a/vcl/unx/source/inc/nodrop_curs.h b/vcl/unx/source/inc/nodrop_curs.h index 96b0c51178e6..5c501d3876c4 100644 --- a/vcl/unx/source/inc/nodrop_curs.h +++ b/vcl/unx/source/inc/nodrop_curs.h @@ -29,7 +29,7 @@ #define nodrop_curs_height 32 #define nodrop_curs_x_hot 9 #define nodrop_curs_y_hot 9 -static char nodrop_curs_bits[] = { +static unsigned char nodrop_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00, 0x7c, 0xf8, 0x00, 0x00, 0x1c, 0xfc, 0x00, 0x00, 0x1e, 0xfe, 0x01, 0x00, 0x0e, 0xdf, 0x01, 0x00, 0x8e, 0xcf, 0x01, 0x00, diff --git a/vcl/unx/source/inc/nodrop_mask.h b/vcl/unx/source/inc/nodrop_mask.h index b5bd992c7a4c..bd315dc28df1 100644 --- a/vcl/unx/source/inc/nodrop_mask.h +++ b/vcl/unx/source/inc/nodrop_mask.h @@ -29,7 +29,7 @@ #define nodrop_mask_height 32 #define nodrop_mask_x_hot 9 #define nodrop_mask_y_hot 9 -static char nodrop_mask_bits[] = { +static unsigned char nodrop_mask_bits[] = { 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00, 0xfc, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x7e, 0xfe, 0x01, 0x00, 0x3f, 0xff, 0x03, 0x00, 0x9f, 0xff, 0x03, 0x00, 0xdf, 0xff, 0x03, 0x00, diff --git a/vcl/unx/source/inc/null_curs.h b/vcl/unx/source/inc/null_curs.h index 7b771173ee44..1f5687cbcf61 100644 --- a/vcl/unx/source/inc/null_curs.h +++ b/vcl/unx/source/inc/null_curs.h @@ -29,6 +29,6 @@ #define nullcurs_height 4 #define nullcurs_x_hot 2 #define nullcurs_y_hot 2 -static char nullcurs_bits[] = { 0x00, 0x00 }; +static unsigned char nullcurs_bits[] = { 0x00, 0x00 }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/source/inc/null_mask.h b/vcl/unx/source/inc/null_mask.h index 5ac9e4df4840..e7ff46805d41 100644 --- a/vcl/unx/source/inc/null_mask.h +++ b/vcl/unx/source/inc/null_mask.h @@ -27,6 +27,6 @@ ************************************************************************/ #define nullmask_width 4 #define nullmask_height 4 -static char nullmask_bits[] = { 0x00, 0x00 }; +static unsigned char nullmask_bits[] = { 0x00, 0x00 }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/source/inc/paintbrush_curs.h b/vcl/unx/source/inc/paintbrush_curs.h index ccdbd42e3cb1..1e3cef066ddc 100644 --- a/vcl/unx/source/inc/paintbrush_curs.h +++ b/vcl/unx/source/inc/paintbrush_curs.h @@ -3,7 +3,7 @@ #define paintbrush_curs_height 16 #define paintbrush_curs_x_hot 0 #define paintbrush_curs_y_hot 10 -static char paintbrush_curs_bits[] = { +static unsigned char paintbrush_curs_bits[] = { 0x00, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x90, 0x80, 0xcb, 0x60, 0x64, 0x90, 0x34, 0x08, 0x19, 0x06, 0x22, 0x11, 0x24, 0x09, 0x18, 0x46, 0x14, 0x24, 0x0a, 0x18, 0x05, 0x90, 0x02, 0xe0, 0x01 }; diff --git a/vcl/unx/source/inc/paintbrush_mask.h b/vcl/unx/source/inc/paintbrush_mask.h index 2b644a19aa09..4e3000d3b981 100644 --- a/vcl/unx/source/inc/paintbrush_mask.h +++ b/vcl/unx/source/inc/paintbrush_mask.h @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #define paintbrush_mask_width 16 #define paintbrush_mask_height 16 -static char paintbrush_mask_bits[] = { +static unsigned char paintbrush_mask_bits[] = { 0x00, 0x80, 0x00, 0xc0, 0x00, 0xe0, 0x00, 0xf0, 0x80, 0xfb, 0xe0, 0x7f, 0xf0, 0x3f, 0xf8, 0x1f, 0xfe, 0x3f, 0xff, 0x3f, 0xff, 0x1f, 0xfe, 0x1f, 0xfc, 0x0f, 0xf8, 0x07, 0xf0, 0x03, 0xe0, 0x01 }; diff --git a/vcl/unx/source/inc/pivotcol_curs.h b/vcl/unx/source/inc/pivotcol_curs.h index 751df69b53b9..dcd7e321fd2e 100644 --- a/vcl/unx/source/inc/pivotcol_curs.h +++ b/vcl/unx/source/inc/pivotcol_curs.h @@ -29,7 +29,7 @@ #define pivotcol_curs_height 32 #define pivotcol_curs_x_hot 7 #define pivotcol_curs_y_hot 5 -static char pivotcol_curs_bits[] = { +static unsigned char pivotcol_curs_bits[] = { 0xff, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x29, 0x01, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0xa9, 0x00, 0x00, 0x00, 0x95, 0x01, 0x00, 0x00, 0xa9, 0x02, 0x00, 0x00, 0x95, 0x04, 0x00, 0x00, diff --git a/vcl/unx/source/inc/pivotcol_mask.h b/vcl/unx/source/inc/pivotcol_mask.h index 1792ef6962db..b5537c03ec9f 100644 --- a/vcl/unx/source/inc/pivotcol_mask.h +++ b/vcl/unx/source/inc/pivotcol_mask.h @@ -29,7 +29,7 @@ #define pivotcol_mask_height 32 #define pivotcol_mask_x_hot 7 #define pivotcol_mask_y_hot 5 -static char pivotcol_mask_bits[] = { +static unsigned char pivotcol_mask_bits[] = { 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, diff --git a/vcl/unx/source/inc/pivotdel_curs.h b/vcl/unx/source/inc/pivotdel_curs.h index c1b8a8537ff9..18348b9e21df 100644 --- a/vcl/unx/source/inc/pivotdel_curs.h +++ b/vcl/unx/source/inc/pivotdel_curs.h @@ -29,7 +29,7 @@ #define pivotdel_curs_height 32 #define pivotdel_curs_x_hot 9 #define pivotdel_curs_y_hot 8 -static char pivotdel_curs_bits[] = { +static unsigned char pivotdel_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x80, 0x01, 0x00, 0x3c, 0xc0, 0x00, 0x00, 0x73, 0x6f, 0x07, 0x00, 0xe1, 0x30, 0x04, 0x00, 0xc1, 0x1d, 0x04, 0x00, 0x81, 0x0f, 0x04, 0x00, 0x01, 0x07, 0x04, 0x00, diff --git a/vcl/unx/source/inc/pivotdel_mask.h b/vcl/unx/source/inc/pivotdel_mask.h index aece5f1bfd60..bf2e2379f194 100644 --- a/vcl/unx/source/inc/pivotdel_mask.h +++ b/vcl/unx/source/inc/pivotdel_mask.h @@ -29,7 +29,7 @@ #define pivotdel_mask_height 32 #define pivotdel_mask_x_hot 9 #define pivotdel_mask_y_hot 8 -static char pivotdel_mask_bits[] = { +static unsigned char pivotdel_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x80, 0x01, 0x00, 0x3c, 0xc0, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, diff --git a/vcl/unx/source/inc/pivotfld_curs.h b/vcl/unx/source/inc/pivotfld_curs.h index ed999caa6dcc..424179cbfe16 100644 --- a/vcl/unx/source/inc/pivotfld_curs.h +++ b/vcl/unx/source/inc/pivotfld_curs.h @@ -29,7 +29,7 @@ #define pivotfld_curs_height 32 #define pivotfld_curs_x_hot 8 #define pivotfld_curs_y_hot 7 -static char pivotfld_curs_bits[] = { +static unsigned char pivotfld_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x01, 0x04, 0x00, 0x01, 0x03, 0x04, 0x00, diff --git a/vcl/unx/source/inc/pivotfld_mask.h b/vcl/unx/source/inc/pivotfld_mask.h index 99f884db83d2..e768b4b26889 100644 --- a/vcl/unx/source/inc/pivotfld_mask.h +++ b/vcl/unx/source/inc/pivotfld_mask.h @@ -29,7 +29,7 @@ #define pivotfld_mask_height 32 #define pivotfld_mask_x_hot 8 #define pivotfld_mask_y_hot 7 -static char pivotfld_mask_bits[] = { +static unsigned char pivotfld_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, diff --git a/vcl/unx/source/inc/pivotrow_curs.h b/vcl/unx/source/inc/pivotrow_curs.h index d504655bd530..1b6060ea5b8b 100644 --- a/vcl/unx/source/inc/pivotrow_curs.h +++ b/vcl/unx/source/inc/pivotrow_curs.h @@ -29,7 +29,7 @@ #define pivotrow_curs_height 32 #define pivotrow_curs_x_hot 8 #define pivotrow_curs_y_hot 7 -static char pivotrow_curs_bits[] = { +static unsigned char pivotrow_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00, 0x01, 0x00, 0x04, 0x00, 0x55, 0x55, 0x07, 0x00, 0xa9, 0xaa, 0x06, 0x00, 0x55, 0x54, 0x07, 0x00, 0x29, 0xa9, 0x06, 0x00, 0x55, 0x53, 0x07, 0x00, diff --git a/vcl/unx/source/inc/pivotrow_mask.h b/vcl/unx/source/inc/pivotrow_mask.h index 8599bc546d3f..f6ea09498aa0 100644 --- a/vcl/unx/source/inc/pivotrow_mask.h +++ b/vcl/unx/source/inc/pivotrow_mask.h @@ -29,7 +29,7 @@ #define pivotrow_mask_height 32 #define pivotrow_curs_x_hot 8 #define pivotrow_curs_y_hot 7 -static char pivotrow_mask_bits[] = { +static unsigned char pivotrow_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, diff --git a/vcl/unx/source/inc/rotate_curs.h b/vcl/unx/source/inc/rotate_curs.h index bfaf4ab65726..c6550475c989 100644 --- a/vcl/unx/source/inc/rotate_curs.h +++ b/vcl/unx/source/inc/rotate_curs.h @@ -29,7 +29,7 @@ #define rotate_curs_height 32 #define rotate_curs_x_hot 15 #define rotate_curs_y_hot 15 -static char rotate_curs_bits[] = { +static unsigned char rotate_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0xd8, 0x00, 0x00, diff --git a/vcl/unx/source/inc/rotate_mask.h b/vcl/unx/source/inc/rotate_mask.h index dafb049c8b89..12790cca4beb 100644 --- a/vcl/unx/source/inc/rotate_mask.h +++ b/vcl/unx/source/inc/rotate_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define rotate_mask_width 32 #define rotate_mask_height 32 -static char rotate_mask_bits[] = { +static unsigned char rotate_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0xf8, 0x03, 0x00, 0x00, 0xfc, 0x01, 0x00, diff --git a/vcl/unx/source/inc/tblsele_curs.h b/vcl/unx/source/inc/tblsele_curs.h index 40b14520f7d6..21bcfd1fdd9f 100644 --- a/vcl/unx/source/inc/tblsele_curs.h +++ b/vcl/unx/source/inc/tblsele_curs.h @@ -3,7 +3,7 @@ #define tblsele_curs_height 16 #define tblsele_curs_x_hot 14 #define tblsele_curs_y_hot 8 -static char tblsele_curs_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/tblsele_mask.h b/vcl/unx/source/inc/tblsele_mask.h index 28d5e8b6e003..2a555e83d884 100644 --- a/vcl/unx/source/inc/tblsele_mask.h +++ b/vcl/unx/source/inc/tblsele_mask.h @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #define tblsele_mask_width 16 #define tblsele_mask_height 16 -static char tblsele_mask_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/tblsels_curs.h b/vcl/unx/source/inc/tblsels_curs.h index 2e4be684d8db..fb739951e9f4 100644 --- a/vcl/unx/source/inc/tblsels_curs.h +++ b/vcl/unx/source/inc/tblsels_curs.h @@ -3,7 +3,7 @@ #define tblsels_curs_height 16 #define tblsels_curs_x_hot 7 #define tblsels_curs_y_hot 14 -static char tblsels_curs_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/tblsels_mask.h b/vcl/unx/source/inc/tblsels_mask.h index ad41a0b4377c..5a75aabe4c51 100644 --- a/vcl/unx/source/inc/tblsels_mask.h +++ b/vcl/unx/source/inc/tblsels_mask.h @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #define tblsels_mask_width 16 #define tblsels_mask_height 16 -static char tblsels_mask_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/tblselse_curs.h b/vcl/unx/source/inc/tblselse_curs.h index 9a8d3b9d423d..fb34ff02b574 100644 --- a/vcl/unx/source/inc/tblselse_curs.h +++ b/vcl/unx/source/inc/tblselse_curs.h @@ -3,7 +3,7 @@ #define tblselse_curs_height 16 #define tblselse_curs_x_hot 14 #define tblselse_curs_y_hot 14 -static char tblselse_curs_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/tblselse_mask.h b/vcl/unx/source/inc/tblselse_mask.h index 32087f1cc30b..fc289854e3ea 100644 --- a/vcl/unx/source/inc/tblselse_mask.h +++ b/vcl/unx/source/inc/tblselse_mask.h @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #define tblselse_mask_width 16 #define tblselse_mask_height 16 -static char tblselse_mask_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/tblselsw_curs.h b/vcl/unx/source/inc/tblselsw_curs.h index 1bade5674398..a421a18b815d 100644 --- a/vcl/unx/source/inc/tblselsw_curs.h +++ b/vcl/unx/source/inc/tblselsw_curs.h @@ -3,7 +3,7 @@ #define tblselsw_curs_height 16 #define tblselsw_curs_x_hot 1 #define tblselsw_curs_y_hot 14 -static char tblselsw_curs_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/tblselsw_mask.h b/vcl/unx/source/inc/tblselsw_mask.h index 49fb462c878e..14b49a9863fb 100644 --- a/vcl/unx/source/inc/tblselsw_mask.h +++ b/vcl/unx/source/inc/tblselsw_mask.h @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #define tblselsw_mask_width 16 #define tblselsw_mask_height 16 -static char tblselsw_mask_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/tblselw_curs.h b/vcl/unx/source/inc/tblselw_curs.h index 2a7e325a2098..2ee9a0d4af20 100644 --- a/vcl/unx/source/inc/tblselw_curs.h +++ b/vcl/unx/source/inc/tblselw_curs.h @@ -3,7 +3,7 @@ #define tblselw_curs_height 16 #define tblselw_curs_x_hot 1 #define tblselw_curs_y_hot 8 -static char tblselw_curs_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/tblselw_mask.h b/vcl/unx/source/inc/tblselw_mask.h index 8f600a85a752..8fa5be7c724a 100644 --- a/vcl/unx/source/inc/tblselw_mask.h +++ b/vcl/unx/source/inc/tblselw_mask.h @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #define tblselw_mask_width 16 #define tblselw_mask_height 16 -static char tblselw_mask_bits[] = { +static 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 }; diff --git a/vcl/unx/source/inc/timemove_curs.h b/vcl/unx/source/inc/timemove_curs.h index c9f9c771ada3..ce5e2b6914b5 100644 --- a/vcl/unx/source/inc/timemove_curs.h +++ b/vcl/unx/source/inc/timemove_curs.h @@ -29,7 +29,7 @@ #define timemove_curs_height 32 #define timemove_curs_x_hot 16 #define timemove_curs_y_hot 16 -static char timemove_curs_bits[] = { +static unsigned char timemove_curs_bits[] = { 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,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00, diff --git a/vcl/unx/source/inc/timemove_mask.h b/vcl/unx/source/inc/timemove_mask.h index 3176258df95d..42664e6998fb 100644 --- a/vcl/unx/source/inc/timemove_mask.h +++ b/vcl/unx/source/inc/timemove_mask.h @@ -29,7 +29,7 @@ #define timemove_mask_height 32 #define timemove_mask_x_hot 16 #define timemove_mask_y_hot 16 -static char timemove_mask_bits[] = { +static unsigned char timemove_mask_bits[] = { 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, 0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00, diff --git a/vcl/unx/source/inc/timesize_curs.h b/vcl/unx/source/inc/timesize_curs.h index 7e75b3e4c95b..99c75d4affb1 100644 --- a/vcl/unx/source/inc/timesize_curs.h +++ b/vcl/unx/source/inc/timesize_curs.h @@ -29,7 +29,7 @@ #define timesize_curs_height 32 #define timesize_curs_x_hot 16 #define timesize_curs_y_hot 16 -static char timesize_curs_bits[] = { +static unsigned char timesize_curs_bits[] = { 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,0xff,0xff,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00, diff --git a/vcl/unx/source/inc/timesize_mask.h b/vcl/unx/source/inc/timesize_mask.h index 2f2de862a678..68d03c95057f 100644 --- a/vcl/unx/source/inc/timesize_mask.h +++ b/vcl/unx/source/inc/timesize_mask.h @@ -29,7 +29,7 @@ #define timesize_mask_height 32 #define timesize_mask_x_hot 16 #define timesize_mask_y_hot 16 -static char timesize_mask_bits[] = { +static unsigned char timesize_mask_bits[] = { 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,0x80,0xff, 0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80, diff --git a/vcl/unx/source/inc/vertcurs_curs.h b/vcl/unx/source/inc/vertcurs_curs.h index 93767087a405..5f8cfde93a8d 100644 --- a/vcl/unx/source/inc/vertcurs_curs.h +++ b/vcl/unx/source/inc/vertcurs_curs.h @@ -3,7 +3,7 @@ #define vertcurs_curs_height 16 #define vertcurs_curs_x_hot 8 #define vertcurs_curs_y_hot 8 -static char vertcurs_curs_bits[] = { +static unsigned char vertcurs_curs_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x02, 0x40, 0x06, 0x60, 0xfc, 0x3f, 0x06, 0x60, 0x02, 0x40, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/vcl/unx/source/inc/vertcurs_mask.h b/vcl/unx/source/inc/vertcurs_mask.h index a652d58b8ef3..05ac8246e52e 100644 --- a/vcl/unx/source/inc/vertcurs_mask.h +++ b/vcl/unx/source/inc/vertcurs_mask.h @@ -3,7 +3,7 @@ #define vertcurs_mask_height 16 #define vertcurs_mask_x_hot 8 #define vertcurs_mask_y_hot 8 -static char vertcurs_mask_bits[] = { +static unsigned char vertcurs_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x07, 0xe0, 0x0f, 0xf0, 0xff, 0xff, 0xfe, 0x7f, 0xff, 0xff, 0x0f, 0xf0, 0x07, 0xe0, 0x07, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/vcl/unx/source/inc/vshear_curs.h b/vcl/unx/source/inc/vshear_curs.h index ba073ca64211..c8f0f7dd4b8b 100644 --- a/vcl/unx/source/inc/vshear_curs.h +++ b/vcl/unx/source/inc/vshear_curs.h @@ -29,7 +29,7 @@ #define vshear_curs_height 32 #define vshear_curs_x_hot 15 #define vshear_curs_y_hot 15 -static char vshear_curs_bits[] = { +static unsigned char vshear_curs_bits[] = { 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, 0x20, 0x04, 0x00, diff --git a/vcl/unx/source/inc/vshear_mask.h b/vcl/unx/source/inc/vshear_mask.h index 7a614df0b9fa..70b777a18d2f 100644 --- a/vcl/unx/source/inc/vshear_mask.h +++ b/vcl/unx/source/inc/vshear_mask.h @@ -27,7 +27,7 @@ ************************************************************************/ #define vshear_mask_width 32 #define vshear_mask_height 32 -static char vshear_mask_bits[] = { +static unsigned char vshear_mask_bits[] = { 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, 0x70, 0x0e, 0x00, 0x00, 0x70, 0x0e, 0x00, diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx index 0accb8def42f..7398cc8410a6 100644 --- a/vcl/unx/source/plugadapt/salplug.cxx +++ b/vcl/unx/source/plugadapt/salplug.cxx @@ -284,7 +284,7 @@ void SalAbort( const XubString& rErrorText ) std::fprintf( stderr, "Application Error" ); else std::fprintf( stderr, "%s", ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() ); - abort(); + exit(-1); } const OUString& SalGetDesktopEnvironment() diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/source/printer/cupsmgr.cxx index fdab933a494c..cb4a2de7ed73 100644 --- a/vcl/unx/source/printer/cupsmgr.cxx +++ b/vcl/unx/source/printer/cupsmgr.cxx @@ -1109,7 +1109,7 @@ const char* CUPSManager::authenticateUser( const char* /*pIn*/ ) const char* pRet = NULL; #ifdef ENABLE_CUPS - OUString aLib = OUString::createFromAscii( _XSALSET_LIBNAME ); + OUString aLib(RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME )); oslModule pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY ); if( pLib ) { diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx index c10f8aca8664..b8466ec55877 100644 --- a/vcl/unx/source/printer/ppdparser.cxx +++ b/vcl/unx/source/printer/ppdparser.cxx @@ -750,9 +750,8 @@ PPDParser::PPDParser( const String& rFile ) : case PPDKey::AnySetup: pSetupType = "AnySetup";break; default: break; }; - fprintf( stderr, "\t\"%s\" (\"%s\") (%d values) OrderDependency: %d %s\n", + fprintf( stderr, "\t\"%s\" (%d values) OrderDependency: %d %s\n", BSTRING( pKey->getKey() ).GetBuffer(), - BSTRING( pKey->m_aUITranslation ).GetBuffer(), pKey->countValues(), pKey->m_nOrderDependency, pSetupType ); @@ -772,12 +771,10 @@ PPDParser::PPDParser( const String& rFile ) : case eNo: pVType = "no";break; default: break; }; - fprintf( stderr, "option: \"%s\" (\"%s\"), value: type %s \"%s\" (\"%s\")\n", + fprintf( stderr, "option: \"%s\", value: type %s \"%s\"\n", BSTRING( pValue->m_aOption ).GetBuffer(), - BSTRING( pValue->m_aOptionTranslation ).GetBuffer(), pVType, - BSTRING( pValue->m_aValue ).GetBuffer(), - BSTRING( pValue->m_aValueTranslation ).GetBuffer() ); + BSTRING( pValue->m_aValue ).GetBuffer() ); } } fprintf( stderr, "constraints: (%d found)\n", m_aConstraints.size() ); diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx index 0fff5b590b98..b907fa9af4a7 100644 --- a/vcl/unx/source/printer/printerinfomanager.cxx +++ b/vcl/unx/source/printer/printerinfomanager.cxx @@ -326,7 +326,7 @@ void PrinterInfoManager::initialize() } } #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "global settings: fontsubst = %s, %d substitutes\n", m_aGlobalDefaults.m_bPerformFontSubstitution ? "true" : "false", m_aGlobalDefaults.m_aFontSubstitutes.size() ); + fprintf( stderr, "global settings: fontsubst = %s, %" SAL_PRI_SIZET "u substitutes\n", m_aGlobalDefaults.m_bPerformFontSubstitution ? "true" : "false", m_aGlobalDefaults.m_aFontSubstitutes.size() ); #endif } } diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx index e565a0e2355f..1d8924913703 100644 --- a/vcl/unx/source/printergfx/printerjob.cxx +++ b/vcl/unx/source/printergfx/printerjob.cxx @@ -110,7 +110,7 @@ PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rE nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL ); if (nError != osl::File::E_None) return NULL; - aFileURL = maSpoolDirName + rtl::OUString::createFromAscii ("/") + aFileURL; + aFileURL = maSpoolDirName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/")) + aFileURL; pFile = new osl::File (aFileURL); nError = pFile->open (OpenFlag_Read | OpenFlag_Write | OpenFlag_Create); @@ -397,9 +397,9 @@ PrinterJob::StartJob ( maSpoolDirName = createSpoolDir (); maJobTitle = rJobName; - rtl::OUString aExt = rtl::OUString::createFromAscii (".ps"); - mpJobHeader = CreateSpoolFile (rtl::OUString::createFromAscii("psp_head"), aExt); - mpJobTrailer = CreateSpoolFile (rtl::OUString::createFromAscii("psp_tail"), aExt); + rtl::OUString aExt(RTL_CONSTASCII_USTRINGPARAM (".ps")); + mpJobHeader = CreateSpoolFile (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_head")), aExt); + mpJobTrailer = CreateSpoolFile (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_tail")), aExt); if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor return sal_False; @@ -668,12 +668,12 @@ PrinterJob::StartPage (const JobData& rJobSetup) InitPaperSize (rJobSetup); rtl::OUString aPageNo = rtl::OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1 - rtl::OUString aExt = aPageNo + rtl::OUString::createFromAscii (".ps"); + rtl::OUString aExt = aPageNo + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (".ps")); osl::File* pPageHeader = CreateSpoolFile ( - rtl::OUString::createFromAscii("psp_pghead"), aExt); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_pghead")), aExt); osl::File* pPageBody = CreateSpoolFile ( - rtl::OUString::createFromAscii("psp_pgbody"), aExt); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_pgbody")), aExt); maHeaderList.push_back (pPageHeader); maPageList.push_back (pPageBody); diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 6c002b673165..7e378cf7e58a 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -3009,11 +3009,14 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) // High contrast HIGHCONTRAST hc; hc.cbSize = sizeof( HIGHCONTRAST ); - if( SystemParametersInfo( SPI_GETHIGHCONTRAST, hc.cbSize, &hc, 0) && (hc.dwFlags & HCF_HIGHCONTRASTON) ) + if( SystemParametersInfo( SPI_GETHIGHCONTRAST, hc.cbSize, &hc, 0) + && (hc.dwFlags & HCF_HIGHCONTRASTON) + ) { aStyleSettings.SetHighContrastMode( 1 ); - else + aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST ); + } else { aStyleSettings.SetHighContrastMode( 0 ); - + } // Query Fonts Font aMenuFont = aStyleSettings.GetMenuFont(); diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 18b5a19aa646..1951684b2747 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -83,7 +83,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString::createFromAscii( "OutDev grinding" ) ); + SetText( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutDev grinding")) ); SetSizePixel( Size( 1024, 1024 ) ); EnablePaint( true ); Show(); @@ -959,8 +959,8 @@ void GrindApp::Main() // Create UCB. uno::Sequence< uno::Any > aArgs( 2 ); - aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); - aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); + aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )); + aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )); ::ucbhelper::ContentBroker::initialize( xFactory, aArgs ); TestWindow pWindow; diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 2f5fa442127a..94971f292dc3 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -100,8 +100,8 @@ SAL_IMPLEMENT_MAIN() * Create UCB. */ Sequence< Any > aArgs( 2 ); - aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); - aArgs[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); + aArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )); + aArgs[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )); #if OSL_DEBUG_LEVEL > 1 sal_Bool bSuccess = #endif |