Kaydet (Commit) 31e37f8f authored tarafından Michael Stahl's avatar Michael Stahl

remove SwCompatibilityOptPage::ReplaceFormatName

... which probably didn't do anything anyway since the dialog actually
used %WRITERCOMPATIBILITYVERSIONOOO11 and not the variables replaced
here.

Change-Id: I27a59382476979b3bbcdb7fc06eda2243d1487e1
üst f67d166b
...@@ -113,11 +113,6 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet ...@@ -113,11 +113,6 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet
for (sal_uInt16 nId = COPT_USE_PRINTERDEVICE; nId <= COPT_EXPAND_WORDSPACE; ++nId) for (sal_uInt16 nId = COPT_USE_PRINTERDEVICE; nId <= COPT_EXPAND_WORDSPACE; ++nId)
{ {
OUString sEntry = m_pFormattingLB->GetEntry(nId); OUString sEntry = m_pFormattingLB->GetEntry(nId);
if ( COPT_USE_OUR_TABSTOPS == nId ||
COPT_USE_LINESPACING == nId ||
COPT_USE_OBJECTPOSITIONING == nId ||
COPT_USE_OUR_TEXTWRAPPING == nId )
ReplaceFormatName( sEntry );
SvTreeListEntry* pEntry = m_pOptionsLB->SvTreeListBox::InsertEntry( sEntry ); SvTreeListEntry* pEntry = m_pOptionsLB->SvTreeListBox::InsertEntry( sEntry );
if ( pEntry ) if ( pEntry )
{ {
...@@ -143,20 +138,6 @@ SwCompatibilityOptPage::~SwCompatibilityOptPage() ...@@ -143,20 +138,6 @@ SwCompatibilityOptPage::~SwCompatibilityOptPage()
delete m_pImpl; delete m_pImpl;
} }
void SwCompatibilityOptPage::ReplaceFormatName( OUString& rEntry )
{
OUString sFormatName(utl::ConfigManager::getProductName());
const bool bOpenOffice = ( sFormatName == "OpenOffice.org" );
const OUString sFormatVersion = bOpenOffice
? OUString("1.1")
: OUString("6.0/7");
if ( !bOpenOffice && ( sFormatName != "StarSuite" ) )
sFormatName = "StarOffice";
rEntry = rEntry.replaceFirst( "%FORMATNAME", sFormatName )
.replaceFirst( "%FORMATVERSION", sFormatVersion );
}
sal_uLong convertBools2Ulong_Impl sal_uLong convertBools2Ulong_Impl
( (
bool _bUsePrtMetrics, bool _bUsePrtMetrics,
......
...@@ -56,7 +56,6 @@ private: ...@@ -56,7 +56,6 @@ private:
// private methods // private methods
void InitControls( const SfxItemSet& rSet ); void InitControls( const SfxItemSet& rSet );
void ReplaceFormatName( OUString& rEntry );
void SetCurrentOptions( sal_uLong nOptions ); void SetCurrentOptions( sal_uLong nOptions );
sal_uLong GetDocumentOptions() const; sal_uLong GetDocumentOptions() const;
void WriteOptions(); void WriteOptions();
......
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