diff options
Diffstat (limited to 'vcl')
31 files changed, 10 insertions, 124 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 395c0ea817d9..7ef4f8be8779 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -634,10 +634,6 @@ ServerFont::~ServerFont() ReleaseFromGarbageCollect(); } -int ServerFont::GetEmUnits() const -{ - return maFaceFT->units_per_EM; -} void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const { diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 07fa9973e58c..0f8531d52b7e 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -112,7 +112,7 @@ namespace unotools explicit VclCanvasBitmap( const BitmapEx& rBitmap ); /// Retrieve contained bitmap. Call me with locked Solar mutex! - BitmapEx getBitmapEx() const; + BitmapEx getBitmapEx() const { return m_aBmpEx;} }; } } diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index e718b044b5ac..d9347df0a15d 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -180,7 +180,7 @@ public: void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const; const unsigned char* GetTable( const char* pName, sal_uLong* pLength ); - int GetEmUnits() const; + int GetEmUnits() const { return maFaceFT->units_per_EM;} const FT_Size_Metrics& GetMetricsFT() const { return maSizeFT->metrics; } const ImplFontCharMap* GetImplFontCharMap() const; bool GetFontCapabilities(vcl::FontCapabilities &) const; diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 61c698daced0..d69e65b1f1b0 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -174,7 +174,7 @@ public: int CountCharsInRange( sal_uInt32 cMin, sal_uInt32 cMax ) const; int GetCharCount() const { return mnCharCount;} - sal_uInt32 GetFirstChar() const; + sal_uInt32 GetFirstChar() const { return mpRangeCodes[0];} sal_uInt32 GetLastChar() const; sal_uInt32 GetNextChar( sal_uInt32 ) const; diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 1202dbcdece2..2242b44ea574 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -159,7 +159,7 @@ private: friend SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ); // SvgData support - const SvgDataPtr& getSvgData() const; + const SvgDataPtr& getSvgData() const { return maSvgData;} }; #endif // INCLUDED_VCL_INC_IMPGRAPH_HXX diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 8d5b69ae96c3..11d03e3f8b03 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -40,10 +40,6 @@ VclAccessibleEvent::~VclAccessibleEvent() { } -Reference<XAccessible> VclAccessibleEvent::GetAccessible() const -{ - return mxAccessible; -} void VclEventListeners::Call( VclSimpleEvent* pEvent ) const { diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 7b07f52aecdb..465e15abe4e8 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2634,10 +2634,6 @@ bool RadioButton::SetModeRadioImage( const Image& rImage ) return true; } -const Image& RadioButton::GetModeRadioImage( ) const -{ - return maImage; -} void RadioButton::SetState( bool bCheck ) { diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 0668fc5212b1..2287164554f6 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2482,10 +2482,6 @@ void TimeFormatter::SetTimeFormat( TimeFormatter::TimeFormat eNewFormat ) mnTimeFormat = sal::static_int_cast<sal_uInt16>(eNewFormat); } -TimeFormatter::TimeFormat TimeFormatter::GetTimeFormat() const -{ - return (TimeFormat)mnTimeFormat; -} void TimeFormatter::SetFormat( TimeFieldFormat eNewFormat ) { diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 7df62f8c606f..404fb046fa48 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -1068,10 +1068,6 @@ bool FixedImage::SetModeImage( const Image& rImage ) return true; } -const Image& FixedImage::GetModeImage( ) const -{ - return maImage; -} Image FixedImage::loadThemeImage(const OString &rFileName) { diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx index 62083747c4bb..9762cdaa5992 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -131,10 +131,6 @@ void FixedHyperlink::SetURL( const OUString& rNewURL ) SetQuickHelpText( m_sURL ); } -OUString FixedHyperlink::GetURL() const -{ - return m_sURL; -} void FixedHyperlink::SetText(const OUString& rNewDescription) { diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 7a2e823f16b9..6c0ebd07ea5c 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -399,10 +399,6 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) } } -Sequence< PropertyValue > FilterConfigItem::GetFilterData() const -{ - return aFilterData; -} Reference< XStatusIndicator > FilterConfigItem::GetStatusIndicator() const { diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index e03fb34d0821..951258ebd2f3 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -2159,10 +2159,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString #endif } -const FilterErrorEx& GraphicFilter::GetLastError() const -{ - return *pErrorEx; -} void GraphicFilter::ResetLastError() { diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index a25bcc78aff5..f69222d2dfbc 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -596,10 +596,6 @@ void WinMtfOutput::SelectObject( sal_Int32 nIndex ) delete pGDIObj; } -const Font& WinMtfOutput::GetFont() const -{ - return maFont; -} void WinMtfOutput::SetTextLayoutMode( const sal_uInt32 nTextLayoutMode ) { diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index d925bc7c6c6a..4254a214de98 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -689,7 +689,7 @@ public: void SelectObject( sal_Int32 nIndex ); rtl_TextEncoding GetCharSet(){ return maFont.GetCharSet(); }; WinMtfFillStyle& GetFillStyle () { return maFillStyle; } - const Font& GetFont() const; + const Font& GetFont() const { return maFont;} void SetTextLayoutMode( const sal_uInt32 nLayoutMode ); void ClearPath(){ aPathObj.Init(); }; diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 019ea983d563..934022a2f398 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -145,10 +145,6 @@ const sal_uInt8* GfxLink::GetData() const return( mpBuf ? mpBuf->mpBuffer : NULL ); } -const Size& GfxLink::GetPrefSize() const -{ - return mpImpData->maPrefSize; -} void GfxLink::SetPrefSize( const Size& rPrefSize ) { @@ -156,15 +152,7 @@ void GfxLink::SetPrefSize( const Size& rPrefSize ) mpImpData->mbPrefSizeValid = true; } -bool GfxLink::IsPrefSizeValid() -{ - return mpImpData->mbPrefSizeValid; -} -const MapMode& GfxLink::GetPrefMapMode() const -{ - return mpImpData->maPrefMapMode; -} void GfxLink::SetPrefMapMode( const MapMode& rPrefMapMode ) { @@ -172,10 +160,6 @@ void GfxLink::SetPrefMapMode( const MapMode& rPrefMapMode ) mpImpData->mbPrefMapModeValid = true; } -bool GfxLink::IsPrefMapModeValid() -{ - return mpImpData->mbPrefMapModeValid; -} bool GfxLink::LoadNative( Graphic& rGraphic ) { diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 015476042e10..96fba1aa0985 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -217,10 +217,6 @@ void SvtGraphicFill::getPath( PolyPolygon& rPath ) const rPath = maPath; } -Color SvtGraphicFill::getFillColor() const -{ - return maFillColor; -} diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index 6bc9f717a1e3..d0d285be5694 100644 --- a/vcl/source/gdi/impfont.cxx +++ b/vcl/source/gdi/impfont.cxx @@ -203,10 +203,6 @@ int ImplFontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const return nCount; } -sal_UCS4 ImplFontCharMap::GetFirstChar() const -{ - return mpRangeCodes[0]; -} sal_UCS4 ImplFontCharMap::GetLastChar() const { diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index ac36ecf3211e..15b8ebeacebf 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1563,10 +1563,6 @@ bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const return bResult; } -const SvgDataPtr& ImpGraphic::getSvgData() const -{ - return maSvgData; -} SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) { diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index ca55525f0fe2..f4524ed6a979 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -517,10 +517,6 @@ PDFExtOutDevData::~PDFExtOutDevData() delete mpGlobalSyncData; } -const com::sun::star::lang::Locale& PDFExtOutDevData::GetDocumentLocale() const -{ - return maDocLocale; -} void PDFExtOutDevData::SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ) { maDocLocale = rLoc; @@ -569,10 +565,6 @@ void PDFExtOutDevData::SetIsExportHiddenSlides( const bool bExportHiddenSlides ) { mbExportHiddenSlides = bExportHiddenSlides; } -std::vector< PDFExtOutDevBookmarkEntry >& PDFExtOutDevData::GetBookmarks() -{ - return maBookmarks; -} void PDFExtOutDevData::SetIsExportNamedDestinations( const bool bExportNDests ) { mbExportNDests = bExportNDests; diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 4a4d745b324c..3ee986b70247 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -6958,10 +6958,6 @@ bool PDFWriterImpl::emit() return true; } -std::set< PDFWriter::ErrorCode > PDFWriterImpl::getErrors() -{ - return m_aErrors; -} sal_Int32 PDFWriterImpl::getSystemFont( const Font& i_rFont ) { diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 2766ef23a787..59f83da27fdf 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -1086,7 +1086,7 @@ public: /* document structure */ sal_Int32 newPage( sal_Int32 nPageWidth , sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation ); bool emit(); - std::set< PDFWriter::ErrorCode > getErrors(); + const std::set< PDFWriter::ErrorCode > & getErrors() const { return m_aErrors;} void insertError( PDFWriter::ErrorCode eErr ) { m_aErrors.insert( eErr ); } void playMetafile( const GDIMetaFile&, vcl::PDFExtOutDevData*, const vcl::PDFWriter::PlayMetafileContext&, VirtualDevice* pDummyDev = NULL ); diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 9f35f0283bda..a0e95d5f649d 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -52,7 +52,7 @@ public: bool Write( SvStream& rOStm ); - std::vector< vcl::PNGWriter::ChunkData >& GetChunks(); + std::vector< vcl::PNGWriter::ChunkData >& GetChunks() { return maChunkSeq;} private: @@ -269,10 +269,6 @@ bool PNGWriterImpl::Write( SvStream& rOStm ) return mbStatus; } -std::vector< vcl::PNGWriter::ChunkData >& PNGWriterImpl::GetChunks() -{ - return maChunkSeq; -} bool PNGWriterImpl::ImplWriteHeader() { diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 938a9769a738..53762040c4db 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -1439,9 +1439,5 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromPARGB( c return aRes; } -BitmapEx VclCanvasBitmap::getBitmapEx() const -{ - return m_aBmpEx; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 548790d63b4e..48eb267aa404 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -580,10 +580,6 @@ void OpenGLContext::setWinSize(const Size& rSize) m_aGLWin.Height = rSize.Height(); } -GLWindow& OpenGLContext::getOpenGLWindow() -{ - return m_aGLWin; -} void OpenGLContext::renderToFile() { diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 117429dd6364..beb9424809da 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -2061,10 +2061,6 @@ void OutputDevice::SetPixelOffset( const Size& rOffset ) mpAlphaVDev->SetPixelOffset( rOffset ); } -Size OutputDevice::GetPixelOffset() const -{ - return Size(mnOutOffOrigX, mnOutOffOrigY); -} long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) { diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 8abb6ff20db2..dec90ea09b08 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -1391,10 +1391,6 @@ void ImplDockingWindowWrapper::SetDragArea( const Rectangle& rRect ) maDragArea = rRect; } -Rectangle ImplDockingWindowWrapper::GetDragArea() const -{ - return maDragArea; -} void ImplDockingWindowWrapper::Lock() { diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx index c133d1d37d95..ed8cd828c757 100644 --- a/vcl/source/window/keyevent.cxx +++ b/vcl/source/window/keyevent.cxx @@ -63,10 +63,4 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const return aClone; } -const Point& HelpEvent::GetMousePosPixel() const -{ - //DBG_ASSERT( !mbKeyboardActivated, "Keyboard help has no mouse position !"); - return maPos; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 4f82d32ce11d..a36a37b37ba8 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -577,7 +577,7 @@ public: void SetImages( long nMaxHeight = 0, bool bForce = false ); void calcMinSize(); - Size getMinSize(); + const Size& getMinSize() { return maMinSize;} Image maImage; }; @@ -631,10 +631,6 @@ void DecoToolBox::calcMinSize() maMinSize = aTbx.CalcWindowSizePixel(); } -Size DecoToolBox::getMinSize() -{ - return maMinSize; -} void DecoToolBox::SetImages( long nMaxHeight, bool bForce ) { diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx index 28414aefc7c0..7f160668d16d 100644 --- a/vcl/source/window/openglwin.cxx +++ b/vcl/source/window/openglwin.cxx @@ -15,7 +15,7 @@ class OpenGLWindowImpl { public: OpenGLWindowImpl(Window* pWindow); - OpenGLContext* getContext(); + OpenGLContext* getContext() { return &maContext;} private: OpenGLContext maContext; boost::scoped_ptr<SystemChildWindow> mpChildWindow; @@ -29,10 +29,6 @@ OpenGLWindowImpl::OpenGLWindowImpl(Window* pWindow): pWindow->SetMouseTransparent(false); } -OpenGLContext* OpenGLWindowImpl::getContext() -{ - return &maContext; -} OpenGLWindow::OpenGLWindow(Window* pParent): Window(pParent, 0), diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index d505fc2440e2..657003174d3e 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -3455,10 +3455,6 @@ void SelectionManager::dragDoDispatch() * XDragSourceContext */ -sal_Int32 SelectionManager::getCurrentCursor() -{ - return m_aCurrentCursor; -} void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLIB_Time ) { diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 80d3aa915e90..7c0402a20ef1 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -459,7 +459,7 @@ namespace x11 { void dropComplete( bool success, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); // for XDragSourceContext - sal_Int32 getCurrentCursor(); + sal_Int32 getCurrentCursor() { return m_aCurrentCursor;} void setCursor( sal_Int32 cursor, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); void setImage( sal_Int32 image, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); void transferablesFlavorsChanged(); |