[Libreoffice-commits] .: svtools/source

[Caolán McNamara]

 svtools/source/misc/imagemgr.cxx |   19 -------------------
 svtools/source/misc/imagemgr.src |    6 +++---
 2 files changed, 3 insertions(+), 22 deletions(-)

New commits:
commit 2a9b72920c529218cac0c65eae26f4500b652b9e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 16 21:24:43 2011 +0000

    We're not going to be called "StarSuite" again
    
    Once StarOffice came in two varieties, StarOffice and "StarSuite" in the Asian
    market. This code effectively converted "StarOffice" to "StarSuite" if product
    itself was called "StarSuite", which ain't going to the be the case again. So
    we can remove all that and just hardcode the old file format names as
    "StarOffice".

diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 75a6a87..2b8928e 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -638,24 +638,6 @@ static Image GetImageFromList_Impl( USHORT nImageId, BOOL bBig )
         return GetOfficeImageFromList_Impl( nImageId, bBig );
 }
 
-//****************************************************************************
-
-void ReplaceStarOfficeVar( String& _rDescription )
-{
-    static String sVariable( RTL_CONSTASCII_USTRINGPARAM( "%STAROFFICE" ) );
-    static String sProductName;
-    if ( sProductName.Len() == 0 )
-    {
-        ::rtl::OUString sTemp;
-        ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ) >>= sTemp;
-        if ( sTemp.equalsAscii( "StarSuite" ) == sal_False )
-            sProductName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarOffice" ) );
-        else
-            sProductName = String( sTemp );
-    }
-    _rDescription.SearchAndReplace( sVariable, sProductName );
-}
-
 String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svtools", "hb93813", "SvFileInformationManager::GetDescription_Impl()" );
@@ -722,7 +704,6 @@ String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObje
         sDescription += ')';
     }
 
-    ReplaceStarOfficeVar( sDescription );
     return sDescription;
 }
 
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 5a7d9c8..c49f048 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -192,7 +192,7 @@ String STR_DESCRIPTION_SDRAW_DOC
 
 String STR_DESCRIPTION_SDATABASE_DOC
 {
-    Text [ en-US ] = "%STAROFFICE Database" ;
+    Text [ en-US ] = "StarOffice Database" ;
 };
 
 String STR_DESCRIPTION_SCALC_DOC
@@ -213,7 +213,7 @@ String STR_DESCRIPTION_GLOBALDOC
 };
 String STR_DESCRIPTION_SIMAGE_DOC
 {
-    Text [ en-US ] = "%STAROFFICE Image" ;
+    Text [ en-US ] = "StarOffice Image" ;
 };
 String STR_DESCRIPTION_TEXTFILE
 {
@@ -225,7 +225,7 @@ String STR_DESCRIPTION_LINK
 };
 String STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC
 {
-    Text [ en-US ] = "%STAROFFICE 3.0 - 5.0 Template" ;
+    Text [ en-US ] = "StarOffice 3.0 - 5.0 Template" ;
 };
 String STR_DESCRIPTION_EXCEL_DOC
 {