Attachment #11722 for issue #23151

View | Details | Raw Unified | Return to issue 23151
Collapse All | Expand All

Lines 151-155 Link Here

(-)vcl/inc/svids.hrc.orig (+2 lines)
151	#define SV_SHORTCUT_TODOCUMENT 10606	151	#define SV_SHORTCUT_TODOCUMENT 10606
152	#define SV_SHORTCUT_MENUBAR 10607	152	#define SV_SHORTCUT_MENUBAR 10607
153		153
		154	#define IL_SYM_TO_IMAGES_L 1090
		155	#define IL_SYM_TO_IMAGES_S 1095
154	#define SV_FUNIT_STRINGS 10700	156	#define SV_FUNIT_STRINGS 10700
155	#endif // _SV_SVIDS_HRC	157	#endif // _SV_SVIDS_HRC




	File = "splvarw.bmp";
};

#define IMG_IDLIST \
	IdList =			   \
	{					   \
		SID_OUTLINE_UP;             \
		SID_OUTLINE_DOWN;           \
		SID_OUTLINE_LEFT;           \
		SID_OUTLINE_RIGHT;          \
	};					   \
	IdCount = { 4 ; };

ImageList IL_SYM_TO_IMAGES_L
{
      ImageBitmap = Bitmap { File = "lc_imgs.bmp" ; };
      MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
	IMG_IDLIST
};

ImageList IL_SYM_TO_IMAGES_S
{
      ImageBitmap = Bitmap { File = "sc_imgs.bmp" ; };
      MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
	IMG_IDLIST
};

Lines 70-75 Link Here

(-)vcl/source/src/makefile.mk.orig (+1 lines)
70		70
71	.INCLUDE : settings.mk	71	.INCLUDE : settings.mk
72		72
		73	IMGLST_SRS=$(SRS)$/svsrc.srs
73	# --- Files --------------------------------------------------------	74	# --- Files --------------------------------------------------------
74		75
75	SRS1NAME=$(TARGET)	76	SRS1NAME=$(TARGET)

Lines 111-116 Link Here

(-)vcl/inc/image.hxx.orig (+3 lines)
111		111
112	private:	112	private:
113	ImplImage* mpImplData;	113	ImplImage* mpImplData;
		114	static const USHORT symbol_to_image_table[];
		115	static const int table_entry_size;
114		116
115	public:	117	public:
116	Image();	118	Image();
Lines 140-145 Link Here
140	BOOL operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); }	142	BOOL operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); }
141		143
142	void ClearCaches();	144	void ClearCaches();
		145	static BOOL GetImageForSymbol(const USHORT nSymbolId, const Size objSize, Image& objImage);
143	};	146	};
144		147
145	inline BOOL Image::operator!() const	148	inline BOOL Image::operator!() const

Lines 70-75 Link Here

(-)vcl/source/gdi/image.cxx.orig (+43 lines)
70	#include <tools/stream.hxx>	70	#include <tools/stream.hxx>
71	#endif	71	#endif
72		72
		73	#ifndef _SV_SVIDS_HRC
		74	#include <svids.hrc>
		75	#endif
		76	#ifndef _SV_SVDATA_HXX
		77	#include <svdata.hxx>
		78	#endif
		79
73	#ifndef _SV_RC_H	80	#ifndef _SV_RC_H
74	#include <rc.h>	81	#include <rc.h>
75	#endif	82	#endif
Lines 94-99 Link Here
94	#endif	101	#endif
95	#undef private	102	#undef private
96		103
		104	#ifndef _SVX_SVXIDS_HRC
		105	#include <svx/svxids.hrc>
		106	#endif
		107
97	// =======================================================================	108	// =======================================================================
98		109
99	DBG_NAME( Image );	110	DBG_NAME( Image );
Lines 212-217 Link Here
212		223
213	// =======================================================================	224	// =======================================================================
214		225
		226	static const USHORT Image::symbol_to_image_table[] =
		227	{
		228	NULL,
		229	NULL,
		230	SID_OUTLINE_UP,
		231	SID_OUTLINE_DOWN,
		232	SID_OUTLINE_LEFT,
		233	SID_OUTLINE_RIGHT
		234	};
		235
		236	static const int Image::table_entry_size = sizeof(symbol_to_image_table) / sizeof(symbol_to_image_table[0]);
		237
		238	static BOOL Image::GetImageForSymbol(const USHORT nSymbolId, const Size objSize, Image& objImage)
		239	{
		240	if (nSymbolId >= table_entry_size)
		241	return FALSE;
		242
		243	long lHeight = objSize.getHeight();
		244	long lWidth = objSize.getWidth();
		245	long lMin = lHeight < lWidth ? lHeight : lWidth;
		246
		247	if (lMin < 16)
		248	return FALSE;
		249
		250	ImageList objImageList = ImageList(ResId(lMin >= 24 ? IL_SYM_TO_IMAGES_L : IL_SYM_TO_IMAGES_S, ImplGetResMgr()));
		251	objImage = objImageList.GetImage(symbol_to_image_table[nSymbolId]);
		252
		253	return TRUE;
		254	}
		255
		256	// -----------------------------------------------------------------------
		257
215	Image::Image()	258	Image::Image()
216	{	259	{
217	DBG_CTOR( Image, NULL );	260	DBG_CTOR( Image, NULL );




    }

    if ( RSC_IMAGEBUTTON_SYMBOL & nObjMask )
    {
	SymbolType s = (SymbolType)ReadShortRes();

	Image objImage;

	if ( Image::GetImageForSymbol(s, GetSizePixel(), objImage) )
	{
	  SetImage(objImage);
	}
	else
	{
	  SetSymbol(s);
	}
    }

    if ( RSC_IMAGEBUTTON_STATE & nObjMask )
        SetState( (TriState)ReadShortRes() );

Return to issue 23151

Lines 177-179 Link Here

(-)vcl/source/src/images.src.orig (+23 lines)
177	File = "splvarw.bmp";	177	File = "splvarw.bmp";
178	};	178	};
179		179
		180	#define IMG_IDLIST \
		181	IdList = \
		182	{ \
		183	SID_OUTLINE_UP; \
		184	SID_OUTLINE_DOWN; \
		185	SID_OUTLINE_LEFT; \
		186	SID_OUTLINE_RIGHT; \
		187	}; \
		188	IdCount = { 4 ; };
		189
		190	ImageList IL_SYM_TO_IMAGES_L
		191	{
		192	ImageBitmap = Bitmap { File = "lc_imgs.bmp" ; };
		193	MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
		194	IMG_IDLIST
		195	};
		196
		197	ImageList IL_SYM_TO_IMAGES_S
		198	{
		199	ImageBitmap = Bitmap { File = "sc_imgs.bmp" ; };
		200	MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
		201	IMG_IDLIST
		202	};

Lines 3323-3329 Link Here

(-)vcl/source/control/button.cxx.orig (-1 / +14 lines)
3323	}	3323	}
3324		3324
3325	if ( RSC_IMAGEBUTTON_SYMBOL & nObjMask )	3325	if ( RSC_IMAGEBUTTON_SYMBOL & nObjMask )
3326	SetSymbol( (SymbolType)ReadShortRes() );	3326	{
		3327	SymbolType s = (SymbolType)ReadShortRes();
		3328
		3329	Image objImage;
		3330
		3331	if ( Image::GetImageForSymbol(s, GetSizePixel(), objImage) )
		3332	{
		3333	SetImage(objImage);
		3334	}
		3335	else
		3336	{
		3337	SetSymbol(s);
		3338	}
		3339	}
3327		3340
3328	if ( RSC_IMAGEBUTTON_STATE & nObjMask )	3341	if ( RSC_IMAGEBUTTON_STATE & nObjMask )
3329	SetState( (TriState)ReadShortRes() );	3342	SetState( (TriState)ReadShortRes() );