diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-10 10:15:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-10 10:18:32 +0100 |
| commit | 7080d629c82422a419d38051536c7711f8abe53e (patch) | |
| tree | 6ce3b762a9efae958ec10ab8f9bd8b798f438168 /sw | |
| parent | c1324a518dc7506eb857180151f50c3a16023e04 (diff) | |
Resolves: fdo#37044 two different TransliterationChgData structs
There are two structs called TransliterationChgData with different
layout. The crashes on MacOSX must be due to this. Rename them
so they've different names.
Change-Id: I887a33bed26b339e229b7fb1ef8dddd192f6fae3
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/txtnode/txtedt.cxx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 5da21649744a..f65bfe94afaf 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1543,13 +1543,16 @@ sal_Bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf ) return sal_False; } -struct TransliterationChgData +namespace { - xub_StrLen nStart; - xub_StrLen nLen; - String sChanged; - Sequence< sal_Int32 > aOffsets; -}; + struct swTransliterationChgData + { + xub_StrLen nStart; + xub_StrLen nLen; + String sChanged; + Sequence< sal_Int32 > aOffsets; + }; +} // change text to Upper/Lower/Hiragana/Katagana/... void SwTxtNode::TransliterateText( @@ -1572,8 +1575,8 @@ void SwTxtNode::TransliterateText( //! This way the offsets for the yet to be changed words will be //! left unchanged by the already replaced text. //! For this we temporarily save the changes to be done in this vector - std::vector< TransliterationChgData > aChanges; - TransliterationChgData aChgData; + std::vector< swTransliterationChgData > aChanges; + swTransliterationChgData aChgData; if (rTrans.getType() == (sal_uInt32)TransliterationModulesExtra::TITLE_CASE) { @@ -1771,7 +1774,7 @@ void SwTxtNode::TransliterateText( // yet unchanged text parts remain the same. for (size_t i = 0; i < aChanges.size(); ++i) { - TransliterationChgData &rData = aChanges[ aChanges.size() - 1 - i ]; + swTransliterationChgData &rData = aChanges[ aChanges.size() - 1 - i ]; if (pUndo) pUndo->AddChanges( *this, rData.nStart, rData.nLen, rData.aOffsets ); ReplaceTextOnly( rData.nStart, rData.nLen, rData.sChanged, rData.aOffsets ); |