summaryrefslogtreecommitdiff
path: root/sd/source/ui/controller
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/controller')
-rw-r--r--sd/source/ui/controller/displaymodecontroller.cxx50
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx15
2 files changed, 33 insertions, 32 deletions
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index c6e695ed9ada..725e2332a2b0 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -15,6 +15,7 @@
#include "strings.hrc"
#include "res_bmp.hrc"
+#include "bitmaps.hlst"
#include "sdresid.hxx"
using namespace ::com::sun::star;
@@ -43,7 +44,7 @@ public:
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
- void setToolboxItemImage( sal_uInt16 nImage );
+ void setToolboxItemImage(const OUString& rImage);
using svt::PopupWindowController::createPopupWindow;
};
@@ -68,10 +69,10 @@ private:
struct snewfoil_value_info
{
- sal_uInt16 mnId;
- sal_uInt16 mnBmpResId;
- sal_uInt16 mnStrResId;
- OUString msUnoCommand;
+ sal_uInt16 mnId;
+ const char* msBmpResId;
+ sal_uInt16 mnStrResId;
+ const char* msUnoCommand;
};
static const snewfoil_value_info editmodes[] =
@@ -79,20 +80,20 @@ static const snewfoil_value_info editmodes[] =
{1,
BMP_DISPLAYMODE_SLIDE,
STR_NORMAL_MODE,
- OUString(".uno:NormalMultiPaneGUI") },
+ ".uno:NormalMultiPaneGUI" },
{2,
BMP_DISPLAYMODE_NOTES,
STR_NOTES_MODE,
- OUString(".uno:NotesMode") },
+ ".uno:NotesMode" },
{3,
BMP_DISPLAYMODE_OUTLINE,
STR_OUTLINE_MODE,
- OUString(".uno:OutlineMode") },
+ ".uno:OutlineMode" },
{4,
BMP_DISPLAYMODE_SLIDE_SORTER,
STR_SLIDE_SORTER_MODE,
- OUString(".uno:DiaMode") },
- {0, 0, 0, OUString() }
+ ".uno:DiaMode" },
+ {0, "", 0, "" }
};
static const snewfoil_value_info mastermodes[] =
@@ -100,16 +101,16 @@ static const snewfoil_value_info mastermodes[] =
{5,
BMP_DISPLAYMODE_SLIDE_MASTER,
STR_SLIDE_MASTER_MODE,
- OUString(".uno:SlideMasterPage") },
+ ".uno:SlideMasterPage" },
{6,
BMP_DISPLAYMODE_NOTES_MASTER,
STR_NOTES_MASTER_MODE,
- OUString(".uno:NotesMasterPage") },
+ ".uno:NotesMasterPage" },
{7,
BMP_DISPLAYMODE_HANDOUT_MASTER,
STR_HANDOUT_MASTER_MODE,
- OUString(".uno:HandoutMode") },
- {0, 0, 0, OUString() }
+ ".uno:HandoutMode" },
+ {0, "", 0, "" }
};
@@ -119,7 +120,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn
for( ; pInfo->mnId; pInfo++ )
{
OUString aText( SD_RESSTR( pInfo->mnStrResId ) );
- BitmapEx aBmp( SdResId( pInfo->mnBmpResId ) );
+ BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
pValue->InsertItem(pInfo->mnId, Image(aBmp), aText);
@@ -204,21 +205,21 @@ void DisplayModeToolbarMenu::SelectHdl(void * pControl)
EndPopupMode();
OUString sCommandURL;
- sal_uInt16 nImage = 0;
+ OUString sImage;
if( pControl == mpDisplayModeSet1 ) {
- sCommandURL = editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msUnoCommand;
- nImage = editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].mnBmpResId;
+ sCommandURL = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msUnoCommand);
+ sImage = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msBmpResId);
}
else if( pControl == mpDisplayModeSet2 ) {
- sCommandURL = mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msUnoCommand;
- nImage = mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].mnBmpResId;
+ sCommandURL = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msUnoCommand);
+ sImage = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msBmpResId);
}
if (!sCommandURL.isEmpty())
mrController.dispatchCommand( sCommandURL, Sequence< PropertyValue >() );
- mrController.setToolboxItemImage( nImage );
+ mrController.setToolboxItemImage(sImage);
}
DisplayModeController::DisplayModeController( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
@@ -233,7 +234,7 @@ void SAL_CALL DisplayModeController::initialize( const css::uno::Sequence< css::
sal_uInt16 nId = 0;
if ( getToolboxId( nId, &pToolBox ) )
pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY );
- setToolboxItemImage( BMP_DISPLAYMODE_SLIDE );
+ setToolboxItemImage(BMP_DISPLAYMODE_SLIDE);
}
VclPtr<vcl::Window> DisplayModeController::createPopupWindow( vcl::Window* pParent )
@@ -241,13 +242,12 @@ VclPtr<vcl::Window> DisplayModeController::createPopupWindow( vcl::Window* pPare
return VclPtr<sd::DisplayModeToolbarMenu>::Create( *this, pParent );
}
-void DisplayModeController::setToolboxItemImage( sal_uInt16 nImage )
+void DisplayModeController::setToolboxItemImage(const OUString& rImage)
{
sal_uInt16 nId;
ToolBox* pToolBox = nullptr;
if (getToolboxId( nId, &pToolBox )) {
- SdResId resId( nImage );
- BitmapEx aBmp( resId );
+ BitmapEx aBmp(rImage);
int targetSize = (pToolBox->GetToolboxButtonSize() == ToolBoxButtonSize::Large) ? 32 : 16;
double scale = 1.0f;
Size size = aBmp.GetSizePixel();
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 95b34206e9d2..759c9eacd8da 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -47,6 +47,7 @@
#include "glob.hrc"
#include "strings.hrc"
#include "res_bmp.hrc"
+#include "bitmaps.hlst"
#include "sdresid.hxx"
#include "pres.hxx"
#include "slidelayoutcontroller.hxx"
@@ -83,7 +84,7 @@ private:
struct snewfoil_value_info_layout
{
- sal_uInt16 mnBmpResId;
+ const char* msBmpResId;
sal_uInt16 mnStrResId;
AutoLayout maAutoLayout;
};
@@ -91,7 +92,7 @@ struct snewfoil_value_info_layout
static const snewfoil_value_info_layout notes[] =
{
{BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES},
- {0, 0, AUTOLAYOUT_NONE},
+ {"", 0, AUTOLAYOUT_NONE},
};
static const snewfoil_value_info_layout handout[] =
@@ -102,7 +103,7 @@ static const snewfoil_value_info_layout handout[] =
{BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4},
{BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6},
{BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9},
- {0, 0, AUTOLAYOUT_NONE},
+ {"", 0, AUTOLAYOUT_NONE},
};
static const snewfoil_value_info_layout standard[] =
@@ -119,7 +120,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT },
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_TITLE_4CONTENT },
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_TITLE_6CONTENT },
- {0, 0, AUTOLAYOUT_NONE}
+ {"", 0, AUTOLAYOUT_NONE}
};
static const snewfoil_value_info_layout v_standard[] =
@@ -129,16 +130,16 @@ static const snewfoil_value_info_layout v_standard[] =
{BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VTITLE_VCONTENT },
{BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VCONTENT },
{BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_2VTEXT },
- {0, 0, AUTOLAYOUT_NONE}
+ {"", 0, AUTOLAYOUT_NONE}
};
static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo )
{
Size aLayoutItemSize;
- for( ; pInfo->mnBmpResId; pInfo++ )
+ for( ; pInfo->mnStrResId; pInfo++ )
{
OUString aText( SD_RESSTR( pInfo->mnStrResId ) );
- BitmapEx aBmp( SdResId( pInfo->mnBmpResId ) );
+ BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1,
Image(aBmp), aText);
generated by cgit (git 2.34.1) at 2024-07-10 14:19:05 +0000