Kaydet (Commit) 01f62067 authored tarafından Caolán McNamara's avatar Caolán McNamara

split SV_RESID_BITMAP_MSGBOX up

Change-Id: I4ebf48e5def5fb31aa7e34b5b6f89b220a27d1a6
üst 3d0618db
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
......@@ -620,7 +620,10 @@ sw/res/sidebar/pageproppanel/last_custom_common.png svx/res/symphony/last_custom
sw/res/sidebar/pageproppanel/last_custom_common_grey.png svx/res/symphony/last_custom_common_grey.png
sw/res/styfamnu.png sw/res/sf05.png
vcl/res/closedoc.png sfx2/res/closedoc.png
vcl/source/src/msgbox.png vcl/res/msgbox.png
vcl/source/src/error.png vcl/res/errorbox.png
vcl/source/src/warningbox.png vcl/res/warningbox.png
vcl/source/src/infobox.png vcl/res/infobox.png
vcl/source/src/querybox.png vcl/res/querybox.png
xmlsecurity/res/signet_11x16.png svx/res/signet_11x16.png
# Mail merge
......
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
......@@ -60,7 +60,10 @@ cmd/lc_alignvcenter.png cmd/lc_alignverticalcenter.png
cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png
cmd/sc_commontaskbarvisible.png cmd/sc_autoformat.png
sd/res/sc05928.png cmd/sc_autoformat.png
vcl/source/src/msgbox.png vcl/res/msgbox.png
vcl/source/src/error.png vcl/res/errorbox.png
vcl/source/src/warningbox.png vcl/res/warningbox.png
vcl/source/src/infobox.png vcl/res/infobox.png
vcl/source/src/querybox.png vcl/res/querybox.png
desktop/res/extension_16.png cmd/sc_addons.png
res/sx03256.png cmd/sc_addons.png
res/extension_plus_26.png cmd/lc_addons.png
......
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
......@@ -194,7 +194,7 @@ struct ImplSVWinData
VclPtr<vcl::Window> mpExtTextInputWin; // Window, which is in ExtTextInput
VclPtr<vcl::Window> mpTrackWin; // window, that is in tracking mode
AutoTimer* mpTrackTimer = nullptr; // tracking timer
ImageList* mpMsgBoxImgList = nullptr; // ImageList for MessageBox
std::vector<Image> maMsgBoxImgList; // ImageList for MessageBox
VclPtr<vcl::Window> mpAutoScrollWin; // window, that is in AutoScrollMode mode
VclPtr<vcl::Window> mpLastWheelWindow; // window, that last received a mouse wheel event
SalWheelMouseEvent maLastWheelEvent; // the last received mouse whell event
......
......@@ -29,7 +29,10 @@
#define SV_RESID_BITMAP_CHECK 1000
#define SV_RESID_BITMAP_RADIO 1010
#define SV_RESID_BITMAP_MSGBOX 1020
#define SV_RESID_BITMAP_ERRORBOX 1020
#define SV_RESID_BITMAP_QUERYBOX 1021
#define SV_RESID_BITMAP_WARNINGBOX 1022
#define SV_RESID_BITMAP_INFOBOX 1023
#define SV_RESID_BITMAP_SPLITHPIN 1040
#define SV_RESID_BITMAP_SPLITVPIN 1041
......
......@@ -419,11 +419,7 @@ void DeInitVCL()
Scheduler::ImplDeInitScheduler();
if ( pSVData->maWinData.mpMsgBoxImgList )
{
delete pSVData->maWinData.mpMsgBoxImgList;
pSVData->maWinData.mpMsgBoxImgList = nullptr;
}
pSVData->maWinData.maMsgBoxImgList.clear();
if ( pSVData->maCtrlData.mpCheckImgList )
{
delete pSVData->maCtrlData.mpCheckImgList;
......
......@@ -74,9 +74,24 @@ Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
File = "radiomono.bmp";
};
Bitmap SV_RESID_BITMAP_MSGBOX
Bitmap SV_RESID_BITMAP_ERRORBOX
{
File = "msgbox.png";
File = "errorbox.png";
};
Bitmap SV_RESID_BITMAP_WARNINGBOX
{
File = "warningbox.png";
};
Bitmap SV_RESID_BITMAP_QUERYBOX
{
File = "querybox.png";
};
Bitmap SV_RESID_BITMAP_INFOBOX
{
File = "infobox.png";
};
Bitmap SV_RESID_BITMAP_CLOSEDOC
......
......@@ -38,15 +38,15 @@
static void ImplInitMsgBoxImageList()
{
ImplSVData* pSVData = ImplGetSVData();
if ( !pSVData->maWinData.mpMsgBoxImgList )
if (pSVData->maWinData.maMsgBoxImgList.empty())
{
ResMgr* pResMgr = ImplGetResMgr();
pSVData->maWinData.mpMsgBoxImgList = new ImageList();
if( pResMgr )
if (pResMgr)
{
Color aNonAlphaMask( 0xC0, 0xC0, 0xC0 );
pSVData->maWinData.mpMsgBoxImgList->InsertFromHorizontalBitmap
( ResId( SV_RESID_BITMAP_MSGBOX, *pResMgr ), 4, &aNonAlphaMask );
pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_ERRORBOX, *pResMgr))));
pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_QUERYBOX, *pResMgr))));
pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WARNINGBOX, *pResMgr))));
pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_INFOBOX, *pResMgr))));
}
}
}
......@@ -394,7 +394,7 @@ InfoBox::InfoBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage
Image InfoBox::GetStandardImage()
{
ImplInitMsgBoxImageList();
return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 4 );
return ImplGetSVData()->maWinData.maMsgBoxImgList[3];
}
WarningBox::WarningBox( vcl::Window* pParent, WinBits nStyle,
......@@ -418,7 +418,7 @@ void WarningBox::SetDefaultCheckBoxText()
Image WarningBox::GetStandardImage()
{
ImplInitMsgBoxImageList();
return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 3 );
return ImplGetSVData()->maWinData.maMsgBoxImgList[2];
}
ErrorBox::ErrorBox( vcl::Window* pParent, WinBits nStyle,
......@@ -444,7 +444,7 @@ Image ErrorBox::GetStandardImage()
// ucb and hence no ability to get this image, so nop.
return Image();
}
return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 1 );
return ImplGetSVData()->maWinData.maMsgBoxImgList[0];
}
QueryBox::QueryBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ) :
......@@ -467,7 +467,7 @@ void QueryBox::SetDefaultCheckBoxText()
Image QueryBox::GetStandardImage()
{
ImplInitMsgBoxImageList();
return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 2 );
return ImplGetSVData()->maWinData.maMsgBoxImgList[1];
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment