diff options
| -rw-r--r-- | sw/source/filter/ww8/writerwordglue.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 28 |
2 files changed, 28 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 12e9a1c9a3b6..663e1e17fd53 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -296,11 +296,13 @@ namespace myImplHelpers aName.InsertAscii("WW-" , 0); sal_Int32 nI = 1; + String aBaseName = aName; while ( 0 != (pColl = maHelper.GetStyle(aName)) && (nI < SAL_MAX_INT32) ) { + aName = aBaseName; aName += String::CreateFromInt32(nI++); } } diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index d83718145192..b0371ffbefaa 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -526,8 +526,32 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos ) GetStyleData( pFmt, bFmtColl, nBase, nWwNext ); String aName = pFmt->GetName(); - if ( aName.EqualsAscii( "Default" ) ) - aName = rtl::OUString("Normal"); + // We want to map LO's default style to Word's "Normal" style. + // Word looks for this specific style name when reading docx files. + // (It must be the English word regardless of language settings) + if ( nPos == 0 ) { + assert( pFmt->GetPoolFmtId() == RES_POOLCOLL_STANDARD ); + aName = OUString("Normal"); + } else if (aName.EqualsIgnoreCaseAscii("Normal")) { + // If LO has a style named "Normal"(!) rename it to something unique + aName.InsertAscii("LO-" , 0); + String aBaseName = aName; + // Check if we still have a clash, in which case we add a suffix + for ( int nSuffix = 0; ; ++nSuffix ) { + bool clash=false; + for ( int n = 1; n < nUsedSlots; ++n ) + if ( pFmtA[n] && + pFmtA[n]->GetName().EqualsIgnoreCaseAscii(aName) ) + { + clash = true; + break; + } + if (!clash) + break; + aName = aBaseName; + aName += OUString::number(++nSuffix); + } + } m_rExport.AttrOutput().StartStyle( aName, bFmtColl, nBase, nWwNext, GetWWId( *pFmt ), nPos, |