[Libreoffice-commits] .: Branch 'libreoffice-3-3' - sw/source

[Jan Holesovsky]

 sw/source/ui/inc/misc.hrc      |    1 
 sw/source/ui/misc/glossary.cxx |    5 ++
 sw/source/ui/misc/glossary.src |   93 +----------------------------------------
 3 files changed, 10 insertions(+), 89 deletions(-)

New commits:
commit 5b20c40cd210941bf525f9bdcc7698392be003ea
Author: Andras Timar <timar at fsf.hu>
Date:   Sun Nov 14 23:44:41 2010 +0100

    Made the "My AutoText" string localizable, #i66304#

diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index 72db977..6e71237 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -96,6 +96,7 @@
 #define MN_REDLINE_POPUP			(RC_MISC_BEGIN + 61)
 #define STR_REMOVE_WARNING          (RC_MISC_BEGIN + 62)
 #define STRRES_NUMTYPES          	(RC_MISC_BEGIN + 63)
+#define STR_MY_AUTOTEXT          	(RC_MISC_BEGIN + 64)
 
 #define MISC_ACT_END 				STRRES_NUMTYPES
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index e945333..bdd330c 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -742,6 +742,9 @@ void SwGlossaryDlg::Init()
     SvLBoxEntry* pSelEntry = 0;
     const String sSelStr(::GetCurrGlosGroup()->GetToken(0, GLOS_DELIM));
     const sal_uInt16 nSelPath = static_cast< sal_uInt16 >(::GetCurrGlosGroup()->GetToken(1, GLOS_DELIM).ToInt32());
+    // #i66304# - "My AutoText" comes from mytexts.bau, but should be translated
+    const String sMyAutoTextEnglish(RTL_CONSTASCII_USTRINGPARAM("My AutoText"));
+    const String sMyAutoTextTranslated(SW_RESSTR(STR_MY_AUTOTEXT));
     for(sal_uInt16 nId = 0; nId < nCnt; ++nId )
     {
         String sTitle;
@@ -750,6 +753,8 @@ void SwGlossaryDlg::Init()
             continue;
         if(!sTitle.Len())
             sTitle = sGroupName.GetToken( 0, GLOS_DELIM );
+        if(sTitle == sMyAutoTextEnglish)
+            sTitle = sMyAutoTextTranslated;
         SvLBoxEntry* pEntry = aCategoryBox.InsertEntry( sTitle );
         sal_uInt16 nPath = static_cast< sal_uInt16 >(sGroupName.GetToken( 1, GLOS_DELIM ).ToInt32());
 
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
index 12d6ab9..88f4ea0 100644
--- a/sw/source/ui/misc/glossary.src
+++ b/sw/source/ui/misc/glossary.src
@@ -372,92 +372,7 @@ InfoBox MSG_NO_GLOSSARIES
     Message [ en-US ] = "There is no AutoText in this file.";
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+String STR_MY_AUTOTEXT
+{
+    Text[ en-US ] = "My AutoText";
+};