diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-02-02 22:16:48 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-02-03 07:44:28 +0000 |
| commit | 3cbfcee36dd16e451d76c561eaaaee0ff29b01a5 (patch) | |
| tree | 7377a9e1d8cd56279104429abce73aec334569d5 /starmath/source/accessibility.hxx | |
| parent | 5c39b6b997ddc85e6848efc230a427a124b97264 (diff) | |
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 <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'starmath/source/accessibility.hxx')
| -rw-r--r-- | starmath/source/accessibility.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index d0e5ebbd759f..d9d30ae62fec 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -202,13 +202,13 @@ public: virtual ~SmTextForwarder(); 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<sal_uInt16>& rList ) const; + virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const; virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const; @@ -220,25 +220,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&, sal_Int32, sal_uInt16); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); + virtual void FieldClicked(const SvxFieldItem&, sal_Int32, sal_Int32); 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 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 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 nLine ) const; virtual sal_Bool Delete( const ESelection& ); virtual sal_Bool InsertText( const OUString&, const ESelection& ); virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False ); @@ -249,7 +249,7 @@ public: virtual const SfxItemSet* GetEmptyItemSetPtr(); // 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 ); virtual void CopyText(const SvxTextForwarder& rSource); }; |