mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused return value from method

Browse Source 
Change-Id: If8ad6d01e92bb6df429acca03df0b40a4e2b7f1d
This commit is contained in:
Noel Grandin
2014-02-19 14:30:47 +02:00
parent 87612bfee4
commit d9fd1d5310
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editeng/source/accessibility/AccessibleStringWrap.cxx
View File

@@ -38,7 +38,7 @@ AccessibleStringWrap::AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont,
{ {
} }
sal_Bool AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ) void AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect )
{ {
DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX, DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX,
"SvxAccessibleStringWrap::GetCharacterBounds: index value overflow"); "SvxAccessibleStringWrap::GetCharacterBounds: index value overflow");
@@ -70,8 +70,6 @@ sal_Bool AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle&
rRect = Rectangle( Point(-rRect.Top(), rRect.Left()), rRect = Rectangle( Point(-rRect.Top(), rRect.Left()),
Point(-rRect.Bottom(), rRect.Right())); Point(-rRect.Bottom(), rRect.Right()));
} }
return sal_True;
} }
sal_Int32 AccessibleStringWrap::GetIndexAtPoint( const Point& rPoint ) sal_Int32 AccessibleStringWrap::GetIndexAtPoint( const Point& rPoint )

10
editeng/source/uno/unoedprx.cxx
View File

@@ -749,8 +749,8 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nI
{ {
AccessibleStringWrap aStringWrap( *pOutDev, aBulletInfo.aFont, aBulletInfo.aText ); AccessibleStringWrap aStringWrap( *pOutDev, aBulletInfo.aFont, aBulletInfo.aText );
if( aStringWrap.GetCharacterBounds( aIndex.GetBulletOffset(), aRect ) ) aStringWrap.GetCharacterBounds( aIndex.GetBulletOffset(), aRect );
aRect.Move( aBulletInfo.aBounds.Left(), aBulletInfo.aBounds.Top() ); aRect.Move( aBulletInfo.aBounds.Left(), aBulletInfo.aBounds.Top() );
} }
} }
else else
@@ -773,10 +773,8 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_Int32 nPara, sal_Int32 nI
Rectangle aStartRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() ); Rectangle aStartRect = mpTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
if( !aStringWrap.GetCharacterBounds( aIndex.GetFieldOffset(), aRect ) ) aStringWrap.GetCharacterBounds( aIndex.GetFieldOffset(), aRect );
aRect = aStartRect; aRect.Move( aStartRect.Left(), aStartRect.Top() );
else
aRect.Move( aStartRect.Left(), aStartRect.Top() );
} }
} }
} }

2
include/editeng/AccessibleStringWrap.hxx
View File

@@ -41,7 +41,7 @@ public:
EDITENG_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText ); EDITENG_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText );
EDITENG_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ); EDITENG_DLLPUBLIC void GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
EDITENG_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint ); EDITENG_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint );
private: private: