diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-12-19 17:19:48 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-19 19:06:37 +0000 |
commit | bccfe2cbc3166f8f15c43417a958701328cfe64b (patch) | |
tree | 94d801ce28cfe6ab81d08100be87087240282877 /svx | |
parent | 2764201eda020d07f7c2fe34c5042c92c9ec7006 (diff) |
convert RID_SVXFLOAT_FONTWORK_CHARSPACING to simple strings
Change-Id: I54a1a714cb80f2d41a922416a0b9d94f1e329b57
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/helpid.hrc | 1 | ||||
-rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 32 | ||||
-rw-r--r-- | svx/source/tbxctrls/fontworkgallery.src | 68 |
3 files changed, 43 insertions, 58 deletions
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 20802cc9c5d8..c5e565d5f17a 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -86,7 +86,6 @@ #define HID_POPUP_COLOR "SVX_HID_POPUP_COLOR" #define HID_POPUP_COLOR_CTRL "SVX_HID_POPUP_COLOR_CTRL" #define HID_POPUP_FONTWORK_ALIGN "SVX_HID_POPUP_FONTWORK_ALIGN" -#define HID_POPUP_FONTWORK_CHARSPACE "SVX_HID_POPUP_FONTWORK_CHARSPACE" #define HID_POPUP_FRAME "SVX_HID_POPUP_FRAME" #define HID_POPUP_LINE "SVX_HID_POPUP_LINE" #define HID_POPUP_LINEEND "SVX_HID_POPUP_LINEEND" diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 9debe620e37c..973809b36f69 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -514,36 +514,30 @@ private: }; - - -FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ) -: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )) -, mrController( rController ) -, msFontworkCharacterSpacing( ".uno:FontworkCharacterSpacing" ) -, msFontworkKernCharacterPairs( ".uno:FontworkKernCharacterPairs" ) +FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::ToolboxController& rController, + const Reference< XFrame >& rFrame, vcl::Window* pParentWindow) + : ToolbarMenu(rFrame, pParentWindow, WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK) + , mrController(rController) + , msFontworkCharacterSpacing(".uno:FontworkCharacterSpacing") + , msFontworkKernCharacterPairs(".uno:FontworkKernCharacterPairs") { - SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); SetSelectHdl( LINK( this, FontworkCharacterSpacingWindow, SelectHdl ) ); - appendEntry( 0, SVX_RESSTR( STR_CHARS_SPACING_VERY_TIGHT ), MenuItemBits::RADIOCHECK ); - appendEntry( 1, SVX_RESSTR( STR_CHARS_SPACING_TIGHT ), MenuItemBits::RADIOCHECK ); - appendEntry( 2, SVX_RESSTR( STR_CHARS_SPACING_NORMAL ), MenuItemBits::RADIOCHECK ); - appendEntry( 3, SVX_RESSTR( STR_CHARS_SPACING_LOOSE ), MenuItemBits::RADIOCHECK ); - appendEntry( 4, SVX_RESSTR( STR_CHARS_SPACING_VERY_LOOSE ), MenuItemBits::RADIOCHECK ); - appendEntry( 5, SVX_RESSTR( STR_CHARS_SPACING_CUSTOM ), MenuItemBits::RADIOCHECK ); + appendEntry(0, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_VERY_TIGHT), MenuItemBits::RADIOCHECK); + appendEntry(1, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_TIGHT), MenuItemBits::RADIOCHECK); + appendEntry(2, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_NORMAL), MenuItemBits::RADIOCHECK); + appendEntry(3, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_LOOSE), MenuItemBits::RADIOCHECK); + appendEntry(4, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_VERY_LOOSE), MenuItemBits::RADIOCHECK); + appendEntry(5, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_CUSTOM), MenuItemBits::RADIOCHECK); appendSeparator(); - appendEntry( 6, SVX_RESSTR( STR_CHARS_SPACING_KERN_PAIRS ), MenuItemBits::CHECKABLE ); + appendEntry(6, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_KERN_PAIRS), MenuItemBits::CHECKABLE); SetOutputSizePixel( getMenuSize() ); - FreeResource(); - AddStatusListener( msFontworkCharacterSpacing ); AddStatusListener( msFontworkKernCharacterPairs ); } - - void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled ) { sal_Int32 i; diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src index dbefa6020655..6bb56b1fde86 100644 --- a/svx/source/tbxctrls/fontworkgallery.src +++ b/svx/source/tbxctrls/fontworkgallery.src @@ -110,47 +110,39 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT }; }; -DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING +String RID_SVXSTR_CHARS_SPACING_VERY_TIGHT { - HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_CHARSPACING"; - Border = FALSE ; - Hide = TRUE ; - SVLook = TRUE ; - Sizeable = FALSE ; - Moveable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; + Text [ en-US ] = "~Very Tight"; +}; - Text [ en-US ] = "Fontwork Character Spacing" ; +String RID_SVXSTR_CHARS_SPACING_TIGHT +{ + Text [ en-US ] = "~Tight"; +}; - String STR_CHARS_SPACING_VERY_TIGHT - { - Text [ en-US ] = "~Very Tight"; - }; - String STR_CHARS_SPACING_TIGHT - { - Text [ en-US ] = "~Tight"; - }; - String STR_CHARS_SPACING_NORMAL - { - Text [ en-US ] = "~Normal"; - }; - String STR_CHARS_SPACING_LOOSE - { - Text [ en-US ] = "~Loose"; - }; - String STR_CHARS_SPACING_VERY_LOOSE - { - Text [ en-US ] = "Very ~Loose"; - }; - String STR_CHARS_SPACING_CUSTOM - { - Text [ en-US ] = "~Custom..."; - }; - String STR_CHARS_SPACING_KERN_PAIRS - { - Text [ en-US ] = "~Kern Character Pairs"; - }; +String RID_SVXSTR_CHARS_SPACING_NORMAL +{ + Text [ en-US ] = "~Normal"; +}; + +String RID_SVXSTR_CHARS_SPACING_LOOSE +{ + Text [ en-US ] = "~Loose"; +}; + +String RID_SVXSTR_CHARS_SPACING_VERY_LOOSE +{ + Text [ en-US ] = "Very ~Loose"; +}; + +String RID_SVXSTR_CHARS_SPACING_CUSTOM +{ + Text [ en-US ] = "~Custom..."; +}; + +String RID_SVXSTR_CHARS_SPACING_KERN_PAIRS +{ + Text [ en-US ] = "~Kern Character Pairs"; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |