summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Deller <luke@deller.id.au>2013-05-03 00:32:22 +1000
committerLuboš Luňák <l.lunak@suse.cz>2013-05-07 14:38:12 +0000
commit2d3d942683d1cce738eab09b58e4fd693d5e7241 (patch)
tree97e03272577d62bccb1ac30dca4f5da7c5330044
parent6b30f7c32ed548617723af21e0f24d70165b04e0 (diff)
Fix style renaming confusion in ww8 filter (solves fdo#63603)
- Mapping LO default style to Word "Normal" style for docx output used a hard coded style name, so it broke when LO's default style was renamed in 4.0 (plus it would never have worked for non-English languages) - This renaming did not cater for nameclashes, leading to fdo#63603 - Similar renaming when importing doc styles did cater for nameclashes, but had a minor bug in that Change-Id: Id23f3021c6507b474c16e93abf43ba748606ebc7 Reviewed-on: https://gerrit.libreoffice.org/3743 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx26
2 files changed, 27 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 8ce8bd95271d..7d4444ebfeab 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -300,11 +300,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 += OUString::number(nI++);
}
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 83970930809a..5e3a2c437110 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -527,8 +527,32 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos )
GetStyleData( pFmt, bFmtColl, nBase, nWwNext );
String aName = pFmt->GetName();
- if ( aName.EqualsAscii( "Default" ) )
+ // 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,