Skip to content

C
core
Kaydet (Commit) abd33384 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

desktop: stop replacing %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION 

... and %PRODUCTXMLFILEFORMATNAME at runtime and hard-code
OpenOffice.org 1.0 for these too.

Change-Id: Id96390506d2a0f367f932e85d3115362ad483bc3
üst 31e37f8f
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 55 deletions
desktop/source/app/app.cxx
Dosyayı görüntüle @ abd33384
......@@ -468,10 +468,6 @@ namespace
: public rtl::Static< OUString, OOOVendor > {};
struct Extension
: public rtl::Static< OUString, Extension > {};
struct XMLFileFormatName
: public rtl::Static< OUString, XMLFileFormatName > {};
struct XMLFileFormatVersion
: public rtl::Static< OUString, XMLFileFormatVersion > {};
}
OUString ReplaceStringHookProc( const OUString& rStr )
......@@ -486,15 +482,10 @@ OUString ReplaceStringHookProc( const OUString& rStr )
OUString sAboutBoxVersion = AboutBoxVersion::get();
OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
OUString sExtension = Extension::get();
OUString sXMLFileFormatName = XMLFileFormatName::get();
OUString sXMLFileFormatVersion = XMLFileFormatVersion::get();
if ( sBrandName.isEmpty() )
{
sBrandName = utl::ConfigManager::getProductName();
sXMLFileFormatName = utl::ConfigManager::getProductXmlFileFormat();
sXMLFileFormatVersion =
utl::ConfigManager::getProductXmlFileFormatVersion();
sVersion = utl::ConfigManager::getProductVersion();
sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
......@@ -510,8 +501,6 @@ OUString ReplaceStringHookProc( const OUString& rStr )
sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix );
sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion );
sRet = sRet.replaceAll( "%PRODUCTEXTENSION", sExtension );
sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATNAME", sXMLFileFormatName );
sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATVERSION", sXMLFileFormatVersion );
}
if ( sRet.indexOf( "%OOOVENDOR" ) != -1 )
......
include/unotools/configmgr.hxx
Dosyayı görüntüle @ abd33384
......@@ -50,10 +50,6 @@ public:
static OUString getProductName();
static OUString getProductXmlFileFormat();
static OUString getProductXmlFileFormatVersion();
static OUString getProductVersion();
static OUString getVendor();
......
svl/source/misc/mediatyp.src
Dosyayı görüntüle @ abd33384
......@@ -356,42 +356,42 @@ String STR_SVT_MIMETYPE_INET_MULTI_MIXED
String STR_SVT_MIMETYPE_APP_SXCALC
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet" ;
};
String STR_SVT_MIMETYPE_APP_SXCHART
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
Text [ en-US ] = "OpenOffice.org 1.0 Chart" ;
};
String STR_SVT_MIMETYPE_APP_SXDRAW
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
Text [ en-US ] = "OpenOffice.org 1.0 Drawing" ;
};
String STR_SVT_MIMETYPE_APP_SXMATH
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
Text [ en-US ] = "OpenOffice.org 1.0 Formula" ;
};
String STR_SVT_MIMETYPE_APP_SXWRITER
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
Text [ en-US ] = "OpenOffice.org 1.0 Text Document" ;
};
String STR_SVT_MIMETYPE_APP_SXIMPRESS
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
Text [ en-US ] = "OpenOffice.org 1.0 Presentation" ;
};
String STR_SVT_MIMETYPE_APP_SXGLOBAL
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
Text [ en-US ] = "OpenOffice.org 1.0 Master Document" ;
};
String STR_SVT_MIMETYPE_APP_SXIPACKED
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;
Text [ en-US ] = "OpenOffice.org 1.0 Presentation (packed)" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svtools/source/dialogs/formats.src
Dosyayı görüntüle @ abd33384
......@@ -225,35 +225,35 @@ String STR_FORMAT_ID_GRAPHOBJ
};
String STR_FORMAT_ID_STARWRITER_60
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Writer object";
Text [ en-US ] = "OpenOffice.org 1.0 Writer object";
};
String STR_FORMAT_ID_STARWRITERWEB_60
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Writer/Web object";
Text [ en-US ] = "OpenOffice.org 1.0 Writer/Web object";
};
String STR_FORMAT_ID_STARWRITERGLOB_60
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Writer/Master object";
Text [ en-US ] = "OpenOffice.org 1.0 Writer/Master object";
};
String STR_FORMAT_ID_STARDRAW_60
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Draw object";
Text [ en-US ] = "OpenOffice.org 1.0 Draw object";
};
String STR_FORMAT_ID_STARIMPRESS_60
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Impress object";
Text [ en-US ] = "OpenOffice.org 1.0 Impress object";
};
String STR_FORMAT_ID_STARCALC_60
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Calc object";
Text [ en-US ] = "OpenOffice.org 1.0 Calc object";
};
String STR_FORMAT_ID_STARCHART_60
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart object";
Text [ en-US ] = "OpenOffice.org 1.0 Chart object";
};
String STR_FORMAT_ID_STARMATH_60
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Math object";
Text [ en-US ] = "OpenOffice.org 1.0 Math object";
};
String STR_FORMAT_ID_WMF
{
......@@ -273,7 +273,7 @@ String STR_FORMAT_ID_DBACCESS_COMMAND
};
String STR_FORMAT_ID_DIALOG_60
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION dialog";
Text [ en-US ] = "OpenOffice.org 1.0 dialog";
};
String STR_FORMAT_ID_FILEGRPDESCRIPTOR
{
......
svtools/source/misc/imagemgr.src
Dosyayı görüntüle @ abd33384
......@@ -280,19 +280,19 @@ String STR_DESCRIPTION_FACTORY_DATABASE
};
String STR_DESCRIPTION_CALC_TEMPLATE
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;
Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet Template" ;
};
String STR_DESCRIPTION_DRAW_TEMPLATE
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;
Text [ en-US ] = "OpenOffice.org 1.0 Drawing Template" ;
};
String STR_DESCRIPTION_IMPRESS_TEMPLATE
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;
Text [ en-US ] = "OpenOffice.org 1.0 Presentation Template" ;
};
String STR_DESCRIPTION_WRITER_TEMPLATE
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;
Text [ en-US ] = "OpenOffice.org 1.0 Text Document Template" ;
};
String STR_DESCRIPTION_LOCALE_VOLUME
{
......@@ -327,37 +327,37 @@ String STR_DESCRIPTION_POWERPOINT_SHOW
String STR_DESCRIPTION_SXMATH_DOC
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
Text [ en-US ] = "OpenOffice.org 1.0 Formula" ;
};
String STR_DESCRIPTION_SXCHART_DOC
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
Text [ en-US ] = "OpenOffice.org 1.0 Chart" ;
};
String STR_DESCRIPTION_SXDRAW_DOC
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
Text [ en-US ] = "OpenOffice.org 1.0 Drawing" ;
};
String STR_DESCRIPTION_SXCALC_DOC
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet" ;
};
String STR_DESCRIPTION_SXIMPRESS_DOC
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
Text [ en-US ] = "OpenOffice.org 1.0 Presentation" ;
};
String STR_DESCRIPTION_SXWRITER_DOC
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
Text [ en-US ] = "OpenOffice.org 1.0 Text Document" ;
};
String STR_DESCRIPTION_SXGLOBAL_DOC
{
Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
Text [ en-US ] = "OpenOffice.org 1.0 Master Document" ;
};
String STR_DESCRIPTION_MATHML_DOC
{
......
unotools/source/config/configmgr.cxx
Dosyayı görüntüle @ abd33384
......@@ -129,18 +129,6 @@ OUString utl::ConfigManager::getProductVersion() {
OUString("Product/ooSetupVersion"));
}
OUString utl::ConfigManager::getProductXmlFileFormat() {
return getConfigurationString(
OUString("/org.openoffice.Setup"),
OUString("Product/ooXMLFileFormatName"));
}
OUString utl::ConfigManager::getProductXmlFileFormatVersion() {
return getConfigurationString(
OUString("/org.openoffice.Setup"),
OUString("Product/ooXMLFileFormatVersion"));
}
OUString utl::ConfigManager::getVendor() {
return getConfigurationString(
OUString("/org.openoffice.Setup"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment