diff options
| -rw-r--r-- | include/svx/dialogs.hrc | 1 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 5 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.src | 12 |
3 files changed, 3 insertions, 15 deletions
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index c6aa5c25005f..c44b6c5e8b78 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -177,7 +177,6 @@ #define RID_SVXMN_RULER (RID_SVX_START + 92) // for Toolbox-Control style -#define RID_SVXTBX_STYLE (RID_SVX_START + 120) #define RID_SVX_STYLE_MENU (RID_SVX_START + 121) #define RID_SVX_UPDATE_STYLE (RID_SVX_START + 122) #define RID_SVX_MODIFY_STYLE (RID_SVX_START + 123) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 3b457796feea..1c50946ebe86 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -340,7 +340,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent, const OUString& rClearFormatKey, const OUString& rMoreKey, bool bInSpec) - : ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ) + : ComboBox(pParent, WB_SORT | WB_BORDER | WB_HIDE | WB_DROPDOWN | WB_AUTOHSCROLL) , eStyleFamily( eFamily ) , nCurSel(0) , bRelease( true ) @@ -353,10 +353,11 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent, , bInSpecialMode( bInSpec ) , m_pMenu( VclPtr<PopupMenu>::Create(SVX_RES( RID_SVX_STYLE_MENU )) ) { + SetHelpId(HID_STYLE_LISTBOX); m_pMenu->SetSelectHdl( LINK( this, SvxStyleBox_Impl, MenuSelectHdl ) ); for(VclPtr<MenuButton> & rpButton : m_pButtons) rpButton = nullptr; - aLogicalSize = PixelToLogic( GetSizePixel(), MapUnit::MapAppFont ); + aLogicalSize = PixelToLogic(Size(60, 86), MapUnit::MapAppFont); SetOptimalSize(); EnableAutocomplete( true ); EnableUserDraw( true ); diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index 312d46229eb4..27aed7b4d400 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -86,18 +86,6 @@ String RID_SVXSTR_MOREBULLETS Text [ en-US ] = "More Bullets..." ; }; -ComboBox RID_SVXTBX_STYLE -{ - HelpId = HID_STYLE_LISTBOX ; - Size = MAP_APPFONT ( 60 , 86 ) ; - DropDown = TRUE ; - Sort = TRUE ; - AutoHScroll = TRUE ; - DDExtraWidth = TRUE ; - Border = TRUE ; - Hide = TRUE ; -}; - Menu RID_SVX_STYLE_MENU { ItemList = |