diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2009-11-24 17:15:31 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2009-11-24 17:15:31 +0100 |
commit | 6bdea9f670a5bcc270324013995c00390f146588 (patch) | |
tree | f0a05514db51a1b0056185e68da6a4d0d11bd1f6 /i18npool | |
parent | d1057ad20b9577b69d50bd0f79e5c6a5376e3ede (diff) | |
parent | 84e49c6bbbc61384618c90193c45af8799d24ea3 (diff) |
CWS-TOOLING: integrate CWS calc32stopper4_DEV300
Diffstat (limited to 'i18npool')
-rw-r--r-- | i18npool/source/search/makefile.mk | 6 | ||||
-rw-r--r-- | i18npool/source/search/textsearch.cxx | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/i18npool/source/search/makefile.mk b/i18npool/source/search/makefile.mk index 1b48919624f6..2e81ec3f1d53 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 96f033f4e4e3..2518a6cb0481 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) { |