[ooo-build-commit] Branch 'ooo/OOO320' - i18npool/source

[Jan Holesovsky]

 i18npool/source/search/makefile.mk    |    6 ++++++
 i18npool/source/search/textsearch.cxx |    1 +
 2 files changed, 7 insertions(+)

New commits:
commit bc12d18d3e80c8c21cb4fca426a9bf781a80c0e5
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Nov 2 14:42:48 2009 +0000

    CWS-TOOLING: integrate CWS calc32stopper4
    2009-10-23 14:55:31 +0200 nn  r277165 : #i101139# MoveTable: nDestTab must be target position, not APPEND
    2009-10-22 17:10:43 +0200 nn  r277129 : #i106045# renaming a sheet has to reset all xml stream flags
    2009-10-21 10:34:25 +0200 nn  r277078 : #i106045# invalidate stream positions for sheet operations, better handling of loaded formula results
    2009-10-19 13:45:37 +0200 nn  r277023 : #i105960# SID_UNDO and friends are no longer volatile
    2009-10-16 17:21:16 +0200 nn  r276990 : #i105945# no optimization for textsearch on unxsoli

diff --git a/i18npool/source/search/makefile.mk b/i18npool/source/search/makefile.mk
index 1b48919..2e81ec3 100644
--- a/i18npool/source/search/makefile.mk
+++ b/i18npool/source/search/makefile.mk
@@ -50,6 +50,12 @@ SLOFILES=	\
             $(EXCEPTIONSFILES) \
             $(SLO)$/levdis.obj
 
+# on unxsoli, no optimization for textsearch because of i105945
+.IF "$(OS)$(COM)$(CPUNAME)"=="SOLARISC52INTEL"
+EXCEPTIONSNOOPTFILES= \
+        $(SLO)$/textsearch.obj
+.ENDIF
+
 SHL1TARGET= $(TARGET)
 SHL1OBJS=	$(SLOFILES)
 
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 575c3b7..d9b7d47 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -562,6 +562,7 @@ sal_Int32 TextSearch::GetDiff( const sal_Unicode cChr ) const
 }
 
 
+// TextSearch::NSrchFrwrd is mis-optimized on unxsoli (#i105945#)
 SearchResult TextSearch::NSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos )
         throw(RuntimeException)
 {