[Libreoffice-commits] core.git: include/svx svx/source

[Andras Timar]

 include/svx/dialogs.hrc                |    4 ++++
 svx/source/tbxctrls/PaletteManager.cxx |   11 ++++-------
 svx/source/tbxctrls/tbcontrl.src       |   17 ++++++++++++++++-
 3 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit 08d876b6b0b52d882350aa64eda784da56856166
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Nov 22 19:49:14 2014 +0100

    fdo#86517 make predefined palette names localizable
    
    Change-Id: I3930757c02f9f976fb52cd75c9edab7cf75078c6

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 495cae8..519de01 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -253,6 +253,10 @@
 #define RID_SVXSTR_MORENUMBERING            (RID_SVX_START + 204)
 #define RID_SVXSTR_MOREBULLETS              (RID_SVX_START + 205)
 
+#define RID_SVXSTR_DEFAULT_PAL              (RID_SVX_START + 206)
+#define RID_SVXSTR_DOC_COLORS               (RID_SVX_START + 207)
+#define RID_SVXSTR_DOC_COLOR_PREFIX         (RID_SVX_START + 208)
+
 // Strings for insert/overwrite mode
 #define RID_SVXSTR_INSERT_HELPTEXT          (RID_SVX_START + 210)
 #define RID_SVXSTR_OVERWRITE_HELPTEXT       (RID_SVX_START + 211)
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index b6d3cb7..33f346e 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -23,14 +23,11 @@
 #include <sfx2/objsh.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
 #include <svtools/colrdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#define STR_DEFAULT_PAL         "Default palette"
-#define STR_DOC_COLORS          "Document colors"
-#define STR_DOC_COLOR_PREFIX    "Document Color "
-
 PaletteManager::PaletteManager() :
     mnMaxRecentColors(Application::GetSettings().GetStyleSettings().GetColorValueSetColumnCount()),
     mnNumOfPalettes(2),
@@ -110,7 +107,7 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet)
         std::vector<Color> aColors = pDocSh->GetDocColors();
         mnColorCount = aColors.size();
         rColorSet.Clear();
-        rColorSet.addEntriesForColorVector(aColors, STR_DOC_COLOR_PREFIX );
+        rColorSet.addEntriesForColorVector(aColors, SVX_RESSTR( RID_SVXSTR_DOC_COLOR_PREFIX ) + " " );
     }
     else
     {
@@ -135,7 +132,7 @@ std::vector<OUString> PaletteManager::GetPaletteList()
 {
     std::vector<OUString> aPaletteNames;
 
-    aPaletteNames.push_back( STR_DEFAULT_PAL );
+    aPaletteNames.push_back( SVX_RESSTR( RID_SVXSTR_DEFAULT_PAL ) );
 
     for( boost::ptr_vector<Palette>::iterator it = maPalettes.begin();
          it != maPalettes.end();
@@ -144,7 +141,7 @@ std::vector<OUString> PaletteManager::GetPaletteList()
         aPaletteNames.push_back( (*it).GetName() );
     }
 
-    aPaletteNames.push_back( STR_DOC_COLORS );
+    aPaletteNames.push_back( SVX_RESSTR ( RID_SVXSTR_DOC_COLORS ) );
 
     return aPaletteNames;
 }
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 0e250c3..6e0add7 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -21,7 +21,7 @@
 #include <helpid.hrc>
 
 /*
- * Bitmaps f"ur SvxFrameWindow
+ * Bitmaps for SvxFrameWindow
  */
 
 #define MASKCOLOR   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
@@ -207,4 +207,19 @@ String RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE
     Text [ en-US ] = "Font Name. The current font is not available and will be substituted.";
 };
 
+String RID_SVXSTR_DEFAULT_PAL
+{
+    Text [ en-US ] = "Default palette";
+};
+
+String RID_SVXSTR_DOC_COLORS
+{
+    Text [ en-US ] = "Document colors";
+};
+
+String RID_SVXSTR_DOC_COLOR_PREFIX
+{
+    Text [ en-US ] = "Document Color";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */