Skip to content

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

filter config: stop replacing %productname% / %formatversion% 

... at runtime.  Hard-code these to OpenOffice.org 1.0, since nobody
will ever build a "StarOffice" or "StarSuite" any more.

Change-Id: I1785dea8dfd15a9384f9fecd92935a6043d995bc
üst 66459465
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 75 deletions
filter/source/config/cache/constant.hxx
Dosyayı görüntüle @ 041d2b88
......@@ -94,8 +94,6 @@
#define CFGDIRECTKEY_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/L10N/ooLocale" )
#define CFGDIRECTKEY_DEFAULTFRAMELOADER _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Misc/Defaults/DefaultFrameLoader")
#define CFGDIRECTKEY_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/L10N/ooLocale" )
#define CFGDIRECTKEY_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooXMLFileFormatName" )
#define CFGDIRECTKEY_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooXMLFileFormatVersion" )
#define CFGDIRECTKEY_PRODUCTNAME _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooName" )
// Note that these flag bits have parallel names in
......@@ -170,8 +168,6 @@
/** @short some default values.
*/
#define DEFAULT_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("en-US")
#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("OpenOffice.org")
#define DEFAULT_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_("1.0")
/** @short used for the queries of the FilterFactory service.
*/
......
filter/source/config/cache/filtercache.cxx
Dosyayı görüntüle @ 041d2b88
......@@ -95,8 +95,6 @@ FilterCache* FilterCache::clone() const
pClone->m_lURLPattern2Types = m_lURLPattern2Types;
pClone->m_sActLocale = m_sActLocale;
pClone->m_sFormatName = m_sFormatName;
pClone->m_sFormatVersion = m_sFormatVersion;
pClone->m_eFillState = m_eFillState;
......@@ -152,8 +150,6 @@ void FilterCache::takeOver(const FilterCache& rClone)
m_lChangedContentHandlers.clear();
m_sActLocale = rClone.m_sActLocale;
m_sFormatName = rClone.m_sFormatName;
m_sFormatVersion = rClone.m_sFormatVersion;
m_eFillState = rClone.m_eFillState;
......@@ -209,23 +205,6 @@ void FilterCache::load(EFillState eRequired,
m_sActLocale = DEFAULT_OFFICELOCALE;
}
impl_getDirectCFGValue(CFGDIRECTKEY_FORMATNAME) >>= m_sFormatName;
if (m_sFormatName.isEmpty())
impl_getDirectCFGValue(CFGDIRECTKEY_PRODUCTNAME) >>= m_sFormatName;
if (m_sFormatName.isEmpty())
{
_FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format name => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATNAME));
m_sFormatName = DEFAULT_FORMATNAME;
}
impl_getDirectCFGValue(CFGDIRECTKEY_FORMATVERSION) >>= m_sFormatVersion;
if (m_sFormatVersion.isEmpty())
{
_FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format version => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATVERSION));
m_sFormatVersion = DEFAULT_FORMATVERSION;
}
// Support the old configuration support. Read it only one times during office runtime!
impl_readOldFormat();
......@@ -1580,8 +1559,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
// SAFE -> ----------------------------------
::osl::ResettableMutexGuard aLock(m_aLock);
OUString sFormatName = m_sFormatName ;
OUString sFormatVersion = m_sFormatVersion;
OUString sActLocale = m_sActLocale ;
aLock.clear();
// <- SAFE ----------------------------------
......@@ -1595,9 +1572,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
::comphelper::SequenceAsVector< OUString >::const_iterator pLocale ;
::comphelper::SequenceAsHashMap lUINames;
const char FORMATNAME_VAR[] = "%productname%";
const char FORMATVERSION_VAR[] = "%formatversion%";
// patch %PRODUCTNAME and %FORMATNAME
for ( pLocale = lLocales.begin();
pLocale != lLocales.end() ;
++pLocale )
......@@ -1607,21 +1581,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
OUString sValue;
xUIName->getByName(sLocale) >>= sValue;
// replace %productname%
sal_Int32 nIndex = sValue.indexOf(FORMATNAME_VAR);
while(nIndex != -1)
{
sValue = sValue.replaceAt(nIndex, RTL_CONSTASCII_LENGTH(FORMATNAME_VAR), sFormatName);
nIndex = sValue.indexOf(FORMATNAME_VAR, nIndex);
}
// replace %formatversion%
nIndex = sValue.indexOf(FORMATVERSION_VAR);
while(nIndex != -1)
{
sValue = sValue.replaceAt(nIndex, RTL_CONSTASCII_LENGTH(FORMATVERSION_VAR), sFormatVersion);
nIndex = sValue.indexOf(FORMATVERSION_VAR, nIndex);
}
lUINames[sLocale] <<= sValue;
}
......
filter/source/config/cache/filtercache.hxx
Dosyayı görüntüle @ 041d2b88
......@@ -222,14 +222,6 @@ class FilterCache : public BaseLock
used to work with localized configuration values. */
OUString m_sActLocale;
//---------------------------------------
/** TODO */
OUString m_sFormatName;
//---------------------------------------
/** TODO */
OUString m_sFormatVersion;
//---------------------------------------
/** @short contains status, which cache items/properties
was already loaded from the underlying configuration.
......
filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Calc)">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Spreadsheet</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet</value>
</prop>
</node>
filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Chart)">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Chart</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Chart</value>
</prop>
</node>
filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Draw)">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Drawing</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Drawing</value>
</prop>
</node>
filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Impress)">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Presentation</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Presentation</value>
</prop>
</node>
filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Math)">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Formula</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Formula</value>
</prop>
</node>
filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Writer)">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Text Document</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
</prop>
</node>
filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="calc_StarOffice_XML_Calc_Template">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Spreadsheet Template</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet Template</value>
</prop>
</node>
filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="draw_StarOffice_XML_Draw_Template">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Drawing Template</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Drawing Template</value>
</prop>
</node>
filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="impress_StarOffice_XML_Draw">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Drawing (Impress)</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Drawing (Impress)</value>
</prop>
</node>
filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="impress_StarOffice_XML_Impress_Template">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Presentation Template</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Presentation Template</value>
</prop>
</node>
filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="writer_StarOffice_XML_Writer_Template">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Text Document Template</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Text Document Template</value>
</prop>
</node>
filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Master Document</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Master Document</value>
</prop>
</node>
filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="writer_globaldocument_StarOffice_XML_Writer">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Text Document</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
</prop>
</node>
filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="writer_web_StarOffice_XML_Writer_Web_Template">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% HTML Template</value>
<value xml:lang="en-US">OpenOffice.org 1.0 HTML Template</value>
</prop>
</node>
filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="writer_web_StarOffice_XML_Writer">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Text Document (Writer/Web)</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Text Document (Writer/Web)</value>
</prop>
</node>
filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -17,6 +17,6 @@
-->
<node oor:name="writerweb8_writer">
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% Text (Writer/Web)</value>
</prop>
<value xml:lang="en-US">Text (Writer/Web)</value>
</prop>
</node>
filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Draw)</value></prop>
<prop oor:name="UIName">
<value>%productname% %formatversion% Zeichnung</value>
<value>OpenOffice.org 1.0 Drawing</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Draw 6.0</value></prop>
</node>
filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Impress)</value></prop>
<prop oor:name="UIName">
<value>%productname% %formatversion% Präsentation</value>
<value>OpenOffice.org 1.0 Presentation</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Impress 6.0</value></prop>
</node>
filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Math)</value></prop>
<prop oor:name="UIName">
<value>%productname% %formatversion% Formel</value>
<value>OpenOffice.org 1.0 Formula</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Math 6.0</value></prop>
</node>
filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Writer)</value></prop>
<prop oor:name="UIName">
<value>%productname% %formatversion% Textdokument</value>
<value>OpenOffice.org 1.0 Text Document</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Writer 6.0</value></prop>
</node>
officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
Dosyayı görüntüle @ 041d2b88
......@@ -59,7 +59,7 @@
<value>com.sun.star.chart2.ChartDocument</value>
</prop>
<prop oor:name="UIName">
<value xml:lang="en-US">%productname% %formatversion% Report Chart</value>
<value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
</prop>
</node>
</node>
......
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