diff options
Diffstat (limited to 'reportdesign')
22 files changed, 62 insertions, 62 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index 55b58bab9937..d88375a7f07a 100644 --- a/reportdesign/inc/ModuleHelper.hxx +++ b/reportdesign/inc/ModuleHelper.hxx @@ -67,8 +67,8 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OModuleClient { public: - inline OModuleClient() { OModule::registerClient(); } - inline ~OModuleClient() { OModule::revokeClient(); } + OModuleClient() { OModule::registerClient(); } + ~OModuleClient() { OModule::revokeClient(); } }; @@ -79,7 +79,7 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId { public: - inline ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } + ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } }; } // namespace rptui diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index d20ce8a329c5..6085e717c074 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -66,8 +66,8 @@ public: OXUndoEnvironment& GetUndoEnv() { return *m_xUndoEnv.get();} void SetModified(bool _bModified); - inline dbaui::DBSubComponentController* getController() const { return m_pController; } - inline void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; } + dbaui::DBSubComponentController* getController() const { return m_pController; } + void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; } void detachController(); OReportPage* createNewPage(const css::uno::Reference< css::report::XSection >& _xSection); diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 53e5db51992b..c37f0c0591d0 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -55,7 +55,7 @@ typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap; DlgEdHint( DlgEdHintKind eHint ); virtual ~DlgEdHint() override; - inline DlgEdHintKind GetKind() const { return eHintKind; } + DlgEdHintKind GetKind() const { return eHintKind; } }; @@ -80,7 +80,7 @@ protected: virtual ~OObjectBase(); - inline bool isListening() const { return m_bIsListening; } + bool isListening() const { return m_bIsListening; } void SetPropsFromRect(const Rectangle& _rRect); diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 5038bf0c4301..dc24b55f9a50 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -68,12 +68,12 @@ namespace rptui :m_xGroup(_xGroup) { } - inline css::uno::Reference< css::report::XSection > getHeader() { return m_xGroup->getHeader(); } - inline css::uno::Reference< css::report::XSection > getFooter() { return m_xGroup->getFooter(); } + css::uno::Reference< css::report::XSection > getHeader() { return m_xGroup->getHeader(); } + css::uno::Reference< css::report::XSection > getFooter() { return m_xGroup->getFooter(); } const css::uno::Reference< css::report::XGroup >& getGroup() { return m_xGroup; } - inline bool getHeaderOn() { return m_xGroup->getHeaderOn(); } - inline bool getFooterOn() { return m_xGroup->getFooterOn(); } + bool getHeaderOn() { return m_xGroup->getHeaderOn(); } + bool getFooterOn() { return m_xGroup->getFooterOn(); } static ::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> getMemberFunction(const css::uno::Reference< css::report::XSection >& _xSection); @@ -89,16 +89,16 @@ namespace rptui :m_xReport(_xReport) { } - inline css::uno::Reference< css::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); } - inline css::uno::Reference< css::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); } - inline css::uno::Reference< css::report::XSection > getPageHeader() { return m_xReport->getPageHeader(); } - inline css::uno::Reference< css::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } - inline css::uno::Reference< css::report::XSection > getDetail() { return m_xReport->getDetail(); } - - inline bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); } - inline bool getReportFooterOn() { return m_xReport->getReportFooterOn(); } - inline bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); } - inline bool getPageFooterOn() { return m_xReport->getPageFooterOn(); } + css::uno::Reference< css::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); } + css::uno::Reference< css::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); } + css::uno::Reference< css::report::XSection > getPageHeader() { return m_xReport->getPageHeader(); } + css::uno::Reference< css::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } + css::uno::Reference< css::report::XSection > getDetail() { return m_xReport->getDetail(); } + + bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); } + bool getReportFooterOn() { return m_xReport->getReportFooterOn(); } + bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); } + bool getPageFooterOn() { return m_xReport->getPageFooterOn(); } static ::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> getMemberFunction(const css::uno::Reference< css::report::XSection >& _xSection); }; diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 4e41ae2d164f..972f8dbe4daa 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -60,7 +60,7 @@ namespace rptui bool isValid() const; /// returns the type of the binding represented by the formula - inline BindType getType() const { return m_eType; } + BindType getType() const { return m_eType; } /// returns the complete formula represented by the object const OUString& diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx index 82e21061576f..4a24c518d94c 100644 --- a/reportdesign/source/filter/xml/xmlTable.hxx +++ b/reportdesign/source/filter/xml/xmlTable.hxx @@ -68,14 +68,14 @@ namespace rptxml virtual void EndElement() override; - inline void addHeight(sal_Int32 _nHeight) { m_aHeight.push_back( _nHeight ); } - inline void addWidth(sal_Int32 _nWidth) { m_aWidth.push_back( _nWidth ); } + void addHeight(sal_Int32 _nHeight) { m_aHeight.push_back( _nHeight ); } + void addWidth(sal_Int32 _nWidth) { m_aWidth.push_back( _nWidth ); } - inline void setColumnSpanned(sal_Int32 _nColSpan) { m_nColSpan = _nColSpan; } - inline void setRowSpanned( sal_Int32 _nRowSpan) { m_nRowSpan = _nRowSpan; } + void setColumnSpanned(sal_Int32 _nColSpan) { m_nColSpan = _nColSpan; } + void setRowSpanned( sal_Int32 _nRowSpan) { m_nRowSpan = _nRowSpan; } void incrementRowIndex(); - inline void incrementColumnIndex() { ++m_nColumnIndex; } + void incrementColumnIndex() { ++m_nColumnIndex; } void addCell(const css::uno::Reference< css::report::XReportComponent>& _xElement); diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index b0ae876c810b..14d7db53d766 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -161,7 +161,7 @@ public: */ void insertFunction(const css::uno::Reference< css::report::XFunction > & _xFunction); void removeFunction(const OUString& _sFunctionName); - inline const TGroupFunctionMap& getFunctions() const { + const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 6a6d64e19b9e..8fdfa0ad87ea 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -164,7 +164,7 @@ namespace rptui */ void ApplyCommand(sal_uInt16 _nCommandId, const ::Color& _aColor ); - inline ::rptui::OReportController& getController() const { return m_rController; } + ::rptui::OReportController& getController() const { return m_rController; } sal_uInt16 mapToolbarItemToSlotId(sal_uInt16 nItemId) const; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 1922e67da645..25e9749117a4 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -130,9 +130,9 @@ public: void copy(); void paste(); - inline sal_Int32 getGroupPosition(sal_Int32 _nRow) const { return _nRow != BROWSER_ENDOFSELECTION ? m_aGroupPositions[_nRow] : sal_Int32(NO_GROUP); } + sal_Int32 getGroupPosition(sal_Int32 _nRow) const { return _nRow != BROWSER_ENDOFSELECTION ? m_aGroupPositions[_nRow] : sal_Int32(NO_GROUP); } - inline ::svt::ComboBoxControl* getExpressionControl() const { return m_pComboCell; } + ::svt::ComboBoxControl* getExpressionControl() const { return m_pComboCell; } /** returns the sequence with the selected groups */ diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 30c511bb54db..e3dbfd459c99 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -124,7 +124,7 @@ class NavigatorTree : public ::cppu::BaseMutex virtual ~UserData() override; const uno::Reference< uno::XInterface >& getContent() const { return m_xContent; } - inline void setContent(const uno::Reference< uno::XInterface >& _xContent) { m_xContent = _xContent; } + void setContent(const uno::Reference< uno::XInterface >& _xContent) { m_xContent = _xContent; } protected: // OPropertyChangeListener diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 4975d8d3499f..e111f483e34f 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -86,10 +86,10 @@ public: virtual void GetFocus() override; virtual bool PreNotify( NotifyEvent& _rNEvt ) override; - inline const OUString& GetCommand() const { return m_aCommandName; } - inline sal_Int32 GetCommandType() const { return m_nCommandType; } - inline bool GetEscapeProcessing() const { return m_bEscapeProcessing; } - inline void SetCreateHdl(const Link<OAddFieldWindow&,void>& _aCreateLink) { m_aCreateLink = _aCreateLink; } + const OUString& GetCommand() const { return m_aCommandName; } + sal_Int32 GetCommandType() const { return m_nCommandType; } + bool GetEscapeProcessing() const { return m_bEscapeProcessing; } + void SetCreateHdl(const Link<OAddFieldWindow&,void>& _aCreateLink) { m_aCreateLink = _aCreateLink; } css::uno::Reference< css::sdbc::XConnection> getConnection() const; diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index 1dfddaf29da2..6b6aea5ee854 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -60,10 +60,10 @@ namespace rptui /** returns if the section is marked */ - inline bool isMarked() const { return m_bMarked; } + bool isMarked() const { return m_bMarked; } - inline void setCollapsedHdl(const Link<OColorListener&,void>& _aLink ){ m_aCollapsedLink = _aLink; } - inline bool isCollapsed() const { return m_bCollapsed; } + void setCollapsedHdl(const Link<OColorListener&,void>& _aLink ){ m_aCollapsedLink = _aLink; } + bool isCollapsed() const { return m_bCollapsed; } /** collapse or expand * diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 1098fae8badb..41434ae3f36f 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -103,7 +103,7 @@ namespace rptui virtual void initialize() override; - inline OReportController& getController() const { return m_rReportController; } + OReportController& getController() const { return m_rReportController; } void SetMode( DlgEdMode m_eMode ); void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index a750f4ea3c8d..fbe24c668cc4 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -412,8 +412,8 @@ namespace rptui * * \return */ - inline sal_Int32 getSplitPos() const { return m_nSplitPos;} - inline void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} + sal_Int32 getSplitPos() const { return m_nSplitPos;} + void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} /** creates a new report from the report definition. * @@ -439,8 +439,8 @@ namespace rptui const std::shared_ptr<rptui::OReportModel>& getSdrModel() const { return m_aReportModel;} const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return m_xContext; } - inline sal_Int16 getZoomValue() const { return m_nZoomValue; } - inline void resetZoomType() { m_eZoomType = SvxZoomType::PERCENT; } + sal_Int16 getZoomValue() const { return m_nZoomValue; } + void resetZoomType() { m_eZoomType = SvxZoomType::PERCENT; } // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index b6dc96080cd9..5781a12d48a7 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -112,9 +112,9 @@ namespace rptui */ void SetGridVisible(bool _bVisible); - inline OSectionWindow* getSectionWindow() const { return m_pParent; } - inline OSectionView& getSectionView() const { return *m_pView; } - inline OReportPage* getPage() const { return m_pPage; } + OSectionWindow* getSectionWindow() const { return m_pParent; } + OSectionView& getSectionView() const { return *m_pView; } + OReportPage* getPage() const { return m_pPage; } const css::uno::Reference< css::report::XSection >& getSection() const { return m_xSection; } DlgEdMode GetMode() const { return m_eMode; } diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index e57f6b092e46..fe1bc16fe1be 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -71,8 +71,8 @@ namespace rptui // Window overrides virtual void Resize() override; - inline ODesignView* getReportView() const { return m_pView; } - inline OScrollWindowHelper* getScrollWindow() const { return m_pParent; } + ODesignView* getReportView() const { return m_pView; } + OScrollWindowHelper* getScrollWindow() const { return m_pParent; } void SetMode( DlgEdMode m_eMode ); void SetInsertObj( sal_uInt16 eObj, const OUString& _sShapeType); @@ -136,7 +136,7 @@ namespace rptui */ void showRuler(bool _bShow); - inline sal_Int32 getRulerHeight() const { return m_aHRuler->GetSizePixel().Height(); } + sal_Int32 getRulerHeight() const { return m_aHRuler->GetSizePixel().Height(); } /** returns the total width of the first section */ diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 12871c6f63af..d8b2c56be03e 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -79,11 +79,11 @@ namespace rptui */ void initialize(); - inline Point getThumbPos() const { return Point(m_aHScroll->GetThumbPos(),m_aVScroll->GetThumbPos())/*m_aScrollOffset*/; } + Point getThumbPos() const { return Point(m_aHScroll->GetThumbPos(),m_aVScroll->GetThumbPos())/*m_aScrollOffset*/; } void setTotalSize(sal_Int32 _nWidth, sal_Int32 _nHeight); const Size& getTotalSize() const { return m_aTotalPixelSize; } - inline ScrollBar& GetHScroll() { return *m_aHScroll.get(); } - inline ScrollBar& GetVScroll() { return *m_aVScroll.get(); } + ScrollBar& GetHScroll() { return *m_aHScroll.get(); } + ScrollBar& GetVScroll() { return *m_aVScroll.get(); } // forwards void SetMode( DlgEdMode _eMode ); diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx index 9c8d4609977d..13d3365940cb 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -49,7 +49,7 @@ public: virtual void MarkListHasChanged() override; virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) override; - inline OReportSection* getReportSection() const { return m_pSectionWindow; } + OReportSection* getReportSection() const { return m_pSectionWindow; } // switch the marked objects to the given layer. void SetMarkedToLayer( SdrLayerID nLayerNo ); diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index fda4807f734f..fefc2d7d5ac2 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -98,10 +98,10 @@ namespace rptui virtual ~OSectionWindow() override; virtual void dispose() override; - inline OStartMarker& getStartMarker() { return *m_aStartMarker.get(); } - inline OReportSection& getReportSection() { return *m_aReportSection.get(); } - inline OEndMarker& getEndMarker() { return *m_aEndMarker.get(); } - inline OViewsWindow* getViewsWindow() { return m_pParent; } + OStartMarker& getStartMarker() { return *m_aStartMarker.get(); } + OReportSection& getReportSection() { return *m_aReportSection.get(); } + OEndMarker& getEndMarker() { return *m_aEndMarker.get(); } + OViewsWindow* getViewsWindow() { return m_pParent; } void setCollapsed(bool _bCollapsed); diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 519a1494d938..6e8be8df0b80 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -115,7 +115,7 @@ namespace rptui void resize(const OSectionWindow& _rSectionWindow); - inline OReportWindow* getView() const { return m_pParent; } + OReportWindow* getView() const { return m_pParent; } /** removes the section at the given position. * @@ -151,7 +151,7 @@ namespace rptui */ sal_Int32 getTotalHeight() const; - inline bool empty() const { return m_aSections.empty(); } + bool empty() const { return m_aSections.empty(); } void SetMode( DlgEdMode m_eMode ); void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType); const OUString& GetInsertObjString() const { return m_sShapeType;} diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index ab218994a837..ae293654bb08 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -108,7 +108,7 @@ public: */ void deactivateOle(bool _bSelect = false); - inline bool isUiActive() const { return m_bUiActive; } + bool isUiActive() const { return m_bUiActive; } protected: void colorizeOverlappedObject(SdrObject* _pOverlappedObj); void unColorizeOverlappedObj(); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 265c73bbb9d5..177d87daa111 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -66,7 +66,7 @@ public: virtual ~OTaskWindow() override { disposeOnce(); } virtual void dispose() override { m_pPropWin.clear(); vcl::Window::dispose(); } - inline void setPropertyBrowser(PropBrw* _pPropWin) + void setPropertyBrowser(PropBrw* _pPropWin) { m_pPropWin = _pPropWin; } |