editeng/source/editeng/impedit.hxx | 2 +-
editeng/source/editeng/impedit4.cxx | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit d7436b75a915f9f018d3722f62301d1f42dc3bcc
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jun 28 13:58:54 2017 +0200
In ImpEditEngine::ReplaceTextOnly, nLen has always been ignored
...ever since the code's introduction with
afb2f41ca982b7e0cbc8a5b4952ea3edfbb2a883 "cws sw33bf08: #i113584#, #i113587#
transliteration fixed"
Change-Id: I9881ed1585857a95d2d8dd83ebf5d68d989e2c1d
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index ce505dcb8ef9..fb26e2f5f7ac 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -999,7 +999,7 @@ public:
void SetAutoCompleteText(const OUString& rStr, bool
bUpdateTipWindow);
EditSelection TransliterateText( const EditSelection& rSelection,
TransliterationFlags nTransliterationMode );
- short ReplaceTextOnly( ContentNode* pNode, sal_Int32
nCurrentStart, sal_Int32 nLen, const OUString& rText, const css::uno::Sequence<
sal_Int32 >& rOffsets );
+ short ReplaceTextOnly( ContentNode* pNode, sal_Int32
nCurrentStart, const OUString& rText, const css::uno::Sequence< sal_Int32 >&
rOffsets );
void SetAsianCompressionMode( CharCompressType n );
CharCompressType GetAsianCompressionMode() const { return
nAsianCompressionMode; }
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index 4918ee36a370..15de52f9517b 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2985,7 +2985,7 @@ EditSelection ImpEditEngine::TransliterateText( const
EditSelection& rSelection,
// Change text without losing the attributes
const sal_Int32 nDiffs =
ReplaceTextOnly( rData.aSelection.Min().GetNode(),
- rData.nStart, rData.nLen, rData.aNewText,
rData.aOffsets );
+ rData.nStart, rData.aNewText, rData.aOffsets );
// adjust selection in end node to possibly changed size
if (aSel.Max().GetNode() == rData.aSelection.Max().GetNode())
@@ -3020,12 +3020,10 @@ EditSelection ImpEditEngine::TransliterateText( const
EditSelection& rSelection,
short ImpEditEngine::ReplaceTextOnly(
ContentNode* pNode,
- sal_Int32 nCurrentStart, sal_Int32 nLen,
+ sal_Int32 nCurrentStart,
const OUString& rNewText,
const uno::Sequence< sal_Int32 >& rOffsets )
{
- (void) nLen;
-
// Change text without losing the attributes
sal_Int32 nCharsAfterTransliteration = rOffsets.getLength();
const sal_Int32* pOffsets = rOffsets.getConstArray();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
