diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-09 10:09:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-06-09 10:10:13 +0200 |
| commit | 184a00b96235f6432294ded63ce4a4a318effdb5 (patch) | |
| tree | e4ae0e00cb168fa43d280cfb51a50515258b5320 | |
| parent | 534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff) | |
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
637 files changed, 739 insertions, 3515 deletions
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index ad11518def9e..19eaa52e97e4 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -530,12 +530,12 @@ protected: /**_______________________________________________________________________________________________________ */ - const sal_Int32& impl_getWidth(); + const sal_Int32& impl_getWidth() { return m_nWidth;} /**_______________________________________________________________________________________________________ */ - const sal_Int32& impl_getHeight(); + const sal_Int32& impl_getHeight() { return m_nHeight;} /**_______________________________________________________________________________________________________ */ diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index 78cc308f6925..2503b1f41a9d 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -737,20 +737,6 @@ const Reference< XGraphics > BaseControl::impl_getGraphicsPeer() // protected method -const sal_Int32& BaseControl::impl_getWidth() -{ - return m_nWidth; -} - -// protected method - -const sal_Int32& BaseControl::impl_getHeight() -{ - return m_nHeight; -} - -// protected method - WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer ) { // - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!! diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index aae2ae6f53ba..35ca5d52ac6b 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -554,7 +554,7 @@ public: std::vector< OUString > GetXIdlClassMethods() const; std::vector< OUString > GetXIdlClassFields() const; - bool CanCodeComplete() const; + bool CanCodeComplete() const { return bCanComplete;} }; } // namespace basctl diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 93e0f048339b..338f35078c3f 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2968,10 +2968,6 @@ std::vector< OUString > UnoTypeCodeCompletetor::GetXIdlClassFields() const return aRetVect;//this is empty when cannot code complete } -bool UnoTypeCodeCompletetor::CanCodeComplete() const -{ - return bCanComplete; -} bool UnoTypeCodeCompletetor::CheckField( const OUString& sFieldName ) {// modifies xClass!!! diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 22eb1ff1369e..5764f7ad902c 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -119,10 +119,6 @@ bool LineNumberWindow::SyncYOffset() return true; } -int LineNumberWindow::GetWidth() -{ - return m_nWidth; -} } // namespace basctl diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx index a99cc069211e..aae3409e5ed1 100644 --- a/basctl/source/basicide/linenumberwindow.hxx +++ b/basctl/source/basicide/linenumberwindow.hxx @@ -38,7 +38,7 @@ public: bool SyncYOffset(); long& GetCurYOffset(); - int GetWidth(); + int GetWidth() { return m_nWidth;} }; } // namespace basctl diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index ebf8ba0b5cc1..b4f0d27bb8f1 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -624,10 +624,6 @@ void DlgEditor::SetInsertObj( sal_uInt16 eObj ) } -sal_uInt16 DlgEditor::GetInsertObj() const -{ - return eActObj; -} void DlgEditor::CreateDefaultObject() diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 0103030fc96f..028e1c9ae04f 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -190,7 +190,7 @@ public: void SetMode (Mode eMode); void SetInsertObj( sal_uInt16 eObj ); - sal_uInt16 GetInsertObj() const; + sal_uInt16 GetInsertObj() const { return eActObj;} void CreateDefaultObject(); Mode GetMode() const { return eMode; } bool IsCreateOK() const { return bCreateOK; } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 10228a89810d..1fb6195cdc1f 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1063,10 +1063,6 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic ) ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p ); } -bool SbModule::IsVBACompat() const -{ - return mbVBACompat; -} void SbModule::SetVBACompat( bool bCompat ) { diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index 2ffbc66c408a..c7e122ae317f 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -314,10 +314,6 @@ void SbiParser::SetCodeCompleting( const bool& b ) bCodeCompleting = b; } -bool SbiParser::IsCodeCompleting() const -{ - return bCodeCompleting; -} bool SbiParser::Parse() { diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx index caf65c56b560..0e39423b48c4 100644 --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -83,7 +83,7 @@ public: SbiParser( StarBASIC*, SbModule* ); bool Parse(); void SetCodeCompleting( const bool& b ); - bool IsCodeCompleting() const; + bool IsCodeCompleting() const { return bCodeCompleting;} SbiExprNode* GetWithVar(); // from 31.3.1996, search symbol in the runtime-library diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index cbbe3ff95c60..49fd3410784d 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -407,7 +407,7 @@ public: SbModule* GetModule() { return pMod; } sal_uInt16 GetDebugFlags() { return nFlags; } void SetDebugFlags( sal_uInt16 nFl ) { nFlags = nFl; } - SbMethod* GetCaller(); + SbMethod* GetCaller() { return pMeth;} SbxVariable* GetExternalCaller(){ return mpExtCaller; } SbiForStack* FindForStackItemForCollection( class BasicCollection* pCollection ); diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index e13855be478f..63debf2a043f 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -977,13 +977,6 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, OUString& rMsg ) return nVBAErrorNumber; } -// Parameter, Locals, Caller - -SbMethod* SbiRuntime::GetCaller() -{ - return pMeth; -} - // Stacks // The expression-stack is available for the continuous evaluation diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx index 5ed2fded14b6..61ff86e1821a 100644 --- a/basic/source/sbx/sbxarray.cxx +++ b/basic/source/sbx/sbxarray.cxx @@ -649,10 +649,6 @@ void SbxDimArray::AddDimImpl32( sal_Int32 lb, sal_Int32 ub, bool bAllowSize0 ) SetError( eRes ); } -short SbxDimArray::GetDims() const -{ - return nDim; -} void SbxDimArray::AddDim( short lb, short ub ) { diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index c0de91f74e40..f112e046ea60 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -138,10 +138,6 @@ SbxArray* SbxVariable::GetParameters() const return mpPar; } -SbxObject* SbxVariable::GetParent() -{ - return pParent; -} // Perhaps some day one could cut the parameter 0. // then the copying will be dropped ... diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 82af9a34c7bc..5f0fe81eda6d 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -2321,10 +2321,6 @@ namespace cairocanvas return aLayout; } - bool CanvasHelper::hasAlpha() const - { - return mbHaveAlpha; - } bool CanvasHelper::repaint( const SurfaceSharedPtr& pSurface, const rendering::ViewState& viewState, diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx index 9258e7c638e0..bbc48c63b0e3 100644 --- a/canvas/source/cairo/cairo_canvashelper.hxx +++ b/canvas/source/cairo/cairo_canvashelper.hxx @@ -252,7 +252,7 @@ namespace cairocanvas */ void modifying() {} - bool hasAlpha() const; + bool hasAlpha() const { return mbHaveAlpha; } enum ColorType { diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index c73aa748c86c..b17ce9050c25 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx @@ -134,10 +134,6 @@ namespace cairocanvas mpSpriteCanvas->setSizePixel( maSize ); } - const ::basegfx::B2ISize& SpriteDeviceHelper::getSizePixel() - { - return maSize; - } void SpriteDeviceHelper::notifySizeUpdate( const awt::Rectangle& rBounds ) { diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx index 7df14756e124..4e4a9434655b 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.hxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx @@ -68,7 +68,7 @@ namespace cairocanvas ::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 ); - const ::basegfx::B2ISize& getSizePixel(); + const ::basegfx::B2ISize& getSizePixel() { return maSize; } void flush(); private: diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index 843a4bb3ac70..120dc9d2559d 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/canvas/source/tools/canvascustomspritehelper.cxx @@ -471,10 +471,6 @@ namespace canvas maPosition + maCurrClipBounds.getMaximum() ); } - double CanvasCustomSpriteHelper::getPriority() const - { - return mfPriority; - } ::basegfx::B2DRange CanvasCustomSpriteHelper::getFullSpriteRect() const { diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 3624b4b6a0b3..7d1edcdb96bc 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -593,13 +593,13 @@ public: com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getChartView(); - bool isTimeBased() const; + bool isTimeBased() const { return mbTimeBased;} void setTimeBased(bool bTimeBased); void getNextTimePoint(); void setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd); - OpenGLWindow* getOpenGLWindow(); + OpenGLWindow* getOpenGLWindow() { return mpOpenGLWindow;} private: sal_Int32 mnStart; diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 7c71bb18203f..283ffea52f17 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -90,10 +90,6 @@ Reference< frame::XModel > Chart2ModelContact::getChartModel() const return Reference< frame::XModel >( m_xChartModel.get(), uno::UNO_QUERY ); } -ChartModel* Chart2ModelContact::getModel() const -{ - return mpModel; -} Reference< chart2::XChartDocument > Chart2ModelContact::getChart2Document() const { diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index c2310d3372b2..9b9e4376bce3 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -58,7 +58,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getChartModel() const; - ChartModel* getModel() const; + ChartModel* getModel() const { return mpModel;} ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getChart2Document() const; diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index caccf120ae00..cac76fe74958 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1069,10 +1069,6 @@ void ChartDocumentWrapper::setUpdateAddIn( bool bUpdateAddIn ) { m_bUpdateAddIn = bUpdateAddIn; } -bool ChartDocumentWrapper::getUpdateAddIn() const -{ - return m_bUpdateAddIn; -} Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const { diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 94174dd67114..cb3ee0527127 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -106,7 +106,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; void setStartColumn( sal_Int32 nStartColumn ); - sal_Int32 getStartColumn() const; + sal_Int32 getStartColumn() const { return m_nStartColumn;} void SetShowWarningBox( bool bShowWarning = true ); private: @@ -130,10 +130,6 @@ void SeriesHeaderEdit::setStartColumn( sal_Int32 nStartColumn ) m_nStartColumn = nStartColumn; } -sal_Int32 SeriesHeaderEdit::getStartColumn() const -{ - return m_nStartColumn; -} void SeriesHeaderEdit::SetShowWarningBox( bool bShowWarning ) { @@ -164,8 +160,8 @@ public: void SetPixelWidth( sal_Int32 nWidth ); - sal_Int32 GetStartColumn() const; - sal_Int32 GetEndColumn() const; + sal_Int32 GetStartColumn() const { return m_nStartCol;} + sal_Int32 GetEndColumn() const { return m_nEndCol;} static sal_Int32 GetRelativeAppFontXPosForNameField(); @@ -316,15 +312,7 @@ void SeriesHeader::SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol ) m_spSeriesName->setStartColumn( nStartCol ); } -sal_Int32 SeriesHeader::GetStartColumn() const -{ - return m_nStartCol; -} -sal_Int32 SeriesHeader::GetEndColumn() const -{ - return m_nEndCol; -} void SeriesHeader::Show() { @@ -740,10 +728,6 @@ bool DataBrowser::SetReadOnly( bool bNewState ) return bResult; } -bool DataBrowser::IsReadOnly() const -{ - return m_bIsReadOnly; -} void DataBrowser::SetClean() { @@ -815,10 +799,6 @@ bool DataBrowser::IsDataValid() return bValid; } -bool DataBrowser::IsEnableItem() -{ - return m_bDataValid; -} void DataBrowser::CellModified() { diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index f32363a50b95..3d908aa4517c 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -92,7 +92,7 @@ public: /// @return old state bool SetReadOnly( bool bNewState ); - bool IsReadOnly() const; + bool IsReadOnly() const { return m_bIsReadOnly;} /// reset the dirty status, if changes have been saved void SetClean(); @@ -140,7 +140,7 @@ public: sal_uInt32 GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) const; - bool IsEnableItem(); + bool IsEnableItem() { return m_bDataValid;} bool IsDataValid(); void ShowWarningBox(); bool ShowQueryBox(); diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 2a3e219bac3d..cc458e57ff1d 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -179,11 +179,6 @@ void CreationWizard::enterState(WizardState nState) svt::RoadmapWizard::enterState(nState); } -bool CreationWizard::isClosable() -{ - //@todo - return m_bIsClosable; -} void CreationWizard::setInvalidPage( TabPage * /* pTabPage */ ) { diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index b279f0514b9f..859a4bf541da 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() { } -ObjectType ObjectPropertiesDialogParameter::getObjectType() const -{ - return m_eObjectType; -} OUString ObjectPropertiesDialogParameter::getLocalizedName() const { return m_aLocalizedName; @@ -313,82 +309,14 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel } } -bool ObjectPropertiesDialogParameter::HasGeometryProperties() const -{ - return m_bHasGeometryProperties; -} -bool ObjectPropertiesDialogParameter::HasStatisticProperties() const -{ - return m_bHasStatisticProperties; -} -bool ObjectPropertiesDialogParameter::ProvidesSecondaryYAxis() const -{ - return m_bProvidesSecondaryYAxis; -} -bool ObjectPropertiesDialogParameter::ProvidesOverlapAndGapWidth() const -{ - return m_bProvidesOverlapAndGapWidth; -} -bool ObjectPropertiesDialogParameter::ProvidesBarConnectors() const -{ - return m_bProvidesBarConnectors; -} -bool ObjectPropertiesDialogParameter::HasAreaProperties() const -{ - return m_bHasAreaProperties; -} -bool ObjectPropertiesDialogParameter::HasSymbolProperties() const -{ - return m_bHasSymbolProperties; -} -bool ObjectPropertiesDialogParameter::HasScaleProperties() const -{ - return m_bHasScaleProperties; -} -bool ObjectPropertiesDialogParameter::CanAxisLabelsBeStaggered() const -{ - return m_bCanAxisLabelsBeStaggered; -} -bool ObjectPropertiesDialogParameter::ShowAxisOrigin() const -{ - return m_bShowAxisOrigin; -} -bool ObjectPropertiesDialogParameter::IsSupportingAxisPositioning() const -{ - return m_bSupportingAxisPositioning; -} -bool ObjectPropertiesDialogParameter::IsCrossingAxisIsCategoryAxis() const -{ - return m_bIsCrossingAxisIsCategoryAxis; -} const uno::Sequence< OUString >& ObjectPropertiesDialogParameter::GetCategories() const { return m_aCategories; } -bool ObjectPropertiesDialogParameter::HasNumberProperties() const -{ - return m_bHasNumberProperties; -} -bool ObjectPropertiesDialogParameter::ProvidesStartingAngle() const -{ - return m_bProvidesStartingAngle; -} -bool ObjectPropertiesDialogParameter::ProvidesMissingValueTreatments() const -{ - return m_bProvidesMissingValueTreatments; -} uno::Reference< chart2::XChartDocument > ObjectPropertiesDialogParameter::getDocument() const { return m_xChartDocument; } -bool ObjectPropertiesDialogParameter::IsComplexCategoriesAxis() const -{ - return m_bComplexCategoriesAxis; -} -sal_Int32 ObjectPropertiesDialogParameter::getNbPoints() const -{ - return m_nNbPoints; -} const sal_uInt16 nNoArrowNoShadowDlg = 1101; @@ -723,10 +651,6 @@ IMPL_LINK_NOARG(SchAttribTabDlg, OKPressed) return m_aOriginalOKClickHdl.Call( this ); } -bool SchAttribTabDlg::DialogWasClosedWithOK() const -{ - return m_bOKPressed; -} } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 839f200e9172..e5e469e92978 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -67,10 +67,6 @@ void LightButton::switchLightOn(bool bOn) } } -bool LightButton::isLightOn() const -{ - return m_bLightOn; -} struct LightSource { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index f08560be63a5..7bfe1ab59602 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -40,7 +40,7 @@ public: virtual ~LightButton(); void switchLightOn(bool bOn); - bool isLightOn() const; + bool isLightOn() const { return m_bLightOn;} private: bool m_bLightOn; diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 1cf5a8e81b3d..21de1e66bdd6 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -72,7 +72,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const; void setUpdateAddIn( bool bUpdateAddIn ); - bool getUpdateAddIn() const; + bool getUpdateAddIn() const { return m_bUpdateAddIn;} void setBaseDiagram( const OUString& rBaseDiagram ); OUString getBaseDiagram() const; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index 84e74acfe1a0..5aaff14479b8 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -50,7 +50,7 @@ public: , sal_Int32 nOnePageOnlyIndex=-1 );//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap virtual ~CreationWizard(); - bool isClosable(); + bool isClosable() { /*@todo*/ return m_bIsClosable;} // TabPageNotifiable virtual void setInvalidPage( TabPage * pTabPage ) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 598f8fc8929e..13f14e0f402f 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -34,33 +34,33 @@ public: virtual ~ObjectPropertiesDialogParameter(); void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); - ObjectType getObjectType() const; + ObjectType getObjectType() const { return m_eObjectType;} OUString getLocalizedName() const; - bool HasGeometryProperties() const; - bool HasStatisticProperties() const; - bool ProvidesSecondaryYAxis() const; - bool ProvidesOverlapAndGapWidth() const; - bool ProvidesBarConnectors() const; - bool HasAreaProperties() const; - bool HasSymbolProperties() const; - bool HasNumberProperties() const; - bool ProvidesStartingAngle() const; - bool ProvidesMissingValueTreatments() const; - - bool HasScaleProperties() const; - bool CanAxisLabelsBeStaggered() const; - bool IsSupportingAxisPositioning() const; - bool ShowAxisOrigin() const; - bool IsCrossingAxisIsCategoryAxis() const; + bool HasGeometryProperties() const { return m_bHasGeometryProperties;} + bool HasStatisticProperties() const { return m_bHasStatisticProperties;} + bool ProvidesSecondaryYAxis() const { return m_bProvidesSecondaryYAxis;} + bool ProvidesOverlapAndGapWidth() const { return m_bProvidesOverlapAndGapWidth;} + bool ProvidesBarConnectors() const { return m_bProvidesBarConnectors;} + bool HasAreaProperties() const { return m_bHasAreaProperties;} + bool HasSymbolProperties() const { return m_bHasSymbolProperties;} + bool HasNumberProperties() const { return m_bHasNumberProperties;} + bool ProvidesStartingAngle() const { return m_bProvidesStartingAngle;} + bool ProvidesMissingValueTreatments() const { return m_bProvidesMissingValueTreatments;} + + bool HasScaleProperties() const { return m_bHasScaleProperties;} + bool CanAxisLabelsBeStaggered() const { return m_bCanAxisLabelsBeStaggered;} + 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; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getDocument() const; - bool IsComplexCategoriesAxis() const; + bool IsComplexCategoriesAxis() const { return m_bComplexCategoriesAxis;} - sal_Int32 getNbPoints() const; + sal_Int32 getNbPoints() const { return m_nNbPoints;} private: OUString m_aObjectCID; @@ -140,7 +140,7 @@ public: void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth ); - bool DialogWasClosedWithOK() const; + bool DialogWasClosedWithOK() const { return m_bOKPressed;} }; } //namespace chart diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 7b24560e34ae..de8c7518eca6 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -102,7 +102,7 @@ public: sal_Int32 getCategoryLevelCount() const; const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList(); + ::com::sun::star::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList() { return m_aSplitCategoriesList;} bool isDateAxis(); const std::vector< DatePlusIndex >& getDateCategories(); diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx index 2b36c2d78843..77ed6cabd501 100644 --- a/chart2/source/inc/InternalData.hxx +++ b/chart2/source/inc/InternalData.hxx @@ -66,8 +66,8 @@ public: /// @return the index of the newly appended row sal_Int32 appendRow(); - sal_Int32 getRowCount() const; - sal_Int32 getColumnCount() const; + sal_Int32 getRowCount() const { return m_nRowCount;} + sal_Int32 getColumnCount() const { return m_nColumnCount;} typedef ::std::vector< ::std::vector< ::com::sun::star::uno::Any > > tVecVecAny; //inner index is hierarchical level diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 2465875fbeea..1fd93e871fdf 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -106,7 +106,7 @@ protected: virtual void impl_apiCallCountReachedNull() SAL_OVERRIDE; void impl_setOwnership( bool bDeliverOwnership, bool bMyVeto ); - bool impl_shouldCloseAtNextChance(); + bool impl_shouldCloseAtNextChance() { return m_bOwnership;} void impl_doClose(); void impl_init() diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index e97983801558..d199ef7b4005 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -36,7 +36,7 @@ public: NumberFormatterWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ); virtual ~NumberFormatterWrapper(); - SvNumberFormatter* getSvNumberFormatter() const; + SvNumberFormatter* getSvNumberFormatter() const { return m_pNumberFormatter;} ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; }; diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 6c3f968852dc..d1275c718a2f 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -96,7 +96,7 @@ public: void setValuesAtAllDataSeries(); private: - SAL_DLLPRIVATE bool useAutoScale() const; + SAL_DLLPRIVATE bool useAutoScale() const { return m_bUseAutoScale;} /** sets the auto-resize at all objects that support this feature for text. eNewState must be either AUTO_RESIZE_YES or AUTO_RESIZE_NO diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index e4b671892ce6..8da9ed76c9df 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1357,10 +1357,6 @@ OUString SAL_CALL ChartModel::dump() return OUString(); } -bool ChartModel::isTimeBased() const -{ - return mbTimeBased; -} void ChartModel::setTimeBased(bool bTimeBased) { @@ -1433,10 +1429,6 @@ void ChartModel::update() mpChartView->update(); } -OpenGLWindow* ChartModel::getOpenGLWindow() -{ - return mpOpenGLWindow; -} } // namespace chart diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index a425a8583f19..a4adb844ec96 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -52,10 +52,6 @@ StockDataInterpreter::StockDataInterpreter( StockDataInterpreter::~StockDataInterpreter() {} -StockChartTypeTemplate::StockVariant StockDataInterpreter::GetStockVariant() const -{ - return m_eStockVariant; -} // ____ XDataInterpreter ____ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx index 472b49e3841d..6190e08915e2 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -52,7 +52,7 @@ protected: private: StockChartTypeTemplate::StockVariant m_eStockVariant; - StockChartTypeTemplate::StockVariant GetStockVariant() const; + StockChartTypeTemplate::StockVariant GetStockVariant() const { return m_eStockVariant;} }; } // namespace chart diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 31a08c7afafc..a1df24a0c641 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -139,10 +139,6 @@ Reference< chart2::data::XDataSequence > ExplicitCategoriesProvider::getOriginal return 0; } -const Sequence< Reference< data::XLabeledDataSequence> >& ExplicitCategoriesProvider::getSplitCategoriesList() -{ - return m_aSplitCategoriesList; -} bool ExplicitCategoriesProvider::hasComplexCategories() const { diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 0cc7038fcb88..71a2fd8ab466 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -484,15 +484,7 @@ void InternalData::deleteRow( sal_Int32 nAtIndex ) #endif } -sal_Int32 InternalData::getRowCount() const -{ - return m_nRowCount; -} -sal_Int32 InternalData::getColumnCount() const -{ - return m_nColumnCount; -} void InternalData::setComplexRowLabels( const vector< vector< uno::Any > >& rNewRowLabels ) { diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 2b17a2e516e6..62996b79fb98 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -316,10 +316,6 @@ void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool b m_bOwnership = bDeliverOwnership && bMyVeto; } -bool CloseableLifeTimeManager::impl_shouldCloseAtNextChance() -{ - return m_bOwnership; -} void CloseableLifeTimeManager ::impl_apiCallCountReachedNull() diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index cef25c27f133..dc8b7b92ee6c 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -67,10 +67,6 @@ NumberFormatterWrapper::~NumberFormatterWrapper() { } -SvNumberFormatter* NumberFormatterWrapper::getSvNumberFormatter() const -{ - return m_pNumberFormatter; -} Date NumberFormatterWrapper::getNullDate() const { diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 5e4fbb88e685..1f5c84f30025 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -53,10 +53,6 @@ awt::Size ReferenceSizeProvider::getPageSize() const return m_aPageSize; } -bool ReferenceSizeProvider::useAutoScale() const -{ - return m_bUseAutoScale; -} void ReferenceSizeProvider::impl_setValuesAtTitled( const Reference< XTitled > & xTitled ) diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index c686911ed120..57ee304a49b1 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -2001,10 +2001,6 @@ void VSeriesPlotter::setCoordinateSystemResolution( const Sequence< sal_Int32 >& m_aCoordinateSystemResolution = rCoordinateSystemResolution; } -bool VSeriesPlotter::PointsWereSkipped() const -{ - return m_bPointsWereSkipped; -} bool VSeriesPlotter::WantToPlotInFrontOfAxisLine() { diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 14c2bb3bc631..9aeaa9c70fd9 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -78,7 +78,7 @@ public: void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex ); void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); - sal_Int32 getTotalPointCount() const; + sal_Int32 getTotalPointCount() const { return m_nPointCount;} double getXValue( sal_Int32 index ) const; double getYValue( sal_Int32 index ) const; @@ -129,20 +129,20 @@ public: bool hasPointOwnColor( sal_Int32 index ) const; - ::com::sun::star::chart2::StackingDirection getStackingDirection() const; - sal_Int32 getAttachedAxisIndex() const; + ::com::sun::star::chart2::StackingDirection getStackingDirection() const { return m_eStackingDirection;} + sal_Int32 getAttachedAxisIndex() const { return m_nAxisIndex;} void setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex ); void doSortByXValues(); void setConnectBars( bool bConnectBars ); - bool getConnectBars() const; + bool getConnectBars() const { return m_bConnectBars;} void setGroupBarsPerAxis( bool bGroupBarsPerAxis ); - bool getGroupBarsPerAxis() const; + bool getGroupBarsPerAxis() const { return m_bGroupBarsPerAxis;} void setStartingAngle( sal_Int32 nStartingAngle ); - sal_Int32 getStartingAngle() const; + sal_Int32 getStartingAngle() const { return m_nStartingAngle;} void setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole ); @@ -175,7 +175,7 @@ public: void releaseShapes(); void setMissingValueTreatment( sal_Int32 nMissingValueTreatment ); - sal_Int32 getMissingValueTreatment() const; + sal_Int32 getMissingValueTreatment() const { return m_nMissingValueTreatment;} void setOldTimeBased( VDataSeries* pOldSeries, double nPercent ); VDataSeries* createCopyForTimeBased() const; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 632c81daac01..0f45b401a376 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -247,7 +247,7 @@ public: void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); //better performance for big data void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution ); - bool PointsWereSkipped() const; + bool PointsWereSkipped() const { return m_bPointsWereSkipped;} //return the depth for a logic 1 double getTransformedDepth() const; diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index d9caddd4dcd9..71cd03aa4d7d 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -185,10 +185,6 @@ awt::Point SAL_CALL DummyXShape::getPosition() return maPosition; } -const awt::Point& DummyXShape::getPos() -{ - return maPosition; -} void SAL_CALL DummyXShape::setPosition( const awt::Point& rPoint ) throw(uno::RuntimeException, std::exception) diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 5fc71e6a9b8f..ddee02d815f9 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -169,7 +169,7 @@ public: */ virtual void render(); - const com::sun::star::awt::Point& getPos(); // internal API + const com::sun::star::awt::Point& getPos() { return maPosition;} // internal API protected: diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 10ec3bb2bb22..7354bd88b9ef 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -421,39 +421,19 @@ void VDataSeries::setPageReferenceSize( const awt::Size & rPageRefSize ) m_aReferenceSize = rPageRefSize; } -StackingDirection VDataSeries::getStackingDirection() const -{ - return m_eStackingDirection; -} -sal_Int32 VDataSeries::getAttachedAxisIndex() const -{ - return m_nAxisIndex; -} void VDataSeries::setConnectBars( bool bConnectBars ) { m_bConnectBars = bConnectBars; } -bool VDataSeries::getConnectBars() const -{ - return m_bConnectBars; -} void VDataSeries::setGroupBarsPerAxis( bool bGroupBarsPerAxis ) { m_bGroupBarsPerAxis = bGroupBarsPerAxis; } -bool VDataSeries::getGroupBarsPerAxis() const -{ - return m_bGroupBarsPerAxis; -} void VDataSeries::setStartingAngle( sal_Int32 nStartingAngle ) { m_nStartingAngle = nStartingAngle; } -sal_Int32 VDataSeries::getStartingAngle() const -{ - return m_nStartingAngle; -} void VDataSeries::setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex ) { @@ -462,10 +442,6 @@ void VDataSeries::setAttachedAxisIndex( sal_Int32 nAttachedAxisIndex ) m_nAxisIndex = nAttachedAxisIndex; } -sal_Int32 VDataSeries::getTotalPointCount() const -{ - return m_nPointCount; -} double VDataSeries::getXValue( sal_Int32 index ) const { @@ -1056,10 +1032,6 @@ void VDataSeries::setMissingValueTreatment( sal_Int32 nMissingValueTreatment ) m_nMissingValueTreatment = nMissingValueTreatment; } -sal_Int32 VDataSeries::getMissingValueTreatment() const -{ - return m_nMissingValueTreatment; -} VDataSeries::VDataSeries() : m_nPolygonIndex(0) diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index 67ae20f229c4..f632d38dcec4 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -51,9 +51,5 @@ const OString Options::getOption(const OString& option) const return i->second; } -const StringVector& Options::getInputFiles() -{ - return m_inputFiles; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 56ab1c77f04b..7a3dcc4acec5 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -1972,9 +1972,6 @@ void Access::initBroadcasterAndChanges( } } -bool Access::isDisposed() const { - return disposed_; -} Access::ModifiedChild::ModifiedChild(): directlyModified(false) diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index 625026e869ff..a91312f012a0 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -472,7 +472,7 @@ protected: Modifications::Node const & modifications, Broadcaster * broadcaster, std::vector< com::sun::star::util::ElementChange > * changes); - bool isDisposed() const; + bool isDisposed() const { return disposed_;} private: struct ModifiedChild { diff --git a/configmgr/source/groupnode.cxx b/configmgr/source/groupnode.cxx index 72e252392fec..a1d5b5864fd2 100644 --- a/configmgr/source/groupnode.cxx +++ b/configmgr/source/groupnode.cxx @@ -55,9 +55,6 @@ int GroupNode::getMandatory() const { return mandatory_; } -bool GroupNode::isExtensible() const { - return extensible_; -} GroupNode::GroupNode(GroupNode const & other, bool keepTemplateName): Node(other), extensible_(other.extensible_), mandatory_(other.mandatory_) diff --git a/configmgr/source/groupnode.hxx b/configmgr/source/groupnode.hxx index 8fbac97381af..227084bf57d1 100644 --- a/configmgr/source/groupnode.hxx +++ b/configmgr/source/groupnode.hxx @@ -44,7 +44,7 @@ public: virtual int getMandatory() const SAL_OVERRIDE; - bool isExtensible() const; + bool isExtensible() const { return extensible_;} private: GroupNode(GroupNode const & other, bool keepTemplateName); diff --git a/configmgr/source/localizedpropertynode.cxx b/configmgr/source/localizedpropertynode.cxx index 3eda905a71f6..ed861d14ce3f 100644 --- a/configmgr/source/localizedpropertynode.cxx +++ b/configmgr/source/localizedpropertynode.cxx @@ -44,13 +44,7 @@ NodeMap & LocalizedPropertyNode::getMembers() { return members_; } -Type LocalizedPropertyNode::getStaticType() const { - return staticType_; -} -bool LocalizedPropertyNode::isNillable() const { - return nillable_; -} LocalizedPropertyNode::LocalizedPropertyNode( LocalizedPropertyNode const & other): diff --git a/configmgr/source/localizedpropertynode.hxx b/configmgr/source/localizedpropertynode.hxx index 538e0c0ab69d..7c6da7b69059 100644 --- a/configmgr/source/localizedpropertynode.hxx +++ b/configmgr/source/localizedpropertynode.hxx @@ -39,9 +39,9 @@ public: virtual NodeMap & getMembers() SAL_OVERRIDE; - Type getStaticType() const; + Type getStaticType() const { return staticType_;} - bool isNillable() const; + bool isNillable() const { return nillable_;} private: LocalizedPropertyNode(LocalizedPropertyNode const & other); diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx index 4875173e9f79..294ec0ecaa78 100644 --- a/configmgr/source/node.cxx +++ b/configmgr/source/node.cxx @@ -57,17 +57,11 @@ void Node::setLayer(int layer) { layer_ = layer; } -int Node::getLayer() const { - return layer_; -} void Node::setFinalized(int layer) { finalized_ = layer; } -int Node::getFinalized() const { - return finalized_; -} rtl::Reference< Node > Node::getMember(OUString const & name) { NodeMap const & members = getMembers(); diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx index 58ad20e4e05f..6537973f7841 100644 --- a/configmgr/source/node.hxx +++ b/configmgr/source/node.hxx @@ -47,10 +47,10 @@ public: virtual int getMandatory() const; void setLayer(int layer); - int getLayer() const; + int getLayer() const { return layer_;} void setFinalized(int layer); - int getFinalized() const; + int getFinalized() const { return finalized_;} rtl::Reference< Node > getMember(OUString const & name); diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx index bec6918dda9d..456091359ebf 100644 --- a/configmgr/source/propertynode.cxx +++ b/configmgr/source/propertynode.cxx @@ -46,13 +46,7 @@ rtl::Reference< Node > PropertyNode::clone(bool) const { return new PropertyNode(*this); } -Type PropertyNode::getStaticType() const { - return staticType_; -} -bool PropertyNode::isNillable() const { - return nillable_; -} css::uno::Any PropertyNode::getValue(Components & components) { if (!externalDescriptor_.isEmpty()) { @@ -81,9 +75,6 @@ void PropertyNode::setExternal(int layer, OUString const & descriptor) { externalDescriptor_ = descriptor; } -bool PropertyNode::isExtension() const { - return extension_; -} PropertyNode::PropertyNode(PropertyNode const & other): Node(other), staticType_(other.staticType_), nillable_(other.nillable_), diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx index 1e21aca5c2d9..60108e7db6ea 100644 --- a/configmgr/source/propertynode.hxx +++ b/configmgr/source/propertynode.hxx @@ -41,9 +41,9 @@ public: virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; - Type getStaticType() const; + Type getStaticType() const { return staticType_;} - bool isNillable() const; + bool isNillable() const { return nillable_;} com::sun::star::uno::Any getValue(Components & components); @@ -51,7 +51,7 @@ public: void setExternal(int layer, OUString const & descriptor); - bool isExtension() const; + bool isExtension() const { return extension_;} private: PropertyNode(PropertyNode const & other); diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index a89d5627cf04..8951dcdcf664 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -110,9 +110,6 @@ OUString RootAccess::getLocale() const { return locale_; } -bool RootAccess::isUpdate() const { - return update_; -} void RootAccess::setAlive(bool b) { alive_ = b; diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx index 4fce20c15161..6583cea1ce3f 100644 --- a/configmgr/source/rootaccess.hxx +++ b/configmgr/source/rootaccess.hxx @@ -75,7 +75,7 @@ public: OUString getLocale() const; - bool isUpdate() const; + bool isUpdate() const { return update_;} void setAlive(bool b); diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx index 738b386a4b27..5c140f6f4dff 100644 --- a/configmgr/source/valueparser.cxx +++ b/configmgr/source/valueparser.cxx @@ -436,9 +436,6 @@ void ValueParser::start( state_ = STATE_TEXT; } -int ValueParser::getLayer() const { - return layer_; -} template< typename T > css::uno::Any ValueParser::convertItems() { css::uno::Sequence< T > seq(items_.size()); diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx index a02418ad8bbc..1f0aef061324 100644 --- a/configmgr/source/valueparser.hxx +++ b/configmgr/source/valueparser.hxx @@ -63,7 +63,7 @@ public: rtl::Reference< Node > const & property, OUString const & localizedName = OUString()); - int getLayer() const; + int getLayer() const { return layer_;} Type type_; OString separator_; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 5a591ef3d164..36029954293f 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2763,10 +2763,6 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton ) return 0; } -SvxEntries* SvxMainMenuOrganizerDialog::GetEntries() -{ - return pEntries; -} SvxConfigEntry* SvxMainMenuOrganizerDialog::GetSelectedEntry() { diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index e7e98d900635..ab32c51e192a 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -311,8 +311,8 @@ public: void Modify(); void SetValues( Color aColor, ColorMode eMode, double x, double y ); - double GetX(); - double GetY(); + double GetX() { return mdX;} + double GetY() { return mdY;} void KeyMove( int dx, int dy ); @@ -649,15 +649,7 @@ void ColorFieldControl::SetValues( Color aColor, ColorMode eMode, double x, doub } } -double ColorFieldControl::GetX() -{ - return mdX; -} -double ColorFieldControl::GetY() -{ - return mdY; -} void ColorFieldControl::UpdatePosition() { diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 3e4c0f851210..28f2134abc19 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -547,10 +547,6 @@ OUString SvxThesaurusDialog::GetWord() return m_pReplaceEdit->GetText(); } -sal_uInt16 SvxThesaurusDialog::GetLanguage() const -{ - return nLookUpLanguage; -} void SvxThesaurusDialog::Apply() { diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 839461762d89..d72f5db88b69 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -518,7 +518,7 @@ public: virtual ~SvxMainMenuOrganizerDialog (); - SvxEntries* GetEntries(); + SvxEntries* GetEntries() { return pEntries;} void SetEntries( SvxEntries* ); SvxConfigEntry* GetSelectedEntry(); }; diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index b6efa28a67a4..4ab94e7c2bd6 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -166,7 +166,7 @@ public: void SetWindowTitle( LanguageType nLanguage ); OUString GetWord(); - sal_uInt16 GetLanguage() const; + sal_uInt16 GetLanguage() const { return nLookUpLanguage;} }; #endif diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 18de7b71b465..0bcf4c793a3e 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -691,15 +691,7 @@ bool ORowSetCache::next( ) return !m_bAfterLast; } -bool ORowSetCache::isBeforeFirst( ) -{ - return m_bBeforeFirst; -} -bool ORowSetCache::isAfterLast( ) -{ - return m_bAfterLast; -} bool ORowSetCache::isFirst( ) { diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index c00aadd58568..ab48003e9574 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -179,8 +179,8 @@ namespace dbaccess // ::com::sun::star::sdbc::XResultSet bool next( ); - bool isBeforeFirst( ); - bool isAfterLast( ); + bool isBeforeFirst( ) { return m_bBeforeFirst;} + bool isAfterLast( ) { return m_bAfterLast;} bool isFirst( ); bool isLast( ); bool beforeFirst( ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 3936c68a7449..7ac7bccb6131 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -988,10 +988,6 @@ void OAppDetailPageHelper::Resize() } } -PreviewMode OAppDetailPageHelper::getPreviewMode() -{ - return m_ePreviewMode; -} bool OAppDetailPageHelper::isPreviewEnabled() { diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 2f2a9f8104cc..f102e5e37708 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -321,7 +321,7 @@ namespace dbaui ,const OUString& _rName ); /// returns the preview mode - PreviewMode getPreviewMode(); + PreviewMode getPreviewMode() { return m_ePreviewMode;} /// <TRUE/> if the preview is enabled bool isPreviewEnabled(); diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 08645950ed65..8855e906831e 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -169,20 +169,12 @@ void OAppBorderWindow::ImplInitSettings() SetBackground( rStyleSettings.GetDialogColor() ); } -OApplicationView* OAppBorderWindow::getView() const -{ - return m_pView; -} OApplicationSwapWindow* OAppBorderWindow::getPanel() const { return static_cast< OApplicationSwapWindow* >( m_pPanel->getChildWindow() ); } -OApplicationDetailView* OAppBorderWindow::getDetailView() const -{ - return m_pDetailView; -} // class OApplicationView OApplicationView::OApplicationView( Window* pParent diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 43660890f693..109f63114ca1 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -60,9 +60,9 @@ namespace dbaui virtual void GetFocus() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - OApplicationView* getView() const; + OApplicationView* getView() const { return m_pView;} OApplicationSwapWindow* getPanel() const; - OApplicationDetailView* getDetailView() const; + OApplicationDetailView* getDetailView() const { return m_pDetailView;} }; class OApplicationView : public ODataView diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 333f95c58b75..5c51f27d65e0 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -135,14 +135,6 @@ void OSqlEdit::KeyInput( const KeyEvent& rKEvt ) m_bAccelAction = false; } -bool OSqlEdit::IsInAccelAct() -{ - // Cut, Copy, Paste by Accel. runs the action in the Edit but also the - // corresponding slot in the View. Therefore, the action occurs twice. - // To prevent this, SlotExec in View can call this function. - - return m_bAccelAction; -} void OSqlEdit::GetFocus() { diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index 1d4812a36a46..73cc8e3e88a4 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -105,8 +105,8 @@ namespace dbaui TOTypeInfoSP getTypeInfo() const; TOTypeInfoSP getSpecialTypeInfo() const; bool IsAutoIncrement() const; - bool IsPrimaryKey() const; - bool IsCurrency() const; + bool IsPrimaryKey() const { return m_bIsPrimaryKey;} + bool IsCurrency() const { return m_bIsCurrency;} bool IsNullable() const; }; } diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index d042c316e87d..2cfb67fda79f 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -353,7 +353,7 @@ namespace dbaui /** returns whether a primary key should be created in the target database */ - bool shouldCreatePrimaryKey() const; + bool shouldCreatePrimaryKey() const { return m_bCreatePrimaryKeyColumn;} void setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ); static bool supportsPrimaryKey( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); @@ -393,7 +393,7 @@ namespace dbaui sal_Int32 getMaxColumnNameLength() const; void setOperation( const sal_Int16 _nOperation ); - sal_Int16 getOperation() const; + sal_Int16 getOperation() const { return m_nOperation;} OUString convertColumnName( const TColumnFindFunctor& _rCmpFunctor, const OUString& _sColumnName, diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index f537cb856088..c941bdfa4c6e 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -74,7 +74,10 @@ namespace dbaui using MultiLineEditSyntaxHighlight::SetText; // own functionality - bool IsInAccelAct(); + // Cut, Copy, Paste by Accel. runs the action in the Edit but also the + // corresponding slot in the View. Therefore, the action occurs twice. + // To prevent this, SlotExec in View can call this function. + bool IsInAccelAct() { return m_bAccelAction; } void SetTextModifyHdl(const Link& lnk) { m_lnkTextModifyHdl = lnk; } // please don't use SetModifyHdl, I need it for myself, this here is called from the handler set with that diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 3d6ad196522c..d293ea777ded 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -913,10 +913,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) return bFinish ? 1 : 0; } -bool OCopyTableWizard::shouldCreatePrimaryKey() const -{ - return m_bCreatePrimaryKeyColumn; -} void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ) { @@ -1379,10 +1375,6 @@ void OCopyTableWizard::setOperation( const sal_Int16 _nOperation ) m_nOperation = _nOperation; } -sal_Int16 OCopyTableWizard::getOperation() const -{ - return m_nOperation; -} OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFunctor, const OUString& _sColumnName, diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index f7ea19a66701..8922c959fb86 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -600,15 +600,7 @@ bool OFieldDescription::IsAutoIncrement() const return m_bIsAutoIncrement; } -bool OFieldDescription::IsPrimaryKey() const -{ - return m_bIsPrimaryKey; -} -bool OFieldDescription::IsCurrency() const -{ - return m_bIsCurrency; -} bool OFieldDescription::IsNullable() const { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 0954b2098a2b..4d71f7a039ea 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -169,10 +169,6 @@ SfxUndoManager& OTableEditorCtrl::GetUndoManager() const return GetView()->getController().GetUndoManager(); } -bool OTableEditorCtrl::IsReadOnly() -{ - return bReadOnly; -} void OTableEditorCtrl::SetReadOnly( bool bRead ) { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index af84754d2080..d09060a24458 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -160,7 +160,7 @@ namespace dbaui bool IsCutAllowed( long nRow = -1 ); bool IsCopyAllowed( long nRow = -1 ); bool IsPasteAllowed( long nRow = -1 ); - bool IsReadOnly(); + bool IsReadOnly() { return bReadOnly;} OFieldDescription* GetFieldDescr( long nRow ); // window overloads diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 7b8726a44996..35e93e66eade 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -610,137 +610,29 @@ void CommandLineArgs::InitParamValues() m_bDocumentArgs = false; } -bool CommandLineArgs::IsMinimized() const -{ - return m_minimized; -} -bool CommandLineArgs::IsInvisible() const -{ - return m_invisible; -} -bool CommandLineArgs::IsNoRestore() const -{ - return m_norestore; -} -bool CommandLineArgs::IsNoDefault() const -{ - return m_nodefault; -} -bool CommandLineArgs::IsHeadless() const -{ - return m_headless; -} -bool CommandLineArgs::IsQuickstart() const -{ - return m_quickstart; -} -bool CommandLineArgs::IsNoQuickstart() const -{ - return m_noquickstart; -} -bool CommandLineArgs::IsTerminateAfterInit() const -{ - return m_terminateafterinit; -} -bool CommandLineArgs::IsNoLogo() const -{ - return m_nologo; -} -bool CommandLineArgs::IsNoLockcheck() const -{ - return m_nolockcheck; -} -bool CommandLineArgs::IsHelp() const -{ - return m_help; -} -bool CommandLineArgs::IsHelpWriter() const -{ - return m_helpwriter; -} -bool CommandLineArgs::IsHelpCalc() const -{ - return m_helpcalc; -} -bool CommandLineArgs::IsHelpDraw() const -{ - return m_helpdraw; -} -bool CommandLineArgs::IsHelpImpress() const -{ - return m_helpimpress; -} -bool CommandLineArgs::IsHelpBase() const -{ - return m_helpbase; -} -bool CommandLineArgs::IsHelpMath() const -{ - return m_helpmath; -} -bool CommandLineArgs::IsHelpBasic() const -{ - return m_helpbasic; -} -bool CommandLineArgs::IsWriter() const -{ - return m_writer; -} -bool CommandLineArgs::IsCalc() const -{ - return m_calc; -} -bool CommandLineArgs::IsDraw() const -{ - return m_draw; -} -bool CommandLineArgs::IsImpress() const -{ - return m_impress; -} -bool CommandLineArgs::IsBase() const -{ - return m_base; -} -bool CommandLineArgs::IsGlobal() const -{ - return m_global; -} -bool CommandLineArgs::IsMath() const -{ - return m_math; -} -bool CommandLineArgs::IsWeb() const -{ - return m_web; -} -bool CommandLineArgs::IsVersion() const -{ - return m_version; -} OUString CommandLineArgs::GetUnknown() const { @@ -753,10 +645,6 @@ bool CommandLineArgs::HasModuleParam() const || m_web || m_base; } -bool CommandLineArgs::HasSplashPipe() const -{ - return m_splashpipe; -} std::vector< OUString > const & CommandLineArgs::GetAccept() const { @@ -832,15 +720,7 @@ OUString CommandLineArgs::GetConversionOut() const return translateExternalUris(m_conversionout); } -bool CommandLineArgs::IsEmpty() const -{ - return m_bEmpty; -} -bool CommandLineArgs::WantsToLoadDocument() const -{ - return m_bDocumentArgs; -} OUString CommandLineArgs::GetPidfileName() const { diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index f7d13fe068e1..faa76f892a7b 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -56,40 +56,40 @@ class CommandLineArgs: private boost::noncopyable boost::optional< OUString > getCwdUrl() const { return m_cwdUrl; } // Access to bool parameters - bool IsMinimized() const; - bool IsInvisible() const; - bool IsNoRestore() const; - bool IsNoDefault() const; - bool IsHeadless() const; - bool IsQuickstart() const; - bool IsNoQuickstart() const; - bool IsTerminateAfterInit() const; - bool IsNoLogo() const; - bool IsNoLockcheck() const; - bool IsHelp() const; - bool IsHelpWriter() const; - bool IsHelpCalc() const; - bool IsHelpDraw() const; - bool IsHelpImpress() const; - bool IsHelpBase() const; - bool IsHelpMath() const; - bool IsHelpBasic() const; - bool IsWriter() const; - bool IsCalc() const; - bool IsDraw() const; - bool IsImpress() const; - bool IsBase() const; - bool IsGlobal() const; - bool IsMath() const; - bool IsWeb() const; - bool IsVersion() const; + bool IsMinimized() const { return m_minimized;} + bool IsInvisible() const { return m_invisible;} + bool IsNoRestore() const { return m_norestore;} + bool IsNoDefault() const { return m_nodefault;} + bool IsHeadless() const { return m_headless;} + bool IsQuickstart() const { return m_quickstart;} + bool IsNoQuickstart() const { return m_noquickstart;} + bool IsTerminateAfterInit() const { return m_terminateafterinit;} + bool IsNoLogo() const { return m_nologo;} + bool IsNoLockcheck() const { return m_nolockcheck;} + bool IsHelp() const { return m_help;} + bool IsHelpWriter() const { return m_helpwriter;} + bool IsHelpCalc() const { return m_helpcalc;} + bool IsHelpDraw() const { return m_helpdraw;} + bool IsHelpImpress() const { return m_helpimpress;} + bool IsHelpBase() const { return m_helpbase;} + bool IsHelpMath() const { return m_helpmath;} + bool IsHelpBasic() const { return m_helpbasic;} + bool IsWriter() const { return m_writer;} + bool IsCalc() const { return m_calc;} + bool IsDraw() const { return m_draw;} + bool IsImpress() const { return m_impress;} + bool IsBase() const { return m_base;} + bool IsGlobal() const { return m_global;} + bool IsMath() const { return m_math;} + bool IsWeb() const { return m_web;} + bool IsVersion() const { return m_version;} bool HasModuleParam() const; - bool WantsToLoadDocument() const; + bool WantsToLoadDocument() const { return m_bDocumentArgs;} OUString GetUnknown() const; // Access to string parameters - bool HasSplashPipe() const; + bool HasSplashPipe() const { return m_splashpipe;} std::vector< OUString > const & GetAccept() const; std::vector< OUString > const & GetUnaccept() const; std::vector< OUString > GetOpenList() const; @@ -108,7 +108,7 @@ class CommandLineArgs: private boost::noncopyable OUString GetPidfileName() const; // Special analyzed states (does not match directly to a command line parameter!) - bool IsEmpty() const; + bool IsEmpty() const { return m_bEmpty;} private: void ParseCommandLine_Impl( Supplier& supplier ); diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 6fcfc3c67b21..82bd1c03ae46 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -151,7 +151,7 @@ public: FileDoesNotExistFilter( const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv); - bool exist(); + bool exist() { return m_bExist;} // XCommandEnvironment virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -263,10 +263,6 @@ FileDoesNotExistFilter::~FileDoesNotExistFilter() { }; -bool FileDoesNotExistFilter::exist() -{ - return m_bExist; -} // XCommandEnvironment Reference<css::task::XInteractionHandler > FileDoesNotExistFilter::getInteractionHandler() throw (css::uno::RuntimeException, std::exception) diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index e37ab417ca64..25a36260c713 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -64,7 +64,7 @@ public: JavaInfo* pData; CJavaInfo(); ~CJavaInfo(); - operator JavaInfo* () const; + operator JavaInfo* () const { return pData;} }; CJavaInfo::CJavaInfo(): pData(NULL) @@ -76,10 +76,6 @@ CJavaInfo::~CJavaInfo() jfw_freeJavaInfo(pData); } -CJavaInfo::operator JavaInfo*() const -{ - return pData; -} class JavaMigration : public ::cppu::WeakImplHelper4< diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 8ce0e571d2f1..1108825b3306 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -252,20 +252,12 @@ namespace accessibility } } - int AccessibleEditableTextPara::getNotifierClientId() const - { - return mnNotifierClientId; - } void AccessibleEditableTextPara::SetIndexInParent( sal_Int32 nIndex ) { mnIndexInParent = nIndex; } - sal_Int32 AccessibleEditableTextPara::GetIndexInParent() const - { - return mnIndexInParent; - } void AccessibleEditableTextPara::SetParagraphIndex( sal_Int32 nIndex ) { @@ -302,10 +294,6 @@ namespace accessibility } } - sal_Int32 AccessibleEditableTextPara::GetParagraphIndex() const - { - return mnParagraphIndex; - } void AccessibleEditableTextPara::Dispose() { diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 03dc074c7db4..334782ac6d44 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -474,11 +474,6 @@ namespace accessibility } } - int AccessibleImageBullet::getNotifierClientId() const - { - - return mnNotifierClientId; - } void AccessibleImageBullet::SetParagraphIndex( sal_Int32 nIndex ) { @@ -509,11 +504,6 @@ namespace accessibility catch( const uno::Exception& ) {} // optional behaviour } - sal_Int32 AccessibleImageBullet::GetParagraphIndex() const - { - - return mnParagraphIndex; - } SvxEditSource& AccessibleImageBullet::GetEditSource() const { diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 64fe731e1787..54c96aba59cb 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1185,10 +1185,6 @@ const ContentNode* EditPaM::GetNode() const return pNode; } -ContentNode* EditPaM::GetNode() -{ - return pNode; -} void EditPaM::SetNode(ContentNode* p) { diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 1d8c5f908949..40d5a9db7536 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -306,7 +306,7 @@ public: EditPaM(ContentNode* p, sal_Int32 n); const ContentNode* GetNode() const; - ContentNode* GetNode(); + ContentNode* GetNode() { return pNode;} void SetNode(ContentNode* p); sal_Int32 GetIndex() const { return nIndex; } diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 41fddb0b363f..9938e9cd964c 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -620,10 +620,6 @@ EditTextObjectImpl::~EditTextObjectImpl() } } -sal_uInt16 EditTextObjectImpl::GetUserType() const -{ - return nUserType; -} void EditTextObjectImpl::SetUserType( sal_uInt16 n ) { @@ -653,10 +649,6 @@ std::vector<svl::SharedString> EditTextObjectImpl::GetSharedStrings() const return aSSs; } -bool EditTextObjectImpl::IsVertical() const -{ - return bVertical; -} void EditTextObjectImpl::SetVertical( bool b ) { @@ -667,10 +659,6 @@ void EditTextObjectImpl::SetVertical( bool b ) } } -sal_uInt16 EditTextObjectImpl::GetScriptType() const -{ - return nScriptType; -} void EditTextObjectImpl::SetScriptType( sal_uInt16 nType ) { diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index c5ec2e605d18..1e9773c0be02 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -205,16 +205,16 @@ public: EditTextObjectImpl( EditTextObject* pFront, const EditTextObjectImpl& r ); ~EditTextObjectImpl(); - sal_uInt16 GetUserType() const; + sal_uInt16 GetUserType() const { return nUserType;} void SetUserType( sal_uInt16 n ); void NormalizeString( svl::SharedStringPool& rPool ); std::vector<svl::SharedString> GetSharedStrings() const; - bool IsVertical() const; + bool IsVertical() const { return bVertical;} void SetVertical( bool b ); - sal_uInt16 GetScriptType() const; + sal_uInt16 GetScriptType() const { return nScriptType;} void SetScriptType( sal_uInt16 nType ); ContentInfo* CreateAndInsertContent(); diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 55d3b5c3e74d..f3e5355b814b 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -126,10 +126,6 @@ EditUndo::~EditUndo() { } -EditEngine* EditUndo::GetEditEngine() -{ - return mpEditEngine; -} sal_uInt16 EditUndo::GetId() const { diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 33fc1e77ce2d..69a1b2ce0ccf 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -721,10 +721,6 @@ void SvxTableField::SetTab(int nTab) mnTab = nTab; } -int SvxTableField::GetTab() const -{ - return mnTab; -} SvxFieldData* SvxTableField::Clone() const { diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 129197ef9266..56cfeaccf901 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -449,10 +449,6 @@ void SvxNumberFormat::SetBulletFont(const Font* pFont) pBulletFont = pFont ? new Font(*pFont): 0; } -SvxNumberFormat::SvxNumPositionAndSpaceMode SvxNumberFormat::GetPositionAndSpaceMode() const -{ - return mePositionAndSpaceMode; -} void SvxNumberFormat::SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePositionAndSpaceMode ) { mePositionAndSpaceMode = ePositionAndSpaceMode; @@ -483,34 +479,18 @@ void SvxNumberFormat::SetLabelFollowedBy( const LabelFollowedBy eLabelFollowedBy { meLabelFollowedBy = eLabelFollowedBy; } -SvxNumberFormat::LabelFollowedBy SvxNumberFormat::GetLabelFollowedBy() const -{ - return meLabelFollowedBy; -} void SvxNumberFormat::SetListtabPos( const long nListtabPos ) { mnListtabPos = nListtabPos; } -long SvxNumberFormat::GetListtabPos() const -{ - return mnListtabPos; -} void SvxNumberFormat::SetFirstLineIndent( const long nFirstLineIndent ) { mnFirstLineIndent = nFirstLineIndent; } -long SvxNumberFormat::GetFirstLineIndent() const -{ - return mnFirstLineIndent; -} void SvxNumberFormat::SetIndentAt( const long nIndentAt ) { mnIndentAt = nIndentAt; } -long SvxNumberFormat::GetIndentAt() const -{ - return mnIndentAt; -} IMPL_STATIC_LINK( SvxNumberFormat, GraphicArrived, void *, EMPTYARG ) { diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx index c8d0be88a3f3..eb42e67b546f 100644 --- a/editeng/source/uno/unoedhlp.cxx +++ b/editeng/source/uno/unoedhlp.cxx @@ -45,15 +45,7 @@ sal_uLong SvxEditSourceHint::GetValue() const return TextHint::GetValue(); } -sal_Int32 SvxEditSourceHint::GetStartValue() const -{ - return mnStart; -} -sal_Int32 SvxEditSourceHint::GetEndValue() const -{ - return mnEnd; -} TYPEINIT1( SvxEditSourceHintEndPara , SvxEditSourceHint ); diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 8a3eb5677d18..961898e93700 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -422,10 +422,6 @@ void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdap } SAL_WNODEPRECATED_DECLARATIONS_POP -bool SvxEditSourceAdapter::IsValid() const -{ - return mbEditSourceValid; -} diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 4af9c7f4e95d..23da15b73726 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -56,10 +56,6 @@ namespace pcr } - ::sal_Int16 SAL_CALL ControlHelper::getControlType() throw (RuntimeException) - { - return m_nControlType; - } Reference< XPropertyControlContext > SAL_CALL ControlHelper::getControlContext() throw (RuntimeException) @@ -80,10 +76,6 @@ namespace pcr } - bool SAL_CALL ControlHelper::isModified( ) throw (RuntimeException) - { - return m_bModified; - } void SAL_CALL ControlHelper::notifyModifiedValue( ) throw (RuntimeException) diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index 9be15b7f15a9..7eab623cf99e 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -131,11 +131,11 @@ namespace pcr public: // XPropertyControl - ::sal_Int16 SAL_CALL getControlType() throw (::com::sun::star::uno::RuntimeException); + ::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); 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); + bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException) { return m_bModified; } void SAL_CALL notifyModifiedValue( ) throw (::com::sun::star::uno::RuntimeException); // XComponent diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index c302e44fa273..364d07ff7ba9 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -336,10 +336,6 @@ namespace pcr } - bool OPropertyEditor::HasHelpSection() const - { - return m_bHasHelpSection; - } void OPropertyEditor::SetHelpText( const OUString& _rHelpText ) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 85aad9e79232..e80dceeffdd2 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -82,7 +82,7 @@ namespace pcr void SetControlObserver( IPropertyControlObserver* ); void EnableHelpSection( bool _bEnable ); - bool HasHelpSection() const; + bool HasHelpSection() const { return m_bHasHelpSection; } void SetHelpText( const OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index eb25a2104290..173ad3bfa4d7 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -1379,9 +1379,5 @@ bool SaneDlg::SetAdjustedNumericalValue( return true; } -bool SaneDlg::getDoScan() -{ - return doScan; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index f91a260f1273..1bb2836d1eac 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -138,7 +138,7 @@ public: virtual ~SaneDlg(); virtual short Execute() SAL_OVERRIDE; - bool getDoScan(); + bool getDoScan() { return doScan;} }; diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index d6fd86ff0562..b0b844ff106a 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -393,9 +393,5 @@ CGMBitmap* CGMBitmap::GetNext() -CGMBitmapDescriptor* CGMBitmap::GetBitmap() -{ - return pCGMBitmapDescriptor; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx index 4b51352fd261..9db74c981578 100644 --- a/filter/source/graphicfilter/icgm/bitmap.hxx +++ b/filter/source/graphicfilter/icgm/bitmap.hxx @@ -83,7 +83,7 @@ class CGMBitmap public: CGMBitmap( CGM& rCGM ); ~CGMBitmap(); - CGMBitmapDescriptor* GetBitmap(); + CGMBitmapDescriptor* GetBitmap() { return pCGMBitmapDescriptor;} CGMBitmap* GetNext(); }; #endif diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index bfd80459d14e..fe2180b8a807 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -37,10 +37,6 @@ void Bundle::SetColor( sal_uInt32 nColor ) mnColor = nColor; } -sal_uInt32 Bundle::GetColor() const -{ - return mnColor; -} diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx index 6a3f9d0fcddd..5e5ed0034830 100644 --- a/filter/source/graphicfilter/icgm/bundles.hxx +++ b/filter/source/graphicfilter/icgm/bundles.hxx @@ -35,7 +35,7 @@ class Bundle public: void SetColor( sal_uInt32 nColor ) ; - sal_uInt32 GetColor() const; + sal_uInt32 GetColor() const { return mnColor;} long GetIndex() const { return mnBundleIndex; } ; void SetIndex( long nBundleIndex ) { mnBundleIndex = nBundleIndex; } ; diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 0fd59db85771..c39a0f208211 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -1268,10 +1268,6 @@ bool ImplEESdrObject::ImplHasText() const return xXText.is() && !xXText->getString().isEmpty(); } -bool ImplEESdrObject::GetOOXML() const -{ - return mbOOXML; -} void ImplEESdrObject::SetOOXML(bool bOOXML) { diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 11a9c61dee25..7ef49a2d5fc1 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -86,7 +86,7 @@ public: sal_uInt32 ImplGetText(); bool ImplHasText() const; - bool GetOOXML() const; + bool GetOOXML() const { return mbOOXML;} void SetOOXML(bool bOOXML); }; diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 8d85688af27f..ccc9b179a96f 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -157,10 +157,6 @@ IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl) return 0; } -bool XMLFilterSettingsDialog::isClosable() -{ - return m_bIsClosable; -} diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 7fbd3622f0e7..1af868fdb975 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -106,7 +106,7 @@ public: virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - bool isClosable(); + bool isClosable() { return m_bIsClosable;} private: void initFilterList(); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 78da78bde5ad..2969b9555020 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -273,10 +273,6 @@ bool XMLFilterTabDialog::onOk() -filter_info_impl* XMLFilterTabDialog::getNewFilterInfo() const -{ - return mpNewInfo; -} diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 726d857bf065..c44c8a5ee042 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -39,7 +39,7 @@ public: bool onOk(); - filter_info_impl* getNewFilterInfo() const; + filter_info_impl* getNewFilterInfo() const { return mpNewInfo;} private: com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index 18a7d66e3c37..b18995f6af9d 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.cxx @@ -103,10 +103,6 @@ namespace frm } - bool RichTextViewPort::GetHideInactiveSelection() const - { - return m_bHideInactiveSelection; - } } // namespace frm diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx index b33a5e798113..fdd4bb005999 100644 --- a/forms/source/richtext/richtextviewport.hxx +++ b/forms/source/richtext/richtextviewport.hxx @@ -41,7 +41,7 @@ namespace frm inline void setAttributeInvalidationHandler( const Link& _rHandler ) { m_aInvalidationHandler = _rHandler; } void SetHideInactiveSelection( bool _bHide ); - bool GetHideInactiveSelection() const; + bool GetHideInactiveSelection() const { return m_bHideInactiveSelection; } protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index 809f80fac1d1..b00077d47a5a 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -106,12 +106,6 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const && ( nStart == 0 && nEnd == nLength ); } -/// do we have an actual expression? -bool ComputedExpression::isEmptyExpression() const -{ - return mbIsEmpty; -} - bool ComputedExpression::isSimpleExpression() const { // actual work is done by setExpression diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx index e6f8ba200cfd..a2c43053f0b9 100644 --- a/forms/source/xforms/computedexpression.hxx +++ b/forms/source/xforms/computedexpression.hxx @@ -94,7 +94,7 @@ public: void setNamespaces( const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& ); /// do we have an actual expression? - bool isEmptyExpression() const; + bool isEmptyExpression() const { return mbIsEmpty;} /// heuristically determine whether this expression is 'simple', /// i.e. whether its value will change depending on the values diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx index e8ccd35a282d..493881b9170b 100644 --- a/forms/source/xforms/mip.cxx +++ b/forms/source/xforms/mip.cxx @@ -77,23 +77,16 @@ void MIP::join( const MIP& rMip ) inherit( rMip ); } -bool MIP::hasReadonly() const { return mbHasReadonly; } bool MIP::isReadonly() const { return mbHasReadonly ? mbReadonly : mbHasCalculate; } void MIP::setReadonly( bool b ) { mbHasReadonly = true; mbReadonly = b; } void MIP::resetReadonly() { mbHasReadonly = false; mbReadonly = false; } -bool MIP::hasRequired() const { return mbHasRequired; } -bool MIP::isRequired() const { return mbRequired; } void MIP::setRequired( bool b ) { mbHasRequired = true; mbRequired = b; } void MIP::resetRequired() { mbHasRequired = false; mbRequired = false; } -bool MIP::hasRelevant() const { return mbHasRelevant; } -bool MIP::isRelevant() const { return mbRelevant; } void MIP::setRelevant( bool b ) { mbHasRelevant = true; mbRelevant = b; } void MIP::resetRelevant() { mbHasRelevant = false; mbRelevant = true; } -bool MIP::hasConstraint() const { return mbHasConstraint; } -bool MIP::isConstraint() const { return mbConstraint; } void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation = OUString(); } void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation = OUString(); } @@ -101,11 +94,9 @@ void MIP::setConstraintExplanation( const OUString& s ) { msConstraintExplanatio OUString MIP::getConstraintExplanation() const { return msConstraintExplanation; } -bool MIP::hasCalculate() const { return mbHasCalculate; } void MIP::setHasCalculate( bool b ) { mbHasCalculate = b; } void MIP::resetCalculate() { mbHasCalculate = false; } -bool MIP::hasTypeName() const { return mbHasTypeName; } 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 d9974dab5327..361f1229a40f 100644 --- a/forms/source/xforms/mip.hxx +++ b/forms/source/xforms/mip.hxx @@ -63,32 +63,32 @@ public: // - type (static; default: xsd:string) // (currently default implemented as empty string) - bool hasTypeName() const; + bool hasTypeName() const { return mbHasTypeName; } OUString getTypeName() const; void setTypeName( const OUString& ); void resetTypeName(); // - readonly (computed XPath; default: false; true if calculate exists) - bool hasReadonly() const; + bool hasReadonly() const { return mbHasReadonly; } bool isReadonly() const; void setReadonly( bool ); void resetReadonly(); // - required (computed XPath; default: false) - bool hasRequired() const; - bool isRequired() const; + bool hasRequired() const { return mbHasRequired; } + bool isRequired() const { return mbRequired; } void setRequired( bool ); void resetRequired(); // - relevant (computed XPath; default: true) - bool hasRelevant() const; - bool isRelevant() const; + bool hasRelevant() const { return mbHasRelevant; } + bool isRelevant() const { return mbRelevant; } void setRelevant( bool ); void resetRelevant(); // - constraing (computed XPath; default: true) - bool hasConstraint() const; - bool isConstraint() const; + bool hasConstraint() const { return mbHasConstraint; } + bool isConstraint() const { return mbConstraint; } void setConstraint( bool ); void resetConstraint(); @@ -100,7 +100,7 @@ public: // (for calculate, we only store whether a calculate MIP is present; // the actual calculate value is handled my changing the instance // directly) - bool hasCalculate() const; + bool hasCalculate() const { return mbHasCalculate; } void setHasCalculate( bool ); void resetCalculate(); diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index a17158ec176f..d4aafddddbbc 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -207,10 +207,6 @@ void Model::setNamespaces( const XNameContainer_t& rNamespaces ) mxNamespaces = rNamespaces; } -bool Model::getExternalData() const -{ - return mbExternalData; -} void Model::setExternalData( bool _bData ) { @@ -426,10 +422,6 @@ void Model::loadInstances() } } -bool Model::isInitialized() const -{ - return mbInitialized; -} bool Model::isValid() const { diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index 56ce37141bac..5559d6a80c76 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -156,7 +156,7 @@ public: void setNamespaces( const XNameContainer_t& ); // get/set the ExternalData property - bool getExternalData() const; + bool getExternalData() const { return mbExternalData;} void setExternalData( bool _bData ); @@ -194,7 +194,7 @@ public: void loadInstances(); /// has model been initialized? - bool isInitialized() const; + bool isInitialized() const { return mbInitialized;} /// is model currently valid (for submission)? bool isValid() const; diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 4d21f979583b..a3eb261f6943 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -175,10 +175,6 @@ void Submission::setVersion( const OUString& sVersion ) msVersion = sVersion; } -bool Submission::getIndent() const -{ - return mbIndent; -} void Submission::setIndent( bool bIndent ) { @@ -205,20 +201,12 @@ void Submission::setEncoding( const OUString& sEncoding ) msEncoding = sEncoding; } -bool Submission::getOmitXmlDeclaration() const -{ - return mbOmitXmlDeclaration; -} void Submission::setOmitXmlDeclaration( bool bOmitXmlDeclaration ) { mbOmitXmlDeclaration = bOmitXmlDeclaration; } -bool Submission::getStandalone() const -{ - return mbStandalone; -} void Submission::setStandalone( bool bStandalone ) { diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index 07ea512c6c93..a431f54c856d 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -126,7 +126,7 @@ public: OUString getVersion() const; void setVersion( const OUString& ); - bool getIndent() const; + bool getIndent() const { return mbIndent;} void setIndent( bool ); OUString getMediaType() const; @@ -135,10 +135,10 @@ public: OUString getEncoding() const; void setEncoding( const OUString& ); - bool getOmitXmlDeclaration() const; + bool getOmitXmlDeclaration() const { return mbOmitXmlDeclaration;} void setOmitXmlDeclaration( bool ); - bool getStandalone() const; + bool getStandalone() const { return mbStandalone;} void setStandalone( bool ); OUString getCDataSectionElement() const; diff --git a/formula/source/core/api/vectortoken.cxx b/formula/source/core/api/vectortoken.cxx index c1ff94c82146..4cf764faf9e2 100644 --- a/formula/source/core/api/vectortoken.cxx +++ b/formula/source/core/api/vectortoken.cxx @@ -36,10 +36,6 @@ VectorRefArray::VectorRefArray( const double* pNumArray, rtl_uString** pStrArray mpStringArray(pStrArray), mbValid(true) {} -bool VectorRefArray::isValid() const -{ - return mbValid; -} SingleVectorRefToken::SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength ) : FormulaToken(svSingleVectorRef, ocPush), maArray(rArray), mnRequestedLength(nReqLength), mnArrayLength(nArrayLength) {} diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 68939ba17aba..bb0ee20786fb 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -217,10 +217,6 @@ ParaWin::~ParaWin() aBtnFx4.SetGetFocusHdl( aEmptyLink ); } -sal_uInt16 ParaWin::GetActiveLine() -{ - return nActiveLine; -} void ParaWin::SetActiveLine(sal_uInt16 no) { diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index 70858e3fa9d0..3b2df6bcb7c9 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -135,7 +135,7 @@ public: bool IsRefMode() {return bRefMode;} void SetRefMode(bool bFlag) {bRefMode=bFlag;} - sal_uInt16 GetActiveLine(); + sal_uInt16 GetActiveLine() { return nActiveLine;} void SetActiveLine(sal_uInt16 no); RefEdit* GetActiveEdit(); OUString GetActiveArgName(); diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index d3e02709612b..3171fe36a49b 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -58,10 +58,6 @@ void StructListBox::SetActiveFlag(bool bFlag) bActiveFlag=bFlag; } -bool StructListBox::GetActiveFlag() -{ - return bActiveFlag; -} void StructListBox::MouseButtonDown( const MouseEvent& rMEvt ) { diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 85829ae00e4c..f5086983fd34 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -59,7 +59,7 @@ public: IFormulaToken* pToken = NULL ); void SetActiveFlag(bool bFlag=true); - bool GetActiveFlag(); + bool GetActiveFlag() { return bActiveFlag;} void GetFocus() SAL_OVERRIDE; void LoseFocus() SAL_OVERRIDE; }; diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index c3b381888929..67430c56c595 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -99,9 +99,6 @@ void PlacesListBox::AppendPlace( PlacePtr pPlace ) } } -sal_Int32 PlacesListBox::GetNbEditablePlaces() { - return mnNbEditables; -} bool PlacesListBox::IsUpdated() { if(mbUpdated) { @@ -111,9 +108,6 @@ bool PlacesListBox::IsUpdated() { return false; } -const std::vector<PlacePtr>& PlacesListBox::GetPlaces() { - return maPlaces; -} void PlacesListBox::RemovePlace( sal_uInt16 nPos ) { diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index 51d300b53697..19a5963b3af7 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -54,9 +54,9 @@ class PlacesListBox : public Control void AppendPlace( PlacePtr pPlace ); void RemovePlace( sal_uInt16 nPos ); void RemoveSelectedPlace(); - sal_Int32 GetNbEditablePlaces(); + sal_Int32 GetNbEditablePlaces() { return mnNbEditables;} bool IsUpdated(); - const std::vector<PlacePtr>& GetPlaces(); + const std::vector<PlacePtr>& GetPlaces() { return maPlaces;} void SetAddHdl( const Link& rHdl ); void SetDelHdl( const Link& rHdl ); diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx index 2f28c10e0915..e6b4e315af5f 100644 --- a/fpicker/source/office/fpinteraction.cxx +++ b/fpicker/source/office/fpinteraction.cxx @@ -115,10 +115,6 @@ namespace svt } - bool OFilePickerInteractionHandler::wasUsed() const - { - return m_bUsed; - } void OFilePickerInteractionHandler::resetUseState() diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx index 9c9ef6052dbc..dd116f958421 100644 --- a/fpicker/source/office/fpinteraction.hxx +++ b/fpicker/source/office/fpinteraction.hxx @@ -61,7 +61,7 @@ namespace svt // some generic functions void enableInterceptions( EInterceptedInteractions eInterceptions ); - bool wasUsed () const; + bool wasUsed () const { return m_bUsed; } void resetUseState (); void forgetRequest (); diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 5b96a0d74a07..41eb059f376c 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -88,7 +88,7 @@ namespace framework OUString getUINameFromCommand( const OUString& rCommandURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL ); void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel ); - bool isContextSensitiveToolbarNonVisible(); + bool isContextSensitiveToolbarNonVisible() { return m_bResetActive;} ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 6814ace0c1c7..a428ccdce2b6 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -202,10 +202,6 @@ void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl } } -bool ToolbarLayoutManager::isLayoutDirty() -{ - return m_bLayoutDirty; -} void ToolbarLayoutManager::doLayout(const ::Size& aContainerSize) { diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 1169e5cab87d..b137ac03c6c3 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -94,7 +94,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a bool isPreviewFrame(); // layouting - bool isLayoutDirty(); + bool isLayoutDirty() { return m_bLayoutDirty;} void doLayout(const ::Size& aContainerSize); // creation/destruction diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 5321064ef9d9..857519ebdf0f 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -333,10 +333,6 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl return aSeq; } -bool ToolbarsMenuController::isContextSensitiveToolbarNonVisible() -{ - return m_bResetActive; -} void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { diff --git a/helpcompiler/inc/BasCodeTagger.hxx b/helpcompiler/inc/BasCodeTagger.hxx index dfc8ee890491..74b97ce1cb91 100644 --- a/helpcompiler/inc/BasCodeTagger.hxx +++ b/helpcompiler/inc/BasCodeTagger.hxx @@ -57,7 +57,7 @@ class L10N_DLLPUBLIC LibXmlTreeWalker LibXmlTreeWalker( xmlDocPtr doc ); ~LibXmlTreeWalker() {} void nextNode(); - xmlNodePtr currentNode(); + xmlNodePtr currentNode() { return m_pCurrentNode;} bool end(); void ignoreCurrNodesChildren(); }; diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx index 8d00056bffca..58e6cfdabe4d 100644 --- a/helpcompiler/source/BasCodeTagger.cxx +++ b/helpcompiler/source/BasCodeTagger.cxx @@ -48,10 +48,6 @@ bool LibXmlTreeWalker::end() return m_pCurrentNode->next == NULL && m_Queue.empty(); } -xmlNodePtr LibXmlTreeWalker::currentNode() -{ - return m_pCurrentNode; -} diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx index 9333aeb78455..05bc830ec829 100644 --- a/helpcompiler/source/HelpIndexer.cxx +++ b/helpcompiler/source/HelpIndexer.cxx @@ -79,9 +79,6 @@ bool HelpIndexer::indexDocuments() return true; } -OUString const & HelpIndexer::getErrorMessage() { - return d_error; -} bool HelpIndexer::scanForFiles() { if (!scanForFiles(d_contentDir)) { diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx index bc17e0c8cc1a..7b8c34decd02 100644 --- a/hwpfilter/source/hpara.cxx +++ b/hwpfilter/source/hpara.cxx @@ -188,10 +188,6 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag) } -HWPPara *HWPPara::Next(void) -{ - return _next; -} CharShape *HWPPara::GetCharShape(int pos) diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h index a3d0ae0b6f2e..f382a96f9049 100644 --- a/hwpfilter/source/hpara.h +++ b/hwpfilter/source/hpara.h @@ -139,7 +139,7 @@ class DLLEXPORT HWPPara /** * Returns next paragraph. */ - HWPPara *Next(void); + HWPPara *Next(void) { return _next;} int HomePos(int line) const; int EndPos(int line) const; diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index dabca79d219e..5f5b8e3c3ebc 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -133,10 +133,6 @@ int HWPFile::Open(HStream & stream) } -int HWPFile::State(void) const -{ - return error_code; -} int HWPFile::SetState(int errcode) diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h index a7bf4fabb475..d6d1a39afae1 100644 --- a/hwpfilter/source/hwpfile.h +++ b/hwpfilter/source/hwpfile.h @@ -116,7 +116,7 @@ class DLLEXPORT HWPFile * Say current state * @returns 0 if normal, otherwise error code. If it's bigger than USER_ERROR_BIT, it is internally using error, otherwise it's system error which is able to get the message @ref strerror() method. */ - int State( void ) const; + int State( void ) const { return error_code;} /** * Sets the current state */ diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 237fdcadfa7a..b7b8aa180ea4 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -2029,10 +2029,6 @@ bool LanguageTag::isValidBcp47() const } -bool LanguageTag::isSystemLocale() const -{ - return mbSystemLocale; -} LanguageTag & LanguageTag::makeFallback() diff --git a/idlc/inc/idlc/aststack.hxx b/idlc/inc/idlc/aststack.hxx index 500acc5f8f92..0a63c31e2331 100644 --- a/idlc/inc/idlc/aststack.hxx +++ b/idlc/inc/idlc/aststack.hxx @@ -29,7 +29,7 @@ public: AstStack(); virtual ~AstStack(); - sal_uInt32 depth(); + sal_uInt32 depth() { return m_top;} AstScope* top(); AstScope* bottom(); AstScope* nextToTop(); diff --git a/idlc/source/aststack.cxx b/idlc/source/aststack.cxx index 9f3ae824de42..402d05a0bf64 100644 --- a/idlc/source/aststack.cxx +++ b/idlc/source/aststack.cxx @@ -41,10 +41,6 @@ AstStack::~AstStack() rtl_freeMemory(m_stack); } -sal_uInt32 AstStack::depth() -{ - return m_top; -} AstScope* AstStack::top() { diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index c65f05588ba7..e245840f193a 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -125,7 +125,7 @@ public: bool ExceedsLegacyModuleSize(); void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const; bool HasExeCode(); - bool IsVBACompat() const; + bool IsVBACompat() const { return mbVBACompat;} void SetVBACompat( bool bCompat ); sal_Int32 GetModuleType() { return mnType; } void SetModuleType( sal_Int32 nType ) { mnType = nType; } diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index 1ab7ed3deabc..c642e121e22a 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -194,7 +194,7 @@ public: void Put( SbxVariable*, const short* ); SbxVariable* Get( SbxArray* ); - short GetDims() const; + short GetDims() const { return nDim;} void AddDim( short, short ); void unoAddDim( short, short ); bool GetDim( short, short&, short& ) const; diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 46726e5968ab..ec133d8bbd06 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -337,7 +337,7 @@ public: virtual void Broadcast( sal_uIntPtr nHintId ) SAL_OVERRIDE; inline const SbxObject* GetParent() const { return pParent; } - SbxObject* GetParent(); + SbxObject* GetParent() { return pParent;} virtual void SetParent( SbxObject* ); const OUString& GetDeclareClassName( void ); diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx index 03cbdc8e2bae..04c215295c09 100644 --- a/include/canvas/base/canvascustomspritehelper.hxx +++ b/include/canvas/base/canvascustomspritehelper.hxx @@ -92,7 +92,7 @@ namespace canvas ::basegfx::B2DPoint getPosPixel() const; ::basegfx::B2DVector getSizePixel() const; ::basegfx::B2DRange getUpdateArea() const; - double getPriority() const; + double getPriority() const { return mfPriority; } // redraw must be implemented by derived - non sensible default implementation // void redraw( const Sprite::Reference& rSprite, diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx index c158eaeba628..369f8818e77b 100644 --- a/include/codemaker/options.hxx +++ b/include/codemaker/options.hxx @@ -57,7 +57,7 @@ public: const ::rtl::OString getOption(const ::rtl::OString& option) const throw( IllegalArgument ); - const StringVector& getInputFiles(); + const StringVector& getInputFiles() { return m_inputFiles;} inline const StringVector& getExtraInputFiles() const { return m_extra_input_files; } diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index d7621d36fea3..e2fb5c1d0c0e 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -185,7 +185,7 @@ namespace accessibility there potential deadlock situations can be resolved. Thus, make sure SolarMutex is locked when calling this. */ - sal_Int32 GetIndexInParent() const; + sal_Int32 GetIndexInParent() const { return mnIndexInParent; } /** Set the current paragraph number @@ -203,7 +203,7 @@ namespace accessibility there potential deadlock situations can be resolved. Thus, make sure SolarMutex is locked when calling this. */ - sal_Int32 GetParagraphIndex() const; + sal_Int32 GetParagraphIndex() const { return mnParagraphIndex; } /** Set the edit engine offset @@ -310,7 +310,7 @@ namespace accessibility void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const; void LostPropertyEvent( const ::com::sun::star::uno::Any& rOldValue, const sal_Int16 nEventId ) const; - int getNotifierClientId() const; + int getNotifierClientId() const { return mnNotifierClientId; } /// Do we have children? This is the case for image bullets bool HaveChildren(); diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index 440b42bf37e7..d13ed7bab820 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -145,7 +145,7 @@ namespace accessibility there potential deadlock situations can be resolved. Thus, make sure SolarMutex is locked when calling this. */ - sal_Int32 GetParagraphIndex() const; + sal_Int32 GetParagraphIndex() const { return mnParagraphIndex; } /// Calls all Listener objects to tell them the change. Don't hold locks when calling this! virtual void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; @@ -166,7 +166,7 @@ namespace accessibility SvxEditSource& GetEditSource() const; - int getNotifierClientId() const; + int getNotifierClientId() const { return mnNotifierClientId; } /** Query the SvxTextForwarder for EditEngine access. diff --git a/include/editeng/editund2.hxx b/include/editeng/editund2.hxx index 52c11ca3acc4..c103fcbb9166 100644 --- a/include/editeng/editund2.hxx +++ b/include/editeng/editund2.hxx @@ -53,7 +53,7 @@ public: EditUndo(sal_uInt16 nI, EditEngine* pEE); virtual ~EditUndo(); - EditEngine* GetEditEngine(); + EditEngine* GetEditEngine() { return mpEditEngine;} virtual void Undo() SAL_OVERRIDE = 0; virtual void Redo() SAL_OVERRIDE = 0; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 50a7f81b6878..961b5e08b987 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -232,7 +232,7 @@ public: explicit SvxTableField(int nTab); void SetTab(int nTab); - int GetTab() const; + int GetTab() const { return mnTab;} virtual SvxFieldData* Clone() const SAL_OVERRIDE; virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 57f63b95d06a..8f6882f3d463 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -199,7 +199,7 @@ public: void SetGraphicSize(const Size& rSet) {aGraphicSize = rSet;} const Size& GetGraphicSize() const {return aGraphicSize;} - SvxNumPositionAndSpaceMode GetPositionAndSpaceMode() const; + SvxNumPositionAndSpaceMode GetPositionAndSpaceMode() const { return mePositionAndSpaceMode;} void SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePositionAndSpaceMode ); void SetLSpace(short nSet) {nLSpace = nSet;} @@ -212,13 +212,13 @@ public: short GetCharTextDistance() const; void SetLabelFollowedBy( const LabelFollowedBy eLabelFollowedBy ); - LabelFollowedBy GetLabelFollowedBy() const; + LabelFollowedBy GetLabelFollowedBy() const { return meLabelFollowedBy;} void SetListtabPos( const long nListtabPos ); - long GetListtabPos() const; + long GetListtabPos() const { return mnListtabPos;} void SetFirstLineIndent( const long nFirstLineIndent ); - long GetFirstLineIndent() const; + long GetFirstLineIndent() const { return mnFirstLineIndent;} void SetIndentAt( const long nIndentAt ); - long GetIndentAt() const; + long GetIndentAt() const { return mnIndentAt;} static Size GetGraphicSizeMM100(const Graphic* pGraphic); static OUString CreateRomanString( sal_uLong nNo, bool bUpper ); diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx index 9b360200c889..c9900a808e5c 100644 --- a/include/editeng/unoedhlp.hxx +++ b/include/editeng/unoedhlp.hxx @@ -50,8 +50,8 @@ public: SvxEditSourceHint( sal_uLong nId, sal_uLong nValue, sal_Int32 nStart=0, sal_Int32 nEnd=0 ); sal_uLong GetValue() const; - sal_Int32 GetStartValue() const; - sal_Int32 GetEndValue() const; + sal_Int32 GetStartValue() const { return mnStart;} + sal_Int32 GetEndValue() const { return mnEnd;} }; class SvxEditSourceHintEndPara :public SvxEditSourceHint { diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index 1bc9ebc66d94..dd1f64d179a9 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -154,7 +154,7 @@ public: SAL_WNODEPRECATED_DECLARATIONS_PUSH void SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee ); SAL_WNODEPRECATED_DECLARATIONS_POP - bool IsValid() const; + bool IsValid() const { return mbEditSourceValid;} private: // declared, but not defined diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx index 0c28f7e9e2c9..7f015b76d064 100644 --- a/include/formula/vectortoken.hxx +++ b/include/formula/vectortoken.hxx @@ -47,7 +47,7 @@ struct FORMULA_DLLPUBLIC VectorRefArray VectorRefArray( rtl_uString** pArray ); VectorRefArray( const double* pNumArray, rtl_uString** pStrArray ); - bool isValid() const; + bool isValid() const { return mbValid;} }; /** diff --git a/include/helpcompiler/HelpIndexer.hxx b/include/helpcompiler/HelpIndexer.hxx index 47733a6d8a25..fe4da1171c92 100644 --- a/include/helpcompiler/HelpIndexer.hxx +++ b/include/helpcompiler/HelpIndexer.hxx @@ -59,7 +59,7 @@ class L10N_DLLPUBLIC HelpIndexer { /** * Get the error string (empty if no error occurred). */ - OUString const & getErrorMessage(); + OUString const & getErrorMessage() { return d_error;} private: diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx index f3cf64293cd9..3d484ad9f5d2 100644 --- a/include/i18nlangtag/languagetag.hxx +++ b/include/i18nlangtag/languagetag.hxx @@ -235,7 +235,7 @@ public: /** If this tag was contructed as an empty tag denoting the system locale. */ - bool isSystemLocale() const; + bool isSystemLocale() const { return mbSystemLocale;} /** Reset with existing BCP 47 language tag string. See ctor. */ diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx index 055ad0904eee..6ba969a22e1e 100644 --- a/include/jvmaccess/unovirtualmachine.hxx +++ b/include/jvmaccess/unovirtualmachine.hxx @@ -85,7 +85,7 @@ public: different for different JDK versions, so that the mangled C++ name of the function would depend on the JDK version used at compile time. */ - void * getClassLoader() const; + void * getClassLoader() const { return m_classLoader;} private: UnoVirtualMachine(UnoVirtualMachine &); // not defined diff --git a/include/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx index 16c8271677a0..4f1e2f82f7cf 100644 --- a/include/oox/drawingml/chart/typegroupconverter.hxx +++ b/include/oox/drawingml/chart/typegroupconverter.hxx @@ -123,7 +123,7 @@ public: /** Returns true, if the series in this chart type group are stacked on each other as percentage. */ bool isPercent() const; /** Returns true, if the chart is three-dimensional. */ - bool is3dChart() const; + bool is3dChart() const { return mb3dChart;} /** Returns true, if chart type supports wall and floor format in 3D mode. */ bool isWall3dChart() const; /** Returns true, if the series in this chart type group are ordered on the Z axis. */ diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index f8e1b7c8e8d7..390086bca369 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -180,9 +180,9 @@ public: void setFontRefColorForNodes(const Color& rColor) { maFontRefColorForNodes = rColor; } const Color& getFontRefColorForNodes() const { return maFontRefColorForNodes; } void setLockedCanvas(bool bLockedCanvas); - bool getLockedCanvas(); + bool getLockedCanvas() { return mbLockedCanvas;} void setWps(bool bWps); - bool getWps(); + bool getWps() { return mbWps;} void setTextBox(bool bTextBox); const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> & getDiagramDoms() { return maDiagramDoms; } diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 84e86373aff0..878037e68d72 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -66,7 +66,7 @@ public: /** Returns true, if the storage operates in read-only mode (based on an input stream). */ - bool isReadOnly() const; + bool isReadOnly() const { return mbReadOnly;} /** Returns the com.sun.star.embed.XStorage interface of the current storage. */ ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > diff --git a/include/package/Deflater.hxx b/include/package/Deflater.hxx index 2b95782dcae1..ad73f280ceee 100644 --- a/include/package/Deflater.hxx +++ b/include/package/Deflater.hxx @@ -50,7 +50,7 @@ public: void SAL_CALL setLevel( sal_Int32 nNewLevel ); bool SAL_CALL needsInput( ); void SAL_CALL finish( ); - bool SAL_CALL finished( ); + bool SAL_CALL finished( ) { return bFinished;} sal_Int32 SAL_CALL doDeflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); sal_Int64 SAL_CALL getTotalIn( ); sal_Int64 SAL_CALL getTotalOut( ); diff --git a/include/package/Inflater.hxx b/include/package/Inflater.hxx index 9c4874a1029c..db587185d849 100644 --- a/include/package/Inflater.hxx +++ b/include/package/Inflater.hxx @@ -42,8 +42,8 @@ public: Inflater(bool bNoWrap = false); ~Inflater(); void SAL_CALL setInput( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer ); - bool SAL_CALL needsDictionary( ); - bool SAL_CALL finished( ); + bool SAL_CALL needsDictionary( ) { return bNeedDict;} + bool SAL_CALL finished( ) { return bFinished;} sal_Int32 SAL_CALL doInflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); void SAL_CALL end( ); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 95eab18df1d3..917397f3e845 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -158,8 +158,8 @@ public: bool HasTemplate() const { return m_bHasTemplate; } void SetDeleteUserData( bool bSet ); void SetUseUserData( bool bSet ); - bool IsDeleteUserData() const; - bool IsUseUserData() const; + bool IsDeleteUserData() const { return m_bDeleteUserData;} + bool IsUseUserData() const { return m_bUseUserData;} std::vector< CustomProperty* > GetCustomProperties() const; void ClearCustomProperties(); diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 453eb3fffd71..5563559de167 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -46,7 +46,7 @@ public: void insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId); - long GetThumbnailSize() const; + long GetThumbnailSize() const { return mnItemMaxSize;} static bool typeMatchesExtension(ApplicationType type, const OUString &rExt); static BitmapEx getDefaultThumbnail(const OUString &rURL); diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 646dd5e85183..003d9ac36e00 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -107,7 +107,7 @@ public: // Return if we can import templates to the current region virtual bool isImportAllowed () const = 0; - sal_uInt16 getCurRegionId () const; + sal_uInt16 getCurRegionId () const { return mnCurRegionId;} const OUString& getCurRegionName () const; diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 06876e63d7dc..c49ead68e29f 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -45,7 +45,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pOther = NULL ) const SAL_OVERRIDE; - sal_Int64 GetValue() const; + sal_Int64 GetValue() const { return mnValue;} void SetValue( sal_Int64 nVal ); }; diff --git a/include/svl/sharedstring.hxx b/include/svl/sharedstring.hxx index fe9e851f045d..ddb63f14e8d8 100644 --- a/include/svl/sharedstring.hxx +++ b/include/svl/sharedstring.hxx @@ -36,10 +36,10 @@ public: OUString getString() const; - rtl_uString* getData(); + rtl_uString* getData() { return mpData;} const rtl_uString* getData() const; - rtl_uString* getDataIgnoreCase(); + rtl_uString* getDataIgnoreCase() { return mpDataIgnoreCase;} const rtl_uString* getDataIgnoreCase() const; bool isValid() const; diff --git a/include/svl/style.hxx b/include/svl/style.hxx index f82d14266fb3..3b936763886b 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -230,7 +230,7 @@ public: const OUString& GetAppName() const { return aAppName; } SfxItemPool& GetPool(); - const SfxItemPool& GetPool() const; + const SfxItemPool& GetPool() const { return rPool;} virtual SfxStyleSheetIteratorPtr CreateIterator(SfxStyleFamily, sal_uInt16 nMask); virtual sal_uInt16 Count(); @@ -265,7 +265,7 @@ public: { return Find(rStr, nSearchFamily, nMask); } void SetSearchMask(SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); - sal_uInt16 GetSearchMask() const; + sal_uInt16 GetSearchMask() const { return nMask;} SfxStyleFamily GetSearchFamily() const { return nSearchFamily; } void Reindex(); diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx index a6178f72cbfd..0527caf7022d 100644 --- a/include/svx/AccessibleShapeTreeInfo.hxx +++ b/include/svx/AccessibleShapeTreeInfo.hxx @@ -118,7 +118,7 @@ public: @return The returned value may be NULL. */ - SdrView* GetSdrView (void) const; + SdrView* GetSdrView (void) const { return mpView;} /** Set a new controller. This will usually but not necessarily correspond to the SdrView. @@ -146,7 +146,7 @@ public: @return The returned value may be NULL. */ - Window* GetWindow (void) const; + Window* GetWindow (void) const { return mpWindow;} /** The view forwarder allows the transformation between internal and pixel coordinates and can be asked for the visible area. @@ -159,7 +159,7 @@ public: @return The returned pointer may be NULL. */ - const IAccessibleViewForwarder* GetViewForwarder (void) const; + const IAccessibleViewForwarder* GetViewForwarder (void) const { return mpViewForwarder;} private: /** Deprecated. diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 9d97b3e7cb71..f2f7dbf38ed6 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -252,7 +252,7 @@ public: void CheckAction(bool bFlag=true); void CheckComment(bool bFlag=true); - ListBox* GetLbAction(); + ListBox* GetLbAction() { return m_pLbAction;} void SetReadyHdl( const Link& rLink ) { aReadyLink= rLink; } const Link& GetReadyHdl() const { return aReadyLink; } @@ -319,7 +319,7 @@ public: void InsertWriterHeader(); void InsertCalcHeader(); - SvxRedlinTable* GetTableControl(); + SvxRedlinTable* GetTableControl() { return m_pViewData;} void EnableAccept(bool nFlag=true); void EnableAcceptAll(bool nFlag=true); @@ -380,8 +380,8 @@ public: void ShowFilterPage(); void ShowViewPage(); - SvxTPFilter* GetFilterPage(); - SvxTPView* GetViewPage(); + SvxTPFilter* GetFilterPage() { return pTPFilter;} + SvxTPView* GetViewPage() { return pTPView;} SvxRedlinTable* GetViewTable(); }; diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 8af1bd4e475a..914758f31475 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -128,7 +128,7 @@ public: void markColumn(sal_uInt16 nId); bool isColumnMarked(sal_uInt16 nId) const; - sal_Int32 GetSelectedColumn() const; + sal_Int32 GetSelectedColumn() const { return m_nCurrentSelectedColumn;} /** return the name of the specified object. @param eObjType diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index cdc221d1d4e1..652a2edb9e12 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -125,7 +125,7 @@ public: inline double Prim() const { return mfPrim; } inline double Dist() const { return mfDist; } inline double Secn() const { return mfSecn; } - double PatternScale() const; + double PatternScale() const { return mfPatternScale;} void SetPatternScale( double fScale ); inline editeng::SvxBorderStyle Type() const { return mnType; } diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 91b788cdf0c2..909c1c8d9984 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -151,7 +151,7 @@ public: EDITED_INVALID }; - EditedAndValid GetEditedAndValid() const; + EditedAndValid GetEditedAndValid() const { return meEditedAndValid;} sal_Int32 SaveEditedAsEntry(); diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index f9e9ae6bf9ea..d32b8efd47cf 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -231,7 +231,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();} protected: OUString GetBulCharFmtName(); - SfxMapUnit GetMapUnit(); + SfxMapUnit GetMapUnit() { return eCoreUnit;} protected: bool bIsLoading; void ImplLoad(const OUString& filename); diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index 4610d3039882..d7282d1abe19 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -161,7 +161,7 @@ public: void SetComment4Entry(short nEntry, const OUString& aCommentString); void SetCurrencySymbol(sal_uInt32 nPos); - sal_uInt32 GetCurrencySymbol(); + sal_uInt32 GetCurrencySymbol() { return nCurCurrencyEntryPos;} sal_uInt16 FindCurrencyFormat( const OUString& rFmtString ); sal_uInt16 FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,bool bTmpBanking); void SetCurCurrencyEntry(NfCurrencyEntry*); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 56074eee1e13..e856cf030d20 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -52,8 +52,8 @@ public: SvxLongLRSpaceItem(const SvxLongLRSpaceItem &); SvxLongLRSpaceItem(); - long GetLeft() const; - long GetRight() const; + long GetLeft() const { return mlLeft;} + long GetRight() const { return mlRight;} void SetLeft(long lArgLeft); void SetRight(long lArgRight); }; @@ -86,8 +86,8 @@ public: SvxLongULSpaceItem(const SvxLongULSpaceItem &); SvxLongULSpaceItem(); - long GetUpper() const; - long GetLower() const; + long GetUpper() const { return mlLeft;} + long GetLower() const { return mlRight;} void SetUpper(long lArgLeft); void SetLower(long lArgRight); }; @@ -194,12 +194,12 @@ public: void Append(const SvxColumnDescription& rDesc); void SetLeft(long aLeft); void SetRight(long aRight); - sal_uInt16 GetActColumn() const; + sal_uInt16 GetActColumn() const { return nActColumn;} bool IsFirstAct() const; bool IsLastAct() const; - long GetLeft(); - long GetRight(); - bool IsTable() const; + long GetLeft() { return nLeft;} + long GetRight() { return nRight;} + bool IsTable() const { return bTable;} bool CalcOrtho() const; void SetOrtho(bool bVal); bool IsConsistent() const; @@ -239,12 +239,12 @@ public: bool bLimits = false); SvxObjectItem(const SvxObjectItem& rCopy); - bool HasLimits() const; + bool HasLimits() const { return bLimits;} - long GetStartX() const; - long GetEndX() const; - long GetStartY() const; - long GetEndY() const; + long GetStartX() const { return nStartX;} + long GetEndX() const { return nEndX;} + long GetStartY() const { return nStartY;} + long GetEndY() const { return nEndY;} void SetStartX(long lValue); void SetEndX(long lValue); diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 4a7b177e1cd0..9e3a33dd2dcb 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -45,11 +45,11 @@ namespace sdr SVX_DLLPUBLIC virtual ~Event(); // access to mpNext - Event* GetNext() const; + Event* GetNext() const { return mpNext; } void SetNext(Event* pNew); // get/set time - sal_uInt32 GetTime() const; + sal_uInt32 GetTime() const { return mnTime; } void SVX_DLLPUBLIC SetTime(sal_uInt32 nNew); // execute event @@ -83,7 +83,7 @@ namespace sdr void Clear(); // get first - Event* GetFirst(); + Event* GetFirst() { return mpHead; } }; } // end of namespace animation } // end of namespace sdr @@ -119,7 +119,7 @@ namespace sdr SVX_DLLPUBLIC virtual void Timeout() SAL_OVERRIDE; // get time - sal_uInt32 GetTime(); + sal_uInt32 GetTime() { return mnTime; } // #i38135# void SetTime(sal_uInt32 nTime); diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index fd48a475d32e..b94e5a97d3be 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -161,7 +161,7 @@ namespace sdr virtual bool IsAsynchronGraphicsLoadingAllowed() const; // access to ViewObjectContactRedirector - ViewObjectContactRedirector* GetViewObjectContactRedirector() const; + ViewObjectContactRedirector* GetViewObjectContactRedirector() const { return mpViewObjectContactRedirector; } void SetViewObjectContactRedirector(ViewObjectContactRedirector* pNew); // check if buffering of MasterPages is allowed. Default is sal_False. diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index da4ec001e9a3..6b28b5ad88bf 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -95,7 +95,7 @@ public: SfxBindings* pBindings, SfxChildWinInfo* pInfo ); virtual ~SvxSearchDialogWrapper (); - SvxSearchDialog *getDialog (); + SvxSearchDialog *getDialog () { return dialog;} static void SetSearchLabel(const SearchLabel& rSL); SFX_DECL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper); }; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 53e91b95a99c..88a71e219cc8 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -468,7 +468,7 @@ public: void ResetFocusHdl(); // Access to View - SdrMarkView* GetView() const; + SdrMarkView* GetView() const { return pView;} // Sortierung: 1.Level Erst Refpunkt-Handles, dann normale Handles, dann Glue, dann User, dann Plushandles // 2.Level PageView (Pointer) diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index d57b1a09ecd8..97f5b8d4b08b 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -66,7 +66,7 @@ public: } void SetMarkedSdrObj(SdrObject* pNewObj); - SdrObject* GetMarkedSdrObj() const; + SdrObject* GetMarkedSdrObj() const { return mpSelectedSdrObject;} SdrPageView* GetPageView() const { diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index e982cb5e5460..ae322501912b 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -132,9 +132,9 @@ public: void SetObject(const SdrObject* pNewObj); void SetKind(SdrHintKind eNewKind); - const SdrPage* GetPage() const; - const SdrObject* GetObject() const; - SdrHintKind GetKind() const; + const SdrPage* GetPage() const { return mpPage;} + const SdrObject* GetObject() const { return mpObj;} + SdrHintKind GetKind() const { return meHint;} }; @@ -650,7 +650,7 @@ public: void MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel ); - bool IsInDestruction() const; + bool IsInDestruction() const { return mbInDestruction;} static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId(); diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index c7be3585c679..1b7adf1cf489 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -147,7 +147,7 @@ public: void SetMirroredX( const bool bMirroredX ); void SetMirroredY( const bool bMirroredY ); - double GetObjectRotation() const; + double GetObjectRotation() const { return fObjectRotation;} double GetExtraTextRotation( const bool bPreRotation = false ) const; TYPEINFO_OVERRIDE(); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index ccdf58abb683..5b57cf2f0b36 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -197,8 +197,8 @@ public: virtual ~SdrObjUserData(); virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0 - sal_uInt32 GetInventor() const; - sal_uInt16 GetId() const; + sal_uInt32 GetInventor() const { return nInventor;} + sal_uInt16 GetId() const { return nIdentifier;} virtual bool HasMacro (const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; @@ -460,13 +460,13 @@ public: virtual void SetBoundRectDirty(); virtual void SetObjList(SdrObjList* pNewObjList); - SdrObjList* GetObjList() const; + SdrObjList* GetObjList() const { return pObjList;} virtual void SetPage(SdrPage* pNewPage); - SdrPage* GetPage() const; + SdrPage* GetPage() const { return pPage;} virtual void SetModel(SdrModel* pNewModel); - SdrModel* GetModel() const; + SdrModel* GetModel() const { return pModel;} SdrItemPool* GetObjectItemPool() const; void AddListener(SfxListener& rListener); @@ -488,7 +488,7 @@ public: // UserCall interface void SetUserCall(SdrObjUserCall* pUser); - SdrObjUserCall* GetUserCall() const; + SdrObjUserCall* GetUserCall() const { return pUserCall;} void SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect) const; // Such a reference point is for instance: @@ -523,7 +523,7 @@ public: sal_uInt32 GetOrdNum() const; // Warning: this method should only be used if you really knows what you're doing - sal_uInt32 GetOrdNumDirect() const; + sal_uInt32 GetOrdNumDirect() const { return nOrdNum;} // setting the order number should only happen from the model or from the page void SetOrdNum(sal_uInt32 nNum); @@ -881,38 +881,38 @@ public: SdrObject* ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash = false) const; // if true, reference onto an object - bool IsVirtualObj() const; + bool IsVirtualObj() const { return bVirtObj;} // is true, if object can probably be filled // is false, if object has probably line ends // is invalid, if this is a group object - bool IsClosedObj() const; + bool IsClosedObj() const { return bClosedObj;} - bool IsEdgeObj() const; - bool Is3DObj() const; - bool IsUnoObj() const; + bool IsEdgeObj() const { return bIsEdge;} + bool Is3DObj() const { return bIs3DObj;} + bool IsUnoObj() const { return bIsUnoObj;} void SetMarkProtect(bool bProt); - bool IsMarkProtect() const; + bool IsMarkProtect() const { return bMarkProt;} void SetInserted(bool bIns); - bool IsInserted() const; + bool IsInserted() const { return bInserted;} void SetMoveProtect(bool bProt); - bool IsMoveProtect() const; + bool IsMoveProtect() const { return bMovProt;} void SetResizeProtect(bool bProt); - bool IsResizeProtect() const; + bool IsResizeProtect() const { return bSizProt;} void SetPrintable(bool bPrn); bool IsPrintable() const; void SetVisible(bool bVisible); - bool IsVisible() const; + bool IsVisible() const { return mbVisible;} void SetEmptyPresObj(bool bEpt); - bool IsEmptyPresObj() const; + bool IsEmptyPresObj() const { return bEmptyPresObj;} void SetNotVisibleAsMaster(bool bFlg); - bool IsNotVisibleAsMaster() const; + bool IsNotVisibleAsMaster() const { return bNotVisibleAsMaster;} // #i25616# - bool LineIsOutsideGeometry() const; + bool LineIsOutsideGeometry() const { return mbLineIsOutsideGeometry;} // #i25616# - bool DoesSupportTextIndentingOnLineWidthChange() const; + bool DoesSupportTextIndentingOnLineWidthChange() const { return mbSupportTextIndentingOnLineWidthChange;} // application specific data sal_uInt16 GetUserDataCount() const; @@ -990,7 +990,7 @@ public: /// @see mbDoNotInsertIntoPageAutomatically void SetDoNotInsertIntoPageAutomatically(bool bSet); /// @see mbDoNotInsertIntoPageAutomatically - bool IsDoNotInsertIntoPageAutomatically() const; + bool IsDoNotInsertIntoPageAutomatically() const { return mbDoNotInsertIntoPageAutomatically;} // #i121917# virtual bool HasText() const; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 4a3779a0f85f..6a529c26c0e7 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -186,7 +186,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - bool IsMirrored() const; + bool IsMirrored() const { return bMirrored;} void SetMirrored( bool _bMirrored ); // #111096# diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 74168ebc2274..3f48b3145a3c 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -48,7 +48,7 @@ public: virtual ~SdrPageObj(); // #111111# - SdrPage* GetReferencedPage() const; + SdrPage* GetReferencedPage() const { return mpShownPage;} void SetReferencedPage(SdrPage* pNewPage); // #i96598# diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 077b66964803..9dc74bbb7bdb 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -403,7 +403,7 @@ public: // StyleSheet access void SetStyleSheet(SfxStyleSheet* pStyleSheet); - SfxStyleSheet* GetStyleSheet() const; + SfxStyleSheet* GetStyleSheet() const { return mpStyleSheet;} }; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 0c5dbcd91a33..645c35383a41 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -103,7 +103,7 @@ public: enum HintType { SVX_HINT_VIEWCHANGED }; TYPEINFO_OVERRIDE(); explicit SvxViewHint (HintType eType); - HintType GetHintType (void) const; + HintType GetHintType (void) const { return meHintType;} private: HintType meHintType; @@ -223,7 +223,7 @@ public: void SetBufferedOverlayAllowed(bool bNew); // allow page painting at all? - bool IsPagePaintingAllowed() const; + bool IsPagePaintingAllowed() const { return mbPagePaintingAllowed;} void SetPagePaintingAllowed(bool bNew); protected: diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 2904d87321ba..739244f16664 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -255,7 +255,7 @@ protected: void SetOwner(bool bNew); private: - sal_uInt32 GetOrdNum() const; + sal_uInt32 GetOrdNum() const { return nOrdNum;} void SetOrdNum(sal_uInt32 nOrdNum_); }; diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 81092d548acc..cdcd74fb3264 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -611,7 +611,7 @@ public: virtual ~SvxShapePolyPolygon() throw(); // Local support functions - ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw(); + ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} void SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); @@ -641,7 +641,7 @@ public: virtual ~SvxShapePolyPolygonBezier() throw(); // Local support functions - ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw(); + ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} void SetPolygon(const basegfx::B2DPolyPolygon & rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx index c81a8ea8dfb8..83841ce6a377 100644 --- a/include/tools/multisel.hxx +++ b/include/tools/multisel.hxx @@ -125,7 +125,7 @@ public: public: Iterator() : pEnumerator( NULL ), pPossibleValues( NULL ), nRangeIndex( -1 ), nCurrent( -1 ) {} Iterator& operator++(); - sal_Int32 operator*() const; + sal_Int32 operator*() const { return nCurrent;} bool operator==(const Iterator&) const; bool operator!=(const Iterator& i_rComp) const { return ! (*this == i_rComp); } diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx index 63a5ec2002e2..8d393265f82f 100644 --- a/include/tools/zcodec.hxx +++ b/include/tools/zcodec.hxx @@ -75,7 +75,7 @@ public: void SetBreak( sal_uIntPtr ); sal_uIntPtr GetBreak(); void SetCRC( sal_uIntPtr nCurrentCRC ); - sal_uIntPtr GetCRC(); + sal_uIntPtr GetCRC() { return mnCRC;} }; #endif diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index a08df2da504d..134d7cadce5c 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -164,14 +164,14 @@ namespace utl const OUString& GetSubTreeName() const {return sSubTree;} - bool IsModified() const; + bool IsModified() const { return m_bIsModified;} /** writes the changed values into the sub tree. Always called in the Dtor of the derived class. */ virtual void Commit()=0; bool IsInValueChange() const; - sal_Int16 GetMode() const; + sal_Int16 GetMode() const { return m_nMode;} }; }//namespace utl #endif // INCLUDED_UNOTOOLS_CONFIGITEM_HXX diff --git a/include/vcl/GraphicNativeMetadata.hxx b/include/vcl/GraphicNativeMetadata.hxx index e6bf8b638d47..bc9f871cc06d 100644 --- a/include/vcl/GraphicNativeMetadata.hxx +++ b/include/vcl/GraphicNativeMetadata.hxx @@ -31,7 +31,7 @@ public: virtual ~GraphicNativeMetadata(); bool read(Graphic& rGraphic); - sal_uInt16 getRotation(); + sal_uInt16 getRotation() { return mRotation;} }; #endif // INCLUDED_VCL_GRAPHICNATIVEMETADATA_HXX diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 222cffae31b0..8dd71252a9c8 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -323,7 +323,7 @@ public: SAL_DLLPRIVATE void ImplReleaseRef(); SAL_DLLPRIVATE void ImplMakeUnique(); - ImpBitmap* ImplGetImpBitmap() const; + ImpBitmap* ImplGetImpBitmap() const { return mpImpBmp;} SAL_DLLPRIVATE void ImplSetImpBitmap( ImpBitmap* pImpBmp ); SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap ); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index e98ec6dad008..8776ec0cc465 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -106,8 +106,8 @@ public: bool isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; } virtual void queue_resize() SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - VclButtonBox* get_action_area(); - VclBox* get_content_area(); + VclButtonBox* get_action_area() { return mpActionArea;} + VclBox* get_content_area() { return mpContentArea;} virtual bool Close() SAL_OVERRIDE; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 1587be0b8061..fe4b7c6d0344 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -140,7 +140,7 @@ public: void Lock(); void Unlock(); - bool IsLocked() const; + bool IsLocked() const { return mbLocked;} void StartPopupMode( ToolBox* pParentToolBox, sal_uLong nPopupModeFlags ); bool IsInPopupMode() const; @@ -170,7 +170,7 @@ public: FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } void SetFloatStyle( WinBits nWinStyle ); - WinBits GetFloatStyle() const; + WinBits GetFloatStyle() const { return mnFloatBits;} virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index f656c17384dd..a7a9d6f7176b 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -192,7 +192,7 @@ public: sal_Int64 GetSpinSize() const { return mnSpinSize; } void SetDecimalDigits( sal_uInt16 nDigits ); - sal_uInt16 GetDecimalDigits() const; + sal_uInt16 GetDecimalDigits() const { return mnDecimalDigits;} void SetUseThousandSep( bool b ); bool IsUseThousandSep() const { return mbThousandSep; } diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 55c1eae3c3f2..9eafde5e70b2 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -144,12 +144,12 @@ public: GfxLink& operator=( const GfxLink& ); bool IsEqual( const GfxLink& ) const; - GfxLinkType GetType() const; + GfxLinkType GetType() const { return meType;} void SetUserId( sal_uInt32 nUserId ) { mnUserId = nUserId; } sal_uInt32 GetUserId() const { return mnUserId; } - sal_uInt32 GetDataSize() const; + sal_uInt32 GetDataSize() const { return mnBufSize;} void SetData( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, bool bOwns ); const sal_uInt8* GetData() const; diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx index 0140b5df8384..b7ef7fbf4737 100644 --- a/include/vcl/graphictools.hxx +++ b/include/vcl/graphictools.hxx @@ -127,15 +127,15 @@ public: @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) */ - double getTransparency () const; + double getTransparency () const { return mfTransparency;} /// Get width of the stroke - double getStrokeWidth () const; + double getStrokeWidth () const { return mfStrokeWidth;} /// Get the style in which open stroke ends are drawn - CapType getCapType () const; + CapType getCapType () const { return maCapType;} /// Get the style in which the stroke segments are joined - JoinType getJoinType () const; + JoinType getJoinType () const { return maJoinType;} /// Get the maximum length of mitered joins - double getMiterLimit () const; + double getMiterLimit () const { return mfMiterLimit;} /// Get an array of "on" and "off" lengths for stroke dashing void getDashArray ( DashArray& ) const; @@ -305,16 +305,16 @@ public: @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) */ - double getTransparency () const; + double getTransparency () const { return mfTransparency;} /// Get fill rule used - FillRule getFillRule () const; + FillRule getFillRule () const { return maFillRule;} /** Get fill type used Currently, only one of the fill types can be used simultaneously. If you specify e.g. FillRule::fillGradient, hatching, texture and solid fill color are ignored. */ - FillType getFillType () const; + FillType getFillType () const { return maFillType;} /** Get transformation applied to hatch, gradient or texture during fill A fill operation generally starts at the top left position of @@ -328,14 +328,14 @@ public: */ void getTransform ( Transform& ) const; /// deprecated - bool IsTiling () const; + bool IsTiling () const { return mbTiling;} /** Query state of texture tiling @return true, if texture is tiled, false, if output only once. */ - bool isTiling () const; + bool isTiling () const { return mbTiling;} /// Get type of gradient used - GradientType getGradientType () const; + GradientType getGradientType () const { return maGradientType;} /** Get the texture graphic used diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index b6a61051f8f8..89b8364788c4 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -66,7 +66,7 @@ public: BigInt GetMax() const { return mnMax; } void SetDecimalDigits( sal_uInt16 nDigits ); - sal_uInt16 GetDecimalDigits() const; + sal_uInt16 GetDecimalDigits() const { return mnDecimalDigits;} void SetValue( BigInt nNewValue ); void SetUserValue( BigInt nNewValue ); BigInt GetValue() const; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index ac3c84ba0761..d7b3550cfe4d 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -234,7 +234,7 @@ public: sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; OString GetItemIdent(sal_uInt16 nItemId) const; MenuItemType GetItemType( sal_uInt16 nPos ) const; - sal_uInt16 GetCurItemId() const; + sal_uInt16 GetCurItemId() const { return nSelectedId;} OString GetCurItemIdent() const; void SetHighlightItem(sal_uInt16 nHighlightedItem); diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index cee186cd11ea..2b603c1c67ea 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -107,40 +107,40 @@ public : - bool GetIsExportNotes() const; + bool GetIsExportNotes() const { return mbExportNotes;} void SetIsExportNotes( const bool bExportNotes ); - bool GetIsExportNotesPages() const; + bool GetIsExportNotesPages() const { return mbExportNotesPages;} void SetIsExportNotesPages( const bool bExportNotesPages ); - bool GetIsExportTaggedPDF() const; + bool GetIsExportTaggedPDF() const { return mbTaggedPDF;} void SetIsExportTaggedPDF( const bool bTaggedPDF ); - bool GetIsExportTransitionEffects() const; + bool GetIsExportTransitionEffects() const { return mbTransitionEffects;} void SetIsExportTransitionEffects( const bool bTransitionalEffects ); - bool GetIsExportFormFields() const; + bool GetIsExportFormFields() const { return mbExportFormFields;} void SetIsExportFormFields( const bool bExportFormFields ); void SetFormsFormat( const sal_Int32 nFormsFormat ); - bool GetIsExportBookmarks() const; + bool GetIsExportBookmarks() const { return mbExportBookmarks;} void SetIsExportBookmarks( const bool bExportBookmarks ); - bool GetIsExportHiddenSlides() const; + bool GetIsExportHiddenSlides() const { return mbExportHiddenSlides;} void SetIsExportHiddenSlides( const bool bExportHiddenSlides ); - bool GetIsExportNamedDestinations() const; //i56629 + bool GetIsExportNamedDestinations() const { return mbExportNDests;} //i56629 void SetIsExportNamedDestinations( const bool bExportNDests ); //i56629 // PageNumber, Compression is being set by the PDFExport - sal_Int32 GetCurrentPageNumber() const; + sal_Int32 GetCurrentPageNumber() const { return mnPage;} void SetCurrentPageNumber( const sal_Int32 nPage ); - bool GetIsLosslessCompression() const; + bool GetIsLosslessCompression() const { return mbUseLosslessCompression;} void SetIsLosslessCompression( const bool bLosslessCompression ); - bool GetIsReduceImageResolution() const; + bool GetIsReduceImageResolution() const { return mbReduceImageResolution;} void SetIsReduceImageResolution( const bool bReduceImageResolution ); const com::sun::star::lang::Locale& GetDocumentLocale() const; diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index af4941df5470..7211885e03c1 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -92,7 +92,7 @@ public: bool XOr( const Region& rRegion ); bool IsEmpty() const; - bool IsNull() const; + bool IsNull() const { return mbIsNull;} void SetEmpty(); void SetNull(); diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 52714062fbaa..fafc2e8c4873 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -248,7 +248,7 @@ public: TextView* GetView( sal_uInt16 nView ) const; void InsertView( TextView* pTextView ); void RemoveView( TextView* pTextView ); - TextView* GetActiveView() const; + TextView* GetActiveView() const { return mpActiveView;} void SetActiveView( TextView* pView ); void SetMaxTextLen( sal_uLong nLen ); diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 8790f778c31d..397946314cb1 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -469,7 +469,7 @@ public: @see <member>mbIsGraphicLoadOnDemandSupported</member> */ - bool isGraphicLoadOnDemandSupported() const; + bool isGraphicLoadOnDemandSupported() const { return mbIsGraphicLoadOnDemandSupported;} /** Returns true if the embedded font document URL has already been processed. diff --git a/jvmaccess/source/unovirtualmachine.cxx b/jvmaccess/source/unovirtualmachine.cxx index 66c181dfaa39..ed0a081fd40c 100644 --- a/jvmaccess/source/unovirtualmachine.cxx +++ b/jvmaccess/source/unovirtualmachine.cxx @@ -63,9 +63,6 @@ UnoVirtualMachine::getVirtualMachine() const { return m_virtualMachine; } -void * UnoVirtualMachine::getClassLoader() const { - return m_classLoader; -} UnoVirtualMachine::~UnoVirtualMachine() { try { diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index c481269d229f..457ba8d80ee3 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -311,10 +311,6 @@ bool SunVersion::operator == (const SunVersion& ver) const return bRet; } -SunVersion::operator bool() -{ - return m_bValid; -} #if OSL_DEBUG_LEVEL >= 2 SelfTest::SelfTest() diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx index e30d70c63d03..1262651b3202 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx @@ -96,7 +96,7 @@ public: /** Test if the version is compatible tu SUN's versioning scheme */ - operator bool (); + operator bool () { return m_bValid;} /** Will always contain a value if the object has been constructed with a version string. diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 6b6ec8bd04f8..01cc105add9a 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -1097,10 +1097,6 @@ void MergedSettings::merge(const NodeJava & share, const NodeJava & user) m_JRELocations = * share.getJRELocations(); } -bool MergedSettings::getEnabled() const -{ - return m_bEnabled; -} const OUString& MergedSettings::getUserClassPath() const { return m_sClassPath; diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index 8fce7267edf4..ec708dbb482a 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -291,7 +291,7 @@ public: /** the default is true. */ - bool getEnabled() const; + bool getEnabled() const { return m_bEnabled;} const OUString & getUserClassPath() const; diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 56e24c6400a5..4931737a0e03 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -1223,10 +1223,6 @@ CJavaInfo::~CJavaInfo() jfw_freeJavaInfo(pInfo); } -CJavaInfo::operator ::JavaInfo* () -{ - return pInfo; -} JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo) { diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx index 87f87619ad04..b69382e0d0fa 100644 --- a/jvmfwk/source/framework.hxx +++ b/jvmfwk/source/framework.hxx @@ -96,7 +96,7 @@ public: void attach(::JavaInfo* pInfo); ::JavaInfo * detach(); const ::JavaInfo* operator ->() const; - operator ::JavaInfo* (); + operator ::JavaInfo* () { return pInfo;} operator ::JavaInfo const * () const; ::JavaInfo* cloneJavaInfo() const; diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx index bb2640e7dd81..83aadca49bdd 100644 --- a/jvmfwk/source/libxmlutil.cxx +++ b/jvmfwk/source/libxmlutil.cxx @@ -44,15 +44,6 @@ CXPathObjectPtr & CXPathObjectPtr::operator = (xmlXPathObject* pObj) _object = pObj; return *this; } -xmlXPathObject* CXPathObjectPtr::operator ->() - -{ - return _object; -} -CXPathObjectPtr::operator xmlXPathObject*() const -{ - return _object; -} CXPathContextPtr::CXPathContextPtr(xmlXPathContextPtr aContext) : _object(aContext) @@ -76,15 +67,7 @@ CXPathContextPtr & CXPathContextPtr::operator = (xmlXPathContextPtr pObj) _object = pObj; return *this; } -xmlXPathContext* CXPathContextPtr::operator ->() -{ - return _object; -} -CXPathContextPtr::operator xmlXPathContext*() const -{ - return _object; -} CXmlDocPtr::CXmlDocPtr(xmlDoc* aDoc) : _object(aDoc) @@ -108,15 +91,7 @@ CXmlDocPtr & CXmlDocPtr::operator = (xmlDoc* pObj) return *this; } -xmlDoc* CXmlDocPtr::operator ->() -{ - return _object; -} -CXmlDocPtr::operator xmlDoc*() const -{ - return _object; -} CXmlCharPtr::CXmlCharPtr(xmlChar * aChar) @@ -148,10 +123,6 @@ CXmlCharPtr & CXmlCharPtr::operator = (xmlChar* pObj) return *this; } -CXmlCharPtr::operator xmlChar*() const -{ - return _object; -} CXmlCharPtr::operator OUString() { diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx index c8f68ed041db..88f8127f7929 100644 --- a/jvmfwk/source/libxmlutil.hxx +++ b/jvmfwk/source/libxmlutil.hxx @@ -39,8 +39,8 @@ public: /** Takes ownership of xmlXPathObject */ CXPathObjectPtr & operator = (xmlXPathObject* pObj); - xmlXPathObject* operator -> (); - operator xmlXPathObject* () const; + xmlXPathObject* operator -> () { return _object;} + operator xmlXPathObject* () const { return _object;} }; @@ -55,8 +55,8 @@ public: CXPathContextPtr(xmlXPathContextPtr aContext); CXPathContextPtr & operator = (xmlXPathContextPtr pObj); ~CXPathContextPtr(); - xmlXPathContext* operator -> (); - operator xmlXPathContext* () const; + xmlXPathContext* operator -> () { return _object;} + operator xmlXPathContext* () const { return _object;} }; @@ -74,8 +74,8 @@ public: */ CXmlDocPtr & operator = (xmlDoc* pObj); ~CXmlDocPtr(); - xmlDoc* operator -> (); - operator xmlDoc* () const; + xmlDoc* operator -> () { return _object;} + operator xmlDoc* () const { return _object;} }; @@ -91,7 +91,7 @@ public: CXmlCharPtr(const OUString &); ~CXmlCharPtr(); CXmlCharPtr & operator = (xmlChar* pObj); - operator xmlChar* () const; + operator xmlChar* () const { return _object;} operator OUString (); operator OString (); }; diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index aacc1908a79d..4415e30b3e8c 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -291,7 +291,7 @@ private: public: MergeData( const OString &rTyp, const OString &rGID, const OString &rLID , const OString &rFilename ); ~MergeData(); - MergeEntrys* GetMergeEntries(); + MergeEntrys* GetMergeEntries() { return pMergeEntrys;} bool operator==( ResData *pData ); }; diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 452a86a18652..ebc5ec56854c 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -209,10 +209,6 @@ MergeData::~MergeData() delete pMergeEntrys; } -MergeEntrys* MergeData::GetMergeEntries() -{ - return pMergeEntrys; -} bool MergeData::operator==( ResData *pData ) { diff --git a/lotuswordpro/source/filter/lwpbasetype.hxx b/lotuswordpro/source/filter/lwpbasetype.hxx index 7a2359d4ec84..e12297e03d9a 100644 --- a/lotuswordpro/source/filter/lwpbasetype.hxx +++ b/lotuswordpro/source/filter/lwpbasetype.hxx @@ -112,8 +112,8 @@ public: LwpPoint(); void Read(LwpObjectStream *pStrm); void Reset(); - inline sal_Int32 GetX() const; - inline sal_Int32 GetY() const; + sal_Int32 GetX() const {return m_nX;} + sal_Int32 GetY() const {return m_nY;} inline void SetX(sal_Int32 nX); inline void SetY(sal_Int32 nY); protected: @@ -121,8 +121,6 @@ protected: sal_Int32 m_nY; }; -sal_Int32 LwpPoint::GetX() const {return m_nX;} -sal_Int32 LwpPoint::GetY() const {return m_nY;} void LwpPoint::SetX(sal_Int32 nX){m_nX = nX;} void LwpPoint::SetY(sal_Int32 nY){m_nY = nY;} diff --git a/lotuswordpro/source/filter/lwpdlvlist.hxx b/lotuswordpro/source/filter/lwpdlvlist.hxx index 6c90a82b51fd..7b36c34f0179 100644 --- a/lotuswordpro/source/filter/lwpdlvlist.hxx +++ b/lotuswordpro/source/filter/lwpdlvlist.hxx @@ -67,9 +67,10 @@ #include "lwpatomholder.hxx" #include "lwpobj.hxx" + /** * @brief Double Linked Virtual List -*/ + */ class LwpDLVList : public LwpObject { public: @@ -82,20 +83,13 @@ protected: protected: void Read() SAL_OVERRIDE; public: - inline LwpObjectID* GetNext(); - inline LwpObjectID* GetPrevious(); + LwpObjectID* GetNext() { return &m_ListNext; } + LwpObjectID* GetPrevious() { return &m_ListPrevious; } }; -LwpObjectID* LwpDLVList::GetNext() -{ - return &m_ListNext; -} -LwpObjectID* LwpDLVList::GetPrevious() -{ - return &m_ListPrevious; -} + /** * @brief Double Linked Named Family Virtual List -*/ + */ class LwpDLNFVList : public LwpDLVList { public: @@ -112,32 +106,13 @@ protected: void ReadName(LwpObjectStream* pObjStrm); public: // 01/17/2005 - inline LwpAtomHolder* GetName(); + LwpAtomHolder* GetName() { return &m_Name; } //end - inline LwpObjectID* GetChildHead(); - inline LwpObjectID* GetChildTail(); - inline LwpObjectID* GetParent(); + LwpObjectID* GetChildHead() { return &m_ChildHead; } + LwpObjectID* GetChildTail() { return &m_ChildTail; } + LwpObjectID* GetParent() { return &m_Parent; } }; -LwpAtomHolder* LwpDLNFVList::GetName() -{ - return &m_Name; -} - -LwpObjectID* LwpDLNFVList::GetChildHead() -{ - return &m_ChildHead; -} - -LwpObjectID* LwpDLNFVList::GetChildTail() -{ - return &m_ChildTail; -} - -LwpObjectID* LwpDLNFVList::GetParent() -{ - return &m_Parent; -} class LwpPropList; /** @@ -155,14 +130,9 @@ protected: void Read() SAL_OVERRIDE; void ReadPropertyList(LwpObjectStream* pObjStrm); public: - inline LwpPropList* GetPropList(); + LwpPropList* GetPropList() { return m_pPropList; } }; -LwpPropList* LwpDLNFPVList::GetPropList() -{ - return m_pPropList; -} - /** * @brief Double Linked Virtual List Head Tail */ @@ -175,17 +145,9 @@ private: LwpObjectID m_ListHead; LwpObjectID m_ListTail; public: - inline LwpObjectID* GetHead(); - inline LwpObjectID* GetTail(); + LwpObjectID* GetHead() { return &m_ListHead; } + LwpObjectID* GetTail() { return &m_ListTail; } }; -LwpObjectID* LwpDLVListHeadTail::GetHead() -{ - return &m_ListHead; -} -LwpObjectID* LwpDLVListHeadTail::GetTail() -{ - return &m_ListTail; -} /** * @brief Double Linked Virtual List Head @@ -196,14 +158,10 @@ public: LwpDLVListHead(){} ~LwpDLVListHead(){} void Read(LwpObjectStream* pObjStrm); - inline LwpObjectID* GetFirst(); + LwpObjectID* GetFirst() { return &m_objHead; } protected: LwpObjectID m_objHead;//LwpDLVList }; -LwpObjectID* LwpDLVListHead::GetFirst() -{ - return &m_objHead; -} #endif diff --git a/lotuswordpro/source/filter/lwpdropcapmgr.cxx b/lotuswordpro/source/filter/lwpdropcapmgr.cxx index ee8398521fac..3772954aa46f 100644 --- a/lotuswordpro/source/filter/lwpdropcapmgr.cxx +++ b/lotuswordpro/source/filter/lwpdropcapmgr.cxx @@ -77,8 +77,4 @@ void LwpDropcapMgr::SetXFPara(XFParagraph* pXFPara) m_pXFPara = pXFPara; } -XFParagraph* LwpDropcapMgr::GetXFPara() -{ - return m_pXFPara; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpdropcapmgr.hxx b/lotuswordpro/source/filter/lwpdropcapmgr.hxx index a8a53d43b039..620ad35e934d 100644 --- a/lotuswordpro/source/filter/lwpdropcapmgr.hxx +++ b/lotuswordpro/source/filter/lwpdropcapmgr.hxx @@ -73,7 +73,7 @@ public: LwpDropcapMgr(); ~LwpDropcapMgr(); void SetXFPara(XFParagraph* pXFPara); - XFParagraph* GetXFPara(); + XFParagraph* GetXFPara() { return m_pXFPara;} private: XFParagraph* m_pXFPara; }; diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 800b6a411c12..9bf661bed57e 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -2123,14 +2123,6 @@ bool LwpPlacableLayout::IsAnchorCell() } /** -* @descr: Get font style for setting position of frame -* -*/ -rtl::Reference<XFFont> LwpPlacableLayout::GetFont() -{ - return m_pFont; -} -/** * @descr: Set font style for setting position of frame * */ diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 525e9dde8bd8..1b2c9aacb06a 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -410,7 +410,11 @@ public: virtual bool IsAnchorFrame() SAL_OVERRIDE; virtual bool IsAnchorCell() SAL_OVERRIDE; virtual void XFConvertFrame(XFContentContainer* /*pCont*/, sal_Int32 /*nStart*/ = 0, sal_Int32 /*nEnd*/ = 0, bool /*bAll*/ = false) {} - rtl::Reference<XFFont> GetFont(); + /** + * @descr: Get font style for setting position of frame + * + */ + rtl::Reference<XFFont> GetFont() { return m_pFont; } void SetFont(rtl::Reference<XFFont> const & pFont); enum WrapType { diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 07dab82a0d8e..152171c9805c 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -759,10 +759,6 @@ LwpBreaksOverride* LwpParaStyle::GetBreaks() const return NULL; } -LwpBulletOverride* LwpParaStyle::GetBulletOverride() const -{ - return m_pBulletOverride; -} LwpNumberingOverride* LwpParaStyle::GetNumberingOverride() const { diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx index 78f2a5bc4435..6a394f4e9bf4 100644 --- a/lotuswordpro/source/filter/lwpparastyle.hxx +++ b/lotuswordpro/source/filter/lwpparastyle.hxx @@ -103,7 +103,7 @@ public: LwpParaBorderOverride* GetParaBorder() const; LwpBreaksOverride* GetBreaks() const; LwpTabOverride* GetTabOverride() const; - LwpBulletOverride* GetBulletOverride() const; + LwpBulletOverride* GetBulletOverride() const { return m_pBulletOverride;} LwpNumberingOverride* GetNumberingOverride() const; public: static void ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::BorderType eType, XFBorders* pXFBorders); diff --git a/lotuswordpro/source/filter/lwpsdwrect.cxx b/lotuswordpro/source/filter/lwpsdwrect.cxx index 189ae3109b7c..884296e72c07 100644 --- a/lotuswordpro/source/filter/lwpsdwrect.cxx +++ b/lotuswordpro/source/filter/lwpsdwrect.cxx @@ -116,15 +116,6 @@ SdwRectangle::~SdwRectangle() } /************************************************************************** * @date: 11/19/2004 - * @short: Get the flag whether if the rectangle has been rotated. - * @return: m_bRotated rotation flag. -**************************************************************************/ -bool SdwRectangle::IsRectRotated() const -{ - return m_bRotated; -} -/************************************************************************** - * @date: 11/19/2004 * @short: Calculate and return center point of the rectangle. * @return: center point **************************************************************************/ diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx index 846c1b9c7c4b..dbcd37d0e4d3 100644 --- a/lotuswordpro/source/filter/lwpsdwrect.hxx +++ b/lotuswordpro/source/filter/lwpsdwrect.hxx @@ -108,7 +108,11 @@ public: ~SdwRectangle(); public: - bool IsRectRotated() const; + /* + * @short: Get the flag whether if the rectangle has been rotated. + * @return: m_bRotated rotation flag. + */ + bool IsRectRotated() const { return m_bRotated;} Point GetRectCenter() const ; diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx index f096e7d8c999..a1777240f850 100644 --- a/lotuswordpro/source/filter/lwpstory.hxx +++ b/lotuswordpro/source/filter/lwpstory.hxx @@ -112,13 +112,13 @@ public: XFContentContainer* GetXFContent(); void AddXFContent(XFContent* pContent); - inline bool GetDropcapFlag(); - inline LwpPageLayout* GetCurrentLayout(); + bool GetDropcapFlag() { return m_bDropcap; } + LwpPageLayout* GetCurrentLayout() { return m_pCurrentLayout; } inline LwpMiddleLayout* GetTabLayout();//for register tab style - inline OUString GetSectionName(); - inline LwpHyperlinkMgr* GetHyperlinkMgr(); + OUString GetSectionName() { return m_CurrSectionName; } + LwpHyperlinkMgr* GetHyperlinkMgr() { return m_pHyperlinkMgr; } - inline bool IsPMModified(); + inline bool IsPMModified() { return m_bPMModified; } inline void SetPMModified(bool bPMModified); inline void SetDropcapFlag(bool bFlag); inline void SetTabLayout(LwpLayout* pLayout); @@ -151,10 +151,6 @@ LwpObjectID* LwpStory::GetLastPara() { return m_ParaList.GetTail(); } -bool LwpStory::GetDropcapFlag() -{ - return m_bDropcap; -} LwpMiddleLayout* LwpStory::GetTabLayout() { if(m_pTabLayout) @@ -177,22 +173,6 @@ void LwpStory::SetSectionName(const OUString& StyleName) { m_CurrSectionName = StyleName; } -OUString LwpStory::GetSectionName() -{ - return m_CurrSectionName; -} -bool LwpStory::IsPMModified() -{ - return m_bPMModified; -} -LwpPageLayout* LwpStory::GetCurrentLayout() -{ - return m_pCurrentLayout; -} -LwpHyperlinkMgr* LwpStory::GetHyperlinkMgr() -{ - return m_pHyperlinkMgr; -} inline void LwpStory::AddBullStyleName2List(const OUString& rStyleName, const sal_uInt8& nPos) { m_vBulletStyleNameList.push_back(std::make_pair(rStyleName, nPos)); diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx index 4b5115d1da85..691a37583421 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx @@ -76,9 +76,5 @@ OUString XFFontDecl::GetFontFamily() return m_strFontFamily; } -bool XFFontDecl::GetFontPitchFixed() -{ - return m_bPitchFixed; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx index eb69e138e8de..b540b93dfd2b 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx @@ -84,7 +84,7 @@ public: */ OUString GetFontFamily(); - bool GetFontPitchFixed(); + bool GetFontPitchFixed() { return m_bPitchFixed;} private: OUString m_strFontName; diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 3ca777f5c163..5127bbcac4d8 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -198,10 +198,6 @@ bool TypeGroupConverter::isPercent() const return maTypeInfo.mbSupportsStacking && (mrModel.mnGrouping == XML_percentStacked); } -bool TypeGroupConverter::is3dChart() const -{ - return mb3dChart; -} bool TypeGroupConverter::isWall3dChart() const { diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 0737830ece35..6948f46a32f6 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -270,20 +270,12 @@ void Shape::setLockedCanvas(bool bLockedCanvas) mbLockedCanvas = bLockedCanvas; } -bool Shape::getLockedCanvas() -{ - return mbLockedCanvas; -} void Shape::setWps(bool bWps) { mbWps = bWps; } -bool Shape::getWps() -{ - return mbWps; -} void Shape::setTextBox(bool bTextBox) { diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx index 17deba75b76b..a4c0c367be46 100644 --- a/oox/source/helper/storagebase.cxx +++ b/oox/source/helper/storagebase.cxx @@ -102,10 +102,6 @@ bool StorageBase::isRootStorage() const return implIsStorage() && maStorageName.isEmpty(); } -bool StorageBase::isReadOnly() const -{ - return mbReadOnly; -} Reference< XStorage > StorageBase::getXStorage() const { diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 58110de201c6..96d43fc980b3 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -154,10 +154,6 @@ void SAL_CALL Deflater::finish( ) { bFinish = true; } -bool SAL_CALL Deflater::finished( ) -{ - return bFinished; -} sal_Int32 SAL_CALL Deflater::doDeflateSegment( uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) { OSL_ASSERT( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength())); diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index b341537f4eff..a9e372c860cf 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -67,15 +67,7 @@ void SAL_CALL Inflater::setInput( const Sequence< sal_Int8 >& rBuffer ) nLength = rBuffer.getLength(); } -bool SAL_CALL Inflater::needsDictionary( ) -{ - return bNeedDict; -} -bool SAL_CALL Inflater::finished( ) -{ - return bFinished; -} sal_Int32 SAL_CALL Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) { diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 57811315bde8..c25262f56c70 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1014,10 +1014,6 @@ OGroupsSortingDialog::~OGroupsSortingDialog() m_pCurrentGroupListener->dispose(); } -bool OGroupsSortingDialog::isReadOnly( ) const -{ - return m_bReadOnly; -} void OGroupsSortingDialog::UpdateData( ) { diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index f853d86d3f65..cfbfe491b1ff 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -114,7 +114,7 @@ namespace rptui void SetMode( DlgEdMode m_eMode ); void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); - sal_uInt16 GetInsertObj() const; + sal_uInt16 GetInsertObj() const { return m_eActObj;} OUString GetInsertObjString() const; DlgEdMode GetMode() const { return m_eMode; } diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index ebe694ce3e4a..a36d64e6594c 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -119,7 +119,7 @@ private: /** returns <TRUE/> when the dialog should be read only */ - bool isReadOnly( ) const; + bool isReadOnly( ) const { return m_bReadOnly;} /** returns the data type for the given column name @param _sColumnName diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index d05f59dca808..c94c27a9555b 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -316,10 +316,6 @@ OUString ODesignView::GetInsertObjString() const } -sal_uInt16 ODesignView::GetInsertObj() const -{ - return m_eActObj; -} void ODesignView::Cut() diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index c6995ea32a47..dbf807dab8e5 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -210,7 +210,7 @@ public: com::sun::star::uno::XInterface>& rInterface ); void SetCallerFromObjectShell( SfxObjectShell* pSh ); - bool ValidParamCount(); + bool ValidParamCount() { return bValidCount;} ScAddInArgumentType GetArgType( long nPos ); void SetParam( long nPos, const com::sun::star::uno::Any& rValue ); diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 534e0dc6275a..cb386f3cac7f 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -379,7 +379,7 @@ private: virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) SAL_OVERRIDE; void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); - const ::boost::unordered_set<sal_uInt16>& getAllFileIds(); + const ::boost::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;} private: ExternalRefListener(); diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 2b1e387afaad..bc8304982dce 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -549,8 +549,8 @@ public: // is col, belonging to a TabDelete bool IsTabDeleteCol() const; - SCsCOL GetDx() const; - SCsROW GetDy() const; + SCsCOL GetDx() const { return nDx; } + SCsROW GetDy() const { return nDy; } ScBigRange GetOverAllRange() const; // BigRange + (nDx, nDy) const ScChangeActionCellListEntry* GetFirstCellEntry() const diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx index 7791a938fddc..b206b33ef999 100644 --- a/sc/inc/clipcontext.hxx +++ b/sc/inc/clipcontext.hxx @@ -83,36 +83,36 @@ public: void setTabRange(SCTAB nStart, SCTAB nEnd); - SCTAB getTabStart() const; - SCTAB getTabEnd() const; + SCTAB getTabStart() const { return mnTabStart;} + SCTAB getTabEnd() const { return mnTabEnd;} void setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); Range getDestRange() const; - ScDocument* getUndoDoc(); - ScDocument* getClipDoc(); - sal_uInt16 getInsertFlag() const; + ScDocument* getUndoDoc() { return mpRefUndoDoc;} + ScDocument* getClipDoc() { return mpClipDoc;} + sal_uInt16 getInsertFlag() const { return mnInsertFlag;} void setDeleteFlag( sal_uInt16 nFlag ); - sal_uInt16 getDeleteFlag() const; + sal_uInt16 getDeleteFlag() const { return mnDeleteFlag;} ScCellValue& getSingleCell(); void setCondFormatList( ScConditionalFormatList* pCondFormatList ); - ScConditionalFormatList* getCondFormatList(); + ScConditionalFormatList* getCondFormatList() { return mpCondFormatList;} - const ScPatternAttr* getSingleCellPattern() const; + const ScPatternAttr* getSingleCellPattern() const { return mpSinglePattern;} void setSingleCellPattern( const ScPatternAttr* pAttr ); - const ScPostIt* getSingleCellNote() const; + const ScPostIt* getSingleCellNote() const { return mpSingleNote;} void setSingleCellNote( const ScPostIt* pNote ); void setTableProtected( bool b ); - bool isTableProtected() const; + bool isTableProtected() const { return mbTableProtected;} - bool isAsLink() const; - bool isSkipAttrForEmptyCells() const; - bool isCloneNotes() const; + bool isAsLink() const { return mbAsLink;} + bool isSkipAttrForEmptyCells() const { return mbSkipAttrForEmptyCells;} + bool isCloneNotes() const { return mbCloneNotes;} bool isDateCell( const ScColumn& rCol, SCROW nRow ) const; }; @@ -127,8 +127,8 @@ public: CopyToClipContext(ScDocument& rDoc, bool bKeepScenarioFlags, bool bCloneNotes); virtual ~CopyToClipContext(); - bool isKeepScenarioFlags() const; - bool isCloneNotes() const; + bool isKeepScenarioFlags() const { return mbKeepScenarioFlags;} + bool isCloneNotes() const { return mbCloneNotes;} }; class CopyToDocContext : public ClipContextBase diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 6639741dced6..b06fe2b8bd32 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -76,7 +76,7 @@ public: const ScTokenArray* GetFormula() const; OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const; - ScColorScaleEntryType GetType() const; + ScColorScaleEntryType GetType() const { return meType;} void SetType( ScColorScaleEntryType eType ); bool NeedsRepaint() const; diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 730855a7e10f..0f2bde98796e 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -348,7 +348,7 @@ public: bool IsValid( const ScAddress& rPos ) const; void SetDateType(condformat::ScCondFormatDateType eType); - condformat::ScCondFormatDateType GetDateType() const; + condformat::ScCondFormatDateType GetDateType() const { return meType;} const OUString& GetStyleName() const; void SetStyleName( const OUString& rStyleName ); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 259d119eeffa..c00f55efd632 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -542,7 +542,7 @@ public: ScRangePairListRef& GetColNameRangesRef() { return xColNameRanges; } ScRangePairListRef& GetRowNameRangesRef() { return xRowNameRanges; } - SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; + SC_DLLPUBLIC ScDBCollection* GetDBCollection() const { return pDBCollection;} void SetDBCollection( ScDBCollection* pNewDBCollection, bool bRemoveAutoFilter = false ); const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly = false) const; @@ -558,7 +558,7 @@ public: SC_DLLPUBLIC ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; ScDPObject* GetDPAtBlock( const ScRange& rBlock ) const; - SC_DLLPUBLIC ScChartCollection* GetChartCollection() const; + SC_DLLPUBLIC ScChartCollection* GetChartCollection() const { return pChartCollection;} void StopTemporaryChartLock(); @@ -629,7 +629,7 @@ public: SC_DLLPUBLIC bool GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ); - bool IsEmbedded() const; + bool IsEmbedded() const { return bIsEmbedded;} void GetEmbedded( ScRange& rRange ) const; void SetEmbedded( const ScRange& rRange ); void ResetEmbedded(); @@ -687,7 +687,7 @@ public: SC_DLLPUBLIC bool IsActiveScenario( SCTAB nTab ) const; SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, bool bActive ); // only for Undo etc. SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention GetAddressConvention() const; - SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const; + SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const { return eGrammar;} SC_DLLPUBLIC void SetGrammar( formula::FormulaGrammar::Grammar eGram ); SC_DLLPUBLIC sal_uInt8 GetLinkMode( SCTAB nTab ) const; bool IsLinked( SCTAB nTab ) const; @@ -762,7 +762,7 @@ public: SfxBindings* GetViewBindings(); SfxObjectShell* GetDocumentShell() const { return pShell; } - SC_DLLPUBLIC ScDrawLayer* GetDrawLayer(); + SC_DLLPUBLIC ScDrawLayer* GetDrawLayer() { return pDrawLayer; } SfxBroadcaster* GetDrawBroadcaster(); // to avoid header void BeginDrawUndo(); @@ -1185,7 +1185,7 @@ public: void EnableExecuteLink( bool bVal ) { mbExecuteLinkEnabled = bVal; } bool IsChangeReadOnlyEnabled() const { return mbChangeReadOnlyEnabled; } void EnableChangeReadOnly( bool bVal ) { mbChangeReadOnlyEnabled = bVal; } - SC_DLLPUBLIC bool IsUserInteractionEnabled() const; + SC_DLLPUBLIC bool IsUserInteractionEnabled() const { return mbUserInteractionEnabled;} SC_DLLPUBLIC void EnableUserInteraction( bool bVal ); SC_DLLPUBLIC sal_Int16 GetNamedRangesLockCount() const { return mnNamedRangesLockCount; } void SetNamedRangesLockCount( sal_Int16 nCount ) { mnNamedRangesLockCount = nCount; } @@ -1411,7 +1411,7 @@ public: SC_DLLPUBLIC ScConditionalFormatList* GetCondFormList( SCTAB nTab ) const; const ScValidationDataList* GetValidationList() const; - ScValidationDataList* GetValidationList(); + ScValidationDataList* GetValidationList() { return pValidationList;} SC_DLLPUBLIC void ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ); @@ -1759,7 +1759,7 @@ public: bool GetNoListening() const { return bNoListening; } ScBroadcastAreaSlotMachine* GetBASM() const { return pBASM; } - SC_DLLPUBLIC ScChartListenerCollection* GetChartListenerCollection() const; + SC_DLLPUBLIC ScChartListenerCollection* GetChartListenerCollection() const { return pChartListenerCollection;} void SetChartListenerCollection( ScChartListenerCollection*, bool bSetChartRangeLists = false ); void UpdateChart( const OUString& rName ); @@ -1955,10 +1955,10 @@ public: return *pRecursionHelper; } bool IsInDtorClear() const { return bInDtorClear; } - void SetExpandRefs( bool bVal ); - bool IsExpandRefs() const; + void SetExpandRefs( bool bVal ); + bool IsExpandRefs() const { return bExpandRefs; } - sal_uLong GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; } + sal_uLong GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; } void IncXMLImportedFormulaCount( sal_uLong nVal ) { if ( nXMLImportedFormulaCount + nVal > nXMLImportedFormulaCount ) diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index 4647227a43e8..06f66c0b7788 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -129,7 +129,7 @@ public: const OUString* InternString(const OUString& rStr) const; void AddReference(ScDPObject* pObj) const; void RemoveReference(ScDPObject* pObj) const; - const ObjectSetType& GetAllReferences() const; + const ObjectSetType& GetAllReferences() const { return maRefObjects;} SCROW GetIdByItemData(long nDim, const ScDPItemData& rItem) const; OUString GetFormattedString(long nDim, const ScDPItemData& rItem) const; @@ -160,15 +160,15 @@ public: bool InitFromDoc(ScDocument* pDoc, const ScRange& rRange); bool InitFromDataBase(DBConnector& rDB); - SCROW GetRowCount() const; + SCROW GetRowCount() const { return mnRowCount;} SCROW GetDataSize() const; SCROW GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty ) const; OUString GetDimensionName(LabelsType::size_type nDim) const; bool IsRowEmpty(SCROW nRow) const; bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam) const; - ScDocument* GetDoc() const; - long GetColumnCount() const; + ScDocument* GetDoc() const { return mpDoc;} + long GetColumnCount() const { return mnColumnCount;} const ScDPItemData* GetItemDataById( long nDim, SCROW nId ) const; diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index cb3b130db8b3..4990a29e8542 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -85,7 +85,7 @@ public: size_t GetItemCount() const { return aItems.size(); } void SetDateDimension(); - bool IsDateDimension() const; + bool IsDateDimension() const { return mbDateDimension;} }; typedef ::std::vector<ScDPGroupDimension> ScDPGroupDimensionVec; @@ -112,7 +112,7 @@ public: void DisposeData(); - bool IsDateDimension() const; + bool IsDateDimension() const { return mbDateDimension;} }; diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 299baa0e2e45..b6866f743c95 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -140,7 +140,7 @@ public: const ScRange& GetOutRange() const { return aOutRange; } void SetHeaderLayout(bool bUseGrid); - bool GetHeaderLayout() const; + bool GetHeaderLayout() const { return mbHeaderLayout;} void SetSheetDesc(const ScSheetSourceDesc& rDesc, bool bFromRefUpdate = false); void SetImportDesc(const ScImportSourceDesc& rDesc); diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index 5bac8c40ab98..d4ff356c739d 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -131,7 +131,7 @@ public: void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); void SetHeaderLayout(bool bUseGrid); - bool GetHeaderLayout() const; + bool GetHeaderLayout() const { return mbHeaderLayout;} static void GetDataDimensionNames( OUString& rSourceName, OUString& rGivenName, diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 207e256eb25e..e02890a2ccb0 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -114,10 +114,10 @@ public: ScDPResultMember* GetColResRoot() const { return pColResRoot; } ScDPResultMember* GetRowResRoot() const { return pRowResRoot; } - const IndexArray& GetColVisible() const; - const IndexArray& GetColSorted() const; - const IndexArray& GetRowVisible() const; - const IndexArray& GetRowSorted() const; + const IndexArray& GetColVisible() const { return maColVisible;} + const IndexArray& GetColSorted() const { return maColSorted;} + const IndexArray& GetRowVisible() const { return maRowVisible;} + const IndexArray& GetRowSorted() const { return maRowSorted;} void AddColIndex( long nVisible, long nSorted ); void AddRowIndex( long nVisible, long nSorted ); @@ -339,7 +339,7 @@ public: ResultMembers* GetDimResultMembers(long nDim, ScDPDimension* pDim, ScDPLevel* pLevel) const; - const ScDPSource& GetSource() const; + const ScDPSource& GetSource() const { return mrSource;} }; class ScDPResultMember @@ -381,7 +381,9 @@ public: bool IsValid() const; bool IsVisible() const; long GetSize(long nMeasure) const; - bool HasHiddenDetails() const; + // bHasHiddenDetails is set only if the "show details" flag is off, + // and there was a child dimension to skip + bool HasHiddenDetails() const { return bHasHiddenDetails; } bool IsSubTotalInTitle(long nMeasure) const; long GetSubTotalCount( long* pUserSubStart = NULL ) const; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 6d9d73e21028..757054fb4131 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -416,9 +416,9 @@ public: void setOrientation(sal_uInt16 nNew); long getPosition() const; bool getIsDataLayoutDimension() const; - sal_uInt16 getFunction() const; + sal_uInt16 getFunction() const { return nFunction;} void setFunction(sal_uInt16 nNew); // for data dimension - long getUsedHierarchy() const; + long getUsedHierarchy() const { return nUsedHier;} void setUsedHierarchy(long nNew); bool HasSelectedPage() const { return bHasSelectedPage; } @@ -638,7 +638,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> getSubTotals() const; - bool getShowEmpty() const; + bool getShowEmpty() const { return bShowEmpty;} const ::com::sun::star::sheet::DataPilotFieldSortInfo& GetSortInfo() const { return aSortInfo; } const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo& GetAutoShow() const { return aAutoShowInfo; } @@ -717,7 +717,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - long getCount() const; + long getCount() const { return nMbrCount;} ScDPMember* getByIndex(long nIndex) const; long getMinMembers() const; @@ -757,7 +757,7 @@ public: bool IsNamedItem(SCROW nIndex) const; SC_DLLPUBLIC const OUString* GetLayoutName() const; - long GetDim() const; + long GetDim() const { return nDim;} sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order @@ -815,8 +815,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - bool isVisible() const; - bool getShowDetails() const; + bool isVisible() const { return bVisible;} + bool getShowDetails() const { return bShowDet;} }; diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx index 4eb57b990135..e13a4b1c6f20 100644 --- a/sc/inc/editdataarray.hxx +++ b/sc/inc/editdataarray.hxx @@ -40,9 +40,9 @@ public: const EditTextObject* GetOldData() const; const EditTextObject* GetNewData() const; - SCTAB GetTab() const; - SCCOL GetCol() const; - SCROW GetRow() const; + SCTAB GetTab() const { return mnTab;} + SCCOL GetCol() const { return mnCol;} + SCROW GetRow() const { return mnRow;} private: Item(); // disabled diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 9bcc64d36f8f..666958a5f60a 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -168,7 +168,7 @@ public: void setReferenced( bool bReferenced ); /// Unconditionally set the reference status flag. void setReferencedFlag( ReferencedFlag eFlag ); - ReferencedFlag getReferencedFlag() const; + ReferencedFlag getReferencedFlag() const { return meReferenced;} bool isReferenced() const; /// Obtain a sorted vector of rows. void getAllRows(::std::vector<SCROW>& rRows, SCROW nLow = 0, SCROW nHigh = MAXROW) const; diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index 3d76950c52a9..bb117090748a 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -241,7 +241,7 @@ public: ScEditSource* pEditSrc, sal_Int32 eType, const ESelection& rSel); virtual ~ScEditFieldObj(); - sal_Int32 GetFieldType() const; + sal_Int32 GetFieldType() const { return meType;} void DeleteField(); bool IsInserted() const; SvxFieldItem CreateFieldItem(); diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 3301d1e54468..25efdb786a8e 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -210,14 +210,14 @@ public: void ResetTableOpDirtyVar(); void SetTableOpDirty(); bool IsDirtyOrInTableOpDirty() const; - bool GetDirty() const; + bool GetDirty() const { return bDirty; } void ResetDirty(); - bool NeedsListening() const; + bool NeedsListening() const { return bNeedListening; } void SetNeedsListening( bool bVar ); void SetNeedsDirty( bool bVar ); void SetNeedNumberFormat( bool bVal ); - bool NeedsNumberFormat() const; - short GetFormatType() const; + bool NeedsNumberFormat() const { return mbNeedsNumberFormat;} + short GetFormatType() const { return nFormatType; } void Compile(const OUString& rFormula, bool bNoListening = false, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ); @@ -230,8 +230,8 @@ public: void CalcAfterLoad( sc::CompileFormulaContext& rCxt ); bool MarkUsedExternalReferences(); void Interpret(); - bool IsIterCell() const; - sal_uInt16 GetSeenInIteration() const; + bool IsIterCell() const { return bIsIterCell; } + sal_uInt16 GetSeenInIteration() const { return nSeenInIteration; } bool HasOneReference( ScRange& r ) const; /* Checks if the formula contains reference list that can be @@ -281,8 +281,8 @@ public: bool TestTabRefAbs(SCTAB nTable); void UpdateCompile( bool bForceIfNameInUse = false ); void FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const; - bool IsSubTotal() const; - bool IsChanged() const; + bool IsSubTotal() const { return bSubTotal;} + bool IsChanged() const { return bChanged;} void SetChanged(bool b); bool IsEmpty(); // formula::svEmptyCell result // display as empty string if formula::svEmptyCell result @@ -300,35 +300,35 @@ public: sal_uInt16 GetRawError(); // don't interpret, just return code or result error bool GetErrorOrValue( sal_uInt16& rErr, double& rVal ); sc::FormulaResultValue GetResult(); - sal_uInt8 GetMatrixFlag() const; - ScTokenArray* GetCode(); + sal_uInt8 GetMatrixFlag() const { return cMatrixFlag;} + ScTokenArray* GetCode() { return pCode;} const ScTokenArray* GetCode() const; void SetCode( ScTokenArray* pNew ); - bool IsRunning() const; + bool IsRunning() const { return bRunning;} void SetRunning( bool bVal ); void CompileDBFormula( sc::CompileFormulaContext& rCxt ); void CompileDBFormula( sc::CompileFormulaContext& rCxt, bool bCreateFormulaString ); void CompileColRowNameFormula( sc::CompileFormulaContext& rCxt ); - ScFormulaCell* GetPrevious() const; - ScFormulaCell* GetNext() const; + ScFormulaCell* GetPrevious() const { return pPrevious; } + ScFormulaCell* GetNext() const { return pNext; } void SetPrevious( ScFormulaCell* pF ); void SetNext( ScFormulaCell* pF ); - ScFormulaCell* GetPreviousTrack() const; - ScFormulaCell* GetNextTrack() const; + ScFormulaCell* GetPreviousTrack() const { return pPreviousTrack; } + ScFormulaCell* GetNextTrack() const { return pNextTrack; } void SetPreviousTrack( ScFormulaCell* pF ); void SetNextTrack( ScFormulaCell* pF ); virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; void SetCompile( bool bVal ); - ScDocument* GetDocument() const; + ScDocument* GetDocument() const { return pDocument;} void SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag=true ); void GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const; // cell belongs to ChangeTrack and not to the real document void SetInChangeTrack( bool bVal ); - bool IsInChangeTrack() const; + bool IsInChangeTrack() const { return bInChangeTrack;} // For import filters! void AddRecalcMode( formula::ScRecalcMode ); @@ -399,7 +399,7 @@ public: void SyncSharedCode(); - bool IsPostponedDirty() const; + bool IsPostponedDirty() const { return mbPostponedDirty;} }; #endif diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx index 7d66f9248ad6..f42fdc7a4054 100644 --- a/sc/inc/listenercontext.hxx +++ b/sc/inc/listenercontext.hxx @@ -52,7 +52,7 @@ public: void setPositionDelta( const ScAddress& rDelta ); ScDocument& getDoc(); - ScTokenArray* getOldCode(); + ScTokenArray* getOldCode() { return mpOldCode;} ScAddress getOldPosition( const ScAddress& rPos ) const; ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol); diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 1c76955da094..3bc60ac4d69a 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -209,7 +209,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - bool IsModifyAndBroadcast() const; + bool IsModifyAndBroadcast() const { return mbModifyAndBroadcast;} /// XNamedRanges virtual void SAL_CALL addNewByName( const OUString& aName, const OUString& aContent, diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index 8a557c6c61e9..a0df79d56a95 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -41,19 +41,19 @@ public: ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNewHidden = false ); ScOutlineEntry( const ScOutlineEntry& rEntry ); - SC_DLLPUBLIC SCCOLROW GetStart() const; - SCSIZE GetSize() const; + SC_DLLPUBLIC SCCOLROW GetStart() const { return nStart;} + SCSIZE GetSize() const { return nSize;} SC_DLLPUBLIC SCCOLROW GetEnd() const; /** * @return true is the group is hidden, false otherwise. */ - SC_DLLPUBLIC bool IsHidden() const; + SC_DLLPUBLIC bool IsHidden() const { return bHidden;} /** * @return true if the control is visible, false otherwise. */ - SC_DLLPUBLIC bool IsVisible() const; + SC_DLLPUBLIC bool IsVisible() const { return bVisible;} void Move( SCsCOLROW nDelta ); void SetSize( SCSIZE nNewSize ); @@ -106,7 +106,7 @@ public: ScOutlineArray(); ScOutlineArray( const ScOutlineArray& rArray ); - size_t GetDepth() const; + size_t GetDepth() const { return nDepth;} bool FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, size_t& rFindLevel) const; @@ -180,7 +180,7 @@ public: ScSubOutlineIterator( ScOutlineArray* pOutlineArray, size_t nLevel, size_t nEntry ); ScOutlineEntry* GetNext(); - size_t LastLevel() const; + size_t LastLevel() const { return nSubLevel;} size_t LastEntry() const; void DeleteLast(); }; diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 47a299761612..5716207e07e7 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -96,7 +96,7 @@ public: bool bCloneCaption ) const; /** Returns the data struct containing all note settings. */ - const ScNoteData& GetNoteData() const; + const ScNoteData& GetNoteData() const { return maNoteData;} /** Returns the creation date of this note. */ const OUString& GetDate() const; diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx index 1c3a067a3f6f..2d1116e66629 100644 --- a/sc/inc/queryentry.hxx +++ b/sc/inc/queryentry.hxx @@ -65,7 +65,7 @@ struct SC_DLLPUBLIC ScQueryEntry utl::TextSearch* GetSearchTextPtr( bool bCaseSens ) const; QueryItemsType& GetQueryItems(); - const QueryItemsType& GetQueryItems() const; + const QueryItemsType& GetQueryItems() const { return maQueryItems;} void SetQueryByEmpty(); bool IsQueryByEmpty() const; void SetQueryByNonEmpty(); diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index f069abdb5dc3..90105cc71402 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -112,7 +112,7 @@ struct ScDBQueryParamBase : public ScQueryParamBase SCCOL mnField; /// the field in which the values are processed during iteration. bool mbSkipString; - DataType GetType() const; + DataType GetType() const { return meType;} virtual ~ScDBQueryParamBase(); diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx index 1f927312327b..146adf8f35d9 100644 --- a/sc/inc/refhint.hxx +++ b/sc/inc/refhint.hxx @@ -31,7 +31,7 @@ protected: public: virtual ~RefHint() = 0; - Type getType() const; + Type getType() const { return meType; } }; class RefMovedHint : public RefHint @@ -68,9 +68,9 @@ public: const sc::ColReorderMapType& getColMap() const; - SCTAB getTab() const; - SCROW getStartRow() const; - SCROW getEndRow() const; + SCTAB getTab() const { return mnTab;} + SCROW getStartRow() const { return mnRow1;} + SCROW getEndRow() const { return mnRow2;} }; } diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx index 21e9ee4e9e09..8d2c5975d1bf 100644 --- a/sc/inc/rowheightcontext.hxx +++ b/sc/inc/rowheightcontext.hxx @@ -36,18 +36,18 @@ public: ~RowHeightContext(); - double getPPTX() const; - double getPPTY() const; + double getPPTX() const { return mfPPTX;} + double getPPTY() const { return mfPPTY;} const Fraction& getZoomX() const; const Fraction& getZoomY() const; - OutputDevice* getOutputDevice(); + OutputDevice* getOutputDevice() { return mpOutDev;} void setExtraHeight( sal_uInt16 nH ); - sal_uInt16 getExtraHeight() const; + sal_uInt16 getExtraHeight() const { return mnExtraHeight;} void setForceAutoSize( bool b ); - bool isForceAutoSize() const; + bool isForceAutoSize() const { return mbForceAutoSize;} }; } diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index cafefdf5d836..055c38e9f05a 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -214,7 +214,7 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = NULL, bool bUseRef = true ); void SetRefInputHdl( ScInputHandler* pNew ); - ScInputHandler* GetRefInputHdl(); + ScInputHandler* GetRefInputHdl() { return pRefInputHandler;} void ViewShellGone(ScTabViewShell* pViewSh); void ViewShellChanged(); diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx index a62e35606115..f1775fd34126 100644 --- a/sc/inc/segmenttree.hxx +++ b/sc/inc/segmenttree.hxx @@ -42,7 +42,7 @@ public: explicit ForwardIterator(ScFlatBoolRowSegments& rSegs); bool getValue(SCROW nPos, bool& rVal); - SCROW getLastPos() const; + SCROW getLastPos() const { return mnLastPos;} private: ScFlatBoolRowSegments& mrSegs; @@ -124,7 +124,7 @@ public: explicit ForwardIterator(ScFlatUInt16RowSegments& rSegs); bool getValue(SCROW nPos, sal_uInt16& rVal); - SCROW getLastPos() const; + SCROW getLastPos() const { return mnLastPos;} private: ScFlatUInt16RowSegments& mrSegs; diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx index 0e6e240681f3..38ae38e29bae 100644 --- a/sc/inc/sheetdata.hxx +++ b/sc/inc/sheetdata.hxx @@ -169,7 +169,7 @@ public: const std::vector<ScTextStyleEntry>& GetNoteTextStyles() const { return maNoteTextStyles; } const std::vector<ScTextStyleEntry>& GetTextStyles() const { return maTextStyles; } - bool IsInSupportedSave() const; + bool IsInSupportedSave() const { return mbInSupportedSave;} void SetInSupportedSave( bool bSet ); }; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 0c008514cbc5..45f8912fa7f4 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -294,7 +294,7 @@ public: void SetName( const OUString& rNewName ); void SetAnonymousDBData(ScDBData* pDBData); - ScDBData* GetAnonymousDBData(); + ScDBData* GetAnonymousDBData() { return pDBDataNoName;} void GetCodeName( OUString& rName ) const { rName = aCodeName; } void SetCodeName( const OUString& rNewName ) { aCodeName = rNewName; } @@ -1105,7 +1105,7 @@ private: * @return Current row position, or ROW_NOT_FOUND if the iterator * doesn't point to a valid data cell position. */ - SCROW getRow() const; + SCROW getRow() const { return mnCurRow;} private: ScFlatBoolRowSegments& mrRowSegs; diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index 9538819e7733..b6aee9504899 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -60,9 +60,9 @@ public: ScTokenArray* Clone() const; /// True copy! void GenHash(); - size_t GetHash() const; + size_t GetHash() const { return mnHashValue;} - ScFormulaVectorState GetVectorState() const; + ScFormulaVectorState GetVectorState() const { return meVectorState;} /** * If the array contains at least one relative row reference or named diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx index 5ba1c0313a52..37965c8fe200 100644 --- a/sc/inc/tokenstringcontext.hxx +++ b/sc/inc/tokenstringcontext.hxx @@ -58,12 +58,12 @@ public: CompileFormulaContext( ScDocument* pDoc ); CompileFormulaContext( ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ); - formula::FormulaGrammar::Grammar getGrammar() const; + formula::FormulaGrammar::Grammar getGrammar() const { return meGram;} void setGrammar( formula::FormulaGrammar::Grammar eGram ); const std::vector<OUString>& getTabNames() const; - ScDocument* getDoc(); + ScDocument* getDoc() { return mpDoc;} }; } diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx index 4e393b790baa..dc313c05d913 100644 --- a/sc/inc/typedstrdata.hxx +++ b/sc/inc/typedstrdata.hxx @@ -32,9 +32,9 @@ public: ScTypedStrData( const ScTypedStrData& rCpy ); bool IsStrData() const; - bool IsDate() const; + bool IsDate() const { return mbIsDate;} SC_DLLPUBLIC const OUString& GetString() const; - StringType GetStringType() const; + StringType GetStringType() const { return meStrType;} double GetValue() const { return mfValue; } struct LessCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool> diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index 8c6e11eddb6f..c2a88dfbebf5 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -36,7 +36,7 @@ public: ScUnitConverterData( const ScUnitConverterData& ); ~ScUnitConverterData(); - double GetValue() const; + double GetValue() const { return mfValue;} const OUString& GetIndexString() const; static OUString BuildIndexString( diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx index c70d9d48de2b..556e3dbcb4d8 100644 --- a/sc/source/core/data/clipcontext.cxx +++ b/sc/source/core/data/clipcontext.cxx @@ -53,15 +53,7 @@ void CopyFromClipContext::setTabRange(SCTAB nStart, SCTAB nEnd) mnTabEnd = nEnd; } -SCTAB CopyFromClipContext::getTabStart() const -{ - return mnTabStart; -} -SCTAB CopyFromClipContext::getTabEnd() const -{ - return mnTabEnd; -} void CopyFromClipContext::setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { @@ -81,30 +73,14 @@ CopyFromClipContext::Range CopyFromClipContext::getDestRange() const return aRet; } -ScDocument* CopyFromClipContext::getUndoDoc() -{ - return mpRefUndoDoc; -} -ScDocument* CopyFromClipContext::getClipDoc() -{ - return mpClipDoc; -} -sal_uInt16 CopyFromClipContext::getInsertFlag() const -{ - return mnInsertFlag; -} void CopyFromClipContext::setDeleteFlag( sal_uInt16 nFlag ) { mnDeleteFlag = nFlag; } -sal_uInt16 CopyFromClipContext::getDeleteFlag() const -{ - return mnDeleteFlag; -} ScCellValue& CopyFromClipContext::getSingleCell() { @@ -116,25 +92,13 @@ void CopyFromClipContext::setCondFormatList( ScConditionalFormatList* pCondForma mpCondFormatList = pCondFormatList; } -ScConditionalFormatList* CopyFromClipContext::getCondFormatList() -{ - return mpCondFormatList; -} -const ScPatternAttr* CopyFromClipContext::getSingleCellPattern() const -{ - return mpSinglePattern; -} void CopyFromClipContext::setSingleCellPattern( const ScPatternAttr* pAttr ) { mpSinglePattern = pAttr; } -const ScPostIt* CopyFromClipContext::getSingleCellNote() const -{ - return mpSingleNote; -} void CopyFromClipContext::setSingleCellNote( const ScPostIt* pNote ) { @@ -146,25 +110,9 @@ void CopyFromClipContext::setTableProtected( bool b ) mbTableProtected = b; } -bool CopyFromClipContext::isTableProtected() const -{ - return mbTableProtected; -} -bool CopyFromClipContext::isAsLink() const -{ - return mbAsLink; -} -bool CopyFromClipContext::isSkipAttrForEmptyCells() const -{ - return mbSkipAttrForEmptyCells; -} -bool CopyFromClipContext::isCloneNotes() const -{ - return mbCloneNotes; -} bool CopyFromClipContext::isDateCell( const ScColumn& rCol, SCROW nRow ) const { @@ -179,15 +127,7 @@ CopyToClipContext::CopyToClipContext( CopyToClipContext::~CopyToClipContext() {} -bool CopyToClipContext::isKeepScenarioFlags() const -{ - return mbKeepScenarioFlags; -} -bool CopyToClipContext::isCloneNotes() const -{ - return mbCloneNotes; -} CopyToDocContext::CopyToDocContext(ScDocument& rDoc) : ClipContextBase(rDoc) {} CopyToDocContext::~CopyToDocContext() {} diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index c5001497e0dc..fe8eff879695 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -343,10 +343,6 @@ void ScColorScaleEntry::SetType( ScColorScaleEntryType eType ) } } -ScColorScaleEntryType ScColorScaleEntry::GetType() const -{ - return meType; -} double ScColorScaleFormat::GetMinValue() const { diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 80a2b53c26dd..2fb8cf125d6c 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1775,10 +1775,6 @@ void ScCondDateFormatEntry::SetDateType( condformat::ScCondFormatDateType eType meType = eType; } -condformat::ScCondFormatDateType ScCondDateFormatEntry::GetDateType() const -{ - return meType; -} const OUString& ScCondDateFormatEntry::GetStyleName() const { diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index d65c42c16cb3..a1bc567efb9d 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -368,10 +368,6 @@ void ScDocument::SetExpandRefs( bool bVal ) bExpandRefs = bVal; } -bool ScDocument::IsExpandRefs() const -{ - return bExpandRefs; -} void ScDocument::StartTrackTimer() { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 051c0d1faef7..2a4bde6506ba 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -229,10 +229,6 @@ const ScRangeData* ScDocument::GetRangeAtBlock( const ScRange& rBlock, OUString* return pData; } -ScDBCollection* ScDocument::GetDBCollection() const -{ - return pDBCollection; -} void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, bool bRemoveAutoFilter ) { @@ -362,10 +358,6 @@ ScDPObject* ScDocument::GetDPAtBlock( const ScRange & rBlock ) const return NULL; } -ScChartCollection* ScDocument::GetChartCollection() const -{ - return pChartCollection; -} void ScDocument::StopTemporaryChartLock() { @@ -373,10 +365,6 @@ void ScDocument::StopTemporaryChartLock() apTemporaryChartLock->StopLocking(); } -ScChartListenerCollection* ScDocument::GetChartListenerCollection() const -{ - return pChartListenerCollection; -} void ScDocument::SetChartListenerCollection( ScChartListenerCollection* pNewChartListenerCollection, @@ -466,10 +454,6 @@ formula::FormulaGrammar::AddressConvention ScDocument::GetAddressConvention() co return formula::FormulaGrammar::extractRefConvention(eGrammar); } -formula::FormulaGrammar::Grammar ScDocument::GetGrammar() const -{ - return eGrammar; -} void ScDocument::SetGrammar( formula::FormulaGrammar::Grammar eGram ) { @@ -1628,10 +1612,6 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) } -bool ScDocument::IsEmbedded() const -{ - return bIsEmbedded; -} void ScDocument::GetEmbedded( ScRange& rRange ) const { diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 1247563867de..54f1508f9298 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -1184,10 +1184,6 @@ SfxBindings* ScDocument::GetViewBindings() return NULL; } -ScDrawLayer* ScDocument::GetDrawLayer() -{ - return pDrawLayer; -} void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ) { diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 87451de19fea..928a478e4480 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4508,10 +4508,6 @@ const ScValidationDataList* ScDocument::GetValidationList() const return pValidationList; } -ScValidationDataList* ScDocument::GetValidationList() -{ - return pValidationList; -} void ScDocument::ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ) { @@ -6083,10 +6079,6 @@ void ScDocument::EnableUndo( bool bVal ) mbUndoEnabled = bVal; } -bool ScDocument::IsUserInteractionEnabled() const -{ - return mbUserInteractionEnabled; -} void ScDocument::EnableUserInteraction( bool bVal ) { diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 478fc0a3e53e..bf402f5beb4d 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -829,10 +829,6 @@ size_t ScDPCache::GetGroupFieldCount() const return maGroupFields.size(); } -SCROW ScDPCache::GetRowCount() const -{ - return mnRowCount; -} SCROW ScDPCache::GetDataSize() const { @@ -912,10 +908,6 @@ void ScDPCache::RemoveReference(ScDPObject* pObj) const mpDoc->GetDPCollection()->RemoveCache(this); } -const ScDPCache::ObjectSetType& ScDPCache::GetAllReferences() const -{ - return maRefObjects; -} SCROW ScDPCache::GetIdByItemData(long nDim, const ScDPItemData& rItem) const { @@ -1154,15 +1146,8 @@ SCROW ScDPCache::GetOrder(long /*nDim*/, SCROW nIndex) const return nIndex; } -ScDocument* ScDPCache::GetDoc() const -{ - return mpDoc; -}; +; -long ScDPCache::GetColumnCount() const -{ - return mnColumnCount; -} #if DEBUG_PIVOT_TABLE diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index f2a68f56af83..e2eeea7a0971 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -434,10 +434,6 @@ void ScDPGroupDimension::SetDateDimension() mbDateDimension = true; } -bool ScDPGroupDimension::IsDateDimension() const -{ - return mbDateDimension; -} ScDPNumGroupDimension::ScDPNumGroupDimension() : mbDateDimension(false) {} @@ -460,10 +456,6 @@ void ScDPNumGroupDimension::DisposeData() maMemberEntries.clear(); } -bool ScDPNumGroupDimension::IsDateDimension() const -{ - return mbDateDimension; -} ScDPNumGroupDimension::~ScDPNumGroupDimension() { diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 97b1a153fc0b..df40306ab97b 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -408,10 +408,6 @@ void ScDPObject::SetHeaderLayout (bool bUseGrid) mbHeaderLayout = bUseGrid; } -bool ScDPObject::GetHeaderLayout() const -{ - return mbHeaderLayout; -} void ScDPObject::SetOutRange(const ScRange& rRange) { diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 21e958f555d9..0cec6affe9ac 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -1229,10 +1229,6 @@ void ScDPOutput::SetHeaderLayout(bool bUseGrid) bSizesValid = false; } -bool ScDPOutput::GetHeaderLayout() const -{ - return mbHeaderLayout; -} namespace { diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 6382ae2ea311..976c991099bf 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -315,25 +315,9 @@ ScDPRunningTotalState::ScDPRunningTotalState( ScDPResultMember* pColRoot, ScDPRe maRowSorted.push_back(-1); } -const ScDPRunningTotalState::IndexArray& ScDPRunningTotalState::GetColVisible() const -{ - return maColVisible; -} -const ScDPRunningTotalState::IndexArray& ScDPRunningTotalState::GetColSorted() const -{ - return maColSorted; -} -const ScDPRunningTotalState::IndexArray& ScDPRunningTotalState::GetRowVisible() const -{ - return maRowVisible; -} -const ScDPRunningTotalState::IndexArray& ScDPRunningTotalState::GetRowSorted() const -{ - return maRowSorted; -} void ScDPRunningTotalState::AddColIndex( long nVisible, long nSorted ) { @@ -907,10 +891,6 @@ bool ScDPResultData::HasCommonElement( SCROW nFirstDataId, long nFirstIndex, return false; } -const ScDPSource& ScDPResultData::GetSource() const -{ - return mrSource; -} ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDim, ScDPLevel* pLevel) const { @@ -1227,14 +1207,6 @@ bool ScDPResultMember::IsValid() const return true; } -bool ScDPResultMember::HasHiddenDetails() const -{ - // bHasHiddenDetails is set only if the "show details" flag is off, - // and there was a child dimension to skip - - return bHasHiddenDetails; -} - long ScDPResultMember::GetSubTotalCount( long* pUserSubStart ) const { if ( pUserSubStart ) diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index d746eadcb279..8355ff48c5d3 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1426,20 +1426,12 @@ bool ScDPDimension::getIsDataLayoutDimension() const return pSource->GetData()->getIsDataLayoutDimension( nDim ); } -sal_uInt16 ScDPDimension::getFunction() const -{ - return nFunction; -} void ScDPDimension::setFunction(sal_uInt16 nNew) { nFunction = nNew; } -long ScDPDimension::getUsedHierarchy() const -{ - return nUsedHier; -} void ScDPDimension::setUsedHierarchy(long /* nNew */) { @@ -2207,10 +2199,6 @@ uno::Sequence<sheet::GeneralFunction> ScDPLevel::getSubTotals() const return aSubTotals; } -bool ScDPLevel::getShowEmpty() const -{ - return bShowEmpty; -} // XPropertySet @@ -2447,10 +2435,6 @@ sal_Bool SAL_CALL ScDPMembers::hasElements() throw(uno::RuntimeException, std::e // end of XNameAccess implementation -long ScDPMembers::getCount() const -{ - return nMbrCount; -} long ScDPMembers::getMinMembers() const { @@ -2645,10 +2629,6 @@ const OUString* ScDPMember::GetLayoutName() const return mpLayoutName.get(); } -long ScDPMember::GetDim() const -{ - return nDim; -} OUString ScDPMember::GetNameStr() const { @@ -2668,15 +2648,7 @@ void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::R OSL_FAIL("not implemented"); //! exception? } -bool ScDPMember::isVisible() const -{ - return bVisible; -} -bool ScDPMember::getShowDetails() const -{ - return bShowDet; -} // XPropertySet diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 7891500cdfb0..c7e9aeb6006e 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -991,9 +991,7 @@ void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ) } } -bool ScFormulaCell::GetDirty() const { return bDirty; } void ScFormulaCell::ResetDirty() { bDirty = bTableOpDirty = mbPostponedDirty = false; } -bool ScFormulaCell::NeedsListening() const { return bNeedListening; } void ScFormulaCell::SetNeedsListening( bool bVar ) { bNeedListening = bVar; } void ScFormulaCell::SetNeedsDirty( bool bVar ) @@ -1003,12 +1001,7 @@ void ScFormulaCell::SetNeedsDirty( bool bVar ) void ScFormulaCell::SetNeedNumberFormat( bool bVal ) { mbNeedsNumberFormat = bVal; } -bool ScFormulaCell::NeedsNumberFormat() const -{ - return mbNeedsNumberFormat; -} -short ScFormulaCell::GetFormatType() const { return nFormatType; } void ScFormulaCell::Compile( const OUString& rFormula, bool bNoListening, const FormulaGrammar::Grammar eGrammar ) @@ -1582,8 +1575,6 @@ void ScFormulaCell::Interpret() } } -bool ScFormulaCell::IsIterCell() const { return bIsIterCell; } -sal_uInt16 ScFormulaCell::GetSeenInIteration() const { return nSeenInIteration; } void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) { @@ -1908,10 +1899,6 @@ void ScFormulaCell::SetCompile( bool bVal ) bCompile = bVal; } -ScDocument* ScFormulaCell::GetDocument() const -{ - return pDocument; -} void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag ) { @@ -1945,10 +1932,6 @@ void ScFormulaCell::SetInChangeTrack( bool bVal ) bInChangeTrack = bVal; } -bool ScFormulaCell::IsInChangeTrack() const -{ - return bInChangeTrack; -} void ScFormulaCell::Notify( const SfxHint& rHint ) { @@ -3398,30 +3381,14 @@ void ScFormulaCell::FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() ); } -bool ScFormulaCell::IsSubTotal() const -{ - return bSubTotal; -} -bool ScFormulaCell::IsChanged() const -{ - return bChanged; -} void ScFormulaCell::SetChanged(bool b) { bChanged = b; } -sal_uInt8 ScFormulaCell::GetMatrixFlag() const -{ - return cMatrixFlag; -} -ScTokenArray* ScFormulaCell::GetCode() -{ - return pCode; -} const ScTokenArray* ScFormulaCell::GetCode() const { @@ -3435,10 +3402,6 @@ void ScFormulaCell::SetCode( ScTokenArray* pNew ) pCode = pNew; // takes ownership. } -bool ScFormulaCell::IsRunning() const -{ - return bRunning; -} void ScFormulaCell::SetRunning( bool bVal ) { @@ -3526,12 +3489,8 @@ void ScFormulaCell::CompileColRowNameFormula( sc::CompileFormulaContext& rCxt ) } } -ScFormulaCell* ScFormulaCell::GetPrevious() const { return pPrevious; } -ScFormulaCell* ScFormulaCell::GetNext() const { return pNext; } void ScFormulaCell::SetPrevious( ScFormulaCell* pF ) { pPrevious = pF; } void ScFormulaCell::SetNext( ScFormulaCell* pF ) { pNext = pF; } -ScFormulaCell* ScFormulaCell::GetPreviousTrack() const { return pPreviousTrack; } -ScFormulaCell* ScFormulaCell::GetNextTrack() const { return pNextTrack; } void ScFormulaCell::SetPreviousTrack( ScFormulaCell* pF ) { pPreviousTrack = pF; } void ScFormulaCell::SetNextTrack( ScFormulaCell* pF ) { pNextTrack = pF; } @@ -4090,9 +4049,5 @@ void ScFormulaCell::SyncSharedCode() pCode = mxGroup->mpCode; } -bool ScFormulaCell::IsPostponedDirty() const -{ - return mbPostponedDirty; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/listenercontext.cxx b/sc/source/core/data/listenercontext.cxx index dcdffac65710..d6b92ebe0ef6 100644 --- a/sc/source/core/data/listenercontext.cxx +++ b/sc/source/core/data/listenercontext.cxx @@ -49,10 +49,6 @@ ScDocument& EndListeningContext::getDoc() return mrDoc; } -ScTokenArray* EndListeningContext::getOldCode() -{ - return mpOldCode; -} ScAddress EndListeningContext::getOldPosition( const ScAddress& rPos ) const { diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index 605c80d9def5..fb420674283a 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -41,29 +41,13 @@ ScOutlineEntry::ScOutlineEntry( const ScOutlineEntry& rEntry ) : { } -SCCOLROW ScOutlineEntry::GetStart() const -{ - return nStart; -} -SCSIZE ScOutlineEntry::GetSize() const -{ - return nSize; -} SCCOLROW ScOutlineEntry::GetEnd() const { return nStart+nSize-1; } -bool ScOutlineEntry::IsHidden() const -{ - return bHidden; -} -bool ScOutlineEntry::IsVisible() const -{ - return bVisible; -} void ScOutlineEntry::Move( SCsCOLROW nDelta ) { @@ -305,10 +289,6 @@ bool ScOutlineArray::Insert( return true; } -size_t ScOutlineArray::GetDepth() const -{ - return nDepth; -} bool ScOutlineArray::FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, size_t& rFindLevel) const @@ -884,10 +864,6 @@ ScOutlineEntry* ScSubOutlineIterator::GetNext() return pEntry; // nSubLevel gueltig, wenn pEntry != 0 } -size_t ScSubOutlineIterator::LastLevel() const -{ - return nSubLevel; -} size_t ScSubOutlineIterator::LastEntry() const { diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index a3459af1c2ce..703dc8aaa506 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -509,10 +509,6 @@ ScPostIt* ScPostIt::Clone( const ScAddress& rOwnPos, ScDocument& rDestDoc, const return bCloneCaption ? new ScPostIt( rDestDoc, rDestPos, *this ) : new ScPostIt( rDestDoc, rDestPos, maNoteData, false ); } -const ScNoteData& ScPostIt::GetNoteData() const -{ - return maNoteData; -} const OUString& ScPostIt::GetDate() const { diff --git a/sc/source/core/data/rowheightcontext.cxx b/sc/source/core/data/rowheightcontext.cxx index 9fa96d130ec0..408bf4df759a 100644 --- a/sc/source/core/data/rowheightcontext.cxx +++ b/sc/source/core/data/rowheightcontext.cxx @@ -22,15 +22,7 @@ RowHeightContext::RowHeightContext( RowHeightContext::~RowHeightContext() {} -double RowHeightContext::getPPTX() const -{ - return mfPPTX; -} -double RowHeightContext::getPPTY() const -{ - return mfPPTY; -} const Fraction& RowHeightContext::getZoomX() const { @@ -42,30 +34,18 @@ const Fraction& RowHeightContext::getZoomY() const return maZoomY; } -OutputDevice* RowHeightContext::getOutputDevice() -{ - return mpOutDev; -} void RowHeightContext::setExtraHeight( sal_uInt16 nH ) { mnExtraHeight = nH; } -sal_uInt16 RowHeightContext::getExtraHeight() const -{ - return mnExtraHeight; -} void RowHeightContext::setForceAutoSize( bool b ) { mbForceAutoSize = b; } -bool RowHeightContext::isForceAutoSize() const -{ - return mbForceAutoSize; -} } diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index caf7201c9422..a5bf3c833d4e 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -291,10 +291,6 @@ bool ScFlatBoolRowSegments::ForwardIterator::getValue(SCROW nPos, bool& rVal) return true; } -SCROW ScFlatBoolRowSegments::ForwardIterator::getLastPos() const -{ - return mnLastPos; -} ScFlatBoolRowSegments::RangeIterator::RangeIterator(ScFlatBoolRowSegments& rSegs) : mrSegs(rSegs) @@ -460,10 +456,6 @@ bool ScFlatUInt16RowSegments::ForwardIterator::getValue(SCROW nPos, sal_uInt16& return true; } -SCROW ScFlatUInt16RowSegments::ForwardIterator::getLastPos() const -{ - return mnLastPos; -} ScFlatUInt16RowSegments::ScFlatUInt16RowSegments(sal_uInt16 nDefault) : mpImpl(new ScFlatUInt16SegmentsImpl(static_cast<SCCOLROW>(MAXROW), nDefault)) diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index b7e020f5a04b..fe407e0db71c 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -2076,10 +2076,6 @@ ScRefCellValue ScTable::VisibleDataCellIterator::next() return ScRefCellValue(); } -SCROW ScTable::VisibleDataCellIterator::getRow() const -{ - return mnCurRow; -} void ScTable::SetAnonymousDBData(ScDBData* pDBData) { @@ -2087,10 +2083,6 @@ void ScTable::SetAnonymousDBData(ScDBData* pDBData) pDBDataNoName = pDBData; } -ScDBData* ScTable::GetAnonymousDBData() -{ - return pDBDataNoName; -} sal_uLong ScTable::AddCondFormat( ScConditionalFormat* pNew ) { diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 73b03c567d87..8d19ab9ac5c3 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -94,11 +94,11 @@ public: explicit ScTableProtectionImpl(SCSIZE nOptSize); explicit ScTableProtectionImpl(const ScTableProtectionImpl& r); - bool isProtected() const; + bool isProtected() const { return mbProtected;} bool isProtectedWithPass() const; void setProtected(bool bProtected); - bool isPasswordEmpty() const; + bool isPasswordEmpty() const { return mbEmptyPass;} bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const; void setPassword(const OUString& aPassText); ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash( @@ -189,10 +189,6 @@ ScTableProtectionImpl::ScTableProtectionImpl(const ScTableProtectionImpl& r) : { } -bool ScTableProtectionImpl::isProtected() const -{ - return mbProtected; -} bool ScTableProtectionImpl::isProtectedWithPass() const { @@ -224,10 +220,6 @@ void ScTableProtectionImpl::setPassword(const OUString& aPassText) } } -bool ScTableProtectionImpl::isPasswordEmpty() const -{ - return mbEmptyPass; -} bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const { diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 3ae711a30518..1ca4d1cf0b69 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -71,7 +71,7 @@ public: protected: ScDBRangeBase(ScDocument* pDoc, RefType eType); - ScDocument* getDoc() const; + ScDocument* getDoc() const { return mpDoc;} /** * Populate query options that are always the same for all database diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 642699a5a0be..37d7f6053c02 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -140,7 +140,7 @@ public: NOT_VOLATILE }; - VolatileType GetVolatileType() const; + VolatileType GetVolatileType() const { return meVolatileType;} private: static ScCalcConfig maGlobalConfig; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index bbc709ea1b4f..d8539b9d76aa 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1346,10 +1346,6 @@ ScUnoAddInCall::~ScUnoAddInCall() // pFuncData is deleted with ScUnoAddInCollection } -bool ScUnoAddInCall::ValidParamCount() -{ - return bValidCount; -} ScAddInArgumentType ScUnoAddInCall::GetArgType( long nPos ) { diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index d8c9e86a4d3a..b2097a119d42 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -883,8 +883,6 @@ bool ScChangeActionDel::IsTabDeleteCol() const return p && p->GetType() == SC_CAT_DELETE_TABS; } -SCsCOL ScChangeActionDel::GetDx() const { return nDx; } -SCsROW ScChangeActionDel::GetDy() const { return nDy; } ScChangeActionDelMoveEntry* ScChangeActionDel::AddCutOffMove( ScChangeActionMove* pMove, short nFrom, short nTo ) diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 4b8887cc1adf..66a9edbbc043 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -266,10 +266,6 @@ void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam) pParam->bDuplicate = true; } -ScDocument* ScDBRangeBase::getDoc() const -{ - return mpDoc; -} ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) : ScDBRangeBase(pDoc, INTERNAL), maRange(rRange) diff --git a/sc/source/core/tool/editdataarray.cxx b/sc/source/core/tool/editdataarray.cxx index b3946d4c011c..a635d64a465e 100644 --- a/sc/source/core/tool/editdataarray.cxx +++ b/sc/source/core/tool/editdataarray.cxx @@ -72,19 +72,7 @@ const EditTextObject* ScEditDataArray::Item::GetNewData() const return mpNewData.get(); } -SCTAB ScEditDataArray::Item::GetTab() const -{ - return mnTab; -} -SCCOL ScEditDataArray::Item::GetCol() const -{ - return mnCol; -} -SCROW ScEditDataArray::Item::GetRow() const -{ - return mnRow; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 2205ed7d9320..a49e87c3847e 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -334,10 +334,6 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR, bool bEmpty) return pMat; } -ScInterpreter::VolatileType ScInterpreter::GetVolatileType() const -{ - return meVolatileType; -} ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index a282f4dce500..455c8c6617cb 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -84,10 +84,6 @@ ScQueryEntry::QueryItemsType& ScQueryEntry::GetQueryItems() return maQueryItems; } -const ScQueryEntry::QueryItemsType& ScQueryEntry::GetQueryItems() const -{ - return maQueryItems; -} void ScQueryEntry::SetQueryByEmpty() { diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index 26cb756b85d3..295d952af67e 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -394,10 +394,6 @@ ScDBQueryParamBase::~ScDBQueryParamBase() { } -ScDBQueryParamBase::DataType ScDBQueryParamBase::GetType() const -{ - return meType; -} ScDBQueryParamInternal::ScDBQueryParamInternal() : ScDBQueryParamBase(ScDBQueryParamBase::INTERNAL), diff --git a/sc/source/core/tool/refhint.cxx b/sc/source/core/tool/refhint.cxx index 0e70b4f22ac3..56e21e41d035 100644 --- a/sc/source/core/tool/refhint.cxx +++ b/sc/source/core/tool/refhint.cxx @@ -14,7 +14,6 @@ namespace sc { RefHint::RefHint( Type eType ) : SfxSimpleHint(SC_HINT_REFERENCE), meType(eType) {} RefHint::~RefHint() {} -RefHint::Type RefHint::getType() const { return meType; } RefMovedHint::RefMovedHint( const ScRange& rRange, const ScAddress& rMove ) : RefHint(Moved), maRange(rRange), maMoveDelta(rMove) {} @@ -41,20 +40,8 @@ const sc::ColReorderMapType& RefColReorderHint::getColMap() const return mrColMap; } -SCTAB RefColReorderHint::getTab() const -{ - return mnTab; -} -SCROW RefColReorderHint::getStartRow() const -{ - return mnRow1; -} -SCROW RefColReorderHint::getEndRow() const -{ - return mnRow2; -} } diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 8b3cc2581029..84e3c2a02470 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -206,7 +206,7 @@ public: void Clear(); void SetImmutable(bool bVal); - bool IsImmutable() const; + bool IsImmutable() const { return mbCloneIfConst;} void Resize(SCSIZE nC, SCSIZE nR); void Resize(SCSIZE nC, SCSIZE nR, double fVal); void SetErrorInterpreter( ScInterpreter* p); @@ -314,10 +314,6 @@ void ScMatrixImpl::SetImmutable(bool bVal) mbCloneIfConst = bVal; } -bool ScMatrixImpl::IsImmutable() const -{ - return mbCloneIfConst; -} void ScMatrixImpl::Resize(SCSIZE nC, SCSIZE nR) { diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 4ac537f45155..92900583f69a 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1675,15 +1675,7 @@ void ScTokenArray::GenHash() mnHashValue = nHash; } -size_t ScTokenArray::GetHash() const -{ - return mnHashValue; -} -ScFormulaVectorState ScTokenArray::GetVectorState() const -{ - return meVectorState; -} bool ScTokenArray::IsInvariant() const { diff --git a/sc/source/core/tool/tokenstringcontext.cxx b/sc/source/core/tool/tokenstringcontext.cxx index 31bca19b7aea..de23ddb7e7d4 100644 --- a/sc/source/core/tool/tokenstringcontext.cxx +++ b/sc/source/core/tool/tokenstringcontext.cxx @@ -128,10 +128,6 @@ void CompileFormulaContext::updateTabNames() } } -formula::FormulaGrammar::Grammar CompileFormulaContext::getGrammar() const -{ - return meGram; -} void CompileFormulaContext::setGrammar( formula::FormulaGrammar::Grammar eGram ) { @@ -146,10 +142,6 @@ const std::vector<OUString>& CompileFormulaContext::getTabNames() const return maTabNames; } -ScDocument* CompileFormulaContext::getDoc() -{ - return mpDoc; -} } diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index ad0142beb02a..b13e49a4af6a 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -104,20 +104,12 @@ bool ScTypedStrData::IsStrData() const return meStrType != Value; } -bool ScTypedStrData::IsDate() const -{ - return mbIsDate; -} const OUString& ScTypedStrData::GetString() const { return maStrValue; } -ScTypedStrData::StringType ScTypedStrData::GetStringType() const -{ - return meStrType; -} FindTypedStrData::FindTypedStrData(const ScTypedStrData& rVal, bool bCaseSens) : maVal(rVal), mbCaseSens(bCaseSens) {} diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 8b8468395351..87f4c8d96d44 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -41,10 +41,6 @@ ScUnitConverterData::ScUnitConverterData( const ScUnitConverterData& r ) : ScUnitConverterData::~ScUnitConverterData() {} -double ScUnitConverterData::GetValue() const -{ - return mfValue; -} const OUString& ScUnitConverterData::GetIndexString() const { diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 5a391a6ec792..4c5bdb98bab9 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -473,11 +473,6 @@ XclExpBiff8Encrypter::~XclExpBiff8Encrypter() { } -bool XclExpBiff8Encrypter::IsValid() const -{ - return mbValid; -} - void XclExpBiff8Encrypter::GetSaltDigest( sal_uInt8 pnSaltDigest[16] ) const { if ( sizeof( mpnSaltDigest ) == 16 ) diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 0c75adfd41b1..3cda3814c0aa 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -203,11 +203,6 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : InsertName(pTokArr); } -bool XclImpName::IsMacro() const -{ - return mbMacro; -} - void XclImpName::ConvertTokens() { if (!mpTokensData) diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index da208ffdd54a..a94e35dc26a6 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -346,7 +346,7 @@ public: /** Returns the source column index of the pivot field with the passed index, or -1. */ sal_Int32 getCacheDatabaseIndex( sal_Int32 nFieldIdx ) const; - ScDPObject* getDPObject(); + ScDPObject* getDPObject() { return mpDPObject; } private: typedef RefVector< PivotTableField > PivotTableFieldVector; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 13a225b9a735..d5744f87f6de 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -201,7 +201,7 @@ public: explicit XclExpBiff8Encrypter( const XclExpRoot& rRoot ); ~XclExpBiff8Encrypter(); - bool IsValid() const; + bool IsValid() const { return mbValid; } void GetSaltDigest( sal_uInt8 pnSaltDigest[16] ) const; void GetSalt( sal_uInt8 pnSalt[16] ) const; diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index e41630befffe..75a5936b9b22 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -55,7 +55,7 @@ public: inline const ScRangeData* GetScRangeData() const { return mpScData; } inline bool IsGlobal() const { return mnScTab == SCTAB_MAX; } inline bool IsVBName() const { return mbVBName; } - bool IsMacro() const; + bool IsMacro() const { return mbMacro; } void ConvertTokens(); private: diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 9bf341e4ab99..a1966560946b 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -1291,11 +1291,6 @@ sal_Int32 PivotTable::getCacheDatabaseIndex( sal_Int32 nFieldIdx ) const return mpPivotCache ? mpPivotCache->getCacheDatabaseIndex( nFieldIdx ) : -1; } -ScDPObject* PivotTable::getDPObject() -{ - return mpDPObject; -} - // private -------------------------------------------------------------------- PivotTableField* PivotTable::getTableField( sal_Int32 nFieldIdx ) diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx index 19e5be3285d7..6d8da1aa6de6 100644 --- a/sc/source/filter/starcalc/collect.cxx +++ b/sc/source/filter/starcalc/collect.cxx @@ -75,7 +75,6 @@ ScCollection::~ScCollection() } -sal_uInt16 ScCollection::GetCount() const { return nCount; } bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject) { diff --git a/sc/source/filter/starcalc/collect.hxx b/sc/source/filter/starcalc/collect.hxx index 9f6258a207e7..45f1e093db8e 100644 --- a/sc/source/filter/starcalc/collect.hxx +++ b/sc/source/filter/starcalc/collect.hxx @@ -48,7 +48,7 @@ public: bool Insert(ScDataObject* pScDataObject); ScDataObject* At(sal_uInt16 nIndex) const; - sal_uInt16 GetCount() const; + sal_uInt16 GetCount() const { return nCount; } ScDataObject* operator[]( const sal_uInt16 nIndex) const { return At(nIndex); } ScCollection& operator= ( const ScCollection& rCol ); diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 8f394d2f7308..74ac1deefdbc 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -255,10 +255,6 @@ bool ScSheetSaveData::AddLoadedNamespaces( SvXMLNamespaceMap& rNamespaces ) cons return true; // success } -bool ScSheetSaveData::IsInSupportedSave() const -{ - return mbInSupportedSave; -} void ScSheetSaveData::SetInSupportedSave( bool bSet ) { diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 91280264ff96..acc062027607 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1944,10 +1944,6 @@ void ScXMLImport::SetPostProcessData( sc::ImportPostProcessData* p ) mpPostProcessData = p; } -sc::ImportPostProcessData* ScXMLImport::GetPostProcessData() -{ - return mpPostProcessData; -} sc::PivotTableSources& ScXMLImport::GetPivotTableSources() { diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 1f449827f951..8f28ea9c648d 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -1111,7 +1111,7 @@ public: const SvXMLTokenMap& GetDataStreamAttrTokenMap(); void SetPostProcessData( sc::ImportPostProcessData* p ); - sc::ImportPostProcessData* GetPostProcessData(); + sc::ImportPostProcessData* GetPostProcessData() { return mpPostProcessData;} sc::PivotTableSources& GetPivotTableSources(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index a881971f8856..040a2a1d0a72 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -89,7 +89,7 @@ public: ~ScNotesChildren(); void Init(const Rectangle& rVisRect, sal_Int32 nOffset); - sal_Int32 GetChildrenCount() const; + sal_Int32 GetChildrenCount() const { return mnParagraphs;} uno::Reference<XAccessible> GetChild(sal_Int32 nIndex) const; uno::Reference<XAccessible> GetAt(const awt::Point& rPoint) const; @@ -212,10 +212,6 @@ void ScNotesChildren::Init(const Rectangle& rVisRect, sal_Int32 nOffset) } } -sal_Int32 ScNotesChildren::GetChildrenCount() const -{ - return mnParagraphs; -} struct ScParaFound { diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index a05c3a501c23..947ae2f05757 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1723,10 +1723,6 @@ void ScTextWnd::UpdateAutoCorrFlag() } } -ScTabViewShell* ScTextWnd::GetViewShell() -{ - return mpViewShell; -} void ScTextWnd::StartEditEngine() { diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index dc97b247a015..951b43fb0d1b 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1472,10 +1472,6 @@ void ScModule::SetRefInputHdl( ScInputHandler* pNew ) pRefInputHandler = pNew; } -ScInputHandler* ScModule::GetRefInputHdl() -{ - return pRefInputHandler; -} void ScModule::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd ) diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 8462d1ae20d9..c011a673a13f 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -100,10 +100,6 @@ void ScInputStatusItem::SetMisspellRanges( const std::vector<editeng::MisspellRa mpMisspellRanges = pRanges; } -const std::vector<editeng::MisspellRanges>* ScInputStatusItem::GetMisspellRanges() const -{ - return mpMisspellRanges; -} // ScPaintHint was moved to schints.cxx diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 1b05eff304be..c4c6be5810fb 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -476,10 +476,6 @@ void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, fireMenuHighlightedEvent(); } -size_t ScMenuFloatingWindow::getSelectedMenuItem() const -{ - return mnSelectedMenu; -} void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItemData* pTimer) { @@ -741,10 +737,6 @@ void ScMenuFloatingWindow::getMenuItemPosSize(size_t nPos, Point& rPos, Size& rS rSize = Size(aWndSize.Width() - nLeftMargin*2, nH); } -ScMenuFloatingWindow* ScMenuFloatingWindow::getParentMenuWindow() const -{ - return mpParentMenu; -} size_t ScMenuFloatingWindow::getEnclosingMenuItem(const Point& rPos) const { @@ -850,10 +842,6 @@ void ScMenuFloatingWindow::terminateAllPopupMenus() mpParentMenu->terminateAllPopupMenus(); } -ScDocument* ScMenuFloatingWindow::getDoc() -{ - return mpDoc; -} ScCheckListMenuWindow::Config::Config() : mbAllowEmptySet(true), mbRTL(false) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index dfcbb4bc7971..0810ea2bbb41 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -124,10 +124,6 @@ void ScCondFrmtEntry::Deselect() SetHeight(); } -bool ScCondFrmtEntry::IsSelected() const -{ - return mbActive; -} IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) { diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 053fd9c8f04b..888d7e4c810a 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -146,10 +146,6 @@ ScConditionalFormatList* ScCondFormatManagerDlg::GetConditionalFormatList() return pList; } -bool ScCondFormatManagerDlg::CondFormatsChanged() -{ - return mbModified; -} IMPL_LINK_NOARG(ScCondFormatManagerDlg, RemoveBtnHdl) { diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 3b1f4263813d..5b9951c6769a 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -378,15 +378,7 @@ ScRange DataStream::GetRange() const return aRange; } -bool DataStream::IsRefreshOnEmptyLine() const -{ - return mbRefreshOnEmptyLine; -} -DataStream::MoveType DataStream::GetMove() const -{ - return meOrigMove; -} void DataStream::Decode(const OUString& rURL, const ScRange& rRange, sal_Int32 nLimit, MoveType eMove, const sal_uInt32 nSettings) diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index cbf967aaf74c..216599f8c43b 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -60,10 +60,6 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) return bRet; } -bool ScDocShell::IsEmpty() const -{ - return bIsEmpty; -} void ScDocShell::SetEmpty(bool bSet) diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index f297c53d45d1..22d295e68295 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -280,11 +280,6 @@ void ScDocShell::UnlockDocument_Impl(sal_uInt16 nNew) } } -sal_uInt16 ScDocShell::GetLockCount() const -{ - return nDocumentLock; -} - void ScDocShell::SetLockCount(sal_uInt16 nNew) { if (nNew) // setzen @@ -390,11 +385,6 @@ void ScDocShell::CalcOutputFactor() } } -double ScDocShell::GetOutputFactor() const -{ - return nPrtToScreenFactor; -} - void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and Load { // Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index cce3e2fba694..a4d03f29b080 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -274,10 +274,6 @@ void ScExternalRefCache::Table::setReferenced( bool bReferenced ) meReferenced = (bReferenced ? REFERENCED_MARKED : UNREFERENCED); } -ScExternalRefCache::Table::ReferencedFlag ScExternalRefCache::Table::getReferencedFlag() const -{ - return meReferenced; -} bool ScExternalRefCache::Table::isReferenced() const { diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index b98a9028df91..d64c7015cd1b 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -65,14 +65,14 @@ public: void clearSelectedMenuItem(); ScMenuFloatingWindow* getSubMenuWindow(size_t nPos) const; bool isMenuItemSelected(size_t nPos) const; - size_t getSelectedMenuItem() const; + size_t getSelectedMenuItem() const { return mnSelectedMenu;} void setName(const OUString& rName); const OUString& getName() const; void executeMenuItem(size_t nPos); void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const; - ScMenuFloatingWindow* getParentMenuWindow() const; + ScMenuFloatingWindow* getParentMenuWindow() const { return mpParentMenu;} protected: virtual void handlePopupEnd(); @@ -90,7 +90,7 @@ protected: void fillMenuItemsToAccessible(ScAccessibleFilterMenu* pAccMenu) const; - ScDocument* getDoc(); + ScDocument* getDoc() { return mpDoc;} protected: ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 1b54fa3e049e..aa38d0d0a7d4 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -69,7 +69,7 @@ public: virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - bool IsSelected() const; + bool IsSelected() const { return mbActive;} void SetIndex(sal_Int32 nIndex); sal_Int32 GetIndex() const { return mnIndex; } void SetHeight(); diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 381eb65ffbe7..4531b9defc96 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -53,7 +53,7 @@ public: ScConditionalFormatList* GetConditionalFormatList(); - bool CondFormatsChanged(); + bool CondFormatsChanged() { return mbModified;} virtual bool IsInRefMode() const; diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 055460de23ac..d7320ecefe04 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -81,9 +81,9 @@ public: ScRange GetRange() const; const OUString& GetURL() const { return msURL; } const sal_Int32& GetLimit() const { return mnLimit; } - MoveType GetMove() const; + MoveType GetMove() const { return meOrigMove;} const sal_uInt32& GetSettings() const { return mnSettings; } - bool IsRefreshOnEmptyLine() const; + bool IsRefreshOnEmptyLine() const { return mbRefreshOnEmptyLine;} void Decode( const OUString& rURL, const ScRange& rRange, sal_Int32 nLimit, diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 89706d2fd5b4..16d84bb09852 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -353,7 +353,7 @@ public: void LockPaint(); void UnlockPaint(); - sal_uInt16 GetLockCount() const; + sal_uInt16 GetLockCount() const { return nDocumentLock;} void SetLockCount(sal_uInt16 nNew); void LockDocument(); @@ -364,14 +364,14 @@ public: virtual SfxStyleSheetBasePool* GetStyleSheetPool() SAL_OVERRIDE; void SetInplace( bool bInplace ); - bool IsEmpty() const; + bool IsEmpty() const { return bIsEmpty; } void SetEmpty(bool bSet); bool IsInUndo() const { return bIsInUndo; } void SetInUndo(bool bSet); void CalcOutputFactor(); - double GetOutputFactor() const; + double GetOutputFactor() const { return nPrtToScreenFactor;} void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, SCTAB nCurTab, bool& rbHeader, diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 2a5fd8b1f5c0..68d39e422676 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -107,7 +107,7 @@ protected: void ImplInitSettings(); void UpdateAutoCorrFlag(); - ScTabViewShell* GetViewShell(); + ScTabViewShell* GetViewShell() { return mpViewShell;} typedef ::std::vector< ScAccessibleEditLineTextData* > AccTextDataVector; diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index e0f8addead60..9a59e93b5832 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -34,10 +34,10 @@ public: ScMoveTableDlg(Window* pParent, const OUString& rDefault); virtual ~ScMoveTableDlg(); - sal_uInt16 GetSelectedDocument () const; - SCTAB GetSelectedTable () const; - bool GetCopyTable () const; - bool GetRenameTable () const; + sal_uInt16 GetSelectedDocument () const { return nDocument; } + SCTAB GetSelectedTable () const { return nTable; } + bool GetCopyTable () const { return bCopyTable; } + bool GetRenameTable () const { return bRenameTable; } void GetTabNameString( OUString& rString ) const; void SetForceCopyTable (); void EnableCopyTable (bool bFlag=true); diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index e2147cd19f75..c83a234c9898 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -292,7 +292,7 @@ public: ScPrintHFParam GetHeader(){return aHdr;} ScPrintHFParam GetFooter(){return aFtr;} - bool HasPrintRange() const; + bool HasPrintRange() const { return mbHasPrintRange;} private: void Construct( const ScPrintOptions* pOptions ); diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index dfb8e8be5568..d624759ba9f7 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -259,7 +259,7 @@ public: /** Returns the current tab bar width relative to the frame window width (0.0 ... 1.0). */ SC_DLLPUBLIC double GetRelTabBarWidth() const; /** Returns the pending tab bar width relative to the frame window width (0.0 ... 1.0). */ - double GetPendingRelTabBarWidth() const; + double GetPendingRelTabBarWidth() const { return mfPendingTabBarWidth;} void DoResize( const Point& rOffset, const Size& rSize, bool bInner = false ); void RepeatResize( bool bUpdateFix = true ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 9eeb6f825dfe..aa22c2ffabb9 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -252,7 +252,7 @@ public: bool IsRefInputMode() const; void ExecuteInputDirect(); - ScInputHandler* GetInputHandler() const; + ScInputHandler* GetInputHandler() const { return pInputHandler;} void UpdateInputHandler( bool bForce = false, bool bStopEditing = true ); void UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ); bool TabKeyInput(const KeyEvent& rKEvt); @@ -330,7 +330,7 @@ public: void SetFormShellAtTop( bool bSet ); - ObjectSelectionType GetCurObjectSelectionType(); + ObjectSelectionType GetCurObjectSelectionType() { return eCurOST; } virtual ErrCode DoVerb(long nVerb) SAL_OVERRIDE; virtual void Initialize() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 249c0a0ce134..5ca8953e0ced 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -123,7 +123,7 @@ public: void SetPopupMenu(PopupMenu* pPopUp); - sal_uInt16 GetSelected() const; + sal_uInt16 GetSelected() const { return nSelected;} OString GetSelectedIdent() const; void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 88dae719cbd7..976d54b30f20 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -83,7 +83,7 @@ public: const EditTextObject* GetEditData() const { return pEditData; } void SetMisspellRanges( const std::vector<editeng::MisspellRanges>* pRanges ); - const std::vector<editeng::MisspellRanges>* GetMisspellRanges() const; + const std::vector<editeng::MisspellRanges>* GetMisspellRanges() const { return mpMisspellRanges;} }; diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index ecf5b609bf9f..9d57e0574323 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -70,13 +70,9 @@ ScMoveTableDlg::~ScMoveTableDlg() { } -sal_uInt16 ScMoveTableDlg::GetSelectedDocument () const { return nDocument; } -SCTAB ScMoveTableDlg::GetSelectedTable () const { return nTable; } -bool ScMoveTableDlg::GetCopyTable () const { return bCopyTable; } -bool ScMoveTableDlg::GetRenameTable () const { return bRenameTable; } void ScMoveTableDlg::GetTabNameString( OUString& rString ) const { diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index da277055e6f8..2c92ccc7bbe3 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -350,10 +350,6 @@ void ScExtIButton::SetPopupMenu(PopupMenu* pPopUp) pPopupMenu=pPopUp; } -sal_uInt16 ScExtIButton::GetSelected() const -{ - return nSelected; -} OString ScExtIButton::GetSelectedIdent() const { diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index bdc61d7d7371..5545c03d1131 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -372,10 +372,6 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } } -SfxBindings* AlignmentPropertyPanel::GetBindings() -{ - return mpBindings; -} void AlignmentPropertyPanel::FormatDegrees(double& dTmp) { diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 8552e25b8615..c67e17f047e5 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -56,7 +56,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //ui controls diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 0b244106622e..d6c091448a80 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -656,10 +656,6 @@ void CellAppearancePropertyPanel::NotifyItemUpdate( } } -SfxBindings* CellAppearancePropertyPanel::GetBindings() -{ - return mpBindings; -} void CellAppearancePropertyPanel::SetStyleIcon() { diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 028d067eb33f..4224e39f683b 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -65,7 +65,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //ui controls diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 145beb9e0ee2..6fda69ac8b7d 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -316,10 +316,6 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( } } -SfxBindings* NumberFormatPropertyPanel::GetBindings() -{ - return mpBindings; -} }} // end of namespace ::sc::sidebar diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 69f1cbc94270..4a0dc7ca7437 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -54,7 +54,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //ui controls diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 4792d86b4b78..3da876a99c3a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -3016,10 +3016,6 @@ void ScChart2DataSequence::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } -const boost::unordered_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListener::getAllFileIds() -{ - return maFileIds; -} uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw (uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index e91cfe10b652..8021562df8a0 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -1187,10 +1187,6 @@ SvxFieldItem ScEditFieldObj::CreateFieldItem() return SvxFieldItem(*getData(), EE_FEATURE_FIELD); } -sal_Int32 ScEditFieldObj::GetFieldType() const -{ - return meType; -} void ScEditFieldObj::DeleteField() { diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 14bcecac00d4..6d4107401305 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -491,10 +491,6 @@ void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -bool ScNamedRangesObj::IsModifyAndBroadcast() const -{ - return mbModifyAndBroadcast; -} // sheet::XNamedRanges diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 6a1bbf184b07..9381ffeee91e 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -155,7 +155,9 @@ public: const Size& GetTextSize() const { return aTextSize; } long GetOriginalWidth() const { return nOriginalWidth; } - sal_uLong GetResultValueFormat() const; + // Get the effective number format, including formula result types. + // This assumes that a formula cell has already been calculated. + sal_uLong GetResultValueFormat() const { return nValueFormat;} sal_uLong GetValueFormat() const { return nValueFormat; } bool GetLineBreak() const { return bLineBreak; } @@ -794,14 +796,6 @@ bool ScDrawStringsVars::HasEditCharacters() const return false; } -sal_uLong ScDrawStringsVars::GetResultValueFormat() const -{ - // Get the effective number format, including formula result types. - // This assumes that a formula cell has already been calculated. - - return nValueFormat; -} - double ScOutputData::GetStretch() { if ( mpRefDevice->IsMapMode() ) diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index f3cb9b60d2d1..9988884e7c5e 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -312,10 +312,6 @@ void ScPrintFunc::GetPrintState( ScPrintState& rState ) rState.nDocPages = nDocPages; } -bool ScPrintFunc::HasPrintRange() const -{ - return mbHasPrintRange; -} bool ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const { diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 286f1c1fef12..caaee2278c04 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -858,10 +858,6 @@ double ScTabView::GetRelTabBarWidth() const return 0.0; } -double ScTabView::GetPendingRelTabBarWidth() const -{ - return mfPendingTabBarWidth; -} ScGridWindow* ScTabView::GetActiveWin() { diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 80b7e77347e5..14ed4aec4bb7 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1059,10 +1059,6 @@ IMPL_LINK_NOARG(ScTabViewShell, FormControlActivated) return 0; } -ObjectSelectionType ScTabViewShell::GetCurObjectSelectionType() -{ - return eCurOST; -} // GetMySubShell / SetMySubShell: altes Verhalten simulieren, // dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 712520ff0360..122e24cac482 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -98,10 +98,6 @@ void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ ) { } -ScInputHandler* ScTabViewShell::GetInputHandler() const -{ - return pInputHandler; -} OUString ScTabViewShell::GetDescription() const { diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index a66886622eb2..8d0385cca039 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -361,11 +361,6 @@ throw ( provider::ScriptFrameworkErrorException, return xScript; } -bool -MasterScriptProvider::isValid() -{ - return m_bIsValid; -} ProviderCache* diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index b1153272e85a..e321a2cac131 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -114,7 +114,7 @@ public: private: OUString parseLocationName( const OUString& location ); void createPkgProvider(); - bool isValid(); + bool isValid() { return m_bIsValid;} OUString getURLForModel(); const css::uno::Sequence< OUString >& getProviderNames(); diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index da589b87f33f..6310fe3c4a42 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -267,10 +267,10 @@ public: ::sd::DrawDocShell* pBookmarkDocSh, bool bCopy, Point* pObjPos); - bool IsStartWithPresentation() const; + bool IsStartWithPresentation() const { return mbStartWithPresentation;} void SetStartWithPresentation( bool bStartWithPresentation ); - bool IsExitAfterPresenting() const; + bool IsExitAfterPresenting() const { return mbExitAfterPresenting;} void SetExitAfterPresenting( bool bExitAfterPresenting ); /// load xml-based impress layout definitions into document @@ -401,7 +401,7 @@ public: scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const> when formatting depends on the current printer metrics. */ - sal_Int32 GetPrinterIndependentLayout (void); + sal_Int32 GetPrinterIndependentLayout (void) { return mnPrinterIndependentLayout;} void SetOnlineSpell( bool bIn ); bool GetOnlineSpell() const { return mbOnlineSpell; } diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 0b695f0fdb3f..b3af2ebb7889 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -107,7 +107,7 @@ public: The returned pointer is NULL when the device could not be created when this modules was instantiated. */ - OutputDevice* GetVirtualRefDevice (void); + OutputDevice* GetVirtualRefDevice (void) { return mpVirtualRefDevice;} /** Deprecated alias to <member>GetVirtualRefDevice</member>. @param rDocShell diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 4cce90698c09..d73b3245539b 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -242,19 +242,19 @@ public: void SetStopSound( bool bStopSound ) { mbStopSound = bStopSound; } bool IsStopSound() const { return mbStopSound; } - sal_Int16 getTransitionType() const; + sal_Int16 getTransitionType() const { return mnTransitionType;} void setTransitionType( sal_Int16 nTransitionType ); - sal_Int16 getTransitionSubtype() const; + sal_Int16 getTransitionSubtype() const { return mnTransitionSubtype;} void setTransitionSubtype( sal_Int16 nTransitionSubtype ); - bool getTransitionDirection() const; + bool getTransitionDirection() const { return mbTransitionDirection;} void setTransitionDirection( bool bTransitionbDirection ); - sal_Int32 getTransitionFadeColor() const; + sal_Int32 getTransitionFadeColor() const { return mnTransitionFadeColor;} void setTransitionFadeColor( sal_Int32 nTransitionFadeColor ); - double getTransitionDuration() const; + double getTransitionDuration() const { return mfTransitionDuration;} void setTransitionDuration( double fTranstionDuration ); virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, @@ -371,7 +371,7 @@ public: When this method returns <TRUE/> for a master page then this master page should not be deleted automatically. */ - bool IsPrecious (void) const; + bool IsPrecious (void) const { return mbIsPrecious; } void createAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); void addAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, int nIndex = -1 ); diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 2245654020af..957f946cbec5 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -925,25 +925,13 @@ void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode) } } -sal_Int32 SdDrawDocument::GetPrinterIndependentLayout (void) -{ - return mnPrinterIndependentLayout; -} -bool SdDrawDocument::IsStartWithPresentation() const -{ - return mbStartWithPresentation; -} void SdDrawDocument::SetStartWithPresentation( bool bStartWithPresentation ) { mbStartWithPresentation = bStartWithPresentation; } -bool SdDrawDocument::IsExitAfterPresenting() const -{ - return mbExitAfterPresenting; -} void SdDrawDocument::SetExitAfterPresenting( bool bExitAfterPresenting ) { diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 477ea485179c..30ea98df6027 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -3077,14 +3077,6 @@ void SdPage::SetPrecious (const bool bIsPrecious) -bool SdPage::IsPrecious (void) const -{ - return mbIsPrecious; -} - - - - HeaderFooterSettings::HeaderFooterSettings() { mbHeaderVisible = true; diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index d76d29a3fb77..c3b80fbfc937 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -528,10 +528,6 @@ void SdPage::RemoveEmptyPresentationObjects() } } -sal_Int16 SdPage::getTransitionType (void) const -{ - return mnTransitionType; -} void SdPage::setTransitionType( sal_Int16 nTransitionType ) { @@ -539,10 +535,6 @@ void SdPage::setTransitionType( sal_Int16 nTransitionType ) ActionChanged(); } -sal_Int16 SdPage::getTransitionSubtype (void) const -{ - return mnTransitionSubtype; -} void SdPage::setTransitionSubtype ( sal_Int16 nTransitionSubtype ) { @@ -550,10 +542,6 @@ void SdPage::setTransitionSubtype ( sal_Int16 nTransitionSubtype ) ActionChanged(); } -bool SdPage::getTransitionDirection (void) const -{ - return mbTransitionDirection; -} void SdPage::setTransitionDirection ( bool bTransitionbDirection ) { @@ -561,10 +549,6 @@ void SdPage::setTransitionDirection ( bool bTransitionbDirection ) ActionChanged(); } -sal_Int32 SdPage::getTransitionFadeColor (void) const -{ - return mnTransitionFadeColor; -} void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) { @@ -572,10 +556,6 @@ void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) ActionChanged(); } -double SdPage::getTransitionDuration (void) const -{ - return mfTransitionDuration; -} void SdPage::setTransitionDuration ( double fTranstionDuration ) { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index e62bf65ffa6d..ef01a40afff0 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -74,10 +74,6 @@ AccessibleSlideSorterObject::~AccessibleSlideSorterObject (void) -sal_uInt16 AccessibleSlideSorterObject::GetPageNumber (void) const -{ - return mnPageNumber; -} diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 78e8920a1bfb..5714eeb81a39 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -186,7 +186,7 @@ public: bool getIsPreview() const; void setIsPreview( bool bIsPreview ); - sal_uInt16 getId() const; + sal_uInt16 getId() const { return mnId;} bool select( const OUString& rsPresetId ); @@ -473,10 +473,6 @@ void CustomAnimationCreateTabPage::setIsPreview( bool bIsPreview ) mpCBXPReview->Check( bIsPreview ); } -sal_uInt16 CustomAnimationCreateTabPage::getId() const -{ - return mnId; -} bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) { diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 15b157801e11..b3392e6ba665 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -226,10 +226,6 @@ SvNumberFormatter* SdModule::GetNumberFormatter() return pNumberFormatter; } -OutputDevice* SdModule::GetVirtualRefDevice (void) -{ - return mpVirtualRefDevice; -} /** This method is deprecated and only an alias to * <member>GetVirtualRefDevice()</member>. The given argument is ignored. diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 77997dc97467..cff6d88dea58 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -738,10 +738,6 @@ sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Se } -SdDrawDocument* SdTransferable::GetSourceDoc (void) const -{ - return mpSourceDoc; -} void SdTransferable::AddUserData (const ::boost::shared_ptr<UserData>& rpData) { diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index a80f78302621..f0f1c62c7481 100644 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -142,10 +142,6 @@ bool Assistent::IsFirstPage() const return nPage == 0; } -int Assistent::GetCurrentPage() const -{ - return mnCurrentPage; -} bool Assistent::IsEnabled( int nPage ) const { diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 980af6305811..cc0ac1b3cf71 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -160,10 +160,6 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction ) -NavigatorDragType SdPageObjsTLB::SdPageObjsTransferable::GetDragType() const -{ - return meDragType; -} @@ -837,10 +833,6 @@ void SdPageObjsTLB::SetShowAllShapes ( -bool SdPageObjsTLB::GetShowAllShapes (void) const -{ - return mbShowAllShapes; -} diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 2882d0c43b9c..e5c5273b0ce2 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -647,10 +647,6 @@ bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com: return bRet; } -SdDrawDocument* DrawDocShell::GetDoc() -{ - return mpDoc; -} SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool() { diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index c6fc83a08d8c..43523f16f1c4 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -89,10 +89,6 @@ void SmartTag::deselect() -bool SmartTag::isSelected() const -{ - return mbSelected; -} diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 351c28e1b7b6..d4a7270b51a7 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -77,7 +77,7 @@ public: /** The page number as given to the constructor. */ - sal_uInt16 GetPageNumber (void) const; + sal_uInt16 GetPageNumber (void) const { return mnPageNumber;} void FireAccessibleEvent ( short nEventId, diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 084040be7bf7..492732f329a4 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -153,7 +153,7 @@ public: The returned pointer is <NULL/> after a call to ReleaseViewShellBase(). */ - ViewShellBase* GetViewShellBase (void); + ViewShellBase* GetViewShellBase (void) { return mpBase;} /** This method is typically called from the destructor of ViewShellBase to tell the DrawController that it and its members must not access diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 151ed6975889..4ce23492310b 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -113,7 +113,7 @@ public: rtl::Reference<FuPoor> GetDocShellFunction() const { return mxDocShellFunction; } void SetDocShellFunction( const rtl::Reference<FuPoor>& xFunction ); - SdDrawDocument* GetDoc(); + SdDrawDocument* GetDoc() { return mpDoc;} DocumentType GetDocumentType() const { return meDocType; } SfxPrinter* GetPrinter(bool bCreate); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 96c5c9c94de6..5c4a63344611 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -285,7 +285,7 @@ public: void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); - bool IsLayerModeActive (void) const; + bool IsLayerModeActive (void) const { return mbIsLayerModeActive;} sal_uInt16* GetSlotArray() const { return mpSlotArray; } diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index e0309275fd22..db095b8abfc1 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -66,7 +66,7 @@ public: The result may be <NULL/> when the SetFormShell() method has not yet been called or was last called with <NULL/>. */ - FmFormShell* GetFormShell (void); + FmFormShell* GetFormShell (void) { return mpFormShell;} private: ViewShellBase& mrBase; diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 40bdffe449bd..c83b7f2e8bb5 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -94,7 +94,7 @@ public: PageKind GetPageKindOnLoad() const { return mePageKindOnLoad; } void SetSelectedPage (sal_uInt16 nPage); - sal_uInt16 GetSelectedPage () const; + sal_uInt16 GetSelectedPage () const { return mnSelectedPage;} /** is used in FrameView::ReadUserDataSequence() only to store the page that was selected while last saving this document */ @@ -114,7 +114,7 @@ public: /** Return the value of the edit mode as it was when the document was loaded. */ - EditMode GetViewShEditModeOnLoad (void) const; + EditMode GetViewShEditModeOnLoad (void) const { return meEditModeOnLoad;} void SetLayerMode(bool bMode) { mbLayerMode = bMode; } @@ -141,14 +141,14 @@ public: /** Return the type of the view shell previously associated with this frame view. */ - ViewShell::ShellType GetPreviousViewShellType (void) const; + ViewShell::ShellType GetPreviousViewShellType (void) const { return mePreviousViewShellType;} /** Remember the type of the view shell at the time when the document is loaded or, rather, when the ViewShellBase is constructed. */ void SetViewShellTypeOnLoad (ViewShell::ShellType eType); - ViewShell::ShellType GetViewShellTypeOnLoad (void) const; + ViewShell::ShellType GetViewShellTypeOnLoad (void) const { return meViewShellTypeOnLoad;} void SetPresentationViewShellId(sal_uInt16 nId) { mnPresViewShellId = nId; } @@ -167,7 +167,7 @@ public: double GetTabCtrlPercent() const { return mnTabCtrlPercent; } void SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes); - bool IsNavigatorShowingAllShapes (void) const; + bool IsNavigatorShowingAllShapes (void) const { return mbIsNavigatorShowingAllShapes;} virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 8df6870572bf..df312e82b1e8 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -111,7 +111,7 @@ public: DECL_LINK( EndDropHdl, void * ); DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo* ); - sal_uLong GetPaperWidth(); + sal_uLong GetPaperWidth() { return mnPaperWidth;} bool PrepareClose(bool bUI = true); diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 2781d367afcf..55934933d68a 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -84,7 +84,7 @@ public: Calling this method should be necessary only during startup and shutdown (when that can be detected). */ - bool IsValid (void) const; + bool IsValid (void) const { return mbIsValid;} /** Create a new slide sorter that is strongly coupled to the given view shell. Use this function for a slide sorter in the left pane. @@ -150,7 +150,7 @@ public: @return May be empty. */ - ViewShell* GetViewShell (void) const; + ViewShell* GetViewShell (void) const { return mpViewShell;} /** Return the XController object of the main view. */ @@ -161,7 +161,7 @@ public: @return May be empty. */ - ViewShellBase* GetViewShellBase (void) const; + ViewShellBase* GetViewShellBase (void) const { return mpViewShellBase;} void Paint (const Rectangle& rRepaintArea); diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index da4098d5f5f3..672342b08487 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -115,9 +115,9 @@ public: void UpdateSelectionClipboard( bool bForceDeselect ); - inline DrawDocShell* GetDocSh(void) const; + inline DrawDocShell* GetDocSh(void) const { return mpDocSh; } inline SdDrawDocument& GetDoc(void) const; - inline ViewShell* GetViewShell(void) const; + inline ViewShell* GetViewShell(void) const { return mpViewSh; } virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, @@ -275,20 +275,11 @@ private: }; -DrawDocShell* View::GetDocSh (void) const -{ - return mpDocSh; -} SdDrawDocument& View::GetDoc (void) const { return mrDoc; } -ViewShell* View::GetViewShell (void) const -{ - return mpViewSh; -} - } // end of namespace sd #endif diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 87edbc5a611e..378d6f069aa9 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -146,9 +146,9 @@ public: /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline ::Window* GetParentWindow (void) const; + inline ::Window* GetParentWindow (void) const { return mpParentWindow; } - inline ::sd::View* GetView (void) const; + inline ::sd::View* GetView (void) const { return mpView; } inline SdrView* GetDrawView (void) const; SD_DLLPUBLIC DrawDocShell* GetDocSh (void) const; @@ -159,7 +159,7 @@ public: /** The active window is usually the mpContentWindow. When there is a show running then the active window is a ShowWindow. */ - ::sd::Window* GetActiveWindow (void) const; + ::sd::Window* GetActiveWindow (void) const { return mpActiveWindow;} /** Set the active window. When the shell is displayed in the center pane then the window of the ViewShellBase is also set to the given @@ -196,7 +196,7 @@ public: const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId); - bool HasRuler (void); + bool HasRuler (void) { return mbHasRulers;} void SetRuler(bool bRuler); /** Set internal values of all scroll bars that determine thumb size and @@ -222,9 +222,9 @@ public: void ExecReq( SfxRequest &rReq ); - ZoomList* GetZoomList (void); + ZoomList* GetZoomList (void) { return mpZoomList;} - FrameView* GetFrameView (void); + FrameView* GetFrameView (void) { return mpFrameView; } /** Setting a frame view triggers ReadFrameViewData() for the new frame. @param pFrameView @@ -594,16 +594,6 @@ private: -::Window* ViewShell::GetParentWindow (void) const -{ - return mpParentWindow; -} - -::sd::View* ViewShell::GetView (void) const -{ - return mpView; -} - SdrView* ViewShell::GetDrawView (void) const { return static_cast<SdrView*>(mpView); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index e693e6183065..038de7685c9f 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -102,8 +102,8 @@ public: */ static ViewShellBase* GetViewShellBase (SfxViewFrame* pFrame); - DrawDocShell* GetDocShell (void) const; - SdDrawDocument* GetDocument (void) const; + DrawDocShell* GetDocShell (void) const { return mpDocShell;} + SdDrawDocument* GetDocument (void) const { return mpDocument;} /** Callback function for general slot calls. At the moment these are slots for switching the pane docking windows on and off. diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index 677ca5dc982b..049e02790937 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -49,7 +49,7 @@ public: ViewShellHint (HintId nHintId); - HintId GetHintId (void) const; + HintId GetHintId (void) const { return meHintId;} private: HintId meHintId; diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index cb04ba7c952b..6dc691d49c8e 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -63,7 +63,7 @@ public: bool IsFirstPage() const; - int GetCurrentPage() const; + int GetCurrentPage() const { return mnCurrentPage;} }; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index dad48ca76f70..6a0ffca46a7b 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -76,7 +76,7 @@ public: NavigatorDragType eDragType, const ::com::sun::star::uno::Any& rTreeListBoxData ); ::sd::DrawDocShell& GetDocShell() const; - NavigatorDragType GetDragType() const; + NavigatorDragType GetDragType() const { return meDragType;} static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); static SdPageObjsTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); @@ -201,7 +201,7 @@ public: void Fill( const SdDrawDocument*, bool bAllPages, const OUString& rDocName ); void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); - bool GetShowAllShapes (void) const; + bool GetShowAllShapes (void) const { return mbShowAllShapes;} bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); bool HasSelectedChildren( const OUString& rName ); bool SelectEntry( const OUString& rName ); diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 10ebdf788dcb..095beecf83dd 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -79,7 +79,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; - SdDrawDocument* GetSourceDoc (void) const; + SdDrawDocument* GetSourceDoc (void) const { return mpSourceDoc;} /** User data objects can be used to store information temporarily at the transferable. The slide sorter uses this to store diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index b34a47da1d5b..f227e417d911 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -63,7 +63,7 @@ public: virtual bool Command( const CommandEvent& rCEvt ); /** returns true if this smart tag is currently selected */ - bool isSelected() const; + bool isSelected() const { return mbSelected;} ::sd::View& getView() const { return mrView; } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index bc595f1139b3..dde213073a1f 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -100,7 +100,7 @@ public: void SetBackgroundColor (const Color aColor); void SetTextColor (const Color aColor); void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor); - sal_Int32 GetTop (void) const; + sal_Int32 GetTop (void) const { return mnTop;} void SetTop (const sal_Int32 nTop); void SetText (const OUString& Text); sal_Int32 ParseDistance (const OUString& rsDistance) const; @@ -492,10 +492,6 @@ void PresenterTextView::Implementation::SetFontDescriptor ( -sal_Int32 PresenterTextView::Implementation::GetTop (void) const -{ - return mnTop; -} diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 4edeeacebd0b..8dfc1b807dc3 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -267,10 +267,6 @@ void MasterPageContainer::SetPreviewSize (PreviewSize eSize) -MasterPageContainer::PreviewSize MasterPageContainer::GetPreviewSize (void) const -{ - return mePreviewSize; -} diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index 79706d093481..692815a0b4ba 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -75,7 +75,7 @@ public: /** Returns the preview size. */ - PreviewSize GetPreviewSize (void) const; + PreviewSize GetPreviewSize (void) const { return mePreviewSize;} /** Return the preview size in pixels. */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index f0d23099ddad..1229588cc911 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -165,18 +165,10 @@ void BitmapCache::Clear (void) -bool BitmapCache::IsFull (void) const -{ - return mbIsFull; -} -sal_Int32 BitmapCache::GetSize (void) -{ - return mnNormalCacheSize; -} diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 1ceae6b69997..0b892be83943 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -79,12 +79,12 @@ public: /** Return <TRUE/> when the cache is full, i.e. the cache compactor had to be run. */ - bool IsFull (void) const; + bool IsFull (void) const { return mbIsFull;} /** Return the memory size that is occupied by all non-precious bitmaps in the cache. */ - sal_Int32 GetSize (void); + sal_Int32 GetSize (void) { return mnNormalCacheSize;} /** Return <TRUE/> when a preview bitmap exists for the given key. */ diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 7b28c7d6ab53..cab9f9244d53 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -51,7 +51,7 @@ public: animation is marked as expired to prevent another run. */ void Expire (void); - bool IsExpired (void); + bool IsExpired (void) { return mbIsExpired;} Animator::AnimationFunctor maAnimation; Animator::FinishFunctor maFinishFunctor; @@ -342,10 +342,6 @@ void Animator::Animation::Expire (void) -bool Animator::Animation::IsExpired (void) -{ - return mbIsExpired; -} diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 597f3ec6a251..1d1f295f4752 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -211,10 +211,6 @@ model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor (void) const -sal_Int32 FocusManager::GetFocusedPageIndex (void) const -{ - return mnPageIndex; -} void FocusManager::SetFocusedPage (const model::SharedPageDescriptor& rpDescriptor) diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index b2c66b284ec0..c047be13a4c2 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -161,10 +161,6 @@ void InsertionIndicatorHandler::UpdatePosition ( -bool InsertionIndicatorHandler::IsActive (void) const -{ - return mbIsActive; -} diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 1484159df697..5d40c03c21af 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -275,10 +275,6 @@ int PageSelector::GetPageCount (void) const -int PageSelector::GetSelectedPageCount (void) const -{ - return mnSelectedPageCount; -} diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 091249582316..cd70c1324d07 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -65,10 +65,6 @@ void Properties::HandleDataChangeEvent (void) -bool Properties::IsHighlightCurrentSlide (void) const -{ - return mbIsHighlightCurrentSlide; -} @@ -81,10 +77,6 @@ void Properties::SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide) -bool Properties::IsShowSelection (void) const -{ - return mbIsShowSelection; -} @@ -97,10 +89,6 @@ void Properties::SetShowSelection (const bool bIsShowSelection) -bool Properties::IsShowFocus (void) const -{ - return mbIsShowFocus; -} @@ -113,10 +101,6 @@ void Properties::SetShowFocus (const bool bIsShowFocus) -bool Properties::IsCenterSelection (void) const -{ - return mbIsCenterSelection; -} @@ -129,10 +113,6 @@ void Properties::SetCenterSelection (const bool bIsCenterSelection) -bool Properties::IsSmoothSelectionScrolling (void) const -{ - return mbIsSmoothSelectionScrolling; -} @@ -145,10 +125,6 @@ void Properties::SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrol -bool Properties::IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const -{ - return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation; -} @@ -224,10 +200,6 @@ void Properties::SetHighlightColor (const Color& rColor) -bool Properties::IsUIReadOnly (void) const -{ - return mbIsUIReadOnly; -} @@ -240,10 +212,6 @@ void Properties::SetUIReadOnly (const bool bIsUIReadOnly) -bool Properties::IsOnlyPreviewTriggersMouseOver (void) const -{ - return mbIsOnlyPreviewTriggersMouseOver; -} } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 5024a7d5b304..62963579a93d 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -174,7 +174,7 @@ public: const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode); - bool IsMouseOverIndicatorAllowed (void) const; + bool IsMouseOverIndicatorAllowed (void) const { return mbIsMouseOverIndicatorAllowed;} protected: SlideSorter& mrSlideSorter; @@ -1173,10 +1173,6 @@ void SelectionFunction::ModeHandler::StartDrag ( -bool SelectionFunction::ModeHandler::IsMouseOverIndicatorAllowed (void) const -{ - return mbIsMouseOverIndicatorAllowed; -} diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index c1d55ca1a998..3b055a0848be 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -124,10 +124,6 @@ const ::std::vector<TransferableData::Representative>& TransferableData::GetRepr -SlideSorterViewShell* TransferableData::GetSourceViewShell (void) const -{ - return mpViewShell; -} } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index c6a4f1e5df28..e4135045f369 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -88,10 +88,6 @@ void VisibleAreaManager::DeactivateCurrentSlideTracking (void) -bool VisibleAreaManager::IsCurrentSlideTrackingActive (void) const -{ - return mbIsCurrentSlideTrackingActive; -} diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index ebf2fe97dc74..881567e87868 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -110,7 +110,7 @@ public: When there is no page that currently has the focus then -1 is returned. */ - sal_Int32 GetFocusedPageIndex (void) const; + sal_Int32 GetFocusedPageIndex (void) const { return mnPageIndex;} /** Set the focused page to the one described by the given page descriptor. The visibility of the focus indicator is not modified. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index dbe7709aec34..75953a49046d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -87,7 +87,7 @@ public: /** Return whether the insertion marker is active. */ - bool IsActive (void) const; + bool IsActive (void) const { return mbIsActive;} /** Return the insertion index that corresponds with the current graphical location of the insertion indicator. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 0ef877f96d39..0cb6486dd7c4 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -109,7 +109,7 @@ public: deselect them. */ int GetPageCount (void) const; - int GetSelectedPageCount (void) const; + int GetSelectedPageCount (void) const { return mnSelectedPageCount;} /** Return the anchor for a range selection. This usually is the first selected page after all pages have been deselected. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 46c8b61fdaf2..7d70c203fe9a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -40,21 +40,21 @@ public: /** When this method returns <TRUE/> then the current slide is highlighted in the view. The default value is <FALSE/>. */ - bool IsHighlightCurrentSlide (void) const; + bool IsHighlightCurrentSlide (void) const { return mbIsHighlightCurrentSlide;} void SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide); /** When this method returns <TRUE/> then the selection is indicated in the view (typically by drawing rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowSelection (void) const; + bool IsShowSelection (void) const { return mbIsShowSelection;} void SetShowSelection (const bool bIsShowSelection); /** When this method returns <TRUE/> then the focusdselection is indicated in the view (typically by drawing dotted rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowFocus (void) const; + bool IsShowFocus (void) const { return mbIsShowFocus;} void SetShowFocus (const bool bIsShowFocus); /** When this method returns <TRUE/> then on a selection change the @@ -62,21 +62,21 @@ public: centered in the view. This can be used to center the current slide by selecting only the current slide. The default value is <FALSE/>. */ - bool IsCenterSelection (void) const; + bool IsCenterSelection (void) const { return mbIsCenterSelection;} void SetCenterSelection (const bool bIsCenterSelection); /** When this mehod returns <TRUE/> then the view may try to change the visible area by scrolling it smoothly on the screen. Experimental. Default value is <FALSE/>. */ - bool IsSmoothSelectionScrolling (void) const; + bool IsSmoothSelectionScrolling (void) const { return mbIsSmoothSelectionScrolling;} void SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrolling); /** When this method returns <TRUE/> then during a full screen presentation the previews in a slide sorter are not updated. Default value is <TRUE/>. */ - bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const; + bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const { return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;} void SetSuspendPreviewUpdatesDuringFullScreenPresentation (const bool bFlag); /** Return the background color. @@ -102,14 +102,14 @@ public: /** The UI can be set to be read only indepently from the model status. Used for instance in the presenter view. */ - bool IsUIReadOnly (void) const; + bool IsUIReadOnly (void) const { return mbIsUIReadOnly;} void SetUIReadOnly (const bool bIsUIReadOnly); /** The mouse over effect (and whether a mouse motion starts a multi selection or a drag-and-drop) can be triggered by just the preview area or the whole page object area. */ - bool IsOnlyPreviewTriggersMouseOver (void) const; + bool IsOnlyPreviewTriggersMouseOver (void) const { return mbIsOnlyPreviewTriggersMouseOver;} private: diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index ed756d864d2b..ad67d7a09ef0 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -75,7 +75,7 @@ public: /** Return the view shell for which the transferable was created. */ - SlideSorterViewShell* GetSourceViewShell (void) const; + SlideSorterViewShell* GetSourceViewShell (void) const { return mpViewShell;} private: SlideSorterViewShell* mpViewShell; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx index 5e8de169c779..62c1ea3b14e2 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx @@ -39,7 +39,7 @@ public: void ActivateCurrentSlideTracking (void); void DeactivateCurrentSlideTracking (void); - bool IsCurrentSlideTrackingActive (void) const; + bool IsCurrentSlideTrackingActive (void) const { return mbIsCurrentSlideTrackingActive;} /** Request the current slide to be moved into the visible area. This request is only obeyed when the current slide tracking is diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 09fc74c5ea82..f7cb2a4dabd7 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -78,8 +78,8 @@ public: /** Set the edit mode to that currently used by the controller. */ bool SetEditModeFromController (void); - EditMode GetEditMode (void) const; - PageKind GetPageType (void) const; + EditMode GetEditMode (void) const { return meEditMode;} + PageKind GetPageType (void) const { return mePageKind;} /** Return the number of slides in the document regardless of whether they are visible or not or whether they are hidden or not. diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 3949be34f42d..196369a060e1 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -69,7 +69,7 @@ public: /** Return the page that is represented by the descriptor as SdPage pointer . */ - SdPage* GetPage (void) const; + SdPage* GetPage (void) const { return mpPage;} /** Return the page that is represented by the descriptor as XDrawPage reference. */ @@ -80,7 +80,7 @@ public: XDrawPage when there are hidden slides and the XIndexAccess used to access the model filters them out. */ - sal_Int32 GetPageIndex (void) const; + sal_Int32 GetPageIndex (void) const { return mnIndex;} void SetPageIndex (const sal_Int32 nIndex); bool UpdateMasterPage (void); diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index b44bfa987cb9..a94a598e5b43 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -84,7 +84,7 @@ public: method does not trigger any repaints or layouts. */ bool SetOrientation (const Layouter::Orientation eOrientation); - Layouter::Orientation GetOrientation (void) const; + Layouter::Orientation GetOrientation (void) const { return meOrientation;} void RequestRepaint (void); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 1e50f741502d..15262e33e014 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -72,7 +72,7 @@ public: OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE; - bool IsVisible (void) const; + bool IsVisible (void) const { return mbIsVisible;} void Hide (void); void Show (void); diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 1c21d0e3215a..75201f4cb8fd 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -166,18 +166,10 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) -EditMode SlideSorterModel::GetEditMode (void) const -{ - return meEditMode; -} -PageKind SlideSorterModel::GetPageType (void) const -{ - return mePageKind; -} diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index ecaf10c4b6c9..58ba11158ba4 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -73,10 +73,6 @@ PageDescriptor::~PageDescriptor (void) -SdPage* PageDescriptor::GetPage (void) const -{ - return mpPage; -} @@ -89,10 +85,6 @@ Reference<drawing::XDrawPage> PageDescriptor::GetXDrawPage (void) const -sal_Int32 PageDescriptor::GetPageIndex (void) const -{ - return mnIndex; -} diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 8182f0a868f8..b2c604d38703 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -248,10 +248,6 @@ SlideSorter::~SlideSorter (void) -bool SlideSorter::IsValid (void) const -{ - return mbIsValid; -} @@ -335,18 +331,10 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) -ViewShellBase* SlideSorter::GetViewShellBase (void) const -{ - return mpViewShellBase; -} -ViewShell* SlideSorter::GetViewShell (void) const -{ - return mpViewShell; -} diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index fba8dd6ec84a..35f40cb5e553 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -621,10 +621,6 @@ bool SlideSorterView::SetOrientation (const Layouter::Orientation eOrientation) -Layouter::Orientation SlideSorterView::GetOrientation (void) const -{ - return meOrientation; -} diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 3755352cc3b3..eb5ceeb41d76 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -354,10 +354,6 @@ void InsertionIndicatorOverlay::SetLayerInvalidator (const SharedILayerInvalidat -bool InsertionIndicatorOverlay::IsVisible (void) const -{ - return mbIsVisible; -} diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 380b69c2478b..75ae4e6128c7 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -617,10 +617,6 @@ void DrawController::BroadcastContextChange (void) const -ViewShellBase* DrawController::GetViewShellBase (void) -{ - return mpBase; -} diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 8e21db98f798..1225f8d61bcc 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -137,10 +137,6 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell) -FmFormShell* FormShellManager::GetFormShell (void) -{ - return mpFormShell; -} diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index c8e262a61125..a576cf871483 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -95,7 +95,7 @@ public: /** Return the OutlinerView that was provided by the last call to ProvideOutlinerView() (or NULL when there was no such call.) */ - OutlinerView* GetOutlinerView (void); + OutlinerView* GetOutlinerView (void) { return mpOutlineView;} /** Provide in the member mpOutlineView an instance of OutlinerView that is either taken from the ViewShell, when it is an OutlineViewShell, @@ -1742,10 +1742,6 @@ Outliner::Implementation::~Implementation (void) -OutlinerView* Outliner::Implementation::GetOutlinerView () -{ - return mpOutlineView; -} diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 96c15633a346..4237e2c461f4 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -412,17 +412,9 @@ ViewShellBase* ViewShellBase::GetViewShellBase (SfxViewFrame* pViewFrame) -DrawDocShell* ViewShellBase::GetDocShell (void) const -{ - return mpDocShell; -} -SdDrawDocument* ViewShellBase::GetDocument (void) const -{ - return mpDocument; -} diff --git a/sd/source/ui/view/ViewShellHint.cxx b/sd/source/ui/view/ViewShellHint.cxx index a4eddefed9b2..130152a85376 100644 --- a/sd/source/ui/view/ViewShellHint.cxx +++ b/sd/source/ui/view/ViewShellHint.cxx @@ -33,10 +33,6 @@ ViewShellHint::ViewShellHint (HintId eHintId) -ViewShellHint::HintId ViewShellHint::GetHintId (void) const -{ - return meHintId; -} } // end of namespace sd diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 6ceeca8a4cb3..5760ffb69bed 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -471,10 +471,6 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) -bool DrawViewShell::IsLayerModeActive (void) const -{ - return mbIsLayerModeActive; -} /** diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index d780e1db0f34..a5fdb8862cb7 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -380,10 +380,6 @@ void FrameView::SetViewShEditModeOnLoad (EditMode eMode) -EditMode FrameView::GetViewShEditModeOnLoad (void) const -{ - return meEditModeOnLoad; -} @@ -959,10 +955,6 @@ void FrameView::SetPreviousViewShellType (ViewShell::ShellType eType) -ViewShell::ShellType FrameView::GetPreviousViewShellType (void) const -{ - return mePreviousViewShellType; -} @@ -975,10 +967,6 @@ void FrameView::SetViewShellTypeOnLoad (ViewShell::ShellType eType) -ViewShell::ShellType FrameView::GetViewShellTypeOnLoad (void) const -{ - return meViewShellTypeOnLoad; -} @@ -991,10 +979,6 @@ void FrameView::SetSelectedPage(sal_uInt16 nPage) -sal_uInt16 FrameView::GetSelectedPage (void) const -{ - return mnSelectedPage; -} @@ -1007,10 +991,6 @@ void FrameView::SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAl -bool FrameView::IsNavigatorShowingAllShapes (void) const -{ - return mbIsNavigatorShowingAllShapes; -} } // end of namespace sd diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index b6b4d4153260..058c01556722 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1042,10 +1042,6 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage) return GetOutlineTextObject(pPage); } -sal_uLong OutlineView::GetPaperWidth() -{ - return mnPaperWidth; -} /** updates draw model with all changes from outliner model */ bool OutlineView::PrepareClose(bool) diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 8f91d6c75af0..68864d49d508 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -717,14 +717,6 @@ bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) -FrameView* ViewShell::GetFrameView (void) -{ - return mpFrameView; -} - - - - void ViewShell::SetFrameView (FrameView* pNewFrameView) { mpFrameView = pNewFrameView; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 17bcf5f8cd1b..2ff4a712b1d1 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -829,10 +829,6 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& } -bool ViewShell::HasRuler (void) -{ - return mbHasRulers; -} @@ -1447,10 +1443,6 @@ void ViewShell::SetIsMainViewShell (bool bIsMainViewShell) -::sd::Window* ViewShell::GetActiveWindow (void) const -{ - return mpActiveWindow; -} @@ -1476,10 +1468,6 @@ void ViewShell::Draw(OutputDevice &, const Region &) -ZoomList* ViewShell::GetZoomList (void) -{ - return mpZoomList; -} diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index fa77685bf8ee..43d60acdb25a 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -628,10 +628,6 @@ void PresenterController::SetAccessibilityActiveState (const bool bIsActive) } } -bool PresenterController::IsAccessibilityActive (void) const -{ - return mbIsAccessibilityActive; -} void PresenterController::HandleMouseClick (const awt::MouseEvent& rEvent) { diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index aaadbba3dca3..44e943d29542 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -121,7 +121,7 @@ public: bool HasTransition (css::uno::Reference<css::drawing::XDrawPage>& rxPage); bool HasCustomAnimation (css::uno::Reference<css::drawing::XDrawPage>& rxPage); void SetAccessibilityActiveState (const bool bIsActive); - bool IsAccessibilityActive (void) const; + bool IsAccessibilityActive (void) const { return mbIsAccessibilityActive;} void HandleMouseClick (const css::awt::MouseEvent& rEvent); void UpdatePaneTitles (void); diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 0aa33f2f3571..b6e440c2e8dd 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -210,10 +210,6 @@ void PresenterScrollBar::SetThumbPosition ( } } -double PresenterScrollBar::GetThumbPosition (void) const -{ - return mnThumbPosition; -} void PresenterScrollBar::SetTotalSize (const double nTotalSize) { @@ -236,20 +232,12 @@ void PresenterScrollBar::SetThumbSize (const double nThumbSize) } } -double PresenterScrollBar::GetThumbSize (void) const -{ - return mnThumbSize; -} void PresenterScrollBar::SetLineHeight (const double nLineHeight) { mnLineHeight = nLineHeight; } -double PresenterScrollBar::GetLineHeight (void) const -{ - return mnLineHeight; -} void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rxCanvas) { diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 593b1f52f399..19331e98e89f 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -75,7 +75,7 @@ public: double nPosition, const bool bAsynchronousRepaint); - double GetThumbPosition (void) const; + double GetThumbPosition (void) const { return mnThumbPosition;} /** Set the upper border of the slider range. */ @@ -86,10 +86,10 @@ public: A value not larger than the last value given to SetTotalSize(). */ void SetThumbSize (const double nThumbSize); - double GetThumbSize (void) const; + double GetThumbSize (void) const { return mnThumbSize;} void SetLineHeight (const double nLineHeight); - double GetLineHeight (void) const; + double GetLineHeight (void) const { return mnLineHeight;} /** Set the canvas that is used for painting the scroll bar. */ diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 8073190a39d3..7a6ab95fe78f 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -1133,15 +1133,7 @@ void PresenterTextCaret::HideCaret (void) mnCharacterIndex = -1; } -sal_Int32 PresenterTextCaret::GetParagraphIndex (void) const -{ - return mnParagraphIndex; -} -sal_Int32 PresenterTextCaret::GetCharacterIndex (void) const -{ - return mnCharacterIndex; -} void PresenterTextCaret::SetPosition ( const sal_Int32 nParagraphIndex, @@ -1176,10 +1168,6 @@ void PresenterTextCaret::SetPosition ( } } -bool PresenterTextCaret::IsVisible (void) const -{ - return mbIsCaretVisible; -} void PresenterTextCaret::SetCaretMotionBroadcaster ( const ::boost::function<void(sal_Int32,sal_Int32,sal_Int32,sal_Int32)>& rBroadcaster) diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 3d404216f9f0..4f67b5724a25 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -52,13 +52,13 @@ public: void ShowCaret (void); void HideCaret (void); - sal_Int32 GetParagraphIndex (void) const; - sal_Int32 GetCharacterIndex (void) const; + sal_Int32 GetParagraphIndex (void) const { return mnParagraphIndex;} + sal_Int32 GetCharacterIndex (void) const { return mnCharacterIndex;} void SetPosition ( const sal_Int32 nParagraphIndex, const sal_Int32 nCharacterIndex); - bool IsVisible (void) const; + bool IsVisible (void) const { return mbIsCaretVisible;} /** Set a (possibly empty) functor that broadcasts changes of the caret position. This is used when a PresenterTextView object is set at diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 4c825edce7f5..0b4a2452779a 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -187,7 +187,7 @@ namespace { virtual awt::Size CreateBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas) = 0; - bool IsEnabled (void) const; + bool IsEnabled (void) const { return mbIsEnabled;} private: bool mbIsEnabled; }; @@ -1343,10 +1343,6 @@ bool Element::IsOutside (const awt::Rectangle& rBox) return false; } -bool Element::IsEnabled (void) const -{ - return mbIsEnabled; -} bool Element::IsFilling (void) const { diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index f0c9c05b2965..2ac85493d4d8 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -293,10 +293,6 @@ void RecentDocsView::LoseFocus() ThumbnailView::LoseFocus(); } -long RecentDocsView::GetThumbnailSize() const -{ - return mnItemMaxSize; -} void RecentDocsView::Clear() { diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 33e007da997b..32994450d410 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -207,10 +207,6 @@ void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties> updateItems(aItems); } -sal_uInt16 TemplateAbstractView::getCurRegionId() const -{ - return mnCurRegionId; -} const OUString &TemplateAbstractView::getCurRegionName() const { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 57a5f94e31f9..e307917ea525 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -441,20 +441,12 @@ void SfxDocumentInfoItem::UpdateDocumentInfo( } -bool SfxDocumentInfoItem::IsDeleteUserData() const -{ - return m_bDeleteUserData; -} void SfxDocumentInfoItem::SetDeleteUserData( bool bSet ) { m_bDeleteUserData = bSet; } -bool SfxDocumentInfoItem::IsUseUserData() const -{ - return m_bUseUserData; -} void SfxDocumentInfoItem::SetUseUserData( bool bSet ) { diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index fcb3d9090d05..bd52861928a6 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -88,7 +88,7 @@ public: void SetItemText( sal_uInt16 nItemId, const OUString& rText ); sal_uInt16 GetItemCount() const; - Menu* GetSVMenu() const; + Menu* GetSVMenu() const { return pSVMenu;} SfxMenuControl& operator[]( sal_uInt16 nPos ) const; sal_uInt16 GetItemId( sal_uInt16 nPos ) const; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 76552d78dbdd..b4861cb14bd9 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -983,11 +983,6 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) // returns the associated StarView-menu -Menu* SfxVirtualMenu::GetSVMenu() const -{ - - return pSVMenu; -} diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx index ac9082c50d43..0faecdbdd6fa 100644 --- a/sfx2/source/sidebar/Paint.cxx +++ b/sfx2/source/sidebar/Paint.cxx @@ -67,10 +67,6 @@ Paint Paint::Create (const cssu::Any& rValue) -Paint::Type Paint::GetType (void) const -{ - return meType; -} diff --git a/sfx2/source/sidebar/Paint.hxx b/sfx2/source/sidebar/Paint.hxx index 623b2cfaaf9e..eaa69e1a5b46 100644 --- a/sfx2/source/sidebar/Paint.hxx +++ b/sfx2/source/sidebar/Paint.hxx @@ -59,7 +59,7 @@ public: // Create a Paint object for the given gradient. explicit Paint (const Gradient& rGradient); - Type GetType (void) const; + Type GetType (void) const { return meType;} const Color& GetColor (void) const; const Gradient& GetGradient (void) const; diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 53c805fd02e8..16412544c5da 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -114,10 +114,6 @@ PanelTitleBar* Panel::GetTitleBar (void) const -bool Panel::IsTitleBarOptional (void) const -{ - return mbIsTitleBarOptional; -} @@ -152,10 +148,6 @@ void Panel::SetExpanded (const bool bIsExpanded) -bool Panel::IsExpanded (void) const -{ - return mbIsExpanded; -} diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index 218f95373798..ef47c2060aa7 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -54,12 +54,12 @@ public: void Dispose (void); PanelTitleBar* GetTitleBar (void) const; - bool IsTitleBarOptional (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::awt::XWindow> GetElementWindow (void); void SetExpanded (const bool bIsExpanded); - bool IsExpanded (void) const; + bool IsExpanded (void) const { return mbIsExpanded;} bool HasIdPredicate (const ::rtl::OUString& rsId) const; const ::rtl::OUString& GetId (void) const; diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index c03030626fdb..80e4c182a518 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -129,18 +129,10 @@ void TitleBar::setPosSizePixel ( -ToolBox& TitleBar::GetToolBox (void) -{ - return maToolBox; -} -const ToolBox& TitleBar::GetToolBox (void) const -{ - return maToolBox; -} diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx index 2ff949e47bcd..56ab6b9a9d64 100644 --- a/sfx2/source/sidebar/TitleBar.hxx +++ b/sfx2/source/sidebar/TitleBar.hxx @@ -49,8 +49,8 @@ public: long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL) SAL_OVERRIDE; - ToolBox& GetToolBox (void); - const ToolBox& GetToolBox (void) const; + ToolBox& GetToolBox (void) { return maToolBox;} + const ToolBox& GetToolBox (void) const { return maToolBox;} protected: SidebarToolBox maToolBox; diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx index 80083b105843..7dc51c79a355 100644 --- a/shell/inc/internal/xml_parser.hxx +++ b/shell/inc/internal/xml_parser.hxx @@ -102,7 +102,7 @@ public: /** Returns the currently used document handler or null if no document handler was set before. */ - i_xml_parser_event_handler* get_document_handler() const; + i_xml_parser_event_handler* get_document_handler() const { return document_handler_;} private: void init(); diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx index e88abf63ee32..4821111c1da0 100644 --- a/shell/source/all/xml_parser.cxx +++ b/shell/source/all/xml_parser.cxx @@ -192,9 +192,5 @@ void xml_parser::set_document_handler( document_handler_ = event_handler; } -i_xml_parser_event_handler* xml_parser::get_document_handler() const -{ - return document_handler_; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 2b791c8ea350..13d47d692972 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -822,10 +822,6 @@ namespace slideshow eNodeType ); } - const VectorOfDocTreeNodes& DrawShapeSubsetting::getActiveSubsets() const - { - return maCurrentSubsets; - } } } diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx index 294776914c5d..cb1cc556b1c9 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx @@ -138,7 +138,7 @@ namespace slideshow are currently hidden, because displayed by child shapes). */ - const VectorOfDocTreeNodes& getActiveSubsets() const; + const VectorOfDocTreeNodes& getActiveSubsets() const { return maCurrentSubsets; } /** This enum classifies each action index in the metafile. diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx index 07ae77f70bf9..c407fbeb763a 100644 --- a/svl/source/items/int64item.cxx +++ b/svl/source/items/int64item.cxx @@ -95,10 +95,6 @@ SfxPoolItem* SfxInt64Item::Clone( SfxItemPool* /*pOther*/ ) const return new SfxInt64Item(*this); } -sal_Int64 SfxInt64Item::GetValue() const -{ - return mnValue; -} void SfxInt64Item::SetValue( sal_Int64 nVal ) { diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 40e8eeec207f..4848b027e104 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -604,10 +604,6 @@ void SfxStyleSheetBasePool::SetSearchMask(SfxStyleFamily eFam, sal_uInt16 n) nSearchFamily = eFam; nMask = n; } -sal_uInt16 SfxStyleSheetBasePool::GetSearchMask() const -{ - return nMask; -} SfxStyleSheetIteratorPtr SfxStyleSheetBasePool::CreateIterator ( @@ -845,10 +841,6 @@ SfxItemPool& SfxStyleSheetBasePool::GetPool() return rPool; } -const SfxItemPool& SfxStyleSheetBasePool::GetPool() const -{ - return rPool; -} SfxStyleSheet::SfxStyleSheet(const OUString &rName, diff --git a/svl/source/misc/sharedstring.cxx b/svl/source/misc/sharedstring.cxx index 81379520a3d9..2bddc75fad29 100644 --- a/svl/source/misc/sharedstring.cxx +++ b/svl/source/misc/sharedstring.cxx @@ -100,20 +100,12 @@ OUString SharedString::getString() const return mpData ? OUString(mpData) : OUString(); } -rtl_uString* SharedString::getData() -{ - return mpData; -} const rtl_uString* SharedString::getData() const { return mpData; } -rtl_uString* SharedString::getDataIgnoreCase() -{ - return mpDataIgnoreCase; -} const rtl_uString* SharedString::getDataIgnoreCase() const { diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx index 859f88e2dc9a..d930e176b24b 100644 --- a/svx/inc/sdr/properties/itemsettools.hxx +++ b/svx/inc/sdr/properties/itemsettools.hxx @@ -45,7 +45,7 @@ namespace sdr explicit ItemChangeBroadcaster(const SdrObject& rObj); ~ItemChangeBroadcaster(); - sal_uInt32 GetRectangleCount() const; + sal_uInt32 GetRectangleCount() const { return mnCount; } const Rectangle& GetRectangle(sal_uInt32 nIndex) const; }; } // end of namespace properties diff --git a/svx/inc/svdoopengl.hxx b/svx/inc/svdoopengl.hxx index 258fcdd72246..e30baeacfd0a 100644 --- a/svx/inc/svdoopengl.hxx +++ b/svx/inc/svdoopengl.hxx @@ -30,7 +30,7 @@ public: virtual ~SdrOpenGLObj(); virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; - OpenGLContext* getOpenGLContext(); + OpenGLContext* getOpenGLContext() { return mpContext;} virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 1e98cd553b76..4a89f38da17a 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -139,10 +139,6 @@ void AccessibleShapeTreeInfo::SetSdrView (SdrView* pView) -SdrView* AccessibleShapeTreeInfo::GetSdrView (void) const -{ - return mpView; -} @@ -173,10 +169,6 @@ void AccessibleShapeTreeInfo::SetWindow (Window* pWindow) -Window* AccessibleShapeTreeInfo::GetWindow (void) const -{ - return mpWindow; -} @@ -189,10 +181,6 @@ void AccessibleShapeTreeInfo::SetViewForwarder (const IAccessibleViewForwarder* -const IAccessibleViewForwarder* AccessibleShapeTreeInfo::GetViewForwarder (void) const -{ - return mpViewForwarder; -} } // end of namespace accessibility diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index e205ba74aada..9d8488ef579d 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -156,7 +156,12 @@ namespace accessibility void FireEvent( const AccessibleEventObject& rEvent ) const; void SetFocus( bool bHaveFocus ); - bool HaveFocus(); + bool HaveFocus() + { + // No locking of solar mutex here, since we rely on the fact + // that sal_Bool access is atomic + return mbThisHasFocus; + } void SetChildFocus( sal_Int32 nChild, bool bHaveFocus ); void SetShapeFocus( bool bHaveFocus ); void ChangeChildFocus( sal_Int32 nNewChild ); @@ -524,13 +529,6 @@ namespace accessibility OSL_TRACE("AccessibleTextHelper_Impl::SetFocus: focus changed, Object %p, state: %s", this, bHaveFocus ? "focused" : "not focused"); } - bool AccessibleTextHelper_Impl::HaveFocus() - { - - // No locking of solar mutex here, since we rely on the fact - // that sal_Bool access is atomic - return mbThisHasFocus; - } bool AccessibleTextHelper_Impl::IsActive() const { diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index a18ddbf94718..53f1685f1c7a 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -509,10 +509,6 @@ void SvxTPView::EnableUndo(bool nFlag) m_pUndo->Enable(nFlag); } -SvxRedlinTable* SvxTPView::GetTableControl() -{ - return m_pViewData; -} IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB ) { @@ -888,10 +884,6 @@ void SvxTPFilter::ShowAction(bool bShow) } } -ListBox* SvxTPFilter::GetLbAction() -{ - return m_pLbAction; -} IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb ) { @@ -1123,15 +1115,7 @@ void SvxAcceptChgCtr::ShowViewPage() SetCurPageId(m_nViewPageId); } -SvxTPFilter* SvxAcceptChgCtr::GetFilterPage() -{ - return pTPFilter; -} -SvxTPView* SvxAcceptChgCtr::GetViewPage() -{ - return pTPView; -} SvxRedlinTable* SvxAcceptChgCtr::GetViewTable() { diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index f629d9cc9548..d8b6153e1165 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1161,10 +1161,6 @@ Style::Style( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16 n Set( pBorder, fScale, nMaxWidth ); } -double Style::PatternScale() const -{ - return mfPatternScale; -} void Style::SetPatternScale( double fScale ) { diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index de8c2514f26c..44aeecbc083c 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -767,10 +767,6 @@ IMPL_LINK( SvxLanguageComboBox, EditModifyHdl, SvxLanguageComboBox*, /*pEd*/ ) } -SvxLanguageComboBox::EditedAndValid SvxLanguageComboBox::GetEditedAndValid() const -{ - return meEditedAndValid; -} sal_Int32 SvxLanguageComboBox::SaveEditedAsEntry() diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 6c914271d75d..4983389f86dd 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -152,15 +152,7 @@ SvxLongLRSpaceItem::SvxLongLRSpaceItem(const SvxLongLRSpaceItem &rCpy) : mlRight (rCpy.mlRight) {} -long SvxLongLRSpaceItem::GetLeft() const -{ - return mlLeft; -} -long SvxLongLRSpaceItem::GetRight() const -{ - return mlRight; -} void SvxLongLRSpaceItem::SetLeft(long lArgLeft) { @@ -293,15 +285,7 @@ SvxLongULSpaceItem::SvxLongULSpaceItem() : mlRight (0) {} -long SvxLongULSpaceItem::GetUpper() const -{ - return mlLeft; -} -long SvxLongULSpaceItem::GetLower() const -{ - return mlRight; -} void SvxLongULSpaceItem::SetUpper(long lArgLeft) { @@ -646,10 +630,6 @@ void SvxColumnItem::SetRight(long right) nRight = right; } -sal_uInt16 SvxColumnItem::GetActColumn() const -{ - return nActColumn; -} bool SvxColumnItem::IsFirstAct() const { @@ -661,20 +641,8 @@ bool SvxColumnItem::IsLastAct() const return nActColumn == Count() - 1; } -long SvxColumnItem::GetLeft() -{ - return nLeft; -} -long SvxColumnItem::GetRight() -{ - return nRight; -} -bool SvxColumnItem::IsTable() const -{ - return bTable; -} /* SvxColumnDescription */ @@ -844,30 +812,10 @@ bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM return bRet; } -bool SvxObjectItem::HasLimits() const -{ - return bLimits; -} -long SvxObjectItem::GetStartX() const -{ - return nStartX; -} -long SvxObjectItem::GetEndX() const -{ - return nEndX; -} -long SvxObjectItem::GetStartY() const -{ - return nStartY; -} -long SvxObjectItem::GetEndY() const -{ - return nEndY; -} void SvxObjectItem::SetStartX(long lValue) { diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index ac1a4afd2824..37f7de03079d 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2244,10 +2244,6 @@ SvxSearchDialogWrapper::~SvxSearchDialogWrapper () { } -SvxSearchDialog *SvxSearchDialogWrapper::getDialog () -{ - return dialog; -} diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 49570960ccb4..7455e6d31d34 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -2005,10 +2005,6 @@ void FmGridControl::Select() } } -sal_Int32 FmGridControl::GetSelectedColumn() const -{ - return m_nCurrentSelectedColumn; -} void FmGridControl::KeyInput( const KeyEvent& rKEvt ) { diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 9e464d0db02c..3d30b76b65c5 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1605,10 +1605,6 @@ void SvxNumberFormatShell::SetCurrencySymbol(sal_uInt32 nPos) } } -sal_uInt32 SvxNumberFormatShell::GetCurrencySymbol() -{ - return nCurCurrencyEntryPos; -} void SvxNumberFormatShell::SetCurCurrencyEntry(NfCurrencyEntry* pCEntry) { diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index d7d44184c78a..099af576c38b 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -38,10 +38,6 @@ namespace sdr { } - Event* Event::GetNext() const - { - return mpNext; - } void Event::SetNext(Event* pNew) { @@ -51,10 +47,6 @@ namespace sdr } } - sal_uInt32 Event::GetTime() const - { - return mnTime; - } void Event::SetTime(sal_uInt32 nNew) { @@ -145,10 +137,6 @@ namespace sdr } } - Event* EventList::GetFirst() - { - return mpHead; - } } // end of namespace animation } // end of namespace sdr @@ -230,10 +218,6 @@ namespace sdr } } - sal_uInt32 Scheduler::GetTime() - { - return mnTime; - } // #i38135# void Scheduler::SetTime(sal_uInt32 nTime) diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 259aea7afbd7..e74326c5d487 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -195,18 +195,12 @@ namespace sdr return true; } - // check if asynchronious graphis loading is allowed. Default is false. + // check if asynchronous graphics loading is allowed. Default is false. bool ObjectContact::IsAsynchronGraphicsLoadingAllowed() const { return false; } - // access to ViewObjectContactRedirector - ViewObjectContactRedirector* ObjectContact::GetViewObjectContactRedirector() const - { - return mpViewObjectContactRedirector; - } - void ObjectContact::SetViewObjectContactRedirector(ViewObjectContactRedirector* pNew) { if(mpViewObjectContactRedirector != pNew) diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 2879b487313a..0d4a5e16b904 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -72,10 +72,6 @@ namespace sdr } } - sal_uInt32 ItemChangeBroadcaster::GetRectangleCount() const - { - return mnCount; - } const Rectangle& ItemChangeBroadcaster::GetRectangle(sal_uInt32 nIndex) const { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index f37bb1acfc43..109cb5bdce99 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -1069,10 +1069,6 @@ void AreaPropertyPanel::NotifyItemUpdate( -SfxBindings* AreaPropertyPanel::GetBindings() -{ - return mpBindings; -} diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index eea746439b2d..bd6677d732fc 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -70,7 +70,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} const static sal_Int32 DEFAULT_CENTERX; const static sal_Int32 DEFAULT_CENTERY; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 656aeaea3f82..58e8cd2c5699 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -461,10 +461,6 @@ void GraphicPropertyPanel::NotifyItemUpdate( -SfxBindings* GraphicPropertyPanel::GetBindings() -{ - return mpBindings; -} // namespace close diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 9bedc8869e3d..a7ac8eb869d1 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -53,7 +53,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //ui controls diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index eaa79bbe118e..241d16ec8395 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -673,10 +673,6 @@ void LinePropertyPanel::NotifyItemUpdate( -SfxBindings* LinePropertyPanel::GetBindings() -{ - return mpBindings; -} diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 9eb1508d7f13..c22268f014f2 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -74,7 +74,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} void SetWidth(long nWidth); void SetWidthIcon(int n); diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 77fcea5fcfe3..a16e59e2a77f 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -346,18 +346,10 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl) -bool LineWidthControl::IsCloseByEdit() -{ - return mbCloseByEdit; -} -long LineWidthControl::GetTmpCustomWidth() -{ - return mnTmpCusomWidth; -} diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index 99a1d98312e6..6053edb54c6b 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -43,8 +43,8 @@ public: virtual void Paint(const Rectangle& rect) SAL_OVERRIDE; void SetWidthSelect( long lValue, bool bValuable, SfxMapUnit eMapUnit); - bool IsCloseByEdit(); - long GetTmpCustomWidth(); + bool IsCloseByEdit() { return mbCloseByEdit;} + long GetTmpCustomWidth() { return mnTmpCusomWidth;} private: LinePropertyPanel& mrLinePropertyPanel; diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index 68f11f56e24c..66f83a2f151a 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -76,10 +76,6 @@ void LineWidthValueSet::SetSelItem(sal_uInt16 nSel) -sal_uInt16 LineWidthValueSet::GetSelItem() -{ - return nSelItem; -} diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index 90b64565f3b7..a3bb77382c8f 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -33,7 +33,7 @@ public: void SetUnit(OUString* str); void SetSelItem(sal_uInt16 nSel); - sal_uInt16 GetSelItem(); + sal_uInt16 GetSelItem() { return nSelItem;} void SetImage(Image img); void SetCusEnable(bool bEnable); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index f1ac7a0cebbb..b819b00833f0 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -255,10 +255,6 @@ void NBOTypeMgrBase::StoreMapUnit_impl() { } } } -SfxMapUnit NBOTypeMgrBase::GetMapUnit() -{ - return eCoreUnit; -} /*************************************************************************************************** **********************Character Bullet Type lib********************************************************** ****************************************************************************************************/ diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index d8843464b64c..2a5e55cf11bf 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -209,10 +209,6 @@ void ParaPropertyPanel::HandleContextChange ( } } -SfxBindings* ParaPropertyPanel::GetBindings() -{ - return mpBindings; -} diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 220945ba70e3..df9a425a5e08 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -69,7 +69,7 @@ public: const cssu::Reference<css::ui::XSidebar>& rxSidebar); virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} virtual void HandleContextChange ( const ::sfx2::sidebar::EnumContext aContext) SAL_OVERRIDE; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index b2c3754c48af..c0b40e48bf5b 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -894,10 +894,6 @@ void PosSizePropertyPanel::NotifyItemUpdate( -SfxBindings* PosSizePropertyPanel::GetBindings() -{ - return mpBindings; -} diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index b25b6af63e9d..a64a579d5194 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -66,7 +66,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //Position diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 88a482c8f699..d81a63ef36f2 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -441,14 +441,6 @@ IMPL_LINK(TextCharacterSpacingControl, KerningModifyHdl, MetricField*, EMPTYARG) mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SFX_CALLMODE_RECORD, &aKernItem, 0L); return 0; } -short TextCharacterSpacingControl::GetLastCustomState() -{ - return mnLastCus; -} -long TextCharacterSpacingControl::GetLastCustomValue() -{ - return mnCustomKern; -} }} // end of namespace sidebar diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index f0ae669ee617..957a58a79668 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -49,8 +49,8 @@ public: //virtual void Paint(const Rectangle& rect); //add - short GetLastCustomState(); - long GetLastCustomValue(); + short GetLastCustomState() { return mnLastCus;} + long GetLastCustomValue() { return mnCustomKern;} //add end private: diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index db6345eb7334..3b334d117720 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1754,10 +1754,6 @@ static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) } } -SdrMarkView* SdrHdlList::GetView() const -{ - return pView; -} // Helper struct for re-sorting handles struct ImplHdlAndIndex diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 698ee8d60759..f6945e977ac9 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -117,10 +117,6 @@ void SdrMark::SetMarkedSdrObj(SdrObject* pNewObj) } } -SdrObject* SdrMark::GetMarkedSdrObj() const -{ - return mpSelectedSdrObject; -} SdrMark& SdrMark::operator=(const SdrMark& rMark) { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index f3fc337673ea..f713087c6073 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -304,10 +304,6 @@ SdrModel::~SdrModel() delete mpImpl; } -bool SdrModel::IsInDestruction() const -{ - return mbInDestruction; -} // not yet implemented void SdrModel::operator=(const SdrModel&) @@ -2060,19 +2056,7 @@ void SdrHint::SetKind(SdrHintKind eNewKind) meHint = eNewKind; } -const SdrPage* SdrHint::GetPage() const -{ - return mpPage; -} -const SdrObject* SdrHint::GetObject() const -{ - return mpObj; -} -SdrHintKind SdrHint::GetKind() const -{ - return meHint; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 8f7b0e2e5166..a640b229d315 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -535,10 +535,6 @@ void SdrObjCustomShape::SetMirroredY( const bool bMirrorY ) SetMergedItem( aGeometryItem ); } -double SdrObjCustomShape::GetObjectRotation() const -{ - return fObjectRotation; -} bool SdrObjCustomShape::IsPostRotate() const { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index ca94637feb5a..c18f84c716ac 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -167,15 +167,7 @@ SdrObjUserData::SdrObjUserData(const SdrObjUserData& rData) : SdrObjUserData::~SdrObjUserData() {} -sal_uInt32 SdrObjUserData::GetInventor() const -{ - return nInventor; -} -sal_uInt16 SdrObjUserData::GetId() const -{ - return nIdentifier; -} bool SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const { @@ -570,20 +562,12 @@ void SdrObject::SetModel(SdrModel* pNewModel) pModel = pNewModel; } -SdrModel* SdrObject::GetModel() const -{ - return pModel; -} void SdrObject::SetObjList(SdrObjList* pNewObjList) { pObjList=pNewObjList; } -SdrObjList* SdrObject::GetObjList() const -{ - return pObjList; -} void SdrObject::SetPage(SdrPage* pNewPage) { @@ -611,10 +595,6 @@ void SdrObject::SetPage(SdrPage* pNewPage) } } -SdrPage* SdrObject::GetPage() const -{ - return pPage; -} // init global static itempool SdrItemPool* SdrObject::mpGlobalItemPool = NULL; @@ -900,10 +880,6 @@ sal_uInt32 SdrObject::GetOrdNum() const return nOrdNum; } -sal_uInt32 SdrObject::GetOrdNumDirect() const -{ - return nOrdNum; -} void SdrObject::SetOrdNum(sal_uInt32 nNum) { @@ -2690,95 +2666,39 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas return pRet; } -bool SdrObject::IsVirtualObj() const -{ - return bVirtObj; -} -bool SdrObject::IsClosedObj() const -{ - return bClosedObj; -} -bool SdrObject::IsEdgeObj() const -{ - return bIsEdge; -} -bool SdrObject::Is3DObj() const -{ - return bIs3DObj; -} -bool SdrObject::IsUnoObj() const -{ - return bIsUnoObj; -} void SdrObject::SetMarkProtect(bool bProt) { bMarkProt = bProt; } -bool SdrObject::IsMarkProtect() const -{ - return bMarkProt; -} -bool SdrObject::IsInserted() const -{ - return bInserted; -} -bool SdrObject::IsMoveProtect() const -{ - return bMovProt; -} -bool SdrObject::IsResizeProtect() const -{ - return bSizProt; -} bool SdrObject::IsPrintable() const { return !bNoPrint; } -bool SdrObject::IsVisible() const -{ - return mbVisible; -} void SdrObject::SetEmptyPresObj(bool bEpt) { bEmptyPresObj = bEpt; } -bool SdrObject::IsEmptyPresObj() const -{ - return bEmptyPresObj; -} void SdrObject::SetNotVisibleAsMaster(bool bFlg) { bNotVisibleAsMaster=bFlg; } -bool SdrObject::IsNotVisibleAsMaster() const -{ - return bNotVisibleAsMaster; -} -bool SdrObject::LineIsOutsideGeometry() const -{ - return mbLineIsOutsideGeometry; -} -bool SdrObject::DoesSupportTextIndentingOnLineWidthChange() const -{ - return mbSupportTextIndentingOnLineWidthChange; -} // convert this path object to contour object, even when it is a group SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) const @@ -2966,10 +2886,6 @@ void SdrObject::SetUserCall(SdrObjUserCall* pUser) pUserCall = pUser; } -SdrObjUserCall* SdrObject::GetUserCall() const -{ - return pUserCall; -} void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect) const { @@ -3335,10 +3251,6 @@ void SdrObject::SetDoNotInsertIntoPageAutomatically(const bool bSet) mbDoNotInsertIntoPageAutomatically = bSet; } -bool SdrObject::IsDoNotInsertIntoPageAutomatically() const -{ - return mbDoNotInsertIntoPageAutomatically; -} // #i121917# bool SdrObject::HasText() const diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5a9496f8e541..4b1c22b490c5 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1210,10 +1210,6 @@ void SdrGrafObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) ImpSetAttrToGrafInfo(); } -bool SdrGrafObj::IsMirrored() const -{ - return bMirrored; -} void SdrGrafObj::SetMirrored( bool _bMirrored ) { diff --git a/svx/source/svdraw/svdoopengl.cxx b/svx/source/svdraw/svdoopengl.cxx index f1e8398cf057..1b3398359c83 100644 --- a/svx/source/svdraw/svdoopengl.cxx +++ b/svx/source/svdraw/svdoopengl.cxx @@ -34,10 +34,6 @@ sdr::contact::ViewContact* SdrOpenGLObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfOpenGLObj(*this); } -OpenGLContext* SdrOpenGLObj::getOpenGLContext() -{ - return mpContext; -} void SdrOpenGLObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 409c2b16f535..568aa4ea7a10 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -96,10 +96,6 @@ SdrPageObj::~SdrPageObj() } } -SdrPage* SdrPageObj::GetReferencedPage() const -{ - return mpShownPage; -} void SdrPageObj::SetReferencedPage(SdrPage* pNewPage) { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index b0a9c4477c6e..dbe91a6c2843 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1236,10 +1236,6 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet) ImpPageChange(*mpSdrPage); } -SfxStyleSheet* SdrPageProperties::GetStyleSheet() const -{ - return mpStyleSheet; -} diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 180396120b1e..3e09f9d64fb4 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -127,10 +127,6 @@ SvxViewHint::SvxViewHint (HintType eHintType) { } -SvxViewHint::HintType SvxViewHint::GetHintType (void) const -{ - return meHintType; -} @@ -1318,10 +1314,6 @@ void SdrPaintView::SetBufferedOverlayAllowed(bool bNew) } } -bool SdrPaintView::IsPagePaintingAllowed() const -{ - return mbPagePaintingAllowed; -} void SdrPaintView::SetPagePaintingAllowed(bool bNew) { diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index b51142e6a50e..9aa4e00a3fc3 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -778,10 +778,6 @@ void SdrUndoObjList::SetOwner(bool bNew) bOwner = bNew; } -sal_uInt32 SdrUndoObjList::GetOrdNum() const -{ - return nOrdNum; -} void SdrUndoObjList::SetOrdNum(sal_uInt32 nOrdNum_) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index ddcc2f7c37d3..87aa9c4b0689 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -276,10 +276,6 @@ void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ) GetModel()->SetSortMode(SortNone); } -sal_uInt16 DictionaryList::getSortColumn() const -{ - return m_nSortColumnIndex; -} IMPL_LINK( DictionaryList, CompareHdl, SvSortData*, pData ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 182c4984ad92..b088bb07196d 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -81,7 +81,7 @@ public: DictionaryEntry* getFirstSelectedEntry() const; void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ); - sal_uInt16 getSortColumn() const; + sal_uInt16 getSortColumn() const { return m_nSortColumnIndex;} private: OUString getPropertyTypeName( sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/ ) const; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index bdc4478bea60..acbb614fc74d 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1262,10 +1262,6 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx } -drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const throw() -{ - return mePolygonKind; -} void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) @@ -1397,10 +1393,6 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con } -drawing::PolygonKind SvxShapePolyPolygonBezier::GetPolygonKind() const throw() -{ - return mePolygonKind; -} void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 1a70be1f03d0..cbffcd4688fb 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -405,10 +405,6 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt -const ::GalleryObject* GalleryItem::implGetObject() const -{ - return mpGalleryObject; -} diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index ab526c9e086a..6449cc4fd608 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -92,7 +92,7 @@ private: ::unogallery::GalleryTheme* mpTheme; const ::GalleryObject* mpGalleryObject; - const ::GalleryObject* implGetObject() const; + const ::GalleryObject* implGetObject() const { return mpGalleryObject;} void implSetInvalid(); // not available diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index aa28d12f7b41..8381641fae35 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -401,10 +401,6 @@ void GalleryTheme::implReleaseItems( GalleryObject* pObj ) -::GalleryTheme* GalleryTheme::implGetTheme() const -{ - return mpTheme; -} diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index bf3b698e49bb..88d8afd86582 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -91,7 +91,7 @@ private: ::Gallery* mpGallery; ::GalleryTheme* mpTheme; - ::GalleryTheme* implGetTheme() const; + ::GalleryTheme* implGetTheme() const { return mpTheme;} void implReleaseItems( GalleryObject* pObj ); diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx index 08f473c36a71..5efa72f6b386 100644 --- a/sw/inc/SwNodeNum.hxx +++ b/sw/inc/SwNodeNum.hxx @@ -35,9 +35,9 @@ public: explicit SwNodeNum( SwNumRule* pNumRule ); virtual ~SwNodeNum(); - SwNumRule* GetNumRule() const; + SwNumRule* GetNumRule() const { return mpNumRule;} void ChangeNumRule( SwNumRule& rNumRule ); - SwTxtNode* GetTxtNode() const; + SwTxtNode* GetTxtNode() const { return mpTxtNode;} virtual bool IsNotificationEnabled() const SAL_OVERRIDE; diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 4ac7e3157a0f..ce938020c9aa 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -162,7 +162,7 @@ public: */ SwNumberTree::tSwNumTreeNumber GetNumber( bool bValidate = true ) const; - bool IsContinueingPreviousSubTree() const; + bool IsContinueingPreviousSubTree() const { return mbContinueingPreviousSubTree;} /** Returns level numbers of this node. @@ -223,7 +223,7 @@ public: @retval true this node is a phantom @retval false this node is NOT a phantom */ - bool IsPhantom() const; + bool IsPhantom() const { return mbPhantom;} /** set level of this node diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index d5b4336bd3f7..fcc5c1b0868e 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -215,11 +215,11 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to member <mpDrawObj> void SetDrawObj( SdrObject& _rDrawObj ); const SdrObject* GetDrawObj() const; - SdrObject* DrawObj(); + SdrObject* DrawObj() { return mpDrawObj;} // accessors to member <mpAnchorFrm> const SwFrm* GetAnchorFrm() const; - SwFrm* AnchorFrm(); + SwFrm* AnchorFrm() { return mpAnchorFrm;} void ChgAnchorFrm( SwFrm* _pNewAnchorFrm ); /** determine anchor frame containing the anchor position @@ -232,7 +232,7 @@ class SW_DLLPUBLIC SwAnchoredObject */ SwFrm* GetAnchorFrmContainingAnchPos(); - SwPageFrm* GetPageFrm(); + SwPageFrm* GetPageFrm() { return mpPageFrm;} const SwPageFrm* GetPageFrm() const; void SetPageFrm( SwPageFrm* _pNewPageFrm ); @@ -298,7 +298,7 @@ class SW_DLLPUBLIC SwAnchoredObject void ResetLastCharRectHeight(); // accessor to member <nmLastTopOfLine> - SwTwips GetLastTopOfLine() const; + SwTwips GetLastTopOfLine() const { return mnLastTopOfLine;} void AddLastTopOfLineY( SwTwips _nDiff ); /** reset members <maLastCharRect> and <mnLastTopOfLine> @@ -468,7 +468,7 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to member <mbTmpConsiderWrapInfluence> void SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrapInfluence ); - bool IsTmpConsiderWrapInfluence() const; + bool IsTmpConsiderWrapInfluence() const { return mbTmpConsiderWrapInfluence;} /** method to determine, if the anchored object is overlapping with a previous column diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 468eb1c3029c..578615599cdf 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -123,7 +123,7 @@ public: const SwFrmFmt *GetFmt() const { return (const SwFrmFmt*)GetRegisteredIn(); } - bool IsInDTOR() const; + bool IsInDTOR() const { return mbInDTOR;} /** method to move drawing object to corresponding visible layer diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index f9f904d1fbf9..ee48178b2b00 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1801,7 +1801,7 @@ public: bool ContainsHiddenChars() const; // call back for API wrapper - SwModify* GetUnoCallBack() const; + SwModify* GetUnoCallBack() const { return mpUnoCallBack; } IGrammarContact* getGrammarContact() const { return mpGrammarContact; } diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index ee1aa0e364d5..eb588342e2ec 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -303,7 +303,7 @@ class SW_DLLPUBLIC SwInputField : public SwField virtual SwField* Copy() const SAL_OVERRIDE; // Accessing Input Field's content - const OUString& getContent() const; + const OUString& getContent() const { return aContent;} void LockNotifyContentChange(); void UnlockNotifyContentChange(); @@ -320,7 +320,7 @@ public: virtual ~SwInputField(); void SetFmtFld( SwFmtFld& rFmtFld ); - SwFmtFld* GetFmtFld(); + SwFmtFld* GetFmtFld() { return mpFmtFld;} // Providing new Input Field's content: // Fill Input Field's content depending on <nSupType>. diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 366511cbf7b8..3a9d370f0017 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -66,7 +66,7 @@ public: sal_uInt16 GetPageNum() const { return nPageNum; } const SwPosition *GetCntntAnchor() const { return m_pCntntAnchor.get(); } // #i28701# - sal_uInt32 GetOrder() const; + sal_uInt32 GetOrder() const { return mnOrder;} void SetType( RndStdIds nRndId ) { nAnchorId = nRndId; } void SetPageNum( sal_uInt16 nNew ) { nPageNum = nNew; } diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index 9adeedfa748c..0bcf9cebca20 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -135,7 +135,7 @@ protected: SwTxtNode * m_pTxtNode; SwTxtMeta * GetTxtAttr() const; - SwTxtNode * GetTxtNode() const; ///< @return 0 if not in document (undo) + SwTxtNode * GetTxtNode() const { return m_pTxtNode;} ///< @return 0 if not in document (undo) SwFmtMeta * GetFmtMeta() const { return m_pFmt; } void SetFmtMeta( SwFmtMeta * const i_pFmt ) { m_pFmt = i_pFmt; }; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index d4cd0fb653c6..100c176ef588 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -202,7 +202,7 @@ public: GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const; boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer(); - bool IsLinkedInputStreamReady() const; + bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;} void TriggerAsyncRetrieveInputStream(); void ApplyInputStream( com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index b7af846bbf88..46ef40180a5f 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -594,7 +594,7 @@ public: */ void SetAttrOutlineLevel(int nLevel); - bool IsEmptyListStyleDueToSetOutlineLevelAttr(); + bool IsEmptyListStyleDueToSetOutlineLevelAttr() { return mbEmptyListStyleSetDueToSetOutlineLevelAttr;} void SetEmptyListStyleDueToSetOutlineLevelAttr(); void ResetEmptyListStyleDueToResetOutlineLevelAttr(); diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index cf63e103b949..0ba4f7a768a6 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -246,7 +246,7 @@ public: bool IsOutlineRule() const { return meRuleType == OUTLINE_RULE; } - bool IsCountPhantoms() const; + bool IsCountPhantoms() const { return mbCountPhantoms; } void SetCountPhantoms(bool bCountPhantoms); /// Query and set PoolFormat IDs. diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index ab1945b437ac..6ca6e4779f17 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -100,7 +100,7 @@ public: virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE; virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE; virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE; - SfxItemSet* GetItemSet( ) const; + SfxItemSet* GetItemSet( ) const { return pSet; } }; class SW_DLLPUBLIC SwRedlineData diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index 61c6410024c5..51af85f85a21 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -44,15 +44,7 @@ SwNodeNum::~SwNodeNum() { } -SwTxtNode * SwNodeNum::GetTxtNode() const -{ - return mpTxtNode; -} -SwNumRule * SwNodeNum::GetNumRule() const -{ - return mpNumRule; -} void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule ) { diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index b35a53d8eb90..9b3716b8dd53 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -702,10 +702,6 @@ SwNumberTree::tSwNumTreeNumber SwNumberTreeNode::GetNumber(bool bValidate) return mnNumber; } -bool SwNumberTreeNode::IsContinueingPreviousSubTree() const -{ - return mbContinueingPreviousSubTree; -} vector<SwNumberTree::tSwNumTreeNumber> SwNumberTreeNode::GetNumberVector() const { @@ -731,10 +727,6 @@ bool SwNumberTreeNode::IsValid(const SwNumberTreeNode * pChild) const return bResult; } -bool SwNumberTreeNode::IsPhantom() const -{ - return mbPhantom; -} void SwNumberTreeNode::SetPhantom(bool _bPhantom) { diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index a247357a6c34..868a7bec26c8 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -216,21 +216,6 @@ bool SwAccessibleChild::IsValid() const mpWindow != 0; } -const SdrObject* SwAccessibleChild::GetDrawObject() const -{ - return mpDrawObj; -} - -const SwFrm *SwAccessibleChild::GetSwFrm() const -{ - return mpFrm; -} - -Window* SwAccessibleChild::GetWindow() const -{ - return mpWindow; -} - bool SwAccessibleChild::IsVisibleChildrenOnly() const { bool bRet( false ); diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx index 445b8eeb26c8..ba7f983b1007 100644 --- a/sw/source/core/access/accfrmobj.hxx +++ b/sw/source/core/access/accfrmobj.hxx @@ -52,9 +52,9 @@ class SwAccessibleChild bool IsValid() const; - const SwFrm* GetSwFrm() const; - const SdrObject* GetDrawObject() const; - Window* GetWindow() const; + const SwFrm* GetSwFrm() const { return mpFrm; } + const SdrObject* GetDrawObject() const { return mpDrawObj; } + Window* GetWindow() const { return mpWindow; } const SwFrm* GetParent( const bool bInPagePreview ) const; diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 8699fca3f14b..5266765138f0 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -826,11 +826,6 @@ void SwDoc::SetPreviewPrtData( const SwPagePreviewPrtData* pNew ) SetModified(); } -SwModify* SwDoc::GetUnoCallBack() const -{ - return mpUnoCallBack; -} - /** SwDoc: Reading and writing of the layout cache. */ void SwDoc::ReadLayoutCache( SvStream& rStream ) { diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index cb1520a7af71..ab47e58d0965 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -3249,11 +3249,6 @@ bool SwRedlineExtraData_FormattingChanges::operator == ( const SwRedlineExtraDat return false; } -SfxItemSet* SwRedlineExtraData_FormattingChanges::GetItemSet( ) const -{ - return pSet; -} - SwRedlineData::SwRedlineData( RedlineType_t eT, sal_uInt16 nAut ) : pNext( 0 ), pExtraData( 0 ), aStamp( DateTime::SYSTEM ), diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index f7e773c9110a..66c156f8fad7 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1003,11 +1003,6 @@ void SwNumRule::Validate() SetInvalidRule(false); } -bool SwNumRule::IsCountPhantoms() const -{ - return mbCountPhantoms; -} - void SwNumRule::SetCountPhantoms(bool bCountPhantoms) { mbCountPhantoms = bCountPhantoms; diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 7eeb80aaadcb..adc9a1b8d19e 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -59,7 +59,7 @@ class WriterHelper public: WriterHelper( xmlTextWriterPtr ); ~WriterHelper(); - operator xmlTextWriterPtr(); + operator xmlTextWriterPtr() { return writer;} void startElement( const char* element ); void endElement(); void writeFormatAttribute( const char* attribute, const char* format, ... ) @@ -93,10 +93,6 @@ WriterHelper::~WriterHelper() } } -WriterHelper::operator xmlTextWriterPtr() -{ - return writer; -} void WriterHelper::startElement( const char* element ) { diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 16b5e87382e0..c9caf9d91db5 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -174,10 +174,6 @@ SwContact::~SwContact() SetInDTOR(); } -bool SwContact::IsInDTOR() const -{ - return mbInDTOR; -} void SwContact::SetInDTOR() { diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 9667bfff21f8..dec2dc70402b 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -1136,15 +1136,7 @@ void SwInputField::SetFmtFld( SwFmtFld& rFmtFld ) mpFmtFld = &rFmtFld; } -SwFmtFld* SwInputField::GetFmtFld() -{ - return mpFmtFld; -} -const OUString& SwInputField::getContent() const -{ - return aContent; -} void SwInputField::LockNotifyContentChange() { diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 329df90a4181..9452ad971d19 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -1232,10 +1232,6 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream() } } -bool SwGrfNode::IsLinkedInputStreamReady() const -{ - return mbLinkedInputStreamReady; -} void SwGrfNode::ApplyInputStream( com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index 882a0283c6ad..be6a4f84a11c 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -131,13 +131,13 @@ namespace objectpositioning Point GetAnchorPos() const; // calculated relative position to base line for object position type AS_CHAR - SwTwips GetRelPosY() const; + SwTwips GetRelPosY() const { return mnRelPos;} // determined object rectangle including spacing for object position type AS_CHAR SwRect GetObjBoundRectInclSpacing() const; // determined line alignment relative to line height - sal_uInt8 GetLineAlignment() const; + sal_uInt8 GetLineAlignment() const { return mnLineAlignment;} }; } diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 64bfe0b01cff..136244213d9c 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -549,14 +549,14 @@ public: inline bool IsVertical() const; inline bool IsVertLR() const; - inline bool GetVerticalFlag() const; + inline bool GetVerticalFlag() const { return mbVertical; } inline void SetVertical( bool bNew ){ mbVertical = bNew ? 1 : 0; } inline void SetbVertLR( bool bNew ) { mbVertLR = bNew ? 1 : 0; } inline void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew ? 1 : 0; } inline void SetInvalidVert( bool bNew) { mbInvalidVert = bNew ? 1 : 0; } inline bool IsRightToLeft() const; - inline bool GetRightToLeftFlag() const; + inline bool GetRightToLeftFlag() const { return mbRightToLeft; } inline void SetRightToLeft( bool bNew ){ mbRightToLeft = bNew ? 1 : 0; } inline void SetDerivedR2L( bool bNew ) { mbDerivedR2L = bNew ? 1 : 0; } inline void SetInvalidR2L( bool bNew ) { mbInvalidR2L = bNew ? 1 : 0; } @@ -935,20 +935,12 @@ inline bool SwFrm::IsVertLR() const { return mbVertLR; } -bool SwFrm::GetVerticalFlag() const -{ - return mbVertical; -} inline bool SwFrm::IsRightToLeft() const { if( mbInvalidR2L ) ((SwFrm*)this)->SetDirFlags( false ); return mbRightToLeft; } -bool SwFrm::GetRightToLeftFlag() const -{ - return mbRightToLeft; -} inline void SwFrm::SetCompletePaint() const { diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index a97fa82b86ee..b6cf395e9a65 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -117,20 +117,12 @@ const SdrObject* SwAnchoredObject::GetDrawObj() const return mpDrawObj; } -SdrObject* SwAnchoredObject::DrawObj() -{ - return mpDrawObj; -} const SwFrm* SwAnchoredObject::GetAnchorFrm() const { return mpAnchorFrm; } -SwFrm* SwAnchoredObject::AnchorFrm() -{ - return mpAnchorFrm; -} void SwAnchoredObject::ChgAnchorFrm( SwFrm* _pNewAnchorFrm ) { @@ -161,10 +153,6 @@ SwFrm* SwAnchoredObject::GetAnchorFrmContainingAnchPos() return pAnchorFrmContainingAnchPos; } -SwPageFrm* SwAnchoredObject::GetPageFrm() -{ - return mpPageFrm; -} const SwPageFrm* SwAnchoredObject::GetPageFrm() const { @@ -227,10 +215,6 @@ void SwAnchoredObject::SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFr RegisterAtCorrectPage(); } -SwTwips SwAnchoredObject::GetLastTopOfLine() const -{ - return mnLastTopOfLine; -} // #i28701# - follow-up of #i22341# void SwAnchoredObject::AddLastTopOfLineY( SwTwips _nDiff ) @@ -799,10 +783,6 @@ void SwAnchoredObject::SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrap } } -bool SwAnchoredObject::IsTmpConsiderWrapInfluence() const -{ - return mbTmpConsiderWrapInfluence; -} void SwAnchoredObject::SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence ) { diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index fa5a4d07ca4a..24ac07e45ed9 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1480,10 +1480,6 @@ SfxPoolItem* SwFmtAnchor::Clone( SfxItemPool* ) const sal_uInt32 SwFmtAnchor::mnOrderCounter = 0; // OD 2004-05-05 #i28701# -sal_uInt32 SwFmtAnchor::GetOrder() const -{ - return mnOrder; -} bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index b6a3d06f8e6f..10919aedb8bb 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -400,10 +400,6 @@ Point SwAsCharAnchoredObjectPosition::GetAnchorPos() const } /** calculated relative position to base line for object position */ -SwTwips SwAsCharAnchoredObjectPosition::GetRelPosY() const -{ - return mnRelPos; -} /** determined object rectangle including spacing for object */ SwRect SwAsCharAnchoredObjectPosition::GetObjBoundRectInclSpacing() const @@ -412,9 +408,5 @@ SwRect SwAsCharAnchoredObjectPosition::GetObjBoundRectInclSpacing() const } /** determined line alignment */ -sal_uInt8 SwAsCharAnchoredObjectPosition::GetLineAlignment() const -{ - return mnLineAlignment; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 446e104488ca..2119610ce978 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -638,10 +638,6 @@ SwTxtMeta * Meta::GetTxtAttr() const return (m_pFmt) ? m_pFmt->GetTxtAttr() : 0; } -SwTxtNode * Meta::GetTxtNode() const -{ - return m_pTxtNode; -} void Meta::NotifyChangeTxtNodeImpl() { diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 04099d94ac1d..235e5161485f 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3752,10 +3752,6 @@ void SwTxtNode::SetAttrOutlineLevel(int nLevel) } // #i70748# -bool SwTxtNode::IsEmptyListStyleDueToSetOutlineLevelAttr() -{ - return mbEmptyListStyleSetDueToSetOutlineLevelAttr; -} void SwTxtNode::SetEmptyListStyleDueToSetOutlineLevelAttr() { diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 71cc1db2a1d3..fc19e785b817 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -215,7 +215,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; void SetFrmFmt(SwFrmFmt * _pFrmFmt); const SwFrmFmt* GetFrmFmt() const; - SwFrmFmt* GetFrmFmt(); + SwFrmFmt* GetFrmFmt() { return pFrmFmt;} }; class SwFltAnchorClient : public SwClient diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index eaebcae87a22..454cad669d73 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -873,10 +873,6 @@ const SwFrmFmt * SwFltAnchor::GetFrmFmt() const return pFrmFmt; } -SwFrmFmt * SwFltAnchor::GetFrmFmt() -{ - return pFrmFmt; -} bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const { diff --git a/sw/source/filter/ww8/WW8FibData.cxx b/sw/source/filter/ww8/WW8FibData.cxx index 4a5a5829d01f..2c94015a1ca6 100644 --- a/sw/source/filter/ww8/WW8FibData.cxx +++ b/sw/source/filter/ww8/WW8FibData.cxx @@ -41,15 +41,7 @@ void WW8FibData::setWriteReservation(bool bWriteReservation) m_bWriteReservation = bWriteReservation; } -bool WW8FibData::getReadOnlyRecommended() const -{ - return m_bReadOnlyRecommended; -} -bool WW8FibData::getWriteReservation() const -{ - return m_bWriteReservation; -} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/WW8FibData.hxx b/sw/source/filter/ww8/WW8FibData.hxx index fb1b18de46c1..a196b8560ecb 100644 --- a/sw/source/filter/ww8/WW8FibData.hxx +++ b/sw/source/filter/ww8/WW8FibData.hxx @@ -35,8 +35,8 @@ public: void setReadOnlyRecommended(bool bReadOnlyRecommended); void setWriteReservation(bool bWriteReservation); - bool getReadOnlyRecommended() const; - bool getWriteReservation() const; + bool getReadOnlyRecommended() const { return m_bReadOnlyRecommended;} + bool getWriteReservation() const { return m_bWriteReservation;} }; } diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 075020debce4..d6544742865f 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -113,45 +113,13 @@ void WW8TableNodeInfoInner::setRect(const SwRect & rRect) maRect = rRect; } -sal_uInt32 WW8TableNodeInfoInner::getDepth() const -{ - return mnDepth; -} -sal_uInt32 WW8TableNodeInfoInner::getCell() const -{ - return mnCell; -} -sal_uInt32 WW8TableNodeInfoInner::getRow() const -{ - return mnRow; -} -sal_uInt32 WW8TableNodeInfoInner::getShadowsBefore() const -{ - return mnShadowsBefore; -} -sal_uInt32 WW8TableNodeInfoInner::getShadowsAfter() const -{ - return mnShadowsAfter; -} -bool WW8TableNodeInfoInner::isEndOfCell() const -{ - return mbEndOfCell; -} -bool WW8TableNodeInfoInner::isEndOfLine() const -{ - return mbEndOfLine; -} -bool WW8TableNodeInfoInner::isFirstInTable() const -{ - return mbFirstInTable; -} const SwNode * WW8TableNodeInfoInner::getNode() const { @@ -376,15 +344,7 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() return pResult; } -const SwTableBox * WW8TableNodeInfoInner::getTableBox() const -{ - return mpTableBox; -} -const SwTable * WW8TableNodeInfoInner::getTable() const -{ - return mpTable; -} const SwRect & WW8TableNodeInfoInner::getRect() const { @@ -559,10 +519,6 @@ void WW8TableNodeInfo::setShadowsAfter(sal_uInt32 nShadowsAfter) getInnerForDepth(mnDepth)->setShadowsAfter(nShadowsAfter); } -WW8TableInfo * WW8TableNodeInfo::getParent() const -{ - return mpParent; -} sal_uInt32 WW8TableNodeInfo::getDepth() const { @@ -572,25 +528,13 @@ sal_uInt32 WW8TableNodeInfo::getDepth() const return mnDepth; } -const SwNode * WW8TableNodeInfo::getNode() const -{ - return mpNode; -} const SwTableBox * WW8TableNodeInfo::getTableBox() const { return getInnerForDepth(mnDepth)->getTableBox(); } -WW8TableNodeInfo * WW8TableNodeInfo::getNext() const -{ - return mpNext; -} -const SwNode * WW8TableNodeInfo::getNextNode() const -{ - return mpNextNode; -} sal_uInt32 WW8TableNodeInfo::getCell() const { diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 83c463550507..4c2188a84d8a 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -85,17 +85,17 @@ public: void setTable(const SwTable * pTable); void setRect(const SwRect & rRect); - sal_uInt32 getDepth() const; - sal_uInt32 getCell() const; - sal_uInt32 getRow() const; - sal_uInt32 getShadowsBefore() const; - sal_uInt32 getShadowsAfter() const; - bool isEndOfCell() const; - bool isEndOfLine() const; - bool isFirstInTable() const; + sal_uInt32 getDepth() const { return mnDepth;} + sal_uInt32 getCell() const { return mnCell;} + sal_uInt32 getRow() const { return mnRow;} + sal_uInt32 getShadowsBefore() const { return mnShadowsBefore;} + sal_uInt32 getShadowsAfter() const { return mnShadowsAfter;} + bool isEndOfCell() const { return mbEndOfCell;} + bool isEndOfLine() const { return mbEndOfLine;} + bool isFirstInTable() const { return mbFirstInTable;} bool isVertMerge() const; - const SwTableBox * getTableBox() const; - const SwTable * getTable() const; + const SwTableBox * getTableBox() const { return mpTableBox;} + const SwTable * getTable() const { return mpTable;} const SwRect & getRect() const; const SwNode * getNode() const; @@ -194,15 +194,15 @@ public: void setNextNode(const SwNode * pNode); void setRect(const SwRect & rRect); - WW8TableInfo * getParent() const; + WW8TableInfo * getParent() const { return mpParent;} sal_uInt32 getDepth() const; bool isEndOfLine() const; bool isEndOfCell() const; bool isFirstInTable() const; - const SwNode * getNode() const; + const SwNode * getNode() const { return mpNode;} const SwTableBox * getTableBox() const; - WW8TableNodeInfo * getNext() const; - const SwNode * getNextNode() const; + WW8TableNodeInfo * getNext() const { return mpNext;} + const SwNode * getNextNode() const { return mpNextNode;} const SwRect & getRect() const; const Inners_t & getInners() const; diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 0935461eb2e1..b21da7c4f246 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -258,10 +258,6 @@ namespace sw } } - bool Frame::IsInline() const - { - return mbIsInline; - } void Frame::ForceTreatAsInline() { diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 00b63bd80ab2..72d5794dcd18 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -147,7 +147,7 @@ namespace sw @return whether this is inline or not */ - bool IsInline() const; + bool IsInline() const { return mbIsInline; } /** Even if the frame isn't an inline frame, force it to behave as one diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 1247392035ae..c2d7ff4b3d5d 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -5581,10 +5581,6 @@ WW8Fib::WW8Fib(sal_uInt8 nVer, bool bDot) nNumDecimalSep = aLocaleWrapper.getNumDecimalSep()[0]; } -sal_Unicode WW8Fib::getNumDecimalSep() const -{ - return nNumDecimalSep; -} bool WW8Fib::WriteHeader(SvStream& rStrm) { diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 1daae04b7f04..b3ca7ca29c69 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1436,7 +1436,7 @@ public: static rtl_TextEncoding GetFIBCharset(sal_uInt16 chs); ww::WordVersion GetFIBVersion() const; WW8_CP GetBaseCp(ManTypes nType) const; - sal_Unicode getNumDecimalSep() const; + sal_Unicode getNumDecimalSep() const { return nNumDecimalSep;} }; class WW8Style diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index b50ddff3a507..ffb210b63492 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -429,10 +429,6 @@ bool TBDelta::ControlDropsToolBar() return !( CiTBDE & 0x8000 ); } -sal_Int32 TBDelta::TBCStreamOffset() -{ - return fc; -} sal_Int16 TBDelta::CustomizationIndex() { diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 4695f083d6cf..0fe3e530b1f2 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -93,7 +93,7 @@ public: bool ControlIsInserted(); bool ControlIsChanged(); bool ControlDropsToolBar(); - sal_Int32 TBCStreamOffset(); + sal_Int32 TBCStreamOffset() { return fc;} sal_Int16 CustomizationIndex(); }; diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index aa6e06710961..7d3c7af83f3b 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -171,10 +171,6 @@ void SwCustomizeAddressListDialog::UpdateButtons() m_pRenamePB->Enable(nEntries > 0); } -SwCSVData* SwCustomizeAddressListDialog::GetNewData() -{ - return m_pNewData; -} SwAddRenameEntryDialog::SwAddRenameEntryDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index b92f1e9cbc01..b11931d153a3 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -50,7 +50,7 @@ public: SwCustomizeAddressListDialog(Window* pParent, const SwCSVData& rOldData); virtual ~SwCustomizeAddressListDialog(); - SwCSVData* GetNewData(); + SwCSVData* GetNewData() { return m_pNewData;} }; class SwAddRenameEntryDialog : public SfxModalDialog diff --git a/sw/source/uibase/dbui/maildispatcher.cxx b/sw/source/uibase/dbui/maildispatcher.cxx index a384fe855fa0..8b1a8771b3c0 100644 --- a/sw/source/uibase/dbui/maildispatcher.cxx +++ b/sw/source/uibase/dbui/maildispatcher.cxx @@ -184,10 +184,6 @@ void MailDispatcher::shutdown() wakening_call_.set(); } -bool MailDispatcher::isStarted() const -{ - return run_; -} void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> listener) { diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx index 4cbe6cd9f3cd..8dc22fc3b978 100644 --- a/sw/source/uibase/inc/maildispatcher.hxx +++ b/sw/source/uibase/inc/maildispatcher.hxx @@ -116,7 +116,7 @@ public: @return <TRUE/> if the sending thread is running. */ - bool isStarted() const; + bool isStarted() const { return run_;} /** returns if the thread is still running */ diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx index 463215eb2fa4..ef9b6871a3ff 100644 --- a/sw/source/uibase/inc/swcont.hxx +++ b/sw/source/uibase/inc/swcont.hxx @@ -60,7 +60,7 @@ class SwTypeNumber SwTypeNumber(sal_uInt8 nId) :nTypeId(nId){} virtual ~SwTypeNumber(); - sal_uInt8 GetTypeId() const; + sal_uInt8 GetTypeId() const { return nTypeId;} }; class SwContent : public SwTypeNumber diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 5791659c4a34..d55b4980a2be 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -154,10 +154,6 @@ SwContent::SwContent(const SwContentType* pCnt, const OUString& rName, long nYPo { } -sal_uInt8 SwTypeNumber::GetTypeId() const -{ - return nTypeId; -} SwTypeNumber::~SwTypeNumber() { diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx index 102ab5186976..72b3bde38c1d 100644 --- a/tools/source/memtools/multisel.cxx +++ b/tools/source/memtools/multisel.cxx @@ -776,10 +776,6 @@ StringRangeEnumerator::Iterator& StringRangeEnumerator::Iterator::operator++() return *this; } -sal_Int32 StringRangeEnumerator::Iterator::operator*() const -{ - return nCurrent; -} bool StringRangeEnumerator::Iterator::operator==( const Iterator& i_rCompare ) const { diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index 2e9ad1ff896a..224963cf2191 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -318,10 +318,6 @@ void ZCodec::SetCRC( sal_uIntPtr nCRC ) mnCRC = nCRC; } -sal_uIntPtr ZCodec::GetCRC() -{ - return mnCRC; -} void ZCodec::InitCompress() { diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index bb5bf134cdc1..89f7f56b7a9c 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -73,20 +73,6 @@ XInputStream_impl::~XInputStream_impl() } -sal_Int32 SAL_CALL XInputStream_impl::CtorSuccess() -{ - return m_nErrorCode; -}; - - - -sal_Int32 SAL_CALL XInputStream_impl::getMinorError() -{ - return m_nMinorErrorCode; -} - - - // XTypeProvider diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index 5acb3bc05cd7..389735666130 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -53,8 +53,8 @@ namespace fileaccess { * Returns an error code as given by filerror.hxx */ - sal_Int32 SAL_CALL CtorSuccess(); - sal_Int32 SAL_CALL getMinorError(); + sal_Int32 SAL_CALL CtorSuccess() { return m_nErrorCode;} + sal_Int32 SAL_CALL getMinorError() { return m_nMinorErrorCode;} // XTypeProvider diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index d847271ddf81..386218254f21 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -93,17 +93,9 @@ XResultSet_impl::~XResultSet_impl() -sal_Int32 SAL_CALL XResultSet_impl::CtorSuccess() -{ - return m_nErrorCode; -} -sal_Int32 SAL_CALL XResultSet_impl::getMinorError() -{ - return m_nMinorErrorCode; -} void SAL_CALL diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 531f95cb8d18..d60eff191276 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -93,8 +93,8 @@ class XResultSet_impl : public Notifier, return m_aBaseDirectory; } - sal_Int32 SAL_CALL CtorSuccess(); - sal_Int32 SAL_CALL getMinorError(); + sal_Int32 SAL_CALL CtorSuccess() { return m_nErrorCode;} + sal_Int32 SAL_CALL getMinorError() { return m_nMinorErrorCode;} // XEventListener virtual void SAL_CALL diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 7ee9408919d7..bd8ee9ba3220 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -84,17 +84,9 @@ XStream_impl::~XStream_impl() } -sal_Int32 SAL_CALL XStream_impl::CtorSuccess() -{ - return m_nErrorCode; -} -sal_Int32 SAL_CALL XStream_impl::getMinorError() -{ - return m_nMinorErrorCode; -} diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index 12968c9febe2..66e2b9878f61 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -55,8 +55,8 @@ class XStream_impl : public cppu::WeakImplHelper6< * Returns an error code as given by filerror.hxx */ - sal_Int32 SAL_CALL CtorSuccess(); - sal_Int32 SAL_CALL getMinorError(); + sal_Int32 SAL_CALL CtorSuccess() { return m_nErrorCode;} + sal_Int32 SAL_CALL getMinorError() { return m_nMinorErrorCode;} virtual ~XStream_impl(); diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index f2e6beb5d869..59bc54cec1c8 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -44,10 +44,6 @@ void SAL_CALL XInteractionApproveImpl::select() } -bool XInteractionApproveImpl::isSelected() const -{ - return m_bSelected; -} // XInteractionDisapproveImpl diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 28198c7de0ba..51d117781ec9 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -44,7 +44,7 @@ namespace ftp { throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - bool isSelected() const; + bool isSelected() const { return m_bSelected;} private: diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 1adbb527c3a9..574440a9186b 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -1095,10 +1095,6 @@ bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode) return bRet; } -sal_Int16 ConfigItem::GetMode() const -{ - return m_nMode; -} void ConfigItem::SetModified() { @@ -1110,10 +1106,6 @@ void ConfigItem::ClearModified() m_bIsModified = false; } -bool ConfigItem::IsModified() const -{ - return m_bIsModified; -} bool ConfigItem::IsInValueChange() const { diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 2610eeb0eda1..751c53be4dc0 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -79,7 +79,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem virtual void Commit() SAL_OVERRIDE; - SvtExtendedSecurityOptions::OpenHyperlinkMode GetOpenHyperlinkMode(); + SvtExtendedSecurityOptions::OpenHyperlinkMode GetOpenHyperlinkMode() { return m_eOpenHyperlinkMode;} private: /*-**************************************************************************************************** @@ -199,10 +199,6 @@ void SvtExtendedSecurityOptions_Impl::Commit() // public method -SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions_Impl::GetOpenHyperlinkMode() -{ - return m_eOpenHyperlinkMode; -} // private method diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index 10321798746d..9172fcc1191b 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -80,10 +80,10 @@ class SvtFontOptions_Impl : public ConfigItem It's not used in the moment - but it's possible for the feature! *//*-*****************************************************************************************************/ - bool IsFontHistoryEnabled ( ) const; + bool IsFontHistoryEnabled ( ) const { return m_bFontHistory;} void EnableFontHistory ( bool bState ); - bool IsFontWYSIWYGEnabled ( ) const; + bool IsFontWYSIWYGEnabled ( ) const { return m_bFontWYSIWYG;} void EnableFontWYSIWYG ( bool bState ); private: @@ -234,13 +234,6 @@ void SvtFontOptions_Impl::Commit() // public method -bool SvtFontOptions_Impl::IsFontHistoryEnabled() const -{ - return m_bFontHistory; -} - -// public method - void SvtFontOptions_Impl::EnableFontHistory( bool bState ) { m_bFontHistory = bState; @@ -249,13 +242,6 @@ void SvtFontOptions_Impl::EnableFontHistory( bool bState ) // public method -bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const -{ - return m_bFontWYSIWYG; -} - -// public method - void SvtFontOptions_Impl::EnableFontWYSIWYG( bool bState ) { m_bFontWYSIWYG = bState; diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index d5c6daf5453c..ed83d1c0bbaa 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -79,8 +79,8 @@ class SvtLocalisationOptions_Impl : public ConfigItem It's not used in the moment - but it's possible for the feature! *//*-*****************************************************************************************************/ - bool IsAutoMnemonic ( ) const; - sal_Int32 GetDialogScale ( ) const; + bool IsAutoMnemonic ( ) const { return m_bAutoMnemonic;} + sal_Int32 GetDialogScale ( ) const { return m_nDialogScale;} private: @@ -216,17 +216,6 @@ void SvtLocalisationOptions_Impl::Commit() // public method -bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const -{ - return m_bAutoMnemonic; -} - -// public method - -sal_Int32 SvtLocalisationOptions_Impl::GetDialogScale() const -{ - return m_nDialogScale; -} Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames() { diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 7906ed7cc726..d0bb4a5959c4 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -204,13 +204,14 @@ class SvtSecurityOptions_Impl : public ConfigItem bool m_bROExecutePlugins; bool m_bROBasicMode; public: - bool IsWarningEnabled() const; + bool IsWarningEnabled() const { return m_bWarning;} void SetWarningEnabled( bool bSet ); - bool IsConfirmationEnabled() const; + bool IsConfirmationEnabled() const { return m_bConfirmation;} void SetConfirmationEnabled( bool bSet ); - bool IsExecutePlugins() const; + bool IsExecutePlugins() const { return m_bExecutePlugins;} void SetExecutePlugins( bool bSet ); - EBasicSecurityMode GetBasicMode ( ) const; + // xmlsec05 deprecated + EBasicSecurityMode GetBasicMode ( ) const { return m_eBasicMode;} void SetBasicMode ( EBasicSecurityMode eMode ); }; @@ -1109,13 +1110,6 @@ Mutex& SvtSecurityOptions::GetInitMutex() return theSecurityOptionsMutex::get(); } -// xmlsec05 deprecated - -EBasicSecurityMode SvtSecurityOptions_Impl::GetBasicMode() const -{ - return m_eBasicMode; -} - void SvtSecurityOptions_Impl::SetBasicMode( EBasicSecurityMode eMode ) { DBG_ASSERT(!m_bROBasicMode, "SvtSecurityOptions_Impl::SetBasicMode()\nYou tried to write on a readonly value!\n"); @@ -1126,10 +1120,6 @@ void SvtSecurityOptions_Impl::SetBasicMode( EBasicSecurityMode eMode ) } } -bool SvtSecurityOptions_Impl::IsExecutePlugins() const -{ - return m_bExecutePlugins; -} void SvtSecurityOptions_Impl::SetExecutePlugins( bool bSet ) { @@ -1141,10 +1131,6 @@ void SvtSecurityOptions_Impl::SetExecutePlugins( bool bSet ) } } -bool SvtSecurityOptions_Impl::IsWarningEnabled() const -{ - return m_bWarning; -} void SvtSecurityOptions_Impl::SetWarningEnabled( bool bSet ) { @@ -1156,10 +1142,6 @@ void SvtSecurityOptions_Impl::SetWarningEnabled( bool bSet ) } } -bool SvtSecurityOptions_Impl::IsConfirmationEnabled() const -{ - return m_bConfirmation; -} void SvtSecurityOptions_Impl::SetConfirmationEnabled( bool bSet ) { diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 47adb0929535..395c0ea817d9 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -620,10 +620,6 @@ const OString* ServerFont::GetFontFileName() const return mpFontInfo->GetFontFileName(); } -bool ServerFont::TestFont() const -{ - return mbFaceOk; -} ServerFont::~ServerFont() { diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx index aa6e7c1c513e..fbf7ba6f000d 100644 --- a/vcl/generic/print/common_gfx.cxx +++ b/vcl/generic/print/common_gfx.cxx @@ -87,11 +87,6 @@ PrinterGfx::Init (const JobData& rData) return true; } -sal_uInt16 -PrinterGfx::GetBitCount () -{ - return mnDepth; -} PrinterGfx::PrinterGfx() : mfScaleX(0.0) diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index 9a87b7e26c62..016c8f70fa28 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -59,23 +59,8 @@ GlyphSet::~GlyphSet () /* FIXME delete the glyphlist ??? */ } -sal_Int32 -GlyphSet::GetFontID () -{ - return mnFontID; -} -fonttype::type -GlyphSet::GetFontType () -{ - return meBaseType; -} -bool -GlyphSet::IsVertical () -{ - return mbVertical; -} bool GlyphSet::GetCharID ( diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx index d8cd49d22be3..e6f8fa73c811 100644 --- a/vcl/generic/print/glyphset.hxx +++ b/vcl/generic/print/glyphset.hxx @@ -94,15 +94,15 @@ public: GlyphSet (sal_Int32 nFontID, bool bVertical); ~GlyphSet (); - sal_Int32 GetFontID (); - fonttype::type GetFontType (); + sal_Int32 GetFontID () { return mnFontID;} + fonttype::type GetFontType () { return meBaseType;} static OString GetReencodedFontName (rtl_TextEncoding nEnc, const OString &rFontName); static OString GetGlyphSetEncodingName (rtl_TextEncoding nEnc, const OString &rFontName); - bool IsVertical (); + bool IsVertical () { return mbVertical;} void DrawText (PrinterGfx &rGfx, const Point& rPoint, const sal_Unicode* pStr, sal_Int16 nLen, diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index c0eb98d387c4..e718b044b5ac 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -168,7 +168,7 @@ public: virtual ~ServerFont(); const OString* GetFontFileName() const; - bool TestFont() const; + bool TestFont() const { return mbFaceOk;} FT_Face GetFtFace() const; int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); } void SetFontOptions( boost::shared_ptr<ImplFontOptions> ); diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index 1fb877740bd6..c797ea4a5812 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -325,7 +325,7 @@ public: void Clear(); // query depth - sal_uInt16 GetBitCount (); + sal_uInt16 GetBitCount () { return mnDepth;} // clip region void ResetClipRegion (); diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index df6ea1b0c03d..61c698daced0 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -172,7 +172,7 @@ public: bool IsDefaultMap() const; bool HasChar( sal_uInt32 ) const; int CountCharsInRange( sal_uInt32 cMin, sal_uInt32 cMax ) const; - int GetCharCount() const; + int GetCharCount() const { return mnCharCount;} sal_uInt32 GetFirstChar() const; sal_uInt32 GetLastChar() const; diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 20e305dc5690..1202dbcdece2 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -84,7 +84,7 @@ private: void ImplClearGraphics( bool bCreateSwapInfo ); void ImplClear(); - GraphicType ImplGetType() const; + GraphicType ImplGetType() const { return meType;} void ImplSetDefaultType(); bool ImplIsSupportedGraphic() const; @@ -127,14 +127,14 @@ private: private: - GraphicReader* ImplGetContext(); + GraphicReader* ImplGetContext() { return mpContext;} void ImplSetContext( GraphicReader* pReader ); private: void ImplSetDocFileName( const OUString& rName, sal_uLong nFilePos ); const OUString& ImplGetDocFileName() const; - sal_uLong ImplGetDocFilePos() const; + sal_uLong ImplGetDocFilePos() const { return mnDocFilePos;} bool ImplReadEmbedded( SvStream& rIStream, bool bSwap = false ); bool ImplWriteEmbedded( SvStream& rOStream ); @@ -145,7 +145,7 @@ private: bool ImplSwapOut(); bool ImplSwapOut( SvStream* pOStm ); - bool ImplIsSwapOut() const; + bool ImplIsSwapOut() const { return mbSwapOut;} void ImplSetLink( const GfxLink& ); GfxLink ImplGetLink(); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index bd60588d78e4..81bd025fc97f 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -539,10 +539,6 @@ void NumericFormatter::SetShowTrailingZeros( bool bShowTrailingZeros ) } } -sal_uInt16 NumericFormatter::GetDecimalDigits() const -{ - return mnDecimalDigits; -} void NumericFormatter::SetValue( sal_Int64 nNewValue ) { diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index ed5558dd045f..36afacd82698 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -432,10 +432,6 @@ void LongCurrencyFormatter::SetDecimalDigits( sal_uInt16 nDigits ) ReformatAll(); } -sal_uInt16 LongCurrencyFormatter::GetDecimalDigits() const -{ - return mnDecimalDigits; -} void ImplNewLongCurrencyFieldValue( LongCurrencyField* pField, BigInt nNewValue ) { diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index b114adeb62be..660df5adeee0 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -155,10 +155,6 @@ TextView* TextEngine::GetView( sal_uInt16 nView ) const return (*mpViews)[ nView ]; } -TextView* TextEngine::GetActiveView() const -{ - return mpActiveView; -} void TextEngine::SetActiveView( TextView* pTextView ) { diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx b/vcl/source/filter/GraphicNativeMetadata.cxx index 08b698a727e0..beb6787255f4 100644 --- a/vcl/source/filter/GraphicNativeMetadata.cxx +++ b/vcl/source/filter/GraphicNativeMetadata.cxx @@ -31,10 +31,6 @@ GraphicNativeMetadata::GraphicNativeMetadata() : GraphicNativeMetadata::~GraphicNativeMetadata() {} -sal_uInt16 GraphicNativeMetadata::getRotation() -{ - return mRotation; -} bool GraphicNativeMetadata::read(Graphic& rGraphic) { diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx index e7a32878b86e..01f059247a17 100644 --- a/vcl/source/filter/jpeg/Exif.cxx +++ b/vcl/source/filter/jpeg/Exif.cxx @@ -28,9 +28,6 @@ Exif::Exif() : Exif::~Exif() {} -Orientation Exif::getOrientation() { - return maOrientation; -} void Exif::setOrientation(Orientation aOrientation) { maOrientation = aOrientation; @@ -68,10 +65,6 @@ sal_Int32 Exif::getRotation() return 0; } -bool Exif::hasExif() -{ - return mbExifPresent; -} bool Exif::read(SvStream& rStream) { diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx index c365ec8071bf..5d8bbaa768fe 100644 --- a/vcl/source/filter/jpeg/Exif.hxx +++ b/vcl/source/filter/jpeg/Exif.hxx @@ -75,9 +75,9 @@ public : Exif(); virtual ~Exif(); - bool hasExif(); + bool hasExif() { return mbExifPresent;} - Orientation getOrientation(); + Orientation getOrientation() { return maOrientation;} sal_Int32 getRotation(); void setOrientation(Orientation orientation); diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 52af3eb5d480..28cefe824ebd 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -387,10 +387,6 @@ void Bitmap::ImplAssignWithSize( const Bitmap& rBitmap ) maPrefMapMode = aOldMapMode; } -ImpBitmap* Bitmap::ImplGetImpBitmap() const -{ - return mpImpBmp; -} void Bitmap::ImplSetImpBitmap( ImpBitmap* pImpBmp ) { diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 2a6f8c88f2c4..019ea983d563 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -130,20 +130,12 @@ void GfxLink::ImplCopy( const GfxLink& rGfxLink ) mpSwap->mnRefCount++; } -GfxLinkType GfxLink::GetType() const -{ - return meType; -} bool GfxLink::IsNative() const { return( meType >= GFX_LINK_FIRST_NATIVE_ID && meType <= GFX_LINK_LAST_NATIVE_ID ); } -sal_uInt32 GfxLink::GetDataSize() const -{ - return mnBufSize; -} const sal_uInt8* GfxLink::GetData() const { diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index fe2b76006988..015476042e10 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -76,30 +76,10 @@ void SvtGraphicStroke::getEndArrow( PolyPolygon& rPath ) const rPath = maEndArrow; } -double SvtGraphicStroke::getTransparency() const -{ - return mfTransparency; -} -double SvtGraphicStroke::getStrokeWidth() const -{ - return mfStrokeWidth; -} -SvtGraphicStroke::CapType SvtGraphicStroke::getCapType() const -{ - return maCapType; -} -SvtGraphicStroke::JoinType SvtGraphicStroke::getJoinType() const -{ - return maJoinType; -} -double SvtGraphicStroke::getMiterLimit() const -{ - return mfMiterLimit; -} void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const { @@ -242,40 +222,16 @@ Color SvtGraphicFill::getFillColor() const return maFillColor; } -double SvtGraphicFill::getTransparency() const -{ - return mfTransparency; -} -SvtGraphicFill::FillRule SvtGraphicFill::getFillRule() const -{ - return maFillRule; -} -SvtGraphicFill::FillType SvtGraphicFill::getFillType() const -{ - return maFillType; -} void SvtGraphicFill::getTransform( Transform& rTrans ) const { rTrans = maFillTransform; } -bool SvtGraphicFill::IsTiling() const -{ - return mbTiling; -} -bool SvtGraphicFill::isTiling() const -{ - return mbTiling; -} -SvtGraphicFill::GradientType SvtGraphicFill::getGradientType() const -{ - return maGradientType; -} void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const { diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index 25beddcb11c7..6bc9f717a1e3 100644 --- a/vcl/source/gdi/impfont.cxx +++ b/vcl/source/gdi/impfont.cxx @@ -102,10 +102,6 @@ void ImplFontCharMap::DeReference( void) const delete this; } -int ImplFontCharMap::GetCharCount() const -{ - return mnCharCount; -} int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const { diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index ff8c044c9650..ac36ecf3211e 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -402,10 +402,6 @@ void ImpGraphic::ImplClear() mnSizeBytes = 0; } -GraphicType ImpGraphic::ImplGetType() const -{ - return meType; -} void ImpGraphic::ImplSetDefaultType() { @@ -951,10 +947,6 @@ sal_uLong ImpGraphic::ImplGetAnimationLoopCount() const return( mpAnimation ? mpAnimation->GetLoopCount() : 0UL ); } -GraphicReader* ImpGraphic::ImplGetContext() -{ - return mpContext; -} void ImpGraphic::ImplSetContext( GraphicReader* pReader ) { @@ -976,10 +968,6 @@ const OUString& ImpGraphic::ImplGetDocFileName() const return maDocFileURLStr; } -sal_uLong ImpGraphic::ImplGetDocFilePos() const -{ - return mnDocFilePos; -} bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, bool bSwap ) { @@ -1493,10 +1481,6 @@ bool ImpGraphic::ImplSwapIn( SvStream* pIStm ) return bRet; } -bool ImpGraphic::ImplIsSwapOut() const -{ - return mbSwapOut; -} void ImpGraphic::ImplSetLink( const GfxLink& rGfxLink ) { diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index da710651bc49..ca55525f0fe2 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -525,66 +525,34 @@ void PDFExtOutDevData::SetDocumentLocale( const com::sun::star::lang::Locale& rL { maDocLocale = rLoc; } -sal_Int32 PDFExtOutDevData::GetCurrentPageNumber() const -{ - return mnPage; -} void PDFExtOutDevData::SetCurrentPageNumber( const sal_Int32 nPage ) { mnPage = nPage; } -bool PDFExtOutDevData::GetIsLosslessCompression() const -{ - return mbUseLosslessCompression; -} void PDFExtOutDevData::SetIsLosslessCompression( const bool bUseLosslessCompression ) { mbUseLosslessCompression = bUseLosslessCompression; } -bool PDFExtOutDevData::GetIsReduceImageResolution() const -{ - return mbReduceImageResolution; -} void PDFExtOutDevData::SetIsReduceImageResolution( const bool bReduceImageResolution ) { mbReduceImageResolution = bReduceImageResolution; } -bool PDFExtOutDevData::GetIsExportNotes() const -{ - return mbExportNotes; -} void PDFExtOutDevData::SetIsExportNotes( const bool bExportNotes ) { mbExportNotes = bExportNotes; } -bool PDFExtOutDevData::GetIsExportNotesPages() const -{ - return mbExportNotesPages; -} void PDFExtOutDevData::SetIsExportNotesPages( const bool bExportNotesPages ) { mbExportNotesPages = bExportNotesPages; } -bool PDFExtOutDevData::GetIsExportTaggedPDF() const -{ - return mbTaggedPDF; -} void PDFExtOutDevData::SetIsExportTaggedPDF( const bool bTaggedPDF ) { mbTaggedPDF = bTaggedPDF; } -bool PDFExtOutDevData::GetIsExportTransitionEffects() const -{ - return mbTransitionEffects; -} void PDFExtOutDevData::SetIsExportTransitionEffects( const bool bTransitionEffects ) { mbTransitionEffects = bTransitionEffects; } -bool PDFExtOutDevData::GetIsExportFormFields() const -{ - return mbExportFormFields; -} void PDFExtOutDevData::SetIsExportFormFields( const bool bExportFomtFields ) { mbExportFormFields = bExportFomtFields; @@ -593,18 +561,10 @@ void PDFExtOutDevData::SetFormsFormat( const sal_Int32 nFormsFormat ) { mnFormsFormat = nFormsFormat; } -bool PDFExtOutDevData::GetIsExportBookmarks() const -{ - return mbExportBookmarks; -} void PDFExtOutDevData::SetIsExportBookmarks( const bool bExportBookmarks ) { mbExportBookmarks = bExportBookmarks; } -bool PDFExtOutDevData::GetIsExportHiddenSlides() const -{ - return mbExportHiddenSlides; -} void PDFExtOutDevData::SetIsExportHiddenSlides( const bool bExportHiddenSlides ) { mbExportHiddenSlides = bExportHiddenSlides; @@ -613,10 +573,6 @@ std::vector< PDFExtOutDevBookmarkEntry >& PDFExtOutDevData::GetBookmarks() { return maBookmarks; } -bool PDFExtOutDevData::GetIsExportNamedDestinations() const -{ - return mbExportNDests; -} void PDFExtOutDevData::SetIsExportNamedDestinations( const bool bExportNDests ) { mbExportNDests = bExportNDests; diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 9adf158a138e..49ba57e0dad6 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -226,10 +226,6 @@ bool Region::IsEmpty() const return !mbIsNull && !mpB2DPolyPolygon.get() && !mpPolyPolygon.get() && !mpRegionBand.get(); } -bool Region::IsNull() const -{ - return mbIsNull; -} RegionBand* ImplCreateRegionBandFromPolyPolygon(const PolyPolygon& rPolyPolygon) { diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 756a09b7343c..12aa2323d5d9 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -531,20 +531,12 @@ WinBits Dialog::init(Window *pParent, const ResId& rResId) return nStyle; } -VclButtonBox* Dialog::get_action_area() -{ - return mpActionArea; -} void Dialog::set_action_area(VclButtonBox* pActionArea) { mpActionArea = pActionArea; } -VclBox* Dialog::get_content_area() -{ - return mpContentArea; -} void Dialog::set_content_area(VclBox* pContentArea) { diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 93014d3886ca..8abb6ff20db2 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -1338,10 +1338,6 @@ void ImplDockingWindowWrapper::SetFloatStyle( WinBits nStyle ) mnFloatBits = nStyle; } -WinBits ImplDockingWindowWrapper::GetFloatStyle() const -{ - return mnFloatBits; -} void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, @@ -1418,9 +1414,5 @@ void ImplDockingWindowWrapper::Unlock() pToolBox->Lock( mbLocked ); } -bool ImplDockingWindowWrapper::IsLocked() const -{ - return mbLocked; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 73e566803b5e..1996b4659d96 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1570,10 +1570,6 @@ void Menu::SetHighlightItem( sal_uInt16 nItem ) nHighlightedItem = nItem; } -sal_uInt16 Menu::GetCurItemId() const -{ - return nSelectedId; -} OString Menu::GetCurItemIdent() const { diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx index efa6be2bddd2..7e03c3d59fc5 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -188,10 +188,6 @@ table::BorderLine2 BorderHandler::getBorderLine() return aBorderLine; } -bool BorderHandler::getShadow() -{ - return m_bShadow; -} void BorderHandler::enableInteropGrabBag(const OUString& aName) { diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx index b0160395432b..0368a934f3c2 100644 --- a/writerfilter/source/dmapper/BorderHandler.hxx +++ b/writerfilter/source/dmapper/BorderHandler.hxx @@ -71,7 +71,7 @@ public: ::boost::shared_ptr<PropertyMap> getProperties(); ::com::sun::star::table::BorderLine2 getBorderLine(); sal_Int32 getLineDistance() const { return m_nLineDistance;} - bool getShadow(); + bool getShadow() { return m_bShadow;} void enableInteropGrabBag(const OUString& aName); css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString()); }; diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 772043ed4483..8d09c69c4b4f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -386,30 +386,18 @@ void DomainMapper_Impl::SetSymbolData( sal_Int32 nSymbolData ) m_nSymboldata = nSymbolData; } -sal_Int32 DomainMapper_Impl::GetSymbolData() -{ - return m_nSymboldata; -} void DomainMapper_Impl::SetIsLastParagraphInSection( bool bIsLast ) { m_bIsLastParaInSection = bIsLast; } -bool DomainMapper_Impl::GetIsLastParagraphInSection() -{ - return m_bIsLastParaInSection; -} void DomainMapper_Impl::SetIsFirstParagraphInSection( bool bIsFirst ) { m_bIsFirstParaInSection = bIsFirst; } -bool DomainMapper_Impl::GetIsFirstParagraphInSection() -{ - return m_bIsFirstParaInSection; -} void DomainMapper_Impl::SetIsDummyParaAddedForTableInSection( bool bIsAdded ) @@ -417,55 +405,31 @@ void DomainMapper_Impl::SetIsDummyParaAddedForTableInSection( bool bIsAdded ) m_bDummyParaAddedForTableInSection = bIsAdded; } -bool DomainMapper_Impl::GetIsDummyParaAddedForTableInSection() -{ - return m_bDummyParaAddedForTableInSection; -} void DomainMapper_Impl::SetIsTextFrameInserted( bool bIsInserted ) { m_bTextFrameInserted = bIsInserted; } -bool DomainMapper_Impl::GetIsTextFrameInserted() -{ - return m_bTextFrameInserted; -} void DomainMapper_Impl::SetParaSectpr(bool bParaSectpr) { m_bParaSectpr = bParaSectpr; } -bool DomainMapper_Impl::GetParaSectpr() -{ - return m_bParaSectpr; -} void DomainMapper_Impl::SetSdt(bool bSdt) { m_bSdt = bSdt; } -bool DomainMapper_Impl::GetSdt() -{ - return m_bSdt; -} void DomainMapper_Impl::SetIsTableHasDirectFormatting(bool bIsTableHasDirectFormatting) { m_bIsTableHasDirectFormatting = bIsTableHasDirectFormatting; } -bool DomainMapper_Impl::GetIsTableHasDirectFormatting() -{ - return m_bIsTableHasDirectFormatting; -} -bool DomainMapper_Impl::GetParaChanged() -{ - return m_bParaChanged; -} void DomainMapper_Impl::PushProperties(ContextType eId) { @@ -4757,10 +4721,6 @@ sal_Int32 DomainMapper_Impl::getCurrentNumberingProperty(const OUString& aProp) return nRet; } -bool DomainMapper_Impl::IsNewDoc() -{ - return m_bIsNewDoc; -} void DomainMapper_Impl::enableInteropGrabBag(const OUString& aName) { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 74ff7845abf3..f73b72ba2de9 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -457,27 +457,27 @@ public: void AddDummyParaForTableInSection(); void RemoveLastParagraph( ); void SetIsLastParagraphInSection( bool bIsLast ); - bool GetIsLastParagraphInSection(); + bool GetIsLastParagraphInSection() { return m_bIsLastParaInSection;} void SetIsFirstParagraphInSection( bool bIsFirst ); - bool GetIsFirstParagraphInSection(); + bool GetIsFirstParagraphInSection() { return m_bIsFirstParaInSection;} void SetIsDummyParaAddedForTableInSection( bool bIsAdded ); - bool GetIsDummyParaAddedForTableInSection(); + bool GetIsDummyParaAddedForTableInSection() { return m_bDummyParaAddedForTableInSection;} void SetIsTextFrameInserted( bool bIsInserted ); - bool GetIsTextFrameInserted(); + bool GetIsTextFrameInserted() { return m_bTextFrameInserted;} void SetParaSectpr(bool bParaSectpr); - bool GetParaSectpr(); + bool GetParaSectpr() { return m_bParaSectpr;} void SetSymbolData( sal_Int32 nSymbolData ); - sal_Int32 GetSymbolData(); + sal_Int32 GetSymbolData() { return m_nSymboldata;} /// Setter method for m_bSdt. void SetSdt(bool bSdt); /// Getter method for m_bSdt. - bool GetSdt(); + bool GetSdt() { return m_bSdt;} /// Getter method for m_bIsTableHasDirectFormatting - bool GetIsTableHasDirectFormatting(); + bool GetIsTableHasDirectFormatting() { return m_bIsTableHasDirectFormatting;} /// Setter method for m_bIsTableHasDirectFormatting void SetIsTableHasDirectFormatting(bool bIsTableHasDirectFormatting); - bool GetParaChanged(); + bool GetParaChanged() { return m_bParaChanged;} void deferBreak( BreakType deferredBreakType ); bool isBreakDeferred( BreakType deferredBreakType ); @@ -736,7 +736,7 @@ public: sal_Int32 getCurrentNumberingProperty(const OUString& aProp); /// If we're importing into a new document, or just pasting to an existing one. - bool IsNewDoc(); + bool IsNewDoc() { return m_bIsNewDoc;} /// If we're inside <w:rPr>, inside <w:style w:type="table"> bool m_bInTableStyleRunProps; diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx index 799416d24fef..3f8bc073be9e 100644 --- a/writerfilter/source/dmapper/FFDataHandler.cxx +++ b/writerfilter/source/dmapper/FFDataHandler.cxx @@ -57,15 +57,7 @@ const OUString & FFDataHandler::getStatusText() const return m_sStatusText; } -sal_uInt32 FFDataHandler::getCheckboxHeight() const -{ - return m_nCheckboxHeight; -} -bool FFDataHandler::getCheckboxAutoHeight() const -{ - return m_bCheckboxAutoHeight; -} bool FFDataHandler::getCheckboxChecked() const { diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx index 3b53cb95d53d..9692ac2186d3 100644 --- a/writerfilter/source/dmapper/FFDataHandler.hxx +++ b/writerfilter/source/dmapper/FFDataHandler.hxx @@ -45,10 +45,10 @@ public: const OUString & getStatusText() const; // member: checkboxHeight - sal_uInt32 getCheckboxHeight() const; + sal_uInt32 getCheckboxHeight() const { return m_nCheckboxHeight;} // member: checkboxAutoHeight - bool getCheckboxAutoHeight() const; + bool getCheckboxAutoHeight() const { return m_bCheckboxAutoHeight;} // member: checkboxChecked or checkboxDefault (if the previous is not set) bool getCheckboxChecked() const; diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx index da93450c69d9..79ca0d06cc83 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.cxx +++ b/writerfilter/source/dmapper/GraphicHelpers.cxx @@ -147,15 +147,7 @@ sal_Int16 PositionHandler::orientation() const return m_nOrient; } -sal_Int16 PositionHandler::relation() const -{ - return m_nRelation; -} -sal_Int32 PositionHandler::position() const -{ - return m_nPosition; -} void PositionHandler::setPositionOffset(const OUString & sText, bool vertical) { diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx index 6a41abfb53b4..e8c4aa5851ef 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.hxx +++ b/writerfilter/source/dmapper/GraphicHelpers.hxx @@ -40,8 +40,8 @@ public: static void setAlignH(const OUString & sText); static void setAlignV(const OUString & sText); sal_Int16 orientation() const; - sal_Int16 relation() const; - sal_Int32 position() const; + sal_Int16 relation() const { return m_nRelation;} + sal_Int32 position() const { return m_nPosition;} private: virtual void lcl_attribute( Id aName, Value& rVal ) SAL_OVERRIDE; virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 547c7b062d0b..65f6a669b321 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -426,10 +426,6 @@ void NumPicBullet::SetShape(uno::Reference<drawing::XShape> xShape) m_xShape = xShape; } -sal_Int32 NumPicBullet::GetId() -{ - return m_nId; -} uno::Reference<drawing::XShape> NumPicBullet::GetShape() { diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 71a6e66511a4..4f310f11e73a 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -118,7 +118,7 @@ public: virtual ~NumPicBullet(); void SetId(sal_Int32 nId); - sal_Int32 GetId(); + 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(); private: diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 5abccdc86f01..10f6abf5b2dc 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -183,10 +183,6 @@ OUStringBuffer& SdtHelper::getLocale() return m_sLocale; } -bool SdtHelper::hasElements() -{ - return m_bHasElements; -} void SdtHelper::appendToInteropGrabBag(com::sun::star::beans::PropertyValue rValue) { diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx index 11b776de83e1..9472c714d845 100644 --- a/writerfilter/source/dmapper/SdtHelper.hxx +++ b/writerfilter/source/dmapper/SdtHelper.hxx @@ -75,7 +75,7 @@ public: OUStringBuffer& getDateFormat(); OUStringBuffer& getLocale(); /// If createControlShape() was ever called. - bool hasElements(); + bool hasElements() { return m_bHasElements;} /// Create drop-down control from w:sdt's w:dropDownList. void createDropDownControl(); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 73c76b33791d..cd71adbb9443 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -517,10 +517,6 @@ void OOXMLFastContextHandler::setDefine(Id nDefine) mnDefine = nDefine; } -Id OOXMLFastContextHandler::getDefine() const -{ - return mnDefine; -} OOXMLParserState::Pointer_t OOXMLFastContextHandler::getParserState() const { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index bb9d378459e3..afc685bb321e 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -174,7 +174,7 @@ public: virtual Id getId() const; void setDefine(Id nDefine); - Id getDefine() const; + Id getDefine() const { return mnDefine;} OOXMLParserState::Pointer_t getParserState() const; diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index aa08c79cd4db..e74a81c508a9 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.cxx +++ b/writerfilter/source/ooxml/OOXMLParserState.cxx @@ -54,35 +54,19 @@ void OOXMLParserState::setLastParagraphInSection(bool bLastParagraphInSection) mbLastParagraphInSection = bLastParagraphInSection; } -bool OOXMLParserState::isLastParagraphInSection() const -{ - return mbLastParagraphInSection; -} -bool OOXMLParserState::isInSectionGroup() const -{ - return mbInSectionGroup; -} void OOXMLParserState::setInSectionGroup(bool bInSectionGroup) { mbInSectionGroup = bInSectionGroup; } -bool OOXMLParserState::isInParagraphGroup() const -{ - return mbInParagraphGroup; -} void OOXMLParserState::setInParagraphGroup(bool bInParagraphGroup) { mbInParagraphGroup = bInParagraphGroup; } -bool OOXMLParserState::isInCharacterGroup() const -{ - return mbInCharacterGroup; -} void OOXMLParserState::setInCharacterGroup(bool bInCharacterGroup) { @@ -94,10 +78,6 @@ void OOXMLParserState::setForwardEvents(bool bForwardEvents) mbForwardEvents = bForwardEvents; } -bool OOXMLParserState::isForwardEvents() const -{ - return mbForwardEvents; -} const std::string OOXMLParserState::getHandle() const { @@ -118,10 +98,6 @@ void OOXMLParserState::setDocument(OOXMLDocumentImpl* pDocument) mpDocument = pDocument; } -OOXMLDocumentImpl* OOXMLParserState::getDocument() const -{ - return mpDocument; -} void OOXMLParserState::setXNoteId(const sal_Int32 nId) { diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx index d7f6005cedd0..9472945ca45a 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.hxx +++ b/writerfilter/source/ooxml/OOXMLParserState.hxx @@ -62,26 +62,26 @@ public: OOXMLParserState(); virtual ~OOXMLParserState(); - bool isInSectionGroup() const; + bool isInSectionGroup() const { return mbInSectionGroup;} void setInSectionGroup(bool bInSectionGroup); void setLastParagraphInSection(bool bLastParagraphInSection); - bool isLastParagraphInSection() const; + bool isLastParagraphInSection() const { return mbLastParagraphInSection;} - bool isInParagraphGroup() const; + bool isInParagraphGroup() const { return mbInParagraphGroup;} void setInParagraphGroup(bool bInParagraphGroup); - bool isInCharacterGroup() const; + bool isInCharacterGroup() const { return mbInCharacterGroup;} void setInCharacterGroup(bool bInCharacterGroup); void setForwardEvents(bool bForwardEvents); - bool isForwardEvents() const; + bool isForwardEvents() const { return mbForwardEvents;} const std::string getHandle() const; void setHandle(); void setDocument(OOXMLDocumentImpl* pDocument); - OOXMLDocumentImpl* getDocument() const; + OOXMLDocumentImpl* getDocument() const { return mpDocument;} void setXNoteId(const sal_Int32 rId); sal_Int32 getXNoteId() const; diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index dfae1d1a9e04..76fa69b81952 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -839,10 +839,6 @@ void OOXMLPropertySetEntryToInteger::attribute(Id nId, Value & rValue) mnValue = rValue.getInt(); } -int OOXMLPropertySetEntryToInteger::getValue() const -{ - return mnValue; -} }} diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 1e0b6400ad2a..78c578f0dce5 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -296,7 +296,7 @@ public: virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; virtual void attribute(Id nId, Value & rValue) SAL_OVERRIDE; - int getValue() const; + int getValue() const { return mnValue;} }; Sprm::Kind SprmKind(sal_uInt32 nSprmCode); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 0f9c09ce8d7f..0608cb230db5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -413,10 +413,6 @@ void RTFDocumentImpl::checkFirstRun() } } -bool RTFDocumentImpl::getFirstRun() -{ - return m_bFirstRun; -} void RTFDocumentImpl::setNeedPar(bool bNeedPar) { diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index f5c43a7d9109..2f73a8fa288d 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -361,7 +361,7 @@ public: /// If this is the first run of the document, starts the initial paragraph. void checkFirstRun(); /// If the initial paragraph is started. - bool getFirstRun(); + bool getFirstRun() { return m_bFirstRun;} /// If we need to add a dummy paragraph before a section break. void setNeedPar(bool bNeedPar); /// Return the dmapper index of an RTF index for fonts. diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx index bab41e635c2d..91f8d6e0b2de 100644 --- a/writerfilter/source/rtftok/rtflookahead.cxx +++ b/writerfilter/source/rtftok/rtflookahead.cxx @@ -121,10 +121,6 @@ bool RTFLookahead::isSubstream() const return false; } -bool RTFLookahead::hasTable() -{ - return m_bHasTable; -} } // namespace rtftok } // namespace writerfilter diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx index f2103de1b177..682878cba506 100644 --- a/writerfilter/source/rtftok/rtflookahead.hxx +++ b/writerfilter/source/rtftok/rtflookahead.hxx @@ -44,7 +44,7 @@ public: virtual void setSkipUnknown(bool bSkipUnknown) SAL_OVERRIDE; virtual void finishSubstream() SAL_OVERRIDE; virtual bool isSubstream() const SAL_OVERRIDE; - bool hasTable(); + bool hasTable() { return m_bHasTable;} private: boost::shared_ptr<RTFTokenizer> m_pTokenizer; SvStream& m_rStream; diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index a8587e7c21af..9c55f975514f 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -197,10 +197,6 @@ int RTFTokenizer::asHex(char ch) return ret; } -int RTFTokenizer::getGroup() const -{ - return m_nGroup; -} void RTFTokenizer::pushGroup() { @@ -360,10 +356,6 @@ OUString RTFTokenizer::getPosition() return aRet.makeStringAndClear(); } -sal_Size RTFTokenizer::getGroupStart() -{ - return m_nGroupStart; -} } // namespace rtftok } // namespace writerfilter diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx index 371ec6d1936d..36be2b526854 100644 --- a/writerfilter/source/rtftok/rtftokenizer.hxx +++ b/writerfilter/source/rtftok/rtftokenizer.hxx @@ -29,13 +29,13 @@ public: int resolveParse(); int asHex(char ch); /// Number of states on the stack. - int getGroup() const; + int getGroup() const { return m_nGroup;} /// To be invoked by the pushState() callback to signal when the importer enters a group. void pushGroup(); /// To be invoked by the popState() callback to single when the importer leaves a group. void popGroup(); OUString getPosition(); - sal_Size getGroupStart(); + sal_Size getGroupStart() { return m_nGroupStart;} /// To look up additional properties of a math symbol. static bool lookupMathKeyword(RTFMathSymbol& rSymbol); private: diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index 79121a2ce213..b0ab09c299d3 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -41,12 +41,6 @@ XInputStream_impl::~XInputStream_impl() } -bool SAL_CALL XInputStream_impl::CtorSuccess() -{ - return m_bIsOpen; -}; - - uno::Any SAL_CALL XInputStream_impl::queryInterface( const uno::Type& rType ) diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx index 4ce7d0a7910c..92801ba0daac 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx @@ -48,7 +48,7 @@ namespace chelp { * Returns an error code as given by filerror.hxx */ - bool SAL_CALL CtorSuccess(); + bool SAL_CALL CtorSuccess() { return m_bIsOpen;} virtual com::sun::star::uno::Any SAL_CALL queryInterface( diff --git a/xmloff/source/core/SvXMLAttr.cxx b/xmloff/source/core/SvXMLAttr.cxx index 3b0bfa8931f6..58997a44d4d7 100644 --- a/xmloff/source/core/SvXMLAttr.cxx +++ b/xmloff/source/core/SvXMLAttr.cxx @@ -34,10 +34,6 @@ bool SvXMLAttr::operator== (const SvXMLAttr &rCmp) const ( rCmp.aValue == aValue ); } -sal_uInt16 SvXMLAttr::getPrefixPos() const -{ - return aPrefixPos; -} const OUString& SvXMLAttr::getLName() const { diff --git a/xmloff/source/core/SvXMLAttr.hxx b/xmloff/source/core/SvXMLAttr.hxx index 4b5e6d1cbe39..7725a3dc03c7 100644 --- a/xmloff/source/core/SvXMLAttr.hxx +++ b/xmloff/source/core/SvXMLAttr.hxx @@ -27,7 +27,7 @@ public: const OUString& rValue ); bool operator== (const SvXMLAttr &rCmp) const; - sal_uInt16 getPrefixPos() const; + sal_uInt16 getPrefixPos() const { return aPrefixPos;} const OUString& getLName() const; const OUString& getValue() const; }; diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index d414c3849bcb..32e23dbe409e 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1850,10 +1850,6 @@ bool SvXMLImport::isGeneratorVersionOlderThan( : nGeneratorVersion < nOOoVersion; } -bool SvXMLImport::isGraphicLoadOnDemandSupported() const -{ - return mbIsGraphicLoadOnDemandSupported; -} OUString SvXMLImport::GetODFVersion() const { diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx index bed64959f5be..375ad745335c 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -50,7 +50,7 @@ public: virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; - bool IsCategoryAxis() const; + bool IsCategoryAxis() const { return m_bHasCategories;} private: ::rtl::Reference< XMLPersAttrListTContext > & m_rCategoriesContext; @@ -186,10 +186,6 @@ void XMLAxisOASISContext::EndElement() Export(); } -bool XMLAxisOASISContext::IsCategoryAxis() const -{ - return m_bHasCategories; -} TYPEINIT1( XMLChartPlotAreaOASISTContext, XMLProcAttrTransformerContext ); diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index 26980fec76f7..df3dc75e3bdf 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -42,7 +42,7 @@ public: virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ) SAL_OVERRIDE; - bool IsCategoryAxis() const; + bool IsCategoryAxis() const { return m_bIsCategoryAxis;} private: bool m_bIsCategoryAxis; @@ -118,10 +118,6 @@ void XMLAxisOOoContext::StartElement( XMLPersElemContentTContext::StartElement( xAttrList ); } -bool XMLAxisOOoContext::IsCategoryAxis() const -{ - return m_bIsCategoryAxis; -} TYPEINIT1( XMLChartPlotAreaOOoTContext, XMLProcAttrTransformerContext ) diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index bea9a958f740..f437e9f98e37 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -113,10 +113,6 @@ void BufferNode::setReceivedAll() elementCollectorNotify(); } -bool BufferNode::isAllReceived() const -{ - return m_bAllReceived; -} void BufferNode::addElementCollector(const ElementCollector* pElementCollector) /****** BufferNode/addElementCollector *************************************** @@ -182,10 +178,6 @@ void BufferNode::removeElementCollector(const ElementCollector* pElementCollecto } } -ElementMark* BufferNode::getBlocker() const -{ - return m_pBlocker; -} void BufferNode::setBlocker(const ElementMark* pBlocker) /****** BufferNode/setBlocker ************************************************ diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx index 4ca3dfaddc86..db2b2d95c324 100644 --- a/xmlsecurity/source/framework/buffernode.hxx +++ b/xmlsecurity/source/framework/buffernode.hxx @@ -88,10 +88,10 @@ public: bool isECOfBeforeModifyIncluded(sal_Int32 nIgnoredSecurityId) const; void setReceivedAll(); - bool isAllReceived() const; + bool isAllReceived() const { return m_bAllReceived;} void addElementCollector(const ElementCollector* pElementCollector); void removeElementCollector(const ElementCollector* pElementCollector); - ElementMark* getBlocker() const; + ElementMark* getBlocker() const { return m_pBlocker;} void setBlocker(const ElementMark* pBlocker); OUString printChildren() const; bool hasAnything() const; diff --git a/xmlsecurity/source/framework/elementcollector.cxx b/xmlsecurity/source/framework/elementcollector.cxx index 137491049665..96c242020e58 100644 --- a/xmlsecurity/source/framework/elementcollector.cxx +++ b/xmlsecurity/source/framework/elementcollector.cxx @@ -80,15 +80,7 @@ ElementCollector::ElementCollector( m_type = cssxc::sax::ElementMarkType_ELEMENTCOLLECTOR; } -cssxc::sax::ElementMarkPriority ElementCollector::getPriority() const -{ - return m_nPriority; -} -bool ElementCollector::getModify() const -{ - return m_bToModify; -} void ElementCollector::notifyListener() /****** ElementCollector/notifyListener *************************************** diff --git a/xmlsecurity/source/framework/elementcollector.hxx b/xmlsecurity/source/framework/elementcollector.hxx index ed1411939a19..dfc73b04b462 100644 --- a/xmlsecurity/source/framework/elementcollector.hxx +++ b/xmlsecurity/source/framework/elementcollector.hxx @@ -77,8 +77,8 @@ public: xReferenceResolvedListener); virtual ~ElementCollector() {}; - com::sun::star::xml::crypto::sax::ElementMarkPriority getPriority() const; - bool getModify() const; + com::sun::star::xml::crypto::sax::ElementMarkPriority getPriority() const { return m_nPriority;} + bool getModify() const { return m_bToModify;} void notifyListener(); void setReferenceResolvedListener( const com::sun::star::uno::Reference< diff --git a/xmlsecurity/source/framework/elementmark.cxx b/xmlsecurity/source/framework/elementmark.cxx index 98947659b71c..24edb826a27b 100644 --- a/xmlsecurity/source/framework/elementmark.cxx +++ b/xmlsecurity/source/framework/elementmark.cxx @@ -58,35 +58,19 @@ ElementMark::ElementMark(sal_Int32 nSecurityId, sal_Int32 nBufferId) { } -BufferNode* ElementMark::getBufferNode() const -{ - return m_pBufferNode; -} void ElementMark::setBufferNode(const BufferNode* pBufferNode) { m_pBufferNode = (BufferNode*)pBufferNode; } -sal_Int32 ElementMark::getSecurityId() const -{ - return m_nSecurityId; -} void ElementMark::setSecurityId(sal_Int32 nSecurityId) { m_nSecurityId = nSecurityId; } -com::sun::star::xml::crypto::sax::ElementMarkType ElementMark::getType() const -{ - return m_type; -} -sal_Int32 ElementMark::getBufferId() const -{ - return m_nBufferId; -} diff --git a/xmlsecurity/source/framework/elementmark.hxx b/xmlsecurity/source/framework/elementmark.hxx index f707e39efcd6..8838f2462fdd 100644 --- a/xmlsecurity/source/framework/elementmark.hxx +++ b/xmlsecurity/source/framework/elementmark.hxx @@ -62,12 +62,12 @@ public: ElementMark(sal_Int32 nSecurityId, sal_Int32 nBufferId); virtual ~ElementMark() {}; - BufferNode* getBufferNode() const; + BufferNode* getBufferNode() const { return m_pBufferNode;} void setBufferNode(const BufferNode* pBufferNode); - sal_Int32 getSecurityId() const; + sal_Int32 getSecurityId() const { return m_nSecurityId;} void setSecurityId(sal_Int32 nSecurityId); - com::sun::star::xml::crypto::sax::ElementMarkType getType() const; - sal_Int32 getBufferId() const; + com::sun::star::xml::crypto::sax::ElementMarkType getType() const { return m_type;} + sal_Int32 getBufferId() const { return m_nBufferId;} }; #endif diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index fb4a35f85fa9..0a2076459558 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -110,31 +110,6 @@ cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedSe return XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(); } -xmlNodePtr XMLElementWrapper_XmlSecImpl::getNativeElement( ) const -/****** XMLElementWrapper_XmlSecImpl/getNativeElement ************************* - * - * NAME - * getNativeElement -- Retrieves the libxml2 node wrapped by this object - * - * SYNOPSIS - * pNode = getNativeElement(); - * - * FUNCTION - * see NAME - * - * INPUTS - * empty - * - * RESULT - * pNode - the libxml2 node wrapped by this object - * - * AUTHOR - * Michael Mi - * Email: michael.mi@sun.com - ******************************************************************************/ -{ - return m_pElement; -} void XMLElementWrapper_XmlSecImpl::setNativeElement(const xmlNodePtr pNode) /****** XMLElementWrapper_XmlSecImpl/setNativeElement ************************* diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index b9018a0d6f72..eb029cade1a8 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -77,7 +77,17 @@ public: throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - xmlNodePtr getNativeElement( ) const; + /* + * NAME + * getNativeElement -- Retrieves the libxml2 node wrapped by this object + * + * SYNOPSIS + * pNode = getNativeElement(); + * + * RESULT + * pNode - the libxml2 node wrapped by this object + */ + xmlNodePtr getNativeElement( ) const { return m_pElement;} void setNativeElement(const xmlNodePtr pNode); }; |