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 /dbaccess | |
parent | 534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff) |
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/api/RowSetCache.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/core/api/RowSetCache.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/control/sqledit.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/FieldDescriptions.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/WCopyTable.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/sqledit.hxx | 5 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/WCopyTable.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.hxx | 2 |
14 files changed, 14 insertions, 59 deletions
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 |