diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-10 10:15:34 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-10 11:53:01 +0200 |
| commit | 414152c1ed10ec01b6ea385960c53304e4ec95cc (patch) | |
| tree | 8a85261ef66d761244b1d4fc4d251b524d510ccb /editeng | |
| parent | 1dc9f21667237bf61ec8d2a9e50b7fb8a61d475b (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
(cherry picked from commit 7080d629c82422a419d38051536c7711f8abe53e)
Conflicts:
editeng/source/editeng/impedit4.cxx
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index ff441f17e844..5b80c17c83b9 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -2659,16 +2659,17 @@ void ImpEditEngine::SetAutoCompleteText( const String& rStr, sal_Bool bClearTipW Help::ShowQuickHelp( pActiveView->GetWindow(), Rectangle(), String(), 0 ); } - -struct TransliterationChgData +namespace { - sal_uInt16 nStart; - xub_StrLen nLen; - EditSelection aSelection; - String aNewText; - uno::Sequence< sal_Int32 > aOffsets; -}; - + struct eeTransliterationChgData + { + sal_uInt16 nStart; + xub_StrLen nLen; + EditSelection aSelection; + String aNewText; + uno::Sequence< sal_Int32 > aOffsets; + }; +} EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ) { @@ -2721,8 +2722,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, //! 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< eeTransliterationChgData > aChanges; + eeTransliterationChgData aChgData; if (nTransliterationMode == i18n::TransliterationModulesExtra::TITLE_CASE) { @@ -2945,7 +2946,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, // yet unchanged text parts remain the same. for (size_t i = 0; i < aChanges.size(); ++i) { - const TransliterationChgData &rData = aChanges[ aChanges.size() - 1 - i ]; + const eeTransliterationChgData& rData = aChanges[ aChanges.size() - 1 - i ]; bChanges = sal_True; if (rData.nLen != rData.aNewText.Len()) |