summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-03 20:57:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-03 20:55:50 +0000
commit6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch)
tree21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /accessibility
parent7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff)
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with a rewriting Clang plugin (to be pushed later). Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8 Reviewed-on: https://gerrit.libreoffice.org/34874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/inc/extended/AccessibleBrowseBox.hxx6
-rw-r--r--accessibility/inc/extended/AccessibleBrowseBoxBase.hxx4
-rw-r--r--accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx2
-rw-r--r--accessibility/inc/extended/AccessibleGridControl.hxx2
-rw-r--r--accessibility/inc/extended/AccessibleGridControlTableCell.hxx4
-rw-r--r--accessibility/inc/extended/accessiblebrowseboxcell.hxx4
-rw-r--r--accessibility/inc/extended/accessibletablistboxtable.hxx2
-rw-r--r--accessibility/inc/extended/listboxaccessible.hxx4
-rw-r--r--accessibility/inc/extended/textwindowaccessibility.hxx19
-rw-r--r--accessibility/inc/helper/listboxhelper.hxx1
-rw-r--r--accessibility/inc/standard/vclxaccessiblelistitem.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessibletoolboxitem.hxx8
-rw-r--r--accessibility/source/standard/vclxaccessibletoolbox.cxx4
13 files changed, 30 insertions, 32 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index a2b31babbe13..781a9afeb0d8 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -120,7 +120,7 @@ public:
/** returns the accessible object for the row or the column header bar
*/
- inline css::uno::Reference<
+ css::uno::Reference<
css::accessibility::XAccessible >
getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
{
@@ -129,7 +129,7 @@ public:
/** returns the accessible object for the table representation
*/
- inline css::uno::Reference<
+ css::uno::Reference<
css::accessibility::XAccessible >
getTable( )
{
@@ -203,7 +203,7 @@ public:
);
/// returns the AccessibleContext belonging to this Accessible
- inline AccessibleBrowseBox* getContext() { return m_xContext.get(); }
+ AccessibleBrowseBox* getContext() { return m_xContext.get(); }
protected:
virtual ~AccessibleBrowseBoxAccess() override;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 217e20a48ecb..0448ddfa930b 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -285,7 +285,7 @@ protected:
public:
/** @return The osl::Mutex member provided by the class BaseMutex. */
- inline ::osl::Mutex& getMutex( ) { return m_aMutex; }
+ ::osl::Mutex& getMutex( ) { return m_aMutex; }
/** @throws <type>DisposedException</type> If the object is not alive. */
void ensureIsAlive() const;
@@ -386,7 +386,7 @@ protected:
class SolarMethodGuard : public SolarMutexGuard, public osl::MutexGuard
{
public:
- inline SolarMethodGuard( osl::Mutex& rMutex )
+ SolarMethodGuard( osl::Mutex& rMutex )
:SolarMutexGuard( )
,osl::MutexGuard( rMutex )
{
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index cfe00b40aa07..c9659708f9aa 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -45,7 +45,7 @@ namespace accessibility
/** Grabs the focus to the BrowseBox. */
virtual void SAL_CALL grabFocus() override;
- inline bool isRowBarCell() const
+ bool isRowBarCell() const
{
return getType() == ::svt::BBTYPE_ROWHEADERCELL;
}
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index b55523d39d23..362dee2ea120 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -168,7 +168,7 @@ public:
);
/// returns the AccessibleContext belonging to this Accessible
- inline AccessibleGridControl* getContext() { return m_xContext.get(); }
+ AccessibleGridControl* getContext() { return m_xContext.get(); }
protected:
virtual ~AccessibleGridControlAccess() override;
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index e3d138f1eaff..eeef6d32a82e 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -34,8 +34,8 @@ namespace accessibility
protected:
// attribute access
- inline sal_Int32 getRowPos( ) const { return m_nRowPos; }
- inline sal_Int32 getColumnPos( ) const { return m_nColPos; }
+ sal_Int32 getRowPos( ) const { return m_nRowPos; }
+ sal_Int32 getColumnPos( ) const { return m_nColPos; }
// XAccessibleComponent
virtual void SAL_CALL grabFocus() override;
diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
index 113e38f752df..eb82e4862726 100644
--- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
@@ -40,8 +40,8 @@ namespace accessibility
protected:
// attribute access
- inline sal_Int32 getRowPos( ) const { return m_nRowPos; }
- inline sal_Int32 getColumnPos( ) const { return m_nColPos; }
+ sal_Int32 getRowPos( ) const { return m_nRowPos; }
+ sal_Int32 getColumnPos( ) const { return m_nColPos; }
protected:
// AccessibleBrowseBoxBase overridables
diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx
index 1a3bfc6c8dea..631352401dc1 100644
--- a/accessibility/inc/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/extended/accessibletablistboxtable.hxx
@@ -59,7 +59,7 @@ private:
sal_Int32 implGetSelRowCount() const;
/** Returns the row index from cell index. */
- inline sal_Int32 implGetRow( sal_Int32 _nIndex ) const { return _nIndex / implGetColumnCount(); }
+ sal_Int32 implGetRow( sal_Int32 _nIndex ) const { return _nIndex / implGetColumnCount(); }
/** Returns the absolute row index of the nSelRow-th selected row. */
sal_Int32 implGetSelRow( sal_Int32 _nSelRow ) const;
diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx
index 7e17bf55313d..6fc46106e638 100644
--- a/accessibility/inc/extended/listboxaccessible.hxx
+++ b/accessibility/inc/extended/listboxaccessible.hxx
@@ -40,12 +40,12 @@ namespace accessibility
VclPtr<SvTreeListBox> m_pWindow;
protected:
- inline SvTreeListBox* getListBox() const
+ SvTreeListBox* getListBox() const
{
return const_cast< ListBoxAccessibleBase* >( this )->m_pWindow;
}
- inline bool isAlive() const { return nullptr != m_pWindow; }
+ bool isAlive() const { return nullptr != m_pWindow; }
public:
ListBoxAccessibleBase( SvTreeListBox& _rWindow );
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index 8db74f5c8b38..c44c028b8459 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -67,10 +67,10 @@ class Document;
class SfxListenerGuard
{
public:
- inline SfxListenerGuard(::SfxListener & rListener):
+ SfxListenerGuard(::SfxListener & rListener):
m_rListener(rListener), m_pNotifier(nullptr) {}
- inline ~SfxListenerGuard() { endListening(); }
+ ~SfxListenerGuard() { endListening(); }
// Not thread safe:
void startListening(::SfxBroadcaster & rNotifier);
@@ -86,10 +86,10 @@ private:
class WindowListenerGuard
{
public:
- inline WindowListenerGuard(::Link<VclWindowEvent&,void> const & rListener):
+ WindowListenerGuard(::Link<VclWindowEvent&,void> const & rListener):
m_aListener(rListener), m_pNotifier(nullptr) {}
- inline ~WindowListenerGuard() { endListening(); }
+ ~WindowListenerGuard() { endListening(); }
// Not thread safe:
void startListening(vcl::Window & rNotifier);
@@ -105,19 +105,18 @@ private:
class ParagraphInfo
{
public:
- inline ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {}
+ ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {}
- inline
css::uno::WeakReference< css::accessibility::XAccessible > const &
getParagraph() const { return m_xParagraph; }
- inline ::sal_Int32 getHeight() const { return m_nHeight; }
+ ::sal_Int32 getHeight() const { return m_nHeight; }
- inline void setParagraph(
+ void setParagraph(
css::uno::Reference< css::accessibility::XAccessible > const &
rParagraph) { m_xParagraph = rParagraph; }
- inline void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; }
+ void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; }
private:
css::uno::WeakReference< css::accessibility::XAccessible >
@@ -148,7 +147,7 @@ public:
Paragraphs::size_type nNumber);
// Not thread-safe.
- inline Paragraphs::size_type getNumber() const { return m_nNumber; }
+ Paragraphs::size_type getNumber() const { return m_nNumber; }
// Not thread-safe.
void numberChanged(bool bIncremented);
diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx
index 9236d32a7b13..570e46ffce03 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -41,7 +41,6 @@ private:
T& m_aComboListBox;
public:
- inline
VCLListBoxHelper( T& _pListBox ) :
m_aComboListBox( _pListBox ){}
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 57c93997c24b..a9d9db5ba624 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -92,7 +92,7 @@ public:
void NotifyAccessibleEvent( sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );
- inline bool IsSelected() const { return m_bSelected; }
+ bool IsSelected() const { return m_bSelected; }
void SetSelected( bool _bSelected );
void SetVisible( bool _bVisible );
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 77f8411d8295..9abaaecc88cf 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -59,8 +59,8 @@ private:
css::uno::Reference< css::accessibility::XAccessible > m_xChild;
public:
- inline sal_Int32 getIndexInParent() const { return m_nIndexInParent; }
- inline void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; }
+ sal_Int32 getIndexInParent() const { return m_nIndexInParent; }
+ void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; }
protected:
virtual ~VCLXAccessibleToolBoxItem() override;
@@ -81,10 +81,10 @@ public:
VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos );
void SetFocus( bool _bFocus );
- inline bool HasFocus() const { return m_bHasFocus; }
+ bool HasFocus() const { return m_bHasFocus; }
void SetChecked( bool _bCheck );
void SetIndeterminate( bool _bIndeterminate );
- inline void ReleaseToolBox() { m_pToolBox = nullptr; }
+ void ReleaseToolBox() { m_pToolBox = nullptr; }
void NameChanged();
void SetChild( const css::uno::Reference< css::accessibility::XAccessible >& _xChild );
const css::uno::Reference< css::accessibility::XAccessible >&
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index a4111ae28dae..c4cd2cbb76ad 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -87,8 +87,8 @@ namespace
sal_Int32 m_nIndexInParent;
public:
- inline sal_Int32 getIndexInParent() const { return m_nIndexInParent; }
- inline void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; }
+ sal_Int32 getIndexInParent() const { return m_nIndexInParent; }
+ void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; }
static bool isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation );