convert RID_SVXFLOAT_FONTWORK_CHARSPACING to simple strings

Change-Id: I54a1a714cb80f2d41a922416a0b9d94f1e329b57

include/svx/dialogs.hrc

@@ -899,11 +899,9 @@
 #define RID_SVXSTR_DEPTH_4_INCH             (RID_SVX_START + 1001)
 
 #define RID_SVXFLOAT_FONTWORK_ALIGNMENT     (RID_SVX_START + 1002)
-#define RID_SVXFLOAT_FONTWORK_CHARSPACING   (RID_SVX_START + 1003)
 
-/*  #i35426# DR 2004-10-19: (RID_SVX_START+1002) and (RID_SVX_START+1003) are
-    already used for RID_SVXFLOAT_FONTWORK_ALIGNMENT and
-    RID_SVXFLOAT_FONTWORK_CHARSPACING above. But these IDs describe floating
+/*  #i35426# DR 2004-10-19: (RID_SVX_START+1002) is
+    already used for RID_SVXFLOAT_FONTWORK_ALIGNMENT above. But these IDs describe floating
     windows, and the following IDs are for strings, so this is no conflict. */
 #define RID_SVXSTR_PAGES                    (RID_SVX_START + 1002)
 
@@ -1068,9 +1066,16 @@
 #define RID_SVXSTR_MATTE                 (RID_SVX_START + 1298)
 #define RID_SVXSTR_PLASTIC               (RID_SVX_START + 1299)
 #define RID_SVXSTR_METAL                 (RID_SVX_START + 1300)
+#define RID_SVXSTR_CHARS_SPACING_VERY_TIGHT (RID_SVX_START + 1301)
+#define RID_SVXSTR_CHARS_SPACING_TIGHT   (RID_SVX_START + 1302)
+#define RID_SVXSTR_CHARS_SPACING_NORMAL  (RID_SVX_START + 1303)
+#define RID_SVXSTR_CHARS_SPACING_LOOSE   (RID_SVX_START + 1304)
+#define RID_SVXSTR_CHARS_SPACING_VERY_LOOSE (RID_SVX_START + 1305)
+#define RID_SVXSTR_CHARS_SPACING_CUSTOM   (RID_SVX_START + 1306)
+#define RID_SVXSTR_CHARS_SPACING_KERN_PAIRS (RID_SVX_START + 1307)
 
 // !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
-#define RID_SVXSTR_NEXTFREE              (RID_SVX_START + 1301)
+#define RID_SVXSTR_NEXTFREE              (RID_SVX_START + 1308)
 
 // if we have _a_lot_ time, we should group the resource ids by type, instead
 // of grouping them by semantics. The reason is that resource ids have to be

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"

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;

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: */