summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-09 10:09:42 +0200
committerNoel Grandin <noel@peralex.com>2014-06-09 10:10:13 +0200
commit184a00b96235f6432294ded63ce4a4a318effdb5 (patch)
treee4ae0e00cb168fa43d280cfb51a50515258b5320 /vcl
parent534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff)
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx4
-rw-r--r--vcl/generic/print/common_gfx.cxx5
-rw-r--r--vcl/generic/print/glyphset.cxx15
-rw-r--r--vcl/generic/print/glyphset.hxx6
-rw-r--r--vcl/inc/generic/glyphcache.hxx2
-rw-r--r--vcl/inc/generic/printergfx.hxx2
-rw-r--r--vcl/inc/impfont.hxx2
-rw-r--r--vcl/inc/impgraph.hxx8
-rw-r--r--vcl/source/control/field.cxx4
-rw-r--r--vcl/source/control/longcurr.cxx4
-rw-r--r--vcl/source/edit/texteng.cxx4
-rw-r--r--vcl/source/filter/GraphicNativeMetadata.cxx4
-rw-r--r--vcl/source/filter/jpeg/Exif.cxx7
-rw-r--r--vcl/source/filter/jpeg/Exif.hxx4
-rw-r--r--vcl/source/gdi/bitmap.cxx4
-rw-r--r--vcl/source/gdi/gfxlink.cxx8
-rw-r--r--vcl/source/gdi/graphictools.cxx44
-rw-r--r--vcl/source/gdi/impfont.cxx4
-rw-r--r--vcl/source/gdi/impgraph.cxx16
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx44
-rw-r--r--vcl/source/gdi/region.cxx4
-rw-r--r--vcl/source/window/dialog.cxx8
-rw-r--r--vcl/source/window/dockmgr.cxx8
-rw-r--r--vcl/source/window/menu.cxx4
24 files changed, 12 insertions, 203 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 47adb0929535..395c0ea817d9 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -620,10 +620,6 @@ const OString* ServerFont::GetFontFileName() const
return mpFontInfo->GetFontFileName();
}
-bool ServerFont::TestFont() const
-{
- return mbFaceOk;
-}
ServerFont::~ServerFont()
{
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index aa6e7c1c513e..fbf7ba6f000d 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -87,11 +87,6 @@ PrinterGfx::Init (const JobData& rData)
return true;
}
-sal_uInt16
-PrinterGfx::GetBitCount ()
-{
- return mnDepth;
-}
PrinterGfx::PrinterGfx()
: mfScaleX(0.0)
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 9a87b7e26c62..016c8f70fa28 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -59,23 +59,8 @@ GlyphSet::~GlyphSet ()
/* FIXME delete the glyphlist ??? */
}
-sal_Int32
-GlyphSet::GetFontID ()
-{
- return mnFontID;
-}
-fonttype::type
-GlyphSet::GetFontType ()
-{
- return meBaseType;
-}
-bool
-GlyphSet::IsVertical ()
-{
- return mbVertical;
-}
bool
GlyphSet::GetCharID (
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index d8cd49d22be3..e6f8fa73c811 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -94,15 +94,15 @@ public:
GlyphSet (sal_Int32 nFontID, bool bVertical);
~GlyphSet ();
- sal_Int32 GetFontID ();
- fonttype::type GetFontType ();
+ sal_Int32 GetFontID () { return mnFontID;}
+ fonttype::type GetFontType () { return meBaseType;}
static OString
GetReencodedFontName (rtl_TextEncoding nEnc,
const OString &rFontName);
static OString
GetGlyphSetEncodingName (rtl_TextEncoding nEnc,
const OString &rFontName);
- bool IsVertical ();
+ bool IsVertical () { return mbVertical;}
void DrawText (PrinterGfx &rGfx, const Point& rPoint,
const sal_Unicode* pStr, sal_Int16 nLen,
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index c0eb98d387c4..e718b044b5ac 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -168,7 +168,7 @@ public:
virtual ~ServerFont();
const OString* GetFontFileName() const;
- bool TestFont() const;
+ bool TestFont() const { return mbFaceOk;}
FT_Face GetFtFace() const;
int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); }
void SetFontOptions( boost::shared_ptr<ImplFontOptions> );
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index 1fb877740bd6..c797ea4a5812 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -325,7 +325,7 @@ public:
void Clear();
// query depth
- sal_uInt16 GetBitCount ();
+ sal_uInt16 GetBitCount () { return mnDepth;}
// clip region
void ResetClipRegion ();
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index df6ea1b0c03d..61c698daced0 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -172,7 +172,7 @@ public:
bool IsDefaultMap() const;
bool HasChar( sal_uInt32 ) const;
int CountCharsInRange( sal_uInt32 cMin, sal_uInt32 cMax ) const;
- int GetCharCount() const;
+ int GetCharCount() const { return mnCharCount;}
sal_uInt32 GetFirstChar() const;
sal_uInt32 GetLastChar() const;
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 20e305dc5690..1202dbcdece2 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -84,7 +84,7 @@ private:
void ImplClearGraphics( bool bCreateSwapInfo );
void ImplClear();
- GraphicType ImplGetType() const;
+ GraphicType ImplGetType() const { return meType;}
void ImplSetDefaultType();
bool ImplIsSupportedGraphic() const;
@@ -127,14 +127,14 @@ private:
private:
- GraphicReader* ImplGetContext();
+ GraphicReader* ImplGetContext() { return mpContext;}
void ImplSetContext( GraphicReader* pReader );
private:
void ImplSetDocFileName( const OUString& rName, sal_uLong nFilePos );
const OUString& ImplGetDocFileName() const;
- sal_uLong ImplGetDocFilePos() const;
+ sal_uLong ImplGetDocFilePos() const { return mnDocFilePos;}
bool ImplReadEmbedded( SvStream& rIStream, bool bSwap = false );
bool ImplWriteEmbedded( SvStream& rOStream );
@@ -145,7 +145,7 @@ private:
bool ImplSwapOut();
bool ImplSwapOut( SvStream* pOStm );
- bool ImplIsSwapOut() const;
+ bool ImplIsSwapOut() const { return mbSwapOut;}
void ImplSetLink( const GfxLink& );
GfxLink ImplGetLink();
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index bd60588d78e4..81bd025fc97f 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -539,10 +539,6 @@ void NumericFormatter::SetShowTrailingZeros( bool bShowTrailingZeros )
}
}
-sal_uInt16 NumericFormatter::GetDecimalDigits() const
-{
- return mnDecimalDigits;
-}
void NumericFormatter::SetValue( sal_Int64 nNewValue )
{
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index ed5558dd045f..36afacd82698 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -432,10 +432,6 @@ void LongCurrencyFormatter::SetDecimalDigits( sal_uInt16 nDigits )
ReformatAll();
}
-sal_uInt16 LongCurrencyFormatter::GetDecimalDigits() const
-{
- return mnDecimalDigits;
-}
void ImplNewLongCurrencyFieldValue( LongCurrencyField* pField, BigInt nNewValue )
{
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index b114adeb62be..660df5adeee0 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -155,10 +155,6 @@ TextView* TextEngine::GetView( sal_uInt16 nView ) const
return (*mpViews)[ nView ];
}
-TextView* TextEngine::GetActiveView() const
-{
- return mpActiveView;
-}
void TextEngine::SetActiveView( TextView* pTextView )
{
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx b/vcl/source/filter/GraphicNativeMetadata.cxx
index 08b698a727e0..beb6787255f4 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -31,10 +31,6 @@ GraphicNativeMetadata::GraphicNativeMetadata() :
GraphicNativeMetadata::~GraphicNativeMetadata()
{}
-sal_uInt16 GraphicNativeMetadata::getRotation()
-{
- return mRotation;
-}
bool GraphicNativeMetadata::read(Graphic& rGraphic)
{
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index e7a32878b86e..01f059247a17 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -28,9 +28,6 @@ Exif::Exif() :
Exif::~Exif()
{}
-Orientation Exif::getOrientation() {
- return maOrientation;
-}
void Exif::setOrientation(Orientation aOrientation) {
maOrientation = aOrientation;
@@ -68,10 +65,6 @@ sal_Int32 Exif::getRotation()
return 0;
}
-bool Exif::hasExif()
-{
- return mbExifPresent;
-}
bool Exif::read(SvStream& rStream)
{
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index c365ec8071bf..5d8bbaa768fe 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -75,9 +75,9 @@ public :
Exif();
virtual ~Exif();
- bool hasExif();
+ bool hasExif() { return mbExifPresent;}
- Orientation getOrientation();
+ Orientation getOrientation() { return maOrientation;}
sal_Int32 getRotation();
void setOrientation(Orientation orientation);
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 52af3eb5d480..28cefe824ebd 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -387,10 +387,6 @@ void Bitmap::ImplAssignWithSize( const Bitmap& rBitmap )
maPrefMapMode = aOldMapMode;
}
-ImpBitmap* Bitmap::ImplGetImpBitmap() const
-{
- return mpImpBmp;
-}
void Bitmap::ImplSetImpBitmap( ImpBitmap* pImpBmp )
{
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 2a6f8c88f2c4..019ea983d563 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -130,20 +130,12 @@ void GfxLink::ImplCopy( const GfxLink& rGfxLink )
mpSwap->mnRefCount++;
}
-GfxLinkType GfxLink::GetType() const
-{
- return meType;
-}
bool GfxLink::IsNative() const
{
return( meType >= GFX_LINK_FIRST_NATIVE_ID && meType <= GFX_LINK_LAST_NATIVE_ID );
}
-sal_uInt32 GfxLink::GetDataSize() const
-{
- return mnBufSize;
-}
const sal_uInt8* GfxLink::GetData() const
{
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index fe2b76006988..015476042e10 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.cxx
@@ -76,30 +76,10 @@ void SvtGraphicStroke::getEndArrow( PolyPolygon& rPath ) const
rPath = maEndArrow;
}
-double SvtGraphicStroke::getTransparency() const
-{
- return mfTransparency;
-}
-double SvtGraphicStroke::getStrokeWidth() const
-{
- return mfStrokeWidth;
-}
-SvtGraphicStroke::CapType SvtGraphicStroke::getCapType() const
-{
- return maCapType;
-}
-SvtGraphicStroke::JoinType SvtGraphicStroke::getJoinType() const
-{
- return maJoinType;
-}
-double SvtGraphicStroke::getMiterLimit() const
-{
- return mfMiterLimit;
-}
void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const
{
@@ -242,40 +222,16 @@ Color SvtGraphicFill::getFillColor() const
return maFillColor;
}
-double SvtGraphicFill::getTransparency() const
-{
- return mfTransparency;
-}
-SvtGraphicFill::FillRule SvtGraphicFill::getFillRule() const
-{
- return maFillRule;
-}
-SvtGraphicFill::FillType SvtGraphicFill::getFillType() const
-{
- return maFillType;
-}
void SvtGraphicFill::getTransform( Transform& rTrans ) const
{
rTrans = maFillTransform;
}
-bool SvtGraphicFill::IsTiling() const
-{
- return mbTiling;
-}
-bool SvtGraphicFill::isTiling() const
-{
- return mbTiling;
-}
-SvtGraphicFill::GradientType SvtGraphicFill::getGradientType() const
-{
- return maGradientType;
-}
void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const
{
diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index 25beddcb11c7..6bc9f717a1e3 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -102,10 +102,6 @@ void ImplFontCharMap::DeReference( void) const
delete this;
}
-int ImplFontCharMap::GetCharCount() const
-{
- return mnCharCount;
-}
int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const
{
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index ff8c044c9650..ac36ecf3211e 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -402,10 +402,6 @@ void ImpGraphic::ImplClear()
mnSizeBytes = 0;
}
-GraphicType ImpGraphic::ImplGetType() const
-{
- return meType;
-}
void ImpGraphic::ImplSetDefaultType()
{
@@ -951,10 +947,6 @@ sal_uLong ImpGraphic::ImplGetAnimationLoopCount() const
return( mpAnimation ? mpAnimation->GetLoopCount() : 0UL );
}
-GraphicReader* ImpGraphic::ImplGetContext()
-{
- return mpContext;
-}
void ImpGraphic::ImplSetContext( GraphicReader* pReader )
{
@@ -976,10 +968,6 @@ const OUString& ImpGraphic::ImplGetDocFileName() const
return maDocFileURLStr;
}
-sal_uLong ImpGraphic::ImplGetDocFilePos() const
-{
- return mnDocFilePos;
-}
bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, bool bSwap )
{
@@ -1493,10 +1481,6 @@ bool ImpGraphic::ImplSwapIn( SvStream* pIStm )
return bRet;
}
-bool ImpGraphic::ImplIsSwapOut() const
-{
- return mbSwapOut;
-}
void ImpGraphic::ImplSetLink( const GfxLink& rGfxLink )
{
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index da710651bc49..ca55525f0fe2 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -525,66 +525,34 @@ void PDFExtOutDevData::SetDocumentLocale( const com::sun::star::lang::Locale& rL
{
maDocLocale = rLoc;
}
-sal_Int32 PDFExtOutDevData::GetCurrentPageNumber() const
-{
- return mnPage;
-}
void PDFExtOutDevData::SetCurrentPageNumber( const sal_Int32 nPage )
{
mnPage = nPage;
}
-bool PDFExtOutDevData::GetIsLosslessCompression() const
-{
- return mbUseLosslessCompression;
-}
void PDFExtOutDevData::SetIsLosslessCompression( const bool bUseLosslessCompression )
{
mbUseLosslessCompression = bUseLosslessCompression;
}
-bool PDFExtOutDevData::GetIsReduceImageResolution() const
-{
- return mbReduceImageResolution;
-}
void PDFExtOutDevData::SetIsReduceImageResolution( const bool bReduceImageResolution )
{
mbReduceImageResolution = bReduceImageResolution;
}
-bool PDFExtOutDevData::GetIsExportNotes() const
-{
- return mbExportNotes;
-}
void PDFExtOutDevData::SetIsExportNotes( const bool bExportNotes )
{
mbExportNotes = bExportNotes;
}
-bool PDFExtOutDevData::GetIsExportNotesPages() const
-{
- return mbExportNotesPages;
-}
void PDFExtOutDevData::SetIsExportNotesPages( const bool bExportNotesPages )
{
mbExportNotesPages = bExportNotesPages;
}
-bool PDFExtOutDevData::GetIsExportTaggedPDF() const
-{
- return mbTaggedPDF;
-}
void PDFExtOutDevData::SetIsExportTaggedPDF( const bool bTaggedPDF )
{
mbTaggedPDF = bTaggedPDF;
}
-bool PDFExtOutDevData::GetIsExportTransitionEffects() const
-{
- return mbTransitionEffects;
-}
void PDFExtOutDevData::SetIsExportTransitionEffects( const bool bTransitionEffects )
{
mbTransitionEffects = bTransitionEffects;
}
-bool PDFExtOutDevData::GetIsExportFormFields() const
-{
- return mbExportFormFields;
-}
void PDFExtOutDevData::SetIsExportFormFields( const bool bExportFomtFields )
{
mbExportFormFields = bExportFomtFields;
@@ -593,18 +561,10 @@ void PDFExtOutDevData::SetFormsFormat( const sal_Int32 nFormsFormat )
{
mnFormsFormat = nFormsFormat;
}
-bool PDFExtOutDevData::GetIsExportBookmarks() const
-{
- return mbExportBookmarks;
-}
void PDFExtOutDevData::SetIsExportBookmarks( const bool bExportBookmarks )
{
mbExportBookmarks = bExportBookmarks;
}
-bool PDFExtOutDevData::GetIsExportHiddenSlides() const
-{
- return mbExportHiddenSlides;
-}
void PDFExtOutDevData::SetIsExportHiddenSlides( const bool bExportHiddenSlides )
{
mbExportHiddenSlides = bExportHiddenSlides;
@@ -613,10 +573,6 @@ std::vector< PDFExtOutDevBookmarkEntry >& PDFExtOutDevData::GetBookmarks()
{
return maBookmarks;
}
-bool PDFExtOutDevData::GetIsExportNamedDestinations() const
-{
- return mbExportNDests;
-}
void PDFExtOutDevData::SetIsExportNamedDestinations( const bool bExportNDests )
{
mbExportNDests = bExportNDests;
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 9adf158a138e..49ba57e0dad6 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -226,10 +226,6 @@ bool Region::IsEmpty() const
return !mbIsNull && !mpB2DPolyPolygon.get() && !mpPolyPolygon.get() && !mpRegionBand.get();
}
-bool Region::IsNull() const
-{
- return mbIsNull;
-}
RegionBand* ImplCreateRegionBandFromPolyPolygon(const PolyPolygon& rPolyPolygon)
{
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 756a09b7343c..12aa2323d5d9 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -531,20 +531,12 @@ WinBits Dialog::init(Window *pParent, const ResId& rResId)
return nStyle;
}
-VclButtonBox* Dialog::get_action_area()
-{
- return mpActionArea;
-}
void Dialog::set_action_area(VclButtonBox* pActionArea)
{
mpActionArea = pActionArea;
}
-VclBox* Dialog::get_content_area()
-{
- return mpContentArea;
-}
void Dialog::set_content_area(VclBox* pContentArea)
{
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 93014d3886ca..8abb6ff20db2 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -1338,10 +1338,6 @@ void ImplDockingWindowWrapper::SetFloatStyle( WinBits nStyle )
mnFloatBits = nStyle;
}
-WinBits ImplDockingWindowWrapper::GetFloatStyle() const
-{
- return mnFloatBits;
-}
void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY,
long nWidth, long nHeight,
@@ -1418,9 +1414,5 @@ void ImplDockingWindowWrapper::Unlock()
pToolBox->Lock( mbLocked );
}
-bool ImplDockingWindowWrapper::IsLocked() const
-{
- return mbLocked;
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 73e566803b5e..1996b4659d96 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1570,10 +1570,6 @@ void Menu::SetHighlightItem( sal_uInt16 nItem )
nHighlightedItem = nItem;
}
-sal_uInt16 Menu::GetCurItemId() const
-{
- return nSelectedId;
-}
OString Menu::GetCurItemIdent() const
{