You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2012/07/02 18:37:11 UTC
svn commit: r1356327 - in /incubator/ooo/branches/AOO34/main:
editeng/source/editeng/impedit4.cxx sw/source/core/txtnode/txtedt.cxx
Author: hdu
Date: Mon Jul 2 16:37:10 2012
New Revision: 1356327
URL: http://svn.apache.org/viewvc?rev=1356327&view=rev
Log:
#i120045# use namespace to avoid name clash of different TransliterationChgData structs
Modified:
incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx
incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx
Modified: incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx?rev=1356327&r1=1356326&r2=1356327&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx (original)
+++ incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx Mon Jul 2 16:37:10 2012
@@ -2812,7 +2812,8 @@ void ImpEditEngine::SetAutoCompleteText(
#endif // !SVX_LIGHT
}
-
+namespace editeng // #i120045# namespace to avoid XCode template-misoptimization
+{
struct TransliterationChgData
{
sal_uInt16 nStart;
@@ -2821,6 +2822,8 @@ struct TransliterationChgData
String aNewText;
uno::Sequence< sal_Int32 > aOffsets;
};
+}
+using editeng::TransliterationChgData;
EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode )
Modified: incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx?rev=1356327&r1=1356326&r2=1356327&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx (original)
+++ incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx Mon Jul 2 16:37:10 2012
@@ -1590,7 +1590,8 @@ void SwLinguStatistik::Flush()
#endif
-
+namespace sw // #i120045# namespace to avoid XCode template-misoptimization
+{
struct TransliterationChgData
{
xub_StrLen nStart;
@@ -1598,6 +1599,8 @@ struct TransliterationChgData
String sChanged;
Sequence< sal_Int32 > aOffsets;
};
+}
+using sw::TransliterationChgData;
// change text to Upper/Lower/Hiragana/Katagana/...
void SwTxtNode::TransliterateText(