diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-19 05:34:48 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-19 10:55:56 +0000 |
commit | 8eb5db89978547547510b2954918c9881eeecb52 (patch) | |
tree | a3b7bb76eb6b0aa6376fe54aa78d1ce8884a6f59 /editeng | |
parent | bd5921b7371c41267ec42a2784778e7b34641ac5 (diff) |
replace sxub_Unicode by sal_Unicode
Change-Id: Icf4b434a1961cc4964ee6e362491868e898a1831
Reviewed-on: https://gerrit.libreoffice.org/887
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editdoc.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 12 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 560d7cac5a09..8b034966a92f 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2062,7 +2062,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const nLen += (nNodes - 1) * nSepSize; rtl_uString* newStr = comphelper::string::rtl_uString_alloc(nLen); - xub_Unicode* pCur = newStr->buffer; + sal_Unicode* pCur = newStr->buffer; size_t nLastNode = nNodes-1; for ( sal_uInt16 nNode = 0; nNode < nNodes; nNode++ ) { diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 258e8a5bc445..5b691c2e1e62 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1341,7 +1341,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie #endif if ( !bReadOnly && IsSimpleCharInput( rKeyEvent ) ) { - xub_Unicode nCharCode = rKeyEvent.GetCharCode(); + sal_Unicode nCharCode = rKeyEvent.GetCharCode(); pEditView->pImpEditView->DrawSelection(); // Autocorrection? SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 750b470af4c4..4f3f5f5878ba 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -1179,7 +1179,7 @@ inline Cursor* ImpEditView::GetCursor() void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit ); void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const MapUnit* pSourceUnit = NULL, const MapUnit* pDestUnit = NULL ); -sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar ); +sal_uInt8 GetCharTypeForCompression( sal_Unicode cChar ); Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin ); #endif // _IMPEDIT_HXX diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 0249020c0374..233f9c1429d1 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2527,7 +2527,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_uInt16 nPara ) } } -EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, +EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c, sal_Bool bOverwrite, Window* pFrameWin ) { EditSelection aSel( rCurSel ); @@ -2590,7 +2590,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel, - xub_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput ) + sal_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput ) { OSL_ENSURE( c != '\t', "Tab for InsertText ?" ); OSL_ENSURE( c != '\n', "Word wrapping for InsertText ?"); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 2e0017907e00..57ae2ea69344 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -128,7 +128,7 @@ Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin ) return aTranslatedPos; } -sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar ) +sal_uInt8 GetCharTypeForCompression( sal_Unicode cChar ) { switch ( cChar ) { @@ -254,7 +254,7 @@ static Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin, double nSin, dou return aTranslatedPos; } -static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) // For Kashidas from sw/source/core/text/porlay.txt +static sal_Bool lcl_IsLigature( sal_Unicode cCh, sal_Unicode cNextCh ) // For Kashidas from sw/source/core/text/porlay.txt { // Lam + Alef return ( 0x644 == cCh && 0x627 == cNextCh ) || @@ -262,7 +262,7 @@ static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) // For Ka ( 0x628 == cCh && 0x631 == cNextCh ); } -static sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) // For Kashidas from sw/source/core/text/porlay.txt +static sal_Bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh ) // For Kashidas from sw/source/core/text/porlay.txt { // Alef, Dal, Thal, Reh, Zain, and Waw do not connect to the left sal_Bool bRet = 0x627 != cPrevCh && 0x62F != cPrevCh && 0x630 != cPrevCh && @@ -2128,8 +2128,8 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, sal_uInt16 nStart, sal_ xub_StrLen nIdx = 0; xub_StrLen nKashidaPos = STRING_LEN; - xub_Unicode cCh; - xub_Unicode cPrevCh = 0; + sal_Unicode cCh; + sal_Unicode cPrevCh = 0; while ( nIdx < aWord.Len() ) { @@ -2177,7 +2177,7 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, sal_uInt16 nStart, sal_ DBG_ASSERT( 0 != cPrevCh, "No previous character" ); // check if next character is Reh, Yeh or Alef Maksura - xub_Unicode cNextCh = aWord.GetChar( nIdx + 1 ); + sal_Unicode cNextCh = aWord.GetChar( nIdx + 1 ); if ( 0x631 == cNextCh || 0x64A == cNextCh || 0x649 == cNextCh ) diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index b45373cf9bb5..51eb8b717cd9 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -486,7 +486,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView) XubString aNumber_US( RTL_CONSTASCII_USTRINGPARAM( "Numbering" ) ); XubString aStr( pEditEngine->GetText( (sal_uInt16)nPara ) ); - xub_Unicode* pPtr = (xub_Unicode*)aStr.GetBuffer(); + sal_Unicode* pPtr = (sal_Unicode*)aStr.GetBuffer(); sal_uInt16 nHeadingNumberStart = 0; sal_uInt16 nNumberingNumberStart = 0; |