summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/dlg')
-rw-r--r--sd/source/ui/dlg/inspagob.cxx6
-rw-r--r--sd/source/ui/dlg/navigatr.cxx32
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx3
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx30
4 files changed, 46 insertions, 25 deletions
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 537865b6146a..2afd2d54bca8 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -21,6 +21,7 @@
#include "strings.hrc"
#include "res_bmp.hrc"
+#include "bitmaps.hlst"
#include "sdresid.hxx"
#include "drawdoc.hxx"
#include "DrawDocShell.hxx"
@@ -82,8 +83,9 @@ void SdInsertPagesObjsDlg::Reset()
else
{
Color aColor( COL_WHITE );
- Bitmap aBmpText( SdResId( BMP_DOC_TEXT ) );
- Image aImgText(BitmapEx(aBmpText, aColor));
+ BitmapEx aBmpText(BMP_DOC_TEXT);
+ //to-do, check if this is already transparent and remove intermedia bitmapex if it is
+ Image aImgText(BitmapEx(aBmpText.GetBitmap(), aColor));
m_pLbTree->InsertEntry( rName, aImgText, aImgText );
}
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 4d22b91e365c..76fa5140872b 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -44,6 +44,7 @@
#include "app.hrc"
#include "strings.hrc"
#include "res_bmp.hrc"
+#include "bitmaps.hlst"
#include "drawdoc.hxx"
#include "DrawDocShell.hxx"
#include "sdresid.hxx"
@@ -266,7 +267,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
for (sal_uInt16 nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; ++nID)
{
- sal_uInt16 nRId = GetDragTypeSdResId( (NavigatorDragType)nID, false );
+ sal_uInt16 nRId = GetDragTypeSdStrId((NavigatorDragType)nID);
if( nRId > 0 )
{
DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!");
@@ -616,23 +617,40 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName )
maLbDocs->SelectEntryPos( nPos );
}
-sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, bool bImage )
+sal_uInt16 SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT)
{
switch( eDT )
{
case NAVIGATOR_DRAGTYPE_NONE:
- return( bImage ? 0 : STR_NONE );
+ return STR_NONE;
case NAVIGATOR_DRAGTYPE_URL:
- return( bImage ? BMP_HYPERLINK : STR_DRAGTYPE_URL );
+ return STR_DRAGTYPE_URL;
case NAVIGATOR_DRAGTYPE_EMBEDDED:
- return( bImage ? BMP_EMBEDDED : STR_DRAGTYPE_EMBEDDED );
+ return STR_DRAGTYPE_EMBEDDED;
case NAVIGATOR_DRAGTYPE_LINK:
- return( bImage ? BMP_LINK : STR_DRAGTYPE_LINK );
+ return STR_DRAGTYPE_LINK;
default: OSL_FAIL( "No resource for DragType available!" );
}
return 0;
}
+OUString SdNavigatorWin::GetDragTypeSdBmpId(NavigatorDragType eDT)
+{
+ switch( eDT )
+ {
+ case NAVIGATOR_DRAGTYPE_NONE:
+ return OUString();
+ case NAVIGATOR_DRAGTYPE_URL:
+ return OUString(BMP_HYPERLINK);
+ case NAVIGATOR_DRAGTYPE_EMBEDDED:
+ return OUString(BMP_EMBEDDED);
+ case NAVIGATOR_DRAGTYPE_LINK:
+ return OUString(BMP_LINK);
+ default: OSL_FAIL( "No resource for DragType available!" );
+ }
+ return OUString();
+}
+
NavDocInfo* SdNavigatorWin::GetDocInfo()
{
sal_uInt32 nPos = maLbDocs->GetSelectEntryPos();
@@ -721,7 +739,7 @@ void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt )
void SdNavigatorWin::SetDragImage()
{
const sal_uInt16 nDragTypeId = maToolbox->GetItemId("dragmode");
- maToolbox->SetItemImage(nDragTypeId, Image(BitmapEx(SdResId(GetDragTypeSdResId(meDragType, true)))));
+ maToolbox->SetItemImage(nDragTypeId, Image(BitmapEx(GetDragTypeSdBmpId(meDragType))));
}
/**
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index e406177a91ec..7746eb90f0d6 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -23,6 +23,7 @@
#include "strings.hrc"
#include "res_bmp.hrc"
+#include "bitmaps.hlst"
#include "sdpreslt.hxx"
#include "sdattr.hxx"
#include "sdresid.hxx"
@@ -272,7 +273,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
// empty layout
maLayoutNames.push_back(maStrNone);
m_pVS->InsertItem( (sal_uInt16) maLayoutNames.size(),
- Image(Bitmap(SdResId(BMP_FOIL_NONE))), maStrNone );
+ Image(BMP_FOIL_NONE), maStrNone );
}
if (!bCancel)
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 2e0f718e81cd..073185fbecda 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -41,6 +41,7 @@
#include "navigatr.hxx"
#include "strings.hrc"
#include "res_bmp.hrc"
+#include "bitmaps.hlst"
#include "customshowlist.hxx"
#include "ViewShell.hxx"
#include "DrawController.hxx"
@@ -196,8 +197,8 @@ SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle )
, mpBookmarkDoc ( nullptr )
, mpMedium ( nullptr )
, mpOwnMedium ( nullptr )
-, maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) )
-, maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) )
+, maImgOle ( BitmapEx(BMP_OLE) )
+, maImgGraphic ( BitmapEx(BMP_GRAPHIC) )
, mbLinkableSelected ( false )
, mpDropNavWin ( nullptr )
, mpFrame ( nullptr )
@@ -211,8 +212,7 @@ SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle )
WB_HSCROLL |
WB_HASBUTTONSATROOT |
WB_QUICK_SEARCH /* i31275 */ );
- SetNodeBitmaps( Image(Bitmap( SdResId(BMP_EXPAND) )),
- Image(Bitmap( SdResId(BMP_COLLAPSE) )));
+ SetNodeBitmaps(Image(BitmapEx(BMP_EXPAND)), Image(BitmapEx(BMP_COLLAPSE)));
SetDragDropMode(
DragDropMode::CTRL_MOVE | DragDropMode::CTRL_COPY |
@@ -538,8 +538,8 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
mpMedium = pInMedium;
maDocName = rDocName;
- Image aImgDocOpen=Image( BitmapEx( SdResId( BMP_DOC_OPEN ) ) );
- Image aImgDocClosed=Image( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) );
+ Image aImgDocOpen=Image(BitmapEx(BMP_DOC_OPEN));
+ Image aImgDocClosed=Image(BitmapEx(BMP_DOC_CLOSED));
// insert document name
InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, nullptr, true, TREELIST_APPEND,
@@ -882,9 +882,9 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry )
SdrObject* pObj = nullptr;
SvTreeListEntry* pPageEntry = nullptr;
- Image aImgPage = Image( BitmapEx( SdResId( BMP_PAGE ) ) );
- Image aImgPageObjs = Image( BitmapEx( SdResId( BMP_PAGEOBJS ) ) );
- Image aImgObjects = Image( BitmapEx( SdResId( BMP_OBJECTS ) ) );
+ Image aImgPage = Image(BitmapEx(BMP_PAGE));
+ Image aImgPageObjs = Image(BitmapEx(BMP_PAGEOBJS));
+ Image aImgObjects = Image(BitmapEx(BMP_OBJECTS));
// document name already inserted
@@ -1580,12 +1580,12 @@ void SdPageObjsTLB::AddShapeToTransferable (
//===== IconProvider ==========================================================
SdPageObjsTLB::IconProvider::IconProvider()
- : maImgPage( BitmapEx( SdResId( BMP_PAGE ) ) ),
- maImgPageExcl( BitmapEx( SdResId( BMP_PAGE_EXCLUDED ) ) ),
- maImgPageObjsExcl( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) ) ),
- maImgPageObjs( BitmapEx( SdResId( BMP_PAGEOBJS ) ) ),
- maImgObjects( BitmapEx( SdResId( BMP_OBJECTS ) ) ),
- maImgGroup( BitmapEx( SdResId( BMP_GROUP ) ) )
+ : maImgPage(BitmapEx(BMP_PAGE)),
+ maImgPageExcl(BitmapEx(BMP_PAGE_EXCLUDED)),
+ maImgPageObjsExcl(BitmapEx(BMP_PAGEOBJS_EXCLUDED)),
+ maImgPageObjs(BitmapEx(BMP_PAGEOBJS)),
+ maImgObjects(BitmapEx(BMP_OBJECTS)),
+ maImgGroup(BitmapEx(BMP_GROUP))
{
}
generated by cgit (git 2.34.1) at 2024-07-27 07:01:48 +0000