diff options
-rw-r--r-- | sw/source/core/crsr/swcrsr.cxx | 14 | ||||
-rw-r--r-- | sw/source/core/doc/docfmt.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/docnode/node.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/edit/edattr.cxx | 10 | ||||
-rw-r--r-- | sw/source/filter/rtf/rtfatr.cxx | 33 |
5 files changed, 40 insertions, 37 deletions
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 5364cb11a328..c223e4b5feee 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swcrsr.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jp $ $Date: 2000-11-02 16:59:40 $ + * last change: $Author: jp $ $Date: 2000-11-20 16:37:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,11 +73,11 @@ #include <svx/protitem.hxx> #endif -#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HDL -#include <com/sun/star/text/WordType.hdl> +#ifndef _COM_SUN_STAR_I18N_WORDTYPE_HDL +#include <com/sun/star/i18n/WordType.hdl> #endif -#ifndef _COM_SUN_STAR_TEXT_CHARTYPE_HDL -#include <com/sun/star/text/CharType.hdl> +#ifndef _COM_SUN_STAR_I18N_CHARTYPE_HDL +#include <com/sun/star/i18n/CharType.hdl> #endif @@ -137,7 +137,7 @@ #include <statstr.hrc> // ResId fuer Statusleiste #endif -using namespace ::com::sun::star::text; +using namespace ::com::sun::star::i18n; static const USHORT coSrchRplcThreshold = 500; diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index acf64e4680c1..5684810bd44a 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfmt.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jp $ $Date: 2000-11-02 17:28:08 $ + * last change: $Author: jp $ $Date: 2000-11-20 16:36:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,8 +112,8 @@ SO2_DECL_REF(SvLinkName) #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> #endif -#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HDL -#include <com/sun/star/text/WordType.hdl> +#ifndef _COM_SUN_STAR_I18N_WORDTYPE_HDL +#include <com/sun/star/i18n/WordType.hdl> #endif @@ -200,7 +200,7 @@ SO2_DECL_REF(SvLinkName) #endif -using namespace ::com::sun::star::text; +using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index e1ad7d674df4..be785fd1e75b 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -2,9 +2,9 @@ * * $RCSfile: node.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-11-06 10:45:59 $ + * last change: $Author: jp $ $Date: 2000-11-20 16:36:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,8 +72,8 @@ #ifndef _SVX_PROTITEM_HXX //autogen #include <svx/protitem.hxx> #endif -#ifndef _COM_SUN_STAR_TEXT_CHARACTERITERATORMODE_HDL_ -#include <com/sun/star/text/CharacterIteratorMode.hdl> +#ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ +#include <com/sun/star/i18n/CharacterIteratorMode.hdl> #endif #ifndef _FMTCNTNT_HXX //autogen @@ -188,7 +188,7 @@ #include <breakit.hxx> #endif -using namespace ::com::sun::star::text; +using namespace ::com::sun::star::i18n; TYPEINIT2( SwCntntNode, SwModify, SwIndexReg ) diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 0132792c8bb7..efd4ac5d1896 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edattr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2000-11-13 12:29:51 $ + * last change: $Author: jp $ $Date: 2000-11-20 16:40:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,8 +75,8 @@ #ifndef _SVX_LRSPITEM_HXX //autogen #include <svx/lrspitem.hxx> #endif -#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HDL_ -#include <com/sun/star/text/ScriptType.hdl> +#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ +#include <com/sun/star/i18n/ScriptType.hdl> #endif #ifndef _TXATBASE_HXX //autogen @@ -125,7 +125,7 @@ #include <scrpmtch.hxx> #endif -using namespace ::com::sun::star::text; +using namespace ::com::sun::star::i18n; /************************************* * harte Formatierung (Attribute) diff --git a/sw/source/filter/rtf/rtfatr.cxx b/sw/source/filter/rtf/rtfatr.cxx index 9c626d75c89c..9973976d97aa 100644 --- a/sw/source/filter/rtf/rtfatr.cxx +++ b/sw/source/filter/rtf/rtfatr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtfatr.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jp $ $Date: 2000-11-20 09:37:54 $ + * last change: $Author: jp $ $Date: 2000-11-20 16:40:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,8 +75,8 @@ #endif #define ITEMID_BOXINFO SID_ATTR_BORDER_INNER -#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HDL_ -#include <com/sun/star/text/ScriptType.hdl> +#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ +#include <com/sun/star/i18n/ScriptType.hdl> #endif #ifndef SVTOOLS_URIHELPER_HXX @@ -665,7 +665,7 @@ RTFEndPosLst::RTFEndPosLst( SwRTFWriter& rWriter, const SwTxtNode& rNd ) // JP 15.11.00: first default to latin - this must be change, if it // clear how we handle empty paragraphs - nCurScript = ::com::sun::star::text::ScriptType::LATIN; + nCurScript = ::com::sun::star::i18n::ScriptType::LATIN; // search the script changes and add this positions as a Item into // the attribute list @@ -680,9 +680,9 @@ RTFEndPosLst::RTFEndPosLst( SwRTFWriter& rWriter, const SwTxtNode& rNd ) nChg = pBreakIt->xBreak->endOfScript( rTxt, nChg, nScript ); switch( nScript ) { - case ::com::sun::star::text::ScriptType::LATIN: - case ::com::sun::star::text::ScriptType::ASIAN: - case ::com::sun::star::text::ScriptType::COMPLEX: + case ::com::sun::star::i18n::ScriptType::LATIN: + case ::com::sun::star::i18n::ScriptType::ASIAN: + case ::com::sun::star::i18n::ScriptType::COMPLEX: if( nSttPos != nChg ) { SfxPoolItem* pAttr = new @@ -794,7 +794,7 @@ void RTFEndPosLst::OutFontAttrs( USHORT nScript ) // size/weight/posture optional switch( nScript ) { - case ::com::sun::star::text::ScriptType::LATIN: + case ::com::sun::star::i18n::ScriptType::LATIN: rWrt.Strm() << sRTF_RTLCH << sRTF_AF; rWrt.OutULong( nCmplx ); rWrt.Strm() << sRTF_LTRCH << sRTF_DBCH << sRTF_AF; @@ -802,7 +802,7 @@ void RTFEndPosLst::OutFontAttrs( USHORT nScript ) rWrt.OutULong( nLatin ) << sRTF_LOCH << sRTF_F; rWrt.OutULong( nLatin ); break; - case ::com::sun::star::text::ScriptType::ASIAN: + case ::com::sun::star::i18n::ScriptType::ASIAN: rWrt.Strm() << sRTF_RTLCH << sRTF_AF; rWrt.OutULong( nCmplx ); rWrt.Strm() << sRTF_LTRCH << sRTF_LOCH << sRTF_AF; @@ -812,7 +812,7 @@ void RTFEndPosLst::OutFontAttrs( USHORT nScript ) pIdArr = aAsianIds; break; - case ::com::sun::star::text::ScriptType::COMPLEX: + case ::com::sun::star::i18n::ScriptType::COMPLEX: rWrt.Strm() << sRTF_LTRCH << sRTF_DBCH << sRTF_AF; rWrt.OutULong( nAsian ) << sRTF_LOCH << sRTF_AF; rWrt.OutULong( nLatin ) << sRTF_HICH << sRTF_AF; @@ -865,21 +865,21 @@ BOOL RTFEndPosLst::MatchScriptToId( USHORT nWhich ) const case RES_CHRATR_LANGUAGE: case RES_CHRATR_POSTURE: case RES_CHRATR_WEIGHT: - bRet = nCurScript == ::com::sun::star::text::ScriptType::LATIN; + bRet = nCurScript == ::com::sun::star::i18n::ScriptType::LATIN; break; case RES_CHRATR_CJK_FONT: case RES_CHRATR_CJK_FONTSIZE: case RES_CHRATR_CJK_LANGUAGE: case RES_CHRATR_CJK_POSTURE: case RES_CHRATR_CJK_WEIGHT: - bRet = nCurScript == ::com::sun::star::text::ScriptType::ASIAN; + bRet = nCurScript == ::com::sun::star::i18n::ScriptType::ASIAN; break; case RES_CHRATR_CTL_FONT: case RES_CHRATR_CTL_FONTSIZE: case RES_CHRATR_CTL_LANGUAGE: case RES_CHRATR_CTL_POSTURE: case RES_CHRATR_CTL_WEIGHT: - bRet = nCurScript == ::com::sun::star::text::ScriptType::COMPLEX; + bRet = nCurScript == ::com::sun::star::i18n::ScriptType::COMPLEX; break; } return bRet; @@ -3400,11 +3400,14 @@ SwNodeFnTab aRTFNodeFnTab = { Source Code Control System - Header - $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/rtfatr.cxx,v 1.6 2000-11-20 09:37:54 jp Exp $ + $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/rtfatr.cxx,v 1.7 2000-11-20 16:40:58 jp Exp $ Source Code Control System - Update $Log: not supported by cvs2svn $ + Revision 1.6 2000/11/20 09:37:54 jp + new para attributes - expand para range + Revision 1.5 2000/11/16 09:57:35 jp export CJK attributes |