diff options
25 files changed, 42 insertions, 43 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 8860344c97c3..6dafb7396fd4 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -330,7 +330,7 @@ class type_info_ public: virtual ~type_info_() throw (); - inline type_info_( void * m_data, const char * m_d_name ) throw () + type_info_( void * m_data, const char * m_d_name ) throw () : _m_data( m_data ) { ::strcpy( _m_d_name, m_d_name ); } // #100211# - checked @@ -352,7 +352,7 @@ private: public: - inline type_info_descriptor(void * m_data, const char * m_d_name) throw () + type_info_descriptor(void * m_data, const char * m_d_name) throw () : info(m_data, m_d_name) { type_info_size = sizeof(type_info_) + strlen(m_d_name); @@ -497,7 +497,7 @@ struct ExceptionType type_info_ type_info; - inline ExceptionType( + ExceptionType( unsigned char * pCode, sal_uInt64 pCodeBase, typelib_TypeDescription * pTD ) throw () diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index db4f151123dd..2e755ee4d61f 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -225,7 +225,7 @@ namespace dxcanvas ::basegfx::B2IVector maPageSize; D3DPRESENT_PARAMETERS mad3dpp; - inline bool isDisposed() const { return (mhWnd==nullptr); } + bool isDisposed() const { return (mhWnd==nullptr); } struct dxvertex { diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index 8f6b1d1bfdd6..b8e13c96cd3d 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -51,7 +51,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 0ac1470fa1aa..23fb72f53e82 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -38,7 +38,7 @@ namespace connectivity ::connectivity::OTypeInfo aSimpleType; // the general type info DataTypeEnum eType; - inline OUString getDBName() const { return aSimpleType.aTypeName; } + OUString getDBName() const { return aSimpleType.aTypeName; } }; class WpADOConnection; diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index 904d7661c7d1..a69ed9a8b2d3 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -75,7 +75,7 @@ namespace connectivity ~ODatabaseMetaDataResultSetMetaData() override; /// Avoid ambiguous cast error from the compiler. - inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() + operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } virtual sal_Int32 SAL_CALL getColumnCount( ) override; diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index fab79415258b..52043a875902 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -127,7 +127,7 @@ namespace connectivity // late constructor void construct(); - inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} + void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} virtual OUString SAL_CALL getImplementationName( ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index 483811b6ecdb..71b897e9fe9d 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -130,19 +130,19 @@ namespace connectivity // They only call the superclass WpOLECollection(Ts* pInt=nullptr):WpOLEBase<Ts>(pInt){} WpOLECollection(const WpOLECollection& rhs) : WpOLEBase<Ts>(rhs) {} - inline WpOLECollection& operator=(const WpOLECollection& rhs) + WpOLECollection& operator=(const WpOLECollection& rhs) {WpOLEBase<Ts>::operator=(rhs); return *this;}; - inline void Refresh(){pInterface->Refresh();} + void Refresh(){pInterface->Refresh();} - inline sal_Int32 GetItemCount() const + sal_Int32 GetItemCount() const { sal_Int32 nCount = 0; return pInterface ? (SUCCEEDED(pInterface->get_Count(&nCount)) ? nCount : sal_Int32(0)) : sal_Int32(0); } - inline WrapT GetItem(sal_Int32 index) const + WrapT GetItem(sal_Int32 index) const { OSL_ENSURE(index >= 0 && index<GetItemCount(),"Wrong index for field!"); T* pT = NULL; @@ -152,7 +152,7 @@ namespace connectivity return aRet; } - inline WrapT GetItem(const OLEVariant& index) const + WrapT GetItem(const OLEVariant& index) const { T* pT = NULL; WrapT aRet(NULL); @@ -161,7 +161,7 @@ namespace connectivity return aRet; } - inline WrapT GetItem(const OUString& sStr) const + WrapT GetItem(const OUString& sStr) const { WrapT aRet(NULL); T* pT = NULL; @@ -177,7 +177,7 @@ namespace connectivity aRet.setWithOutAddRef(pT); return aRet; } - inline void fillElementNames(TStringVector& _rVector) + void fillElementNames(TStringVector& _rVector) { if(IsValid()) { @@ -204,16 +204,16 @@ namespace connectivity using WpOLEBase<Ts>::pInterface; WpOLEAppendCollection(Ts* pInt=nullptr):WpOLECollection<Ts,T,WrapT>(pInt){} WpOLEAppendCollection(const WpOLEAppendCollection& rhs) : WpOLECollection<Ts, T, WrapT>(rhs) {} - inline WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs) + WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs) {WpOLEBase<Ts>::operator=(rhs); return *this;}; - inline bool Append(const WrapT& aWrapT) + bool Append(const WrapT& aWrapT) { return SUCCEEDED(pInterface->Append(OLEVariant(static_cast<T*>(aWrapT)))); }; - inline bool Delete(const OUString& sName) + bool Delete(const OUString& sName) { return SUCCEEDED(pInterface->Delete(OLEVariant(sName))); }; diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx index 9e233ae1f834..31e73a80fdc2 100644 --- a/connectivity/source/inc/ado/Awrapadox.hxx +++ b/connectivity/source/inc/ado/Awrapadox.hxx @@ -79,7 +79,7 @@ namespace connectivity WpADOView(ADOView* pInt=nullptr) : WpOLEBase<ADOView>(pInt){} WpADOView(const WpADOView& rhs) : WpOLEBase<ADOView>(rhs) {} - inline WpADOView& operator=(const WpADOView& rhs) + WpADOView& operator=(const WpADOView& rhs) {WpOLEBase<ADOView>::operator=(rhs); return *this;} OUString get_Name() const; @@ -93,7 +93,7 @@ namespace connectivity WpADOGroup(ADOGroup* pInt=nullptr) : WpOLEBase<ADOGroup>(pInt){} WpADOGroup(const WpADOGroup& rhs) : WpOLEBase<ADOGroup>(rhs) {} - inline WpADOGroup& operator=(const WpADOGroup& rhs) + WpADOGroup& operator=(const WpADOGroup& rhs) {WpOLEBase<ADOGroup>::operator=(rhs); return *this;} void Create(); @@ -117,7 +117,7 @@ namespace connectivity WpADOUser(_ADOUser* pInt=nullptr) : WpOLEBase<_ADOUser>(pInt){} WpADOUser(const WpADOUser& rhs) : WpOLEBase<_ADOUser>(rhs) {} - inline WpADOUser& operator=(const WpADOUser& rhs) + WpADOUser& operator=(const WpADOUser& rhs) {WpOLEBase<_ADOUser>::operator=(rhs); return *this;} void Create(); diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx index ae67f5dbbd67..2e90ac93d89d 100644 --- a/connectivity/source/inc/ado/WrapCatalog.hxx +++ b/connectivity/source/inc/ado/WrapCatalog.hxx @@ -31,7 +31,7 @@ namespace connectivity WpADOCatalog(_ADOCatalog* pInt = nullptr) : WpOLEBase<_ADOCatalog>(pInt){} WpADOCatalog(const WpADOCatalog& rhs) : WpOLEBase<_ADOCatalog>(rhs) {} - inline WpADOCatalog& operator=(const WpADOCatalog& rhs) + WpADOCatalog& operator=(const WpADOCatalog& rhs) {WpOLEBase<_ADOCatalog>::operator=(rhs); return *this;} OUString GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eNum); diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx index c6d47aa98151..64093d71d26f 100644 --- a/connectivity/source/inc/ado/WrapColumn.hxx +++ b/connectivity/source/inc/ado/WrapColumn.hxx @@ -37,7 +37,7 @@ namespace connectivity void Create(); - inline WpADOColumn& operator=(const WpADOColumn& rhs) + WpADOColumn& operator=(const WpADOColumn& rhs) {WpOLEBase<_ADOColumn>::operator=(rhs); return *this;} OUString get_Name() const; diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx index bfffdfded043..23fd7b476c5b 100644 --- a/connectivity/source/inc/ado/WrapIndex.hxx +++ b/connectivity/source/inc/ado/WrapIndex.hxx @@ -31,7 +31,7 @@ namespace connectivity WpADOIndex(_ADOIndex* pInt=nullptr) : WpOLEBase<_ADOIndex>(pInt){} WpADOIndex(const WpADOIndex& rhs) : WpOLEBase<_ADOIndex>(rhs) {} - inline WpADOIndex& operator=(const WpADOIndex& rhs) + WpADOIndex& operator=(const WpADOIndex& rhs) {WpOLEBase<_ADOIndex>::operator=(rhs); return *this;} void Create(); diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx index b8ab562a2ac1..774b5c43a5ea 100644 --- a/connectivity/source/inc/ado/WrapKey.hxx +++ b/connectivity/source/inc/ado/WrapKey.hxx @@ -31,7 +31,7 @@ namespace connectivity WpADOKey(ADOKey* pInt=nullptr) : WpOLEBase<ADOKey>(pInt){} WpADOKey(const WpADOKey& rhs) : WpOLEBase<ADOKey>(rhs) {} - inline WpADOKey& operator=(const WpADOKey& rhs) + WpADOKey& operator=(const WpADOKey& rhs) {WpOLEBase<ADOKey>::operator=(rhs); return *this;} void Create(); diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx index e99eb33be714..b8e1a9ab8711 100644 --- a/connectivity/source/inc/ado/WrapTable.hxx +++ b/connectivity/source/inc/ado/WrapTable.hxx @@ -33,7 +33,7 @@ namespace connectivity WpADOTable(_ADOTable* pInt=nullptr) : WpOLEBase<_ADOTable>(pInt){} WpADOTable(const WpADOTable& rhs) : WpOLEBase<_ADOTable>(rhs) {} - inline WpADOTable& operator=(const WpADOTable& rhs) + WpADOTable& operator=(const WpADOTable& rhs) {WpOLEBase<_ADOTable>::operator=(rhs); return *this;} void Create(); diff --git a/shell/inc/contentreader.hxx b/shell/inc/contentreader.hxx index d51ad7fbc4c7..d73f4d093741 100644 --- a/shell/inc/contentreader.hxx +++ b/shell/inc/contentreader.hxx @@ -41,7 +41,7 @@ public: @return the chunkbuffer of the document. */ - inline ChunkBuffer_t const & getChunkBuffer( ) const{ return m_ChunkBuffer; }; + ChunkBuffer_t const & getChunkBuffer( ) const{ return m_ChunkBuffer; }; protected: // protected because its only an implementation relevant class @@ -92,7 +92,7 @@ protected: @return the Style-Locale map */ - inline StyleLocaleMap_t const & getStyleMap( ) const{ return m_StyleMap; }; + StyleLocaleMap_t const & getStyleMap( ) const{ return m_StyleMap; }; /** get style of the current content. diff --git a/shell/source/win32/ooofilereader/autostyletag.hxx b/shell/source/win32/ooofilereader/autostyletag.hxx index b988ac3f9e0f..b1a5cfb546f1 100644 --- a/shell/source/win32/ooofilereader/autostyletag.hxx +++ b/shell/source/win32/ooofilereader/autostyletag.hxx @@ -50,8 +50,8 @@ class CAutoStyleTag : public ITag void setStyle( ::std::wstring const & Style ); void setLocale(const LocaleSet_t& Locale); void clearStyleLocalePair(); - inline StyleLocalePair_t getStyleLocalePair() const{ return m_CurrentStyleLocalePair; } - inline bool isFull() const + StyleLocalePair_t getStyleLocalePair() const{ return m_CurrentStyleLocalePair; } + bool isFull() const { return (( m_CurrentStyleLocalePair.first != EMPTY_STRING )&& ( m_CurrentStyleLocalePair.second != EMPTY_LOCALE)); diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx index eb1004ca142c..19b5e0f9d9f8 100644 --- a/vcl/inc/win/winlayout.hxx +++ b/vcl/inc/win/winlayout.hxx @@ -217,7 +217,7 @@ public: SalGraphics &rGraphics, HDC hDC) override; - inline bool BindDC(HDC hDC, tools::Rectangle const & rRect = tools::Rectangle(0, 0, 0, 0)) { + bool BindDC(HDC hDC, tools::Rectangle const & rRect = tools::Rectangle(0, 0, 0, 0)) { RECT const rc = { rRect.Left(), rRect.Top(), rRect.Right(), rRect.Bottom() }; return SUCCEEDED(mpRT->BindDC(hDC, &rc)); } @@ -230,12 +230,12 @@ public: IDWriteFontFace * GetFontFace() const { return mpFontFace; } float GetEmHeight() const { return mlfEmHeight; } - inline HRESULT CreateRenderTarget() { + HRESULT CreateRenderTarget() { if (mpRT) mpRT->Release(); mpRT = nullptr; return mpD2DFactory->CreateDCRenderTarget(&mRTProps, &mpRT); } - inline bool Ready() const { return mpGdiInterop && mpRT; } + bool Ready() const { return mpGdiInterop && mpRT; } private: static void CleanupModules(); diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index aa3eac7c56a5..544e6b6c2a3a 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -1585,13 +1585,13 @@ ScopedFont::~ScopedFont() class ScopedTrueTypeFont { public: - inline ScopedTrueTypeFont(): m_pFont(nullptr) {} + ScopedTrueTypeFont(): m_pFont(nullptr) {} ~ScopedTrueTypeFont(); int open(void const * pBuffer, sal_uInt32 nLen, sal_uInt32 nFaceNum); - inline TrueTypeFont * get() const { return m_pFont; } + TrueTypeFont * get() const { return m_pFont; } private: TrueTypeFont * m_pFont; diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h b/winaccessibility/source/UAccCOM/AccActionBase.h index 204edf58bce5..657d002c5f0b 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.h +++ b/winaccessibility/source/UAccCOM/AccActionBase.h @@ -73,7 +73,7 @@ protected: css::uno::Reference<css::accessibility::XAccessibleAction> pRXAct; private: - inline css::accessibility::XAccessibleAction* GetXInterface() + css::accessibility::XAccessibleAction* GetXInterface() { return pRXAct.get(); } diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.h b/winaccessibility/source/UAccCOM/AccComponentBase.h index bfc368ab8998..7bc0c3bb8dd0 100644 --- a/winaccessibility/source/UAccCOM/AccComponentBase.h +++ b/winaccessibility/source/UAccCOM/AccComponentBase.h @@ -59,7 +59,7 @@ protected: css::uno::Reference<css::accessibility::XAccessibleComponent> pRXComp; - inline css::accessibility::XAccessibleComponent* GetXInterface() + css::accessibility::XAccessibleComponent* GetXInterface() { return pRXComp.get(); } diff --git a/winaccessibility/source/UAccCOM/AccEditableText.h b/winaccessibility/source/UAccCOM/AccEditableText.h index cea68337a737..c0e002ced15a 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.h +++ b/winaccessibility/source/UAccCOM/AccEditableText.h @@ -106,7 +106,7 @@ private: static void get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, css::uno::Any &rAny); - inline css::accessibility::XAccessibleEditableText* GetXInterface() + css::accessibility::XAccessibleEditableText* GetXInterface() { return pRXEdtTxt.get(); } diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.h b/winaccessibility/source/UAccCOM/AccHyperLink.h index c47ed4de6f89..1af6adabbbd2 100644 --- a/winaccessibility/source/UAccCOM/AccHyperLink.h +++ b/winaccessibility/source/UAccCOM/AccHyperLink.h @@ -127,7 +127,7 @@ private: css::uno::Reference<css::accessibility::XAccessibleHyperlink> pRXLink; - inline css::accessibility::XAccessibleHyperlink* GetXInterface() + css::accessibility::XAccessibleHyperlink* GetXInterface() { return pRXLink.get(); } diff --git a/winaccessibility/source/UAccCOM/AccImage.h b/winaccessibility/source/UAccCOM/AccImage.h index 03a8e3f96db9..3d7d86306c1c 100644 --- a/winaccessibility/source/UAccCOM/AccImage.h +++ b/winaccessibility/source/UAccCOM/AccImage.h @@ -91,7 +91,7 @@ private: css::uno::Reference<css::accessibility::XAccessibleImage> pRXImg; - inline css::accessibility::XAccessibleImage* GetXInterface() + css::accessibility::XAccessibleImage* GetXInterface() { return pRXImg.get(); } diff --git a/winaccessibility/source/UAccCOM/AccTable.h b/winaccessibility/source/UAccCOM/AccTable.h index 83cd1b6d1fd6..6bc8b64d9569 100644 --- a/winaccessibility/source/UAccCOM/AccTable.h +++ b/winaccessibility/source/UAccCOM/AccTable.h @@ -170,7 +170,7 @@ private: css::uno::Reference<css::accessibility::XAccessibleTable> pRXTable; - inline css::accessibility::XAccessibleTable* GetXInterface() + css::accessibility::XAccessibleTable* GetXInterface() { return pRXTable.get(); } diff --git a/winaccessibility/source/UAccCOM/AccTextBase.h b/winaccessibility/source/UAccCOM/AccTextBase.h index 915a0c71596b..fc0c0a7be772 100644 --- a/winaccessibility/source/UAccCOM/AccTextBase.h +++ b/winaccessibility/source/UAccCOM/AccTextBase.h @@ -103,7 +103,7 @@ private: css::uno::Reference<css::accessibility::XAccessibleText> pRXText; - inline css::accessibility::XAccessibleText* GetXInterface() + css::accessibility::XAccessibleText* GetXInterface() { return pRXText.get(); } diff --git a/winaccessibility/source/UAccCOM/AccValue.h b/winaccessibility/source/UAccCOM/AccValue.h index 930e70f18a72..b5a2ef6bba71 100644 --- a/winaccessibility/source/UAccCOM/AccValue.h +++ b/winaccessibility/source/UAccCOM/AccValue.h @@ -93,7 +93,7 @@ private: css::uno::Reference<css::accessibility::XAccessibleValue> pRXVal; - inline css::accessibility::XAccessibleValue* GetXInterface() + css::accessibility::XAccessibleValue* GetXInterface() { return pRXVal.get(); } |