summaryrefslogtreecommitdiff
path: root/svx/source/inc
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 /svx/source/inc
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 'svx/source/inc')
-rw-r--r--svx/source/inc/charmapacc.hxx8
-rw-r--r--svx/source/inc/datanavi.hxx20
-rw-r--r--svx/source/inc/filtnav.hxx4
-rw-r--r--svx/source/inc/fmexch.hxx8
-rw-r--r--svx/source/inc/fmpgeimp.hxx4
-rw-r--r--svx/source/inc/fmshimp.hxx14
-rw-r--r--svx/source/inc/fmtextcontrolfeature.hxx4
-rw-r--r--svx/source/inc/fmtextcontrolshell.hxx2
-rw-r--r--svx/source/inc/fmvwimp.hxx4
-rw-r--r--svx/source/inc/formcontrolling.hxx6
-rw-r--r--svx/source/inc/frmselimpl.hxx30
-rw-r--r--svx/source/inc/gridcell.hxx8
-rw-r--r--svx/source/inc/sdbdatacolumn.hxx2
13 files changed, 57 insertions, 57 deletions
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index d93540437a5b..afc9181fec91 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -84,8 +84,8 @@ namespace svx
);
// simple access methods
- inline SvxShowCharSetAcc* getTable() const { return m_xTable.get(); }
- inline SvxShowCharSet* getCharSetControl() const { return mpParent; }
+ SvxShowCharSetAcc* getTable() const { return m_xTable.get(); }
+ SvxShowCharSet* getCharSetControl() const { return mpParent; }
};
@@ -174,7 +174,7 @@ namespace svx
virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
- inline void SAL_CALL fireEvent(
+ void SAL_CALL fireEvent(
const sal_Int16 _nEventId,
const css::uno::Any& _rOldValue,
const css::uno::Any& _rNewValue
@@ -257,7 +257,7 @@ namespace svx
virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
- inline void SAL_CALL fireEvent(
+ void SAL_CALL fireEvent(
const sal_Int16 _nEventId,
const css::uno::Any& _rOldValue,
const css::uno::Any& _rNewValue
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index b8de220fe7c1..123c986cbb44 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -279,7 +279,7 @@ namespace svxform
virtual void Resize() override;
- inline bool HasModel() const { return m_bHasModel; }
+ bool HasModel() const { return m_bHasModel; }
OUString SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos );
void ClearModel();
OUString LoadInstance(const PropertyValue_seq& _xPropSeq);
@@ -287,16 +287,16 @@ namespace svxform
bool DoMenuAction( sal_uInt16 _nMenuID );
void EnableMenuItems( Menu* _pMenu );
- inline const OUString& GetInstanceName() const { return m_sInstanceName; }
- inline const OUString& GetInstanceURL() const { return m_sInstanceURL; }
- inline bool GetLinkOnce() const { return m_bLinkOnce; }
- inline void SetInstanceName( const OUString &name ) { m_sInstanceName=name; }
- inline void SetInstanceURL( const OUString &url ) { m_sInstanceURL=url; }
- inline void SetLinkOnce( bool bLinkOnce ) { m_bLinkOnce=bLinkOnce; }
+ const OUString& GetInstanceName() const { return m_sInstanceName; }
+ const OUString& GetInstanceURL() const { return m_sInstanceURL; }
+ bool GetLinkOnce() const { return m_bLinkOnce; }
+ void SetInstanceName( const OUString &name ) { m_sInstanceName=name; }
+ void SetInstanceURL( const OUString &url ) { m_sInstanceURL=url; }
+ void SetLinkOnce( bool bLinkOnce ) { m_bLinkOnce=bLinkOnce; }
- inline css::uno::Reference<css::beans::XPropertySet>
+ css::uno::Reference<css::beans::XPropertySet>
GetBindingForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getBindingForNode(xNode,true); }
- inline OUString GetServiceNameForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); }
+ OUString GetServiceNameForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); }
const XFormsUIHelper1_ref& GetXFormsHelper() const { return m_xUIHelper; }
};
@@ -579,7 +579,7 @@ namespace svxform
virtual ~AddSubmissionDialog() override;
virtual void dispose() override;
- inline const XSubmission_ref& GetNewSubmission() const { return m_xNewSubmission; }
+ const XSubmission_ref& GetNewSubmission() const { return m_xNewSubmission; }
};
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index a48391a6c63b..b22cb959a4f0 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -108,10 +108,10 @@ public:
{
}
- inline const css::uno::Reference< css::form::runtime::XFormController >&
+ const css::uno::Reference< css::form::runtime::XFormController >&
GetController() { return m_xController; }
- inline const css::uno::Reference< css::form::runtime::XFilterController >&
+ const css::uno::Reference< css::form::runtime::XFilterController >&
GetFilterController() { return m_xFilterController; }
virtual Image GetImage() const override;
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index db0672d05669..1215c3c307e4 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -105,10 +105,10 @@ namespace svxform
void startDrag( sal_Int8 nDragSourceActions );
void copyToClipboard( ) const;
- inline bool isDragSource() const { return m_xTransferable.is() && m_xTransferable->isDragging(); }
- inline bool isClipboardOwner() const { return m_xTransferable.is() && m_xTransferable->isClipboardOwner(); }
- inline bool isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
- inline void clear() { if ( isDataExchangeActive() ) m_xTransferable->clear(); }
+ bool isDragSource() const { return m_xTransferable.is() && m_xTransferable->isDragging(); }
+ bool isClipboardOwner() const { return m_xTransferable.is() && m_xTransferable->isClipboardOwner(); }
+ bool isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
+ void clear() { if ( isDataExchangeActive() ) m_xTransferable->clear(); }
SVX_DLLPRIVATE void setClipboardListener( const Link<OLocalExchange&,void>& _rListener ) { if ( m_xTransferable.is() ) m_xTransferable->setClipboardListener( _rListener ); }
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index f56da8cf6fec..811086cbc556 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -83,8 +83,8 @@ public:
);
// activation handling
- inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
- inline void setHasBeenActivated( ) { m_bFirstActivation = false; }
+ bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
+ void setHasBeenActivated( ) { m_bFirstActivation = false; }
const css::uno::Reference< css::form::XForms>& getForms( bool _bForceCreate = true );
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index d9b668026108..6a92aa8149eb 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -171,7 +171,7 @@ class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE
struct SAL_DLLPRIVATE InvalidSlotInfo {
sal_uInt16 id;
sal_uInt8 flags;
- inline InvalidSlotInfo(sal_uInt16 slotId, sal_uInt8 flgs) : id(slotId), flags(flgs) {};
+ InvalidSlotInfo(sal_uInt16 slotId, sal_uInt8 flgs) : id(slotId), flags(flgs) {};
};
std::vector<InvalidSlotInfo> m_arrInvalidSlots;
// we explicitly switch off the propbrw before leaving the design mode
@@ -251,14 +251,14 @@ class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE
public:
// attribute access
- SAL_DLLPRIVATE inline const css::uno::Reference< css::frame::XFrame >&
+ SAL_DLLPRIVATE const css::uno::Reference< css::frame::XFrame >&
getHostFrame() const { return m_xAttachedFrame; }
- SAL_DLLPRIVATE inline const css::uno::Reference< css::sdbc::XResultSet >&
+ SAL_DLLPRIVATE const css::uno::Reference< css::sdbc::XResultSet >&
getExternallyDisplayedForm() const { return m_xExternalDisplayedForm; }
- SAL_DLLPRIVATE inline bool
+ SAL_DLLPRIVATE bool
didPrepareClose() const { return m_bPreparedClose; }
- SAL_DLLPRIVATE inline void
+ SAL_DLLPRIVATE void
didPrepareClose( bool _bDid ) { m_bPreparedClose = _bDid; }
public:
@@ -354,9 +354,9 @@ public:
SAL_DLLPRIVATE const css::uno::Reference< css::form::XForm>& getActiveForm() const {return m_xActiveForm;}
SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getNavController() const {return m_xNavigationController;}
- SAL_DLLPRIVATE inline const svx::ControllerFeatures& getActiveControllerFeatures() const
+ SAL_DLLPRIVATE const svx::ControllerFeatures& getActiveControllerFeatures() const
{ return m_aActiveControllerFeatures; }
- SAL_DLLPRIVATE inline const svx::ControllerFeatures& getNavControllerFeatures() const
+ SAL_DLLPRIVATE const svx::ControllerFeatures& getNavControllerFeatures() const
{ return m_aNavControllerFeatures.isAssigned() ? m_aNavControllerFeatures : m_aActiveControllerFeatures; }
/** announces a new "current selection"
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index b8038b23ee20..6511ff981a98 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -61,8 +61,8 @@ namespace svx
);
/// determines whether the feature we're responsible for is currently enabled
- inline bool isFeatureEnabled( ) const { return m_bFeatureEnabled; }
- inline const css::uno::Any& getFeatureState( ) const { return m_aFeatureState; }
+ bool isFeatureEnabled( ) const { return m_bFeatureEnabled; }
+ const css::uno::Any& getFeatureState( ) const { return m_aFeatureState; }
/** dispatches the feature URL to the dispatcher
*/
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 1ebc31654093..76c87c64f468 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -151,7 +151,7 @@ namespace svx
void executeClipboardSlot( SfxSlotId _nSlot );
private:
- inline bool isControllerListening() const { return !m_aControlObservers.empty(); }
+ bool isControllerListening() const { return !m_aControlObservers.empty(); }
FmTextControlFeature*
implGetFeatureDispatcher(
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 59fe6d23b23f..4bef73e801d5 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -216,8 +216,8 @@ public:
getFormController( const css::uno::Reference< css::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;
// activation handling
- inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
- inline void setHasBeenActivated( ) { m_bFirstActivation = false; }
+ bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
+ void setHasBeenActivated( ) { m_bFirstActivation = false; }
void onFirstViewActivation( const FmFormModel* _pDocModel );
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index f48357db5ac9..f733e5a31ffa 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -101,7 +101,7 @@ namespace svx
~ControllerFeatures();
/// checks whether the instance is properly assigned to a form and/or controller
- inline bool isAssigned( ) const { return m_pImpl != nullptr; }
+ bool isAssigned( ) const { return m_pImpl != nullptr; }
/** assign to a controller
*/
@@ -113,8 +113,8 @@ namespace svx
void dispose();
// access to the instance which implements the functionality. Not to be used when not assigned
- inline const FormControllerHelper* operator->() const { return m_pImpl.get(); }
- inline FormControllerHelper* operator->() { return m_pImpl.get(); }
+ const FormControllerHelper* operator->() const { return m_pImpl.get(); }
+ FormControllerHelper* operator->() { return m_pImpl.get(); }
};
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 7bb2d5728cd0..0bb1e12b17ae 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -37,38 +37,38 @@ class FrameBorder
public:
explicit FrameBorder(FrameBorderType eType);
- inline FrameBorderType GetType() const
+ FrameBorderType GetType() const
{
return meType;
}
- inline bool IsEnabled() const
+ bool IsEnabled() const
{
return mbEnabled;
}
void Enable(FrameSelFlags nFlags);
- inline FrameBorderState GetState() const
+ FrameBorderState GetState() const
{
return meState;
}
void SetState(FrameBorderState eState);
- inline bool IsSelected() const { return mbSelected; }
- inline void Select( bool bSelect ) { mbSelected = bSelect; }
+ bool IsSelected() const { return mbSelected; }
+ void Select( bool bSelect ) { mbSelected = bSelect; }
const editeng::SvxBorderLine& GetCoreStyle() const { return maCoreStyle; }
void SetCoreStyle( const editeng::SvxBorderLine* pStyle );
- inline void SetUIColorPrim( const Color& rColor ) {maUIStyle.SetColorPrim( rColor ); }
- inline void SetUIColorSecn( const Color& rColor ) {maUIStyle.SetColorSecn( rColor ); }
- inline const frame::Style& GetUIStyle() const { return maUIStyle; }
+ void SetUIColorPrim( const Color& rColor ) {maUIStyle.SetColorPrim( rColor ); }
+ void SetUIColorSecn( const Color& rColor ) {maUIStyle.SetColorSecn( rColor ); }
+ const frame::Style& GetUIStyle() const { return maUIStyle; }
- inline void ClearFocusArea() { maFocusArea.Clear(); }
+ void ClearFocusArea() { maFocusArea.Clear(); }
void AddFocusPolygon( const tools::Polygon& rFocus );
void MergeFocusToPolyPolygon( tools::PolyPolygon& rPPoly ) const;
- inline void ClearClickArea() { maClickArea.Clear(); }
+ void ClearClickArea() { maClickArea.Clear(); }
void AddClickRect( const Rectangle& rRect );
bool ContainsClickPoint( const Point& rPos ) const;
Rectangle GetClickBoundRect() const;
@@ -217,19 +217,19 @@ struct FrameSelectorImpl
/** Dummy predicate for frame border iterators to use all borders in a container. */
struct FrameBorderDummy_Pred
{
- inline bool operator()( const FrameBorder* ) const { return true; }
+ bool operator()( const FrameBorder* ) const { return true; }
};
/** Predicate for frame border iterators to use only visible borders in a container. */
struct FrameBorderVisible_Pred
{
- inline bool operator()( const FrameBorder* pBorder ) const { return pBorder->GetState() == FrameBorderState::Show; }
+ bool operator()( const FrameBorder* pBorder ) const { return pBorder->GetState() == FrameBorderState::Show; }
};
/** Predicate for frame border iterators to use only selected borders in a container. */
struct FrameBorderSelected_Pred
{
- inline bool operator()( const FrameBorder* pBorder ) const { return pBorder->IsSelected(); }
+ bool operator()( const FrameBorder* pBorder ) const { return pBorder->IsSelected(); }
};
/** Template class for all types of frame border iterators. */
@@ -244,9 +244,9 @@ public:
typedef FrameBorderIterBase<Cont, Iter, Pred> this_type;
explicit FrameBorderIterBase( container_type& rCont );
- inline bool Is() const { return maIt != maEnd; }
+ bool Is() const { return maIt != maEnd; }
this_type& operator++();
- inline value_type operator*() const { return *maIt; }
+ value_type operator*() const { return *maIt; }
private:
iterator_type maIt;
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index a337a2cc3098..418719bccc7c 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -220,11 +220,11 @@ protected:
const css::uno::Reference< css::sdbc::XRowSet >& getCursor() const { return m_xCursor; }
// control transparency
- inline bool isTransparent( ) const { return m_bTransparent; }
- inline void setTransparent( bool _bSet ) { m_bTransparent = _bSet; }
+ bool isTransparent( ) const { return m_bTransparent; }
+ void setTransparent( bool _bSet ) { m_bTransparent = _bSet; }
// control alignment
- inline void setAlignedController( bool _bAlign ) { m_bAlignedController = _bAlign; }
+ void setAlignedController( bool _bAlign ) { m_bAlignedController = _bAlign; }
/** determined whether or not the value property is locked
@@ -271,7 +271,7 @@ public:
}
// control alignment
- inline bool isAlignedController() const { return m_bAlignedController; }
+ bool isAlignedController() const { return m_bAlignedController; }
void AlignControl(sal_Int16 nAlignment);
void SetTextLineColor();
diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx
index c3a2bae539b1..95e3f7ecf3e3 100644
--- a/svx/source/inc/sdbdatacolumn.hxx
+++ b/svx/source/inc/sdbdatacolumn.hxx
@@ -47,7 +47,7 @@ namespace svxform
// void !, even if the object has some of the needed interfaces.
// 'conversions'
- inline const css::uno::Reference< css::sdb::XColumn>& getColumn() const
+ const css::uno::Reference< css::sdb::XColumn>& getColumn() const
{
return m_xColumn;
}