summaryrefslogtreecommitdiff
path: root/svx/source/stbctrls
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/stbctrls')
-rw-r--r--svx/source/stbctrls/modctrl.cxx7
-rw-r--r--svx/source/stbctrls/pszctrl.cxx5
-rw-r--r--svx/source/stbctrls/selctrl.cxx3
-rw-r--r--svx/source/stbctrls/stbctrls.src66
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx7
-rw-r--r--svx/source/stbctrls/zoomctrl.cxx3
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx7
7 files changed, 19 insertions, 79 deletions
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 2f4eb634f68d..247d0dc62f06 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include "modctrl_internal.hxx"
+#include "bitmaps.hlst"
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::PropertyValue;
@@ -54,9 +55,9 @@ struct SvxModifyControl::ImplData
ImplData():
mnModState(MODIFICATION_STATE_NO)
{
- 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)));
+ maImages[MODIFICATION_STATE_NO] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_NO));
+ maImages[MODIFICATION_STATE_YES] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_YES));
+ maImages[MODIFICATION_STATE_FEEDBACK] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_FEEDBACK));
maIdle.SetPriority(TaskPriority::LOWEST);
}
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index c19f02cb3114..f009e3e8af50 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -42,6 +42,7 @@
#include "stbctrls.h"
#include <svx/dialogs.hrc>
+#include "bitmaps.hlst"
#include <unotools/localedatawrapper.hxx>
#include <comphelper/processfactory.hxx>
@@ -221,8 +222,8 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId,
pImpl->bTable = false;
pImpl->bHasMenu = false;
pImpl->nFunctionSet = 0;
- pImpl->aPosImage = Image(BitmapEx(ResId(RID_SVXBMP_POSITION, DIALOG_MGR())));
- pImpl->aSizeImage = Image(BitmapEx(ResId(RID_SVXBMP_SIZE, DIALOG_MGR())));
+ pImpl->aPosImage = Image(BitmapEx(RID_SVXBMP_POSITION));
+ pImpl->aSizeImage = Image(BitmapEx(RID_SVXBMP_SIZE));
addStatusListener( STR_POSITION); // SID_ATTR_POSITION
addStatusListener( STR_TABLECELL); // SID_TABLE_CELL
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index a98ed9e29f1e..fd73a7418b8a 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -29,6 +29,7 @@
#include <svx/dialogs.hrc>
#include "stbctrls.h"
+#include "bitmaps.hlst"
SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item);
@@ -82,7 +83,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
mnState( 0 ),
- maImage(BitmapEx(SVX_RES(RID_SVXBMP_SELECTION)))
+ maImage(BitmapEx(RID_SVXBMP_SELECTION))
{
GetStatusBar().SetItemText( GetId(), "" );
}
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index f68fbf243795..7c58b4bbc9a2 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -36,11 +36,6 @@ String RID_SVXSTR_OVERWRITE_TEXT
Text [ en-US ] = "Overwrite" ;
};
-Bitmap RID_SVXBMP_SELECTION
-{
- File = "selection_10x22.png" ;
-};
-
String RID_SVXSTR_XMLSEC_SIG_OK
{
Text [ en-US ] = "Digital Signature: The document signature is OK.";
@@ -155,65 +150,4 @@ String RID_SIDEBAR_EMPTY_PANEL_TEXT
{
Text [ en-US ] = "Properties for the task that you are performing are not available for the current selection" ;
};
-
-Bitmap RID_SVXBMP_POSITION
-{
- File = "sc10223.png" ;
-};
-
-Bitmap RID_SVXBMP_SIZE
-{
- File = "sc10224.png" ;
-};
-
-Bitmap RID_SVXBMP_SIGNET
-{
- File = "signet_11x16.png" ;
-};
-
-Bitmap RID_SVXBMP_SIGNET_BROKEN
-{
- File = "caution_11x16.png" ;
-};
-
-Bitmap RID_SVXBMP_SIGNET_NOTVALIDATED
-{
- File = "notcertificate_16.png" ;
-};
-
-Bitmap RID_SVXBMP_SLIDERBUTTON
-{
- File = "slidezoombutton_10.png" ;
-};
-
-Bitmap RID_SVXBMP_SLIDERDECREASE
-{
- File = "slidezoomout_10.png" ;
-};
-
-Bitmap RID_SVXBMP_SLIDERINCREASE
-{
- File = "slidezoomin_10.png" ;
-};
-
-Bitmap RID_SVXBMP_DOC_MODIFIED_YES
-{
- File = "doc_modified_yes_14.png" ;
-};
-
-Bitmap RID_SVXBMP_DOC_MODIFIED_NO
-{
- File = "doc_modified_no_14.png" ;
-};
-
-Bitmap RID_SVXBMP_DOC_MODIFIED_FEEDBACK
-{
- File = "doc_modified_feedback.png" ;
-};
-
-Bitmap RID_SVXBMP_ZOOM_PAGE
-{
- 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 42f94aeeefba..327b36425407 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -37,6 +37,7 @@
#include <svx/dialmgr.hxx>
#include "svx/xmlsecctrl.hxx"
#include <tools/urlobj.hxx>
+#include "bitmaps.hlst"
SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxUInt16Item );
@@ -55,9 +56,9 @@ XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16
{
mpImpl->mnState = SignatureState::UNKNOWN;
- 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)));
+ mpImpl->maImage = Image(BitmapEx(RID_SVXBMP_SIGNET));
+ mpImpl->maImageBroken = Image(BitmapEx(RID_SVXBMP_SIGNET_BROKEN));
+ mpImpl->maImageNotValidated = Image(BitmapEx(RID_SVXBMP_SIGNET_NOTVALIDATED));
}
XmlSecStatusBarControl::~XmlSecStatusBarControl()
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index e93740e9deb9..31073cad96d9 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -34,6 +34,7 @@
#include "stbctrls.h"
#include <svx/dialmgr.hxx>
#include "modctrl_internal.hxx"
+#include "bitmaps.hlst"
SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem);
@@ -181,7 +182,7 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomPageStatusBarControl,SfxVoidItem);
SvxZoomPageStatusBarControl::SvxZoomPageStatusBarControl(sal_uInt16 _nSlotId,
sal_uInt16 _nId, StatusBar& rStb)
: SfxStatusBarControl(_nSlotId, _nId, rStb)
- , maImage(BitmapEx(SVX_RES(RID_SVXBMP_ZOOM_PAGE)))
+ , maImage(BitmapEx(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 b137bf37a201..01fb793e9359 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -27,6 +27,7 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <basegfx/tools/zoomtools.hxx>
+#include "bitmaps.hlst"
#include <set>
@@ -156,9 +157,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nI
SfxStatusBarControl( _nSlotId, _nId, rStatusBar ),
mxImpl( new SvxZoomSliderControl_Impl )
{
- 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)));
+ mxImpl->maSliderButton = Image(BitmapEx(RID_SVXBMP_SLIDERBUTTON));
+ mxImpl->maIncreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERINCREASE));
+ mxImpl->maDecreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERDECREASE));
}
SvxZoomSliderControl::~SvxZoomSliderControl()
generated by cgit (git 2.34.1) at 2024-08-07 09:17:16 +0000