mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e*, f*: load BitmapEx resources instead of Image ones

Browse Source 
Change-Id: I3383e222829042557a8fd9f575049c47aeddeb09
This commit is contained in:
Caolán McNamara 2017-01-16 12:01:11 +00:00
parent d602f40488
commit 0bb8bcf1f8
13 changed files with 45 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/source/dbpilots/commonpagesdbp.cxx
View File

@ -361,9 +361,8 @@ namespace dbp
return;
}
Image aTableImage, aQueryImage;
aTableImage = Image( ModuleRes( IMG_TABLE ) );
aQueryImage = Image( ModuleRes( IMG_QUERY ) );
Image aTableImage(BitmapEx(ModuleRes(BMP_TABLE)));
Image aQueryImage(BitmapEx(ModuleRes(BMP_QUERY)));
lcl_fillEntries( *m_pTable, aTableNames, aTableImage, CommandType::TABLE );
lcl_fillEntries( *m_pTable, aQueryNames, aQueryImage, CommandType::QUERY );

9
extensions/source/dbpilots/commonpagesdbp.src
View File

@ -19,15 +19,14 @@
#include "dbpresid.hrc"
Image IMG_TABLE
Bitmap BMP_TABLE
{
ImageBitmap = Bitmap { File = "sx03188.png"; };
File = "sx03188.png";
};
Image IMG_QUERY
Bitmap BMP_QUERY
{
ImageBitmap = Bitmap { File = "sx03202.png"; };
File = "sx03202.png";
};
String RID_STR_OPTION_DB_FIELD_TITLE

4
extensions/source/dbpilots/dbpresid.hrc
View File

@ -80,8 +80,8 @@
// Image
#define IMG_TABLE ( RID_DIALOG_START + 1 )
#define IMG_QUERY ( RID_DIALOG_START + 2 )
#define BMP_TABLE ( RID_DIALOG_START + 1 )
#define BMP_QUERY ( RID_DIALOG_START + 2 )
#define WINDOW_SIZE_X 260
#define WINDOW_SIZE_Y 185

5
extensions/source/update/ui/updatecheckui.cxx
View File

@ -236,7 +236,6 @@ UpdateCheckUI::getImplementationName() throw (uno::RuntimeException, std::except
return ::getImplementationName();
}
uno::Sequence< OUString > SAL_CALL
UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
{
@ -249,7 +248,6 @@ UpdateCheckUI::supportsService( OUString const & serviceName ) throw (uno::Runti
return cppu::supportsService(this, serviceName);
}
Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
{
sal_uInt32 nResID;
@ -264,10 +262,9 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
else
nResID = RID_UPDATE_AVAILABLE_16;
return Image( ResId( nResID, *mpUpdResMgr ) );
return Image(BitmapEx(ResId(nResID, *mpUpdResMgr)));
}
Image UpdateCheckUI::GetBubbleImage( OUString &rURL )
{
Image aImage;

8
extensions/source/update/ui/updatecheckui.src
View File

@ -19,14 +19,14 @@
#include "updatecheckui.hrc"
Image RID_UPDATE_AVAILABLE_16
Bitmap RID_UPDATE_AVAILABLE_16
{
ImageBitmap = Bitmap{ file = "onlineupdate_16.png"; };
File = "onlineupdate_16.png";
};
Image RID_UPDATE_AVAILABLE_26
Bitmap RID_UPDATE_AVAILABLE_26
{
ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; };
File = "onlineupdate_26.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

30
formula/source/ui/dlg/formdlgs.src
View File

@ -20,24 +20,24 @@
#include "formdlgs.hrc"
#include "ForResId.hrc"
Image BMP_STR_CLOSE
Bitmap BMP_STR_CLOSE
{
ImageBitmap = Bitmap { File = "fapclose.png"; };
File = "fapclose.png";
};
Image BMP_STR_OPEN
Bitmap BMP_STR_OPEN
{
ImageBitmap = Bitmap { File = "fapopen.png"; };
File = "fapopen.png";
};
Image BMP_STR_END
Bitmap BMP_STR_END
{
ImageBitmap = Bitmap { File = "fapok.png"; };
File = "fapok.png";
};
Image BMP_STR_ERROR
Bitmap BMP_STR_ERROR
{
ImageBitmap = Bitmap { File = "faperror.png"; };
File = "faperror.png";
};
String STR_STRUCT_ERR1
@ -65,12 +65,9 @@ String STR_END
Text [ en-US ] = "~End" ;
};
Image RID_BMP_REFBTN1
Bitmap RID_BMP_REFBTN1
{
ImageBitmap = Bitmap
{
File = "refinp1.png";
};
File = "refinp1.png";
};
String RID_STR_SHRINK
@ -78,12 +75,9 @@ String RID_STR_SHRINK
Text [ en-US ] = "Shrink" ;
};
Image RID_BMP_REFBTN2
Bitmap RID_BMP_REFBTN2
{
ImageBitmap = Bitmap
{
File = "refinp2.png";
};
File = "refinp2.png";
};
String RID_STR_EXPAND

4
formula/source/ui/dlg/funcutl.cxx
View File

@ -525,8 +525,8 @@ IMPL_LINK_NOARG(RefEdit, UpdateHdl, Idle *, void)
//class RefButton
RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) :
ImageButton( _pParent, nStyle ),
aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
aImgRefStart(BitmapEx(ModuleRes(RID_BMP_REFBTN1))),
aImgRefDone(BitmapEx(ModuleRes(RID_BMP_REFBTN2))),
aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ),
aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ),
pAnyRefDlg( nullptr ),

8
formula/source/ui/dlg/parawin.cxx
View File

@ -58,13 +58,13 @@ ParaWin::ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg):
m_pFtArgDesc->SetText("");
get(m_pBtnFx1, "FX1");
m_pBtnFx1->SetModeImage(Image(ModuleRes( BMP_FX )));
m_pBtnFx1->SetModeImage(Image(BitmapEx(ModuleRes(BMP_FX))));
get(m_pBtnFx2, "FX2");
m_pBtnFx2->SetModeImage(Image(ModuleRes( BMP_FX )));
m_pBtnFx2->SetModeImage(Image(BitmapEx(ModuleRes(BMP_FX))));
get(m_pBtnFx3, "FX3");
m_pBtnFx3->SetModeImage(Image(ModuleRes( BMP_FX )));
m_pBtnFx3->SetModeImage(Image(BitmapEx(ModuleRes(BMP_FX))));
get(m_pBtnFx4, "FX4");
m_pBtnFx4->SetModeImage(Image(ModuleRes( BMP_FX )));
m_pBtnFx4->SetModeImage(Image(BitmapEx(ModuleRes(BMP_FX))));
get(m_pFtArg1, "FT_ARG1");
get(m_pFtArg2, "FT_ARG2");

4
formula/source/ui/dlg/parawin.src
View File

@ -19,9 +19,9 @@
#include "ForResId.hrc"
Image BMP_FX
Bitmap BMP_FX
{
ImageBitmap = Bitmap { File = "fx.png" ; };
File = "fx.png";
};
String STR_OPTIONAL

8
formula/source/ui/dlg/structpg.cxx
View File

@ -82,8 +82,8 @@ VCL_BUILDER_FACTORY_ARGS(StructListBox, WB_BORDER)
StructPage::StructPage(vcl::Window* pParent):
TabPage(pParent, "StructPage", "formula/ui/structpage.ui"),
maImgEnd ( ModuleRes( BMP_STR_END ) ),
maImgError ( ModuleRes( BMP_STR_ERROR ) ),
maImgEnd(BitmapEx(ModuleRes(BMP_STR_END))),
maImgError(BitmapEx(ModuleRes(BMP_STR_ERROR))),
pSelectedToken ( nullptr )
{
get(m_pTlbStruct, "struct");
@ -94,8 +94,8 @@ StructPage::StructPage(vcl::Window* pParent):
WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION);
m_pTlbStruct->SetNodeDefaultImages();
m_pTlbStruct->SetDefaultExpandedEntryBmp( Image( ModuleRes( BMP_STR_OPEN ) ) );
m_pTlbStruct->SetDefaultCollapsedEntryBmp( Image( ModuleRes( BMP_STR_CLOSE ) ) );
m_pTlbStruct->SetDefaultExpandedEntryBmp(Image(BitmapEx(ModuleRes(BMP_STR_OPEN))));
m_pTlbStruct->SetDefaultCollapsedEntryBmp(Image(BitmapEx(ModuleRes(BMP_STR_CLOSE))));
m_pTlbStruct->SetSelectHdl(LINK( this, StructPage, SelectHdl ) );

4
framework/inc/classes/resource.hrc
View File

@ -53,8 +53,8 @@
#define STR_REMOTE_TITLE (RID_STR_START+26)
#define STR_SAFEMODE_TITLE (RID_STR_START+27)
#define IMG_SAVEMODIFIED_SMALL (RID_IMAGE_START+0)
#define IMG_SAVEMODIFIED_LARGE (RID_IMAGE_START+1)
#define BMP_SAVEMODIFIED_SMALL (RID_IMAGE_START+0)
#define BMP_SAVEMODIFIED_LARGE (RID_IMAGE_START+1)
#define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION (RID_MENU_START+0)

9
framework/source/classes/resource.src
View File

@ -204,13 +204,14 @@ String STR_LANGSTATUS_HINT
Text [ en-US ] = "Text Language. Right-click to set character or paragraph language" ;
};
Image IMG_SAVEMODIFIED_SMALL
Bitmap BMP_SAVEMODIFIED_SMALL
{
ImageBitmap = Bitmap{File = "savemodified_small.png";};
File = "savemodified_small.png";
};
Image IMG_SAVEMODIFIED_LARGE
Bitmap BMP_SAVEMODIFIED_LARGE
{
ImageBitmap = Bitmap{File = "savemodified_large.png";};
File = "savemodified_large.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
framework/source/uielement/popuptoolbarcontroller.cxx
View File

@ -515,7 +515,7 @@ void SaveToolbarController::updateImage()
}
else if ( m_bModified )
{
Image aResImage(eImageType == vcl::ImageType::Size16 ? FwkResId(IMG_SAVEMODIFIED_SMALL) : FwkResId(IMG_SAVEMODIFIED_LARGE));
Image aResImage(BitmapEx(eImageType == vcl::ImageType::Size16 ? FwkResId(BMP_SAVEMODIFIED_SMALL) : FwkResId(BMP_SAVEMODIFIED_LARGE)));
aImage = aResImage;
}