From 3cbfcee36dd16e451d76c561eaaaee0ff29b01a5 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 2 Feb 2014 22:16:48 -0600 Subject: xub_StrLen and tools/string.hxx final straw Thre is still some 0xffff limit left and possibly some less than gracefully handled overflow/error cases Change-Id: I00957ee3a30b02f73918ea49d7353056263dc638 Reviewed-on: https://gerrit.libreoffice.org/7787 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- include/editeng/AccessibleEditableTextPara.hxx | 2 +- include/editeng/editdata.hxx | 75 +++++++++++++------------- include/editeng/editeng.hxx | 72 ++++++++++++------------- include/editeng/editstat.hxx | 8 +-- include/editeng/editview.hxx | 8 +-- include/editeng/eedata.hxx | 10 ++-- include/editeng/misspellrange.hxx | 10 ++-- include/editeng/outliner.hxx | 44 +++++++-------- include/editeng/section.hxx | 8 +-- include/editeng/svxrtf.hxx | 12 ++--- include/editeng/unoedhlp.hxx | 2 +- include/editeng/unoedprx.hxx | 30 +++++------ include/editeng/unoedsrc.hxx | 36 ++++++------- include/editeng/unofored.hxx | 30 +++++------ include/editeng/unoforou.hxx | 34 ++++++------ include/editeng/unotext.hxx | 32 +++++------ include/formula/token.hxx | 4 +- include/svx/svdoutl.hxx | 2 +- include/tools/solar.h | 2 - include/tools/string.hxx | 31 ----------- 20 files changed, 208 insertions(+), 244 deletions(-) delete mode 100644 include/tools/string.hxx (limited to 'include') diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index d6f7d6fbcb2c..0f62ce879270 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -304,7 +304,7 @@ namespace accessibility @return sal_False, if the method was not able to determine the range */ - sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nIndex ); + sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nIndex ); // syntactic sugar for FireEvent void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const; diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index 2e167179bd08..5f59e5ddcf29 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -46,9 +46,9 @@ enum EVAnchorMode { #define EE_PARA_ALL SAL_MAX_INT32 #define EE_PARA_MAX_COUNT SAL_MAX_INT32 -#define EE_INDEX_NOT_FOUND SAL_MAX_UINT16 -#define EE_TEXTPOS_ALL SAL_MAX_UINT16 -#define EE_TEXTPOS_MAX_COUNT SAL_MAX_UINT16 +#define EE_INDEX_NOT_FOUND SAL_MAX_INT32 +#define EE_TEXTPOS_ALL SAL_MAX_INT32 +#define EE_TEXTPOS_MAX_COUNT SAL_MAX_INT32 EDITENG_DLLPUBLIC extern const size_t EE_APPEND; @@ -102,45 +102,42 @@ class SfxStyleSheet; struct EPosition { sal_Int32 nPara; - xub_StrLen nIndex; + sal_Int32 nIndex; - EPosition() : - nPara( EE_PARA_NOT_FOUND ), - nIndex( EE_INDEX_NOT_FOUND ) - { - } + EPosition() + : nPara( EE_PARA_NOT_FOUND ) + , nIndex( EE_INDEX_NOT_FOUND ) + { } - EPosition( sal_Int32 nPara_, xub_StrLen nPos_ ) : - nPara( nPara_ ), - nIndex( nPos_ ) - { - } + EPosition( sal_Int32 nPara_, sal_Int32 nPos_ ) + : nPara( nPara_ ) + , nIndex( nPos_ ) + { } }; struct ESelection { sal_Int32 nStartPara; - xub_StrLen nStartPos; + sal_Int32 nStartPos; sal_Int32 nEndPara; - xub_StrLen nEndPos; + sal_Int32 nEndPos; ESelection() : nStartPara( 0 ), nStartPos( 0 ), nEndPara( 0 ), nEndPos( 0 ) {} - ESelection( sal_Int32 nStPara, xub_StrLen nStPos, sal_Int32 nEPara, xub_StrLen nEPos ) : - nStartPara( nStPara ), - nStartPos( nStPos ), - nEndPara( nEPara ), - nEndPos( nEPos ) - { - } - - ESelection( sal_Int32 nPara, xub_StrLen nPos ) : - nStartPara( nPara ), - nStartPos( nPos ), - nEndPara( nPara ), - nEndPos( nPos ) - { - } + ESelection( sal_Int32 nStPara, sal_Int32 nStPos, + sal_Int32 nEPara, sal_Int32 nEPos ) + : nStartPara( nStPara ) + , nStartPos( nStPos ) + , nEndPara( nEPara ) + , nEndPos( nEPos ) + { } + + ESelection( sal_Int32 nPara, sal_Int32 nPos ) + : nStartPara( nPara ) + , nStartPos( nPos ) + , nEndPara( nPara ) + , nEndPos( nPos ) + { } void Adjust(); bool IsEqual( const ESelection& rS ) const; @@ -185,15 +182,15 @@ inline bool ESelection::IsGreater( const ESelection& rS ) const inline void ESelection::Adjust() { - sal_Bool bSwap = sal_False; + bool bSwap = false; if ( nStartPara > nEndPara ) - bSwap = sal_True; + bSwap = true; else if ( ( nStartPara == nEndPara ) && ( nStartPos > nEndPos ) ) - bSwap = sal_True; + bSwap = true; if ( bSwap ) { - sal_Int32 nSPar = nStartPara; sal_uInt16 nSPos = nStartPos; + sal_Int32 nSPar = nStartPara; sal_Int32 nSPos = nStartPos; nStartPara = nEndPara; nStartPos = nEndPos; nEndPara = nSPar; nEndPos = nSPos; } @@ -206,7 +203,7 @@ struct EDITENG_DLLPUBLIC EFieldInfo EPosition aPosition; EFieldInfo(); - EFieldInfo( const SvxFieldItem& rFieldItem, sal_Int32 nPara, sal_uInt16 nPos ); + EFieldInfo( const SvxFieldItem& rFieldItem, sal_Int32 nPara, sal_Int32 nPos ); ~EFieldInfo(); EFieldInfo( const EFieldInfo& ); @@ -275,8 +272,8 @@ struct EECharAttrib const SfxPoolItem* pAttr; sal_Int32 nPara; - xub_StrLen nStart; - xub_StrLen nEnd; + sal_Int32 nStart; + sal_Int32 nEnd; }; struct MoveParagraphsInfo @@ -298,7 +295,7 @@ struct PasteOrDropInfos sal_Int32 nStartPara; sal_Int32 nEndPara; - PasteOrDropInfos() : nAction(0), nStartPara(0xFFFFFFFF), nEndPara(0xFFFFFFFF) {} + PasteOrDropInfos() : nAction(0), nStartPara(-1), nEndPara(-1) {} }; enum EENotifyType diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 77b9d532310e..090dc10e66e0 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -164,7 +164,7 @@ private: bool bAcceptStartOfWord = true); EDITENG_DLLPRIVATE long GetXPos( - const ParaPortion* pParaPortion, const EditLine* pLine, sal_uInt16 nIndex, bool bPreferPortionStart = false) const; + const ParaPortion* pParaPortion, const EditLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false) const; EDITENG_DLLPRIVATE Range GetLineXPosStartEnd( const ParaPortion* pParaPortion, const EditLine* pLine) const; @@ -196,23 +196,23 @@ public: MapMode GetRefMapMode(); void SetUpdateMode( sal_Bool bUpdate ); - sal_Bool GetUpdateMode() const; - void SetUpdateModeForAcc( sal_Bool bUp); - sal_Bool GetUpdateModeForAcc( ) const; + sal_Bool GetUpdateMode() const; + void SetUpdateModeForAcc( sal_Bool bUp); + sal_Bool GetUpdateModeForAcc( ) const; void SetBackgroundColor( const Color& rColor ); Color GetBackgroundColor() const; Color GetAutoColor() const; void EnableAutoColor( sal_Bool b ); void ForceAutoColor( sal_Bool b ); - sal_Bool IsForceAutoColor() const; + sal_Bool IsForceAutoColor() const; void InsertView(EditView* pEditView, size_t nIndex = EE_APPEND); EditView* RemoveView( EditView* pEditView ); EditView* RemoveView(size_t nIndex = EE_APPEND); EditView* GetView(size_t nIndex = 0) const; size_t GetViewCount() const; - sal_Bool HasView( EditView* pView ) const; + sal_Bool HasView( EditView* pView ) const; EditView* GetActiveView() const; void SetActiveView(EditView* pView); @@ -227,9 +227,9 @@ public: void SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ); EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const; - sal_uInt16 GetScriptType( const ESelection& rSelection ) const; + sal_uInt16 GetScriptType( const ESelection& rSelection ) const; LanguageType GetLanguage(const EditPaM& rPaM) const; - LanguageType GetLanguage( sal_Int32 nPara, sal_uInt16 nPos ) const; + LanguageType GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const; void TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode ); EditSelection TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ); @@ -240,9 +240,9 @@ public: void SetAddExtLeading( sal_Bool b ); - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); - void ClearPolygon(); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); + void ClearPolygon(); const Size& GetMinAutoPaperSize() const; void SetMinAutoPaperSize( const Size& rSz ); @@ -258,22 +258,22 @@ public: sal_uInt32 CalcTextWidth(); OUString GetText( sal_Int32 nParagraph ) const; - xub_StrLen GetTextLen( sal_Int32 nParagraph ) const; + sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; sal_uInt32 GetTextHeight( sal_Int32 nParagraph ) const; sal_Int32 GetParagraphCount() const; - sal_uInt16 GetLineCount( sal_Int32 nParagraph ) const; - xub_StrLen GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) const; - void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const; - sal_uInt16 GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const; - sal_uInt32 GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine = 0 ); + sal_Int32 GetLineCount( sal_Int32 nParagraph ) const; + sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const; + void GetLineBoundaries( /*out*/sal_Int32& rStart, /*out*/sal_Int32& rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; + sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; + sal_uInt32 GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine = 0 ); ParagraphInfos GetParagraphInfos( sal_Int32 nPara ); sal_Int32 FindParagraph( long nDocPosY ); EPosition FindDocPosition( const Point& rDocPos ) const; Rectangle GetCharacterBounds( const EPosition& rPos ) const; - OUString GetWord(sal_Int32 nPara, xub_StrLen nIndex); + OUString GetWord(sal_Int32 nPara, sal_Int32 nIndex); ESelection GetWord( const ESelection& rSelection, sal_uInt16 nWordType ) const; @@ -296,7 +296,7 @@ public: void GetCharAttribs( sal_Int32 nPara, std::vector& rLst ) const; - SfxItemSet GetAttribs( sal_Int32 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags = 0xFF ) const; + SfxItemSet GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags = 0xFF ) const; SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ); sal_Bool HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const; @@ -317,7 +317,7 @@ public: sal_Bool IsInUndo(); void EnableUndo( sal_Bool bEnable ); - sal_Bool IsUndoEnabled(); + sal_Bool IsUndoEnabled(); /** returns the value last used for bTryMerge while calling ImpEditEngine::InsertUndo This is currently used in a bad but needed hack to get undo actions merged in the @@ -326,20 +326,20 @@ public: void ClearModifyFlag(); void SetModified(); - sal_Bool IsModified() const; + sal_Bool IsModified() const; void SetModifyHdl( const Link& rLink ); Link GetModifyHdl() const; - sal_Bool IsInSelectionMode() const; + sal_Bool IsInSelectionMode() const; void StripPortions(); - void GetPortions( sal_Int32 nPara, std::vector& rList ); + void GetPortions( sal_Int32 nPara, std::vector& rList ); long GetFirstLineStartX( sal_Int32 nParagraph ); Point GetDocPosTopLeft( sal_Int32 nParagraph ); Point GetDocPos( const Point& rPaperPos ) const; - sal_Bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 ); + sal_Bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 ); // StartDocPos corrresponds to VisArea.TopLeft(). void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect ); @@ -361,7 +361,7 @@ public: Link GetImportHdl() const; // Do not evaluate font formatting => For Outliner - sal_Bool IsFlatMode() const; + sal_Bool IsFlatMode() const; void SetFlatMode( sal_Bool bFlat ); void SetControlWord( sal_uInt32 nWord ); @@ -412,15 +412,15 @@ public: void SetDefaultLanguage( LanguageType eLang ); LanguageType GetDefaultLanguage() const; - sal_Bool HasOnlineSpellErrors() const; + sal_Bool HasOnlineSpellErrors() const; void CompleteOnlineSpelling(); - sal_Bool ShouldCreateBigTextObject() const; + sal_Bool ShouldCreateBigTextObject() const; // For fast Pre-Test without view: EESpellState HasSpellErrors(); void ClearSpellErrors(); - sal_Bool HasText( const SvxSearchItem& rSearchItem ); + sal_Bool HasText( const SvxSearchItem& rSearchItem ); //initialize sentence spelling void StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc); @@ -462,8 +462,8 @@ public: virtual void ParagraphHeightChanged( sal_Int32 nPara ); virtual void DrawingText( - const Point& rStartPos, const OUString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray, - const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, + const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, const sal_Int32* pDXArray, + const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, const EEngineData::WrongSpellVector* pWrongSpellVector, const SvxFieldData* pFieldData, bool bEndOfLine, @@ -475,7 +475,7 @@ public: virtual void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, - const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, + const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, @@ -483,9 +483,9 @@ public: virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const; virtual sal_Bool FormattingParagraph( sal_Int32 nPara ); virtual sal_Bool SpellNextDocument(); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos ); - virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos ); - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); // to be overloaded if access to bullet information needs to be provided virtual const SvxNumberFormat * GetNumberFormat( sal_Int32 nPara ) const; @@ -546,7 +546,7 @@ public: const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = com::sun::star::i18n::CharacterIteratorMode::SKIPCELL); void SeekCursor( - ContentNode* pNode, sal_uInt16 nPos, SvxFont& rFont, OutputDevice* pOut = NULL, sal_uInt16 nIgnoreWhich = 0); + ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = NULL, sal_uInt16 nIgnoreWhich = 0); EditPaM DeleteSelection(const EditSelection& rSel); @@ -571,7 +571,7 @@ public: void UpdateSelections(); void InsertContent(ContentNode* pNode, sal_Int32 nPos); - EditPaM SplitContent(sal_Int32 nNode, sal_uInt16 nSepPos); + EditPaM SplitContent(sal_Int32 nNode, sal_Int32 nSepPos); EditPaM ConnectContents(sal_Int32 nLeftNode, bool bBackward); EditPaM InsertFeature(const EditSelection& rEditSelection, const SfxPoolItem& rItem); diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx index 59f5ae4f1d8d..8fd9f405585e 100644 --- a/include/editeng/editstat.hxx +++ b/include/editeng/editstat.hxx @@ -90,10 +90,10 @@ class EditStatus protected: sal_uLong nStatusBits; sal_uLong nControlBits; - sal_uInt16 nPrevPara; // for EE_STAT_CRSRLEFTPARA + sal_Int32 nPrevPara; // for EE_STAT_CRSRLEFTPARA public: - EditStatus() { nStatusBits = 0; nControlBits = 0; nPrevPara = 0xFFFF; } + EditStatus() { nStatusBits = 0; nControlBits = 0; nPrevPara = -1; } void Clear() { nStatusBits = 0; } void SetControlBits( sal_uLong nMask, bool bOn ) @@ -105,8 +105,8 @@ public: sal_uLong GetControlWord() const { return nControlBits; } sal_uLong& GetControlWord() { return nControlBits; } - sal_uInt16 GetPrevParagraph() const { return nPrevPara; } - sal_uInt16& GetPrevParagraph() { return nPrevPara; } + sal_Int32 GetPrevParagraph() const { return nPrevPara; } + sal_Int32& GetPrevParagraph() { return nPrevPara; } }; #define SPELLCMD_IGNOREWORD 0x0001 diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 71339dea89c9..5b62c301c86f 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -191,7 +191,7 @@ public: EESpellState StartSpeller( sal_Bool bMultipleDoc = sal_False ); EESpellState StartThesaurus(); - sal_uInt16 StartSearchAndReplace( const SvxSearchItem& rSearchItem ); + sal_Int32 StartSearchAndReplace( const SvxSearchItem& rSearchItem ); // for text conversion void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc ); @@ -202,13 +202,13 @@ public: sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False ); sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False ); sal_Bool IsShapeParaFocusable(); - sal_Bool WrongSpelledBreakPara(sal_Int32 nPara, sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nIndex); + sal_Bool WrongSpelledBreakPara(sal_Int32 nPara, sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nIndex); void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); void InsertField( const SvxFieldItem& rFld ); const SvxFieldItem* GetFieldUnderMousePointer() const; - const SvxFieldItem* GetFieldUnderMousePointer( sal_Int32& nPara, xub_StrLen& nPos ) const; - const SvxFieldItem* GetField( const Point& rPos, sal_Int32* pnPara = NULL, xub_StrLen* pnPos = NULL ) const; + const SvxFieldItem* GetFieldUnderMousePointer( sal_Int32& nPara, sal_Int32& nPos ) const; + const SvxFieldItem* GetField( const Point& rPos, sal_Int32* pnPara = NULL, sal_Int32* pnPos = NULL ) const; const SvxFieldItem* GetFieldAtSelection() const; diff --git a/include/editeng/eedata.hxx b/include/editeng/eedata.hxx index 88a65afe1d1f..38eff23f474c 100644 --- a/include/editeng/eedata.hxx +++ b/include/editeng/eedata.hxx @@ -31,10 +31,10 @@ namespace EEngineData class WrongSpellClass { public: - sal_uInt32 nStart; - sal_uInt32 nEnd; + sal_Int32 nStart; + sal_Int32 nEnd; - WrongSpellClass(sal_uInt32 nS, sal_uInt32 nE) : nStart(nS), nEnd(nE) {} + WrongSpellClass(sal_Int32 nS, sal_Int32 nE) : nStart(nS), nEnd(nE) {} }; typedef std::vector< WrongSpellClass > WrongSpellVector; @@ -51,9 +51,9 @@ namespace EEngineData { public: TextMarkingType eType; - sal_uInt32 nIndex; + sal_Int32 nIndex; - TextMarkingClass(TextMarkingType eT, sal_uInt32 nI) : eType(eT), nIndex(nI) {} + TextMarkingClass(TextMarkingType eT, sal_Int32 nI) : eType(eT), nIndex(nI) {} }; typedef std::vector< TextMarkingClass > TextMarkingVector; diff --git a/include/editeng/misspellrange.hxx b/include/editeng/misspellrange.hxx index 58c09356f373..2279f0f4020c 100644 --- a/include/editeng/misspellrange.hxx +++ b/include/editeng/misspellrange.hxx @@ -18,19 +18,19 @@ namespace editeng { struct EDITENG_DLLPUBLIC MisspellRange { - size_t mnStart; - size_t mnEnd; + sal_Int32 mnStart; + sal_Int32 mnEnd; MisspellRange(); - MisspellRange(size_t nStart, size_t nEnd); + MisspellRange(sal_Int32 nStart, sal_Int32 nEnd); }; struct EDITENG_DLLPUBLIC MisspellRanges { - size_t mnParagraph; + sal_Int32 mnParagraph; std::vector maRanges; - MisspellRanges(size_t nParagraph, const std::vector& rRanges); + MisspellRanges(sal_Int32 nParagraph, const std::vector& rRanges); }; } diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 609c9607f4a9..7d6e8aeb3263 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -162,7 +162,7 @@ struct ParaRange ParaRange( sal_Int32 nS, sal_Int32 nE ) { nStartPara = nS, nEndPara = nE; } void Adjust(); - sal_uInt16 Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); } + sal_Int32 Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); } }; inline void ParaRange::Adjust() @@ -280,7 +280,7 @@ public: EESpellState StartSpeller( sal_Bool bMultipleDoc = sal_False ); EESpellState StartThesaurus(); - sal_uInt16 StartSearchAndReplace( const SvxSearchItem& rSearchItem ); + sal_Int32 StartSearchAndReplace( const SvxSearchItem& rSearchItem ); // for text conversion void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc ); @@ -368,10 +368,10 @@ class EDITENG_DLLPUBLIC DrawPortionInfo public: const Point& mrStartPos; const OUString maText; - sal_uInt16 mnTextStart; - sal_uInt16 mnTextLen; + sal_Int32 mnTextStart; + sal_Int32 mnTextLen; sal_Int32 mnPara; - xub_StrLen mnIndex; + sal_Int32 mnIndex; const SvxFont& mrFont; const sal_Int32* mpDXArray; @@ -397,11 +397,11 @@ public: DrawPortionInfo( const Point& rPos, const OUString& rTxt, - sal_uInt16 nTxtStart, - sal_uInt16 nTxtLen, + sal_Int32 nTxtStart, + sal_Int32 nTxtLen, const SvxFont& rFnt, sal_Int32 nPar, - xub_StrLen nIdx, + sal_Int32 nIdx, const sal_Int32* pDXArr, const EEngineData::WrongSpellVector* pWrongSpellVector, const SvxFieldData* pFieldData, @@ -481,8 +481,8 @@ private: OUString aRepresentation; sal_Int32 nPara; - xub_StrLen nPos; - sal_Bool bSimpleClick; + sal_Int32 nPos; + sal_Bool bSimpleClick; EditFieldInfo(); EditFieldInfo( const EditFieldInfo& ); @@ -490,7 +490,7 @@ private: SdrPage* mpSdrPage; public: - EditFieldInfo( Outliner* pOutl, const SvxFieldItem& rFItem, sal_Int32 nPa, xub_StrLen nPo ) + EditFieldInfo( Outliner* pOutl, const SvxFieldItem& rFItem, sal_Int32 nPa, sal_Int32 nPo ) : rFldItem( rFItem ) { pOutliner = pOutl; @@ -519,7 +519,7 @@ public: { delete pFldColor; pFldColor = 0; } sal_Int32 GetPara() const { return nPara; } - xub_StrLen GetPos() const { return nPos; } + sal_Int32 GetPos() const { return nPos; } sal_Bool IsSimpleClick() const { return bSimpleClick; } void SetSimpleClick( sal_Bool bSimple ) { bSimpleClick = bSimple; } @@ -676,7 +676,7 @@ public: EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const; sal_uInt16 GetScriptType( const ESelection& rSelection ) const; - LanguageType GetLanguage( sal_Int32 nPara, sal_uInt16 nPos ) const; + LanguageType GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const; void SetAsianCompressionMode( sal_uInt16 nCompressionMode ); @@ -832,13 +832,13 @@ public: void SetWordDelimiters( const OUString& rDelimiters ); OUString GetWordDelimiters() const; - OUString GetWord( sal_Int32 nPara, xub_StrLen nIndex ); + OUString GetWord( sal_Int32 nPara, sal_Int32 nIndex ); void StripPortions(); virtual void DrawingText( - const Point& rStartPos, const OUString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, - const sal_Int32* pDXArray, const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, + const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, + const sal_Int32* pDXArray, const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, const EEngineData::WrongSpellVector* pWrongSpellVector, const SvxFieldData* pFieldData, bool bEndOfLine, @@ -850,7 +850,7 @@ public: virtual void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, - const SvxFont& rFont, sal_Int32 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, + const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, @@ -891,8 +891,8 @@ public: void SetEndMovingHdl( const Link& rLink){aEndMovingHdl=rLink;} sal_uLong GetLineCount( sal_Int32 nParagraph ) const; - sal_uInt16 GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) const; - sal_uLong GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine = 0 ); + sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const; + sal_uLong GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine = 0 ); sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); @@ -912,9 +912,9 @@ public: sal_Bool UpdateFields(); void RemoveFields( sal_Bool bKeepFieldText, TypeId aType = NULL ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos ); - virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos ); - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetSpeller( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpeller ); diff --git a/include/editeng/section.hxx b/include/editeng/section.hxx index ea9ed1948870..b9f6c37392d7 100644 --- a/include/editeng/section.hxx +++ b/include/editeng/section.hxx @@ -20,14 +20,14 @@ namespace editeng { struct EDITENG_DLLPUBLIC Section { - size_t mnParagraph; - size_t mnStart; - size_t mnEnd; + sal_Int32 mnParagraph; + sal_Int32 mnStart; + sal_Int32 mnEnd; std::vector maAttributes; Section(); - Section(size_t nPara, size_t nStart, size_t nEnd); + Section(sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd); }; } diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index c5f9cc16228d..74ff45fc9179 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -69,7 +69,7 @@ public: virtual ~SvxPosition() {} virtual sal_Int32 GetNodeIdx() const = 0; - virtual xub_StrLen GetCntIdx() const = 0; + virtual sal_Int32 GetCntIdx() const = 0; virtual SvxPosition* Clone() const = 0; // Cloning itself virtual SvxNodeIdx* MakeNodeIdx() const = 0; // Cloning NodeIndex @@ -275,7 +275,7 @@ protected: virtual void InsertText() = 0; virtual void MovePos( int bForward = sal_True ) = 0; virtual void SetEndPrevPara( SvxNodeIdx*& rpNodePos, - xub_StrLen& rCntPos )=0; + sal_Int32& rCntPos )=0; virtual void SetAttrInDoc( SvxRTFItemStackType &rSet ); // for Tokens, which are not evaluated in ReadAttr virtual void UnknownAttrToken( int nToken, SfxItemSet* pSet ); @@ -328,7 +328,7 @@ public: inline const Color& GetColor( size_t nId ) const; const Font& GetFont( sal_uInt16 nId ); // Changes the dflt Font - virtual bool IsEndPara( SvxNodeIdx* pNd, xub_StrLen nCnt ) const = 0; + virtual bool IsEndPara( SvxNodeIdx* pNd, sal_Int32 nCnt ) const = 0; // to det a different attribute pool. May only be done prior to CallParser! // The maps are not generated anew! @@ -359,7 +359,7 @@ class EDITENG_DLLPUBLIC SvxRTFItemStackType SfxItemSet aAttrSet; SvxNodeIdx *pSttNd, *pEndNd; - xub_StrLen nSttCnt, nEndCnt; + sal_Int32 nSttCnt, nEndCnt; SvxRTFItemStackList* pChildList; sal_uInt16 nStyleNo; @@ -387,8 +387,8 @@ public: const SvxNodeIdx& GetSttNode() const { return *pSttNd; } const SvxNodeIdx& GetEndNode() const { return *pEndNd; } - xub_StrLen GetSttCnt() const { return nSttCnt; } - xub_StrLen GetEndCnt() const { return nEndCnt; } + sal_Int32 GetSttCnt() const { return nSttCnt; } + sal_Int32 GetEndCnt() const { return nEndCnt; } SfxItemSet& GetAttrSet() { return aAttrSet; } const SfxItemSet& GetAttrSet() const { return aAttrSet; } diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx index 8f70e2fc11a6..8184561001e3 100644 --- a/include/editeng/unoedhlp.hxx +++ b/include/editeng/unoedhlp.hxx @@ -100,7 +100,7 @@ public: @return sal_True, if the range has been successfully determined */ - static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False); + static sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False); /** Convert point from edit engine to user coordinate space diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index dde5c06afd20..c2b877c25889 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -34,13 +34,13 @@ public: virtual ~SvxAccessibleTextAdapter(); virtual sal_Int32 GetParagraphCount() const; - virtual sal_uInt16 GetTextLen( sal_Int32 nParagraph ) const; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; virtual OUString GetText( const ESelection& rSel ) const; virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const; + virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const; virtual sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); @@ -54,28 +54,28 @@ public: virtual SfxItemPool* GetPool() const; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual sal_Bool IsValid() const; - virtual LanguageType GetLanguage( sal_Int32, sal_uInt16 ) const; - virtual sal_uInt16 GetFieldCount( sal_Int32 nPara ) const; + virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_uInt16 nIndex ) const; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const; virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; virtual MapMode GetMapMode() const; virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_uInt16& nIndex ) const; - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; - virtual sal_uInt16 GetLineCount( sal_Int32 nPara ) const; - virtual sal_uInt16 GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const; + virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; + virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; + virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; virtual void SetUpdateModeForAcc( sal_Bool bUp); virtual sal_Bool GetUpdateModeForAcc() const; - virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const; - virtual sal_uInt16 GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const; + virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; virtual sal_Bool Delete( const ESelection& ); virtual sal_Bool InsertText( const OUString&, const ESelection& ); @@ -88,7 +88,7 @@ public: // implementation functions for XParagraphAppend and XTextPortionAppend // (not needed for accessibility, only for new import API) virtual void AppendParagraph(); - virtual sal_uInt16 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); //XTextCopy virtual void CopyText(const SvxTextForwarder& rSource); diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index d99f532eec4e..1b89fccb16d2 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -140,13 +140,13 @@ public: virtual ~SvxTextForwarder(); virtual sal_Int32 GetParagraphCount() const = 0; - virtual sal_uInt16 GetTextLen( sal_Int32 nParagraph ) const = 0; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const = 0; virtual OUString GetText( const ESelection& rSel ) const = 0; virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const = 0; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const = 0; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) = 0; virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0; - virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const = 0; + virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const = 0; virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const = 0; virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const = 0; @@ -156,8 +156,8 @@ public: virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) = 0; virtual void QuickInsertLineBreak( const ESelection& rSel ) = 0; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) = 0; - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos ) = 0; + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ) = 0; + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) = 0; virtual SfxItemPool* GetPool() const = 0; @@ -165,7 +165,7 @@ public: // implementation functions for XParagraphAppend and XTextPortionAppend virtual void AppendParagraph() = 0; - virtual sal_uInt16 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) = 0; + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) = 0; // XTextCopy virtual void CopyText(const SvxTextForwarder& rSource) = 0; @@ -184,14 +184,14 @@ public: @param nIndex[0 .. m-1] Index of character to query language of */ - virtual LanguageType GetLanguage( sal_Int32 nPara, sal_uInt16 nIndex ) const = 0; + virtual LanguageType GetLanguage( sal_Int32 nPara, sal_Int32 nIndex ) const = 0; /** Query number of fields in the underlying edit engine @param nPara[0 .. n-1] Index of paragraph to query field number in */ - virtual sal_uInt16 GetFieldCount( sal_Int32 nPara ) const = 0; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const = 0; /** Query information for given field number in the underlying edit engine @@ -235,7 +235,7 @@ public: left corner of text. The coordinates returned here are to be interpreted in the map mode given by GetMapMode(). */ - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_uInt16 nIndex ) const = 0; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const = 0; /** Query the bounding rectangle of the given paragraph @@ -283,7 +283,7 @@ public: @return sal_True, if the point is over any text and both rPara and rIndex are valid */ - virtual sal_Bool GetIndexAtPoint( const Point& rPoint, sal_Int32& rPara, sal_uInt16& rIndex ) const = 0; + virtual sal_Bool GetIndexAtPoint( const Point& rPoint, sal_Int32& rPara, sal_Int32& rIndex ) const = 0; /** Get the start and the end index of the word at the given index @@ -308,7 +308,7 @@ public: @return sal_True, if the result is non-empty */ - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& rStart, sal_uInt16& rEnd ) const = 0; + virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& rStart, sal_Int32& rEnd ) const = 0; /** Query range of similar attributes @@ -325,7 +325,7 @@ public: @return sal_True, if the range has been successfully determined */ - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const = 0; + virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const = 0; /** Query number of lines in the formatted paragraph @@ -335,7 +335,7 @@ public: @return number of lines in given paragraph */ - virtual sal_uInt16 GetLineCount( sal_Int32 nPara ) const = 0; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const = 0; /** Query line length @@ -346,7 +346,7 @@ public: Index of line in paragraph to query line length of */ - virtual sal_uInt16 GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const = 0; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const = 0; /** Query bounds of line in paragraph @@ -363,7 +363,7 @@ public: Index of line in paragraph to query line length of */ - virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const = 0; + virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const = 0; /** Query the line number for a index in the paragraphs text @@ -376,7 +376,7 @@ public: @returns [0 .. k-1] The line number of the chara in the paragraph */ - virtual sal_uInt16 GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const = 0; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const = 0; /** Delete given text range and reformat text @@ -432,8 +432,8 @@ public: */ virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) = 0; - virtual sal_Int16 GetNumberingStartValue( sal_Int32 nPara ); - virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue ); + virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara ); + virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue ); virtual sal_Bool IsParaIsNumberingRestart( sal_Int32 nPara ); virtual void SetParaIsNumberingRestart( sal_Int32 nPara, sal_Bool bParaIsNumberingRestart ); @@ -538,7 +538,7 @@ public: virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; }; virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; }; - virtual sal_Bool BreakParaWrongList(sal_Int32, sal_uInt16&, sal_uInt16&, sal_Int32){ return sal_False; }; + virtual sal_Bool BreakParaWrongList(sal_Int32, sal_Int32&, sal_Int32&, sal_Int32){ return sal_False; }; }; #endif diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx index 69f5f3f69db5..b7269258b8b9 100644 --- a/include/editeng/unofored.hxx +++ b/include/editeng/unofored.hxx @@ -36,13 +36,13 @@ public: virtual ~SvxEditEngineForwarder(); virtual sal_Int32 GetParagraphCount() const; - virtual sal_uInt16 GetTextLen( sal_Int32 nParagraph ) const; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; virtual OUString GetText( const ESelection& rSel ) const; virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const; + virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const; virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const; @@ -54,25 +54,25 @@ public: virtual SfxItemPool* GetPool() const; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual sal_Bool IsValid() const; - virtual LanguageType GetLanguage( sal_Int32, sal_uInt16 ) const; - virtual sal_uInt16 GetFieldCount( sal_Int32 nPara ) const; + virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_uInt16 nIndex ) const; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const; virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; virtual MapMode GetMapMode() const; virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_uInt16& nIndex ) const; - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; - virtual sal_uInt16 GetLineCount( sal_Int32 nPara ) const; - virtual sal_uInt16 GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const; - virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const; - virtual sal_uInt16 GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; + virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; + virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; + virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; virtual sal_Bool Delete( const ESelection& ); virtual sal_Bool InsertText( const OUString&, const ESelection& ); virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ); @@ -83,7 +83,7 @@ public: // implementation functions for XParagraphAppend and XTextPortionAppend virtual void AppendParagraph(); - virtual sal_uInt16 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); //XTextCopy virtual void CopyText(const SvxTextForwarder& rSource); }; diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx index b882be93a6e7..ae7e912a7a7c 100644 --- a/include/editeng/unoforou.hxx +++ b/include/editeng/unoforou.hxx @@ -54,13 +54,13 @@ public: virtual ~SvxOutlinerForwarder(); virtual sal_Int32 GetParagraphCount() const; - virtual sal_uInt16 GetTextLen( sal_Int32 nParagraph ) const; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; virtual OUString GetText( const ESelection& rSel ) const; virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const; + virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const; virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const; @@ -72,35 +72,35 @@ public: virtual SfxItemPool* GetPool() const; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual sal_Bool IsValid() const; Outliner& GetOutliner() const { return rOutliner; } - virtual LanguageType GetLanguage( sal_Int32, sal_uInt16 ) const; - virtual sal_uInt16 GetFieldCount( sal_Int32 nPara ) const; + virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_uInt16 nIndex ) const; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const; virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; virtual MapMode GetMapMode() const; virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_uInt16& nIndex ) const; - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; - virtual sal_uInt16 GetLineCount( sal_Int32 nPara ) const; - virtual sal_uInt16 GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const; - virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nPara, sal_uInt16 nLine ) const; - virtual sal_uInt16 GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; + virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; + virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; + virtual void GetLineBoundaries( /*out*/sal_Int32& rStart, /*out*/sal_Int32& rEnd, sal_Int32 nPara, sal_Int32 nLine ) const; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; virtual sal_Bool Delete( const ESelection& ); virtual sal_Bool InsertText( const OUString&, const ESelection& ); virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ); virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; virtual sal_Bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); - virtual sal_Int16 GetNumberingStartValue( sal_Int32 nPara ); - virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue ); + virtual sal_Int32 GetNumberingStartValue( sal_Int32 nPara ); + virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int32 nNumberingStartValue ); virtual sal_Bool IsParaIsNumberingRestart( sal_Int32 nPara ); virtual void SetParaIsNumberingRestart( sal_Int32 nPara, sal_Bool bParaIsNumberingRestart ); @@ -112,7 +112,7 @@ public: // implementation functions for XParagraphAppend and XTextPortionAppend virtual void AppendParagraph(); - virtual sal_uInt16 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); //XTextCopy virtual void CopyText(const SvxTextForwarder& rSource); }; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index da054cd6a245..02b47d6404df 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -173,13 +173,13 @@ public: // SvxTextForwarder virtual sal_Int32 GetParagraphCount() const; - virtual sal_uInt16 GetTextLen( sal_Int32 nParagraph ) const; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; virtual OUString GetText( const ESelection& rSel ) const; virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const; + virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const; sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const; @@ -191,27 +191,27 @@ public: virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); virtual void QuickInsertLineBreak( const ESelection& rSel ); - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, xub_StrLen nPos ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual sal_Bool IsValid() const; virtual void SetNotifyHdl( const Link& ); - virtual LanguageType GetLanguage( sal_Int32, sal_uInt16 ) const; - virtual sal_uInt16 GetFieldCount( sal_Int32 nPara ) const; + virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_uInt16 nIndex ) const; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const; virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; virtual MapMode GetMapMode() const; virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_uInt16& nIndex ) const; - virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; - virtual sal_uInt16 GetLineCount( sal_Int32 nPara ) const; - virtual sal_uInt16 GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const; - virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const; - virtual sal_uInt16 GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; + virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; + virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; + virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; virtual sal_Bool Delete( const ESelection& ); virtual sal_Bool InsertText( const OUString&, const ESelection& ); virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ); @@ -222,7 +222,7 @@ public: // implementation functions for XParagraphAppend and XTextPortionAppend virtual void AppendParagraph(); - virtual sal_uInt16 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); //XTextCopy virtual void CopyText(const SvxTextForwarder& rSource); }; @@ -583,7 +583,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxParentText; const SvxUnoTextBase& mrParentText; sal_Int32 mnParagraph; - std::vector* mpPortions; + std::vector* mpPortions; sal_uInt16 mnNextPortion; public: diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 002cefbb8a21..b72897d8ad31 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -178,9 +178,9 @@ public: struct PrivateAccess { friend class FormulaCompiler; private: PrivateAccess() { } }; inline void NewOpCode( OpCode e, const PrivateAccess& ) { eOp = e; } - static size_t GetStrLenBytes( xub_StrLen nLen ) + static sal_Int32 GetStrLenBytes( sal_Int32 nLen ) { return nLen * sizeof(sal_Unicode); } - static size_t GetStrLenBytes( const OUString& rStr ) + static sal_Int32 GetStrLenBytes( const OUString& rStr ) { return GetStrLenBytes( rStr.getLength() ); } }; diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx index 4067c82d503b..0c650ecfe72e 100644 --- a/include/svx/svdoutl.hxx +++ b/include/svx/svdoutl.hxx @@ -44,7 +44,7 @@ public: void setVisualizedPage(const SdrPage* pPage) { if(pPage != mpVisualizedPage) mpVisualizedPage = pPage; } const SdrPage* getVisualizedPage() const { return mpVisualizedPage; } - virtual OUString CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor); + virtual OUString CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor); }; #endif // INCLUDED_SVX_SVDOUTL_HXX diff --git a/include/tools/solar.h b/include/tools/solar.h index 914f0de915bc..f1ac0a784c30 100644 --- a/include/tools/solar.h +++ b/include/tools/solar.h @@ -115,8 +115,6 @@ inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((sal_uInt8*)&n)[7 #pragma warning(error : 4002 4003) #endif -#define xub_StrLen sal_uInt16 - #if defined WNT #define SVLIBRARY( Base ) Base "lo.dll" #elif defined MACOSX diff --git a/include/tools/string.hxx b/include/tools/string.hxx deleted file mode 100644 index 6572bbcf51cf..000000000000 --- a/include/tools/string.hxx +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _STRING_HXX -#define _STRING_HXX - -/******************************************************************************* - * THIS CODE IS DEPRECATED. DO NOT USE IT IN ANY NEW CODE. - ******************************************************************************/ - -#define STRING_MAXLEN ((xub_StrLen)0xFFFF) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit