::get(); }
protected:
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index a02a6a7e00bc..04dfa535879b 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -269,14 +269,14 @@ public:
one previously registered via registerProperty.
@see registerProperty
*/
- inline void getCurrentPropertyValueByHandle( sal_Int32 nHandle, css::uno::Any& /* [out] */ rValue, const NotifierAccess& ) const
+ void getCurrentPropertyValueByHandle( sal_Int32 nHandle, css::uno::Any& /* [out] */ rValue, const NotifierAccess& ) const
{
getFastPropertyValue( rValue, nHandle );
}
/** notifies a change in a given property to all interested listeners
*/
- inline void notifyPropertyChange( sal_Int32 nHandle, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue, const NotifierAccess& ) const
+ void notifyPropertyChange( sal_Int32 nHandle, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue, const NotifierAccess& ) const
{
const_cast< PropertySetBase* >( this )->firePropertyChange( nHandle, rNewValue, rOldValue );
}
@@ -325,13 +325,13 @@ public:
the handle of the property which is going to be changed. Must be a valid property
handle for the given rPropertySet
*/
- inline PropertyChangeNotifier( const PropertySetBase& rPropertySet, sal_Int32 nHandle )
+ PropertyChangeNotifier( const PropertySetBase& rPropertySet, sal_Int32 nHandle )
:m_rPropertySet( rPropertySet )
,m_nHandle( nHandle )
{
m_rPropertySet.getCurrentPropertyValueByHandle( m_nHandle, m_aOldValue, PropertySetBase::NotifierAccess() );
}
- inline ~PropertyChangeNotifier()
+ ~PropertyChangeNotifier()
{
css::uno::Any aNewValue;
m_rPropertySet.getCurrentPropertyValueByHandle( m_nHandle, aNewValue, PropertySetBase::NotifierAccess() );
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index c564c18a4100..cdf636990765 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -88,33 +88,33 @@ public:
// inline functions
- inline NSView* getUserPane() {
+ NSView* getUserPane() {
if (!m_bIsUserPaneLaidOut) {
createUserPane();
}
return m_pUserPane;
}
- inline bool getVisibility(ToggleType tToggle) {
+ bool getVisibility(ToggleType tToggle) {
return m_bToggleVisibility[tToggle];
}
- inline void setFilterControlNeeded(bool bNeeded) {
+ void setFilterControlNeeded(bool bNeeded) {
m_bIsFilterControlNeeded = bNeeded;
if (bNeeded) {
m_bUserPaneNeeded = true;
}
}
- inline void setFilterHelper(FilterHelper* pFilterHelper) {
+ void setFilterHelper(FilterHelper* pFilterHelper) {
m_pFilterHelper = pFilterHelper;
}
- inline void setFilePickerDelegate(AquaFilePickerDelegate* pDelegate) {
+ void setFilePickerDelegate(AquaFilePickerDelegate* pDelegate) {
m_pDelegate = pDelegate;
}
- inline bool isAutoExtensionEnabled() {
+ bool isAutoExtensionEnabled() {
return ([((NSButton*) m_pToggles[AUTOEXTENSION]) state] == NSOnState);
}
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index a4ffa6893e42..22d7a7d52428 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -129,11 +129,11 @@ public:
void SAL_CALL controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent );
void SAL_CALL dialogSizeChanged( );
- inline AquaFilePickerDelegate * getDelegate() {
+ AquaFilePickerDelegate * getDelegate() {
return m_pDelegate;
}
- inline OUString const & getSaveFileName() {
+ OUString const & getSaveFileName() {
return m_sSaveFileName;
}
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index fa0c8b959e63..acfa2a855db0 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -47,9 +47,9 @@ public:
int run();
int runandwaitforresult();
- inline OUString const & getDisplayDirectory() { return m_sDisplayDirectory; }
+ OUString const & getDisplayDirectory() { return m_sDisplayDirectory; }
- inline ControlHelper* getControlHelper() const {
+ ControlHelper* getControlHelper() const {
return m_pControlHelper;
}
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 5212080433ef..81ecad00daec 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -77,10 +77,10 @@ namespace svt
OUString m_aDisplayDirectory;
protected:
- inline SvtFileDialog_Base* getDialog() { return m_pDlg; }
+ SvtFileDialog_Base* getDialog() { return m_pDlg; }
- inline const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return OCommonPicker_Base::rBHelper; }
- inline ::cppu::OBroadcastHelper& GetBroadcastHelper() { return OCommonPicker_Base::rBHelper; }
+ const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return OCommonPicker_Base::rBHelper; }
+ ::cppu::OBroadcastHelper& GetBroadcastHelper() { return OCommonPicker_Base::rBHelper; }
public:
OCommonPicker();
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index bdd2e43e48d0..0c37ac83fbc0 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -113,25 +113,25 @@ namespace svt
@seealso State
*/
- inline State getState( ) const { return m_eState; }
+ State getState( ) const { return m_eState; }
/** checks if the content is valid
Note that "not (is valid)" is not the same as "is invalid"
*/
- inline bool isValid( ) const { return VALID == getState(); }
+ bool isValid( ) const { return VALID == getState(); }
/** checks if the content is valid
Note that "not (is invalid)" is not the same as "is valid"
*/
- inline bool isInvalid( ) const { return INVALID == getState(); }
+ bool isInvalid( ) const { return INVALID == getState(); }
/** checks if the content is bound
*/
- inline bool isBound( ) const { return NOT_BOUND != getState(); }
+ bool isBound( ) const { return NOT_BOUND != getState(); }
/** returns the URL of the content
*/
- inline OUString getURL() const { return m_pContent ? m_pContent->getURL() : m_sURL; }
+ OUString getURL() const { return m_pContent ? m_pContent->getURL() : m_sURL; }
/** (re)creates the content for the given URL
@@ -175,19 +175,19 @@ namespace svt
@postcond
the content is not in the state UNKNOWN
*/
- inline bool isFolder( const OUString& _rURL )
+ bool isFolder( const OUString& _rURL )
{
return implIs( _rURL, Folder );
}
/** checks if the content is existent (it is if and only if it is a document or a folder)
*/
- inline bool is( const OUString& _rURL )
+ bool is( const OUString& _rURL )
{
return implIs( _rURL, Folder ) || implIs( _rURL, Document );
}
- inline bool isFolder( ) { return isFolder( getURL() ); }
+ bool isFolder( ) { return isFolder( getURL() ); }
};
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index fe4963112565..8639ea78f489 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -87,7 +87,7 @@ private:
VclPtr m_pMenu;
protected:
- inline SvtFileDialog* GetDialogParent() { return m_pDlg; }
+ SvtFileDialog* GetDialogParent() { return m_pDlg; }
virtual void FillURLMenu( PopupMenu* _pMenu ) = 0;
@@ -179,11 +179,11 @@ public:
~SvtExpFileDlg_Impl();
- inline void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { _aBlackList = rBlackList; }
- inline const css::uno::Sequence< OUString >& GetBlackList() const { return _aBlackList; }
+ void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { _aBlackList = rBlackList; }
+ const css::uno::Sequence< OUString >& GetBlackList() const { return _aBlackList; }
void SetStandardDir( const OUString& _rDir );
- inline const OUString& GetStandardDir() const { return _aStdDir; }
- inline void DisableFilterBoxAutoWidth() { _pLbFilter->EnableDDAutoWidth( false ); }
+ const OUString& GetStandardDir() const { return _aStdDir; }
+ void DisableFilterBoxAutoWidth() { _pLbFilter->EnableDDAutoWidth( false ); }
// access to the filter listbox only as Control* - we want to maintain the entries/userdata ourself
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index 0c0466067cd9..b09ba7257c32 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -47,7 +47,7 @@ class Gate
@short ctor
@descr These initialize the object right as an open gate.
*//*-*****************************************************************************************************/
- inline Gate()
+ Gate()
: m_bClosed ( false )
{
open();
@@ -59,7 +59,7 @@ class Gate
blocked threads can running ... but I don't know
if it's right - we are destroyed yet!?
*//*-*****************************************************************************************************/
- inline ~Gate()
+ ~Gate()
{
open();
}
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 033f61b940f6..2c4366cdee23 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -27,13 +27,13 @@ namespace framework{
class TransactionGuard
{
public:
- inline TransactionGuard( TransactionManager& rManager, EExceptionMode eMode )
+ TransactionGuard( TransactionManager& rManager, EExceptionMode eMode )
: m_pManager( &rManager )
{
m_pManager->registerTransaction( eMode );
}
- inline ~TransactionGuard()
+ ~TransactionGuard()
{
m_pManager->unregisterTransaction();
}
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 0cd54b70c70b..a151573ab9aa 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -175,7 +175,7 @@ private:
OUStringHash >
{
public:
- inline void free()
+ void free()
{
UrlToDispatchMap().swap( *this );// get rid of reserved capacity
}
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index ac69abf9add0..446f06b3f0ac 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -150,7 +150,7 @@ class LiblangtagDataRef
public:
LiblangtagDataRef();
~LiblangtagDataRef();
- inline void init()
+ void init()
{
if (!mbInitialized)
setup();
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 00e24be389d6..31f7c95d9d57 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -93,12 +93,12 @@ protected:
public:
LocaleNode (const OUString& name, const Reference< XAttributeList > & attr);
- inline void setValue(const OUString &oValue) { aValue += oValue; };
- inline const OUString& getName() const { return aName; };
- inline const OUString& getValue() const { return aValue; };
- inline const Attr& getAttr() const { return aAttribs; };
- inline sal_Int32 getNumberOfChildren () const { return nChildren; };
- inline LocaleNode * getChildAt (sal_Int32 idx) const { return children[idx] ; };
+ void setValue(const OUString &oValue) { aValue += oValue; };
+ const OUString& getName() const { return aName; };
+ const OUString& getValue() const { return aValue; };
+ const Attr& getAttr() const { return aAttribs; };
+ sal_Int32 getNumberOfChildren () const { return nChildren; };
+ LocaleNode * getChildAt (sal_Int32 idx) const { return children[idx] ; };
const LocaleNode * findNode ( const sal_Char *name) const;
void print () const;
void printR () const;
@@ -130,7 +130,7 @@ public:
class LCInfoNode : public LocaleNode {
public:
- inline LCInfoNode (const OUString& name,
+ LCInfoNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
};
@@ -138,7 +138,7 @@ public:
class LCCTYPENode : public LocaleNode {
public:
- inline LCCTYPENode (const OUString& name,
+ LCCTYPENode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -148,7 +148,7 @@ class LCFormatNode : public LocaleNode {
static sal_Int16 mnSection;
static sal_Int16 mnFormats;
public:
- inline LCFormatNode (const OUString& name,
+ LCFormatNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -156,7 +156,7 @@ public:
class LCCollationNode : public LocaleNode {
public:
- inline LCCollationNode (const OUString& name,
+ LCCollationNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -164,7 +164,7 @@ public:
class LCIndexNode : public LocaleNode {
public:
- inline LCIndexNode (const OUString& name,
+ LCIndexNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -172,7 +172,7 @@ public:
class LCSearchNode : public LocaleNode {
public:
- inline LCSearchNode (const OUString& name,
+ LCSearchNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -180,7 +180,7 @@ public:
class LCCalendarNode : public LocaleNode {
public:
- inline LCCalendarNode (const OUString& name,
+ LCCalendarNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -188,7 +188,7 @@ public:
class LCCurrencyNode : public LocaleNode {
public:
- inline LCCurrencyNode (const OUString& name,
+ LCCurrencyNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -196,7 +196,7 @@ public:
class LCTransliterationNode : public LocaleNode {
public:
- inline LCTransliterationNode (const OUString& name,
+ LCTransliterationNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -204,7 +204,7 @@ public:
class LCMiscNode : public LocaleNode {
public:
- inline LCMiscNode (const OUString& name,
+ LCMiscNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -212,7 +212,7 @@ public:
class LCNumberingLevelNode : public LocaleNode {
public:
- inline LCNumberingLevelNode (const OUString& name,
+ LCNumberingLevelNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
@@ -220,7 +220,7 @@ public:
class LCOutlineNumberingLevelNode : public LocaleNode {
public:
- inline LCOutlineNumberingLevelNode (const OUString& name,
+ LCOutlineNumberingLevelNode (const OUString& name,
const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
virtual void generateCode (const OFileWriter &of) const override;
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx
index e469a6a6d906..daf8778806a3 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -181,7 +181,7 @@ public:
void CalcLPQR( int nOtherX, int nShorterY, int nLongerZ,
bool bRelaxed );
- inline int GetLimit() const { return nLimit; }
+ int GetLimit() const { return nLimit; }
// Calculate current balance, keep this inline for performance reasons!
// c == cpPattern[jj] == cString[ii]
diff --git a/idlc/inc/astscope.hxx b/idlc/inc/astscope.hxx
index 7a4e475b34d3..e241f49407b9 100644
--- a/idlc/inc/astscope.hxx
+++ b/idlc/inc/astscope.hxx
@@ -57,7 +57,7 @@ public:
AstDeclaration* lookupForAdd(AstDeclaration* pDecl);
protected:
- inline AstDeclaration const * getLast() const
+ AstDeclaration const * getLast() const
{ return m_declarations.back(); }
private:
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 4855e0973350..90127f28a1e9 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -272,7 +272,7 @@ public:
bool IsBroadcaster() const { return pCst != nullptr; }
virtual void Broadcast( SfxHintId nHintId ) override;
- inline const SbxObject* GetParent() const { return pParent; }
+ const SbxObject* GetParent() const { return pParent; }
SbxObject* GetParent() { return pParent;}
virtual void SetParent( SbxObject* );
diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx
index 06f026fc0532..8d9b6084ec26 100644
--- a/include/codemaker/options.hxx
+++ b/include/codemaker/options.hxx
@@ -57,7 +57,7 @@ public:
const StringVector& getInputFiles() { return m_inputFiles;}
- inline const StringVector& getExtraInputFiles() const
+ const StringVector& getExtraInputFiles() const
{ return m_extra_input_files; }
protected:
::rtl::OString m_program;
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 6e3d53b43c79..0a5f595cbb9d 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -54,13 +54,13 @@ class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI Any : public uno_Any
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( size_t nSize )
+ static void * SAL_CALL operator new ( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem )
+ static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( size_t, void * pMem )
+ static void * SAL_CALL operator new ( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * )
+ static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
@@ -144,13 +144,13 @@ public:
@return a Type object of the set value
*/
- inline const Type & SAL_CALL getValueType() const
+ const Type & SAL_CALL getValueType() const
{ return * reinterpret_cast< const Type * >( &pType ); }
/** Gets the type of the set value.
@return the unacquired type description reference of the set value
*/
- inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const
+ typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const
{ return pType; }
/** Gets the type description of the set value. Provides ownership of the type description!
@@ -158,14 +158,14 @@ public:
@param ppTypeDescr a pointer to type description pointer
*/
- inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const
+ void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const
{ ::typelib_typedescriptionreference_getDescription( ppTypeDescr, pType ); }
/** Gets the type class of the set value.
@return the type class of the set value
*/
- inline TypeClass SAL_CALL getValueTypeClass() const
+ TypeClass SAL_CALL getValueTypeClass() const
{ return (TypeClass)pType->eTypeClass; }
/** Gets the type name of the set value.
@@ -178,14 +178,14 @@ public:
@return true if any has a value, false otherwise
*/
- inline bool SAL_CALL hasValue() const
+ bool SAL_CALL hasValue() const
{ return (typelib_TypeClass_VOID != pType->eTypeClass); }
/** Gets a pointer to the set value.
@return a pointer to the set value
*/
- inline const void * SAL_CALL getValue() const
+ const void * SAL_CALL getValue() const
{ return pData; }
/** Provides a value of specified type, so you can easily write e.g.
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h
index af2dc299b8e0..ba68c74ae574 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -83,14 +83,14 @@ public:
@return UNacquired interface pointer
*/
- inline XInterface * SAL_CALL get() const
+ XInterface * SAL_CALL get() const
{ return _pInterface; }
/** Checks if reference is null.
@return true if reference acquires an interface, i.e. true if it is not null
*/
- inline bool SAL_CALL is() const
+ bool SAL_CALL is() const
{ return (NULL != _pInterface); }
#if defined LIBO_INTERNAL_ONLY
@@ -98,7 +98,7 @@ public:
@return true if reference acquires an interface, i.e. true if it is not null
*/
- inline explicit operator bool() const
+ explicit operator bool() const
{ return is(); }
#endif
@@ -256,7 +256,7 @@ class SAL_DLLPUBLIC_RTTI Reference : public BaseReference
principle, this is not guaranteed to work. In practice, it seems to
work on all supported platforms.
*/
- static inline interface_type * castFromXInterface(XInterface * p) {
+ static interface_type * castFromXInterface(XInterface * p) {
return static_cast< interface_type * >(static_cast< void * >(p));
}
@@ -271,20 +271,20 @@ class SAL_DLLPUBLIC_RTTI Reference : public BaseReference
principle, this is not guaranteed to work. In practice, it seems to
work on all supported platforms.
*/
- static inline XInterface * castToXInterface(interface_type * p) {
+ static XInterface * castToXInterface(interface_type * p) {
return static_cast< XInterface * >(static_cast< void * >(p));
}
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( ::size_t nSize )
+ static void * SAL_CALL operator new ( ::size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem )
+ static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( ::size_t, void * pMem )
+ static void * SAL_CALL operator new ( ::size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * )
+ static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
@@ -409,14 +409,14 @@ public:
any interface must be derived from com.sun.star.uno.XInterface.
This a useful direct cast possibility.
*/
- inline SAL_CALL operator const Reference< XInterface > & () const
+ SAL_CALL operator const Reference< XInterface > & () const
{ return * reinterpret_cast< const Reference< XInterface > * >( this ); }
/** Dereference operator: Used to call interface methods.
@return UNacquired interface pointer
*/
- inline interface_type * SAL_CALL operator -> () const {
+ interface_type * SAL_CALL operator -> () const {
assert(_pInterface != NULL);
return castFromXInterface(_pInterface);
}
@@ -425,7 +425,7 @@ public:
@return UNacquired interface pointer
*/
- inline interface_type * SAL_CALL get() const
+ interface_type * SAL_CALL get() const
{ return castFromXInterface(_pInterface); }
/** Clears reference, i.e. releases interface. Reference is null after clear() call.
diff --git a/include/com/sun/star/uno/Sequence.h b/include/com/sun/star/uno/Sequence.h
index d22bc1e8e78f..15a792bc9860 100644
--- a/include/com/sun/star/uno/Sequence.h
+++ b/include/com/sun/star/uno/Sequence.h
@@ -62,13 +62,13 @@ public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( ::size_t nSize )
+ static void * SAL_CALL operator new ( ::size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem )
+ static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( ::size_t, void * pMem )
+ static void * SAL_CALL operator new ( ::size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * )
+ static void SAL_CALL operator delete ( void *, void * )
{}
/** Static pointer to typelib type of sequence.
@@ -140,7 +140,7 @@ public:
@return length of sequence
*/
- inline sal_Int32 SAL_CALL getLength() const
+ sal_Int32 SAL_CALL getLength() const
{ return _pSequence->nElements; }
/** Tests whether the sequence has elements, i.e. elements count is
@@ -148,7 +148,7 @@ public:
@return true, if elements count is greater than zero
*/
- inline bool SAL_CALL hasElements() const
+ bool SAL_CALL hasElements() const
{ return (_pSequence->nElements > 0); }
/** Gets a pointer to elements array for reading.
@@ -157,7 +157,7 @@ public:
@return pointer to elements array
*/
- inline const E * SAL_CALL getConstArray() const
+ const E * SAL_CALL getConstArray() const
{ return reinterpret_cast< const E * >( _pSequence->elements ); }
/** Gets a pointer to elements array for reading and writing.
@@ -249,7 +249,7 @@ public:
@return UNacquired sequence handle
*/
- inline uno_Sequence * SAL_CALL get() const
+ uno_Sequence * SAL_CALL get() const
{ return _pSequence; }
};
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index 23c5527d92c4..041314e9778d 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -60,13 +60,13 @@ class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI Type
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( size_t nSize )
+ static void * SAL_CALL operator new ( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem )
+ static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( size_t, void * pMem )
+ static void * SAL_CALL operator new ( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * )
+ static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
@@ -117,7 +117,7 @@ public:
/** Destructor: Releases acquired C type description reference.
*/
- inline ~Type()
+ ~Type()
{ ::typelib_typedescriptionreference_release( _pType ); }
/** Assignment operator: Acquires right side type and releases previously set type.
@@ -131,7 +131,7 @@ public:
@return type class of set type
*/
- inline TypeClass SAL_CALL getTypeClass() const
+ TypeClass SAL_CALL getTypeClass() const
{ return (TypeClass)_pType->eTypeClass; }
/** Gets the name of the set type.
@@ -144,14 +144,14 @@ public:
@param ppDescr [inout] type description
*/
- inline void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const
+ void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const
{ ::typelib_typedescriptionreference_getDescription( ppDescr, _pType ); }
/** Gets the C typelib type description reference pointer. Does not acquire the reference!
@return UNacquired type description reference
*/
- inline typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const
+ typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const
{ return _pType; }
/** Tests if values of this reflected type can be assigned by values of given type.
@@ -162,7 +162,7 @@ public:
@return true if values of this type can be assigned from values of given type,
false otherwise
*/
- inline bool SAL_CALL isAssignableFrom( const Type & rType ) const
+ bool SAL_CALL isAssignableFrom( const Type & rType ) const
{ return ::typelib_typedescriptionreference_isAssignableFrom( _pType, rType._pType ); }
/** Compares two types.
@@ -170,21 +170,21 @@ public:
@param rType another type
@return true if both types refer the same type, false otherwise
*/
- inline bool SAL_CALL equals( const Type & rType ) const
+ bool SAL_CALL equals( const Type & rType ) const
{ return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
/** Equality operator: Compares two types.
@param rType another type
@return true if both types refer the same type, false otherwise
*/
- inline bool SAL_CALL operator == ( const Type & rType ) const
+ bool SAL_CALL operator == ( const Type & rType ) const
{ return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
/** Unequality operator: Compares two types.
@param rType another type
@return false if both types refer the same type, true otherwise
*/
- inline bool SAL_CALL operator != ( const Type & rType ) const
+ bool SAL_CALL operator != ( const Type & rType ) const
{ return (! ::typelib_typedescriptionreference_equals( _pType, rType._pType )); }
};
diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index c1203a35b257..d18ad49786bf 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -39,8 +39,8 @@ namespace comphelper
bool mbInit;
SlaveData ( ChainablePropertySet *pSlave);
- inline bool IsInit () { return mbInit;}
- inline void SetInit ( bool bInit) { mbInit = bInit; }
+ bool IsInit () { return mbInit;}
+ void SetInit ( bool bInit) { mbInit = bInit; }
};
}
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index 504afb9dd59a..7163817280a3 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -57,14 +57,14 @@ namespace comphelper
{
IMutex* m_pMutex;
public:
- inline OMutexGuard( IMutex* _pMutex )
+ OMutexGuard( IMutex* _pMutex )
:m_pMutex( _pMutex )
{
if ( m_pMutex )
m_pMutex->acquire();
}
- inline ~OMutexGuard( )
+ ~OMutexGuard( )
{
if ( m_pMutex )
m_pMutex->release();
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index f512b42f31b0..69c5647c5bda 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -207,12 +207,12 @@ namespace comphelper
EventObjectType m_aEvent;
public:
- inline EventHolder( const EventObjectType& _rEvent )
+ EventHolder( const EventObjectType& _rEvent )
:m_aEvent( _rEvent )
{
}
- inline const EventObjectType& getEventObject() const { return m_aEvent; }
+ const EventObjectType& getEventObject() const { return m_aEvent; }
};
COMPHELPER_DLLPUBLIC void JoinAsyncEventNotifiers();
diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx
index ac6acfa758bd..75f43a9f8812 100644
--- a/include/comphelper/componentbase.hxx
+++ b/include/comphelper/componentbase.hxx
@@ -64,14 +64,14 @@ namespace comphelper
Subsequent instantiations of a ComponentMethodGuard won't throw the NotInitializedException now.
*/
- inline void setInitialized() { m_bInitialized = true; }
+ void setInitialized() { m_bInitialized = true; }
public:
/// helper struct to grant access to selected public methods to the ComponentMethodGuard class
struct GuardAccess { friend class ComponentMethodGuard; private: GuardAccess() { } };
/// retrieves the component's mutex
- inline ::osl::Mutex& getMutex( GuardAccess ) { return getMutex(); }
+ ::osl::Mutex& getMutex( GuardAccess ) { return getMutex(); }
/// checks whether the component is already disposed, throws a DisposedException if so.
void checkDisposed( GuardAccess ) const;
/// checks whether the component is already initialized, throws a NotInitializedException if not.
@@ -79,14 +79,14 @@ namespace comphelper
protected:
/// retrieves the component's broadcast helper
- inline ::cppu::OBroadcastHelper& getBroadcastHelper() { return m_rBHelper; }
+ ::cppu::OBroadcastHelper& getBroadcastHelper() { return m_rBHelper; }
/// retrieves the component's mutex
- inline ::osl::Mutex& getMutex() { return m_rBHelper.rMutex; }
+ ::osl::Mutex& getMutex() { return m_rBHelper.rMutex; }
/// determines whether the instance is already disposed
- inline bool impl_isDisposed() const { return m_rBHelper.bDisposed; }
+ bool impl_isDisposed() const { return m_rBHelper.bDisposed; }
/// determines whether the component is already initialized
- inline bool
+ bool
impl_isInitialized_nothrow() const { return m_bInitialized; }
/** returns the context to be used when throwing exceptions
@@ -121,7 +121,7 @@ namespace comphelper
_rComponent.checkDisposed( ComponentBase::GuardAccess() );
}
- inline void clear()
+ void clear()
{
m_aMutexGuard.clear();
}
diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx
index e4df46d6f76c..4439dbfc5da6 100644
--- a/include/comphelper/interfacecontainer2.hxx
+++ b/include/comphelper/interfacecontainer2.hxx
@@ -126,13 +126,13 @@ class COMPHELPER_DLLPUBLIC OInterfaceContainerHelper2
{
public:
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
/**
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index ad040d1779e0..22b98c693a03 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -169,12 +169,12 @@ namespace comphelper
{
}
- inline void addListener( const css::uno::Reference< ListenerClass >& _rxListener )
+ void addListener( const css::uno::Reference< ListenerClass >& _rxListener )
{
OListenerContainer::impl_addListener( _rxListener.get() );
}
- inline void removeListener( const css::uno::Reference< ListenerClass >& _rxListener )
+ void removeListener( const css::uno::Reference< ListenerClass >& _rxListener )
{
OListenerContainer::impl_removeListener( _rxListener.get() );
}
@@ -224,21 +224,21 @@ namespace comphelper
typedef EVENT EventClass;
public:
- inline OListenerContainerBase( ::osl::Mutex& _rMutex ) : OListenerContainer( _rMutex )
+ OListenerContainerBase( ::osl::Mutex& _rMutex ) : OListenerContainer( _rMutex )
{
}
- inline void addTypedListener( const css::uno::Reference< ListenerClass >& _rxListener )
+ void addTypedListener( const css::uno::Reference< ListenerClass >& _rxListener )
{
OListenerContainer::impl_addListener( _rxListener.get() );
}
- inline void removeTypedListener( const css::uno::Reference< ListenerClass >& _rxListener )
+ void removeTypedListener( const css::uno::Reference< ListenerClass >& _rxListener )
{
OListenerContainer::impl_removeListener( _rxListener.get() );
}
- inline bool notify( const EventClass& _rEvent )
+ bool notify( const EventClass& _rEvent )
{
return OListenerContainer::impl_notify( _rEvent );
}
diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx
index cb850aa26574..9b19bf2e3dda 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
@@ -83,12 +83,12 @@ namespace comphelper
~NamedValueCollection();
- inline void assign( const css::uno::Sequence< css::uno::Any >& _rArguments )
+ void assign( const css::uno::Sequence< css::uno::Any >& _rArguments )
{
impl_assign( _rArguments );
}
- inline void clear()
+ void clear()
{
impl_assign( css::uno::Sequence< css::beans::NamedValue >() );
}
@@ -195,13 +195,13 @@ namespace comphelper
}
/// determines whether a value with a given name is present in the collection
- inline bool has( const sal_Char* _pAsciiValueName ) const
+ bool has( const sal_Char* _pAsciiValueName ) const
{
return impl_has( OUString::createFromAscii( _pAsciiValueName ) );
}
/// determines whether a value with a given name is present in the collection
- inline bool has( const OUString& _rValueName ) const
+ bool has( const OUString& _rValueName ) const
{
return impl_has( _rValueName );
}
@@ -212,7 +212,7 @@ namespace comphelper
which case it has been overwritten.
*/
template < typename VALUE_TYPE >
- inline bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue )
+ bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue )
{
return impl_put( OUString::createFromAscii( _pAsciiValueName ), css::uno::makeAny( _rValue ) );
}
@@ -223,17 +223,17 @@ namespace comphelper
which case it has been overwritten.
*/
template < typename VALUE_TYPE >
- inline bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue )
+ bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue )
{
return impl_put( _rValueName, css::uno::makeAny( _rValue ) );
}
- inline bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue )
+ bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue )
{
return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue );
}
- inline bool put( const OUString& _rValueName, const css::uno::Any& _rValue )
+ bool put( const OUString& _rValueName, const css::uno::Any& _rValue )
{
return impl_put( _rValueName, _rValue );
}
@@ -242,7 +242,7 @@ namespace comphelper
@return if and only if a value with the given name existed in the collection.
*/
- inline bool remove( const sal_Char* _pAsciiValueName )
+ bool remove( const sal_Char* _pAsciiValueName )
{
return impl_remove( OUString::createFromAscii( _pAsciiValueName ) );
}
@@ -251,7 +251,7 @@ namespace comphelper
@return if and only if a value with the given name existed in the collection.
*/
- inline bool remove( const OUString& _rValueName )
+ bool remove( const OUString& _rValueName )
{
return impl_remove( _rValueName );
}
@@ -272,7 +272,7 @@ namespace comphelper
/** transforms the collection into a sequence of PropertyValues
*/
- inline css::uno::Sequence< css::beans::PropertyValue >
+ css::uno::Sequence< css::beans::PropertyValue >
getPropertyValues() const
{
css::uno::Sequence< css::beans::PropertyValue > aValues;
@@ -282,7 +282,7 @@ namespace comphelper
/** returns a Sequence< Any >, containing PropertyValues
*/
- inline css::uno::Sequence< css::uno::Any >
+ css::uno::Sequence< css::uno::Any >
getWrappedPropertyValues() const
{
return impl_wrap< css::beans::PropertyValue >();
@@ -290,7 +290,7 @@ namespace comphelper
/** returns a Sequence< Any >, containing NamedValues
*/
- inline css::uno::Sequence< css::uno::Any >
+ css::uno::Sequence< css::uno::Any >
getWrappedNamedValues() const
{
return impl_wrap< css::beans::NamedValue >();
@@ -298,7 +298,7 @@ namespace comphelper
/** transforms the collection into a sequence of NamedValues
*/
- inline css::uno::Sequence< css::beans::NamedValue >
+ css::uno::Sequence< css::beans::NamedValue >
getNamedValues() const
{
css::uno::Sequence< css::beans::NamedValue > aValues;
diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index 2123484ebb85..dcca91db86dd 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -130,7 +130,7 @@ namespace comphelper
@param _out_rProps
takes, upon return, the descriptions of all properties in the bag
*/
- inline void describeProperties(
+ void describeProperties(
css::uno::Sequence< css::beans::Property >& _out_rProps
) const
{
@@ -202,14 +202,14 @@ namespace comphelper
/** determines whether a property with a given name is part of the bag
*/
- inline bool hasPropertyByName( const OUString& _rName ) const
+ bool hasPropertyByName( const OUString& _rName ) const
{
return isRegisteredProperty( _rName );
}
/** determines whether a property with a given handle is part of the bag
*/
- inline bool hasPropertyByHandle( sal_Int32 _nHandle ) const
+ bool hasPropertyByHandle( sal_Int32 _nHandle ) const
{
return isRegisteredProperty( _nHandle );
}
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index bf3c5d87233e..465d3e243666 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -88,7 +88,7 @@ namespace comphelper
css::uno::Reference< css::uno::XComponentContext > m_xContext;
protected:
- inline const css::uno::Reference< css::uno::XComponentContext >& getComponentContext()
+ const css::uno::Reference< css::uno::XComponentContext >& getComponentContext()
{
return m_xContext;
}
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index d31ae21914e8..270601af7c67 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -247,7 +247,7 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAs
@return The value of the specified property or
an empty css::uno::Any.
*/
- inline css::uno::Any getValue(const OUString& sKey) const
+ css::uno::Any getValue(const OUString& sKey) const
{
const_iterator pIt = find(sKey);
if (pIt == end())
diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx
index 87e6717cbb84..d0fd28dd6e21 100644
--- a/include/comphelper/sharedmutex.hxx
+++ b/include/comphelper/sharedmutex.hxx
@@ -37,7 +37,7 @@ namespace comphelper
SharedMutex( const SharedMutex& );
SharedMutex& operator=( const SharedMutex& );
- inline operator ::osl::Mutex& () { return *m_pMutexImpl; }
+ operator ::osl::Mutex& () { return *m_pMutexImpl; }
private:
std::shared_ptr< ::osl::Mutex > m_pMutexImpl;
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index 0fc4e588fb51..273153cfaeb9 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -50,26 +50,26 @@ namespace comphelper
m_xBroadcaster;
protected:
- inline css::uno::Reference< css::uno::XInterface >
+ css::uno::Reference< css::uno::XInterface >
getListener( ) const
{
return m_aListener.get();
}
- inline const css::uno::Reference< css::uno::XInterface >&
+ const css::uno::Reference< css::uno::XInterface >&
getBroadcaster( ) const
{
return m_xBroadcaster;
}
- inline void resetListener( )
+ void resetListener( )
{
m_aListener.clear();
}
protected:
- inline OWeakListenerAdapterBase(
+ OWeakListenerAdapterBase(
const css::uno::Reference< css::uno::XWeak >& _rxListener,
const css::uno::Reference< css::uno::XInterface >& _rxBroadcaster
)
@@ -109,7 +109,7 @@ namespace comphelper
);
protected:
- inline css::uno::Reference< LISTENER > getListener( ) const
+ css::uno::Reference< LISTENER > getListener( ) const
{
return css::uno::Reference< LISTENER >( OWeakListenerAdapterBase::getListener(), css::uno::UNO_QUERY );
}
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index 93b7ec28dd7c..dfde6cab9342 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -278,13 +278,13 @@ namespace connectivity
free();
}
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void * SAL_CALL operator new( size_t,void* _pHint )
+ static void * SAL_CALL operator new( size_t,void* _pHint )
{ return _pHint; }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void SAL_CALL operator delete( void *,void* )
+ static void SAL_CALL operator delete( void *,void* )
{ }
ORowSetValue& operator=(const ORowSetValue& _rRH);
@@ -456,16 +456,16 @@ namespace connectivity
ORowSetValueDecorator(const ORowSetValue& _aValue) : m_aValue(_aValue){m_aValue.setBound(true);}
ORowSetValueDecorator& operator=(const ORowSetValue& _aValue);
- inline operator const ORowSetValue&() const { return m_aValue; }
- inline bool operator ==( const ORowSetValue & _rRH ) { return m_aValue == _rRH; }
- inline const ORowSetValue& getValue() const { return m_aValue; }
- inline ORowSetValue& get() { return m_aValue; }
- inline void setValue(const ORowSetValue& _aValue) { m_aValue = _aValue; }
- inline void setNull() { m_aValue.setNull(); }
- inline void setBound(bool _bBound ) { m_aValue.setBound(_bBound);}
- inline bool isBound( ) const { return m_aValue.isBound();}
- inline void setTypeKind(sal_Int32 _nType) { m_aValue.setTypeKind(_nType); }
- inline void setModified(bool _bModified) { m_aValue.setModified(_bModified); }
+ operator const ORowSetValue&() const { return m_aValue; }
+ bool operator ==( const ORowSetValue & _rRH ) { return m_aValue == _rRH; }
+ const ORowSetValue& getValue() const { return m_aValue; }
+ ORowSetValue& get() { return m_aValue; }
+ void setValue(const ORowSetValue& _aValue) { m_aValue = _aValue; }
+ void setNull() { m_aValue.setNull(); }
+ void setBound(bool _bBound ) { m_aValue.setBound(_bBound);}
+ bool isBound( ) const { return m_aValue.isBound();}
+ void setTypeKind(sal_Int32 _nType) { m_aValue.setTypeKind(_nType); }
+ void setModified(bool _bModified) { m_aValue.setModified(_bModified); }
};
typedef ::rtl::Reference ORowSetValueDecoratorRef;
diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx
index 4d9737c2cf20..140d6328c1d2 100644
--- a/include/connectivity/TColumnsHelper.hxx
+++ b/include/connectivity/TColumnsHelper.hxx
@@ -55,7 +55,7 @@ namespace connectivity
@param _pTable
The parent.
*/
- inline void setParent(OTableHelper* _pTable) { m_pTable = _pTable;}
+ void setParent(OTableHelper* _pTable) { m_pTable = _pTable;}
};
}
#endif // INCLUDED_CONNECTIVITY_TCOLUMNSHELPER_HXX
diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx
index 7330a718e61b..a7c3e731ccb1 100644
--- a/include/connectivity/TIndex.hxx
+++ b/include/connectivity/TIndex.hxx
@@ -41,7 +41,7 @@ namespace connectivity
bool _isPrimaryKeyIndex,
bool _isClustered
);
- inline OTableHelper* getTable() const { return m_pTable; }
+ OTableHelper* getTable() const { return m_pTable; }
};
}
#endif // INCLUDED_CONNECTIVITY_TINDEX_HXX
diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx
index cfce73d09c6a..3fc9ba1f8b46 100644
--- a/include/connectivity/TKey.hxx
+++ b/include/connectivity/TKey.hxx
@@ -38,7 +38,7 @@ namespace connectivity
,const OUString& Name
,const std::shared_ptr& _rProps
);
- inline OTableHelper* getTable() const { return m_pTable; }
+ OTableHelper* getTable() const { return m_pTable; }
};
}
#endif // INCLUDED_CONNECTIVITY_TKEY_HXX
diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx
index d4ef414fe704..f2a2ca171014 100644
--- a/include/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
@@ -86,7 +86,7 @@ namespace dbtools
protected:
// needed because we want to call a virtual method during construction
void lateConstruct();
- inline void ensureConstructed( ) const { if ( m_aEncodings.empty() ) const_cast< OCharsetMap* >( this )->lateConstruct(); }
+ void ensureConstructed( ) const { if ( m_aEncodings.empty() ) const_cast< OCharsetMap* >( this )->lateConstruct(); }
virtual bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const;
};
diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx
index b16f8ed8de41..ead3b9b58960 100644
--- a/include/connectivity/dbmetadata.hxx
+++ b/include/connectivity/dbmetadata.hxx
@@ -86,7 +86,7 @@ namespace dbtools
/** resets the instance so that it's based on a new connection
*/
- inline void reset( const css::uno::Reference< css::sdbc::XConnection >& _connection )
+ void reset( const css::uno::Reference< css::sdbc::XConnection >& _connection )
{
*this = DatabaseMetaData( _connection );
}
diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx
index 4999dede4149..41df1c61b9f0 100644
--- a/include/connectivity/filtermanager.hxx
+++ b/include/connectivity/filtermanager.hxx
@@ -84,7 +84,7 @@ namespace dbtools
const OUString& getFilterComponent( FilterComponent _eWhich ) const;
void setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent );
- inline bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; }
+ bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; }
void setApplyPublicFilter( bool _bApply );
private:
diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx
index 7a101df72893..49eebb93665a 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
@@ -147,7 +147,7 @@ namespace dbtools
void clearAllParameterInformation();
/// checks whether the parameter information are up-to-date
- inline bool isUpToDate() const { return m_bUpToDate; }
+ bool isUpToDate() const { return m_bUpToDate; }
/** updates all parameter information represented by the instance
*/
@@ -232,7 +232,7 @@ namespace dbtools
private:
/// checkes whether the object is already initialized, and not yet disposed
- inline bool isAlive() const { return m_xComponent.get().is() && m_xInnerParamUpdate.is(); }
+ bool isAlive() const { return m_xComponent.get().is() && m_xInnerParamUpdate.is(); }
/** creates a filter expression from a master-detail link where the detail denotes a column name
*/
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index a801a1f1eba2..4337a025843e 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -172,7 +172,7 @@ namespace connectivity
DECLARE_SERVICE_INFO();
void reFill(const TStringVector &_rVector);
- inline bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); }
+ bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); }
void renameObject(const OUString& _sOldName, const OUString& _sNewName);
// only the name is identical to ::cppu::OComponentHelper
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 442d69d8b536..4db670eafd49 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -161,13 +161,13 @@ namespace connectivity
const OSQLParser& _rParser );
~OSQLParseTreeIterator();
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void * SAL_CALL operator new( size_t,void* _pHint )
+ static void * SAL_CALL operator new( size_t,void* _pHint )
{ return _pHint; }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void SAL_CALL operator delete( void *,void* )
+ static void SAL_CALL operator delete( void *,void* )
{ }
void dispose();
@@ -192,8 +192,8 @@ namespace connectivity
The returned object contains a chain (via SQLException::NextException) of SQLExceptions.
*/
- inline const css::sdbc::SQLException& getErrors() const { return m_aErrors; }
- inline bool hasErrors() const { return !m_aErrors.Message.isEmpty(); }
+ const css::sdbc::SQLException& getErrors() const { return m_aErrors; }
+ bool hasErrors() const { return !m_aErrors.Message.isEmpty(); }
// statement type (already set in setParseTree):
OSQLStatementType getStatementType() const { return m_eStatementType; }
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index 570a17ea7289..3d9304882539 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -44,13 +44,13 @@ namespace connectivity
OSQLScanner();
virtual ~OSQLScanner();
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void * SAL_CALL operator new( size_t,void* _pHint )
+ static void * SAL_CALL operator new( size_t,void* _pHint )
{ return _pHint; }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void SAL_CALL operator delete( void *,void* )
+ static void SAL_CALL operator delete( void *,void* )
{ }
sal_Int32 SQLyygetc();
@@ -72,7 +72,7 @@ namespace connectivity
static sal_Int32 GetSQLRule();
static sal_Int32 GetDATERule();
static sal_Int32 GetSTRINGRule();
- inline sal_Int32 GetCurrentPos() const { return m_nCurrentPos; }
+ sal_Int32 GetCurrentPos() const { return m_nCurrentPos; }
};
}
diff --git a/include/cppu/Enterable.hxx b/include/cppu/Enterable.hxx
index 4670ab52d49e..9e6970d8e4e0 100644
--- a/include/cppu/Enterable.hxx
+++ b/include/cppu/Enterable.hxx
@@ -47,16 +47,16 @@ public:
public:
inline explicit Enterable();
- inline void enter() {m_enter(this);}
- inline void leave() {m_leave(this);}
+ void enter() {m_enter(this);}
+ void leave() {m_leave(this);}
- inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);}
- inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);}
+ void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);}
+ void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);}
inline void callInto(uno_EnvCallee * pCallee, ...);
inline void callOut (uno_EnvCallee * pCallee, ...);
- inline int isValid (rtl::OUString * pReason) {return m_isValid(this, &pReason->pData);}
+ int isValid (rtl::OUString * pReason) {return m_isValid(this, &pReason->pData);}
private:
Enterable(Enterable const &) SAL_DELETED_FUNCTION;
diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx
index a9bcc2726062..40708129ae6f 100644
--- a/include/cppu/unotype.hxx
+++ b/include/cppu/unotype.hxx
@@ -285,7 +285,7 @@ namespace cppu {
*/
template< typename T > class UnoType {
public:
- static inline css::uno::Type const & get() {
+ static css::uno::Type const & get() {
using namespace ::cppu::detail;
#if defined LIBO_INTERNAL_ONLY
typedef typename std::remove_reference::type T1;
diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx
index cf10806d9033..9158c8e0a783 100644
--- a/include/cppuhelper/access_control.hxx
+++ b/include/cppuhelper/access_control.hxx
@@ -54,21 +54,21 @@ public:
/** Clears the access controller reference being used.
*/
- inline void SAL_CALL clear()
+ void SAL_CALL clear()
{ m_xController.clear(); }
/** Returns access to the access controller reference being used.
@return access controller
*/
- inline css::uno::Reference< css::security::XAccessController > const & SAL_CALL get() const
+ css::uno::Reference< css::security::XAccessController > const & SAL_CALL get() const
{ return m_xController; }
/** Returns access to the access controller reference being used.
@return access controller
*/
- inline css::security::XAccessController * SAL_CALL operator -> () const
+ css::security::XAccessController * SAL_CALL operator -> () const
{ return m_xController.get(); }
diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx
index 45ad3f0143b6..ab55d4fca1ac 100644
--- a/include/cppuhelper/compbase1.hxx
+++ b/include/cppuhelper/compbase1.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > > {};
public:
- inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, PartialWeakComponentImplHelper1< Ifc1 > > > {};
public:
- inline PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {};
public:
- inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx
index 7d499c1e9d0c..fabcf4d8035d 100644
--- a/include/cppuhelper/compbase10.hxx
+++ b/include/cppuhelper/compbase10.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakComponentImplHelper10 > > {};
public:
- inline WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, PartialWeakComponentImplHelper10 > > {};
public:
- inline PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggComponentImplHelper10 > > {};
public:
- inline WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx
index ec55cf0eba20..d914bc4aac9e 100644
--- a/include/cppuhelper/compbase11.hxx
+++ b/include/cppuhelper/compbase11.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakComponentImplHelper11 > > {};
public:
- inline WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, PartialWeakComponentImplHelper11 > > {};
public:
- inline PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggComponentImplHelper11 > > {};
public:
- inline WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx
index c43c57078720..e7f6c9ca3671 100644
--- a/include/cppuhelper/compbase12.hxx
+++ b/include/cppuhelper/compbase12.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakComponentImplHelper12 > > {};
public:
- inline WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, PartialWeakComponentImplHelper12 > > {};
public:
- inline PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggComponentImplHelper12 > > {};
public:
- inline WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx
index 4804151f3df7..3534f8a1885e 100644
--- a/include/cppuhelper/compbase2.hxx
+++ b/include/cppuhelper/compbase2.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakComponentImplHelper2 > > {};
public:
- inline WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, PartialWeakComponentImplHelper2 > > {};
public:
- inline PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -126,7 +126,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakAggComponentImplHelper2 > > {};
public:
- inline WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx
index 674342073e31..34fb477582b9 100644
--- a/include/cppuhelper/compbase3.hxx
+++ b/include/cppuhelper/compbase3.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakComponentImplHelper3 > > {};
public:
- inline WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, PartialWeakComponentImplHelper3 > > {};
public:
- inline PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakAggComponentImplHelper3 > > {};
public:
- inline WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx
index b5e06502515b..b3d1a263ed03 100644
--- a/include/cppuhelper/compbase4.hxx
+++ b/include/cppuhelper/compbase4.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakComponentImplHelper4 > > {};
public:
- inline WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, PartialWeakComponentImplHelper4 > > {};
public:
- inline PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggComponentImplHelper4 > > {};
public:
- inline WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx
index 1fe66f71254d..5e583aa3ff13 100644
--- a/include/cppuhelper/compbase5.hxx
+++ b/include/cppuhelper/compbase5.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakComponentImplHelper5 > > {};
public:
- inline WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, PartialWeakComponentImplHelper5 > > {};
public:
- inline PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakAggComponentImplHelper5 > > {};
public:
- inline WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx
index e8cf7ad8a5b1..1ae3a95dd443 100644
--- a/include/cppuhelper/compbase6.hxx
+++ b/include/cppuhelper/compbase6.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakComponentImplHelper6 > > {};
public:
- inline WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, PartialWeakComponentImplHelper6 > > {};
public:
- inline PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakAggComponentImplHelper6 > > {};
public:
- inline WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx
index 3690c9ce7d9b..ee4a9b445a56 100644
--- a/include/cppuhelper/compbase7.hxx
+++ b/include/cppuhelper/compbase7.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakComponentImplHelper7 > > {};
public:
- inline WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, PartialWeakComponentImplHelper7 > > {};
public:
- inline PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakAggComponentImplHelper7 > > {};
public:
- inline WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx
index 0e8600cdce3c..89b30358c805 100644
--- a/include/cppuhelper/compbase8.hxx
+++ b/include/cppuhelper/compbase8.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakComponentImplHelper8 > > {};
public:
- inline WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, PartialWeakComponentImplHelper8 > > {};
public:
- inline PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -125,7 +125,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakAggComponentImplHelper8 > > {};
public:
- inline WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx
index 730e63134dae..78cd2b96e0d9 100644
--- a/include/cppuhelper/compbase9.hxx
+++ b/include/cppuhelper/compbase9.hxx
@@ -47,7 +47,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakComponentImplHelper9 > > {};
public:
- inline WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -85,7 +85,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, PartialWeakComponentImplHelper9 > > {};
public:
- inline PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
@@ -124,7 +124,7 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakAggComponentImplHelper9 > > {};
public:
- inline WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx
index 864dd3afa31f..28535e8bb6ca 100644
--- a/include/cppuhelper/compbase_ex.hxx
+++ b/include/cppuhelper/compbase_ex.hxx
@@ -58,13 +58,13 @@ public:
virtual ~WeakComponentImplHelperBase() SAL_OVERRIDE;
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
virtual css::uno::Any SAL_CALL queryInterface(
@@ -99,13 +99,13 @@ public:
virtual ~WeakAggComponentImplHelperBase() SAL_OVERRIDE;
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
virtual css::uno::Any SAL_CALL queryInterface(
diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx
index e6de21c710c1..a8dca83861d5 100644
--- a/include/cppuhelper/component_context.hxx
+++ b/include/cppuhelper/component_context.hxx
@@ -50,7 +50,7 @@ struct SAL_WARN_UNUSED ContextEntry_Init
/** Default ctor.
*/
- inline ContextEntry_Init()
+ ContextEntry_Init()
: bLateInitService( false )
{}
/** Ctor.
@@ -63,7 +63,7 @@ struct SAL_WARN_UNUSED ContextEntry_Init
whether this entry is a late-init named object entry
(value is object factory or service string)
*/
- inline ContextEntry_Init(
+ ContextEntry_Init(
::rtl::OUString const & name_,
css::uno::Any const & value_,
bool bLateInitService_ = false )
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h
index 3daa656b5664..0049cb8e2b75 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -128,13 +128,13 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper
{
public:
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
/**
@@ -312,13 +312,13 @@ class OMultiTypeInterfaceContainerHelperVar
{
public:
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
/**
@@ -400,7 +400,7 @@ private:
InterfaceMap *m_pMap;
::osl::Mutex & rMutex;
- inline typename InterfaceMap::iterator find(const key &rKey) const
+ typename InterfaceMap::iterator find(const key &rKey) const
{
typename InterfaceMap::iterator iter = m_pMap->begin();
typename InterfaceMap::iterator end = m_pMap->end();
@@ -457,7 +457,7 @@ struct SAL_WARN_UNUSED OBroadcastHelperVar
/**
adds a listener threadsafe.
**/
- inline void addListener(
+ void addListener(
const keyType &key,
const css::uno::Reference < css::uno::XInterface > &r )
{
@@ -471,7 +471,7 @@ struct SAL_WARN_UNUSED OBroadcastHelperVar
/**
removes a listener threadsafe
**/
- inline void removeListener(
+ void removeListener(
const keyType &key,
const css::uno::Reference < css::uno::XInterface > & r )
{
@@ -486,7 +486,7 @@ struct SAL_WARN_UNUSED OBroadcastHelperVar
was not created, null was returned. This can be used to optimize
performance ( construction of an event object can be avoided ).
***/
- inline OInterfaceContainerHelper * SAL_CALL getContainer( const keyType &key ) const
+ OInterfaceContainerHelper * SAL_CALL getContainer( const keyType &key ) const
{ return aLC.getContainer( key ); }
};
@@ -512,13 +512,13 @@ class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelper
{
public:
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
/**
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index b1f2a5082b0b..31a91b425112 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -47,13 +47,13 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC IPropertyArrayHelper
{
public:
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
/**
@@ -223,13 +223,13 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt
{
public:
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
/**
diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx
index e90ea3c00236..912f90865e04 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.hxx
@@ -41,17 +41,17 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OTypeCollection
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
/// @endcond
- inline OTypeCollection( const OTypeCollection & rCollection )
+ OTypeCollection( const OTypeCollection & rCollection )
: _aTypes( rCollection._aTypes )
{}
OTypeCollection(
@@ -177,13 +177,13 @@ public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
~OImplementationId();
@@ -194,7 +194,7 @@ public:
@param bUseEthernetAddress whether an ethernet mac address should be taken into account
*/
- inline OImplementationId( bool bUseEthernetAddress = true )
+ OImplementationId( bool bUseEthernetAddress = true )
: _pSeq( NULL )
, _bUseEthernetAddress( bUseEthernetAddress )
{}
@@ -202,11 +202,11 @@ public:
@param rSeq implementation id
*/
- inline OImplementationId( const css::uno::Sequence< sal_Int8 > & rSeq )
+ OImplementationId( const css::uno::Sequence< sal_Int8 > & rSeq )
: _pSeq( new css::uno::Sequence< sal_Int8 >( rSeq ) )
, _bUseEthernetAddress( false )
{}
- inline OImplementationId( const OImplementationId & rId )
+ OImplementationId( const OImplementationId & rId )
: _pSeq( new css::uno::Sequence< sal_Int8 >( rId.getImplementationId() ) )
, _bUseEthernetAddress( false )
{}
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index 0bc22a49e005..cddd79590592 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -81,13 +81,13 @@ protected:
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
/// @endcond
@@ -99,7 +99,7 @@ public:
#else
/** Default Constructor. Sets the reference count to zero.
*/
- inline OWeakObject()
+ OWeakObject()
: m_refCount( 0 )
, m_pWeakConnectionPoint( NULL )
, m_pReserved(NULL)
@@ -109,7 +109,7 @@ public:
@param rObj dummy param
*/
- inline OWeakObject( const OWeakObject & rObj )
+ OWeakObject( const OWeakObject & rObj )
: css::uno::XWeak()
, m_refCount( 0 )
, m_pWeakConnectionPoint( NULL )
@@ -121,7 +121,7 @@ public:
@return this OWeakObject
*/
- inline OWeakObject & SAL_CALL operator = ( const OWeakObject &)
+ OWeakObject & SAL_CALL operator = ( const OWeakObject &)
{ return *this; }
/** Basic queryInterface() implementation supporting com::sun::star::uno::XWeak and
@@ -151,7 +151,7 @@ public:
@return XInterface reference
*/
- inline SAL_CALL operator css::uno::Reference< css::uno::XInterface > ()
+ SAL_CALL operator css::uno::Reference< css::uno::XInterface > ()
{ return this; }
};
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index b633c44ce26d..03754f3ec06f 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.hxx
@@ -45,7 +45,7 @@ class CPPUHELPER_DLLPUBLIC OWeakAggObject
public:
/** Constructor. No delegator set.
*/
- inline OWeakAggObject()
+ OWeakAggObject()
{}
/** If a delegator is set, then the delegators gets acquired. Otherwise call is delegated to
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index d57cd2b43d12..1afdd864f136 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.hxx
@@ -53,7 +53,7 @@ class CPPUHELPER_DLLPUBLIC WeakReferenceHelper
public:
/** Default ctor. Creates an empty weak reference.
*/
- inline WeakReferenceHelper()
+ WeakReferenceHelper()
: m_pImpl( NULL )
{}
@@ -103,7 +103,7 @@ public:
@param rObj another weak ref
@return true, if both weak refs reference to the same object.
*/
- inline bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const
+ bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const
{ return (get() == rObj.get()); }
/** Gets a hard reference to the object.
@@ -116,7 +116,7 @@ public:
@return hard reference or null, if the weakly referenced interface has gone
*/
- inline SAL_CALL operator Reference< XInterface > () const
+ SAL_CALL operator Reference< XInterface > () const
{ return get(); }
/** Releases this reference.
@@ -148,7 +148,7 @@ class SAL_WARN_UNUSED WeakReference : public WeakReferenceHelper
public:
/** Default ctor. Creates an empty weak reference.
*/
- inline WeakReference()
+ WeakReference()
: WeakReferenceHelper()
{}
@@ -156,7 +156,7 @@ public:
@param rRef another hard ref
*/
- inline WeakReference( const Reference< interface_type > & rRef )
+ WeakReference( const Reference< interface_type > & rRef )
: WeakReferenceHelper( rRef )
{}
@@ -176,7 +176,7 @@ public:
@return hard reference or null, if the weakly referenced interface has gone
*/
- inline SAL_CALL operator Reference< interface_type > () const
+ SAL_CALL operator Reference< interface_type > () const
{ return Reference< interface_type >::query( get() ); }
};
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index 6e56e67cee43..df50c19a15f2 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -72,7 +72,7 @@ namespace dbaui
virtual void StateChanged( StateChangedType nStateChange ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
- inline IController& getCommandController() const { return *m_xController.get(); }
+ IController& getCommandController() const { return *m_xController.get(); }
const css::uno::Reference< css::uno::XComponentContext >& getORB() { return m_xContext;}
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index e2e389c8d9a6..2a0514d85b6c 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -180,7 +180,7 @@ namespace dbaui
struct CompareFeatureById : ::std::binary_function< SupportedFeatures::value_type, sal_Int32, bool >
{
- inline bool operator()( const SupportedFeatures::value_type& _aType, sal_Int32 _nId ) const
+ bool operator()( const SupportedFeatures::value_type& _aType, sal_Int32 _nId ) const
{
return !!( _nId == _aType.second.nFeatureId );
}
@@ -202,7 +202,7 @@ namespace dbaui
struct FindFeatureListener : ::std::binary_function< FeatureListener, css::uno::Reference< css::frame::XStatusListener >, bool >
{
- inline bool operator()( const FeatureListener& lhs, const css::uno::Reference< css::frame::XStatusListener >& rhs ) const
+ bool operator()( const FeatureListener& lhs, const css::uno::Reference< css::frame::XStatusListener >& rhs ) const
{
return !!( lhs.xListener == rhs );
}
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index 2af8a546c4b5..04a04ff36ee3 100644
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@@ -71,18 +71,18 @@ public:
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
- inline void SetOneWord( const SvxAdjust eType )
+ void SetOneWord( const SvxAdjust eType )
{
bOneBlock = eType == SVX_ADJUST_BLOCK;
}
- inline void SetLastBlock( const SvxAdjust eType )
+ void SetLastBlock( const SvxAdjust eType )
{
bLastBlock = eType == SVX_ADJUST_BLOCK;
bLastCenter = eType == SVX_ADJUST_CENTER;
}
- inline void SetAdjust( const SvxAdjust eType )
+ void SetAdjust( const SvxAdjust eType )
{
bLeft = eType == SVX_ADJUST_LEFT;
bRight = eType == SVX_ADJUST_RIGHT;
@@ -90,7 +90,7 @@ public:
bBlock = eType == SVX_ADJUST_BLOCK;
}
- inline SvxAdjust GetLastBlock() const
+ SvxAdjust GetLastBlock() const
{
SvxAdjust eRet = SVX_ADJUST_LEFT;
@@ -101,7 +101,7 @@ public:
return eRet;
}
- inline SvxAdjust GetOneWord() const
+ SvxAdjust GetOneWord() const
{
SvxAdjust eRet = SVX_ADJUST_LEFT;
@@ -110,7 +110,7 @@ public:
return eRet;
}
- inline SvxAdjust GetAdjust() const
+ SvxAdjust GetAdjust() const
{
SvxAdjust eRet = SVX_ADJUST_LEFT;
diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx
index 5704b35c845d..06b47f657190 100644
--- a/include/editeng/autokernitem.hxx
+++ b/include/editeng/autokernitem.hxx
@@ -49,7 +49,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern)
+ SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern)
{
SetValue( rAutoKern.GetValue() );
return *this;
diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx
index 4cdd649e934e..fe034a02f5b5 100644
--- a/include/editeng/blinkitem.hxx
+++ b/include/editeng/blinkitem.hxx
@@ -48,7 +48,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) {
+ SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) {
SetValue(rBlink.GetValue());
return *this;
}
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index a63d4a19dfe3..984bd389d7e4 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -212,10 +212,10 @@ public:
bool IsTable() const { return mbEnableHor && mbEnableVer; }
void SetTable( bool bNew ) { mbEnableHor = mbEnableVer = bNew; }
- inline bool IsHorEnabled() const { return mbEnableHor; }
- inline void EnableHor( bool bEnable ) { mbEnableHor = bEnable; }
- inline bool IsVerEnabled() const { return mbEnableVer; }
- inline void EnableVer( bool bEnable ) { mbEnableVer = bEnable; }
+ bool IsHorEnabled() const { return mbEnableHor; }
+ void EnableHor( bool bEnable ) { mbEnableHor = bEnable; }
+ bool IsVerEnabled() const { return mbEnableVer; }
+ void EnableVer( bool bEnable ) { mbEnableVer = bEnable; }
bool IsDist() const { return bDist; }
void SetDist( bool bNew ) { bDist = bNew; }
diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx
index daa1faaba68a..7f53bcbe0c1f 100644
--- a/include/editeng/charhiddenitem.hxx
+++ b/include/editeng/charhiddenitem.hxx
@@ -40,7 +40,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) {
+ SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) {
SetValue(rHidden.GetValue());
return *this;
}
diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx
index c87aa57e2f14..6da13c4ee9bd 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -56,7 +56,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem )
+ SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index 2ab87f22aaa5..95e86c3a01aa 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -57,7 +57,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem )
+ SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem )
{
SetValue( rItem.GetValue() );
SetFitToLine( rItem.IsFitToLine() );
diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx
index 32761e429a69..3c0539031b2a 100644
--- a/include/editeng/charscaleitem.hxx
+++ b/include/editeng/charscaleitem.hxx
@@ -54,7 +54,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem )
+ SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
index 82dc4a6de32b..7223c2b9a944 100644
--- a/include/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
@@ -48,9 +48,9 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
- inline rtl_TextEncoding GetCharSet() const { return eFrom; }
+ rtl_TextEncoding GetCharSet() const { return eFrom; }
- inline SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor)
+ SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor)
{
SetValue( rColor.GetValue() );
eFrom = rColor.GetCharSet();
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index d1a38a051dee..4977b11694a0 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -52,7 +52,7 @@ public:
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
virtual sal_uInt16 GetValueCount() const override;
- inline SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap)
+ SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap)
{
SetValue( rMap.GetValue() );
return *this;
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index d68282de5146..55bf50a8f4d1 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -57,7 +57,7 @@ public:
virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override;
virtual SvStream& Store(SvStream& rStream, sal_uInt16 nVersion) const override;
- inline SvxColorItem& operator=(const SvxColorItem& rColor)
+ SvxColorItem& operator=(const SvxColorItem& rColor)
{
SetValue(rColor.GetValue());
return *this;
diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx
index 13f4083d3afb..c7865967373a 100644
--- a/include/editeng/contouritem.hxx
+++ b/include/editeng/contouritem.hxx
@@ -46,7 +46,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxContourItem& operator=(const SvxContourItem& rCont)
+ SvxContourItem& operator=(const SvxContourItem& rCont)
{
SetValue(rCont.GetValue());
return *this;
diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index 6bf4d4250ffe..b09654d946e2 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -59,7 +59,7 @@ public:
virtual bool GetBoolValue() const override;
virtual void SetBoolValue( bool bVal ) override;
- inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross)
+ SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross)
{
SetValue( rCross.GetValue() );
return *this;
diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx
index 0f5942162a11..fe9d92a915e9 100644
--- a/include/editeng/emphasismarkitem.hxx
+++ b/include/editeng/emphasismarkitem.hxx
@@ -55,7 +55,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
+ SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx
index 427950d41062..1e8585a0f116 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -65,7 +65,7 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
- inline void SetEscapement( const SvxEscapement eNew )
+ void SetEscapement( const SvxEscapement eNew )
{
if( SvxEscapement::Off == eNew )
{
@@ -84,15 +84,15 @@ public:
nProp = DFLT_ESC_PROP;
}
}
- inline SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); }
+ SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); }
- inline short &GetEsc() { return nEsc; }
- inline short GetEsc() const { return nEsc; }
+ short &GetEsc() { return nEsc; }
+ short GetEsc() const { return nEsc; }
- inline sal_uInt8 &GetProportionalHeight() { return nProp; }
- inline sal_uInt8 GetProportionalHeight() const { return nProp; }
+ sal_uInt8 &GetProportionalHeight() { return nProp; }
+ sal_uInt8 GetProportionalHeight() const { return nProp; }
- inline SvxEscapementItem& operator=(const SvxEscapementItem& rEsc)
+ SvxEscapementItem& operator=(const SvxEscapementItem& rEsc)
{
nEsc = rEsc.GetEsc();
nProp = rEsc.GetProportionalHeight();
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index 552f7807b13a..ac021bcca0b3 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -64,7 +64,7 @@ public:
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
- inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize)
+ SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize)
{
DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
nHeight = rSize.nHeight;
diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx
index 2d7f2f42184e..47233b7a3c26 100644
--- a/include/editeng/forbiddenruleitem.hxx
+++ b/include/editeng/forbiddenruleitem.hxx
@@ -45,7 +45,7 @@ public:
OUString &rText,
const IntlWrapper * = nullptr ) const override;
- inline SvxForbiddenRuleItem& operator=(
+ SvxForbiddenRuleItem& operator=(
const SvxForbiddenRuleItem& rItem )
{
SetValue( rItem.GetValue() );
diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index 7cc444c42d10..c1b6b36134fb 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -54,7 +54,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem )
+ SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx
index a79de4b2b495..00e146913360 100644
--- a/include/editeng/fwdtitem.hxx
+++ b/include/editeng/fwdtitem.hxx
@@ -55,7 +55,7 @@ public:
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
- inline SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem )
+ SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem )
{
SetWidthValue( rItem.GetWidth() );
SetProp( rItem.GetProp() );
diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx
index b68c2881bdec..ebb6ab406171 100644
--- a/include/editeng/hngpnctitem.hxx
+++ b/include/editeng/hngpnctitem.hxx
@@ -44,7 +44,7 @@ public:
OUString &rText,
const IntlWrapper * = nullptr ) const override;
- inline SvxHangingPunctuationItem& operator=(
+ SvxHangingPunctuationItem& operator=(
const SvxHangingPunctuationItem& rItem )
{
SetValue( rItem.GetValue() );
diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index b37c2544cb99..3a46267d754d 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -60,22 +60,22 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
- inline void SetHyphen( const bool bNew ) { bHyphen = bNew; }
- inline bool IsHyphen() const { return bHyphen; }
+ void SetHyphen( const bool bNew ) { bHyphen = bNew; }
+ bool IsHyphen() const { return bHyphen; }
- inline void SetPageEnd( const bool bNew ) { bPageEnd = bNew; }
- inline bool IsPageEnd() const { return bPageEnd; }
+ void SetPageEnd( const bool bNew ) { bPageEnd = bNew; }
+ bool IsPageEnd() const { return bPageEnd; }
- inline sal_uInt8 &GetMinLead() { return nMinLead; }
- inline sal_uInt8 GetMinLead() const { return nMinLead; }
+ sal_uInt8 &GetMinLead() { return nMinLead; }
+ sal_uInt8 GetMinLead() const { return nMinLead; }
- inline sal_uInt8 &GetMinTrail() { return nMinTrail; }
- inline sal_uInt8 GetMinTrail() const { return nMinTrail; }
+ sal_uInt8 &GetMinTrail() { return nMinTrail; }
+ sal_uInt8 GetMinTrail() const { return nMinTrail; }
- inline sal_uInt8 &GetMaxHyphens() { return nMaxHyphens; }
- inline sal_uInt8 GetMaxHyphens() const { return nMaxHyphens; }
+ sal_uInt8 &GetMaxHyphens() { return nMaxHyphens; }
+ sal_uInt8 GetMaxHyphens() const { return nMaxHyphens; }
- inline SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew )
+ SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew )
{
bHyphen = rNew.IsHyphen();
bPageEnd = rNew.IsPageEnd();
diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index e246bb5b73ba..1a384c2b76b6 100644
--- a/include/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
@@ -49,7 +49,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
- inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify)
+ SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify)
{
SetValue( rHorJustify.GetValue() );
return *this;
@@ -81,7 +81,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
- inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify)
+ SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify)
{
SetValue( rVerJustify.GetValue() );
return *this;
diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx
index a32657cdc15c..d5eca73b3104 100644
--- a/include/editeng/kernitem.hxx
+++ b/include/editeng/kernitem.hxx
@@ -53,7 +53,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxKerningItem& operator=(const SvxKerningItem& rKern) {
+ SvxKerningItem& operator=(const SvxKerningItem& rKern) {
SetValue( rKern.GetValue() );
return *this;
}
diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx
index a3a1823ecba0..e2ae3e8b8186 100644
--- a/include/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
@@ -51,7 +51,7 @@ public:
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual sal_uInt16 GetValueCount() const override;
- inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang)
+ SvxLanguageItem& operator=(const SvxLanguageItem& rLang)
{
SetValue( rLang.GetValue() );
return *this;
diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx
index 856f2d8eb70e..28a9e09336e1 100644
--- a/include/editeng/lcolitem.hxx
+++ b/include/editeng/lcolitem.hxx
@@ -41,7 +41,7 @@ public:
const IntlWrapper * pIntlWrapper = nullptr )
const override;
- inline SvxLineColorItem& operator=(const SvxLineColorItem& rColor)
+ SvxLineColorItem& operator=(const SvxLineColorItem& rColor)
{ return static_cast(SvxColorItem::
operator=(static_cast(rColor))); }
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 084fcb263f2e..eea64a7d0ec3 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -95,31 +95,31 @@ public:
inline void SetRight( const long nR, const sal_uInt16 nProp = 100 );
// Query/direct setting of the absolute values
- inline long GetLeft() const { return nLeftMargin; }
- inline long GetRight() const { return nRightMargin;}
- inline void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; }
- inline void SetRightValue( const long nR ) { nRightMargin = nR; }
- inline bool IsAutoFirst() const { return bAutoFirst; }
- inline void SetAutoFirst( const bool bNew ) { bAutoFirst = bNew; }
+ long GetLeft() const { return nLeftMargin; }
+ long GetRight() const { return nRightMargin;}
+ void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; }
+ void SetRightValue( const long nR ) { nRightMargin = nR; }
+ bool IsAutoFirst() const { return bAutoFirst; }
+ void SetAutoFirst( const bool bNew ) { bAutoFirst = bNew; }
- inline bool IsExplicitZeroMarginValRight() const { return bExplicitZeroMarginValRight; }
- inline bool IsExplicitZeroMarginValLeft() const { return bExplicitZeroMarginValLeft; }
- inline void SetExplicitZeroMarginValRight( const bool eR ) { bExplicitZeroMarginValRight = eR; }
- inline void SetExplicitZeroMarginValLeft( const bool eL ) { bExplicitZeroMarginValLeft = eL; }
- inline sal_uInt16 GetPropLeft() const { return nPropLeftMargin; }
- inline sal_uInt16 GetPropRight() const { return nPropRightMargin;}
+ bool IsExplicitZeroMarginValRight() const { return bExplicitZeroMarginValRight; }
+ bool IsExplicitZeroMarginValLeft() const { return bExplicitZeroMarginValLeft; }
+ void SetExplicitZeroMarginValRight( const bool eR ) { bExplicitZeroMarginValRight = eR; }
+ void SetExplicitZeroMarginValLeft( const bool eL ) { bExplicitZeroMarginValLeft = eL; }
+ sal_uInt16 GetPropLeft() const { return nPropLeftMargin; }
+ sal_uInt16 GetPropRight() const { return nPropRightMargin;}
// The UI/text interface:
inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 );
- inline long GetTextLeft() const { return nTxtLeft; }
+ long GetTextLeft() const { return nTxtLeft; }
inline void SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
- inline short GetTextFirstLineOfst() const { return nFirstLineOfst; }
- inline void SetPropTextFirstLineOfst( const sal_uInt16 nProp )
+ short GetTextFirstLineOfst() const { return nFirstLineOfst; }
+ void SetPropTextFirstLineOfst( const sal_uInt16 nProp )
{ nPropFirstLineOfst = nProp; }
- inline sal_uInt16 GetPropTextFirstLineOfst() const
+ sal_uInt16 GetPropTextFirstLineOfst() const
{ return nPropFirstLineOfst; }
- inline void SetTextFirstLineOfstValue( const short nValue )
+ void SetTextFirstLineOfstValue( const short nValue )
{ nFirstLineOfst = nValue; }
void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index 75d600afeb30..2c5c6ffcc33c 100644
--- a/include/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
@@ -65,16 +65,16 @@ public:
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
// Methods to query and edit. InterlineSpace is added to the height.
- inline short GetInterLineSpace() const { return nInterLineSpace; }
- inline void SetInterLineSpace( const short nSpace )
+ short GetInterLineSpace() const { return nInterLineSpace; }
+ void SetInterLineSpace( const short nSpace )
{
nInterLineSpace = nSpace;
eInterLineSpaceRule = SvxInterLineSpaceRule::Fix;
}
// Determines the absolute or minimum row height.
- inline sal_uInt16 GetLineHeight() const { return nLineHeight; }
- inline void SetLineHeight( const sal_uInt16 nHeight )
+ sal_uInt16 GetLineHeight() const { return nLineHeight; }
+ void SetLineHeight( const sal_uInt16 nHeight )
{
nLineHeight = nHeight;
eLineSpaceRule = SvxLineSpaceRule::Min;
@@ -82,17 +82,17 @@ public:
// To increase or decrease the row height.
sal_uInt16 GetPropLineSpace() const { return nPropLineSpace; }
- inline void SetPropLineSpace( const sal_uInt8 nProp )
+ void SetPropLineSpace( const sal_uInt8 nProp )
{
nPropLineSpace = nProp;
eInterLineSpaceRule = SvxInterLineSpaceRule::Prop;
}
- inline void SetLineSpaceRule(SvxLineSpaceRule e) { eLineSpaceRule = e; }
- inline SvxLineSpaceRule GetLineSpaceRule() const { return eLineSpaceRule; }
+ void SetLineSpaceRule(SvxLineSpaceRule e) { eLineSpaceRule = e; }
+ SvxLineSpaceRule GetLineSpaceRule() const { return eLineSpaceRule; }
- inline void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; }
- inline SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; }
+ void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; }
+ SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; }
virtual sal_uInt16 GetValueCount() const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx
index 3c5109b43c06..fe7a33678c49 100644
--- a/include/editeng/nhypitem.hxx
+++ b/include/editeng/nhypitem.hxx
@@ -39,7 +39,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH)
+ SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH)
{
SetValue( rNHH.GetValue() );
return *this;
diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx
index fda14d94c15d..fb6a836ab318 100644
--- a/include/editeng/nlbkitem.hxx
+++ b/include/editeng/nlbkitem.hxx
@@ -39,7 +39,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB)
+ SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB)
{
SetValue( rLB.GetValue() );
return *this;
diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx
index 4e6f7d95c679..b5faa4829842 100644
--- a/include/editeng/optitems.hxx
+++ b/include/editeng/optitems.hxx
@@ -79,13 +79,13 @@ public:
virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const override;
virtual SvStream& Store( SvStream& rStrm, sal_uInt16 ) const override;
- inline sal_uInt8 &GetMinLead() { return nMinLead; }
- inline sal_uInt8 GetMinLead() const { return nMinLead; }
+ sal_uInt8 &GetMinLead() { return nMinLead; }
+ sal_uInt8 GetMinLead() const { return nMinLead; }
- inline sal_uInt8 &GetMinTrail() { return nMinTrail; }
- inline sal_uInt8 GetMinTrail() const { return nMinTrail; }
+ sal_uInt8 &GetMinTrail() { return nMinTrail; }
+ sal_uInt8 GetMinTrail() const { return nMinTrail; }
- inline SfxHyphenRegionItem& operator=( const SfxHyphenRegionItem& rNew )
+ SfxHyphenRegionItem& operator=( const SfxHyphenRegionItem& rNew )
{
nMinLead = rNew.GetMinLead();
nMinTrail = rNew.GetMinTrail();
diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx
index f0bb668f86ea..8998056f02d1 100644
--- a/include/editeng/orphitem.hxx
+++ b/include/editeng/orphitem.hxx
@@ -48,7 +48,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans )
+ SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans )
{
SetValue( rOrphans.GetValue() );
return *this;
diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx
index 26926b3456ef..19aac0e99766 100644
--- a/include/editeng/paravertalignitem.hxx
+++ b/include/editeng/paravertalignitem.hxx
@@ -57,7 +57,7 @@ public:
Align GetValue() const { return (Align) SfxUInt16Item::GetValue(); }
void SetValue(Align n) { SfxUInt16Item::SetValue((sal_uInt16)n); }
- inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem )
+ SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 674f5ba8b747..a558fbd5c7a1 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -59,7 +59,7 @@ public:
virtual bool GetBoolValue() const override;
virtual void SetBoolValue( bool bVal ) override;
- inline SvxPostureItem& operator=(const SvxPostureItem& rPost) {
+ SvxPostureItem& operator=(const SvxPostureItem& rPost) {
SetValue( rPost.GetValue() );
return *this;
}
diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx
index a786e2976ebd..20cb729505e1 100644
--- a/include/editeng/prszitem.hxx
+++ b/include/editeng/prszitem.hxx
@@ -45,7 +45,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize)
+ SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize)
{
SetValue( rPropSize.GetValue() );
return *this;
diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx
index 788ed50657cc..3dc6e7473cc3 100644
--- a/include/editeng/scriptspaceitem.hxx
+++ b/include/editeng/scriptspaceitem.hxx
@@ -46,7 +46,7 @@ public:
OUString &rText,
const IntlWrapper * = nullptr ) const override;
- inline SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem )
+ SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx
index 82221b6b0845..2c8e21f806ab 100644
--- a/include/editeng/shdditem.hxx
+++ b/include/editeng/shdditem.hxx
@@ -49,7 +49,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) {
+ SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) {
SetValue(rShadow.GetValue());
return *this;
}
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 1dd09472efd4..5d40fcbf3e0e 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -91,11 +91,11 @@ public:
static void ShowLanguageErrors();
void SpellDocument(); // Perform Spell Checking
- inline bool IsStartDone(){ return bStartDone; }
- inline bool IsEndDone(){ return bEndDone; }
- inline bool IsHyphen(){ return bHyphen; } // Split instead of Spell check
- inline void SetHyphen() { bHyphen = true; }
- inline bool IsAllRight() { return bAllRight; }
+ bool IsStartDone(){ return bStartDone; }
+ bool IsEndDone(){ return bEndDone; }
+ bool IsHyphen(){ return bHyphen; } // Split instead of Spell check
+ void SetHyphen() { bHyphen = true; }
+ bool IsAllRight() { return bAllRight; }
protected:
const css::uno::Reference< css::uno::XInterface >&
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 23b85d41f0b5..17957ff561d0 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -323,7 +323,7 @@ public:
// Query/Set the current settings of AutoCorrect
long GetFlags() const { return nFlags; }
- inline SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;}
+ SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;}
bool IsAutoCorrFlag( long nFlag ) const
{ return (nFlags & nFlag) != 0; }
void SetAutoCorrFlag( long nFlag, bool bOn = true );
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 869c4ef4c755..80dcf3744a23 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -49,26 +49,26 @@ public:
SvxFont( const SvxFont &rFont );
// Methods for Superscript/Subscript
- inline short GetEscapement() const { return nEsc; }
- inline void SetEscapement( const short nNewEsc ) { nEsc = nNewEsc; }
+ short GetEscapement() const { return nEsc; }
+ void SetEscapement( const short nNewEsc ) { nEsc = nNewEsc; }
- inline sal_uInt8 GetPropr() const { return nPropr; }
- inline void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; }
- inline void SetProprRel( const sal_uInt8 nNewPropr )
+ sal_uInt8 GetPropr() const { return nPropr; }
+ void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; }
+ void SetProprRel( const sal_uInt8 nNewPropr )
{ SetPropr( (sal_uInt8)( (long)nNewPropr * (long)nPropr / 100L ) ); }
// Kerning
- inline short GetFixKerning() const { return nKern; }
- inline void SetFixKerning( const short nNewKern ) { nKern = nNewKern; }
+ short GetFixKerning() const { return nKern; }
+ void SetFixKerning( const short nNewKern ) { nKern = nNewKern; }
- inline SvxCaseMap GetCaseMap() const { return eCaseMap; }
- inline void SetCaseMap( const SvxCaseMap eNew ) { eCaseMap = eNew; }
+ SvxCaseMap GetCaseMap() const { return eCaseMap; }
+ void SetCaseMap( const SvxCaseMap eNew ) { eCaseMap = eNew; }
// Is-Methods:
- inline bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; }
- inline bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; }
- inline bool IsKern() const { return 0 != nKern; }
- inline bool IsEsc() const { return 0 != nEsc; }
+ bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; }
+ bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; }
+ bool IsKern() const { return 0 != nKern; }
+ bool IsEsc() const { return 0 != nEsc; }
// Consider Upper case, Lower case letters etc.
OUString CalcCaseMap(const OUString &rTxt) const;
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index d3df41f8766c..f0702c6f6965 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -61,7 +61,7 @@ public:
virtual bool operator==( const SfxPoolItem& ) const override;
- inline SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine)
+ SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine)
{
SetValue( rTextLine.GetValue() );
SetColor( rTextLine.GetColor() );
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index eaa11698e337..1dbd1e875cd3 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -59,7 +59,7 @@ public:
virtual bool GetBoolValue() const override;
virtual void SetBoolValue( bool bVal ) override;
- inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) {
+ SvxWeightItem& operator=(const SvxWeightItem& rWeight) {
SetValue( rWeight.GetValue() );
return *this;
}
diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx
index fbffc6cea9d1..1d5d9eabf3db 100644
--- a/include/editeng/widwitem.hxx
+++ b/include/editeng/widwitem.hxx
@@ -48,7 +48,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxWidowsItem& operator=( const SvxWidowsItem& rWidows )
+ SvxWidowsItem& operator=( const SvxWidowsItem& rWidows )
{
SetValue( rWidows.GetValue() );
return *this;
diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx
index d2195566da22..2459c2557cdb 100644
--- a/include/editeng/wrlmitem.hxx
+++ b/include/editeng/wrlmitem.hxx
@@ -50,7 +50,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
- inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM )
+ SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM )
{
SetValue( rWLM.GetValue() );
return *this;
diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx
index 7a8ff2938cf7..6e7ca4a415a6 100644
--- a/include/filter/msfilter/dffpropset.hxx
+++ b/include/filter/msfilter/dffpropset.hxx
@@ -55,7 +55,7 @@ class MSFILTER_DLLPUBLIC DffPropSet
explicit DffPropSet();
~DffPropSet();
- inline bool IsProperty( sal_uInt32 nRecType ) const { return ( mpPropSetEntries[ nRecType & 0x3ff ].aFlags.bSet ); };
+ bool IsProperty( sal_uInt32 nRecType ) const { return ( mpPropSetEntries[ nRecType & 0x3ff ].aFlags.bSet ); };
bool IsHardAttribute( sal_uInt32 nId ) const;
sal_uInt32 GetPropertyValue( sal_uInt32 nId, sal_uInt32 nDefault ) const;
/** Returns a boolean property by its real identifier. */
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 531cced1bba9..5a2f1d3bd676 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -963,9 +963,9 @@ public:
sal_uInt32 GetLastShapeId( sal_uInt32 nDrawingId ) const;
/** Sets the flag indicating that the DGGCONTAINER exists. */
- inline void SetDggContainer() { mbHasDggCont = true; }
+ void SetDggContainer() { mbHasDggCont = true; }
/** Sets the flag indicating that the DGGCONTAINER exists. */
- inline bool HasDggContainer() const { return mbHasDggCont; }
+ bool HasDggContainer() const { return mbHasDggCont; }
/** Returns the total size of the DGG atom (including header). */
sal_uInt32 GetDggAtomSize() const;
/** Writes the complete DGG atom to the passed stream (overwrites existing data!). */
@@ -981,7 +981,7 @@ public:
SvStream* QueryPictureStream();
/** Returns the picture stream if existing (queried), otherwise null. */
- inline SvStream* GetPictureStream() { return mpPicStrm; }
+ SvStream* GetPictureStream() { return mpPicStrm; }
private:
/** Derived classes may implement to create a new stream used to store the
@@ -999,7 +999,7 @@ private:
{
sal_uInt32 mnDrawingId; /// Identifier of drawing this cluster belongs to (one-based index into maDrawingInfos).
sal_uInt32 mnNextShapeId; /// Next free shape identifier in this cluster.
- inline explicit ClusterEntry( sal_uInt32 nDrawingId ) : mnDrawingId( nDrawingId ), mnNextShapeId( 0 ) {}
+ explicit ClusterEntry( sal_uInt32 nDrawingId ) : mnDrawingId( nDrawingId ), mnNextShapeId( 0 ) {}
};
typedef ::std::vector< ClusterEntry > ClusterTable;
@@ -1008,7 +1008,7 @@ private:
sal_uInt32 mnClusterId; /// Currently used cluster (one-based index into maClusterTable).
sal_uInt32 mnShapeCount; /// Current number of shapes in this drawing.
sal_uInt32 mnLastShapeId; /// Last shape identifier generated for this drawing.
- inline explicit DrawingInfo( sal_uInt32 nClusterId ) : mnClusterId( nClusterId ), mnShapeCount( 0 ), mnLastShapeId( 0 ) {}
+ explicit DrawingInfo( sal_uInt32 nClusterId ) : mnClusterId( nClusterId ), mnShapeCount( 0 ), mnLastShapeId( 0 ) {}
};
typedef ::std::vector< DrawingInfo > DrawingInfoVector;
@@ -1054,7 +1054,7 @@ public:
/** Creates and returns a new shape identifier, updates the internal shape
counters and registers the identifier in the DGG cluster table. */
- inline sal_uInt32 GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); }
+ sal_uInt32 GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); }
/** Returns the graphic provider from the global object that has been
passed to the constructor.
@@ -1064,7 +1064,7 @@ public:
/** Called if a picture shall be written and no picture stream is set at
class ImplEESdrWriter.
*/
- inline SvStream* QueryPictureStream() { return mxGlobal->QueryPictureStream(); }
+ SvStream* QueryPictureStream() { return mxGlobal->QueryPictureStream(); }
/// Inserts internal data into the EscherStream, this process
/// may and has to be executed only once
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 5ea99506b084..f7c993db0fc3 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -681,10 +681,10 @@ public:
const Rectangle& rClientRect,
const Rectangle& rGlobalChildRect );
- inline const SvxMSDffShapeInfos_ById* GetShapeInfos() const
+ const SvxMSDffShapeInfos_ById* GetShapeInfos() const
{ return m_xShapeInfosById.get(); }
- inline SvxMSDffShapeOrders* GetShapeOrders() const
+ SvxMSDffShapeOrders* GetShapeOrders() const
{ return m_pShapeOrders; }
void StoreShapeOrder(sal_uLong nId,
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 002ee4dfa50e..57136bf6366f 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -54,7 +54,7 @@ struct MSFILTER_DLLPUBLIC MacroResolvedInfo
OUString msResolvedMacro;
bool mbFound;
- inline explicit MacroResolvedInfo( SfxObjectShell* pDocContext = nullptr ) : mpDocContext( pDocContext ), mbFound( false ) {}
+ explicit MacroResolvedInfo( SfxObjectShell* pDocContext = nullptr ) : mpDocContext( pDocContext ), mbFound( false ) {}
};
MSFILTER_DLLPUBLIC OUString makeMacroURL( const OUString& sMacroName );
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index f9ab53a78352..3c65b94973f3 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -114,16 +114,16 @@ public:
void copyFrom( const OpCodeMap& r );
/// Get the symbol String -> OpCode hash map for finds.
- inline const OpCodeHashMap* getHashMap() const { return mpHashMap; }
+ const OpCodeHashMap* getHashMap() const { return mpHashMap; }
/// Get the symbol String -> AddIn String hash map for finds.
- inline const ExternalHashMap* getExternalHashMap() const { return mpExternalHashMap; }
+ const ExternalHashMap* getExternalHashMap() const { return mpExternalHashMap; }
/// Get the AddIn String -> symbol String hash map for finds.
- inline const ExternalHashMap* getReverseExternalHashMap() const { return mpReverseExternalHashMap; }
+ const ExternalHashMap* getReverseExternalHashMap() const { return mpReverseExternalHashMap; }
/// Get the symbol string matching an OpCode.
- inline const OUString& getSymbol( const OpCode eOp ) const
+ const OUString& getSymbol( const OpCode eOp ) const
{
DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range");
if (sal_uInt16(eOp) < mnSymbols)
@@ -133,31 +133,31 @@ public:
}
/// Get the first character of the symbol string matching an OpCode.
- inline sal_Unicode getSymbolChar( const OpCode eOp ) const { return getSymbol(eOp)[0]; };
+ sal_Unicode getSymbolChar( const OpCode eOp ) const { return getSymbol(eOp)[0]; };
/// Get the grammar.
- inline FormulaGrammar::Grammar getGrammar() const { return meGrammar; }
+ FormulaGrammar::Grammar getGrammar() const { return meGrammar; }
/// Get the symbol count.
- inline sal_uInt16 getSymbolCount() const { return mnSymbols; }
+ sal_uInt16 getSymbolCount() const { return mnSymbols; }
/** Are these English symbols, as opposed to native language (which may
be English as well)? */
- inline bool isEnglish() const { return mbEnglish; }
+ bool isEnglish() const { return mbEnglish; }
/// Is it an ODF 1.1 compatibility mapping?
- inline bool isPODF() const { return FormulaGrammar::isPODF( meGrammar); }
+ bool isPODF() const { return FormulaGrammar::isPODF( meGrammar); }
/* TODO: add isAPI() once a FormulaLanguage was added. */
/// Is it an ODFF / ODF 1.2 mapping?
- inline bool isODFF() const { return FormulaGrammar::isODFF( meGrammar); }
+ bool isODFF() const { return FormulaGrammar::isODFF( meGrammar); }
/// Is it an OOXML mapping?
- inline bool isOOXML() const { return FormulaGrammar::isOOXML( meGrammar); }
+ bool isOOXML() const { return FormulaGrammar::isOOXML( meGrammar); }
/// Does it have external symbol/name mappings?
- inline bool hasExternals() const { return !mpExternalHashMap->empty(); }
+ bool hasExternals() const { return !mpExternalHashMap->empty(); }
/// Put entry of symbol String and OpCode pair.
void putOpCode( const OUString & rStr, const OpCode eOp, const CharClass* pCharClass );
@@ -250,7 +250,7 @@ public:
/** Set symbol map corresponding to one of predefined formula::FormulaGrammar::Grammar,
including an address reference convention. */
- inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; }
+ FormulaGrammar::Grammar GetGrammar() const { return meGrammar; }
/** Whether current symbol set and grammar need transformation of Table
structured references to A1 style references when writing / exporting
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index b708244bf08c..9fce5d6e54d2 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -37,23 +37,23 @@ public:
virtual void SaveValues();
- inline sal_uInt16 GetMode() const { return nMode; }
- inline sal_Int32 GetFStart() const { return nFStart; }
- inline sal_uInt16 GetOffset() const { return nOffset; }
- inline sal_uInt16 GetEdFocus() const { return nEdFocus; }
- inline const OUString& GetUndoStr() const { return aUndoStr; }
- inline bool GetMatrixFlag()const{ return bMatrix;}
+ sal_uInt16 GetMode() const { return nMode; }
+ sal_Int32 GetFStart() const { return nFStart; }
+ sal_uInt16 GetOffset() const { return nOffset; }
+ sal_uInt16 GetEdFocus() const { return nEdFocus; }
+ const OUString& GetUndoStr() const { return aUndoStr; }
+ bool GetMatrixFlag()const{ return bMatrix;}
const VclPtr& GetFocusWindow()const { return xFocusWin; }
- inline const Selection& GetSelection()const { return aSelection;}
+ const Selection& GetSelection()const { return aSelection;}
- inline void SetMode( sal_uInt16 nNew ) { nMode = nNew; }
- inline void SetFStart( sal_Int32 nNew ) { nFStart = nNew; }
- inline void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; }
- inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; }
- inline void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; }
- inline void SetMatrixFlag(bool bNew) { bMatrix=bNew;}
- inline void SetFocusWindow(const VclPtr& rWin) { xFocusWin=rWin;}
- inline void SetSelection(const Selection& aSel) { aSelection=aSel;}
+ void SetMode( sal_uInt16 nNew ) { nMode = nNew; }
+ void SetFStart( sal_Int32 nNew ) { nFStart = nNew; }
+ void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; }
+ void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; }
+ void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; }
+ void SetMatrixFlag(bool bNew) { bMatrix=bNew;}
+ void SetFocusWindow(const VclPtr& rWin) { xFocusWin=rWin;}
+ void SetSelection(const Selection& aSel) { aSelection=aSel;}
protected:
void Reset();
FormEditData( const FormEditData& );
diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx
index 58371f1e786e..753ef8e8178e 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -48,7 +48,7 @@ namespace formula
public:
FormulaHelper(const IFunctionManager* _pFunctionManager);
- inline const CharClass* GetCharClass() const { return m_pCharClass; }
+ const CharClass* GetCharClass() const { return m_pCharClass; }
bool GetNextFunc( const OUString& rFormula,
bool bBack,
diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx
index 2bd6585a017d..5d7933dee24a 100644
--- a/include/formula/grammar.hxx
+++ b/include/formula/grammar.hxx
@@ -161,7 +161,7 @@ public:
};
/// If English parsing/formatting is associated with a grammar.
- static inline bool isEnglish( const Grammar eGrammar )
+ static bool isEnglish( const Grammar eGrammar )
{
return (eGrammar & kEnglishBit) != 0;
}
@@ -172,12 +172,12 @@ public:
static bool isSupported( const Grammar eGrammar );
- static inline sal_Int32 extractFormulaLanguage( const Grammar eGrammar )
+ static sal_Int32 extractFormulaLanguage( const Grammar eGrammar )
{
return eGrammar & kFlagMask;
}
- static inline AddressConvention extractRefConvention( const Grammar eGrammar )
+ static AddressConvention extractRefConvention( const Grammar eGrammar )
{
return static_cast(
((eGrammar & ~kEnglishBit) >> kConventionShift) -
@@ -189,28 +189,28 @@ public:
static Grammar mergeToGrammar( const Grammar eGrammar, const AddressConvention eConv );
/// If grammar is of ODF 1.1
- static inline bool isPODF( const Grammar eGrammar )
+ static bool isPODF( const Grammar eGrammar )
{
return extractFormulaLanguage( eGrammar) ==
css::sheet::FormulaLanguage::ODF_11;
}
/// If grammar is of ODFF
- static inline bool isODFF( const Grammar eGrammar )
+ static bool isODFF( const Grammar eGrammar )
{
return extractFormulaLanguage( eGrammar) ==
css::sheet::FormulaLanguage::ODFF;
}
/// If grammar is of OOXML
- static inline bool isOOXML( const Grammar eGrammar )
+ static bool isOOXML( const Grammar eGrammar )
{
return extractFormulaLanguage( eGrammar) ==
css::sheet::FormulaLanguage::OOXML;
}
/// If grammar has an Excel syntax, determined by address convention.
- static inline bool isExcelSyntax( const Grammar eGrammar )
+ static bool isExcelSyntax( const Grammar eGrammar )
{
AddressConvention eConv = extractRefConvention( eGrammar );
switch (eConv)
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 9ba7728c09fa..e6e5bc459b51 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -103,9 +103,9 @@ public:
virtual ~FormulaToken();
- inline void Delete() { delete this; }
- inline void DeleteIfZeroRef() { if (mnRefCnt == 0) delete this; }
- inline StackVar GetType() const { return eType; }
+ void Delete() { delete this; }
+ void DeleteIfZeroRef() { if (mnRefCnt == 0) delete this; }
+ StackVar GetType() const { return eType; }
bool IsFunction() const; // pure functions, no operators
bool IsExternalRef() const;
@@ -113,19 +113,19 @@ public:
sal_uInt8 GetParamCount() const;
- inline void IncRef() const
+ void IncRef() const
{
osl_atomic_increment(&mnRefCnt);
}
- inline void DecRef() const
+ void DecRef() const
{
if (!osl_atomic_decrement(&mnRefCnt))
const_cast(this)->Delete();
}
- inline oslInterlockedCount GetRef() const { return mnRefCnt; }
- inline OpCode GetOpCode() const { return eOp; }
+ oslInterlockedCount GetRef() const { return mnRefCnt; }
+ OpCode GetOpCode() const { return eOp; }
/**
Dummy methods to avoid switches and casts where possible,
@@ -190,7 +190,7 @@ public:
/** This is dirty and only the compiler should use it! */
struct PrivateAccess { friend class FormulaCompiler; private: PrivateAccess() { } };
- inline void NewOpCode( OpCode e, const PrivateAccess& ) { eOp = e; }
+ void NewOpCode( OpCode e, const PrivateAccess& ) { eOp = e; }
};
inline void intrusive_ptr_add_ref(const FormulaToken* p)
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 65b12a940fd4..39e326b63ade 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -80,10 +80,10 @@ public:
FORMULA_MISSING_CONVENTION_OOXML
};
explicit MissingConvention( Convention eConvention ) : meConvention(eConvention) {}
- inline bool isPODF() const { return meConvention == FORMULA_MISSING_CONVENTION_PODF; }
- inline bool isODFF() const { return meConvention == FORMULA_MISSING_CONVENTION_ODFF; }
- inline bool isOOXML() const { return meConvention == FORMULA_MISSING_CONVENTION_OOXML; }
- inline Convention getConvention() const { return meConvention; }
+ bool isPODF() const { return meConvention == FORMULA_MISSING_CONVENTION_PODF; }
+ bool isODFF() const { return meConvention == FORMULA_MISSING_CONVENTION_ODFF; }
+ bool isOOXML() const { return meConvention == FORMULA_MISSING_CONVENTION_OOXML; }
+ Convention getConvention() const { return meConvention; }
private:
Convention meConvention;
};
@@ -172,14 +172,14 @@ protected:
*/
sal_uInt16 RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount );
- inline void SetCombinedBitsRecalcMode( ScRecalcMode nBits )
+ void SetCombinedBitsRecalcMode( ScRecalcMode nBits )
{ nMode |= (nBits & ~ScRecalcMode::EMask); }
- inline ScRecalcMode GetCombinedBitsRecalcMode() const
+ ScRecalcMode GetCombinedBitsRecalcMode() const
{ return nMode & ~ScRecalcMode::EMask; }
/** Exclusive bits already set in nMode are
zero'ed, nBits may contain combined bits, but
only one exclusive bit may be set! */
- inline void SetMaskedRecalcMode( ScRecalcMode nBits )
+ void SetMaskedRecalcMode( ScRecalcMode nBits )
{ nMode = GetCombinedBitsRecalcMode() | nBits; }
public:
@@ -249,36 +249,36 @@ public:
void SetHyperLink( bool bVal ) { bHyperLink = bVal; }
bool IsHyperLink() const { return bHyperLink; }
- inline ScRecalcMode GetRecalcMode() const { return nMode; }
+ ScRecalcMode GetRecalcMode() const { return nMode; }
/** Bits aren't set directly but validated and
maybe handled according to priority if more
than one exclusive bit was set. */
void AddRecalcMode( ScRecalcMode nBits );
- inline void ClearRecalcMode() { nMode = ScRecalcMode::NORMAL; }
- inline void SetExclusiveRecalcModeNormal()
+ void ClearRecalcMode() { nMode = ScRecalcMode::NORMAL; }
+ void SetExclusiveRecalcModeNormal()
{ SetMaskedRecalcMode( ScRecalcMode::NORMAL ); }
- inline void SetExclusiveRecalcModeAlways()
+ void SetExclusiveRecalcModeAlways()
{ SetMaskedRecalcMode( ScRecalcMode::ALWAYS ); }
- inline void SetExclusiveRecalcModeOnLoad()
+ void SetExclusiveRecalcModeOnLoad()
{ SetMaskedRecalcMode( ScRecalcMode::ONLOAD ); }
- inline void SetExclusiveRecalcModeOnLoadOnce()
+ void SetExclusiveRecalcModeOnLoadOnce()
{ SetMaskedRecalcMode( ScRecalcMode::ONLOAD_ONCE ); }
- inline void SetRecalcModeForced()
+ void SetRecalcModeForced()
{ nMode |= ScRecalcMode::FORCED; }
- inline void SetRecalcModeOnRefMove()
+ void SetRecalcModeOnRefMove()
{ nMode |= ScRecalcMode::ONREFMOVE; }
- inline bool IsRecalcModeNormal() const
+ bool IsRecalcModeNormal() const
{ return bool(nMode & ScRecalcMode::NORMAL); }
- inline bool IsRecalcModeAlways() const
+ bool IsRecalcModeAlways() const
{ return bool(nMode & ScRecalcMode::ALWAYS); }
- inline bool IsRecalcModeOnLoad() const
+ bool IsRecalcModeOnLoad() const
{ return bool(nMode & ScRecalcMode::ONLOAD); }
- inline bool IsRecalcModeOnLoadOnce() const
+ bool IsRecalcModeOnLoadOnce() const
{ return bool(nMode & ScRecalcMode::ONLOAD_ONCE); }
- inline bool IsRecalcModeForced() const
+ bool IsRecalcModeForced() const
{ return bool(nMode & ScRecalcMode::FORCED); }
- inline bool IsRecalcModeOnRefMove() const
+ bool IsRecalcModeOnRefMove() const
{ return bool(nMode & ScRecalcMode::ONREFMOVE); }
/** Get OpCode of the most outer function */
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index 1db3616c3d9a..c3b73c8a0341 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -37,19 +37,19 @@ class SAL_WARN_UNUSED I18NLANGTAG_DLLPUBLIC MsLangId
public:
/// Create a LangID from a primary and a sublanguage.
- static inline LanguageType makeLangID( LanguageType nSubLangId, LanguageType nPriLangId)
+ static LanguageType makeLangID( LanguageType nSubLangId, LanguageType nPriLangId)
{
return (nSubLangId << 10) | nPriLangId;
}
/// Get the primary language of a LangID.
- static inline LanguageType getPrimaryLanguage( LanguageType nLangID)
+ static LanguageType getPrimaryLanguage( LanguageType nLangID)
{
return nLangID & LANGUAGE_MASK_PRIMARY;
}
/// Get the sublanguage of a LangID.
- static inline LanguageType getSubLanguage( LanguageType nLangID)
+ static LanguageType getSubLanguage( LanguageType nLangID)
{
return (nLangID & ~LANGUAGE_MASK_PRIMARY) >> 10;
}
diff --git a/include/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx
index 4b0025587093..df18b5791e40 100644
--- a/include/jvmaccess/virtualmachine.hxx
+++ b/include/jvmaccess/virtualmachine.hxx
@@ -79,7 +79,7 @@ public:
@return
A valid JNI environment pointer. Will never be null.
*/
- inline JNIEnv * getEnvironment() const { return m_pEnvironment; }
+ JNIEnv * getEnvironment() const { return m_pEnvironment; }
private:
AttachGuard(AttachGuard &) = delete;
diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index bc35ba77d588..c1bfff733f5b 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -47,7 +47,7 @@ private:
map_t mLruMap;
const size_t mMaxSize;
- inline void checkLRU()
+ void checkLRU()
{
if (mLruMap.size() > mMaxSize)
{
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 952e53a0d777..042a1dfc9d49 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -127,7 +127,7 @@ public:
@see DirectoryItem::getFileStatus()
*/
- static inline RC getCanonicalName( const ::rtl::OUString& ustrRequestedURL, ::rtl::OUString& ustrValidURL )
+ static RC getCanonicalName( const ::rtl::OUString& ustrRequestedURL, ::rtl::OUString& ustrValidURL )
{
return static_cast< RC >( osl_getCanonicalName( ustrRequestedURL.pData, &ustrValidURL.pData ) );
}
@@ -167,7 +167,7 @@ public:
@see DirectoryItem::getFileStatus()
*/
- static inline RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL, const ::rtl::OUString& ustrRelativeFileURL, ::rtl::OUString& ustrAbsoluteFileURL )
+ static RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL, const ::rtl::OUString& ustrRelativeFileURL, ::rtl::OUString& ustrAbsoluteFileURL )
{
return static_cast< RC >( osl_getAbsoluteFileURL( ustrBaseDirectoryURL.pData, ustrRelativeFileURL.pData, &ustrAbsoluteFileURL.pData ) );
}
@@ -187,7 +187,7 @@ public:
@see getFileURLFromSystemPath()
*/
- static inline RC getSystemPathFromFileURL( const ::rtl::OUString& ustrFileURL, ::rtl::OUString& ustrSystemPath )
+ static RC getSystemPathFromFileURL( const ::rtl::OUString& ustrFileURL, ::rtl::OUString& ustrSystemPath )
{
return static_cast< RC >( osl_getSystemPathFromFileURL( ustrFileURL.pData, &ustrSystemPath.pData ) );
}
@@ -207,7 +207,7 @@ public:
@see getSystemPathFromFileURL()
*/
- static inline RC getFileURLFromSystemPath( const ::rtl::OUString& ustrSystemPath, ::rtl::OUString& ustrFileURL )
+ static RC getFileURLFromSystemPath( const ::rtl::OUString& ustrSystemPath, ::rtl::OUString& ustrFileURL )
{
return static_cast< RC >( osl_getFileURLFromSystemPath( ustrSystemPath.pData, &ustrFileURL.pData ) );
}
@@ -240,7 +240,7 @@ public:
@see getSystemPathFromFileURL()
*/
- static inline RC searchFileURL( const ::rtl::OUString& ustrFileName, const ::rtl::OUString& ustrSearchPath, ::rtl::OUString& ustrFileURL )
+ static RC searchFileURL( const ::rtl::OUString& ustrFileName, const ::rtl::OUString& ustrSearchPath, ::rtl::OUString& ustrFileURL )
{
return static_cast< RC >( osl_searchFileURL( ustrFileName.pData, ustrSearchPath.pData, &ustrFileURL.pData ) );
}
@@ -255,7 +255,7 @@ public:
E_NOENT no such file or directory not found
*/
- static inline RC getTempDirURL( ::rtl::OUString& ustrTempDirURL )
+ static RC getTempDirURL( ::rtl::OUString& ustrTempDirURL )
{
return static_cast< RC >( osl_getTempDirURL( &ustrTempDirURL.pData ) );
}
@@ -308,7 +308,7 @@ public:
@see getTempDirURL()
*/
- static inline RC createTempFile(
+ static RC createTempFile(
::rtl::OUString* pustrDirectoryURL,
oslFileHandle* pHandle,
::rtl::OUString* pustrTempFileURL)
@@ -367,7 +367,7 @@ public:
The other volume device.
*/
- inline VolumeDevice & operator =( const VolumeDevice & rDevice )
+ VolumeDevice & operator =( const VolumeDevice & rDevice )
{
oslVolumeDeviceHandle newHandle = rDevice._aHandle;
@@ -387,7 +387,7 @@ public:
@return
The full qualified URL where the device is mounted to.
*/
- inline rtl::OUString getMountPath()
+ rtl::OUString getMountPath()
{
rtl::OUString aPath;
osl_getVolumeDeviceMountPath( _aHandle, &aPath.pData );
@@ -457,7 +457,7 @@ public:
@return true if all fields are valid else false.
*/
- inline bool isValid( sal_uInt32 nMask ) const
+ bool isValid( sal_uInt32 nMask ) const
{
return ( nMask & _aInfo.uValidFields ) == nMask;
}
@@ -468,7 +468,7 @@ public:
true if Attributes are valid and the volume is remote else false.
*/
- inline bool getRemoteFlag() const
+ bool getRemoteFlag() const
{
return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_Remote);
}
@@ -479,7 +479,7 @@ public:
true if attributes are valid and the volume is removable else false.
*/
- inline bool getRemoveableFlag() const
+ bool getRemoveableFlag() const
{
return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_Removeable);
}
@@ -490,7 +490,7 @@ public:
true if attributes are valid and the volume is a CDROM else false.
*/
- inline bool getCompactDiscFlag() const
+ bool getCompactDiscFlag() const
{
return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_CompactDisc);
}
@@ -501,7 +501,7 @@ public:
true if attributes are valid and the volume is a floppy disk else false.
*/
- inline bool getFloppyDiskFlag() const
+ bool getFloppyDiskFlag() const
{
return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_FloppyDisk);
}
@@ -512,7 +512,7 @@ public:
true if attributes are valid and the volume is a fixed disk else false.
*/
- inline bool getFixedDiskFlag() const
+ bool getFixedDiskFlag() const
{
return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_FixedDisk);
}
@@ -523,7 +523,7 @@ public:
true if attributes are valid and the volume is a RAM disk else false.
*/
- inline bool getRAMDiskFlag() const
+ bool getRAMDiskFlag() const
{
return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_RAMDisk);
}
@@ -535,7 +535,7 @@ public:
0 otherwise.
*/
- inline sal_uInt64 getTotalSpace() const
+ sal_uInt64 getTotalSpace() const
{
return _aInfo.uTotalSpace;
}
@@ -547,7 +547,7 @@ public:
0 otherwise.
*/
- inline sal_uInt64 getFreeSpace() const
+ sal_uInt64 getFreeSpace() const
{
return _aInfo.uFreeSpace;
}
@@ -559,7 +559,7 @@ public:
0 otherwise.
*/
- inline sal_uInt64 getUsedSpace() const
+ sal_uInt64 getUsedSpace() const
{
return _aInfo.uUsedSpace;
}
@@ -571,7 +571,7 @@ public:
0 otherwise.
*/
- inline sal_uInt32 getMaxNameLength() const
+ sal_uInt32 getMaxNameLength() const
{
return _aInfo.uMaxNameLength;
}
@@ -583,7 +583,7 @@ public:
0 otherwise.
*/
- inline sal_uInt32 getMaxPathLength() const
+ sal_uInt32 getMaxPathLength() const
{
return _aInfo.uMaxPathLength;
}
@@ -595,7 +595,7 @@ public:
otherwise an empty string.
*/
- inline ::rtl::OUString getFileSystemName() const
+ ::rtl::OUString getFileSystemName() const
{
return _aInfo.ustrFileSystemName ? ::rtl::OUString( _aInfo.ustrFileSystemName ) : ::rtl::OUString();
}
@@ -608,7 +608,7 @@ public:
otherwise returns NULL;
*/
- inline VolumeDevice getDeviceHandle() const
+ VolumeDevice getDeviceHandle() const
{
return _aDevice;
}
@@ -708,7 +708,7 @@ public:
true if all fields are valid else false.
*/
- inline bool isValid( sal_uInt32 nMask ) const
+ bool isValid( sal_uInt32 nMask ) const
{
return ( nMask & _aStatus.uValidFields ) == nMask;
}
@@ -718,7 +718,7 @@ public:
@return
The file type.
*/
- inline Type getFileType() const
+ Type getFileType() const
{
SAL_INFO_IF(
!isValid(osl_FileStatus_Mask_Type), "sal.osl",
@@ -736,7 +736,7 @@ public:
@see getFileType
@since LibreOffice 3.6
*/
- inline bool isDirectory() const
+ bool isDirectory() const
{
return ( getFileType() == Directory || getFileType() == Volume );
}
@@ -751,7 +751,7 @@ public:
@see isLink
@since LibreOffice 3.6
*/
- inline bool isRegular() const
+ bool isRegular() const
{
return ( getFileType() == Regular );
}
@@ -764,7 +764,7 @@ public:
@see getFileType
@since LibreOffice 3.6
*/
- inline bool isLink() const
+ bool isLink() const
{
return ( getFileType() == Link );
}
@@ -775,7 +775,7 @@ public:
The set of attribute flags of this file.
*/
- inline sal_uInt64 getAttributes() const
+ sal_uInt64 getAttributes() const
{
SAL_INFO_IF(
!isValid(osl_FileStatus_Mask_Attributes), "sal.osl",
@@ -790,7 +790,7 @@ public:
TimeValue otherwise.
*/
- inline TimeValue getCreationTime() const
+ TimeValue getCreationTime() const
{
SAL_INFO_IF(
!isValid(osl_FileStatus_Mask_CreationTime), "sal.osl",
@@ -805,7 +805,7 @@ public:
TimeValue otherwise.
*/
- inline TimeValue getAccessTime() const
+ TimeValue getAccessTime() const
{
SAL_INFO_IF(
!isValid(osl_FileStatus_Mask_AccessTime), "sal.osl",
@@ -820,7 +820,7 @@ public:
TimeValue otherwise.
*/
- inline TimeValue getModifyTime() const
+ TimeValue getModifyTime() const
{
SAL_INFO_IF(
!isValid(osl_FileStatus_Mask_ModifyTime), "sal.osl",
@@ -834,7 +834,7 @@ public:
The actual file size if this information is valid, 0 otherwise.
*/
- inline sal_uInt64 getFileSize() const
+ sal_uInt64 getFileSize() const
{
SAL_INFO_IF(
!isValid(osl_FileStatus_Mask_FileSize), "sal.osl",
@@ -848,7 +848,7 @@ public:
The file name if this information is valid, an empty string otherwise.
*/
- inline ::rtl::OUString getFileName() const
+ ::rtl::OUString getFileName() const
{
SAL_INFO_IF(
!isValid(osl_FileStatus_Mask_FileName), "sal.osl",
@@ -865,7 +865,7 @@ public:
empty string otherwise.
*/
- inline ::rtl::OUString getFileURL() const
+ ::rtl::OUString getFileURL() const
{
SAL_INFO_IF(
!isValid(osl_FileStatus_Mask_FileURL), "sal.osl",
@@ -881,7 +881,7 @@ public:
otherwise.
*/
- inline ::rtl::OUString getLinkTargetURL() const
+ ::rtl::OUString getLinkTargetURL() const
{
SAL_INFO_IF(
!isValid(osl_FileStatus_Mask_LinkTargetURL), "sal.osl",
@@ -928,7 +928,7 @@ public:
/** Destructor
*/
- inline ~File()
+ ~File()
{
close();
}
@@ -940,7 +940,7 @@ public:
@since LibreOffice 4.1
*/
- inline rtl::OUString getURL() const { return _aPath; }
+ rtl::OUString getURL() const { return _aPath; }
/** Open a regular file.
@@ -985,7 +985,7 @@ public:
@see setSize()
*/
- inline RC open( sal_uInt32 uFlags )
+ RC open( sal_uInt32 uFlags )
{
return static_cast< RC >( osl_openFile( _aPath.pData, &_pData, uFlags ) );
}
@@ -1004,7 +1004,7 @@ public:
@see open()
*/
- inline RC close()
+ RC close()
{
oslFileError Error = osl_File_E_BADF;
@@ -1034,7 +1034,7 @@ public:
@see getPos()
*/
- inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) SAL_WARN_UNUSED_RESULT
+ RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) SAL_WARN_UNUSED_RESULT
{
return static_cast< RC >( osl_setFilePos( _pData, uHow, uPos ) );
}
@@ -1055,7 +1055,7 @@ public:
@see write()
*/
- inline RC getPos( sal_uInt64& uPos )
+ RC getPos( sal_uInt64& uPos )
{
return static_cast< RC >( osl_getFilePos( _pData, &uPos ) );
}
@@ -1082,7 +1082,7 @@ public:
@see setPos()
*/
- inline RC isEndOfFile( sal_Bool *pIsEOF )
+ RC isEndOfFile( sal_Bool *pIsEOF )
{
return static_cast< RC >( osl_isEndOfFile( _pData, pIsEOF ) );
}
@@ -1105,7 +1105,7 @@ public:
@see getStatus()
*/
- inline RC setSize( sal_uInt64 uSize )
+ RC setSize( sal_uInt64 uSize )
{
return static_cast< RC >( osl_setFileSize( _pData, uSize ) );
}
@@ -1130,7 +1130,7 @@ public:
@see getStatus()
*/
- inline RC getSize( sal_uInt64 &rSize )
+ RC getSize( sal_uInt64 &rSize )
{
return static_cast< RC >( osl_getFileSize( _pData, &rSize ) );
}
@@ -1167,7 +1167,7 @@ public:
@see setPos()
*/
- inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead )
+ RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead )
{
return static_cast< RC >( osl_readFile( _pData, pBuffer, uBytesRequested, &rBytesRead ) );
}
@@ -1206,7 +1206,7 @@ public:
@see setPos()
*/
- inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten)
+ RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten)
{
return static_cast< RC >( osl_writeFile( _pData, pBuffer, uBytesToWrite, &rBytesWritten ) );
}
@@ -1236,7 +1236,7 @@ public:
@see setPos()
*/
- inline RC readLine( ::rtl::ByteSequence& aSeq )
+ RC readLine( ::rtl::ByteSequence& aSeq )
{
return static_cast< RC >( osl_readLine( _pData, reinterpret_cast(&aSeq) ) );
}
@@ -1271,7 +1271,7 @@ public:
@see open()
@see write()
*/
- inline RC sync() const
+ RC sync() const
{
OSL_PRECOND(_pData, "File::sync(): File not open");
return static_cast< RC >(osl_syncFile(_pData));
@@ -1303,7 +1303,7 @@ public:
@see remove()
*/
- inline static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
+ static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
{
return static_cast< RC >( osl_copyFile( ustrSourceFileURL.pData, ustrDestFileURL.pData ) );
}
@@ -1332,7 +1332,7 @@ public:
@see copy()
*/
- inline static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
+ static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
{
return static_cast< RC >( osl_moveFile( ustrSourceFileURL.pData, ustrDestFileURL.pData ) );
}
@@ -1365,7 +1365,7 @@ public:
@see open()
*/
- inline static RC remove( const ::rtl::OUString& ustrFileURL )
+ static RC remove( const ::rtl::OUString& ustrFileURL )
{
return static_cast< RC >( osl_removeFile( ustrFileURL.pData ) );
}
@@ -1385,7 +1385,7 @@ public:
@see FileStatus
*/
- inline static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes )
+ static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes )
{
return static_cast< RC >( osl_setFileAttributes( ustrFileURL.pData, uAttributes ) );
}
@@ -1412,7 +1412,7 @@ public:
@see FileStatus
*/
- inline static RC setTime(
+ static RC setTime(
const ::rtl::OUString& ustrFileURL,
const TimeValue& rCreationTime,
const TimeValue& rLastAccessTime,
@@ -1489,7 +1489,7 @@ public:
true if object is valid directory item else false.
*/
- inline bool is()
+ bool is()
{
return _pData != NULL;
}
@@ -1528,7 +1528,7 @@ public:
@see Directory::getNextItem()
*/
- static inline RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem )
+ static RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem )
{
if( rItem._pData)
{
@@ -1571,7 +1571,7 @@ public:
@see FileStatus
*/
- inline RC getFileStatus( FileStatus& rStatus )
+ RC getFileStatus( FileStatus& rStatus )
{
return static_cast< RC >( osl_getFileStatus( _pData, &rStatus._aStatus, rStatus._nMask ) );
}
@@ -1592,7 +1592,7 @@ public:
@since LibreOffice 3.6
*/
- inline bool isIdenticalTo( const DirectoryItem &pOther )
+ bool isIdenticalTo( const DirectoryItem &pOther )
{
return osl_identicalDirectoryItem( _pData, pOther._pData );
}
@@ -1685,7 +1685,7 @@ public:
@since LibreOffice 4.1
*/
- inline rtl::OUString getURL() const { return _aPath; }
+ rtl::OUString getURL() const { return _aPath; }
/** Open a directory for enumerating its contents.
@@ -1705,7 +1705,7 @@ public:
@see close()
*/
- inline RC open()
+ RC open()
{
return static_cast< RC >( osl_openDirectory( _aPath.pData, &_pData ) );
}
@@ -1721,7 +1721,7 @@ public:
@see close()
*/
- inline bool isOpen() { return _pData != NULL; }
+ bool isOpen() { return _pData != NULL; }
/** Close a directory.
@@ -1735,7 +1735,7 @@ public:
@see open()
*/
- inline RC close()
+ RC close()
{
oslFileError Error = osl_File_E_BADF;
@@ -1766,7 +1766,7 @@ public:
@see open()
*/
- inline RC reset()
+ RC reset()
{
close();
return open();
@@ -1795,7 +1795,7 @@ public:
@see DirectoryItem
*/
- inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 )
+ RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 )
{
if( rItem._pData )
{
@@ -1837,7 +1837,7 @@ public:
@see VolumeInfo
*/
- inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo )
+ static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo )
{
return static_cast< RC >( osl_getVolumeInformation( ustrDirectoryURL.pData, &rInfo._aInfo, rInfo._nMask ) );
}
@@ -1873,7 +1873,7 @@ public:
@see remove()
*/
- inline static RC create(
+ static RC create(
const ::rtl::OUString& ustrDirectoryURL,
sal_uInt32 flags = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write )
{
@@ -1909,7 +1909,7 @@ public:
@see create()
*/
- inline static RC remove( const ::rtl::OUString& ustrDirectoryURL )
+ static RC remove( const ::rtl::OUString& ustrDirectoryURL )
{
return static_cast< RC >( osl_removeDirectory( ustrDirectoryURL.pData ) );
}
diff --git a/include/osl/thread.hxx b/include/osl/thread.hxx
index 6c2392f0da30..4708ec011386 100644
--- a/include/osl/thread.hxx
+++ b/include/osl/thread.hxx
@@ -51,13 +51,13 @@ class Thread
Thread& operator= ( const Thread& ) SAL_DELETED_FUNCTION;
public:
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new( size_t nSize )
+ static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete( void * pMem )
+ static void SAL_CALL operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new( size_t, void * pMem )
+ static void * SAL_CALL operator new( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete( void *, void * )
+ static void SAL_CALL operator delete( void *, void * )
{}
Thread(): m_hThread(NULL){}
@@ -148,7 +148,7 @@ public:
osl_yieldThread();
}
- static inline void setName(char const * name) throw () {
+ static void setName(char const * name) throw () {
osl_setThreadName(name);
}
diff --git a/include/rtl/bootstrap.hxx b/include/rtl/bootstrap.hxx
index e058724e8e9f..4c1ce0e29a3b 100644
--- a/include/rtl/bootstrap.hxx
+++ b/include/rtl/bootstrap.hxx
@@ -120,21 +120,21 @@ namespace rtl
@param macro [inout] The macro to be expanded
*/
- inline void expandMacrosFrom( ::rtl::OUString & macro ) const
+ void expandMacrosFrom( ::rtl::OUString & macro ) const
{ rtl_bootstrap_expandMacros_from_handle( _handle, ¯o.pData ); }
/** Expands a macro using default bootstrap variables.
@param macro [inout] The macro to be expanded
*/
- static inline void expandMacros( ::rtl::OUString & macro )
+ static void expandMacros( ::rtl::OUString & macro )
{ rtl_bootstrap_expandMacros( ¯o.pData ); }
/** Provides the bootstrap internal handle.
@return bootstrap handle
*/
- inline rtlBootstrapHandle getHandle() const
+ rtlBootstrapHandle getHandle() const
{ return _handle; }
/** Escapes special characters ("$" and "\").
diff --git a/include/rtl/byteseq.h b/include/rtl/byteseq.h
index ef003026ab51..14b8c8cd5ac2 100644
--- a/include/rtl/byteseq.h
+++ b/include/rtl/byteseq.h
@@ -171,13 +171,13 @@ class SAL_WARN_UNUSED ByteSequence
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( size_t nSize )
+ static void * SAL_CALL operator new ( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem )
+ static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( size_t, void * pMem )
+ static void * SAL_CALL operator new ( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * )
+ static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
@@ -243,7 +243,7 @@ public:
@return length of sequence
*/
- inline sal_Int32 SAL_CALL getLength() const
+ sal_Int32 SAL_CALL getLength() const
{ return _pSequence->nElements; }
/** Gets a pointer to byte array for READING. If the sequence has a length of 0, then the
@@ -251,7 +251,7 @@ public:
@return pointer to byte array
*/
- inline const sal_Int8 * SAL_CALL getConstArray() const
+ const sal_Int8 * SAL_CALL getConstArray() const
{ return reinterpret_cast(_pSequence->elements); }
/** Gets a pointer to elements array for READING AND WRITING. In general if the sequence
has a handle acquired by other sequences (reference count > 1), then a new sequence is
@@ -282,7 +282,7 @@ public:
@param nIndex index
@return const C++ reference to byte at element of index nIndex
*/
- inline const sal_Int8 & SAL_CALL operator [] ( sal_Int32 nIndex ) const
+ const sal_Int8 & SAL_CALL operator [] ( sal_Int32 nIndex ) const
{ return getConstArray()[ nIndex ]; }
/** Equality operator: Compares two sequences.
@@ -310,13 +310,13 @@ public:
@return UNacquired handle of the sequence
*/
- inline sal_Sequence * SAL_CALL getHandle() const
+ sal_Sequence * SAL_CALL getHandle() const
{ return _pSequence; }
/** Returns the UNnacquired C handle of the sequence (for compatibility reasons)
@return UNacquired handle of the sequence
*/
- inline sal_Sequence * SAL_CALL get() const
+ sal_Sequence * SAL_CALL get() const
{ return _pSequence; }
};
diff --git a/include/rtl/instance.hxx b/include/rtl/instance.hxx
index 740c581df1ca..d1d8d9eaa44e 100644
--- a/include/rtl/instance.hxx
+++ b/include/rtl/instance.hxx
@@ -270,7 +270,7 @@ template< typename Inst, typename InstCtor,
class rtl_Instance
{
public:
- static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor)
+ static Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor)
{
#if defined _MSC_VER
static Inst * m_pInstance = 0;
@@ -294,7 +294,7 @@ public:
return p;
}
- static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor,
+ static Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor,
DataCtor aDataCtor)
{
#if defined _MSC_VER
@@ -320,7 +320,7 @@ public:
return p;
}
- static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor,
+ static Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor,
const Data &rData)
{
#if defined _MSC_VER
diff --git a/include/rtl/malformeduriexception.hxx b/include/rtl/malformeduriexception.hxx
index effe116fdc3e..3e294516a21f 100644
--- a/include/rtl/malformeduriexception.hxx
+++ b/include/rtl/malformeduriexception.hxx
@@ -36,15 +36,15 @@ public:
@param rMessage
A message containing any details about the exception.
*/
- inline SAL_EXCEPTION_DLLPRIVATE MalformedUriException(
+ SAL_EXCEPTION_DLLPRIVATE MalformedUriException(
rtl::OUString const & rMessage): m_aMessage(rMessage) {}
- inline SAL_EXCEPTION_DLLPRIVATE MalformedUriException(
+ SAL_EXCEPTION_DLLPRIVATE MalformedUriException(
MalformedUriException const & other): m_aMessage(other.m_aMessage) {}
- inline SAL_EXCEPTION_DLLPRIVATE ~MalformedUriException() {}
+ SAL_EXCEPTION_DLLPRIVATE ~MalformedUriException() {}
- inline SAL_EXCEPTION_DLLPRIVATE MalformedUriException operator =(
+ SAL_EXCEPTION_DLLPRIVATE MalformedUriException operator =(
MalformedUriException const & rOther)
{ m_aMessage = rOther.m_aMessage; return *this; }
@@ -54,7 +54,7 @@ public:
A reference to the message. The reference is valid for the lifetime of
this MalformedUriException.
*/
- inline SAL_EXCEPTION_DLLPRIVATE rtl::OUString const & getMessage() const
+ SAL_EXCEPTION_DLLPRIVATE rtl::OUString const & getMessage() const
{ return m_aMessage; }
private:
diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx
index 5eeb857f8a42..e8f624a93d6f 100644
--- a/include/rtl/ref.hxx
+++ b/include/rtl/ref.hxx
@@ -42,21 +42,21 @@ class Reference
public:
/** Constructor...
*/
- inline Reference()
+ Reference()
: m_pBody (NULL)
{}
/** Constructor...
*/
- inline Reference (reference_type * pBody, __sal_NoAcquire)
+ Reference (reference_type * pBody, __sal_NoAcquire)
: m_pBody (pBody)
{
}
/** Constructor...
*/
- inline Reference (reference_type * pBody)
+ Reference (reference_type * pBody)
: m_pBody (pBody)
{
if (m_pBody)
@@ -65,7 +65,7 @@ public:
/** Copy constructor...
*/
- inline Reference (const Reference & handle)
+ Reference (const Reference & handle)
: m_pBody (handle.m_pBody)
{
if (m_pBody)
@@ -75,7 +75,7 @@ public:
#ifdef LIBO_INTERNAL_ONLY
/** Move constructor...
*/
- inline Reference (Reference && handle)
+ Reference (Reference && handle)
: m_pBody (handle.m_pBody)
{
handle.m_pBody = nullptr;
@@ -84,7 +84,7 @@ public:
/** Destructor...
*/
- inline ~Reference()
+ ~Reference()
{
if (m_pBody)
m_pBody->release();
@@ -93,7 +93,7 @@ public:
/** Set...
Similar to assignment.
*/
- inline Reference &
+ Reference &
SAL_CALL set (reference_type * pBody)
{
if (pBody)
@@ -109,7 +109,7 @@ public:
Unbinds this instance from its body (if bound) and
bind it to the body represented by the handle.
*/
- inline Reference &
+ Reference &
SAL_CALL operator= (const Reference & handle)
{
return set( handle.m_pBody );
@@ -121,7 +121,7 @@ public:
* bind it to the body represented by the handle, and
* set the body represented by the handle to nullptr.
*/
- inline Reference &
+ Reference &
operator= (Reference && handle)
{
// self-movement guts ourself
@@ -135,7 +135,7 @@ public:
/** Assignment...
*/
- inline Reference &
+ Reference &
SAL_CALL operator= (reference_type * pBody)
{
return set( pBody );
@@ -148,7 +148,7 @@ public:
since in the second case two large objects exist in memory
(the old body and the new body).
*/
- inline Reference & SAL_CALL clear()
+ Reference & SAL_CALL clear()
{
if (m_pBody)
{
@@ -164,7 +164,7 @@ public:
I.e. handle->someBodyOp() and handle.get()->someBodyOp()
are the same.
*/
- inline reference_type * SAL_CALL get() const
+ reference_type * SAL_CALL get() const
{
return m_pBody;
}
@@ -172,7 +172,7 @@ public:
/** Probably most common used: handle->someBodyOp().
*/
- inline reference_type * SAL_CALL operator->() const
+ reference_type * SAL_CALL operator->() const
{
assert(m_pBody != NULL);
return m_pBody;
@@ -181,7 +181,7 @@ public:
/** Allows (*handle).someBodyOp().
*/
- inline reference_type & SAL_CALL operator*() const
+ reference_type & SAL_CALL operator*() const
{
assert(m_pBody != NULL);
return *m_pBody;
@@ -190,7 +190,7 @@ public:
/** Returns True if the handle does point to a valid body.
*/
- inline bool SAL_CALL is() const
+ bool SAL_CALL is() const
{
return (m_pBody != NULL);
}
@@ -198,7 +198,7 @@ public:
#if defined LIBO_INTERNAL_ONLY
/** Returns True if the handle does point to a valid body.
*/
- inline explicit operator bool() const
+ explicit operator bool() const
{
return is();
}
@@ -206,7 +206,7 @@ public:
/** Returns True if this points to pBody.
*/
- inline bool SAL_CALL operator== (const reference_type * pBody) const
+ bool SAL_CALL operator== (const reference_type * pBody) const
{
return (m_pBody == pBody);
}
@@ -214,7 +214,7 @@ public:
/** Returns True if handle points to the same body.
*/
- inline bool
+ bool
SAL_CALL operator== (const Reference & handle) const
{
return (m_pBody == handle.m_pBody);
@@ -223,7 +223,7 @@ public:
/** Needed to place References into STL collection.
*/
- inline bool
+ bool
SAL_CALL operator!= (const Reference & handle) const
{
return (m_pBody != handle.m_pBody);
@@ -232,7 +232,7 @@ public:
/** Needed to place References into STL collection.
*/
- inline bool
+ bool
SAL_CALL operator< (const Reference & handle) const
{
return (m_pBody < handle.m_pBody);
@@ -241,7 +241,7 @@ public:
/** Needed to place References into STL collection.
*/
- inline bool
+ bool
SAL_CALL operator> (const Reference & handle) const
{
return (m_pBody > handle.m_pBody);
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 8f5d044e5a4e..37876983cd1b 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -154,7 +154,7 @@ public:
@param str a OString data.
*/
- inline OString( rtl_String * str, __sal_NoAcquire )
+ OString( rtl_String * str, __sal_NoAcquire )
{
pData = str;
}
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index a313307dd7d6..32ce9cabe269 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -1277,7 +1277,7 @@ public:
This output parameter receives a pointer to the internal capacity.
pInternalCapacity itself must not be null.
*/
- inline void accessInternals(rtl_uString *** pInternalData,
+ void accessInternals(rtl_uString *** pInternalData,
sal_Int32 ** pInternalCapacity)
{
*pInternalData = &pData;
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 4c8e373a1c04..50f3be69bbbd 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -180,7 +180,7 @@ public:
@param str
OUString data
*/
- inline OUString( rtl_uString * str, __sal_NoAcquire )
+ OUString( rtl_uString * str, __sal_NoAcquire )
{ pData = str; }
/**
@@ -375,7 +375,7 @@ public:
@since UDK 3.2.7
*/
- inline explicit OUString(
+ explicit OUString(
sal_uInt32 const * codePoints, sal_Int32 codePointCount):
pData(NULL)
{
@@ -424,7 +424,7 @@ public:
@return
OUString const & based on given storage
*/
- static inline OUString const & unacquired( rtl_uString * const * ppHandle )
+ static OUString const & unacquired( rtl_uString * const * ppHandle )
{ return * reinterpret_cast< OUString const * >( ppHandle ); }
/**
@@ -1570,7 +1570,7 @@ public:
@since UDK 3.2.7
*/
- inline bool endsWithAsciiL(char const * asciiStr, sal_Int32 asciiStrLength)
+ bool endsWithAsciiL(char const * asciiStr, sal_Int32 asciiStrLength)
const
{
return asciiStrLength <= pData->length
@@ -1691,7 +1691,7 @@ public:
@return true if this string ends with asciiStr, ignoring the case of ASCII
letters ("A"--"Z" and "a"--"z"); otherwise, false is returned
*/
- inline bool endsWithIgnoreAsciiCaseAsciiL(
+ bool endsWithIgnoreAsciiCaseAsciiL(
char const * asciiStr, sal_Int32 asciiStrLength) const
{
return asciiStrLength <= pData->length
@@ -1732,7 +1732,7 @@ public:
* @since LibreOffice 3.6
*/
template< typename T >
- friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OUString& rString, T& literal )
+ friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OUString& rString, T& literal )
{
assert(
libreoffice_internal::ConstCharArrayDetector::isValid(literal));
@@ -1748,7 +1748,7 @@ public:
* @since LibreOffice 3.6
*/
template< typename T >
- friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OUString& rString )
+ friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OUString& rString )
{
assert(
libreoffice_internal::ConstCharArrayDetector::isValid(literal));
@@ -1764,7 +1764,7 @@ public:
* @since LibreOffice 3.6
*/
template< typename T >
- friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OUString& rString, T& literal )
+ friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OUString& rString, T& literal )
{
assert(
libreoffice_internal::ConstCharArrayDetector::isValid(literal));
@@ -1780,7 +1780,7 @@ public:
* @since LibreOffice 3.6
*/
template< typename T >
- friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OUString& rString )
+ friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OUString& rString )
{
assert(
libreoffice_internal::ConstCharArrayDetector::isValid(literal));
@@ -1791,8 +1791,7 @@ public:
#if defined LIBO_INTERNAL_ONLY
/** @overload @since LibreOffice 5.3 */
- template friend inline
- typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
+ template friend typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
operator ==(OUString & string, T & literal) {
return
rtl_ustr_reverseCompare_WithLength(
@@ -1803,8 +1802,7 @@ public:
== 0;
}
/** @overload @since LibreOffice 5.3 */
- template friend inline
- typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
+ template friend typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
operator ==(T & literal, OUString & string) {
return
rtl_ustr_reverseCompare_WithLength(
@@ -1815,8 +1813,7 @@ public:
== 0;
}
/** @overload @since LibreOffice 5.3 */
- template friend inline
- typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
+ template friend typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
operator !=(OUString & string, T & literal) {
return
rtl_ustr_reverseCompare_WithLength(
@@ -1827,8 +1824,7 @@ public:
!= 0;
}
/** @overload @since LibreOffice 5.3 */
- template friend inline
- typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
+ template friend typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
operator !=(T & literal, OUString & string) {
return
rtl_ustr_reverseCompare_WithLength(
@@ -3226,7 +3222,7 @@ public:
@return
True if the conversion succeeded, false otherwise.
*/
- inline bool convertToString(OString * pTarget, rtl_TextEncoding nEncoding,
+ bool convertToString(OString * pTarget, rtl_TextEncoding nEncoding,
sal_uInt32 nFlags) const
{
return rtl_convertUStringToString(&pTarget->pData, pData->buffer,
@@ -3284,7 +3280,7 @@ public:
@since UDK 3.2.7
*/
- inline sal_uInt32 iterateCodePoints(
+ sal_uInt32 iterateCodePoints(
sal_Int32 * indexUtf16, sal_Int32 incrementCodePoints = 1) const
{
return rtl_uString_iterateCodePoints(
@@ -3300,7 +3296,7 @@ public:
*
* @since LibreOffice 4.4
*/
- static inline OUString fromUtf8(const OString& rSource)
+ static OUString fromUtf8(const OString& rSource)
{
OUString aTarget;
bool bSuccess = rtl_convertStringToUString(&aTarget.pData,
@@ -3323,7 +3319,7 @@ public:
*
* @since LibreOffice 4.4
*/
- inline OString toUtf8() const
+ OString toUtf8() const
{
OString aTarget;
bool bSuccess = rtl_convertUStringToString(&aTarget.pData,
diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx
index c1535334fb2c..bb2f31bcd78f 100644
--- a/include/salhelper/refobj.hxx
+++ b/include/salhelper/refobj.hxx
@@ -62,7 +62,7 @@ public:
public:
/** Construction.
*/
- inline ReferenceObject() : m_nReferenceCount(0)
+ ReferenceObject() : m_nReferenceCount(0)
{}
diff --git a/include/salhelper/simplereferenceobject.hxx b/include/salhelper/simplereferenceobject.hxx
index 46b00ac332c2..e21797ce91be 100644
--- a/include/salhelper/simplereferenceobject.hxx
+++ b/include/salhelper/simplereferenceobject.hxx
@@ -57,7 +57,7 @@ namespace salhelper {
class SALHELPER_DLLPUBLIC SimpleReferenceObject
{
public:
- inline SimpleReferenceObject(): m_nCount(0) {}
+ SimpleReferenceObject(): m_nCount(0) {}
/** @attention
The results are undefined if, for any individual instance of
@@ -65,10 +65,10 @@ public:
the total number of calls to release() by a platform dependent amount
(which, hopefully, is quite large).
*/
- inline void acquire()
+ void acquire()
{ osl_atomic_increment(&m_nCount); }
- inline void release()
+ void release()
{ if (osl_atomic_decrement(&m_nCount) == 0) delete this; }
/** see general class documentation
diff --git a/include/salhelper/thread.hxx b/include/salhelper/thread.hxx
index 7b61a2972204..9cf827f0edc9 100644
--- a/include/salhelper/thread.hxx
+++ b/include/salhelper/thread.hxx
@@ -62,10 +62,10 @@ public:
using osl::Thread::wait;
using osl::Thread::yield;
- static inline void * operator new(std::size_t size)
+ static void * operator new(std::size_t size)
{ return SimpleReferenceObject::operator new(size); }
- static inline void operator delete(void * pointer)
+ static void operator delete(void * pointer)
{ SimpleReferenceObject::operator delete(pointer); }
protected:
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 60c0b87b6b56..25c31550a079 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -111,15 +111,15 @@ public:
void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, sal_Int32 attribute, const OString& value, FSEND_t)
{ singleElementInternal( FSNS( namespaceTokenId, elementTokenId), attribute, value.getStr(), FSEND_internal ); }
void endElement(sal_Int32 elementTokenId);
- inline void endElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId)
+ void endElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId)
{ endElement( FSNS( namespaceTokenId, elementTokenId ) ); }
void singleElement(sal_Int32 elementTokenId, const XFastAttributeListRef& xAttrList);
- inline void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef const & xAttrList)
+ void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef const & xAttrList)
{ singleElement(FSNS( namespaceTokenId, elementTokenId), xAttrList); }
void startElement(sal_Int32 elementTokenId, const XFastAttributeListRef& xAttrList);
- inline void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef const & xAttrList)
+ void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef const & xAttrList)
{ startElement( FSNS( namespaceTokenId, elementTokenId ), xAttrList ); }
FastSerializerHelper* write(const char* value);
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index 1e4a2c8f28f2..d85b681de705 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -79,7 +79,7 @@ public:
is used (simply casting between list position and values). If the map
exists, it *MUST* be terminated by an entry containing the special
"not found" list position. */
- inline explicit PosValueMapper( PosT nNFPos, const MapEntryType* pMap = nullptr ) :
+ explicit PosValueMapper( PosT nNFPos, const MapEntryType* pMap = nullptr ) :
mpMap( pMap ), mnNFPos( nNFPos ) {}
/** Returns the value at the specified list position.
@@ -90,7 +90,7 @@ public:
PosT GetPosFromValue( ValueT nValue ) const;
/** Returns the special "not found" list position. */
- inline PosT GetNotFoundPos() const { return mnNFPos; }
+ PosT GetNotFoundPos() const { return mnNFPos; }
private:
const MapEntryType* mpMap; /// The list position/value map.
@@ -143,7 +143,7 @@ private:
class SFX2_DLLPUBLIC ControlWrapperBase
{
public:
- inline explicit ControlWrapperBase() {}
+ explicit ControlWrapperBase() {}
virtual ~ControlWrapperBase();
/** Derived classes enable, disable, show, or hide control(s).
@@ -185,12 +185,12 @@ public:
typedef ValueT ControlValueType;
typedef SingleControlWrapper< ControlT, ValueT > SingleControlWrapperType;
- inline explicit SingleControlWrapper( ControlT& rControl ) : mrControl( rControl ) {}
+ explicit SingleControlWrapper( ControlT& rControl ) : mrControl( rControl ) {}
/** Returns a reference to the control this connection works on. */
- inline const ControlT& GetControl() const { return mrControl; }
+ const ControlT& GetControl() const { return mrControl; }
/** Returns a reference to the control this connection works on. */
- inline ControlT& GetControl() { return mrControl; }
+ ControlT& GetControl() { return mrControl; }
/** Enables, disables, shows, or hides the control.
@descr Does nothing, if the corresponding parameter is TRISTATE_INDET. */
@@ -251,7 +251,7 @@ template< typename ValueT >
class MetricFieldWrapper : public SingleControlWrapper< MetricField, ValueT >
{
public:
- inline explicit MetricFieldWrapper( MetricField& rField, FieldUnit eUnit = FUNIT_NONE ) :
+ explicit MetricFieldWrapper( MetricField& rField, FieldUnit eUnit = FUNIT_NONE ) :
SingleControlWrapper< MetricField, ValueT >( rField ), meUnit( eUnit ) {}
virtual bool IsControlDontKnow() const SAL_OVERRIDE;
@@ -285,7 +285,7 @@ public:
/** @param pMap Optional list position <-> value map.
See PosValueMapper documentation for details. */
- inline explicit ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap = nullptr ) :
+ explicit ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap = nullptr ) :
SingleControlWrapper< ListBox, ValueT >( rListBox ), MapperType( WRAPPER_LISTBOX_ENTRY_NOTFOUND, pMap ) {}
virtual bool IsControlDontKnow() const SAL_OVERRIDE
@@ -318,7 +318,7 @@ public:
/** @param pMap Optional position <-> value map.
See PosValueMapper documentation for details. */
- inline explicit ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap = nullptr ) :
+ explicit ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap = nullptr ) :
SingleControlWrapper< ValueSet, ValueT >( rValueSet ), MapperType( WRAPPER_VALUESET_ITEM_NOTFOUND, pMap ) {}
virtual bool IsControlDontKnow() const SAL_OVERRIDE
@@ -388,9 +388,9 @@ public:
MultiControlWrapper() : maDefValue( 0 ){}
/** Returns the default value that can be used in GetControlValue(). */
- inline const ValueT& GetDefaultValue() const { return maDefValue; }
+ const ValueT& GetDefaultValue() const { return maDefValue; }
/** Sets a default value that can be used in GetControlValue(). */
- inline void SetDefaultValue( const ValueT& rDefValue ) { maDefValue = rDefValue; }
+ void SetDefaultValue( const ValueT& rDefValue ) { maDefValue = rDefValue; }
/** Derived classes return the value the control contains. */
virtual ValueT GetControlValue() const = 0;
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index bea1e06311d8..216fa6fc9aee 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -358,9 +358,9 @@ public:
virtual void Resize() override;
- inline void CheckYes() { m_aYesButton->Check(); }
- inline void CheckNo() { m_aNoButton->Check(); }
- inline bool IsYesChecked() const { return m_aYesButton->IsChecked(); }
+ void CheckYes() { m_aYesButton->Check(); }
+ void CheckNo() { m_aNoButton->Check(); }
+ bool IsYesChecked() const { return m_aYesButton->IsChecked(); }
};
// struct CustomPropertyLine ---------------------------------------------
@@ -436,7 +436,7 @@ public:
bool InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar );
sal_uInt16 GetVisibleLineCount() const;
- inline sal_Int32 GetLineHeight() const { return m_nLineHeight; }
+ sal_Int32 GetLineHeight() const { return m_nLineHeight; }
void AddLine( const OUString& sName, css::uno::Any& rAny );
bool AreAllLinesValid() const;
void ClearAllLines();
@@ -472,9 +472,9 @@ public:
void AddLine( const OUString& sName, css::uno::Any& rAny, bool bInteractive );
- inline bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); }
- inline void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); }
- inline css::uno::Sequence< css::beans::PropertyValue >
+ bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); }
+ void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); }
+ css::uno::Sequence< css::beans::PropertyValue >
GetCustomProperties() const
{ return m_pPropertiesWin->GetCustomProperties(); }
void Init(VclBuilderContainer& rParent);
@@ -562,8 +562,8 @@ public:
CmisPropertiesWindow(SfxTabPage* pParent);
~CmisPropertiesWindow();
- inline sal_Int32 GetItemHeight() const { return m_nItemHeight; }
- inline long getBoxHeight() const { return VclContainer::getLayoutRequisition(*m_pBox).Height(); };
+ sal_Int32 GetItemHeight() const { return m_nItemHeight; }
+ long getBoxHeight() const { return VclContainer::getLayoutRequisition(*m_pBox).Height(); };
void AddLine( const OUString& sId, const OUString& sName,
const OUString& sType, const bool bUpdatable,
const bool bRequired, const bool bMultiValued,
@@ -601,7 +601,7 @@ public:
css::uno::Any& rAny );
void ClearAllLines();
- inline css::uno::Sequence< css::document::CmisProperty >
+ css::uno::Sequence< css::document::CmisProperty >
GetCmisProperties() const
{ return m_pPropertiesWin.GetCmisProperties(); }
};
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 039a9e54cb9c..28159ec0cb45 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -134,7 +134,7 @@ public:
ErrCode Execute();
void StartExecuteModal( const Link& rEndDialogHdl );
- inline ErrCode GetError() const { return m_nError; }
+ ErrCode GetError() const { return m_nError; }
sal_Int16 GetDialogType() const;
bool IsPasswordEnabled() const;
OUString GetRealFilter() const;
diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx
index 0633bf2d0a92..a379a1120ed7 100644
--- a/include/sfx2/itemwrapper.hxx
+++ b/include/sfx2/itemwrapper.hxx
@@ -90,12 +90,12 @@ public:
typedef ValueT ItemValueType;
typedef SingleItemWrapper< ItemT, ValueT > SingleItemWrapperType;
- inline explicit SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {}
+ explicit SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {}
virtual ~SingleItemWrapper() {}
/** Returns the SID this wrapper works on. */
- inline sal_uInt16 GetSlotId() const { return mnSlot; }
+ sal_uInt16 GetSlotId() const { return mnSlot; }
/** Returns the item from an item set, if it is not in "don't know" state.
@descr Similar to ItemWrapperHelper::GetUniqueItem(), but works always
@@ -131,7 +131,7 @@ template< typename ItemT, typename ValueT, typename InternalValueT = ValueT >
class ValueItemWrapper : public SingleItemWrapper< ItemT, ValueT >
{
public:
- inline explicit ValueItemWrapper( sal_uInt16 nSlot ) :
+ explicit ValueItemWrapper( sal_uInt16 nSlot ) :
SingleItemWrapper< ItemT, ValueT >( nSlot ) {}
virtual ValueT GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE
@@ -151,7 +151,7 @@ template< typename ItemT >
class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& >
{
public:
- inline explicit IdentItemWrapper( sal_uInt16 nSlot ) :
+ explicit IdentItemWrapper( sal_uInt16 nSlot ) :
SingleItemWrapper< ItemT, const ItemT& >( nSlot ) {}
virtual const ItemT& GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index ceca0fd2aeab..339c8032ccb8 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -164,7 +164,7 @@ public:
// #i88291#
void clearStreamToLoadFrom();
- inline bool WasLastEditOK() const { return bWasLastEditOK; }
+ bool WasLastEditOK() const { return bWasLastEditOK; }
FileDialogHelper & GetInsertFileDialog(const OUString& rFactory) const;
};
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 9a42e24c5917..cf1ca2a2fe2d 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -792,7 +792,7 @@ class SfxObjectShellLock
protected:
SfxObjectShell * pObj;
public:
- inline SfxObjectShellLock() { pObj = nullptr; }
+ SfxObjectShellLock() { pObj = nullptr; }
inline SfxObjectShellLock( const SfxObjectShellLock & rObj );
inline SfxObjectShellLock( SfxObjectShellLock && rObj );
inline SfxObjectShellLock( SfxObjectShell * pObjP );
@@ -801,11 +801,11 @@ public:
inline SfxObjectShellLock & operator = ( const SfxObjectShellLock & rObj );
inline SfxObjectShellLock & operator = ( SfxObjectShellLock && rObj );
inline SfxObjectShellLock & operator = ( SfxObjectShell * pObj );
- inline bool Is() const { return pObj != nullptr; }
- inline SfxObjectShell * operator & () const { return pObj; }
- inline SfxObjectShell * operator -> () const { return pObj; }
- inline SfxObjectShell & operator * () const { return *pObj; }
- inline operator SfxObjectShell * () const { return pObj; }
+ bool Is() const { return pObj != nullptr; }
+ SfxObjectShell * operator & () const { return pObj; }
+ SfxObjectShell * operator -> () const { return pObj; }
+ SfxObjectShell & operator * () const { return *pObj; }
+ operator SfxObjectShell * () const { return pObj; }
};
inline SfxObjectShellLock::SfxObjectShellLock( const SfxObjectShellLock & rObj )
{
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index c1302571972e..8e0473df1825 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -167,15 +167,15 @@ public:
void HideNewCategoryOption();
- inline const OUString& GetSelectedCategory() const {
+ const OUString& GetSelectedCategory() const {
return msSelectedCategory;
};
- inline void SetSelectLabelText(OUString const & sText) const {
+ void SetSelectLabelText(OUString const & sText) const {
mpSelectLabel->SetText(sText);
};
- inline bool IsNewCategoryCreated() const {
+ bool IsNewCategoryCreated() const {
return mbIsNewCategory;
}
@@ -199,8 +199,8 @@ public:
virtual void dispose() override;
virtual short Execute() override;
- inline OUString const & getTemplatePath() const { return msTemplatePath; };
- inline bool IsStartWithTemplate() const { return mpCBXHideDlg->IsChecked(); };
+ OUString const & getTemplatePath() const { return msTemplatePath; };
+ bool IsStartWithTemplate() const { return mpCBXHideDlg->IsChecked(); };
private:
DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void);
diff --git a/include/store/store.hxx b/include/store/store.hxx
index 012afd1ab9b2..fc25856b903a 100644
--- a/include/store/store.hxx
+++ b/include/store/store.hxx
@@ -39,13 +39,13 @@ class OStoreStream
public:
/** Construction.
*/
- inline OStoreStream()
+ OStoreStream()
: m_hImpl (nullptr)
{}
/** Destruction.
*/
- inline ~OStoreStream()
+ ~OStoreStream()
{
if (m_hImpl)
(void) store_releaseHandle (m_hImpl);
@@ -53,7 +53,7 @@ public:
/** Copy construction.
*/
- inline OStoreStream (OStoreStream const & rhs)
+ OStoreStream (OStoreStream const & rhs)
: m_hImpl (rhs.m_hImpl)
{
if (m_hImpl)
@@ -62,7 +62,7 @@ public:
/** Assignment.
*/
- inline OStoreStream & operator= (OStoreStream const & rhs)
+ OStoreStream & operator= (OStoreStream const & rhs)
{
if (rhs.m_hImpl)
(void) store_acquireHandle (rhs.m_hImpl);
@@ -75,7 +75,7 @@ public:
/** Open the stream.
@see store_openStream()
*/
- inline storeError create (
+ storeError create (
storeFileHandle hFile,
rtl::OUString const & rPath,
rtl::OUString const & rName,
@@ -92,7 +92,7 @@ public:
/** Read from the stream.
@see store_readStream()
*/
- inline storeError readAt (
+ storeError readAt (
sal_uInt32 nOffset,
void * pBuffer,
sal_uInt32 nBytes,
@@ -107,7 +107,7 @@ public:
/** Write to the stream.
@see store_writeStream()
*/
- inline storeError writeAt (
+ storeError writeAt (
sal_uInt32 nOffset,
void const * pBuffer,
sal_uInt32 nBytes,
@@ -135,13 +135,13 @@ class OStoreDirectory
public:
/** Construction.
*/
- inline OStoreDirectory()
+ OStoreDirectory()
: m_hImpl (nullptr)
{}
/** Destruction.
*/
- inline ~OStoreDirectory()
+ ~OStoreDirectory()
{
if (m_hImpl)
(void) store_releaseHandle (m_hImpl);
@@ -149,7 +149,7 @@ public:
/** Copy construction.
*/
- inline OStoreDirectory (OStoreDirectory const & rhs)
+ OStoreDirectory (OStoreDirectory const & rhs)
: m_hImpl (rhs.m_hImpl)
{
if (m_hImpl)
@@ -158,7 +158,7 @@ public:
/** Move construction.
*/
- inline OStoreDirectory (OStoreDirectory && rhs)
+ OStoreDirectory (OStoreDirectory && rhs)
: m_hImpl (rhs.m_hImpl)
{
rhs.m_hImpl = nullptr;
@@ -166,7 +166,7 @@ public:
/** Assignment.
*/
- inline OStoreDirectory & operator= (OStoreDirectory const & rhs)
+ OStoreDirectory & operator= (OStoreDirectory const & rhs)
{
if (rhs.m_hImpl)
(void) store_acquireHandle (rhs.m_hImpl);
@@ -178,7 +178,7 @@ public:
/** Move assignment.
*/
- inline OStoreDirectory & operator= (OStoreDirectory && rhs)
+ OStoreDirectory & operator= (OStoreDirectory && rhs)
{
if (m_hImpl)
(void) store_releaseHandle (m_hImpl);
@@ -190,7 +190,7 @@ public:
/** Open the directory.
@see store_openDirectory()
*/
- inline storeError create (
+ storeError create (
storeFileHandle hFile,
rtl::OUString const & rPath,
rtl::OUString const & rName,
@@ -213,7 +213,7 @@ public:
/** Find first directory entry.
@see store_findFirst()
*/
- inline storeError first (iterator& it)
+ storeError first (iterator& it)
{
if (!m_hImpl)
return store_E_InvalidHandle;
@@ -224,7 +224,7 @@ public:
/** Find next directory entry.
@see store_findNext()
*/
- inline storeError next (iterator& it)
+ storeError next (iterator& it)
{
if (!m_hImpl)
return store_E_InvalidHandle;
@@ -248,13 +248,13 @@ class OStoreFile
public:
/** Construction.
*/
- inline OStoreFile()
+ OStoreFile()
: m_hImpl (nullptr)
{}
/** Destruction.
*/
- inline ~OStoreFile()
+ ~OStoreFile()
{
if (m_hImpl)
(void) store_releaseHandle (m_hImpl);
@@ -262,7 +262,7 @@ public:
/** Copy construction.
*/
- inline OStoreFile (OStoreFile const & rhs)
+ OStoreFile (OStoreFile const & rhs)
: m_hImpl (rhs.m_hImpl)
{
if (m_hImpl)
@@ -271,7 +271,7 @@ public:
/** Assignment.
*/
- inline OStoreFile & operator= (OStoreFile const & rhs)
+ OStoreFile & operator= (OStoreFile const & rhs)
{
if (rhs.m_hImpl)
(void) store_acquireHandle (rhs.m_hImpl);
@@ -283,7 +283,7 @@ public:
/** Conversion into File Handle.
*/
- inline operator storeFileHandle() const
+ operator storeFileHandle() const
{
return m_hImpl;
}
@@ -291,7 +291,7 @@ public:
/** Check for a valid File Handle.
@return sal_True if valid, sal_False otherwise.
*/
- inline bool isValid() const
+ bool isValid() const
{
return (m_hImpl != nullptr);
}
@@ -299,7 +299,7 @@ public:
/** Open the file.
@see store_openFile()
*/
- inline storeError create(
+ storeError create(
rtl::OUString const & rFilename,
storeAccessMode eAccessMode )
{
@@ -314,7 +314,7 @@ public:
/** Open the temporary file in memory.
@see store_createMemoryFile()
*/
- inline storeError createInMemory ()
+ storeError createInMemory ()
{
if (m_hImpl)
{
@@ -327,7 +327,7 @@ public:
/** Close the file.
@see store_closeFile()
*/
- inline void close()
+ void close()
{
if (m_hImpl)
{
@@ -339,7 +339,7 @@ public:
/** Flush the file.
@see store_flushFile()
*/
- inline storeError flush() const
+ storeError flush() const
{
if (!m_hImpl)
return store_E_InvalidHandle;
@@ -350,7 +350,7 @@ public:
/** Remove a file entry.
@see store_remove()
*/
- inline storeError remove (
+ storeError remove (
rtl::OUString const & rPath, rtl::OUString const & rName)
{
if (!m_hImpl)
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 767bd7fa8509..e3b7d589ece7 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -81,8 +81,8 @@ class SVL_DLLPUBLIC SvxMacroTableDtor
private:
SvxMacroTable aSvxMacroTable;
public:
- inline SvxMacroTableDtor() {}
- inline SvxMacroTableDtor( const SvxMacroTableDtor &rCpy ) : aSvxMacroTable(rCpy.aSvxMacroTable) { }
+ SvxMacroTableDtor() {}
+ SvxMacroTableDtor( const SvxMacroTableDtor &rCpy ) : aSvxMacroTable(rCpy.aSvxMacroTable) { }
SvxMacroTableDtor& operator=( const SvxMacroTableDtor &rCpy );
bool operator==( const SvxMacroTableDtor& rOther ) const;
@@ -133,8 +133,8 @@ public:
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override;
- inline const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;}
- inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; }
+ const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;}
+ void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; }
inline const SvxMacro& GetMacro( sal_uInt16 nEvent ) const;
inline bool HasMacro( sal_uInt16 nEvent ) const;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 54571a6a48f8..78ed4120841f 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -173,7 +173,7 @@ public:
SfxPoolItem* CloneSetWhich( sal_uInt16 nNewWhich ) const;
sal_uInt32 GetRefCount() const { return m_nRefCount; }
- inline SfxItemKind GetKind() const { return m_nKind; }
+ SfxItemKind GetKind() const { return m_nKind; }
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
private:
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index aa39e273e288..a7187df469d7 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -41,7 +41,7 @@ public:
OUString &rText,
const IntlWrapper * = nullptr ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
- inline sal_uInt16& From() { return nFrom; }
+ sal_uInt16& From() { return nFrom; }
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override;
virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override;
};
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 1f6d5553d336..0c3a86772f78 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -191,8 +191,8 @@ public:
inline bool IsMatchFullHalfWidthForms() const;
void SetMatchFullHalfWidthForms( bool bVal );
- inline bool IsUseAsianOptions() const { return m_bAsianOptions; }
- inline void SetUseAsianOptions( bool bVal ) { m_bAsianOptions = bVal; }
+ bool IsUseAsianOptions() const { return m_bAsianOptions; }
+ void SetUseAsianOptions( bool bVal ) { m_bAsianOptions = bVal; }
sal_Int32 GetStartPointX() const;
sal_Int32 GetStartPointY() const;
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index dfdd8ebe2623..a1e87a7f58c3 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -293,7 +293,7 @@ public:
sal_uInt16 nCurrFormat, bool bBank );
/// General Unicode Euro symbol
- static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); }
+ static sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); }
};
typedef std::vector< OUString > NfWSStringsDtor;
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 6784f807344a..b226137f9da3 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -243,9 +243,9 @@ public:
void SelectEntry( sal_uInt16 nStyle, bool bSelect = true );
sal_uInt16 GetSelectEntryStyle() const;
- inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; }
+ void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; }
- inline void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; }
+ void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; }
void SetColor( const Color& rColor );
const Color& GetColor() const { return aColor; }
diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx
index 91ec525f110b..b129bddf5555 100644
--- a/include/svtools/dialogclosedlistener.hxx
+++ b/include/svtools/dialogclosedlistener.hxx
@@ -47,7 +47,7 @@ namespace svt
public:
DialogClosedListener();
- inline void SetDialogClosedLink( const Link& rLink ) { m_aDialogClosedLink = rLink; }
+ void SetDialogClosedLink( const Link& rLink ) { m_aDialogClosedLink = rLink; }
// XDialogClosedListener methods
virtual void SAL_CALL dialogClosed( const css::ui::dialogs::DialogClosedEvent& aEvent ) override;
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index d11dcafb07f5..4bf90f3a4792 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -106,7 +106,7 @@ namespace svt
// suspending the controller is not culmulative!
void suspend( );
void resume( );
- inline bool isSuspended( ) const { return bSuspended; }
+ bool isSuspended( ) const { return bSuspended; }
protected:
virtual bool MoveAllowed(const KeyEvent& rEvt) const;
diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx
index 2f3c9559c41b..16df99b9f756 100644
--- a/include/svtools/extcolorcfg.hxx
+++ b/include/svtools/extcolorcfg.hxx
@@ -49,12 +49,12 @@ public:
,m_nDefaultColor(_nDefaultColor)
{}
- inline const OUString& getName() const { return m_sName; }
- inline const OUString& getDisplayName() const { return m_sDisplayName; }
- inline sal_Int32 getColor() const { return m_nColor; }
- inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; }
+ const OUString& getName() const { return m_sName; }
+ const OUString& getDisplayName() const { return m_sDisplayName; }
+ sal_Int32 getColor() const { return m_nColor; }
+ sal_Int32 getDefaultColor() const { return m_nDefaultColor; }
- inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; }
+ void setColor(sal_Int32 _nColor) { m_nColor = _nColor; }
};
class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 2256a8614f15..bd79fb2e9e59 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -82,7 +82,7 @@ namespace svt
css::uno::Reference m_aContext;
public:
- inline bool needInitialization() const { return m_bNeedInitialization && !m_bInitialized; }
+ bool needInitialization() const { return m_bNeedInitialization && !m_bInitialized; }
protected:
OGenericUnoDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxContext);
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index b39e69102486..60be20134dc3 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -564,7 +564,7 @@ private:
const GraphicObject* pCopyObj
);
void SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj );
- inline bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); }
+ bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); }
// Only used in swap case by GraphicObject
void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj );
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index e0fb1dfdd559..186a70b68ce8 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -295,7 +295,7 @@ public:
void Clear();
void SetOffset( long nNewOffset );
- inline void SetDragSize( long nNewSize ) { mnDragSize = nNewSize; }
+ void SetDragSize( long nNewSize ) { mnDragSize = nNewSize; }
sal_uInt16 GetItemCount() const;
sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
@@ -321,13 +321,13 @@ public:
using Window::SetHelpId;
- inline void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; }
- inline void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; }
- inline void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; }
- inline void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
- inline void SetCreateAccessibleHdl( const Link& rLink ) { maCreateAccessibleHdl = rLink; }
+ void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; }
+ void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; }
+ void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; }
+ void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
+ void SetCreateAccessibleHdl( const Link& rLink ) { maCreateAccessibleHdl = rLink; }
- inline bool IsDragable() const { return mbDragable; }
+ bool IsDragable() const { return mbDragable; }
/** Creates and returns the accessible object of the header bar. */
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index b6335631de88..e79e57105812 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -114,8 +114,8 @@ public:
bool IsEqual( const IMapObject& rEqObj );
// IMap-Events
- inline const SvxMacroTableDtor& GetMacroTable() const { return aEventList;}
- inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; }
+ const SvxMacroTableDtor& GetMacroTable() const { return aEventList;}
+ void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; }
};
#endif
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 0954185138ba..141363d1d068 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -81,7 +81,7 @@ public:
void SetFilter(const OUString& _sFilter);
- inline void EnableAutocompletion( bool _bEnable )
+ void EnableAutocompletion( bool _bEnable )
{ bIsAutoCompleteEnabled = _bEnable; }
void SetPlaceHolder( const OUString& sPlaceHolder )
{ aPlaceHolder = sPlaceHolder; }
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 40c31d12e46c..a7a7ac7c7172 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -117,7 +117,7 @@ public:
SvLBoxItem* GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const;
const CommandEvent& GetCommandEvent() const { return aCEvt; }
- inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
+ bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
void SetCommandHdl( const Link& rLink ) { aCommandLink = rLink; }
void SetHeaderBarClickHdl( const Link& rLink ) { aHeaderBarClickLink = rLink; }
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index ff699e3f5fe1..67f77ee2ab28 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -110,19 +110,19 @@ public:
virtual SvParserState CallParser() = 0; // calling of the parser
- inline SvParserState GetStatus() const { return eState; } // StatusInfo
+ SvParserState GetStatus() const { return eState; } // StatusInfo
- inline sal_uLong GetLineNr() const { return nlLineNr; }
- inline sal_uLong GetLinePos() const { return nlLinePos; }
- inline void IncLineNr() { ++nlLineNr; }
- inline sal_uLong IncLinePos() { return ++nlLinePos; }
+ sal_uLong GetLineNr() const { return nlLineNr; }
+ sal_uLong GetLinePos() const { return nlLinePos; }
+ void IncLineNr() { ++nlLineNr; }
+ sal_uLong IncLinePos() { return ++nlLinePos; }
inline void SetLineNr( sal_uLong nlNum ); // inline bottom
inline void SetLinePos( sal_uLong nlPos ); // inline bottom
sal_uInt32 GetNextChar(); // Return next Unicode codepoint in UTF32.
void RereadLookahead();
- inline bool IsParserWorking() const { return SvParserState::Working == eState; }
+ bool IsParserWorking() const { return SvParserState::Working == eState; }
Link GetAsynchCallLink() const
{ return LINK( const_cast(this), SvParser, NewDataRead ); }
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 71e3629158ed..2e10dcf3df01 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -160,8 +160,8 @@ public:
// Accessible -------------------------------------------------------------
- inline void DisableTransientChildren() { SetChildrenNotTransient(); }
- inline bool IsTransientChildrenDisabled() const { return !AreChildrenTransient(); }
+ void DisableTransientChildren() { SetChildrenNotTransient(); }
+ bool IsTransientChildrenDisabled() const { return !AreChildrenTransient(); }
bool IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState );
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 8cf82f4e29a5..623721180bae 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -162,7 +162,7 @@ private:
std::unique_ptr mxObjDesc;
protected:
- inline const css::uno::Reference< css::datatransfer::clipboard::XClipboard >&
+ const css::uno::Reference< css::datatransfer::clipboard::XClipboard >&
getOwnClipboard() const { return mxClipboard; }
private:
@@ -195,7 +195,7 @@ protected:
// derivees need to access lostOwnership in case hey override it
// on windows, changing the access rights to a method gives unresolved externals, so we introduce
// this impl-method here 'til the next incompatible update
- inline void implCallOwnLostOwnership(
+ void implCallOwnLostOwnership(
const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard,
const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans
)
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 002174236bc7..97e0ce929a68 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -613,7 +613,7 @@ public:
/** Sets default bitmaps for collapsed and expanded nodes.
*/
- inline void SetNodeDefaultImages( )
+ void SetNodeDefaultImages( )
{
SetNodeBitmaps(
GetDefaultCollapsedNodeImage( ),
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 0c40da37bd6e..08c6150d74e6 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -347,7 +347,7 @@ public:
@param _nIndex
The new index in parent.
*/
- inline void setIndexInParent(sal_Int32 _nIndex) { m_nIndexInParent = _nIndex; }
+ void setIndexInParent(sal_Int32 _nIndex) { m_nIndexInParent = _nIndex; }
protected:
/// Children manager. May be empty if there are no children.
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 57378da738c7..05feaab75582 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -51,7 +51,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
- inline SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation)
+ SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation)
{
SetValue( rOrientation.GetValue() );
return *this;
@@ -99,7 +99,7 @@ public:
sal_Int16 GetBottomMargin() const {return nBottomMargin; }
void SetBottomMargin(sal_Int16 nBottom);
- inline SvxMarginItem& operator=(const SvxMarginItem& rMargin)
+ SvxMarginItem& operator=(const SvxMarginItem& rMargin)
{
nLeftMargin = rMargin.nLeftMargin;
nTopMargin = rMargin.nTopMargin;
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index eb1fd88c8ba6..36ece5e8cc7a 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -64,8 +64,8 @@ public:
void SelectIndex( int index, bool bFocus = false );
void OutputIndex( int index );
void DeSelect();
- inline bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; }
- inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast(nSelectedIndex); }
+ bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; }
+ sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast(nSelectedIndex); }
static sal_uInt16 GetRowPos(sal_uInt16 _nPos);
static sal_uInt16 GetColumnPos(sal_uInt16 _nPos);
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index ab5e4728c89a..7520faf6ca21 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -117,20 +117,20 @@ public:
/** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */
explicit Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0 );
- inline RefMode GetRefMode() const { return meRefMode; }
- inline const Color& GetColorPrim() const { return maColorPrim; }
- inline const Color& GetColorSecn() const { return maColorSecn; }
- inline const Color& GetColorGap() const { return maColorGap; }
- inline bool UseGapColor() const { return mbUseGapColor; }
- inline double Prim() const { return mfPrim; }
- inline double Dist() const { return mfDist; }
- inline double Secn() const { return mfSecn; }
+ RefMode GetRefMode() const { return meRefMode; }
+ const Color& GetColorPrim() const { return maColorPrim; }
+ const Color& GetColorSecn() const { return maColorSecn; }
+ const Color& GetColorGap() const { return maColorGap; }
+ bool UseGapColor() const { return mbUseGapColor; }
+ double Prim() const { return mfPrim; }
+ double Dist() const { return mfDist; }
+ double Secn() const { return mfSecn; }
double PatternScale() const { return mfPatternScale;}
void SetPatternScale( double fScale );
- inline editeng::SvxBorderStyle Type() const { return mnType; }
+ editeng::SvxBorderStyle Type() const { return mnType; }
/** Returns the total width of this frame style. */
- inline double GetWidth() const { return mfPrim + mfDist + mfSecn; }
+ double GetWidth() const { return mfPrim + mfDist + mfSecn; }
/** Sets the frame style to invisible state. */
void Clear();
@@ -145,12 +145,12 @@ public:
void Set( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
/** Sets a new reference point handling mode, does not modify other settings. */
- inline void SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; }
+ void SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; }
/** Sets a new color, does not modify other settings. */
- inline void SetColorPrim( const Color& rColor ) { maColorPrim = rColor; }
- inline void SetColorSecn( const Color& rColor ) { maColorSecn = rColor; }
+ void SetColorPrim( const Color& rColor ) { maColorPrim = rColor; }
+ void SetColorSecn( const Color& rColor ) { maColorSecn = rColor; }
/** Sets whether to use dotted style for single hair lines. */
- inline void SetType( editeng::SvxBorderStyle nType ) { mnType = nType; }
+ void SetType( editeng::SvxBorderStyle nType ) { mnType = nType; }
/** Mirrors this style (exchanges primary and secondary), if it is a double frame style. */
Style& MirrorSelf();
@@ -187,15 +187,15 @@ class SAL_WARN_UNUSED DiagStyle : public Style
{
public:
/** Constructs an invisible diagonal frame style. */
- inline explicit DiagStyle() : mfAngle( 0.0 ) {}
+ explicit DiagStyle() : mfAngle( 0.0 ) {}
/** Constructs a diagonal frame style passed style and angle. */
- inline explicit DiagStyle( const Style& rStyle, double fAngle ) :
+ explicit DiagStyle( const Style& rStyle, double fAngle ) :
Style( rStyle ), mfAngle( fAngle ) {}
- inline double GetAngle() const { return mfAngle; }
+ double GetAngle() const { return mfAngle; }
/** Returns this style mirrored, if it is a double frame style, otherwise a simple copy. */
- inline DiagStyle Mirror() const { return DiagStyle( Style::Mirror(), mfAngle ); }
+ DiagStyle Mirror() const { return DiagStyle( Style::Mirror(), mfAngle ); }
private:
double mfAngle; /// Angle between this and hor. or vert. border.
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index 8fec54cc2571..18989a121ca4 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -53,7 +53,7 @@ public:
SvxFrameDirection GetSelectEntryValue() const;
/** Saves the currently selected frame direction. */
- inline void SaveValue() { meSaveValue = GetSelectEntryValue(); }
+ void SaveValue() { meSaveValue = GetSelectEntryValue(); }
private:
SvxFrameDirection meSaveValue; /// Saved value for later comparison.
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 2a153301e015..cbe6f7186bea 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -143,7 +143,7 @@ public:
/** Selects or deselects all frame borders. */
void SelectAllBorders( bool bSelect );
/** Deselects all frame borders. */
- inline void DeselectAllBorders() { SelectAllBorders( false ); }
+ void DeselectAllBorders() { SelectAllBorders( false ); }
/** Selects or deselects all visible frame borders (ignores hidden and "don't care" borders). */
void SelectAllVisibleBorders();
diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index bbae2350ba66..0526b4409070 100644
--- a/include/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
@@ -60,7 +60,7 @@ public:
sal_Int32 GetTop() const { return nTop; }
sal_Int32 GetBottom() const { return nBottom; }
- inline SvxGrfCrop& operator=( const SvxGrfCrop& rCrop )
+ SvxGrfCrop& operator=( const SvxGrfCrop& rCrop )
{
nLeft = rCrop.GetLeft(); nTop = rCrop.GetTop();
nRight = rCrop.GetRight(); nBottom = rCrop.GetBottom();
diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx
index baf56b67b583..f3d16bc9d614 100644
--- a/include/svx/orienthelper.hxx
+++ b/include/svx/orienthelper.hxx
@@ -75,7 +75,7 @@ public:
/** Shows or hides the dial control and all dependent windows. */
void Show( bool bShow );
/** Hides the dial control and all dependent windows. */
- inline void Hide() { Show( false ); }
+ void Hide() { Show( false ); }
/** Sets the "stacked" check box to the passed state and updates dependent controls. */
void SetStackedState( TriState eState );
diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index 7f9a374cf009..ea3230211ac0 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
@@ -45,7 +45,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
- inline SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor )
+ SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor )
{
SetValue( rAuthor.GetValue() );
return *this;
@@ -75,7 +75,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
- inline SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate )
+ SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate )
{
SetValue( rDate.GetValue() );
return *this;
@@ -106,7 +106,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
- inline SvxPostItTextItem& operator=( const SvxPostItTextItem& rText )
+ SvxPostItTextItem& operator=( const SvxPostItTextItem& rText )
{
SetValue( rText.GetValue() );
return *this;
@@ -129,7 +129,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
- inline SvxPostItIdItem& operator=( const SvxPostItIdItem& rId )
+ SvxPostItIdItem& operator=( const SvxPostItIdItem& rId )
{
SetValue( rId.GetValue() );
return *this;
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index b4aa64ade87f..bd0034030258 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -140,7 +140,7 @@ public:
// Add own implementation for TRSetBaseGeometry to handle TailPos over changes
virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) override;
- inline const Point& GetFixedTailPos() const {return maFixedTailPos;}
+ const Point& GetFixedTailPos() const {return maFixedTailPos;}
// geometry access
::basegfx::B2DPolygon getTailPolygon() const;
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index adda37c3d9e6..15e476e33e89 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -57,15 +57,15 @@ public:
void ResetVars();
bool TakeGluePoint(SdrGluePoint& rGP) const;
- inline void SetBestConnection( bool rB ) { bBestConn = rB; };
- inline void SetBestVertex( bool rB ) { bBestVertex = rB; };
- inline void SetAutoVertex( bool rB ) { bAutoVertex = rB; };
- inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; };
+ void SetBestConnection( bool rB ) { bBestConn = rB; };
+ void SetBestVertex( bool rB ) { bBestVertex = rB; };
+ void SetAutoVertex( bool rB ) { bAutoVertex = rB; };
+ void SetConnectorId( sal_uInt16 nId ) { nConId = nId; };
- inline bool IsBestConnection() const { return bBestConn; };
- inline bool IsAutoVertex() const { return bAutoVertex; };
- inline sal_uInt16 GetConnectorId() const { return nConId; };
- inline SdrObject* GetObject() const { return pObj; }
+ bool IsBestConnection() const { return bBestConn; };
+ bool IsAutoVertex() const { return bAutoVertex; };
+ sal_uInt16 GetConnectorId() const { return nConId; };
+ SdrObject* GetObject() const { return pObj; }
};
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index 6ac7f6b31af5..8b17f6290da4 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -74,16 +74,16 @@ public:
SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle);
- inline void SetWrap(sal_uInt16 nW) { nWrap = nW; }
+ void SetWrap(sal_uInt16 nW) { nWrap = nW; }
- inline void SetHAlign(short nH) { nHAlign = nH; }
- inline void SetHoriRel(short nR) { nHRel = nR; }
+ void SetHAlign(short nH) { nHAlign = nH; }
+ void SetHoriRel(short nR) { nHRel = nR; }
- inline void SetVAlign(short nV) { nVAlign = nV; }
- inline void SetVertRel(short nR) { nVRel = nR; }
+ void SetVAlign(short nV) { nVAlign = nV; }
+ void SetVertRel(short nR) { nVRel = nR; }
- inline void SetTransparent(bool bT) { bTrans = bT; }
- inline void SetAnchor(short nA) { nAnchor = nA; }
+ void SetTransparent(bool bT) { bTrans = bT; }
+ void SetAnchor(short nA) { nAnchor = nA; }
void SetRelPos(const Point& rP);
};
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 89ff80132568..6d2c0bfc1bae 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -48,9 +48,9 @@ namespace svx
OUString szServiceName;
css::uno::Reference< css::beans::XPropertySet > xPropSet;
- inline OXFormsDescriptor() {}
- inline OXFormsDescriptor( const OXFormsDescriptor &rhs ) { *this=rhs; }
- inline OXFormsDescriptor &operator = ( const OXFormsDescriptor &rhs ) {
+ OXFormsDescriptor() {}
+ OXFormsDescriptor( const OXFormsDescriptor &rhs ) { *this=rhs; }
+ OXFormsDescriptor &operator = ( const OXFormsDescriptor &rhs ) {
szName = rhs.szName;
szServiceName = rhs.szServiceName;
xPropSet = rhs.xPropSet;
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index f5e10a5411f6..9080d918304e 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -127,7 +127,7 @@ protected:
void DisposeAccessibleContext(css::uno::Reference<
css::lang::XComponent> const& xContext);
- inline void setPeer( const css::uno::Reference< css::awt::XWindowPeer >& _xPeer)
+ void setPeer( const css::uno::Reference< css::awt::XWindowPeer >& _xPeer)
{
mxPeer = _xPeer;
mxVclWindowPeer = css::uno::Reference< css::awt::XVclWindowPeer >(mxPeer,css::uno::UNO_QUERY); // just to avoid the query_interface thing
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 2ec345c40b56..bb32d486339e 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -214,17 +214,17 @@ class SAL_WARN_UNUSED SvCompatWeakRef
{
tools::SvRef< SvCompatWeakHdl > _xHdl;
public:
- inline SvCompatWeakRef( ) {}
- inline SvCompatWeakRef( T* pObj )
+ SvCompatWeakRef( ) {}
+ SvCompatWeakRef( T* pObj )
{ if( pObj ) _xHdl = pObj->GetHdl(); }
- inline SvCompatWeakRef& operator = ( T * pObj )
+ SvCompatWeakRef& operator = ( T * pObj )
{ _xHdl = pObj ? pObj->GetHdl() : nullptr; return *this; }
- inline bool is() const
+ bool is() const
{ return _xHdl.is() && _xHdl->GetObj(); }
explicit operator bool() const { return is(); }
- inline T* operator -> () const
+ T* operator -> () const
{ return _xHdl.is() ? _xHdl->GetObj() : nullptr; }
- inline operator T* () const
+ operator T* () const
{ return _xHdl.is() ? _xHdl->GetObj() : nullptr; }
};
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index d1a9408c4bd0..cdbede709e29 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -253,12 +253,12 @@ public:
// General Structure:
- inline INetURLObject():
+ INetURLObject():
m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http) {}
- inline bool HasError() const { return m_eScheme == INetProtocol::NotValid; }
+ bool HasError() const { return m_eScheme == INetProtocol::NotValid; }
- inline OUString GetMainURL(DecodeMechanism eMechanism,
+ OUString GetMainURL(DecodeMechanism eMechanism,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aAbsURIRef, eMechanism, eCharset); }
@@ -280,7 +280,7 @@ public:
bool operator ==(INetURLObject const & rObject) const;
- inline bool operator !=(INetURLObject const & rObject) const
+ bool operator !=(INetURLObject const & rObject) const
{ return !(*this == rObject); }
// Strict Parsing:
@@ -307,7 +307,7 @@ public:
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
FSysStyle eStyle = FSysStyle::Detect);
- inline void SetSmartProtocol(INetProtocol eTheSmartScheme)
+ void SetSmartProtocol(INetProtocol eTheSmartScheme)
{ m_eSmartScheme = eTheSmartScheme; }
inline bool
@@ -377,7 +377,7 @@ public:
struct SchemeInfo;
- inline INetProtocol GetProtocol() const { return m_eScheme; }
+ INetProtocol GetProtocol() const { return m_eScheme; }
bool isSchemeEqualTo(INetProtocol scheme) const { return scheme == m_eScheme; }
@@ -411,19 +411,19 @@ public:
// User Info:
- inline bool HasUserData() const { return m_aUser.isPresent(); }
+ bool HasUserData() const { return m_aUser.isPresent(); }
- inline OUString GetUser(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
+ OUString GetUser(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aUser, eMechanism, eCharset); }
- inline OUString GetPass(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
+ OUString GetPass(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aAuth, eMechanism, eCharset); }
- inline bool SetUser(OUString const & rTheUser)
+ bool SetUser(OUString const & rTheUser)
{ return setUser(rTheUser, RTL_TEXTENCODING_UTF8); }
inline bool SetPass(OUString const & rThePassword);
@@ -433,9 +433,9 @@ public:
// Host and Port:
- inline bool HasPort() const { return m_aPort.isPresent(); }
+ bool HasPort() const { return m_aPort.isPresent(); }
- inline OUString GetHost(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
+ OUString GetHost(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aHost, eMechanism, eCharset); }
@@ -445,21 +445,21 @@ public:
sal_uInt32 GetPort() const;
- inline bool SetHost(OUString const & rTheHost)
+ bool SetHost(OUString const & rTheHost)
{ return setHost(rTheHost, RTL_TEXTENCODING_UTF8); }
bool SetPort(sal_uInt32 nThePort);
// Path:
- inline bool HasURLPath() const { return !m_aPath.isEmpty(); }
+ bool HasURLPath() const { return !m_aPath.isEmpty(); }
- inline OUString GetURLPath(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
+ OUString GetURLPath(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aPath, eMechanism, eCharset); }
- inline bool SetURLPath(OUString const & rThePath,
+ bool SetURLPath(OUString const & rThePath,
EncodeMechanism eMechanism = EncodeMechanism::WasEncoded,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setPath(rThePath, eMechanism, eCharset); }
@@ -724,9 +724,9 @@ public:
// Query:
- inline bool HasParam() const { return m_aQuery.isPresent(); }
+ bool HasParam() const { return m_aQuery.isPresent(); }
- inline OUString GetParam(rtl_TextEncoding eCharset
+ OUString GetParam(rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aQuery, DecodeMechanism::NONE, eCharset); }
@@ -736,9 +736,9 @@ public:
// Fragment:
- inline bool HasMark() const { return m_aFragment.isPresent(); }
+ bool HasMark() const { return m_aFragment.isPresent(); }
- inline OUString GetMark(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
+ OUString GetMark(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aFragment, eMechanism, eCharset); }
@@ -930,14 +930,14 @@ public:
EncodeMechanism eMechanism = EncodeMechanism::WasEncoded,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline OUString GetName(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
+ OUString GetName(DecodeMechanism eMechanism = DecodeMechanism::ToIUri,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return GetLastName(eMechanism, eCharset); }
void SetExtension(OUString const & rTheExtension);
- inline OUString GetExtension() const
+ OUString GetExtension() const
{ return GetFileExtension(); }
OUString CutExtension();
@@ -954,19 +954,19 @@ private:
sal_Int32 m_nLength;
public:
- explicit inline SubString(sal_Int32 nTheBegin = -1,
+ explicit SubString(sal_Int32 nTheBegin = -1,
sal_Int32 nTheLength = 0):
m_nBegin(nTheBegin), m_nLength(nTheLength) {}
- inline bool isPresent() const { return m_nBegin != -1; }
+ bool isPresent() const { return m_nBegin != -1; }
- inline bool isEmpty() const { return m_nLength == 0; }
+ bool isEmpty() const { return m_nLength == 0; }
- inline sal_Int32 getBegin() const { return m_nBegin; }
+ sal_Int32 getBegin() const { return m_nBegin; }
- inline sal_Int32 getLength() const { return m_nLength; }
+ sal_Int32 getLength() const { return m_nLength; }
- inline sal_Int32 getEnd() const { return m_nBegin + m_nLength; }
+ sal_Int32 getEnd() const { return m_nBegin + m_nLength; }
inline sal_Int32 clear();
diff --git a/include/typelib/typedescription.hxx b/include/typelib/typedescription.hxx
index 8ce75bd1691b..8ec814173604 100644
--- a/include/typelib/typedescription.hxx
+++ b/include/typelib/typedescription.hxx
@@ -52,13 +52,13 @@ class TypeDescription
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( size_t nSize )
+ static void * SAL_CALL operator new ( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem )
+ static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( size_t, void * pMem )
+ static void * SAL_CALL operator new ( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * )
+ static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
@@ -111,7 +111,7 @@ public:
@param rTypeDescr another type description
@return this TypeDescription
*/
- inline TypeDescription & SAL_CALL operator =( const TypeDescription & rTypeDescr )
+ TypeDescription & SAL_CALL operator =( const TypeDescription & rTypeDescr )
{ return this->operator =( rTypeDescr.get() ); }
#if defined LIBO_INTERNAL_ONLY
@@ -136,7 +136,7 @@ public:
@param rTypeDescr another type description
@return true, if both type descriptions are equal, false otherwise
*/
- inline bool SAL_CALL equals( const TypeDescription & rTypeDescr ) const
+ bool SAL_CALL equals( const TypeDescription & rTypeDescr ) const
{ return equals( rTypeDescr._pTypeDescr ); }
/** Makes stored type description complete.
@@ -147,13 +147,13 @@ public:
@return stored pointer of type description
*/
- inline typelib_TypeDescription * SAL_CALL get() const
+ typelib_TypeDescription * SAL_CALL get() const
{ return _pTypeDescr; }
/** Tests if a type description is set.
@return true, if a type description is set, false otherwise
*/
- inline bool SAL_CALL is() const
+ bool SAL_CALL is() const
{ return (_pTypeDescr != NULL); }
};
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx
index d4d5608f83af..8031f9bcbfee 100644
--- a/include/uno/current_context.hxx
+++ b/include/uno/current_context.hxx
@@ -92,7 +92,7 @@ public:
@return the previously set context
*/
- inline Reference< XCurrentContext > SAL_CALL getPreviousContext() const
+ Reference< XCurrentContext > SAL_CALL getPreviousContext() const
{ return m_xPreviousContext; }
};
diff --git a/include/uno/dispatcher.hxx b/include/uno/dispatcher.hxx
index c32d8b312b1f..67e77ab56105 100644
--- a/include/uno/dispatcher.hxx
+++ b/include/uno/dispatcher.hxx
@@ -49,7 +49,7 @@ class UnoInterfaceReference
public:
uno_Interface * m_pUnoI;
- inline bool is() const
+ bool is() const
{ return m_pUnoI != NULL; }
inline ~UnoInterfaceReference();
@@ -64,7 +64,7 @@ public:
{ other.m_pUnoI = nullptr; }
#endif
- inline uno_Interface * get() const
+ uno_Interface * get() const
{ return m_pUnoI; }
inline UnoInterfaceReference & set(
@@ -73,10 +73,10 @@ public:
uno_Interface * pUnoI, __sal_NoAcquire );
inline void clear();
- inline UnoInterfaceReference & operator = (
+ UnoInterfaceReference & operator = (
UnoInterfaceReference const & ref )
{ return set( ref.m_pUnoI ); }
- inline UnoInterfaceReference & operator = (
+ UnoInterfaceReference & operator = (
uno_Interface * pUnoI )
{ return set( pUnoI ); }
diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx
index e8b99a6ec14d..31eca6f04fad 100644
--- a/include/uno/environment.hxx
+++ b/include/uno/environment.hxx
@@ -63,13 +63,13 @@ public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( size_t nSize )
+ static void * SAL_CALL operator new ( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem )
+ static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( size_t, void * pMem )
+ static void * SAL_CALL operator new ( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * )
+ static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
@@ -114,7 +114,7 @@ public:
@param rEnv another environment
@return this environment
*/
- inline Environment & SAL_CALL operator = ( const Environment & rEnv )
+ Environment & SAL_CALL operator = ( const Environment & rEnv )
{ return operator = ( rEnv._pEnv ); }
#if defined LIBO_INTERNAL_ONLY
@@ -132,28 +132,28 @@ public:
@return UNacquired pointer to the C environment struct
*/
- inline uno_Environment * SAL_CALL get() const
+ uno_Environment * SAL_CALL get() const
{ return _pEnv; }
/** Gets type name of set environment.
@return type name of set environment
*/
- inline ::rtl::OUString SAL_CALL getTypeName() const
+ ::rtl::OUString SAL_CALL getTypeName() const
{ return _pEnv->pTypeName; }
/** Gets free context pointer of set environment.
@return free context pointer of set environment
*/
- inline void * SAL_CALL getContext() const
+ void * SAL_CALL getContext() const
{ return _pEnv->pContext; }
/** Tests if a environment is set.
@return true, if a environment is set, false otherwise
*/
- inline bool SAL_CALL is() const
+ bool SAL_CALL is() const
{ return (_pEnv != NULL); }
/** Releases a set environment.
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 352f375ff58d..f520b6f5b2bf 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -57,13 +57,13 @@ class Mapping
public:
// these are here to force memory de/allocation to sal lib.
/// @cond INTERNAL
- inline static void * SAL_CALL operator new ( size_t nSize )
+ static void * SAL_CALL operator new ( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem )
+ static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( size_t, void * pMem )
+ static void * SAL_CALL operator new ( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * )
+ static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
@@ -130,7 +130,7 @@ public:
@param rMapping another mapping
@return this mapping
*/
- inline Mapping & SAL_CALL operator = ( const Mapping & rMapping )
+ Mapping & SAL_CALL operator = ( const Mapping & rMapping )
{ return operator = ( rMapping._pMapping ); }
#if defined LIBO_INTERNAL_ONLY
@@ -148,14 +148,14 @@ public:
@return UNacquired C mapping
*/
- inline uno_Mapping * SAL_CALL get() const
+ uno_Mapping * SAL_CALL get() const
{ return _pMapping; }
/** Tests if a mapping is set.
@return true if a mapping is set
*/
- inline bool SAL_CALL is() const
+ bool SAL_CALL is() const
{ return (_pMapping != NULL); }
/** Releases a set mapping.
@@ -175,7 +175,7 @@ public:
@param pTypeDescr type description of interface
@return mapped interface
*/
- inline void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const
+ void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const
{ return mapInterface( pInterface, reinterpret_cast(pTypeDescr) ); }
/** Maps an interface from one environment to another.
@@ -193,7 +193,7 @@ public:
@param pInterface source interface
@param pTypeDescr type description of interface
*/
- inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const
+ void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const
{ (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, pTypeDescr ); }
/** Maps an interface from one environment to another.
@@ -201,7 +201,7 @@ public:
@param pInterface source interface
@param pTypeDescr type description of interface
*/
- inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const
+ void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const
{ (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, reinterpret_cast(pTypeDescr) ); }
/** Maps an interface from one environment to another.
diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx
index cd4f63509bba..c4811508e029 100644
--- a/include/unotools/calendarwrapper.hxx
+++ b/include/unotools/calendarwrapper.hxx
@@ -98,11 +98,11 @@ public:
// convenience methods
/// get epoch start (should be 01Jan1970)
- inline const DateTime& getEpochStart() const
+ const DateTime& getEpochStart() const
{ return aEpochStart; }
/// set a local (!) Gregorian DateTime
- inline void setGregorianDateTime( const DateTime& rDateTime )
+ void setGregorianDateTime( const DateTime& rDateTime )
{ setLocalDateTime( rDateTime - aEpochStart ); }
};
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index 15041eb82314..5c050ccba2a5 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -96,14 +96,14 @@ public:
static bool isAsciiAlpha( const OUString& rStr );
/// whether type is pure numeric or not, e.g. return of getStringType
- static inline bool isNumericType( sal_Int32 nType )
+ static bool isNumericType( sal_Int32 nType )
{
return ((nType & nCharClassNumericType) != 0) &&
((nType & ~(nCharClassNumericTypeMask)) == 0);
}
/// whether type is pure alphanumeric or not, e.g. return of getStringType
- static inline bool isAlphaNumericType( sal_Int32 nType )
+ static bool isAlphaNumericType( sal_Int32 nType )
{
return ((nType & (nCharClassAlphaType |
nCharClassNumericType)) != 0) &&
@@ -112,14 +112,14 @@ public:
}
/// whether type is pure letter or not, e.g. return of getStringType
- static inline bool isLetterType( sal_Int32 nType )
+ static bool isLetterType( sal_Int32 nType )
{
return ((nType & nCharClassLetterType) != 0) &&
((nType & ~(nCharClassLetterTypeMask)) == 0);
}
/// whether type is pure letternumeric or not, e.g. return of getStringType
- static inline bool isLetterNumericType( sal_Int32 nType )
+ static bool isLetterNumericType( sal_Int32 nType )
{
return ((nType & (nCharClassLetterType |
nCharClassNumericType)) != 0) &&
diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index 8d18092b3bd9..defbabdf8563 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -69,17 +69,17 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
static OUString getName( const Index rIdx );
- static inline OUString getUserEntryName()
+ static OUString getUserEntryName()
{
return OUString( "_user" );
}
- static inline OUString getDefaultEntryName()
+ static OUString getDefaultEntryName()
{
return OUString( "_default" );
}
- static inline Index getIndex( const OUString& rName )
+ static Index getIndex( const OUString& rName )
{
for ( int i = static_cast(Index::Name); i < static_cast(Index::INVALID); ++i )
if ( getName( Index(i) ) == rName )
@@ -91,12 +91,12 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
return Index::INVALID;
}
- static inline size_t getElementCount()
+ static size_t getElementCount()
{
return static_cast(Index::INVALID);
}
- inline css::uno::Any getValue( const Index rIdx ) const
+ css::uno::Any getValue( const Index rIdx ) const
{
if ( static_cast(rIdx) < getElementCount() )
{
@@ -110,7 +110,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
}
template
- inline T getValue( const Index rIdx ) const
+ T getValue( const Index rIdx ) const
{
T aValue = T();
@@ -126,7 +126,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
return aValue;
}
- inline void setValue( const Index rIdx, css::uno::Any& rValue )
+ void setValue( const Index rIdx, css::uno::Any& rValue )
{
if ( static_cast(rIdx) < getElementCount() )
{
@@ -139,7 +139,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
}
template
- inline void setValue( const Index rIdx, T rValue )
+ void setValue( const Index rIdx, T rValue )
{
if ( static_cast(rIdx) < getElementCount() )
{
@@ -151,12 +151,12 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
}
}
- inline bool isDefaultEntry() const
+ bool isDefaultEntry() const
{
return m_bDefaultEntry;
}
- inline void setDefaultEntry( bool rValue )
+ void setDefaultEntry( bool rValue )
{
m_bDefaultEntry = rValue;
}
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index ccb549b2398b..02ec91526245 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -286,14 +286,14 @@ public:
bool bUseThousandSep = true ) const;
// dummy returns, to be implemented
- inline sal_Unicode getCurrZeroChar() const
+ sal_Unicode getCurrZeroChar() const
{ return cCurrZeroChar; }
- static inline bool isNumLeadingZero()
+ static bool isNumLeadingZero()
{ return true; }
/// standard decimal places
- static inline sal_uInt16 getNumDigits()
+ static sal_uInt16 getNumDigits()
{ return 2; }
- static inline bool isNumTrailingZeros()
+ static bool isNumTrailingZeros()
{ return true; }
// reserved words
@@ -315,7 +315,7 @@ public:
OOO_ENABLE_LOCALE_DATA_CHECKS is set to 'Y' or 'Yes' (or any other
string starting with 'Y') or '1'.
Also used in conjunction with the number formatter. */
- static inline bool areChecksEnabled()
+ static bool areChecksEnabled()
{
if (nLocaleDataChecking == 0)
evaluateLocaleDataChecking();
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index bb94742ecb5a..60685334461d 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -150,16 +150,16 @@ namespace utl
};
public:
- inline SharedUNOComponent()
+ SharedUNOComponent()
{
}
- explicit inline SharedUNOComponent( const css::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode eMode = TakeOwnership )
+ explicit SharedUNOComponent( const css::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode eMode = TakeOwnership )
{
reset( _rxComponent, eMode );
}
- inline SharedUNOComponent( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow )
+ SharedUNOComponent( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow )
{
set( _rRef, _queryThrow );
}
diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx
index 570a8d2a7a3d..774111269569 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -86,12 +86,12 @@ public:
void processVbaEventNoThrow( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs );
/** @throws css::lang::IllegalArgumentException if the passed sequence does not contain a value at the specified index. */
- static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex )
+ static void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex )
{ if( (nIndex < 0) || (nIndex >= rArgs.getLength()) ) throw css::lang::IllegalArgumentException(); }
/** @throws css::lang::IllegalArgumentException if the passed sequence does not contain a value of a specific at the specified index. */
template< typename Type >
- static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex )
+ static void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex )
{ checkArgument( rArgs, nIndex ); if( !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); }
protected:
@@ -125,8 +125,8 @@ protected:
{
sal_Int32 mnEventId;
css::uno::Sequence< css::uno::Any > maArgs;
- inline /*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId( nEventId ) {}
- inline EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {}
+ /*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId( nEventId ) {}
+ EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {}
};
typedef ::std::deque< EventQueueEntry > EventQueue;
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 75c1f900bebe..ef5f23cfed63 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -316,8 +316,8 @@ protected:
virtual const Color&
GetCanonicalTextColor( const StyleSettings& _rStyle ) const override;
- inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; }
- inline void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; }
+ void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; }
+ void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; }
// draws the radio button (the knob image), in its current state (pressed/checked)
// at the usual location, which can be overridden with SetStateRect
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index e8b79ad3742f..973f12421347 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -348,7 +348,7 @@ public:
when the control loses the focus - instead, the invalid input will be preserved.
*/
void EnforceValidValue( bool _bEnforce ) { mbEnforceValidValue = _bEnforce; }
- inline bool IsEnforceValidValue( ) const { return mbEnforceValidValue; }
+ bool IsEnforceValidValue( ) const { return mbEnforceValidValue; }
};
@@ -421,7 +421,7 @@ public:
when the control loses the focus - instead, the invalid input will be preserved.
*/
void EnforceValidValue( bool _bEnforce ) { mbEnforceValidValue = _bEnforce; }
- inline bool IsEnforceValidValue( ) const { return mbEnforceValidValue; }
+ bool IsEnforceValidValue( ) const { return mbEnforceValidValue; }
};
@@ -481,13 +481,13 @@ public:
virtual void SetUnit( FieldUnit meUnit ) override;
void SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit );
- inline void SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); }
+ void SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); }
sal_Int64 GetFirst( FieldUnit eOutUnit ) const;
- inline sal_Int64 GetFirst() const { return GetFirst(FUNIT_NONE); }
+ sal_Int64 GetFirst() const { return GetFirst(FUNIT_NONE); }
void SetLast( sal_Int64 nNewLast, FieldUnit eInUnit );
- inline void SetLast(sal_Int64 last) { SetLast(last, FUNIT_NONE); }
+ void SetLast(sal_Int64 last) { SetLast(last, FUNIT_NONE); }
sal_Int64 GetLast( FieldUnit eOutUnit ) const;
- inline sal_Int64 GetLast() const { return GetLast(FUNIT_NONE); }
+ sal_Int64 GetLast() const { return GetLast(FUNIT_NONE); }
static void SetDefaultUnit( FieldUnit eDefaultUnit );
static FieldUnit GetDefaultUnit();
diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx
index dea9b3c5470f..4a5dd3a69160 100644
--- a/include/vcl/fixedhyper.hxx
+++ b/include/vcl/fixedhyper.hxx
@@ -93,7 +93,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText
m_aClickHdl is called if the text is clicked.
*/
- inline void SetClickHdl( const Link& rLink ) { m_aClickHdl = rLink; }
+ void SetClickHdl( const Link& rLink ) { m_aClickHdl = rLink; }
// ::FixedHyperbaseLink
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 30997a984911..2d392b596897 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -300,7 +300,7 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue
ControlState mnPage1State;
ControlState mnPage2State;
- inline ScrollbarValue()
+ ScrollbarValue()
: ImplControlValue( ControlType::Scrollbar, 0 )
{
mnMin = 0; mnMax = 0; mnCur = 0; mnVisibleSize = 0;
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index b4ed9e988ec8..a34c7c14f9ab 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -88,7 +88,7 @@ class VCL_DLLPUBLIC Task
protected:
static void StartTimer( sal_uInt64 nMS );
- inline const ImplSchedulerData* GetSchedulerData() const { return mpSchedulerData; }
+ const ImplSchedulerData* GetSchedulerData() const { return mpSchedulerData; }
virtual void SetDeletionFlags();
/// Is this item ready to be dispatched at nTimeNow
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx
index f88969c733b9..95655b7b9192 100644
--- a/include/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
@@ -83,11 +83,11 @@ private:
SAL_DLLPRIVATE bool ImplMoveFocus( bool _bUpper );
SAL_DLLPRIVATE void ImplCalcFocusRect( bool _bUpper );
- SAL_DLLPRIVATE inline bool ImplIsUpperEnabled( ) const
+ SAL_DLLPRIVATE bool ImplIsUpperEnabled( ) const
{
return mnValue + mnValueStep <= mnMaxRange;
}
- SAL_DLLPRIVATE inline bool ImplIsLowerEnabled( ) const
+ SAL_DLLPRIVATE bool ImplIsLowerEnabled( ) const
{
return mnValue >= mnMinRange + mnValueStep;
}
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index a02ef5850446..97fd9034160d 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -92,7 +92,7 @@ public:
virtual TextAttrib* Clone() const override;
virtual bool operator==( const TextAttrib& rAttr ) const override;
- inline FontWeight getFontWeight() const { return meWeight; }
+ FontWeight getFontWeight() const { return meWeight; }
};
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index e3e0e827ee8e..c8bd45084318 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -104,19 +104,19 @@ class VclPtr
public:
/** Constructor...
*/
- inline VclPtr()
+ VclPtr()
: m_rInnerRef()
{}
/** Constructor...
*/
- inline VclPtr (reference_type * pBody)
+ VclPtr (reference_type * pBody)
: m_rInnerRef(pBody)
{}
/** Constructor... that doesn't take a ref.
*/
- inline VclPtr (reference_type * pBody, __sal_NoAcquire)
+ VclPtr (reference_type * pBody, __sal_NoAcquire)
: m_rInnerRef(pBody, SAL_NO_ACQUIRE)
{}
@@ -129,7 +129,7 @@ public:
@param rRef another reference
*/
template< class derived_type >
- inline VclPtr(
+ VclPtr(
const VclPtr< derived_type > & rRef,
typename ::vcl::detail::UpCast< reference_type, derived_type >::t = 0 )
: m_rInnerRef( static_cast(rRef) )
@@ -152,7 +152,7 @@ public:
/** Probably most common used: handle->someBodyOp().
*/
- inline reference_type * operator->() const
+ reference_type * operator->() const
{
return m_rInnerRef.get();
}
@@ -161,17 +161,17 @@ public:
I.e. handle->someBodyOp() and handle.get()->someBodyOp()
are the same.
*/
- inline reference_type * get() const
+ reference_type * get() const
{
return m_rInnerRef.get();
}
- inline void set(reference_type *pBody)
+ void set(reference_type *pBody)
{
m_rInnerRef.set(pBody);
}
- inline void reset(reference_type *pBody)
+ void reset(reference_type *pBody)
{
m_rInnerRef.set(pBody);
}
@@ -198,27 +198,27 @@ public:
return *this;
}
- inline operator reference_type * () const
+ operator reference_type * () const
{
return m_rInnerRef.get();
}
- inline explicit operator bool () const
+ explicit operator bool () const
{
return m_rInnerRef.get() != nullptr;
}
- inline void clear()
+ void clear()
{
m_rInnerRef.clear();
}
- inline void reset()
+ void reset()
{
m_rInnerRef.clear();
}
- inline void disposeAndClear()
+ void disposeAndClear()
{
// hold it alive for the lifetime of this method
::rtl::Reference aTmp(m_rInnerRef);
@@ -230,7 +230,7 @@ public:
/** Needed to place VclPtr's into STL collection.
*/
- inline bool operator< (const VclPtr & handle) const
+ bool operator< (const VclPtr & handle) const
{
return (m_rInnerRef < handle.m_rInnerRef);
}
@@ -314,26 +314,26 @@ class ScopedVclPtr : public VclPtr
public:
/** Constructor...
*/
- inline ScopedVclPtr()
+ ScopedVclPtr()
: VclPtr()
{}
/** Constructor
*/
- inline ScopedVclPtr (reference_type * pBody)
+ ScopedVclPtr (reference_type * pBody)
: VclPtr(pBody)
{}
/** Copy constructor...
*/
- inline ScopedVclPtr (const VclPtr & handle)
+ ScopedVclPtr (const VclPtr & handle)
: VclPtr(handle)
{}
/**
Assignment that releases the last reference.
*/
- inline void disposeAndReset(reference_type *pBody)
+ void disposeAndReset(reference_type *pBody)
{
VclPtr::disposeAndClear();
VclPtr::set(pBody);
@@ -342,7 +342,7 @@ public:
/**
Assignment that releases the last reference.
*/
- inline ScopedVclPtr& operator = (reference_type * pBody)
+ ScopedVclPtr& operator = (reference_type * pBody)
{
disposeAndReset(pBody);
return *this;
@@ -357,7 +357,7 @@ public:
@param rRef another reference
*/
template< class derived_type >
- inline ScopedVclPtr(
+ ScopedVclPtr(
const VclPtr< derived_type > & rRef,
typename ::vcl::detail::UpCast< reference_type, derived_type >::t = 0 )
: VclPtr( rRef )
@@ -386,7 +386,7 @@ private:
void reset(reference_type *pBody) = delete;
protected:
- inline ScopedVclPtr (reference_type * pBody, __sal_NoAcquire)
+ ScopedVclPtr (reference_type * pBody, __sal_NoAcquire)
: VclPtr(pBody, SAL_NO_ACQUIRE)
{}
};
diff --git a/include/vcl/vclreferencebase.hxx b/include/vcl/vclreferencebase.hxx
index 1813f866ade3..af60e2db9514 100644
--- a/include/vcl/vclreferencebase.hxx
+++ b/include/vcl/vclreferencebase.hxx
@@ -33,13 +33,13 @@ class VCL_DLLPUBLIC VclReferenceBase
template friend class VclPtr;
public:
- inline void acquire() const
+ void acquire() const
{
assert(mnRefCnt>0);
mnRefCnt++;
}
- inline void release() const
+ void release() const
{
assert(mnRefCnt>0);
if (!--mnRefCnt)
diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx
index 748fb4e95c87..a69e8ef31dec 100644
--- a/include/xmloff/ProgressBarHelper.hxx
+++ b/include/xmloff/ProgressBarHelper.hxx
@@ -53,7 +53,7 @@ public:
void SetReference(sal_Int32 nVal) { nReference = nVal; }
void SetValue(sal_Int32 nValue);
void SetRepeat(bool bValue) { bRepeat = bValue; }
- inline void Increment(sal_Int32 nInc = 1) { SetValue( nValue+nInc ); }
+ void Increment(sal_Int32 nInc = 1) { SetValue( nValue+nInc ); }
void End() { if (xStatusIndicator.is()) xStatusIndicator->end(); }
// set the new reference and returns the new value which gives the
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index ee2692fe0ba3..7015a616ea3c 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -99,7 +99,7 @@ public:
virtual void FillPropertySet(
const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override;
- inline bool HasCombinedCharactersLetter()
+ bool HasCombinedCharactersLetter()
{ return bHasCombinedCharactersLetter; }
const ::std::vector< XMLPropertyState > & GetProperties_() { return GetProperties(); }
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 2a6040bd4f25..b8f274cc90b2 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -411,7 +411,7 @@ public:
GetModel() const { return mxModel; }
// Get XNumberFormatsSupplier
css::uno::Reference< css::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier() { return mxNumberFormatsSupplier; }
- inline void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier)
+ void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier)
{
mxNumberFormatsSupplier = _xNumberFormatSupplier;
if ( mxNumberFormatsSupplier.is() && mxHandler.is() )
@@ -468,7 +468,7 @@ public:
bool *pEncoded=nullptr ) const;
// save linked sections?
- inline bool IsSaveLinkedSections() { return mbSaveLinkedSections; }
+ bool IsSaveLinkedSections() { return mbSaveLinkedSections; }
// get export flags
SvXMLExportFlags getExportFlags() const { return mnExportFlags; }
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 330e92a0da9a..c53b9c1bebac 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -220,10 +220,10 @@ protected:
const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& xAttrList );
virtual XMLTextImportHelper* CreateTextImport();
- inline void ClearTextImport() { mxTextImport = nullptr; }
+ void ClearTextImport() { mxTextImport = nullptr; }
virtual XMLShapeImportHelper* CreateShapeImport();
- inline bool HasShapeImport() const { return mxShapeImport.is(); }
- inline void ClearShapeImport() { mxShapeImport = nullptr; }
+ bool HasShapeImport() const { return mxShapeImport.is(); }
+ void ClearShapeImport() { mxShapeImport = nullptr; }
static SchXMLImportHelper* CreateChartImport();
::xmloff::OFormLayerXMLImport* CreateFormImport();
@@ -359,7 +359,7 @@ public:
const css::uno::Reference< css::container::XNameContainer > & GetMarkerHelper();
const css::uno::Reference< css::container::XNameContainer > & GetDashHelper();
inline css::uno::Reference< css::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier();
- inline void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier)
+ void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier)
{
mxNumberFormatsSupplier = _xNumberFormatSupplier;
}
diff --git a/include/xmlreader/span.hxx b/include/xmlreader/span.hxx
index 1d8bc838dc44..1f4630efca42 100644
--- a/include/xmlreader/span.hxx
+++ b/include/xmlreader/span.hxx
@@ -35,32 +35,32 @@ struct SAL_WARN_UNUSED OOO_DLLPUBLIC_XMLREADER Span {
char const * begin;
sal_Int32 length;
- inline Span(): begin(nullptr), length(0) {}
+ Span(): begin(nullptr), length(0) {}
// init length to avoid compiler warnings
- inline Span(char const * theBegin, sal_Int32 theLength):
+ Span(char const * theBegin, sal_Int32 theLength):
begin(theBegin), length(theLength) {}
- template< std::size_t N > explicit inline Span(char const (& literal)[N]):
+ template< std::size_t N > explicit Span(char const (& literal)[N]):
begin(literal), length(N - 1)
{}
- inline void clear() throw() { begin = nullptr; }
+ void clear() throw() { begin = nullptr; }
- inline bool is() const { return begin != nullptr; }
+ bool is() const { return begin != nullptr; }
- inline bool equals(Span const & text) const {
+ bool equals(Span const & text) const {
return length == text.length
&& (rtl_str_compare_WithLength(
begin, length, text.begin, text.length)
== 0);
}
- inline bool equals(char const * textBegin, sal_Int32 textLength) const {
+ bool equals(char const * textBegin, sal_Int32 textLength) const {
return equals(Span(textBegin, textLength));
}
- template< std::size_t N > inline bool equals(char const (& literal)[N])
+ template< std::size_t N > bool equals(char const (& literal)[N])
const
{
return equals(Span(literal, N - 1));
diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx
index c25c456c8983..364590b05243 100644
--- a/include/xmlreader/xmlreader.hxx
+++ b/include/xmlreader/xmlreader.hxx
@@ -129,9 +129,9 @@ private:
enum class State { Content, StartTag, EndTag, EmptyElementTag, Done };
- SAL_DLLPRIVATE inline char read() { return pos_ == end_ ? '\0' : *pos_++; }
+ SAL_DLLPRIVATE char read() { return pos_ == end_ ? '\0' : *pos_++; }
- SAL_DLLPRIVATE inline char peek() { return pos_ == end_ ? '\0' : *pos_; }
+ SAL_DLLPRIVATE char peek() { return pos_ == end_ ? '\0' : *pos_; }
SAL_DLLPRIVATE void normalizeLineEnds(Span const & text);
diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index ba31f5c5f022..e7bac7bcb071 100644
--- a/include/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
@@ -42,7 +42,7 @@ class XMLSCRIPT_DLLPUBLIC XMLElement
: public cppu::WeakImplHelper< css::xml::sax::XAttributeList >
{
public:
- inline XMLElement( OUString const & name )
+ XMLElement( OUString const & name )
: _name( name )
{}
diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index 17d12210e32c..12eb3fdb76ab 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -51,7 +51,7 @@ public:
private:
/// @throws css::io::BufferSizeExceededException
void resizeBuffer(sal_Int32 nMinSize);
- inline void checkInvariants() {
+ void checkInvariants() {
assert( m_nBufferLen >= 0 );
assert( m_nOccupiedBuffer >= 0 );
assert( m_nOccupiedBuffer <= m_nBufferLen );
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 0f5e126c6299..569425655732 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -212,7 +212,7 @@ public:
FileHandleGuard(const FileHandleGuard&) = delete;
FileHandleGuard& operator=(const FileHandleGuard&) = delete;
- inline oslFileHandle & getHandle() { return m_rHandle; }
+ oslFileHandle & getHandle() { return m_rHandle; }
private:
oslFileHandle & m_rHandle;
diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index 96c6ee78d505..c124fce09c16 100644
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
@@ -50,7 +50,7 @@ struct LangSvcEntries
aSvcImplNames[0] = rSvcImplName;
}
- inline void Clear()
+ void Clear()
{
aSvcImplNames.realloc(0);
nLastTriedSvcIndex = -1;
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
index c31f142ca3c2..29fd54a41c17 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
@@ -152,8 +152,8 @@ public:
LwpColor* GetFillColor();
XFBGImage* GetFillPattern();
- inline bool IsTransparent() { return (m_nID == BACK_TRANSPARENT); }
- inline bool IsPatternFill() { return (m_nID > 2 && m_nID < 72); }
+ bool IsTransparent() { return (m_nID == BACK_TRANSPARENT); }
+ bool IsPatternFill() { return (m_nID > 2 && m_nID < 72); }
friend class LwpBackgroundOverride;
private:
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index fe6b61a70b4f..8c41bec29753 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -138,7 +138,7 @@ public:
* @param type of the object.
* @descr set the type to the draw object.
*/
- inline void SetObjectType(DrawObjectType eType) { m_eType = eType; }
+ void SetObjectType(DrawObjectType eType) { m_eType = eType; }
};
/**
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx
index 6928df392b42..b0297fbbade7 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -116,8 +116,8 @@ public:
{}
public:
void Read(LwpObjectStream *pStrm);
- inline sal_uInt16 GetFaceID(){return m_nFaceName;}
- inline sal_uInt16 GetAltFaceID(){return m_nAltFaceName;}
+ sal_uInt16 GetFaceID(){return m_nFaceName;}
+ sal_uInt16 GetAltFaceID(){return m_nAltFaceName;}
void Override(rtl::Reference const & pFont);
inline bool IsFaceNameOverridden();
inline bool IsAltFaceNameOverridden();
diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx
index 2f2ac1d96466..2009e11d90f5 100644
--- a/lotuswordpro/source/filter/lwpfoundry.hxx
+++ b/lotuswordpro/source/filter/lwpfoundry.hxx
@@ -132,8 +132,8 @@ private:
LwpObjectID m_OleHead;
LwpObjectID m_OleTail;
public:
- inline LwpObjectID& GetContentList() { return m_ContentList; }
- inline LwpObjectID& GetGraphicListHead() { return m_GrapHead; }
+ LwpObjectID& GetContentList() { return m_ContentList; }
+ LwpObjectID& GetGraphicListHead() { return m_GrapHead; }
LwpContent* EnumContents(LwpContent* pContent);
public:
@@ -249,14 +249,14 @@ private: //file members
private:
void ReadStyles(LwpObjectStream *pStrm);
public:
- inline LwpContentManager& GetContentManager() { return m_ContentMgr; }
- inline LwpObjectID& GetGraphicListHead() { return m_ContentMgr.GetGraphicListHead(); }
- inline LwpFontManager& GetFontManger() { return m_FontMgr;}
- inline LwpObjectID& GetTextStyleHead() { return m_TextStyle;}
- inline LwpObjectID& GetLayout() {return m_Layout;}
- inline LwpObjectID& GetBulletManagerID() { return m_BulMgr.GetHeadID();}
- inline LwpDocument* GetDocument(){ return m_pDoc;}
- inline LwpNumberManager& GetNumberManager() { return m_NumMgr;}
+ LwpContentManager& GetContentManager() { return m_ContentMgr; }
+ LwpObjectID& GetGraphicListHead() { return m_ContentMgr.GetGraphicListHead(); }
+ LwpFontManager& GetFontManger() { return m_FontMgr;}
+ LwpObjectID& GetTextStyleHead() { return m_TextStyle;}
+ LwpObjectID& GetLayout() {return m_Layout;}
+ LwpObjectID& GetBulletManagerID() { return m_BulMgr.GetHeadID();}
+ LwpDocument* GetDocument(){ return m_pDoc;}
+ LwpNumberManager& GetNumberManager() { return m_NumMgr;}
LwpObjectID * GetDefaultTextStyle() ;
private:
std::unique_ptr m_xStyleMgr;
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index c780067fb365..5940afa8cda9 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -97,7 +97,7 @@ class LwpVirtualLayout : public LwpDLNFPVList
{
public:
LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- inline virtual sal_uInt16 GetNumCols(){return 1;}
+ virtual sal_uInt16 GetNumCols(){return 1;}
virtual double GetColWidth(sal_uInt16 nIndex);
virtual double GetColGap(sal_uInt16 nIndex);
virtual bool IsAutoGrow(){ return false;}
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index 0eb7f40b17b3..86b62a6a2624 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -116,7 +116,7 @@ public:
sal_Int32 GetScaleWidth(){return m_nScaleWidth;}
sal_Int32 GetScaleHeight(){return m_nScaleHeight;}
sal_uInt16 GetPlacement(){return m_nPlacement;}
- inline LwpPoint& GetOffset() {return m_Offset;}
+ LwpPoint& GetOffset() {return m_Offset;}
protected:
virtual void Read() override;
protected:
@@ -209,8 +209,8 @@ public:
LwpColumnInfo();
~LwpColumnInfo();
void Read(LwpObjectStream *pStrm);
- inline double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(m_nWidth);}
- inline double GetGap(){return LwpTools::ConvertFromUnitsToMetric(m_nGap);}
+ double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(m_nWidth);}
+ double GetGap(){return LwpTools::ConvertFromUnitsToMetric(m_nGap);}
private:
sal_Int32 m_nWidth;
sal_Int32 m_nGap;
@@ -221,7 +221,7 @@ class LwpLayoutColumns : public LwpVirtualPiece
public:
LwpLayoutColumns(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual void Parse(IXFStream* pOutputStream) override;
- inline sal_uInt16 GetNumCols(){return m_nNumCols;}
+ sal_uInt16 GetNumCols(){return m_nNumCols;}
double GetColWidth(sal_uInt16 nIndex);
double GetColGap(sal_uInt16 nIndex);
protected:
@@ -238,7 +238,7 @@ class LwpLayoutGutters : public LwpVirtualPiece
public:
LwpLayoutGutters(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual void Parse(IXFStream* pOutputStream) override;
- inline LwpBorderStuff& GetBorderStuff() { return m_BorderBuffer; }
+ LwpBorderStuff& GetBorderStuff() { return m_BorderBuffer; }
protected:
virtual void Read() override;
protected:
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index e34ae8147852..08e79c7abe36 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -80,7 +80,7 @@ public:
virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_LAYOUT;}
sal_uInt16 GetRowID() { return crowid;}
virtual void RegisterStyle() override;
- inline LwpTableLayout * GetParentTableLayout(){return dynamic_cast(GetParent().obj().get());}
+ LwpTableLayout * GetParentTableLayout(){return dynamic_cast(GetParent().obj().get());}
void SetRowMap();
protected:
void Read() override;
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index f4c421bea964..9168b680b19f 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -114,7 +114,7 @@ public:
const OUString& GetSectionName() { return m_CurrSectionName; }
LwpHyperlinkMgr* GetHyperlinkMgr() { return m_pHyperlinkMgr.get(); }
- inline bool IsPMModified() { return m_bPMModified; }
+ bool IsPMModified() { return m_bPMModified; }
inline void SetPMModified(bool bPMModified);
inline void SetDropcapFlag(bool bFlag);
inline void SetTabLayout(LwpLayout* pLayout);
diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx
index 1e8a6fb8a934..5c2c2c85191c 100644
--- a/lotuswordpro/source/filter/lwptoc.hxx
+++ b/lotuswordpro/source/filter/lwptoc.hxx
@@ -147,10 +147,10 @@ public:
LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
void RegisterStyle() override;
virtual void XFConvert(XFContentContainer* pCont) override;
- inline sal_uInt16 GetLevel(){return m_nLevel;}
- inline bool GetUseText(){ return (m_nFlags & USETEXT) != 0;}
- inline OUString GetSearchStyle(){return m_SearchName.str();}
- inline bool GetUseLeadingText(){ return (m_nFlags & USENUMBER) != 0;}
+ sal_uInt16 GetLevel(){return m_nLevel;}
+ bool GetUseText(){ return (m_nFlags & USETEXT) != 0;}
+ OUString GetSearchStyle(){return m_SearchName.str();}
+ bool GetUseLeadingText(){ return (m_nFlags & USENUMBER) != 0;}
private:
virtual ~LwpTocLevelData() override;
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 4caf0f9364d8..baffe4ba2b76 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -37,7 +37,7 @@ struct ElementInfo
sal_Int32 mnElement; /// The element identifier.
bool mbTrimSpaces; /// True = trims leading/trailing spaces from text data.
- inline explicit ElementInfo() : maChars( 0), mnElement( XML_TOKEN_INVALID ), mbTrimSpaces( false ) {}
+ explicit ElementInfo() : maChars( 0), mnElement( XML_TOKEN_INVALID ), mbTrimSpaces( false ) {}
};
ContextHandler2Helper::ContextHandler2Helper( bool bEnableTrimSpace ) :
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 38c25ba312dc..9e20540544ab 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -82,7 +82,7 @@ public:
DocumentOpenedGuard(const DocumentOpenedGuard&) = delete;
DocumentOpenedGuard& operator=(const DocumentOpenedGuard&) = delete;
- inline bool isValid() const { return mbValid; }
+ bool isValid() const { return mbValid; }
private:
OUString maUrl;
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 3165626ab3b4..4459bfc3e93c 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -39,7 +39,7 @@ namespace prv {
class Locator : public ::cppu::WeakImplHelper< XLocator >
{
public:
- inline explicit Locator( RecordParser* pParser ) : mpParser( pParser ) {}
+ explicit Locator( RecordParser* pParser ) : mpParser( pParser ) {}
void dispose();
/// @throws css::uno::RuntimeException
@@ -94,7 +94,7 @@ class ContextStack
public:
explicit ContextStack( FragmentHandlerRef const & xHandler );
- inline bool empty() const { return maStack.empty(); }
+ bool empty() const { return maStack.empty(); }
sal_Int32 getCurrentRecId() const;
bool hasCurrentEndRecId() const;
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index dba0a30b4dd5..7645f448b0d4 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -58,7 +58,7 @@ namespace {
struct TitleKey : public ::std::pair< ObjectType, ::std::pair< sal_Int32, sal_Int32 > >
{
- inline explicit TitleKey( ObjectType eObjType, sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 )
+ explicit TitleKey( ObjectType eObjType, sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 )
{ first = eObjType; second.first = nMainIdx; second.second = nSubIdx; }
};
@@ -73,7 +73,7 @@ struct TitleLayoutInfo
ModelRef< LayoutModel > mxLayout; /// The layout model, if existing.
GetShapeFunc mpGetShape; /// Helper function to receive the title shape.
- inline explicit TitleLayoutInfo() : mpGetShape( nullptr ) {}
+ explicit TitleLayoutInfo() : mpGetShape( nullptr ) {}
void convertTitlePos(
ConverterRoot& rRoot,
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 43bdcc0d8b1a..b9d4720d9e1c 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -507,7 +507,7 @@ struct ObjectTypeFormatEntry
const AutoFormatEntry* mpAutoFills; /// Automatic fill formatting for all chart styles.
const AutoTextEntry* mpAutoTexts; /// Automatic text attributes for all chart styles.
bool mbIsFrame; /// True = object is a frame, false = object is a line.
- inline ObjectTypeFormatEntry(ObjectType eObjType, const ShapePropertyInfo& rPropInfo,
+ ObjectTypeFormatEntry(ObjectType eObjType, const ShapePropertyInfo& rPropInfo,
const AutoFormatEntry* pAutoLines,
const AutoFormatEntry* pAutoFills,
const AutoTextEntry* pAutoTexts,
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index fd444c131094..9488567080c1 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -56,7 +56,7 @@ struct AxesSetModel
TypeGroupVector maTypeGroups; /// All type groups containing data series.
AxisMap maAxes; /// All axes mapped by API axis type.
- inline explicit AxesSetModel() {}
+ explicit AxesSetModel() {}
};
/** Axes set converter. This is a helper class for the plot area converter. */
@@ -74,13 +74,13 @@ public:
bool bSupportsVaryColorsByPoint );
/** Returns the automatic chart title if the axes set contains only one series. */
- inline const OUString& getAutomaticTitle() const { return maAutoTitle; }
+ const OUString& getAutomaticTitle() const { return maAutoTitle; }
/** Returns true, if the chart is three-dimensional. */
- inline bool is3dChart() const { return mb3dChart; }
+ bool is3dChart() const { return mb3dChart; }
/** Returns true, if chart type supports wall and floor format in 3D mode. */
- inline bool isWall3dChart() const { return mbWall3dChart; }
+ bool isWall3dChart() const { return mbWall3dChart; }
/** Returns true, if chart is a pie chart or doughnut chart. */
- inline bool isPieChart() const { return mbPieChart; }
+ bool isPieChart() const { return mbPieChart; }
private:
OUString maAutoTitle;
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 220bf29aba82..d35cc1cf2ff6 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -163,7 +163,7 @@ struct PropInfo
PropType meType;
sal_uInt16 mnId;
sal_uInt32 mnSize;
- inline explicit PropInfo( const OUString& rName, PropType eType, sal_uInt16 nId, sal_uInt32 nSize ) :
+ explicit PropInfo( const OUString& rName, PropType eType, sal_uInt16 nId, sal_uInt32 nSize ) :
maName( rName ), meType( eType ), mnId( nId ), mnSize( nSize ) {}
};
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index eedf306483b9..99a14231190c 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -39,7 +39,7 @@ namespace {
struct ValueRangeComp
{
- inline bool operator()( const ValueRange& rLHS, const ValueRange& rRHS ) const
+ bool operator()( const ValueRange& rLHS, const ValueRange& rRHS ) const
{
return rLHS.mnLast < rRHS.mnFirst;
}
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 805bb2d7a504..eb7a54b94b9c 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -131,8 +131,8 @@ struct VbaControlNameInserter
{
public:
VbaControlNamesSet& mrCtrlNames;
- inline explicit VbaControlNameInserter( VbaControlNamesSet& rCtrlNames ) : mrCtrlNames( rCtrlNames ) {}
- inline void operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); }
+ explicit VbaControlNameInserter( VbaControlNamesSet& rCtrlNames ) : mrCtrlNames( rCtrlNames ) {}
+ void operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); }
};
/** A dummy invisible form control (fixed label without text) that is used to
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index 8e3408800fc6..8e902b35aa37 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -39,7 +39,7 @@ public:
ZipPackageBuffer();
virtual ~ZipPackageBuffer() override;
- inline void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); }
+ void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); }
const css::uno::Sequence < sal_Int8>& getSequence () const { return m_aBuffer; }
// XInputStream
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index d54a3098d6a7..a87acfcb8292 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -66,7 +66,7 @@ public:
~BlopObject();
- inline sal_uInt8 readBYTE(sal_uInt32 index) const
+ sal_uInt8 readBYTE(sal_uInt32 index) const
{
if (index >= m_bufferLen) {
throw BoundsError();
@@ -74,7 +74,7 @@ public:
return m_pBuffer[index];
}
- inline sal_Int16 readINT16(sal_uInt32 index) const
+ sal_Int16 readINT16(sal_uInt32 index) const
{
if (m_bufferLen < 2 || index >= m_bufferLen - 1) {
throw BoundsError();
@@ -82,7 +82,7 @@ public:
return ((m_pBuffer[index] << 8) | (m_pBuffer[index+1] << 0));
}
- inline sal_uInt16 readUINT16(sal_uInt32 index) const
+ sal_uInt16 readUINT16(sal_uInt32 index) const
{
if (m_bufferLen < 2 || index >= m_bufferLen - 1) {
throw BoundsError();
@@ -90,7 +90,7 @@ public:
return ((m_pBuffer[index] << 8) | (m_pBuffer[index+1] << 0));
}
- inline sal_Int32 readINT32(sal_uInt32 index) const
+ sal_Int32 readINT32(sal_uInt32 index) const
{
if (m_bufferLen < 4 || index >= m_bufferLen - 3) {
throw BoundsError();
@@ -103,7 +103,7 @@ public:
);
}
- inline sal_uInt32 readUINT32(sal_uInt32 index) const
+ sal_uInt32 readUINT32(sal_uInt32 index) const
{
if (m_bufferLen < 4 || index >= m_bufferLen - 3) {
throw BoundsError();
@@ -116,7 +116,7 @@ public:
);
}
- inline sal_Int64 readINT64(sal_uInt32 index) const
+ sal_Int64 readINT64(sal_uInt32 index) const
{
if (m_bufferLen < 8 || index >= m_bufferLen - 7) {
throw BoundsError();
@@ -133,7 +133,7 @@ public:
);
}
- inline sal_uInt64 readUINT64(sal_uInt32 index) const
+ sal_uInt64 readUINT64(sal_uInt32 index) const
{
if (m_bufferLen < 8 || index >= m_bufferLen - 7) {
throw BoundsError();
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(); }
+ 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(); }
- 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(); }
+ 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& _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& _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& _aLink ){ m_aCollapsedLink = _aLink; }
- inline bool isCollapsed() const { return m_bCollapsed; }
+ void setCollapsedHdl(const Link& _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& 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;
}
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 1ef86e66d91b..d39da67650a9 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -80,7 +80,7 @@ class RscTypCont
void Init(); // initializes classes and tables
void SETCONST( RscConst *, const char *, sal_uInt32 );
void SETCONST( RscConst *, Atom, sal_uInt32 );
- inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast(p3)); }
+ void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast(p3)); }
RscEnum * InitFieldUnitsType();
RscTupel * InitStringLongTupel();
static RscCont * InitStringLongTupelList( RscTupel * pStringLongTupel );
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 2a99e0aecda1..6455c35b2aaa 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -119,9 +119,9 @@ struct rtl_bootstrap_NameValue
OUString sName;
OUString sValue;
- inline rtl_bootstrap_NameValue()
+ rtl_bootstrap_NameValue()
{}
- inline rtl_bootstrap_NameValue(
+ rtl_bootstrap_NameValue(
OUString const & name, OUString const & value )
: sName( name ),
sValue( value )
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 4d0ecb199b61..72558a946131 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -81,19 +81,19 @@ struct StringTraits
typedef rtl_String String;
- static inline void createString(rtl_String ** pString,
+ static void createString(rtl_String ** pString,
sal_Char const * pChars, sal_Int32 nLen)
{
rtl_string_newFromStr_WithLength(pString, pChars, nLen);
}
- static inline void createBuffer(rtl_String ** pBuffer,
+ static void createBuffer(rtl_String ** pBuffer,
sal_Int32 * pCapacity)
{
rtl_string_new_WithLength(pBuffer, *pCapacity);
}
- static inline void appendChars(rtl_String ** pBuffer, sal_Int32 * pCapacity,
+ static void appendChars(rtl_String ** pBuffer, sal_Int32 * pCapacity,
sal_Int32 * pOffset, sal_Char const * pChars,
sal_Int32 nLen)
{
@@ -102,7 +102,7 @@ struct StringTraits
*pOffset += nLen;
}
- static inline void appendAscii(rtl_String ** pBuffer, sal_Int32 * pCapacity,
+ static void appendAscii(rtl_String ** pBuffer, sal_Int32 * pCapacity,
sal_Int32 * pOffset, sal_Char const * pStr,
sal_Int32 nLen)
{
@@ -118,19 +118,19 @@ struct UStringTraits
typedef rtl_uString String;
- static inline void createString(rtl_uString ** pString,
+ static void createString(rtl_uString ** pString,
sal_Unicode const * pChars, sal_Int32 nLen)
{
rtl_uString_newFromStr_WithLength(pString, pChars, nLen);
}
- static inline void createBuffer(rtl_uString ** pBuffer,
+ static void createBuffer(rtl_uString ** pBuffer,
sal_Int32 * pCapacity)
{
rtl_uString_new_WithLength(pBuffer, *pCapacity);
}
- static inline void appendChars(rtl_uString ** pBuffer,
+ static void appendChars(rtl_uString ** pBuffer,
sal_Int32 * pCapacity, sal_Int32 * pOffset,
sal_Unicode const * pChars, sal_Int32 nLen)
{
@@ -139,7 +139,7 @@ struct UStringTraits
*pOffset += nLen;
}
- static inline void appendAscii(rtl_uString ** pBuffer,
+ static void appendAscii(rtl_uString ** pBuffer,
sal_Int32 * pCapacity, sal_Int32 * pOffset,
sal_Char const * pStr, sal_Int32 nLen)
{
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index 7edeb3067409..b00dfb99f472 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -318,9 +318,9 @@ struct Component
sal_Unicode const * pBegin;
sal_Unicode const * pEnd;
- inline Component(): pBegin(nullptr), pEnd(nullptr) {}
+ Component(): pBegin(nullptr), pEnd(nullptr) {}
- inline bool isPresent() const { return pBegin != nullptr; }
+ bool isPresent() const { return pBegin != nullptr; }
inline sal_Int32 getLength() const;
};
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index c3f5888c72ba..5f394983c016 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -207,13 +207,13 @@ public:
SCROW nRow;
SCCOL nCol;
- inline Details( formula::FormulaGrammar::AddressConvention eConvP, SCROW nRowP, SCCOL nColP ) :
+ Details( formula::FormulaGrammar::AddressConvention eConvP, SCROW nRowP, SCCOL nColP ) :
eConv(eConvP), nRow(nRowP), nCol(nColP)
{}
- inline Details( formula::FormulaGrammar::AddressConvention eConvP, ScAddress const & rAddr ) :
+ Details( formula::FormulaGrammar::AddressConvention eConvP, ScAddress const & rAddr ) :
eConv(eConvP), nRow(rAddr.Row()), nCol(rAddr.Col())
{}
- inline Details( formula::FormulaGrammar::AddressConvention eConvP) :
+ Details( formula::FormulaGrammar::AddressConvention eConvP) :
eConv(eConvP), nRow(0), nCol(0)
{}
/* Use the formula::FormulaGrammar::AddressConvention associated with rAddr::Tab() */
@@ -227,82 +227,82 @@ public:
sal_uInt16 mnFileId;
bool mbExternal;
- inline ExternalInfo() :
+ ExternalInfo() :
mnFileId(0), mbExternal(false)
{}
};
- inline ScAddress() :
+ ScAddress() :
nRow(0), nCol(0), nTab(0)
{}
- inline ScAddress( SCCOL nColP, SCROW nRowP, SCTAB nTabP ) :
+ ScAddress( SCCOL nColP, SCROW nRowP, SCTAB nTabP ) :
nRow(nRowP), nCol(nColP), nTab(nTabP)
{}
/** Yes, it is what it seems to be: Uninitialized. May be used for
performance reasons if it is initialized by other means. */
- inline ScAddress( Uninitialized )
+ ScAddress( Uninitialized )
{}
- inline ScAddress( InitializeInvalid ) :
+ ScAddress( InitializeInvalid ) :
nRow(-1), nCol(-1), nTab(-1)
{}
- inline ScAddress( const ScAddress& rAddress ) :
+ ScAddress( const ScAddress& rAddress ) :
nRow(rAddress.nRow), nCol(rAddress.nCol), nTab(rAddress.nTab)
{}
inline ScAddress& operator=( const ScAddress& rAddress );
inline void Set( SCCOL nCol, SCROW nRow, SCTAB nTab );
- inline SCROW Row() const
+ SCROW Row() const
{
return nRow;
}
- inline SCCOL Col() const
+ SCCOL Col() const
{
return nCol;
}
- inline SCTAB Tab() const
+ SCTAB Tab() const
{
return nTab;
}
- inline void SetRow( SCROW nRowP )
+ void SetRow( SCROW nRowP )
{
nRow = nRowP;
}
- inline void SetCol( SCCOL nColP )
+ void SetCol( SCCOL nColP )
{
nCol = nColP;
}
- inline void SetTab( SCTAB nTabP )
+ void SetTab( SCTAB nTabP )
{
nTab = nTabP;
}
- inline void SetInvalid()
+ void SetInvalid()
{
nRow = -1;
nCol = -1;
nTab = -1;
}
- inline bool IsValid() const
+ bool IsValid() const
{
return (nRow >= 0) && (nCol >= 0) && (nTab >= 0);
}
inline void PutInOrder( ScAddress& rAddress );
- inline void IncRow( SCsROW nDelta = 1 )
+ void IncRow( SCsROW nDelta = 1 )
{
nRow = sal::static_int_cast(nRow + nDelta);
}
- inline void IncCol( SCsCOL nDelta = 1 )
+ void IncCol( SCsCOL nDelta = 1 )
{
nCol = sal::static_int_cast(nCol + nDelta);
}
- inline void IncTab( SCsTAB nDelta = 1 )
+ void IncTab( SCsTAB nDelta = 1 )
{
nTab = sal::static_int_cast(nTab + nDelta);
}
- inline void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const
+ void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const
{
nColP = nCol;
nRowP = nRow;
@@ -474,51 +474,51 @@ public:
ScAddress aStart;
ScAddress aEnd;
- inline ScRange() :
+ ScRange() :
aStart(), aEnd()
{}
- inline ScRange( ScAddress::Uninitialized eUninitialized ) :
+ ScRange( ScAddress::Uninitialized eUninitialized ) :
aStart( eUninitialized ), aEnd( eUninitialized )
{}
- inline ScRange( ScAddress::InitializeInvalid eInvalid ) :
+ ScRange( ScAddress::InitializeInvalid eInvalid ) :
aStart( eInvalid ), aEnd( eInvalid )
{}
- inline ScRange( const ScAddress& aInputStart, const ScAddress& aInputEnd ) :
+ ScRange( const ScAddress& aInputStart, const ScAddress& aInputEnd ) :
aStart( aInputStart ), aEnd( aInputEnd )
{
aStart.PutInOrder( aEnd );
}
- inline ScRange( const ScRange& rRange ) :
+ ScRange( const ScRange& rRange ) :
aStart( rRange.aStart ), aEnd( rRange.aEnd )
{}
- inline ScRange( const ScAddress& rRange ) :
+ ScRange( const ScAddress& rRange ) :
aStart( rRange ), aEnd( rRange )
{}
- inline ScRange( SCCOL nCol, SCROW nRow, SCTAB nTab ) :
+ ScRange( SCCOL nCol, SCROW nRow, SCTAB nTab ) :
aStart( nCol, nRow, nTab ), aEnd( aStart )
{}
- inline ScRange( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2 ) :
+ ScRange( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2 ) :
aStart( nCol1, nRow1, nTab1 ), aEnd( nCol2, nRow2, nTab2 )
{}
- inline ScRange& operator=( const ScRange& rRange )
+ ScRange& operator=( const ScRange& rRange )
{
aStart = rRange.aStart;
aEnd = rRange.aEnd;
return *this;
}
- inline ScRange& operator=( const ScAddress& rPos )
+ ScRange& operator=( const ScAddress& rPos )
{
aStart = aEnd = rPos;
return *this;
}
- inline void SetInvalid()
+ void SetInvalid()
{
aStart.SetInvalid();
aEnd.SetInvalid();
}
- inline bool IsValid() const
+ bool IsValid() const
{
return aStart.IsValid() && aEnd.IsValid();
}
@@ -773,43 +773,43 @@ private:
bool bRelRow;
bool bRelTab;
public:
- inline ScRefAddress() :
+ ScRefAddress() :
bRelCol(false), bRelRow(false), bRelTab(false)
{}
- inline ScRefAddress( SCCOL nCol, SCROW nRow, SCTAB nTab,
+ ScRefAddress( SCCOL nCol, SCROW nRow, SCTAB nTab,
bool bRelColP, bool bRelRowP, bool bRelTabP ) :
aAdr(nCol, nRow, nTab),
bRelCol(bRelColP), bRelRow(bRelRowP), bRelTab(bRelTabP)
{}
- inline ScRefAddress( const ScRefAddress& rRef ) :
+ ScRefAddress( const ScRefAddress& rRef ) :
aAdr(rRef.aAdr), bRelCol(rRef.bRelCol), bRelRow(rRef.bRelRow),
bRelTab(rRef.bRelTab)
{}
inline ScRefAddress& operator=( const ScRefAddress& );
- inline bool IsRelCol() const
+ bool IsRelCol() const
{
return bRelCol;
}
- inline bool IsRelRow() const
+ bool IsRelRow() const
{
return bRelRow;
}
- inline bool IsRelTab() const
+ bool IsRelTab() const
{
return bRelTab;
}
- inline void SetRelCol(bool bNewRelCol)
+ void SetRelCol(bool bNewRelCol)
{
bRelCol = bNewRelCol;
}
- inline void SetRelRow(bool bNewRelRow)
+ void SetRelRow(bool bNewRelRow)
{
bRelRow = bNewRelRow;
}
- inline void SetRelTab(bool bNewRelTab)
+ void SetRelTab(bool bNewRelTab)
{
bRelTab = bNewRelTab;
}
@@ -819,20 +819,20 @@ public:
inline void Set( SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
bool bNewRelCol, bool bNewRelRow, bool bNewRelTab );
- inline const ScAddress& GetAddress() const
+ const ScAddress& GetAddress() const
{
return aAdr;
}
- inline SCCOL Col() const
+ SCCOL Col() const
{
return aAdr.Col();
}
- inline SCROW Row() const
+ SCROW Row() const
{
return aAdr.Row();
}
- inline SCTAB Tab() const
+ SCTAB Tab() const
{
return aAdr.Tab();
}
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 23e97ca17f1a..dc9b2884aec5 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -71,7 +71,7 @@ public:
bool IsMerged() const { return nColMerge>1 || nRowMerge>1; }
- inline ScMergeAttr& operator=(const ScMergeAttr& rMerge)
+ ScMergeAttr& operator=(const ScMergeAttr& rMerge)
{
nColMerge = rMerge.nColMerge;
nRowMerge = rMerge.nRowMerge;
@@ -141,7 +141,7 @@ public:
void SetHideCell( bool bHCell);
bool GetHidePrint() const { return bHidePrint; }
void SetHidePrint( bool bHPrint);
- inline ScProtectionAttr& operator=(const ScProtectionAttr& rProtection)
+ ScProtectionAttr& operator=(const ScProtectionAttr& rProtection)
{
bProtection = rProtection.bProtection;
bHideFormula = rProtection.bHideFormula;
@@ -310,13 +310,13 @@ public:
virtual bool operator==( const SfxPoolItem& rCmp ) const override;
- inline sal_uInt16 GetWidth() const { return mnWidth; }
- inline sal_uInt16 GetHeight() const { return mnHeight; }
- inline bool IsValid() const { return mnWidth || mnHeight; }
+ sal_uInt16 GetWidth() const { return mnWidth; }
+ sal_uInt16 GetHeight() const { return mnHeight; }
+ bool IsValid() const { return mnWidth || mnHeight; }
- inline void SetWidth( sal_uInt16 nWidth ) { mnWidth = nWidth; }
- inline void SetHeight( sal_uInt16 nHeight ) { mnHeight = nHeight; }
- inline void Set( sal_uInt16 nWidth, sal_uInt16 nHeight )
+ void SetWidth( sal_uInt16 nWidth ) { mnWidth = nWidth; }
+ void SetHeight( sal_uInt16 nHeight ) { mnHeight = nHeight; }
+ void Set( sal_uInt16 nWidth, sal_uInt16 nHeight )
{ mnWidth = nWidth; mnHeight = nHeight; }
virtual bool GetPresentation( SfxItemPresentation ePresentation,
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 049b74482962..5c8fbb5bfab8 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -131,7 +131,7 @@ public:
bool IsValid( const ScDocument* pDoc ) const
{ return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); }
- inline ScRange MakeRange() const
+ ScRange MakeRange() const
{ return ScRange( aStart.MakeAddress(),
aEnd.MakeAddress() ); }
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 468d0c3891ba..0aa34f5b8dd8 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -463,7 +463,7 @@ private:
virtual bool IsForceArrayParameter( const formula::FormulaToken* pToken, sal_uInt16 nParam ) const override;
/// Access the CharTable flags
- inline ScCharFlags GetCharTableFlags( sal_Unicode c, sal_Unicode cLast )
+ ScCharFlags GetCharTableFlags( sal_Unicode c, sal_Unicode cLast )
{ return c < 128 ? pConv->getCharTableFlags(c, cLast) : ScCharFlags::NONE; }
};
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index b99538667267..894755d74421 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -303,10 +303,10 @@ struct ScFieldIdentifier
sal_Int32 mnFieldIdx; /// Field index (if several fields with same name exist).
bool mbDataLayout; /// True = data layout field collecting all data fields as items.
- inline explicit ScFieldIdentifier() :
+ explicit ScFieldIdentifier() :
mnFieldIdx( 0 ), mbDataLayout( false ) {}
- inline explicit ScFieldIdentifier( const OUString& rFieldName, bool bDataLayout ) :
+ explicit ScFieldIdentifier( const OUString& rFieldName, bool bDataLayout ) :
maFieldName( rFieldName ), mnFieldIdx( 0 ), mbDataLayout( bDataLayout ) {}
};
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 4b05b6ada4ca..e2206026f8ae 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2232,7 +2232,7 @@ public:
void SC_DLLPUBLIC GetSortParam( ScSortParam& rParam, SCTAB nTab );
void SC_DLLPUBLIC SetSortParam( ScSortParam& rParam, SCTAB nTab );
- inline void SetVbaEventProcessor( const css::uno::Reference< css::script::vba::XVBAEventProcessor >& rxVbaEvents )
+ void SetVbaEventProcessor( const css::uno::Reference< css::script::vba::XVBAEventProcessor >& rxVbaEvents )
{ mxVbaEvents = rxVbaEvents; }
const css::uno::Reference< css::script::vba::XVBAEventProcessor >&
GetVbaEventProcessor() const { return mxVbaEvents; }
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index ed3acc48051c..766dfed47784 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -266,8 +266,8 @@ public:
void SetInitChild( bool b ) { mbInitChild = b; }
void SetInitAllChildren( bool b ) { mbAllChildren = b; }
- inline ScDPDimension* GetDim( size_t nPos ) const { return mppDim[nPos];}
- inline ScDPLevel* GetLevel( size_t nPos ) const { return mppLev[nPos];}
+ ScDPDimension* GetDim( size_t nPos ) const { return mppDim[nPos];}
+ ScDPLevel* GetLevel( size_t nPos ) const { return mppLev[nPos];}
bool GetInitChild() const {return mbInitChild; }
bool GetInitAllChild() const { return mbAllChildren; }
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index dd3fadf06bbf..00f87cac0e35 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -603,7 +603,7 @@ public:
/// strchr() functionality on unicode, as long as we need it for FormulaToken etc.
static const sal_Unicode* UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c );
- static inline sal_Unicode ToUpperAlpha( sal_Unicode c )
+ static sal_Unicode ToUpperAlpha( sal_Unicode c )
{ return ( c >= 'a' && c <= 'z' ) ? ( c-'a'+'A' ) : c; }
/** Adds the string rToken to rTokenList, using a list separator character.
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 5f3b6cfc7556..905df00e5860 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -128,7 +128,7 @@ public:
const ScAddress & rQueryAddress,
const bool bAvailable );
- inline const ScRange& getRange() const { return maRange; }
+ const ScRange& getRange() const { return maRange; }
struct Hash
{
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index f7c10daab2d7..2904d82cefed 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -48,10 +48,10 @@ public:
~ScCaptionPtr();
ScCaptionPtr& operator=( const ScCaptionPtr& r );
- inline explicit operator bool() const { return mpCaption != nullptr; }
- inline SdrCaptionObj* get() const { return mpCaption; }
- inline SdrCaptionObj* operator->() const { return mpCaption; }
- inline SdrCaptionObj& operator*() const { return *mpCaption; }
+ explicit operator bool() const { return mpCaption != nullptr; }
+ SdrCaptionObj* get() const { return mpCaption; }
+ SdrCaptionObj* operator->() const { return mpCaption; }
+ SdrCaptionObj& operator*() const { return *mpCaption; }
// Does not default to nullptr to make it visually obvious where such is used.
void reset( SdrCaptionObj* p );
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 5f3e7626940a..277056971286 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -51,7 +51,7 @@ private:
public:
/// No default ctor, because used in ScRawToken union, set InitFlags!
- inline void InitFlags() { mnFlagValue = 0; } ///< all FALSE
+ void InitFlags() { mnFlagValue = 0; } ///< all FALSE
/// InitAddress: InitFlags and set address
void InitAddress( const ScAddress& rAdr );
void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab );
@@ -121,19 +121,19 @@ struct ScComplexRefData
ScSingleRefData Ref1;
ScSingleRefData Ref2;
- inline void InitFlags()
+ void InitFlags()
{ Ref1.InitFlags(); Ref2.InitFlags(); }
- inline void InitRange( const ScRange& rRange )
+ void InitRange( const ScRange& rRange )
{
Ref1.InitAddress( rRange.aStart );
Ref2.InitAddress( rRange.aEnd );
}
- inline void InitRangeRel( const ScRange& rRange, const ScAddress& rPos )
+ void InitRangeRel( const ScRange& rRange, const ScAddress& rPos )
{
Ref1.InitAddressRel( rRange.aStart, rPos );
Ref2.InitAddressRel( rRange.aEnd, rPos );
}
- inline void InitRange( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
+ void InitRange( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2 )
{
Ref1.InitAddress( nCol1, nRow1, nTab1 );
@@ -150,14 +150,14 @@ struct ScComplexRefData
bool ValidExternal() const;
/** Whether this references entire columns, A:A */
- inline bool IsEntireCol() const
+ bool IsEntireCol() const
{
// Both row anchors must be absolute.
return Ref1.Row() == 0 && Ref2.Row() == MAXROW && !Ref1.IsRowRel() && !Ref2.IsRowRel();
}
/** Whether this references entire rows, 1:1 */
- inline bool IsEntireRow() const
+ bool IsEntireRow() const
{
// Both column anchors must be absolute.
return Ref1.Col() == 0 && Ref2.Col() == MAXCOL && !Ref1.IsColRel() && !Ref2.IsColRel();
@@ -172,7 +172,7 @@ struct ScComplexRefData
/** Adjust ordering (front-top-left/rear-bottom-right) to a new position. */
void PutInOrder( const ScAddress& rPos );
- inline bool operator==( const ScComplexRefData& r ) const
+ bool operator==( const ScComplexRefData& r ) const
{ return Ref1 == r.Ref1 && Ref2 == r.Ref2; }
/** Enlarge range if reference passed is not within existing range.
ScAddress position is used to calculate absolute references from
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 632205a6ebfb..886bbd86840a 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -153,7 +153,7 @@ public:
};
/// The maximum number of elements a matrix may have at runtime.
- inline static size_t GetElementsMax()
+ static size_t GetElementsMax()
{
// TODO: Fix me.
return 0x08000000;
@@ -174,19 +174,19 @@ public:
bool static IsSizeAllocatable( SCSIZE nC, SCSIZE nR );
/// Value or boolean.
- inline static bool IsValueType( ScMatValType nType )
+ static bool IsValueType( ScMatValType nType )
{
return nType <= ScMatValType::Boolean;
}
/// Boolean.
- inline static bool IsBooleanType( ScMatValType nType )
+ static bool IsBooleanType( ScMatValType nType )
{
return nType == ScMatValType::Boolean;
}
/// String, empty or empty path, but not value nor boolean.
- inline static bool IsNonValueType( ScMatValType nType )
+ static bool IsNonValueType( ScMatValType nType )
{
return bool(nType & ScMatValType::NonvalueMask);
}
@@ -194,19 +194,19 @@ public:
/** String, but not empty or empty path or any other type.
Not named IsStringType to prevent confusion because previously
IsNonValueType was named IsStringType. */
- inline static bool IsRealStringType( ScMatValType nType )
+ static bool IsRealStringType( ScMatValType nType )
{
return (nType & ScMatValType::NonvalueMask) == ScMatValType::String;
}
/// Empty, but not empty path or any other type.
- inline static bool IsEmptyType( ScMatValType nType )
+ static bool IsEmptyType( ScMatValType nType )
{
return (nType & ScMatValType::NonvalueMask) == ScMatValType::Empty;
}
/// Empty path, but not empty or any other type.
- inline static bool IsEmptyPathType( ScMatValType nType )
+ static bool IsEmptyPathType( ScMatValType nType )
{
return (nType & ScMatValType::NonvalueMask) == ScMatValType::EmptyPath;
}
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 3351249c97dd..d0cd0204d518 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -75,7 +75,7 @@ struct SC_DLLPUBLIC ScSortParam
void Clear ();
void MoveToDest();
- inline sal_uInt16 GetSortKeyCount() const { return maKeyState.size(); }
+ sal_uInt16 GetSortKeyCount() const { return maKeyState.size(); }
};
namespace sc {
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 5f8711c786f5..0358a760c702 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -280,15 +280,15 @@ public:
bool IsStreamValid() const { return bStreamValid; }
void SetStreamValid( bool bSet, bool bIgnoreLock = false );
- SAL_WARN_UNUSED_RESULT inline bool IsColValid( SCCOL nScCol ) const
+ SAL_WARN_UNUSED_RESULT bool IsColValid( SCCOL nScCol ) const
{
return nScCol >= static_cast< SCCOL >( 0 ) && nScCol < aCol.size();
}
- SAL_WARN_UNUSED_RESULT inline bool IsColRowValid( SCCOL nScCol, SCROW nScRow ) const
+ SAL_WARN_UNUSED_RESULT bool IsColRowValid( SCCOL nScCol, SCROW nScRow ) const
{
return IsColValid( nScCol ) && ValidRow( nScRow );
}
- SAL_WARN_UNUSED_RESULT inline bool IsColRowTabValid( SCCOL nScCol, SCROW nScRow, SCTAB nScTab ) const
+ SAL_WARN_UNUSED_RESULT bool IsColRowTabValid( SCCOL nScCol, SCROW nScRow, SCTAB nScTab ) const
{
return IsColValid( nScCol ) && ValidRow( nScRow ) && ValidTab( nScTab );
}
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 5892a3b91a45..147bba46730d 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -442,7 +442,7 @@ public:
if ( pS )
*pS = (*pD).Ref1;
}
- inline ScComplexRefData& Ref() { return *pD; }
+ ScComplexRefData& Ref() { return *pD; }
};
class SingleDoubleRefProvider
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 6a4124f5a9bf..6aeb958d9137 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -113,8 +113,8 @@ public:
ScValidationMode GetDataMode() const { return eDataMode; }
- inline sal_Int16 GetListType() const { return mnListType; }
- inline void SetListType( sal_Int16 nListType ) { mnListType = nListType; }
+ sal_Int16 GetListType() const { return mnListType; }
+ void SetListType( sal_Int16 nListType ) { mnListType = nListType; }
/** Returns true, if the validation cell will show a selection list.
@descr Use this instead of GetListType() which returns the raw property
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index 4e9be263cb0a..634d464f564b 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -39,20 +39,20 @@ public:
void Save( SvStream& rStream, rtl_TextEncoding eByteStrSet ) const; // saving of the numberformats
void PutFormatIndex(sal_uInt32 nFormat, SvNumberFormatter& rFormatter);
sal_uInt32 GetFormatIndex( SvNumberFormatter& rFormatter);
- inline bool operator==(const ScNumFormatAbbrev& rNumFormat) const
+ bool operator==(const ScNumFormatAbbrev& rNumFormat) const
{
return ((sFormatstring == rNumFormat.sFormatstring)
&& (eLanguage == rNumFormat.eLanguage)
&& (eSysLanguage == rNumFormat.eSysLanguage));
}
- inline ScNumFormatAbbrev& operator=(const ScNumFormatAbbrev& rNumFormat)
+ ScNumFormatAbbrev& operator=(const ScNumFormatAbbrev& rNumFormat)
{
sFormatstring = rNumFormat.sFormatstring;
eLanguage = rNumFormat.eLanguage;
eSysLanguage = rNumFormat.eSysLanguage;
return *this;
}
- inline LanguageType GetLanguage() const { return eLanguage; }
+ LanguageType GetLanguage() const { return eLanguage; }
};
#endif
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 4d2487153f31..1a67cb577fc4 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -570,15 +570,15 @@ namespace {
struct ScDPSaveGroupDimNameFunc
{
OUString maDimName;
- inline explicit ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {}
- inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; }
+ explicit ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {}
+ bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; }
};
struct ScDPSaveGroupSourceNameFunc
{
OUString maSrcDimName;
- inline explicit ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {}
- inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; }
+ explicit ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {}
+ bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; }
};
} // namespace
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 965d843aafc1..2bc0e99a3284 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -166,7 +166,7 @@ public:
/** Returns the drawing layer page of the sheet contained in maPos. */
SdrPage* GetDrawPage();
/** Returns the caption drawing object. */
- inline ScCaptionPtr GetCaption() { return mxCaption; }
+ ScCaptionPtr GetCaption() { return mxCaption; }
/** Moves the caption inside the passed rectangle. Uses page area if 0 is passed. */
void FitCaptionToRect( const Rectangle* pVisRect = nullptr );
@@ -188,7 +188,7 @@ private:
/** Initializes all members. */
void Initialize();
/** Returns the passed rectangle if existing, page rectangle otherwise. */
- inline const Rectangle& GetVisRect( const Rectangle* pVisRect ) const { return pVisRect ? *pVisRect : maPageRect; }
+ const Rectangle& GetVisRect( const Rectangle* pVisRect ) const { return pVisRect ? *pVisRect : maPageRect; }
private:
ScDocument& mrDoc;
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 08d2d6bcd1a6..f7d921b530e7 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -555,7 +555,7 @@ namespace {
class ScStringTokenIterator
{
public:
- inline explicit ScStringTokenIterator( ScTokenArray& rTokArr ) :
+ explicit ScStringTokenIterator( ScTokenArray& rTokArr ) :
mrTokArr( rTokArr ), mbSkipEmpty( true ), mbOk( true ) {}
/** Returns the string of the first string token or NULL on error or empty token array. */
@@ -564,7 +564,7 @@ public:
rtl_uString* Next();
/** Returns false, if a wrong token has been found. Does NOT return false on end of token array. */
- inline bool Ok() const { return mbOk; }
+ bool Ok() const { return mbOk; }
private:
svl::SharedString maCurString; /// Current string.
diff --git a/sc/source/core/inc/arraysumfunctor.hxx b/sc/source/core/inc/arraysumfunctor.hxx
index d94bf74240a3..13f69d9cf62a 100644
--- a/sc/source/core/inc/arraysumfunctor.hxx
+++ b/sc/source/core/inc/arraysumfunctor.hxx
@@ -94,7 +94,7 @@ public:
}
private:
- inline double executeSSE2(size_t& i, const double* pCurrent) const
+ double executeSSE2(size_t& i, const double* pCurrent) const
{
#if defined(LO_SSE2_AVAILABLE)
double fSum = 0.0;
@@ -144,7 +144,7 @@ private:
#endif
}
- inline double executeUnrolled(size_t& i, const double* pCurrent) const
+ double executeUnrolled(size_t& i, const double* pCurrent) const
{
size_t nRealSize = mnSize - i;
size_t nUnrolledSize = nRealSize - (nRealSize % 4);
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 654edc078e16..b55c478656e7 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -66,20 +66,20 @@ public:
ScBroadcastArea( const ScRange& rRange );
- inline SvtBroadcaster& GetBroadcaster() { return aBroadcaster; }
- inline const SvtBroadcaster& GetBroadcaster() const { return aBroadcaster; }
- inline void UpdateRange( const ScRange& rNewRange )
+ SvtBroadcaster& GetBroadcaster() { return aBroadcaster; }
+ const SvtBroadcaster& GetBroadcaster() const { return aBroadcaster; }
+ void UpdateRange( const ScRange& rNewRange )
{ aRange = rNewRange; }
- inline const ScRange& GetRange() const { return aRange; }
- inline void IncRef() { ++nRefCount; }
- inline sal_uLong DecRef() { return nRefCount ? --nRefCount : 0; }
- inline sal_uLong GetRef() { return nRefCount; }
- inline ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; }
- inline void SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; }
- inline bool IsInUpdateChain() const { return mbInUpdateChain; }
- inline void SetInUpdateChain( bool b ) { mbInUpdateChain = b; }
+ const ScRange& GetRange() const { return aRange; }
+ void IncRef() { ++nRefCount; }
+ sal_uLong DecRef() { return nRefCount ? --nRefCount : 0; }
+ sal_uLong GetRef() { return nRefCount; }
+ ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; }
+ void SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; }
+ bool IsInUpdateChain() const { return mbInUpdateChain; }
+ void SetInUpdateChain( bool b ) { mbInUpdateChain = b; }
- inline bool IsGroupListening() const { return mbGroupListening; }
+ bool IsGroupListening() const { return mbGroupListening; }
void SetGroupListening( bool b ) { mbGroupListening = b; }
/** Equalness of this or range. */
@@ -265,14 +265,14 @@ private:
public:
TableSlots();
~TableSlots();
- inline ScBroadcastAreaSlot** getSlots() { return ppSlots; }
+ ScBroadcastAreaSlot** getSlots() { return ppSlots; }
/**
Obtain slot pointer, no check on validity! It is assumed that
all calls are made with the results of ComputeSlotOffset(),
ComputeAreaPoints() and ComputeNextSlot()
*/
- inline ScBroadcastAreaSlot* getAreaSlot( SCSIZE nOff ) { return *(ppSlots + nOff); }
+ ScBroadcastAreaSlot* getAreaSlot( SCSIZE nOff ) { return *(ppSlots + nOff); }
private:
ScBroadcastAreaSlot** ppSlots;
@@ -327,10 +327,10 @@ public:
/// @return: how many removed
size_t RemoveBulkArea( const ScBroadcastArea* p );
- inline void SetUpdateChain( ScBroadcastArea* p ) { pUpdateChain = p; }
- inline ScBroadcastArea* GetEOUpdateChain() const { return pEOUpdateChain; }
- inline void SetEOUpdateChain( ScBroadcastArea* p ) { pEOUpdateChain = p; }
- inline bool IsInBulkBroadcast() const { return nInBulkBroadcast > 0; }
+ void SetUpdateChain( ScBroadcastArea* p ) { pUpdateChain = p; }
+ ScBroadcastArea* GetEOUpdateChain() const { return pEOUpdateChain; }
+ void SetEOUpdateChain( ScBroadcastArea* p ) { pEOUpdateChain = p; }
+ bool IsInBulkBroadcast() const { return nInBulkBroadcast > 0; }
// only for ScBroadcastAreaSlot
void PushAreaToBeErased( ScBroadcastAreaSlot* pSlot,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index bbd18ddd5c17..ae47fc4e1b11 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -289,7 +289,7 @@ void PushTempTokenWithoutError( const formula::FormulaToken* );
If nGlobalError is not set do nothing.
Used in PushTempToken() and alike to simplify handling.
@return: if nGlobalError. */
-inline bool IfErrorPushError()
+bool IfErrorPushError()
{
if (nGlobalError != FormulaError::NONE)
{
@@ -441,7 +441,7 @@ void ScTableOp(); // repeated operations
// common helper functions
-inline void CurFmtToFuncFmt()
+void CurFmtToFuncFmt()
{ nFuncFmtType = nCurFmtType; nFuncFmtIndex = nCurFmtIndex; }
/** Check if a double is suitable as string position or length argument.
diff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx
index 4df70f098d6f..004c82c253c4 100644
--- a/sc/source/core/inc/parclass.hxx
+++ b/sc/source/core/inc/parclass.hxx
@@ -86,7 +86,7 @@ public:
/** Whether OpCode has a parameter of type
ForceArray or ReferenceOrForceArray. */
- static inline bool HasForceArray( OpCode eOp)
+ static bool HasForceArray( OpCode eOp)
{
return 0 <= (short)eOp &&
eOp <= SC_OPCODE_LAST_OPCODE_ID &&
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index efd1029e0dd5..574273417fb6 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -48,7 +48,7 @@ namespace {
struct MatrixAdd : public ::std::binary_function
{
- inline double operator() (const double& lhs, const double& rhs) const
+ double operator() (const double& lhs, const double& rhs) const
{
return ::rtl::math::approxAdd( lhs,rhs);
}
@@ -56,7 +56,7 @@ struct MatrixAdd : public ::std::binary_function
struct MatrixSub : public ::std::binary_function
{
- inline double operator() (const double& lhs, const double& rhs) const
+ double operator() (const double& lhs, const double& rhs) const
{
return ::rtl::math::approxSub( lhs,rhs);
}
@@ -64,7 +64,7 @@ struct MatrixSub : public ::std::binary_function
struct MatrixMul : public ::std::binary_function
{
- inline double operator() (const double& lhs, const double& rhs) const
+ double operator() (const double& lhs, const double& rhs) const
{
return lhs * rhs;
}
@@ -72,7 +72,7 @@ struct MatrixMul : public ::std::binary_function
struct MatrixDiv : public ::std::binary_function
{
- inline double operator() (const double& lhs, const double& rhs) const
+ double operator() (const double& lhs, const double& rhs) const
{
return ScInterpreter::div( lhs,rhs);
}
@@ -80,7 +80,7 @@ struct MatrixDiv : public ::std::binary_function
struct MatrixPow : public ::std::binary_function
{
- inline double operator() (const double& lhs, const double& rhs) const
+ double operator() (const double& lhs, const double& rhs) const
{
return ::pow( lhs,rhs);
}
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 181eb60dc20e..c7db4c085302 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -238,7 +238,7 @@ struct XclExpChRootData : public XclChRootData
XclChFrBlockVector maWrittenFrBlocks; /// Stack of future record levels already written out.
XclChFrBlockVector maUnwrittenFrBlocks; /// Stack of future record levels not yet written out.
- inline explicit XclExpChRootData( XclExpChChart& rChartData ) : mrChartData( rChartData ) {}
+ explicit XclExpChRootData( XclExpChChart& rChartData ) : mrChartData( rChartData ) {}
/** Registers a new future record level. */
void RegisterFutureRecBlock( const XclChFrBlock& rFrBlock );
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index dae805f4222c..126e139595ed 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -62,14 +62,14 @@ struct XclExpHashEntry
{
const XclExpString* mpString; /// Pointer to the string (no ownership).
sal_uInt32 mnSstIndex; /// The SST index of this string.
- inline explicit XclExpHashEntry( const XclExpString* pString, sal_uInt32 nSstIndex ) :
+ explicit XclExpHashEntry( const XclExpString* pString, sal_uInt32 nSstIndex ) :
mpString( pString ), mnSstIndex( nSstIndex ) {}
};
/** Function object for strict weak ordering. */
struct XclExpHashEntrySWO
{
- inline bool operator()( const XclExpHashEntry& rLeft, const XclExpHashEntry& rRight ) const
+ bool operator()( const XclExpHashEntry& rLeft, const XclExpHashEntry& rRight ) const
{ return *rLeft.mpString < *rRight.mpString; }
};
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 93261215d9d9..79dce1e5bdc6 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -57,10 +57,10 @@ struct XclExpScToken
const FormulaToken* mpScToken; /// Currently processed Calc token.
sal_uInt8 mnSpaces; /// Number of spaces before the Calc token.
- inline explicit XclExpScToken() : mpScToken( nullptr ), mnSpaces( 0 ) {}
- inline bool Is() const { return mpScToken != nullptr; }
- inline StackVar GetType() const { return mpScToken ? mpScToken->GetType() : static_cast< StackVar >( svUnknown ); }
- inline OpCode GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); }
+ explicit XclExpScToken() : mpScToken( nullptr ), mnSpaces( 0 ) {}
+ bool Is() const { return mpScToken != nullptr; }
+ StackVar GetType() const { return mpScToken ? mpScToken->GetType() : static_cast< StackVar >( svUnknown ); }
+ OpCode GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); }
};
/** Effective token class conversion types. */
@@ -83,7 +83,7 @@ struct XclExpTokenConvInfo
or for all parameters of a function. */
struct XclExpOperandList : public std::vector< XclExpTokenConvInfo >
{
- inline explicit XclExpOperandList() { reserve( 2 ); }
+ explicit XclExpOperandList() { reserve( 2 ); }
void AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eConv, bool bValType );
};
@@ -106,7 +106,7 @@ struct XclExpExtFuncData
bool mbVBasic; /// True = Visual Basic macro call.
bool mbHidden; /// True = Create hidden defined name.
- inline explicit XclExpExtFuncData() : mbVBasic( false ), mbHidden( false ) {}
+ explicit XclExpExtFuncData() : mbVBasic( false ), mbHidden( false ) {}
void Set( const OUString& rFuncName, bool bVBasic, bool bHidden );
};
@@ -126,30 +126,30 @@ public:
const XclFunctionInfo& rFuncInfo,
const XclExpExtFuncData& rExtFuncData );
- inline const FormulaToken& GetScToken() const { return *mrTokData.mpScToken; }
- inline OpCode GetOpCode() const { return mrFuncInfo.meOpCode; }
- inline sal_uInt16 GetXclFuncIdx() const { return mrFuncInfo.mnXclFunc; }
- inline bool IsVolatile() const { return mrFuncInfo.IsVolatile(); }
- inline bool IsFixedParamCount() const { return mrFuncInfo.IsFixedParamCount(); }
- inline bool IsAddInEquivalent() const { return mrFuncInfo.IsAddInEquivalent(); }
- inline bool IsMacroFunc() const { return mrFuncInfo.IsMacroFunc(); }
- inline sal_uInt8 GetSpaces() const { return mrTokData.mnSpaces; }
- inline const XclExpExtFuncData& GetExtFuncData() const { return maExtFuncData; }
- inline sal_uInt8 GetReturnClass() const { return mrFuncInfo.mnRetClass; }
+ const FormulaToken& GetScToken() const { return *mrTokData.mpScToken; }
+ OpCode GetOpCode() const { return mrFuncInfo.meOpCode; }
+ sal_uInt16 GetXclFuncIdx() const { return mrFuncInfo.mnXclFunc; }
+ bool IsVolatile() const { return mrFuncInfo.IsVolatile(); }
+ bool IsFixedParamCount() const { return mrFuncInfo.IsFixedParamCount(); }
+ bool IsAddInEquivalent() const { return mrFuncInfo.IsAddInEquivalent(); }
+ bool IsMacroFunc() const { return mrFuncInfo.IsMacroFunc(); }
+ sal_uInt8 GetSpaces() const { return mrTokData.mnSpaces; }
+ const XclExpExtFuncData& GetExtFuncData() const { return maExtFuncData; }
+ sal_uInt8 GetReturnClass() const { return mrFuncInfo.mnRetClass; }
const XclFuncParamInfo& GetParamInfo() const;
bool IsCalcOnlyParam() const;
bool IsExcelOnlyParam() const;
void IncParamInfoIdx();
- inline sal_uInt8 GetMinParamCount() const { return mrFuncInfo.mnMinParamCount; }
- inline sal_uInt8 GetMaxParamCount() const { return mrFuncInfo.mnMaxParamCount; }
- inline sal_uInt8 GetParamCount() const { return static_cast< sal_uInt8 >( mxOperands->size() ); }
+ sal_uInt8 GetMinParamCount() const { return mrFuncInfo.mnMinParamCount; }
+ sal_uInt8 GetMaxParamCount() const { return mrFuncInfo.mnMaxParamCount; }
+ sal_uInt8 GetParamCount() const { return static_cast< sal_uInt8 >( mxOperands->size() ); }
void FinishParam( sal_uInt16 nTokPos );
const XclExpOperandListRef& GetOperandList() const { return mxOperands; }
- inline ScfUInt16Vec& GetAttrPosVec() { return maAttrPosVec; }
- inline void AppendAttrPos( sal_uInt16 nPos ) { maAttrPosVec.push_back( nPos ); }
+ ScfUInt16Vec& GetAttrPosVec() { return maAttrPosVec; }
+ void AppendAttrPos( sal_uInt16 nPos ) { maAttrPosVec.push_back( nPos ); }
private:
ScfUInt16Vec maAttrPosVec; /// Token array positions of tAttr tokens.
@@ -315,7 +315,7 @@ public:
private:
const XclExpCompConfig* GetConfigForType( XclFormulaType eType ) const;
- inline sal_uInt16 GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); }
+ sal_uInt16 GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); }
void Init( XclFormulaType eType );
void Init( XclFormulaType eType, const ScTokenArray& rScTokArr,
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 8ecd71762587..46a7e779eba3 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -54,7 +54,7 @@ public:
const OUString& rName, sal_uInt16 nFlags = 0 );
/** Returns the name string of the external name. */
- inline const OUString& GetName() const { return maName; }
+ const OUString& GetName() const { return maName; }
private:
/** Writes the start of the record that is equal in all EXTERNNAME records and calls WriteAddData(). */
@@ -197,7 +197,7 @@ public:
ScExternalRefCache::TableTypeRef const & xCacheTable );
/** Returns the external sheet name. */
- inline const XclExpString& GetTabName() const { return maTabName; }
+ const XclExpString& GetTabName() const { return maTabName; }
/** Stores all cells in the given range in the CRN list. */
void StoreCellRange( const ScRange& rRange );
@@ -373,12 +373,12 @@ struct XclExpXti
sal_uInt16 mnFirstSBTab; /// Index to the first sheet of the range in the SUPBOOK.
sal_uInt16 mnLastSBTab; /// Index to the last sheet of the range in the SUPBOOK.
- inline explicit XclExpXti() : mnSupbook( 0 ), mnFirstSBTab( 0 ), mnLastSBTab( 0 ) {}
- inline explicit XclExpXti( sal_uInt16 nSupbook, sal_uInt16 nFirstSBTab, sal_uInt16 nLastSBTab ) :
+ explicit XclExpXti() : mnSupbook( 0 ), mnFirstSBTab( 0 ), mnLastSBTab( 0 ) {}
+ explicit XclExpXti( sal_uInt16 nSupbook, sal_uInt16 nFirstSBTab, sal_uInt16 nLastSBTab ) :
mnSupbook( nSupbook ), mnFirstSBTab( nFirstSBTab ), mnLastSBTab( nLastSBTab ) {}
/** Writes this XTI structure (inside of the EXTERNSHEET record). */
- inline void Save( XclExpStream& rStrm ) const
+ void Save( XclExpStream& rStrm ) const
{ rStrm << mnSupbook << mnFirstSBTab << mnLastSBTab; }
};
@@ -444,7 +444,7 @@ public:
{
sal_uInt16 mnSupbook; /// SUPBOOK index for an Excel sheet.
sal_uInt16 mnSBTab; /// Sheet name index in SUPBOOK for an Excel sheet.
- inline void Set( sal_uInt16 nSupbook, sal_uInt16 nSBTab )
+ void Set( sal_uInt16 nSupbook, sal_uInt16 nSBTab )
{ mnSupbook = nSupbook; mnSBTab = nSBTab; }
};
typedef ::std::vector< XclExpSBIndex > XclExpSBIndexVec;
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index bfd76c6b2c28..fbedae44707b 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -61,18 +61,18 @@ public:
void SetSymbol( const OUString& rValue );
/** Returns the original name (title) of this defined name. */
- inline const OUString& GetOrigName() const { return maOrigName; }
+ const OUString& GetOrigName() const { return maOrigName; }
/** Returns the Excel built-in name index of this defined name.
@return The built-in name index or EXC_BUILTIN_UNKNOWN for user-defined names. */
- inline sal_Unicode GetBuiltInName() const { return mcBuiltIn; }
+ sal_Unicode GetBuiltInName() const { return mcBuiltIn; }
/** Returns the token array for this defined name. */
const XclTokenArrayRef& GetTokenArray() const { return mxTokArr; }
/** Returns true, if this is a document-global defined name. */
- inline bool IsGlobal() const { return mnXclTab == EXC_NAME_GLOBAL; }
+ bool IsGlobal() const { return mnXclTab == EXC_NAME_GLOBAL; }
/** Returns the Calc sheet of a local defined name. */
- inline SCTAB GetScTab() const { return mnScTab; }
+ SCTAB GetScTab() const { return mnScTab; }
/** Returns true, if this defined name is volatile. */
bool IsVolatile() const;
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index 7a388d805500..442395596b0e 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -63,12 +63,12 @@ struct XclHasher : public ::std::unary_function< Type, sal_uInt32 > {};
template< typename Type >
struct XclDirectHasher : public XclHasher< Type >
{
- inline sal_uInt32 operator()( Type nVal ) const { return nVal; }
+ sal_uInt32 operator()( Type nVal ) const { return nVal; }
};
struct XclFormatRunHasher : public XclHasher< const XclFormatRun& >
{
- inline sal_uInt32 operator()( const XclFormatRun& rRun ) const
+ sal_uInt32 operator()( const XclFormatRun& rRun ) const
{ return (rRun.mnChar << 8) ^ rRun.mnFontIdx; }
};
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index ab7dd9dff35e..529b086afe2b 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -139,16 +139,16 @@ public:
explicit XclListColor( const Color& rColor, sal_uInt32 nColorId );
/** Returns the RGB color value of the color. */
- inline const Color& GetColor() const { return maColor; }
+ const Color& GetColor() const { return maColor; }
/** Returns the unique ID of the color. */
- inline sal_uInt32 GetColorId() const { return mnColorId; }
+ sal_uInt32 GetColorId() const { return mnColorId; }
/** Returns the current weighting of the color. */
- inline sal_uInt32 GetWeighting() const { return mnWeight; }
+ sal_uInt32 GetWeighting() const { return mnWeight; }
/** Returns true, if this color is a base color, i.e. it will not be removed or merged. */
- inline bool IsBaseColor() const { return mbBaseColor; }
+ bool IsBaseColor() const { return mbBaseColor; }
/** Adds the passed weighting to this color. */
- inline void AddWeighting( sal_uInt32 nWeight ) { mnWeight += nWeight; }
+ void AddWeighting( sal_uInt32 nWeight ) { mnWeight += nWeight; }
/** Merges this color with rColor, regarding weighting settings. */
void Merge( const XclListColor& rColor );
};
@@ -185,7 +185,7 @@ struct XclColorIdData
Color maColor; /// The original inserted color.
sal_uInt32 mnIndex; /// Maps current color ID to color list or export color vector.
/** Sets the contents of this struct. */
- inline void Set( const Color& rColor, sal_uInt32 nIndex ) { maColor = rColor; mnIndex = nIndex; }
+ void Set( const Color& rColor, sal_uInt32 nIndex ) { maColor = rColor; mnIndex = nIndex; }
};
/** A color that will be written to the Excel file. */
@@ -194,8 +194,8 @@ struct XclPaletteColor
Color maColor; /// Resulting color to export.
bool mbUsed; /// true = Entry is used in the document.
- inline explicit XclPaletteColor( const Color& rColor ) : maColor( rColor ), mbUsed( false ) {}
- inline void SetColor( const Color& rColor ) { maColor = rColor; mbUsed = true; }
+ explicit XclPaletteColor( const Color& rColor ) : maColor( rColor ), mbUsed( false ) {}
+ void SetColor( const Color& rColor ) { maColor = rColor; mbUsed = true; }
};
/** Maps a color list index to a palette index.
@@ -205,8 +205,8 @@ struct XclRemap
sal_uInt32 mnPalIndex; /// Index to palette.
bool mbProcessed; /// true = List color already processed.
- inline explicit XclRemap() : mnPalIndex( 0 ), mbProcessed( false ) {}
- inline void SetIndex( sal_uInt32 nPalIndex )
+ explicit XclRemap() : mnPalIndex( 0 ), mbProcessed( false ) {}
+ void SetIndex( sal_uInt32 nPalIndex )
{ mnPalIndex = nPalIndex; mbProcessed = true; }
};
@@ -216,7 +216,7 @@ struct XclNearest
sal_uInt32 mnPalIndex; /// Index to nearest palette color.
sal_Int32 mnDist; /// Distance to palette color.
- inline explicit XclNearest() : mnPalIndex( 0 ), mnDist( 0 ) {}
+ explicit XclNearest() : mnPalIndex( 0 ), mnDist( 0 ) {}
};
} // namespace
@@ -259,7 +259,7 @@ public:
private:
/** Returns the Excel index of a 0-based color index. */
- static inline sal_uInt16 GetXclIndex( sal_uInt32 nIndex )
+ static sal_uInt16 GetXclIndex( sal_uInt32 nIndex )
{ return static_cast< sal_uInt16 >( nIndex + EXC_COLOR_USEROFFSET ); }
/** Returns the original inserted color represented by the color ID nColorId. */
@@ -1331,8 +1331,8 @@ size_t XclExpFontBuffer::Find( const XclFontData& rFontData )
struct XclExpNumFmtPred
{
sal_uLong mnScNumFmt;
- inline explicit XclExpNumFmtPred( sal_uLong nScNumFmt ) : mnScNumFmt( nScNumFmt ) {}
- inline bool operator()( const XclExpNumFmt& rFormat ) const
+ explicit XclExpNumFmtPred( sal_uLong nScNumFmt ) : mnScNumFmt( nScNumFmt ) {}
+ bool operator()( const XclExpNumFmt& rFormat ) const
{ return rFormat.mnScNumFmt == mnScNumFmt; }
};
@@ -2379,7 +2379,7 @@ struct XclExpBorderPred
{
const XclExpCellBorder&
mrBorder;
- inline explicit XclExpBorderPred( const XclExpCellBorder& rBorder ) : mrBorder( rBorder ) {}
+ explicit XclExpBorderPred( const XclExpCellBorder& rBorder ) : mrBorder( rBorder ) {}
bool operator()( const XclExpCellBorder& rBorder ) const;
};
@@ -2409,7 +2409,7 @@ struct XclExpFillPred
{
const XclExpCellArea&
mrFill;
- inline explicit XclExpFillPred( const XclExpCellArea& rFill ) : mrFill( rFill ) {}
+ explicit XclExpFillPred( const XclExpCellArea& rFill ) : mrFill( rFill ) {}
bool operator()( const XclExpCellArea& rFill ) const;
};
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 1dcde34ff7ff..d7fb26f5a7f0 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -206,7 +206,7 @@ struct XclImpChRootData : public XclChRootData
{
XclImpChChart& mrChartData; /// The chart data object.
- inline explicit XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {}
+ explicit XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {}
};
XclImpChRoot::XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ) :
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 25c2ecee968a..1784a5610be2 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -65,7 +65,7 @@ public:
The sheet index is set while creating the Calc sheet with CreateTable(). */
explicit XclImpSupbookTab( const OUString& rTabName );
- inline const OUString& GetTabName() const { return maTabName; }
+ const OUString& GetTabName() const { return maTabName; }
/** Reads a CRN record (external referenced cell) at the specified address. */
void ReadCrn( XclImpStream& rStrm, const XclAddress& rXclPos );
@@ -99,10 +99,10 @@ public:
void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv );
/** Returns the SUPBOOK record type. */
- inline XclSupbookType GetType() const { return meType; }
+ XclSupbookType GetType() const { return meType; }
/** Returns the URL of the external document. */
- inline const OUString& GetXclUrl() const { return maXclUrl; }
+ const OUString& GetXclUrl() const { return maXclUrl; }
/** Returns the external name specified by an index from the Excel document (one-based). */
const XclImpExtName* GetExternName( sal_uInt16 nXclIndex ) const;
@@ -143,7 +143,7 @@ struct XclImpXti
sal_uInt16 mnSupbook; /// Index to SUPBOOK record.
sal_uInt16 mnSBTabFirst; /// Index to the first sheet of the range in the SUPBOOK.
sal_uInt16 mnSBTabLast; /// Index to the last sheet of the range in the SUPBOOK.
- inline explicit XclImpXti() : mnSupbook( SAL_MAX_UINT16 ), mnSBTabFirst( SAL_MAX_UINT16 ), mnSBTabLast( SAL_MAX_UINT16 ) {}
+ explicit XclImpXti() : mnSupbook( SAL_MAX_UINT16 ), mnSBTabFirst( SAL_MAX_UINT16 ), mnSBTabLast( SAL_MAX_UINT16 ) {}
};
inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index b7111bc57c57..d7e6c5a9ef82 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1588,7 +1588,7 @@ namespace {
/** Functor for case-insensitive string comparison, usable in maps etc. */
struct IgnoreCaseCompare
{
- inline bool operator()( const OUString& rName1, const OUString& rName2 ) const
+ bool operator()( const OUString& rName1, const OUString& rName2 ) const
{ return rName1.compareToIgnoreAsciiCase( rName2 ) < 0; }
};
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 2c0ea0f1862d..374fc6256b21 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -387,15 +387,15 @@ const XclCodePageEntry* const pCodePageTableEnd = std::end(pCodePageTable);
struct XclCodePageEntry_CPPred
{
- inline explicit XclCodePageEntry_CPPred( sal_uInt16 nCodePage ) : mnCodePage( nCodePage ) {}
- inline bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.mnCodePage == mnCodePage; }
+ explicit XclCodePageEntry_CPPred( sal_uInt16 nCodePage ) : mnCodePage( nCodePage ) {}
+ bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.mnCodePage == mnCodePage; }
sal_uInt16 mnCodePage;
};
struct XclCodePageEntry_TEPred
{
- inline explicit XclCodePageEntry_TEPred( rtl_TextEncoding eTextEnc ) : meTextEnc( eTextEnc ) {}
- inline bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.meTextEnc == meTextEnc; }
+ explicit XclCodePageEntry_TEPred( rtl_TextEncoding eTextEnc ) : meTextEnc( eTextEnc ) {}
+ bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.meTextEnc == meTextEnc; }
rtl_TextEncoding meTextEnc;
};
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index aa28b5bc913f..5e31859b0d37 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1783,8 +1783,8 @@ private:
public:
explicit ScHTMLTableMap( ScHTMLTable& rParentTable );
- inline const_iterator begin() const { return maTables.begin(); }
- inline const_iterator end() const { return maTables.end(); }
+ const_iterator begin() const { return maTables.begin(); }
+ const_iterator end() const { return maTables.end(); }
/** Returns the specified table.
@param nTableId Unique identifier of the table.
@@ -1797,7 +1797,7 @@ public:
private:
/** Sets a working table with its index for search optimization. */
- inline void SetCurrTable( ScHTMLTable* pTable ) const
+ void SetCurrTable( ScHTMLTable* pTable ) const
{ if( pTable ) mpCurrTable = pTable; }
};
@@ -1849,9 +1849,9 @@ public:
@param pTableMap Pointer to the table map (is allowed to be NULL). */
explicit ScHTMLTableIterator( const ScHTMLTableMap* pTableMap );
- inline bool is() const { return mpTableMap && maIter != maEnd; }
- inline ScHTMLTable* operator->() { return maIter->second.get(); }
- inline ScHTMLTableIterator& operator++() { ++maIter; return *this; }
+ bool is() const { return mpTableMap && maIter != maEnd; }
+ ScHTMLTable* operator->() { return maIter->second.get(); }
+ ScHTMLTableIterator& operator++() { ++maIter; return *this; }
private:
ScHTMLTableMap::const_iterator maIter;
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 65d8dd4c0d62..cdf47298015b 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -50,7 +50,7 @@ private:
public:
XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID );
- inline const sal_uInt8* GetGUID() const { return aGUID; }
+ const sal_uInt8* GetGUID() const { return aGUID; }
virtual sal_uInt16 GetNum() const override;
virtual std::size_t GetLen() const override;
@@ -70,8 +70,8 @@ public:
XclExpUserBViewList( const ScChangeTrack& rChangeTrack );
virtual ~XclExpUserBViewList() override;
- inline const_iterator cbegin () { return aViews.cbegin(); }
- inline const_iterator cend () { return aViews.cend(); }
+ const_iterator cbegin () { return aViews.cbegin(); }
+ const_iterator cend () { return aViews.cend(); }
virtual void Save( XclExpStream& rStrm ) override;
};
@@ -160,7 +160,7 @@ private:
sal_uInt16 nRecNum;
public:
- inline XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {}
+ XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {}
virtual ~XclExpChTrEmpty() override;
virtual sal_uInt16 GetNum() const override;
@@ -216,11 +216,11 @@ private:
virtual void SaveCont( XclExpStream& rStrm ) override;
public:
- inline XclExpChTrHeader() : nCount( 0 ) {}
+ XclExpChTrHeader() : nCount( 0 ) {}
virtual ~XclExpChTrHeader() override;
- inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); }
- inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; }
+ void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); }
+ void SetCount( sal_uInt32 nNew ) { nCount = nNew; }
virtual sal_uInt16 GetNum() const override;
virtual std::size_t GetLen() const override;
@@ -305,9 +305,9 @@ public:
sal_uInt16 GetId( sal_uInt16 nIndex ) const;
void Remove();
- inline sal_uInt16 GetBufferCount() const
+ sal_uInt16 GetBufferCount() const
{ return static_cast< sal_uInt16 >( (pLast - pBuffer.get()) + 1 ); }
- inline void GetBufferCopy( sal_uInt16* pDest ) const
+ void GetBufferCopy( sal_uInt16* pDest ) const
{ memcpy( pDest, pBuffer.get(), sizeof(sal_uInt16) * GetBufferCount() ); }
};
@@ -319,12 +319,12 @@ private:
sal_uInt16* pBuffer;
sal_uInt16 nTabCount;
- inline void Clear() { delete[] pBuffer; pBuffer = nullptr; }
+ void Clear() { delete[] pBuffer; pBuffer = nullptr; }
virtual void SaveCont( XclExpStream& rStrm ) override;
public:
- inline XclExpChTrTabId( sal_uInt16 nCount ) :
+ XclExpChTrTabId( sal_uInt16 nCount ) :
pBuffer( nullptr ), nTabCount( nCount ) {}
XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer );
virtual ~XclExpChTrTabId() override;
@@ -369,7 +369,7 @@ protected:
// save header data, call SaveActionData()
virtual void SaveCont( XclExpStream& rStrm ) override;
- static inline std::size_t GetHeaderByteCount() { return 12; }
+ static std::size_t GetHeaderByteCount() { return 12; }
// override to save action data without header, called by SaveCont()
virtual void SaveActionData( XclExpStream& rStrm ) const = 0;
@@ -381,7 +381,7 @@ protected:
// do something after writing the record
virtual void CompleteSaveAction( XclExpStream& rStrm ) const;
- inline bool GetAccepted() const { return bAccepted; }
+ bool GetAccepted() const { return bAccepted; }
public:
XclExpChTrAction(
@@ -391,10 +391,10 @@ public:
sal_uInt16 nNewOpCode = EXC_CHTR_OP_UNKNOWN );
virtual ~XclExpChTrAction() override;
- inline const OUString& GetUsername() const { return sUsername; }
- inline const DateTime& GetDateTime() const { return aDateTime; }
- inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; }
- inline bool ForceInfoRecord() const { return bForceInfo; }
+ const OUString& GetUsername() const { return sUsername; }
+ const DateTime& GetDateTime() const { return aDateTime; }
+ const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; }
+ bool ForceInfoRecord() const { return bForceInfo; }
// set own index & return new index
// could override to use more indexes per action
@@ -403,8 +403,8 @@ public:
virtual void Save( XclExpStream& rStrm ) override;
virtual std::size_t GetLen() const override;
- inline XclExpChTrAction* GetAddAction() { return pAddAction.get(); }
- inline sal_uInt32 GetActionNumber() const { return nIndex; }
+ XclExpChTrAction* GetAddAction() { return pAddAction.get(); }
+ sal_uInt32 GetActionNumber() const { return nIndex; }
};
inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress )
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx
index f38e53ecc5c3..82e1f2bb74af 100644
--- a/sc/source/filter/inc/XclImpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclImpChangeTrack.hxx
@@ -63,7 +63,7 @@ private:
enum { nmBase, nmFound, nmNested }
eNestedMode; // action with nested content actions
- inline bool FoundNestedMode() { return eNestedMode == nmFound; }
+ bool FoundNestedMode() { return eNestedMode == nmFound; }
void DoAcceptRejectAction( ScChangeAction* pAction );
void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast );
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index a72e66109106..713476b8a572 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -34,9 +34,9 @@ struct BinAddress
sal_Int32 mnCol;
sal_Int32 mnRow;
- inline explicit BinAddress() : mnCol( 0 ), mnRow( 0 ) {}
- inline explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
- inline explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {}
+ explicit BinAddress() : mnCol( 0 ), mnRow( 0 ) {}
+ explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
+ explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {}
void read( SequenceInputStream& rStrm );
};
@@ -71,7 +71,7 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& or
class BinRangeList
{
public:
- inline explicit BinRangeList() : mvRanges() {}
+ explicit BinRangeList() : mvRanges() {}
::std::vector< BinRange >::const_iterator begin() const { return mvRanges.begin(); }
::std::vector< BinRange >::const_iterator end() const { return mvRanges.end(); }
@@ -147,17 +147,17 @@ public:
sal_Int32 nStart = 0 );
/** Returns the biggest valid cell address in the own Calc document. */
- inline const ScAddress&
+ const ScAddress&
getMaxApiAddress() const { return maMaxApiPos; }
/** Returns the biggest valid cell address in the imported/exported
Excel document. */
- inline const ScAddress&
+ const ScAddress&
getMaxXlsAddress() const { return maMaxXlsPos; }
/** Returns the biggest valid cell address in both Calc and the
imported/exported Excel document. */
- inline const ScAddress&
+ const ScAddress&
getMaxAddress() const { return maMaxPos; }
/** Checks if the passed column index is valid.
diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index f2aface35235..0f1cd52992a4 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -166,7 +166,7 @@ public:
/** Creates and returns the specified filter settings object. */
template< typename FilterSettingsType >
- inline FilterSettingsBase& createFilterSettings()
+ FilterSettingsBase& createFilterSettings()
{ mxSettings.reset( new FilterSettingsType( *this ) ); return *mxSettings; }
/** Returns converted UNO API filter settings representing all filter
diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx
index 5807ae6fca2e..4548ff6a9b4a 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -42,7 +42,7 @@ public:
virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override;
/** Returns true, if the decoder has been initialized correctly. */
- inline bool isValid() const { return mbValid; }
+ bool isValid() const { return mbValid; }
private:
/** Derived classes implement password verification and initialization of
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index a0c7aec5193b..cb7bbf4dbfd3 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -164,7 +164,7 @@ public:
void finalizeImport();
/** Returns the priority of this rule. */
- inline sal_Int32 getPriority() const { return maModel.mnPriority; }
+ sal_Int32 getPriority() const { return maModel.mnPriority; }
ColorScaleRule* getColorScale();
DataBarRule* getDataBar();
@@ -210,7 +210,7 @@ public:
void finalizeImport();
/** Returns the cell ranges this conditional formatting belongs to. */
- inline const ScRangeList& getRanges() const { return maModel.maRanges; }
+ const ScRangeList& getRanges() const { return maModel.maRanges; }
void setReadyForFinalize() { mbReadyForFinalize = true; }
private:
diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index fefdef0313b6..3c29cc33d05d 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -114,9 +114,9 @@ public:
void importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId );
/** Returns the unique connection identifier. */
- inline sal_Int32 getConnectionId() const { return maModel.mnId; }
+ sal_Int32 getConnectionId() const { return maModel.mnId; }
/** Returns the source data type of the connection. */
- inline sal_Int32 getConnectionType() const { return maModel.mnType; }
+ sal_Int32 getConnectionType() const { return maModel.mnType; }
/** Returns read-only access to the connection model data. */
const ConnectionModel& getModel() const { return maModel; }
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index fed44d83916c..b0d24739e67e 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -68,9 +68,9 @@ public:
explicit DefinedNameBase( const WorkbookHelper& rHelper );
/** Returns the original name as imported from or exported to the file. */
- inline const OUString& getModelName() const { return maModel.maName; }
+ const OUString& getModelName() const { return maModel.maName; }
/** Returns the name as used in the Calc document. */
- inline const OUString& getCalcName() const { return maCalcName; }
+ const OUString& getCalcName() const { return maCalcName; }
/** Returns the original name as imported from or exported to the file. */
const OUString& getUpcaseModelName() const;
@@ -102,20 +102,20 @@ public:
void convertFormula( const css::uno::Sequence& rExternalLinks );
std::unique_ptr getScTokens( const css::uno::Sequence& rExternalLinks );
/** Returns true, if this defined name is global in the document. */
- inline bool isGlobalName() const { return mnCalcSheet < 0; }
+ bool isGlobalName() const { return mnCalcSheet < 0; }
/** Returns true, if this defined name is a special builtin name. */
- inline bool isBuiltinName() const { return mcBuiltinId != BIFF_DEFNAME_UNKNOWN; }
+ bool isBuiltinName() const { return mcBuiltinId != BIFF_DEFNAME_UNKNOWN; }
/** Returns true, if this defined name is a macro function call. */
- inline bool isMacroFunction() const { return maModel.mbMacro && maModel.mbFunction; }
+ bool isMacroFunction() const { return maModel.mbMacro && maModel.mbFunction; }
/** Returns true, if this defined name is a reference to a VBA macro. */
- inline bool isVBName() const { return maModel.mbMacro && maModel.mbVBName; }
+ bool isVBName() const { return maModel.mbMacro && maModel.mbVBName; }
/** Returns the 0-based sheet index for local names, or -1 for global names. */
- inline sal_Int16 getLocalCalcSheet() const { return mnCalcSheet; }
+ sal_Int16 getLocalCalcSheet() const { return mnCalcSheet; }
/** Returns the built-in identifier of the defined name. */
- inline sal_Unicode getBuiltinId() const { return mcBuiltinId; }
+ sal_Unicode getBuiltinId() const { return mcBuiltinId; }
/** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */
- inline sal_Int32 getTokenIndex() const { return mnTokenIndex; }
+ sal_Int32 getTokenIndex() const { return mnTokenIndex; }
/** Tries to resolve the defined name to an absolute cell range. */
bool getAbsoluteRange( ScRange& orRange ) const;
diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx
index ff2ca068e64d..ae1662bf6ab2 100644
--- a/sc/source/filter/inc/drawingbase.hxx
+++ b/sc/source/filter/inc/drawingbase.hxx
@@ -30,15 +30,15 @@ namespace xls {
/** Absolute position in a spreadsheet (in EMUs) independent from cells. */
struct AnchorPointModel : public ::oox::drawingml::EmuPoint
{
- inline explicit AnchorPointModel() : ::oox::drawingml::EmuPoint( -1, -1 ) {}
- inline bool isValid() const { return (X >= 0) && (Y >= 0); }
+ explicit AnchorPointModel() : ::oox::drawingml::EmuPoint( -1, -1 ) {}
+ bool isValid() const { return (X >= 0) && (Y >= 0); }
};
/** Absolute size in a spreadsheet (in EMUs). */
struct AnchorSizeModel : public ::oox::drawingml::EmuSize
{
- inline explicit AnchorSizeModel() : ::oox::drawingml::EmuSize( -1, -1 ) {}
- inline bool isValid() const { return (Width >= 0) && (Height >= 0); }
+ explicit AnchorSizeModel() : ::oox::drawingml::EmuSize( -1, -1 ) {}
+ bool isValid() const { return (Width >= 0) && (Height >= 0); }
};
/** Position in spreadsheet (cell position and offset inside cell). */
@@ -50,7 +50,7 @@ struct CellAnchorModel
sal_Int64 mnRowOffset; /// Y offset inside the row.
explicit CellAnchorModel();
- inline bool isValid() const { return (mnCol >= 0) && (mnRow >= 0); }
+ bool isValid() const { return (mnCol >= 0) && (mnRow >= 0); }
};
/** Application-specific client data of a shape. */
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index cbf746dfe729..88105a159f9f 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -124,7 +124,7 @@ public:
void GetDimensions( SCCOL& nCols, SCROW& nRows ) const
{ nCols = nColMax; nRows = nRowMax; }
- inline size_t ListSize() const{ return maList.size(); }
+ size_t ListSize() const{ return maList.size(); }
ScEEParseEntry* ListEntry( size_t index ) { return maList[ index ]; }
const ScEEParseEntry* ListEntry( size_t index ) const { return maList[ index ]; }
};
diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index 8d5391896c57..fa02e013b9eb 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -35,7 +35,7 @@ class WorkbookContextBase : public ::oox::core::ContextHandler2, public Workbook
{
public:
template< typename ParentType >
- inline explicit WorkbookContextBase( ParentType& rParent ) :
+ explicit WorkbookContextBase( ParentType& rParent ) :
::oox::core::ContextHandler2( rParent ), WorkbookHelper( rParent ) {}
};
@@ -47,7 +47,7 @@ class WorksheetContextBase : public ::oox::core::ContextHandler2, public Workshe
{
public:
template< typename ParentType >
- inline explicit WorksheetContextBase( ParentType& rParent ) :
+ explicit WorksheetContextBase( ParentType& rParent ) :
::oox::core::ContextHandler2( rParent ), WorksheetHelper( rParent ) {}
};
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index 02fc8c4240fe..1c8cef4db240 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -87,20 +87,20 @@ public:
RootData* pRoot,
const ScRange& rRange);
- inline bool IsActive() const { return bActive; }
- inline bool IsFiltered() const { return bAutoOrAdvanced; }
- inline SCTAB Tab() const { return aParam.nTab; }
- inline SCCOL StartCol() const { return aParam.nCol1; }
- inline SCROW StartRow() const { return aParam.nRow1; }
- inline SCCOL EndCol() const { return aParam.nCol2; }
- inline SCROW EndRow() const { return aParam.nRow2; }
+ bool IsActive() const { return bActive; }
+ bool IsFiltered() const { return bAutoOrAdvanced; }
+ SCTAB Tab() const { return aParam.nTab; }
+ SCCOL StartCol() const { return aParam.nCol1; }
+ SCROW StartRow() const { return aParam.nRow1; }
+ SCCOL EndCol() const { return aParam.nCol2; }
+ SCROW EndRow() const { return aParam.nRow2; }
void ReadAutoFilter( XclImpStream& rStrm, svl::SharedStringPool& rPool );
- inline void Activate() { bActive = true; }
+ void Activate() { bActive = true; }
void SetAdvancedRange( const ScRange* pRange );
void SetExtractPos( const ScAddress& rAddr );
- inline void SetAutoOrAdvanced() { bAutoOrAdvanced = true; }
+ void SetAutoOrAdvanced() { bAutoOrAdvanced = true; }
void Apply();
void EnableRemoveFilter();
};
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index a2997097214e..289444b1f7d6 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -97,7 +97,7 @@ private:
protected:
bool bVal;
- inline ExcBoolRecord() : bVal( false ) {}
+ ExcBoolRecord() : bVal( false ) {}
public:
virtual std::size_t GetLen() const override;
@@ -256,7 +256,7 @@ protected:
public:
ExcBundlesheetBase( RootData& rRootData, SCTAB nTab );
- inline void SetStreamPos(sal_uInt64 const nStrPos) { m_nStrPos = nStrPos; }
+ void SetStreamPos(sal_uInt64 const nStrPos) { m_nStrPos = nStrPos; }
void UpdateStreamPos( XclExpStream& rStrm );
virtual sal_uInt16 GetNum() const override;
@@ -338,8 +338,8 @@ class XclExpAutofilterinfo : public XclExpUInt16Record
public:
explicit XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nScCol );
- inline const ScAddress& GetStartPos() const { return maStartPos; }
- inline SCCOL GetColCount() const { return static_cast< SCCOL >( GetValue() ); }
+ const ScAddress& GetStartPos() const { return maStartPos; }
+ SCCOL GetColCount() const { return static_cast< SCCOL >( GetValue() ); }
private:
ScAddress maStartPos;
@@ -359,7 +359,7 @@ public:
ExcFilterCondition();
~ExcFilterCondition();
- inline bool IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); }
+ bool IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); }
std::size_t GetTextBytes() const;
void SetCondition( sal_uInt8 nTp, sal_uInt8 nOp, double fV, OUString* pT );
@@ -388,8 +388,8 @@ private:
public:
XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC );
- inline sal_uInt16 GetCol() const { return nCol; }
- inline bool HasTop10() const { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); }
+ sal_uInt16 GetCol() const { return nCol; }
+ bool HasTop10() const { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); }
bool HasCondition() const;
bool AddEntry( const ScQueryEntry& rEntry );
diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx
index 38d436c6d61c..a33a37db6d8e 100644
--- a/sc/source/filter/inc/excscen.hxx
+++ b/sc/source/filter/inc/excscen.hxx
@@ -38,9 +38,9 @@ public:
ExcScenarioCell( const sal_uInt16 nC, const sal_uInt16 nR );
- inline void SetValue( const OUString& rVal ) { aValue = rVal; }
+ void SetValue( const OUString& rVal ) { aValue = rVal; }
- inline const OUString& GetValue() const { return aValue; }
+ const OUString& GetValue() const { return aValue; }
};
class ExcScenario
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index db47ce23e0ce..7114daa4eddf 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -58,7 +58,7 @@ public:
/** Appends the passed value to the result set. */
template< typename Type >
- inline void appendResultValue( const Type& rValue )
+ void appendResultValue( const Type& rValue )
{ if( maCurrIt != maResults.end() ) (*maCurrIt++) <<= rValue; }
/** Imports the definedName element. */
@@ -117,7 +117,7 @@ typedef std::shared_ptr< ExternalName > ExternalNameRef;
class LinkSheetRange
{
public:
- inline explicit LinkSheetRange() { setDeleted(); }
+ explicit LinkSheetRange() { setDeleted(); }
/** Sets this struct to deleted state. */
void setDeleted();
@@ -129,17 +129,17 @@ public:
void setExternalRange( sal_Int32 nDocLink, sal_Int32 nFirst, sal_Int32 nLast );
/** Returns true, if the sheet indexes are valid and different. */
- inline bool isDeleted() const { return mnFirst < 0; }
+ bool isDeleted() const { return mnFirst < 0; }
/** Returns true, if the sheet range points to an external document. */
- inline bool isExternal() const { return !isDeleted() && (meType == LINKSHEETRANGE_EXTERNAL); }
+ bool isExternal() const { return !isDeleted() && (meType == LINKSHEETRANGE_EXTERNAL); }
/** Returns true, if the sheet indexes are valid and different. */
- inline bool isSameSheet() const { return meType == LINKSHEETRANGE_SAMESHEET; }
+ bool isSameSheet() const { return meType == LINKSHEETRANGE_SAMESHEET; }
/** Returns true, if the sheet indexes are valid and different. */
- inline bool is3dRange() const { return (0 <= mnFirst) && (mnFirst < mnLast); }
+ bool is3dRange() const { return (0 <= mnFirst) && (mnFirst < mnLast); }
- inline sal_Int32 getDocLinkIndex() const { return mnDocLink; }
- inline sal_Int32 getFirstSheet() const { return mnFirst; }
- inline sal_Int32 getLastSheet() const { return mnLast; }
+ sal_Int32 getDocLinkIndex() const { return mnDocLink; }
+ sal_Int32 getFirstSheet() const { return mnFirst; }
+ sal_Int32 getLastSheet() const { return mnLast; }
private:
enum LinkSheetRangeType
@@ -204,17 +204,17 @@ public:
void importExternalAddin( SequenceInputStream& rStrm );
/** Sets the link type to 'self reference'. */
- inline void setSelfLinkType() { meLinkType = ExternalLinkType::Self; }
+ void setSelfLinkType() { meLinkType = ExternalLinkType::Self; }
/** Returns the type of this external link. */
- inline ExternalLinkType getLinkType() const { return meLinkType; }
+ ExternalLinkType getLinkType() const { return meLinkType; }
/** Returns the relation identifier for the external link fragment. */
- inline const OUString& getRelId() const { return maRelId; }
+ const OUString& getRelId() const { return maRelId; }
/** Returns the class name of this external link. */
- inline const OUString& getClassName() const { return maClassName; }
+ const OUString& getClassName() const { return maClassName; }
/** Returns the target URL of this external link. */
- inline const OUString& getTargetUrl() const { return maTargetUrl; }
+ const OUString& getTargetUrl() const { return maTargetUrl; }
/** Returns the link info needed by the XML formula parser. */
css::sheet::ExternalLinkInfo getLinkInfo() const;
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index 649c8ac45698..acd8944bd7e2 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -48,10 +48,10 @@ class ScfApiHelper
{
public:
/** Converts a tools color to a UNO color value. */
- inline static sal_Int32 ConvertToApiColor( const Color& rColor )
+ static sal_Int32 ConvertToApiColor( const Color& rColor )
{ return static_cast< sal_Int32 >( rColor.GetColor() ); }
/** Converts a UNO color value to a tools color. */
- inline static Color ConvertFromApiColor( sal_Int32 nApiColor )
+ static Color ConvertFromApiColor( sal_Int32 nApiColor )
{ return Color( static_cast< ColorData >( nApiColor ) ); }
/** Converts a non-empty vector into a UNO sequence containing elements of the same type. */
@@ -112,12 +112,12 @@ css::uno::Sequence< Type > ScfApiHelper::VectorToSequence( const ::std::vector<
class ScfPropertySet
{
public:
- inline explicit ScfPropertySet() {}
+ explicit ScfPropertySet() {}
/** Constructs a property set wrapper with the passed UNO property set. */
- inline explicit ScfPropertySet( const css::uno::Reference< css::beans::XPropertySet > & xPropSet ) { Set( xPropSet ); }
+ explicit ScfPropertySet( const css::uno::Reference< css::beans::XPropertySet > & xPropSet ) { Set( xPropSet ); }
/** Constructs a property set wrapper after querying the XPropertySet interface. */
template< typename InterfaceType >
- inline explicit ScfPropertySet( const css::uno::Reference< InterfaceType >& xInterface ) { Set( xInterface ); }
+ explicit ScfPropertySet( const css::uno::Reference< InterfaceType >& xInterface ) { Set( xInterface ); }
~ScfPropertySet();
@@ -125,11 +125,11 @@ public:
void Set( css::uno::Reference< css::beans::XPropertySet > const & xPropSet );
/** Queries the passed interface for an XPropertySet and releases the old UNO property set. */
template< typename InterfaceType >
- inline void Set( css::uno::Reference< InterfaceType > xInterface )
+ void Set( css::uno::Reference< InterfaceType > xInterface )
{ Set( css::uno::Reference< css::beans::XPropertySet >( xInterface, css::uno::UNO_QUERY ) ); }
/** Returns true, if the contained XPropertySet interface is valid. */
- inline bool Is() const { return mxPropSet.is(); }
+ bool Is() const { return mxPropSet.is(); }
/** Returns the contained XPropertySet interface. */
const css::uno::Reference< css::beans::XPropertySet >& GetApiPropertySet() const { return mxPropSet; }
@@ -149,7 +149,7 @@ public:
/** Gets the specified property from the property set.
@return true, if the passed variable could be filled with the property value. */
template< typename Type >
- inline bool GetProperty( Type& rValue, const OUString& rPropName ) const
+ bool GetProperty( Type& rValue, const OUString& rPropName ) const
{ css::uno::Any aAny; return GetAnyProperty( aAny, rPropName ) && (aAny >>= rValue); }
/** Gets the specified Boolean property from the property set.
@@ -175,19 +175,19 @@ public:
/** Puts the passed value into the property set. */
template< typename Type >
- inline void SetProperty( const OUString& rPropName, const Type& rValue )
+ void SetProperty( const OUString& rPropName, const Type& rValue )
{ SetAnyProperty( rPropName, css::uno::makeAny( rValue ) ); }
/** Puts the passed Boolean value into the property set. */
- inline void SetBoolProperty( const OUString& rPropName, bool bValue )
+ void SetBoolProperty( const OUString& rPropName, bool bValue )
{ SetAnyProperty( rPropName, css::uno::Any( bValue ) ); }
/** Puts the passed string into the property set. */
- inline void SetStringProperty( const OUString& rPropName, const OUString& rValue )
+ void SetStringProperty( const OUString& rPropName, const OUString& rValue )
{ SetProperty( rPropName, rValue ); }
/** Puts the passed color into the property set. */
- inline void SetColorProperty( const OUString& rPropName, const Color& rColor )
+ void SetColorProperty( const OUString& rPropName, const Color& rColor )
{ SetProperty( rPropName, ScfApiHelper::ConvertToApiColor( rColor ) ); }
/** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface.
@@ -246,7 +246,7 @@ public:
/** Writes an Any to the value sequence. */
void WriteValue( const css::uno::Any& rAny );
/** Writes a color value to the value sequence. */
- inline void WriteValue( const Color& rColor )
+ void WriteValue( const Color& rColor )
{ WriteValue( ScfApiHelper::ConvertToApiColor( rColor ) ); }
/** Writes a C++ boolean value to the value sequence. */
void WriteValue( bool rbValue );
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 21716615b25a..ba5440cc7679 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -282,7 +282,7 @@ public:
/** Appends a new token with the passed op-code and data. */
template< typename Type >
- inline void append( sal_Int32 nOpCode, const Type& rData ) { append( nOpCode ) <<= rData; }
+ void append( sal_Int32 nOpCode, const Type& rData ) { append( nOpCode ) <<= rData; }
/** Converts to a sequence. */
ApiTokenSequence toSequence() const;
@@ -298,8 +298,8 @@ class ApiTokenIterator
{
public:
explicit ApiTokenIterator( const ApiTokenSequence& rTokens, sal_Int32 nSpacesOpCode, bool bSkipSpaces );
- inline bool is() const { return mpToken != mpTokenEnd; }
- inline const ApiToken* operator->() const { return mpToken; }
+ bool is() const { return mpToken != mpTokenEnd; }
+ const ApiToken* operator->() const { return mpToken; }
ApiTokenIterator& operator++();
@@ -601,7 +601,7 @@ public:
const OpCodeProvider& rOpCodeProv );
/** Returns read/write access to the formula parser property set. */
- inline PropertySet& getParserProperties() { return maParserProps; }
+ PropertySet& getParserProperties() { return maParserProps; }
/** Calls the XFormulaParser::parseFormula() function of the API parser. */
ApiTokenSequence parseFormula(
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx
index 862a820d0ed7..6919831bb004 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -125,7 +125,7 @@ public:
/** Starts the progress bar or activates another segment. */
void ActivateSegment( sal_Int32 nSegment );
/** Starts the progress bar (with first segment). */
- inline void Activate() { ActivateSegment( 0 ); }
+ void Activate() { ActivateSegment( 0 ); }
/** Set current segment to the specified absolute position. */
void ProgressAbs( std::size_t nPos );
/** Increase current segment by the passed value. */
@@ -191,7 +191,7 @@ public:
explicit ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId );
/** Set progress bar to the specified position. */
- inline void ProgressAbs( std::size_t nPos ) { maProgress.ProgressAbs( nPos ); }
+ void ProgressAbs( std::size_t nPos ) { maProgress.ProgressAbs( nPos ); }
private:
/** Initializes and starts the progress bar. */
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 10c323d103f6..1114b0a83366 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -216,7 +216,7 @@ public:
/** Reads and returns a zero terminated byte string and decreases a stream counter. */
static OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft);
/** Reads and returns a zero terminated byte string and decreases a stream counter. */
- inline static OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc)
+ static OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc)
{
return OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc);
}
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index 2d4c2dc66795..d36c70caf763 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -236,18 +236,18 @@ struct ScHTMLPos
SCCOL mnCol;
SCROW mnRow;
- inline explicit ScHTMLPos() : mnCol( 0 ), mnRow( 0 ) {}
- inline explicit ScHTMLPos( SCCOL nCol, SCROW nRow ) :
+ explicit ScHTMLPos() : mnCol( 0 ), mnRow( 0 ) {}
+ explicit ScHTMLPos( SCCOL nCol, SCROW nRow ) :
mnCol( nCol ), mnRow( nRow ) {}
- inline explicit ScHTMLPos( const ScAddress& rAddr ) { Set( rAddr ); }
+ explicit ScHTMLPos( const ScAddress& rAddr ) { Set( rAddr ); }
- inline SCCOLROW Get( ScHTMLOrient eOrient ) const
+ SCCOLROW Get( ScHTMLOrient eOrient ) const
{ return (eOrient == tdCol) ? mnCol : mnRow; }
- inline void Set( SCCOL nCol, SCROW nRow )
+ void Set( SCCOL nCol, SCROW nRow )
{ mnCol = nCol; mnRow = nRow; }
- inline void Set( const ScAddress& rAddr )
+ void Set( const ScAddress& rAddr )
{ Set( rAddr.Col(), rAddr.Row() ); }
- inline ScAddress MakeAddr() const
+ ScAddress MakeAddr() const
{ return ScAddress( mnCol, mnRow, 0 ); }
};
@@ -262,9 +262,9 @@ struct ScHTMLSize
SCCOL mnCols;
SCROW mnRows;
- inline explicit ScHTMLSize( SCCOL nCols, SCROW nRows ) :
+ explicit ScHTMLSize( SCCOL nCols, SCROW nRows ) :
mnCols( nCols ), mnRows( nRows ) {}
- inline void Set( SCCOL nCols, SCROW nRows )
+ void Set( SCCOL nCols, SCROW nRows )
{ mnCols = nCols; mnRows = nRows; }
};
@@ -277,16 +277,16 @@ public:
ScHTMLTableId nTableId = SC_HTML_NO_TABLE );
/** Returns true, if the selection of the entry is empty. */
- inline bool IsEmpty() const { return !aSel.HasRange(); }
+ bool IsEmpty() const { return !aSel.HasRange(); }
/** Returns true, if the entry has any content to be imported. */
bool HasContents() const;
/** Returns true, if the entry represents a table. */
- inline bool IsTable() const { return nTab != SC_HTML_NO_TABLE; }
+ bool IsTable() const { return nTab != SC_HTML_NO_TABLE; }
/** Returns true, if the entry represents a table. */
- inline ScHTMLTableId GetTableId() const { return nTab; }
+ ScHTMLTableId GetTableId() const { return nTab; }
/** Sets or cleares the import always state. */
- inline void SetImportAlways() { mbImportAlways = true; }
+ void SetImportAlways() { mbImportAlways = true; }
/** Sets start point of the entry selection to the start of the import info object. */
void AdjustStart( const ImportInfo& rInfo );
/** Sets end point of the entry selection to the end of the import info object. */
@@ -295,9 +295,9 @@ public:
void Strip( const EditEngine& rEditEngine );
/** Returns read/write access to the item set of this entry. */
- inline SfxItemSet& GetItemSet() { return aItemSet; }
+ SfxItemSet& GetItemSet() { return aItemSet; }
/** Returns read-only access to the item set of this entry. */
- inline const SfxItemSet& GetItemSet() const { return aItemSet; }
+ const SfxItemSet& GetItemSet() const { return aItemSet; }
private:
bool mbImportAlways; /// true = Always import this entry.
@@ -338,9 +338,9 @@ public:
virtual ~ScHTMLTable();
/** Returns the name of the table, specified in the TABLE tag. */
- inline const OUString& GetTableName() const { return maTableName; }
+ const OUString& GetTableName() const { return maTableName; }
/** Returns the unique identifier of the table. */
- inline ScHTMLTableId GetTableId() const { return maTableId.mnTableId; }
+ ScHTMLTableId GetTableId() const { return maTableId.mnTableId; }
/** Returns the cell spanning of the specified cell. */
ScHTMLSize GetSpan( const ScHTMLPos& rCellPos ) const;
@@ -408,7 +408,7 @@ public:
ScHTMLSize GetDocSize( const ScHTMLPos& rCellPos ) const;
/** Returns the resulting Calc position of the top left edge of the table. */
- inline const ScHTMLPos& GetDocPos() const { return maDocBasePos; }
+ const ScHTMLPos& GetDocPos() const { return maDocBasePos; }
/** Calculates the resulting Calc position of the specified HTML column/row. */
SCCOLROW GetDocPos( ScHTMLOrient eOrient, SCCOLROW nCellPos ) const;
/** Calculates the resulting Calc position of the specified HTML cell. */
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 7740bfa280b2..4a2dfafd51a0 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -61,9 +61,9 @@ public:
explicit XclImpOutlineDataBuffer( const XclImpRoot& rRoot, SCTAB nScTab );
virtual ~XclImpOutlineDataBuffer() override;
- inline XclImpColRowSettings* GetColRowBuff() const { return mxColRowBuff.get(); }
- inline XclImpOutlineBuffer* GetColOutline() const { return mxColOutlineBuff.get(); }
- inline XclImpOutlineBuffer* GetRowOutline() const { return mxRowOutlineBuff.get(); }
+ XclImpColRowSettings* GetColRowBuff() const { return mxColRowBuff.get(); }
+ XclImpOutlineBuffer* GetColOutline() const { return mxColOutlineBuff.get(); }
+ XclImpOutlineBuffer* GetRowOutline() const { return mxRowOutlineBuff.get(); }
void Convert();
private:
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index 564befff6860..2c3b3905d4f2 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -42,13 +42,13 @@ struct LotAttrWK3
sal_uInt8 nFontCol;
sal_uInt8 nBack;
- inline bool HasStyles () const
+ bool HasStyles () const
{
return ( nFont || nLineStyle || nFontCol || ( nBack & 0x7F ) );
// !! ohne Center-Bit!!
}
- inline bool IsCentered () const
+ bool IsCentered () const
{
return ( nBack & 0x80 );
}
@@ -78,7 +78,7 @@ private:
~ENTRY();
};
- inline static void MakeHash( const LotAttrWK3& rAttr, sal_uInt32& rOut )
+ static void MakeHash( const LotAttrWK3& rAttr, sal_uInt32& rOut )
{
reinterpret_cast(&rOut)[ 0 ] = rAttr.nFont & 0x7F;
reinterpret_cast(&rOut)[ 1 ] = rAttr.nLineStyle;
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index d207d7619191..6c7bd0a92482 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -37,7 +37,7 @@ private:
SvxFontHeightItem* pHeight;
SvxColorItem* pColor;
sal_Int32 nType; // < 0 -> undefiniert
- inline ENTRY()
+ ENTRY()
{
pTmpName = nullptr;
pFont = nullptr;
@@ -45,7 +45,7 @@ private:
pColor = nullptr;
nType = -1;
}
- inline ~ENTRY()
+ ~ENTRY()
{
if( pTmpName )
delete pTmpName;
@@ -56,20 +56,20 @@ private:
if( pColor )
delete pColor;
}
- inline void TmpName( const OUString &rNew )
+ void TmpName( const OUString &rNew )
{
if( pTmpName )
*pTmpName = rNew;
else
pTmpName = new OUString( rNew );
}
- inline void Height( SvxFontHeightItem& rNew )
+ void Height( SvxFontHeightItem& rNew )
{
if( pHeight )
delete pHeight;
pHeight = &rNew;
}
- inline void Type( const sal_uInt16 nNew ) { nType = nNew; }
+ void Type( const sal_uInt16 nNew ) { nType = nNew; }
};
static void MakeFont( ENTRY* pEntry );
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index 8f2b171d74fa..83fe5b21ba2c 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -169,7 +169,7 @@ struct ExtName
sal_uInt32 nStorageId;
sal_uInt16 nFlags;
- inline ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {}
+ ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {}
bool IsOLE() const;
};
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx
index dfb8ae8c6b8f..fe867c6b740b 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -71,13 +71,13 @@ public:
void readIndex( SequenceInputStream& rStrm );
/** Returns the type of the item. */
- inline sal_Int32 getType() const { return mnType; }
+ sal_Int32 getType() const { return mnType; }
/** Returns the value of the item. */
- inline const css::uno::Any& getValue() const { return maValue; }
+ const css::uno::Any& getValue() const { return maValue; }
/** Returns the string representation of the item. */
OUString getName() const;
/** Returns true if the item is unused. */
- inline bool isUnused() const { return mbUnused; }
+ bool isUnused() const { return mbUnused; }
private:
friend class PivotCacheItemList;
@@ -99,9 +99,9 @@ public:
void importItem( sal_Int32 nRecId, SequenceInputStream& rStrm );
/** Returns true, if this item list is empty. */
- inline bool empty() const { return maItems.empty(); }
+ bool empty() const { return maItems.empty(); }
/** Returns the size of the item list. */
- inline size_t size() const { return maItems.size(); }
+ size_t size() const { return maItems.size(); }
/** Returns the specified item. */
const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const;
@@ -183,7 +183,7 @@ struct PivotCacheGroupItem
OUString maOrigName;
OUString maGroupName;
- inline explicit PivotCacheGroupItem( const OUString& rItemName ) :
+ explicit PivotCacheGroupItem( const OUString& rItemName ) :
maOrigName( rItemName ), maGroupName( rItemName ) {}
};
@@ -228,29 +228,29 @@ public:
void applyItemCaptions( const IdCaptionPairList& vCaptions );
/** Returns true, if the field is based on source data, or false if it is grouped or calculated. */
- inline bool isDatabaseField() const { return maFieldModel.mbDatabaseField; }
+ bool isDatabaseField() const { return maFieldModel.mbDatabaseField; }
/** Returns true, if the field contains a list of shared items. */
- inline bool hasSharedItems() const { return !maSharedItems.empty(); }
+ bool hasSharedItems() const { return !maSharedItems.empty(); }
/** Returns true, if the field contains a list of grouping items. */
- inline bool hasGroupItems() const { return !maGroupItems.empty(); }
+ bool hasGroupItems() const { return !maGroupItems.empty(); }
/** Returns true, if the field has inplace numeric grouping settings. */
- inline bool hasNumericGrouping() const { return maFieldGroupModel.mbRangeGroup && !maFieldGroupModel.mbDateGroup; }
+ bool hasNumericGrouping() const { return maFieldGroupModel.mbRangeGroup && !maFieldGroupModel.mbDateGroup; }
/** Returns true, if the field has inplace date grouping settings. */
- inline bool hasDateGrouping() const { return maFieldGroupModel.mbRangeGroup && maFieldGroupModel.mbDateGroup; }
+ bool hasDateGrouping() const { return maFieldGroupModel.mbRangeGroup && maFieldGroupModel.mbDateGroup; }
/** Returns true, if the field has a parent group field that groups the items of this field. */
- inline bool hasParentGrouping() const { return maFieldGroupModel.mnParentField >= 0; }
+ bool hasParentGrouping() const { return maFieldGroupModel.mnParentField >= 0; }
/** Returns the name of the cache field. */
- inline const OUString& getName() const { return maFieldModel.maName; }
+ const OUString& getName() const { return maFieldModel.maName; }
/** Returns the index of the parent group field that groups the items of this field. */
- inline sal_Int32 getParentGroupField() const { return maFieldGroupModel.mnParentField; }
+ sal_Int32 getParentGroupField() const { return maFieldGroupModel.mnParentField; }
/** Returns the index of the base field grouping is based on. */
- inline sal_Int32 getGroupBaseField() const { return maFieldGroupModel.mnBaseField; }
+ sal_Int32 getGroupBaseField() const { return maFieldGroupModel.mnBaseField; }
/** Returns the finalized group name of this field. */
- inline const OUString& getFinalGroupName() const { return maFieldGroupModel.msFinalGroupName; }
+ const OUString& getFinalGroupName() const { return maFieldGroupModel.msFinalGroupName; }
/** Set the finalized group name of this field. */
- inline void setFinalGroupName(const OUString& rFinalGroupName) { maFieldGroupModel.msFinalGroupName = rFinalGroupName; }
+ void setFinalGroupName(const OUString& rFinalGroupName) { maFieldGroupModel.msFinalGroupName = rFinalGroupName; }
/** Returns the shared or group item with the specified index. */
const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const;
@@ -367,14 +367,14 @@ public:
/** Returns true, if the pivot cache is based on a valid data source, so
that pivot tables can be created based on this pivot cache. */
- inline bool isValidDataSource() const { return mbValidSource; }
+ bool isValidDataSource() const { return mbValidSource; }
/** Returns true, if the pivot cache is based on a dummy sheet created in finalizeImport. */
- inline bool isBasedOnDummySheet() const { return mbDummySheet; }
+ bool isBasedOnDummySheet() const { return mbDummySheet; }
/** Returns the internal cell range the cache is based on. */
- inline const ScRange&
+ const ScRange&
getSourceRange() const { return maSheetSrcModel.maRange; }
/** Returns the relation identifier of the pivot cache records fragment. */
- inline const OUString& getRecordsRelId() const { return maDefModel.maRelId; }
+ const OUString& getRecordsRelId() const { return maDefModel.maRelId; }
/** Returns the cache field with the specified index. */
PivotCacheField* getCacheField( sal_Int32 nFieldIdx );
diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx
index f3bc3daf4821..083d434bfd58 100644
--- a/sc/source/filter/inc/pivottablebuffer.hxx
+++ b/sc/source/filter/inc/pivottablebuffer.hxx
@@ -152,7 +152,7 @@ public:
const css::uno::Reference< css::sheet::XDataPilotDescriptor >& rxDPDesc);
/** Returns the name of the DataPilot field in the fields collection. */
- inline const OUString& getDPFieldName() const { return maDPFieldName; }
+ const OUString& getDPFieldName() const { return maDPFieldName; }
/** Converts dimension and other settings for a row field. */
void convertRowField();
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 1582b4c2fa6f..bb62d2e40a5c 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -51,9 +51,9 @@ public:
void finalizeImport();
/** Returns the text data of this portion. */
- inline const OUString& getText() const { return maText; }
+ const OUString& getText() const { return maText; }
/** Returns true, if the portion contains font formatting. */
- inline bool hasFont() const { return mxFont.get() != nullptr; }
+ bool hasFont() const { return mxFont.get() != nullptr; }
/** Converts the portion and replaces or appends to the passed XText. */
void convert(
@@ -84,8 +84,8 @@ struct FontPortionModel
sal_Int32 mnPos; /// First character in the string.
sal_Int32 mnFontId; /// Font identifier for the next characters.
- explicit inline FontPortionModel() : mnPos( 0 ), mnFontId( -1 ) {}
- explicit inline FontPortionModel( sal_Int32 nPos, sal_Int32 nFontId ) :
+ explicit FontPortionModel() : mnPos( 0 ), mnFontId( -1 ) {}
+ explicit FontPortionModel( sal_Int32 nPos, sal_Int32 nFontId ) :
mnPos( nPos ), mnFontId( nFontId ) {}
void read( SequenceInputStream& rStrm );
@@ -96,7 +96,7 @@ class FontPortionModelList {
::std::vector< FontPortionModel > mvModels;
public:
- inline explicit FontPortionModelList() : mvModels() {}
+ explicit FontPortionModelList() : mvModels() {}
bool empty() const { return mvModels.empty(); }
@@ -175,8 +175,8 @@ struct PhoneticPortionModel
sal_Int32 mnBasePos; /// First character in base text.
sal_Int32 mnBaseLen; /// Number of characters in base text.
- explicit inline PhoneticPortionModel() : mnPos( -1 ), mnBasePos( -1 ), mnBaseLen( 0 ) {}
- explicit inline PhoneticPortionModel( sal_Int32 nPos, sal_Int32 nBasePos, sal_Int32 nBaseLen ) :
+ explicit PhoneticPortionModel() : mnPos( -1 ), mnBasePos( -1 ), mnBaseLen( 0 ) {}
+ explicit PhoneticPortionModel( sal_Int32 nPos, sal_Int32 nBasePos, sal_Int32 nBaseLen ) :
mnPos( nPos ), mnBasePos( nBasePos ), mnBaseLen( nBaseLen ) {}
void read( SequenceInputStream& rStrm );
@@ -186,7 +186,7 @@ struct PhoneticPortionModel
class PhoneticPortionModelList
{
public:
- inline explicit PhoneticPortionModelList() : mvModels() {}
+ explicit PhoneticPortionModelList() : mvModels() {}
bool empty() const { return mvModels.empty(); }
diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx
index c44088ea7680..d74a7ed62538 100644
--- a/sc/source/filter/inc/root.hxx
+++ b/sc/source/filter/inc/root.hxx
@@ -75,8 +75,8 @@ class ExcRoot
{
protected:
RootData* pExcRoot;
- inline ExcRoot( RootData* pNexExcRoot ) : pExcRoot( pNexExcRoot ) {}
- inline ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {}
+ ExcRoot( RootData* pNexExcRoot ) : pExcRoot( pNexExcRoot ) {}
+ ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {}
};
// Lotus Imp~/Exp~ -
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 9f9a357d2208..19ed1e86346a 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -103,7 +103,7 @@ public:
void importColorId( SequenceInputStream& rStrm );
/** Returns true, if the color is set to automatic. */
- inline bool isAuto() const { return isPlaceHolder(); }
+ bool isAuto() const { return isPlaceHolder(); }
};
SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor );
@@ -232,7 +232,7 @@ public:
/** Returns the font model structure. This function can be called before
finalizeImport() has been called. */
- inline const FontModel& getModel() const { return maModel; }
+ const FontModel& getModel() const { return maModel; }
/** Final processing after import of all style settings. */
void finalizeImport();
@@ -315,9 +315,9 @@ public:
void finalizeImport();
/** Returns the alignment model structure. */
- inline const AlignmentModel& getModel() const { return maModel; }
+ const AlignmentModel& getModel() const { return maModel; }
/** Returns the converted API alignment data struct. */
- inline const ApiAlignmentData& getApiData() const { return maApiData; }
+ const ApiAlignmentData& getApiData() const { return maApiData; }
void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const;
@@ -365,7 +365,7 @@ public:
void finalizeImport();
/** Returns the converted API protection data struct. */
- inline const ApiProtectionData& getApiData() const { return maApiData; }
+ const ApiProtectionData& getApiData() const { return maApiData; }
void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const;
private:
@@ -441,7 +441,7 @@ public:
void finalizeImport( bool bRTL );
/** Returns the converted API border data struct. */
- inline const ApiBorderData& getApiData() const { return maApiData; }
+ const ApiBorderData& getApiData() const { return maApiData; }
void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const;
@@ -613,12 +613,12 @@ public:
void finalizeImport();
/** Returns true, if the XF is a cell XF, and false, if it is a style XF. */
- inline bool isCellXf() const { return maModel.mbCellXf; }
+ bool isCellXf() const { return maModel.mbCellXf; }
/** Returns the referred font object. */
FontRef getFont() const;
/** Returns the alignment data of this style. */
- inline const Alignment& getAlignment() const { return maAlignment; }
+ const Alignment& getAlignment() const { return maAlignment; }
void applyPatternToAttrList(
AttrList& rAttrs, SCROW nRow1, SCROW nRow2, sal_Int32 nForceScNumFmt );
@@ -716,10 +716,10 @@ public:
void finalizeImport( const OUString& rFinalName );
/** Returns the cell style model structure. */
- inline const CellStyleModel& getModel() const { return maModel; }
+ const CellStyleModel& getModel() const { return maModel; }
/** Returns the final style name used in the document. */
- inline const OUString& getFinalStyleName() const { return maFinalName; }
- inline ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; }
+ const OUString& getFinalStyleName() const { return maFinalName; }
+ ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; }
private:
CellStyleModel maModel;
OUString maFinalName; /// Final style name used in API.
diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx
index 878c91943879..a5fbc55bc6bf 100644
--- a/sc/source/filter/inc/stylesfragment.hxx
+++ b/sc/source/filter/inc/stylesfragment.hxx
@@ -40,7 +40,7 @@ class FontContext : public WorkbookContextBase
{
public:
template< typename ParentType >
- inline explicit FontContext( ParentType& rParent, const FontRef& rxFont ) :
+ explicit FontContext( ParentType& rParent, const FontRef& rxFont ) :
WorkbookContextBase( rParent ), mxFont( rxFont ) {}
protected:
@@ -54,7 +54,7 @@ class BorderContext : public WorkbookContextBase
{
public:
template< typename ParentType >
- inline explicit BorderContext( ParentType& rParent, const BorderRef& rxBorder ) :
+ explicit BorderContext( ParentType& rParent, const BorderRef& rxBorder ) :
WorkbookContextBase( rParent ), mxBorder( rxBorder ) {}
protected:
@@ -69,7 +69,7 @@ class FillContext : public WorkbookContextBase
{
public:
template< typename ParentType >
- inline explicit FillContext( ParentType& rParent, const FillRef& rxFill ) :
+ explicit FillContext( ParentType& rParent, const FillRef& rxFill ) :
WorkbookContextBase( rParent ), mxFill( rxFill ), mfGradPos( -1.0 ) {}
protected:
@@ -84,7 +84,7 @@ class XfContext : public WorkbookContextBase
{
public:
template< typename ParentType >
- inline explicit XfContext( ParentType& rParent, const XfRef& rxXf, bool bCellXf ) :
+ explicit XfContext( ParentType& rParent, const XfRef& rxXf, bool bCellXf ) :
WorkbookContextBase( rParent ), mxXf( rxXf ), mbCellXf( bCellXf ) {}
protected:
@@ -100,7 +100,7 @@ class DxfContext : public WorkbookContextBase
{
public:
template< typename ParentType >
- inline explicit DxfContext( ParentType& rParent, const DxfRef& rxDxf ) :
+ explicit DxfContext( ParentType& rParent, const DxfRef& rxDxf ) :
WorkbookContextBase( rParent ), mxDxf( rxDxf ) {}
protected:
diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx
index 384b46191713..43a87b9b87a9 100644
--- a/sc/source/filter/inc/tablebuffer.hxx
+++ b/sc/source/filter/inc/tablebuffer.hxx
@@ -50,9 +50,9 @@ public:
/** Imports a table definition from a TABLE record. */
void importTable( SequenceInputStream& rStrm, sal_Int16 nSheet );
/** Creates a new auto filter and stores it internally. */
- inline AutoFilter& createAutoFilter() { return maAutoFilters.createAutoFilter(); }
+ AutoFilter& createAutoFilter() { return maAutoFilters.createAutoFilter(); }
/** Creates a new tableColumns handler and stores it internally. */
- inline TableColumns& createTableColumns() { return maTableColumns.createTableColumns(); }
+ TableColumns& createTableColumns() { return maTableColumns.createTableColumns(); }
/** Creates a database range from this tables. */
void finalizeImport();
@@ -60,24 +60,24 @@ public:
void applyTableColumns();
/** Returns the unique table identifier. */
- inline sal_Int32 getTableId() const { return maModel.mnId; }
+ sal_Int32 getTableId() const { return maModel.mnId; }
/** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */
- inline sal_Int32 getTokenIndex() const { return mnTokenIndex; }
+ sal_Int32 getTokenIndex() const { return mnTokenIndex; }
/** Returns the original display name of the table. */
- inline const OUString& getDisplayName() const { return maModel.maDisplayName; }
+ const OUString& getDisplayName() const { return maModel.maDisplayName; }
/** Returns the original (unchecked) total range of the table. */
- inline const ScRange& getOriginalRange() const { return maModel.maRange; }
+ const ScRange& getOriginalRange() const { return maModel.maRange; }
/** Returns the cell range of this table. */
- inline const ScRange& getRange() const { return maDestRange; }
+ const ScRange& getRange() const { return maDestRange; }
/** Returns the number of columns of this table. */
- inline SCCOL getWidth() const { return maDestRange.aEnd.Col() - maDestRange.aStart.Col() + 1; }
+ SCCOL getWidth() const { return maDestRange.aEnd.Col() - maDestRange.aStart.Col() + 1; }
/** Returns the number of rows of this table. */
- inline SCROW getHeight() const { return maDestRange.aEnd.Row() - maDestRange.aStart.Row() + 1; }
+ SCROW getHeight() const { return maDestRange.aEnd.Row() - maDestRange.aStart.Row() + 1; }
/** Returns the number of header rows in the table range. */
- inline sal_Int32 getHeaderRows() const { return maModel.mnHeaderRows; }
+ sal_Int32 getHeaderRows() const { return maModel.mnHeaderRows; }
/** Returns the number of totals rows in the table range. */
- inline sal_Int32 getTotalsRows() const { return maModel.mnTotalsRows; }
+ sal_Int32 getTotalsRows() const { return maModel.mnTotalsRows; }
private:
TableModel maModel;
diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx
index 8ae61d11e87d..76a6d021ab91 100644
--- a/sc/source/filter/inc/themebuffer.hxx
+++ b/sc/source/filter/inc/themebuffer.hxx
@@ -40,7 +40,7 @@ public:
sal_Int32 getColorByIndex(size_t nIndex) const;
/** Returns the default font data for the current file type. */
- inline const FontModel& getDefaultFontModel() const { return *mxDefFontModel; }
+ const FontModel& getDefaultFontModel() const { return *mxDefFontModel; }
private:
typedef ::std::unique_ptr< FontModel > FontModelPtr;
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index cd18b10ccac0..55d0dba05ea1 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -44,9 +44,9 @@ struct TokenId
TokenId() : nId( 0 ) {}
TokenId( sal_uInt16 n ) : nId( n ) {}
TokenId( const TokenId& r ) : nId( r.nId ) {}
- inline TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; }
- inline TokenId& operator =( sal_uInt16 n ) { nId = n; return *this; }
- inline operator const sal_uInt16&() const { return nId; }
+ TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; }
+ TokenId& operator =( sal_uInt16 n ) { nId = n; return *this; }
+ operator const sal_uInt16&() const { return nId; }
};
struct ScComplexRefData;
@@ -232,7 +232,7 @@ class TokenStack
inline void Reset();
- inline bool HasMoreTokens() const { return nPos > 0; }
+ bool HasMoreTokens() const { return nPos > 0; }
inline const TokenId Get();
};
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index e5e12b6dfc08..e6369c6aa817 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -101,7 +101,7 @@ typedef std::shared_ptr< WorkbookGlobals > WorkbookGlobalsRef;
class WorkbookHelper
{
public:
- inline /*implicit*/ WorkbookHelper( WorkbookGlobals& rBookGlob ) : mrBookGlob( rBookGlob ) {}
+ /*implicit*/ WorkbookHelper( WorkbookGlobals& rBookGlob ) : mrBookGlob( rBookGlob ) {}
virtual ~WorkbookHelper();
static WorkbookGlobalsRef constructGlobals( ExcelFilter& rFilter );
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index ee04695e4eeb..c63ce77e0d8c 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -142,8 +142,8 @@ private:
public:
XclEscherHostAppData() : bStackedGroup( false )
{}
- inline void SetStackedGroup( bool b ) { bStackedGroup = b; }
- inline bool IsStackedGroup() const { return bStackedGroup; }
+ void SetStackedGroup( bool b ) { bStackedGroup = b; }
+ bool IsStackedGroup() const { return bStackedGroup; }
};
// --- class XclEscherClientData -------------------------------------
@@ -172,7 +172,7 @@ public:
XclObj* pObj );
//! ONLY for the AdditionalText mimic
- inline void SetXclObj( XclObj* p ) { pXclObj = p; }
+ void SetXclObj( XclObj* p ) { pXclObj = p; }
virtual void WriteData( EscherEx& rEx ) const override;
};
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index 62698c2e7fe7..3d7bc09e5d3c 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -52,15 +52,15 @@ public:
void pop_back ();
- inline bool empty () const { return maObjs.empty(); }
+ bool empty () const { return maObjs.empty(); }
- inline size_t size () const { return maObjs.size(); }
+ size_t size () const { return maObjs.size(); }
- inline iterator begin () { return maObjs.begin(); }
+ iterator begin () { return maObjs.begin(); }
- inline iterator end () { return maObjs.end(); }
+ iterator end () { return maObjs.end(); }
- inline XclExpMsoDrawing* GetMsodrawingPerSheet() { return pMsodrawingPerSheet; }
+ XclExpMsoDrawing* GetMsodrawingPerSheet() { return pMsodrawingPerSheet; }
/// close groups and DgContainer opened in ctor
void EndSheet();
@@ -115,25 +115,25 @@ protected:
public:
virtual ~XclObj() override;
- inline sal_uInt16 GetObjType() const { return mnObjType; }
+ sal_uInt16 GetObjType() const { return mnObjType; }
- inline void SetId( sal_uInt16 nId ) { nObjId = nId; }
+ void SetId( sal_uInt16 nId ) { nObjId = nId; }
- inline void SetTab( SCTAB nScTab ) { mnScTab = nScTab; }
- inline SCTAB GetTab() const { return mnScTab; }
+ void SetTab( SCTAB nScTab ) { mnScTab = nScTab; }
+ SCTAB GetTab() const { return mnScTab; }
- inline void SetLocked( bool b )
+ void SetLocked( bool b )
{ b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; }
- inline void SetPrintable( bool b )
+ void SetPrintable( bool b )
{ b ? nGrbit |= 0x0010 : nGrbit &= ~0x0010; }
- inline void SetAutoFill( bool b )
+ void SetAutoFill( bool b )
{ b ? nGrbit |= 0x2000 : nGrbit &= ~0x2000; }
- inline void SetAutoLine( bool b )
+ void SetAutoLine( bool b )
{ b ? nGrbit |= 0x4000 : nGrbit &= ~0x4000; }
// set corresponding Excel object type in OBJ/ftCmo
void SetEscherShapeType( sal_uInt16 nType );
- inline void SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; }
+ void SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; }
/** If set to true, this object has created its own escher data.
@descr This causes the function EscherEx::EndShape() to not post process
@@ -144,7 +144,7 @@ public:
EscherEx::EndShape(). */
/** Returns true, if the object has created the escher data itself.
@descr See SetOwnEscher() for details. */
- inline bool IsOwnEscher() const { return mbOwnEscher; }
+ bool IsOwnEscher() const { return mbOwnEscher; }
//! actually writes ESCHER_ClientTextbox
void SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj );
@@ -203,8 +203,8 @@ public:
XclTxo( const XclExpRoot& rRoot, const SdrTextObj& rEditObj );
XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObject* pCaption );
- inline void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; }
- inline void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; }
+ void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; }
+ void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; }
virtual void Save( XclExpStream& rStrm ) override;
@@ -358,7 +358,7 @@ protected:
public:
ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const OUString& rTxt );
- inline std::size_t GetStringBytes() const
+ std::size_t GetStringBytes() const
{ return sText.GetSize(); }
void WriteAddress( XclExpStream& rStrm ) const ;
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index a5b43c149dbf..f4e05de6f3b3 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -84,7 +84,7 @@ public:
virtual ~XclExpChRoot() override;
/** Returns this root instance - for code readability in derived classes. */
- inline const XclExpChRoot& GetChRoot() const { return *this; }
+ const XclExpChRoot& GetChRoot() const { return *this; }
/** Returns the API Chart document model. */
css::uno::Reference< css::chart2::XChartDocument > const &
GetChartDocument() const;
@@ -204,7 +204,7 @@ public:
explicit XclExpChFramePos( sal_uInt16 nTLMode );
/** Returns read/write access to the frame position data. */
- inline XclChFramePos& GetFramePosData() { return maData; }
+ XclChFramePos& GetFramePosData() { return maData; }
private:
virtual void WriteBody( XclExpStream& rStrm ) override;
@@ -224,17 +224,17 @@ public:
void Convert( const XclExpChRoot& rRoot,
const ScfPropertySet& rPropSet, XclChObjectType eObjType );
/** Sets or clears the automatic flag. */
- inline void SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO, bAuto ); }
+ void SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO, bAuto ); }
/** Sets flag to show or hide an axis. */
- inline void SetShowAxis( bool bShowAxis )
+ void SetShowAxis( bool bShowAxis )
{ ::set_flag( maData.mnFlags, EXC_CHLINEFORMAT_SHOWAXIS, bShowAxis ); }
/** Sets the line format to the specified default type. */
void SetDefault( XclChFrameType eDefFrameType );
/** Returns true, if the line format is set to automatic. */
- inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); }
+ bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); }
/** Returns true, if the line style is set to something visible. */
- inline bool HasLine() const { return maData.mnPattern != EXC_CHLINEFORMAT_NONE; }
+ bool HasLine() const { return maData.mnPattern != EXC_CHLINEFORMAT_NONE; }
/** Returns true, if the line contains default formatting according to the passed frame type. */
bool IsDefault( XclChFrameType eDefFrameType ) const;
@@ -258,14 +258,14 @@ public:
bool Convert( const XclExpChRoot& rRoot,
const ScfPropertySet& rPropSet, XclChObjectType eObjType );
/** Sets or clears the automatic flag. */
- inline void SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO, bAuto ); }
+ void SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO, bAuto ); }
/** Sets the area format to the specified default type. */
void SetDefault( XclChFrameType eDefFrameType );
/** Returns true, if the area format is set to automatic. */
- inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); }
+ bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); }
/** Returns true, if the area style is set to something visible. */
- inline bool HasArea() const { return maData.mnPattern != EXC_PATT_NONE; }
+ bool HasArea() const { return maData.mnPattern != EXC_PATT_NONE; }
/** Returns true, if the area contains default formatting according to the passed frame type. */
bool IsDefault( XclChFrameType eDefFrameType ) const;
@@ -399,7 +399,7 @@ public:
void AppendString( const OUString& rStr );
/** Returns true, if this source link contains explicit string data. */
- inline bool HasString() const { return mxString && !mxString->IsEmpty(); }
+ bool HasString() const { return mxString && !mxString->IsEmpty(); }
/** Writes the CHSOURCELINK record and optionally a CHSTRING record with explicit string data. */
virtual void Save( XclExpStream& rStrm ) override;
@@ -507,7 +507,7 @@ public:
void ConvertTrendLineEquation( const ScfPropertySet& rPropSet, const XclChDataPointPos& rPointPos );
/** Returns true, if the string object does not contain any text data. */
- inline bool HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
+ bool HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
/** Returns the flags needed for the CHATTACHEDLABEL record. */
sal_uInt16 GetAttLabelFlags() const;
@@ -546,11 +546,11 @@ public:
const ScfPropertySet& rPropSet, bool bCloseSymbol );
/** Returns true, if markers are enabled. */
- inline bool HasMarker() const { return maData.mnMarkerType != EXC_CHMARKERFORMAT_NOSYMBOL; }
+ bool HasMarker() const { return maData.mnMarkerType != EXC_CHMARKERFORMAT_NOSYMBOL; }
/** Returns true, if border line of markers is visible. */
- inline bool HasLineColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOLINE ); }
+ bool HasLineColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOLINE ); }
/** Returns true, if fill area of markers is visible. */
- inline bool HasFillColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOFILL ); }
+ bool HasFillColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOFILL ); }
private:
/** Registers marker colors in palette and stores color identifiers. */
@@ -625,7 +625,7 @@ public:
void ConvertLine( const ScfPropertySet& rPropSet, XclChObjectType eObjType );
/** Returns true, if this objects describes the formatting of an entire series. */
- inline bool IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; }
+ bool IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; }
/** Writes all embedded records. */
virtual void WriteSubRecords( XclExpStream& rStrm ) override;
@@ -772,9 +772,9 @@ public:
void SetStacked( bool bPercent );
/** Returns true, if this is object represents a valid chart type. */
- inline bool IsValidType() const { return maTypeInfo.meTypeId != EXC_CHTYPEID_UNKNOWN; }
+ bool IsValidType() const { return maTypeInfo.meTypeId != EXC_CHTYPEID_UNKNOWN; }
/** Returns the chart type info struct for the contained chart type. */
- inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; }
+ const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; }
private:
virtual void WriteBody( XclExpStream& rStrm ) override;
@@ -793,10 +793,10 @@ public:
/** Converts 3d settings for the passed chart type. */
void Convert( const ScfPropertySet& rPropSet, bool b3dWallChart );
/** Sets flag that the data points are clustered on the X axis. */
- inline void SetClustered() { ::set_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
+ void SetClustered() { ::set_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
/** Returns true, if the data points are clustered on the X axis. */
- inline bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
+ bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
private:
virtual void WriteBody( XclExpStream& rStrm ) override;
@@ -887,19 +887,19 @@ public:
void ConvertLegend( const ScfPropertySet& rPropSet );
/** Returns true, if this chart type group contains at least one valid series. */
- inline bool IsValidGroup() const { return !maSeries.IsEmpty() && maType.IsValidType(); }
+ bool IsValidGroup() const { return !maSeries.IsEmpty() && maType.IsValidType(); }
/** Returns the index of this chart type group format. */
- inline sal_uInt16 GetGroupIdx() const { return maData.mnGroupIdx; }
+ sal_uInt16 GetGroupIdx() const { return maData.mnGroupIdx; }
/** Returns the chart type info struct for the contained chart type. */
- inline const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; }
+ const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; }
/** Returns true, if the chart is three-dimensional. */
- inline bool Is3dChart() const { return maTypeInfo.mb3dChart; }
+ bool Is3dChart() const { return maTypeInfo.mb3dChart; }
/** Returns true, if chart type supports wall and floor format. */
- inline bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
+ bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
/** Returns true, if the series in this chart type group are ordered on the Z axis. */
- inline bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
+ bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
/** Returns true, if this chart type can be combined with other types. */
- inline bool IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; }
+ bool IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; }
/** Writes all embedded records. */
virtual void WriteSubRecords( XclExpStream& rStrm ) override;
@@ -949,7 +949,7 @@ public:
/** Converts position settings of a crossing axis at this axis. */
void ConvertAxisPosition( const ScfPropertySet& rPropSet );
/** Sets flag for tickmark position between categories or on categories. */
- inline void SetTicksBetweenCateg( bool bTicksBetween )
+ void SetTicksBetweenCateg( bool bTicksBetween )
{ ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_BETWEEN, bTicksBetween ); }
private:
@@ -1029,9 +1029,9 @@ public:
void ConvertWall( css::uno::Reference< css::chart2::XDiagram > const & xDiagram );
/** Returns the type of this axis. */
- inline sal_uInt16 GetAxisType() const { return maData.mnType; }
+ sal_uInt16 GetAxisType() const { return maData.mnType; }
/** Returns the axis dimension index used by the chart API. */
- inline sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); }
+ sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); }
/** Writes all embedded records. */
virtual void WriteSubRecords( XclExpStream& rStrm ) override;
@@ -1071,11 +1071,11 @@ public:
sal_uInt16 nFirstGroupIdx );
/** Returns true, if this axes set exists (returns false if this is a dummy object). */
- inline bool IsValidAxesSet() const { return !maTypeGroups.IsEmpty(); }
+ bool IsValidAxesSet() const { return !maTypeGroups.IsEmpty(); }
/** Returns the index of the axes set (primary/secondary). */
- inline sal_uInt16 GetAxesSetId() const { return maData.mnAxesSetId; }
+ sal_uInt16 GetAxesSetId() const { return maData.mnAxesSetId; }
/** Returns the axes set index used by the chart API. */
- inline sal_Int32 GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); }
+ sal_Int32 GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); }
/** Returns true, if the chart is three-dimensional. */
bool Is3dChart() const;
diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 06f582fe5e3d..1b8d00253d3a 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -104,7 +104,7 @@ public:
virtual ~XclExpHyperlink() override;
/** Returns the cell representation text or 0, if not available. */
- inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? nullptr : &m_Repr; }
+ const OUString* GetRepr() const { return m_Repr.isEmpty() ? nullptr : &m_Repr; }
virtual void SaveXml( XclExpXmlStream& rStrm ) override;
@@ -322,7 +322,7 @@ public:
virtual ~XclExpDV() override;
/** Returns the core handle of the validation data. */
- inline sal_uLong GetScHandle() const { return mnScHandle; }
+ sal_uLong GetScHandle() const { return mnScHandle; }
/** Inserts a new cell range into the cell range list. */
void InsertCellRange( const ScRange& rPos );
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index fdb632b38a49..f3a98cfddd6b 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -172,11 +172,11 @@ protected:
css::uno::Reference< css::drawing::XShape > const & xShape );
/** Returns the Excel token array of the cell link, or 0, if no link present. */
- inline const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); }
+ const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); }
/** Returns the Excel token array of the source range, or 0, if no link present. */
- inline const XclTokenArray* GetSourceRangeTokArr() const { return mxSrcRange.get(); }
+ const XclTokenArray* GetSourceRangeTokArr() const { return mxSrcRange.get(); }
/** Returns the number of entries in the source range, or 0, if no source set. */
- inline sal_uInt16 GetSourceEntryCount() const { return mnEntryCount; }
+ sal_uInt16 GetSourceEntryCount() const { return mnEntryCount; }
/** Writes a formula with special style only valid in OBJ records. */
static void WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr );
@@ -405,7 +405,7 @@ public:
/** Finalizes the object manager after conversion of all sheets. */
void EndDocument();
- inline XclEscherEx& GetEscherEx() { return *mxEscherEx; }
+ XclEscherEx& GetEscherEx() { return *mxEscherEx; }
XclExpMsoDrawing* GetMsodrawingPerSheet();
bool HasObj() const;
sal_uInt16 AddObj( XclObj* pObjRec );
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index b60d3438bc24..7bcdd57759ad 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -189,9 +189,9 @@ public:
XclExpHyperlinkRef GetLinkRecord();
/** Returns true, if multiple URLs have been processed. */
- inline bool HasMultipleUrls() const { return mbMultipleUrls; }
+ bool HasMultipleUrls() const { return mbMultipleUrls; }
/** Returns a string containing all processed URLs. */
- inline const OUString& GetUrlList() { return maUrlList; }
+ const OUString& GetUrlList() { return maUrlList; }
private:
XclExpHyperlinkRef mxLinkRec; /// Created HLINK record.
@@ -374,9 +374,9 @@ public:
const EditTextObject* pRightObj );
/** Returns the last generated header/footer string. */
- inline const OUString& GetHFString() const { return maHFString; }
+ const OUString& GetHFString() const { return maHFString; }
/** Returns the total height of the last generated header/footer in twips. */
- inline sal_Int32 GetTotalHeight() const { return mnTotalHeight; }
+ sal_Int32 GetTotalHeight() const { return mnTotalHeight; }
private:
/** Converts the text object contents and stores it in the passed string. */
diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx
index b8f0868a6cd3..6798583bb252 100644
--- a/sc/source/filter/inc/xelink.hxx
+++ b/sc/source/filter/inc/xelink.hxx
@@ -89,19 +89,19 @@ public:
SCTAB GetRealScTab( SCTAB nSortedScTab ) const;
/** Returns the number of Calc sheets. */
- inline SCTAB GetScTabCount() const { return mnScCnt; }
+ SCTAB GetScTabCount() const { return mnScCnt; }
/** Returns the number of Excel sheets to be exported. */
- inline sal_uInt16 GetXclTabCount() const { return mnXclCnt; }
+ sal_uInt16 GetXclTabCount() const { return mnXclCnt; }
/** Returns the number of external linked sheets. */
- inline sal_uInt16 GetXclExtTabCount() const { return mnXclExtCnt; }
+ sal_uInt16 GetXclExtTabCount() const { return mnXclExtCnt; }
/** Returns the number of exported selected sheets. */
- inline sal_uInt16 GetXclSelectedCount() const { return mnXclSelCnt; }
+ sal_uInt16 GetXclSelectedCount() const { return mnXclSelCnt; }
/** Returns the Excel index of the active, displayed sheet. */
- inline sal_uInt16 GetDisplayedXclTab() const { return mnDisplXclTab; }
+ sal_uInt16 GetDisplayedXclTab() const { return mnDisplXclTab; }
/** Returns the Excel index of the first visible sheet. */
- inline sal_uInt16 GetFirstVisXclTab() const { return mnFirstVisXclTab; }
+ sal_uInt16 GetFirstVisXclTab() const { return mnFirstVisXclTab; }
private:
/** Returns true, if any of the passed flags is set for the specified Calc sheet. */
@@ -121,7 +121,7 @@ private:
OUString maScName;
sal_uInt16 mnXclTab;
ExcTabBufFlags mnFlags;
- inline explicit XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( ExcTabBufFlags::NONE ) {}
+ explicit XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( ExcTabBufFlags::NONE ) {}
};
typedef ::std::vector< XclExpTabInfoEntry > XclExpTabInfoVec;
diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx
index fe05987c39be..6fc206078885 100644
--- a/sc/source/filter/inc/xepage.hxx
+++ b/sc/source/filter/inc/xepage.hxx
@@ -96,7 +96,7 @@ public:
explicit XclExpPageSettings( const XclExpRoot& rRoot );
/** Returns read-only access to the page data. */
- inline const XclPageData& GetPageData() const { return maData; }
+ const XclPageData& GetPageData() const { return maData; }
/** Writes all page settings records to the stream. */
virtual void Save( XclExpStream& rStrm ) override;
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index 8d9cd54770c1..7cdc3892bb26 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -45,7 +45,7 @@ public:
explicit XclExpPCItem( sal_Int16 nValue );
explicit XclExpPCItem( bool bValue );
- inline sal_uInt16 GetTypeFlag() const { return mnTypeFlag; }
+ sal_uInt16 GetTypeFlag() const { return mnTypeFlag; }
bool EqualsText( const OUString& rText ) const;
bool EqualsDouble( double fValue ) const;
@@ -79,7 +79,7 @@ public:
void SetGroupChildField( const XclExpPCField& rChildField );
/** Returns the name of this cache field. */
- inline const OUString& GetFieldName() const { return maFieldInfo.maName; }
+ const OUString& GetFieldName() const { return maFieldInfo.maName; }
/** Returns the number of visible items of this field. */
sal_uInt16 GetItemCount() const;
@@ -164,12 +164,12 @@ public:
const ScDPObject& rDPObj, sal_uInt16 nListIdx );
/** Returns true, if the cache has been constructed successfully. */
- inline bool IsValid() const { return mbValid; }
+ bool IsValid() const { return mbValid; }
/** Returns true, if the item index list will be written. */
bool HasItemIndexList() const;
/** Returns the list index of the cache used in pivot table records. */
- inline sal_uInt16 GetCacheIndex() const { return mnListIdx; }
+ sal_uInt16 GetCacheIndex() const { return mnListIdx; }
/** Returns the number of pivot cache fields. */
sal_uInt16 GetFieldCount() const;
@@ -327,7 +327,7 @@ public:
const XclExpPCField* GetCacheField( sal_uInt16 nCacheIdx ) const;
/** Returns the output range of the pivot table. */
- inline SCTAB GetScTab() const { return mnOutScTab; }
+ SCTAB GetScTab() const { return mnOutScTab; }
/** Returns a pivot table field by its name. */
const XclExpPTField* GetField( sal_uInt16 nFieldIdx ) const;
diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index 5bff6106f2f3..efa20eb0f402 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -125,16 +125,16 @@ public:
virtual ~XclExpRecord() override;
/** Returns the current record ID. */
- inline sal_uInt16 GetRecId() const { return mnRecId; }
+ sal_uInt16 GetRecId() const { return mnRecId; }
/** Returns the current record size prediction. */
- inline std::size_t GetRecSize() const { return mnRecSize; }
+ std::size_t GetRecSize() const { return mnRecSize; }
/** Sets a new record ID. */
- inline void SetRecId( sal_uInt16 nRecId ) { mnRecId = nRecId; }
+ void SetRecId( sal_uInt16 nRecId ) { mnRecId = nRecId; }
/** Sets a new record size prediction. */
- inline void SetRecSize( std::size_t nRecSize ) { mnRecSize = nRecSize; }
+ void SetRecSize( std::size_t nRecSize ) { mnRecSize = nRecSize; }
/** Adds a size value to the record size prediction. */
- inline void AddRecSize( std::size_t nRecSize ) { mnRecSize += nRecSize; }
+ void AddRecSize( std::size_t nRecSize ) { mnRecSize += nRecSize; }
/** Sets record ID and size with one call. */
void SetRecHeader( sal_uInt16 nRecId, std::size_t nRecSize );
@@ -173,13 +173,13 @@ public:
/** @param nRecId The record ID of this record.
@param rValue The value for the record body.
@param nSize Record size. Uses sizeof( Type ), if this parameter is omitted. */
- inline explicit XclExpValueRecord( sal_uInt16 nRecId, const Type& rValue, std::size_t nSize = sizeof( Type ) ) :
+ explicit XclExpValueRecord( sal_uInt16 nRecId, const Type& rValue, std::size_t nSize = sizeof( Type ) ) :
XclExpRecord( nRecId, nSize ), maValue( rValue ), mnAttribute( -1 ) {}
/** Returns the value of the record. */
- inline const Type& GetValue() const { return maValue; }
+ const Type& GetValue() const { return maValue; }
/** Sets a new record value. */
- inline void SetValue( const Type& rValue ) { maValue = rValue; }
+ void SetValue( const Type& rValue ) { maValue = rValue; }
/** Sets the OOXML attribute this record corresponds to */
XclExpValueRecord* SetAttribute( sal_Int32 nId );
@@ -230,11 +230,11 @@ class XclExpBoolRecord : public XclExpRecord
public:
/** @param nRecId The record ID of this record.
@param nValue The value for the record body. */
- inline explicit XclExpBoolRecord( sal_uInt16 nRecId, bool bValue, sal_Int32 nAttribute = -1 ) :
+ explicit XclExpBoolRecord( sal_uInt16 nRecId, bool bValue, sal_Int32 nAttribute = -1 ) :
XclExpRecord( nRecId, 2 ), mbValue( bValue ), mnAttribute( nAttribute ) {}
/** Returns the Boolean value of the record. */
- inline bool GetBool() const { return mbValue; }
+ bool GetBool() const { return mbValue; }
virtual void SaveXml( XclExpXmlStream& rStrm ) override;
@@ -297,41 +297,41 @@ class XclExpRecordList : public XclExpRecordBase
public:
typedef std::shared_ptr< RecType > RecordRefType;
- inline bool IsEmpty() const { return maRecs.empty(); }
- inline size_t GetSize() const { return maRecs.size(); }
+ bool IsEmpty() const { return maRecs.empty(); }
+ size_t GetSize() const { return maRecs.size(); }
/** Returns true, if the passed index points to an exiting record. */
- inline bool HasRecord( size_t nPos ) const
+ bool HasRecord( size_t nPos ) const
{ return nPos < maRecs.size(); }
/** Returns reference to an existing record or empty reference on error. */
- inline RecordRefType GetRecord( size_t nPos ) const
+ RecordRefType GetRecord( size_t nPos ) const
{ return (nPos < maRecs.size()) ? maRecs[ nPos ] : RecordRefType(); }
/** Returns reference to the first existing record or empty reference, if list is empty. */
- inline RecordRefType GetFirstRecord() const
+ RecordRefType GetFirstRecord() const
{ return maRecs.empty() ? RecordRefType() : maRecs.front(); }
/** Returns reference to the last existing record or empty reference, if list is empty. */
- inline RecordRefType GetLastRecord() const
+ RecordRefType GetLastRecord() const
{ return maRecs.empty() ? RecordRefType() : maRecs.back(); }
/** Inserts a record at the specified position into the list. */
- inline void InsertRecord( RecordRefType xRec, size_t nPos )
+ void InsertRecord( RecordRefType xRec, size_t nPos )
{ if( xRec.get() ) maRecs.insert( maRecs.begin() + ::std::min( nPos, maRecs.size() ), xRec ); }
/** Appends a record to the list. */
- inline void AppendRecord( RecordRefType xRec )
+ void AppendRecord( RecordRefType xRec )
{ if( xRec.get() ) maRecs.push_back( xRec ); }
/** Replaces the record at the specified position from the list with the passed record. */
- inline void ReplaceRecord( RecordRefType xRec, size_t nPos )
+ void ReplaceRecord( RecordRefType xRec, size_t nPos )
{ RemoveRecord( nPos ); InsertRecord( xRec, nPos ); }
/** Appends a newly created record to the list. */
- inline void AppendNewRecord( RecType* pRec )
+ void AppendNewRecord( RecType* pRec )
{ if( pRec ) AppendRecord( RecordRefType( pRec ) ); }
/** Removes the record at the specified position from the list. */
- inline void RemoveRecord( size_t nPos )
+ void RemoveRecord( size_t nPos )
{ if( nPos < maRecs.size() ) maRecs.erase( maRecs.begin() + nPos ); }
/** Removes all records from the list. */
- inline void RemoveAllRecords() { maRecs.clear(); }
+ void RemoveAllRecords() { maRecs.clear(); }
/** Writes the complete record list. */
virtual void Save( XclExpStream& rStrm ) override
diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx
index 5a7ac4ef751e..6ccfda12691f 100644
--- a/sc/source/filter/inc/xeroot.hxx
+++ b/sc/source/filter/inc/xeroot.hxx
@@ -115,9 +115,9 @@ public:
explicit XclExpRoot( XclExpRootData& rExpRootData );
/** Returns this root instance - for code readability in derived classes. */
- inline const XclExpRoot& GetRoot() const { return *this; }
+ const XclExpRoot& GetRoot() const { return *this; }
/** Returns true, if URLs should be stored relative to the document location. */
- inline bool IsRelUrl() const { return mrExpData.mbRelUrl; }
+ bool IsRelUrl() const { return mrExpData.mbRelUrl; }
sc::CompileFormulaContext& GetCompileFormulaContext() const { return *mrExpData.mpCompileFormulaCxt; }
/** Returns the buffer for Calc->Excel sheet index conversion. */
@@ -155,7 +155,7 @@ public:
XclExpDxfs& GetDxfs() const;
/** Clean and return the OStringBuffer */
- inline OStringBuffer& GetStringBuf() const { mrExpData.maStringBuf.setLength(0); return mrExpData.maStringBuf; }
+ OStringBuffer& GetStringBuf() const { mrExpData.maStringBuf.setLength(0); return mrExpData.maStringBuf; }
XclExpXmlPivotTableManager& GetXmlPivotTableManager();
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 754187b46ea2..8c8808a1927c 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -84,7 +84,7 @@ public:
~XclExpStream();
/** Returns the filter root data. */
- inline const XclExpRoot& GetRoot() const { return mrRoot; }
+ const XclExpRoot& GetRoot() const { return mrRoot; }
/** Starts a new record: writes header data, stores calculated record size. */
void StartRecord( sal_uInt16 nRecId, std::size_t nRecSize );
@@ -92,7 +92,7 @@ public:
void EndRecord();
/** Returns the position inside of current record (starts by 0 in every CONTINUE). */
- inline sal_uInt16 GetRawRecPos() const { return mnCurrSize; }
+ sal_uInt16 GetRawRecPos() const { return mnCurrSize; }
/** Sets data slice length. 0 = no slices. */
void SetSliceSize( sal_uInt16 nSize );
@@ -137,7 +137,7 @@ public:
/** Sets position of system stream (only allowed outside of records). */
void SetSvStreamPos(sal_uInt64 nPos);
/** Returns the absolute position of the system stream. */
- inline sal_uInt64 GetSvStreamPos() const { return mrStrm.Tell(); }
+ sal_uInt64 GetSvStreamPos() const { return mrStrm.Tell(); }
void SetEncrypter( XclExpEncrypterRef const & xEncrypter );
@@ -295,7 +295,7 @@ public:
virtual ~XclExpXmlStream() override;
/** Returns the filter root data. */
- inline const XclExpRoot& GetRoot() const { return *mpRoot; }
+ const XclExpRoot& GetRoot() const { return *mpRoot; }
sax_fastparser::FSHelperPtr& GetCurrentStream();
void PushStream( sax_fastparser::FSHelperPtr const & aStream );
diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx
index 570a3f0e25a7..56726faea3fc 100644
--- a/sc/source/filter/inc/xestring.hxx
+++ b/sc/source/filter/inc/xestring.hxx
@@ -111,22 +111,22 @@ public:
// get data ---------------------------------------------------------------
/** Returns the character count of the string. */
- inline sal_uInt16 Len() const { return mnLen; }
+ sal_uInt16 Len() const { return mnLen; }
/** Returns true, if the string is empty. */
- inline bool IsEmpty() const { return mnLen == 0; }
+ bool IsEmpty() const { return mnLen == 0; }
/** Returns true, if the string contains line breaks. */
- inline bool IsWrapped() const { return mbWrapped; }
+ bool IsWrapped() const { return mbWrapped; }
/** Returns true, if this string is equal to the passed string. */
bool IsEqual( const XclExpString& rCmp ) const;
/** Returns true, if this string is less than the passed string. */
bool IsLessThan( const XclExpString& rCmp ) const;
/** Returns true, if the string contains formatting information. */
- inline bool IsRich() const { return !maFormats.empty(); }
+ bool IsRich() const { return !maFormats.empty(); }
/** Returns the current count of formatting runs for rich strings. */
sal_uInt16 GetFormatsCount() const;
/** Returns the vector with all formatting runs. */
- inline const XclFormatRunVec& GetFormats() const { return maFormats; }
+ const XclFormatRunVec& GetFormats() const { return maFormats; }
/** Returns the current string flags field to export. */
sal_uInt8 GetFlagField() const;
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index f22d4e4fda80..0cf18f9bacf1 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -162,9 +162,9 @@ public:
const XclFontData& rFontData, XclExpColorType eColorType );
/** Returns read-only access to font data. */
- inline const XclFontData& GetFontData() const { return maData; }
+ const XclFontData& GetFontData() const { return maData; }
/** Returns the font color identifier. */
- inline sal_uInt32 GetFontColorId() const { return mnColorId; }
+ sal_uInt32 GetFontColorId() const { return mnColorId; }
/** Compares this font with the passed font data.
@param nHash The hash value calculated from the font data. */
virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const;
@@ -261,7 +261,7 @@ struct XclExpNumFmt
sal_uInt16 mnXclNumFmt; /// Resulting Excel format index.
OUString maNumFmtString; /// format string
- inline explicit XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) :
+ explicit XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) :
mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ), maNumFmtString( rFrmt ) {}
void SaveXml( XclExpXmlStream& rStrm );
@@ -278,7 +278,7 @@ public:
virtual ~XclExpNumFmtBuffer() override;
/** Returns the core index of the current standard number format. */
- inline sal_uInt32 GetStandardFormat() const { return mnStdFmt; }
+ sal_uInt32 GetStandardFormat() const { return mnStdFmt; }
/** Inserts a number format into the format buffer.
@param nScNumFmt The core index of the number format.
@@ -539,7 +539,7 @@ public:
explicit XclExpStyle( sal_uInt32 nXFId, sal_uInt8 nStyleId, sal_uInt8 nLevel );
/** Returns true, if this record represents an Excel built-in style. */
- inline bool IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; }
+ bool IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; }
virtual void SaveXml( XclExpXmlStream& rStrm ) override;
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 12837cac6964..1cf60bc8a69c 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -278,11 +278,11 @@ class XclExpCellBase : public XclExpRecord
{
public:
/** Returns the (first) address of the cell(s). */
- inline const XclAddress& GetXclPos() const { return maXclPos; }
+ const XclAddress& GetXclPos() const { return maXclPos; }
/** Returns the (first) Excel column index of the cell(s). */
- inline sal_uInt16 GetXclCol() const { return maXclPos.mnCol; }
+ sal_uInt16 GetXclCol() const { return maXclPos.mnCol; }
/** Returns the Excel row index of the cell. */
- inline sal_uInt32 GetXclRow() const { return maXclPos.mnRow; }
+ sal_uInt32 GetXclRow() const { return maXclPos.mnRow; }
/** Derived classes return the column index of the last contained cell. */
virtual sal_uInt16 GetLastXclCol() const = 0;
@@ -308,7 +308,7 @@ protected:
sal_uInt16 nRecId, std::size_t nContSize, const XclAddress& rXclPos );
/** Sets this record to a new column position. */
- inline void SetXclCol( sal_uInt16 nXclCol ) { maXclPos.mnCol = nXclCol; }
+ void SetXclCol( sal_uInt16 nXclCol ) { maXclPos.mnCol = nXclCol; }
private:
XclAddress maXclPos; /// Address of the cell.
@@ -341,11 +341,11 @@ protected:
sal_uInt16 nRecId, std::size_t nContSize, const XclAddress& rXclPos,
const ScPatternAttr* pPattern, sal_Int16 nScript, sal_uInt32 nForcedXFId );
- inline void SetContSize( std::size_t nContSize ) { mnContSize = nContSize; }
- inline std::size_t GetContSize() const { return mnContSize; }
+ void SetContSize( std::size_t nContSize ) { mnContSize = nContSize; }
+ std::size_t GetContSize() const { return mnContSize; }
- inline void SetXFId( sal_uInt32 nXFId ) { maXFId.mnXFId = nXFId; }
- inline sal_uInt32 GetXFId() const { return maXFId.mnXFId; }
+ void SetXFId( sal_uInt32 nXFId ) { maXFId.mnXFId = nXFId; }
+ sal_uInt32 GetXFId() const { return maXFId.mnXFId; }
private:
/** Writes cell address, XF index, and calls WriteContents() for each cell. */
@@ -470,7 +470,7 @@ struct XclExpMultiXFId : public XclExpXFId
{
sal_uInt16 mnCount; /// Number of XF identifiers.
- inline explicit XclExpMultiXFId( sal_uInt32 nXFId, sal_uInt16 nCount = 1 ) :
+ explicit XclExpMultiXFId( sal_uInt32 nXFId, sal_uInt16 nCount = 1 ) :
XclExpXFId( nXFId ), mnCount( nCount ) {}
};
@@ -585,9 +585,9 @@ class XclExpOutlineBuffer
{
public:
/** Returns true, if a collapsed group ends at the last processed position. */
- inline bool IsCollapsed() const { return mbCurrCollapse; }
+ bool IsCollapsed() const { return mbCurrCollapse; }
/** Returns the highest level of an open group at the last processed position. */
- inline sal_uInt8 GetLevel() const { return ::std::min( mnCurrLevel, EXC_OUTLINE_MAX ); }
+ sal_uInt8 GetLevel() const { return ::std::min( mnCurrLevel, EXC_OUTLINE_MAX ); }
protected:
/** Constructs the outline buffer.
@@ -603,7 +603,7 @@ private:
{
SCCOLROW mnScEndPos; /// The end position of a group in a level.
bool mbHidden; /// true = Group in this level is hidden.
- inline explicit XclExpLevelInfo() : mnScEndPos( 0 ), mbHidden( false ) {}
+ explicit XclExpLevelInfo() : mnScEndPos( 0 ), mbHidden( false ) {}
};
typedef ::std::vector< XclExpLevelInfo > XclExpLevelInfoVec;
@@ -617,11 +617,11 @@ private:
class XclExpColOutlineBuffer : public XclExpOutlineBuffer
{
public:
- inline explicit XclExpColOutlineBuffer( const XclExpRoot& rRoot ) :
+ explicit XclExpColOutlineBuffer( const XclExpRoot& rRoot ) :
XclExpOutlineBuffer( rRoot, false ) {}
/** Updates the current state by processing the settings of the passed Calc column. */
- inline void Update( SCCOL nScCol )
+ void Update( SCCOL nScCol )
{ UpdateColRow( static_cast< SCCOLROW >( nScCol ) ); }
};
@@ -629,11 +629,11 @@ public:
class XclExpRowOutlineBuffer : public XclExpOutlineBuffer
{
public:
- inline explicit XclExpRowOutlineBuffer( const XclExpRoot& rRoot ) :
+ explicit XclExpRowOutlineBuffer( const XclExpRoot& rRoot ) :
XclExpOutlineBuffer( rRoot, true ) {}
/** Updates the current state by processing the settings of the passed Calc row. */
- inline void Update( SCROW nScRow )
+ void Update( SCROW nScRow )
{ UpdateColRow( static_cast< SCCOLROW >( nScRow ) ); }
};
@@ -726,11 +726,11 @@ public:
bool TryMerge( const XclExpColinfo& rColInfo );
/** Returns the Excel width of the column(s). */
- inline sal_uInt16 GetColWidth() const { return mnWidth; }
+ sal_uInt16 GetColWidth() const { return mnWidth; }
/** Returns the final Excel XF index of the column(s). */
- inline sal_uInt16 GetXFIndex() const { return maXFId.mnXFIndex; }
+ sal_uInt16 GetXFIndex() const { return maXFId.mnXFIndex; }
/** Returns the number of columns represented by this record. */
- inline sal_uInt16 GetColCount() const { return mnLastXclCol - mnFirstXclCol + 1; }
+ sal_uInt16 GetColCount() const { return mnLastXclCol - mnFirstXclCol + 1; }
/** Returns true, if the column has default format and width. */
bool IsDefault( const XclExpDefcolwidth& rDefColWidth ) const;
@@ -798,9 +798,9 @@ struct XclExpDefaultRowData
explicit XclExpDefaultRowData( const XclExpRow& rRow );
/** Returns true, if rows are hidden by default. */
- inline bool IsHidden() const { return ::get_flag( mnFlags, EXC_DEFROW_HIDDEN ); }
+ bool IsHidden() const { return ::get_flag( mnFlags, EXC_DEFROW_HIDDEN ); }
/** Returns true, if the rows have a manually set height by default. */
- inline bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_DEFROW_UNSYNCED ); }
+ bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_DEFROW_UNSYNCED ); }
};
/** Represents a DEFROWHEIGHT record containing default format for unused rows. */
@@ -841,17 +841,17 @@ public:
XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty, bool bHidden, sal_uInt16 nHeight );
/** Returns the excel row index of this ROW record. */
- inline sal_uInt32 GetXclRow() const { return mnXclRow; }
+ sal_uInt32 GetXclRow() const { return mnXclRow; }
/** Returns the height of the row in twips. */
- inline sal_uInt16 GetHeight() const { return mnHeight; }
+ sal_uInt16 GetHeight() const { return mnHeight; }
/** Returns true, if this row does not contain at least one valid cell. */
- inline bool IsEmpty() const { return maCellList.IsEmpty(); }
+ bool IsEmpty() const { return maCellList.IsEmpty(); }
/** Returns true, if this row is hidden. */
- inline bool IsHidden() const { return ::get_flag( mnFlags, EXC_ROW_HIDDEN ); }
+ bool IsHidden() const { return ::get_flag( mnFlags, EXC_ROW_HIDDEN ); }
/** Returns true, if this row contains a manually set height. */
- inline bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_ROW_UNSYNCED ); }
+ bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_ROW_UNSYNCED ); }
/** Returns true, if this row is enabled (will be exported). */
- inline bool IsEnabled() const { return mbEnabled; }
+ bool IsEnabled() const { return mbEnabled; }
/** Appends the passed cell object to this row. */
void AppendCell( XclExpCellRef const & xCell, bool bIsMergedBase );
@@ -884,8 +884,8 @@ public:
virtual void Save( XclExpStream& rStrm ) override;
virtual void SaveXml( XclExpXmlStream& rStrm ) override;
- inline sal_uInt32 GetXclRowRpt() const { return mnXclRowRpt; }
- inline void SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; }
+ sal_uInt32 GetXclRowRpt() const { return mnXclRowRpt; }
+ void SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; }
private:
/** Inserts a cell at the specified list position, tries to merge with neighbors. */
void InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase );
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 3a5272da7e6f..7d72bf89ddd3 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -87,7 +87,7 @@ public:
virtual ~XclImpChRoot() override;
/** Returns this root instance - for code readability in derived classes. */
- inline const XclImpChRoot& GetChRoot() const { return *this; }
+ const XclImpChRoot& GetChRoot() const { return *this; }
/** Returns a reference to the parent chart data object. */
XclImpChChart& GetChartData() const;
/** Returns chart type info for a unique chart type identifier. */
@@ -204,7 +204,7 @@ public:
void ReadChFramePos( XclImpStream& rStrm );
/** Returns read-only access to the imported frame position data. */
- inline const XclChFramePos& GetFramePosData() const { return maData; }
+ const XclChFramePos& GetFramePosData() const { return maData; }
private:
XclChFramePos maData; /// Position of the frame.
@@ -217,21 +217,21 @@ class XclImpChLineFormat
{
public:
/** Creates a new line format object with automatic formatting. */
- inline explicit XclImpChLineFormat() {}
+ explicit XclImpChLineFormat() {}
/** Creates a new line format object with the passed formatting. */
- inline explicit XclImpChLineFormat( const XclChLineFormat& rLineFmt ) : maData( rLineFmt ) {}
+ explicit XclImpChLineFormat( const XclChLineFormat& rLineFmt ) : maData( rLineFmt ) {}
/** Reads the CHLINEFORMAT record (basic line properties). */
void ReadChLineFormat( XclImpStream& rStrm );
/** Returns true, if the line format is set to automatic. */
- inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); }
+ bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); }
/** Returns true, if the line style is set to something visible. */
- inline bool HasLine() const { return IsAuto() || (maData.mnPattern != EXC_CHLINEFORMAT_NONE); }
+ bool HasLine() const { return IsAuto() || (maData.mnPattern != EXC_CHLINEFORMAT_NONE); }
/** Returns the line width of this line format (returns 'single', if the line is invisible). */
- inline sal_Int16 GetWeight() const { return (IsAuto() || !HasLine()) ? EXC_CHLINEFORMAT_SINGLE : maData.mnWeight; }
+ sal_Int16 GetWeight() const { return (IsAuto() || !HasLine()) ? EXC_CHLINEFORMAT_SINGLE : maData.mnWeight; }
/** Returns true, if the "show axis" flag is set. */
- inline bool IsShowAxis() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_SHOWAXIS ); }
+ bool IsShowAxis() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_SHOWAXIS ); }
/** Converts and writes the contained data to the passed property set. */
void Convert( const XclImpChRoot& rRoot,
@@ -249,17 +249,17 @@ class XclImpChAreaFormat
{
public:
/** Creates a new area format object with automatic formatting. */
- inline explicit XclImpChAreaFormat() {}
+ explicit XclImpChAreaFormat() {}
/** Creates a new area format object with the passed formatting. */
- inline explicit XclImpChAreaFormat( const XclChAreaFormat& rAreaFmt ) : maData( rAreaFmt ) {}
+ explicit XclImpChAreaFormat( const XclChAreaFormat& rAreaFmt ) : maData( rAreaFmt ) {}
/** Reads the CHAREAFORMAT record (basic fill properties, e.g. transparent or colored). */
void ReadChAreaFormat( XclImpStream& rStrm );
/** Returns true, if the area format is set to automatic. */
- inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); }
+ bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); }
/** Returns true, if the area style is set to something visible. */
- inline bool HasArea() const { return IsAuto() || (maData.mnPattern != EXC_PATT_NONE); }
+ bool HasArea() const { return IsAuto() || (maData.mnPattern != EXC_PATT_NONE); }
/** Converts and writes the contained data to the passed property set. */
void Convert( const XclImpChRoot& rRoot,
@@ -305,7 +305,7 @@ class XclImpChFrameBase : public XclImpChGroupBase
{
public:
/** Creates a new frame object without internal formatting objects. */
- inline explicit XclImpChFrameBase() {}
+ explicit XclImpChFrameBase() {}
/** Creates a new frame object with specific default formatting. */
explicit XclImpChFrameBase( const XclChFormatInfo& rFmtInfo );
@@ -313,14 +313,14 @@ public:
virtual void ReadSubRecord( XclImpStream& rStrm ) override;
/** Returns true, if the line format is set to automatic. */
- inline bool IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); }
+ bool IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); }
/** Returns true, if the line style is set to something visible. */
- inline bool HasLine() const { return IsAutoLine() || mxLineFmt->HasLine(); }
+ bool HasLine() const { return IsAutoLine() || mxLineFmt->HasLine(); }
/** Returns the line weight used for this frame. */
- inline sal_Int16 GetLineWeight() const { return mxLineFmt ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; }
+ sal_Int16 GetLineWeight() const { return mxLineFmt ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; }
/** Returns true, if the area format is set to automatic. */
- inline bool IsAutoArea() const { return !mxEscherFmt && (!mxAreaFmt || mxAreaFmt->IsAuto()); }
+ bool IsAutoArea() const { return !mxEscherFmt && (!mxAreaFmt || mxAreaFmt->IsAuto()); }
protected:
/** Converts and writes the contained line formatting to the passed property set. */
@@ -387,12 +387,12 @@ public:
void SetTextFormats( const XclFormatRunVec& rFormats );
/** Returns the destination object (title, values, category, ...). */
- inline sal_uInt8 GetDestType() const { return maData.mnDestType; }
+ sal_uInt8 GetDestType() const { return maData.mnDestType; }
/** Returns the link type (to worksheet, directly, default, ...). */
- inline sal_uInt8 GetLinkType() const { return maData.mnLinkType; }
+ sal_uInt8 GetLinkType() const { return maData.mnLinkType; }
/** Returns true, if the source link contains explicit string data. */
- inline bool HasString() const { return mxString && !mxString->IsEmpty(); }
+ bool HasString() const { return mxString && !mxString->IsEmpty(); }
/** Returns explicit string data or an empty string. */
OUString GetString() const {
if (mxString) return mxString->GetText();
@@ -452,7 +452,7 @@ public:
void ReadChFont( XclImpStream& rStrm );
/** Returns the contained font index. */
- inline sal_uInt16 GetFontIndex() const { return mnFontIdx; }
+ sal_uInt16 GetFontIndex() const { return mnFontIdx; }
private:
sal_uInt16 mnFontIdx; /// Index into font buffer.
@@ -490,13 +490,13 @@ public:
void UpdateDataLabel( bool bCateg, bool bValue, bool bPercent );
/** Returns the target object this text is linked to. */
- inline sal_uInt16 GetLinkTarget() const { return maObjLink.mnTarget; }
+ sal_uInt16 GetLinkTarget() const { return maObjLink.mnTarget; }
/** Returns the position of the data point label this text is linked to. */
- inline const XclChDataPointPos& GetPointPos() const { return maObjLink.maPointPos; }
+ const XclChDataPointPos& GetPointPos() const { return maObjLink.maPointPos; }
/** Returns true, if this text group contains string data. */
- inline bool HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
+ bool HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
/** Returns true, if the text object is marked as deleted. */
- inline bool IsDeleted() const { return ::get_flag( maData.mnFlags, EXC_CHTEXT_DELETED ); }
+ bool IsDeleted() const { return ::get_flag( maData.mnFlags, EXC_CHTEXT_DELETED ); }
/** Converts and writes the contained font settings to the passed property set. */
void ConvertFont( ScfPropertySet& rPropSet ) const;
@@ -545,7 +545,7 @@ public:
void ReadChMarkerFormat( XclImpStream& rStrm );
/** Returns true, if the marker format is set to automatic. */
- inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_AUTO ); }
+ bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_AUTO ); }
/** Converts and writes the contained data to the passed property set. */
void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet,
@@ -584,7 +584,7 @@ public:
/** Reads the CHSERIESFORMAT record (additional settings for a series). */
void ReadChSeriesFormat( XclImpStream& rStrm );
/** Returns true, if the series line is smoothed. */
- inline bool HasSpline() const { return ::get_flag( mnFlags, EXC_CHSERIESFORMAT_SMOOTHED ); }
+ bool HasSpline() const { return ::get_flag( mnFlags, EXC_CHSERIESFORMAT_SMOOTHED ); }
private:
sal_uInt16 mnFlags; /// Additional flags.
@@ -642,7 +642,7 @@ public:
/** Sets this object to the specified data point position. */
void SetPointPos( const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx );
/** Sets type and text formatting for a data point label (CHTEXT group). */
- inline void SetDataLabel( XclImpChTextRef xLabel ) { mxLabel = xLabel; }
+ void SetDataLabel( XclImpChTextRef xLabel ) { mxLabel = xLabel; }
/** Updates default data format for series group. */
void UpdateGroupFormat( const XclChExtTypeInfo& rTypeInfo );
@@ -654,15 +654,15 @@ public:
void UpdateTrendLineFormat();
/** Returns the position of the data point described by this group. */
- inline const XclChDataPointPos& GetPointPos() const { return maData.maPointPos; }
+ const XclChDataPointPos& GetPointPos() const { return maData.maPointPos; }
/** Returns the format index of the data point described by this group. */
- inline sal_uInt16 GetFormatIdx() const { return maData.mnFormatIdx; }
+ sal_uInt16 GetFormatIdx() const { return maData.mnFormatIdx; }
/** Returns true, if markers are set to automatic format. */
- inline bool IsAutoMarker() const { return !mxMarkerFmt || mxMarkerFmt->IsAuto(); }
+ bool IsAutoMarker() const { return !mxMarkerFmt || mxMarkerFmt->IsAuto(); }
/** Returns true, if the series line is smoothed. */
- inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
+ bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
/** Returns the data label text object. */
- inline const XclImpChText* GetDataLabel() const { return mxLabel.get(); }
+ const XclImpChText* GetDataLabel() const { return mxLabel.get(); }
/** Converts and writes the contained data to the passed property set. */
void Convert( ScfPropertySet& rPropSet, const XclChExtTypeInfo& rTypeInfo ) const;
@@ -698,9 +698,9 @@ public:
/** Reads the CHSERTRENDLINE record. */
void ReadChSerTrendLine( XclImpStream& rStrm );
/** Sets formatting information for the trend line. */
- inline void SetDataFormat( XclImpChDataFormatRef xDataFmt ) { mxDataFmt = xDataFmt; }
+ void SetDataFormat( XclImpChDataFormatRef xDataFmt ) { mxDataFmt = xDataFmt; }
- inline void SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; }
+ void SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; }
/** Creates an API object representing this trend line. */
css::uno::Reference< css::chart2::XRegressionCurve >
@@ -728,7 +728,7 @@ public:
XclImpChDataFormatRef const & xDataFmt );
/** Returns the type of this error bar (X/Y, plus/minus). */
- inline sal_uInt8 GetBarType() const { return maData.mnBarType; }
+ sal_uInt8 GetBarType() const { return maData.mnBarType; }
/** Creates a labeled data sequence object from value data link. */
css::uno::Reference< css::chart2::data::XLabeledDataSequence >
CreateValueSequence() const;
@@ -772,18 +772,18 @@ public:
void FinalizeDataFormats();
/** Returns the axes set identifier this series is assigned to (primary/secondary). */
- inline sal_uInt16 GetGroupIdx() const { return mnGroupIdx; }
+ sal_uInt16 GetGroupIdx() const { return mnGroupIdx; }
/** Returns the 0-based index of the parent series (e.g. of a trend line). */
- inline sal_uInt16 GetParentIdx() const { return mnParentIdx; }
+ sal_uInt16 GetParentIdx() const { return mnParentIdx; }
/** Returns true, if the series is child of another series (e.g. trend line). */
- inline bool HasParentSeries() const { return mnParentIdx != EXC_CHSERIES_INVALID; }
+ bool HasParentSeries() const { return mnParentIdx != EXC_CHSERIES_INVALID; }
/** Returns true, if the series contains child series (e.g. trend lines). */
- inline bool HasChildSeries() const { return !maTrendLines.empty() || !m_ErrorBars.empty(); }
+ bool HasChildSeries() const { return !maTrendLines.empty() || !m_ErrorBars.empty(); }
/** Returns series title or an empty string, if the series does not contain a title. */
OUString GetTitle() const { return mxTitleLink ? mxTitleLink->GetString() : OUString(); }
/** Returns true, if the series line is smoothed. */
- inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
+ bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
/** Creates a labeled data sequence object from value data link. */
css::uno::Reference< css::chart2::data::XLabeledDataSequence >
@@ -854,9 +854,9 @@ public:
void Finalize( bool bStockChart );
/** Returns the record identifier of the chart type record. */
- inline sal_uInt16 GetRecId() const { return mnRecId; }
+ sal_uInt16 GetRecId() const { return mnRecId; }
/** Returns the chart type info struct for the contained chart type. */
- inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; }
+ const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; }
/** Returns true, if the series in this chart type group are stacked on each other (no percentage). */
bool IsStacked() const;
/** Returns true, if the series in this chart type group are stacked on each other as percentage. */
@@ -884,7 +884,7 @@ public:
/** Reads the CHCHART3D record (properties for 3D charts). */
void ReadChChart3d( XclImpStream& rStrm );
/** Returns true, if the data points are clustered on the X axis. */
- inline bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
+ bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
/** Converts and writes the contained data to the passed property set. */
void Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) const;
@@ -974,21 +974,21 @@ public:
sal_uInt16 PopUnusedFormatIndex();
/** Returns the index of this chart type group. */
- inline sal_uInt16 GetGroupIdx() const { return maData.mnGroupIdx; }
+ sal_uInt16 GetGroupIdx() const { return maData.mnGroupIdx; }
/** Returns the chart type info struct for the contained chart type. */
- inline const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; }
+ const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; }
/** Returns true, if this chart type group contains at least one valid series. */
- inline bool IsValidGroup() const { return !maSeries.empty(); }
+ bool IsValidGroup() const { return !maSeries.empty(); }
/** Returns true, if the series in this chart type group are stacked on each other as percentage. */
- inline bool IsPercent() const { return maType.IsPercent(); }
+ bool IsPercent() const { return maType.IsPercent(); }
/** Returns true, if the chart is three-dimensional. */
- inline bool Is3dChart() const { return mxChart3d && maTypeInfo.mbSupports3d; }
+ bool Is3dChart() const { return mxChart3d && maTypeInfo.mbSupports3d; }
/** Returns true, if chart type supports wall and floor format in 3d mode. */
- inline bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
+ bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
/** Returns true, if the series in this chart type group are ordered on the Z axis. */
- inline bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
+ bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
/** Returns true, if category (X axis) labels are enabled (may be disabled in radar charts). */
- inline bool HasCategoryLabels() const { return maType.HasCategoryLabels(); }
+ bool HasCategoryLabels() const { return maType.HasCategoryLabels(); }
/** Returns true, if points of a series show varying automatic area format. */
bool HasVarPointFormat() const;
/** Returns true, if bars are connected with lines (stacked bar charts only). */
@@ -1022,7 +1022,7 @@ private:
void ReadChDataFormat( XclImpStream& rStrm );
/** Returns true, if the chart type group contains drop bar formats. */
- inline bool HasDropBars() const { return !m_DropBars.empty(); }
+ bool HasDropBars() const { return !m_DropBars.empty(); }
/** Inserts the passed series into the chart type. Adds additional properties to the series. */
void InsertDataSeries( css::uno::Reference< css::chart2::XChartType > const & xChartType,
@@ -1103,7 +1103,7 @@ public:
void ReadChTick( XclImpStream& rStrm );
/** Returns true, if the axis shows attached labels. */
- inline bool HasLabels() const { return maData.mnLabelPos != EXC_CHTICK_NOLABEL; }
+ bool HasLabels() const { return maData.mnLabelPos != EXC_CHTICK_NOLABEL; }
/** Returns the leading font color for the axis labels. */
Color GetFontColor() const;
/** Returns the rotation value for the axis labels. */
@@ -1144,9 +1144,9 @@ public:
virtual sal_uInt16 GetRotation() const override;
/** Returns the type of this axis. */
- inline sal_uInt16 GetAxisType() const { return maData.mnType; }
+ sal_uInt16 GetAxisType() const { return maData.mnType; }
/** Returns the axis dimension index used by the chart API. */
- inline sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); }
+ sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); }
/** Creates an API axis object. */
css::uno::Reference< css::chart2::XAxis >
@@ -1196,11 +1196,11 @@ public:
void Finalize();
/** Returns true, if this axes set exists (returns false if this is a dummy object). */
- inline bool IsValidAxesSet() const { return !maTypeGroups.empty(); }
+ bool IsValidAxesSet() const { return !maTypeGroups.empty(); }
/** Returns the index of the axes set (primary/secondary). */
- inline sal_uInt16 GetAxesSetId() const { return maData.mnAxesSetId; }
+ sal_uInt16 GetAxesSetId() const { return maData.mnAxesSetId; }
/** Returns the axes set index used by the chart API. */
- inline sal_Int32 GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); }
+ sal_Int32 GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); }
/** Returns the outer plot area position, if existing. */
const XclImpChFramePosRef& GetPlotAreaFramePos() const { return mxFramePos; }
@@ -1291,7 +1291,7 @@ public:
/** Returns true, if the plot area has benn moved and/or resized manually. */
bool IsManualPlotArea() const;
/** Returns the number of units on the progress bar needed for the chart. */
- static inline std::size_t GetProgressSize() { return 2 * EXC_CHART_PROGRESS_SIZE; }
+ static std::size_t GetProgressSize() { return 2 * EXC_CHART_PROGRESS_SIZE; }
/** Converts and writes all properties to the passed chart. */
void Convert(
@@ -1383,7 +1383,7 @@ public:
/** Returns the number of units on the progress bar needed for the chart. */
std::size_t GetProgressSize() const;
/** Returns true, if the chart is based on a pivot table. */
- inline bool IsPivotChart() const { return mbIsPivotChart; }
+ bool IsPivotChart() const { return mbIsPivotChart; }
/** Creates the chart object in the passed component. */
void Convert( css::uno::Reference< css::frame::XModel > const & xModel,
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 6c0552d31677..185ee9a3f388 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -73,9 +73,9 @@ public:
static XclImpDrawObjRef ReadObj8( const XclImpRoot& rRoot, XclImpStream& rStrm );
/** Sets whether this is an area object (then its width and height must be greater than 0). */
- inline void SetAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
+ void SetAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
/** If set to true, a new SdrObject will be created while in DFF import. */
- inline void SetSimpleMacro( bool bMacro ) { mbSimpleMacro = bMacro; }
+ void SetSimpleMacro( bool bMacro ) { mbSimpleMacro = bMacro; }
/** Sets the object anchor explicitly. */
void SetAnchor( const XclObjAnchor& rAnchor );
@@ -85,32 +85,32 @@ public:
bool bVisible, bool bAutoMargin );
/** If set to false, the SdrObject will not be created, processed, or inserted into the draw page. */
- inline void SetProcessSdrObj( bool bProcess ) { mbProcessSdr = bProcess; }
+ void SetProcessSdrObj( bool bProcess ) { mbProcessSdr = bProcess; }
/** If set to false, the SdrObject will be created or processed, but not be inserted into the draw page. */
- inline void SetInsertSdrObj( bool bInsert ) { mbInsertSdr = bInsert; }
+ void SetInsertSdrObj( bool bInsert ) { mbInsertSdr = bInsert; }
/** If set to true, a new SdrObject will be created while in DFF import. */
- inline void SetCustomDffObj( bool bCustom ) { mbCustomDff = bCustom; }
+ void SetCustomDffObj( bool bCustom ) { mbCustomDff = bCustom; }
/** Returns the sheet index and Excel object identifier from OBJ record. */
- inline sal_uInt16 GetObjId() const { return mnObjId; }
+ sal_uInt16 GetObjId() const { return mnObjId; }
/** Returns the Excel object type from OBJ record. */
- inline sal_uInt16 GetObjType() const { return mnObjType; }
+ sal_uInt16 GetObjType() const { return mnObjType; }
/** Returns the name of this object, may generate a default name. */
virtual OUString GetObjName() const;
/** Returns associated macro name, if set, otherwise zero length string. */
- inline const OUString& GetMacroName() const { return maMacroName; }
+ const OUString& GetMacroName() const { return maMacroName; }
/** Returns the shape identifier used in the DFF stream. */
- inline sal_uInt32 GetDffShapeId() const { return mnDffShapeId; }
+ sal_uInt32 GetDffShapeId() const { return mnDffShapeId; }
/** Returns the shape flags from the DFF stream. */
- inline sal_uInt32 GetDffFlags() const { return mnDffFlags; }
+ sal_uInt32 GetDffFlags() const { return mnDffFlags; }
/** Returns true, if the object is hidden. */
- inline bool IsHidden() const { return mbHidden; }
+ bool IsHidden() const { return mbHidden; }
/** Returns true, if the object is visible. */
- inline bool IsVisible() const { return mbVisible; }
+ bool IsVisible() const { return mbVisible; }
/** Returns true, if the object is printable. */
- inline bool IsPrintable() const { return mbPrintable; }
+ bool IsPrintable() const { return mbPrintable; }
/** Returns the object anchor if existing, null otherwise. */
const XclObjAnchor* GetAnchor() const;
@@ -120,9 +120,9 @@ public:
ScRange GetUsedArea( SCTAB nScTab ) const;
/** Returns true, if the object is valid and will be processed. */
- inline bool IsProcessSdrObj() const { return mbProcessSdr && !mbHidden; }
+ bool IsProcessSdrObj() const { return mbProcessSdr && !mbHidden; }
/** Returns true, if the SdrObject will be created or processed, but not be inserted into the draw page. */
- inline bool IsInsertSdrObj() const { return mbInsertSdr; }
+ bool IsInsertSdrObj() const { return mbInsertSdr; }
/** Returns the needed size on the progress bar (calls virtual DoGetProgressSize() function). */
std::size_t GetProgressSize() const;
@@ -215,7 +215,7 @@ private:
std::vector< XclImpDrawObjRef > mObjs;
public:
- inline explicit XclImpDrawObjVector() : mObjs() {}
+ explicit XclImpDrawObjVector() : mObjs() {}
std::vector< XclImpDrawObjRef >::const_iterator begin() const { return mObjs.begin(); }
std::vector< XclImpDrawObjRef >::const_iterator end() const { return mObjs.end(); }
@@ -386,7 +386,7 @@ public:
explicit XclImpTextObj( const XclImpRoot& rRoot );
/** Stores the passed textbox data. */
- inline void SetTextData( const XclImpObjTextData& rTextData ) { maTextData = rTextData; }
+ void SetTextData( const XclImpObjTextData& rTextData ) { maTextData = rTextData; }
protected:
/** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
@@ -467,7 +467,7 @@ public:
virtual ~XclImpControlHelper();
/** Returns true, if a linked cell address is present. */
- inline bool HasCellLink() const { return mxCellLink != nullptr; }
+ bool HasCellLink() const { return mxCellLink != nullptr; }
/** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */
SdrObjectPtr CreateSdrObjectFromShape(
@@ -512,7 +512,7 @@ public:
void SetDffProperties( const DffPropSet& rDffPropSet );
/** Returns the service name of the control component to be created. */
- inline OUString GetServiceName() const { return DoGetServiceName(); }
+ OUString GetServiceName() const { return DoGetServiceName(); }
/** Fills the passed macro event descriptor. */
bool FillMacroDescriptor(
css::script::ScriptEventDescriptor& rDescriptor ) const;
@@ -820,22 +820,22 @@ public:
/** Returns the ObjectName - can use non-obvious lookup for override in the associated vba document module stream**/
virtual OUString GetObjName() const override;
/** Returns the graphic imported from the IMGDATA record. */
- inline const Graphic& GetGraphic() const { return maGraphic; }
+ const Graphic& GetGraphic() const { return maGraphic; }
/** Returns the visible area of the imported graphic. */
- inline const Rectangle& GetVisArea() const { return maVisArea; }
+ const Rectangle& GetVisArea() const { return maVisArea; }
/** Returns true, if the OLE object will be shown as symbol. */
- inline bool IsSymbol() const { return mbSymbol; }
+ bool IsSymbol() const { return mbSymbol; }
/** Returns the storage name for the OLE object. */
OUString GetOleStorageName() const;
/** Returns true, if this object is an OCX form control. */
- inline bool IsOcxControl() const { return mbEmbedded && mbControl && mbUseCtlsStrm; }
+ bool IsOcxControl() const { return mbEmbedded && mbControl && mbUseCtlsStrm; }
/** Returns the position in the 'Ctls' stream for additional form control data. */
- inline std::size_t GetCtlsStreamPos() const { return mnCtlsStrmPos; }
+ std::size_t GetCtlsStreamPos() const { return mnCtlsStrmPos; }
/** Returns the size in the 'Ctls' stream for additional form control data. */
- inline std::size_t GetCtlsStreamSize() const { return mnCtlsStrmSize; }
+ std::size_t GetCtlsStreamSize() const { return mnCtlsStrmSize; }
protected:
/** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
@@ -900,8 +900,8 @@ private:
{
SdrObject* mpSdrObj; /// Pointer to an SdrObject.
sal_uInt32 mnDffFlags; /// Shape flags from DFF stream.
- inline explicit XclImpSdrInfo() : mpSdrObj( nullptr ), mnDffFlags( 0 ) {}
- inline void Set( SdrObject* pSdrObj, sal_uInt32 nDffFlags )
+ explicit XclImpSdrInfo() : mpSdrObj( nullptr ), mnDffFlags( 0 ) {}
+ void Set( SdrObject* pSdrObj, sal_uInt32 nDffFlags )
{ mpSdrObj = pSdrObj; mnDffFlags = nDffFlags; }
};
typedef std::map< sal_uInt32, XclImpSdrInfo > XclImpSdrInfoMap;
@@ -962,7 +962,7 @@ public:
/** Returns true, if the conversion of OLE objects is supported. */
bool SupportsOleObjects() const;
/** Returns the default text margin in drawing layer units. */
- inline sal_Int32 GetDefaultTextMargin() const { return mnDefTextMargin; }
+ sal_Int32 GetDefaultTextMargin() const { return mnDefTextMargin; }
private:
// virtual functions of SvxMSDffManager
@@ -1068,7 +1068,7 @@ public:
void ReadMsoDrawing( XclImpStream& rStrm );
/** Returns true, if the conversion of OLE objects is supported. */
- inline bool SupportsOleObjects() const { return mbOleObjs; }
+ bool SupportsOleObjects() const { return mbOleObjs; }
/** Finds the OBJ record data related to the DFF shape at the passed position. */
XclImpDrawObjRef FindDrawObj( const DffRecordHeader& rHeader ) const;
/** Finds the OBJ record data specified by the passed object identifier. */
@@ -1133,7 +1133,7 @@ public:
void ReadTabChart( XclImpStream& rStrm );
/** Returns the total cell range covered by any shapes in the sheet. */
- inline const ScRange& GetUsedArea() const { return maScUsedArea; }
+ const ScRange& GetUsedArea() const { return maScUsedArea; }
/** Converts all objects and inserts them into the sheet drawing page. */
void ConvertObjects( XclImpDffConverter& rDffConv );
diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx
index a523231f1c76..e5a5f6484194 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -201,11 +201,11 @@ private: // types
private:
/** Returns the current edit engine text object. */
- inline XclImpHFPortionInfo& GetCurrInfo() { return maInfos[ meCurrObj ]; }
+ XclImpHFPortionInfo& GetCurrInfo() { return maInfos[ meCurrObj ]; }
/** Returns the current edit engine text object. */
- inline XclImpHFPortionInfo::EditTextObjectRef& GetCurrObj() { return GetCurrInfo().mxObj; }
+ XclImpHFPortionInfo::EditTextObjectRef& GetCurrObj() { return GetCurrInfo().mxObj; }
/** Returns the current selection. */
- inline ESelection& GetCurrSel() { return GetCurrInfo().maSel; }
+ ESelection& GetCurrSel() { return GetCurrInfo().maSel; }
/** Returns the maximum line height of the specified portion. */
sal_uInt16 GetMaxLineHeight( XclImpHFPortion ePortion ) const;
@@ -309,15 +309,15 @@ public:
virtual ~XclImpCachedValue();
/** Returns the type of the cached value (EXC_CACHEDVAL_*). */
- inline sal_uInt8 GetType() const { return mnType; }
+ sal_uInt8 GetType() const { return mnType; }
/** Returns the cached string value, if this value is a string, else an empty string. */
const OUString& GetString() const { return maStr;}
/** Returns the cached number, if this value has number type, else 0.0. */
- inline double GetValue() const { return mfValue; }
+ double GetValue() const { return mfValue; }
/** Returns the cached Boolean value, if this value has Boolean type, else false. */
- inline bool GetBool() const { return (mnType == EXC_CACHEDVAL_BOOL) && (mnBoolErr != 0); }
+ bool GetBool() const { return (mnType == EXC_CACHEDVAL_BOOL) && (mnBoolErr != 0); }
/** Returns the cached Calc error code, if this value has Error type, else 0. */
- inline sal_uInt8 GetXclError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? mnBoolErr : EXC_ERR_NA; }
+ sal_uInt8 GetXclError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? mnBoolErr : EXC_ERR_NA; }
/** Returns the cached Calc error code, if this value has Error type, else 0. */
FormulaError GetScError() const;
diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx
index a7e686c5556d..0da156da58b1 100644
--- a/sc/source/filter/inc/xiname.hxx
+++ b/sc/source/filter/inc/xiname.hxx
@@ -51,12 +51,12 @@ public:
explicit XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx );
- inline const OUString& GetXclName() const { return maXclName; }
- inline const OUString& GetScName() const { return maScName; }
- inline SCTAB GetScTab() const { return mnScTab; }
- inline const ScRangeData* GetScRangeData() const { return mpScData; }
- inline bool IsGlobal() const { return mnScTab == SCTAB_MAX; }
- inline bool IsVBName() const { return mbVBName; }
+ const OUString& GetXclName() const { return maXclName; }
+ const OUString& GetScName() const { return maScName; }
+ SCTAB GetScTab() const { return mnScTab; }
+ const ScRangeData* GetScRangeData() const { return mpScData; }
+ bool IsGlobal() const { return mnScTab == SCTAB_MAX; }
+ bool IsVBName() const { return mbVBName; }
bool IsMacro() const { return mbMacro; }
void ConvertTokens();
diff --git a/sc/source/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx
index eef405a96d51..f7b1756c4231 100644
--- a/sc/source/filter/inc/xipage.hxx
+++ b/sc/source/filter/inc/xipage.hxx
@@ -33,7 +33,7 @@ public:
explicit XclImpPageSettings( const XclImpRoot& rRoot );
/** Returns read-only access to the page data. */
- inline const XclPageData& GetPageData() const { return maData; }
+ const XclPageData& GetPageData() const { return maData; }
/** Initializes the object to be used for a new sheet. */
void Initialize();
@@ -58,7 +58,7 @@ public:
/** Overrides paper size and orientation (used in sheet-charts). */
void SetPaperSize( sal_uInt16 nXclPaperSize, bool bPortrait );
/** Sets or clears the fit-to-pages setting (contained in WSBOOL record). */
- inline void SetFitToPages( bool bFitToPages ) { maData.mbFitToPages = bFitToPages; }
+ void SetFitToPages( bool bFitToPages ) { maData.mbFitToPages = bFitToPages; }
/** Creates a page stylesheet from current settings and sets it at current sheet. */
void Finalize();
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index 8bf43053b343..34c0c32e214f 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -149,7 +149,7 @@ public:
// data access ------------------------------------------------------------
/** Returns the data source range read from the DCONREF record. */
- inline const ScRange& GetSourceRange() const { return maSrcRange; }
+ const ScRange& GetSourceRange() const { return maSrcRange; }
const OUString& GetSourceRangeName() const { return maSrcRangeName; }
@@ -236,9 +236,9 @@ public:
const OUString* GetItemName( sal_uInt16 nItemIdx ) const;
/** Returns the flags of the axes this field is part of. */
- inline sal_uInt16 GetAxes() const { return maFieldInfo.mnAxes; }
+ sal_uInt16 GetAxes() const { return maFieldInfo.mnAxes; }
/** Sets the flags of the axes this field is part of. */
- inline void SetAxes( sal_uInt16 nAxes ) { maFieldInfo.mnAxes = nAxes; }
+ void SetAxes( sal_uInt16 nAxes ) { maFieldInfo.mnAxes = nAxes; }
// records ----------------------------------------------------------------
@@ -298,7 +298,7 @@ public:
// cache/field access, misc. ----------------------------------------------
const XclImpPivotCacheRef& GetPivotCache() const { return mxPCache; }
- inline const ScfStringVec& GetVisFieldNames() const { return maVisFieldNames; }
+ const ScfStringVec& GetVisFieldNames() const { return maVisFieldNames; }
sal_uInt16 GetFieldCount() const;
const XclImpPTField* GetField( sal_uInt16 nFieldIdx ) const;
diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index 0af43864bbda..389df5c7fcb4 100644
--- a/sc/source/filter/inc/xiroot.hxx
+++ b/sc/source/filter/inc/xiroot.hxx
@@ -129,8 +129,8 @@ public:
explicit XclImpRoot( XclImpRootData& rImpRootData );
/** Returns this root instance - for code readability in derived classes. */
- inline const XclImpRoot& GetRoot() const { return *this; }
- inline XclImpRoot& GetRoot() { return *this; }
+ const XclImpRoot& GetRoot() const { return *this; }
+ XclImpRoot& GetRoot() { return *this; }
/** Sets a code page read from a CODEPAGE record for byte string import. */
void SetCodePage( sal_uInt16 nCodePage );
@@ -204,9 +204,9 @@ public:
static OUString GetScAddInName( const OUString& rXclName );
/** Returns true, if the document contains a VB project. */
- inline bool HasBasic() const { return mrImpData.mbHasBasic; }
+ bool HasBasic() const { return mrImpData.mbHasBasic; }
/** Called to indicate that the document contains a VB project. */
- inline void SetHasBasic() { mrImpData.mbHasBasic = true; }
+ void SetHasBasic() { mrImpData.mbHasBasic = true; }
/** Reads the CODENAME record and inserts the codename into the document. */
void ReadCodeName( XclImpStream& rStrm, bool bGlobals );
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index 8c5567591b1e..a3f6890cdb3e 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -47,9 +47,9 @@ public:
virtual ~XclImpDecrypter() override;
/** Returns the current error code of the decrypter. */
- inline ErrCode GetError() const { return mnError; }
+ ErrCode GetError() const { return mnError; }
/** Returns true, if the decoder has been initialized correctly. */
- inline bool IsValid() const { return mnError == ERRCODE_NONE; }
+ bool IsValid() const { return mnError == ERRCODE_NONE; }
/** Creates a (ref-counted) copy of this decrypter object. */
XclImpDecrypterRef Clone() const;
@@ -214,7 +214,7 @@ public:
bool& rbValid ) const;
/** Returns the stored stream position. */
- inline std::size_t GetPos() const { return mnPos; }
+ std::size_t GetPos() const { return mnPos; }
private:
std::size_t mnPos; /// Absolute position of the stream.
@@ -289,7 +289,7 @@ public:
~XclImpStream();
/** Returns the filter root data. */
- inline const XclImpRoot& GetRoot() const { return mrRoot; }
+ const XclImpRoot& GetRoot() const { return mrRoot; }
/** Sets stream pointer to the start of the next record content.
@descr Ignores all CONTINUE records of the current record, if automatic
@@ -330,7 +330,7 @@ public:
/** Switches usage of current decryption algorithm off.
@descr This is a record-local setting. The function StartNextRecord()
always enables decryption. */
- inline void DisableDecryption() { EnableDecryption( false ); }
+ void DisableDecryption() { EnableDecryption( false ); }
/** Pushes current position on user position stack.
@descr This stack is emptied when starting a new record with
@@ -347,9 +347,9 @@ public:
void SeekGlobalPosition();
/** Returns record reading state: false = record overread. */
- inline bool IsValid() const { return mbValid; }
+ bool IsValid() const { return mbValid; }
/** Returns the current record ID. */
- inline sal_uInt16 GetRecId() const { return mnRecId; }
+ sal_uInt16 GetRecId() const { return mnRecId; }
/** Returns the position inside of the whole record content. */
std::size_t GetRecPos() const;
/** Returns the data size of the whole record without record headers. */
@@ -426,7 +426,7 @@ public:
@param cNulSubst The character to use for NUL replacement. It is
possible to specify NUL here. in this case strings are terminated when
the first NUL occurs during string import. */
- inline void SetNulSubstChar( sal_Unicode cNulSubst = '?' ) { mcNulSubst = cNulSubst; }
+ void SetNulSubstChar( sal_Unicode cNulSubst = '?' ) { mcNulSubst = cNulSubst; }
/** Reads nChars characters and returns the string. */
OUString ReadRawUniString( sal_uInt16 nChars, bool b16Bit );
@@ -455,9 +455,9 @@ public:
// *** SvStream functions *** ---------------------------------------------
/** Returns the absolute stream position. */
- inline std::size_t GetSvStreamPos() const { return mrStrm.Tell(); }
+ std::size_t GetSvStreamPos() const { return mrStrm.Tell(); }
/** Returns the stream size. */
- inline std::size_t GetSvStreamSize() const { return mnStreamSize; }
+ std::size_t GetSvStreamSize() const { return mnStreamSize; }
/** Stores current stream position into rPos. */
void StorePosition( XclImpStreamPos& rPos );
diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx
index 0cf90c0e53d9..bb9d9f360ae2 100644
--- a/sc/source/filter/inc/xistring.hxx
+++ b/sc/source/filter/inc/xistring.hxx
@@ -41,23 +41,23 @@ public:
void Read( XclImpStream& rStrm, XclStrFlags nFlags = EXC_STR_DEFAULT );
/** Sets the passed string data. */
- inline void SetText( const OUString& rText ) { maString = rText; }
+ void SetText( const OUString& rText ) { maString = rText; }
/** Sets the passed formatting buffer. */
- inline void SetFormats( const XclFormatRunVec& rFormats ) { maFormats = rFormats; }
+ void SetFormats( const XclFormatRunVec& rFormats ) { maFormats = rFormats; }
/** Reads and appends the formatting information (run count and runs) from stream. */
- inline void ReadFormats( XclImpStream& rStrm ) { ReadFormats( rStrm, maFormats ); }
+ void ReadFormats( XclImpStream& rStrm ) { ReadFormats( rStrm, maFormats ); }
/** Reads and appends formatting runs from an OBJ or TXO record. */
- inline void ReadObjFormats( XclImpStream& rStrm, sal_uInt16 nFormatSize ) { ReadObjFormats( rStrm, maFormats, nFormatSize ); }
+ void ReadObjFormats( XclImpStream& rStrm, sal_uInt16 nFormatSize ) { ReadObjFormats( rStrm, maFormats, nFormatSize ); }
/** Returns true, if the string is empty. */
- inline bool IsEmpty() const { return maString.isEmpty(); }
+ bool IsEmpty() const { return maString.isEmpty(); }
/** Returns the pure text data of the string. */
- inline const OUString& GetText() const { return maString; }
+ const OUString& GetText() const { return maString; }
/** Returns true, if the string contains formatting information. */
- inline bool IsRich() const { return !maFormats.empty(); }
+ bool IsRich() const { return !maFormats.empty(); }
/** Returns the formatting run vector. */
- inline const XclFormatRunVec& GetFormats() const { return maFormats; }
+ const XclFormatRunVec& GetFormats() const { return maFormats; }
/** Insert a formatting run to the passed format buffer. */
static void AppendFormat( XclFormatRunVec& rFormats, sal_uInt16 nChar, sal_uInt16 nFontIdx );
@@ -82,9 +82,9 @@ public:
explicit XclImpStringIterator( const XclImpString& rString );
/** Returns true, if the iterator references a valid text portion. */
- inline bool Is() const { return mnTextBeg < mrText.getLength(); }
+ bool Is() const { return mnTextBeg < mrText.getLength(); }
/** Returns the index of the current text portion. */
- inline size_t GetPortionIndex() const { return mnPortion; }
+ size_t GetPortionIndex() const { return mnPortion; }
/** Returns the string of the current text portion. */
OUString GetPortionText() const;
/** Returns the font index of the current text portion. */
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index eb4c0c5e618a..66592f689b91 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -57,7 +57,7 @@ public:
/** Returns the color for a (non-zero-based) Excel palette entry.
@descr First looks for a color read from file, then looks for a default color.
@return The color from current or default palette or COL_AUTO, if nothing else found. */
- inline Color GetColor( sal_uInt16 nXclIndex ) const
+ Color GetColor( sal_uInt16 nXclIndex ) const
{ return Color( GetColorData( nXclIndex ) ); }
/** Reads a PALETTE record. */
@@ -89,16 +89,16 @@ public:
void SetFontData( const XclFontData& rFontData, bool bHasCharSet );
/** Returns read-only access to font data. */
- inline const XclFontData& GetFontData() const { return maData; }
+ const XclFontData& GetFontData() const { return maData; }
/** Returns true, if the font character set is valid. */
- inline bool HasCharSet() const { return mbHasCharSet; }
+ bool HasCharSet() const { return mbHasCharSet; }
/** Returns true, if the font contains superscript or subscript. */
- inline bool HasEscapement() const { return maData.mnEscapem != EXC_FONTESC_NONE; }
+ bool HasEscapement() const { return maData.mnEscapem != EXC_FONTESC_NONE; }
/** Returns the text encoding for strings used with this font. */
rtl_TextEncoding GetFontEncoding() const;
/** Returns true, if this font contains characters for Asian scripts (CJK). */
- inline bool HasAsianChars() const { return mbHasAsian; }
+ bool HasAsianChars() const { return mbHasAsian; }
/** Reads a FONT record for all BIFF versions. */
void ReadFont( XclImpStream& rStrm );
@@ -171,7 +171,7 @@ public:
/** Returns the object that stores all contents of a FONT record. */
const XclImpFont* GetFont( sal_uInt16 nFontIndex ) const;
/** Returns the application font data of this file, needed i.e. for column width. */
- inline const XclFontData& GetAppFontData() const { return maAppFont; }
+ const XclFontData& GetAppFontData() const { return maAppFont; }
/** Reads a FONT record. */
void ReadFont( XclImpStream& rStrm );
@@ -362,11 +362,11 @@ struct XclImpCellArea : public XclCellArea
class XclImpXFIndex
{
public:
- inline explicit XclImpXFIndex( sal_uInt16 nXFIndex, bool bBoolCell = false ) :
+ explicit XclImpXFIndex( sal_uInt16 nXFIndex, bool bBoolCell = false ) :
mnXFIndex( nXFIndex ), mbBoolCell( bBoolCell ) {}
- inline sal_uInt16 GetXFIndex() const { return mnXFIndex; }
- inline bool IsBoolCell() const { return mbBoolCell; }
+ sal_uInt16 GetXFIndex() const { return mnXFIndex; }
+ bool IsBoolCell() const { return mbBoolCell; }
private:
sal_uInt16 mnXFIndex; /// The XF record index.
@@ -393,8 +393,8 @@ public:
/** Reads an XF record. */
void ReadXF( XclImpStream& rStrm );
- inline sal_uInt8 GetHorAlign() const { return maAlignment.mnHorAlign; }
- inline sal_uInt16 GetFontIndex() const { return mnXclFont; }
+ sal_uInt8 GetHorAlign() const { return maAlignment.mnHorAlign; }
+ sal_uInt16 GetFontIndex() const { return mnXclFont; }
/** Creates a Calc item set containing an item set with all cell properties.
@param bSkipPoolDefs true = Do not put items equal to pool default; false = Put all items.
@@ -453,11 +453,11 @@ public:
/** Reads a STYLE record. */
void ReadStyle( XclImpStream& rStrm );
- inline const OUString& GetName() const { return maName; }
- inline sal_uInt16 GetXfId() const { return mnXfId; }
- inline bool IsBuiltin() const { return mbBuiltin && (mnBuiltinId != EXC_STYLE_USERDEF); }
- inline sal_uInt8 GetBuiltinId() const { return mnBuiltinId; }
- inline sal_uInt8 GetLevel() const { return mnLevel; }
+ const OUString& GetName() const { return maName; }
+ sal_uInt16 GetXfId() const { return mnXfId; }
+ bool IsBuiltin() const { return mbBuiltin && (mnBuiltinId != EXC_STYLE_USERDEF); }
+ sal_uInt8 GetBuiltinId() const { return mnBuiltinId; }
+ sal_uInt8 GetLevel() const { return mnLevel; }
/** Creates a cell style sheet and inserts it into the Calc document.
@return The pointer to the cell style sheet, or 0, if there is no style sheet. */
@@ -498,10 +498,10 @@ public:
void ReadStyle( XclImpStream& rStrm );
/** Returns the object that stores all contents of an XF record. */
- inline XclImpXF* GetXF( sal_uInt16 nXFIndex )
+ XclImpXF* GetXF( sal_uInt16 nXFIndex )
{ return (nXFIndex >= maXFList.size()) ? nullptr : maXFList.at(nXFIndex).get(); }
- inline const XclImpXF* GetXF( sal_uInt16 nXFIndex ) const
+ const XclImpXF* GetXF( sal_uInt16 nXFIndex ) const
{ return (nXFIndex >= maXFList.size()) ? nullptr : maXFList.at(nXFIndex).get(); }
/** Returns the index to the Excel font used in the specified XF record. */
@@ -578,7 +578,7 @@ public:
typedef std::vector< std::unique_ptr > IndexList;
- inline explicit XclImpXFRangeColumn() {}
+ explicit XclImpXFRangeColumn() {}
IndexList::iterator begin() { return maIndexList.begin(); }
IndexList::iterator end() { return maIndexList.end(); }
diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx
index 1723c8aa6925..60a843031c29 100644
--- a/sc/source/filter/inc/xladdress.hxx
+++ b/sc/source/filter/inc/xladdress.hxx
@@ -32,11 +32,11 @@ struct XclAddress
sal_uInt16 mnCol;
sal_uInt32 mnRow;
- inline explicit XclAddress( ScAddress::Uninitialized ) {}
- inline explicit XclAddress() : mnCol( 0 ), mnRow( 0 ) {}
- inline explicit XclAddress( sal_uInt16 nCol, sal_uInt32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
+ explicit XclAddress( ScAddress::Uninitialized ) {}
+ explicit XclAddress() : mnCol( 0 ), mnRow( 0 ) {}
+ explicit XclAddress( sal_uInt16 nCol, sal_uInt32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
- inline void Set( sal_uInt16 nCol, sal_uInt32 nRow ) { mnCol = nCol; mnRow = nRow; }
+ void Set( sal_uInt16 nCol, sal_uInt32 nRow ) { mnCol = nCol; mnRow = nRow; }
void Read( XclImpStream& rStrm );
void Write( XclExpStream& rStrm ) const;
@@ -60,17 +60,17 @@ struct XclRange
XclAddress maFirst;
XclAddress maLast;
- inline explicit XclRange( ScAddress::Uninitialized e ) : maFirst( e ), maLast( e ) {}
- inline explicit XclRange() {}
- inline explicit XclRange( const XclAddress& rPos ) : maFirst( rPos ), maLast( rPos ) {}
- inline explicit XclRange( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 ) :
+ explicit XclRange( ScAddress::Uninitialized e ) : maFirst( e ), maLast( e ) {}
+ explicit XclRange() {}
+ explicit XclRange( const XclAddress& rPos ) : maFirst( rPos ), maLast( rPos ) {}
+ explicit XclRange( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 ) :
maFirst( nCol1, nRow1 ), maLast( nCol2, nRow2 ) {}
- inline void Set( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 )
+ void Set( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 )
{ maFirst.Set( nCol1, nRow1 ); maLast.Set( nCol2, nRow2 ); }
- inline sal_uInt16 GetColCount() const { return maLast.mnCol - maFirst.mnCol + 1; }
- inline sal_uInt32 GetRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; }
+ sal_uInt16 GetColCount() const { return maLast.mnCol - maFirst.mnCol + 1; }
+ sal_uInt32 GetRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; }
bool Contains( const XclAddress& rPos ) const;
void Read( XclImpStream& rStrm, bool bCol16Bit = true );
@@ -98,7 +98,7 @@ private:
XclRangeVector mRanges;
public:
- inline explicit XclRangeList() : mRanges() {}
+ explicit XclRangeList() : mRanges() {}
size_t size() const { return mRanges.size(); }
bool empty() const { return mRanges.empty(); }
@@ -137,11 +137,11 @@ public:
virtual ~XclAddressConverterBase();
/** Returns whether the "some columns have been cut" warning box should be shown. */
- inline bool IsColTruncated() const { return mbColTrunc; }
+ bool IsColTruncated() const { return mbColTrunc; }
/** Returns whether the "some rows have been cut" warning box should be shown. */
- inline bool IsRowTruncated() const { return mbRowTrunc; }
+ bool IsRowTruncated() const { return mbRowTrunc; }
/** Returns whether the "some sheets have been cut" warning box should be shown. */
- inline bool IsTabTruncated() const { return mbTabTrunc; }
+ bool IsTabTruncated() const { return mbTabTrunc; }
/** Checks if the passed sheet index is valid.
@param nScTab The sheet index to check.
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index b47d4080d935..8aa8a47010f4 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -1227,10 +1227,10 @@ struct XclChExtTypeInfo : public XclChTypeInfo
void Set( const XclChTypeInfo& rTypeInfo, bool b3dChart, bool bSpline );
/** Returns true, if this chart type supports area formatting for its series. */
- inline bool IsSeriesFrameFormat() const
+ bool IsSeriesFrameFormat() const
{ return mb3dChart ? mbSeriesIsFrame3d : mbSeriesIsFrame2d; }
/** Returns the correct object type identifier for series and data points. */
- inline XclChObjectType GetSeriesObjectType() const
+ XclChObjectType GetSeriesObjectType() const
{ return IsSeriesFrameFormat() ? EXC_CHOBJTYPE_FILLEDSERIES : EXC_CHOBJTYPE_LINEARSERIES; }
};
@@ -1268,7 +1268,7 @@ enum XclChTextType
/** A map key for text and title objects. */
struct XclChTextKey : public ::std::pair< XclChTextType, ::std::pair< sal_uInt16, sal_uInt16 > >
{
- inline explicit XclChTextKey( XclChTextType eTextType, sal_uInt16 nMainIdx = 0, sal_uInt16 nSubIdx = 0 )
+ explicit XclChTextKey( XclChTextType eTextType, sal_uInt16 nMainIdx = 0, sal_uInt16 nSubIdx = 0 )
{ first = eTextType; second.first = nMainIdx; second.second = nSubIdx; }
};
diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index 421cd7c78b45..7ad4d40b9606 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -360,8 +360,8 @@ struct XclObjLineData
explicit XclObjLineData();
- inline bool IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_LINE_AUTO ); }
- inline bool IsVisible() const { return IsAuto() || (mnStyle != EXC_OBJ_LINE_NONE); }
+ bool IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_LINE_AUTO ); }
+ bool IsVisible() const { return IsAuto() || (mnStyle != EXC_OBJ_LINE_NONE); }
};
XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData );
@@ -375,8 +375,8 @@ struct XclObjFillData
explicit XclObjFillData();
- inline bool IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_FILL_AUTO ); }
- inline bool IsFilled() const { return IsAuto() || (mnPattern != EXC_PATT_NONE); }
+ bool IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_FILL_AUTO ); }
+ bool IsFilled() const { return IsAuto() || (mnPattern != EXC_PATT_NONE); }
};
XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData );
@@ -402,8 +402,8 @@ struct XclObjTextData
/** Reads text data from a BIFF8 TXO record. */
void ReadTxo8( XclImpStream& rStrm );
- inline sal_uInt8 GetHorAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 1, 3 ); }
- inline sal_uInt8 GetVerAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 4, 3 ); }
+ sal_uInt8 GetHorAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 1, 3 ); }
+ sal_uInt8 GetVerAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 4, 3 ); }
};
enum XclTbxEventType
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index a0fcc25b35c6..f1e128784d1d 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -324,15 +324,15 @@ struct XclFunctionInfo
EXC_FUNCFLAG_ADDINEQUIV is set. */
/** Returns true, if the function is volatile. */
- inline bool IsVolatile() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_VOLATILE ); }
+ bool IsVolatile() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_VOLATILE ); }
/** Returns true, if optional parameters are expected to appear in pairs. */
- inline bool IsParamPairs() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_PARAMPAIRS ); }
+ bool IsParamPairs() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_PARAMPAIRS ); }
/** Returns true, if the function parameter count is fixed. */
- inline bool IsFixedParamCount() const { return (mnXclFunc != EXC_FUNCID_EXTERNCALL) && (mnMinParamCount == mnMaxParamCount); }
+ bool IsFixedParamCount() const { return (mnXclFunc != EXC_FUNCID_EXTERNCALL) && (mnMinParamCount == mnMaxParamCount); }
/** Returns true, if the function is simulated by a macro call. */
- inline bool IsMacroFunc() const { return mpcMacroName != nullptr && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); }
+ bool IsMacroFunc() const { return mpcMacroName != nullptr && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); }
/** Returns true, if the function is stored as an add-in call. */
- inline bool IsAddInEquivalent() const { return mpcMacroName != nullptr && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); }
+ bool IsAddInEquivalent() const { return mpcMacroName != nullptr && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); }
/** Returns the name of the external function as string. */
OUString GetMacroFuncName() const;
/** Returns the programmatical name of the Add-In function as string. */
@@ -383,13 +383,13 @@ public:
explicit XclTokenArray( ScfUInt8Vec& rTokVec, ScfUInt8Vec& rExtDataVec, bool bVolatile = false );
/** Returns true, if the token array is empty. */
- inline bool Empty() const { return maTokVec.empty(); }
+ bool Empty() const { return maTokVec.empty(); }
/** Returns the size of the token array in bytes. */
sal_uInt16 GetSize() const;
/** Returns read-only access to the byte vector storing token data. */
- inline const sal_uInt8* GetData() const { return maTokVec.empty() ? nullptr : maTokVec.data(); }
+ const sal_uInt8* GetData() const { return maTokVec.empty() ? nullptr : maTokVec.data(); }
/** Returns true, if the formula contains a volatile function. */
- inline bool IsVolatile() const { return mbVolatile; }
+ bool IsVolatile() const { return mbVolatile; }
/** Reads the size field of the token array. */
void ReadSize( XclImpStream& rStrm );
@@ -446,11 +446,11 @@ public:
void Init( const ScTokenArray& rScTokArr, bool bSkipSpaces );
- inline bool Is() const { return mppScToken != nullptr; }
- inline bool operator!() const { return !Is(); }
- inline const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : nullptr; }
- inline const ::formula::FormulaToken* operator->() const { return Get(); }
- inline const ::formula::FormulaToken& operator*() const { return *Get(); }
+ bool Is() const { return mppScToken != nullptr; }
+ bool operator!() const { return !Is(); }
+ const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : nullptr; }
+ const ::formula::FormulaToken* operator->() const { return Get(); }
+ const ::formula::FormulaToken& operator*() const { return *Get(); }
XclTokenArrayIterator& operator++();
@@ -492,7 +492,7 @@ public:
inline static sal_uInt8 GetTokenId( sal_uInt8 nBaseId, sal_uInt8 nTokenClass );
/** Returns the token class of the passed token ID. */
- inline static sal_uInt8 GetTokenClass( sal_uInt8 nTokenId ) { return nTokenId & EXC_TOKCLASS_MASK; }
+ static sal_uInt8 GetTokenClass( sal_uInt8 nTokenId ) { return nTokenId & EXC_TOKCLASS_MASK; }
/** Changes the token class in the passed classified token ID. */
inline static void ChangeTokenClass( sal_uInt8& rnTokenId, sal_uInt8 nTokenClass );
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 67158c3bfa52..26a7d30188eb 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -388,7 +388,7 @@ public:
void SetBool( bool bValue );
/** Returns the text representation of the item. */
- inline const OUString& ConvertToText() const { return maText; }
+ const OUString& ConvertToText() const { return maText; }
/** Returns true, if the passed term equals this item. */
bool IsEqual( const XclPCItem& rItem ) const;
@@ -475,7 +475,7 @@ public:
virtual ~XclPCField();
/** Returns the index of this field in the containing pivot cache. */
- inline sal_uInt16 GetFieldIndex() const { return mnFieldIdx; }
+ sal_uInt16 GetFieldIndex() const { return mnFieldIdx; }
/** Returns true, if the type of the field is supported by Calc. */
bool IsSupportedField() const;
@@ -544,7 +544,7 @@ struct XclPTCachedName
OUString maName; /// The visible name, if used.
bool mbUseCache; /// true = Use name in cache instead of maName.
- inline explicit XclPTCachedName() : mbUseCache( true ) {}
+ explicit XclPTCachedName() : mbUseCache( true ) {}
};
XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName );
@@ -556,7 +556,7 @@ struct XclPTVisNameInfo
XclPTCachedName maVisName; /// The displayed name of the item.
/** Returns true, if the name is set explicitly (maVisName.mbUseCache is false). */
- inline bool HasVisName() const { return !maVisName.mbUseCache; }
+ bool HasVisName() const { return !maVisName.mbUseCache; }
/** Returns the name, if set explicitly (maVisName.mbUseCache is false). */
const OUString* GetVisName() const;
/** Sets the visible name and enables usage of cache if name is empty. */
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index f90598f14ab4..f1b9a1085825 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -45,7 +45,7 @@ struct XclRange;
struct XclDebugObjCounter
{
sal_Int32 mnObjCnt;
- inline explicit XclDebugObjCounter() : mnObjCnt( 0 ) {}
+ explicit XclDebugObjCounter() : mnObjCnt( 0 ) {}
~XclDebugObjCounter();
};
#endif
@@ -138,30 +138,30 @@ public:
XclRoot& operator=( const XclRoot& rRoot );
/** Returns old RootData struct. Deprecated. */
- inline RootData& GetOldRoot() const { return *mrData.mxRD; }
+ RootData& GetOldRoot() const { return *mrData.mxRD; }
/** Returns the current BIFF version of the importer/exporter. */
- inline XclBiff GetBiff() const { return mrData.meBiff; }
+ XclBiff GetBiff() const { return mrData.meBiff; }
/** Returns the current output format of the importer/exporter. */
- inline XclOutput GetOutput() const { return mrData.meOutput; }
+ XclOutput GetOutput() const { return mrData.meOutput; }
/** Returns true, if currently a document is imported. */
- inline bool IsImport() const { return !mrData.mbExport; }
+ bool IsImport() const { return !mrData.mbExport; }
/** Returns the text encoding to import/export byte strings. */
- inline rtl_TextEncoding GetTextEncoding() const { return mrData.meTextEnc; }
+ rtl_TextEncoding GetTextEncoding() const { return mrData.meTextEnc; }
/** Returns the system language, i.e. for number formats. */
- inline LanguageType GetSysLanguage() const { return mrData.meSysLang; }
+ LanguageType GetSysLanguage() const { return mrData.meSysLang; }
/** Returns the document language. */
- inline LanguageType GetDocLanguage() const { return mrData.meDocLang; }
+ LanguageType GetDocLanguage() const { return mrData.meDocLang; }
/** Returns the UI language. */
- inline LanguageType GetUILanguage() const { return mrData.meUILang; }
+ LanguageType GetUILanguage() const { return mrData.meUILang; }
/** Returns the default script type, e.g. for blank cells. */
- inline sal_Int16 GetDefApiScript() const { return mrData.mnDefApiScript; }
+ sal_Int16 GetDefApiScript() const { return mrData.mnDefApiScript; }
/** Returns the width of the '0' character (default font) for the current printer (twips). */
- inline long GetCharWidth() const { return mrData.mnCharWidth; }
+ long GetCharWidth() const { return mrData.mnCharWidth; }
/** Returns the current Calc sheet index. */
- inline bool IsInGlobals() const { return mrData.mnScTab == SCTAB_GLOBAL; }
+ bool IsInGlobals() const { return mrData.mnScTab == SCTAB_GLOBAL; }
/** Returns the current Calc sheet index. */
- inline SCTAB GetCurrScTab() const { return mrData.mnScTab; }
+ SCTAB GetCurrScTab() const { return mrData.mnScTab; }
/** Calculates the width of the passed number of pixels in 1/100 mm. */
sal_Int32 GetHmmFromPixelX( double fPixelX ) const;
@@ -169,16 +169,16 @@ public:
sal_Int32 GetHmmFromPixelY( double fPixelY ) const;
/** Returns the medium to import from. */
- inline SfxMedium& GetMedium() const { return mrData.mrMedium; }
+ SfxMedium& GetMedium() const { return mrData.mrMedium; }
/** Returns the document URL of the imported/exported file. */
- inline const OUString& GetDocUrl() const { return mrData.maDocUrl; }
+ const OUString& GetDocUrl() const { return mrData.maDocUrl; }
/** Returns the base path of the imported/exported file. */
- inline const OUString& GetBasePath() const { return mrData.maBasePath; }
+ const OUString& GetBasePath() const { return mrData.maBasePath; }
/** Returns the current user name. */
- inline const OUString& GetUserName() const { return mrData.maUserName; }
+ const OUString& GetUserName() const { return mrData.maUserName; }
/** Returns the default password used for stream encryption. */
- inline const OUString& GetDefaultPassword() const { return mrData.maDefPassword; }
+ const OUString& GetDefaultPassword() const { return mrData.maDefPassword; }
/** Requests and verifies a password from the medium or the user. */
css::uno::Sequence< css::beans::NamedValue >
RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
@@ -245,25 +245,25 @@ public:
XclTracer& GetTracer() const;
/** Returns the highest possible cell address in a Calc document. */
- inline const ScAddress& GetScMaxPos() const { return mrData.maScMaxPos; }
+ const ScAddress& GetScMaxPos() const { return mrData.maScMaxPos; }
/** Returns the highest possible cell address in an Excel document (using current BIFF version). */
- inline const ScAddress& GetXclMaxPos() const { return mrData.maXclMaxPos; }
+ const ScAddress& GetXclMaxPos() const { return mrData.maXclMaxPos; }
/** Returns the highest possible cell address valid in Calc and Excel (using current BIFF version). */
- inline const ScAddress& GetMaxPos() const { return mrData.maMaxPos; }
+ const ScAddress& GetMaxPos() const { return mrData.maMaxPos; }
/** Sets the document language. */
- inline void SetDocLanguage( LanguageType eLang ) { mrData.meDocLang = eLang; }
+ void SetDocLanguage( LanguageType eLang ) { mrData.meDocLang = eLang; }
/** Sets the UI language, i.e. if it has been read from a file. */
- inline void SetUILanguage( LanguageType eLang ) { mrData.meUILang = eLang; }
+ void SetUILanguage( LanguageType eLang ) { mrData.meUILang = eLang; }
/** Sets the text encoding to import/export byte strings. */
void SetTextEncoding( rtl_TextEncoding eTextEnc );
/** Sets the width of the '0' character (default font) for the current printer (twips).
@param rFontData The font used for the '0' character. */
void SetCharWidth( const XclFontData& rFontData );
/** Sets the current Calc sheet index. */
- inline void SetCurrScTab( SCTAB nScTab ) { mrData.mnScTab = nScTab; }
+ void SetCurrScTab( SCTAB nScTab ) { mrData.mnScTab = nScTab; }
/** Increases the current Calc sheet index by 1. */
- inline void IncCurrScTab() { ++mrData.mnScTab; }
+ void IncCurrScTab() { ++mrData.mnScTab; }
private:
XclRootData& mrData; /// Reference to the global data struct.
diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx
index 1052a6b7159f..6f45c5bdbfc0 100644
--- a/sc/source/filter/inc/xlstring.hxx
+++ b/sc/source/filter/inc/xlstring.hxx
@@ -61,8 +61,8 @@ struct XclFormatRun
sal_uInt16 mnChar; /// First character this format applies to.
sal_uInt16 mnFontIdx; /// Excel font index for the next characters.
- explicit inline XclFormatRun() : mnChar( 0 ), mnFontIdx( 0 ) {}
- explicit inline XclFormatRun( sal_uInt16 nChar, sal_uInt16 nFontIdx ) :
+ explicit XclFormatRun() : mnChar( 0 ), mnFontIdx( 0 ) {}
+ explicit XclFormatRun( sal_uInt16 nChar, sal_uInt16 nFontIdx ) :
mnChar( nChar ), mnFontIdx( nFontIdx ) {}
};
diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index 5a258be4023d..3770095c87fd 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -255,16 +255,16 @@ public:
explicit XclDefaultPalette( const XclRoot& rRoot );
/** Returns the color count in the current palette. */
- inline sal_uInt32 GetColorCount() const { return mnTableSize - EXC_COLOR_USEROFFSET; }
+ sal_uInt32 GetColorCount() const { return mnTableSize - EXC_COLOR_USEROFFSET; }
/** Returns the default RGB color data for a (non-zero-based) Excel color or COL_AUTO on error. */
ColorData GetDefColorData( sal_uInt16 nXclIndex ) const;
/** Returns the default color for a (non-zero-based) Excel color or COL_AUTO on error. */
- inline Color GetDefColor( sal_uInt16 nXclIndex ) const
+ Color GetDefColor( sal_uInt16 nXclIndex ) const
{ return Color( GetDefColorData( nXclIndex ) ); }
/** Returns true, if the passed Excel color index is a system color. */
- inline bool IsSystemColor( sal_uInt16 nXclIndex ) const { return nXclIndex >= mnTableSize; }
+ bool IsSystemColor( sal_uInt16 nXclIndex ) const { return nXclIndex >= mnTableSize; }
private:
const ColorData* mpnColorTable; /// The table with RGB values.
@@ -452,7 +452,7 @@ public:
explicit XclNumFmtBuffer( const XclRoot& rRoot );
/** Returns the core index of the current standard number format. */
- inline sal_uLong GetStdScNumFmt() const { return mnStdScNumFmt; }
+ sal_uLong GetStdScNumFmt() const { return mnStdScNumFmt; }
protected:
typedef ::std::map< sal_uInt16, XclNumFmt > XclNumFmtMap;
@@ -461,7 +461,7 @@ protected:
void InitializeImport();
/** Returns the current number format map. */
- inline const XclNumFmtMap& GetFormatMap() const { return maFmtMap; }
+ const XclNumFmtMap& GetFormatMap() const { return maFmtMap; }
/** Inserts a new number format for the specified Excel format index. */
void InsertFormat( sal_uInt16 nXclNumFmt, const OUString& rFormat );
@@ -575,9 +575,9 @@ public:
bool HasUsedFlags() const;
/** Returns true, if this is a hard cell format. */
- inline bool IsCellXF() const { return mbCellXF; }
+ bool IsCellXF() const { return mbCellXF; }
/** Returns true, if this is a cell style. */
- inline bool IsStyleXF() const { return !IsCellXF(); }
+ bool IsStyleXF() const { return !IsCellXF(); }
protected:
/** Returns true, if this object is equal to the passed. */
diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx
index bc69f89a0485..38a62ac889be 100644
--- a/sc/source/filter/inc/xltracer.hxx
+++ b/sc/source/filter/inc/xltracer.hxx
@@ -55,7 +55,7 @@ public:
~XclTracer();
/** Returns true, if tracing is enabled. */
- inline bool IsEnabled() const { return mbEnabled; }
+ bool IsEnabled() const { return mbEnabled; }
/** Ensure that particular traces are logged once per document. */
void ProcessTraceOnce(XclTracerId eProblem);
diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index 4de059df098b..a742bb678427 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -109,7 +109,7 @@ struct XclSelectionData
XclRangeList maXclSelection; /// Selected cell ranges.
sal_uInt16 mnCursorIdx; /// Index of cursor in selection list.
- inline explicit XclSelectionData() : mnCursorIdx( 0 ) {}
+ explicit XclSelectionData() : mnCursorIdx( 0 ) {}
};
typedef std::shared_ptr< XclSelectionData > XclSelectionDataRef;
diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx
index e253ca0e9329..f25b3ebfb702 100644
--- a/sc/source/filter/oox/biffhelper.cxx
+++ b/sc/source/filter/oox/biffhelper.cxx
@@ -40,8 +40,8 @@ union DecodedDouble
double mfValue;
sal_math_Double maStruct;
- inline explicit DecodedDouble() {}
- inline explicit DecodedDouble( double fValue ) : mfValue( fValue ) {}
+ explicit DecodedDouble() {}
+ explicit DecodedDouble( double fValue ) : mfValue( fValue ) {}
};
} // namespace
diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx
index 05dcb5ba79ad..71475c1db2ad 100644
--- a/sc/source/filter/oox/excelvbaproject.cxx
+++ b/sc/source/filter/oox/excelvbaproject.cxx
@@ -56,7 +56,7 @@ struct SheetCodeNameInfo
PropertySet maSheetProps; /// Property set of the sheet without codename.
OUString maPrefix; /// Prefix for the codename to be generated.
- inline explicit SheetCodeNameInfo( PropertySet& rSheetProps, const OUString& rPrefix ) :
+ explicit SheetCodeNameInfo( PropertySet& rSheetProps, const OUString& rPrefix ) :
maSheetProps( rSheetProps ), maPrefix( rPrefix ) {}
};
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 82d9aa94f9fe..b94cd73b0221 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -466,7 +466,7 @@ protected:
template< typename Type >
bool pushValueOperandToken( const Type& rValue, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
template< typename Type >
- inline bool pushValueOperandToken( const Type& rValue )
+ bool pushValueOperandToken( const Type& rValue )
{ return pushValueOperandToken( rValue, OPCODE_PUSH, nullptr ); }
bool pushParenthesesOperandToken( const WhiteSpaceVec* pClosingSpaces = nullptr );
bool pushUnaryPreOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
@@ -481,7 +481,7 @@ protected:
template< typename Type >
bool pushValueOperand( const Type& rValue, sal_Int32 nOpCode );
template< typename Type >
- inline bool pushValueOperand( const Type& rValue )
+ bool pushValueOperand( const Type& rValue )
{ return pushValueOperand( rValue, OPCODE_PUSH ); }
bool pushBoolOperand( bool bValue );
bool pushErrorOperand( double fEncodedError );
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 3fb7178acd7d..2f4987890388 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1850,7 +1850,7 @@ class NumberFormatFinalizer
public:
explicit NumberFormatFinalizer( const WorkbookHelper& rHelper );
- inline void operator()( NumberFormat& rNumFmt ) const
+ void operator()( NumberFormat& rNumFmt ) const
{ rNumFmt.finalizeImport( mxNumFmts, maEnUsLocale ); }
private:
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index b0397f43e491..beeea7b352e5 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -385,11 +385,11 @@ public:
private:
/** Returns the current edit engine text object. */
- inline HFPortionInfo& getPortion() { return maPortions[ meCurrPortion ]; }
+ HFPortionInfo& getPortion() { return maPortions[ meCurrPortion ]; }
/** Returns the start cursor of the current text range. */
- inline const Reference& getStartPos() { return getPortion().mxStart; }
+ const Reference& getStartPos() { return getPortion().mxStart; }
/** Returns the end cursor of the current text range. */
- inline const Reference& getEndPos() { return getPortion().mxEnd; }
+ const Reference& getEndPos() { return getPortion().mxEnd; }
/** Returns the current line height of the specified portion. */
double getCurrHeight( HFPortionId ePortion ) const;
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index c29fcede5e04..aad783f896c9 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -114,29 +114,29 @@ public:
~WorkbookGlobals();
/** Returns true, if this helper refers to a valid document. */
- inline bool isValid() const { return mxDoc.is(); }
+ bool isValid() const { return mxDoc.is(); }
// filter -----------------------------------------------------------------
/** Returns the base filter object (base class of all filters). */
- inline FilterBase& getBaseFilter() const { return mrBaseFilter; }
+ FilterBase& getBaseFilter() const { return mrBaseFilter; }
/** Returns the filter progress bar. */
- inline SegmentProgressBar& getProgressBar() const { return *mxProgressBar; }
+ SegmentProgressBar& getProgressBar() const { return *mxProgressBar; }
/** Returns the VBA project storage. */
const StorageRef& getVbaProjectStorage() const { return mxVbaPrjStrg; }
/** Returns the index of the current Calc sheet, if filter currently processes a sheet. */
- inline sal_Int16 getCurrentSheetIndex() const { return mnCurrSheet; }
+ sal_Int16 getCurrentSheetIndex() const { return mnCurrSheet; }
/** Returns true when reading a file generated by a known good generator. */
- inline bool isGeneratorKnownGood() const { return mbGeneratorKnownGood; }
+ bool isGeneratorKnownGood() const { return mbGeneratorKnownGood; }
/** Sets the VBA project storage used to import VBA source code and forms. */
- inline void setVbaProjectStorage( const StorageRef& rxVbaPrjStrg ) { mxVbaPrjStrg = rxVbaPrjStrg; }
+ void setVbaProjectStorage( const StorageRef& rxVbaPrjStrg ) { mxVbaPrjStrg = rxVbaPrjStrg; }
/** Sets the index of the current Calc sheet, if filter currently processes a sheet. */
- inline void setCurrentSheetIndex( SCTAB nSheet ) { mnCurrSheet = nSheet; }
+ void setCurrentSheetIndex( SCTAB nSheet ) { mnCurrSheet = nSheet; }
// document model ---------------------------------------------------------
- inline ScEditEngineDefaulter& getEditEngine() const
+ ScEditEngineDefaulter& getEditEngine() const
{
return *mxEditEngine.get();
}
@@ -168,58 +168,58 @@ public:
// buffers ----------------------------------------------------------------
- inline FormulaBuffer& getFormulaBuffer() const { return *mxFormulaBuffer; }
+ FormulaBuffer& getFormulaBuffer() const { return *mxFormulaBuffer; }
/** Returns the global workbook settings object. */
- inline WorkbookSettings& getWorkbookSettings() const { return *mxWorkbookSettings; }
+ WorkbookSettings& getWorkbookSettings() const { return *mxWorkbookSettings; }
/** Returns the workbook and sheet view settings object. */
- inline ViewSettings& getViewSettings() const { return *mxViewSettings; }
+ ViewSettings& getViewSettings() const { return *mxViewSettings; }
/** Returns the worksheet buffer containing sheet names and properties. */
- inline WorksheetBuffer& getWorksheets() const { return *mxWorksheets; }
+ WorksheetBuffer& getWorksheets() const { return *mxWorksheets; }
/** Returns the office theme object read from the theme substorage. */
- inline ThemeBuffer& getTheme() const { return *mxTheme; }
+ ThemeBuffer& getTheme() const { return *mxTheme; }
/** Returns all cell formatting objects read from the styles substream. */
- inline StylesBuffer& getStyles() const { return *mxStyles; }
+ StylesBuffer& getStyles() const { return *mxStyles; }
/** Returns the shared strings read from the shared strings substream. */
- inline SharedStringsBuffer& getSharedStrings() const { return *mxSharedStrings; }
+ SharedStringsBuffer& getSharedStrings() const { return *mxSharedStrings; }
/** Returns the external links read from the external links substream. */
- inline ExternalLinkBuffer& getExternalLinks() const { return *mxExtLinks; }
+ ExternalLinkBuffer& getExternalLinks() const { return *mxExtLinks; }
/** Returns the defined names read from the workbook globals. */
- inline DefinedNamesBuffer& getDefinedNames() const { return *mxDefNames; }
+ DefinedNamesBuffer& getDefinedNames() const { return *mxDefNames; }
/** Returns the tables collection (equivalent to Calc's database ranges). */
- inline TableBuffer& getTables() const { return *mxTables; }
+ TableBuffer& getTables() const { return *mxTables; }
/** Returns the scenarios collection. */
- inline ScenarioBuffer& getScenarios() const { return *mxScenarios; }
+ ScenarioBuffer& getScenarios() const { return *mxScenarios; }
/** Returns the collection of external data connections. */
- inline ConnectionsBuffer& getConnections() const { return *mxConnections; }
+ ConnectionsBuffer& getConnections() const { return *mxConnections; }
/** Returns the collection of pivot caches. */
- inline PivotCacheBuffer& getPivotCaches() const { return *mxPivotCaches; }
+ PivotCacheBuffer& getPivotCaches() const { return *mxPivotCaches; }
/** Returns the collection of pivot tables. */
- inline PivotTableBuffer& getPivotTables() { return *mxPivotTables; }
+ PivotTableBuffer& getPivotTables() { return *mxPivotTables; }
// converters -------------------------------------------------------------
/** Returns a shared import formula parser. */
- inline FormulaParser& getFormulaParser() const { return *mxFmlaParser; }
+ FormulaParser& getFormulaParser() const { return *mxFmlaParser; }
/** Returns an unshared import formula parser. */
- inline FormulaParser* createFormulaParser() { return new FormulaParser(*this); }
+ FormulaParser* createFormulaParser() { return new FormulaParser(*this); }
/** Returns the measurement unit converter. */
- inline UnitConverter& getUnitConverter() const { return *mxUnitConverter; }
+ UnitConverter& getUnitConverter() const { return *mxUnitConverter; }
/** Returns the converter for string to cell address/range conversion. */
- inline AddressConverter& getAddressConverter() const { return *mxAddrConverter; }
+ AddressConverter& getAddressConverter() const { return *mxAddrConverter; }
/** Returns the chart object converter. */
- inline oox::drawingml::chart::ChartConverter* getChartConverter() const { return mxChartConverter.get(); }
+ oox::drawingml::chart::ChartConverter* getChartConverter() const { return mxChartConverter.get(); }
/** Returns the page/print settings converter. */
- inline PageSettingsConverter& getPageSettingsConverter() const { return *mxPageSettConverter; }
+ PageSettingsConverter& getPageSettingsConverter() const { return *mxPageSettConverter; }
// OOXML/BIFF12 specific --------------------------------------------------
/** Returns the base OOXML/BIFF12 filter object. */
- inline XmlFilterBase& getOoxFilter() const { return *mpOoxFilter; }
+ XmlFilterBase& getOoxFilter() const { return *mpOoxFilter; }
// BIFF2-BIFF8 specific ---------------------------------------------------
/** Returns the text encoding used to import/export byte strings. */
- inline rtl_TextEncoding getTextEncoding() const { return meTextEnc; }
+ rtl_TextEncoding getTextEncoding() const { return meTextEnc; }
private:
/** Initializes some basic members and sets needed document properties. */
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 0f01e0d777b2..9cc3cf294e77 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -208,14 +208,14 @@ public:
SCTAB nSheet );
/** Returns true, if this helper refers to an existing Calc sheet. */
- inline bool isValidSheet() const { return mxSheet.is(); }
+ bool isValidSheet() const { return mxSheet.is(); }
/** Returns the type of this sheet. */
- inline WorksheetType getSheetType() const { return meSheetType; }
+ WorksheetType getSheetType() const { return meSheetType; }
/** Returns the index of the current sheet. */
- inline SCTAB getSheetIndex() const { return maUsedArea.aStart.Tab(); }
+ SCTAB getSheetIndex() const { return maUsedArea.aStart.Tab(); }
/** Returns the XSpreadsheet interface of the current sheet. */
- inline const Reference< XSpreadsheet >& getSheet() const { return mxSheet; }
+ const Reference< XSpreadsheet >& getSheet() const { return mxSheet; }
/** Returns the XCell interface for the passed cell address. */
Reference< XCell > getCell( const ScAddress& rAddress ) const;
@@ -243,25 +243,25 @@ public:
ScRange getCellRangeFromRectangle( const awt::Rectangle& rRect ) const;
/** Returns the buffer for cell contents and cell formatting. */
- inline SheetDataBuffer& getSheetData() { return maSheetData; }
+ SheetDataBuffer& getSheetData() { return maSheetData; }
/** Returns the conditional formatting in this sheet. */
- inline CondFormatBuffer& getCondFormats() { return maCondFormats; }
+ CondFormatBuffer& getCondFormats() { return maCondFormats; }
/** Returns the buffer for all cell comments in this sheet. */
- inline CommentsBuffer& getComments() { return maComments; }
+ CommentsBuffer& getComments() { return maComments; }
/** Returns the auto filters for the sheet. */
- inline AutoFilterBuffer& getAutoFilters() { return maAutoFilters; }
+ AutoFilterBuffer& getAutoFilters() { return maAutoFilters; }
/** Returns the buffer for all web query tables in this sheet. */
- inline QueryTableBuffer& getQueryTables() { return maQueryTables; }
+ QueryTableBuffer& getQueryTables() { return maQueryTables; }
/** Returns the worksheet settings object. */
- inline WorksheetSettings& getWorksheetSettings() { return maSheetSett; }
+ WorksheetSettings& getWorksheetSettings() { return maSheetSett; }
/** Returns the page/print settings for this sheet. */
- inline PageSettings& getPageSettings() { return maPageSett; }
+ PageSettings& getPageSettings() { return maPageSett; }
/** Returns the view settings for this sheet. */
- inline SheetViewSettings& getSheetViewSettings() { return maSheetViewSett; }
+ SheetViewSettings& getSheetViewSettings() { return maSheetViewSett; }
/** Returns the VML drawing page for this sheet (OOXML/BIFF12 only). */
- inline VmlDrawing& getVmlDrawing() { return *mxVmlDrawing; }
+ VmlDrawing& getVmlDrawing() { return *mxVmlDrawing; }
/** returns the ExtLst entries that need to be filled */
- inline ExtLst& getExtLst() { return maExtLst; }
+ ExtLst& getExtLst() { return maExtLst; }
/** Sets a column or row page break described in the passed struct. */
void setPageBreak( const PageBreakModel& rModel, bool bRowBreak );
diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx
index 22ddc9bafc71..a90f6975ed1f 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -62,10 +62,10 @@ private:
ScMyImpDetectiveOpList aDetectiveOpList;
public:
- inline ScMyImpDetectiveOpArray() :
+ ScMyImpDetectiveOpArray() :
aDetectiveOpList() {}
- inline void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp )
+ void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp )
{ aDetectiveOpList.push_back( rDetOp ); }
void Sort();
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index c7998c18ef05..196d3e5fb629 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -153,10 +153,10 @@ struct ScMyAreaLink
ScRange aDestRange;
sal_Int32 nRefresh;
- inline ScMyAreaLink() : nRefresh( 0 ) {}
+ ScMyAreaLink() : nRefresh( 0 ) {}
- inline sal_Int32 GetColCount() const { return aDestRange.aEnd.Col() - aDestRange.aStart.Col() + 1; }
- inline sal_Int32 GetRowCount() const { return aDestRange.aEnd.Row() - aDestRange.aStart.Col() + 1; }
+ sal_Int32 GetColCount() const { return aDestRange.aEnd.Col() - aDestRange.aStart.Col() + 1; }
+ sal_Int32 GetRowCount() const { return aDestRange.aEnd.Row() - aDestRange.aStart.Col() + 1; }
bool Compare( const ScMyAreaLink& rAreaLink ) const;
bool operator<(const ScMyAreaLink& rAreaLink ) const;
@@ -174,7 +174,7 @@ public:
ScMyAreaLinksContainer();
virtual ~ScMyAreaLinksContainer() override;
- inline void AddNewAreaLink( const ScMyAreaLink& rAreaLink )
+ void AddNewAreaLink( const ScMyAreaLink& rAreaLink )
{ aAreaLinkList.push_back( rAreaLink ); }
using ScMyIteratorBase::UpdateAddress;
@@ -341,19 +341,19 @@ public:
void Clear();
- inline void SetShapes(ScMyShapesContainer* pNewShapes)
+ void SetShapes(ScMyShapesContainer* pNewShapes)
{ pShapes = pNewShapes; }
- inline void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes)
+ void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes)
{ pNoteShapes = pNewNoteShapes; }
- inline void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges)
+ void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges)
{ pEmptyDatabaseRanges = pNewEmptyDatabaseRanges; }
- inline void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges)
+ void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges)
{ pMergedRanges = pNewMergedRanges; }
- inline void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks)
+ void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks)
{ pAreaLinks = pNewAreaLinks; }
- inline void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj)
+ void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj)
{ pDetectiveObj = pNewDetectiveObj; }
- inline void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp)
+ void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp)
{ pDetectiveOp = pNewDetectiveOp; }
void SetCurrentTable(const SCTAB nTable,
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index f1a69c5b7e31..a02a6ee3dffe 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -235,8 +235,8 @@ public:
virtual ~ScXMLExport() override;
static sal_Int16 GetMeasureUnit();
- inline ScDocument* GetDocument() { return pDoc; }
- inline const ScDocument* GetDocument() const { return pDoc; }
+ ScDocument* GetDocument() { return pDoc; }
+ const ScDocument* GetDocument() const { return pDoc; }
bool IsMatrix (const ScAddress& aCell,
ScRange& aCellAddress, bool& bIsFirst) const;
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index e11e61e5558c..7cf62782732a 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -990,8 +990,8 @@ public:
ScDocumentImport& GetDoc();
- inline ScDocument* GetDocument() { return pDoc; }
- inline const ScDocument* GetDocument() const { return pDoc; }
+ ScDocument* GetDocument() { return pDoc; }
+ const ScDocument* GetDocument() const { return pDoc; }
ScMyTables& GetTables() { return aTables; }
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 31cb87ee0e4c..89982b3923b8 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -47,7 +47,7 @@ struct Func_SetType
{
sal_Int32 mnType;
explicit Func_SetType( sal_Int32 nType ) : mnType( nType ) {}
- inline void operator()( ScCsvColState& rState ) const
+ void operator()( ScCsvColState& rState ) const
{ rState.mnType = mnType; }
};
@@ -55,7 +55,7 @@ struct Func_Select
{
bool mbSelect;
explicit Func_Select( bool bSelect ) : mbSelect( bSelect ) {}
- inline void operator()( ScCsvColState& rState ) const
+ void operator()( ScCsvColState& rState ) const
{ rState.Select( mbSelect ); }
};
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index 836addd33957..234ca326f784 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -88,7 +88,7 @@ protected:
virtual Rectangle GetBoundingBox() const override;
/** Returns whether the object is alive. Must be called with locked mutex. */
- inline bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; }
+ bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; }
/** @throws css::lang::DisposedException if the object is disposed/disposing or any pointer
is missing. Should be used with locked mutex! */
void ensureAlive() const;
@@ -444,16 +444,16 @@ private:
/** Returns the count of selected columns in the table. */
sal_Int32 implGetSelColumnCount() const;
/** Returns the total cell count in the table (including header). */
- inline sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); }
+ sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); }
/** Returns the row index from cell index (including header). */
- inline sal_Int32 implGetRow( sal_Int32 nIndex ) const { return nIndex / implGetColumnCount(); }
+ sal_Int32 implGetRow( sal_Int32 nIndex ) const { return nIndex / implGetColumnCount(); }
/** Returns the column index from cell index (including header). */
- inline sal_Int32 implGetColumn( sal_Int32 nIndex ) const { return nIndex % implGetColumnCount(); }
+ sal_Int32 implGetColumn( sal_Int32 nIndex ) const { return nIndex % implGetColumnCount(); }
/** Returns the absolute column index of the nSelColumn-th selected column. */
sal_Int32 implGetSelColumn( sal_Int32 nSelColumn ) const;
/** Returns the child index from cell position (including header). */
- inline sal_Int32 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return nRow * implGetColumnCount() + nColumn; }
+ sal_Int32 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return nRow * implGetColumnCount() + nColumn; }
/** Returns the contents of the specified cell (including header). Indexes must be valid. */
OUString implGetCellText( sal_Int32 nRow, sal_Int32 nColumn ) const;
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 03cbaeb182a8..215341a0fcef 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -88,7 +88,7 @@ public:
void RefInputDone( bool bForced );
void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton );
- inline void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; }
+ void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; }
void DoClose( sal_uInt16 nId );
static void SetDispatcherLock( bool bLock );
static void EnableSpreadsheets( bool bFlag = true );
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index ac724afa13bc..6aec2addad75 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -69,8 +69,8 @@ struct ScCsvExpData
sal_Int32 mnIndex; /// Index of a column.
sal_uInt8 mnType; /// External type of the column.
- inline ScCsvExpData() : mnIndex( 0 ), mnType( SC_COL_STANDARD ) {}
- inline ScCsvExpData( sal_Int32 nIndex, sal_uInt8 nType ) :
+ ScCsvExpData() : mnIndex( 0 ), mnType( SC_COL_STANDARD ) {}
+ ScCsvExpData( sal_Int32 nIndex, sal_uInt8 nType ) :
mnIndex( nIndex ), mnType( nType ) {}
};
@@ -207,14 +207,14 @@ private:
sal_Int32 mnParam2; /// Second parameter.
public:
- inline explicit ScCsvCmd() : meType( CSVCMD_NONE ),
+ explicit ScCsvCmd() : meType( CSVCMD_NONE ),
mnParam1( CSV_POS_INVALID ), mnParam2( CSV_POS_INVALID ) {}
inline void Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 );
- inline ScCsvCmdType GetType() const { return meType; }
- inline sal_Int32 GetParam1() const { return mnParam1; }
- inline sal_Int32 GetParam2() const { return mnParam2; }
+ ScCsvCmdType GetType() const { return meType; }
+ sal_Int32 GetParam1() const { return mnParam1; }
+ sal_Int32 GetParam2() const { return mnParam2; }
};
inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 )
@@ -262,11 +262,11 @@ public:
// repaint helpers --------------------------------------------------------
/** Sets the graphic invalid (next Redraw() will not use cached graphic). */
- inline void InvalidateGfx() { mbValidGfx = false; }
+ void InvalidateGfx() { mbValidGfx = false; }
/** Sets the graphic valid (next Redraw() will use cached graphic). */
- inline void ValidateGfx() { mbValidGfx = true; }
+ void ValidateGfx() { mbValidGfx = true; }
/** Returns true, if cached graphic is valid. */
- inline bool IsValidGfx() const { return mbValidGfx; }
+ bool IsValidGfx() const { return mbValidGfx; }
/** Repaints all controls.
@param bInvalidate true = invalidates graphics of this control (not all). */
@@ -276,14 +276,14 @@ public:
/** Decreases no-repaint counter and repaints if counter reaches 0. */
void EnableRepaint();
/** Returns true, if controls will not repaint. */
- inline bool IsNoRepaint() const { return mrData.mnNoRepaint > 0; }
+ bool IsNoRepaint() const { return mrData.mnNoRepaint > 0; }
// command handling -------------------------------------------------------
/** Sets a new command handler. */
- inline void SetCmdHdl( const Link& rHdl ) { maCmdHdl = rHdl; }
+ void SetCmdHdl( const Link& rHdl ) { maCmdHdl = rHdl; }
/** Returns data of the last command. */
- inline const ScCsvCmd& GetCmd() const { return maCmd; }
+ const ScCsvCmd& GetCmd() const { return maCmd; }
/** Executes a command by calling command handler. */
void Execute(
@@ -294,18 +294,18 @@ public:
// layout helpers ---------------------------------------------------------
/** Returns a reference to the current layout data. */
- inline const ScCsvLayoutData& GetLayoutData() const { return mrData; }
+ const ScCsvLayoutData& GetLayoutData() const { return mrData; }
/** Returns true, if the Right-to-Left layout mode is active. */
- inline bool IsRTL() const { return mrData.mbAppRTL; }
+ bool IsRTL() const { return mrData.mbAppRTL; }
/** Returns the number of available positions. */
- inline sal_Int32 GetPosCount() const { return mrData.mnPosCount; }
+ sal_Int32 GetPosCount() const { return mrData.mnPosCount; }
/** Returns the number of visible positions. */
sal_Int32 GetVisPosCount() const;
/** Returns the first visible position. */
- inline sal_Int32 GetFirstVisPos() const { return mrData.mnPosOffset; }
+ sal_Int32 GetFirstVisPos() const { return mrData.mnPosOffset; }
/** Returns the last visible position. */
- inline sal_Int32 GetLastVisPos() const { return GetFirstVisPos() + GetVisPosCount(); }
+ sal_Int32 GetLastVisPos() const { return GetFirstVisPos() + GetVisPosCount(); }
/** Returns highest possible position for first visible character. */
sal_Int32 GetMaxPosOffset() const;
@@ -315,9 +315,9 @@ public:
bool IsVisibleSplitPos( sal_Int32 nPos ) const;
/** Returns the width of the header column. */
- inline sal_Int32 GetHdrWidth() const { return mrData.mnHdrWidth; }
+ sal_Int32 GetHdrWidth() const { return mrData.mnHdrWidth; }
/** Returns the width of one character column. */
- inline sal_Int32 GetCharWidth() const { return mrData.mnCharWidth; }
+ sal_Int32 GetCharWidth() const { return mrData.mnCharWidth; }
/** Returns the start position of the header column. */
sal_Int32 GetHdrX() const;
/** Returns the X position of the first pixel of the data area. */
@@ -330,11 +330,11 @@ public:
sal_Int32 GetPosFromX( sal_Int32 nX ) const;
/** Returns the number of data lines. */
- inline sal_Int32 GetLineCount() const { return mrData.mnLineCount; }
+ sal_Int32 GetLineCount() const { return mrData.mnLineCount; }
/** Returns the number of visible lines (including partly visible bottom line). */
sal_Int32 GetVisLineCount() const;
/** Returns index of first visible line. */
- inline sal_Int32 GetFirstVisLine() const { return mrData.mnLineOffset; }
+ sal_Int32 GetFirstVisLine() const { return mrData.mnLineOffset; }
/** Returns index of last visible line. */
sal_Int32 GetLastVisLine() const;
/** Returns highest possible index for first line. */
@@ -346,18 +346,18 @@ public:
bool IsVisibleLine( sal_Int32 nLine ) const;
/** Returns the height of the header line. */
- inline sal_Int32 GetHdrHeight() const { return mrData.mnHdrHeight; }
+ sal_Int32 GetHdrHeight() const { return mrData.mnHdrHeight; }
/** Returns the height of one line. */
- inline sal_Int32 GetLineHeight() const { return mrData.mnLineHeight; }
+ sal_Int32 GetLineHeight() const { return mrData.mnLineHeight; }
/** Returns output Y coordinate of the specified line. */
sal_Int32 GetY( sal_Int32 nLine ) const;
/** Returns line index from output coordinate. */
sal_Int32 GetLineFromY( sal_Int32 nY ) const;
/** Returns the ruler cursor position. */
- inline sal_Int32 GetRulerCursorPos() const { return mrData.mnPosCursor; }
+ sal_Int32 GetRulerCursorPos() const { return mrData.mnPosCursor; }
/** Returns the data grid cursor position (not column index!). */
- inline sal_Int32 GetGridCursorPos() const { return mrData.mnColCursor; }
+ sal_Int32 GetGridCursorPos() const { return mrData.mnColCursor; }
// static helpers ---------------------------------------------------------
diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index f813c79a8223..c75f8ef32272 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -145,7 +145,7 @@ private:
// columns/column types ---------------------------------------------------
public:
/** Returns the number of columns. */
- inline sal_uInt32 GetColumnCount() const { return maColStates.size(); }
+ sal_uInt32 GetColumnCount() const { return maColStates.size(); }
/** Returns the index of the first visible column. */
sal_uInt32 GetFirstVisColumn() const;
/** Returns the index of the last visible column. */
@@ -162,14 +162,14 @@ public:
sal_uInt32 GetColumnFromX( sal_Int32 nX ) const;
/** Returns start position of the column with the specified index. */
- inline sal_Int32 GetColumnPos( sal_uInt32 nColIndex ) const { return maSplits[ nColIndex ]; }
+ sal_Int32 GetColumnPos( sal_uInt32 nColIndex ) const { return maSplits[ nColIndex ]; }
/** Returns column index from position. A split counts to its following column. */
sal_uInt32 GetColumnFromPos( sal_Int32 nPos ) const;
/** Returns the character width of the column with the specified index. */
sal_Int32 GetColumnWidth( sal_uInt32 nColIndex ) const;
/** Returns the vector with the states of all columns. */
- inline const ScCsvColStateVec& GetColumnStates() const { return maColStates; }
+ const ScCsvColStateVec& GetColumnStates() const { return maColStates; }
/** Sets all column states to the values in the passed vector. */
void SetColumnStates( const ScCsvColStateVec& rColStates );
/** Returns the data type of the selected columns. */
@@ -215,7 +215,7 @@ public:
void SelectAll( bool bSelect = true );
/** Returns index of the focused column. */
- inline sal_uInt32 GetFocusColumn() const { return GetColumnFromPos( GetGridCursorPos() ); }
+ sal_uInt32 GetFocusColumn() const { return GetColumnFromPos( GetGridCursorPos() ); }
private:
/** Moves column cursor to a new position. */
@@ -268,9 +268,9 @@ public:
private:
/** Returns the width of the control. */
- inline sal_Int32 GetWidth() const { return maWinSize.Width(); }
+ sal_Int32 GetWidth() const { return maWinSize.Width(); }
/** Returns the height of the control. */
- inline sal_Int32 GetHeight() const { return maWinSize.Height(); }
+ sal_Int32 GetHeight() const { return maWinSize.Height(); }
/** Sets a clip region in the specified output device for the specified column. */
SAL_DLLPRIVATE void ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex );
diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx
index a4885f4996c4..709817c1711f 100644
--- a/sc/source/ui/inc/csvruler.hxx
+++ b/sc/source/ui/inc/csvruler.hxx
@@ -87,18 +87,18 @@ private:
// split handling ---------------------------------------------------------
public:
/** Returns the split array. */
- inline const ScCsvSplits& GetSplits() const { return maSplits; }
+ const ScCsvSplits& GetSplits() const { return maSplits; }
/** Returns the number of splits. */
- inline sal_uInt32 GetSplitCount() const
+ sal_uInt32 GetSplitCount() const
{ return maSplits.Count(); }
/** Returns the position of the specified split. */
- inline sal_Int32 GetSplitPos( sal_uInt32 nIndex ) const
+ sal_Int32 GetSplitPos( sal_uInt32 nIndex ) const
{ return maSplits[ nIndex ]; }
/** Finds a position nearest to nPos which does not cause scrolling the visible area. */
sal_Int32 GetNoScrollPos( sal_Int32 nPos ) const;
/** Returns true if at position nPos is a split. */
- inline bool HasSplit( sal_Int32 nPos ) const { return maSplits.HasSplit( nPos ); }
+ bool HasSplit( sal_Int32 nPos ) const { return maSplits.HasSplit( nPos ); }
/** Inserts a split. */
void InsertSplit( sal_Int32 nPos );
/** Removes a split. */
@@ -149,9 +149,9 @@ public:
private:
/** Returns the width of the control. */
- inline sal_Int32 GetWidth() const { return maWinSize.Width(); }
+ sal_Int32 GetWidth() const { return maWinSize.Width(); }
/** Returns the height of the control. */
- inline sal_Int32 GetHeight() const { return maWinSize.Height(); }
+ sal_Int32 GetHeight() const { return maWinSize.Height(); }
/** Draws the background and active area to maBackgrDev (only the given X range). */
SAL_DLLPRIVATE void ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth );
diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx
index 472ab2b51f85..852ed39969d5 100644
--- a/sc/source/ui/inc/csvtablebox.hxx
+++ b/sc/source/ui/inc/csvtablebox.hxx
@@ -88,10 +88,10 @@ private:
SAL_DLLPRIVATE void InitVScrollBar();
/** Calculates and sets valid position offset nearest to nPos. */
- SAL_DLLPRIVATE inline void ImplSetPosOffset( sal_Int32 nPos )
+ SAL_DLLPRIVATE void ImplSetPosOffset( sal_Int32 nPos )
{ maData.mnPosOffset = std::max( std::min( nPos, GetMaxPosOffset() ), sal_Int32( 0 ) ); }
/** Calculates and sets valid line offset nearest to nLine. */
- SAL_DLLPRIVATE inline void ImplSetLineOffset( sal_Int32 nLine )
+ SAL_DLLPRIVATE void ImplSetLineOffset( sal_Int32 nLine )
{ maData.mnLineOffset = std::max( std::min( nLine, GetMaxLineOffset() ), sal_Int32( 0 ) ); }
/** Moves controls (not cursors!) so that nPos becomes visible. */
SAL_DLLPRIVATE void MakePosVisible( sal_Int32 nPos );
@@ -108,7 +108,7 @@ public:
/** Reads UI strings for data types from the list box. */
void InitTypes( const ListBox& rListBox );
/** Returns the data type of the selected columns. */
- inline sal_Int32 GetSelColumnType() const { return maGrid->GetSelColumnType(); }
+ sal_Int32 GetSelColumnType() const { return maGrid->GetSelColumnType(); }
/** Fills the options object with current column data. */
void FillColumnData( ScAsciiOptions& rOptions ) const;
@@ -116,9 +116,9 @@ public:
// event handling ---------------------------------------------------------
public:
/** Sets a new handler for "update cell texts" requests. */
- inline void SetUpdateTextHdl( const Link& rHdl ) { maUpdateTextHdl = rHdl; }
+ void SetUpdateTextHdl( const Link& rHdl ) { maUpdateTextHdl = rHdl; }
/** Sets a new handler for "column selection changed" events. */
- inline void SetColTypeHdl( const Link& rHdl ) { maColTypeHdl = rHdl; }
+ void SetColTypeHdl( const Link& rHdl ) { maColTypeHdl = rHdl; }
protected:
virtual void Resize() override;
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 7111ddf9daf5..ea0813e6c978 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -126,13 +126,13 @@ public:
/** Locks/unlocks the background layer that contains background objects.
Unlocked layer is required to be able to edit the objects. */
- inline void LockBackgroundLayer( bool bLock ) { LockCalcLayer( SC_LAYER_BACK, bLock ); }
+ void LockBackgroundLayer( bool bLock ) { LockCalcLayer( SC_LAYER_BACK, bLock ); }
/** Locks/unlocks the internal layer that contains caption objects of cell notes.
Unlocked layer is required to be able to edit the contained objects. */
- inline void LockInternalLayer( bool bLock = true ) { LockCalcLayer( SC_LAYER_INTERN, bLock ); }
+ void LockInternalLayer( bool bLock = true ) { LockCalcLayer( SC_LAYER_INTERN, bLock ); }
/** Unlocks the internal layer that contains caption objects of cell notes. */
- inline void UnlockInternalLayer() { LockInternalLayer( false ); }
+ void UnlockInternalLayer() { LockInternalLayer( false ); }
SdrEndTextEditKind ScEndTextEdit(); // calls SetDrawTextUndo(0)
css::uno::Reference< css::datatransfer::XTransferable > CopyToTransferable();
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 74fce921d8f9..3007d29ec0bc 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -69,7 +69,7 @@ private:
OUString maComment;
bool mbProtected;
- inline explicit ScenarioEntry() : mbProtected( false ) {}
+ explicit ScenarioEntry() : mbProtected( false ) {}
};
typedef ::std::vector< ScenarioEntry > ScenarioList;
diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx
index f0236c21df09..268bb7f64858 100644
--- a/sc/source/ui/inc/navsett.hxx
+++ b/sc/source/ui/inc/navsett.hxx
@@ -38,14 +38,14 @@ private:
public:
ScNavigatorSettings();
- inline void SetExpanded( ScContentId nIndex, bool bExpand ) { maExpandedVec[ nIndex ] = bExpand; }
- inline bool IsExpanded( ScContentId nIndex ) const { return maExpandedVec[ nIndex ]; }
+ void SetExpanded( ScContentId nIndex, bool bExpand ) { maExpandedVec[ nIndex ] = bExpand; }
+ bool IsExpanded( ScContentId nIndex ) const { return maExpandedVec[ nIndex ]; }
- inline void SetRootSelected( ScContentId nIndex ) { mnRootSelected = nIndex; }
- inline ScContentId GetRootSelected() const { return mnRootSelected; }
+ void SetRootSelected( ScContentId nIndex ) { mnRootSelected = nIndex; }
+ ScContentId GetRootSelected() const { return mnRootSelected; }
- inline void SetChildSelected( sal_uLong nIndex ) { mnChildSelected = nIndex; }
- inline sal_uLong GetChildSelected() const { return mnChildSelected; }
+ void SetChildSelected( sal_uLong nIndex ) { mnChildSelected = nIndex; }
+ sal_uLong GetChildSelected() const { return mnChildSelected; }
};
#endif // INCLUDED_SC_SOURCE_UI_INC_NAVSETT_HXX
diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx
index 7d120b9b97fb..cd9f49183e1a 100644
--- a/sc/source/ui/inc/olinewin.hxx
+++ b/sc/source/ui/inc/olinewin.hxx
@@ -78,9 +78,9 @@ private:
void InitSettings();
/** Returns the calc document. */
- inline ScDocument& GetDoc() const { return *mrViewData.GetDocument(); }
+ ScDocument& GetDoc() const { return *mrViewData.GetDocument(); }
/** Returns the current sheet index. */
- inline SCTAB GetTab() const { return mrViewData.GetTabNo(); }
+ SCTAB GetTab() const { return mrViewData.GetTabNo(); }
/** Returns the outline array of the corresponding document. */
const ScOutlineArray* GetOutlineArray() const;
/** Returns the specified outline entry. */
@@ -178,7 +178,7 @@ private:
/** Starts mouse tracking after click on a button. */
void StartMouseTracking( size_t nLevel, size_t nEntry );
/** Returns whether mouse tracking mode is active. */
- inline bool IsMouseTracking() const { return mbMTActive; }
+ bool IsMouseTracking() const { return mbMTActive; }
/** Ends mouse tracking. */
void EndMouseTracking();
diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx
index 8791751697aa..cc69e10fbfce 100644
--- a/sc/source/ui/inc/selectionstate.hxx
+++ b/sc/source/ui/inc/selectionstate.hxx
@@ -40,12 +40,12 @@ public:
explicit ScSelectionState( ScViewData& rViewData );
/** Returns the type of the selection this object contains. */
- inline ScSelectionType GetSelectionType() const { return meType; }
+ ScSelectionType GetSelectionType() const { return meType; }
/** Returns the position of the cell cursor. */
- inline const ScAddress& GetCellCursor() const { return maCursor; }
+ const ScAddress& GetCellCursor() const { return maCursor; }
/** Returns the edit engine selection. */
- inline const ESelection& GetEditSelection() const { return maEditSel; }
+ const ESelection& GetEditSelection() const { return maEditSel; }
private:
ScSelectionType meType; /// Type of the selection.
diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx
index 20f96d721c94..ea1eaec98128 100644
--- a/sc/source/ui/inc/spelleng.hxx
+++ b/sc/source/ui/inc/spelleng.hxx
@@ -42,9 +42,9 @@ public:
virtual void ConvertAll( EditView& rEditView ) = 0;
/** Returns true, if at least one cell has been modified. */
- inline bool IsAnyModified() const { return mbIsAnyModified; }
+ bool IsAnyModified() const { return mbIsAnyModified; }
/** Returns true, if the entire document/selection has been finished. */
- inline bool IsFinished() const { return mbFinished; }
+ bool IsFinished() const { return mbFinished; }
protected:
/** Implementation of cell iteration. Finds a cell that needs conversion.
diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx
index 061c0c2517a0..af1537a33b9d 100644
--- a/sc/source/ui/inc/spellparam.hxx
+++ b/sc/source/ui/inc/spellparam.hxx
@@ -52,12 +52,12 @@ public:
sal_Int32 nOptions,
bool bIsInteractive );
- inline ScConversionType GetType() const { return meConvType; }
- inline LanguageType GetSourceLang() const { return meSourceLang; }
- inline LanguageType GetTargetLang() const { return meTargetLang; }
- inline const vcl::Font* GetTargetFont() const { return mbUseTargetFont ? &maTargetFont : nullptr; }
- inline sal_Int32 GetOptions() const { return mnOptions; }
- inline bool IsInteractive() const { return mbIsInteractive; }
+ ScConversionType GetType() const { return meConvType; }
+ LanguageType GetSourceLang() const { return meSourceLang; }
+ LanguageType GetTargetLang() const { return meTargetLang; }
+ const vcl::Font* GetTargetFont() const { return mbUseTargetFont ? &maTargetFont : nullptr; }
+ sal_Int32 GetOptions() const { return mnOptions; }
+ bool IsInteractive() const { return mbIsInteractive; }
private:
ScConversionType meConvType; /// Type of the conversion.
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx
index ab8c102ced38..86343729b4a8 100644
--- a/sc/source/ui/vba/vbasheetobjects.cxx
+++ b/sc/source/ui/vba/vbasheetobjects.cxx
@@ -83,11 +83,11 @@ public:
const uno::Type& rVbaType );
/** Returns the VBA helper interface of the VBA collection object. */
- inline const uno::Reference< XHelperInterface >& getParent() const { return mxParent; }
+ const uno::Reference< XHelperInterface >& getParent() const { return mxParent; }
/** Returns the component context of the VBA collection object. */
- inline const uno::Reference< uno::XComponentContext >& getContext() const { return mxContext; }
+ const uno::Reference< uno::XComponentContext >& getContext() const { return mxContext; }
/** Returns the VBA type information of the objects in this container. */
- inline const uno::Type& getVbaType() const { return maVbaType; }
+ const uno::Type& getVbaType() const { return maVbaType; }
/** Collects all shapes supported by this instance and inserts them into
the internal shape vector.
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 80679d867edc..6e488404ab21 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -289,11 +289,11 @@ public:
SortedIndividualInt32List();
~SortedIndividualInt32List();
- inline sal_uInt32 Count() const
+ sal_uInt32 Count() const
{ return maVector.size(); }
/// @return element on position nIndex or 0 on invalid index
- inline sal_Int32 Get( sal_uInt32 n ) const
+ sal_Int32 Get( sal_uInt32 n ) const
{ return maVector[n]; }
/// @return true if nVal (internal date representation) is contained
@@ -317,11 +317,11 @@ class ScaDoubleList
private:
std::vector maVector;
protected:
- inline void ListAppend( double fValue ) { maVector.push_back(fValue); }
+ void ListAppend( double fValue ) { maVector.push_back(fValue); }
/// @throws css::uno::RuntimeException
/// @throws css::lang::IllegalArgumentException
- inline void Append( double fValue )
+ void Append( double fValue )
{ if( CheckInsert( fValue ) ) ListAppend( fValue ); }
/** @param rAnyConv must be an initialized ScaAnyConmverter
@@ -357,9 +357,9 @@ protected:
public:
virtual ~ScaDoubleList() {}
- inline sal_uInt32 Count() const
+ sal_uInt32 Count() const
{ return maVector.size(); }
- inline double Get( sal_uInt32 n ) const
+ double Get( sal_uInt32 n ) const
{ return maVector[n]; }
/// @throws css::uno::RuntimeException
@@ -501,9 +501,9 @@ public:
inline const Complex* Get( sal_uInt32 nIndex ) const;
- inline bool empty() const
+ bool empty() const
{ return maVector.empty(); }
- inline sal_uInt32 Count() const
+ sal_uInt32 Count() const
{ return maVector.size(); }
inline void Append( Complex* pNew );
@@ -803,9 +803,9 @@ public:
ScaDate& operator=( const ScaDate& rCopy );
/// @return the current month.
- inline sal_uInt16 getMonth() const { return nMonth; };
+ sal_uInt16 getMonth() const { return nMonth; };
/// @return the current year.
- inline sal_uInt16 getYear() const { return nYear; };
+ sal_uInt16 getYear() const { return nYear; };
/// adds/subtracts the given count of months, adjusts day
///
@@ -827,9 +827,9 @@ public:
static sal_Int32 getDiff( const ScaDate& rFrom, const ScaDate& rTo );
bool operator<( const ScaDate& rCmp ) const;
- inline bool operator<=( const ScaDate& rCmp ) const { return !(rCmp < *this); }
- inline bool operator>( const ScaDate& rCmp ) const { return rCmp < *this; }
- inline bool operator>=( const ScaDate& rCmp ) const { return !(*this < rCmp); }
+ bool operator<=( const ScaDate& rCmp ) const { return !(rCmp < *this); }
+ bool operator>( const ScaDate& rCmp ) const { return rCmp < *this; }
+ bool operator>=( const ScaDate& rCmp ) const { return !(*this < rCmp); }
};
inline sal_uInt16 ScaDate::getDaysInMonth() const
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index d2b460851e24..e06c292f9780 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -81,16 +81,16 @@ public:
ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rRscMgr );
~ScaFuncData();
- inline sal_uInt16 GetUINameID() const { return nUINameID; }
- inline sal_uInt16 GetDescrID() const { return nDescrID; }
- inline ScaCategory GetCategory() const { return eCat; }
- inline bool IsDouble() const { return bDouble; }
+ sal_uInt16 GetUINameID() const { return nUINameID; }
+ sal_uInt16 GetDescrID() const { return nDescrID; }
+ ScaCategory GetCategory() const { return eCat; }
+ bool IsDouble() const { return bDouble; }
sal_uInt16 GetStrIndex( sal_uInt16 nParam ) const;
- inline bool Is( const OUString& rCompare ) const
+ bool Is( const OUString& rCompare ) const
{ return aIntName == rCompare; }
- inline const std::vector& GetCompNameList() const { return aCompList; }
+ const std::vector& GetCompNameList() const { return aCompList; }
};
typedef std::vector ScaFuncDataList;
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 55e7855007ea..abeb6ab0286a 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -91,16 +91,16 @@ public:
ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rRscMgr );
~ScaFuncData();
- inline sal_uInt16 GetUINameID() const { return nUINameID; }
- inline sal_uInt16 GetDescrID() const { return nDescrID; }
- inline ScaCategory GetCategory() const { return eCat; }
- inline bool IsDouble() const { return bDouble; }
+ sal_uInt16 GetUINameID() const { return nUINameID; }
+ sal_uInt16 GetDescrID() const { return nDescrID; }
+ ScaCategory GetCategory() const { return eCat; }
+ bool IsDouble() const { return bDouble; }
sal_uInt16 GetStrIndex( sal_uInt16 nParam ) const;
- inline bool Is( const OUString& rCompare ) const
+ bool Is( const OUString& rCompare ) const
{ return aIntName == rCompare; }
- inline const std::vector& GetCompNameList() const { return aCompList; }
+ const std::vector& GetCompNameList() const { return aCompList; }
};
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 8925ff2073c7..ad9becab80bc 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -180,7 +180,7 @@ public:
sal_uInt32 GetId( FontCollectionEntry& rFontDescriptor );
- inline sal_uInt32 GetCount() const { return maFonts.size(); };
+ sal_uInt32 GetCount() const { return maFonts.size(); };
const FontCollectionEntry* GetById( sal_uInt32 nId );
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index f6f84c0fea22..20c8798fafc6 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -118,9 +118,9 @@ public:
void UpdateSelectionClipboard( bool bForceDeselect );
- inline DrawDocShell* GetDocSh() const { return mpDocSh; }
+ DrawDocShell* GetDocSh() const { return mpDocSh; }
inline SdDrawDocument& GetDoc() const;
- inline ViewShell* GetViewShell() const { return mpViewSh; }
+ ViewShell* GetViewShell() const { return mpViewSh; }
SfxViewShell* GetSfxViewShell() const override;
virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = nullptr, vcl::Window* pWin = nullptr, bool bIsNewObj = false,
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index fa1a6962cece..68df8b54640d 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -140,11 +140,11 @@ public:
/** Return the window that is the parent of all controls of this view
shell. This may or may not be the window of the frame.
*/
- inline vcl::Window* GetParentWindow() const { return mpParentWindow; }
+ vcl::Window* GetParentWindow() const { return mpParentWindow; }
sd::Window* GetContentWindow() const;
- inline ::sd::View* GetView() const { return mpView; }
+ ::sd::View* GetView() const { return mpView; }
inline SdrView* GetDrawView() const;
SD_DLLPUBLIC DrawDocShell* GetDocSh() const;
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 810e0709b288..1aa927160b20 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -266,7 +266,7 @@ private:
void displaySlideNumber( sal_Int32 nSlide );
void displaySlideIndex( sal_Int32 nIndex );
sal_Int32 getCurrentSlideNumber();
- inline bool isInputFreezed() const { return mbInputFreeze; }
+ bool isInputFreezed() const { return mbInputFreeze; }
void jumpToBookmark( const OUString& sBookmark );
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 5e20423e1bd9..c1f7efcdad24 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -166,7 +166,7 @@ public:
void ShowViewTabBar (bool bShow);
void SetUserWantsTabBar(bool inValue);
- inline bool GetUserWantsTabBar() { return mbUserWantsTabBar; }
+ bool GetUserWantsTabBar() { return mbUserWantsTabBar; }
/** Common code of ViewShellBase::OuterResizePixel() and
ViewShellBase::InnerResizePixel().
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& rLink ) { SetDoubleClickHdl( rLink ); }
+ void SetOpenHdl( const Link