Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4055
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/4055/1
fix backport error in commit for fdo#63603 (style renaming)
Change-Id: I5c78bf7055b32f730fea651a134d1a4439e85fcb
---
M sw/source/filter/ww8/wrtw8sty.cxx
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index b0371ff..f5370ea 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -531,7 +531,7 @@
// (It must be the English word regardless of language settings)
if ( nPos == 0 ) {
assert( pFmt->GetPoolFmtId() == RES_POOLCOLL_STANDARD );
- aName = OUString("Normal");
+ aName = rtl::OUString("Normal");
} else if (aName.EqualsIgnoreCaseAscii("Normal")) {
// If LO has a style named "Normal"(!) rename it to something
unique
aName.InsertAscii("LO-" , 0);
@@ -549,7 +549,7 @@
if (!clash)
break;
aName = aBaseName;
- aName += OUString::number(++nSuffix);
+ aName += OUString::valueOf(sal_Int32(++nSuffix));
}
}
--
To view, visit https://gerrit.libreoffice.org/4055
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c78bf7055b32f730fea651a134d1a4439e85fcb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Luke Deller <lukedell...@gmail.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
