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

these can be const

Browse Source
This commit is contained in:
Caolán McNamara
2011-10-16 14:20:46 +01:00
parent e748b09663
commit bf939922f0
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editeng/inc/editeng/svxfont.hxx
View File

@@ -104,7 +104,7 @@ public:
Size GetPhysTxtSize( const OutputDevice *pOut, const String &rTxt ); Size GetPhysTxtSize( const OutputDevice *pOut, const String &rTxt );
Size GetTxtSize( const OutputDevice *pOut, const String &rTxt, Size GetTxtSize( const OutputDevice *pOut, const String &rTxt,
const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ); const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const;
void DrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt, void DrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt,
const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const; const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const;

2
editeng/source/items/svxfont.cxx
View File

@@ -463,7 +463,7 @@ Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const XubString &rTxt,
Size SvxFont::GetTxtSize( const OutputDevice *pOut, const XubString &rTxt, Size SvxFont::GetTxtSize( const OutputDevice *pOut, const XubString &rTxt,
const xub_StrLen nIdx, const xub_StrLen nLen ) const xub_StrLen nIdx, const xub_StrLen nLen ) const
{ {
xub_StrLen nTmp = nLen; xub_StrLen nTmp = nLen;
if ( nTmp == STRING_LEN ) // already initialized? if ( nTmp == STRING_LEN ) // already initialized?

14
svx/source/dialog/fntctrl.cxx
View File

@@ -115,7 +115,7 @@ namespace
_rFont.SetSize( aSize ); _rFont.SetSize( aSize );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void calcFontHeightAnyAscent(OutputDevice* _pWin,Font& _rFont,long& _nHeight,long& _nAscent) void calcFontHeightAnyAscent(OutputDevice* _pWin,const Font& _rFont,long& _nHeight,long& _nAscent)
{ {
if ( !_nHeight ) if ( !_nHeight )
{ {
@@ -202,8 +202,8 @@ public:
} }
void CheckScript(); void CheckScript();
Size CalcTextSize( OutputDevice* pWin, OutputDevice* pPrt, SvxFont &rFont ); Size CalcTextSize( OutputDevice* pWin, OutputDevice* pPrt, const SvxFont &rFont );
void DrawPrev( OutputDevice* pWin, Printer* pPrt, Point &rPt, SvxFont &rFont ); void DrawPrev( OutputDevice* pWin, Printer* pPrt, Point &rPt, const SvxFont &rFont );
sal_Bool SetFontWidthScale( sal_uInt16 nScaleInPercent ); sal_Bool SetFontWidthScale( sal_uInt16 nScaleInPercent );
inline void Invalidate100PercentFontWidth(); inline void Invalidate100PercentFontWidth();
@@ -315,7 +315,7 @@ void FontPrevWin_Impl::_CheckScript()
*/ */
Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter, Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter,
SvxFont &rFont ) const SvxFont &rFont )
{ {
sal_uInt16 nScript; sal_uInt16 nScript;
sal_uInt16 nIdx = 0; sal_uInt16 nIdx = 0;
@@ -341,7 +341,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
long nCTLAscent = 0; long nCTLAscent = 0;
do do
{ {
SvxFont& rFnt = (nScript==com::sun::star::i18n::ScriptType::ASIAN) ? aCJKFont : ((nScript==com::sun::star::i18n::ScriptType::COMPLEX) ? aCTLFont : rFont); const SvxFont& rFnt = (nScript==com::sun::star::i18n::ScriptType::ASIAN) ? aCJKFont : ((nScript==com::sun::star::i18n::ScriptType::COMPLEX) ? aCTLFont : rFont);
sal_uIntPtr nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ). sal_uIntPtr nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ).
Width(); Width();
aTextWidth[ nIdx++ ] = nWidth; aTextWidth[ nIdx++ ] = nWidth;
@@ -393,7 +393,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
*/ */
void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter, void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
Point &rPt, SvxFont &rFont ) Point &rPt, const SvxFont &rFont )
{ {
Font aOldFont = _pPrinter->GetFont(); Font aOldFont = _pPrinter->GetFont();
sal_uInt16 nScript; sal_uInt16 nScript;
@@ -413,7 +413,7 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
} }
do do
{ {
SvxFont& rFnt = (nScript==com::sun::star::i18n::ScriptType::ASIAN) ? aCJKFont : ((nScript==com::sun::star::i18n::ScriptType::COMPLEX) ? aCTLFont : rFont); const SvxFont& rFnt = (nScript==com::sun::star::i18n::ScriptType::ASIAN) ? aCJKFont : ((nScript==com::sun::star::i18n::ScriptType::COMPLEX) ? aCTLFont : rFont);
_pPrinter->SetFont( rFnt ); _pPrinter->SetFont( rFnt );
rFnt.DrawPrev( pWin, _pPrinter, rPt, aText, nStart, nEnd - nStart ); rFnt.DrawPrev( pWin, _pPrinter, rPt, aText, nStart, nEnd - nStart );