basctl/source/basicide/bastype2.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 12
cppuhelper/source/tdmgr.cxx | 10
include/svx/dialogs.hrc | 151 ++++----
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 6
sd/inc/glob.hrc | 6
sd/source/ui/animations/CustomAnimation.hrc | 20 -
sd/source/ui/animations/CustomAnimation.src | 41 +-
sd/source/ui/animations/CustomAnimationList.cxx | 26 -
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/app/res_bmp.src | 21 -
sd/source/ui/dlg/navigatr.cxx | 8
sd/source/ui/inc/res_bmp.hrc | 6
sd/source/ui/slidesorter/inc/view/SlsResource.hrc | 32 -
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx | 2
sd/source/ui/slidesorter/view/SlsResource.hxx | 40 --
sd/source/ui/slidesorter/view/SlsResource.src | 33 -
sd/source/ui/slidesorter/view/SlsTheme.cxx | 25 -
sfx2/inc/doc.hrc | 4
sfx2/source/control/dispatch.cxx | 2
sfx2/source/control/recentdocsview.cxx | 2
sfx2/source/control/recentdocsviewitem.cxx | 4
sfx2/source/control/templateview.hrc | 8
sfx2/source/control/templateview.src | 10
sfx2/source/control/templateviewitem.cxx | 2
sfx2/source/dialog/dialog.hrc | 2
sfx2/source/dialog/dialog.src | 7
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/dinfdlg.src | 4
sfx2/source/dialog/titledockwin.cxx | 4
sfx2/source/dialog/titledockwin.src | 4
sfx2/source/doc/doc.src | 14
sfx2/source/doc/templatedlg.cxx | 4
sfx2/source/inc/sfxlocal.hrc | 4
svx/source/dialog/docrecovery.cxx | 6
svx/source/dialog/fontwork.cxx | 8
svx/source/dialog/langbox.cxx | 4
svx/source/dialog/langbox.src | 8
svx/source/dialog/sdstring.src | 28 -
svx/source/engine3d/float3d.cxx | 4
svx/source/engine3d/float3d.src | 12
svx/source/sidebar/area/AreaPropertyPanel.src | 29 -
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 12
svx/source/sidebar/line/LinePropertyPanel.src | 53 +-
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 18 -
svx/source/sidebar/line/LineWidthPopup.cxx | 4
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2
svx/source/sidebar/paragraph/ParaPropertyPanel.src | 9
svx/source/stbctrls/modctrl.cxx | 6
svx/source/stbctrls/pszctrl.cxx | 5
svx/source/stbctrls/selctrl.cxx | 3
svx/source/stbctrls/stbctrls.src | 103 ++---
svx/source/stbctrls/xmlsecctrl.cxx | 6
svx/source/stbctrls/zoomctrl.cxx | 2
svx/source/stbctrls/zoomsliderctrl.cxx | 6
svx/source/tbxctrls/extrusioncontrols.cxx | 38 +-
svx/source/tbxctrls/extrusioncontrols.src | 196 +++++------
svx/source/tbxctrls/fontworkgallery.cxx | 10
svx/source/tbxctrls/fontworkgallery.src | 20 -
svx/source/tbxctrls/grafctrl.cxx | 22 -
svx/source/tbxctrls/tbcontrl.src | 44 +-
vcl/unx/generic/printer/ppdparser.cxx | 12
wizards/source/importwizard/DialogModul.xba | 2
wizards/source/importwizard/FilesModul.xba | 2
wizards/source/tools/ModuleControls.xba | 2
65 files changed, 534 insertions(+), 662 deletions(-)
New commits:
commit ecd82b5121899fe23f0ccbdd8a89c8b18436f027
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 13:34:31 2017 +0000
Related: tdf#80731 bug in our own wizards revealed by new bracket test
Change-Id: Iec49bf80794a4ba61a70b22d0fc1769349ca4508
diff --git a/wizards/source/importwizard/DialogModul.xba
b/wizards/source/importwizard/DialogModul.xba
index 65fb1f2..e552669 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -375,7 +375,7 @@ Dim sPath as String
ElseIf oCheckbox.State = 0 Then
CheckControlPath = True
Else
- sPath = ConvertToUrl(Trim(oTextBox.Text)
+ sPath = ConvertToUrl(Trim(oTextBox.Text))
CheckControlPath = oUcb.Exists(sPath)
End If
End Function
diff --git a/wizards/source/importwizard/FilesModul.xba
b/wizards/source/importwizard/FilesModul.xba
index c796cad..1e6363f 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -327,7 +327,7 @@ Dim sPrevMimeTypeorExtension as String
CurFiltername = GetFilterName(sMimeTypeorExtension,
sFilterName(), sExtension, FilterIndex)
ApplIndex = FilesList(i,2)
If sMimeTypeorExtension <>
sPrevMimeTypeorExtension Then
- CreateLogTable(ApplIndex, sMimeTypeOrExtension,
sFiltername()
+ CreateLogTable(ApplIndex, sMimeTypeOrExtension,
sFiltername())
End If
If ApplIndex > Ubound(Applications) or (ApplIndex
< 0) Then
Msgbox "Applicationindex out of
bounds:" & sSourcUrl
diff --git a/wizards/source/tools/ModuleControls.xba
b/wizards/source/tools/ModuleControls.xba
index 96f23ad..300b6ee 100644
--- a/wizards/source/tools/ModuleControls.xba
+++ b/wizards/source/tools/ModuleControls.xba
@@ -311,7 +311,7 @@ Dim sProdName as String
Filternames(i,0) = ReplaceString(Filternames(i,0),
sProdName,"%productname%")
oDialog.AppendFilter(FilterNames(i,0), FilterNames(i,1))
Next i
- oDialog.SetCurrentFilter(FilterNames(0,0)
+ oDialog.SetCurrentFilter(FilterNames(0,0))
End Sub
commit ef306355851e9b6591e9f3fb9476d5bbd548d9ba
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 14:28:30 2017 +0000
these used to OSL_TRACE, quiten them to SAL_INFO
Change-Id: Iec429b986a55a847baceb2e84752a380c6db831a
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index d78260c..38c5375 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -589,15 +589,13 @@ static void SAL_CALL typelib_callback(
*ppRet = createCTD( access, xTD );
}
}
- catch (container::NoSuchElementException & exc)
+ catch (const container::NoSuchElementException & exc)
{
- (void) exc; // avoid warning about unused variable
- SAL_WARN("cppuhelper", "typelibrary type not available: " <<
exc.Message );
+ SAL_INFO("cppuhelper", "typelibrary type not available: " <<
exc.Message );
}
- catch (Exception & exc)
+ catch (const Exception & exc)
{
- (void) exc; // avoid warning about unused variable
- SAL_WARN("cppuhelper", exc.Message );
+ SAL_INFO("cppuhelper", exc.Message );
}
}
}
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index b56fa9c..91625cc 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -560,7 +560,7 @@ void SfxDispatcher::Pop(SfxShell& rShell,
SfxDispatcherPopFlags nMode)
xImp->aToDoStack.push_front( SfxToDo_Impl(bPush, bDelete, bUntil,
rShell) );
if (xImp->bFlushed)
{
- SAL_WARN("sfx.control", "Unflushed dispatcher!");
+ SAL_INFO("sfx.control", "Unflushed dispatcher!");
xImp->bFlushed = false;
xImp->bUpdated = false;
commit 5a5cd0ac64c9a56f6d680a2aec2821c8d888f688
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 14:23:13 2017 +0000
silence warning spew, these aren't serious
Change-Id: I8c027a5ec0ed61722eb299d247d79032fd1dcd84
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 234ed35..012ec95 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -739,19 +739,13 @@ PPDParser::PPDParser( const OUString& rFile ) :
if (m_pResolutions == nullptr) {
SAL_WARN( "vcl.unx.print", "no Resolution in " << m_aFile);
}
- if (m_pDefaultResolution == nullptr) {
- SAL_WARN( "vcl.unx.print", "no DefaultResolution in " + m_aFile);
- }
+ SAL_INFO_IF(!m_pDefaultResolution, "vcl.unx.print", "no DefaultResolution
in " + m_aFile);
m_pInputSlots = getKey( OUString( "InputSlot" ) );
if( m_pInputSlots )
m_pDefaultInputSlot = m_pInputSlots->getDefaultValue();
- if (m_pInputSlots == nullptr) {
- SAL_WARN( "vcl.unx.print", "no InputSlot in " << m_aFile);
- }
- if (m_pDefaultInputSlot == nullptr) {
- SAL_WARN( "vcl.unx.print", "no DefaultInputSlot in " << m_aFile);
- }
+ SAL_INFO_IF(!m_pInputSlots, "vcl.unx.print", "no InputSlot in " <<
m_aFile);
+ SAL_INFO_IF(!m_pDefaultInputSlot, "vcl.unx.print", "no DefaultInputSlot in
" << m_aFile);
m_pDuplexTypes = getKey( OUString( "Duplex" ) );
if( m_pDuplexTypes )
commit 484658f9df81b06e7444b5c7c2cc7841abf829e7
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 14:19:42 2017 +0000
missed a conversion here
Change-Id: I7c422c9700b960248450181c950394f72504e7ea
diff --git a/basctl/source/basicide/bastype2.cxx
b/basctl/source/basicide/bastype2.cxx
index 65be3ce..a50abbe 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -271,7 +271,7 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry*
pDocumentRootEntry, cons
{
AddEntry(
aLibName,
- Image( IDEResId( nId ) ),
+ Image(BitmapEx(IDEResId(nId))),
pDocumentRootEntry, true,
o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY));
}
commit 8211548e7d76fe1b6e022f3db7301bb63aaa66ec
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 11:29:11 2017 +0000
svx: load BitmapEx resources instead of Image ones
Change-Id: Id23523170f757361f3fc3d8a18b6db827f45d109
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 3151d6c..a877896 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -42,7 +42,7 @@ LightButton::LightButton( vcl::Window* pParent)
: ImageButton( pParent)
, m_bLightOn(false)
{
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
+ SetModeImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_OFF))));
}
VCL_BUILDER_FACTORY(LightButton)
@@ -54,11 +54,11 @@ void LightButton::switchLightOn(bool bOn)
m_bLightOn = bOn;
if(m_bLightOn)
{
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON) ) );
+ SetModeImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_ON))));
}
else
{
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
+ SetModeImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_OFF))));
}
}
@@ -97,9 +97,9 @@ void LightSourceInfo::initButtonFromSource()
{
if(!pButton)
return;
- pButton->SetModeImage( Image( SVX_RES(
- aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON :
RID_SVXIMAGE_LIGHT_OFF
- ) ) );
+ pButton->SetModeImage(Image(BitmapEx(SVX_RES(
+ aLightSource.bIsEnabled ? RID_SVXBMP_LAMP_ON : RID_SVXBMP_LAMP_OFF
+ ) ) ));
}
namespace
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 6f30c40..ee81ddd 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -141,9 +141,9 @@
// ResId's fuer Dialoge aus StarDraw
#define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289)
-#define RID_SVXIMAGE_LIGHT_ON (RID_SVX_START + 210)
-#define RID_SVXIMAGE_LIGHT_OFF (RID_SVX_START + 211)
-#define RID_SVXIMAGE_COLORDLG (RID_SVX_START + 214)
+#define RID_SVXBMP_LAMP_ON (RID_SVX_START + 210)
+#define RID_SVXBMP_LAMP_OFF (RID_SVX_START + 211)
+#define RID_SVXBMP_COLORDLG (RID_SVX_START + 214)
#define RID_SVXFLOAT3D_FAVORITE (RID_SVX_START + 73)
#define RID_SVXFLOAT3D_FIX_R (RID_SVX_START + 77)
@@ -157,17 +157,9 @@
#define RID_SVXMNU_PSZ_FUNC (RID_SVX_START + 83)
#define RID_SVXMNU_XMLSECSTATBAR (RID_SVX_START + 84)
-// ResId for position and size bitmap
-#define RID_SVXBMP_POSITION (RID_SVX_START + 85)
-#define RID_SVXBMP_SIZE (RID_SVX_START + 86)
-
-#define RID_SVXBMP_SIGNET (RID_SVX_START + 87)
-#define RID_SVXBMP_SIGNET_BROKEN (RID_SVX_START + 89)
-#define RID_SVXBMP_SIGNET_NOTVALIDATED (RID_SVX_START + 91)
-
-#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 67)
-#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68)
-#define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 69)
+#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 66)
+#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 67)
+#define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 68)
#define RID_SVXBMP_GROUP_CLOSED (RID_SVX_START + 69)
#define RID_SVXBMP_GROUP_OPEN (RID_SVX_START + 70)
@@ -217,6 +209,14 @@
#define RID_SVXBMP_FRMSEL_ARROW15 (RID_SVX_START + 109)
#define RID_SVXBMP_FRMSEL_ARROW16 (RID_SVX_START + 110)
+// ResId for position and size bitmap
+#define RID_SVXBMP_POSITION (RID_SVX_START + 111)
+#define RID_SVXBMP_SIZE (RID_SVX_START + 112)
+
+#define RID_SVXBMP_SIGNET (RID_SVX_START + 113)
+#define RID_SVXBMP_SIGNET_BROKEN (RID_SVX_START + 114)
+#define RID_SVXBMP_SIGNET_NOTVALIDATED (RID_SVX_START + 115)
+
// for Toolbox-Control style
#define RID_SVX_STYLE_MENU (RID_SVX_START + 121)
#define RID_SVX_UPDATE_STYLE (RID_SVX_START + 122)
@@ -234,8 +234,8 @@
#define RID_UNODRAW_OLE2 (RID_SVX_START + 234)
#define RID_UNODRAW_GRAPHICS (RID_SVX_START + 235)
-#define RID_SVXIMG_NOTCHECKED (RID_SVX_START + 243)
-#define RID_SVXIMG_CHECKED (RID_SVX_START + 244)
+#define RID_SVXBMP_NOTCHECKED (RID_SVX_START + 243)
+#define RID_SVXBMP_CHECKED (RID_SVX_START + 244)
#define RID_SIDEBAR_EMPTY_PANEL_TEXT (RID_SVX_START + 321)
@@ -361,12 +361,12 @@
#define RID_SVXBMP_GRAF_GAMMA (RID_SVX_START + 477)
#define RID_SVXBMP_GRAF_TRANSPARENCE (RID_SVX_START + 478)
-#define RID_SVXIMG_DEPTH_INFINITY (RID_SVX_START + 482)
-#define RID_SVXIMG_DEPTH_0 (RID_SVX_START + 483)
-#define RID_SVXIMG_DEPTH_1 (RID_SVX_START + 484)
-#define RID_SVXIMG_DEPTH_2 (RID_SVX_START + 485)
-#define RID_SVXIMG_DEPTH_3 (RID_SVX_START + 486)
-#define RID_SVXIMG_DEPTH_4 (RID_SVX_START + 487)
+#define RID_SVXBMP_DEPTH_INFINITY (RID_SVX_START + 482)
+#define RID_SVXBMP_DEPTH_0 (RID_SVX_START + 483)
+#define RID_SVXBMP_DEPTH_1 (RID_SVX_START + 484)
+#define RID_SVXBMP_DEPTH_2 (RID_SVX_START + 485)
+#define RID_SVXBMP_DEPTH_3 (RID_SVX_START + 486)
+#define RID_SVXBMP_DEPTH_4 (RID_SVX_START + 487)
// Defines for the 3D engine
#define RID_SVX_3D_UNDO_EXCHANGE_PASTE (RID_SVX_START + 489)
@@ -396,10 +396,10 @@
#define STR_INSERT_SOUND_TITLE (RID_SVX_START + 529)
#define STR_INSERT_VIDEO_TITLE (RID_SVX_START + 530)
-#define RID_SVXIMG_WIRE_FRAME (RID_SVX_START + 532)
-#define RID_SVXIMG_MATTE (RID_SVX_START + 533)
-#define RID_SVXIMG_PLASTIC (RID_SVX_START + 534)
-#define RID_SVXIMG_METAL (RID_SVX_START + 535)
+#define RID_SVXBMP_WIRE_FRAME (RID_SVX_START + 532)
+#define RID_SVXBMP_MATTE (RID_SVX_START + 533)
+#define RID_SVXBMP_PLASTIC (RID_SVX_START + 534)
+#define RID_SVXBMP_METAL (RID_SVX_START + 535)
// BM: some additional standard colors
#define RID_SVXSTR_COLOR_VIOLET (RID_SVX_START + 540)
@@ -1011,28 +1011,28 @@
// sidebar-related resources
#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1241)
-#define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 0)
-#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 1)
-#define IMG_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21)
-#define IMG_WIDTH1_ICON (RID_SVX_SIDEBAR_BEGIN + 22)
-#define IMG_WIDTH2_ICON (RID_SVX_SIDEBAR_BEGIN + 23)
-#define IMG_WIDTH3_ICON (RID_SVX_SIDEBAR_BEGIN + 24)
-#define IMG_WIDTH4_ICON (RID_SVX_SIDEBAR_BEGIN + 25)
-#define IMG_WIDTH5_ICON (RID_SVX_SIDEBAR_BEGIN + 26)
-#define IMG_WIDTH6_ICON (RID_SVX_SIDEBAR_BEGIN + 27)
-#define IMG_WIDTH7_ICON (RID_SVX_SIDEBAR_BEGIN + 28)
-#define IMG_WIDTH8_ICON (RID_SVX_SIDEBAR_BEGIN + 29)
-#define IMG_AXIAL (RID_SVX_SIDEBAR_BEGIN + 30)
-#define IMG_ELLI (RID_SVX_SIDEBAR_BEGIN + 31)
-#define IMG_QUAD (RID_SVX_SIDEBAR_BEGIN + 32)
-#define IMG_RADIAL (RID_SVX_SIDEBAR_BEGIN + 33)
-#define IMG_SQUARE (RID_SVX_SIDEBAR_BEGIN + 34)
-#define IMG_LINEAR (RID_SVX_SIDEBAR_BEGIN + 35)
+#define BMP_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 0)
+#define BMP_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 1)
+#define BMP_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21)
+#define BMP_WIDTH1_ICON (RID_SVX_SIDEBAR_BEGIN + 22)
+#define BMP_WIDTH2_ICON (RID_SVX_SIDEBAR_BEGIN + 23)
+#define BMP_WIDTH3_ICON (RID_SVX_SIDEBAR_BEGIN + 24)
+#define BMP_WIDTH4_ICON (RID_SVX_SIDEBAR_BEGIN + 25)
+#define BMP_WIDTH5_ICON (RID_SVX_SIDEBAR_BEGIN + 26)
+#define BMP_WIDTH6_ICON (RID_SVX_SIDEBAR_BEGIN + 27)
+#define BMP_WIDTH7_ICON (RID_SVX_SIDEBAR_BEGIN + 28)
+#define BMP_WIDTH8_ICON (RID_SVX_SIDEBAR_BEGIN + 29)
+#define BMP_AXIAL (RID_SVX_SIDEBAR_BEGIN + 30)
+#define BMP_ELLI (RID_SVX_SIDEBAR_BEGIN + 31)
+#define BMP_QUAD (RID_SVX_SIDEBAR_BEGIN + 32)
+#define BMP_RADIAL (RID_SVX_SIDEBAR_BEGIN + 33)
+#define BMP_SQUARE (RID_SVX_SIDEBAR_BEGIN + 34)
+#define BMP_LINEAR (RID_SVX_SIDEBAR_BEGIN + 35)
#define RID_SVX_SIDEBAR_END (RID_SVX_START + 1279)
-#define RID_SVXIMG_GREENCHECK (RID_SVX_START + 1280)
-#define RID_SVXIMG_YELLOWCHECK (RID_SVX_START + 1281)
-#define RID_SVXIMG_REDCROSS (RID_SVX_START + 1282)
+#define RID_SVXBMP_GREENCHECK (RID_SVX_START + 1280)
+#define RID_SVXBMP_YELLOWCHECK (RID_SVX_START + 1281)
+#define RID_SVXBMP_REDCROSS (RID_SVX_START + 1282)
#define RID_SVXSTR_SUCCESSRECOV (RID_SVX_START + 1283)
#define RID_SVXSTR_ORIGDOCRECOV (RID_SVX_START + 1284)
#define RID_SVXSTR_RECOVFAILED (RID_SVX_START + 1285)
@@ -1057,35 +1057,35 @@
#define RID_SVXSTR_CHARS_SPACING_VERY_LOOSE (RID_SVX_START + 1305)
#define RID_SVXSTR_CHARS_SPACING_CUSTOM (RID_SVX_START + 1306)
#define RID_SVXSTR_CHARS_SPACING_KERN_PAIRS (RID_SVX_START + 1307)
-#define RID_SVXIMG_DIRECTION (RID_SVX_START + 1308) // needs 10
resource ids
-#define RID_SVXIMG_PERSPECTIVE (RID_SVX_START + 1318)
-#define RID_SVXIMG_PARALLEL (RID_SVX_START + 1319)
+#define RID_SVXBMP_DIRECTION (RID_SVX_START + 1308) // needs 10
resource ids
+#define RID_SVXBMP_PERSPECTIVE (RID_SVX_START + 1318)
+#define RID_SVXBMP_PARALLEL (RID_SVX_START + 1319)
#define RID_SVXSTR_DIRECTION (RID_SVX_START + 1320) // needs 10
resource ids
#define RID_SVXSTR_PERSPECTIVE (RID_SVX_START + 1330)
#define RID_SVXSTR_PARALLEL (RID_SVX_START + 1331)
#define RID_SVXSTR_BRIGHT (RID_SVX_START + 1332)
#define RID_SVXSTR_NORMAL (RID_SVX_START + 1333)
#define RID_SVXSTR_DIM (RID_SVX_START + 1334)
-#define RID_SVXIMG_LIGHT_OFF (RID_SVX_START + 1335) // needs 10
resource ids
-#define RID_SVXIMG_LIGHT_ON (RID_SVX_START + 1345) // needs 10
resource ids
-#define RID_SVXIMG_LIGHT_PREVIEW (RID_SVX_START + 1355) // needs 10
resource ids
-#define RID_SVXIMG_LIGHTING_BRIGHT (RID_SVX_START + 1365)
-#define RID_SVXIMG_LIGHTING_NORMAL (RID_SVX_START + 1366)
-#define RID_SVXIMG_LIGHTING_DIM (RID_SVX_START + 1367)
+#define RID_SVXBMP_LIGHT_OFF (RID_SVX_START + 1335) // needs 10
resource ids
+#define RID_SVXBMP_LIGHT_ON (RID_SVX_START + 1345) // needs 10
resource ids
+#define RID_SVXBMP_LIGHT_PREVIEW (RID_SVX_START + 1355) // needs 10
resource ids
+#define RID_SVXBMP_LIGHTING_BRIGHT (RID_SVX_START + 1365)
+#define RID_SVXBMP_LIGHTING_NORMAL (RID_SVX_START + 1366)
+#define RID_SVXBMP_LIGHTING_DIM (RID_SVX_START + 1367)
#define RID_SVXSTR_ALIGN_LEFT (RID_SVX_START + 1368)
#define RID_SVXSTR_ALIGN_CENTER (RID_SVX_START + 1369)
#define RID_SVXSTR_ALIGN_RIGHT (RID_SVX_START + 1370)
#define RID_SVXSTR_ALIGN_WORD (RID_SVX_START + 1371)
#define RID_SVXSTR_ALIGN_STRETCH (RID_SVX_START + 1372)
-#define RID_SVXIMG_FONTWORK_ALIGN_LEFT (RID_SVX_START + 1373)
-#define RID_SVXIMG_FONTWORK_ALIGN_CENTER (RID_SVX_START + 1374)
-#define RID_SVXIMG_FONTWORK_ALIGN_RIGHT (RID_SVX_START + 1375)
-#define RID_SVXIMG_FONTWORK_ALIGN_WORD (RID_SVX_START + 1376)
-#define RID_SVXIMG_FONTWORK_ALIGN_STRETCH (RID_SVX_START + 1377)
-#define RID_SVXIMG_SHADOW_ANGLE (RID_SVX_START + 1378)
-#define RID_SVXIMG_SHADOW_SIZE (RID_SVX_START + 1379)
-#define RID_SVXIMG_SHADOW_XDIST (RID_SVX_START + 1380)
-#define RID_SVXIMG_SHADOW_YDIST (RID_SVX_START + 1381)
+#define RID_SVXBMP_FONTWORK_ALIGN_LEFT (RID_SVX_START + 1373)
+#define RID_SVXBMP_FONTWORK_ALIGN_CENTER (RID_SVX_START + 1374)
+#define RID_SVXBMP_FONTWORK_ALIGN_RIGHT (RID_SVX_START + 1375)
+#define RID_SVXBMP_FONTWORK_ALIGN_WORD (RID_SVX_START + 1376)
+#define RID_SVXBMP_FONTWORK_ALIGN_STRETCH (RID_SVX_START + 1377)
+#define RID_SVXBMP_SHADOW_ANGLE (RID_SVX_START + 1378)
+#define RID_SVXBMP_SHADOW_SIZE (RID_SVX_START + 1379)
+#define RID_SVXBMP_SHADOW_XDIST (RID_SVX_START + 1380)
+#define RID_SVXBMP_SHADOW_YDIST (RID_SVX_START + 1381)
#define RID_SVXSTR_ZOOM_25 (RID_SVX_START + 1382)
#define RID_SVXSTR_ZOOM_50 (RID_SVX_START + 1383)
#define RID_SVXSTR_ZOOM_75 (RID_SVX_START + 1384)
@@ -1098,8 +1098,8 @@
#define RID_SVXSTR_WIDTH_LAST_CUSTOM (RID_SVX_START + 1391)
#define RID_SVXSTR_PT (RID_SVX_START + 1392)
-#define RID_SVXIMG_WIDTH_CUSTOM (RID_SVX_START + 1393)
-#define RID_SVXIMG_WIDTH_CUSTOM_GRAY (RID_SVX_START + 1394)
+#define RID_SVXBMP_WIDTH_CUSTOM (RID_SVX_START + 1393)
+#define RID_SVXBMP_WIDTH_CUSTOM_GRAY (RID_SVX_START + 1394)
#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 1395)
#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 1396)
#define RID_SVXSTRARY_NUMBERINGTYPE (RID_SVX_START + 1397)
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index a380905..2c09eae 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -221,9 +221,9 @@ ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent,
aLogicalSize( 115, 40 ),
m_xDispatchProvider( rDispatchProvider )
{
- mpImpl->maSliderButton = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON )
);
- mpImpl->maIncreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE )
);
- mpImpl->maDecreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERDECREASE )
);
+ mpImpl->maSliderButton =
Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERBUTTON)));
+ mpImpl->maIncreaseButton =
Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERINCREASE)));
+ mpImpl->maDecreaseButton =
Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERDECREASE)));
Size aSliderSize = LogicToPixel( Size( aLogicalSize), MapMode(
MapUnit::Map10thMM ) );
SetSizePixel( Size( aSliderSize.Width() * nSliderWidth-1,
aSliderSize.Height() + nSliderHeight ) );
}
diff --git a/svx/source/dialog/docrecovery.cxx
b/svx/source/dialog/docrecovery.cxx
index 032c15f..f257c3c 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -814,9 +814,9 @@ void RecovDocListEntry::Paint(const Point& aPos,
SvTreeListBox& aDevice, vcl::Re
RecovDocList::RecovDocList(SvSimpleTableContainer& rParent, ResMgr &rResMgr)
: SvSimpleTable ( rParent )
- , m_aGreenCheckImg ( ResId(RID_SVXIMG_GREENCHECK, rResMgr ) )
- , m_aYellowCheckImg ( ResId(RID_SVXIMG_YELLOWCHECK, rResMgr ) )
- , m_aRedCrossImg ( ResId(RID_SVXIMG_REDCROSS, rResMgr ) )
+ , m_aGreenCheckImg (BitmapEx(ResId(RID_SVXBMP_GREENCHECK, rResMgr)))
+ , m_aYellowCheckImg (BitmapEx(ResId(RID_SVXBMP_YELLOWCHECK, rResMgr)))
+ , m_aRedCrossImg (BitmapEx(ResId(RID_SVXBMP_REDCROSS, rResMgr)))
, m_aSuccessRecovStr ( ResId(RID_SVXSTR_SUCCESSRECOV, rResMgr ) )
, m_aOrigDocRecovStr ( ResId(RID_SVXSTR_ORIGDOCRECOV, rResMgr ) )
, m_aRecovFailedStr ( ResId(RID_SVXSTR_RECOVFAILED, rResMgr ) )
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index b668941..86b37f0 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -803,13 +803,13 @@ void SvxFontWorkDialog::ApplyImageList()
{
if (nLastShadowTbxId == nShadowSlantId)
{
- m_pFbShadowX->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_ANGLE)));
- m_pFbShadowY->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_SIZE)));
+
m_pFbShadowX->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_ANGLE))));
+
m_pFbShadowY->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_SIZE))));
}
else
{
- m_pFbShadowX->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_XDIST)));
- m_pFbShadowY->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_YDIST)));
+
m_pFbShadowX->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_XDIST))));
+
m_pFbShadowY->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_YDIST))));
}
}
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 4734089..60e5278 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -140,8 +140,8 @@ SvxLanguageBoxBase::SvxLanguageBoxBase()
void SvxLanguageBoxBase::ImplLanguageBoxBaseInit()
{
- m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) );
- m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) );
+ m_aNotCheckedImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_NOTCHECKED)));
+ m_aCheckedImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_CHECKED)));
m_aAllString = SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL );
m_nLangList = SvxLanguageListFlags::EMPTY;
m_bHasLangNone = false;
diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src
index 9960187..133dc1f 100644
--- a/svx/source/dialog/langbox.src
+++ b/svx/source/dialog/langbox.src
@@ -19,14 +19,14 @@
#include <svx/dialogs.hrc>
-Image RID_SVXIMG_NOTCHECKED
+Bitmap RID_SVXBMP_NOTCHECKED
{
- ImageBitmap = Bitmap { File = "notcheck.png" ; } ;
+ File = "notcheck.png";
};
-Image RID_SVXIMG_CHECKED
+Bitmap RID_SVXBMP_CHECKED
{
- ImageBitmap = Bitmap { File = "lngcheck.png" ; } ;
+ File = "lngcheck.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 3bf08a9..79fc0f1 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -2295,39 +2295,39 @@ String RID_SVXSTR_VIEW
Text [ en-US ] = "List" ;
};
-Image RID_SVXIMG_GREENCHECK
+Bitmap RID_SVXBMP_GREENCHECK
{
- ImageBitmap = Bitmap { File = "nu01.png"; };
+ File = "nu01.png";
};
-Image RID_SVXIMG_YELLOWCHECK
+Bitmap RID_SVXBMP_YELLOWCHECK
{
- ImageBitmap = Bitmap { File = "nu04.png"; };
+ File = "nu04.png";
};
-Image RID_SVXIMG_REDCROSS
+Bitmap RID_SVXBMP_REDCROSS
{
- ImageBitmap = Bitmap { File = "nu02.png"; };
+ File = "nu02.png";
};
-Image RID_SVXIMG_SHADOW_ANGLE
+Bitmap RID_SVXBMP_SHADOW_ANGLE
{
- ImageBitmap = Bitmap { File = "fw018.png"; };
+ File = "fw018.png";
};
-Image RID_SVXIMG_SHADOW_SIZE
+Bitmap RID_SVXBMP_SHADOW_SIZE
{
- ImageBitmap = Bitmap { File = "fw019.png"; };
+ File = "fw019.png";
};
-Image RID_SVXIMG_SHADOW_XDIST
+Bitmap RID_SVXBMP_SHADOW_XDIST
{
- ImageBitmap = Bitmap { File = "fw016.png"; };
+ File = "fw016.png";
};
-Image RID_SVXIMG_SHADOW_YDIST
+Bitmap RID_SVXBMP_SHADOW_YDIST
{
- ImageBitmap = Bitmap { File = "fw017.png"; };
+ File = "fw017.png";
};
String RID_SVXSTR_SUCCESSRECOV
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 80d065d..b20b711 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -87,8 +87,8 @@ namespace {
Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window*
pParent)
: SfxDockingWindow (pInBindings, pCW, pParent,
"Docking3DEffects", "svx/ui/docking3deffects.ui")
- , aImgLightOn(SVX_RES(RID_SVXIMAGE_LIGHT_ON))
- , aImgLightOff(SVX_RES(RID_SVXIMAGE_LIGHT_OFF))
+ , aImgLightOn(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_ON)))
+ , aImgLightOff(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_OFF)))
, bUpdate(false)
, eViewType(ViewType3D::Geo)
, pModel(nullptr)
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index 43a4885..e58ad58 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -21,19 +21,19 @@
#include "float3d.hrc"
#include <svx/svxcommands.h>
-Image RID_SVXIMAGE_LIGHT_ON
+Bitmap RID_SVXBMP_LAMP_ON
{
- ImageBitmap = Bitmap { File = "lighton.png" ; };
+ File = "lighton.png";
};
-Image RID_SVXIMAGE_LIGHT_OFF
+Bitmap RID_SVXBMP_LAMP_OFF
{
- ImageBitmap = Bitmap { File = "light.bmp" ; };
+ File = "light.bmp";
};
-Image RID_SVXIMAGE_COLORDLG
+Bitmap RID_SVXBMP_COLORDLG
{
- ImageBitmap = Bitmap { File = "colordlg.bmp" ; };
+ File = "colordlg.bmp";
};
String RID_SVXFLOAT3D_FAVORITE
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src
b/svx/source/sidebar/area/AreaPropertyPanel.src
index 5e9d134..2b066f5 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -20,29 +20,34 @@
#include <svx/dialogs.hrc>
#include "helpid.hrc"
-Image IMG_AXIAL
+Bitmap BMP_AXIAL
{
- ImageBitmap = Bitmap{File = "symphony/axial.png";};
+ File = "symphony/axial.png";
};
-Image IMG_ELLI
+
+Bitmap BMP_ELLI
{
- ImageBitmap = Bitmap{File = "symphony/ellipsoid.png";};
+ File = "symphony/ellipsoid.png";
};
-Image IMG_QUAD
+
+Bitmap BMP_QUAD
{
- ImageBitmap = Bitmap{File = "symphony/Quadratic.png";};
+ File = "symphony/Quadratic.png";
};
-Image IMG_RADIAL
+
+Bitmap BMP_RADIAL
{
- ImageBitmap = Bitmap{File = "symphony/radial.png";};
+ File = "symphony/radial.png";
};
-Image IMG_SQUARE
+
+Bitmap BMP_SQUARE
{
- ImageBitmap = Bitmap{File = "symphony/Square.png";};
+ File = "symphony/Square.png";
};
-Image IMG_LINEAR
+
+Bitmap BMP_LINEAR
{
- ImageBitmap = Bitmap{File = "symphony/linear.png";};
+ File = "symphony/linear.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 318b95b..dde9b0a 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -85,12 +85,12 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
mpFillGradientItem(),
mpHatchItem(),
mpBitmapItem(),
- maImgAxial(SVX_RES(IMG_AXIAL)),
- maImgElli(SVX_RES(IMG_ELLI)),
- maImgQuad(SVX_RES(IMG_QUAD)),
- maImgRadial(SVX_RES(IMG_RADIAL)),
- maImgSquare(SVX_RES(IMG_SQUARE)),
- maImgLinear(SVX_RES(IMG_LINEAR)),
+ maImgAxial(BitmapEx(SVX_RES(BMP_AXIAL))),
+ maImgElli(BitmapEx(SVX_RES(BMP_ELLI))),
+ maImgQuad(BitmapEx(SVX_RES(BMP_QUAD))),
+ maImgRadial(BitmapEx(SVX_RES(BMP_RADIAL))),
+ maImgSquare(BitmapEx(SVX_RES(BMP_SQUARE))),
+ maImgLinear(BitmapEx(SVX_RES(BMP_LINEAR))),
mpFloatTransparenceItem(),
mpTransparanceItem()
{
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src
b/svx/source/sidebar/line/LinePropertyPanel.src
index ec3665a..2860e70 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -20,50 +20,59 @@
#include <svx/dialogs.hrc>
#include "helpid.hrc"
-Image IMG_NONE_ICON
+Bitmap BMP_NONE_ICON
{
- ImageBitmap = Bitmap{File = "symphony/blank.png";};
+ File = "symphony/blank.png";
};
-Image IMG_WIDTH1_ICON
+Bitmap BMP_WIDTH1_ICON
{
- ImageBitmap = Bitmap{File = "symphony/width1.png";};
+ File = "symphony/width1.png";
};
-Image IMG_WIDTH2_ICON
+
+Bitmap BMP_WIDTH2_ICON
{
- ImageBitmap = Bitmap{File = "symphony/width2.png";};
+ File = "symphony/width2.png";
};
-Image IMG_WIDTH3_ICON
+
+Bitmap BMP_WIDTH3_ICON
{
- ImageBitmap = Bitmap{File = "symphony/width3.png";};
+ File = "symphony/width3.png";
};
-Image IMG_WIDTH4_ICON
+
+Bitmap BMP_WIDTH4_ICON
{
- ImageBitmap = Bitmap{File = "symphony/width4.png";};
+ File = "symphony/width4.png";
};
-Image IMG_WIDTH5_ICON
+
+Bitmap BMP_WIDTH5_ICON
{
- ImageBitmap = Bitmap{File = "symphony/width5.png";};
+ File = "symphony/width5.png";
};
-Image IMG_WIDTH6_ICON
+
+Bitmap BMP_WIDTH6_ICON
{
- ImageBitmap = Bitmap{File = "symphony/width6.png";};
+ File = "symphony/width6.png";
};
-Image IMG_WIDTH7_ICON
+
+Bitmap BMP_WIDTH7_ICON
{
- ImageBitmap = Bitmap{File = "symphony/width7.png";};
+ File = "symphony/width7.png";
};
-Image IMG_WIDTH8_ICON
+
+Bitmap BMP_WIDTH8_ICON
{
- ImageBitmap = Bitmap{File = "symphony/width8.png";};
+ File = "symphony/width8.png";
};
-Image RID_SVXIMG_WIDTH_CUSTOM
+
+Bitmap RID_SVXBMP_WIDTH_CUSTOM
{
- ImageBitmap = Bitmap{File = "symphony/last_custom_common.png";};
+ File = "symphony/last_custom_common.png";
};
-Image RID_SVXIMG_WIDTH_CUSTOM_GRAY
+
+Bitmap RID_SVXBMP_WIDTH_CUSTOM_GRAY
{
- ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png";};
+ File = "symphony/last_custom_common_grey.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 14de0a6..89e105b 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -169,7 +169,7 @@ LinePropertyPanelBase::LinePropertyPanelBase(
mpStartItem(),
mpEndItem(),
mxLineWidthPopup(VclPtr<LineWidthPopup>::Create(*this)),
- maIMGNone(SVX_RES(IMG_NONE_ICON)),
+ maIMGNone(BitmapEx(SVX_RES(BMP_NONE_ICON))),
mpIMGWidthIcon(),
mbWidthValuable(true),
mbArrowSupported(true)
@@ -221,14 +221,14 @@ void LinePropertyPanelBase::dispose()
void LinePropertyPanelBase::Initialize()
{
mpIMGWidthIcon.reset(new Image[8]);
- mpIMGWidthIcon[0] = Image(SVX_RES(IMG_WIDTH1_ICON));
- mpIMGWidthIcon[1] = Image(SVX_RES(IMG_WIDTH2_ICON));
- mpIMGWidthIcon[2] = Image(SVX_RES(IMG_WIDTH3_ICON));
- mpIMGWidthIcon[3] = Image(SVX_RES(IMG_WIDTH4_ICON));
- mpIMGWidthIcon[4] = Image(SVX_RES(IMG_WIDTH5_ICON));
- mpIMGWidthIcon[5] = Image(SVX_RES(IMG_WIDTH6_ICON));
- mpIMGWidthIcon[6] = Image(SVX_RES(IMG_WIDTH7_ICON));
- mpIMGWidthIcon[7] = Image(SVX_RES(IMG_WIDTH8_ICON));
+ mpIMGWidthIcon[0] = Image(BitmapEx(SVX_RES(BMP_WIDTH1_ICON)));
+ mpIMGWidthIcon[1] = Image(BitmapEx(SVX_RES(BMP_WIDTH2_ICON)));
+ mpIMGWidthIcon[2] = Image(BitmapEx(SVX_RES(BMP_WIDTH3_ICON)));
+ mpIMGWidthIcon[3] = Image(BitmapEx(SVX_RES(BMP_WIDTH4_ICON)));
+ mpIMGWidthIcon[4] = Image(BitmapEx(SVX_RES(BMP_WIDTH5_ICON)));
+ mpIMGWidthIcon[5] = Image(BitmapEx(SVX_RES(BMP_WIDTH6_ICON)));
+ mpIMGWidthIcon[6] = Image(BitmapEx(SVX_RES(BMP_WIDTH7_ICON)));
+ mpIMGWidthIcon[7] = Image(BitmapEx(SVX_RES(BMP_WIDTH8_ICON)));
FillLineStyleList();
SelectLineStyle();
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx
b/svx/source/sidebar/line/LineWidthPopup.cxx
index 52f60d0..e89b2d7 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -38,8 +38,8 @@ LineWidthPopup::LineWidthPopup(LinePropertyPanelBase& rParent)
, m_bCloseByEdit(false)
, m_nCustomWidth(0)
, m_nTmpCustomWidth(0)
- , m_aIMGCus(SVX_RES(RID_SVXIMG_WIDTH_CUSTOM))
- , m_aIMGCusGray(SVX_RES(RID_SVXIMG_WIDTH_CUSTOM_GRAY))
+ , m_aIMGCus(BitmapEx(SVX_RES(RID_SVXBMP_WIDTH_CUSTOM)))
+ , m_aIMGCusGray(BitmapEx(SVX_RES(RID_SVXBMP_WIDTH_CUSTOM_GRAY)))
{
get(m_xMFWidth, "spin");
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 3ece38aa..742f256 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -545,7 +545,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui",
rxFrame),
- maIndHang (SVX_RES(IMG_INDENT_HANG)),
+ maIndHang(BitmapEx(SVX_RES(BMP_INDENT_HANG))),
maTxtLeft (0),
maUpper (0),
maLower (0),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 073e120..65558ec 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -20,13 +20,14 @@
#include "helpid.hrc"
#include <svx/dialogs.hrc>
-Image IMG_SPACE3
+Bitmap BMP_SPACE3
{
- ImageBitmap = Bitmap{File = "symphony/spacing3.png";};
+ File = "symphony/spacing3.png";
};
-Image IMG_INDENT_HANG
+
+Bitmap BMP_INDENT_HANG
{
- ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png";};
+ File = "symphony/Indent_Hanging.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 50abd3d..ccdf094 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -54,9 +54,9 @@ struct SvxModifyControl::ImplData
ImplData():
mnModState(MODIFICATION_STATE_NO)
{
- maImages[MODIFICATION_STATE_NO] =
Image(SVX_RES(RID_SVXBMP_DOC_MODIFIED_NO));
- maImages[MODIFICATION_STATE_YES] =
Image(SVX_RES(RID_SVXBMP_DOC_MODIFIED_YES));
- maImages[MODIFICATION_STATE_FEEDBACK] =
Image(SVX_RES(RID_SVXBMP_DOC_MODIFIED_FEEDBACK));
+ maImages[MODIFICATION_STATE_NO] =
Image(BitmapEx(SVX_RES(RID_SVXBMP_DOC_MODIFIED_NO)));
+ maImages[MODIFICATION_STATE_YES] =
Image(BitmapEx(SVX_RES(RID_SVXBMP_DOC_MODIFIED_YES)));
+ maImages[MODIFICATION_STATE_FEEDBACK] =
Image(BitmapEx(SVX_RES(RID_SVXBMP_DOC_MODIFIED_FEEDBACK)));
maIdle.SetPriority(TaskPriority::LOWEST);
}
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 90e1594..4fafe04 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -174,15 +174,14 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl(
sal_uInt16 _nSlotId,
pImpl->bTable = false;
pImpl->bHasMenu = false;
pImpl->nFunctionSet = 0;
- pImpl->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
- pImpl->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
+ pImpl->aPosImage = Image(BitmapEx(ResId(RID_SVXBMP_POSITION,
DIALOG_MGR())));
+ pImpl->aSizeImage = Image(BitmapEx(ResId(RID_SVXBMP_SIZE, DIALOG_MGR())));
addStatusListener( STR_POSITION); // SID_ATTR_POSITION
addStatusListener( STR_TABLECELL); // SID_TABLE_CELL
addStatusListener( STR_FUNC); // SID_PSZ_FUNCTION
}
-
/* [Description]
Dtor():
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 8cf5f5c..c6ef39f 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -75,12 +75,11 @@ SvxSelectionModeControl::SvxSelectionModeControl(
sal_uInt16 _nSlotId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
mnState( 0 ),
- maImage( SVX_RES( RID_SVXBMP_SELECTION ) )
+ maImage(BitmapEx(SVX_RES(RID_SVXBMP_SELECTION)))
{
GetStatusBar().SetItemText( GetId(), "" );
}
-
void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
const SfxPoolItem* pState )
{
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 259bc8e..83618a4 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -68,12 +68,9 @@ Menu RID_SVXMENU_SELECTION
};
};
-Image RID_SVXBMP_SELECTION
+Bitmap RID_SVXBMP_SELECTION
{
- ImageBitmap = Bitmap
- {
- File = "selection_10x22.png" ;
- };
+ File = "selection_10x22.png" ;
};
String RID_SVXSTR_XMLSEC_SIG_OK
@@ -309,92 +306,64 @@ Menu RID_SVXMNU_XMLSECSTATBAR
};
};
-// Images ----------------------------------------------------------------
-
-Image RID_SVXBMP_POSITION
+Bitmap RID_SVXBMP_POSITION
{
- ImageBitmap = Bitmap
- {
- File = "sc10223.png" ;
- };
+ File = "sc10223.png" ;
};
-Image RID_SVXBMP_SIZE
+
+Bitmap RID_SVXBMP_SIZE
{
- ImageBitmap = Bitmap
- {
- File = "sc10224.png" ;
- };
+ File = "sc10224.png" ;
};
-Image RID_SVXBMP_SIGNET
+
+Bitmap RID_SVXBMP_SIGNET
{
- ImageBitmap = Bitmap
- {
- File = "signet_11x16.png" ;
- };
+ File = "signet_11x16.png" ;
};
-Image RID_SVXBMP_SIGNET_BROKEN
+
+Bitmap RID_SVXBMP_SIGNET_BROKEN
{
- ImageBitmap = Bitmap
- {
- File = "caution_11x16.png" ;
- };
+ File = "caution_11x16.png" ;
};
-Image RID_SVXBMP_SIGNET_NOTVALIDATED
+
+Bitmap RID_SVXBMP_SIGNET_NOTVALIDATED
{
- ImageBitmap = Bitmap
- {
- File = "notcertificate_16.png" ;
- };
+ File = "notcertificate_16.png" ;
};
-Image RID_SVXBMP_SLIDERBUTTON
+Bitmap RID_SVXBMP_SLIDERBUTTON
{
- ImageBitmap = Bitmap
- {
- File = "slidezoombutton_10.png" ;
- };
+ File = "slidezoombutton_10.png" ;
};
-Image RID_SVXBMP_SLIDERDECREASE
+
+Bitmap RID_SVXBMP_SLIDERDECREASE
{
- ImageBitmap = Bitmap
- {
- File = "slidezoomout_10.png" ;
- };
+ File = "slidezoomout_10.png" ;
};
-Image RID_SVXBMP_SLIDERINCREASE
+
+Bitmap RID_SVXBMP_SLIDERINCREASE
{
- ImageBitmap = Bitmap
- {
- File = "slidezoomin_10.png" ;
- };
+ File = "slidezoomin_10.png" ;
};
-Image RID_SVXBMP_DOC_MODIFIED_YES
+
+Bitmap RID_SVXBMP_DOC_MODIFIED_YES
{
- ImageBitmap = Bitmap
- {
- File = "doc_modified_yes_14.png" ;
- };
+ File = "doc_modified_yes_14.png" ;
};
-Image RID_SVXBMP_DOC_MODIFIED_NO
+
+Bitmap RID_SVXBMP_DOC_MODIFIED_NO
{
- ImageBitmap = Bitmap
- {
- File = "doc_modified_no_14.png" ;
- };
+ File = "doc_modified_no_14.png" ;
};
-Image RID_SVXBMP_DOC_MODIFIED_FEEDBACK
+
+Bitmap RID_SVXBMP_DOC_MODIFIED_FEEDBACK
{
- ImageBitmap = Bitmap
- {
- File = "doc_modified_feedback.png" ;
- };
+ File = "doc_modified_feedback.png" ;
};
-Image RID_SVXBMP_ZOOM_PAGE
+
+Bitmap RID_SVXBMP_ZOOM_PAGE
{
- ImageBitmap = Bitmap
- {
- File = "zoom_page_statusbar.png" ;
- };
+ File = "zoom_page_statusbar.png" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx
b/svx/source/stbctrls/xmlsecctrl.cxx
index 2fb9bd3..e8047c2 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -54,9 +54,9 @@ XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16
_nSlotId, sal_uInt16
{
mpImpl->mnState = SignatureState::UNKNOWN;
- mpImpl->maImage = Image( SVX_RES( RID_SVXBMP_SIGNET
) );
- mpImpl->maImageBroken = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN
) );
- mpImpl->maImageNotValidated = Image( SVX_RES(
RID_SVXBMP_SIGNET_NOTVALIDATED ) );
+ mpImpl->maImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_SIGNET)));
+ mpImpl->maImageBroken =
Image(BitmapEx(SVX_RES(RID_SVXBMP_SIGNET_BROKEN)));
+ mpImpl->maImageNotValidated =
Image(BitmapEx(SVX_RES(RID_SVXBMP_SIGNET_NOTVALIDATED)));
}
XmlSecStatusBarControl::~XmlSecStatusBarControl()
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 0ab191c..be7eb43 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -177,7 +177,7 @@
SFX_IMPL_STATUSBAR_CONTROL(SvxZoomPageStatusBarControl,SfxVoidItem);
SvxZoomPageStatusBarControl::SvxZoomPageStatusBarControl(sal_uInt16 _nSlotId,
sal_uInt16 _nId, StatusBar& rStb)
: SfxStatusBarControl(_nSlotId, _nId, rStb)
- , maImage(SVX_RES(RID_SVXBMP_ZOOM_PAGE))
+ , maImage(BitmapEx(SVX_RES(RID_SVXBMP_ZOOM_PAGE)))
{
GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_FIT_SLIDE));
}
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx
b/svx/source/stbctrls/zoomsliderctrl.cxx
index 8811a26..c9187ec 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -156,9 +156,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16
_nSlotId, sal_uInt16 _nI
SfxStatusBarControl( _nSlotId, _nId, rStatusBar ),
mxImpl( new SvxZoomSliderControl_Impl )
{
- mxImpl->maSliderButton = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON ) );
- mxImpl->maIncreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE ) );
- mxImpl->maDecreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERDECREASE ) );
+ mxImpl->maSliderButton =
Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERBUTTON)));
+ mxImpl->maIncreaseButton =
Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERINCREASE)));
+ mxImpl->maDecreaseButton =
Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERDECREASE)));
}
SvxZoomSliderControl::~SvxZoomSliderControl()
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx
b/svx/source/tbxctrls/extrusioncontrols.cxx
index 1e96224..4bcb8ce 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -63,12 +63,12 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
)
: ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
, mrController(rController)
- , maImgPerspective(SVX_RES(RID_SVXIMG_PERSPECTIVE))
- , maImgParallel(SVX_RES(RID_SVXIMG_PARALLEL))
+ , maImgPerspective(BitmapEx(SVX_RES(RID_SVXBMP_PERSPECTIVE)))
+ , maImgParallel(BitmapEx(SVX_RES(RID_SVXBMP_PARALLEL)))
{
for(sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i)
{
- maImgDirection[i] = Image( SVX_RES( RID_SVXIMG_DIRECTION + i ) );
+ maImgDirection[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_DIRECTION + i)));
}
SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectToolbarMenuHdl )
);
@@ -322,12 +322,12 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
vcl::Window* pParentWindow
) : ToolbarMenu( rController.getFrameInterface(), pParentWindow, WB_STDPOPUP
)
, mrController( rController )
- , maImgDepth0(SVX_RES(RID_SVXIMG_DEPTH_0))
- , maImgDepth1(SVX_RES(RID_SVXIMG_DEPTH_1))
- , maImgDepth2(SVX_RES(RID_SVXIMG_DEPTH_2))
- , maImgDepth3(SVX_RES(RID_SVXIMG_DEPTH_3))
- , maImgDepth4(SVX_RES(RID_SVXIMG_DEPTH_4))
- , maImgDepthInfinity(SVX_RES(RID_SVXIMG_DEPTH_INFINITY))
+ , maImgDepth0(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_0)))
+ , maImgDepth1(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_1)))
+ , maImgDepth2(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_2)))
+ , maImgDepth3(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_3)))
+ , maImgDepth4(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_4)))
+ , maImgDepthInfinity(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_INFINITY)))
, meUnit(FUNIT_NONE)
, mfDepth( -1.0 )
, msExtrusionDepth( ".uno:ExtrusionDepth" )
@@ -528,9 +528,9 @@
ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro
vcl::Window* pParentWindow)
: ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
, mrController(rController)
- , maImgBright(SVX_RES(RID_SVXIMG_LIGHTING_BRIGHT))
- , maImgNormal(SVX_RES(RID_SVXIMG_LIGHTING_NORMAL))
- , maImgDim(SVX_RES(RID_SVXIMG_LIGHTING_DIM))
+ , maImgBright(BitmapEx(SVX_RES(RID_SVXBMP_LIGHTING_BRIGHT)))
+ , maImgNormal(BitmapEx(SVX_RES(RID_SVXBMP_LIGHTING_NORMAL)))
+ , maImgDim(BitmapEx(SVX_RES(RID_SVXBMP_LIGHTING_DIM)))
, mnLevel(0)
, mbLevelEnabled(false)
, mnDirection(FROM_FRONT)
@@ -540,10 +540,10 @@
ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro
{
if( i != FROM_FRONT )
{
- maImgLightingOff[i] = Image(SVX_RES(RID_SVXIMG_LIGHT_OFF + i));
- maImgLightingOn[i] = Image(SVX_RES(RID_SVXIMG_LIGHT_ON + i));
+ maImgLightingOff[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_LIGHT_OFF
+ i)));
+ maImgLightingOn[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_LIGHT_ON +
i)));
}
- maImgLightingPreview[i] = Image(SVX_RES(RID_SVXIMG_LIGHT_PREVIEW + i));
+ maImgLightingPreview[i] =
Image(BitmapEx(SVX_RES(RID_SVXBMP_LIGHT_PREVIEW + i)));
}
SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectToolbarMenuHdl )
);
@@ -797,10 +797,10 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
vcl::Window* pParentWindow)
: ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
, mrController(rController)
- , maImgSurface1(SVX_RES(RID_SVXIMG_WIRE_FRAME))
- , maImgSurface2(SVX_RES(RID_SVXIMG_MATTE))
- , maImgSurface3(SVX_RES(RID_SVXIMG_PLASTIC))
- , maImgSurface4(SVX_RES(RID_SVXIMG_METAL))
+ , maImgSurface1(BitmapEx(SVX_RES(RID_SVXBMP_WIRE_FRAME)))
+ , maImgSurface2(BitmapEx(SVX_RES(RID_SVXBMP_MATTE)))
+ , maImgSurface3(BitmapEx(SVX_RES(RID_SVXBMP_PLASTIC)))
+ , maImgSurface4(BitmapEx(SVX_RES(RID_SVXBMP_METAL)))
{
SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
diff --git a/svx/source/tbxctrls/extrusioncontrols.src
b/svx/source/tbxctrls/extrusioncontrols.src
index 8760914..80d5345 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -20,59 +20,59 @@
#include <svx/dialogs.hrc>
#include "extrusioncontrols.hrc"
-Image RID_SVXIMG_DIRECTION + DIRECTION_NW
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_NW
{
- ImageBitmap = Bitmap { File = "directionnorthwest_22.bmp" ; };
+ File = "directionnorthwest_22.bmp";
};
-Image RID_SVXIMG_DIRECTION + DIRECTION_N
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_N
{
- ImageBitmap = Bitmap { File = "directionnorth_22.bmp" ; };
+ File = "directionnorth_22.bmp";
};
-Image RID_SVXIMG_DIRECTION + DIRECTION_NE
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_NE
{
- ImageBitmap = Bitmap { File = "directionnortheast_22.bmp"; };
+ File = "directionnortheast_22.bmp";
};
-Image RID_SVXIMG_DIRECTION + DIRECTION_W
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_W
{
- ImageBitmap = Bitmap { File = "directionwest_22.bmp"; };
+ File = "directionwest_22.bmp";
};
-Image RID_SVXIMG_DIRECTION + DIRECTION_NONE
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_NONE
{
- ImageBitmap = Bitmap { File = "directionstraight_22.bmp"; };
+ File = "directionstraight_22.bmp";
};
-Image RID_SVXIMG_DIRECTION + DIRECTION_E
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_E
{
- ImageBitmap = Bitmap { File = "directioneast_22.bmp"; };
+ File = "directioneast_22.bmp";
};
-Image RID_SVXIMG_DIRECTION + DIRECTION_SW
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_SW
{
- ImageBitmap = Bitmap { File = "directionsouthwest_22.bmp"; };
+ File = "directionsouthwest_22.bmp";
};
-Image RID_SVXIMG_DIRECTION + DIRECTION_S
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_S
{
- ImageBitmap = Bitmap { File = "directionsouth_22.bmp"; };
+ File = "directionsouth_22.bmp";
};
-Image RID_SVXIMG_DIRECTION + DIRECTION_SE
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_SE
{
- ImageBitmap = Bitmap { File = "directionsoutheast_22.bmp"; };
+ File = "directionsoutheast_22.bmp";
};
-Image RID_SVXIMG_PERSPECTIVE
+Bitmap RID_SVXBMP_PERSPECTIVE
{
- ImageBitmap = Bitmap { File = "perspective_16.bmp"; };
+ File = "perspective_16.bmp";
};
-Image RID_SVXIMG_PARALLEL
+Bitmap RID_SVXBMP_PARALLEL
{
- ImageBitmap = Bitmap { File = "parallel_16.bmp"; };
+ File = "parallel_16.bmp";
};
String RID_SVXSTR_PERSPECTIVE
@@ -130,144 +130,144 @@ String RID_SVXSTR_DIRECTION + DIRECTION_SE
Text [ en-US ] = "Extrusion South-East";
};
-Image RID_SVXIMG_LIGHT_OFF + FROM_TOP_LEFT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_TOP_LEFT
{
- ImageBitmap = Bitmap { File = "lightofffromtopleft_22.bmp"; };
+ File = "lightofffromtopleft_22.bmp";
};
-Image RID_SVXIMG_LIGHT_OFF + FROM_TOP
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_TOP
{
- ImageBitmap = Bitmap { File = "lightofffromtop_22.bmp"; };
+ File = "lightofffromtop_22.bmp";
};
-Image RID_SVXIMG_LIGHT_OFF + FROM_TOP_RIGHT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_TOP_RIGHT
{
- ImageBitmap = Bitmap { File = "lightofffromtopright_22.bmp"; };
+ File = "lightofffromtopright_22.bmp";
};
-Image RID_SVXIMG_LIGHT_OFF + FROM_LEFT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_LEFT
{
- ImageBitmap = Bitmap { File = "lightofffromleft_22.bmp"; };
+ File = "lightofffromleft_22.bmp";
};
-Image RID_SVXIMG_LIGHT_OFF + FROM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_RIGHT
{
- ImageBitmap = Bitmap { File = "lightofffromright_22.bmp"; };
+ File = "lightofffromright_22.bmp";
};
-Image RID_SVXIMG_LIGHT_OFF + FROM_BOTTOM_LEFT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_BOTTOM_LEFT
{
- ImageBitmap = Bitmap { File = "lightofffrombottomleft_22.bmp"; };
+ File = "lightofffrombottomleft_22.bmp";
};
-Image RID_SVXIMG_LIGHT_OFF + FROM_BOTTOM
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_BOTTOM
{
- ImageBitmap = Bitmap { File = "lightofffrombottom_22.bmp"; };
+ File = "lightofffrombottom_22.bmp";
};
-Image RID_SVXIMG_LIGHT_OFF + FROM_BOTTOM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_BOTTOM_RIGHT
{
- ImageBitmap = Bitmap { File = "lightofffrombottomright_22.bmp"; };
+ File = "lightofffrombottomright_22.bmp";
};
-Image RID_SVXIMG_LIGHT_ON + FROM_TOP_LEFT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_TOP_LEFT
{
- ImageBitmap = Bitmap { File = "lightonfromtopleft_22.bmp"; };
+ File = "lightonfromtopleft_22.bmp";
};
-Image RID_SVXIMG_LIGHT_ON + FROM_TOP
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_TOP
{
- ImageBitmap = Bitmap { File = "lightonfromtop_22.bmp"; };
+ File = "lightonfromtop_22.bmp";
};
-Image RID_SVXIMG_LIGHT_ON + FROM_TOP_RIGHT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_TOP_RIGHT
{
- ImageBitmap = Bitmap { File = "lightonfromtopright_22.bmp"; };
+ File = "lightonfromtopright_22.bmp";
};
-Image RID_SVXIMG_LIGHT_ON + FROM_LEFT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_LEFT
{
- ImageBitmap = Bitmap { File = "lightonfromleft_22.bmp"; };
+ File = "lightonfromleft_22.bmp";
};
-Image RID_SVXIMG_LIGHT_ON + FROM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_RIGHT
{
- ImageBitmap = Bitmap { File = "lightonfromright_22.bmp"; };
+ File = "lightonfromright_22.bmp";
};
-Image RID_SVXIMG_LIGHT_ON + FROM_BOTTOM_LEFT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_BOTTOM_LEFT
{
- ImageBitmap = Bitmap { File = "lightonfrombottomleft_22.bmp"; };
+ File = "lightonfrombottomleft_22.bmp";
};
-Image RID_SVXIMG_LIGHT_ON + FROM_BOTTOM
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_BOTTOM
{
- ImageBitmap = Bitmap { File = "lightonfrombottom_22.bmp"; };
+ File = "lightonfrombottom_22.bmp";
};
-Image RID_SVXIMG_LIGHT_ON + FROM_BOTTOM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_BOTTOM_RIGHT
{
- ImageBitmap = Bitmap { File = "lightonfrombottomright_22.bmp"; };
+ File = "lightonfrombottomright_22.bmp";
};
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_TOP_LEFT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_TOP_LEFT
{
- ImageBitmap = Bitmap { File = "lightfromtopleft_22.bmp"; };
+ File = "lightfromtopleft_22.bmp";
};
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_TOP
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_TOP
{
- ImageBitmap = Bitmap { File = "lightfromtop_22.bmp"; };
+ File = "lightfromtop_22.bmp";
};
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_TOP_RIGHT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_TOP_RIGHT
{
- ImageBitmap = Bitmap { File = "lightfromtopright_22.bmp"; };
+ File = "lightfromtopright_22.bmp";
};
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_LEFT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_LEFT
{
- ImageBitmap = Bitmap { File = "lightfromleft_22.bmp"; };
+ File = "lightfromleft_22.bmp";
};
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_RIGHT
{
- ImageBitmap = Bitmap { File = "lightfromright_22.bmp"; };
+ File = "lightfromright_22.bmp";
};
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_FRONT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_FRONT
{
- ImageBitmap = Bitmap { File = "lightfromfront_22.bmp"; };
+ File = "lightfromfront_22.bmp";
};
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_BOTTOM_LEFT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_BOTTOM_LEFT
{
- ImageBitmap = Bitmap { File = "lightfrombottomleft_22.bmp"; };
+ File = "lightfrombottomleft_22.bmp";
};
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_BOTTOM
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_BOTTOM
{
- ImageBitmap = Bitmap { File = "lightfrombottom_22.bmp"; };
+ File = "lightfrombottom_22.bmp";
};
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_BOTTOM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_BOTTOM_RIGHT
{
- ImageBitmap = Bitmap { File = "lightfrombottomright_22.bmp"; };
+ File = "lightfrombottomright_22.bmp";
};
-Image RID_SVXIMG_LIGHTING_BRIGHT
+Bitmap RID_SVXBMP_LIGHTING_BRIGHT
{
- ImageBitmap = Bitmap { File = "brightlit_16.bmp"; };
+ File = "brightlit_16.png";
};
-Image RID_SVXIMG_LIGHTING_NORMAL
+Bitmap RID_SVXBMP_LIGHTING_NORMAL
{
- ImageBitmap = Bitmap { File = "normallit_16.bmp"; };
+ File = "normallit_16.png";
};
-Image RID_SVXIMG_LIGHTING_DIM
+Bitmap RID_SVXBMP_LIGHTING_DIM
{
- ImageBitmap = Bitmap { File = "dimlit_16.bmp"; };
+ File = "dimlit_16.png";
};
String RID_SVXSTR_BRIGHT
@@ -305,54 +305,54 @@ String RID_SVXSTR_METAL
Text [ en-US ] = "Me~tal";
};
-Image RID_SVXIMG_WIRE_FRAME
+Bitmap RID_SVXBMP_WIRE_FRAME
{
- ImageBitmap = Bitmap { File = "wireframe_16.bmp"; };
+ File = "wireframe_16.bmp";
};
-Image RID_SVXIMG_MATTE
+Bitmap RID_SVXBMP_MATTE
{
- ImageBitmap = Bitmap { File = "matte_16.bmp"; };
+ File = "matte_16.bmp";
};
-Image RID_SVXIMG_PLASTIC
+Bitmap RID_SVXBMP_PLASTIC
{
- ImageBitmap = Bitmap { File = "plastic_16.bmp"; };
+ File = "plastic_16.bmp";
};
-Image RID_SVXIMG_METAL
+Bitmap RID_SVXBMP_METAL
{
- ImageBitmap = Bitmap { File = "metal_16.bmp"; };
+ File = "metal_16.bmp";
};
-Image RID_SVXIMG_DEPTH_0
+Bitmap RID_SVXBMP_DEPTH_0
{
- ImageBitmap = Bitmap { File = "extrusion0inch_16.bmp"; };
+ File = "extrusion0inch_16.bmp";
};
-Image RID_SVXIMG_DEPTH_1
+Bitmap RID_SVXBMP_DEPTH_1
{
- ImageBitmap = Bitmap { File = "extrusion05inch_16.bmp"; };
+ File = "extrusion05inch_16.bmp";
};
-Image RID_SVXIMG_DEPTH_2
+Bitmap RID_SVXBMP_DEPTH_2
{
- ImageBitmap = Bitmap { File = "extrusion1inch_16.bmp"; };
+ File = "extrusion1inch_16.bmp";
};
-Image RID_SVXIMG_DEPTH_3
+Bitmap RID_SVXBMP_DEPTH_3
{
- ImageBitmap = Bitmap { File = "extrusion2inch_16.bmp"; };
+ File = "extrusion2inch_16.bmp";
};
-Image RID_SVXIMG_DEPTH_4
+Bitmap RID_SVXBMP_DEPTH_4
{
- ImageBitmap = Bitmap { File = "extrusion4inch_16.bmp"; };
+ File = "extrusion4inch_16.bmp";
};
-Image RID_SVXIMG_DEPTH_INFINITY
+Bitmap RID_SVXBMP_DEPTH_INFINITY
{
- ImageBitmap = Bitmap { File = "extrusioninfinity_16.bmp"; };
+ File = "extrusioninfinity_16.bmp";
};
String RID_SVXSTR_DEPTH_0
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index e8d5f36..bc3099f 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -269,11 +269,11 @@ private:
FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController&
rController, vcl::Window* pParentWindow)
: ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
, mrController(rController)
- , maImgAlgin1(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_LEFT))
- , maImgAlgin2(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_CENTER))
- , maImgAlgin3(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_RIGHT))
- , maImgAlgin4(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_WORD))
- , maImgAlgin5(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_STRETCH))
+ , maImgAlgin1(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_LEFT)))
+ , maImgAlgin2(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_CENTER)))
+ , maImgAlgin3(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_RIGHT)))
+ , maImgAlgin4(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_WORD)))
+ , maImgAlgin5(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_STRETCH)))
, msFontworkAlignment(".uno:FontworkAlignment")
{
SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) );
diff --git a/svx/source/tbxctrls/fontworkgallery.src
b/svx/source/tbxctrls/fontworkgallery.src
index 86d7954..6b61f89 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -45,29 +45,29 @@ String RID_SVXSTR_ALIGN_STRETCH
Text [ en-US ] = "S~tretch Justify";
};
-Image RID_SVXIMG_FONTWORK_ALIGN_LEFT
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_LEFT
{
- ImageBitmap = Bitmap { File = "fontworkalignleft_16.png"; };
+ File = "fontworkalignleft_16.png";
};
-Image RID_SVXIMG_FONTWORK_ALIGN_CENTER
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_CENTER
{
- ImageBitmap = Bitmap { File = "fontworkaligncentered_16.png"; };
+ File = "fontworkaligncentered_16.png";
};
-Image RID_SVXIMG_FONTWORK_ALIGN_RIGHT
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_RIGHT
{
- ImageBitmap = Bitmap { File = "fontworkalignright_16.png"; };
+ File = "fontworkalignright_16.png";
};
-Image RID_SVXIMG_FONTWORK_ALIGN_WORD
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_WORD
{
- ImageBitmap = Bitmap { File = "fontworkalignjustified_16.png"; };
+ File = "fontworkalignjustified_16.png";
};
-Image RID_SVXIMG_FONTWORK_ALIGN_STRETCH
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_STRETCH
{
- ImageBitmap = Bitmap { File = "fontworkalignstretch_16.png"; };
+ File = "fontworkalignstretch_16.png";
};
String RID_SVXSTR_CHARS_SPACING_VERY_TIGHT
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 3c53cd7..2ce5396 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -190,13 +190,13 @@ static sal_uInt16 ImplGetRID( const OUString& aCommand )
{
static const CommandToRID aImplCommandToResMap[] =
{
- { ".uno:GrafRed", RID_SVXIMG_GRAF_RED },
- { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN },
- { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE },
- { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE },
- { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST },
- { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA },
- { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE },
+ { ".uno:GrafRed", RID_SVXBMP_GRAF_RED },
+ { ".uno:GrafGreen", RID_SVXBMP_GRAF_GREEN },
+ { ".uno:GrafBlue", RID_SVXBMP_GRAF_BLUE },
+ { ".uno:GrafLuminance", RID_SVXBMP_GRAF_LUMINANCE },
+ { ".uno:GrafContrast", RID_SVXBMP_GRAF_CONTRAST },
+ { ".uno:GrafGamma", RID_SVXBMP_GRAF_GAMMA },
+ { ".uno:GrafTransparence", RID_SVXBMP_GRAF_TRANSPARENCE },
{ nullptr, 0 }
};
@@ -247,13 +247,13 @@ ImplGrafControl::ImplGrafControl(
, maField( VclPtr<ImplGrafMetricField>::Create(this, rCmd, rFrame) )
{
ResId aResId( ImplGetRID( rCmd ), DIALOG_MGR() ) ;
- Image aImage( aResId );
+ BitmapEx aBitmapEx(aResId);
- Size aImgSize( aImage.GetSizePixel() );
- Size aFldSize( maField->GetSizePixel() );
+ Size aImgSize(aBitmapEx.GetSizePixel());
+ Size aFldSize(maField->GetSizePixel());
long nFldY, nImgY;
- maImage->SetImage( aImage );
+ maImage->SetImage(Image(aBitmapEx));
maImage->SetSizePixel( aImgSize );
// we want to see the background of the toolbox, not of the FixedImage or
Control
maImage->SetBackground( Wallpaper( COL_TRANSPARENT ) );
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 4cc9775..eb98816 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -168,33 +168,39 @@ String RID_SVXSTR_PAGES
Text [ en-US ] = "Pages";
};
-Image RID_SVXIMG_GRAF_RED
+Bitmap RID_SVXBMP_GRAF_RED
{
- ImageBitmap = Bitmap { File = "sc10865.png" ; };
+ File = "sc10865.png";
};
-Image RID_SVXIMG_GRAF_GREEN
+
+Bitmap RID_SVXBMP_GRAF_GREEN
{
- ImageBitmap = Bitmap { File = "sc10866.png" ; };
+ File = "sc10866.png";
};
-Image RID_SVXIMG_GRAF_BLUE
+
+Bitmap RID_SVXBMP_GRAF_BLUE
{
- ImageBitmap = Bitmap { File = "sc10867.png" ; };
+ File = "sc10867.png";
};
-Image RID_SVXIMG_GRAF_LUMINANCE
+
+Bitmap RID_SVXBMP_GRAF_LUMINANCE
{
- ImageBitmap = Bitmap { File = "sc10863.png" ; };
+ File = "sc10863.png";
};
-Image RID_SVXIMG_GRAF_CONTRAST
+
+Bitmap RID_SVXBMP_GRAF_CONTRAST
{
- ImageBitmap = Bitmap { File = "sc10864.png" ; };
+ File = "sc10864.png";
};
-Image RID_SVXIMG_GRAF_GAMMA
+
+Bitmap RID_SVXBMP_GRAF_GAMMA
{
- ImageBitmap = Bitmap { File = "sc10868.png" ; };
+ File = "sc10868.png";
};
-Image RID_SVXIMG_GRAF_TRANSPARENCE
+
+Bitmap RID_SVXBMP_GRAF_TRANSPARENCE
{
- ImageBitmap = Bitmap { File = "sc10869.png" ; };
+ File = "sc10869.png";
};
String RID_SVXSTR_CLEARFORM
commit b6dcda29bc1b06d92813d7cee9a8dd2771fca145
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 11:29:34 2017 +0000
drop unused image ids
Change-Id: I433613a7c850ecf888be48153f81cca3f093b789
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 7574d3d..6f30c40 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -353,16 +353,13 @@
#define RID_SVX_CONTOUR_START (RID_SVX_START + 461)
// RID_SVX_CONTOUR_END (RID_SVX_START + 471)
-#define RID_SVXIMG_GRAF_RED (RID_SVX_START + 472)
-#define RID_SVXIMG_GRAF_GREEN (RID_SVX_START + 473)
-#define RID_SVXIMG_GRAF_BLUE (RID_SVX_START + 474)
-#define RID_SVXIMG_GRAF_LUMINANCE (RID_SVX_START + 475)
-#define RID_SVXIMG_GRAF_CONTRAST (RID_SVX_START + 476)
-#define RID_SVXIMG_GRAF_GAMMA (RID_SVX_START + 477)
-#define RID_SVXIMG_GRAF_TRANSPARENCE (RID_SVX_START + 478)
-
-#define RID_SVX_RELOAD_NORMAL (RID_SVX_START + 480)
-#define RID_SVX_RELOAD_SPECIAL (RID_SVX_START + 481)
+#define RID_SVXBMP_GRAF_RED (RID_SVX_START + 472)
+#define RID_SVXBMP_GRAF_GREEN (RID_SVX_START + 473)
+#define RID_SVXBMP_GRAF_BLUE (RID_SVX_START + 474)
+#define RID_SVXBMP_GRAF_LUMINANCE (RID_SVX_START + 475)
+#define RID_SVXBMP_GRAF_CONTRAST (RID_SVX_START + 476)
+#define RID_SVXBMP_GRAF_GAMMA (RID_SVX_START + 477)
+#define RID_SVXBMP_GRAF_TRANSPARENCE (RID_SVX_START + 478)
#define RID_SVXIMG_DEPTH_INFINITY (RID_SVX_START + 482)
#define RID_SVXIMG_DEPTH_0 (RID_SVX_START + 483)
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index f0c92ff..4cc9775 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -24,16 +24,6 @@
* Bitmaps for SvxFrameWindow
*/
-Image RID_SVX_RELOAD_NORMAL
-{
- ImageBitmap = Bitmap { File = "reload.png" ; };
-};
-
-Image RID_SVX_RELOAD_SPECIAL
-{
- ImageBitmap = Bitmap { File = "reloads.png" ; };
-};
-
Bitmap RID_SVXBMP_FRAME1
{
File = "fr01.png";
commit 9db8c85f75f1d0bc76aa1a77cd118b72d188e8b1
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 11:23:54 2017 +0000
sfx2: load BitmapEx resources instead of Image ones
Change-Id: I9c5a0f1b23eadf15fee3ff78e5061474214fcc35
diff --git a/sfx2/inc/doc.hrc b/sfx2/inc/doc.hrc
index 29e4f66..d89e7b5 100644
--- a/sfx2/inc/doc.hrc
+++ b/sfx2/inc/doc.hrc
@@ -104,8 +104,8 @@
#define STR_QMSG_SEL_FOLDER_DELETE (RID_SFX_DOC_START+146)
#define STR_QMSG_TEMPLATE_OVERWRITE (RID_SFX_DOC_START+147)
#define STR_QMSG_SEL_TEMPLATE_DELETE (RID_SFX_DOC_START+148)
-#define IMG_ACTION_SORT (RID_SFX_DOC_START+149)
-#define IMG_ACTION_REFRESH (RID_SFX_DOC_START+150)
+#define BMP_ACTION_SORT (RID_SFX_DOC_START+149)
+#define BMP_ACTION_REFRESH (RID_SFX_DOC_START+150)
#define STR_OPEN (RID_SFX_DOC_START+151)
#define STR_EDIT_TEMPLATE (RID_SFX_DOC_START+152)
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index 587bf7c..02c6019 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -62,7 +62,7 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
, mnItemPadding(5)
, mnItemMaxTextLength(30)
, mnLastMouseDownItem(THUMBNAILVIEW_ITEM_NOTFOUND)
- , maWelcomeImage(SfxResId(IMG_WELCOME))
+ , maWelcomeImage(BitmapEx(SfxResId(BMP_WELCOME)))
, maWelcomeLine1(SfxResId(STR_WELCOME_LINE1))
, maWelcomeLine2(SfxResId(STR_WELCOME_LINE2))
{
diff --git a/sfx2/source/control/recentdocsviewitem.cxx
b/sfx2/source/control/recentdocsviewitem.cxx
index 5260f05..4005e20 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -36,8 +36,8 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView,
const OUString &rUR
: ThumbnailViewItem(rView, nId),
maURL(rURL),
m_bRemoveIconHighlighted(false),
- m_aRemoveRecentBitmap(SfxResId(IMG_RECENTDOC_REMOVE)),
-
m_aRemoveRecentBitmapHighlighted(SfxResId(IMG_RECENTDOC_REMOVE_HIGHLIGHTED))
+ m_aRemoveRecentBitmap(SfxResId(BMP_RECENTDOC_REMOVE)),
+
m_aRemoveRecentBitmapHighlighted(SfxResId(BMP_RECENTDOC_REMOVE_HIGHLIGHTED))
{
OUString aTitle(rTitle);
INetURLObject aURLObj(rURL);
diff --git a/sfx2/source/control/templateview.hrc
b/sfx2/source/control/templateview.hrc
index 7833639..693ccea 100644
--- a/sfx2/source/control/templateview.hrc
+++ b/sfx2/source/control/templateview.hrc
@@ -9,9 +9,9 @@
#define STR_WELCOME_LINE1 259
#define STR_WELCOME_LINE2 260
-#define IMG_WELCOME 261
-#define IMG_RECENTDOC_REMOVE 262
-#define IMG_RECENTDOC_REMOVE_HIGHLIGHTED 263
-#define IMG_DEFAULT 264
+#define BMP_WELCOME 261
+#define BMP_RECENTDOC_REMOVE 262
+#define BMP_RECENTDOC_REMOVE_HIGHLIGHTED 263
+#define BMP_DEFAULT 264
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templateview.src
b/sfx2/source/control/templateview.src
index 52f4e3d..cf05b69 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -19,22 +19,22 @@ String STR_WELCOME_LINE2
Text [ en-US ] = "Drop a document here or pick an app from the left side
to create one.";
};
-Image IMG_WELCOME
+Bitmap BMP_WELCOME
{
- ImageBitmap = Bitmap { File = "logo.png" ; };
+ File = "logo.png";
};
-Bitmap IMG_RECENTDOC_REMOVE
+Bitmap BMP_RECENTDOC_REMOVE
{
File = "recentdoc_remove.png";
};
-Bitmap IMG_RECENTDOC_REMOVE_HIGHLIGHTED
+Bitmap BMP_RECENTDOC_REMOVE_HIGHLIGHTED
{
File = "recentdoc_remove_highlighted.png";
};
-Bitmap IMG_DEFAULT
+Bitmap BMP_DEFAULT
{
File = "templatestar.png";
};
diff --git a/sfx2/source/control/templateviewitem.cxx
b/sfx2/source/control/templateviewitem.cxx
index 28dc702..2d396b9 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -34,7 +34,7 @@ TemplateViewItem::TemplateViewItem (ThumbnailView &rView,
sal_uInt16 nId)
: ThumbnailViewItem(rView, nId),
mnRegionId(USHRT_MAX),
mnDocId(USHRT_MAX),
- maDefaultBitmap(SfxResId(IMG_DEFAULT)),
+ maDefaultBitmap(SfxResId(BMP_DEFAULT)),
mbIsDefaultTemplate(false)
{
}
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index c860dbd..6864546 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -56,7 +56,7 @@
#define STR_CANCEL_RECORDING ( RC_DIALOG_BEGIN + 108 )
#define STR_PDF_EXPORT_SEND ( RC_DIALOG_BEGIN + 120 )
-#define IMG_INFO ( RC_DIALOG_BEGIN + 122 )
+#define BMP_INFO ( RC_DIALOG_BEGIN + 122 )
//free
#define SFX_ST_EDIT ( RC_DIALOG_BEGIN + 124 )
#define STR_STYLE_ELEMTLIST ( RC_DIALOG_BEGIN + 125 )
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index 60128b6..6c1198b 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -108,12 +108,9 @@ String STR_PDF_EXPORT_SEND
Text [ en-US ] = "Send" ;
};
-Image IMG_INFO
+Bitmap BMP_INFO
{
- ImageBitmap = Bitmap
- {
- File = "info.png" ;
- };
+ File = "info.png" ;
};
String STR_FONT_TABPAGE
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index cddee1e..e3917d9 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1450,7 +1450,7 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window*
pParent ) :
m_aTimeField->SetExtFormat( ExtTimeFieldFormat::Long24H );
m_aDateField->SetExtDateFormat( ExtDateFieldFormat::SystemShortYYYY );
- m_aRemoveButton->SetModeImage(Image(SfxResId(SFX_IMG_PROPERTY_REMOVE)));
+
m_aRemoveButton->SetModeImage(Image(BitmapEx(SfxResId(SFX_BMP_PROPERTY_REMOVE))));
m_aRemoveButton->SetQuickHelpText(SfxResId(STR_SFX_REMOVE_PROPERTY).toString());
m_aEditButton->SetText(SfxResId(SFX_ST_EDIT).toString());
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 558588b..96cd929 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -93,9 +93,9 @@ String STR_SFX_REMOVE_PROPERTY
Text [ en-US ] = "Remove Property" ;
};
-Image SFX_IMG_PROPERTY_REMOVE
+Bitmap SFX_BMP_PROPERTY_REMOVE
{
- ImageBitmap = Bitmap { File = "deleterow.bmp" ; };
+ File = "deleterow.bmp";
};
String STR_SFX_QUERY_WRONG_TYPE
diff --git a/sfx2/source/dialog/titledockwin.cxx
b/sfx2/source/dialog/titledockwin.cxx
index c084cbc..5299973 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -214,8 +214,8 @@ namespace sfx2
m_aToolbox->Clear();
// Get the closer bitmap and set it as right most button.
- Image aImage( SfxResId( SFX_IMG_CLOSE_DOC ) );
- m_aToolbox->InsertItem( 1, aImage );
+ BitmapEx aBitmapEx(SfxResId(SFX_BMP_CLOSE_DOC));
+ m_aToolbox->InsertItem(1, Image(aBitmapEx));
m_aToolbox->ShowItem( 1 );
}
diff --git a/sfx2/source/dialog/titledockwin.src
b/sfx2/source/dialog/titledockwin.src
index 3b55d53..f60c61f 100644
--- a/sfx2/source/dialog/titledockwin.src
+++ b/sfx2/source/dialog/titledockwin.src
@@ -20,9 +20,9 @@
#include <sfx2/sfx.hrc>
#include "sfxlocal.hrc"
-Image SFX_IMG_CLOSE_DOC
+Bitmap SFX_BMP_CLOSE_DOC
{
- ImageBitmap = Bitmap { File = "closedoc.png" ; };
+ File = "closedoc.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index d607087..cb06514 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -368,20 +368,14 @@ String STR_QMSG_ERROR_OPENING_FILE_CONTINUE
Text [ en-US ] = "\nProceeding with import may cause data loss or
corruption, and application may become unstable or crash.\n\nDo you want to
ignore the error and attempt to continue loading the file?";
};
-Image IMG_ACTION_SORT
+Bitmap BMP_ACTION_SORT
{
- ImageBitmap = Bitmap
- {
- File = "sortascending.png";
- };
+ File = "sortascending.png";
};
-Image IMG_ACTION_REFRESH
+Bitmap BMP_ACTION_REFRESH
{
- ImageBitmap = Bitmap
- {
- File = "reload.png";
- };
+ File = "reload.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 3b35ed4..da048e9 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -172,7 +172,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window
*parent)
mpActionMenu = VclPtr<PopupMenu>::Create();
mpActionMenu->InsertItem(MNI_ACTION_NEW_FOLDER,
SfxResId(STR_CATEGORY_NEW).toString(),
- Image(SfxResId(IMG_ACTION_REFRESH)));
+ Image(BitmapEx(SfxResId(BMP_ACTION_REFRESH))));
mpActionMenu->InsertItem(MNI_ACTION_RENAME_FOLDER,
SfxResId(STR_CATEGORY_RENAME).toString());
mpActionMenu->InsertItem(MNI_ACTION_DELETE_FOLDER,
@@ -180,7 +180,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window
*parent)
mpActionMenu->InsertSeparator();
mpActionMenu->InsertItem(MNI_ACTION_REFRESH,
SfxResId(STR_ACTION_REFRESH).toString(),
- Image(SfxResId(IMG_ACTION_REFRESH)));
+ Image(BitmapEx(SfxResId(BMP_ACTION_REFRESH))));
mpActionMenu->InsertItem(MNI_ACTION_DEFAULT,SfxResId(STR_ACTION_DEFAULT).toString());
mpActionMenu->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl));
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index f1fa474..100d008 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -40,8 +40,8 @@
#define SFX_CB_PROPERTY_STRINGARRAY (RID_SFX_SFXLOCAL_START + 13)
// Images ----------------------------------------------------------------
-#define SFX_IMG_PROPERTY_REMOVE (RID_SFX_SFXLOCAL_START + 0)
-#define SFX_IMG_CLOSE_DOC (RID_SFX_SFXLOCAL_START + 2)
+#define SFX_BMP_PROPERTY_REMOVE (RID_SFX_SFXLOCAL_START + 0)
+#define SFX_BMP_CLOSE_DOC (RID_SFX_SFXLOCAL_START + 2)
#endif
commit aa347e360c87651da647c12d444429a3c401c37d
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 11:15:00 2017 +0000
sd: load BitmapEx resources instead of Image ones
Change-Id: Ic3f416300194d8fa9dfebc2b7a700396ba5641a5
diff --git a/sd/source/ui/animations/CustomAnimation.hrc
b/sd/source/ui/animations/CustomAnimation.hrc
index fa0cca2..1c5c142 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -32,16 +32,16 @@
#define RID_CUSTOMANIMATION_SCALE_POPUP
RID_CUSTOMANIMATION_START+11
#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP
RID_CUSTOMANIMATION_START+12
-#define IMG_CUSTOMANIMATION_ON_CLICK
RID_CUSTOMANIMATION_START+0
-#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS
RID_CUSTOMANIMATION_START+1
-#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT
RID_CUSTOMANIMATION_START+2
-#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT
RID_CUSTOMANIMATION_START+3
-#define IMG_CUSTOMANIMATION_EXIT_EFFECT
RID_CUSTOMANIMATION_START+4
-#define IMG_CUSTOMANIMATION_MOTION_PATH
RID_CUSTOMANIMATION_START+5
-#define IMG_CUSTOMANIMATION_OLE
RID_CUSTOMANIMATION_START+6
-#define IMG_CUSTOMANIMATION_MEDIA_PLAY
RID_CUSTOMANIMATION_START+7
-#define IMG_CUSTOMANIMATION_MEDIA_PAUSE
RID_CUSTOMANIMATION_START+8
-#define IMG_CUSTOMANIMATION_MEDIA_STOP
RID_CUSTOMANIMATION_START+9
+#define BMP_CUSTOMANIMATION_ON_CLICK
RID_CUSTOMANIMATION_START+0
+#define BMP_CUSTOMANIMATION_AFTER_PREVIOUS
RID_CUSTOMANIMATION_START+1
+#define BMP_CUSTOMANIMATION_ENTRANCE_EFFECT
RID_CUSTOMANIMATION_START+2
+#define BMP_CUSTOMANIMATION_EMPHASIS_EFFECT
RID_CUSTOMANIMATION_START+3
+#define BMP_CUSTOMANIMATION_EXIT_EFFECT
RID_CUSTOMANIMATION_START+4
+#define BMP_CUSTOMANIMATION_MOTION_PATH
RID_CUSTOMANIMATION_START+5
+#define BMP_CUSTOMANIMATION_OLE
RID_CUSTOMANIMATION_START+6
+#define BMP_CUSTOMANIMATION_MEDIA_PLAY
RID_CUSTOMANIMATION_START+7
+#define BMP_CUSTOMANIMATION_MEDIA_PAUSE
RID_CUSTOMANIMATION_START+8
+#define BMP_CUSTOMANIMATION_MEDIA_STOP
RID_CUSTOMANIMATION_START+9
#define STR_CUSTOMANIMATION_REPEAT_NONE
RID_CUSTOMANIMATION_START+5
#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK
RID_CUSTOMANIMATION_START+6
diff --git a/sd/source/ui/animations/CustomAnimation.src
b/sd/source/ui/animations/CustomAnimation.src
index 632e7b6..156166c 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -384,60 +384,59 @@ String STR_CUSTOMANIMATION_MOTION_PATHS
Text [ en-US ] = "Motion Paths: %1";
};
-
String STR_SLIDETRANSITION_NONE
{
Text [ en-US ] = "None";
};
-Image IMG_CUSTOMANIMATION_ON_CLICK
+Bitmap BMP_CUSTOMANIMATION_ON_CLICK
{
- ImageBitmap = Bitmap { File = "click_16.png" ; };
+ File = "click_16.png";
};
-Image IMG_CUSTOMANIMATION_AFTER_PREVIOUS
+Bitmap BMP_CUSTOMANIMATION_AFTER_PREVIOUS
{
- ImageBitmap = Bitmap { File = "time_16.png" ; };
+ File = "time_16.png";
};
-Image IMG_CUSTOMANIMATION_ENTRANCE_EFFECT
+Bitmap BMP_CUSTOMANIMATION_ENTRANCE_EFFECT
{
- ImageBitmap = Bitmap { File = "effect_16.png" ; };
+ File = "effect_16.png";
};
-Image IMG_CUSTOMANIMATION_EMPHASIS_EFFECT
+Bitmap BMP_CUSTOMANIMATION_EMPHASIS_EFFECT
{
- ImageBitmap = Bitmap { File = "effectshape_16.png" ; };
+ File = "effectshape_16.png";
};
-Image IMG_CUSTOMANIMATION_EXIT_EFFECT
+Bitmap BMP_CUSTOMANIMATION_EXIT_EFFECT
{
- ImageBitmap = Bitmap { File = "effectfade_16.png" ; };
+ File = "effectfade_16.png";
};
-Image IMG_CUSTOMANIMATION_MOTION_PATH
+Bitmap BMP_CUSTOMANIMATION_MOTION_PATH
{
- ImageBitmap = Bitmap { File = "effectpath_16.png" ; };
+ File = "effectpath_16.png";
};
-Image IMG_CUSTOMANIMATION_OLE
+Bitmap BMP_CUSTOMANIMATION_OLE
{
- ImageBitmap = Bitmap { File = "effectole_16.png"; } ;
+ File = "effectole_16.png";
};
-Image IMG_CUSTOMANIMATION_MEDIA_PLAY
+Bitmap BMP_CUSTOMANIMATION_MEDIA_PLAY
{
- ImageBitmap = Bitmap { File = "playblue_16.png"; } ;
+ File = "playblue_16.png";
};
-Image IMG_CUSTOMANIMATION_MEDIA_PAUSE
+Bitmap BMP_CUSTOMANIMATION_MEDIA_PAUSE
{
- ImageBitmap = Bitmap { File = "breakplayingblue_16.png"; } ;
+ File = "breakplayingblue_16.png";
};
-Image IMG_CUSTOMANIMATION_MEDIA_STOP
+Bitmap BMP_CUSTOMANIMATION_MEDIA_STOP
{
- ImageBitmap = Bitmap { File = "stopplayingblue_16.png"; } ;
+ File = "stopplayingblue_16.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx
b/sd/source/ui/animations/CustomAnimationList.cxx
index b06394f..2cac897 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -268,11 +268,11 @@ void CustomAnimationListEntryItem::Paint(const Point&
rPos, SvTreeListBox& rDev,
sal_Int16 nNodeType = mpEffect->getNodeType();
if (nNodeType == EffectNodeType::ON_CLICK )
{
- rRenderContext.DrawImage( aPos,
mpParent->getImage(IMG_CUSTOMANIMATION_ON_CLICK));
+ rRenderContext.DrawImage( aPos,
mpParent->getImage(BMP_CUSTOMANIMATION_ON_CLICK));
}
else if (nNodeType == EffectNodeType::AFTER_PREVIOUS)
{
- rRenderContext.DrawImage(aPos,
mpParent->getImage(IMG_CUSTOMANIMATION_AFTER_PREVIOUS));
+ rRenderContext.DrawImage(aPos,
mpParent->getImage(BMP_CUSTOMANIMATION_AFTER_PREVIOUS));
}
else if (nNodeType == EffectNodeType::WITH_PREVIOUS)
{
@@ -290,25 +290,25 @@ void CustomAnimationListEntryItem::Paint(const Point&
rPos, SvTreeListBox& rDev,
switch (mpEffect->getPresetClass())
{
case EffectPresetClass::ENTRANCE:
- nImage = IMG_CUSTOMANIMATION_ENTRANCE_EFFECT; break;
+ nImage = BMP_CUSTOMANIMATION_ENTRANCE_EFFECT; break;
case EffectPresetClass::EXIT:
- nImage = IMG_CUSTOMANIMATION_EXIT_EFFECT; break;
+ nImage = BMP_CUSTOMANIMATION_EXIT_EFFECT; break;
case EffectPresetClass::EMPHASIS:
- nImage = IMG_CUSTOMANIMATION_EMPHASIS_EFFECT; break;
+ nImage = BMP_CUSTOMANIMATION_EMPHASIS_EFFECT; break;
case EffectPresetClass::MOTIONPATH:
- nImage = IMG_CUSTOMANIMATION_MOTION_PATH; break;
+ nImage = BMP_CUSTOMANIMATION_MOTION_PATH; break;
case EffectPresetClass::OLEACTION:
- nImage = IMG_CUSTOMANIMATION_OLE; break;
+ nImage = BMP_CUSTOMANIMATION_OLE; break;
case EffectPresetClass::MEDIACALL:
switch (mpEffect->getCommand())
{
case EffectCommands::TOGGLEPAUSE:
- nImage = IMG_CUSTOMANIMATION_MEDIA_PAUSE; break;
+ nImage = BMP_CUSTOMANIMATION_MEDIA_PAUSE; break;
case EffectCommands::STOP:
- nImage = IMG_CUSTOMANIMATION_MEDIA_STOP; break;
+ nImage = BMP_CUSTOMANIMATION_MEDIA_STOP; break;
case EffectCommands::PLAY:
default:
- nImage = IMG_CUSTOMANIMATION_MEDIA_PLAY; break;
+ nImage = BMP_CUSTOMANIMATION_MEDIA_PLAY; break;
}
break;
default:
@@ -456,13 +456,13 @@ VCL_BUILDER_FACTORY(CustomAnimationList)
const Image& CustomAnimationList::getImage( sal_uInt16 nId )
{
- DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <=
IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal
index!" );
+ DBG_ASSERT( (nId >= BMP_CUSTOMANIMATION_ON_CLICK) && (nId <=
BMP_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal
index!" );
- Image& rImage = maImages[nId - IMG_CUSTOMANIMATION_ON_CLICK];
+ Image& rImage = maImages[nId - BMP_CUSTOMANIMATION_ON_CLICK];
// load on demand
if( rImage.GetSizePixel().Width() == 0 )
- rImage = Image(SdResId( nId ) );
+ rImage = Image(BitmapEx(SdResId(nId)));
return rImage;
}
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx
b/sd/source/ui/animations/CustomAnimationList.hxx
index 0a0b906..7b45e88 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -105,7 +105,7 @@ private:
MainSequencePtr mpMainSequence;
- Image maImages[ IMG_CUSTOMANIMATION_MEDIA_STOP -
IMG_CUSTOMANIMATION_ON_CLICK + 1];
+ Image maImages[ BMP_CUSTOMANIMATION_MEDIA_STOP -
BMP_CUSTOMANIMATION_ON_CLICK + 1];
css::uno::Reference< css::drawing::XShape > mxLastTargetShape;
sal_Int32 mnLastGroupId;
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index c45c895..f5168a3 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -845,28 +845,19 @@ Bitmap BMP_PRESENTATION_MINIMIZER
File = "minimize_presi_80.png";
};
-Image IMG_EMBEDDED
+Bitmap BMP_EMBEDDED
{
- ImageBitmap = Bitmap
- {
- File = "nv08.png" ;
- };
+ File = "nv08.png" ;
};
-Image IMG_LINK
+Bitmap BMP_LINK
{
- ImageBitmap = Bitmap
- {
- File = "nv09.png" ;
- };
+ File = "nv09.png" ;
};
-Image IMG_HYPERLINK
+Bitmap BMP_HYPERLINK
{
- ImageBitmap = Bitmap
- {
- File = "nv010.png" ;
- };
+ File = "nv010.png" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 042f06a..c12529f 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -619,11 +619,11 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdResId(
NavigatorDragType eDT, bool bImag
case NAVIGATOR_DRAGTYPE_NONE:
return( bImage ? 0 : STR_NONE );
case NAVIGATOR_DRAGTYPE_URL:
- return( bImage ? IMG_HYPERLINK : STR_DRAGTYPE_URL );
+ return( bImage ? BMP_HYPERLINK : STR_DRAGTYPE_URL );
case NAVIGATOR_DRAGTYPE_EMBEDDED:
- return( bImage ? IMG_EMBEDDED : STR_DRAGTYPE_EMBEDDED );
+ return( bImage ? BMP_EMBEDDED : STR_DRAGTYPE_EMBEDDED );
case NAVIGATOR_DRAGTYPE_LINK:
- return( bImage ? IMG_LINK : STR_DRAGTYPE_LINK );
+ return( bImage ? BMP_LINK : STR_DRAGTYPE_LINK );
default: OSL_FAIL( "No resource for DragType available!" );
}
return 0;
@@ -717,7 +717,7 @@ void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt )
void SdNavigatorWin::SetDragImage()
{
const sal_uInt16 nDragTypeId = maToolbox->GetItemId("dragmode");
- maToolbox->SetItemImage(nDragTypeId,
Image(SdResId(GetDragTypeSdResId(meDragType, true))));
+ maToolbox->SetItemImage(nDragTypeId,
Image(BitmapEx(SdResId(GetDragTypeSdResId(meDragType, true)))));
}
/**
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index dfa0f40..7df365e 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -211,8 +211,8 @@
#define BMP_STYLES_FAMILY_GRAPHICS RID_APP_START+397
#define BMP_STYLES_FAMILY_PRESENTATIONS RID_APP_START+398
-#define IMG_EMBEDDED RID_APP_START+399
-#define IMG_LINK RID_APP_START+400
-#define IMG_HYPERLINK RID_APP_START+401
+#define BMP_EMBEDDED RID_APP_START+399
+#define BMP_LINK RID_APP_START+400
+#define BMP_HYPERLINK RID_APP_START+401
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 81516167e37cae84b8d74cfa7537196312fb9911
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 11:06:42 2017 +0000
flatten resource, drop LocalResource class
drop cargo-cult second LocalResource use
Change-Id: I0c655f8ca15ad146bb11290fdefad67846ec8006
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 9f221b9..2296eec 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -134,7 +134,6 @@
#define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227
#define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228
-#define RID_SLIDESORTER_ICONS RID_GLOB_START+227
#define STR_DEAUTHORISE_CLIENT RID_GLOB_START+229
#define STR_MASTERSLIDE_NAME RID_GLOB_START+230
#define STR_MASTERPAGE_NAME RID_GLOB_START+231
@@ -142,6 +141,11 @@
#define STR_SHRINK_FONT_SIZE RID_GLOB_START+232
#define STR_GROW_FONT_SIZE RID_GLOB_START+233
+#define IMAGE_SHADOW RID_GLOB_START+234
+#define IMAGE_INSERT_SHADOW RID_GLOB_START+235
+#define IMAGE_HIDE_SLIDE_OVERLAY RID_GLOB_START+236
+#define IMAGE_FOCUS_BORDER RID_GLOB_START+237
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/inc/view/SlsResource.hrc
b/sd/source/ui/slidesorter/inc/view/SlsResource.hrc
deleted file mode 100644
index 31c2fb2..0000000
--- a/sd/source/ui/slidesorter/inc/view/SlsResource.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef SD_SLIDESORTER_ICONS_HRC
-#define SD_SLIDESORTER_ICONS_HRC
-
-#include "glob.hrc"
-
-#define IMAGE_SHADOW 90
-#define IMAGE_INSERT_SHADOW 91
-#define IMAGE_HIDE_SLIDE_OVERLAY 92
-#define IMAGE_FOCUS_BORDER 93
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index c6e8292..14d3568 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -142,7 +142,7 @@ private:
GradientDescriptor& GetGradient (const GradientColorType eType);
/** Guarded initialization of the specified icon in the maIcons
- container. Call only while a LocalResource object is active.
+ container.
*/
void InitializeIcon (const IconType eType, sal_uInt16 nResourceId);
};
diff --git a/sd/source/ui/slidesorter/view/SlsResource.hxx
b/sd/source/ui/slidesorter/view/SlsResource.hxx
deleted file mode 100644
index e1d6426..0000000
--- a/sd/source/ui/slidesorter/view/SlsResource.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_VIEW_SLSRESOURCE_HXX
-#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_VIEW_SLSRESOURCE_HXX
-
-#include "view/SlsResource.hrc"
-#include "sdresid.hxx"
-#include <tools/rc.hxx>
-
-namespace sd { namespace slidesorter { namespace view {
-
-class LocalResource : public Resource
-{
-public:
- explicit LocalResource (const sal_uInt16 nResourceId) :
Resource(SdResId(nResourceId)){}
- ~LocalResource() { FreeResource(); }
-};
-
-} } } // end of namespace ::sd::slidesorter::view
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/view/SlsResource.src
b/sd/source/ui/slidesorter/view/SlsResource.src
index a192e55..20134d8 100644
--- a/sd/source/ui/slidesorter/view/SlsResource.src
+++ b/sd/source/ui/slidesorter/view/SlsResource.src
@@ -17,29 +17,26 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "view/SlsResource.hrc"
+#include "glob.hrc"
-Resource RID_SLIDESORTER_ICONS
+Bitmap IMAGE_SHADOW
{
- Bitmap IMAGE_SHADOW
- {
- File = "slide_sorter_shadow.png";
- };
+ File = "slide_sorter_shadow.png";
+};
- Bitmap IMAGE_INSERT_SHADOW
- {
- File = "slide_sorter_insert_shadow.png";
- };
+Bitmap IMAGE_INSERT_SHADOW
+{
+ File = "slide_sorter_insert_shadow.png";
+};
- Bitmap IMAGE_HIDE_SLIDE_OVERLAY
- {
- File = "slide_sorter_hide_slide_overlay.png";
- };
+Bitmap IMAGE_HIDE_SLIDE_OVERLAY
+{
+ File = "slide_sorter_hide_slide_overlay.png";
+};
- Bitmap IMAGE_FOCUS_BORDER
- {
- File = "slide_sorter_focus_border.png";
- };
+Bitmap IMAGE_FOCUS_BORDER
+{
+ File = "slide_sorter_focus_border.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx
b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index 44ca4cb..1ebc54c 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "glob.hrc"
#include "view/SlsTheme.hxx"
-#include "SlsResource.hxx"
#include "controller/SlsProperties.hxx"
#include "sdresid.hxx"
#include <tools/color.hxx>
@@ -66,18 +66,14 @@ Theme::Theme (const
std::shared_ptr<controller::Properties>& rpProperties)
maIcons(),
maColor()
{
- {
- LocalResource aResource (RID_SLIDESORTER_ICONS);
-
- maColor.resize(ColorType_Size_);
- maColor[Color_Background] = maBackgroundColor;
- maColor[Color_PageNumberDefault] = 0x0808080;
- maColor[Color_PageNumberHover] = 0x4c4c4c;
- maColor[Color_PageNumberHighContrast] = White;
- maColor[Color_PageNumberBrightBackground] = 0x333333;
- maColor[Color_PageNumberDarkBackground] = 0xcccccc;
- maColor[Color_PreviewBorder] = 0x949599;
- }
+ maColor.resize(ColorType_Size_);
+ maColor[Color_Background] = maBackgroundColor;
+ maColor[Color_PageNumberDefault] = 0x0808080;
+ maColor[Color_PageNumberHover] = 0x4c4c4c;
+ maColor[Color_PageNumberHighContrast] = White;
+ maColor[Color_PageNumberBrightBackground] = 0x333333;
+ maColor[Color_PageNumberDarkBackground] = 0xcccccc;
+ maColor[Color_PreviewBorder] = 0x949599;
Update(rpProperties);
}
@@ -118,7 +114,6 @@ void Theme::Update (const
std::shared_ptr<controller::Properties>& rpProperties)
// Set up icons.
if (maIcons.empty())
{
- LocalResource aResource (RID_SLIDESORTER_ICONS);
maIcons.resize(IconType_Size_);
InitializeIcon(Icon_RawShadow, IMAGE_SHADOW);
commit 0d08b70ec10e3100ae374564c95d74b78508a5a6
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 11:01:45 2017 +0000
can use Bitmaps directly here
Change-Id: I75f4148ff864657e747b02d80a120177b469f28a
diff --git a/sd/source/ui/slidesorter/view/SlsResource.src
b/sd/source/ui/slidesorter/view/SlsResource.src
index 129c15d..a192e55 100644
--- a/sd/source/ui/slidesorter/view/SlsResource.src
+++ b/sd/source/ui/slidesorter/view/SlsResource.src
@@ -21,24 +21,24 @@
Resource RID_SLIDESORTER_ICONS
{
- Image IMAGE_SHADOW
+ Bitmap IMAGE_SHADOW
{
- ImageBitmap = Bitmap { File = "slide_sorter_shadow.png" ; };
+ File = "slide_sorter_shadow.png";
};
- Image IMAGE_INSERT_SHADOW
+ Bitmap IMAGE_INSERT_SHADOW
{
- ImageBitmap = Bitmap { File = "slide_sorter_insert_shadow.png" ; };
+ File = "slide_sorter_insert_shadow.png";
};
- Image IMAGE_HIDE_SLIDE_OVERLAY
+ Bitmap IMAGE_HIDE_SLIDE_OVERLAY
{
- ImageBitmap = Bitmap { File = "slide_sorter_hide_slide_overlay.png" ;
};
+ File = "slide_sorter_hide_slide_overlay.png";
};
- Image IMAGE_FOCUS_BORDER
+ Bitmap IMAGE_FOCUS_BORDER
{
- ImageBitmap = Bitmap { File = "slide_sorter_focus_border.png" ; };
+ File = "slide_sorter_focus_border.png";
};
};
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx
b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index 86bf11a..44ca4cb 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -248,7 +248,7 @@ void Theme::InitializeIcon (const IconType eType,
sal_uInt16 nResourceId)
{
if (eType>=0 && size_t(eType)<maIcons.size())
{
- const BitmapEx aIcon (Image(SdResId(nResourceId)).GetBitmapEx());
+ const BitmapEx aIcon((SdResId(nResourceId)));
maIcons[eType] = aIcon;
}
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
