diff options
665 files changed, 664 insertions, 2954 deletions
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 19eaa52e97e4..303508597304 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -515,17 +515,17 @@ protected: /**_______________________________________________________________________________________________________ */ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > impl_getComponentContext(); + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > impl_getComponentContext() { return m_xComponentContext;} /**_______________________________________________________________________________________________________ */ - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > impl_getPeerWindow(); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > impl_getPeerWindow() { return m_xPeerWindow;} /**_______________________________________________________________________________________________________ */ - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > impl_getGraphicsPeer(); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > impl_getGraphicsPeer() { return m_xGraphicsPeer;} /**_______________________________________________________________________________________________________ */ @@ -559,7 +559,7 @@ protected: /**_______________________________________________________________________________________________________ */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getDelegator(); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getDelegator() { return m_xDelegator;} // private methods diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index 79414840a160..90e53ef67880 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -133,7 +133,7 @@ public: /**_______________________________________________________________________________________________________ */ - operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() const; + operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() const { return ((OWeakObject*)this);} /**_______________________________________________________________________________________________________ */ diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index 2503b1f41a9d..0a6cb89f05f4 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -716,27 +716,6 @@ const OUString BaseControl::impl_getStaticImplementationName() // protected method -const Reference< XComponentContext > BaseControl::impl_getComponentContext() -{ - return m_xComponentContext; -} - -// protected method - -const Reference< XWindow > BaseControl::impl_getPeerWindow() -{ - return m_xPeerWindow; -} - -// protected method - -const Reference< XGraphics > BaseControl::impl_getGraphicsPeer() -{ - return m_xGraphicsPeer; -} - -// protected method - WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer ) { // - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!! @@ -776,10 +755,6 @@ void BaseControl::impl_recalcLayout( const WindowEvent& /*aEvent*/ ) // protected method -Reference< XInterface > BaseControl::impl_getDelegator() -{ - return m_xDelegator; -} // private method diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx index 86e551ad3673..902428017f3b 100644 --- a/UnoControls/source/base/multiplexer.cxx +++ b/UnoControls/source/base/multiplexer.cxx @@ -144,13 +144,6 @@ void SAL_CALL OMRCListenerMultiplexerHelper::release() throw() OWeakObject::release(); } -// operator - -OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const -{ - return ((OWeakObject*)this); -} - // container method void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer ) diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx index d18ed4bc7452..a952c9543cd4 100644 --- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx @@ -135,16 +135,6 @@ void SAL_CALL OConnectionPointContainerHelper::unadvise( const Type& m_aMultiTypeContainer.removeInterface( aType, xListener ); } -// public but impl method! -// Is necessary to get container member at OConnectionPoint-instance. - -OMultiTypeInterfaceContainerHelper& OConnectionPointContainerHelper::impl_getMultiTypeContainer() -{ - // Impl methods are not threadsafe! - // "Parent" function must do this. - return m_aMultiTypeContainer; -} - } // namespace unocontrols /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx index 3abb4f846e97..ec2154c3c8c3 100644 --- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx @@ -178,20 +178,12 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - /**_________________________________________________________________________________________________________ - @short - @descr - - @seealso - - @param - - @return - - @onerror - */ + // public but impl method! + // Is necessary to get container member at OConnectionPoint-instance. + // Impl methods are not threadsafe! + // "Parent" function must do this. + ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer() { return m_aMultiTypeContainer; } - ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer(); // private variables diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx index 10dc5da40ee5..892858b52bb8 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx @@ -188,9 +188,9 @@ public: throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /**@return m_pCellVector*/ - std::vector< AccessibleGridControlTableCell* >& getCellVector(); + std::vector< AccessibleGridControlTableCell* >& getCellVector() { return m_pCellVector;} /**@return m_xAccessCellVector*/ - std::vector< com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible > >& getAccessibleCellVector(); + std::vector< com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible > >& getAccessibleCellVector() { return m_pAccessCellVector;} protected: // internal virtual methods ----------------------------------------------- diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index be67180a179d..2b1cd8e4f673 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -389,15 +389,7 @@ Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar( return Reference< XAccessibleTable >( xRet, uno::UNO_QUERY ); } -std::vector< AccessibleGridControlTableCell* >& AccessibleGridControlTable::getCellVector() -{ - return m_pCellVector; -} -std::vector< Reference< XAccessible > >& AccessibleGridControlTable::getAccessibleCellVector() -{ - return m_pAccessCellVector; -} } // namespace accessibility diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 35ca5d52ac6b..552064e1e4c1 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -525,7 +525,7 @@ public: void InsertEntry( const OUString& aStr ); void ClearListBox(); void SetTextSelection( const TextSelection& aSel ); - const TextSelection& GetTextSelection() const; + const TextSelection& GetTextSelection() const { return aTextSelection;} void ResizeAndPositionListBox(); void SelectFirstEntry(); //selects first entry in ListBox void ClearAndHide(); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 645da409edec..78f65e67968d 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2819,10 +2819,6 @@ void CodeCompleteWindow::SetTextSelection( const TextSelection& aSel ) aTextSelection = aSel; } -const TextSelection& CodeCompleteWindow::GetTextSelection() const -{ - return aTextSelection; -} void CodeCompleteWindow::ResizeAndPositionListBox() { diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 5764f7ad902c..d7064e9d2485 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -99,10 +99,6 @@ void LineNumberWindow::DoScroll(long nHorzScroll, long nVertScroll) Window::Scroll(nHorzScroll, nVertScroll); } -long& LineNumberWindow::GetCurYOffset() -{ - return m_nCurYOffset; -} bool LineNumberWindow::SyncYOffset() { diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx index aae3409e5ed1..e01c078a378f 100644 --- a/basctl/source/basicide/linenumberwindow.hxx +++ b/basctl/source/basicide/linenumberwindow.hxx @@ -36,7 +36,7 @@ public: void DoScroll( long nHorzScroll, long nVertScroll ); bool SyncYOffset(); - long& GetCurYOffset(); + long& GetCurYOffset() { return m_nCurYOffset;} int GetWidth() { return m_nWidth;} }; diff --git a/basegfx/source/vector/b2dvector.cxx b/basegfx/source/vector/b2dvector.cxx index e5ac9bf35657..9ee6c91f39bf 100644 --- a/basegfx/source/vector/b2dvector.cxx +++ b/basegfx/source/vector/b2dvector.cxx @@ -73,15 +73,7 @@ namespace basegfx return hypot( mfX, mfY ); } - double B2DVector::scalar( const B2DVector& rVec ) const - { - return((mfX * rVec.mfX) + (mfY * rVec.mfY)); - } - double B2DVector::cross( const B2DVector& rVec ) const - { - return(mfX * rVec.getY() - mfY * rVec.getX()); - } double B2DVector::angle( const B2DVector& rVec ) const { diff --git a/basegfx/source/vector/b2ivector.cxx b/basegfx/source/vector/b2ivector.cxx index b2cfb7bffb5e..d7cc9a4f37a0 100644 --- a/basegfx/source/vector/b2ivector.cxx +++ b/basegfx/source/vector/b2ivector.cxx @@ -30,10 +30,6 @@ namespace basegfx return *this; } - double B2IVector::scalar( const B2IVector& rVec ) const - { - return((mnX * rVec.mnX) + (mnY * rVec.mnY)); - } B2IVector& B2IVector::operator*=( const B2DHomMatrix& rMat ) { diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index df5c3610b3c5..ccc1490028cf 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1590,10 +1590,6 @@ bool BasicManager::IsBasicModified() const return false; } -std::vector<BasicError>& BasicManager::GetErrors() -{ - return aErrors; -} bool BasicManager::GetGlobalUNOConstant( const sal_Char* _pAsciiName, uno::Any& aOut ) { diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index dbcec4c25980..9254982137d4 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -204,10 +204,6 @@ sal_Int32 PropertySetInfoImpl::GetIndex_Impl( const OUString &rPropName ) const return pP ? sal::static_int_cast<sal_Int32>( pP - _aProps.getConstArray() ) : -1; } -Sequence< Property > PropertySetInfoImpl::getProperties(void) throw() -{ - return _aProps; -} Property PropertySetInfoImpl::getPropertyByName(const OUString& Name) throw( RuntimeException ) { diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index e18156db6828..7102950e068f 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -731,10 +731,6 @@ SbxVariable* SbModule::Find( const OUString& rName, SbxClassType t ) return pRes; } -const OUString& SbModule::GetSource32() const -{ - return aOUSource; -} const OUString& SbModule::GetSource() const { @@ -1800,10 +1796,6 @@ void SbModule::GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache) } } -SbxArrayRef SbModule::GetMethods() -{ - return pMethods; -} OUString SbModule::GetKeywordCase( const OUString& sKeyword ) const { diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 84f3f8cfcb24..db0bc7454af3 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -104,7 +104,7 @@ public: PropertySetInfoImpl( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProps ); // XPropertySetInfo - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) throw (); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) throw () { return _aProps;} ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); bool SAL_CALL hasPropertyByName(const OUString& Name) diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 4d65e4170698..0dd95d33f2bf 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -763,10 +763,6 @@ SbxDataType SbxValue::GetType() const return SbxDataType( aData.eType & 0x0FFF ); } -SbxDataType SbxValue::GetFullType() const -{ - return aData.eType; -} bool SbxValue::SetType( SbxDataType t ) { diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx index a56663afad2d..d1b345a355b4 100644 --- a/binaryurp/source/binaryany.cxx +++ b/binaryurp/source/binaryany.cxx @@ -63,10 +63,6 @@ BinaryAny & BinaryAny::operator =(BinaryAny const & other) throw () { return *this; } -uno_Any * BinaryAny::get() throw () { - return &data_; -} - css::uno::TypeDescription BinaryAny::getType() const throw () { return css::uno::TypeDescription(data_.pType); } diff --git a/binaryurp/source/binaryany.hxx b/binaryurp/source/binaryany.hxx index da359ec6dde0..38197f12b7bf 100644 --- a/binaryurp/source/binaryany.hxx +++ b/binaryurp/source/binaryany.hxx @@ -47,7 +47,7 @@ public: BinaryAny & operator =(BinaryAny const & other) throw (); - uno_Any * get() throw (); + uno_Any * get() throw () { return &data_; } com::sun::star::uno::TypeDescription getType() const throw (); diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index c93df640b555..dc0f3476bb9a 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -105,7 +105,7 @@ public: ~AttachThread(); - rtl::ByteSequence getTid() throw (); + rtl::ByteSequence getTid() throw () { return tid_;} private: uno_ThreadPool threadPool_; @@ -124,9 +124,6 @@ AttachThread::~AttachThread() { uno_releaseIdFromCurrentThread(); } -rtl::ByteSequence AttachThread::getTid() throw () { - return tid_; -} class PopOutgoingRequest: private boost::noncopyable { public: @@ -347,21 +344,8 @@ void Bridge::terminate(bool final) { terminated_.set(); } -css::uno::Reference< css::connection::XConnection > Bridge::getConnection() - const -{ - return connection_; -} -css::uno::Reference< css::bridge::XInstanceProvider > Bridge::getProvider() - const -{ - return provider_; -} -css::uno::Mapping & Bridge::getCppToBinaryMapping() { - return cppToBinaryMapping_; -} BinaryAny Bridge::mapCppToBinaryAny(css::uno::Any const & cppAny) { css::uno::Any in(cppAny); diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx index f22eb5aad5f5..e4d9c5554262 100644 --- a/binaryurp/source/bridge.hxx +++ b/binaryurp/source/bridge.hxx @@ -91,12 +91,12 @@ public: void terminate(bool final); com::sun::star::uno::Reference< com::sun::star::connection::XConnection > - getConnection() const; + getConnection() const { return connection_;} com::sun::star::uno::Reference< com::sun::star::bridge::XInstanceProvider > - getProvider() const; + getProvider() const { return provider_;} - com::sun::star::uno::Mapping & getCppToBinaryMapping(); + com::sun::star::uno::Mapping & getCppToBinaryMapping() { return cppToBinaryMapping_;} BinaryAny mapCppToBinaryAny(com::sun::star::uno::Any const & cppAny); diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx index a28dbc5ef560..571ab92a3d65 100644 --- a/binaryurp/source/proxy.cxx +++ b/binaryurp/source/proxy.cxx @@ -73,13 +73,7 @@ Proxy::Proxy( pDispatcher = &proxy_dispatchInterface; } -OUString Proxy::getOid() const { - return oid_; -} -css::uno::TypeDescription Proxy::getType() const { - return type_; -} void Proxy::do_acquire() { if (osl_atomic_increment(&references_) == 1) { diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx index b3bd4b56b362..b7491cbd691e 100644 --- a/binaryurp/source/proxy.hxx +++ b/binaryurp/source/proxy.hxx @@ -44,9 +44,9 @@ public: rtl::Reference< Bridge > const & bridge, OUString const & oid, com::sun::star::uno::TypeDescription const & type); - OUString getOid() const; + OUString getOid() const { return oid_;} - com::sun::star::uno::TypeDescription getType() const; + com::sun::star::uno::TypeDescription getType() const { return type_;} void do_acquire(); diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 5f0fe81eda6d..07e38f60cc7d 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1527,10 +1527,6 @@ namespace cairocanvas return rv; } - uno::Reference< rendering::XGraphicDevice > CanvasHelper::getDevice() - { - return uno::Reference< rendering::XGraphicDevice >(mpDevice); - } void CanvasHelper::copyRect( const rendering::XCanvas* , const uno::Reference< rendering::XBitmapCanvas >& /*sourceCanvas*/, diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx index bbc48c63b0e3..4adcb3b57e72 100644 --- a/canvas/source/cairo/cairo_canvashelper.hxx +++ b/canvas/source/cairo/cairo_canvashelper.hxx @@ -208,7 +208,7 @@ namespace cairocanvas const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > - getDevice(); + getDevice() { return css::uno::Reference< css::rendering::XGraphicDevice >(mpDevice); } // BitmapCanvasHelper functionality // ================================ diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index e4677e6a085c..50d79ff23d64 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -271,11 +271,6 @@ namespace cairocanvas } } - SurfaceSharedPtr DeviceHelper::getSurface() - { - return mpSurface; - } - SurfaceSharedPtr DeviceHelper::createSurface( const ::basegfx::B2ISize& rSize, Content aContent ) { if( mpSurface ) diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx index 2d377c9c9a50..a4b739960e3b 100644 --- a/canvas/source/cairo/cairo_devicehelper.hxx +++ b/canvas/source/cairo/cairo_devicehelper.hxx @@ -92,7 +92,7 @@ namespace cairocanvas void dumpScreenContent() const; OutputDevice* getOutputDevice() const { return mpRefDevice; } - ::cairo::SurfaceSharedPtr getSurface(); + ::cairo::SurfaceSharedPtr getSurface() { return mpSurface; } ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA ); ::cairo::SurfaceSharedPtr createSurface( BitmapSystemData& rData, const Size& rSize ); diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index b17ce9050c25..9673aec02f11 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx @@ -140,11 +140,6 @@ namespace cairocanvas setSize( ::basegfx::B2ISize(rBounds.Width, rBounds.Height) ); } - SurfaceSharedPtr SpriteDeviceHelper::getBufferSurface() - { - return mpBufferSurface; - } - SurfaceSharedPtr SpriteDeviceHelper::getWindowSurface() { return DeviceHelper::getSurface(); diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx index 4e4a9434655b..bcd9a8461762 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.hxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx @@ -64,7 +64,7 @@ namespace cairocanvas void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds ); void setSize( const ::basegfx::B2ISize& rSize ); - ::cairo::SurfaceSharedPtr getBufferSurface(); + ::cairo::SurfaceSharedPtr getBufferSurface() { return mpBufferSurface; } ::cairo::SurfaceSharedPtr getWindowSurface(); ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA ); ::cairo::SurfaceSharedPtr createSurface( BitmapSystemData& rData, const Size& rSize ); diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx index 5619d487312d..1a7ce4102362 100644 --- a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx +++ b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx @@ -46,10 +46,6 @@ namespace oglcanvas // TODO(F2): copyRect NYI } - geometry::IntegerSize2D BitmapCanvasHelper::getSize() - { - return maSize; - } uno::Reference< rendering::XBitmap > BitmapCanvasHelper::getScaledBitmap( const geometry::RealSize2D& /*newSize*/, bool /*beFast*/ ) diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx index 6fd7a4bcb49f..6e46ebe06f91 100644 --- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx +++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx @@ -65,7 +65,7 @@ namespace oglcanvas const ::com::sun::star::rendering::ViewState& destViewState, const ::com::sun::star::rendering::RenderState& destRenderState ); - ::com::sun::star::geometry::IntegerSize2D getSize(); + ::com::sun::star::geometry::IntegerSize2D getSize() { return maSize; } ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > queryBitmapCanvas(); diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx index 8e487ecaa3ee..ac2705319f59 100644 --- a/canvas/source/opengl/ogl_canvasfont.cxx +++ b/canvas/source/opengl/ogl_canvasfont.cxx @@ -72,10 +72,6 @@ namespace oglcanvas return rendering::FontMetrics(); } - const ::com::sun::star::geometry::Matrix2D& CanvasFont::getFontMatrix() const - { - return maFontMatrix; - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx index 68e8e1e2b129..7eef59bdbbf6 100644 --- a/canvas/source/opengl/ogl_canvasfont.hxx +++ b/canvas/source/opengl/ogl_canvasfont.hxx @@ -55,7 +55,7 @@ namespace oglcanvas virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const; + const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const { return maFontMatrix; } private: ::com::sun::star::rendering::FontRequest maFontRequest; diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index a1917dd0a33d..e9983f09fcb8 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -890,10 +890,6 @@ namespace oglcanvas return drawBitmap(pCanvas, xBitmap, viewState, renderState); } - uno::Reference< rendering::XGraphicDevice > CanvasHelper::getDevice() - { - return uno::Reference< rendering::XGraphicDevice >(mpDevice); - } void CanvasHelper::setupGraphicsState( Action& o_action, const rendering::ViewState& viewState, diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx index 7b482e0df726..0dc98e00d798 100644 --- a/canvas/source/opengl/ogl_canvashelper.hxx +++ b/canvas/source/opengl/ogl_canvashelper.hxx @@ -179,7 +179,7 @@ namespace oglcanvas const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > - getDevice(); + getDevice() { return css::uno::Reference< css::rendering::XGraphicDevice >(mpDevice); } // Flush drawing queue to screen void flush() const; diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index 120dc9d2559d..92035174da5f 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/canvas/source/tools/canvascustomspritehelper.cxx @@ -430,15 +430,7 @@ namespace canvas } } - ::basegfx::B2DPoint CanvasCustomSpriteHelper::getPosPixel() const - { - return maPosition; - } - ::basegfx::B2DVector CanvasCustomSpriteHelper::getSizePixel() const - { - return maSize; - } ::basegfx::B2DRange CanvasCustomSpriteHelper::getUpdateArea( const ::basegfx::B2DRange& rBounds ) const { diff --git a/canvas/source/tools/pagemanager.cxx b/canvas/source/tools/pagemanager.cxx index aacf8a471e33..7f5d7769cc2c 100644 --- a/canvas/source/tools/pagemanager.cxx +++ b/canvas/source/tools/pagemanager.cxx @@ -205,10 +205,6 @@ namespace canvas // PageManager::getRenderModule - canvas::IRenderModuleSharedPtr PageManager::getRenderModule() const - { - return mpRenderModule; - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx index 1307fa0167d5..5e906010e377 100644 --- a/canvas/source/tools/pagemanager.hxx +++ b/canvas/source/tools/pagemanager.hxx @@ -45,7 +45,7 @@ namespace canvas // accelerated page, e.g. OpenGL texture. ::basegfx::B2ISize getPageSize() const; - canvas::IRenderModuleSharedPtr getRenderModule() const; + canvas::IRenderModuleSharedPtr getRenderModule() const { return mpRenderModule; } FragmentSharedPtr allocateSpace( const ::basegfx::B2ISize& rSize ); void free( const FragmentSharedPtr& pFragment ); diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 0bd3954f0885..4112c5b858b1 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -900,13 +900,6 @@ namespace vclcanvas true ); } - uno::Reference< rendering::XGraphicDevice > CanvasHelper::getDevice() - { - // cast away const, need to change refcount (as this is - // ~invisible to client code, still logically const) - return uno::Reference< rendering::XGraphicDevice >(mpDevice); - } - void CanvasHelper::copyRect( const rendering::XCanvas* , const uno::Reference< rendering::XBitmapCanvas >& , const geometry::RealRectangle2D& , diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx index 536b5de4d52c..6920c88f9b05 100644 --- a/canvas/source/vcl/canvashelper.hxx +++ b/canvas/source/vcl/canvashelper.hxx @@ -222,8 +222,11 @@ namespace vclcanvas ::com::sun::star::rendering::XBitmap >& xBitmap, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); + // cast away const, need to change refcount (as this is + // ~invisible to client code, still logically const) ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > - getDevice(); + getDevice() { return css::uno::Reference< css::rendering::XGraphicDevice >(mpDevice); } + // BitmapCanvasHelper functionality // ================================ diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index ecabba2bcb4d..9b3eba310df6 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -595,7 +595,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getNumberFormatsSupplier(); - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getChartView(); + com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getChartView() { return xChartView;} bool isTimeBased() const { return mbTimeBased;} void setTimeBased(bool bTimeBased); diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index db5e60331b08..0c92a26c4625 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -442,10 +442,6 @@ void AccessibleBase::KillAllChildren() m_bChildrenInitialized = false; } -AccessibleElementInfo AccessibleBase::GetInfo() const -{ - return m_aAccInfo; -} void AccessibleBase::SetInfo( const AccessibleElementInfo & rNewInfo ) { @@ -458,10 +454,6 @@ void AccessibleBase::SetInfo( const AccessibleElementInfo & rNewInfo ) true /* global notification */ ); } -AccessibleUniqueId AccessibleBase::GetId() const -{ - return m_aAccInfo.m_aOID; -} // ________ (XComponent::dispose) ________ void SAL_CALL AccessibleBase::disposing() diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index cac76fe74958..2fbe179450f4 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1035,15 +1035,7 @@ void ChartDocumentWrapper::setBaseDiagram( const OUString& rBaseDiagram ) this->setDiagram( xDiagram ); } -OUString ChartDocumentWrapper::getBaseDiagram() const -{ - return m_aBaseDiagram; -} -Reference< util::XRefreshable > ChartDocumentWrapper::getAddIn() const -{ - return m_xAddIn; -} void ChartDocumentWrapper::setAddIn( const Reference< util::XRefreshable >& xAddIn ) { diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 46384871b1e9..0a4cf662fb2e 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -543,10 +543,6 @@ bool DataSeriesPointWrapper::isSupportingAreaProperties() return ChartTypeHelper::isSupportingAreaProperties( xChartType, nDimensionCount ); } -bool DataSeriesPointWrapper::isLinesForbidden() -{ - return !m_bLinesAllowed; -} Reference< chart2::XDataSeries > DataSeriesPointWrapper::getDataSeries() { diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index f0cff4cc2d06..c0d128d47a2d 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -71,7 +71,7 @@ public: virtual ~DataSeriesPointWrapper(); bool isSupportingAreaProperties(); - bool isLinesForbidden(); + bool isLinesForbidden() { return !m_bLinesAllowed;} /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 724c078ae30a..aafc9d3f1fea 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -764,10 +764,6 @@ sal_Int32 DataBrowserModel::getCategoryColumnCount() return nLastTextColumnIndex+1; } -const DataBrowserModel::tDataHeaderVector& DataBrowserModel::getDataHeaders() const -{ - return m_aHeaders; -} void DataBrowserModel::updateFromModel() { diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index 60a8b26b8f43..57bd55f14848 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -130,7 +130,7 @@ public: typedef ::std::vector< tDataHeader > tDataHeaderVector; - const tDataHeaderVector& getDataHeaders() const; + const tDataHeaderVector& getDataHeaders() const { return m_aHeaders;} tDataHeader getHeaderForSeries( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 859a4bf541da..834bf7687633 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -110,10 +110,6 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString ObjectPropertiesDialogParameter::~ObjectPropertiesDialogParameter() { } -OUString ObjectPropertiesDialogParameter::getLocalizedName() const -{ - return m_aLocalizedName; -} void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel >& xChartModel ) { @@ -309,14 +305,6 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel } } -const uno::Sequence< OUString >& ObjectPropertiesDialogParameter::GetCategories() const -{ - return m_aCategories; -} -uno::Reference< chart2::XChartDocument > ObjectPropertiesDialogParameter::getDocument() const -{ - return m_xChartDocument; -} const sal_uInt16 nNoArrowNoShadowDlg = 1101; diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index dbb171068e93..5487a3bdfa29 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -217,9 +217,9 @@ protected: virtual sal_Int32 ImplGetAccessibleChildCount() const throw (::com::sun::star::uno::RuntimeException); - AccessibleElementInfo GetInfo() const; + AccessibleElementInfo GetInfo() const { return m_aAccInfo;} void SetInfo( const AccessibleElementInfo & rNewInfo ); - AccessibleUniqueId GetId() const; + AccessibleUniqueId GetId() const { return m_aAccInfo.m_aOID;} // ________ XComponent ________ virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index 7ae26ebe2271..b4e2d57e825e 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -62,7 +62,7 @@ protected: throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > GetRefSizePropertySet() const; + ::com::sun::star::beans::XPropertySet > GetRefSizePropertySet() const { return m_xRefSizePropSet;} private: SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 21de1e66bdd6..a14cf15b052c 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -69,13 +69,13 @@ public: APPHELPER_SERVICE_FACTORY_HELPER(ChartDocumentWrapper) void setAddIn( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable >& xAddIn ); - ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const { return m_xAddIn;} void setUpdateAddIn( bool bUpdateAddIn ); bool getUpdateAddIn() const { return m_bUpdateAddIn;} void setBaseDiagram( const OUString& rBaseDiagram ); - OUString getBaseDiagram() const; + OUString getBaseDiagram() const { return m_aBaseDiagram;} ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getAdditionalShapes() const; diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index ea8850d766ff..dcf34104439f 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -164,13 +164,13 @@ protected: throw( ::com::sun::star::uno::Exception ); /// Returns the pool - SfxItemPool & GetItemPool() const; + SfxItemPool & GetItemPool() const { return m_rItemPool;} /** Returns the XPropertySet that was given in the CTOR and is used to apply items in ApplyItemSet(). */ ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > GetPropertySet() const; + ::com::sun::star::beans::XPropertySet > GetPropertySet() const { return m_xPropertySet;} // ____ ::utl::OEventListenerAdapter ____ virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx index 843af97d19d2..f0c02c17f91b 100644 --- a/chart2/source/controller/inc/ObjectHierarchy.hxx +++ b/chart2/source/controller/inc/ObjectHierarchy.hxx @@ -86,7 +86,7 @@ public: ExplicitValueProvider * pExplicitValueProvider = 0 ); bool handleKeyEvent( const ::com::sun::star::awt::KeyEvent & rEvent ); - ObjectHierarchy::tOID getCurrentSelection() const; + ObjectHierarchy::tOID getCurrentSelection() const { return m_aCurrentOID;} private: void setCurrentSelection( const ObjectHierarchy::tOID& rOID ); diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 13f14e0f402f..33013c3004f0 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -35,7 +35,7 @@ public: void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); ObjectType getObjectType() const { return m_eObjectType;} - OUString getLocalizedName() const; + OUString getLocalizedName() const { return m_aLocalizedName;} bool HasGeometryProperties() const { return m_bHasGeometryProperties;} bool HasStatisticProperties() const { return m_bHasStatisticProperties;} @@ -53,10 +53,10 @@ public: bool IsSupportingAxisPositioning() const { return m_bSupportingAxisPositioning;} bool ShowAxisOrigin() const { return m_bShowAxisOrigin;} bool IsCrossingAxisIsCategoryAxis() const { return m_bIsCrossingAxisIsCategoryAxis;} - const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const; + const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const { return m_aCategories;} ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > - getDocument() const; + getDocument() const { return m_xChartDocument;} bool IsComplexCategoriesAxis() const { return m_bComplexCategoriesAxis;} diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 6d598d38d89b..79410d8576f1 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -556,11 +556,6 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( return bChanged; } -uno::Reference< beans::XPropertySet > - CharacterPropertyItemConverter::GetRefSizePropertySet() const -{ - return m_xRefSizePropSet; -} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 74bf8a26ac26..e8a31d56d2b3 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -64,20 +64,12 @@ void ItemConverter::resetPropertySet( } } -SfxItemPool & ItemConverter::GetItemPool() const -{ - return m_rItemPool; -} SfxItemSet ItemConverter::CreateEmptyItemSet() const { return SfxItemSet( GetItemPool(), GetWhichPairs() ); } -uno::Reference< beans::XPropertySet > ItemConverter::GetPropertySet() const -{ - return m_xPropertySet; -} void ItemConverter::_disposing( const lang::EventObject& rSource ) { diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 0a8d00fc1322..26caf6e3636b 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -745,10 +745,6 @@ void ObjectKeyNavigation::setCurrentSelection( const ObjectHierarchy::tOID& rOID m_aCurrentOID = rOID; } -ObjectHierarchy::tOID ObjectKeyNavigation::getCurrentSelection() const -{ - return m_aCurrentOID; -} bool ObjectKeyNavigation::first() { diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 9d0107168e02..8630526c9bd0 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -77,10 +77,6 @@ uno::Reference< drawing::XShape > Selection::getSelectedAdditionalShape() return m_aSelectedOID.getAdditionalShape(); } -ObjectIdentifier Selection::getSelectedOID() const -{ - return m_aSelectedOID; -} bool Selection::setSelection( const OUString& rCID ) { diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index 9a5f56534e3f..48d3ea355737 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -39,7 +39,7 @@ public: //methods OUString getSelectedCID(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getSelectedAdditionalShape(); - ObjectIdentifier getSelectedOID() const; + ObjectIdentifier getSelectedOID() const { return m_aSelectedOID;} bool isResizeableObjectSelected(); bool isRotateableObjectSelected( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx index 77ed6cabd501..082f6ee3b6b6 100644 --- a/chart2/source/inc/InternalData.hxx +++ b/chart2/source/inc/InternalData.hxx @@ -72,9 +72,9 @@ public: typedef ::std::vector< ::std::vector< ::com::sun::star::uno::Any > > tVecVecAny; //inner index is hierarchical level void setComplexRowLabels( const tVecVecAny& rNewRowLabels ); - tVecVecAny getComplexRowLabels() const; + tVecVecAny getComplexRowLabels() const { return m_aRowLabels;} void setComplexColumnLabels( const tVecVecAny& rNewColumnLabels ); - tVecVecAny getComplexColumnLabels() const; + tVecVecAny getComplexColumnLabels() const { return m_aColumnLabels;} #if OSL_DEBUG_LEVEL > 1 void traceData() const; diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 6b056122bc46..dead054ca0a2 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -52,7 +52,7 @@ public: ::com::sun::star::beans::PropertyValue > & rMediaDescriptor ); ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > getReducedForModel(); + ::com::sun::star::beans::PropertyValue > getReducedForModel() { return m_aModelProperties;} public: //all properties given in the constructor are stored in the following three sequences diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index d30a00df8a2b..937da78571df 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -265,8 +265,8 @@ public: bool isValid() const; bool isAutoGeneratedObject() const; bool isAdditionalShape() const; - OUString getObjectCID() const; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const; + OUString getObjectCID() const { return m_aObjectCID;} + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const { return m_xAdditionalShape;} ::com::sun::star::uno::Any getAny() const; private: diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index d1275c718a2f..9c15afd3ad69 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -51,7 +51,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc ); - ::com::sun::star::awt::Size getPageSize() const; + ::com::sun::star::awt::Size getPageSize() const { return m_aPageSize;} /** Retrieves the state auto-resize from all objects that support this feature. If all objects return the same state, AUTO_RESIZE_YES or diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index 2baa2f2b9e22..d5f0bea15eef 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -37,7 +37,7 @@ public: WrappedProperty( const OUString& rOuterName, const OUString& rInnerName ); virtual ~WrappedProperty(); - const OUString& getOuterName() const; + const OUString& getOuterName() const { return m_aOuterName;} virtual OUString getInnerName() const; virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 833ea95df316..02c123477eb9 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1408,10 +1408,6 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd) mbTimeBased = true; } -uno::Reference< uno::XInterface > ChartModel::getChartView() -{ - return xChartView; -} void ChartModel::setWindow( const sal_uInt64 nWindowPtr ) throw (uno::RuntimeException, std::exception) diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 9fb275f7a61e..db542d0e8edc 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -66,10 +66,6 @@ ChartType::~ChartType() m_aDataSeries.clear(); } -Reference< uno::XComponentContext > ChartType::GetComponentContext() const -{ - return m_xContext; -} // ____ XChartType ____ Reference< chart2::XCoordinateSystem > SAL_CALL diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 82eb80332504..18dfaea03ba4 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -63,7 +63,7 @@ protected: explicit ChartType( const ChartType & rOther ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - GetComponentContext() const; + GetComponentContext() const { return m_xContext;} // ____ XChartType ____ // still abstract ! implement ! diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 8be651a75f7f..de109e85a98a 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -898,10 +898,6 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( comphelper::copyProperties( xSource, xDestination ); } -Reference< uno::XComponentContext > ChartTypeTemplate::GetComponentContext() const -{ - return m_xContext; -} } // namespace chart diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 39f3e0c5e742..b0dc88c4af09 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -246,7 +246,7 @@ protected: ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - GetComponentContext() const; + GetComponentContext() const { return m_xContext;} static void copyPropertiesFromOldToNewCoordianteSystem( const ::com::sun::star::uno::Sequence< diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index ce454089b868..67e50fb38db9 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -57,10 +57,6 @@ DataInterpreter::DataInterpreter( DataInterpreter::~DataInterpreter() {} -Reference< uno::XComponentContext > DataInterpreter::GetComponentContext() const -{ - return m_xContext; -} // ____ XDataInterpreter ____ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index 9f49db3d29dd..af589f13bf63 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -38,7 +38,7 @@ public: virtual ~DataInterpreter(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - GetComponentContext() const; + GetComponentContext() const { return m_xContext;} /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index 33b850ea90e4..de003b70e04e 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -181,10 +181,6 @@ bool ImplOPropertySet::SetStyle( const Reference< style::XStyle > & xStyle ) return true; } -Reference< style::XStyle > ImplOPropertySet::GetStyle() const -{ - return m_xStyle; -} void ImplOPropertySet::cloneInterfaceProperties() { diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx index 28e84cc818c9..ca7e5f0266f9 100644 --- a/chart2/source/tools/ImplOPropertySet.hxx +++ b/chart2/source/tools/ImplOPropertySet.hxx @@ -67,7 +67,7 @@ public: bool SetStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & xStyle ); ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > - GetStyle() const; + GetStyle() const { return m_xStyle;} typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 71a2fd8ab466..f79bd627d4de 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -496,10 +496,6 @@ void InternalData::setComplexRowLabels( const vector< vector< uno::Any > >& rNew enlargeData( 0, nNewRowCount ); } -vector< vector< uno::Any > > InternalData::getComplexRowLabels() const -{ - return m_aRowLabels; -} void InternalData::setComplexColumnLabels( const vector< vector< uno::Any > >& rNewColumnLabels ) { @@ -511,10 +507,6 @@ void InternalData::setComplexColumnLabels( const vector< vector< uno::Any > >& r enlargeData( nNewColumnCount, 0 ); } -vector< vector< uno::Any > > InternalData::getComplexColumnLabels() const -{ - return m_aColumnLabels; -} #if OSL_DEBUG_LEVEL > 1 void InternalData::traceData() const diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index 9279b9d9fe7b..610426548e1e 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -196,11 +196,6 @@ void MediaDescriptorHelper::impl_init() ISSET_Stream = false; } - uno::Sequence< beans::PropertyValue > MediaDescriptorHelper -::getReducedForModel() -{ - return m_aModelProperties; -} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 9edbdf041abd..0ab0874fdb85 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -1542,15 +1542,7 @@ bool ObjectIdentifier::isAdditionalShape() const return m_xAdditionalShape.is(); } -OUString ObjectIdentifier::getObjectCID() const -{ - return m_aObjectCID; -} -Reference< drawing::XShape > ObjectIdentifier::getAdditionalShape() const -{ - return m_xAdditionalShape; -} Any ObjectIdentifier::getAny() const { diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 1f5c84f30025..0a0145b9604b 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -48,10 +48,6 @@ ReferenceSizeProvider::ReferenceSizeProvider( m_bUseAutoScale( getAutoResizeState( xChartDoc ) == AUTO_RESIZE_YES ) {} -awt::Size ReferenceSizeProvider::getPageSize() const -{ - return m_aPageSize; -} void ReferenceSizeProvider::impl_setValuesAtTitled( diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index 4a8f94b7912b..4666dbb2cf96 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -37,10 +37,6 @@ WrappedProperty::~WrappedProperty() { } -const OUString& WrappedProperty::getOuterName() const -{ - return m_aOuterName; -} OUString WrappedProperty::getInnerName() const { diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index 1dbab1c820e3..ff6b7d509eb6 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -228,15 +228,7 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement( } } -ScaleData ScaleAutomatism::getScale() const -{ - return m_aSourceScale; -} -Date ScaleAutomatism::getNullDate() const -{ - return m_aNullDate; -} void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( ExplicitScaleData& rExplicitScale, diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index a7c6e8dc0877..457a211ee9d1 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -49,10 +49,6 @@ VAxisBase::~VAxisBase() { } -sal_Int32 VAxisBase::getDimensionCount() -{ - return m_nDimension; -} void VAxisBase::initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 7494430a206e..3c39c033e1a6 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -39,7 +39,7 @@ public: ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier ); virtual ~VAxisBase(); - sal_Int32 getDimensionCount(); + sal_Int32 getDimensionCount() { return m_nDimension;} virtual void createMaximumLabels()=0; virtual void createLabels()=0; diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 8cf540b057b9..e6fb154b1473 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -87,13 +87,6 @@ double lcl_getTickOffset(sal_Int32 nLength,sal_Int32 nTickmarkStyle) return fPercent*nLength; } -VLineProperties AxisProperties::makeLinePropertiesForDepth( sal_Int32 /* nDepth */ ) const -{ - //@todo get this from somewhere; maybe for each subincrement - //so far the model does not offer different settings for each tick depth - return m_aLineProperties; -} - TickmarkProperties AxisProperties::makeTickmarkProperties( sal_Int32 nDepth ) const { diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 7da3d8a47118..bf4a50824887 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -147,7 +147,9 @@ private: protected: virtual TickmarkProperties makeTickmarkProperties( sal_Int32 nDepth ) const; - VLineProperties makeLinePropertiesForDepth( sal_Int32 nDepth ) const; + //@todo get this from somewhere; maybe for each subincrement + //so far the model does not offer different settings for each tick depth + VLineProperties makeLinePropertiesForDepth( sal_Int32 /*nDepth*/ ) const { return m_aLineProperties; } }; } //namespace chart diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 205fd77edd49..7415b3e82465 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -147,10 +147,6 @@ void VCoordinateSystem::setTransformationSceneToScreen( } } -drawing::HomogenMatrix VCoordinateSystem::getTransformationSceneToScreen() -{ - return m_aMatrixSceneToScreen; -} //better performance for big data uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution( @@ -205,10 +201,6 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution( return aResolution; } -Reference< XCoordinateSystem > VCoordinateSystem::getModel() const -{ - return m_xCooSysModel; -} Reference< XAxis > VCoordinateSystem::getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const { diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index d04d3b06215b..329827167821 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -675,10 +675,6 @@ void VDiagram::createShapes_3d() adjustPosAndSize_3d( m_aAvailablePosIncludingAxes, m_aAvailableSizeIncludingAxes ); } -uno::Reference< drawing::XShapes > VDiagram::getCoordinateRegion() -{ - return uno::Reference<drawing::XShapes>( m_xCoordinateRegionShape, uno::UNO_QUERY ); -} ::basegfx::B2IRectangle VDiagram::getCurrentRectangle() { diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx index cc3d8144923d..54b04fdcbb0f 100644 --- a/chart2/source/view/inc/3DChartObjects.hxx +++ b/chart2/source/view/inc/3DChartObjects.hxx @@ -94,7 +94,7 @@ public: Text(OpenGL3DRenderer* pRenderer, TextCache& rTextCache, const OUString& rStr, sal_uInt32 nId); virtual void render() SAL_OVERRIDE; - Size getSize() const; + Size getSize() const { return maText.maSize;} void setPosition(const glm::vec3& rTopLeft, const glm::vec3& rTopRight, const glm::vec3& rBottomRight); diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index f2f81dee7428..e355b2749144 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -50,7 +50,7 @@ public: virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix); virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); - const ::std::vector< ExplicitScaleData >& getScales() const; + const ::std::vector< ExplicitScaleData >& getScales() const { return m_aScales;} //better performance for big data inline void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); @@ -155,7 +155,7 @@ public: virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix) SAL_OVERRIDE; virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE; - ::basegfx::B3DHomMatrix getUnitCartesianToScene() const; + ::basegfx::B3DHomMatrix getUnitCartesianToScene() const { return m_aUnitCartesianToScene;} virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationScaledLogicToScene() const SAL_OVERRIDE; diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx index 384577779beb..3518eb2bae64 100644 --- a/chart2/source/view/inc/ScaleAutomatism.hxx +++ b/chart2/source/view/inc/ScaleAutomatism.hxx @@ -73,8 +73,8 @@ public: ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement ) const; - ::com::sun::star::chart2::ScaleData getScale() const; - Date getNullDate() const; + ::com::sun::star::chart2::ScaleData getScale() const { return m_aSourceScale;} + Date getNullDate() const { return m_aNullDate;} private: /** Fills the passed scale data and increment data for category scaling. */ diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index fa2ed6a857ee..18c8c50b6aa2 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -66,7 +66,7 @@ public: void setParticle( const OUString& rCooSysParticle ); virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); - ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen(); + ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen() { return m_aMatrixSceneToScreen;} //better performance for big data virtual ::com::sun::star::uno::Sequence< sal_Int32 > getCoordinateSystemResolution( const ::com::sun::star::awt::Size& rPageSize @@ -97,7 +97,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > - getModel() const; + getModel() const { return m_xCooSysModel;} virtual void createVAxisList( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 9aeaa9c70fd9..c62b45dcc4e2 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -67,7 +67,7 @@ public: ~VDataSeries(); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > - getModel() const; + getModel() const { return m_xDataSeries;} void setCategoryXAxis(); void setXValues( const ::com::sun::star::uno::Reference< @@ -116,7 +116,7 @@ public: getPropertiesOfPoint( sal_Int32 index ) const; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - getPropertiesOfSeries() const; + getPropertiesOfSeries() const { return css::uno::Reference<css::beans::XPropertySet>(m_xDataSeries, css::uno::UNO_QUERY );} ::com::sun::star::chart2::Symbol* getSymbolProperties( sal_Int32 index ) const; @@ -155,12 +155,12 @@ public: //this is here for deep stacking: double m_fLogicZPos;//from 0 to series count -1 - OUString getCID() const; - OUString getSeriesParticle() const; - OUString getPointCID_Stub() const; + OUString getCID() const { return m_aCID;} + OUString getSeriesParticle() const { return m_aSeriesParticle;} + OUString getPointCID_Stub() const { return m_aPointCID_Stub;} OUString getErrorBarsCID( bool bYError ) const; OUString getLabelsCID() const; - OUString getLabelCID_Stub() const; + OUString getLabelCID_Stub() const { return m_aLabelCID_Stub;} OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const; ::com::sun::star::chart2::DataPointLabel* diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index 8baa33754922..ecf6cf23836b 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -52,7 +52,7 @@ public: //methods , const ::com::sun::star::awt::Size& rSize ); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > - getCoordinateRegion(); + getCoordinateRegion() { return css::uno::Reference<css::drawing::XShapes>( m_xCoordinateRegionShape, css::uno::UNO_QUERY );} ::basegfx::B2IRectangle getCurrentRectangle(); diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx index 1cf0b4920994..1b962c69168c 100644 --- a/chart2/source/view/main/3DChartObjects.cxx +++ b/chart2/source/view/main/3DChartObjects.cxx @@ -111,10 +111,6 @@ void Text::render() mnUniqueId); } -Size Text::getSize() const -{ - return maText.maSize; -} void Text::setPosition(const glm::vec3& rTopLeft, const glm::vec3& rTopRight, const glm::vec3& rBottomRight) { diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 12d93678db3a..1880d7ffac00 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -1191,10 +1191,6 @@ void DummyChart::clear() maShapes.clear(); } -TextCache& DummyChart::getTextCache() -{ - return maTextCache; -} } diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index ddee02d815f9..be1b86b57dd4 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -397,7 +397,7 @@ public: virtual void render() SAL_OVERRIDE; void clear(); - TextCache& getTextCache(); + TextCache& getTextCache() { return maTextCache;} private: diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index cfc496a39b0f..9c6a8ed3290e 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -104,10 +104,6 @@ void PlottingPositionHelper::setScales( const std::vector< ExplicitScaleData >& m_bSwapXAndY = bSwapXAndYAxis; m_xTransformationLogicToScene = NULL; } -const std::vector< ExplicitScaleData >& PlottingPositionHelper::getScales() const -{ - return m_aScales; -} uno::Reference< XTransformation > PlottingPositionHelper::getTransformationScaledLogicToScene() const { @@ -423,10 +419,6 @@ void PolarPlottingPositionHelper::setScales( const std::vector< ExplicitScaleDat return aRet; } -::basegfx::B3DHomMatrix PolarPlottingPositionHelper::getUnitCartesianToScene() const -{ - return m_aUnitCartesianToScene; -} uno::Reference< XTransformation > PolarPlottingPositionHelper::getTransformationScaledLogicToScene() const { diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 7354bd88b9ef..6fc067688649 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -312,10 +312,6 @@ void VDataSeries::doSortByXValues() } } -uno::Reference< XDataSeries > VDataSeries::getModel() const -{ - return m_xDataSeries; -} void VDataSeries::releaseShapes() { @@ -370,18 +366,6 @@ void VDataSeries::setParticle( const OUString& rSeriesParticle ) m_aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_LABEL, OUString(), getLabelsCID() ); } -OUString VDataSeries::getSeriesParticle() const -{ - return m_aSeriesParticle; -} -OUString VDataSeries::getCID() const -{ - return m_aCID; -} -OUString VDataSeries::getPointCID_Stub() const -{ - return m_aPointCID_Stub; -} OUString VDataSeries::getErrorBarsCID(bool bYError) const { OUString aChildParticle( ObjectIdentifier::getStringForType( @@ -399,10 +383,6 @@ OUString VDataSeries::getLabelsCID() const return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aSeriesParticle, aChildParticle ); } -OUString VDataSeries::getLabelCID_Stub() const -{ - return m_aLabelCID_Stub; -} OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const { OUString aRet; @@ -910,10 +890,6 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfPoint( sal_Int return this->getPropertiesOfSeries(); } -uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfSeries() const -{ - return uno::Reference<beans::XPropertySet>(m_xDataSeries, uno::UNO_QUERY ); -} DataPointLabel* getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) { diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index f632d38dcec4..f4f318576b5a 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -31,10 +31,6 @@ Options::~Options() } -const OString& Options::getProgramName() const -{ - return m_program; -} bool Options::isValid(const OString& option) const { diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index f40b80f11061..40a17845db55 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -330,7 +330,7 @@ public: OString getDescriptor() const; - OString getSignature() const; + OString getSignature() const { return m_needsSignature ? m_signatureStart + m_signatureEnd : OString();} private: rtl::Reference< TypeManager > m_manager; @@ -387,9 +387,6 @@ OString MethodDescriptor::getDescriptor() const { return buf.makeStringAndClear(); } -OString MethodDescriptor::getSignature() const { - return m_needsSignature ? m_signatureStart + m_signatureEnd : OString(); -} class TypeInfo { public: diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx index 10f1855e5bd4..1ad24fa2fed2 100644 --- a/comphelper/source/misc/stillreadwriteinteraction.cxx +++ b/comphelper/source/misc/stillreadwriteinteraction.cxx @@ -63,10 +63,6 @@ void StillReadWriteInteraction::resetErrorStates() m_bHandledByInternalHandler = false; } -bool StillReadWriteInteraction::wasWriteError() -{ - return (m_bUsed && m_bHandledByMySelf); -} ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction::intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest& aRequest, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest) diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index bda50a89be52..1f3bb28735c4 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -40,7 +40,7 @@ public: Sequence< Property > getProperties() throw(); - const PropertyMap* getPropertyMap() const throw(); + const PropertyMap* getPropertyMap() const throw() { return &maPropertyMap;} Property getPropertyByName( const OUString& aName ) throw( UnknownPropertyException ); bool hasPropertyByName( const OUString& aName ) throw(); @@ -121,10 +121,6 @@ Sequence< Property > PropertyMapImpl::getProperties() throw() return maProperties; } -const PropertyMap* PropertyMapImpl::getPropertyMap() const throw() -{ - return &maPropertyMap; -} Property PropertyMapImpl::getPropertyByName( const OUString& aName ) throw( UnknownPropertyException ) { diff --git a/compilerplugins/clang/inlinesimplememberfunctions.cxx b/compilerplugins/clang/inlinesimplememberfunctions.cxx index 0d4428c843dc..7fa43a4ba9f0 100644 --- a/compilerplugins/clang/inlinesimplememberfunctions.cxx +++ b/compilerplugins/clang/inlinesimplememberfunctions.cxx @@ -65,6 +65,12 @@ bool InlineSimpleMemberFunctions::VisitCXXMethodDecl(const CXXMethodDecl * funct if( functionDecl->isInlineSpecified()) { return true; } + if( functionDecl->getCanonicalDecl()->isInlineSpecified()) { + return true; + } + if( functionDecl->getNameAsString().find("Impl") != std::string::npos) { + return true; + } // ignore stuff that forms part of the stable URE interface if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc( functionDecl->getCanonicalDecl()->getNameInfo().getLoc()))) { @@ -146,69 +152,67 @@ bool InlineSimpleMemberFunctions::VisitCXXMethodDecl(const CXXMethodDecl * funct } } - /* look for a chain like: + /* look for a chains like: CompoundStmt ReturnStmt - ImplicitCastExpr - MemberExpr - CXXThisExpr + stuff + CXXThisExpr */ childStmt = *(*compoundStmt->child_begin())->child_begin(); while (1) { - if (! oneAndOnlyOne( childStmt->children() )) + if (dyn_cast<CallExpr>( childStmt ) != nullptr) + return true; + if (dyn_cast<CXXNewExpr>( childStmt ) != nullptr) + return true; + if (dyn_cast<CXXConstructExpr>( childStmt ) != nullptr) + return true; + if (dyn_cast<ConditionalOperator>( childStmt ) != nullptr) + return true; + if (dyn_cast<BinaryOperator>( childStmt ) != nullptr) return true; + // exclude methods that return fields on incomplete types .e.g the pImpl pattern + const MemberExpr* memberExpr = dyn_cast<MemberExpr>( childStmt ); + if (memberExpr != nullptr && memberExpr->getMemberDecl()) { + const FieldDecl* fieldDecl = dyn_cast<FieldDecl>(memberExpr->getMemberDecl()); + if (fieldDecl != nullptr) + { + // yes, a little bit of a hack. However, it is quite hard to determine if the method + // in question is accessing a field via a pImpl pattern. + if (fieldDecl->getType()->isIncompleteType()) + return true; + if (fieldDecl->getNameAsString().find("Impl") != std::string::npos) + return true; + if (fieldDecl->getNameAsString().find("pImp") != std::string::npos) + return true; + // somewhere in VCL + if (fieldDecl->getNameAsString().find("mpGlobalSyncData") != std::string::npos) + return true; + std::string s = fieldDecl->getType().getAsString(); + if (s.find("Impl") != std::string::npos || s.find("pImp") != std::string::npos || s.find("Internal") != std::string::npos) + return true; + } + } if (dyn_cast<CXXThisExpr>( childStmt ) != nullptr) { - - compoundStmt->dump(); - if (!rewrite(functionDecl)) - { - report( - DiagnosticsEngine::Warning, - "inlinesimpleaccessmethods", - functionDecl->getSourceRange().getBegin()) - << functionDecl->getSourceRange(); - // display the location of the class member declaration - report( - DiagnosticsEngine::Note, - "inlinesimpleaccessmethods", - functionDecl->getCanonicalDecl()->getSourceRange().getBegin()) - << functionDecl->getCanonicalDecl()->getSourceRange(); + if (!rewrite(functionDecl)) + { + report( + DiagnosticsEngine::Warning, + "inlinesimpleaccessmethods", + functionDecl->getSourceRange().getBegin()) + << functionDecl->getSourceRange(); + // display the location of the class member declaration so I don't have to search for it by hand + report( + DiagnosticsEngine::Note, + "inlinesimpleaccessmethods", + functionDecl->getCanonicalDecl()->getSourceRange().getBegin()) + << functionDecl->getCanonicalDecl()->getSourceRange(); } return true; } + if ( childStmt->children().empty() ) + return true; childStmt = *childStmt->child_begin(); } -/* - if (dyn_cast<ImplicitCastExpr>( childStmt ) != nullptr - && oneAndOnlyOne( childStmt->children() )) - { - const Stmt* childStmt2 = *childStmt->child_begin(); - if (dyn_cast<MemberExpr>( childStmt2 ) != nullptr - && oneAndOnlyOne(childStmt2->children())) - { - childStmt2 = *childStmt2->child_begin(); - if (dyn_cast<CXXThisExpr>( childStmt2 ) != nullptr - && childStmt2->children().empty()) - { - if (!rewrite(functionDecl)) - { - report( - DiagnosticsEngine::Warning, - "inlinesimpleaccessmethods", - functionDecl->getSourceRange().getBegin()) - << functionDecl->getSourceRange(); - // display the location of the class member declaration - report( - DiagnosticsEngine::Note, - "inlinesimpleaccessmethods", - functionDecl->getCanonicalDecl()->getSourceRange().getBegin()) - << functionDecl->getCanonicalDecl()->getSourceRange(); - } - return true; - } - } - } -*/ return true; } @@ -287,7 +291,7 @@ bool InlineSimpleMemberFunctions::rewrite(const CXXMethodDecl * functionDecl) { s1 = ReplaceString(s1, " ", " "); s1 = " " + s1; - // scan from the end of the functions body through the whitespace, so we can do a nice clean remove + // scan from the end of the function's body through the trailing whitespace, so we can do a nice clean remove // commented out because for some reason it will sometimes chomp an extra token // SourceLocation endOfRemoveLoc = functionDecl->getBody()->getLocEnd(); // for (;;) { @@ -314,7 +318,7 @@ bool InlineSimpleMemberFunctions::rewrite(const CXXMethodDecl * functionDecl) { return replaceText(canonicalDecl->getLocEnd().getLocWithOffset(p2 - p1 + 1), 1, s1); } -loplugin::Plugin::Registration< InlineSimpleMemberFunctions > X("inlinesimplememberfunctions", true); +loplugin::Plugin::Registration< InlineSimpleMemberFunctions > X("inlinesimplememberfunctions"); } diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 7a3dcc4acec5..665b3cdd422f 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -1371,9 +1371,6 @@ css::uno::Any Access::queryInterface(css::uno::Type const & aType) return res; } -Components & Access::getComponents() const { - return components_; -} void Access::checkLocalizedPropertyAccess() { if (getNode()->kind() == Node::KIND_LOCALIZED_PROPERTY && diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index a91312f012a0..4dbc14e9adca 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -448,7 +448,7 @@ protected: com::sun::star::uno::Type const & aType) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - Components & getComponents() const; + Components & getComponents() const { return components_;} void checkLocalizedPropertyAccess(); diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx index f27f3a51ae6e..27b977d2d824 100644 --- a/configmgr/source/localizedvaluenode.cxx +++ b/configmgr/source/localizedvaluenode.cxx @@ -41,9 +41,6 @@ OUString LocalizedValueNode::getTemplateName() const { return OUString("*"); } -css::uno::Any LocalizedValueNode::getValue() const { - return value_; -} void LocalizedValueNode::setValue(int layer, css::uno::Any const & value) { setLayer(layer); diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx index 403a180428c9..08635f875251 100644 --- a/configmgr/source/localizedvaluenode.hxx +++ b/configmgr/source/localizedvaluenode.hxx @@ -38,7 +38,7 @@ public: virtual OUString getTemplateName() const SAL_OVERRIDE; - com::sun::star::uno::Any getValue() const; + com::sun::star::uno::Any getValue() const { return value_;} void setValue(int layer, com::sun::star::uno::Any const & value); diff --git a/configmgr/source/modifications.cxx b/configmgr/source/modifications.cxx index bd711f77a9cb..6b8cdf60aab3 100644 --- a/configmgr/source/modifications.cxx +++ b/configmgr/source/modifications.cxx @@ -73,9 +73,6 @@ void Modifications::remove(Path const & path) { } } -Modifications::Node const & Modifications::getRoot() const { - return root_; -} } diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx index 33bddadb3093..0521da5ae9ab 100644 --- a/configmgr/source/modifications.hxx +++ b/configmgr/source/modifications.hxx @@ -46,7 +46,7 @@ public: void remove(Path const & path); - Node const & getRoot() const; + Node const & getRoot() const { return root_;} private: Node root_; diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index 8951dcdcf664..09ed9b0b41c4 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -106,9 +106,6 @@ OUString RootAccess::getAbsolutePathRepresentation() { return pathRepresentation_; } -OUString RootAccess::getLocale() const { - return locale_; -} void RootAccess::setAlive(bool b) { diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx index 6583cea1ce3f..4e300a7ba5c2 100644 --- a/configmgr/source/rootaccess.hxx +++ b/configmgr/source/rootaccess.hxx @@ -73,7 +73,7 @@ public: OUString getAbsolutePathRepresentation(); - OUString getLocale() const; + OUString getLocale() const { return locale_;} bool isUpdate() const { return update_;} diff --git a/configmgr/source/setnode.cxx b/configmgr/source/setnode.cxx index 76329a0570a8..d00253b891d2 100644 --- a/configmgr/source/setnode.cxx +++ b/configmgr/source/setnode.cxx @@ -80,13 +80,7 @@ int SetNode::getMandatory() const { return mandatory_; } -OUString const & SetNode::getDefaultTemplateName() const { - return defaultTemplateName_; -} -std::vector< OUString > & SetNode::getAdditionalTemplateNames() { - return additionalTemplateNames_; -} bool SetNode::isValidTemplate(OUString const & templateName) const { return Data::equalTemplateNames(templateName, defaultTemplateName_) || diff --git a/configmgr/source/setnode.hxx b/configmgr/source/setnode.hxx index 91dd7008c7b7..92774b36e344 100644 --- a/configmgr/source/setnode.hxx +++ b/configmgr/source/setnode.hxx @@ -48,9 +48,9 @@ public: virtual int getMandatory() const SAL_OVERRIDE; - OUString const & getDefaultTemplateName() const; + OUString const & getDefaultTemplateName() const { return defaultTemplateName_;} - std::vector< OUString > & getAdditionalTemplateNames(); + std::vector< OUString > & getAdditionalTemplateNames() { return additionalTemplateNames_;} bool isValidTemplate(OUString const & templateName) const; diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx index 80090c37f616..7622c8074fd3 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx @@ -35,10 +35,6 @@ namespace connectivity profileName = aProfileName; profilePath = aProfilePath; } - OUString ProfileStruct::getProfilePath() - { - return profilePath; - } ProfileAccess::~ProfileAccess() { diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx index 3680609adde4..8f011315a7dd 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx @@ -47,7 +47,7 @@ namespace connectivity ); MozillaProductType getProductType() { return product;} OUString getProfileName(){ return profileName;} - OUString getProfilePath() ; + OUString getProfilePath() { return profilePath; } protected: MozillaProductType product; OUString profileName; diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx index e408e490aba4..031b9e7b5302 100644 --- a/cppcanvas/source/inc/canvasgraphichelper.hxx +++ b/cppcanvas/source/inc/canvasgraphichelper.hxx @@ -58,8 +58,8 @@ namespace cppcanvas protected: // for our clients // =============== - CanvasSharedPtr getCanvas() const; - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > getGraphicDevice() const; + CanvasSharedPtr getCanvas() const { return mpCanvas; } + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > getGraphicDevice() const { return mxGraphicDevice; } const ::com::sun::star::rendering::RenderState& getRenderState() const; private: diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx index 562be9715d58..43231ed347d5 100644 --- a/cppcanvas/source/tools/canvasgraphichelper.cxx +++ b/cppcanvas/source/tools/canvasgraphichelper.cxx @@ -115,15 +115,7 @@ namespace cppcanvas return static_cast<CompositeOp>(maRenderState.CompositeOperation); } - CanvasSharedPtr CanvasGraphicHelper::getCanvas() const - { - return mpCanvas; - } - uno::Reference< rendering::XGraphicDevice > CanvasGraphicHelper::getGraphicDevice() const - { - return mxGraphicDevice; - } } } diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index 78701786fe15..9138d1d724f4 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.cxx @@ -42,10 +42,6 @@ namespace cppcanvas maTransformation = rViewTransform; } - ::basegfx::B2DHomMatrix ImplSpriteCanvas::TransformationArbiter::getTransformation() const - { - return maTransformation; - } ImplSpriteCanvas::ImplSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& rCanvas ) : diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index 8a0223e1bee7..c61bcd8ddd05 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -71,7 +71,7 @@ namespace cppcanvas TransformationArbiter(); void setTransformation( const ::basegfx::B2DHomMatrix& rViewTransform ); - ::basegfx::B2DHomMatrix getTransformation() const; + ::basegfx::B2DHomMatrix getTransformation() const { return maTransformation; } private: ::basegfx::B2DHomMatrix maTransformation; diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index eaa041eca53e..f23c8e1082dc 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -112,10 +112,6 @@ SvxCharacterMap::~SvxCharacterMap() -const Font& SvxCharacterMap::GetCharFont() const -{ - return aFont; -} diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 09211e8b4db3..8af1b917362e 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -102,7 +102,7 @@ public: void DisableFontSelection(); - const Font& GetCharFont() const; + const Font& GetCharFont() const { return aFont;} void SetCharFont( const Font& rFont ); void SetChar( sal_UCS4 ); diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index ad81283bf4a7..1688bcd43905 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -43,7 +43,7 @@ public: void HandleEntryChecked( SvTreeListEntry* _pEntry ); - const Point& GetCurMousePoint() const; + const Point& GetCurMousePoint() const { return m_aCurMousePoint;} long GetControlColumnWidth() const; }; diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 8e755a47737b..8c10a9e0e4be 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -313,15 +313,7 @@ void SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const } -SvxChartColorTable & SvxChartColorTableItem::GetColorList() -{ - return m_aColorTable; -} -const SvxChartColorTable & SvxChartColorTableItem::GetColorList() const -{ - return m_aColorTable; -} void SvxChartColorTableItem::ReplaceColorByIndex( size_t _nIndex, const XColorEntry & _rEntry ) { diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 0a0ad216304d..fdfc06f675ba 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -97,8 +97,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void SetOptions( SvxChartOptions* pOpts ) const; - const SvxChartColorTable & GetColorList() const ; - SvxChartColorTable & GetColorList(); + const SvxChartColorTable & GetColorList() const { return m_aColorTable;} + SvxChartColorTable & GetColorList() { return m_aColorTable;} void ReplaceColorByIndex( size_t _nIndex, const XColorEntry & _rEntry ); private: diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index fd7de8f3d505..7830cbe024f2 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -84,10 +84,6 @@ void SvxRadioButtonListBox::HandleEntryChecked( SvTreeListEntry* _pEntry ) SetCheckButtonState( _pEntry, SV_BUTTON_CHECKED ); } -const Point& SvxRadioButtonListBox::GetCurMousePoint() const -{ - return m_aCurMousePoint; -} long SvxRadioButtonListBox::GetControlColumnWidth() const { diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 0bcf4c793a3e..5192dee57e86 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -470,10 +470,6 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize) } // XResultSetMetaDataSupplier -Reference< XResultSetMetaData > ORowSetCache::getMetaData( ) -{ - return m_xMetaData; -} static Any lcl_getBookmark(ORowSetValue& i_aValue,OCacheSet* i_pCacheSet) { diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index ab48003e9574..16912acac60b 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -157,7 +157,7 @@ namespace dbaccess void deregisterOldRow(const TORowSetOldRowHelperRef& _rRow); // ::com::sun::star::sdbc::XResultSetMetaDataSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > getMetaData( ); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > getMetaData( ) { return m_xMetaData;} // ::com::sun::star::sdbcx::XRowLocate ::com::sun::star::uno::Any getBookmark( ); diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 7524ff20b785..4f7dfaf02c0d 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -317,15 +317,7 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const return sEmbeddedDatabaseURL; } -ODsnTypeCollection::TypeIterator ODsnTypeCollection::begin() const -{ - return TypeIterator(this, 0); -} -ODsnTypeCollection::TypeIterator ODsnTypeCollection::end() const -{ - return TypeIterator(this, m_aDsnTypesDisplayNames.size()); -} DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const { diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index d1fd9aa707ef..5ca8c83f3264 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -172,9 +172,9 @@ public: getDefaultDBSettings( const OUString& _sURL ) const; /// get access to the first element of the types collection - TypeIterator begin() const; + inline TypeIterator begin() const; /// get access to the (last + 1st) element of the types collection - TypeIterator end() const; + inline TypeIterator end() const; void fillPageIds(const OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const; @@ -220,6 +220,10 @@ protected: TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos = 0); }; + +inline ODsnTypeCollection::TypeIterator ODsnTypeCollection::begin() const { return ODsnTypeCollection::TypeIterator(this, 0);} +inline ODsnTypeCollection::TypeIterator ODsnTypeCollection::end() const { return ODsnTypeCollection::TypeIterator(this, m_aDsnTypesDisplayNames.size());} + } // namespace dbaccess #endif // INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 9ddfd7bdda26..379e0a2544b3 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -102,10 +102,6 @@ OCollectionView::~OCollectionView( ) { } -Reference< XContent> OCollectionView::getSelectedFolder() const -{ - return m_xContent; -} IMPL_LINK_NOARG(OCollectionView, Save_Click) { diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 85fcaf833e0e..26dca925dea6 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -65,7 +65,7 @@ namespace dbaui ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); virtual ~OCollectionView(); - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getSelectedFolder() const; + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getSelectedFolder() const { return m_xContent;} OUString getName() const; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index 73cc8e3e88a4..14c542fa7752 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -102,7 +102,7 @@ namespace dbaui sal_Int32 GetIsNullable() const; sal_Int32 GetFormatKey() const; SvxCellHorJustify GetHorJustify() const; - TOTypeInfoSP getTypeInfo() const; + TOTypeInfoSP getTypeInfo() const { return m_pType;} TOTypeInfoSP getSpecialTypeInfo() const; bool IsAutoIncrement() const; bool IsPrimaryKey() const { return m_bIsPrimaryKey;} diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 8922c959fb86..65fb772bbf69 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -577,10 +577,6 @@ SvxCellHorJustify OFieldDescription::GetHorJustify() const return m_eHorJustify; } -TOTypeInfoSP OFieldDescription::getTypeInfo() const -{ - return m_pType; -} TOTypeInfoSP OFieldDescription::getSpecialTypeInfo() const { diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 35e93e66eade..5f98e07a7625 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -634,10 +634,6 @@ void CommandLineArgs::InitParamValues() -OUString CommandLineArgs::GetUnknown() const -{ - return m_unknown; -} bool CommandLineArgs::HasModuleParam() const { @@ -646,15 +642,7 @@ bool CommandLineArgs::HasModuleParam() const } -std::vector< OUString > const & CommandLineArgs::GetAccept() const -{ - return m_accept; -} -std::vector< OUString > const & CommandLineArgs::GetUnaccept() const -{ - return m_unaccept; -} std::vector< OUString > CommandLineArgs::GetOpenList() const { @@ -691,30 +679,14 @@ std::vector< OUString > CommandLineArgs::GetPrintToList() const return translateExternalUris(m_printtolist); } -OUString CommandLineArgs::GetPrinterName() const -{ - return m_printername; -} -OUString CommandLineArgs::GetLanguage() const -{ - return m_language; -} -std::vector< OUString > const & CommandLineArgs::GetInFilter() const -{ - return m_infilter; -} std::vector< OUString > CommandLineArgs::GetConversionList() const { return translateExternalUris(m_conversionlist); } -OUString CommandLineArgs::GetConversionParams() const -{ - return m_conversionparams; -} OUString CommandLineArgs::GetConversionOut() const { return translateExternalUris(m_conversionout); @@ -722,10 +694,6 @@ OUString CommandLineArgs::GetConversionOut() const -OUString CommandLineArgs::GetPidfileName() const -{ - return m_pidfile; -} } // namespace desktop diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index faa76f892a7b..609befbb979b 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -86,12 +86,12 @@ class CommandLineArgs: private boost::noncopyable bool HasModuleParam() const; bool WantsToLoadDocument() const { return m_bDocumentArgs;} - OUString GetUnknown() const; + OUString GetUnknown() const { return m_unknown;} // Access to string parameters bool HasSplashPipe() const { return m_splashpipe;} - std::vector< OUString > const & GetAccept() const; - std::vector< OUString > const & GetUnaccept() const; + std::vector< OUString > const & GetAccept() const { return m_accept;} + std::vector< OUString > const & GetUnaccept() const { return m_unaccept;} std::vector< OUString > GetOpenList() const; std::vector< OUString > GetViewList() const; std::vector< OUString > GetStartList() const; @@ -99,13 +99,13 @@ class CommandLineArgs: private boost::noncopyable std::vector< OUString > GetForceNewList() const; std::vector< OUString > GetPrintList() const; std::vector< OUString > GetPrintToList() const; - OUString GetPrinterName() const; - OUString GetLanguage() const; - std::vector< OUString > const & GetInFilter() const; + OUString GetPrinterName() const { return m_printername;} + OUString GetLanguage() const { return m_language;} + std::vector< OUString > const & GetInFilter() const { return m_infilter;} std::vector< OUString > GetConversionList() const; - OUString GetConversionParams() const; + OUString GetConversionParams() const { return m_conversionparams;} OUString GetConversionOut() const; - OUString GetPidfileName() const; + OUString GetPidfileName() const { return m_pidfile;} // Special analyzed states (does not match directly to a command line parameter!) bool IsEmpty() const { return m_bEmpty;} diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index d9b7b6405f3b..eb47be61d22b 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -316,12 +316,6 @@ bool PersistentMap::erase( OString const & key, bool flush_immediately ) return true; } -t_string2string_map PersistentMap::getEntries() const -{ - // TODO: return by const reference instead? - return m_entries; -} - #ifndef DISABLE_BDB2PMAP bool PersistentMap::importFromBDB() { diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index aa978434b168..dcbc4d10c80b 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -49,7 +49,7 @@ public: bool has( OString const & key ) const; bool get( OString * value, OString const & key ) const; - t_string2string_map getEntries() const; + const t_string2string_map& getEntries() const { return m_entries; } void put( OString const & key, OString const & value ); bool erase( OString const & key, bool flush_immediately = true ); diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 970a0c64ac8e..ffb0021ef37b 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -565,10 +565,6 @@ namespace accessibility rForwarder.LogicToPixel( rRect.BottomRight(), rMapMode ) ); } - const Point& AccessibleEditableTextPara::GetEEOffset() const - { - return maEEOffset; - } void AccessibleEditableTextPara::SetEEOffset( const Point& rOffset ) { diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 334782ac6d44..155da1286e96 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -561,11 +561,6 @@ namespace accessibility ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy } - const Point& AccessibleImageBullet::GetEEOffset() const - { - - return maEEOffset; - } } // end of namespace accessibility diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 33c823d915b7..c18420849089 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -332,10 +332,6 @@ void EditCharAttribField::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetColor( *pTxtColor ); } -const OUString& EditCharAttribField::GetFieldValue() const -{ - return aFieldValue; -} void EditCharAttribField::SetFieldValue(const OUString& rVal) { diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index 505d6876917f..81ecb1952b48 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -365,7 +365,7 @@ public: Color*& GetTxtColor() { return pTxtColor; } Color*& GetFldColor() { return pFldColor; } - const OUString& GetFieldValue() const; + const OUString& GetFieldValue() const { return aFieldValue;} void SetFieldValue(const OUString& rVal); void Reset(); diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 54c96aba59cb..8c48fe98da45 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1002,15 +1002,7 @@ EditLine::~EditLine() { } -EditLine::CharPosArrayType& EditLine::GetCharPosArray() -{ - return aPositions; -} -const EditLine::CharPosArrayType& EditLine::GetCharPosArray() const -{ - return aPositions; -} EditLine* EditLine::Clone() const { @@ -1180,10 +1172,6 @@ EditPaM::EditPaM() : pNode(NULL), nIndex(0) {} EditPaM::EditPaM(const EditPaM& r) : pNode(r.pNode), nIndex(r.nIndex) {} EditPaM::EditPaM(ContentNode* p, sal_Int32 n) : pNode(p), nIndex(n) {} -const ContentNode* EditPaM::GetNode() const -{ - return pNode; -} void EditPaM::SetNode(ContentNode* p) @@ -1657,10 +1645,6 @@ sal_Int32 ContentNode::Len() const return maString.getLength(); } -const OUString& ContentNode::GetString() const -{ - return maString; -} void ContentNode::SetChar(sal_Int32 nPos, sal_Unicode c) { @@ -2778,15 +2762,7 @@ bool CharAttribList::HasAttrib( sal_Int32 nStartPos, sal_Int32 nEndPos ) const return false; } -CharAttribList::AttribsType& CharAttribList::GetAttribs() -{ - return aAttribs; -} -const CharAttribList::AttribsType& CharAttribList::GetAttribs() const -{ - return aAttribs; -} namespace { diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 40d5a9db7536..c9ba4496c3ce 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -222,8 +222,8 @@ public: bool HasBoundingAttrib( sal_Int32 nBound ) const; bool HasAttrib( sal_Int32 nStartPos, sal_Int32 nEndPos ) const; - AttribsType& GetAttribs(); - const AttribsType& GetAttribs() const; + AttribsType& GetAttribs() { return aAttribs;} + const AttribsType& GetAttribs() const { return aAttribs;} void Remove(const EditCharAttrib* p); void Remove(sal_Int32 nPos); @@ -279,7 +279,7 @@ public: bool IsFeature( sal_Int32 nPos ) const; sal_Int32 Len() const; - const OUString& GetString() const; + const OUString& GetString() const { return maString;} void SetChar(sal_Int32 nPos, sal_Unicode c); void Insert(const OUString& rStr, sal_Int32 nPos); @@ -305,7 +305,7 @@ public: EditPaM(const EditPaM& r); EditPaM(ContentNode* p, sal_Int32 n); - const ContentNode* GetNode() const; + const ContentNode* GetNode() const { return pNode;} ContentNode* GetNode() { return pNode;} void SetNode(ContentNode* p); @@ -536,8 +536,8 @@ public: bool IsEmpty() const { return (nEnd > nStart) ? sal_False : sal_True; } - CharPosArrayType& GetCharPosArray(); - const CharPosArrayType& GetCharPosArray() const; + CharPosArrayType& GetCharPosArray() { return aPositions;} + const CharPosArrayType& GetCharPosArray() const { return aPositions;} EditLine* Clone() const; diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 9938e9cd964c..be0e9fba153f 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -150,10 +150,6 @@ void ContentInfo::NormalizeString( svl::SharedStringPool& rPool ) maText = rPool.intern(OUString(maText.getData())); } -const svl::SharedString& ContentInfo::GetSharedString() const -{ - return maText; -} OUString ContentInfo::GetText() const { @@ -676,15 +672,7 @@ void EditTextObjectImpl::DestroyAttrib( XEditAttribute* pAttr ) delete pAttr; } -EditTextObjectImpl::ContentInfosType& EditTextObjectImpl::GetContents() -{ - return aContents; -} -const EditTextObjectImpl::ContentInfosType& EditTextObjectImpl::GetContents() const -{ - return aContents; -} ContentInfo* EditTextObjectImpl::CreateAndInsertContent() { @@ -1056,10 +1044,6 @@ void EditTextObjectImpl::ChangeStyleSheetName( SfxStyleFamily eFamily, ImpChangeStyleSheets( rOldName, eFamily, rNewName, eFamily ); } -editeng::FieldUpdater EditTextObjectImpl::GetFieldUpdater() -{ - return editeng::FieldUpdater(*mpFront); -} namespace { diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 1e9773c0be02..131a68f99d2a 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -21,6 +21,7 @@ #define INCLUDED_EDITENG_SOURCE_EDITENG_EDITOBJ2_HXX #include <editeng/editobj.hxx> +#include <editeng/fieldupdater.hxx> #include <editdoc.hxx> #include <unotools/fontcvt.hxx> @@ -144,7 +145,7 @@ public: ~ContentInfo(); void NormalizeString( svl::SharedStringPool& rPool ); - const svl::SharedString& GetSharedString() const; + const svl::SharedString& GetSharedString() const { return maText;} OUString GetText() const; void SetText( const OUString& rStr ); @@ -221,8 +222,8 @@ public: XEditAttribute* CreateAttrib( const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd ); void DestroyAttrib( XEditAttribute* pAttr ); - ContentInfosType& GetContents(); - const ContentInfosType& GetContents() const; + ContentInfosType& GetContents() { return aContents;} + const ContentInfosType& GetContents() const { return aContents;} SfxItemPool* GetPool() const { return pPool; } XParaPortionList* GetPortionInfo() const { return pPortionInfo; } void SetPortionInfo( XParaPortionList* pP ) @@ -255,7 +256,7 @@ public: const OUString& rOldName, SfxStyleFamily eOldFamily, const OUString& rNewName, SfxStyleFamily eNewFamily); void ChangeStyleSheetName(SfxStyleFamily eFamily, const OUString& rOldName, const OUString& rNewName); - editeng::FieldUpdater GetFieldUpdater(); + editeng::FieldUpdater GetFieldUpdater() { return editeng::FieldUpdater(*mpFront);} bool HasMetric() const { return nMetric != 0xFFFF; } sal_uInt16 GetMetric() const { return nMetric; } diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 56a7cf95aa58..52196a668426 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -208,10 +208,6 @@ WrongList::WrongList(const WrongList& r) : WrongList::~WrongList() {} -const std::vector<editeng::MisspellRange>& WrongList::GetRanges() const -{ - return maRanges; -} void WrongList::SetRanges( const std::vector<editeng::MisspellRange>& rRanges ) { diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index 7f1f5c54027d..797e41b1143e 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -86,7 +86,7 @@ public: WrongList(const WrongList& r); ~WrongList(); - const std::vector<editeng::MisspellRange>& GetRanges() const; + const std::vector<editeng::MisspellRange>& GetRanges() const { return maRanges;} void SetRanges( const std::vector<editeng::MisspellRange>& rRanges ); bool IsValid() const; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 7b2524768437..cc7bb58a3abc 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -824,10 +824,6 @@ Sequence< OUString > BibDataManager::getDataSources() return aTableNameSeq; } -OUString BibDataManager::getActiveDataTable() -{ - return aActiveDataTable; -} void BibDataManager::setFilter(const OUString& rQuery) { diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 23580fe8901b..1bdd48b4a89f 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -148,7 +148,7 @@ public: OUString getActiveDataSource() {return aDataSourceURL;} void setActiveDataSource(const OUString& rURL); - OUString getActiveDataTable(); + OUString getActiveDataTable() { return aActiveDataTable;} void setActiveDataTable(const OUString& rTable); void setFilter(const OUString& rQuery); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 3db37dfeb6d1..d08505bc5bf2 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -74,10 +74,6 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta } }; -OUString BibToolBarListener::GetCommand() const -{ - return aCommand; -} BibTBListBoxListener::BibTBListBoxListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId): BibToolBarListener(pTB,aStr,nId) diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 08a0517860e8..b14c231c7d86 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -51,7 +51,7 @@ public: BibToolBarListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); virtual ~BibToolBarListener(); - OUString GetCommand() const; + OUString GetCommand() const { return aCommand;} // ::com::sun::star::lang::XEventListener // we do not hold References to dispatches, so there is nothing to do on disposal diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index c7b93688046d..00bce2cd7f00 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -57,16 +57,8 @@ namespace pcr } - OBrowserListBox& OBrowserPage::getListBox() - { - return m_aListBox; - } - const OBrowserListBox& OBrowserPage::getListBox() const - { - return m_aListBox; - } void OBrowserPage::StateChanged(StateChangedType nType) diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index b1420cda2467..bb368df0ed45 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -47,8 +47,8 @@ namespace pcr sal_Int32 getMinimumWidth(); sal_Int32 getMinimumHeight(); - OBrowserListBox& getListBox(); - const OBrowserListBox& getListBox() const; + OBrowserListBox& getListBox() { return m_aListBox; } + const OBrowserListBox& getListBox() const { return m_aListBox; } }; diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 23da15b73726..2b4263058802 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -58,10 +58,6 @@ namespace pcr - Reference< XPropertyControlContext > SAL_CALL ControlHelper::getControlContext() throw (RuntimeException) - { - return m_xContext; - } void SAL_CALL ControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) throw (RuntimeException) diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index 7eab623cf99e..8de803bdbf98 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -132,7 +132,7 @@ namespace pcr public: // XPropertyControl ::sal_Int16 SAL_CALL getControlType() throw (::com::sun::star::uno::RuntimeException) { return m_nControlType; } - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > SAL_CALL getControlContext() throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > SAL_CALL getControlContext() throw (::com::sun::star::uno::RuntimeException) { return m_xContext; } void SAL_CALL setControlContext( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext >& _controlcontext ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getControlWindow() throw (::com::sun::star::uno::RuntimeException); bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException) { return m_bModified; } diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 9ce5f7867d72..e1858f2a5ba5 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -288,13 +288,6 @@ void Writer::endTag() -sal_uInt16 Writer::createID() -{ - return mnNextId++; -} - - - void Writer::showFrame() { startTag( TAG_SHOWFRAME ); diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 2d0a4aa4fabe..f54dd2904d85 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -332,7 +332,7 @@ private: void startTag( sal_uInt8 nTagId ); void endTag(); - sal_uInt16 createID(); + sal_uInt16 createID() { return mnNextId++; } void Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 height, sal_uInt8 *pCompressed, sal_uInt32 compressed_size ); void Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz, const Rectangle& rClipRect, bool bMap ); diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 589b7d98eb44..069e50642f13 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -92,11 +92,6 @@ CustomToolBarImportHelper::getCfgManager() return m_xCfgSupp->getUIConfigurationManager(); } -uno::Reference< ui::XUIConfigurationManager > -CustomToolBarImportHelper::getAppCfgManager() -{ - return m_xAppCfgMgr; -} uno::Any CustomToolBarImportHelper::createCommandFromMacro( const OUString& sCmd ) @@ -720,13 +715,6 @@ TBCBitMap::~TBCBitMap() { } -// #FIXME Const-ness -Bitmap& -TBCBitMap::getBitMap() -{ - return mBitMap; -} - bool TBCBitMap::Read( SvStream& rS) { OSL_TRACE("TBCBitMap::Read() stream pos 0x%x", rS.Tell() ); diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx index 961eaeda9470..3f0aeba52f95 100644 --- a/filter/source/placeware/tempfile.cxx +++ b/filter/source/placeware/tempfile.cxx @@ -159,9 +159,5 @@ OUString PlaceWareTempFile::createTempFileURL() return aTempFileURL; } -OUString PlaceWareTempFile::getFileURL() -{ - return maURL; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/placeware/tempfile.hxx b/filter/source/placeware/tempfile.hxx index ceefca9a3ff6..38b03f0f566e 100644 --- a/filter/source/placeware/tempfile.hxx +++ b/filter/source/placeware/tempfile.hxx @@ -30,7 +30,7 @@ public: ~PlaceWareTempFile(); static OUString createTempFileURL(); - OUString getFileURL(); + OUString getFileURL() { return maURL;} private: OUString maURL; diff --git a/filter/source/svg/b2dellipse.cxx b/filter/source/svg/b2dellipse.cxx index 4e6196f0e025..07799b583eba 100644 --- a/filter/source/svg/b2dellipse.cxx +++ b/filter/source/svg/b2dellipse.cxx @@ -32,15 +32,7 @@ namespace basegfx return !(*this == rEllipse); } - basegfx::B2DPoint B2DEllipse::getB2DEllipseCenter() const - { - return maCenter; - } - basegfx::B2DTuple B2DEllipse::getB2DEllipseRadius() const - { - return maRadius; - } } // end of namespace basegfx /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/svg/b2dellipse.hxx b/filter/source/svg/b2dellipse.hxx index 21c1937da982..30e19d9a8570 100644 --- a/filter/source/svg/b2dellipse.hxx +++ b/filter/source/svg/b2dellipse.hxx @@ -45,8 +45,8 @@ namespace basegfx bool operator!=(const B2DEllipse& rEllipse) const; // Coordinate interface - basegfx::B2DPoint getB2DEllipseCenter() const; - basegfx::B2DTuple getB2DEllipseRadius() const; + basegfx::B2DPoint getB2DEllipseCenter() const { return maCenter; } + basegfx::B2DTuple getB2DEllipseRadius() const { return maRadius; } }; } // end of namespace basegfx diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 882501fa3eb6..de259dda5cc7 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -536,17 +536,7 @@ namespace XSLT } } - const OString - LibXSLTTransformer::getStyleSheetURL() - { - return m_styleSheetURL; - } - ::std::map<const char*, OString> - LibXSLTTransformer::getParameters() - { - return m_parameters; - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx index 1233ad603afa..45c5490a14e2 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.hxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx @@ -139,10 +139,10 @@ namespace XSLT error(const OUString& msg); const OString SAL_CALL - getStyleSheetURL(); + getStyleSheetURL() { return m_styleSheetURL; } ::std::map<const char*, OString> SAL_CALL - getParameters(); + getParameters() { return m_parameters; } com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> SAL_CALL getComponentContext() { diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 677404f9841a..187d5567b66e 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -141,10 +141,6 @@ Binding::~Binding() throw() } -Binding::Model_t Binding::getModel() const -{ - return mxModel; -} void Binding::_setModel( const Model_t& xModel ) { @@ -337,10 +333,6 @@ Binding* SAL_CALL Binding::getBinding( const Reference<XPropertySet>& xPropertyS -OUString Binding::getBindingID() const -{ - return msBindingID; -} void Binding::setBindingID( const OUString& sBindingID ) { @@ -419,10 +411,6 @@ void Binding::setCalculateExpression( const OUString& sCalculate ) bindingModified(); } -OUString Binding::getType() const -{ - return msTypeName; -} void Binding::setType( const OUString& sTypeName ) { @@ -430,12 +418,6 @@ void Binding::setType( const OUString& sTypeName ) bindingModified(); } -Binding::XNameContainer_t Binding::getBindingNamespaces() const -{ - // return _getNamespaces(); - return mxNamespaces; -} - void Binding::setBindingNamespaces( const XNameContainer_t& rNamespaces ) { _setNamespaces( rNamespaces, true ); diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx index b91162f7b9ad..6af252fa45dd 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -178,13 +178,13 @@ public: // property methods: get/set value - Model_t getModel() const; /// get XForms model + Model_t getModel() const { return mxModel;} /// get XForms model void _setModel( const Model_t& ); /// set XForms model (only called by Model) OUString getModelID() const; /// get ID of XForms model - OUString getBindingID() const; /// get ID for this binding + OUString getBindingID() const { return msBindingID;} /// get ID for this binding void setBindingID( const OUString& ); /// set ID for this binding OUString getBindingExpression() const; /// get binding expression @@ -207,7 +207,7 @@ public: OUString getCalculateExpression() const; /// get calculate MIP void setCalculateExpression( const OUString& ); /// set calculate MIP - OUString getType() const; /// get type name MIP (static) + OUString getType() const { return msTypeName;} /// get type name MIP (static) void setType( const OUString& ); /// set type name MIP (static) // a binding expression can only be interpreted with respect to @@ -215,7 +215,7 @@ public: // access to a binding's namespace // (set-method only changes local namespaces (but may add to model)) - XNameContainer_t getBindingNamespaces() const; /// set binding namespaces + XNameContainer_t getBindingNamespaces() const { return mxNamespaces; } void setBindingNamespaces( const XNameContainer_t& ); /// get binding nmsp. // access to the model's namespaces diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index b00077d47a5a..600a795e5288 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -70,10 +70,6 @@ ComputedExpression::~ComputedExpression() } -OUString ComputedExpression::getExpression() const -{ - return msExpression; -} void ComputedExpression::setExpression( const OUString& rExpression ) { @@ -113,12 +109,6 @@ bool ComputedExpression::isSimpleExpression() const } -const OUString ComputedExpression::_getExpressionForEvaluation() const -{ - // the default implementation is to do nothing... - return msExpression; -} - bool ComputedExpression::_evaluate( const xforms::EvaluationContext& rContext, const OUString& sExpression ) @@ -162,10 +152,6 @@ void ComputedExpression::clear() mxResult.clear(); } -Reference<XXPathObject> ComputedExpression::getXPath() const -{ - return mxResult; -} OUString ComputedExpression::getString( const OUString& rDefault ) const { diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx index a2c43053f0b9..3f347d0cf753 100644 --- a/forms/source/xforms/computedexpression.hxx +++ b/forms/source/xforms/computedexpression.hxx @@ -66,7 +66,8 @@ protected: bool _checkExpression( const sal_Char* pExpression ) const; /// allow manipulation of the expression before it is evaluated - const OUString _getExpressionForEvaluation() const; + // the default implementation is to do nothing... + const OUString _getExpressionForEvaluation() const { return msExpression; } /// obtain a (suitable) XPathAPI implementation com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathAPI> _getXPathAPI(const xforms::EvaluationContext& aContext); @@ -82,7 +83,7 @@ public: /// get the expression string - OUString getExpression() const; + OUString getExpression() const { return msExpression;} /// set a new expression string void setExpression( const OUString& rExpression ); @@ -117,7 +118,7 @@ public: // get the result of this expression as string/bool/... // (Results will be based on the last call of evaluate(..). The caller // must call evaluate to ensure current results.) - com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathObject> getXPath() const; + com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathObject> getXPath() const { return mxResult;} bool getBool( bool bDefault = false ) const; OUString getString( const OUString& rDefault = OUString() ) const; diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx index 493881b9170b..838d4033cbfc 100644 --- a/forms/source/xforms/mip.cxx +++ b/forms/source/xforms/mip.cxx @@ -91,13 +91,11 @@ void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; ms void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation = OUString(); } void MIP::setConstraintExplanation( const OUString& s ) { msConstraintExplanation = s; } -OUString MIP::getConstraintExplanation() const { return msConstraintExplanation; } void MIP::setHasCalculate( bool b ) { mbHasCalculate = b; } void MIP::resetCalculate() { mbHasCalculate = false; } - OUString MIP::getTypeName() const { return msTypeName; } void MIP::setTypeName( const OUString& s ) { msTypeName = s; mbHasTypeName = true; } void MIP::resetTypeName() { msTypeName = OUString(); mbHasTypeName = false; } diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx index 361f1229a40f..729e408f8833 100644 --- a/forms/source/xforms/mip.hxx +++ b/forms/source/xforms/mip.hxx @@ -64,7 +64,7 @@ public: // - type (static; default: xsd:string) // (currently default implemented as empty string) bool hasTypeName() const { return mbHasTypeName; } - OUString getTypeName() const; + OUString getTypeName() const { return msTypeName; } void setTypeName( const OUString& ); void resetTypeName(); @@ -94,7 +94,7 @@ public: // explain _why_ a constraint failed void setConstraintExplanation( const OUString& ); - OUString getConstraintExplanation() const; + OUString getConstraintExplanation() const { return msConstraintExplanation; } // - calculate (computed XPath; default: has none (false)) // (for calculate, we only store whether a calculate MIP is present; diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index b111d817f8f2..6c81ae1c4396 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -176,30 +176,18 @@ Model::IntSequence_t Model::getUnoTunnelID() return aImplementationId.getImplementationId(); } -Model::XDocument_t Model::getForeignSchema() const -{ - return mxForeignSchema; -} void Model::setForeignSchema( const XDocument_t& rDocument ) { mxForeignSchema = rDocument; } -OUString Model::getSchemaRef() const -{ - return msSchemaRef; -} void Model::setSchemaRef( const OUString& rSchemaRef ) { msSchemaRef = rSchemaRef; } -Model::XNameContainer_t Model::getNamespaces() const -{ - return mxNamespaces; -} void Model::setNamespaces( const XNameContainer_t& rNamespaces ) { diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index 5559d6a80c76..0d8b962414e5 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -144,15 +144,15 @@ public: // get/set that part of the schema, that we can't interpret as data types - XDocument_t getForeignSchema() const; + XDocument_t getForeignSchema() const { return mxForeignSchema;} void setForeignSchema( const XDocument_t& ); // get/set the xforms:model/@schema attribute - OUString getSchemaRef() const; + OUString getSchemaRef() const { return msSchemaRef;} void setSchemaRef( const OUString& ); // get/set namespaces for entire model - XNameContainer_t getNamespaces() const; + XNameContainer_t getNamespaces() const { return mxNamespaces;} void setNamespaces( const XNameContainer_t& ); // get/set the ExternalData property diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx index af45a3e239a8..c8273224830b 100644 --- a/forms/source/xforms/pathexpression.cxx +++ b/forms/source/xforms/pathexpression.cxx @@ -128,10 +128,6 @@ Reference<XNode> PathExpression::getNode() const return xResult; } -const PathExpression::NodeVector_t PathExpression::getNodeList() const -{ - return maNodes; -} Reference<XNodeList> PathExpression::getXNodeList() const { diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx index 9e0a41b74262..a01aec66a29d 100644 --- a/forms/source/xforms/pathexpression.hxx +++ b/forms/source/xforms/pathexpression.hxx @@ -70,7 +70,7 @@ public: // get the result of this expression as node/node list/... com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> getNode() const; - const NodeVector_t getNodeList() const; + const NodeVector_t getNodeList() const { return maNodes;} com::sun::star::uno::Reference<com::sun::star::xml::dom::XNodeList> getXNodeList() const; }; diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index a3eb261f6943..82fb8b9bb682 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -105,30 +105,18 @@ Submission::~Submission() throw() { } -Reference<XModel> Submission::getModel() const -{ - return mxModel; -} void Submission::setModel( const Reference<XModel>& xModel ) { mxModel = xModel; } -OUString Submission::getID() const -{ - return msID; -} void Submission::setID( const OUString& sID ) { msID = sID; } -OUString Submission::getBind() const -{ - return msBind; -} void Submission::setBind( const OUString& sBind ) { @@ -145,30 +133,18 @@ void Submission::setRef( const OUString& sRef ) maRef.setExpression( sRef ); } -OUString Submission::getAction() const -{ - return msAction; -} void Submission::setAction( const OUString& sAction ) { msAction = sAction; } -OUString Submission::getMethod() const -{ - return msMethod; -} void Submission::setMethod( const OUString& sMethod ) { msMethod = sMethod; } -OUString Submission::getVersion() const -{ - return msVersion; -} void Submission::setVersion( const OUString& sVersion ) { @@ -181,20 +157,12 @@ void Submission::setIndent( bool bIndent ) mbIndent = bIndent; } -OUString Submission::getMediaType() const -{ - return msMediaType; -} void Submission::setMediaType( const OUString& sMediaType ) { msMediaType = sMediaType; } -OUString Submission::getEncoding() const -{ - return msEncoding; -} void Submission::setEncoding( const OUString& sEncoding ) { @@ -213,40 +181,24 @@ void Submission::setStandalone( bool bStandalone ) mbStandalone = bStandalone; } -OUString Submission::getCDataSectionElement() const -{ - return msCDataSectionElement; -} void Submission::setCDataSectionElement( const OUString& sCDataSectionElement ) { msCDataSectionElement = sCDataSectionElement; } -OUString Submission::getReplace() const -{ - return msReplace; -} void Submission::setReplace( const OUString& sReplace ) { msReplace = sReplace; } -OUString Submission::getSeparator() const -{ - return msSeparator; -} void Submission::setSeparator( const OUString& sSeparator ) { msSeparator = sSeparator; } -Sequence< OUString > Submission::getIncludeNamespacePrefixes() const -{ - return msIncludeNamespacePrefixes; -} void Submission::setIncludeNamespacePrefixes( const Sequence< OUString >& rIncludeNamespacePrefixes ) { diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index a431f54c856d..a7d45b42be29 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -102,37 +102,37 @@ public: /// get XForms model com::sun::star::uno::Reference<com::sun::star::xforms::XModel> - getModel() const; + getModel() const { return mxModel;} /// set XForms model void setModel( const com::sun::star::uno::Reference<com::sun::star::xforms::XModel>& ); - OUString getID() const; /// get ID for this submission + OUString getID() const { return msID;} /// get ID for this submission void setID( const OUString& ); /// set ID for this submission - OUString getBind() const; + OUString getBind() const { return msBind;} void setBind( const OUString& ); OUString getRef() const; void setRef( const OUString& ); - OUString getAction() const; + OUString getAction() const { return msAction;} void setAction( const OUString& ); - OUString getMethod() const; + OUString getMethod() const { return msMethod;} void setMethod( const OUString& ); - OUString getVersion() const; + OUString getVersion() const { return msVersion;} void setVersion( const OUString& ); bool getIndent() const { return mbIndent;} void setIndent( bool ); - OUString getMediaType() const; + OUString getMediaType() const { return msMediaType;} void setMediaType( const OUString& ); - OUString getEncoding() const; + OUString getEncoding() const { return msEncoding;} void setEncoding( const OUString& ); bool getOmitXmlDeclaration() const { return mbOmitXmlDeclaration;} @@ -141,16 +141,16 @@ public: bool getStandalone() const { return mbStandalone;} void setStandalone( bool ); - OUString getCDataSectionElement() const; + OUString getCDataSectionElement() const { return msCDataSectionElement;} void setCDataSectionElement( const OUString& ); - OUString getReplace() const; + OUString getReplace() const { return msReplace;} void setReplace( const OUString& ); - OUString getSeparator() const; + OUString getSeparator() const { return msSeparator;} void setSeparator( const OUString& ); - com::sun::star::uno::Sequence< OUString > getIncludeNamespacePrefixes() const; + com::sun::star::uno::Sequence< OUString > getIncludeNamespacePrefixes() const { return msIncludeNamespacePrefixes;} void setIncludeNamespacePrefixes( const com::sun::star::uno::Sequence< OUString >& ); diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 4e57632588ed..23b7f270ac1b 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -83,15 +83,7 @@ void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequen } } -Reference< XModel > CLibxml2XFormsExtension::getModel() -{ - return m_aModel; -} -Reference< XNode > CLibxml2XFormsExtension::getContextNode() -{ - return m_aContextNode; -} extern "C" void SAL_CALL createRegistryInfo_CLibxml2XFormsExtension() { diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx index e631d55935b8..bbb9d9838615 100644 --- a/forms/source/xforms/xpathlib/extension.hxx +++ b/forms/source/xforms/xpathlib/extension.hxx @@ -52,8 +52,8 @@ public: static OUString SAL_CALL getImplementationName_Static(); static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); - com::sun::star::uno::Reference< com::sun::star::xforms::XModel > getModel(); - com::sun::star::uno::Reference< com::sun::star::xml::dom::XNode > getContextNode(); + com::sun::star::uno::Reference< com::sun::star::xforms::XModel > getModel() { return m_aModel;} + com::sun::star::uno::Reference< com::sun::star::xml::dom::XNode > getContextNode() { return m_aContextNode;} virtual com::sun::star::xml::xpath::Libxml2ExtensionHandle SAL_CALL getLibxml2ExtensionHandle() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL initialize(const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aSequence) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 3247f2a8dfcd..58f5a855e26c 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -116,7 +116,7 @@ namespace formula RefEdit* GetCurrRefEdit(); - const FormulaHelper& GetFormulaHelper() const; + const FormulaHelper& GetFormulaHelper() const { return m_aFormulaHelper;} uno::Reference< sheet::XFormulaOpCodeMapper > GetFormulaOpCodeMapper() const; DECL_LINK( ModifyHdl, ParaWin* ); @@ -1621,10 +1621,6 @@ void FormulaDlg_Impl::SetEdSelection() } // if( pEd ) } -const FormulaHelper& FormulaDlg_Impl::GetFormulaHelper() const -{ - return m_aFormulaHelper; -} FormulaModalDialog::FormulaModalDialog( Window* pParent , bool _bSupportFunctionResult diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 5ec0e61ad29b..27891a481501 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -245,15 +245,15 @@ class AddonsOptions_Impl : public ConfigItem bool HasAddonsMenu () const; sal_Int32 GetAddonsToolBarCount() const; - const Sequence< Sequence< PropertyValue > >& GetAddonsMenu () const; - const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const; + const Sequence< Sequence< PropertyValue > >& GetAddonsMenu () const { return m_aCachedMenuProperties;} + const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const { return m_aCachedMenuBarPartProperties;} const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const; const OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; - const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const; + const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const { return m_aCachedHelpMenuProperties;} Image GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale ); - const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; + const MergeMenuInstructionContainer& GetMergeMenuInstructions() const { return m_aCachedMergeMenuInsContainer;} bool GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const; - const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const; + const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const { return m_aCachedStatusbarMergingInstructions;} void ReadConfigurationData(); @@ -496,20 +496,6 @@ sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const // public method -const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() const -{ - return m_aCachedMenuProperties; -} - -// public method - -const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBarPart() const -{ - return m_aCachedMenuBarPartProperties; -} - -// public method - const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBarPart( sal_uInt32 nIndex ) const { if ( /*nIndex >= 0 &&*/ nIndex < m_aCachedToolBarPartProperties.size() ) @@ -530,20 +516,6 @@ const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nInd // public method -const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu () const -{ - return m_aCachedHelpMenuProperties; -} - -// public method - -const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstructions() const -{ - return m_aCachedMergeMenuInsContainer; -} - -// public method - bool AddonsOptions_Impl::GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const @@ -558,10 +530,6 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions( return false; } -const MergeStatusbarInstructionContainer& AddonsOptions_Impl::GetMergeStatusbarInstructions() const -{ - return m_aCachedStatusbarMergingInstructions; -} // public method diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 785303e0037f..2e974e8c70b5 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -274,15 +274,7 @@ ImageList* CmdImageList::impl_getImageList( sal_Int16 nImageType ) return m_pImageList[nImageType]; } -std::vector< OUString >& CmdImageList::impl_getImageNameVector() -{ - return m_aImageNameVector; -} -std::vector< OUString >& CmdImageList::impl_getImageCommandNameVector() -{ - return m_aImageCommandNameVector; -} Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL ) { diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index a76ee632adab..362cfe1d7c9f 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -69,8 +69,8 @@ namespace framework protected: void impl_fillCommandToImageNameMap(); ImageList* impl_getImageList( sal_Int16 nImageType ); - std::vector< OUString >& impl_getImageNameVector(); - std::vector< OUString >& impl_getImageCommandNameVector(); + std::vector< OUString >& impl_getImageNameVector() { return m_aImageNameVector;} + std::vector< OUString >& impl_getImageCommandNameVector() { return m_aImageCommandNameVector;} private: bool m_bVectorInit; diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx index 7b8c34decd02..5a9be4eec83b 100644 --- a/hwpfilter/source/hpara.cxx +++ b/hwpfilter/source/hpara.cxx @@ -198,10 +198,6 @@ CharShape *HWPPara::GetCharShape(int pos) } -ParaShape *HWPPara::GetParaShape(void) -{ - return &pshape; -} HBox *HWPPara::readHBox(HWPFile & hwpf) diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h index f382a96f9049..49c1f3008996 100644 --- a/hwpfilter/source/hpara.h +++ b/hwpfilter/source/hpara.h @@ -130,7 +130,7 @@ class DLLEXPORT HWPPara /** * Returns the style of paragraph. */ - ParaShape *GetParaShape(void); + ParaShape *GetParaShape(void) { return &pshape;} /** * Returns previous paragraph. diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx index 5b91dc4a5e4d..6be9bd85f343 100644 --- a/hwpfilter/source/hstyle.cxx +++ b/hwpfilter/source/hstyle.cxx @@ -53,10 +53,6 @@ HWPStyle::~HWPStyle(void) } -int HWPStyle::Num(void) const -{ - return nstyles; -} char *HWPStyle::GetName(int n) const diff --git a/hwpfilter/source/hstyle.h b/hwpfilter/source/hstyle.h index 1dd37ea48ccb..443102983535 100644 --- a/hwpfilter/source/hstyle.h +++ b/hwpfilter/source/hstyle.h @@ -36,7 +36,7 @@ class DLLEXPORT HWPStyle HWPStyle( void ); ~HWPStyle( void ); - int Num( void ) const; + int Num( void ) const { return nstyles;} char *GetName( int n ) const; CharShape *GetCharShape( int n ) const; ParaShape *GetParaShape( int n ) const; diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx index 5a1b40b2639c..887f0536d6b9 100644 --- a/idlc/inc/idlc/options.hxx +++ b/idlc/inc/idlc/options.hxx @@ -60,7 +60,7 @@ public: OString prepareHelp(); OString prepareVersion(); - const OString& getProgramName() const; + const OString& getProgramName() const { return m_program;} bool isValid(const OString& option); const OString& getOption(const OString& option) throw( IllegalArgument ); diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx index 9a15ea795ca9..dfdb9bd291a9 100644 --- a/idlc/source/options.cxx +++ b/idlc/source/options.cxx @@ -418,10 +418,6 @@ OString Options::prepareVersion() return version; } -const OString& Options::getProgramName() const -{ - return m_program; -} bool Options::isValid(const OString& option) { diff --git a/include/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx index f5148dbe7718..4b95987ddc89 100644 --- a/include/basegfx/vector/b2dvector.hxx +++ b/include/basegfx/vector/b2dvector.hxx @@ -141,7 +141,7 @@ namespace basegfx @return The Scalar value of the two involved 2D Vectors */ - double scalar( const B2DVector& rVec ) const; + double scalar( const B2DVector& rVec ) const { return((mfX * rVec.mfX) + (mfY * rVec.mfY)); } /** Calculate the length of the cross product with another 2D Vector @@ -158,7 +158,7 @@ namespace basegfx @return The length of the cross product of the two involved 2D Vectors */ - double cross( const B2DVector& rVec ) const; + double cross( const B2DVector& rVec ) const { return(mfX * rVec.getY() - mfY * rVec.getX()); } /** Calculate the Angle with another 2D Vector diff --git a/include/basegfx/vector/b2ivector.hxx b/include/basegfx/vector/b2ivector.hxx index 23eb811becd1..1fdeeb4ea13a 100644 --- a/include/basegfx/vector/b2ivector.hxx +++ b/include/basegfx/vector/b2ivector.hxx @@ -121,7 +121,7 @@ namespace basegfx @return The Scalar value of the two involved 2D Vectors */ - double scalar( const B2IVector& rVec ) const; + double scalar( const B2IVector& rVec ) const { return((mnX * rVec.mnX) + (mnY * rVec.mnY)); } /** Transform vector by given transformation matrix. diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx index 06c67cd75dd3..2f5ef0126ef2 100644 --- a/include/basic/basmgr.hxx +++ b/include/basic/basmgr.hxx @@ -188,7 +188,7 @@ public: // Modify-Flag will be reset only during save. bool IsBasicModified() const; - std::vector<BasicError>& GetErrors(); + std::vector<BasicError>& GetErrors() { return aErrors;} /** sets a global constant in the basic library, referring to some UNO object, to a new value. diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index e245840f193a..3c60c668e386 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -24,6 +24,7 @@ #include <basic/sbdef.hxx> #include <basic/sbxobj.hxx> #include <basic/sbxdef.hxx> +#include <basic/sbx.hxx> #include <rtl/ustring.hxx> #include <vector> #include <deque> @@ -102,7 +103,7 @@ public: virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; virtual const OUString& GetSource() const; - const OUString& GetSource32() const; + const OUString& GetSource32() const { return aOUSource;} const OUString& GetComment() const { return aComment; } virtual void SetSource( const OUString& r ); void SetSource32( const OUString& r ); @@ -135,7 +136,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > GetUnoModule(); bool createCOMWrapperForIface( ::com::sun::star::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject ); void GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache); - SbxArrayRef GetMethods(); + SbxArrayRef GetMethods() { return pMethods;} OUString GetKeywordCase( const OUString& sKeyword ) const; }; diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index ec133d8bbd06..1c84f11ba805 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -137,7 +137,7 @@ public: virtual SbxClassType GetClass() const SAL_OVERRIDE; virtual SbxDataType GetType() const SAL_OVERRIDE; - SbxDataType GetFullType() const; + SbxDataType GetFullType() const { return aData.eType;} bool SetType( SbxDataType ); virtual bool Get( SbxValues& ) const; diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx index 04c215295c09..b43beb9f58af 100644 --- a/include/canvas/base/canvascustomspritehelper.hxx +++ b/include/canvas/base/canvascustomspritehelper.hxx @@ -89,8 +89,8 @@ namespace canvas // Sprite bool isAreaUpdateOpaque( const ::basegfx::B2DRange& rUpdateArea ) const; - ::basegfx::B2DPoint getPosPixel() const; - ::basegfx::B2DVector getSizePixel() const; + ::basegfx::B2DPoint getPosPixel() const { return maPosition; } + ::basegfx::B2DVector getSizePixel() const { return maSize; } ::basegfx::B2DRange getUpdateArea() const; double getPriority() const { return mfPriority; } diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx index 369f8818e77b..0c71b7537142 100644 --- a/include/codemaker/options.hxx +++ b/include/codemaker/options.hxx @@ -52,7 +52,7 @@ public: virtual ::rtl::OString prepareHelp() = 0; - const ::rtl::OString& getProgramName() const; + const ::rtl::OString& getProgramName() const { return m_program;} bool isValid(const ::rtl::OString& option) const; const ::rtl::OString getOption(const ::rtl::OString& option) const throw( IllegalArgument ); diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx index 0143faab4ed1..c4efd3aa4f7f 100644 --- a/include/comphelper/stillreadwriteinteraction.hxx +++ b/include/comphelper/stillreadwriteinteraction.hxx @@ -43,7 +43,7 @@ public: void resetInterceptions(); void resetErrorStates(); - bool wasWriteError(); + bool wasWriteError() { return (m_bUsed && m_bHandledByMySelf);} private: virtual ucbhelper::InterceptedInteraction::EInterceptionState intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest& aRequest, diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 331b2f895447..4daa11558a3f 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -315,7 +315,7 @@ namespace accessibility /// Do we have children? This is the case for image bullets bool HaveChildren(); - const Point& GetEEOffset() const; + const Point& GetEEOffset() const { return maEEOffset; } // Get text from forwarder OUString GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ); diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index d13ed7bab820..02cbc75843ba 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -186,7 +186,7 @@ namespace accessibility */ SvxViewForwarder& GetViewForwarder() const; - const Point& GetEEOffset() const; + const Point& GetEEOffset() const { return maEEOffset; } // the paragraph index in the edit engine (guarded by solar mutex) sal_Int32 mnParagraphIndex; diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 586f65592ca5..58af3c4d665f 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -54,7 +54,7 @@ public: void setMSOCommandMap( MSOCommandConvertor* pCnvtr ) { pMSOCmdConvertor.reset( pCnvtr ); } css::uno::Reference< css::ui::XUIConfigurationManager > getCfgManager(); - css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager(); + css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager() { return m_xAppCfgMgr;} css::uno::Any createCommandFromMacro( const OUString& sCmd ); @@ -166,7 +166,8 @@ public: #if OSL_DEBUG_LEVEL > 1 virtual void Print( FILE* ) SAL_OVERRIDE; #endif - Bitmap& getBitMap(); + // #FIXME Const-ness + Bitmap& getBitMap() { return mBitMap;} }; class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx index 6ba969a22e1e..323cad717738 100644 --- a/include/jvmaccess/unovirtualmachine.hxx +++ b/include/jvmaccess/unovirtualmachine.hxx @@ -74,7 +74,7 @@ public: @return The Java virtual machine wrapper. Will never be null. */ - rtl::Reference< jvmaccess::VirtualMachine > getVirtualMachine() const; + rtl::Reference< jvmaccess::VirtualMachine > getVirtualMachine() const { return m_virtualMachine;} /** Get the UNO class loader. diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index e2cda6e4f88c..cdd614063161 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -57,7 +57,7 @@ public: AgileEngine(); virtual ~AgileEngine(); - AgileEncryptionInfo& getInfo(); + AgileEncryptionInfo& getInfo() { return mInfo;} virtual bool writeEncryptionInfo( const OUString& rPassword, diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index 366eabc690cd..2d76bee8942c 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -90,7 +90,7 @@ public: Standard2007Engine(); virtual ~Standard2007Engine(); - StandardEncryptionInfo& getInfo(); + StandardEncryptionInfo& getInfo() { return mInfo;} virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE; diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index e3522e54ea03..54318fa21fc9 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -97,7 +97,7 @@ public: /** Returns the scheme name from the a:schemeClr element for interoperability purposes */ OUString getSchemeName() const { return msSchemeName; } /** Returns the unaltered list of transformations for interoperability purposes */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getTransformations() const; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getTransformations() const { return maInteropTransformations;} /** Translates between color transformation tokens and their names */ static OUString getColorTransformationName( sal_Int32 nElement ); diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 390086bca369..5882dadde540 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -139,7 +139,7 @@ public: void setTableType(); void setTextBody(const TextBodyPtr & pTextBody); - TextBodyPtr getTextBody(); + TextBodyPtr getTextBody() { return mpTextBody;} void setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle ); TextListStylePtr getMasterTextListStyle() const { return mpMasterTextListStyle; } diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx index 0ff0360eded4..7b81f030e8a0 100644 --- a/include/oox/drawingml/shapecontext.hxx +++ b/include/oox/drawingml/shapecontext.hxx @@ -37,7 +37,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - ShapePtr getShape(); + ShapePtr getShape() { return mpShapePtr;} protected: diff --git a/include/oox/helper/grabbagstack.hxx b/include/oox/helper/grabbagstack.hxx index 619964eb666d..10bc99627936 100644 --- a/include/oox/helper/grabbagstack.hxx +++ b/include/oox/helper/grabbagstack.hxx @@ -38,7 +38,7 @@ public: virtual ~GrabBagStack(); - OUString getCurrentName(); + OUString getCurrentName() { return mCurrentElement.maName;} css::beans::PropertyValue getRootProperty(); diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index f74963cad8b1..feb062973ce5 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -78,7 +78,7 @@ public: // Device info and device dependent unit conversion ----------------------- /** Returns information about the output device. */ - const ::com::sun::star::awt::DeviceInfo& getDeviceInfo() const; + const ::com::sun::star::awt::DeviceInfo& getDeviceInfo() const { return maDeviceInfo;} /** Converts the passed value from horizontal screen pixels to 1/100 mm. */ sal_Int32 convertScreenPixelXToHmm( double fPixelX ) const; diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 878037e68d72..b46929e57b46 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -73,7 +73,7 @@ public: getXStorage() const; /** Returns the element name of this storage. */ - const OUString& getName() const; + const OUString& getName() const { return maStorageName;} /** Returns the full path of this storage. */ OUString getPath() const; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 945fcd05d320..d433cb458735 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -167,7 +167,7 @@ public: const com::sun::star::uno::Any& rValue ); ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > - GetCmisProperties() const; + GetCmisProperties() const { return m_aCmisProperties;} void SetCmisProperties(const ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >& cmisProps ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx index e746946f55bd..f4fb63e62fa2 100644 --- a/include/sfx2/docfilt.hxx +++ b/include/sfx2/docfilt.hxx @@ -106,7 +106,7 @@ public: OUString GetSuffixes() const; OUString GetDefaultExtension() const; const OUString& GetServiceName() const { return aServiceName; } - const OUString& GetProviderName() const; + const OUString& GetProviderName() const { return maProvider;} static const SfxFilter* GetDefaultFilter( const OUString& rName ); static const SfxFilter* GetFilterByName( const OUString& rName ); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index d626455f3a92..d8e5cab0dda3 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -126,7 +126,7 @@ public: static SfxFrame* Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden ); SvCompatWeakHdl* GetHdl(); - Window& GetWindow() const; + Window& GetWindow() const { return *pWindow;} void CancelTransfers( bool bCancelLoadEnv = true ); bool DoClose(); sal_uInt16 GetChildFrameCount() const; diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index cd97ee341a88..d57b10533e4e 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -121,7 +121,7 @@ public: SvLinkSource* GetObj() const { return xObj; } void SetLinkSourceName( const OUString & rName ); - OUString GetLinkSourceName() const; + OUString GetLinkSourceName() const { return aLinkName;} enum UpdateResult { SUCCESS = 0, diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 003d9ac36e00..cd51d2bf67cd 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -109,10 +109,10 @@ public: sal_uInt16 getCurRegionId () const { return mnCurRegionId;} - const OUString& getCurRegionName () const; + const OUString& getCurRegionName () const { return maCurRegionName;} // Check if the root region is visible or not. - bool isNonRootRegionVisible () const; + bool isNonRootRegionVisible () const { return mnCurRegionId;} void setOpenRegionHdl(const Link &rLink); diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 8a31d7f4eb0a..d1bdab7d470a 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -146,7 +146,7 @@ public: virtual bool Validate(); - const OString& GetKey() const; + const OString& GetKey() const { return m_aKey;} void SetVersion( long nVers ) { diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx index a77ebdbc2819..62e343fe9e99 100644 --- a/include/svl/broadcast.hxx +++ b/include/svl/broadcast.hxx @@ -56,7 +56,7 @@ public: void Broadcast( const SfxHint &rHint ); - ListenersType& GetAllListeners(); + ListenersType& GetAllListeners() { return maListeners;} bool HasListeners() const; diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index d7606199fc4f..9ba6868de599 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -30,7 +30,7 @@ public: SfxGrabBagItem(const SfxGrabBagItem& rItem); virtual ~SfxGrabBagItem(); - const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const; + const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const { return m_aMap;} virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; diff --git a/include/svl/sharedstring.hxx b/include/svl/sharedstring.hxx index ddb63f14e8d8..aac16df2e006 100644 --- a/include/svl/sharedstring.hxx +++ b/include/svl/sharedstring.hxx @@ -34,18 +34,18 @@ public: bool operator== ( const SharedString& r ) const; bool operator!= ( const SharedString& r ) const; - OUString getString() const; + OUString getString() const { return mpData ? OUString(mpData) : OUString();} rtl_uString* getData() { return mpData;} - const rtl_uString* getData() const; + const rtl_uString* getData() const { return mpData;} rtl_uString* getDataIgnoreCase() { return mpDataIgnoreCase;} - const rtl_uString* getDataIgnoreCase() const; + const rtl_uString* getDataIgnoreCase() const { return mpDataIgnoreCase;} - bool isValid() const; - bool isEmpty() const; + bool isValid() const { return mpData != NULL;} + bool isEmpty() const { return mpData == NULL || mpData->length == 0;} - sal_Int32 getLength() const; + sal_Int32 getLength() const { return mpData ? mpData->length : 0;} }; } diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 3b936763886b..cabd150756bb 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -229,7 +229,7 @@ public: const OUString& GetAppName() const { return aAppName; } - SfxItemPool& GetPool(); + SfxItemPool& GetPool() { return rPool;} const SfxItemPool& GetPool() const { return rPool;} virtual SfxStyleSheetIteratorPtr CreateIterator(SfxStyleFamily, sal_uInt16 nMask); diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index 834150fe0f19..37bfc6d1799f 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -43,7 +43,7 @@ public: virtual ~SvColorDialog(); void SetColor( const Color& rColor ); - const Color& GetColor() const; + const Color& GetColor() const { return maColor;} void SetMode( sal_Int16 eMode ); diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 1d3ab7c735c1..4a0d10780851 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -112,7 +112,7 @@ public: sal_uInt16 GetSortedCol(){ return nSortCol;} SvLBoxItem* GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const; - CommandEvent GetCommandEvent()const; + CommandEvent GetCommandEvent()const { return aCEvt;} inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } void SetCommandHdl( const Link& rLink ) { aCommandLink = rLink; } diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index a8a6e657bc4b..352a645ed0e1 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -163,9 +163,9 @@ class SVT_DLLPUBLIC ToolboxController : void unbindListener(); bool isBound() const; // TODO remove - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const { return m_xUrlTransformer;} // TODO remove - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const { return m_xParentWindow;} bool m_bInitialized : 1, m_bDisposed : 1; diff --git a/include/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx index 0f74d9757f8b..71ff072b3fef 100644 --- a/include/svtools/treelistentry.hxx +++ b/include/svtools/treelistentry.hxx @@ -73,8 +73,8 @@ public: bool HasChildListPos() const; sal_uLong GetChildListPos() const; - SvTreeListEntries& GetChildEntries(); - const SvTreeListEntries& GetChildEntries() const; + SvTreeListEntries& GetChildEntries() { return maChildren;} + const SvTreeListEntries& GetChildEntries() const { return maChildren;} void Clone(SvTreeListEntry* pSource); diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index cc1aa035ac8a..ab79abb3eaba 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -385,7 +385,7 @@ public: //===== Misc ======================================================== ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - GetXShape(); + GetXShape() { return( mxShape );} /** set the index _nIndex at the accessible shape @param _nIndex diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx index 0527caf7022d..d56663384819 100644 --- a/include/svx/AccessibleShapeTreeInfo.hxx +++ b/include/svx/AccessibleShapeTreeInfo.hxx @@ -74,7 +74,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent> - GetDocumentWindow (void) const; + GetDocumentWindow (void) const { return mxDocumentWindow;} /** Deprecated. Use the correctly named SetModelBroadcaster method instead. @@ -86,7 +86,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster> - GetControllerBroadcaster (void) const; + GetControllerBroadcaster (void) const { return mxModelBroadcaster;} /** Set a new broadcaster that sends events indicating shape changes. The broadcaster usually is or belongs to a document model. @@ -104,7 +104,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster> - GetModelBroadcaster (void) const; + GetModelBroadcaster (void) const { return mxModelBroadcaster;} /** Set the view that will be used to construct SvxTextEditSources which in turn are used to create accessible edit engines. @@ -135,7 +135,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController> - GetController (void) const; + GetController (void) const { return mxController;} /** Set the window that is used to construct SvxTextEditSources which in turn is used to create accessible edit engines. diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 0b62071789bb..53d78124c30a 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -72,7 +72,7 @@ public: sal_uInt16 GetRowPos(sal_uInt16 _nPos) const; sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const; - ScrollBar* getScrollBar(); + ScrollBar* getScrollBar() { return &aVscrollSB;} void ReleaseAccessible(); sal_Int32 getMaxCharCount() const; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 0580d7164647..4e007dfe9da0 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -114,7 +114,7 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; void Reset(); - RECT_POINT GetActualRP() const; + RECT_POINT GetActualRP() const { return eRP;} void SetActualRP( RECT_POINT eNewRP ); void SetState( CTL_STATE nState ); diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index d32b8efd47cf..79d257360ad0 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -230,7 +230,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase // store the attributes passed from pSet void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();} protected: - OUString GetBulCharFmtName(); + OUString GetBulCharFmtName() { return aNumCharFmtName;} SfxMapUnit GetMapUnit() { return eCoreUnit;} protected: bool bIsLoading; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 259f4f4dbda5..24b0c9cf74e4 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -170,7 +170,7 @@ public: const basegfx::B3DHomMatrix& GetFullTransform() const; // get and (re)set transformation matrix - const basegfx::B3DHomMatrix& GetTransform() const; + const basegfx::B3DHomMatrix& GetTransform() const { return maTransformation;} virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix); virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix); diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 3fd8bd3cb4f6..101b461380ab 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -92,7 +92,7 @@ private: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; + const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const { return aPropSeq;} com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName ); com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 ); diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index b94e5a97d3be..89c3bb24eb7a 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -139,7 +139,7 @@ namespace sdr virtual bool AreGluePointsVisible() const; // method to get the primitiveAnimator - sdr::animation::primitiveAnimator& getPrimitiveAnimator(); + sdr::animation::primitiveAnimator& getPrimitiveAnimator() { return maPrimitiveAnimator; } // method to get the EventHandler. It will // return a existing one or create a new one using CreateEventHandler(). diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 9e507ad1be86..abdbcc016d72 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -136,7 +136,7 @@ public: SdrPreRenderDevice* GetPreRenderDevice() const { return mpPreRenderDevice; } // RedrawRegion - const Region& GetRedrawRegion() const; + const Region& GetRedrawRegion() const { return maRedrawRegion;} void SetRedrawRegion(const Region& rNew); // #i72889# read/write access to TempoparyTarget diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index a97bf5d8934b..350ad963deba 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/weakref.hxx> +#include <editeng/forbiddencharacterstable.hxx> #include <rtl/ustring.hxx> #include <sot/storage.hxx> #include <tools/link.hxx> @@ -623,7 +624,7 @@ public: void setLock( bool bLock ); void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); - rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; + rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const { return mpForbiddenCharactersTable;} void SetCharCompressType( sal_uInt16 nType ); sal_uInt16 GetCharCompressType() const { return mnCharCompressType; } diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 84ebec038420..82ee2fbf6768 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -900,7 +900,7 @@ public: void SetResizeProtect(bool bProt); bool IsResizeProtect() const { return bSizProt;} void SetPrintable(bool bPrn); - bool IsPrintable() const; + bool IsPrintable() const { return !bNoPrint;} void SetVisible(bool bVisible); bool IsVisible() const { return mbVisible;} void SetEmptyPresObj(bool bEpt); @@ -984,7 +984,7 @@ public: // the following methods are used to control it; // usually this data makes no sense after the import is finished, since the object // might be resized - Rectangle GetBLIPSizeRectangle() const; + Rectangle GetBLIPSizeRectangle() const { return maBLIPSizeRectangle;} void SetBLIPSizeRectangle( const Rectangle& aRect ); /// @see mbDoNotInsertIntoPageAutomatically diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 6a529c26c0e7..e60060968fae 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -142,8 +142,8 @@ public: void ReleaseGraphicLink(); bool IsLinkedGraphic() const; - const OUString& GetFileName() const; - const OUString& GetFilterName() const; + const OUString& GetFileName() const { return aFileName;} + const OUString& GetFilterName() const { return aFilterName;} void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize, long nExtraData=0L); diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 9dc74bbb7bdb..a3c4f78086a7 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -396,7 +396,7 @@ public: virtual bool isUsedByModel() const SAL_OVERRIDE; // data read/write - const SfxItemSet& GetItemSet() const; + const SfxItemSet& GetItemSet() const { return *mpProperties;} void PutItemSet(const SfxItemSet& rSet); void PutItem(const SfxPoolItem& rItem); void ClearItem(const sal_uInt16 nWhich = 0); diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 0785eded905b..2450e409617e 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -255,11 +255,11 @@ public: void SetApplicationBackgroundColor(Color aBackgroundColor); // #109585# - Color GetApplicationBackgroundColor() const; + Color GetApplicationBackgroundColor() const { return maBackgroundColor;} // #103911# Set/Get document color for svx at SdrPageViews void SetApplicationDocumentColor(Color aDocumentColor); - Color GetApplicationDocumentColor() const; + Color GetApplicationDocumentColor() const { return maDocumentColor;} }; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 645c35383a41..061e983b7e46 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -405,7 +405,7 @@ public: bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht - Color GetGridColor() const; + Color GetGridColor() const { return maGridColor;} void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); } void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); } void SetBordVisible(bool bOn = true) { bBordVisible=bOn; InvalidateAllWin(); } @@ -532,7 +532,7 @@ public: bool IsPrintPreview() const { return bPrintPreview; } void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; } - const svtools::ColorConfig& getColorConfig() const; + const svtools::ColorConfig& getColorConfig() const { return maColorConfig;} virtual void onChangeColorConfig(); diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index a237bc23f8cb..81debfd248df 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -247,7 +247,7 @@ public: // und mehr... OUString GetStatusText(); - SvtAccessibilityOptions& getAccessibilityOptions(); + SvtAccessibilityOptions& getAccessibilityOptions() { return maAccessibilityOptions;} virtual void onAccessibilityOptionsChanged(); }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index a5ebc6d62a9e..686d3b6361ef 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -63,7 +63,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - const GraphicObject& GetGraphicObject() const; + const GraphicObject& GetGraphicObject() const { return maGraphicObject;} void SetGraphicObject(const GraphicObject& rGraphicObject); static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 364292f66e89..a37ac54b0883 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -55,7 +55,7 @@ public: virtual bool HasMetrics() const SAL_OVERRIDE; virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; - const XHatch& GetHatchValue() const; // GetValue -> GetHatchValue + const XHatch& GetHatchValue() const { return aHatch;} // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index e58159932117..9c31904671e3 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -57,7 +57,7 @@ public: virtual bool HasMetrics() const SAL_OVERRIDE; virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; - const XDash& GetDashValue() const; + const XDash& GetDashValue() const { return aDash;} void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index edd77763abab..175f02380b82 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -54,7 +54,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - basegfx::B2DPolyPolygon GetLineEndValue() const; + basegfx::B2DPolyPolygon GetLineEndValue() const { return maPolyPolygon;} void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } XLineEndItem* checkForUniqueItem( SdrModel* pModel ) const; diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index bb0c66720d31..1d3b525e993c 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -54,7 +54,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - basegfx::B2DPolyPolygon GetLineStartValue() const; + basegfx::B2DPolyPolygon GetLineStartValue() const { return maPolyPolygon;} void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } XLineStartItem* checkForUniqueItem( SdrModel* pModel ) const; diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 0cb37424ef19..45c32b60bb34 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -40,7 +40,7 @@ public: virtual ~SvxZoomSliderItem(); void AddSnappingPoint( sal_Int32 nNew ); - const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const; + const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const { return maValues;} sal_uInt16 GetMinZoom() const {return mnMinZoom;} sal_uInt16 GetMaxZoom() const {return mnMaxZoom;} diff --git a/include/unotest/officeconnection.hxx b/include/unotest/officeconnection.hxx index cb7403ca69d7..844c61bae55a 100644 --- a/include/unotest/officeconnection.hxx +++ b/include/unotest/officeconnection.hxx @@ -46,7 +46,7 @@ public: void tearDown(); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - getComponentContext() const; + getComponentContext() const { return context_;} // Must not be called before setUp or after tearDown: bool isStillAlive() const; diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index 134d7cadce5c..b30af8083d4e 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -169,7 +169,7 @@ namespace utl /** writes the changed values into the sub tree. Always called in the Dtor of the derived class. */ virtual void Commit()=0; - bool IsInValueChange() const; + bool IsInValueChange() const { return m_nInValueChange > 0;} sal_Int16 GetMode() const { return m_nMode;} }; diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx index 13d2beff9cb9..adb08cb50801 100644 --- a/include/vcl/FilterConfigItem.hxx +++ b/include/vcl/FilterConfigItem.hxx @@ -76,7 +76,7 @@ public : void WriteBool( const OUString& rKey, bool bValue ); void WriteInt32( const OUString& rKey, sal_Int32 nValue ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const { return aFilterData;} // GetStatusIndicator is returning the "StatusIndicator" property of the FilterData sequence ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const; diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 1c283aff5f47..1146c73dc3a3 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -369,7 +369,7 @@ public: bool IsRadioCheckEnabled() const { return mbRadioCheck; } bool SetModeRadioImage( const Image& rImage ); - const Image& GetModeRadioImage( ) const; + const Image& GetModeRadioImage( ) const { return maImage;} void SetState( bool bCheck ); void Check( bool bCheck = true ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index fe4b7c6d0344..f60e895f03d8 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -136,7 +136,7 @@ public: void ToggleFloatingMode(); void SetDragArea( const Rectangle& rRect ); - Rectangle GetDragArea() const; + Rectangle GetDragArea() const { return maDragArea;} void Lock(); void Unlock(); diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index dbd6d131803f..e43c1b1aa138 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -250,7 +250,7 @@ class VCL_DLLPUBLIC HelpEvent { private: Point maPos; - sal_uInt16 mnMode; + sal_uInt16 mnMode; bool mbKeyboardActivated; public: @@ -258,8 +258,8 @@ public: explicit HelpEvent( sal_uInt16 nHelpMode ); explicit HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode ); - const Point& GetMousePosPixel() const; - sal_uInt16 GetMode() const { return mnMode; } + const Point& GetMousePosPixel() const { return maPos; } + sal_uInt16 GetMode() const { return mnMode; } bool KeyboardActivated() const { return mbKeyboardActivated; } void SetKeyboardActivated( bool bKeyboard ) { mbKeyboardActivated = bKeyboard; } }; diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 8a7f844fa4d2..ad3e31044e18 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -442,7 +442,7 @@ public: const Time& GetMax() const { return maMax; } void SetTimeFormat( TimeFormat eNewFormat ); - TimeFormat GetTimeFormat() const; + TimeFormat GetTimeFormat() const { return (TimeFormat)mnTimeFormat;} void SetFormat( TimeFieldFormat eNewFormat ); TimeFieldFormat GetFormat() const { return meFormat; } diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 9d182ad54f1d..c6e2c45f55a5 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -199,7 +199,7 @@ public: const Image& GetImage() const { return maImage; } bool SetModeImage( const Image& rImage ); - const Image& GetModeImage( ) const; + const Image& GetModeImage( ) const { return maImage;} virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; static Image loadThemeImage(const OString &rFileName); diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 37e4465d4f53..9ad244c473d7 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -116,7 +116,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText @return m_sURL */ - OUString GetURL() const; + const OUString& GetURL() const { return m_sURL;} /** sets new text and recalculates the text length. */ virtual void SetText(const OUString& rNewDescription) SAL_OVERRIDE; diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 9eafde5e70b2..c092f0bbf7ec 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -153,13 +153,13 @@ public: void SetData( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, bool bOwns ); const sal_uInt8* GetData() const; - const Size& GetPrefSize() const; + const Size& GetPrefSize() const { return mpImpData->maPrefSize;} void SetPrefSize( const Size& rPrefSize ); - bool IsPrefSizeValid(); + bool IsPrefSizeValid() { return mpImpData->mbPrefSizeValid;} - const MapMode& GetPrefMapMode() const; + const MapMode& GetPrefMapMode() const { return mpImpData->maPrefMapMode;} void SetPrefMapMode( const MapMode& rPrefMapMode ); - bool IsPrefMapModeValid(); + bool IsPrefMapModeValid() { return mpImpData->mbPrefMapModeValid;} bool IsNative() const; bool IsUser() const { return( GFX_LINK_TYPE_USER == meType ); } diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index a27fcbe98c2e..1579845a4cac 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -311,7 +311,7 @@ public: void Abort() { bAbort = true; } - const FilterErrorEx& GetLastError() const; + const FilterErrorEx& GetLastError() const { return *pErrorEx;} void ResetLastError(); const Link GetFilterCallback() const; diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx index b7ef7fbf4737..a96ac40d2427 100644 --- a/include/vcl/graphictools.hxx +++ b/include/vcl/graphictools.hxx @@ -300,7 +300,7 @@ public: /// Query path to fill void getPath ( PolyPolygon& ) const; /// Get color used for solid fills - Color getFillColor () const; + const Color& getFillColor () const { return maFillColor;} /** Get stroke transparency @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 608c9cb2ef19..1e6f13ed3bae 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -157,7 +157,7 @@ public: void setWinPosAndSize(const Point &rPos, const Size& rSize); void setWinSize(const Size& rSize); - GLWindow& getOpenGLWindow(); + GLWindow& getOpenGLWindow() { return m_aGLWin;} void renderToFile(); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 1a8c67623282..cefffe2815c5 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1603,7 +1603,7 @@ public: @return the current offset in pixel */ - Size GetPixelOffset() const; + Size GetPixelOffset() const { return Size(mnOutOffOrigX, mnOutOffOrigY);} Point LogicToPixel( const Point& rLogicPt ) const; Size LogicToPixel( const Size& rLogicSize ) const; diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index 2b603c1c67ea..85541fe1817b 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -143,10 +143,10 @@ public : bool GetIsReduceImageResolution() const { return mbReduceImageResolution;} void SetIsReduceImageResolution( const bool bReduceImageResolution ); - const com::sun::star::lang::Locale& GetDocumentLocale() const; + const com::sun::star::lang::Locale& GetDocumentLocale() const { return maDocLocale;} void SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ); - std::vector< PDFExtOutDevBookmarkEntry >& GetBookmarks(); + std::vector< PDFExtOutDevBookmarkEntry >& GetBookmarks() { return maBookmarks;} /** Start a new group of render output diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 473b8e4f4f71..25bc14709115 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -249,7 +249,7 @@ class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent public: VclAccessibleEvent( sal_uLong n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); virtual ~VclAccessibleEvent(); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const; + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const { return mxAccessible;} private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible; diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index b45ed3993c4b..d0b02456e6f5 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -539,7 +539,7 @@ public: ::comphelper::UnoInterfaceToUniqueIdentifierMapper& getInterfaceToIdentifierMapper(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext(); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext() { return m_xContext;} // Shapes in Writer cannot be named via context menu (#i51726#) SvtModuleOptions::EFactory GetModelType() const diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx index 02866c3f5868..45f53d94fc88 100644 --- a/include/xmlreader/xmlreader.hxx +++ b/include/xmlreader/xmlreader.hxx @@ -66,7 +66,7 @@ public: int getNamespaceId(Span const & prefix) const; - OUString getUrl() const; + const OUString& getUrl() const { return fileUrl_;} private: typedef std::vector< Span > NamespaceIris; diff --git a/jvmaccess/source/unovirtualmachine.cxx b/jvmaccess/source/unovirtualmachine.cxx index ed0a081fd40c..e730a4773b40 100644 --- a/jvmaccess/source/unovirtualmachine.cxx +++ b/jvmaccess/source/unovirtualmachine.cxx @@ -58,10 +58,6 @@ UnoVirtualMachine::UnoVirtualMachine( } } -rtl::Reference< jvmaccess::VirtualMachine > -UnoVirtualMachine::getVirtualMachine() const { - return m_virtualMachine; -} UnoVirtualMachine::~UnoVirtualMachine() { diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 01cc105add9a..0adc5931d1d6 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -681,31 +681,10 @@ void NodeJava::addJRELocation(rtl_uString * sLocation) m_JRELocations->push_back(OUString(sLocation)); } -const boost::optional<sal_Bool> & NodeJava::getEnabled() const -{ - return m_enabled; -} -const boost::optional<std::vector<OUString> >& -NodeJava::getJRELocations() const -{ - return m_JRELocations; -} -const boost::optional<OUString> & NodeJava::getUserClassPath() const -{ - return m_userClassPath; -} -const boost::optional<std::vector<OUString> > & NodeJava::getVmParameters() const -{ - return m_vmParameters; -} -const boost::optional<CNodeJavaInfo> & NodeJava::getJavaInfo() const -{ - return m_javaInfo; -} jfw::FileStatus NodeJava::checkSettingsFileStatus(OUString const & sURL) const { @@ -1097,10 +1076,6 @@ void MergedSettings::merge(const NodeJava & share, const NodeJava & user) m_JRELocations = * share.getJRELocations(); } -const OUString& MergedSettings::getUserClassPath() const -{ - return m_sClassPath; -} ::std::vector< OString> MergedSettings::getVmParametersUtf8() const { @@ -1113,10 +1088,6 @@ const OUString& MergedSettings::getUserClassPath() const return ret; } -const OString & MergedSettings::getJavaInfoAttrVendorUpdate() const -{ - return m_javaInfo.sAttrVendorUpdate; -} JavaInfo * MergedSettings::createJavaInfo() const @@ -1172,10 +1143,6 @@ void MergedSettings::getJRELocations( } *size = m_JRELocations.size(); } -const std::vector<OUString> & MergedSettings::getJRELocations() const -{ - return m_JRELocations; -} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index ec708dbb482a..17d66fef227f 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -229,22 +229,22 @@ public: /** returns the value of the element /java/enabled */ - const boost::optional<sal_Bool> & getEnabled() const; + const boost::optional<sal_Bool> & getEnabled() const { return m_enabled;} /** returns the value of the element /java/userClassPath. */ - const boost::optional< OUString> & getUserClassPath() const; + const boost::optional< OUString> & getUserClassPath() const { return m_userClassPath;} /** returns the value of the element /java/javaInfo. */ - const boost::optional<CNodeJavaInfo> & getJavaInfo() const; + const boost::optional<CNodeJavaInfo> & getJavaInfo() const { return m_javaInfo;} /** returns the parameters from the element /java/vmParameters/param. */ - const boost::optional< ::std::vector< OUString> > & getVmParameters() const; + const boost::optional< ::std::vector< OUString> > & getVmParameters() const { return m_vmParameters;} /** returns the parameters from the element /java/jreLocations/location. */ - const boost::optional< ::std::vector< OUString> > & getJRELocations() const; + const boost::optional< ::std::vector< OUString> > & getJRELocations() const { return m_JRELocations;} }; /** merges the settings for shared, user and installation during construction. @@ -293,7 +293,7 @@ public: */ bool getEnabled() const { return m_bEnabled;} - const OUString & getUserClassPath() const; + const OUString & getUserClassPath() const { return m_sClassPath;} ::std::vector< OString> getVmParametersUtf8() const; /** returns a JavaInfo structure representing the node @@ -305,7 +305,7 @@ public: /** returns the value of the attribute /java/javaInfo[@vendorUpdate]. */ - OString const & getJavaInfoAttrVendorUpdate() const; + OString const & getJavaInfoAttrVendorUpdate() const { return m_javaInfo.sAttrVendorUpdate;} #ifdef WNT /** returns the javaInfo@autoSelect attribute. @@ -326,7 +326,7 @@ public: */ void getJRELocations(rtl_uString *** parLocations, sal_Int32 * size) const; - const ::std::vector< OUString> & getJRELocations() const; + const ::std::vector< OUString> & getJRELocations() const { return m_JRELocations;} }; diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 4931737a0e03..1a32be20919f 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -1268,15 +1268,7 @@ CJavaInfo & CJavaInfo::operator = (const ::JavaInfo* info) return *this; } -const ::JavaInfo* CJavaInfo::operator ->() const -{ - return pInfo; -} -CJavaInfo::operator JavaInfo const * () const -{ - return pInfo; -} OUString CJavaInfo::getVendor() const { diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx index b69382e0d0fa..cbb33edfcaff 100644 --- a/jvmfwk/source/framework.hxx +++ b/jvmfwk/source/framework.hxx @@ -95,9 +95,9 @@ public: */ void attach(::JavaInfo* pInfo); ::JavaInfo * detach(); - const ::JavaInfo* operator ->() const; + const ::JavaInfo* operator ->() const { return pInfo;} operator ::JavaInfo* () { return pInfo;} - operator ::JavaInfo const * () const; + operator ::JavaInfo const * () const { return pInfo;} ::JavaInfo* cloneJavaInfo() const; OUString getVendor() const; diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx index 83aadca49bdd..838c73590102 100644 --- a/jvmfwk/source/libxmlutil.cxx +++ b/jvmfwk/source/libxmlutil.cxx @@ -135,10 +135,6 @@ CXmlCharPtr::operator OUString() return ret; } -CXmlCharPtr::operator OString() -{ - return OString((sal_Char*) _object); -} diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx index 88f8127f7929..1679110e275f 100644 --- a/jvmfwk/source/libxmlutil.hxx +++ b/jvmfwk/source/libxmlutil.hxx @@ -93,7 +93,7 @@ public: CXmlCharPtr & operator = (xmlChar* pObj); operator xmlChar* () const { return _object;} operator OUString (); - operator OString (); + operator OString () { return OString((sal_Char*) _object);} }; diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx index 1e3cb3e33acf..63c11a54d813 100644 --- a/lingucomponent/source/languageguessing/guess.cxx +++ b/lingucomponent/source/languageguessing/guess.cxx @@ -108,20 +108,8 @@ Guess::~Guess() { } -string Guess::GetLanguage() -{ - return language_str; -} -string Guess::GetCountry() -{ - return country_str; -} -string Guess::GetEncoding() -{ - return encoding_str; -} bool Guess::operator==(string lang) { diff --git a/lingucomponent/source/languageguessing/guess.hxx b/lingucomponent/source/languageguessing/guess.hxx index 43cbcf65e84c..65febf59e03b 100644 --- a/lingucomponent/source/languageguessing/guess.hxx +++ b/lingucomponent/source/languageguessing/guess.hxx @@ -48,9 +48,9 @@ class Guess{ ~Guess(); - string GetLanguage(); - string GetCountry(); - string GetEncoding(); + string GetLanguage() { return language_str;} + string GetCountry() { return country_str;} + string GetEncoding() { return encoding_str;} bool operator==(string lang); diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index a6b6484e722d..4dab774e8d06 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -95,7 +95,7 @@ public: bool bReceiveVerbose ); bool RemoveDicListEvtListener( const uno::Reference< XDictionaryListEventListener >& rxListener ); - sal_Int16 BeginCollectEvents(); + sal_Int16 BeginCollectEvents() { return ++nNumCollectEvtListeners;} sal_Int16 EndCollectEvents(); sal_Int16 FlushEvents(); void ClearEvents() { nCondensedEvt = 0; } @@ -227,10 +227,6 @@ bool DicEvtListenerHelper::RemoveDicListEvtListener( } -sal_Int16 DicEvtListenerHelper::BeginCollectEvents() -{ - return ++nNumCollectEvtListeners; -} sal_Int16 DicEvtListenerHelper::EndCollectEvents() diff --git a/lotuswordpro/source/filter/lwphyperlinkmgr.cxx b/lotuswordpro/source/filter/lwphyperlinkmgr.cxx index 07b70d494b40..da08e437e2f4 100644 --- a/lotuswordpro/source/filter/lwphyperlinkmgr.cxx +++ b/lotuswordpro/source/filter/lwphyperlinkmgr.cxx @@ -72,10 +72,6 @@ LwpHyperlinkMgr::~LwpHyperlinkMgr() { } -OUString LwpHyperlinkMgr::GetHyperlink() -{ - return m_Hyperlink; -} void LwpHyperlinkMgr::SetHyperlink(const OUString& hyperlink) { diff --git a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx index a0621c3902ee..ada057875ec0 100644 --- a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx +++ b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx @@ -74,7 +74,7 @@ public: void SetHyperlinkFlag(bool bFlag){m_bIsHyperlink = bFlag;} bool GetHyperlinkFlag(){return m_bIsHyperlink;} void SetHyperlink(const OUString& hyperlink); - OUString GetHyperlink(); + const OUString& GetHyperlink() { return m_Hyperlink;} private: OUString m_Hyperlink; bool m_bIsHyperlink; diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx index 691a37583421..e3cdbb849828 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx @@ -66,15 +66,7 @@ XFFontDecl::XFFontDecl(const OUString& name, const OUString& family, bool fixed) m_bPitchFixed = fixed; } -OUString XFFontDecl::GetFontName() -{ - return m_strFontName; -} -OUString XFFontDecl::GetFontFamily() -{ - return m_strFontFamily; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx index b540b93dfd2b..813033e783d2 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx @@ -77,12 +77,12 @@ public: /** * @descr Get font name. */ - OUString GetFontName(); + OUString GetFontName() { return m_strFontName;} /** * @descr Get font family. */ - OUString GetFontFamily(); + OUString GetFontFamily() { return m_strFontFamily;} bool GetFontPitchFixed() { return m_bPitchFixed;} diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx index df034ca9d13c..480953dc5270 100644 --- a/oox/source/crypto/AgileEngine.cxx +++ b/oox/source/crypto/AgileEngine.cxx @@ -41,10 +41,6 @@ AgileEngine::AgileEngine() : AgileEngine::~AgileEngine() {} -AgileEncryptionInfo& AgileEngine::getInfo() -{ - return mInfo; -} Crypto::CryptoType AgileEngine::cryptoType(const AgileEncryptionInfo& rInfo) { diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx index 3d06cba20591..1e769a03a013 100644 --- a/oox/source/crypto/Standard2007Engine.cxx +++ b/oox/source/crypto/Standard2007Engine.cxx @@ -66,10 +66,6 @@ Standard2007Engine::Standard2007Engine() : Standard2007Engine::~Standard2007Engine() {} -StandardEncryptionInfo& Standard2007Engine::getInfo() -{ - return mInfo; -} bool Standard2007Engine::generateVerifier() { diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index 59334492a24b..0703cd07cadf 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -340,10 +340,6 @@ void Color::clearTransformations() clearTransparence(); } -::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > Color::getTransformations() const -{ - return maInteropTransformations; -} OUString Color::getColorTransformationName( sal_Int32 nElement ) { diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 815887db35b5..6fdbfe0eeae6 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1173,10 +1173,6 @@ void Shape::setTextBody(const TextBodyPtr & pTextBody) } -TextBodyPtr Shape::getTextBody() -{ - return mpTextBody; -} void Shape::setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle ) { diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx index 74cc2d9081dd..1b709ba201b0 100644 --- a/oox/source/drawingml/shapecontext.cxx +++ b/oox/source/drawingml/shapecontext.cxx @@ -58,10 +58,6 @@ ShapeContext::~ShapeContext() mpMasterShapePtr->addChild( mpShapePtr ); } -ShapePtr ShapeContext::getShape() -{ - return mpShapePtr; -} ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) { diff --git a/oox/source/helper/grabbagstack.cxx b/oox/source/helper/grabbagstack.cxx index a8dbb6cd6e70..8a7e3ad8d1c8 100644 --- a/oox/source/helper/grabbagstack.cxx +++ b/oox/source/helper/grabbagstack.cxx @@ -25,10 +25,6 @@ GrabBagStack::GrabBagStack(const OUString& aName) GrabBagStack::~GrabBagStack() {} -OUString GrabBagStack::getCurrentName() -{ - return mCurrentElement.maName; -} bool GrabBagStack::isStackEmpty() { diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 135a91c06c0f..9e8c00f4f37e 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -160,10 +160,6 @@ sal_Int32 GraphicHelper::getPaletteColor( sal_Int32 /*nPaletteIdx*/ ) const // Device info and device dependent unit conversion --------------------------- -const awt::DeviceInfo& GraphicHelper::getDeviceInfo() const -{ - return maDeviceInfo; -} sal_Int32 GraphicHelper::convertScreenPixelXToHmm( double fPixelX ) const { diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx index a4c0c367be46..740db3270d55 100644 --- a/oox/source/helper/storagebase.cxx +++ b/oox/source/helper/storagebase.cxx @@ -108,10 +108,6 @@ Reference< XStorage > StorageBase::getXStorage() const return implGetXStorage(); } -const OUString& StorageBase::getName() const -{ - return maStorageName; -} OUString StorageBase::getPath() const { diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx index f176e57a8389..4d9f710dbd62 100644 --- a/oox/source/shape/LockedCanvasContext.cxx +++ b/oox/source/shape/LockedCanvasContext.cxx @@ -26,10 +26,6 @@ LockedCanvasContext::~LockedCanvasContext() { } -oox::drawingml::ShapePtr LockedCanvasContext::getShape() -{ - return mpShape; -} ::oox::core::ContextHandlerRef LockedCanvasContext::onCreateContext(sal_Int32 aElementToken, const ::oox::AttributeList& /*rAttribs*/) { diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx index c57aa79ecc05..ab8ceae4e224 100644 --- a/oox/source/shape/LockedCanvasContext.hxx +++ b/oox/source/shape/LockedCanvasContext.hxx @@ -27,7 +27,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const ::oox::AttributeList& rAttribs) SAL_OVERRIDE; - oox::drawingml::ShapePtr getShape(); + oox::drawingml::ShapePtr getShape() { return mpShape;} protected: diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx index 080240a9836c..dfaba90e9d2c 100644 --- a/oox/source/shape/WpgContext.cxx +++ b/oox/source/shape/WpgContext.cxx @@ -30,10 +30,6 @@ WpgContext::~WpgContext() { } -oox::drawingml::ShapePtr WpgContext::getShape() -{ - return mpShape; -} oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& /*rAttribs*/) { diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx index 444efe48331a..e59cf54c4207 100644 --- a/oox/source/shape/WpgContext.hxx +++ b/oox/source/shape/WpgContext.hxx @@ -27,7 +27,7 @@ public: virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) SAL_OVERRIDE; - oox::drawingml::ShapePtr getShape(); + oox::drawingml::ShapePtr getShape() { return mpShape;} protected: oox::drawingml::ShapePtr mpShape; diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index 2d2b022856ea..d7696f3e72dc 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -32,10 +32,6 @@ WpsContext::~WpsContext() { } -oox::drawingml::ShapePtr WpsContext::getShape() -{ - return mpShape; -} oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) { diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx index aafc77a32a5e..cde35324cd1a 100644 --- a/oox/source/shape/WpsContext.hxx +++ b/oox/source/shape/WpsContext.hxx @@ -27,7 +27,7 @@ public: virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) SAL_OVERRIDE; - oox::drawingml::ShapePtr getShape(); + oox::drawingml::ShapePtr getShape() { return mpShape;} protected: oox::drawingml::ShapePtr mpShape; diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 1eaf9552e299..f405645f5bab 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -597,7 +597,7 @@ public: } } - sal_uInt32 parseIndex(); + sal_uInt32 parseIndex() { return ((m_numOfEntries ? sizeof(sal_uInt16) : 0) + (m_numOfEntries * m_FIELD_ENTRY_SIZE));} const sal_Char* getFieldName(sal_uInt16 index); const sal_Char* getFieldType(sal_uInt16 index); @@ -608,10 +608,6 @@ public: const sal_Char* getFieldFileName(sal_uInt16 index); }; -sal_uInt32 FieldList::parseIndex() -{ - return ((m_numOfEntries ? sizeof(sal_uInt16) : 0) + (m_numOfEntries * m_FIELD_ENTRY_SIZE)); -} const sal_Char* FieldList::getFieldName(sal_uInt16 index) { @@ -766,7 +762,7 @@ public: } } - sal_uInt32 parseIndex(); + sal_uInt32 parseIndex() { return ((m_numOfEntries ? sizeof(sal_uInt16) : 0) + (m_numOfEntries * m_REFERENCE_ENTRY_SIZE));} const sal_Char* getReferenceName(sal_uInt16 index); RTReferenceType getReferenceType(sal_uInt16 index); @@ -774,10 +770,6 @@ public: RTFieldAccess getReferenceAccess(sal_uInt16 index); }; -sal_uInt32 ReferenceList::parseIndex() -{ - return ((m_numOfEntries ? sizeof(sal_uInt16) : 0) + (m_numOfEntries * m_REFERENCE_ENTRY_SIZE)); -} const sal_Char* ReferenceList::getReferenceName(sal_uInt16 index) { diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 005f36a7fe4f..710475b67e71 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -64,7 +64,7 @@ public: /** @returns the numbering type that is used to format page fields in drawing shapes */ virtual SvxNumType GetPageNumType() const SAL_OVERRIDE; - OXUndoEnvironment& GetUndoEnv(); + OXUndoEnvironment& GetUndoEnv() { return *m_pUndoEnv;} void SetModified(bool _bModified); inline dbaui::DBSubComponentController* getController() const { return m_pController; } diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 76a544f1a72d..443f53328870 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -116,7 +116,7 @@ public: bool supportsService( const OUString& _sServiceName ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const { return m_xReportComponent;} virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); inline void setOldParent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) { m_xSection = _xSection; } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getOldParent() const { return m_xSection;} diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index 8fe4401a9a5d..518293b8149b 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -83,7 +83,7 @@ public: */ void insertObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection;} }; } #endif // INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 6550b0c50600..506ec8f0d7c7 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -68,7 +68,7 @@ namespace rptui /// returns the complete formula represented by the object const OUString& - getCompleteFormula() const; + getCompleteFormula() const { return m_sCompleteFormula; } /** gets the <em>undecorated formula</em> content @@ -78,7 +78,7 @@ namespace rptui If the formula denotes an expression, then the <em>undecorated content</em> is the expression itself. */ - const OUString& getUndecoratedContent() const; + const OUString& getUndecoratedContent() const { return m_sUndecoratedContent; } /// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression inline OUString getFieldName() const; diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index a6ad2a2e9295..0b53d279f1a1 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -140,11 +140,6 @@ namespace rptui return aFieldContent.makeStringAndClear(); } - const OUString& ReportFormula::getUndecoratedContent() const - { - return m_sUndecoratedContent; - } - const OUString& ReportFormula::getCompleteFormula() const { return m_sCompleteFormula; } bool ReportFormula::isValid() const { return getType() != Invalid; } ReportFormula& ReportFormula::operator=(class ReportFormula const & _rHd) { diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index f244817dd8a1..5c50ad72144b 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -89,10 +89,6 @@ void OReportModel::SetChanged( bool bChanged ) -OXUndoEnvironment& OReportModel::GetUndoEnv() -{ - return *m_pUndoEnv; -} void OReportModel::SetModified(bool _bModified) { diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index a32f242b4e8a..6c2287c4e0dd 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -339,10 +339,6 @@ uno::Reference< report::XSection> OObjectBase::getSection() const return xSection; } -uno::Reference< report::XReportComponent> OObjectBase::getReportComponent() const -{ - return m_xReportComponent; -} uno::Reference< beans::XPropertySet> OObjectBase::getAwtComponent() { diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 6b8300d03c98..242c7b4ead80 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -132,10 +132,6 @@ void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& pObject->StartListening(); } -uno::Reference< report::XSection > OReportPage::getSection() const -{ - return m_xSection; -} uno::Reference< uno::XInterface > OReportPage::createUnoPage() { diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 9eb4f80600c7..efa5d798e934 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1380,10 +1380,6 @@ OUString ORptExport::implConvertNumber(sal_Int32 _nValue) return aBuffer.makeStringAndClear(); } -UniReference < XMLPropertySetMapper > ORptExport::GetCellStylePropertyMapper() const -{ - return m_xCellStylesPropertySetMapper; -} SvXMLAutoStylePoolP* ORptExport::CreateAutoStylePool() { diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 7828eecbb523..77f42bab770f 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -196,7 +196,7 @@ public: inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } - UniReference < XMLPropertySetMapper > GetCellStylePropertyMapper() const; + UniReference < XMLPropertySetMapper > GetCellStylePropertyMapper() const { return m_xCellStylesPropertySetMapper;} }; /** Exports only settings diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 8e7ca2f4cb4b..6c3a25447502 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -150,10 +150,6 @@ void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey, XMLPropStyleContext::SetAttribute( nPrefixKey, rLocalName, rValue ); } -ORptFilter& OControlStyleContext::GetOwnImport() const -{ - return m_rImport; -} OReportStylesContext::OReportStylesContext( ORptFilter& rImport, @@ -422,10 +418,6 @@ sal_Int32 OReportStylesContext::GetIndex(const sal_Int16 nContextID) return -1; } -ORptFilter& OReportStylesContext::GetOwnImport() const -{ - return m_rImport; -} sal_uInt16 OReportStylesContext::GetFamily( const OUString& rFamily ) const { diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index ce32875f06ef..ec549b3f6b3a 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -49,7 +49,7 @@ namespace rptxml bool bConditionalFormatCreated : 1; bool bParentSet : 1; - ORptFilter& GetOwnImport() const; + ORptFilter& GetOwnImport() const { return m_rImport;} OControlStyleContext(const OControlStyleContext&); void operator =(const OControlStyleContext&); @@ -106,7 +106,7 @@ namespace rptxml mutable ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > m_xTableStyles; - ORptFilter& GetOwnImport() const; + ORptFilter& GetOwnImport() const { return m_rImport;} OReportStylesContext(const OReportStylesContext&); void operator =(const OReportStylesContext&); diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 56fdfe41a772..fd69b2497713 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -436,13 +436,13 @@ namespace rptui /** returns the number formatter */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getReportNumberFormatter() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getReportNumberFormatter() const { return m_xFormatter;} /** return the SdrModel of the real model * * \return */ - ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const; + ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_aReportModel;} inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const { return m_xContext; } inline sal_Int16 getZoomValue() const { return m_nZoomValue; } diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 355219ce4bd4..fde7caf0d79d 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -202,7 +202,7 @@ namespace rptui inline bool empty() const { return m_aSections.empty(); } void SetMode( DlgEdMode m_eMode ); void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); - OUString GetInsertObjString() const; + OUString GetInsertObjString() const { return m_sShapeType;} /** copies the current selection in this section */ void Copy(); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 1b391814587a..c442fd89c525 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3036,10 +3036,6 @@ void OReportController::insertGraphic() } } -::boost::shared_ptr<rptui::OReportModel> OReportController::getSdrModel() const -{ - return m_aReportModel; -} sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) { @@ -3980,10 +3976,6 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert } } -uno::Reference< util::XNumberFormatter > OReportController::getReportNumberFormatter() const -{ - return m_xFormatter; -} void OReportController::checkChartEnabled() { diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 617dc14535b9..5715f3700912 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -351,10 +351,6 @@ void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) m_sShapeType = _sShapeType; } -OUString OViewsWindow::GetInsertObjString() const -{ - return m_sShapeType; -} void OViewsWindow::SetMode( DlgEdMode eNewMode ) diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index dbf807dab8e5..c1afbf9edd28 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -31,6 +31,7 @@ #include <rtl/ustring.h> #include "scdllapi.h" #include <rtl/ustring.hxx> +#include "scmatrix.hxx" #include "types.hxx" @@ -224,7 +225,7 @@ public: bool HasVarRes() const { return ( xVarRes.is() ); } double GetValue() const { return fValue; } const OUString& GetString() const { return aString; } - ScMatrixRef GetMatrix() const; + ScMatrixRef GetMatrix() const { return xMatrix;} com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> GetVarRes() const { return xVarRes; } }; diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index bb14668a045f..df7ed0106b6c 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -377,7 +377,7 @@ public: virtual bool operator==(const SfxPoolItem& rCmp ) const SAL_OVERRIDE; virtual ScCondFormatItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE; - const std::vector<sal_uInt32>& GetCondFormatData() const; + const std::vector<sal_uInt32>& GetCondFormatData() const { return maIndex;} void AddCondFormatData( sal_uInt32 nIndex ); void SetCondFormatData( const std::vector<sal_uInt32>& aIndex ); void RemoveCondFormatData( sal_uInt32 nIndex ); diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 24c1bcdc0913..f9a364181389 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -49,7 +49,7 @@ public: virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) SAL_OVERRIDE; void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); - ::boost::unordered_set<sal_uInt16>& getAllFileIds(); + ::boost::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;} private: ExternalRefListener(); @@ -83,7 +83,7 @@ public: ScChartListener( const ScChartListener& ); virtual ~ScChartListener(); - const OUString& GetName() const; + const OUString& GetName() const { return maName;} void SetUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource ); @@ -167,9 +167,9 @@ public: void removeByName(const OUString& rName); - const ListenersType& getListeners() const; - ListenersType& getListeners(); - StringSetType& getNonOleObjectNames(); + const ListenersType& getListeners() const { return maListeners;} + ListenersType& getListeners() { return maListeners;} + StringSetType& getNonOleObjectNames() { return maNonOleObjectNames;} /** * Create a unique name that's not taken by any existing chart listener diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index bc8304982dce..49c6409384b7 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -404,8 +404,8 @@ public: void SetDateTimeUTC( const DateTime& rDT ) { aDateTime = rDT; } - SC_DLLPUBLIC const OUString& GetUser() const; - const OUString& GetComment() const; + const OUString& GetUser() const { return aUser;} + const OUString& GetComment() const { return aComment;} // set user comment void SetComment( const OUString& rStr ); @@ -799,8 +799,8 @@ public: void GetOldString( OUString& rStr, const ScDocument* pDoc ) const; void GetNewString( OUString& rStr, const ScDocument* pDoc ) const; - SC_DLLPUBLIC const ScCellValue& GetOldCell() const; - SC_DLLPUBLIC const ScCellValue& GetNewCell() const; + const ScCellValue& GetOldCell() const { return maOldCell;} + const ScCellValue& GetNewCell() const { return maNewCell;} virtual void GetDescription( OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const SAL_OVERRIDE; @@ -1076,8 +1076,8 @@ public: bool IsInDeleteUndo() const { return bInDeleteUndo; } bool IsInPasteCut() const { return bInPasteCut; } SC_DLLPUBLIC void SetUser( const OUString& rUser ); - SC_DLLPUBLIC const OUString& GetUser() const; - SC_DLLPUBLIC const std::set<OUString>& GetUserCollection() const; + const OUString& GetUser() const { return maUser;} + const std::set<OUString>& GetUserCollection() const { return maUserCollection;} ScDocument* GetDocument() const { return pDoc; } // for import filter const DateTime& GetFixDateTime() const { return aFixDateTime; } diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx index b206b33ef999..7a2eb441f4e3 100644 --- a/sc/inc/clipcontext.hxx +++ b/sc/inc/clipcontext.hxx @@ -96,7 +96,7 @@ public: void setDeleteFlag( sal_uInt16 nFlag ); sal_uInt16 getDeleteFlag() const { return mnDeleteFlag;} - ScCellValue& getSingleCell(); + ScCellValue& getSingleCell() { return maSingleCell;} void setCondFormatList( ScConditionalFormatList* pCondFormatList ); ScConditionalFormatList* getCondFormatList() { return mpCondFormatList;} diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index b06fe2b8bd32..06c3c80c7faa 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -61,7 +61,7 @@ public: ScColorScaleEntry(ScDocument* pDoc, const ScColorScaleEntry& rEntry); ~ScColorScaleEntry(); - const Color& GetColor() const; + const Color& GetColor() const { return maColor;} void SetColor(const Color&); double GetValue() const; void SetValue(double nValue); diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 547fd147b3ca..e4e956b104bb 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -166,8 +166,8 @@ public: void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc); - ScDocument& GetDoc(); - const ScDocument& GetDoc() const; + ScDocument& GetDoc() { return *pDocument;} + const ScDocument& GetDoc() const { return *pDocument;} SCTAB GetTab() const { return nTab; } SCCOL GetCol() const { return nCol; } sc::CellStoreType& GetCellStore() { return maCells; } diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 0f2bde98796e..f70b01bd6585 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -350,7 +350,7 @@ public: void SetDateType(condformat::ScCondFormatDateType eType); condformat::ScCondFormatDateType GetDateType() const { return meType;} - const OUString& GetStyleName() const; + const OUString& GetStyleName() const { return maStyleName;} void SetStyleName( const OUString& rStyleName ); virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE { return condformat::DATE; } diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index c42e97043541..bb2684a409f4 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -220,11 +220,11 @@ public: ScDBCollection(ScDocument* pDocument); ScDBCollection(const ScDBCollection& r); - NamedDBs& getNamedDBs(); - const NamedDBs& getNamedDBs() const; + NamedDBs& getNamedDBs() { return maNamedDBs;} + const NamedDBs& getNamedDBs() const { return maNamedDBs;} - AnonDBs& getAnonDBs(); - const AnonDBs& getAnonDBs() const; + AnonDBs& getAnonDBs() { return maAnonDBs;} + const AnonDBs& getAnonDBs() const { return maAnonDBs;} const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) const; ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly); diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index cf858a0ecdf7..212a64440bb8 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -215,13 +215,13 @@ public: const ScAddress& GetPos() const { return maCurPos; } - CellType getType() const; + CellType getType() const { return maCurCell.meType;} OUString getString(); - const EditTextObject* getEditText() const; - ScFormulaCell* getFormulaCell(); - const ScFormulaCell* getFormulaCell() const; + const EditTextObject* getEditText() const { return maCurCell.mpEditText;} + ScFormulaCell* getFormulaCell() { return maCurCell.mpFormula;} + const ScFormulaCell* getFormulaCell() const { return maCurCell.mpFormula;} ScCellValue getCellValue() const; - const ScRefCellValue& getRefCellValue() const; + const ScRefCellValue& getRefCellValue() const { return maCurCell;} bool hasString() const; bool hasEmptyData() const; @@ -545,7 +545,7 @@ public: SCCOL GetEndCol() const { return nFoundEndCol; } SCROW GetRow() const { return nFoundRow; } const ScPatternAttr* GetPattern() const { return pFoundPattern; } - const ScRefCellValue& GetCell() const; + const ScRefCellValue& GetCell() const { return maFoundCell;} }; class ScRowBreakIterator diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index c00f55efd632..9d032d545263 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -553,8 +553,8 @@ public: SC_DLLPUBLIC const ScRangeData* GetRangeAtBlock( const ScRange& rBlock, OUString* pName=NULL ) const; bool HasPivotTable() const; - SC_DLLPUBLIC ScDPCollection* GetDPCollection(); - SC_DLLPUBLIC const ScDPCollection* GetDPCollection() const; + SC_DLLPUBLIC ScDPCollection* GetDPCollection(); + const ScDPCollection* GetDPCollection() const { return pDPCollection; } SC_DLLPUBLIC ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; ScDPObject* GetDPAtBlock( const ScRange& rBlock ) const; @@ -769,7 +769,7 @@ public: void BeginUnoRefUndo(); bool HasUnoRefUndo() const { return ( pUnoRefUndoList != NULL ); } ScUnoRefList* EndUnoRefUndo(); // must be deleted by caller! - sal_Int64 GetNewUnoId(); + sal_Int64 GetNewUnoId() { return ++nUnoObjectId; } void AddUnoRefChange( sal_Int64 nId, const ScRangeList& rOldRanges ); bool IsChart( const SdrObject* pObject ); @@ -1034,7 +1034,7 @@ public: void SetPreviewFont( SfxItemSet* pFontSet ); SfxItemSet* GetPreviewFont() { return pPreviewFont; } SfxItemSet* GetPreviewFont( SCCOL nCol, SCROW nRow, SCTAB nTab ); - const ScMarkData GetPreviewSelection(); + const ScMarkData& GetPreviewSelection() const { return maPreviewSelection; } void SetPreviewSelection( ScMarkData& rSel ); ScStyleSheet* GetPreviewCellStyle() { return pPreviewCellStyle; } ScStyleSheet* GetPreviewCellStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ); @@ -1410,7 +1410,7 @@ public: SC_DLLPUBLIC ScConditionalFormatList* GetCondFormList( SCTAB nTab ) const; - const ScValidationDataList* GetValidationList() const; + const ScValidationDataList* GetValidationList() const { return pValidationList;} ScValidationDataList* GetValidationList() { return pValidationList;} SC_DLLPUBLIC void ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, @@ -2092,7 +2092,7 @@ public: #endif void SetCalcConfig( const ScCalcConfig& rConfig ); - const ScCalcConfig& GetCalcConfig() const; + const ScCalcConfig& GetCalcConfig() const { return maCalcConfig; } private: diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index a740a929cbe8..ba578d2b5262 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -106,7 +106,7 @@ public: sal_Int32 getRowSize() const; sal_Int32 getColSize() const; - const ScDPCache* getCache() const; + const ScDPCache* getCache() const { return &mrCache;} void fillTable(const ScQueryParam& rQuery, bool bIgnoreEmptyRows, bool bRepeatIfEmpty); diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index 4990a29e8542..60b5d18a213b 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -143,7 +143,7 @@ public: ScDPGroupTableData( const ::boost::shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument ); virtual ~ScDPGroupTableData(); - boost::shared_ptr<ScDPTableData> GetSourceTableData(); + boost::shared_ptr<ScDPTableData> GetSourceTableData() { return pSourceData;} void AddGroupDimension( const ScDPGroupDimension& rGroup ); void SetNumGroupDimension( long nIndex, const ScDPNumGroupDimension& rGroup ); diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx index 5ab1b1ac76d3..1b586060627d 100644 --- a/sc/inc/dpitemdata.hxx +++ b/sc/inc/dpitemdata.hxx @@ -70,7 +70,7 @@ public: ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue); ~ScDPItemData(); - Type GetType() const; + Type GetType() const { return static_cast<Type>(meType); } void SetEmpty(); void SetString(const OUString& rS); void SetString(const OUString* pS); diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index b6866f743c95..696ec1f92766 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -396,9 +396,9 @@ public: void FreeTable(ScDPObject* pDPObj); SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj); - SC_DLLPUBLIC SheetCaches& GetSheetCaches(); - NameCaches& GetNameCaches(); - DBCaches& GetDBCaches(); + SheetCaches& GetSheetCaches() { return maSheetCaches;} + NameCaches& GetNameCaches() { return maNameCaches;} + DBCaches& GetDBCaches() { return maDBCaches;} ScRangeList GetAllTableRanges( SCTAB nTab ) const; bool IntersectsTableByColumns( SCCOL nCol1, SCCOL nCol2, SCROW nRow, SCTAB nTab ) const; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index ff3f43827614..4a4178d905d9 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -269,7 +269,7 @@ public: SC_DLLPUBLIC void SetGrandTotalName(const OUString& rName); SC_DLLPUBLIC const OUString* GetGrandTotalName() const; - SC_DLLPUBLIC const DimsType& GetDimensions() const; + const DimsType& GetDimensions() const { return aDimList;} /** * Get sort order map to sort row and column dimensions in order of diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index b5b10cb3d341..e591aaefd4d3 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -62,10 +62,10 @@ public: */ SC_DLLPUBLIC const ScRange& GetSourceRange() const; SC_DLLPUBLIC void SetRangeName(const OUString& rName); - SC_DLLPUBLIC const OUString& GetRangeName() const; + const OUString& GetRangeName() const { return maRangeName;} bool HasRangeName() const; void SetQueryParam(const ScQueryParam& rParam); - const ScQueryParam& GetQueryParam() const; + const ScQueryParam& GetQueryParam() const { return maQueryParam;} bool operator== ( const ScSheetSourceDesc& rOther ) const; SC_DLLPUBLIC const ScDPCache* CreateCache(const ScDPDimensionSaveData* pDimData) const; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 757054fb4131..733084952b18 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -424,7 +424,7 @@ public: bool HasSelectedPage() const { return bHasSelectedPage; } const ScDPItemData& GetSelectedData(); - const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const; + const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const { return aReferenceValue;} }; class ScDPHierarchies : public cppu::WeakImplHelper2< diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 666958a5f60a..78176fbc94f5 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -274,7 +274,7 @@ public: */ bool setCacheTableReferenced( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets, bool bPermanent ); void setAllCacheTableReferencedStati( bool bReferenced ); - bool areAllCacheTablesReferenced() const; + bool areAllCacheTablesReferenced() const { return maReferenced.mbAllReferenced;} /** * Collect all cached non-empty cell positions, inferred directly from the diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 25efdb786a8e..9e55aec7fd99 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -302,7 +302,7 @@ public: sc::FormulaResultValue GetResult(); sal_uInt8 GetMatrixFlag() const { return cMatrixFlag;} ScTokenArray* GetCode() { return pCode;} - const ScTokenArray* GetCode() const; + const ScTokenArray* GetCode() const { return pCode;} void SetCode( ScTokenArray* pNew ); @@ -375,7 +375,7 @@ public: * Turn a non-grouped cell into the top of a grouped cell. */ ScFormulaCellGroupRef CreateCellGroup( SCROW nLen, bool bInvariant ); - ScFormulaCellGroupRef GetCellGroup() const; + ScFormulaCellGroupRef GetCellGroup() const { return mxGroup;} void SetCellGroup( const ScFormulaCellGroupRef &xRef ); CompareState CompareByTokenArray( ScFormulaCell& rOther ) const; diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx index f42fdc7a4054..000a5beca7e7 100644 --- a/sc/inc/listenercontext.hxx +++ b/sc/inc/listenercontext.hxx @@ -32,7 +32,7 @@ class StartListeningContext : boost::noncopyable public: StartListeningContext(ScDocument& rDoc); StartListeningContext(ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet); - ScDocument& getDoc(); + ScDocument& getDoc() { return mrDoc;} ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol); }; @@ -51,7 +51,7 @@ public: void setPositionDelta( const ScAddress& rDelta ); - ScDocument& getDoc(); + ScDocument& getDoc() { return mrDoc;} ScTokenArray* getOldCode() { return mpOldCode;} ScAddress getOldPosition( const ScAddress& rPos ) const; diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx index eb374ec6d037..82c2247c7a29 100644 --- a/sc/inc/markdata.hxx +++ b/sc/inc/markdata.hxx @@ -87,7 +87,7 @@ public: SCTAB GetFirstSelected() const; SCTAB GetLastSelected() const; - const MarkedTabsType& GetSelectedTabs() const; + const MarkedTabsType& GetSelectedTabs() const { return maTabMarked;} void SetSelectedTabs(const MarkedTabsType& rTabs); void SetMarkNegative( bool bFlag ) { bMarkIsNeg = bFlag; } diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 5716207e07e7..e4408b2cf8a2 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -99,12 +99,12 @@ public: const ScNoteData& GetNoteData() const { return maNoteData;} /** Returns the creation date of this note. */ - const OUString& GetDate() const; + const OUString& GetDate() const { return maNoteData.maDate;} /** Sets a new creation date for this note. */ void SetDate( const OUString& rDate ); /** Returns the author date of this note. */ - const OUString& GetAuthor() const; + const OUString& GetAuthor() const { return maNoteData.maAuthor;} /** Sets a new author date for this note. */ void SetAuthor( const OUString& rAuthor ); @@ -123,7 +123,7 @@ public: /** Returns an existing note caption object. returns null, if the note contains initial caption data needed to construct a caption object. */ - SdrCaptionObj* GetCaption() const; + SdrCaptionObj* GetCaption() const { return maNoteData.mpCaption;} /** Returns the caption object of this note. Creates the caption object, if the note contains initial caption data instead of the caption. */ SdrCaptionObj* GetOrCreateCaption( const ScAddress& rPos ) const; @@ -133,7 +133,7 @@ public: /** Shows or hides the note caption object. */ void ShowCaption( const ScAddress& rPos, bool bShow = true ); /** Returns true, if the caption object is visible. */ - bool IsCaptionShown() const; + bool IsCaptionShown() const { return maNoteData.mbShown;} /** Shows or hides the caption temporarily (does not change internal visibility state). */ void ShowCaptionTemp( const ScAddress& rPos, bool bShow = true ); diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx index 2d1116e66629..f024e6de2753 100644 --- a/sc/inc/queryentry.hxx +++ b/sc/inc/queryentry.hxx @@ -64,7 +64,7 @@ struct SC_DLLPUBLIC ScQueryEntry /// creates pSearchParam and pSearchText if necessary, always RegExp! utl::TextSearch* GetSearchTextPtr( bool bCaseSens ) const; - QueryItemsType& GetQueryItems(); + QueryItemsType& GetQueryItems() { return maQueryItems;} const QueryItemsType& GetQueryItems() const { return maQueryItems;} void SetQueryByEmpty(); bool IsQueryByEmpty() const; diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index 53a356c959b5..ac27db8a3d9a 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -57,7 +57,7 @@ public: void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab ); /// InitAddressRel: InitFlags and set address, everything relative to rPos void InitAddressRel( const ScAddress& rAdr, const ScAddress& rPos ); - sal_uInt8 FlagValue() const; + sal_uInt8 FlagValue() const { return mnFlagValue;} void SetColRel( bool bVal ) { Flags.bColRel = bVal; } bool IsColRel() const { return Flags.bColRel; } @@ -77,11 +77,11 @@ public: void IncTab( SCTAB nInc ); void SetColDeleted( bool bVal ); - bool IsColDeleted() const; + bool IsColDeleted() const { return Flags.bColDeleted;} void SetRowDeleted( bool bVal ); - bool IsRowDeleted() const; + bool IsRowDeleted() const { return Flags.bRowDeleted;} void SetTabDeleted( bool bVal ); - bool IsTabDeleted() const; + bool IsTabDeleted() const { return Flags.bTabDeleted;} bool IsDeleted() const; void SetFlag3D( bool bVal ) { Flags.bFlag3D = bVal; } diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx index 146adf8f35d9..f8a6df71d40f 100644 --- a/sc/inc/refhint.hxx +++ b/sc/inc/refhint.hxx @@ -47,12 +47,12 @@ public: /** * Get the source range from which the references have moved. */ - const ScRange& getRange() const; + const ScRange& getRange() const { return maRange;} /** * Get the movement vector. */ - const ScAddress& getDelta() const; + const ScAddress& getDelta() const { return maMoveDelta;} }; class RefColReorderHint : public RefHint @@ -66,7 +66,7 @@ public: RefColReorderHint( const sc::ColReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 ); virtual ~RefColReorderHint(); - const sc::ColReorderMapType& getColMap() const; + const sc::ColReorderMapType& getColMap() const { return mrColMap;} SCTAB getTab() const { return mnTab;} SCROW getStartRow() const { return mnRow1;} diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx index 8d2c5975d1bf..a33455444438 100644 --- a/sc/inc/rowheightcontext.hxx +++ b/sc/inc/rowheightcontext.hxx @@ -38,8 +38,8 @@ public: double getPPTX() const { return mfPPTX;} double getPPTY() const { return mfPPTY;} - const Fraction& getZoomX() const; - const Fraction& getZoomY() const; + const Fraction& getZoomX() const { return maZoomX;} + const Fraction& getZoomY() const { return maZoomY;} OutputDevice* getOutputDevice() { return mpOutDev;} diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 055c38e9f05a..1e68839bc401 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -141,7 +141,7 @@ public: void AnythingChanged(); // Drag & Drop: - const ScDragData& GetDragData() const; + const ScDragData& GetDragData() const { return *mpDragData;} void SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); void ResetDragObject(); void SetDragLink( @@ -150,7 +150,7 @@ public: ScDocument* pLocalDoc, const OUString& rTarget, const OUString& rText ); // clipboard: - const ScClipData& GetClipData() const; + const ScClipData& GetClipData() const { return *mpClipData;} void SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); ScDocument* GetClipDoc(); // called from document - should be removed later diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 45f8912fa7f4..14bdbe5614d5 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -223,8 +223,8 @@ public: bool bColInfo = true, bool bRowInfo = true ); ~ScTable(); - ScDocument& GetDoc(); - const ScDocument& GetDoc() const; + ScDocument& GetDoc() { return *pDocument;} + const ScDocument& GetDoc() const { return *pDocument;} SCTAB GetTab() const { return nTab; } ScOutlineTable* GetOutlineTable() { return pOutlineTable; } @@ -271,21 +271,21 @@ public: void GetScenarioComment( OUString& rComment) const { rComment = aComment; } void SetScenarioComment( const OUString& rComment ) { aComment = rComment; } const Color& GetScenarioColor() const { return aScenarioColor; } - void SetScenarioColor(const Color& rNew) { aScenarioColor = rNew; } - const Color& GetTabBgColor() const; + void SetScenarioColor(const Color& rNew) { aScenarioColor = rNew; } + const Color& GetTabBgColor() const { return aTabBgColor; } void SetTabBgColor(const Color& rColor); - sal_uInt16 GetScenarioFlags() const { return nScenarioFlags; } - void SetScenarioFlags(sal_uInt16 nNew) { nScenarioFlags = nNew; } + sal_uInt16 GetScenarioFlags() const { return nScenarioFlags; } + void SetScenarioFlags(sal_uInt16 nNew) { nScenarioFlags = nNew; } void SetActiveScenario(bool bSet) { bActiveScenario = bSet; } bool IsActiveScenario() const { return bActiveScenario; } - sal_uInt8 GetLinkMode() const { return nLinkMode; } - bool IsLinked() const { return nLinkMode != SC_LINK_NONE; } - const OUString& GetLinkDoc() const { return aLinkDoc; } - const OUString& GetLinkFlt() const { return aLinkFlt; } - const OUString& GetLinkOpt() const { return aLinkOpt; } - const OUString& GetLinkTab() const { return aLinkTab; } - sal_uLong GetLinkRefreshDelay() const { return nLinkRefreshDelay; } + sal_uInt8 GetLinkMode() const { return nLinkMode; } + bool IsLinked() const { return nLinkMode != SC_LINK_NONE; } + const OUString& GetLinkDoc() const { return aLinkDoc; } + const OUString& GetLinkFlt() const { return aLinkFlt; } + const OUString& GetLinkOpt() const { return aLinkOpt; } + const OUString& GetLinkTab() const { return aLinkTab; } + sal_uLong GetLinkRefreshDelay() const { return nLinkRefreshDelay; } void SetLink( sal_uInt8 nMode, const OUString& rDoc, const OUString& rFlt, const OUString& rOpt, const OUString& rTab, sal_uLong nRefreshDelay ); diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index e516a967e7cf..7f854ad3df27 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -135,7 +135,7 @@ public: sal_uInt16 GetPart() const { return nPart; } ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; } - const EditTextObject* GetTextObject() const; + const EditTextObject* GetTextObject() const { return mpTextObj;} }; /** diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx index 37965c8fe200..a94844d02959 100644 --- a/sc/inc/tokenstringcontext.hxx +++ b/sc/inc/tokenstringcontext.hxx @@ -61,7 +61,7 @@ public: formula::FormulaGrammar::Grammar getGrammar() const { return meGram;} void setGrammar( formula::FormulaGrammar::Grammar eGram ); - const std::vector<OUString>& getTabNames() const; + const std::vector<OUString>& getTabNames() const { return maTabNames;} ScDocument* getDoc() { return mpDoc;} }; diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx index dc313c05d913..42dcd609c079 100644 --- a/sc/inc/typedstrdata.hxx +++ b/sc/inc/typedstrdata.hxx @@ -33,7 +33,7 @@ public: bool IsStrData() const; bool IsDate() const { return mbIsDate;} - SC_DLLPUBLIC const OUString& GetString() const; + const OUString& GetString() const { return maStrValue;} StringType GetStringType() const { return meStrType;} double GetValue() const { return mfValue; } diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index c2a88dfbebf5..bdac5fd5c48f 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -37,7 +37,7 @@ public: ~ScUnitConverterData(); double GetValue() const { return mfValue;} - const OUString& GetIndexString() const; + const OUString& GetIndexString() const { return maIndexString;} static OUString BuildIndexString( const OUString& rFromUnit, const OUString& rToUnit ); diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index b7ec5cd2f055..817ac2c14415 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -85,7 +85,7 @@ public: bool Import( sal_uInt8 nMode, ErrCode& rError ); bool Export(bool bStylesOnly); - const sc::ImportPostProcessData& GetImportPostProcessData() const; + const sc::ImportPostProcessData& GetImportPostProcessData() const { return maPostProcessData;} }; class ScXMLChartExportWrapper diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index df14e4ec8bce..712bd0457e5c 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -1130,10 +1130,6 @@ ScCondFormatItem* ScCondFormatItem::Clone(SfxItemPool*) const return new ScCondFormatItem(maIndex); } -const std::vector<sal_uInt32>& ScCondFormatItem::GetCondFormatData() const -{ - return maIndex; -} void ScCondFormatItem::AddCondFormatData( sal_uInt32 nIndex ) { diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx index 556e3dbcb4d8..d5dc3dc15831 100644 --- a/sc/source/core/data/clipcontext.cxx +++ b/sc/source/core/data/clipcontext.cxx @@ -82,10 +82,6 @@ void CopyFromClipContext::setDeleteFlag( sal_uInt16 nFlag ) } -ScCellValue& CopyFromClipContext::getSingleCell() -{ - return maSingleCell; -} void CopyFromClipContext::setCondFormatList( ScConditionalFormatList* pCondFormatList ) { diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index fe8eff879695..d2e0eef2950b 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -280,10 +280,6 @@ bool ScColorScaleEntry::NeedsRepaint() const return false; } -const Color& ScColorScaleEntry::GetColor() const -{ - return maColor; -} void ScColorScaleEntry::SetColor(const Color& rColor) { diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index f0dc03af9be9..0bc27bb0f464 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -750,15 +750,7 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) pDocPool->Remove( *pNewPattern ); // free up resources } -ScDocument& ScColumn::GetDoc() -{ - return *pDocument; -} -const ScDocument& ScColumn::GetDoc() const -{ - return *pDocument; -} ScRefCellValue ScColumn::GetCellValue( SCROW nRow ) const { diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 2fb8cf125d6c..2c6bc2918d29 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1776,10 +1776,6 @@ void ScCondDateFormatEntry::SetDateType( condformat::ScCondFormatDateType eType } -const OUString& ScCondDateFormatEntry::GetStyleName() const -{ - return maStyleName; -} void ScCondDateFormatEntry::SetStyleName( const OUString& rStyleName ) { diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 235e0d277d72..06519a0569b6 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -931,30 +931,14 @@ bool ScCellIterator::getCurrent() return false; } -CellType ScCellIterator::getType() const -{ - return maCurCell.meType; -} OUString ScCellIterator::getString() { return maCurCell.getString(mpDoc); } -const EditTextObject* ScCellIterator::getEditText() const -{ - return maCurCell.mpEditText; -} -ScFormulaCell* ScCellIterator::getFormulaCell() -{ - return maCurCell.mpFormula; -} -const ScFormulaCell* ScCellIterator::getFormulaCell() const -{ - return maCurCell.mpFormula; -} ScCellValue ScCellIterator::getCellValue() const { @@ -982,10 +966,6 @@ ScCellValue ScCellIterator::getCellValue() const return aRet; } -const ScRefCellValue& ScCellIterator::getRefCellValue() const -{ - return maCurCell; -} bool ScCellIterator::hasString() const { @@ -2501,10 +2481,6 @@ bool ScUsedAreaIterator::GetNext() return bFound; } -const ScRefCellValue& ScUsedAreaIterator::GetCell() const -{ - return maFoundCell; -} ScDocAttrIterator::ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index a1bc567efb9d..2b143ff0d873 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1392,10 +1392,6 @@ void ScDocument::SetPreviewFont( SfxItemSet* pFont ) pPreviewFont = pFont; } -const ScMarkData ScDocument::GetPreviewSelection() -{ - return maPreviewSelection; -} void ScDocument::SetPreviewSelection( ScMarkData& rSel ) { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 2a4bde6506ba..e25a742f60c7 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -324,10 +324,6 @@ ScDPCollection* ScDocument::GetDPCollection() return pDPCollection; } -const ScDPCollection* ScDocument::GetDPCollection() const -{ - return pDPCollection; -} ScDPObject* ScDocument::GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const { @@ -964,10 +960,6 @@ void ScDocument::AddUnoRefChange( sal_Int64 nId, const ScRangeList& rOldRanges ) pUnoRefUndoList->Add( nId, rOldRanges ); } -sal_Int64 ScDocument::GetNewUnoId() -{ - return ++nUnoObjectId; -} void ScDocument::UpdateReference( sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc, bool bIncludeDraw, bool bUpdateNoteCaptionPos ) diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 928a478e4480..4df3001cecf9 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4503,10 +4503,6 @@ const ScPatternAttr* ScDocument::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow return NULL; } -const ScValidationDataList* ScDocument::GetValidationList() const -{ - return pValidationList; -} void ScDocument::ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ) diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx index 4112bb9d0ee3..a2aac0ac1a93 100644 --- a/sc/source/core/data/document10.cxx +++ b/sc/source/core/data/document10.cxx @@ -239,10 +239,6 @@ void ScDocument::SetCalcConfig( const ScCalcConfig& rConfig ) maCalcConfig = rConfig; } -const ScCalcConfig& ScDocument::GetCalcConfig() const -{ - return maCalcConfig; -} void ScDocument::PreprocessRangeNameUpdate() { diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 3a95fac2c720..3b248ff9be3b 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -410,10 +410,6 @@ bool ScDPFilteredCache::isRowQualified(sal_Int32 nRow, const vector<Criterion>& return true; } -const ScDPCache* ScDPFilteredCache::getCache() const -{ - return &mrCache; -} #if DEBUG_PIVOT_TABLE using std::cout; diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index e2eeea7a0971..70085f64f078 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -494,10 +494,6 @@ ScDPGroupTableData::~ScDPGroupTableData() delete[] pNumGroups; } -boost::shared_ptr<ScDPTableData> ScDPGroupTableData::GetSourceTableData() -{ - return pSourceData; -} void ScDPGroupTableData::AddGroupDimension( const ScDPGroupDimension& rGroup ) { diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx index 94f66762adeb..6bd1f736cc14 100644 --- a/sc/source/core/data/dpitemdata.cxx +++ b/sc/source/core/data/dpitemdata.cxx @@ -152,11 +152,6 @@ ScDPItemData::~ScDPItemData() DisposeString(); } -ScDPItemData::Type ScDPItemData::GetType() const -{ - return static_cast<Type>(meType); -} - void ScDPItemData::SetEmpty() { DisposeString(); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index df40306ab97b..c69dfd38f51d 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -3618,20 +3618,8 @@ bool ScDPCollection::InsertNewTable(ScDPObject* pDPObj) return true; } -ScDPCollection::SheetCaches& ScDPCollection::GetSheetCaches() -{ - return maSheetCaches; -} -ScDPCollection::NameCaches& ScDPCollection::GetNameCaches() -{ - return maNameCaches; -} -ScDPCollection::DBCaches& ScDPCollection::GetDBCaches() -{ - return maDBCaches; -} ScRangeList ScDPCollection::GetAllTableRanges( SCTAB nTab ) const { diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 761a369a208e..91fab1cca7e6 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -865,10 +865,6 @@ const OUString* ScDPSaveData::GetGrandTotalName() const return mpGrandTotalName.get(); } -const ScDPSaveData::DimsType& ScDPSaveData::GetDimensions() const -{ - return aDimList; -} namespace { diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 2a03978b7bcb..166c4a3c28be 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -252,10 +252,6 @@ void ScSheetSourceDesc::SetRangeName(const OUString& rName) maRangeName = rName; } -const OUString& ScSheetSourceDesc::GetRangeName() const -{ - return maRangeName; -} bool ScSheetSourceDesc::HasRangeName() const { @@ -267,10 +263,6 @@ void ScSheetSourceDesc::SetQueryParam(const ScQueryParam& rParam) maQueryParam = rParam; } -const ScQueryParam& ScSheetSourceDesc::GetQueryParam() const -{ - return maQueryParam; -} bool ScSheetSourceDesc::operator== (const ScSheetSourceDesc& rOther) const { diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 8355ff48c5d3..f7120ba7e8da 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1458,10 +1458,6 @@ uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() throw(uno return CreateCloneObject(); } -const sheet::DataPilotFieldReference& ScDPDimension::GetReferenceValue() const -{ - return aReferenceValue; -} const ScDPItemData& ScDPDimension::GetSelectedData() { diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index c7e9aeb6006e..ea2eadc8a7e9 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3390,10 +3390,6 @@ void ScFormulaCell::SetChanged(bool b) -const ScTokenArray* ScFormulaCell::GetCode() const -{ - return pCode; -} void ScFormulaCell::SetCode( ScTokenArray* pNew ) { @@ -3516,10 +3512,6 @@ ScFormulaCellGroupRef ScFormulaCell::CreateCellGroup( SCROW nLen, bool bInvarian return mxGroup; } -ScFormulaCellGroupRef ScFormulaCell::GetCellGroup() const -{ - return mxGroup; -} void ScFormulaCell::SetCellGroup( const ScFormulaCellGroupRef &xRef ) { diff --git a/sc/source/core/data/listenercontext.cxx b/sc/source/core/data/listenercontext.cxx index d6b92ebe0ef6..0463e7baa75a 100644 --- a/sc/source/core/data/listenercontext.cxx +++ b/sc/source/core/data/listenercontext.cxx @@ -20,10 +20,6 @@ StartListeningContext::StartListeningContext( ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet) : mrDoc(rDoc), mpSet(pSet) {} -ScDocument& StartListeningContext::getDoc() -{ - return mrDoc; -} ColumnBlockPosition* StartListeningContext::getBlockPosition(SCTAB nTab, SCCOL nCol) { @@ -44,10 +40,6 @@ void EndListeningContext::setPositionDelta( const ScAddress& rDelta ) maPosDelta = rDelta; } -ScDocument& EndListeningContext::getDoc() -{ - return mrDoc; -} ScAddress EndListeningContext::getOldPosition( const ScAddress& rPos ) const diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index a062593735f0..fc200b23f132 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -216,10 +216,6 @@ SCTAB ScMarkData::GetLastSelected() const return 0; } -const ScMarkData::MarkedTabsType& ScMarkData::GetSelectedTabs() const -{ - return maTabMarked; -} void ScMarkData::SetSelectedTabs(const MarkedTabsType& rTabs) { diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 09b6f5189464..141de43276e5 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -510,20 +510,12 @@ ScPostIt* ScPostIt::Clone( const ScAddress& rOwnPos, ScDocument& rDestDoc, const } -const OUString& ScPostIt::GetDate() const -{ - return maNoteData.maDate; -} void ScPostIt::SetDate( const OUString& rDate ) { maNoteData.maDate = rDate; } -const OUString& ScPostIt::GetAuthor() const -{ - return maNoteData.maAuthor; -} void ScPostIt::SetAuthor( const OUString& rAuthor ) { @@ -576,10 +568,6 @@ void ScPostIt::SetText( const ScAddress& rPos, const OUString& rText ) maNoteData.mpCaption->SetText( rText ); } -SdrCaptionObj* ScPostIt::GetCaption() const -{ - return maNoteData.mpCaption; -} SdrCaptionObj* ScPostIt::GetOrCreateCaption( const ScAddress& rPos ) const { @@ -604,10 +592,6 @@ void ScPostIt::ShowCaption( const ScAddress& rPos, bool bShow ) ScCaptionUtil::SetCaptionLayer( *maNoteData.mpCaption, bShow ); } -bool ScPostIt::IsCaptionShown() const -{ - return maNoteData.mbShown; -} void ScPostIt::ShowCaptionTemp( const ScAddress& rPos, bool bShow ) { diff --git a/sc/source/core/data/rowheightcontext.cxx b/sc/source/core/data/rowheightcontext.cxx index 408bf4df759a..08466ae2acad 100644 --- a/sc/source/core/data/rowheightcontext.cxx +++ b/sc/source/core/data/rowheightcontext.cxx @@ -24,15 +24,7 @@ RowHeightContext::~RowHeightContext() {} -const Fraction& RowHeightContext::getZoomX() const -{ - return maZoomX; -} -const Fraction& RowHeightContext::getZoomY() const -{ - return maZoomY; -} void RowHeightContext::setExtraHeight( sal_uInt16 nH ) diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index fe407e0db71c..5cba042224ed 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -394,10 +394,6 @@ void ScTable::SetLoadingRTL( bool bSet ) bLoadingRTL = bSet; } -const Color& ScTable::GetTabBgColor() const -{ - return aTabBgColor; -} void ScTable::SetTabBgColor(const Color& rColor) { diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index b5447116834e..5b44baf605fc 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2640,15 +2640,7 @@ bool ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, std::set<ScTypedStrData>& r return aCol[nCol].GetDataEntries( nRow, rStrings, bLimit ); } -ScDocument& ScTable::GetDoc() -{ - return *pDocument; -} -const ScDocument& ScTable::GetDoc() const -{ - return *pDocument; -} sal_uLong ScTable::GetCellCount() const { diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 8d19ab9ac5c3..364f922d715a 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -112,7 +112,7 @@ public: void setOption(SCSIZE nOptId, bool bEnabled); void setEnhancedProtection( const ::std::vector< ScEnhancedProtection > & rProt ); - const ::std::vector< ScEnhancedProtection > & getEnhancedProtection() const; + const ::std::vector< ScEnhancedProtection > & getEnhancedProtection() const { return maEnhancedProtection;} bool updateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); bool isBlockEditable( const ScRange& rRange ) const; bool isSelectionEditable( const ScRangeList& rRangeList ) const; @@ -351,10 +351,6 @@ void ScTableProtectionImpl::setEnhancedProtection( const ::std::vector< ScEnhanc maEnhancedProtection = rProt; } -const ::std::vector< ScEnhancedProtection > & ScTableProtectionImpl::getEnhancedProtection() const -{ - return maEnhancedProtection; -} bool ScTableProtectionImpl::updateReference( UpdateRefMode eMode, ScDocument* pDoc, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 1ca4d1cf0b69..3c7d18248cc9 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -92,7 +92,7 @@ public: explicit ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange); virtual ~ScDBInternalRange(); - const ScRange& getRange() const; + const ScRange& getRange() const { return maRange;} virtual SCCOL getColSize() const SAL_OVERRIDE; virtual SCROW getRowSize() const SAL_OVERRIDE; diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx index 63e2ee20f1bd..0f5be1945457 100644 --- a/sc/source/core/inc/jumpmatrix.hxx +++ b/sc/source/core/inc/jumpmatrix.hxx @@ -101,7 +101,7 @@ public: void GetJump( SCSIZE nCol, SCSIZE nRow, double& rBool, short& rStart, short& rNext, short& rStop ) const; void SetAllJumps( double fBool, short nStart, short nNext, short nStop = SHRT_MAX ); void SetJumpParameters( ScTokenVec* p ); - const ScTokenVec* GetJumpParameters() const; + const ScTokenVec* GetJumpParameters() const { return pParams;} bool HasResultMatrix() const; ScMatrix* GetResultMatrix(); ///< also applies pending buffered values void GetPos( SCSIZE& rCol, SCSIZE& rRow ) const; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index d8539b9d76aa..f0a757b071e8 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1699,9 +1699,5 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) } } -ScMatrixRef ScUnoAddInCall::GetMatrix() const -{ - return xMatrix; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 6e15d7739100..a19686bdf4a8 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -95,10 +95,6 @@ void ScChartListener::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } -boost::unordered_set<sal_uInt16>& ScChartListener::ExternalRefListener::getAllFileIds() -{ - return maFileIds; -} ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : @@ -176,10 +172,6 @@ ScChartListener::~ScChartListener() } } -const OUString& ScChartListener::GetName() const -{ - return maName; -} void ScChartListener::SetUno( const uno::Reference< chart::XChartDataChangeEventListener >& rListener, @@ -477,20 +469,8 @@ bool ScChartListenerCollection::hasListeners() const return !maListeners.empty(); } -const ScChartListenerCollection::ListenersType& ScChartListenerCollection::getListeners() const -{ - return maListeners; -} -ScChartListenerCollection::ListenersType& ScChartListenerCollection::getListeners() -{ - return maListeners; -} -ScChartListenerCollection::StringSetType& ScChartListenerCollection::getNonOleObjectNames() -{ - return maNonOleObjectNames; -} OUString ScChartListenerCollection::getUniqueName(const OUString& rPrefix) const { diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index b2097a119d42..239964488221 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -553,20 +553,12 @@ OUString ScChangeAction::GetRefString( return aBuf.makeStringAndClear(); } -const OUString& ScChangeAction::GetUser() const -{ - return aUser; -} void ScChangeAction::SetUser( const OUString& r ) { aUser = r; } -const OUString& ScChangeAction::GetComment() const -{ - return aComment; -} void ScChangeAction::SetComment( const OUString& rStr ) { @@ -1451,15 +1443,7 @@ void ScChangeActionContent::GetNewString( OUString& rStr, const ScDocument* pDoc GetValueString(rStr, maNewValue, maNewCell, pDoc); } -const ScCellValue& ScChangeActionContent::GetOldCell() const -{ - return maOldCell; -} -const ScCellValue& ScChangeActionContent::GetNewCell() const -{ - return maNewCell; -} void ScChangeActionContent::GetDescription( OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const @@ -2217,10 +2201,6 @@ void ScChangeTrack::Clear() Init(); } -const std::set<OUString>& ScChangeTrack::GetUserCollection() const -{ - return maUserCollection; -} void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { @@ -2258,10 +2238,6 @@ void ScChangeTrack::SetUser( const OUString& rUser ) maUserCollection.insert(maUser); } -const OUString& ScChangeTrack::GetUser() const -{ - return maUser; -} void ScChangeTrack::StartBlockModify( ScChangeTrackMsgType eMsgType, sal_uLong nStartAction ) diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index e8f171fa4ce0..9e51ae1aa8a3 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -802,25 +802,9 @@ ScDBCollection::ScDBCollection(ScDocument* pDocument) : ScDBCollection::ScDBCollection(const ScDBCollection& r) : pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs), maAnonDBs(r.maAnonDBs) {} -ScDBCollection::NamedDBs& ScDBCollection::getNamedDBs() -{ - return maNamedDBs; -} -const ScDBCollection::NamedDBs& ScDBCollection::getNamedDBs() const -{ - return maNamedDBs; -} -ScDBCollection::AnonDBs& ScDBCollection::getAnonDBs() -{ - return maAnonDBs; -} -const ScDBCollection::AnonDBs& ScDBCollection::getAnonDBs() const -{ - return maAnonDBs; -} const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) const { diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 66a9edbbc043..547bc21e6aec 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -276,10 +276,6 @@ ScDBInternalRange::~ScDBInternalRange() { } -const ScRange& ScDBInternalRange::getRange() const -{ - return maRange; -} SCCOL ScDBInternalRange::getColSize() const { diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx index adac4f68f6a3..625e425c18b4 100644 --- a/sc/source/core/tool/jumpmatrix.cxx +++ b/sc/source/core/tool/jumpmatrix.cxx @@ -110,10 +110,6 @@ void ScJumpMatrix::SetJumpParameters(ScTokenVec* p) pParams = p; } -const ScTokenVec* ScJumpMatrix::GetJumpParameters() const -{ - return pParams; -} void ScJumpMatrix::GetPos(SCSIZE& rCol, SCSIZE& rRow) const { diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index 455c8c6617cb..af739594a2a4 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -79,10 +79,6 @@ ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r ) return *this; } -ScQueryEntry::QueryItemsType& ScQueryEntry::GetQueryItems() -{ - return maQueryItems; -} void ScQueryEntry::SetQueryByEmpty() diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx index 9a5bb0ca4431..435326514f30 100644 --- a/sc/source/core/tool/refdata.cxx +++ b/sc/source/core/tool/refdata.cxx @@ -41,10 +41,6 @@ void ScSingleRefData::InitAddressRel( const ScAddress& rAdr, const ScAddress& rP SetAddress(rAdr, rPos); } -sal_uInt8 ScSingleRefData::FlagValue() const -{ - return mnFlagValue; -} void ScSingleRefData::SetAbsCol( SCCOL nVal ) { @@ -102,30 +98,18 @@ void ScSingleRefData::SetColDeleted( bool bVal ) Flags.bColDeleted = bVal; } -bool ScSingleRefData::IsColDeleted() const -{ - return Flags.bColDeleted; -} void ScSingleRefData::SetRowDeleted( bool bVal ) { Flags.bRowDeleted = bVal; } -bool ScSingleRefData::IsRowDeleted() const -{ - return Flags.bRowDeleted; -} void ScSingleRefData::SetTabDeleted( bool bVal ) { Flags.bTabDeleted = bVal; } -bool ScSingleRefData::IsTabDeleted() const -{ - return Flags.bTabDeleted; -} bool ScSingleRefData::IsDeleted() const { diff --git a/sc/source/core/tool/refhint.cxx b/sc/source/core/tool/refhint.cxx index 56e21e41d035..8327b6186cec 100644 --- a/sc/source/core/tool/refhint.cxx +++ b/sc/source/core/tool/refhint.cxx @@ -20,25 +20,13 @@ RefMovedHint::RefMovedHint( const ScRange& rRange, const ScAddress& rMove ) : RefMovedHint::~RefMovedHint() {} -const ScRange& RefMovedHint::getRange() const -{ - return maRange; -} -const ScAddress& RefMovedHint::getDelta() const -{ - return maMoveDelta; -} RefColReorderHint::RefColReorderHint( const sc::ColReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 ) : RefHint(ColumnReordered), mrColMap(rColMap), mnTab(nTab), mnRow1(nRow1), mnRow2(nRow2) {} RefColReorderHint::~RefColReorderHint() {} -const sc::ColReorderMapType& RefColReorderHint::getColMap() const -{ - return mrColMap; -} diff --git a/sc/source/core/tool/tokenstringcontext.cxx b/sc/source/core/tool/tokenstringcontext.cxx index de23ddb7e7d4..3eb2f16b8474 100644 --- a/sc/source/core/tool/tokenstringcontext.cxx +++ b/sc/source/core/tool/tokenstringcontext.cxx @@ -137,10 +137,6 @@ void CompileFormulaContext::setGrammar( formula::FormulaGrammar::Grammar eGram ) updateTabNames(); } -const std::vector<OUString>& CompileFormulaContext::getTabNames() const -{ - return maTabNames; -} } diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index b13e49a4af6a..de9b8ba14a71 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -105,10 +105,6 @@ bool ScTypedStrData::IsStrData() const } -const OUString& ScTypedStrData::GetString() const -{ - return maStrValue; -} FindTypedStrData::FindTypedStrData(const ScTypedStrData& rVal, bool bCaseSens) : diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 87f4c8d96d44..b9d5c61856c7 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -42,10 +42,6 @@ ScUnitConverterData::ScUnitConverterData( const ScUnitConverterData& r ) : ScUnitConverterData::~ScUnitConverterData() {} -const OUString& ScUnitConverterData::GetIndexString() const -{ - return maIndexString; -} OUString ScUnitConverterData::BuildIndexString( const OUString& rFromUnit, const OUString& rToUnit ) diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index dbb2653d6114..9623b9aeef36 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -996,12 +996,6 @@ OUString XclExpPTField::GetFieldName() const return mpCacheField ? mpCacheField->GetFieldName() : OUString(); } -sal_uInt16 XclExpPTField::GetFieldIndex() const -{ - // field index always equal to cache index - return maFieldInfo.mnCacheIdx; -} - sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const { OSL_ENSURE( !maDataInfoVec.empty(), "XclExpPTField::GetLastDataInfoIndex - no data info found" ); diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index a1c9585372a8..3f9e9a93ce05 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2205,10 +2205,6 @@ void XclExpRowBuffer::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_sheetData ); } -XclExpDimensions* XclExpRowBuffer::GetDimensions() -{ - return &maDimensions; -} XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysEmpty ) { diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 28d8ec53b784..774d24479854 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -811,10 +811,6 @@ XclImpCachedValue::~XclImpCachedValue() { } -const OUString& XclImpCachedValue::GetString() const -{ - return maStr; -} sal_uInt16 XclImpCachedValue::GetScError() const { diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 0e26d5eb5c54..49e2acb55fb9 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -51,7 +51,7 @@ public: /** Reads a cached value and stores it with its cell address. */ explicit XclImpCrn( XclImpStream& rStrm, const XclAddress& rXclPos ); - const XclAddress& GetAddress() const; + const XclAddress& GetAddress() const { return maXclPos;} private: XclAddress maXclPos; /// Excel position of the cached cell. @@ -544,10 +544,6 @@ XclImpCrn::XclImpCrn( XclImpStream& rStrm, const XclAddress& rXclPos ) : { } -const XclAddress& XclImpCrn::GetAddress() const -{ - return maXclPos; -} // Sheet in an external document ============================================== diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index e4b733fb7e9d..40fb56e298e2 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -203,15 +203,7 @@ ScHTMLParser::~ScHTMLParser() { } -ScHTMLStyles& ScHTMLParser::GetStyles() -{ - return maStyles; -} -ScDocument& ScHTMLParser::GetDoc() -{ - return *mpDoc; -} ScHTMLLayoutParser::ScHTMLLayoutParser( EditEngine* pEditP, const OUString& rBaseURL, const Size& aPageSizeP, diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 6dd41a39aed2..c572c3913ab4 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -90,8 +90,8 @@ public: virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE = 0; - ScHTMLStyles& GetStyles(); - ScDocument& GetDoc(); + ScHTMLStyles& GetStyles() { return maStyles;} + ScDocument& GetDoc() { return *mpDoc;} /** Returns the "global table" which contains the entire HTML document. */ virtual const ScHTMLTable* GetGlobalTable() const = 0; diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 7f3a73242522..b2e11864f6b8 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -252,7 +252,7 @@ public: void finalizeImport(); /** Returns an API font descriptor with own font information. */ - const ::com::sun::star::awt::FontDescriptor& getFontDescriptor() const; + const ::com::sun::star::awt::FontDescriptor& getFontDescriptor() const { return maApiData.maDesc;} /** Returns true, if the font requires rich text formatting in Calc. @descr Example: Font escapement is a cell attribute in Excel, but Calc needs an rich text cell for this attribute. */ diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index e2fc6d8a805e..e4be5e58df55 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -318,7 +318,7 @@ class ExcBundlesheet8 : public ExcBundlesheetBase { private: OUString sUnicodeName; - XclExpString GetName() const; + XclExpString GetName() const { return XclExpString( sUnicodeName, EXC_STR_8BITLENGTH );} virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 7eacea1a3b79..9c645d78498b 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -274,8 +274,11 @@ public: /** Returns the name of this field. */ OUString GetFieldName() const; - /** Returns the pivot table field list index of this field. */ - sal_uInt16 GetFieldIndex() const; + /** Returns the pivot table field list index of this field. + * The field index is always equal to cache index. + */ + sal_uInt16 GetFieldIndex() const { return maFieldInfo.mnCacheIdx; } + /** Returns the index of the last inserted data info struct. */ sal_uInt16 GetLastDataInfoIndex() const; diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index b9aad1d09e92..0d90d08f2086 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -941,7 +941,7 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - XclExpDimensions* GetDimensions(); + XclExpDimensions* GetDimensions() { return &maDimensions;} private: /** Returns access to the specified ROW record. Inserts preceding missing ROW records. diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 02786a942089..ce49f0e9ccd7 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -302,7 +302,7 @@ public: /** Returns the type of the cached value (EXC_CACHEDVAL_*). */ inline sal_uInt8 GetType() const { return mnType; } /** Returns the cached string value, if this value is a string, else an empty string. */ - const OUString& GetString() const; + const OUString& GetString() const { return maStr;} /** Returns the cached number, if this value has number type, else 0.0. */ inline double GetValue() const { return mfValue; } /** Returns the cached Boolean value, if this value has Boolean type, else false. */ diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 628db5e915d6..29ae77008971 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -859,10 +859,6 @@ void Font::finalizeImport() } } -const FontDescriptor& Font::getFontDescriptor() const -{ - return maApiData.maDesc; -} bool Font::needsRichTextFormat() const { diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index f59c4781bffa..4463be4b429d 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -149,7 +149,8 @@ public: ScDocument& getScDocument() { return *mpDoc; } - ScDocShell& getDocShell(); + ScDocShell& getDocShell() { return *mpDocShell; } + ScDocumentImport& getDocImport(); /** Returns a reference to the source/target spreadsheet document model. */ @@ -331,11 +332,6 @@ WorkbookGlobals::~WorkbookGlobals() mrExcelFilter.unregisterWorkbookGlobals(); } -ScDocShell& WorkbookGlobals::getDocShell() -{ - return *mpDocShell; -} - ScDocumentImport& WorkbookGlobals::getDocImport() { return *mxDocImport; diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index bb4eb8c5f421..17fda19b1ad1 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1086,10 +1086,6 @@ ExcBundlesheet8::ExcBundlesheet8( const OUString& rString ) : } -XclExpString ExcBundlesheet8::GetName() const -{ - return XclExpString( sUnicodeName, EXC_STR_8BITLENGTH ); -} void ExcBundlesheet8::SaveCont( XclExpStream& rStrm ) diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 156650552783..31566c85b396 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -678,10 +678,6 @@ sal_Int32 ScRowFormatRanges::GetMaxRows() const return nMaxRows; } -sal_Int32 ScRowFormatRanges::GetSize() const -{ - return nSize; -} void ScRowFormatRanges::Sort() { diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 31ceafe68902..e51f46820b4f 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -160,7 +160,7 @@ public: void AddRange(ScMyRowFormatRange& rFormatRange); bool GetNext(ScMyRowFormatRange& rFormatRange); sal_Int32 GetMaxRows() const; - sal_Int32 GetSize() const; + sal_Int32 GetSize() const { return nSize;} void Sort(); }; diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index a9e8dd9343da..f092200846f8 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -986,10 +986,6 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) return false; } -const sc::ImportPostProcessData& ScXMLImportWrapper::GetImportPostProcessData() const -{ - return maPostProcessData; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index a64d075b2541..b070c3697f7e 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -648,10 +648,6 @@ void ScModule::ResetDragObject() mpDragData->aJumpText = OUString(); } -const ScDragData& ScModule::GetDragData() const -{ - return *mpDragData; -} void ScModule::SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { @@ -679,10 +675,6 @@ void ScModule::SetDragJump( mpDragData->aJumpText = rText; } -const ScClipData& ScModule::GetClipData() const -{ - return *mpClipData; -} void ScModule::SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index c4c6be5810fb..2e2413b367f6 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -428,10 +428,6 @@ void ScMenuFloatingWindow::drawAllMenuItems() } } -const Font& ScMenuFloatingWindow::getLabelFont() const -{ - return maLabelFont; -} void ScMenuFloatingWindow::executeMenuItem(size_t nPos) { @@ -656,10 +652,6 @@ void ScMenuFloatingWindow::setName(const OUString& rName) maName = rName; } -const OUString& ScMenuFloatingWindow::getName() const -{ - return maName; -} void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) { diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index dd9ca8a1d5b1..de2f4a623faf 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -596,10 +596,6 @@ ScDPLabelData* ScPivotLayoutDialog::GetLabelData(SCCOL nColumn) return &maPivotParameters.maLabelArray[nColumn]; } -ScDPLabelDataVector& ScPivotLayoutDialog::GetLabelDataVector() -{ - return maPivotParameters.maLabelArray; -} void ScPivotLayoutDialog::PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames) { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index ab9a7b9b8d16..fae875483756 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1103,10 +1103,6 @@ void ScExternalRefCache::addCacheDocToReferenced( sal_uInt16 nFileId ) } } -bool ScExternalRefCache::areAllCacheTablesReferenced() const -{ - return maReferenced.mbAllReferenced; -} void ScExternalRefCache::getAllCachedDataSpans( sal_uInt16 nFileId, sc::ColumnSpanSet& rSet ) const { diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index ace1ed5ffdb9..290773a317ff 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -127,7 +127,7 @@ public: bool IsDataElement(SCCOL nColumn); ScDPLabelData* GetLabelData(SCCOL nColumn); - ScDPLabelDataVector& GetLabelDataVector(); + ScDPLabelDataVector& GetLabelDataVector() { return maPivotParameters.maLabelArray;} void PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames); }; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index d64c7015cd1b..b23da9aab1a3 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -68,7 +68,7 @@ public: size_t getSelectedMenuItem() const { return mnSelectedMenu;} void setName(const OUString& rName); - const OUString& getName() const; + const OUString& getName() const { return maName;} void executeMenuItem(size_t nPos); void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const; @@ -81,7 +81,7 @@ protected: void drawMenuItem(size_t nPos); void drawSeparator(size_t nPos); void drawAllMenuItems(); - const Font& getLabelFont() const; + const Font& getLabelFont() const { return maLabelFont;} void queueLaunchSubMenu(size_t nPos, ScMenuFloatingWindow* pMenu); void queueCloseSubMenu(); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 0a019357a5de..df03b88f525c 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -325,7 +325,7 @@ public: void FakeButtonUp(); - Point GetMousePosPixel() const; + Point GetMousePosPixel() const { return aCurMousePos; } void UpdateStatusPosSize(); void ClickExtern(); diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 588149c9f6f4..bb5c79874979 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -163,7 +163,7 @@ public: virtual void SwitchView(); SC_DLLPUBLIC void SetSelectedTabs(const ScMarkData& rMark); - SC_DLLPUBLIC const ScMarkData::MarkedTabsType& GetSelectedTabs() const; + const ScMarkData::MarkedTabsType& GetSelectedTabs() const { return maSelectedTabs; } }; #endif diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index a31c653e4870..5b041b5062a5 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -62,7 +62,8 @@ public: const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); virtual ~ScSolverOptionsDialog(); - const OUString& GetEngine() const; + // already updated in selection handler + const OUString& GetEngine() const { return maEngine; } const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties(); }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index d624759ba9f7..698087d38d4d 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -26,6 +26,8 @@ #include "hiranges.hxx" #include "viewutil.hxx" #include "select.hxx" +#include "gridwin.hxx" +#include "drawview.hxx" #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> @@ -294,7 +296,8 @@ public: bool SelMouseButtonDown( const MouseEvent& rMEvt ); ScDrawView* GetScDrawView() { return pDrawView; } - SdrView* GetSdrView(); // gegen CLOKs + // gegen CLOKs + SdrView* GetSdrView() { return pDrawView; } bool IsMinimized() const { return bMinimized; } @@ -325,7 +328,7 @@ public: void FakeButtonUp( ScSplitPos eWhich ); ScGridWindow* GetActiveWin(); - Window* GetWindowByPos( ScSplitPos ePos ); + Window* GetWindowByPos( ScSplitPos ePos ) { return pGridWin[ePos]; } ScSplitPos FindWindow( Window* pWindow ) const; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 5ca8953e0ced..3e60f12636da 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -124,7 +124,7 @@ public: void SetPopupMenu(PopupMenu* pPopUp); sal_uInt16 GetSelected() const { return nSelected;} - OString GetSelectedIdent() const; + OString GetSelectedIdent() const { return aSelectedIdent;} void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } const Link& GetMenuHdl() const { return aMLink; } diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 380079f894bf..6995bf3ef325 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -385,7 +385,7 @@ public: virtual bool CanRepeat( SfxRepeatTarget& ) const SAL_OVERRIDE; virtual OUString GetComment() const SAL_OVERRIDE; - CellValues& GetOldValues(); + CellValues& GetOldValues() { return maOldValues;} void SetNewValues( const std::vector<double>& rVals ); }; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 6a86e46720e3..34c62927bc87 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -23,6 +23,7 @@ #include "rangelst.hxx" #include "scdllapi.h" #include "viewopti.hxx" +#include "docsh.hxx" #include <boost/scoped_ptr.hpp> @@ -232,8 +233,7 @@ public: ScDocFunc& GetDocFunc() const; ScDBFunc* GetView() const { return pView; } ScTabViewShell* GetViewShell() const { return pViewShell; } - - SfxObjectShell* GetSfxDocShell() const; + SfxObjectShell* GetSfxDocShell() const { return pDocShell; } SfxBindings& GetBindings(); // from ViewShell's ViewFrame SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index ad004b017cbd..7a25b5aeed62 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -162,11 +162,6 @@ ScSolverOptionsDialog::~ScSolverOptionsDialog() delete mpCheckButtonData; } -const OUString& ScSolverOptionsDialog::GetEngine() const -{ - return maEngine; // already updated in selection handler -} - const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties() { // update maProperties from list box content diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index e5057af8148b..0a996e54b574 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -188,10 +188,6 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rC ScCalcOptionsDialog::~ScCalcOptionsDialog() {} -const ScCalcConfig& ScCalcOptionsDialog::GetConfig() const -{ - return maConfig; -} SvTreeListEntry *ScCalcOptionsDialog::createBoolItem(const OUString &rCaption, bool bValue) const { diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 9a0f5795fcfb..9097725bf4b6 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -36,7 +36,7 @@ public: DECL_LINK( BtnAutomaticSelectHdl, void* ); DECL_LINK( DeviceSelHdl, void* ); - const ScCalcConfig& GetConfig() const; + const ScCalcConfig& GetConfig() const { return maConfig;} private: void FillOptionsList(); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 2c92ccc7bbe3..faf5c4eb18ba 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -351,10 +351,6 @@ void ScExtIButton::SetPopupMenu(PopupMenu* pPopUp) } -OString ScExtIButton::GetSelectedIdent() const -{ - return aSelectedIdent; -} void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt ) { diff --git a/sc/source/ui/undo/undocell2.cxx b/sc/source/ui/undo/undocell2.cxx index f4b5d9376ad2..0b45efc419e9 100644 --- a/sc/source/ui/undo/undocell2.cxx +++ b/sc/source/ui/undo/undocell2.cxx @@ -54,10 +54,6 @@ OUString UndoSetCells::GetComment() const return ScGlobal::GetRscString(STR_UNDO_ENTERDATA); } -CellValues& UndoSetCells::GetOldValues() -{ - return maOldValues; -} void UndoSetCells::SetNewValues( const std::vector<double>& rVals ) { diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 3211f4508e34..5b5dd354961d 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -253,10 +253,6 @@ void ScHeaderFooterTextData::UpdateData(EditEngine& rEditEngine) bDataValid = false; } -const EditTextObject* ScHeaderFooterTextData::GetTextObject() const -{ - return mpTextObj; -} ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 790f7499e3fb..d6730ae3917b 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4777,7 +4777,6 @@ void ScGridWindow::LoseFocus() Window::LoseFocus(); } -Point ScGridWindow::GetMousePosPixel() const { return aCurMousePos; } bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY) diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 0735c42de636..3b3c0ace8d63 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -1606,9 +1606,4 @@ void ScPreview::SetSelectedTabs(const ScMarkData& rMark) maSelectedTabs = rMark.GetSelectedTabs(); } -const ScMarkData::MarkedTabsType& ScPreview::GetSelectedTabs() const -{ - return maSelectedTabs; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index caaee2278c04..0777d419637d 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -866,11 +866,6 @@ ScGridWindow* ScTabView::GetActiveWin() return pGridWin[ePos]; } -Window* ScTabView::GetWindowByPos( ScSplitPos ePos ) -{ - return pGridWin[ePos]; -} - void ScTabView::SetActivePointer( const Pointer& rPointer ) { for (sal_uInt16 i=0; i<4; i++) diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 4fea5a32da98..563bd2cf5657 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -430,11 +430,6 @@ void ScTabView::ViewOptionsHasChanged( bool bHScrollChanged, bool bGraphicsChang // Helper-Funktion gegen das Include des Drawing Layers -SdrView* ScTabView::GetSdrView() -{ - return pDrawView; -} - void ScTabView::DrawMarkListHasChanged() { if ( pDrawView ) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index d77d8cd54493..14d41550082e 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2071,11 +2071,6 @@ void ScViewData::SetScreen( const Rectangle& rVisArea ) ( aScrSize.Height() * ScGlobal::nScreenPPTY / HMM_PER_TWIPS ); } -SfxObjectShell* ScViewData::GetSfxDocShell() const -{ - return pDocShell; -} - ScDocFunc& ScViewData::GetDocFunc() const { return pDocShell->GetDocFunc(); diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index aec961d68bb5..cad138eab137 100644 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx @@ -55,7 +55,7 @@ public: SdCustomShow( const SdCustomShow& rShow ); /** Provides a direct access to the collection of the SdPage objects. */ - PageVec& PagesVector(); + PageVec& PagesVector() { return maPages;} /** * Replaces all occurrences of pOldPage with pNewPage. * If pNewPage is 0 then removes all occurrences of pOldPage. @@ -65,7 +65,7 @@ public: void RemovePage( const SdPage* pPage ); void SetName(const OUString& rName); - OUString GetName() const; + const OUString& GetName() const { return aName;} SdDrawDocument* GetDoc() const { return pDoc; } diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx index a63df61427a4..82c2b767bbca 100644 --- a/sd/source/core/cusshow.cxx +++ b/sd/source/core/cusshow.cxx @@ -85,10 +85,6 @@ uno::Reference< uno::XInterface > SdCustomShow::getUnoCustomShow() return xShow; } -SdCustomShow::PageVec& SdCustomShow::PagesVector() -{ - return maPages; -} void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage ) { @@ -112,9 +108,5 @@ void SdCustomShow::SetName(const OUString& rName) aName = rName; } -OUString SdCustomShow::GetName() const -{ - return aName; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index bc5f7ad8d1bd..9bf6662c6d0d 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -150,10 +150,6 @@ bool Ppt97Animation::HasAfterEffect_DimAfterEffect() const return m_aAtom.nAfterEffect == 3; } #endif -sal_uInt32 Ppt97Animation::GetSoundRef() const -{ - return m_aAtom.nSoundRef; -} void Ppt97Animation::SetSoundFileUrl( const OUString& rSoundFileUrl ) { m_aSoundFileUrl = rSoundFileUrl; @@ -191,10 +187,6 @@ bool Ppt97Animation::GetSpecialTextIterationDelay( double& rfTextIterationDelay return bRet; } -sal_Int32 Ppt97Animation::GetDimColor() const -{ - return static_cast<sal_Int32>(m_aAtom.nDimColor); -} void Ppt97Animation::SetDimColor( sal_Int32 nDimColor ) { diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index 28be9d386b08..672678196805 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -96,8 +96,8 @@ public: //public methods bool HasEffect() const; bool HasParagraphEffect() const; bool HasSoundEffect() const; - sal_Int32 GetDimColor() const; - sal_uInt32 GetSoundRef() const; + sal_Int32 GetDimColor() const { return static_cast<sal_Int32>(m_aAtom.nDimColor);} + sal_uInt32 GetSoundRef() const { return m_aAtom.nSoundRef;} /// @return true if the shape should be animated in addition to the text bool HasAnimateAssociatedShape() const; diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 5b8fe765c8ea..400fde151eff 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -428,10 +428,6 @@ void TemplateScanner::Scan (void) -std::vector<TemplateDir*>& TemplateScanner::GetFolderList (void) -{ - return maFolderList; -} @@ -503,10 +499,6 @@ bool TemplateScanner::HasNextStep (void) -const TemplateEntry* TemplateScanner::GetLastAddedEntry (void) const -{ - return mpLastAddedEntry; -} } diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index cc0ac1b3cf71..83978f8f0540 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -153,10 +153,6 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction ) -::sd::DrawDocShell& SdPageObjsTLB::SdPageObjsTransferable::GetDocShell() const -{ - return mrDocShell; -} diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index b8c0d757ee6c..855a6672bf72 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -58,25 +58,13 @@ bool ConfigurationClassifier::Partition (void) -const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC1minusC2 (void) const -{ - return maC1minusC2; -} -const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC2minusC1 (void) const -{ - return maC2minusC1; -} -const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC1andC2 (void) const -{ - return maC1andC2; -} void ConfigurationClassifier::PartitionResources ( diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index 401498bf0928..d10093fa71f3 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -64,7 +64,7 @@ public: returned. This reference remains valid as long as the called ConfigurationClassifier object stays alive. */ - const ResourceIdVector& GetC1minusC2 (void) const; + const ResourceIdVector& GetC1minusC2 (void) const { return maC1minusC2;} /** Return the resources that belong to the configuration given as rxConfiguration2 to the constructor but that do not belong to @@ -74,7 +74,7 @@ public: returned. This reference remains valid as long as the called ConfigurationClassifier object stays alive. */ - const ResourceIdVector& GetC2minusC1 (void) const; + const ResourceIdVector& GetC2minusC1 (void) const { return maC2minusC1;} /** Return the resources that belong to both the configurations that where given to the constructor. @@ -83,7 +83,7 @@ public: returned. This reference remains valid as long as the called ConfigurationClassifier object stays alive. */ - const ResourceIdVector& GetC1andC2 (void) const; + const ResourceIdVector& GetC1andC2 (void) const { return maC1andC2;} void TraceResourceIdVector ( const sal_Char* pMessage, diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 14cd1ad29e8c..a63a4da0d37e 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -138,10 +138,6 @@ void ConfigurationUpdater::RequestUpdate ( -Reference<XConfiguration> ConfigurationUpdater::GetCurrentConfiguration (void) const -{ - return mxCurrentConfiguration; -} diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index 076b498c5c39..feb6ad686efc 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -72,7 +72,7 @@ public: css::drawing::framework::XConfiguration>& rxRequestedConfiguration); css::uno::Reference< - css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const; + css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const { return mxCurrentConfiguration;} friend class ConfigurationUpdaterLock; /** Return a lock of the called ConfigurationUpdater. While the diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 69842bd26c14..a67d146438d1 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -113,10 +113,6 @@ uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) th -::boost::shared_ptr<ViewShell> ViewShellWrapper::GetViewShell (void) -{ - return mpViewShell; -} diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 8c6fd275ff04..a9b1e8cc2dd5 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -903,10 +903,6 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId ( -Reference<XConfigurationController> FrameworkHelper::GetConfigurationController (void) const -{ - return mxConfigurationController; -} diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index fe2faa50ddc0..bf7462554f1f 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -347,7 +347,7 @@ public: /** Return a pointer to the tab control for pages. */ - TabControl* GetPageTabControl (void); + TabControl* GetPageTabControl (void) { return &maTabControl;} /** Return a pointer to the tab control for layers. */ diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 55934933d68a..106bfa22b954 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -124,21 +124,21 @@ public: /** Return the control of the vertical scroll bar. */ - ::boost::shared_ptr<ScrollBar> GetVerticalScrollBar (void) const; + ::boost::shared_ptr<ScrollBar> GetVerticalScrollBar (void) const { return mpVerticalScrollBar;} /** Return the control of the horizontal scroll bar. */ - ::boost::shared_ptr<ScrollBar> GetHorizontalScrollBar (void) const; + ::boost::shared_ptr<ScrollBar> GetHorizontalScrollBar (void) const { return mpHorizontalScrollBar;} /** Return the scroll bar filler that paints the little square that is enclosed by the two scroll bars. */ - ::boost::shared_ptr<ScrollBarBox> GetScrollBarFiller (void) const; + ::boost::shared_ptr<ScrollBarBox> GetScrollBarFiller (void) const { return mpScrollBarBox;} /** Return the content window. This is a sibling and is geometrically enclosed by the scroll bars. */ - SharedSdWindow GetContentWindow (void) const; + SharedSdWindow GetContentWindow (void) const { return mpContentWindow;} model::SlideSorterModel& GetModel (void) const; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 991d2efd7ff8..9bdbaae39e8f 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -133,7 +133,7 @@ public: them from the returned list. All entries that remain until the destructor is called will be destroyed. */ - std::vector<TemplateDir*>& GetFolderList (void); + std::vector<TemplateDir*>& GetFolderList (void) { return maFolderList;} /** Implementation of the AsynchronousTask interface method. */ @@ -149,7 +149,7 @@ public: <NULL/> is returned either before the template scanning is started or after it has ended. */ - const TemplateEntry* GetLastAddedEntry (void) const; + const TemplateEntry* GetLastAddedEntry (void) const { return mpLastAddedEntry;} /** Set whether to sort the template entries inside the regions. */ diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 8cb3266d67b9..a746b1701a07 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -70,7 +70,7 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - ::boost::shared_ptr< ::TabControl> GetTabControl (void) const; + ::boost::shared_ptr< ::TabControl> GetTabControl (void) const { return mpTabControl;} bool ActivatePage (void); diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 09ff31f89796..bca37326fafe 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -102,15 +102,15 @@ public: */ void CalcMinZoom (void); void SetMinZoom (long int nMin); - long GetMinZoom (void) const; + long GetMinZoom (void) const { return mnMinZoom;} void SetMaxZoom (long int nMax); - long GetMaxZoom (void) const; + long GetMaxZoom (void) const { return mnMaxZoom;} long GetZoom (void) const; - Point GetWinViewPos (void) const; - Point GetViewOrigin (void) const; - Size GetViewSize (void) const; + Point GetWinViewPos (void) const { return maWinPos;} + Point GetViewOrigin (void) const { return maViewOrigin;} + Size GetViewSize (void) const { return maViewSize;} void SetWinViewPos(const Point& rPnt); void SetViewOrigin(const Point& rPnt); void SetViewSize(const Size& rSize); diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 5f90237117c3..434b6a3ab576 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -302,7 +302,7 @@ public: cssdf::XResourceId>& rxAnchor); cssu::Reference<cssdf::XConfigurationController> - GetConfigurationController (void) const; + GetConfigurationController (void) const { return mxConfigurationController;} private: diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index dd8efc9c3087..95252e77e5e8 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -83,7 +83,7 @@ public: to obtain a pointer to the wrapped ViewShell object for a given XView object. */ - ::boost::shared_ptr<ViewShell> GetViewShell (void); + ::boost::shared_ptr<ViewShell> GetViewShell (void) { return mpViewShell;} // XUnoTunnel diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 6a0ffca46a7b..be54329fdde6 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -75,7 +75,7 @@ public: ::sd::DrawDocShell& rDocShell, NavigatorDragType eDragType, const ::com::sun::star::uno::Any& rTreeListBoxData ); - ::sd::DrawDocShell& GetDocShell() const; + ::sd::DrawDocShell& GetDocShell() const { return mrDocShell;} NavigatorDragType GetDragType() const { return meDragType;} static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index 8c96d83c9ae5..cc8004f88b89 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -297,10 +297,6 @@ void RequestQueue::Clear (void) -::osl::Mutex& RequestQueue::GetMutex (void) -{ - return maMutex; -} } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index 887c2cfc96d0..ef28bcd8d0a6 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -98,7 +98,7 @@ public: /** Return the mutex that guards the access to the priority queue. */ - ::osl::Mutex& GetMutex (void); + ::osl::Mutex& GetMutex (void) { return maMutex;} /** Ensure we don't hand out a page deleted before anyone got a chance to process it diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 6a613d8fc27f..0d560b2fe043 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -1037,10 +1037,6 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex -::boost::shared_ptr<Animator> SlideSorterController::GetAnimator (void) const -{ - return mpAnimator; -} diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 512dbab4e670..e7a14b8ee2f5 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -263,10 +263,6 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript -SharedPageDescriptor CurrentSlideManager::GetCurrentSlide (void) -{ - return mpCurrentSlide; -} diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 5d40c03c21af..c90172c90df2 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -279,10 +279,6 @@ int PageSelector::GetPageCount (void) const -SharedPageDescriptor PageSelector::GetSelectionAnchor (void) const -{ - return mpSelectionAnchor; -} diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index cd70c1324d07..f32d577e8820 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -137,10 +137,6 @@ void Properties::SetSuspendPreviewUpdatesDuringFullScreenPresentation (const boo -Color Properties::GetBackgroundColor (void) const -{ - return maBackgroundColor; -} @@ -152,10 +148,6 @@ void Properties::SetBackgroundColor (const Color& rColor) -Color Properties::GetTextColor (void) const -{ - return maTextColor; -} @@ -168,10 +160,6 @@ void Properties::SetTextColor (const Color& rColor) -Color Properties::GetSelectionColor (void) const -{ - return maSelectionColor; -} @@ -184,10 +172,6 @@ void Properties::SetSelectionColor (const Color& rColor) -Color Properties::GetHighlightColor (void) const -{ - return maHighlightColor; -} diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 5d0afac161bc..08c0a3009d87 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -342,10 +342,6 @@ void SelectionManager::SetInsertionPosition (const sal_Int32 nInsertionPosition) -::boost::shared_ptr<SelectionObserver> SelectionManager::GetSelectionObserver (void) const -{ - return mpSelectionObserver; -} } } } // end of namespace ::sd::slidesorter diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index 3b055a0848be..ca5a6a7ef7e5 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -116,10 +116,6 @@ void TransferableData::Notify (SfxBroadcaster&, const SfxHint& rHint) -const ::std::vector<TransferableData::Representative>& TransferableData::GetRepresentatives (void) const -{ - return maRepresentatives; -} diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index db234ea8f715..12ebbe2fd188 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -218,7 +218,7 @@ public: /** Return an Animator object. */ - ::boost::shared_ptr<Animator> GetAnimator (void) const; + ::boost::shared_ptr<Animator> GetAnimator (void) const { return mpAnimator;} VisibleAreaManager& GetVisibleAreaManager (void) const; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index fa71863877e5..3e73a45d3dc8 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -77,7 +77,7 @@ public: /** Return the page descriptor for the current slide. Note, that when there is no current slide then the returned pointer is empty. */ - model::SharedPageDescriptor GetCurrentSlide (void); + model::SharedPageDescriptor GetCurrentSlide (void) { return mpCurrentSlide;} /** Release all references to model data. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 0cb6486dd7c4..78be1d40a931 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -116,7 +116,7 @@ public: @return The returned anchor may be NULL. */ - model::SharedPageDescriptor GetSelectionAnchor (void) const; + model::SharedPageDescriptor GetSelectionAnchor (void) const { return mpSelectionAnchor;} typedef ::std::vector<SdPage*> PageSelection; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 7d70c203fe9a..5aac260c2d61 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -81,22 +81,22 @@ public: /** Return the background color. */ - Color GetBackgroundColor (void) const; + Color GetBackgroundColor (void) const { return maBackgroundColor;} void SetBackgroundColor (const Color& rColor); /** Return the text color. */ - Color GetTextColor (void) const; + Color GetTextColor (void) const { return maTextColor;} void SetTextColor (const Color& rColor); /** Return the color in which selections are to be painted. */ - Color GetSelectionColor (void) const; + Color GetSelectionColor (void) const { return maSelectionColor;} void SetSelectionColor (const Color& rColor); /** Return the color used for highlighting e.g. the current slide. */ - Color GetHighlightColor (void) const; + Color GetHighlightColor (void) const { return maHighlightColor;} void SetHighlightColor (const Color& rColor); /** The UI can be set to be read only indepently from the model status. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index 020673fa0a17..e546b205519e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx @@ -103,7 +103,7 @@ public: */ void SetInsertionPosition (const sal_Int32 nInsertionPosition); - ::boost::shared_ptr<SelectionObserver> GetSelectionObserver (void) const; + ::boost::shared_ptr<SelectionObserver> GetSelectionObserver (void) const { return mpSelectionObserver;} private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index ad67d7a09ef0..0075d3b9071b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -71,7 +71,7 @@ public: virtual void DragFinished (sal_Int8 nDropAction); - const ::std::vector<Representative>& GetRepresentatives (void) const; + const ::std::vector<Representative>& GetRepresentatives (void) const { return maRepresentatives;} /** Return the view shell for which the transferable was created. */ diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index f7cb2a4dabd7..120315122258 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -165,7 +165,7 @@ public: /** Return the mutex so that the caller can lock it and then safely access the model. */ - ::osl::Mutex& GetMutex (void); + ::osl::Mutex& GetMutex (void) { return maMutex;} /** Set the XIndexAccess from which the called SlideSorterModel takes its pages. diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 196369a060e1..d8121cd6e2e5 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -73,7 +73,7 @@ public: /** Return the page that is represented by the descriptor as XDrawPage reference. */ - css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const; + css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const { return mxPage;} /** Returns the index of the page as it is displayed in the view as page number. The value may differ from the index returned by the @@ -109,7 +109,7 @@ public: */ void SetCoreSelection (void); - VisualState& GetVisualState (void); + VisualState& GetVisualState (void) { return maVisualState;} Rectangle GetBoundingBox (void) const; Point GetLocation (const bool bIgnoreLocation = false) const; diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx index d6712e24b0e3..0cae8ba72f65 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx @@ -49,7 +49,7 @@ public: void UpdateVisualState (const PageDescriptor& rDescriptor); - Point GetLocationOffset (void) const; + Point GetLocationOffset (void) const { return maLocationOffset;} bool SetLocationOffset (const Point& rPoint); sal_Int32 mnPageId; // For debugging diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index a94a598e5b43..85d9c109cdb8 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -215,7 +215,7 @@ public: void UpdateOrientation (void); ::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter (void); - ::boost::shared_ptr<LayeredDevice> GetLayeredDevice (void) const; + ::boost::shared_ptr<LayeredDevice> GetLayeredDevice (void) const { return mpLayeredDevice;} class DrawLock { diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index 20384e38adf0..729788e888be 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -111,8 +111,8 @@ public: const Part ePart, const CoordinateSystem eCoordinateSystem); - Image GetTransitionEffectIcon (void) const; - Image GetCustomAnimationEffectIcon (void) const; + Image GetTransitionEffectIcon (void) const { return maTransitionEffectIcon;} + Image GetCustomAnimationEffectIcon (void) const { return maCustomAnimationEffectIcon;} private: SharedSdWindow mpWindow; diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 75201f4cb8fd..27dbdd71e8c3 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -424,10 +424,6 @@ void SlideSorterModel::SynchronizeModelSelection (void) -::osl::Mutex& SlideSorterModel::GetMutex (void) -{ - return maMutex; -} diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 58ba11158ba4..bbe6488f1a25 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -77,10 +77,6 @@ PageDescriptor::~PageDescriptor (void) -Reference<drawing::XDrawPage> PageDescriptor::GetXDrawPage (void) const -{ - return mxPage; -} @@ -227,10 +223,6 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue) -VisualState& PageDescriptor::GetVisualState (void) -{ - return maVisualState; -} diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index b097eda592cc..28c85d0a6920 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -64,10 +64,6 @@ void VisualState::UpdateVisualState (const PageDescriptor& rDescriptor) SetVisualState(VS_None); } -Point VisualState::GetLocationOffset (void) const -{ - return maLocationOffset; -} bool VisualState::SetLocationOffset (const Point& rOffset) diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index b2c604d38703..bad61abed479 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -252,27 +252,15 @@ SlideSorter::~SlideSorter (void) -::boost::shared_ptr<ScrollBar> SlideSorter::GetVerticalScrollBar (void) const -{ - return mpVerticalScrollBar; -} -::boost::shared_ptr<ScrollBar> SlideSorter::GetHorizontalScrollBar (void) const -{ - return mpHorizontalScrollBar; -} -::boost::shared_ptr<ScrollBarBox> SlideSorter::GetScrollBarFiller (void) const -{ - return mpScrollBarBox; -} @@ -323,10 +311,6 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) -::SharedSdWindow SlideSorter::GetContentWindow (void) const -{ - return mpContentWindow; -} diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 35f40cb5e553..d1d908459460 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -986,10 +986,6 @@ bool SlideSorterView::SetState ( -::boost::shared_ptr<LayeredDevice> SlideSorterView::GetLayeredDevice (void) const -{ - return mpLayeredDevice; -} diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index eaea90f2cea6..a5f2b5a73fba 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -276,15 +276,7 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount) -Image PageObjectLayouter::GetTransitionEffectIcon (void) const -{ - return maTransitionEffectIcon; -} -Image PageObjectLayouter::GetCustomAnimationEffectIcon (void) const -{ - return maCustomAnimationEffectIcon; -} } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index e249a2494aeb..e8d196f26862 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -306,7 +306,7 @@ public: void LockUpdate (void); void UnlockUpdate (void); - ToolBarRules& GetToolBarRules (void); + ToolBarRules& GetToolBarRules (void) { return maToolBarRules;} private: const static OUString msToolBarResourcePrefix; @@ -968,10 +968,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP -ToolBarRules& ToolBarManager::Implementation::GetToolBarRules (void) -{ - return maToolBarRules; -} diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index d93f5833e717..45f728ced453 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -184,10 +184,6 @@ void ViewTabBar::disposing (void) -::boost::shared_ptr< ::TabControl> ViewTabBar::GetTabControl (void) const -{ - return mpTabControl; -} diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 372a931895f9..d8a94dfd6c29 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -632,10 +632,6 @@ void DrawViewShell::SetActiveTabLayerIndex (int nIndex) -TabControl* DrawViewShell::GetPageTabControl (void) -{ - return &maTabControl; -} diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 3f0dca33cc0e..4247b6a4e946 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -185,10 +185,6 @@ void Window::SetMinZoom (long int nMin) -long Window::GetMinZoom (void) const -{ - return mnMinZoom; -} @@ -201,10 +197,6 @@ void Window::SetMaxZoom (long int nMax) -long Window::GetMaxZoom (void) const -{ - return mnMaxZoom; -} @@ -324,26 +316,14 @@ void Window::RequestHelp(const HelpEvent& rEvt) -Point Window::GetWinViewPos (void) const -{ - return maWinPos; -} -Point Window::GetViewOrigin (void) const -{ - return maViewOrigin; -} -Size Window::GetViewSize (void) const -{ - return maViewSize; -} diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 1e33b0d60f14..6da226519c48 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -268,10 +268,6 @@ void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm ) -OUString SvBaseLink::GetLinkSourceName() const -{ - return aLinkName; -} diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index d69f34efd450..940be5f191c4 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -161,10 +161,6 @@ void BindDispatch_Impl::Release() release(); } -const ::com::sun::star::frame::FeatureStateEvent& BindDispatch_Impl::GetStatus() const -{ - return aStatus; -} void BindDispatch_Impl::Dispatch( const uno::Sequence < beans::PropertyValue >& aProps, bool bForceSynchron ) { diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 32994450d410..cbda6e69f991 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -208,15 +208,7 @@ void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties> } -const OUString &TemplateAbstractView::getCurRegionName() const -{ - return maCurRegionName; -} -bool TemplateAbstractView::isNonRootRegionVisible () const -{ - return mnCurRegionId; -} void TemplateAbstractView::setOpenRegionHdl(const Link &rLink) { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 38f9045cdb40..65bea0b060b2 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -479,10 +479,6 @@ void SfxDocumentInfoItem::AddCustomProperty( const OUString& sName, const Any& r m_aCustomProperties.push_back( pProp ); } -uno::Sequence< document::CmisProperty > SfxDocumentInfoItem::GetCmisProperties() const -{ - return m_aCmisProperties; -} void SfxDocumentInfoItem::SetCmisProperties( const Sequence< document::CmisProperty >& cmisProps) { diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index d1b4ae07414c..2e8e65ff75fb 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -107,10 +107,6 @@ OUString SfxFilter::GetDefaultExtension() const return comphelper::string::getToken(GetWildcard().getGlob(), 0, ';'); } -const OUString& SfxFilter::GetProviderName() const -{ - return maProvider; -} void SfxFilter::SetURLPattern( const OUString& rStr ) { diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 2e9757334862..65fdb57c5e60 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -55,7 +55,7 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Release(); - const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const; + const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const { return aStatus;} void Dispatch( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aProps, bool bForceSynchron = false ); }; diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 8cb6e834edfc..c7777dd053d9 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -118,10 +118,6 @@ void Deck::Dispose (void) -const ::rtl::OUString& Deck::GetId (void) const -{ - return msId; -} @@ -263,10 +259,6 @@ void Deck::SetPanels (const SharedPanelContainer& rPanels) -const SharedPanelContainer& Deck::GetPanels (void) const -{ - return maPanels; -} diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index 65aa238d9148..ea33fa287286 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -51,11 +51,11 @@ public: void Dispose (void); - const ::rtl::OUString& GetId (void) const; + const ::rtl::OUString& GetId (void) const { return msId;} DeckTitleBar* GetTitleBar (void) const; Rectangle GetContentArea (void) const; void SetPanels (const SharedPanelContainer& rPanels); - const SharedPanelContainer& GetPanels (void) const; + const SharedPanelContainer& GetPanels (void) const { return maPanels;} void RequestLayout (void); ::Window* GetPanelParentWindow (void); diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 04c8c9746d53..083d15bfdf51 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -160,10 +160,6 @@ bool Panel::HasIdPredicate (const ::rtl::OUString& rsId) const -const ::rtl::OUString& Panel::GetId (void) const -{ - return msPanelId; -} @@ -212,10 +208,6 @@ void Panel::DataChanged (const DataChangedEvent& rEvent) SetBackground(Theme::GetPaint(Theme::Paint_PanelBackground).GetWallpaper()); } -Reference<ui::XSidebarPanel> Panel::GetPanelComponent (void) const -{ - return mxPanelComponent; -} Reference<awt::XWindow> Panel::GetElementWindow (void) { diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index ef47c2060aa7..ee64df3aa2af 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -56,12 +56,12 @@ public: PanelTitleBar* GetTitleBar (void) const; bool IsTitleBarOptional (void) const { return mbIsTitleBarOptional;} void SetUIElement (const cssu::Reference<css::ui::XUIElement>& rxElement); - cssu::Reference<css::ui::XSidebarPanel> GetPanelComponent (void) const; + cssu::Reference<css::ui::XSidebarPanel> GetPanelComponent (void) const { return mxPanelComponent;} cssu::Reference<css::awt::XWindow> GetElementWindow (void); void SetExpanded (const bool bIsExpanded); bool IsExpanded (void) const { return mbIsExpanded;} bool HasIdPredicate (const ::rtl::OUString& rsId) const; - const ::rtl::OUString& GetId (void) const; + const ::rtl::OUString& GetId (void) const { return msPanelId;} virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void Resize (void) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 7701879683d0..a5dbcfda7e2b 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -1053,10 +1053,6 @@ void SidebarController::UpdateDeckOpenState (void) -FocusManager& SidebarController::GetFocusManager (void) -{ - return maFocusManager; -} @@ -1240,10 +1236,6 @@ void SidebarController::ShowPanel (const Panel& rPanel) -Context SidebarController::GetCurrentContext (void) const -{ - return maCurrentContext; -} } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index 69f724254cda..a2397cf7ce60 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -136,7 +136,7 @@ public: */ void RequestOpenDeck (void); - FocusManager& GetFocusManager (void); + FocusManager& GetFocusManager (void) { return maFocusManager;} private: typedef ::std::map< @@ -246,7 +246,7 @@ private: */ void ShowPanel (const Panel& rPanel); - Context GetCurrentContext (void) const; + Context GetCurrentContext (void) const { return maCurrentContext;} virtual void SAL_CALL disposing (void) SAL_OVERRIDE; }; diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 6cc50b40c3e9..79cc49193902 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -353,10 +353,6 @@ SystemWindow* SfxFrame::GetTopWindow_Impl() const return NULL; } -Window& SfxFrame::GetWindow() const -{ - return *pWindow; -} bool SfxFrame::Close() { diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx index 81483adf3abc..9bb40d6fd4ba 100644 --- a/slideshow/source/engine/color.cxx +++ b/slideshow/source/engine/color.cxx @@ -193,20 +193,8 @@ namespace slideshow { } - double HSLColor::getHue() const - { - return maHSLTriple.mnHue; - } - double HSLColor::getSaturation() const - { - return maHSLTriple.mnSaturation; - } - double HSLColor::getLuminance() const - { - return maHSLTriple.mnLuminance; - } bool operator==( const HSLColor& rLHS, const HSLColor& rRHS ) @@ -327,20 +315,8 @@ namespace slideshow { } - double RGBColor::getRed() const - { - return maRGBTriple.mnRed; - } - double RGBColor::getGreen() const - { - return maRGBTriple.mnGreen; - } - double RGBColor::getBlue() const - { - return maRGBTriple.mnBlue; - } ::cppcanvas::Color::IntSRGBA RGBColor::getIntegerColor() const { diff --git a/slideshow/source/inc/hslcolor.hxx b/slideshow/source/inc/hslcolor.hxx index 67fc5c24e7ff..5529a1b83f24 100644 --- a/slideshow/source/inc/hslcolor.hxx +++ b/slideshow/source/inc/hslcolor.hxx @@ -44,19 +44,19 @@ namespace slideshow @return hue, is in the range [0,360] */ - double getHue() const; + double getHue() const { return maHSLTriple.mnHue; } /** Saturation of the color. @return saturation, is in the range [0,1] */ - double getSaturation() const; + double getSaturation() const { return maHSLTriple.mnSaturation; } /** Luminance of the color. @return luminance, is in the range [0,1] */ - double getLuminance() const; + double getLuminance() const { return maHSLTriple.mnLuminance; } struct HSLTriple { diff --git a/slideshow/source/inc/rgbcolor.hxx b/slideshow/source/inc/rgbcolor.hxx index 1868f0ac4785..6028c1e889e9 100644 --- a/slideshow/source/inc/rgbcolor.hxx +++ b/slideshow/source/inc/rgbcolor.hxx @@ -43,15 +43,15 @@ namespace slideshow /** Get the RGB red value. */ - double getRed() const; + double getRed() const { return maRGBTriple.mnRed; } /** Get the RGB green value. */ - double getGreen() const; + double getGreen() const { return maRGBTriple.mnGreen; } /** Get the RGB blue value. */ - double getBlue() const; + double getBlue() const { return maRGBTriple.mnBlue; } /** Create an integer sRGBA color. */ diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 62118b8a427c..e4214b2f2d71 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -532,10 +532,6 @@ bool StgStrm::SetSize( sal_Int32 nBytes ) // Return the # of allocated pages -sal_Int32 StgStrm::GetPages() const -{ - return ( nSize + nPageSize - 1 ) / nPageSize; -} //////////////////////////// class StgFATStrm diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx index a1debe22dd32..32dd1bdafc72 100644 --- a/sot/source/sdstor/stgstrms.hxx +++ b/sot/source/sdstor/stgstrms.hxx @@ -82,7 +82,7 @@ public: sal_Int32 GetSize() const { return nSize; } sal_Int32 GetPage() const { return nPage; } short GetPageSize() const { return nPageSize; } - sal_Int32 GetPages() const; + sal_Int32 GetPages() const { return ( nSize + nPageSize - 1 ) / nPageSize;} short GetOffset() const { return nOffset;} void SetEntry( StgDirEntry& ); virtual bool SetSize( sal_Int32 ); diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 217df328ee83..e4242e132f9b 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -614,10 +614,6 @@ const OUString & SotStorage::GetName() const return m_aName; } -const OString& SotStorage::GetKey() const -{ - return m_aKey; -} void SotStorage::ResetError() { diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx index 2ab9e20cc378..9668df2037a6 100644 --- a/stoc/source/javavm/jvmargs.cxx +++ b/stoc/source/javavm/jvmargs.cxx @@ -32,10 +32,6 @@ void JVM::pushProp(const OUString & property) _props.push_back(property); } -const ::std::vector< OUString > & JVM::getProperties() const -{ - return _props; -} } diff --git a/stoc/source/javavm/jvmargs.hxx b/stoc/source/javavm/jvmargs.hxx index 828fc51440ef..4d6badac8395 100644 --- a/stoc/source/javavm/jvmargs.hxx +++ b/stoc/source/javavm/jvmargs.hxx @@ -43,7 +43,7 @@ namespace stoc_javavm { JVM() throw(); void pushProp(const OUString & uString); - const ::std::vector< OUString> & getProperties() const; + const ::std::vector< OUString> & getProperties() const { return _props;} }; } diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx index c17afed3dd94..a1dff888b4a0 100644 --- a/stoc/source/uriproc/UriReference.cxx +++ b/stoc/source/uriproc/UriReference.cxx @@ -71,9 +71,6 @@ bool UriReference::isAbsolute() throw (css::uno::RuntimeException) { return !m_scheme.isEmpty(); } -OUString UriReference::getScheme() throw (css::uno::RuntimeException) { - return m_scheme; -} OUString UriReference::getSchemeSpecificPart() throw (css::uno::RuntimeException) diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx index b9f1af8a023e..1bff45d5cffe 100644 --- a/stoc/source/uriproc/UriReference.hxx +++ b/stoc/source/uriproc/UriReference.hxx @@ -42,7 +42,7 @@ public: bool isAbsolute() throw (css::uno::RuntimeException); - OUString getScheme() throw (css::uno::RuntimeException); + OUString getScheme() throw (css::uno::RuntimeException) { return m_scheme;} OUString getSchemeSpecificPart() throw (css::uno::RuntimeException); diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx index 49ff02b5ecff..c1b8078e2ace 100644 --- a/svl/source/items/grabbagitem.cxx +++ b/svl/source/items/grabbagitem.cxx @@ -40,10 +40,6 @@ SfxGrabBagItem::~SfxGrabBagItem() { } -const std::map<OUString, uno::Any>& SfxGrabBagItem::GetGrabBag() const -{ - return m_aMap; -} bool SfxGrabBagItem::operator==(const SfxPoolItem& rItem) const { diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 4848b027e104..c729f0e93d28 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -836,10 +836,6 @@ void SfxStyleSheetBase::Store( SvStream& ) { } -SfxItemPool& SfxStyleSheetBasePool::GetPool() -{ - return rPool; -} diff --git a/svl/source/misc/sharedstring.cxx b/svl/source/misc/sharedstring.cxx index 2bddc75fad29..850d8df276db 100644 --- a/svl/source/misc/sharedstring.cxx +++ b/svl/source/misc/sharedstring.cxx @@ -95,37 +95,13 @@ bool SharedString::operator!= ( const SharedString& r ) const return !operator== (r); } -OUString SharedString::getString() const -{ - return mpData ? OUString(mpData) : OUString(); -} -const rtl_uString* SharedString::getData() const -{ - return mpData; -} -const rtl_uString* SharedString::getDataIgnoreCase() const -{ - return mpDataIgnoreCase; -} -bool SharedString::isValid() const -{ - return mpData != NULL; -} -bool SharedString::isEmpty() const -{ - return mpData == NULL || mpData->length == 0; -} -sal_Int32 SharedString::getLength() const -{ - return mpData ? mpData->length : 0; -} } diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index 753cbc8a14ef..30e7bd0b58a6 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.cxx @@ -138,10 +138,6 @@ void SvtBroadcaster::Broadcast( const SfxHint &rHint ) void SvtBroadcaster::ListenersGone() {} -SvtBroadcaster::ListenersType& SvtBroadcaster::GetAllListeners() -{ - return maListeners; -} bool SvtBroadcaster::HasListeners() const { diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 07fa25c54f6c..289e85d332e1 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -183,8 +183,8 @@ public: bool IsOverlayBuffer() const { return m_bOverlayBuffer;} bool IsPaintBuffer() const { return m_bPaintBuffer;} - Color GetStripeColorA() const; - Color GetStripeColorB() const; + Color GetStripeColorA() const { return m_bStripeColorA;} + Color GetStripeColorB() const { return m_bStripeColorB;} sal_uInt16 GetStripeLength() const { return m_nStripeLength;} // #i73602# @@ -701,18 +701,10 @@ void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<OU // public method -Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const -{ - return m_bStripeColorA; -} // public method -Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const -{ - return m_bStripeColorB; -} // public method diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 16e42cfd9d74..720028e76ddc 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -368,10 +368,6 @@ void SvSimpleTable::HBarEndDrag() Update(); } -CommandEvent SvSimpleTable::GetCommandEvent() const -{ - return aCEvt; -} void SvSimpleTable::Command( const CommandEvent& rCEvt ) { diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx index af348256d0b1..559a60f2b25d 100644 --- a/svtools/source/contnr/treelistentry.cxx +++ b/svtools/source/contnr/treelistentry.cxx @@ -99,15 +99,7 @@ sal_uLong SvTreeListEntry::GetChildListPos() const return ( nListPos & 0x7fffffff ); } -SvTreeListEntries& SvTreeListEntry::GetChildEntries() -{ - return maChildren; -} -const SvTreeListEntries& SvTreeListEntry::GetChildEntries() const -{ - return maChildren; -} void SvTreeListEntry::Clone(SvTreeListEntry* pSource) { diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 798885b9f7c0..97a17c45f9dc 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -86,7 +86,7 @@ public: const uno::Reference< i18n::XBreakIterator >& _xBreakIter ); /** Returns a size struct containing the width and height of the text in the current output device. */ - const Size& GetTextSize() const; + const Size& GetTextSize() const { return maTextSize;} /** Draws the text in the current output device. */ void DrawText( const Point& _rPos ); @@ -269,10 +269,6 @@ void SvtScriptedTextHelper_Impl::SetText( const OUString& _rText, const uno::Ref CalculateBreaks( _xBreakIter ); } -const Size& SvtScriptedTextHelper_Impl::GetTextSize() const -{ - return maTextSize; -} void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos ) { diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index a25ccac6972e..76c5300c5595 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -56,10 +56,6 @@ void SvColorDialog::SetColor( const Color& rColor ) -const Color& SvColorDialog::GetColor() const -{ - return maColor; -} diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index b920a7485d82..af95a045a405 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -187,7 +187,7 @@ public: ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier(void) const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier(void) const { return ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > ((::com::sun::star::util::XNumberFormatsSupplier*)m_pCurrentSupplier);} void setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier); sal_Int32 getFormatKey(void) const; void setFormatKey(sal_Int32 nKey); diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 81c70292140c..fd02c9dc561b 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -674,15 +674,7 @@ void ToolboxController::updateStatus( const OUString& aCommandURL ) } } -Reference< XURLTransformer > ToolboxController::getURLTransformer() const -{ - return m_xUrlTransformer; -} -Reference< ::com::sun::star::awt::XWindow > ToolboxController::getParent() const -{ - return m_xParentWindow; -} void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequence< PropertyValue >& rArgs, const OUString &sTarget ) { diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index ccce5deb75e6..90f0c7d4aeb3 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -112,7 +112,7 @@ public: virtual ~UnoTreeListItem(); void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; void SetImage( const Image& rImage ); - OUString GetGraphicURL() const; + OUString GetGraphicURL() const { return maGraphicURL;} void SetGraphicURL( const OUString& rGraphicURL ); virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; @@ -1643,10 +1643,6 @@ void UnoTreeListItem::SetImage( const Image& rImage ) -OUString UnoTreeListItem::GetGraphicURL() const -{ - return maGraphicURL; -} diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 93b63da6c6d1..bcd9083e99a9 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -1287,10 +1287,6 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue) } -::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > SVTXFormattedField::getFormatsSupplier(void) const -{ - return ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > ((::com::sun::star::util::XNumberFormatsSupplier*)m_pCurrentSupplier); -} void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 3f9ded6faf37..ccea64fb5b29 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ i18nlangtag \ i18nutil \ sal \ + salhelper \ sfx \ sot \ svl \ diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 49c1a1d4c310..63dde670fe5f 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -1306,10 +1306,6 @@ OUString -uno::Reference< drawing::XShape > AccessibleShape::GetXShape() -{ - return( mxShape ); -} diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 4a89f38da17a..4c2c31f40872 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -86,11 +86,6 @@ void AccessibleShapeTreeInfo::SetDocumentWindow ( -uno::Reference<XAccessibleComponent> - AccessibleShapeTreeInfo::GetDocumentWindow (void) const -{ - return mxDocumentWindow; -} @@ -104,11 +99,6 @@ void AccessibleShapeTreeInfo::SetControllerBroadcaster ( -uno::Reference<document::XEventBroadcaster> - AccessibleShapeTreeInfo::GetControllerBroadcaster (void) const -{ - return mxModelBroadcaster; -} @@ -122,11 +112,6 @@ void AccessibleShapeTreeInfo::SetModelBroadcaster ( -Reference<document::XEventBroadcaster> - AccessibleShapeTreeInfo::GetModelBroadcaster (void) const -{ - return mxModelBroadcaster; -} @@ -152,11 +137,6 @@ void AccessibleShapeTreeInfo::SetController ( -Reference<frame::XController> - AccessibleShapeTreeInfo::GetController (void) const -{ - return mxController; -} diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 656c50c28fe2..c0d01aacc604 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -732,10 +732,6 @@ void SvxShowCharSet::ReleaseAccessible() } -ScrollBar* SvxShowCharSet::getScrollBar() -{ - return &aVscrollSB; -} sal_Int32 SvxShowCharSet::getMaxCharCount() const { diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 0ace4bf3ea66..ddc9e0cc2bd8 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -641,10 +641,6 @@ void SvxRectCtl::Reset() // Returns the currently selected RECT_POINT -RECT_POINT SvxRectCtl::GetActualRP() const -{ - return( eRP ); -} void SvxRectCtl::SetActualRP( RECT_POINT eNewRP ) { diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index d9db1f8921aa..1459ef1bbb1b 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -628,10 +628,6 @@ const basegfx::B3DHomMatrix& E3dObject::GetFullTransform() const return maFullTransform; } -const basegfx::B3DHomMatrix& E3dObject::GetTransform() const -{ - return maTransformation; -} void E3dObject::NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) { diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 25bea99cf298..16a57671eba3 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -286,10 +286,6 @@ bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMe else return true; } -const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeometry() const -{ - return aPropSeq; -} SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem() : SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, "" ) diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 97ac53b7a452..d690f2ae8c0c 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -250,9 +250,5 @@ void SvxZoomSliderItem::AddSnappingPoint( sal_Int32 nNew ) pValues[ nValues ] = nNew; } -const com::sun::star::uno::Sequence < sal_Int32 >& SvxZoomSliderItem::GetSnappingPoints() const -{ - return maValues; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index e74326c5d487..67241aa45cd2 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -148,10 +148,6 @@ namespace sdr } // method to get the primitiveAnimator - sdr::animation::primitiveAnimator& ObjectContact::getPrimitiveAnimator() - { - return maPrimitiveAnimator; - } // method to get the EventHandler. It will // return a existing one or create a new one using CreateEventHandler(). diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 109cb5bdce99..bd152cf66849 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -1321,10 +1321,6 @@ IMPL_LINK(AreaPropertyPanel, ModifyTransparentHdl_Impl, void*, EMPTYARG) } -Color AreaPropertyPanel::GetLastColor (void) const -{ - return maLastColor; -} diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index bd6677d732fc..13f76b577a66 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -177,7 +177,7 @@ private: void Update(); void ImpUpdateTransparencies(); - Color GetLastColor (void) const; + const Color& GetLastColor (void) const { return maLastColor;} void SetColor ( const OUString& rsColorName, const Color aColor); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index b819b00833f0..eecb7d2c44ca 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -163,10 +163,6 @@ void NBOTypeMgrBase::StoreBulCharFmtName_impl() { } } } -OUString NBOTypeMgrBase::GetBulCharFmtName() -{ - return aNumCharFmtName; -} void NBOTypeMgrBase::ImplLoad(const OUString& filename) { bIsLoading = true; diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 4486cfe35950..dbcc1eb0206c 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -82,10 +82,6 @@ TextPropertyPanel* TextPropertyPanel::Create ( rContext); } -::sfx2::sidebar::ControllerItem& TextPropertyPanel::GetSpaceController() -{ - return maSpacingControl; -} TextPropertyPanel::TextPropertyPanel ( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ ) : PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame), @@ -298,10 +294,6 @@ void TextPropertyPanel::NotifyItemUpdate ( } } -Color& TextPropertyPanel::GetUnderlineColor() -{ - return meUnderlineColor; -} } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index a863e0848dc5..9bd78bc6a2d9 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -54,11 +54,11 @@ public: virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; - ::sfx2::sidebar::ControllerItem& GetSpaceController(); + ::sfx2::sidebar::ControllerItem& GetSpaceController() { return maSpacingControl;} long GetSelFontSize(); void EndSpacingPopupMode (void); void EndUnderlinePopupMode (void); - Color& GetUnderlineColor(); + Color& GetUnderlineColor() { return meUnderlineColor;} virtual void HandleContextChange ( diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 963d7feb6a50..98d700d463dd 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -369,10 +369,6 @@ void SdrPaintWindow::DrawOverlay(const Region& rRegion) } } -const Region& SdrPaintWindow::GetRedrawRegion() const -{ - return maRedrawRegion; -} void SdrPaintWindow::SetRedrawRegion(const Region& rNew) { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 4b80ef0044e7..dac12e7a6341 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1876,10 +1876,6 @@ void SdrModel::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTabl ImpSetOutlinerDefaults( pHitTestOutliner ); } -rtl::Reference<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const -{ - return mpForbiddenCharactersTable; -} void SdrModel::SetCharCompressType( sal_uInt16 nType ) { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index c18f84c716ac..d8513d51d136 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2680,10 +2680,6 @@ void SdrObject::SetMarkProtect(bool bProt) -bool SdrObject::IsPrintable() const -{ - return !bNoPrint; -} void SdrObject::SetEmptyPresObj(bool bEpt) @@ -3231,10 +3227,6 @@ bool SdrObject::HasLineStyle() const // usually this data makes no sence after the import is finished, since the object // might be resized -Rectangle SdrObject::GetBLIPSizeRectangle() const -{ - return maBLIPSizeRectangle; -} void SdrObject::SetBLIPSizeRectangle( const Rectangle& aRect ) { diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 4b1c22b490c5..75e8b470a813 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -649,15 +649,7 @@ bool SdrGrafObj::IsLinkedGraphic() const return !aFileName.isEmpty(); } -const OUString& SdrGrafObj::GetFileName() const -{ - return aFileName; -} -const OUString& SdrGrafObj::GetFilterName() const -{ - return aFilterName; -} void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index dbe91a6c2843..04f52ebcd2a4 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1197,10 +1197,6 @@ bool SdrPageProperties::isUsedByModel() const return mpSdrPage->IsInserted(); } -const SfxItemSet& SdrPageProperties::GetItemSet() const -{ - return *mpProperties; -} void SdrPageProperties::PutItemSet(const SfxItemSet& rSet) { diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 39ffbaa5e02a..addcc38352ca 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -951,10 +951,6 @@ void SdrPageView::SetApplicationBackgroundColor(Color aBackgroundColor) maBackgroundColor = aBackgroundColor; } -Color SdrPageView::GetApplicationBackgroundColor() const -{ - return maBackgroundColor; -} // Set document color for svx at SdrPageViews void SdrPageView::SetApplicationDocumentColor(Color aDocumentColor) @@ -962,10 +958,6 @@ void SdrPageView::SetApplicationDocumentColor(Color aDocumentColor) maDocumentColor = aDocumentColor; } -Color SdrPageView::GetApplicationDocumentColor() const -{ - return maDocumentColor; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 3e09f9d64fb4..e80b179b1b44 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -1250,10 +1250,6 @@ void SdrPaintView::VisAreaChanged(const SdrPageWindow& /*rWindow*/) Broadcast(SvxViewHint(SvxViewHint::SVX_HINT_VIEWCHANGED)); } -const svtools::ColorConfig& SdrPaintView::getColorConfig() const -{ - return maColorConfig; -} void SdrPaintView::onChangeColorConfig() { @@ -1265,10 +1261,6 @@ void SdrPaintView::SetGridColor( Color aColor ) maGridColor = aColor; } -Color SdrPaintView::GetGridColor() const -{ - return maGridColor; -} // Set background color for svx at SdrPageViews void SdrPaintView::SetApplicationBackgroundColor(Color aBackgroundColor) diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index e73b316caa40..9bb5cfc41da7 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1430,10 +1430,6 @@ void SdrView::ConfigurationChanged( ::utl::ConfigurationBroadcaster*p, sal_uInt3 SdrCreateView::ConfigurationChanged(p, nHint); } -SvtAccessibilityOptions& SdrView::getAccessibilityOptions() -{ - return maAccessibilityOptions; -} /** method is called whenever the global SvtAccessibilityOptions is changed */ void SdrView::onAccessibilityOptionsChanged() diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 54dbea75e293..eafd2e52f468 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -581,10 +581,6 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (Runt return mnIndexInParent; } -sdr::table::CellRef AccessibleCell::getCellRef() -{ - return mxCell; -} OUString AccessibleCell::getCellName( sal_Int32 nCol, sal_Int32 nRow ) { diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index e417d710221b..dba2e091f508 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -72,7 +72,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sdr::table::CellRef getCellRef(); + sdr::table::CellRef getCellRef() { return mxCell;} void UpdateChildren(); OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index d62d58d7c113..1e854d5cedae 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -136,7 +136,7 @@ public: void addRange( SvxUnoTextRangeBase* pNewRange ); void removeRange( SvxUnoTextRangeBase* pOldRange ); - const SvxUnoTextRangeBaseList& getRanges() const; + const SvxUnoTextRangeBaseList& getRanges() const { return maTextRanges;} void lock(); void unlock(); @@ -264,10 +264,6 @@ void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) -const SvxUnoTextRangeBaseList& SvxTextEditSourceImpl::getRanges() const -{ - return maTextRanges; -} diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 20c60e1387e2..d5af6f29f6b8 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -730,10 +730,6 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const return rOut; } -const XDash& XLineDashItem::GetDashValue() const -{ - return aDash; -} SfxItemPresentation XLineDashItem::GetPresentation ( @@ -1334,10 +1330,6 @@ SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const return rOut; } -basegfx::B2DPolyPolygon XLineStartItem::GetLineStartValue() const -{ - return maPolyPolygon; -} SfxItemPresentation XLineStartItem::GetPresentation ( @@ -1692,10 +1684,6 @@ SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const return rOut; } -basegfx::B2DPolyPolygon XLineEndItem::GetLineEndValue() const -{ - return maPolyPolygon; -} /** this function searches in both the models pool and the styles pool for XLineStartItem and XLineEndItem with the same value or name and returns an item with the value of @@ -3119,10 +3107,6 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const return rOut; } -const XHatch& XFillHatchItem::GetHatchValue() const // GetValue -> GetHatchValue -{ - return aHatch; -} SfxItemPresentation XFillHatchItem::GetPresentation ( diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 71dbdba847df..3070c497d20b 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -370,10 +370,6 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) cons return rOut; } -const GraphicObject& XFillBitmapItem::GetGraphicObject() const -{ - return maGraphicObject; -} void XFillBitmapItem::SetGraphicObject(const GraphicObject& rGraphicObject) { diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx index 4e1061986166..bc8e8699c032 100644 --- a/sw/inc/ToxWhitespaceStripper.hxx +++ b/sw/inc/ToxWhitespaceStripper.hxx @@ -39,7 +39,7 @@ public: GetPositionInStrippedString(sal_Int32 pos) const; OUString - GetStrippedString() const; + GetStrippedString() const { return mStripped;} private: OUString mStripped; diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 28da2cabb061..425952bd824b 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -141,7 +141,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject // accessors to the object area and its position virtual const SwRect GetObjRect() const SAL_OVERRIDE; // Return value can be NULL. - const Rectangle* GetLastObjRect() const; + const Rectangle* GetLastObjRect() const { return mpLastObjRect;} void SetLastObjRect( const Rectangle& _rNewObjRect ); diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index fcc5c1b0868e..14750c879437 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -214,11 +214,11 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to member <mpDrawObj> void SetDrawObj( SdrObject& _rDrawObj ); - const SdrObject* GetDrawObj() const; + const SdrObject* GetDrawObj() const { return mpDrawObj;} SdrObject* DrawObj() { return mpDrawObj;} // accessors to member <mpAnchorFrm> - const SwFrm* GetAnchorFrm() const; + const SwFrm* GetAnchorFrm() const { return mpAnchorFrm;} SwFrm* AnchorFrm() { return mpAnchorFrm;} void ChgAnchorFrm( SwFrm* _pNewAnchorFrm ); /** determine anchor frame containing the anchor position @@ -233,7 +233,7 @@ class SW_DLLPUBLIC SwAnchoredObject SwFrm* GetAnchorFrmContainingAnchPos(); SwPageFrm* GetPageFrm() { return mpPageFrm;} - const SwPageFrm* GetPageFrm() const; + const SwPageFrm* GetPageFrm() const { return mpPageFrm;} void SetPageFrm( SwPageFrm* _pNewPageFrm ); /** method to determine the page frame, on which the 'anchor' of @@ -291,7 +291,7 @@ class SW_DLLPUBLIC SwAnchoredObject void CheckCharRectAndTopOfLine( const bool _bCheckForParaPorInf = true ); // accessors to member <maLastCharRect> - const SwRect& GetLastCharRect() const; + const SwRect& GetLastCharRect() const { return maLastCharRect;} SwTwips GetRelCharX( const SwFrm* pFrm ) const; SwTwips GetRelCharY( const SwFrm* pFrm ) const; void AddLastCharY( long nDiff ); @@ -353,7 +353,7 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to the current relative position (relative to anchor // position of anchor frame) - const Point GetCurrRelPos() const; + const Point GetCurrRelPos() const { return maRelPos;} void SetCurrRelPos( Point _aRelPos ); // accessors to the format diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 578615599cdf..63c92528b476 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -260,8 +260,8 @@ class SwDrawVirtObj : public SdrVirtObj SwDrawVirtObj& operator= (const SwDrawVirtObj& rObj); /// connection to writer layout - const SwAnchoredObject* GetAnchoredObj() const; - SwAnchoredObject* AnchoredObj(); + const SwAnchoredObject* GetAnchoredObj() const { return &maAnchoredDrawObj;} + SwAnchoredObject* AnchoredObj() { return &maAnchoredDrawObj;} const SwFrm* GetAnchorFrm() const; SwFrm* AnchorFrm(); void RemoveFromWriterLayout(); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 7554ebf70277..217eddcceccc 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1862,7 +1862,7 @@ public: // access container for XForms model; will be NULL if !isXForms() com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> - getXForms() const; + getXForms() const { return mxXForms;} com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > GetGCIterator() const; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 246971fc22fc..250be7f7fe46 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -474,12 +474,12 @@ public: /// Text virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - OUString GetTxt() const { return sTxt; } - OUString GetInitials() const; + const OUString& GetTxt() const { return sTxt; } + const OUString& GetInitials() const { return sInitials;} void SetName(const OUString& rStr); - OUString GetName() const; + const OUString& GetName() const { return sName;} - const OutlinerParaObject* GetTextObject() const; + const OutlinerParaObject* GetTextObject() const { return mpText;} void SetTextObject( OutlinerParaObject* pText ); sal_Int32 GetNumberOfParagraphs() const; diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index f44c03af08a5..129fac481920 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -181,28 +181,28 @@ public: @return the selected item */ - OUString GetSelectedItem() const; + const OUString& GetSelectedItem() const { return aSelectedItem;} /** Returns the name of the field. @return the name of the field */ - OUString GetName() const; + const OUString& GetName() const { return aName;} /** Returns the help text of the field. @return the help text of the field */ - OUString GetHelp() const; + const OUString& GetHelp() const { return aHelp;} /** Returns the tool tip of the field. @return the tool tip of the field */ - OUString GetToolTip() const; + const OUString& GetToolTip() const { return aToolTip;} /** Sets the selected item. diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index b8e72f283042..d8c71d6c4479 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -243,7 +243,7 @@ public: SwAttrSet* pAutoAttr ); ///< in ndole.cxx /// Array of all OutlineNodes. - const SwOutlineNodes& GetOutLineNds() const; + const SwOutlineNodes& GetOutLineNds() const { return *pOutlineNds;} /// Update all Nodes - Rule/Format-Change. void UpdateOutlineNode(SwNode & rNd); diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 100c176ef588..212a612b9bdc 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -201,7 +201,7 @@ public: /// Returns the with our graphic attributes filled Graphic-Attr-Structure. GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const; - boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer(); + boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;} bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;} void TriggerAsyncRetrieveInputStream(); void ApplyInputStream( diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index 3142000f35b2..95a5c2a63190 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -248,7 +248,7 @@ public: void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev ); void DeletePostItData(); - SfxObjectShellLock const& GetTempDocShell() const; + SfxObjectShellLock const& GetTempDocShell() const { return m_xTempDocShell;} void SetTempDocShell(SfxObjectShellLock const&); bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != 0; } diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index f36fb141ece3..33ebb321435f 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -635,7 +635,7 @@ public: void InvalidateSelection( const SwPageFrm* _pSelectedPageFrm ); - const SwRect& GetVisArea() const; + const SwRect& GetVisArea() const { return maVisArea;} /** Adjust the MapMode so that the preview page appears at the * proper position. rPoint identifies the page for which the @@ -723,10 +723,6 @@ struct ContainsPredicate } }; -const SwRect& SwAccPreviewData::GetVisArea() const -{ - return maVisArea; -} void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode, const Point& rPoint ) const diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx index 1d464830ab9e..db8d5c4428d0 100644 --- a/sw/source/core/doc/docxforms.cxx +++ b/sw/source/core/doc/docxforms.cxx @@ -44,10 +44,6 @@ using frame::XModule; using xforms::XFormsUIHelper1; using com::sun::star::container::XIndexAccess; -Reference<XNameContainer> SwDoc::getXForms() const -{ - return mxXForms; -} bool SwDoc::isXForms() const { diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx index 4ccaf42aeeed..276def0ba06d 100644 --- a/sw/source/core/doc/list.cxx +++ b/sw/source/core/doc/list.cxx @@ -35,9 +35,9 @@ class SwListImpl const SwNodes& rNodes ); ~SwListImpl(); - const OUString GetListId() const; + const OUString GetListId() const { return msListId;} - const OUString GetDefaultListStyleName() const; + const OUString GetDefaultListStyleName() const { return msDefaultListStyleName;} void InsertListItem( SwNodeNum& rNodeNum, const int nLevel ); @@ -110,15 +110,7 @@ SwListImpl::~SwListImpl() } } -const OUString SwListImpl::GetListId() const -{ - return msListId; -} -const OUString SwListImpl::GetDefaultListStyleName() const -{ - return msDefaultListStyleName; -} void SwListImpl::InsertListItem( SwNodeNum& rNodeNum, const int nLevel ) diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx index 95edb7a82f75..905b91ff68af 100644 --- a/sw/source/core/docnode/ndnum.cxx +++ b/sw/source/core/docnode/ndnum.cxx @@ -90,9 +90,5 @@ void SwNodes::UpdtOutlineIdx( const SwNode& rNd ) UpdateOutlineNode( *(*pOutlineNds)[ nPos ]); } -const SwOutlineNodes & SwNodes::GetOutLineNds() const -{ - return *pOutlineNds; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index c9caf9d91db5..2f6dba71aca5 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2171,18 +2171,6 @@ SwDrawVirtObj* SwDrawVirtObj::Clone() const return pObj; } -// connection to writer layout - -const SwAnchoredObject* SwDrawVirtObj::GetAnchoredObj() const -{ - return &maAnchoredDrawObj; -} - -SwAnchoredObject* SwDrawVirtObj::AnchoredObj() -{ - return &maAnchoredDrawObj; -} - const SwFrm* SwDrawVirtObj::GetAnchorFrm() const { // #i26791# - use new member <maAnchoredDrawObj> diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 7ae51794b71a..bd64283610f1 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1727,25 +1727,13 @@ OUString SwPostItField::GetPar2() const return sTxt; } -OUString SwPostItField::GetInitials() const -{ - return sInitials; -} void SwPostItField::SetName(const OUString& rName) { sName = rName; } -OUString SwPostItField::GetName() const -{ - return sName; -} -const OutlinerParaObject* SwPostItField::GetTextObject() const -{ - return mpText; -} void SwPostItField::SetTextObject( OutlinerParaObject* pText ) { diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index 0a6cd7e3bfde..c6840191c6a2 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -132,25 +132,9 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const return aSeq; } -OUString SwDropDownField::GetSelectedItem() const -{ - return aSelectedItem; -} -OUString SwDropDownField::GetName() const -{ - return aName; -} -OUString SwDropDownField::GetHelp() const -{ - return aHelp; -} -OUString SwDropDownField::GetToolTip() const -{ - return aToolTip; -} bool SwDropDownField::SetSelectedItem(const OUString & rItem) { diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 9452ad971d19..a818742f0cd3 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -1202,12 +1202,6 @@ bool SwGrfNode::IsSelected() const return bRet; } -// #i73788# -boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > SwGrfNode::GetThreadConsumer() -{ - return mpThreadConsumer; -} - void SwGrfNode::TriggerAsyncRetrieveInputStream() { if ( !IsLinkedFile() ) diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index be6a4f84a11c..0e6abccaf553 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -128,13 +128,13 @@ namespace objectpositioning virtual void CalcPosition() SAL_OVERRIDE; // calculated anchored position for object position type AS_CHAR - Point GetAnchorPos() const; + const Point& GetAnchorPos() const { return maAnchorPos;} // calculated relative position to base line for object position type AS_CHAR SwTwips GetRelPosY() const { return mnRelPos;} // determined object rectangle including spacing for object position type AS_CHAR - SwRect GetObjBoundRectInclSpacing() const; + const SwRect& GetObjBoundRectInclSpacing() const { return maObjBoundRect;} // determined line alignment relative to line height sal_uInt8 GetLineAlignment() const { return mnLineAlignment;} diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 8db7247f45e5..2e585cb3fb0e 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -255,7 +255,7 @@ class SwHistoryBookmark : public SwHistoryHint virtual void SetInDoc(SwDoc * pDoc, bool) SAL_OVERRIDE; bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); - const OUString& GetName() const; + const OUString& GetName() const { return m_aName;} private: const OUString m_aName; diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 4146d8f7f7ab..66e5d5d24aa5 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -80,7 +80,7 @@ namespace objectpositioning /** frame, at which the vertical position is oriented at */ - const SwLayoutFrm& GetVertPosOrientFrm() const; + const SwLayoutFrm& GetVertPosOrientFrm() const { return *mpVertPosOrientFrm;} }; } // namespace objectpositioning diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx index 31ddfe88bb3d..ca89944a37f4 100644 --- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx +++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx @@ -45,7 +45,7 @@ namespace objectpositioning /** calculated relative position for object */ - Point GetRelPos() const; + const Point& GetRelPos() const { return maRelPos;} }; } // namespace objectpositioning diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index f750029106cb..0d02c4d856ce 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -125,7 +125,7 @@ public: virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - const SwTxtNode* getTxtNode() const; + const SwTxtNode* getTxtNode() const { return mpTxtNode;} static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 1e011aaa6efd..4138f0160104 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -717,12 +717,6 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm, GetFrmFmt().SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) ); } -// --> #i34748# - change return type -const Rectangle* SwAnchoredDrawObject::GetLastObjRect() const -{ - return mpLastObjRect; -} - // --> #i34748# - change return type. // If member <mpLastObjRect> is NULL, create one. void SwAnchoredDrawObject::SetLastObjRect( const Rectangle& _rNewLastRect ) diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index b6cf395e9a65..1df522b794a1 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -112,16 +112,8 @@ void SwAnchoredObject::SetDrawObj( SdrObject& _rDrawObj ) mpDrawObj = &_rDrawObj; } -const SdrObject* SwAnchoredObject::GetDrawObj() const -{ - return mpDrawObj; -} -const SwFrm* SwAnchoredObject::GetAnchorFrm() const -{ - return mpAnchorFrm; -} void SwAnchoredObject::ChgAnchorFrm( SwFrm* _pNewAnchorFrm ) @@ -154,10 +146,6 @@ SwFrm* SwAnchoredObject::GetAnchorFrmContainingAnchPos() } -const SwPageFrm* SwAnchoredObject::GetPageFrm() const -{ - return mpPageFrm; -} void SwAnchoredObject::SetPageFrm( SwPageFrm* _pNewPageFrm ) { @@ -177,10 +165,6 @@ void SwAnchoredObject::SetPageFrm( SwPageFrm* _pNewPageFrm ) } } -const SwRect& SwAnchoredObject::GetLastCharRect() const -{ - return maLastCharRect; -} SwTwips SwAnchoredObject::GetRelCharX( const SwFrm* pFrm ) const { @@ -365,10 +349,6 @@ void SwAnchoredObject::ClearCharRectAndTopOfLine() mnLastTopOfLine = 0; } -const Point SwAnchoredObject::GetCurrRelPos() const -{ - return maRelPos; -} void SwAnchoredObject::SetCurrRelPos( Point _aRelPos ) { maRelPos = _aRelPos; diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index 10919aedb8bb..9c9dd6c0fa76 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -393,20 +393,4 @@ SwTwips SwAsCharAnchoredObjectPosition::_GetRelPosToBase( return nRelPosToBase; } -/** calculated anchored position for object position */ -Point SwAsCharAnchoredObjectPosition::GetAnchorPos() const -{ - return maAnchorPos; -} - -/** calculated relative position to base line for object position */ - -/** determined object rectangle including spacing for object */ -SwRect SwAsCharAnchoredObjectPosition::GetObjBoundRectInclSpacing() const -{ - return maObjBoundRect; -} - -/** determined line alignment */ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index ed1f130b6e60..96643ba82f88 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -1094,9 +1094,5 @@ const SwFrm& SwToCntntAnchoredObjectPosition::_GetHoriVirtualAnchor( return *pHoriVirtAnchFrm; } -const SwLayoutFrm& SwToCntntAnchoredObjectPosition::GetVertPosOrientFrm() const -{ - return *mpVertPosOrientFrm; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index cf8730977045..fe23cfed5df2 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -226,10 +226,4 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() maRelPos = aRelPos; } -/** calculated relative position for object position */ -Point SwToLayoutAnchoredObjectPosition::GetRelPos() const -{ - return maRelPos; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/tox/ToxWhitespaceStripper.cxx b/sw/source/core/tox/ToxWhitespaceStripper.cxx index b01c92c5b169..cd0024ef33d8 100644 --- a/sw/source/core/tox/ToxWhitespaceStripper.cxx +++ b/sw/source/core/tox/ToxWhitespaceStripper.cxx @@ -53,10 +53,5 @@ ToxWhitespaceStripper::GetPositionInStrippedString(sal_Int32 pos) const return mNewPositions.at(upos); } -OUString -ToxWhitespaceStripper::GetStrippedString() const -{ - return mStripped; -} } diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 5d6b98881b5e..f7c696c921c0 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -678,10 +678,6 @@ bool SwHistoryBookmark::IsEqualBookmark(const ::sw::mark::IMark& rBkmk) && m_aName == rBkmk.GetName(); } -const OUString& SwHistoryBookmark::GetName() const -{ - return m_aName; -} SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet, sal_uLong nNodePos, const std::set<sal_uInt16> &rSetArr ) diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 4bffefa2ce50..555a0ff9d218 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -70,10 +70,6 @@ SwXFlatParagraph::~SwXFlatParagraph() { } -const SwTxtNode* SwXFlatParagraph::getTxtNode() const -{ - return mpTxtNode; -} // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index feeb5d896883..164d760a1405 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -71,10 +71,6 @@ void SwRenderData::DeletePostItData() } } -SfxObjectShellLock const& SwRenderData::GetTempDocShell() const -{ - return m_xTempDocShell; -} void SwRenderData::SetTempDocShell(SfxObjectShellLock const& xShell) { diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index fc19e785b817..60462cbdea29 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -214,7 +214,7 @@ public: virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; void SetFrmFmt(SwFrmFmt * _pFrmFmt); - const SwFrmFmt* GetFrmFmt() const; + const SwFrmFmt* GetFrmFmt() const { return pFrmFmt;} SwFrmFmt* GetFrmFmt() { return pFrmFmt;} }; diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 454cad669d73..7cd8b9fad273 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -868,10 +868,6 @@ void SwFltAnchor::SetFrmFmt(SwFrmFmt * _pFrmFmt) pFrmFmt = _pFrmFmt; } -const SwFrmFmt * SwFltAnchor::GetFrmFmt() const -{ - return pFrmFmt; -} bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index d6544742865f..97a5d40d7dee 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -346,10 +346,6 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() -const SwRect & WW8TableNodeInfoInner::getRect() const -{ - return maRect; -} #ifdef DBG_UTIL ::std::string WW8TableNodeInfoInner::toString() const @@ -546,10 +542,6 @@ sal_uInt32 WW8TableNodeInfo::getRow() const return getInnerForDepth(mnDepth)->getRow(); } -const ww8::WW8TableNodeInfo::Inners_t & WW8TableNodeInfo::getInners() const -{ - return mInners; -} const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getFirstInner() const { @@ -1454,20 +1446,8 @@ void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans) m_pRowSpans = pRowSpans; } -TableBoxVectorPtr WW8TableCellGridRow::getTableBoxVector() const -{ - return m_pTableBoxVector; -} -WidthsPtr WW8TableCellGridRow::getWidths() const -{ - return m_pWidths; -} -RowSpansPtr WW8TableCellGridRow::getRowSpans() const -{ - return m_pRowSpans; -} CellInfo::CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo) : m_aRect(aRect), m_pNodeInfo(pNodeInfo), m_nFmtFrmWidth(0) diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 4c2188a84d8a..d91798d3da38 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -96,7 +96,7 @@ public: bool isVertMerge() const; const SwTableBox * getTableBox() const { return mpTableBox;} const SwTable * getTable() const { return mpTable;} - const SwRect & getRect() const; + const SwRect & getRect() const { return maRect;} const SwNode * getNode() const; @@ -205,7 +205,7 @@ public: const SwNode * getNextNode() const { return mpNextNode;} const SwRect & getRect() const; - const Inners_t & getInners() const; + const Inners_t & getInners() const { return mInners;} const WW8TableNodeInfoInner::Pointer_t getFirstInner() const; const WW8TableNodeInfoInner::Pointer_t getInnerForDepth(sal_uInt32 nDepth) const; @@ -251,9 +251,9 @@ public: void setWidths(WidthsPtr pGridCols); void setRowSpans(RowSpansPtr pRowSpans); - TableBoxVectorPtr getTableBoxVector() const; - WidthsPtr getWidths() const; - RowSpansPtr getRowSpans() const; + TableBoxVectorPtr getTableBoxVector() const { return m_pTableBoxVector;} + WidthsPtr getWidths() const { return m_pWidths;} + RowSpansPtr getRowSpans() const { return m_pRowSpans;} }; class WW8TableCellGrid diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index f293b38ff6fb..35b557228ab8 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -1259,16 +1259,6 @@ void DocxExport::WriteEmbeddings() } } -VMLExport& DocxExport::VMLExporter() -{ - return *m_pVMLExport; -} - -DocxSdrExport& DocxExport::SdrExporter() -{ - return *m_pSdrExport; -} - bool DocxExport::isMirroredMargin() { bool bMirroredMargins = false; diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 950db249f066..3415b0396cc2 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -268,10 +268,10 @@ public: virtual ~DocxExport(); /// Reference to the VMLExport instance for the main document. - oox::vml::VMLExport& VMLExporter(); + oox::vml::VMLExport& VMLExporter() { return *m_pVMLExport; } /// Reference to the DocxSdrExport instance for the main document. - DocxSdrExport& SdrExporter(); + DocxSdrExport& SdrExporter() { return *m_pSdrExport; } /// Set the document default tab stop. void setDefaultTabStop( int stop ) { m_aSettings.defaultTabStop = stop; } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 0020e0504707..130edf14f9b6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -438,11 +438,6 @@ OStringBuffer& RtfAttributeOutput::RunText() return m_aRunText.getLastBuffer(); } -OStringBuffer& RtfAttributeOutput::Styles() -{ - return m_aStyles; -} - void RtfAttributeOutput::RawText(const OUString& rText, bool /*bForceUnicode*/, rtl_TextEncoding eCharSet) { m_aRunText->append(msfilter::rtfutil::OutString(rText, eCharSet)); diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index f43d3d88e6ff..fdd8ff176910 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -76,7 +76,7 @@ public: // Access to (anyway) private buffers, used by the sdr exporter OStringBuffer& RunText(); - OStringBuffer& Styles(); + OStringBuffer& Styles() { return m_aStyles; } /// Output text (without markup). virtual void RawText(const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet) SAL_OVERRIDE; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 65c9b00c116b..0bc4ea88aaba 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -3113,10 +3113,6 @@ SwMSConvertControls::SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ) : oox { } -sal_uInt32 SwMSConvertControls::GenerateObjectID() -{ - return ++mnObjectId; -} // in transitioning away old filter for ole/ocx controls, ReadOCXStream has been made pure virtual in // filter/source/msocximex.cxx, so.. we need an implementation here diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 5d35ae21f0cc..215c33ad2ec4 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -200,10 +200,6 @@ sal_uInt16 MSWordStyles::BuildGetSlot( const SwFmt& rFmt ) return nRet; } -sal_uInt16 MSWordStyles::BuildGetSlot(const SwNumRule&) -{ - return nUsedSlots++; -} sal_uInt16 MSWordStyles::GetWWId( const SwFmt& rFmt ) const { diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 36b260f21029..46c407712920 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1578,7 +1578,7 @@ class MSWordStyles /// Get slot number during building the style table. sal_uInt16 BuildGetSlot( const SwFmt& rFmt ); - sal_uInt16 BuildGetSlot( const SwNumRule& rNumRule ); + sal_uInt16 BuildGetSlot( const SwNumRule& /*rNumRule*/ ) { return nUsedSlots++;} /// Return information about one style. void GetStyleData( SwFmt* pFmt, bool& bFmtColl, sal_uInt16& nBase, sal_uInt16& nNext ); diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 1ed667ca0694..f66573e4d66a 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -235,12 +235,6 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) return bRet; } -bool WW8GlossaryFib::IsGlossaryFib() -{ - // fGlsy will indicate whether this has AutoText or not - return fGlsy; -} - sal_uInt32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream & /* rTableStrm */, SvStream & /* rStrm */, const WW8Fib &rFib) diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index d6c35fad8656..06cc79ec8e94 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -37,7 +37,8 @@ public: WW8GlossaryFib( SvStream& rStrm, sal_uInt8 nWantedVersion , SvStream& rTableStrm, const WW8Fib &rFib) : WW8Fib(rStrm, nWantedVersion,FindGlossaryFibOffset(rTableStrm,rStrm,rFib)) {} - bool IsGlossaryFib(); + // fGlsy will indicate whether this has AutoText or not + bool IsGlossaryFib() { return fGlsy; } private: sal_uInt32 FindGlossaryFibOffset(SvStream &rTableStrm,SvStream &rStrm, const WW8Fib &rFib); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 4ffb00bfd562..6da60d5a3bf2 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -537,12 +537,12 @@ class WW8FieldEntry SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); }; sal_Int32 GetPtCntnt() { return maStartPos.GetPtCntnt(); }; - OUString GetBookmarkName(); - OUString GetBookmarkCode(); + OUString GetBookmarkName() { return msBookmarkName;} + OUString GetBookmarkCode() { return msMarkCode;} void SetBookmarkName(const OUString& bookmarkName); void SetBookmarkType(const OUString& bookmarkType); void SetBookmarkCode(const OUString& bookmarkCode); - ::sw::mark::IFieldmark::parameter_map_t& getParameters(); + ::sw::mark::IFieldmark::parameter_map_t& getParameters() { return maParams;} }; // Mini-Merker fuer einige Flags @@ -712,7 +712,7 @@ public: com::sun::star::drawing::XShape > *pShapeRef=0, bool bFloatingCtrl=false ); private: - sal_uInt32 GenerateObjectID(); + sal_uInt32 GenerateObjectID() { return ++mnObjectId; } SwPaM *pPaM; sal_uInt32 mnObjectId; }; diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index aba9ee4e59ad..e3414ee10e9d 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -654,15 +654,7 @@ WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) throw() return *this; } -OUString WW8FieldEntry::GetBookmarkName() -{ - return msBookmarkName; -} -OUString WW8FieldEntry::GetBookmarkCode() -{ - return msMarkCode; -} void WW8FieldEntry::SetBookmarkName(const OUString& bookmarkName) { @@ -679,10 +671,6 @@ void WW8FieldEntry::SetBookmarkCode(const OUString& bookmarkCode) msMarkCode = bookmarkCode; } -::sw::mark::IFieldmark::parameter_map_t& WW8FieldEntry::getParameters() -{ - return maParams; -} // Read_Field liest ein Feld ein oder, wenn es nicht gelesen werden kann, // wird 0 zurueckgegeben, so dass das Feld vom Aufrufer textuell gelesen wird. diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index 1622a389d27b..0cdbb5157ed2 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -86,11 +86,5 @@ VbaPalette::VbaPalette() mxPalette = new DefaultPalette(); } -uno::Reference< container::XIndexAccess > -VbaPalette::getPalette() const -{ - - return mxPalette; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbapalette.hxx b/sw/source/ui/vba/vbapalette.hxx index 41e0d1ab79f3..e20fba925800 100644 --- a/sw/source/ui/vba/vbapalette.hxx +++ b/sw/source/ui/vba/vbapalette.hxx @@ -28,7 +28,7 @@ public: VbaPalette(); // if no palette available e.g. because the document doesn't have a // palette defined then a default palette will be returned. - css::uno::Reference< css::container::XIndexAccess > getPalette() const; + css::uno::Reference< css::container::XIndexAccess > getPalette() const { return mxPalette;} }; #endif diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index c2baa4b03a72..2d835ec6cbfd 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -455,7 +455,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); OUString GetSelDescr() const; - SwNavigationMgr& GetNavigationMgr(); + SwNavigationMgr& GetNavigationMgr() { return aNavigationMgr; } + void addCurrentPosition(); bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL, bool bSelFrame = true ); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 2653bc0cf304..7d751b30335d 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1475,10 +1475,6 @@ SwFrmFmt *SwWrtShell::GetTblStyle(const OUString &rFmtName) return 0; } -SwNavigationMgr& SwWrtShell::GetNavigationMgr() { - return aNavigationMgr; -} - void SwWrtShell::addCurrentPosition() { SwPaM* pPaM = GetCrsr(); aNavigationMgr.addEntry(*pPaM->GetPoint()); diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index 42fc76e475ca..ff0763c829f3 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -39,25 +39,9 @@ namespace cmis m_sId = "root"; } - OUString& URL::getObjectPath( ) - { - return m_sPath; - } - OUString& URL::getObjectId( ) - { - return m_sId; - } - OUString& URL::getBindingUrl( ) - { - return m_sBindingUrl; - } - OUString& URL::getRepositoryId( ) - { - return m_sRepositoryId; - } void URL::setObjectPath( const OUString& sPath ) { diff --git a/ucb/source/ucp/cmis/cmis_url.hxx b/ucb/source/ucp/cmis/cmis_url.hxx index 3ad7a5d53b24..0e687f5ae100 100644 --- a/ucb/source/ucp/cmis/cmis_url.hxx +++ b/ucb/source/ucp/cmis/cmis_url.hxx @@ -30,10 +30,10 @@ namespace cmis public: URL( OUString const & urlStr ); - OUString& getObjectPath( ); - OUString& getObjectId( ); - OUString& getBindingUrl( ); - OUString& getRepositoryId( ); + OUString& getObjectPath( ) { return m_sPath; } + OUString& getObjectId( ) { return m_sId; } + OUString& getBindingUrl( ) { return m_sBindingUrl; } + OUString& getRepositoryId( ) { return m_sRepositoryId; } OUString& getUsername( ) { return m_sUser; } OUString& getPassword( ) { return m_sPass; } void setObjectPath( const OUString& sPath ); diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index ea5a91036572..ec1a8e66e485 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -139,10 +139,6 @@ void OfficeConnection::tearDown() { } } -css::uno::Reference< css::uno::XComponentContext > -OfficeConnection::getComponentContext() const { - return context_; -} bool OfficeConnection::isStillAlive() const { if (process_ == 0) { diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 574440a9186b..df0fa98194eb 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -1107,10 +1107,6 @@ void ConfigItem::ClearModified() } -bool ConfigItem::IsInValueChange() const -{ - return m_nInValueChange > 0; -} Reference< XHierarchicalNameAccess> ConfigItem::GetTree() { diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index d0bb4a5959c4..ead115f19d52 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -139,14 +139,14 @@ class SvtSecurityOptions_Impl : public ConfigItem bool IsReadOnly ( SvtSecurityOptions::EOption eOption ) const; - Sequence< OUString > GetSecureURLs ( ) const; + Sequence< OUString > GetSecureURLs ( ) const { return m_seqSecureURLs;} void SetSecureURLs ( const Sequence< OUString >& seqURLList ); inline sal_Int32 GetMacroSecurityLevel ( ) const; void SetMacroSecurityLevel ( sal_Int32 _nLevel ); inline bool IsMacroDisabled ( ) const; - Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors ( ) const; + Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors ( ) const { return m_seqTrustedAuthors;} void SetTrustedAuthors ( const Sequence< SvtSecurityOptions::Certificate >& rAuthors ); bool IsOptionSet ( SvtSecurityOptions::EOption eOption ) const; @@ -828,10 +828,6 @@ bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOption ) return bReadonly; } -Sequence< OUString > SvtSecurityOptions_Impl::GetSecureURLs() const -{ - return m_seqSecureURLs; -} void SvtSecurityOptions_Impl::SetSecureURLs( const Sequence< OUString >& seqURLList ) { @@ -868,10 +864,6 @@ void SvtSecurityOptions_Impl::SetMacroSecurityLevel( sal_Int32 _nLevel ) } } -Sequence< SvtSecurityOptions::Certificate > SvtSecurityOptions_Impl::GetTrustedAuthors() const -{ - return m_seqTrustedAuthors; -} void SvtSecurityOptions_Impl::SetTrustedAuthors( const Sequence< SvtSecurityOptions::Certificate >& rAuthors ) { 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(); diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx index 3f8bc073be9e..6717caaf9757 100644 --- a/writerfilter/source/dmapper/FFDataHandler.cxx +++ b/writerfilter/source/dmapper/FFDataHandler.cxx @@ -42,20 +42,8 @@ FFDataHandler::~FFDataHandler() { } -const OUString & FFDataHandler::getName() const -{ - return m_sName; -} -const OUString & FFDataHandler::getHelpText() const -{ - return m_sHelpText; -} -const OUString & FFDataHandler::getStatusText() const -{ - return m_sStatusText; -} @@ -69,20 +57,8 @@ bool FFDataHandler::getCheckboxChecked() const return false; } -const OUString & FFDataHandler::getDropDownResult() const -{ - return m_sDropDownResult; -} -const FFDataHandler::DropDownEntries_t & FFDataHandler::getDropDownEntries() const -{ - return m_DropDownEntries; -} -const OUString & FFDataHandler::getTextDefault() const -{ - return m_sTextDefault; -} void FFDataHandler::lcl_sprm(Sprm & r_Sprm) { diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx index 9692ac2186d3..d01cab59ff52 100644 --- a/writerfilter/source/dmapper/FFDataHandler.hxx +++ b/writerfilter/source/dmapper/FFDataHandler.hxx @@ -36,13 +36,13 @@ public: virtual ~FFDataHandler(); // member: name - const OUString & getName() const; + const OUString & getName() const { return m_sName;} // member: helpText - const OUString & getHelpText() const; + const OUString & getHelpText() const { return m_sHelpText;} // member: statusText - const OUString & getStatusText() const; + const OUString & getStatusText() const { return m_sStatusText;} // member: checkboxHeight sal_uInt32 getCheckboxHeight() const { return m_nCheckboxHeight;} @@ -54,13 +54,13 @@ public: bool getCheckboxChecked() const; // member: dropDownResult - const OUString & getDropDownResult() const; + const OUString & getDropDownResult() const { return m_sDropDownResult;} // member: dropDownEntries - const DropDownEntries_t & getDropDownEntries() const; + const DropDownEntries_t & getDropDownEntries() const { return m_DropDownEntries;} // member: textDefault - const OUString & getTextDefault() const; + const OUString & getTextDefault() const { return m_sTextDefault;} // sprm void resolveSprm(Sprm & r_sprm); diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 8ede56051d3b..2487408faad6 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -880,9 +880,6 @@ uno::Reference<text::XTextContent> GraphicImport::GetGraphicObject() return xResult; } -uno::Reference<drawing::XShape> GraphicImport::GetXShapeObject(){ - return m_xShape; -} void GraphicImport::ProcessShapeOptions(Value& rValue) { diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index 21612c060de3..aa2e519dd3c9 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -92,7 +92,7 @@ public: virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; css::uno::Reference<css::text::XTextContent> GetGraphicObject(); - css::uno::Reference<css::drawing::XShape> GetXShapeObject(); + css::uno::Reference<css::drawing::XShape> GetXShapeObject() { return m_xShape;} bool IsGraphic() const; private: diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 66e9d65b4bc6..000eb72f753d 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -427,10 +427,6 @@ void NumPicBullet::SetShape(uno::Reference<drawing::XShape> xShape) } -uno::Reference<drawing::XShape> NumPicBullet::GetShape() -{ - return m_xShape; -} //--------------------------------------- AbstractListDef implementation diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 4f310f11e73a..3845d408b348 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -120,7 +120,7 @@ public: void SetId(sal_Int32 nId); sal_Int32 GetId() { return m_nId;} void SetShape(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape); - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> GetShape(); + com::sun::star::uno::Reference<com::sun::star::drawing::XShape> GetShape() { return m_xShape;} private: sal_Int32 m_nId; com::sun::star::uno::Reference<com::sun::star::drawing::XShape> m_xShape; diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 6a60e4115c43..8e2b4786acfd 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -290,10 +290,6 @@ void PropertyMap::InsertProps(const PropertyMapPtr pMap) } } -const uno::Reference< text::XFootnote>& PropertyMap::GetFootnote() const -{ - return m_xFootnote; -} void PropertyMap::insertTableProperties( const PropertyMap* ) diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index 6977fff8a0e1..5fd0094b0462 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -119,7 +119,7 @@ public: void Insert( PropertyIds eId, const ::com::sun::star::uno::Any& rAny, bool bOverwrite = true, GrabBagType rGrabBagType = NO_GRAB_BAG ); void Insert( PropertyIds eId, const PropValue& rValue, bool bOverwrite = true ); void InsertProps(const boost::shared_ptr<PropertyMap> pMap); - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>& GetFootnote() const; + const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>& GetFootnote() const { return m_xFootnote;} void SetFootnote( ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> xF ) { m_xFootnote = xF; } sal_Unicode GetFootnoteSymbol() const { return m_cFootnoteSymbol;} diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 10f6abf5b2dc..84f6090b7866 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -158,30 +158,10 @@ void SdtHelper::createControlShape(awt::Size aSize, uno::Reference<awt::XControl m_bHasElements = true; } -std::vector<OUString>& SdtHelper::getDropDownItems() -{ - return m_aDropDownItems; -} -OUStringBuffer& SdtHelper::getSdtTexts() -{ - return m_aSdtTexts; -} -OUStringBuffer& SdtHelper::getDate() -{ - return m_sDate; -} -OUStringBuffer& SdtHelper::getDateFormat() -{ - return m_sDateFormat; -} -OUStringBuffer& SdtHelper::getLocale() -{ - return m_sLocale; -} void SdtHelper::appendToInteropGrabBag(com::sun::star::beans::PropertyValue rValue) diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx index b9d9cdf2462a..b6341093a0bc 100644 --- a/writerfilter/source/dmapper/SdtHelper.hxx +++ b/writerfilter/source/dmapper/SdtHelper.hxx @@ -69,11 +69,11 @@ public: SdtHelper(DomainMapper_Impl& rDM_Impl); virtual ~SdtHelper(); - std::vector<OUString>& getDropDownItems(); - OUStringBuffer& getSdtTexts(); - OUStringBuffer& getDate(); - OUStringBuffer& getDateFormat(); - OUStringBuffer& getLocale(); + std::vector<OUString>& getDropDownItems() { return m_aDropDownItems;} + OUStringBuffer& getSdtTexts() { return m_aSdtTexts;} + OUStringBuffer& getDate() { return m_sDate;} + OUStringBuffer& getDateFormat() { return m_sDateFormat;} + OUStringBuffer& getLocale() { return m_sLocale;} /// If createControlShape() was ever called. bool hasElements() { diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx index fa19d0d2dd1f..28e813b4f05f 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx @@ -494,10 +494,6 @@ TextEffectsHandler::~TextEffectsHandler() { } -boost::optional<PropertyIds> TextEffectsHandler::getGrabBagPropertyId() -{ - return maPropertyId; -} void TextEffectsHandler::lcl_attribute(Id aName, Value& aValue) { diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx index 9994ec4158ed..c1f0a377d4e2 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.hxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx @@ -46,7 +46,7 @@ public: TextEffectsHandler(sal_uInt32 aElementId); virtual ~TextEffectsHandler(); - boost::optional<PropertyIds> getGrabBagPropertyId(); + boost::optional<PropertyIds> getGrabBagPropertyId() { return maPropertyId;} css::beans::PropertyValue getInteropGrabBag(); diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx index 0b25ca2eec3c..039bf7fe4529 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx @@ -200,10 +200,6 @@ void WrapPolygonHandler::lcl_sprm(Sprm & _sprm) } } -WrapPolygon::Pointer_t WrapPolygonHandler::getPolygon() -{ - return mpPolygon; -} }} diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx index 371e310bc567..9aa42937cb2c 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx @@ -62,7 +62,7 @@ public: WrapPolygonHandler(); virtual ~WrapPolygonHandler(); - WrapPolygon::Pointer_t getPolygon(); + WrapPolygon::Pointer_t getPolygon() { return mpPolygon;} private: WrapPolygon::Pointer_t mpPolygon; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index b75247167d3a..49db4fb464fa 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -424,10 +424,6 @@ void OOXMLFastContextHandler::setDefine(Id nDefine) } -OOXMLParserState::Pointer_t OOXMLFastContextHandler::getParserState() const -{ - return mpParserState; -} void OOXMLFastContextHandler::setToken(Token_t nToken) { @@ -996,11 +992,6 @@ void OOXMLFastContextHandler::sendPropertiesToParent() } } -uno::Reference< uno::XComponentContext > -OOXMLFastContextHandler::getComponentContext() -{ - return m_xContext; -} /* class OOXMLFastContextHandlerStream @@ -1039,11 +1030,6 @@ void OOXMLFastContextHandlerStream::sendProperty(Id nId) sText.getLength()); } -OOXMLPropertySet::Pointer_t -OOXMLFastContextHandlerStream::getPropertySetAttrs() const -{ - return mpPropertySetAttrs; -} void OOXMLFastContextHandlerStream::resolvePropertySetAttrs() { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 0590638b8128..053985dbb700 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -176,7 +176,7 @@ public: void setDefine(Id nDefine); Id getDefine() const { return mnDefine;} - OOXMLParserState::Pointer_t getParserState() const; + OOXMLParserState::Pointer_t getParserState() const { return mpParserState;} void sendTableDepth() const; void setHandle(); @@ -276,7 +276,7 @@ protected: (const OUString & rId); virtual void resolvePropertySetAttrs(); - uno::Reference< uno::XComponentContext > getComponentContext(); + uno::Reference< uno::XComponentContext > getComponentContext() { return m_xContext;} sal_uInt32 mnInstanceNumber; @@ -304,7 +304,7 @@ public: virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return STREAM; } - OOXMLPropertySet::Pointer_t getPropertySetAttrs() const; + OOXMLPropertySet::Pointer_t getPropertySetAttrs() const { return mpPropertySetAttrs;} virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal) SAL_OVERRIDE; virtual void sendProperty(Id nId); diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index 7fd89342f74e..a7c8883fb977 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -789,10 +789,6 @@ void OOXMLPropertySetEntryToString::attribute(Id nId, Value & rValue) mStr = rValue.getString(); } -const OUString & OOXMLPropertySetEntryToString::getString() const -{ - return mStr; -} OOXMLPropertySetEntryToInteger::OOXMLPropertySetEntryToInteger(Id nId) : mnId(nId), mnValue(0) diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 78c578f0dce5..9f185618a873 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -282,7 +282,7 @@ public: virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; virtual void attribute(Id nId, Value & rValue) SAL_OVERRIDE; - const OUString & getString() const; + const OUString & getString() const { return mStr;} }; class OOXMLPropertySetEntryToInteger : public Properties diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index 9aa896b59dac..52b10289b368 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -393,12 +393,6 @@ uno::Reference<io::XInputStream> OOXMLStreamImpl::getDocumentStream() return xResult; } -// Giving access to mxDocumentStream. It is needed by resolving custom xml to get list of customxml's used in document. -uno::Reference<io::XStream> OOXMLStreamImpl::accessDocumentStream() -{ - return mxDocumentStream; -} - uno::Reference<io::XInputStream> OOXMLStreamImpl::getStorageStream() { return mxStorageStream; diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx index ea1686db3f11..5c83bfd44db9 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx @@ -84,7 +84,8 @@ public: getFastTokenHandler(css::uno::Reference<css::uno::XComponentContext> rContext) SAL_OVERRIDE; void setInputStream(css::uno::Reference<css::io::XInputStream> rxInputStream); - css::uno::Reference<css::io::XStream> accessDocumentStream(); + // Giving access to mxDocumentStream. It is needed by resolving custom xml to get list of customxml's used in document. + css::uno::Reference<css::io::XStream> accessDocumentStream() { return mxDocumentStream;} }; }} #endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLSTREAMIMPL_HXX diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index d8ccd492ed82..0f29107a786f 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -318,10 +318,6 @@ SvStream& RTFDocumentImpl::Strm() return *m_pInStream; } -Stream& RTFDocumentImpl::Mapper() -{ - return *m_pMapperStream; -} void RTFDocumentImpl::setSuperstream(RTFDocumentImpl* pSuperstream) { @@ -5666,10 +5662,6 @@ int RTFDocumentImpl::popState() return "RTFDocumentImpl"; } -uno::Reference<lang::XMultiServiceFactory> RTFDocumentImpl::getModelFactory() -{ - return m_xModelFactory; -} bool RTFDocumentImpl::isInBackground() { diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index d4007421c621..476362b8a802 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -344,7 +344,7 @@ public: virtual void finishSubstream() SAL_OVERRIDE; virtual bool isSubstream() const SAL_OVERRIDE; - Stream& Mapper(); + Stream& Mapper() { return *m_pMapperStream;} void setSubstream(bool bIsSubtream); void setSuperstream(RTFDocumentImpl* pSuperstream); void setStreamType(Id nId); @@ -352,7 +352,7 @@ public: void setAuthorInitials(OUString& rAuthorInitials); void setIgnoreFirst(OUString& rIgnoreFirst); void seek(sal_Size nPos); - css::uno::Reference<css::lang::XMultiServiceFactory> getModelFactory(); + css::uno::Reference<css::lang::XMultiServiceFactory> getModelFactory() { return m_xModelFactory;} bool isInBackground(); void setDestinationText(OUString& rString); /// Resolve a picture: If not inline, then anchored. diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx index c731986e5cfb..793305ef2621 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx @@ -46,15 +46,7 @@ std::string RTFReferenceProperties::getType() const return "RTFReferenceProperties"; } -RTFSprms& RTFReferenceProperties::getAttributes() -{ - return m_aAttributes; -} -RTFSprms& RTFReferenceProperties::getSprms() -{ - return m_aSprms; -} } // namespace rtftok } // namespace writerfilter diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx b/writerfilter/source/rtftok/rtfreferenceproperties.hxx index 527ad01d7734..263ac728a8f8 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.hxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.hxx @@ -26,8 +26,8 @@ public: virtual ~RTFReferenceProperties(); virtual void resolve(Properties& rHandler) SAL_OVERRIDE; virtual std::string getType() const SAL_OVERRIDE; - RTFSprms& getAttributes(); - RTFSprms& getSprms(); + RTFSprms& getAttributes() { return m_aAttributes;} + RTFSprms& getSprms() { return m_aSprms;} private: RTFSprms m_aAttributes; RTFSprms m_aSprms; diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 9c55f975514f..25735d9d0580 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -57,10 +57,6 @@ RTFTokenizer::~RTFTokenizer() { } -SvStream& RTFTokenizer::Strm() -{ - return *m_pInStream; -} int RTFTokenizer::resolveParse() { diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx index b2ce73b77646..ad9e4ac0fec1 100644 --- a/writerfilter/source/rtftok/rtftokenizer.hxx +++ b/writerfilter/source/rtftok/rtftokenizer.hxx @@ -45,7 +45,7 @@ public: /// To look up additional properties of a math symbol. static bool lookupMathKeyword(RTFMathSymbol& rSymbol); private: - SvStream& Strm(); + SvStream& Strm() { return *m_pInStream;} int resolveKeyword(); int dispatchKeyword(OString& rKeyword, bool bParam, int nParam); diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx index c5a9a4452f8b..891fb7967337 100644 --- a/xmloff/inc/txtlists.hxx +++ b/xmloff/inc/txtlists.hxx @@ -67,8 +67,8 @@ class XMLTextListsHelper : private boost::noncopyable const OUString& sListId ) const; OUString GetContinueListIdOfProcessedList( const OUString& sListId ) const; - const OUString& GetLastProcessedListId() const; - const OUString& GetListStyleOfLastProcessedList() const; + const OUString& GetLastProcessedListId() const { return msLastProcessedListId;} + const OUString& GetListStyleOfLastProcessedList() const { return msListStyleOfLastProcessedList;} OUString GenerateNewListId() const; diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 08b6c1507860..5691a5b9ce75 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -154,7 +154,7 @@ public: com::sun::star::chart::XChartDocument > rChartDoc, bool bIncludeTable ); - UniReference< XMLPropertySetMapper > GetPropertySetMapper() const; + UniReference< XMLPropertySetMapper > GetPropertySetMapper() const { return mxPropertySetMapper;} void SetChartRangeAddress( const OUString& rAddress ) { msChartAddress = rAddress; } @@ -1010,10 +1010,6 @@ const OUString& SchXMLExportHelper::getChartCLSID() return m_pImpl->msCLSID; } -UniReference< XMLPropertySetMapper > SchXMLExportHelper_Impl::GetPropertySetMapper() const -{ - return mxPropertySetMapper; -} void SchXMLExportHelper_Impl::exportAutoStyles() { diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 0e915ea06a4d..93bcbb37d16b 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -706,10 +706,6 @@ bool SchXMLPositonAttributesHelper::isAutomatic() const { return m_bAutoSize || m_bAutoPosition; } -awt::Rectangle SchXMLPositonAttributesHelper::getRectangle() const -{ - return awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height ); -} bool SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index 128e6364d2ab..3ba899091b7f 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -65,7 +65,7 @@ public: bool hasPosSize() const; bool isAutomatic() const; - ::com::sun::star::awt::Rectangle getRectangle() const; + ::com::sun::star::awt::Rectangle getRectangle() const { return css::awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );} private: bool hasSize() const; diff --git a/xmloff/source/core/SvXMLAttr.cxx b/xmloff/source/core/SvXMLAttr.cxx index 58997a44d4d7..a5be7be2698c 100644 --- a/xmloff/source/core/SvXMLAttr.cxx +++ b/xmloff/source/core/SvXMLAttr.cxx @@ -35,13 +35,6 @@ bool SvXMLAttr::operator== (const SvXMLAttr &rCmp) const } -const OUString& SvXMLAttr::getLName() const -{ - return aLName; -} -const OUString& SvXMLAttr::getValue() const { - return aValue; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/core/SvXMLAttr.hxx b/xmloff/source/core/SvXMLAttr.hxx index 7725a3dc03c7..354b67497cd8 100644 --- a/xmloff/source/core/SvXMLAttr.hxx +++ b/xmloff/source/core/SvXMLAttr.hxx @@ -28,8 +28,8 @@ public: bool operator== (const SvXMLAttr &rCmp) const; sal_uInt16 getPrefixPos() const { return aPrefixPos;} - const OUString& getLName() const; - const OUString& getValue() const; + const OUString& getLName() const { return aLName;} + const OUString& getValue() const { return aValue;} }; #endif // INCLUDED_XMLOFF_SOURCE_CORE_SVXMLATTR_HXX diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 7730c882002e..2086d2a7b5b2 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2364,10 +2364,6 @@ void SvXMLExport::DisposingModel() mxEventListener.clear(); } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SvXMLExport::getComponentContext() -{ - return m_xContext; -} ::comphelper::UnoInterfaceToUniqueIdentifierMapper& SvXMLExport::getInterfaceToIdentifierMapper() { diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index 9e6c716ff564..ec0c91872198 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -282,14 +282,6 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext( return pContext; } -const OUString& XMLTextListBlockContext::GetListId() const -{ - return msListId; -} -const OUString& XMLTextListBlockContext::GetContinueListId() const -{ - return msContinueListId; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index 21530e891698..27961782f28c 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -78,8 +78,8 @@ public: ::com::sun::star::container::XIndexReplace >& GetNumRules() const { return mxNumRules; } - const OUString& GetListId() const; - const OUString& GetContinueListId() const; + const OUString& GetListId() const { return msListId;} + const OUString& GetContinueListId() const { return msContinueListId;} }; diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index 5b882a6514cc..71663660c83c 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -216,15 +216,7 @@ OUString XMLTextListsHelper::GetContinueListIdOfProcessedList( return OUString(); } -const OUString& XMLTextListsHelper::GetLastProcessedListId() const -{ - return msLastProcessedListId; -} -const OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() const -{ - return msListStyleOfLastProcessedList; -} OUString XMLTextListsHelper::GenerateNewListId() const { diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx index 215500317da0..6b0112119f41 100644 --- a/xmloff/source/transform/PersAttrListTContext.cxx +++ b/xmloff/source/transform/PersAttrListTContext.cxx @@ -177,9 +177,4 @@ void XMLPersAttrListTContext::ExportContent() // nothing to export } -Reference< XAttributeList > XMLPersAttrListTContext::GetAttrList() const -{ - return m_xAttrList; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index 43e8838f0875..5bf0a701ebc5 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -107,7 +107,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > - GetAttrList() const; + GetAttrList() const { return m_xAttrList; } + }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSATTRLISTTCONTEXT_HXX diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index 4965f2a5ffa8..f98613ded3dc 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -77,10 +77,6 @@ XFormsModelContext::~XFormsModelContext() } -Reference<css::xforms::XModel2> XFormsModelContext::getModel() -{ - return mxModel; -} void XFormsModelContext::HandleAttribute( diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index ef4a4b550750..b439c2771111 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -48,7 +48,7 @@ public: const OUString& rLName ); virtual ~XFormsModelContext(); - com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel(); + com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel() { return mxModel;} // implement SvXMLImportContext & TokenContext methods: diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index 6a3d6a1b14a4..b384f8a670a5 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -208,9 +208,6 @@ int XmlReader::getNamespaceId(Span const & prefix) const { return NAMESPACE_UNKNOWN; } -OUString XmlReader::getUrl() const { - return fileUrl_; -} void XmlReader::normalizeLineEnds(Span const & text) { char const * p = text.begin; diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index f437e9f98e37..9a5da2042825 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -520,10 +520,6 @@ sal_Int32 BufferNode::indexOfChild(const BufferNode* pChild) const return nIndex; } -const BufferNode* BufferNode::getParent() const -{ - return m_pParent; -} void BufferNode::setParent(const BufferNode* pParent) { @@ -736,10 +732,6 @@ const BufferNode* BufferNode::getNextNodeByTreeOrder() const return pNextSiblingParent; } -cssu::Reference< cssxw::XXMLElementWrapper > BufferNode::getXMLElement() const -{ - return m_xXMLElement; -} void BufferNode::setXMLElement( const cssu::Reference< cssxw::XXMLElementWrapper >& xXMLElement ) { diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx index db2b2d95c324..18f3bb63a27b 100644 --- a/xmlsecurity/source/framework/buffernode.hxx +++ b/xmlsecurity/source/framework/buffernode.hxx @@ -102,14 +102,14 @@ public: void addChild(const BufferNode* pChild); void removeChild(const BufferNode* pChild); sal_Int32 indexOfChild(const BufferNode* pChild) const; - const BufferNode* getParent() const; + const BufferNode* getParent() const { return m_pParent;} void setParent(const BufferNode* pParent); const BufferNode* getNextSibling() const; const BufferNode* isAncestor(const BufferNode* pDescendant) const; bool isPrevious(const BufferNode* pFollowing) const; const BufferNode* getNextNodeByTreeOrder() const; com::sun::star::uno::Reference< - com::sun::star::xml::wrapper::XXMLElementWrapper > getXMLElement() const; + com::sun::star::xml::wrapper::XXMLElementWrapper > getXMLElement() const { return m_xXMLElement;} void setXMLElement(const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement); void notifyBranch(); diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 8a6447dbe92f..86d5dba09061 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -199,10 +199,6 @@ SAXHelper::~SAXHelper() { // xmlCleanupParser() ; } -xmlNodePtr SAXHelper::getCurrentNode() -{ - return m_pParserCtxt->node; -} void SAXHelper::setCurrentNode(const xmlNodePtr pNode) { @@ -217,10 +213,6 @@ void SAXHelper::setCurrentNode(const xmlNodePtr pNode) = pNode; } -xmlDocPtr SAXHelper::getDocument() -{ - return m_pParserCtxt->myDoc; -} /** * XDocumentHandler -- start an xml document diff --git a/xmlsecurity/source/xmlsec/saxhelper.hxx b/xmlsecurity/source/xmlsec/saxhelper.hxx index bce17797d0ae..8ed3e6e6bc16 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.hxx +++ b/xmlsecurity/source/xmlsec/saxhelper.hxx @@ -41,9 +41,9 @@ class SAXHelper SAXHelper( ) ; virtual ~SAXHelper() ; - xmlNodePtr getCurrentNode(); + xmlNodePtr getCurrentNode() { return m_pParserCtxt->node;} void setCurrentNode(const xmlNodePtr pNode); - xmlDocPtr getDocument(); + xmlDocPtr getDocument() { return m_pParserCtxt->myDoc;} void startDocument( void ) throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; |