summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorMalte Timmermann <mt@openoffice.org>2000-11-20 13:49:49 +0000
committerMalte Timmermann <mt@openoffice.org>2000-11-20 13:49:49 +0000
commit10bc2b231583e392c2a93e2152c0fdebbc8bac9d (patch)
treed14e76f865503082a05ac01a83b754ca4810225b /svx/source
parent79b8bc811b11fd039f682b0d920c69fc2488c2e8 (diff)
MUST changes, XBreakIterator moved to I18N, SearchText to TextSearch
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/editeng/editdoc.cxx50
-rw-r--r--svx/source/editeng/impedit.hxx22
-rw-r--r--svx/source/editeng/impedit2.cxx50
-rw-r--r--svx/source/editeng/impedit3.cxx20
-rw-r--r--svx/source/editeng/impedit4.cxx36
5 files changed, 89 insertions, 89 deletions
diff --git a/svx/source/editeng/editdoc.cxx b/svx/source/editeng/editdoc.cxx
index f08308fcb36f..73b1e1ca448c 100644
--- a/svx/source/editeng/editdoc.cxx
+++ b/svx/source/editeng/editdoc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: editdoc.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: mt $ $Date: 2000-11-20 11:53:50 $
+ * last change: $Author: mt $ $Date: 2000-11-20 14:49:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -95,7 +95,7 @@
#include <vcl/svapp.hxx>
#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HPP_
-#include <com/sun/star/text/ScriptType.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
#endif
#include <stdlib.h> // qsort
@@ -109,25 +109,25 @@ USHORT GetScriptItemId( USHORT nItemId, short nScriptType )
{
USHORT nId = nItemId;
- if ( ( nScriptType == text::ScriptType::ASIAN ) ||
- ( nScriptType == text::ScriptType::COMPLEX ) )
+ if ( ( nScriptType == i18n::ScriptType::ASIAN ) ||
+ ( nScriptType == i18n::ScriptType::COMPLEX ) )
{
switch ( nItemId )
{
case EE_CHAR_LANGUAGE:
- nId = ( nScriptType == text::ScriptType::ASIAN ) ? EE_CHAR_LANGUAGE_CJK : EE_CHAR_LANGUAGE_CTL;
+ nId = ( nScriptType == i18n::ScriptType::ASIAN ) ? EE_CHAR_LANGUAGE_CJK : EE_CHAR_LANGUAGE_CTL;
break;
case EE_CHAR_FONTINFO:
- nId = ( nScriptType == text::ScriptType::ASIAN ) ? EE_CHAR_FONTINFO_CJK : EE_CHAR_FONTINFO_CTL;
+ nId = ( nScriptType == i18n::ScriptType::ASIAN ) ? EE_CHAR_FONTINFO_CJK : EE_CHAR_FONTINFO_CTL;
break;
case EE_CHAR_FONTHEIGHT:
- nId = ( nScriptType == text::ScriptType::ASIAN ) ? EE_CHAR_FONTHEIGHT_CJK : EE_CHAR_FONTHEIGHT_CTL;
+ nId = ( nScriptType == i18n::ScriptType::ASIAN ) ? EE_CHAR_FONTHEIGHT_CJK : EE_CHAR_FONTHEIGHT_CTL;
break;
case EE_CHAR_WEIGHT:
- nId = ( nScriptType == text::ScriptType::ASIAN ) ? EE_CHAR_WEIGHT_CJK : EE_CHAR_WEIGHT_CTL;
+ nId = ( nScriptType == i18n::ScriptType::ASIAN ) ? EE_CHAR_WEIGHT_CJK : EE_CHAR_WEIGHT_CTL;
break;
case EE_CHAR_ITALIC:
- nId = ( nScriptType == text::ScriptType::ASIAN ) ? EE_CHAR_ITALIC_CJK : EE_CHAR_ITALIC_CTL;
+ nId = ( nScriptType == i18n::ScriptType::ASIAN ) ? EE_CHAR_ITALIC_CJK : EE_CHAR_ITALIC_CTL;
break;
}
}
@@ -142,49 +142,49 @@ BOOL IsScriptItemValid( USHORT nItemId, short nScriptType )
switch ( nItemId )
{
case EE_CHAR_LANGUAGE:
- bValid = nScriptType == text::ScriptType::LATIN;
+ bValid = nScriptType == i18n::ScriptType::LATIN;
break;
case EE_CHAR_LANGUAGE_CJK:
- bValid = nScriptType == text::ScriptType::ASIAN;
+ bValid = nScriptType == i18n::ScriptType::ASIAN;
break;
case EE_CHAR_LANGUAGE_CTL:
- bValid = nScriptType == text::ScriptType::COMPLEX;
+ bValid = nScriptType == i18n::ScriptType::COMPLEX;
break;
case EE_CHAR_FONTINFO:
- bValid = nScriptType == text::ScriptType::LATIN;
+ bValid = nScriptType == i18n::ScriptType::LATIN;
break;
case EE_CHAR_FONTINFO_CJK:
- bValid = nScriptType == text::ScriptType::ASIAN;
+ bValid = nScriptType == i18n::ScriptType::ASIAN;
break;
case EE_CHAR_FONTINFO_CTL:
- bValid = nScriptType == text::ScriptType::COMPLEX;
+ bValid = nScriptType == i18n::ScriptType::COMPLEX;
break;
case EE_CHAR_FONTHEIGHT:
- bValid = nScriptType == text::ScriptType::LATIN;
+ bValid = nScriptType == i18n::ScriptType::LATIN;
break;
case EE_CHAR_FONTHEIGHT_CJK:
- bValid = nScriptType == text::ScriptType::ASIAN;
+ bValid = nScriptType == i18n::ScriptType::ASIAN;
break;
case EE_CHAR_FONTHEIGHT_CTL:
- bValid = nScriptType == text::ScriptType::COMPLEX;
+ bValid = nScriptType == i18n::ScriptType::COMPLEX;
break;
case EE_CHAR_WEIGHT:
- bValid = nScriptType == text::ScriptType::LATIN;
+ bValid = nScriptType == i18n::ScriptType::LATIN;
break;
case EE_CHAR_WEIGHT_CJK:
- bValid = nScriptType == text::ScriptType::ASIAN;
+ bValid = nScriptType == i18n::ScriptType::ASIAN;
break;
case EE_CHAR_WEIGHT_CTL:
- bValid = nScriptType == text::ScriptType::COMPLEX;
+ bValid = nScriptType == i18n::ScriptType::COMPLEX;
break;
case EE_CHAR_ITALIC:
- bValid = nScriptType == text::ScriptType::LATIN;
+ bValid = nScriptType == i18n::ScriptType::LATIN;
break;
case EE_CHAR_ITALIC_CJK:
- bValid = nScriptType == text::ScriptType::ASIAN;
+ bValid = nScriptType == i18n::ScriptType::ASIAN;
break;
case EE_CHAR_ITALIC_CTL:
- bValid = nScriptType == text::ScriptType::COMPLEX;
+ bValid = nScriptType == i18n::ScriptType::COMPLEX;
break;
}
diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx
index 56634cc5bcb6..a4331621c71a 100644
--- a/svx/source/editeng/impedit.hxx
+++ b/svx/source/editeng/impedit.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: impedit.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: mt $ $Date: 2000-11-20 11:53:50 $
+ * last change: $Author: mt $ $Date: 2000-11-20 14:49:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -102,11 +102,11 @@
#endif
#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_
-#include <com/sun/star/text/XBreakIterator.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
#endif
#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_
-#include <com/sun/star/text/WordType.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
#endif
DBG_NAMEEX( EditView );
@@ -397,7 +397,7 @@ private:
// zusammen mit dem Wort fuer die neuen
// Lingu Interfaces benoetigt.
::com::sun::star::lang::Locale aDefaultLocale;
- ::com::sun::star::uno::Reference < ::com::sun::star::text::XBreakIterator > xBI;
+ ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > xBI;
XubString aAutoCompleteText;
@@ -511,11 +511,11 @@ private:
EditPaM CursorEndOfParagraph( const EditPaM& rPaM );
EditPaM CursorStartOfDoc();
EditPaM CursorEndOfDoc();
- EditPaM WordLeft( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::text::WordType::ANYWORD_IGNOREWHITESPACES );
- EditPaM WordRight( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::text::WordType::ANYWORD_IGNOREWHITESPACES );
- EditPaM StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::text::WordType::ANYWORD_IGNOREWHITESPACES );
- EditPaM EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::text::WordType::ANYWORD_IGNOREWHITESPACES );
- EditSelection SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::text::WordType::ANYWORD_IGNOREWHITESPACES );
+ EditPaM WordLeft( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
+ EditPaM WordRight( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
+ EditPaM StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
+ EditPaM EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
+ EditSelection SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
void InitScriptTypes( USHORT nPara );
short GetScriptType( const EditPaM& rPaM ) const;
@@ -566,7 +566,7 @@ private:
void SetValidPaperSize( const Size& rSz );
- ::com::sun::star::uno::Reference < ::com::sun::star::text::XBreakIterator > ImplGetBreakIterator();
+ ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator();
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx
index 14448011b187..fc20c7e53451 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/svx/source/editeng/impedit2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: impedit2.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: mt $ $Date: 2000-11-20 11:53:50 $
+ * last change: $Author: mt $ $Date: 2000-11-20 14:49:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -119,15 +119,15 @@
#endif
#ifndef _COM_SUN_STAR_TEXT_CHARACTERITERATORMODE_HPP_
-#include <com/sun/star/text/CharacterIteratorMode.hpp>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#endif
#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_
-#include <com/sun/star/text/WordType.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
#endif
#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HPP_
-#include <com/sun/star/text/ScriptType.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
#endif
#define LINE_SEP 0x0A
@@ -1048,9 +1048,9 @@ EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM )
if ( rPaM.GetIndex() )
{
- uno::Reference < text::XBreakIterator > xBI = ImplGetBreakIterator();
+ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
sal_Int32 nCount = 1;
- aNewPaM.SetIndex( xBI->previousCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale(), text::CharacterIteratorMode::SKIPCHARACTER, nCount, nCount ) );
+ aNewPaM.SetIndex( xBI->previousCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale(), i18n::CharacterIteratorMode::SKIPCHARACTER, nCount, nCount ) );
}
else
{
@@ -1071,9 +1071,9 @@ EditPaM ImpEditEngine::CursorRight( const EditPaM& rPaM )
EditPaM aNewPaM( rPaM );
if ( rPaM.GetIndex() < rPaM.GetNode()->Len() )
{
- uno::Reference < text::XBreakIterator > xBI = ImplGetBreakIterator();
+ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
sal_Int32 nCount = 1;
- aNewPaM.SetIndex( xBI->nextCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale(), text::CharacterIteratorMode::SKIPCHARACTER, nCount, nCount ) );
+ aNewPaM.SetIndex( xBI->nextCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale(), i18n::CharacterIteratorMode::SKIPCHARACTER, nCount, nCount ) );
}
else
{
@@ -1303,8 +1303,8 @@ EditPaM ImpEditEngine::WordLeft( const EditPaM& rPaM, sal_Int16 nWordType )
}
else
{
- uno::Reference < text::XBreakIterator > xBI = ImplGetBreakIterator();
- text::Boundary aBoundary = xBI->getWordBoundary( *aNewPaM.GetNode(), nCurrentPos, GetLocale(), nWordType, sal_True );
+ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
+ i18n::Boundary aBoundary = xBI->getWordBoundary( *aNewPaM.GetNode(), nCurrentPos, GetLocale(), nWordType, sal_True );
if ( aBoundary.startPos == nCurrentPos )
aBoundary = xBI->previousWord( *aNewPaM.GetNode(), nCurrentPos, GetLocale(), nWordType );
aNewPaM.SetIndex( aBoundary.startPos );
@@ -1319,8 +1319,8 @@ EditPaM ImpEditEngine::WordRight( const EditPaM& rPaM, sal_Int16 nWordType )
EditPaM aNewPaM( rPaM );
if ( aNewPaM.GetIndex() < nMax )
{
- uno::Reference < text::XBreakIterator > xBI = ImplGetBreakIterator();
- text::Boundary aBoundary = xBI->nextWord( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale(), nWordType );
+ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
+ i18n::Boundary aBoundary = xBI->nextWord( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale(), nWordType );
aNewPaM.SetIndex( aBoundary.startPos );
}
// not 'else', maybe the index reached nMax now...
@@ -1341,8 +1341,8 @@ EditPaM ImpEditEngine::WordRight( const EditPaM& rPaM, sal_Int16 nWordType )
EditPaM ImpEditEngine::StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType )
{
EditPaM aNewPaM( rPaM );
- uno::Reference < text::XBreakIterator > xBI = ImplGetBreakIterator();
- text::Boundary aBoundary = xBI->getWordBoundary( *rPaM.GetNode(), rPaM.GetIndex(), GetLocale(), nWordType, sal_True );
+ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
+ i18n::Boundary aBoundary = xBI->getWordBoundary( *rPaM.GetNode(), rPaM.GetIndex(), GetLocale(), nWordType, sal_True );
aNewPaM.SetIndex( aBoundary.startPos );
return aNewPaM;
}
@@ -1350,8 +1350,8 @@ EditPaM ImpEditEngine::StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType )
EditPaM ImpEditEngine::EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType )
{
EditPaM aNewPaM( rPaM );
- uno::Reference < text::XBreakIterator > xBI = ImplGetBreakIterator();
- text::Boundary aBoundary = xBI->getWordBoundary( *rPaM.GetNode(), rPaM.GetIndex(), GetLocale(), nWordType, sal_True );
+ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
+ i18n::Boundary aBoundary = xBI->getWordBoundary( *rPaM.GetNode(), rPaM.GetIndex(), GetLocale(), nWordType, sal_True );
aNewPaM.SetIndex( aBoundary.endPos );
return aNewPaM;
}
@@ -1360,11 +1360,11 @@ EditSelection ImpEditEngine::SelectWord( const EditSelection& rCurSel, sal_Int16
{
EditSelection aNewSel( rCurSel );
EditPaM aPaM( rCurSel.Max() );
- uno::Reference < text::XBreakIterator > xBI = ImplGetBreakIterator();
+ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
sal_Int16 nType = xBI->getWordType( *aPaM.GetNode(), aPaM.GetIndex(), GetLocale() );
- if ( nType == text::WordType::ANY_WORD )
+ if ( nType == i18n::WordType::ANY_WORD )
{
- text::Boundary aBoundary = xBI->getWordBoundary( *aPaM.GetNode(), aPaM.GetIndex(), GetLocale(), nWordType, sal_True );
+ i18n::Boundary aBoundary = xBI->getWordBoundary( *aPaM.GetNode(), aPaM.GetIndex(), GetLocale(), nWordType, sal_True );
aNewSel.Min().SetIndex( aBoundary.startPos );
aNewSel.Max().SetIndex( aBoundary.endPos );
}
@@ -1381,7 +1381,7 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
ContentNode* pNode = pParaPortion->GetNode();
if ( pNode->Len() )
{
- uno::Reference < text::XBreakIterator > xBI = ImplGetBreakIterator();
+ uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
::rtl::OUString aText( *pNode );
USHORT nTextLen = aText.getLength();
@@ -1395,21 +1395,21 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
rTypes[rTypes.Count()-1].nEndPos = nPos;
nScriptType = xBI->getScriptType( aText, nPos );
- if ( nScriptType == text::ScriptType::WEAK )
+ if ( nScriptType == i18n::ScriptType::WEAK )
nScriptType = rTypes[rTypes.Count()-1].nScriptType;
rTypes.Insert( ScriptTypePosInfo( nScriptType, nPos, nTextLen ), rTypes.Count() );
nPos = xBI->endOfScript( aText, nPos, nScriptType );
}
- if ( rTypes[0].nScriptType == text::ScriptType::WEAK )
- rTypes[0].nScriptType = ( rTypes.Count() > 1 ) ? rTypes[1].nScriptType : text::ScriptType::LATIN;
+ if ( rTypes[0].nScriptType == i18n::ScriptType::WEAK )
+ rTypes[0].nScriptType = ( rTypes.Count() > 1 ) ? rTypes[1].nScriptType : i18n::ScriptType::LATIN;
}
}
short ImpEditEngine::GetScriptType( const EditPaM& rPaM ) const
{
- short nScriptType = text::ScriptType::LATIN;
+ short nScriptType = i18n::ScriptType::LATIN;
if ( rPaM.GetNode()->Len() )
{
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index f22197d15dbe..ba14f9812155 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: impedit3.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: mt $ $Date: 2000-11-20 11:53:50 $
+ * last change: $Author: mt $ $Date: 2000-11-20 14:49:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -112,7 +112,7 @@
#endif
#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HPP_
-#include <com/sun/star/text/ScriptType.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
#endif
#include <comphelper/processfactory.hxx>
@@ -1523,14 +1523,14 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
sal_uInt16 nBreakPos = nMaxBreakPos;
- Reference < text::XBreakIterator > xBI = ImplGetBreakIterator();
+ Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
OUString aText( *pNode );
Reference< XHyphenator > xHyph;
if ( bCanHyphenate )
xHyph = GetHyphenator();
- text::LineBreakHyphenationOptions aHyphOptions( xHyph, 1 );
- text::LineBreakUserOptions aUserOptions;
- text::LineBreakResults aLBR = xBI->getLineBreak( *pNode, nBreakPos, GetLocale(), nMinBreakPos, aHyphOptions, aUserOptions );
+ i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, 1 );
+ i18n::LineBreakUserOptions aUserOptions;
+ i18n::LineBreakResults aLBR = xBI->getLineBreak( *pNode, nBreakPos, GetLocale(), nMinBreakPos, aHyphOptions, aUserOptions );
nBreakPos = aLBR.breakIndex;
sal_Bool bBlankSeparator = ( ( nBreakPos >= pLine->GetStart() ) &&
@@ -1996,7 +1996,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rF
rFont = pNode->GetCharAttribs().GetDefFont();
short nScriptType = GetScriptType( EditPaM( pNode, nPos ) );
- if ( ( nScriptType == text::ScriptType::ASIAN ) || ( nScriptType == text::ScriptType::COMPLEX ) )
+ if ( ( nScriptType == i18n::ScriptType::ASIAN ) || ( nScriptType == i18n::ScriptType::COMPLEX ) )
{
const SvxFontItem& rFontItem = (const SvxFontItem&)pNode->GetContentAttribs().GetItem( GetScriptItemId( EE_CHAR_FONTINFO, nScriptType ) );
rFont.SetName( rFontItem.GetFamilyName() );
@@ -3496,7 +3496,7 @@ const SvxLRSpaceItem& ImpEditEngine::GetLRSpaceItem( ContentNode* pNode )
}
-Reference < text::XBreakIterator > ImpEditEngine::ImplGetBreakIterator()
+Reference < i18n::XBreakIterator > ImpEditEngine::ImplGetBreakIterator()
{
if ( !xBI.is() )
{
@@ -3504,7 +3504,7 @@ Reference < text::XBreakIterator > ImpEditEngine::ImplGetBreakIterator()
Reference < XInterface > xI = xMSF->createInstance( OUString::createFromAscii( "com.sun.star.text.BreakIterator" ) );
if ( xI.is() )
{
- Any x = xI->queryInterface( ::getCppuType((const Reference< text::XBreakIterator >*)0) );
+ Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XBreakIterator >*)0) );
x >>= xBI;
}
}
diff --git a/svx/source/editeng/impedit4.cxx b/svx/source/editeng/impedit4.cxx
index 3b3557199a42..4bc239db0ff4 100644
--- a/svx/source/editeng/impedit4.cxx
+++ b/svx/source/editeng/impedit4.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: impedit4.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: tl $ $Date: 2000-11-19 11:29:36 $
+ * last change: $Author: mt $ $Date: 2000-11-20 14:49:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -119,7 +119,7 @@
#endif
#ifndef _TXTCMP_HXX //autogen
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
#endif
#ifndef _SV_HELP_HXX //autogen
@@ -1500,9 +1500,9 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, sal_Bool bMultipleDoc )
pSpellInfo = new SpellInfo;
pSpellInfo->bMultipleDoc = bMultipleDoc;
if ( bForward )
- pSpellInfo->aSpellStart = CreateEPaM( SelectWord( aCurSel, ::com::sun::star::text::WordType::DICTIONARY_WORD ).Min() );
+ pSpellInfo->aSpellStart = CreateEPaM( SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ).Min() );
else
- pSpellInfo->aSpellStart = CreateEPaM( SelectWord( aCurSel, ::com::sun::star::text::WordType::DICTIONARY_WORD ).Max() );
+ pSpellInfo->aSpellStart = CreateEPaM( SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ).Max() );
sal_Bool bIsStart = sal_False;
if ( bMultipleDoc )
@@ -1579,9 +1579,9 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView )
// Bei Rueckwaerts-Suche erst zurueck, sonst wird das gleiche Wort wieder gespellt.
if ( !bForward )
- aCurSel = WordLeft( aCurSel.Min(), ::com::sun::star::text::WordType::DICTIONARY_WORD );
+ aCurSel = WordLeft( aCurSel.Min(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
- aCurSel = SelectWord( aCurSel, ::com::sun::star::text::WordType::DICTIONARY_WORD );
+ aCurSel = SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
aWord = GetSelected( aCurSel );
// Wenn Punkt dahinter, muss dieser mit uebergeben werden !
@@ -1601,7 +1601,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView )
Sequence< PropertyValue >() );
if ( bForward && !xSpellAlt.is() )
- aCurSel = WordRight( aCurSel.Min(), ::com::sun::star::text::WordType::DICTIONARY_WORD );
+ aCurSel = WordRight( aCurSel.Min(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
else
pSpellInfo->eState = EE_SPELL_ERRORFOUND;
}
@@ -1678,7 +1678,7 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel
|| ( ( aSel.Max().GetNode() == pLastNode ) && ( aSel.Max().GetIndex() >= pLastNode->Len() ) ) )
break; // Dokument- oder Ungueltigkeitsbereich-Ende
- aSel = SelectWord( aSel, ::com::sun::star::text::WordType::DICTIONARY_WORD );
+ aSel = SelectWord( aSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
String aWord( GetSelected( aSel ) );
// Wenn Punkt dahinter, muss dieser mit uebergeben werden !
// Falls Abkuerzung...
@@ -1757,7 +1757,7 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel
}
EditPaM aLastEnd( aSel.Max() );
- aSel = WordRight( aSel.Max(), ::com::sun::star::text::WordType::DICTIONARY_WORD );
+ aSel = WordRight( aSel.Max(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
if ( bChanged && ( aSel.Min().GetNode() == pNode ) &&
( ( aSel.Min().GetIndex()-aLastEnd.GetIndex() > 1 ) ) )
{
@@ -1852,12 +1852,12 @@ EESpellState ImpEditEngine::HasSpellErrors()
return EE_SPELL_OK;
}
- aCurSel = SelectWord( aCurSel, ::com::sun::star::text::WordType::DICTIONARY_WORD );
+ aCurSel = SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
aWord = GetSelected( aCurSel );
if ( aWord.Len() > 1 )
xSpellAlt = xSpeller->spell( aWord, eDefaultLanguage,
Sequence< PropertyValue >() );
- aCurSel = WordRight( aCurSel.Max(), ::com::sun::star::text::WordType::DICTIONARY_WORD );
+ aCurSel = WordRight( aCurSel.Max(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
}
#endif
@@ -1872,7 +1872,7 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView )
EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() );
if ( !aCurSel.HasRange() )
- aCurSel = SelectWord( aCurSel, ::com::sun::star::text::WordType::DICTIONARY_WORD );
+ aCurSel = SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
String aWord( GetSelected( aCurSel ) );
Reference< XThesaurus > xThes( SvxGetThesaurus() );
@@ -1966,15 +1966,15 @@ sal_Bool ImpEditEngine::ImpSearch( const SvxSearchItem& rSearchItem,
sal_uInt16 nStartNode, nEndNode;
EditSelection aTmpSel;
- SearchParam aSearchParam( rSearchItem.GetSearchString(),
- SearchParam::SRCH_NORMAL, rSearchItem.GetExact(),
+ utl::SearchParam aSearchParam( rSearchItem.GetSearchString(),
+ utl::SearchParam::SRCH_NORMAL, rSearchItem.GetExact(),
rSearchItem.GetWordOnly(), rSearchItem.GetSelection() );
if ( rSearchItem.GetRegExp() )
- aSearchParam.SetSrchType( SearchParam::SRCH_REGEXP );
+ aSearchParam.SetSrchType( utl::SearchParam::SRCH_REGEXP );
else if ( rSearchItem.IsLevenshtein() )
{
- aSearchParam.SetSrchType( SearchParam::SRCH_LEVDIST );
+ aSearchParam.SetSrchType( utl::SearchParam::SRCH_LEVDIST );
aSearchParam.SetSrchRelaxed( rSearchItem.IsLEVRelaxed() ? sal_True : sal_False );
aSearchParam.SetLEVOther( rSearchItem.GetLEVOther() );
aSearchParam.SetLEVShorter( rSearchItem.GetLEVShorter() );
@@ -1995,7 +1995,7 @@ sal_Bool ImpEditEngine::ImpSearch( const SvxSearchItem& rSearchItem,
}
nStartNode = aEditDoc.GetPos( rStartPos.GetNode() );
- SearchText aSearcher( aSearchParam, Application::GetAppInternational() );
+ utl::TextSearch aSearcher( aSearchParam, Application::GetAppInternational().GetLanguage() );
// ueber die Absaetze iterieren...
for ( sal_uInt16 nNode = nStartNode;