summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
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 'sfx2')
-rw-r--r--sfx2/source/appl/appopen.cxx2
-rw-r--r--sfx2/source/appl/newhelp.hxx36
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx4
-rw-r--r--sfx2/source/doc/oleprops.cxx18
-rw-r--r--sfx2/source/doc/oleprops.hxx36
5 files changed, 48 insertions, 48 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 841ee78b4946..5c1aa0563604 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -125,7 +125,7 @@ void SetTemplate_Impl( const OUString &rFileName,
class SfxDocPasswordVerifier : public ::comphelper::IDocPasswordVerifier
{
public:
- inline explicit SfxDocPasswordVerifier( const Reference< embed::XStorage >& rxStorage ) :
+ explicit SfxDocPasswordVerifier( const Reference< embed::XStorage >& rxStorage ) :
mxStorage( rxStorage ) {}
virtual ::comphelper::DocPasswordVerifierResult
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index e3c1bcb92104..5628ccd345e7 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -65,7 +65,7 @@ public:
virtual void RequestingChildren( SvTreeListEntry* pParent ) override;
virtual bool EventNotify( NotifyEvent& rNEvt ) override;
- inline void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); }
+ void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); }
OUString GetSelectEntry() const;
};
@@ -154,16 +154,16 @@ public:
void SetFactory( const OUString& rFactory );
const OUString& GetFactory() const { return sFactory; }
OUString GetSelectEntry() const;
- inline void SetFocusOnBox() { m_pIndexCB->GrabFocus(); }
- inline bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); }
+ void SetFocusOnBox() { m_pIndexCB->GrabFocus(); }
+ bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); }
- inline void SetKeywordHdl( const Link<IndexTabPage_Impl&,void>& rLink ) { aKeywordLink = rLink; }
+ void SetKeywordHdl( const Link<IndexTabPage_Impl&,void>& rLink ) { aKeywordLink = rLink; }
void SetKeyword( const OUString& rKeyword );
bool HasKeyword() const;
bool HasKeywordIgnoreCase();
void OpenKeyword();
- inline void SelectExecutableEntry() { m_pIndexCB->SelectExecutableEntry(); }
+ void SelectExecutableEntry() { m_pIndexCB->SelectExecutableEntry(); }
};
// class SearchTabPage_Impl ----------------------------------------------
@@ -183,7 +183,7 @@ public:
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
virtual void Select() override;
- inline void SetSearchLink( const Link<LinkParamNone*,void>& rLink ) { aSearchLink = rLink; }
+ void SetSearchLink( const Link<LinkParamNone*,void>& rLink ) { aSearchLink = rLink; }
};
class SearchResultsBox_Impl : public ListBox
@@ -229,13 +229,13 @@ public:
virtual Control* GetLastFocusControl() override;
void SetDoubleClickHdl( const Link<ListBox&,void>& rLink );
- inline void SetFactory( const OUString& rFactory ) { aFactory = rFactory; }
+ void SetFactory( const OUString& rFactory ) { aFactory = rFactory; }
OUString GetSelectEntry() const;
void ClearPage();
- inline void SetFocusOnBox() { m_pResultsLB->GrabFocus(); }
- inline bool HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); }
- inline OUString GetSearchText() const { return m_pSearchED->GetText(); }
- inline bool IsFullWordSearch() const { return m_pFullWordsCB->IsChecked(); }
+ void SetFocusOnBox() { m_pResultsLB->GrabFocus(); }
+ bool HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); }
+ OUString GetSearchText() const { return m_pSearchED->GetText(); }
+ bool IsFullWordSearch() const { return m_pFullWordsCB->IsChecked(); }
bool OpenKeyword( const OUString& rKeyword );
};
@@ -333,13 +333,13 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
void SetDoubleClickHdl( const Link<Control*,bool>& rLink );
- inline void SetSelectFactoryHdl( const Link<SfxHelpIndexWindow_Impl*,void>& rLink ) { aSelectFactoryLink = rLink; }
+ void SetSelectFactoryHdl( const Link<SfxHelpIndexWindow_Impl*,void>& rLink ) { aSelectFactoryLink = rLink; }
void SetFactory( const OUString& rFactory, bool bActive );
- inline OUString GetFactory() const { return pIPage->GetFactory(); }
+ OUString GetFactory() const { return pIPage->GetFactory(); }
OUString GetSelectEntry() const;
void AddBookmarks( const OUString& rTitle, const OUString& rURL );
bool IsValidFactory( const OUString& _rFactory );
- inline OUString GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectEntry(); }
+ OUString GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectEntry(); }
void ClearSearchPage();
void GrabFocusBack();
bool HasFocusOnEdit() const;
@@ -474,11 +474,11 @@ public:
const css::uno::Reference < css::frame::XFrame2 >&
getFrame() const { return xFrame; }
- inline void SetSelectHdl( const Link<ToolBox *, void>& rLink ) { aToolBox->SetSelectHdl( rLink ); }
+ void SetSelectHdl( const Link<ToolBox *, void>& rLink ) { aToolBox->SetSelectHdl( rLink ); }
void ToggleIndex( bool bOn );
void SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch );
void SetPageStyleHeaderOff() const;
- inline ToolBox& GetToolBox() { return *aToolBox.get(); }
+ ToolBox& GetToolBox() { return *aToolBox.get(); }
void CloseFrame();
void DoSearch();
};
@@ -536,7 +536,7 @@ public:
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
void setContainerWindow( const css::uno::Reference < css::awt::XWindow >& xWin );
- inline css::uno::Reference < css::frame::XFrame2 >
+ css::uno::Reference < css::frame::XFrame2 >
getTextFrame() const { return pTextWin->getFrame(); }
void SetFactory( const OUString& rFactory );
@@ -545,7 +545,7 @@ public:
void CloseWindow();
void UpdateToolbox();
- inline void OpenKeyword( const OUString& rKeyword ) { pIndexWin->OpenKeyword( rKeyword ); }
+ void OpenKeyword( const OUString& rKeyword ) { pIndexWin->OpenKeyword( rKeyword ); }
bool HasHistoryPredecessor() const; // forward to interceptor
bool HasHistorySuccessor() const; // forward to interceptor
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 19e66113d881..db6782a94f41 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -210,8 +210,8 @@ namespace sfx2
void SetContext( FileDialogHelper::Context _eNewContext );
- inline bool isSystemFilePicker() const { return mbSystemPicker; }
- inline bool isPasswordEnabled() const { return mbIsPwdEnabled; }
+ bool isSystemFilePicker() const { return mbSystemPicker; }
+ bool isPasswordEnabled() const { return mbIsPwdEnabled; }
};
} // end of namespace sfx2
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 6866aa43cfbb..f1ba967a20fa 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -46,7 +46,7 @@ class SfxOleInt32Property : public SfxOlePropertyBase
public:
explicit SfxOleInt32Property( sal_Int32 nPropId, sal_Int32 nValue = 0 );
- inline sal_Int32 GetValue() const { return mnValue; }
+ sal_Int32 GetValue() const { return mnValue; }
private:
virtual void ImplLoad( SvStream& rStrm ) override;
@@ -63,7 +63,7 @@ class SfxOleDoubleProperty : public SfxOlePropertyBase
public:
explicit SfxOleDoubleProperty( sal_Int32 nPropId, double fValue = 0.0 );
- inline double GetValue() const { return mfValue; }
+ double GetValue() const { return mfValue; }
private:
virtual void ImplLoad( SvStream& rStrm ) override;
@@ -80,7 +80,7 @@ class SfxOleBoolProperty : public SfxOlePropertyBase
public:
explicit SfxOleBoolProperty( sal_Int32 nPropId, bool bValue = false );
- inline bool GetValue() const { return mbValue; }
+ bool GetValue() const { return mbValue; }
private:
virtual void ImplLoad( SvStream& rStrm ) override;
@@ -105,8 +105,8 @@ public:
sal_Int32 nPropId, sal_Int32 nPropType,
rtl_TextEncoding eTextEnc );
- inline const OUString& GetValue() const { return maValue; }
- inline void SetValue( const OUString& rValue ) { maValue = rValue; }
+ const OUString& GetValue() const { return maValue; }
+ void SetValue( const OUString& rValue ) { maValue = rValue; }
private:
OUString maValue;
@@ -150,7 +150,7 @@ public:
explicit SfxOleFileTimeProperty( sal_Int32 nPropId, const util::DateTime& rDateTime );
/** Returns the time value as LOCAL time. */
- inline const util::DateTime& GetValue() const { return maDateTime; }
+ const util::DateTime& GetValue() const { return maDateTime; }
private:
virtual void ImplLoad( SvStream& rStrm ) override;
@@ -167,7 +167,7 @@ public:
explicit SfxOleDateProperty( sal_Int32 nPropId );
/** Returns the date value as LOCAL time. */
- inline const util::Date& GetValue() const { return maDate; }
+ const util::Date& GetValue() const { return maDate; }
private:
virtual void ImplLoad( SvStream& rStrm ) override;
@@ -188,7 +188,7 @@ public:
explicit SfxOleThumbnailProperty( sal_Int32 nPropId,
const uno::Sequence<sal_Int8> & i_rData);
- inline bool IsValid() const { return mData.getLength() > 0; }
+ bool IsValid() const { return mData.getLength() > 0; }
private:
virtual void ImplLoad( SvStream& rStrm ) override;
@@ -209,7 +209,7 @@ class SfxOleBlobProperty : public SfxOlePropertyBase
public:
explicit SfxOleBlobProperty( sal_Int32 nPropId,
const uno::Sequence<sal_Int8> & i_rData);
- inline bool IsValid() const { return mData.getLength() > 0; }
+ bool IsValid() const { return mData.getLength() > 0; }
private:
virtual void ImplLoad( SvStream& rStrm ) override;
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index dfadd52b4290..78c1ac9c29e2 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -100,20 +100,20 @@ const sal_Int32 CLIPDATAFMT_DIB = 8;
class SfxOleTextEncoding
{
public:
- inline explicit SfxOleTextEncoding() :
+ explicit SfxOleTextEncoding() :
mxTextEnc( new rtl_TextEncoding( osl_getThreadTextEncoding() ) ) {}
- inline explicit SfxOleTextEncoding( rtl_TextEncoding eTextEnc ) :
+ explicit SfxOleTextEncoding( rtl_TextEncoding eTextEnc ) :
mxTextEnc( new rtl_TextEncoding( eTextEnc ) ) {}
/** Returns the current text encoding identifier. */
- inline rtl_TextEncoding GetTextEncoding() const { return *mxTextEnc; }
+ rtl_TextEncoding GetTextEncoding() const { return *mxTextEnc; }
/** Sets the passed text encoding. */
- inline void SetTextEncoding( rtl_TextEncoding eTextEnc ) { *mxTextEnc = eTextEnc; }
+ void SetTextEncoding( rtl_TextEncoding eTextEnc ) { *mxTextEnc = eTextEnc; }
/** Returns true, if this object contains Unicode text encoding. */
- inline bool IsUnicode() const { return GetTextEncoding() == RTL_TEXTENCODING_UCS2; }
+ bool IsUnicode() const { return GetTextEncoding() == RTL_TEXTENCODING_UCS2; }
/** Sets Unicode text encoding to this object. */
- inline void SetUnicode() { SetTextEncoding( RTL_TEXTENCODING_UCS2 ); }
+ void SetUnicode() { SetTextEncoding( RTL_TEXTENCODING_UCS2 ); }
/** Converts the current settings to a Windows codepage identifier. */
sal_uInt16 GetCodePage() const;
@@ -135,10 +135,10 @@ class SfxOleStringHelper : public SfxOleTextEncoding
{
public:
/** Creates a string helper object depending on an external text encoding. */
- inline explicit SfxOleStringHelper( const SfxOleTextEncoding& rTextEnc ) :
+ explicit SfxOleStringHelper( const SfxOleTextEncoding& rTextEnc ) :
SfxOleTextEncoding( rTextEnc ) {}
/** Creates a string helper object with own text encoding. */
- inline explicit SfxOleStringHelper( rtl_TextEncoding eTextEnc ) :
+ explicit SfxOleStringHelper( rtl_TextEncoding eTextEnc ) :
SfxOleTextEncoding( eTextEnc ) {}
/** Loads a string from the passed stream with current encoding (maybe Unicode). */
@@ -167,11 +167,11 @@ private:
class SfxOleObjectBase
{
public:
- inline explicit SfxOleObjectBase() : mnErrCode( ERRCODE_NONE ) {}
+ explicit SfxOleObjectBase() : mnErrCode( ERRCODE_NONE ) {}
virtual ~SfxOleObjectBase();
/** Returns the current error code. */
- inline ErrCode GetError() const { return mnErrCode; }
+ ErrCode GetError() const { return mnErrCode; }
/** Loads this object from the passed stream. Calls virtual ImplLoad(). */
ErrCode Load( SvStream& rStrm );
@@ -181,7 +181,7 @@ public:
protected:
/** Sets the passed error code. Will be returned by Load() and Save() functions.
Always the first error code is stored. Multiple calls have no effect. */
- inline void SetError( ErrCode nErrCode ) { if( mnErrCode == ERRCODE_NONE ) mnErrCode = nErrCode; }
+ void SetError( ErrCode nErrCode ) { if( mnErrCode == ERRCODE_NONE ) mnErrCode = nErrCode; }
/** Loads the passed object from the stream. Sets returned error code as own error. */
void LoadObject( SvStream& rStrm, SfxOleObjectBase& rObj );
/** Saves the passed object to the stream. Sets returned error code as own error. */
@@ -202,14 +202,14 @@ private:
class SfxOlePropertyBase : public SfxOleObjectBase
{
public:
- inline explicit SfxOlePropertyBase( sal_Int32 nPropId, sal_Int32 nPropType ) :
+ explicit SfxOlePropertyBase( sal_Int32 nPropId, sal_Int32 nPropType ) :
mnPropId( nPropId ), mnPropType( nPropType ) {}
- inline sal_Int32 GetPropId() const { return mnPropId; }
- inline sal_Int32 GetPropType() const { return mnPropType; }
+ sal_Int32 GetPropId() const { return mnPropId; }
+ sal_Int32 GetPropType() const { return mnPropType; }
protected:
- inline void SetPropType( sal_Int32 nPropType ) { mnPropType = nPropType; }
+ void SetPropType( sal_Int32 nPropType ) { mnPropType = nPropType; }
private:
sal_Int32 mnPropId;
@@ -238,9 +238,9 @@ public:
explicit SfxOleDictionaryProperty( const SfxOleTextEncoding& rTextEnc );
/** Returns true, if the property contains at least one custom property name. */
- inline bool HasPropertyNames() const { return !maPropNameMap.empty(); }
+ bool HasPropertyNames() const { return !maPropNameMap.empty(); }
/** Prepares the property for loading. Does not affect contained names for its own. */
- inline void SetNameCount( sal_Int32 nNameCount ) { SetPropType( nNameCount ); }
+ void SetNameCount( sal_Int32 nNameCount ) { SetPropType( nNameCount ); }
/** Returns the custom name for the passed property ID, or an empty string, if name not found. */
OUString GetPropertyName( sal_Int32 nPropId ) const;
@@ -357,7 +357,7 @@ enum SfxOleSectionType
class SfxOlePropertySet : public SfxOleObjectBase
{
public:
- inline explicit SfxOlePropertySet() {}
+ explicit SfxOlePropertySet() {}
/** Loads this object from the passed storage. */
ErrCode LoadPropertySet( SotStorage* pStrg, const OUString& rStrmName );