connectivity/source/drivers/evoab2/NCatalog.hxx | 2
connectivity/source/drivers/evoab2/NConnection.hxx | 6 -
connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 2
connectivity/source/drivers/evoab2/NResultSetMetaData.hxx | 6 -
connectivity/source/drivers/evoab2/NServices.cxx | 1
include/LibreOfficeKit/LibreOfficeKit.hxx | 84 +++++++-------
mysqlc/source/mysqlc_connection.hxx | 4
mysqlc/source/mysqlc_databasemetadata.hxx | 2
mysqlc/source/mysqlc_resultsetmetadata.hxx | 2
mysqlc/source/mysqlc_services.cxx | 2
vcl/inc/unx/gendata.hxx | 2
vcl/inc/unx/gendisp.hxx | 2
vcl/inc/unx/gtk/gtkgdi.hxx | 6 -
vcl/inc/unx/saldata.hxx | 2
vcl/inc/unx/saldisp.hxx | 22 +--
vcl/inc/unx/salgdi.h | 6 -
vcl/unx/generic/app/saldata.cxx | 6 -
17 files changed, 78 insertions(+), 79 deletions(-)
New commits:
commit f6262b3dcb4126ea03802e66ddf5bfa8833e6328
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 7 08:12:52 2017 +0100
Remove redundant 'inline' keyword, Linux redux
Change-Id: I10c7dbd6a7acce309b056a1ae57c39f00f22c46d
diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx
b/connectivity/source/drivers/evoab2/NCatalog.hxx
index 617a0cf..1ed64f5 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
@@ -32,7 +32,7 @@ namespace connectivity
OEvoabConnection *m_pConnection;
public:
explicit OEvoabCatalog(OEvoabConnection *_pCon);
- inline OEvoabConnection* getConnection() const { return
m_pConnection; }
+ OEvoabConnection* getConnection() const { return m_pConnection; }
virtual void refreshTables() override;
virtual void refreshViews() override {}
virtual void refreshGroups() override {}
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx
b/connectivity/source/drivers/evoab2/NConnection.hxx
index 903d725..4316906 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -68,10 +68,10 @@ namespace connectivity
/// @throws css::sdbc::SQLException
virtual void construct(const OUString& _rUrl,const
css::uno::Sequence< css::beans::PropertyValue >& _rInfo );
- inline OString const & getPassword() { return m_aPassword; }
- inline void setPassword( OString const & aStr ) {
m_aPassword = aStr; }
+ OString const & getPassword() { return m_aPassword; }
+ void setPassword( OString const & aStr ) { m_aPassword =
aStr; }
// own methods
- inline const OEvoabDriver& getDriver() const { return m_rDriver; }
+ const OEvoabDriver& getDriver() const { return m_rDriver; }
SDBCAddress::sdbc_address_type getSDBCAddressType() const { return
m_eSDBCAddressType;}
void setSDBCAddressType(SDBCAddress::sdbc_address_type
_eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;}
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 39a9b2a..fdefba7 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -85,7 +85,7 @@ namespace connectivity
virtual ~OEvoabDatabaseMetaData() override;
public:
- inline OEvoabConnection* getOwnConnection() const { return
m_pConnection; }
+ OEvoabConnection* getOwnConnection() const { return m_pConnection;
}
explicit OEvoabDatabaseMetaData(OEvoabConnection* _pCon);
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index b2722e0..9f5d52c 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -45,12 +45,12 @@ namespace connectivity
explicit OEvoabResultSetMetaData(const OUString& _aTableName);
/// @throws css::sdbc::SQLException
void setEvoabFields(const
::rtl::Reference<connectivity::OSQLColumns> &xColumns);
- inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
+ sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
{ return m_aEvoabFields[columnIndex - 1]; }
- inline sal_Int32 getFieldSize() const
+ sal_Int32 getFieldSize() const
{return m_aEvoabFields.size();}
/// Avoid ambigous 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/drivers/evoab2/NServices.cxx
b/connectivity/source/drivers/evoab2/NServices.cxx
index eacc2d6..8599b69 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -52,7 +52,6 @@ struct ProviderRequest
{
}
- inline
bool CREATE_PROVIDER(
const OUString& Implname,
const Sequence< OUString > & Services,
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 49e2bf7..d68a425 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -32,11 +32,11 @@ private:
public:
/// A lok::Document is typically created by the
lok::Office::documentLoad() method.
- inline Document(LibreOfficeKitDocument* pDoc) :
+ Document(LibreOfficeKitDocument* pDoc) :
mpDoc(pDoc)
{}
- inline ~Document()
+ ~Document()
{
mpDoc->pClass->destroy(mpDoc);
}
@@ -54,13 +54,13 @@ public:
* is triggered as with the "Save As..." in the UI.
* "TakeOwnership" mode must not be used when saving to PNG or PDF.
*/
- inline bool saveAs(const char* pUrl, const char* pFormat = NULL, const
char* pFilterOptions = NULL)
+ bool saveAs(const char* pUrl, const char* pFormat = NULL, const char*
pFilterOptions = NULL)
{
return mpDoc->pClass->saveAs(mpDoc, pUrl, pFormat, pFilterOptions) !=
0;
}
/// Gives access to the underlying C pointer.
- inline LibreOfficeKitDocument *get() { return mpDoc; }
+ LibreOfficeKitDocument *get() { return mpDoc; }
#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
/**
@@ -68,7 +68,7 @@ public:
*
* @return an element of the LibreOfficeKitDocumentType enum.
*/
- inline int getDocumentType()
+ int getDocumentType()
{
return mpDoc->pClass->getDocumentType(mpDoc);
}
@@ -79,7 +79,7 @@ public:
* Part refers to either individual sheets in a Calc, or slides in Impress,
* and has no relevance for Writer.
*/
- inline int getParts()
+ int getParts()
{
return mpDoc->pClass->getParts(mpDoc);
}
@@ -93,36 +93,36 @@ public:
* @return a rectangle list, using the same format as
* LOK_CALLBACK_TEXT_SELECTION.
*/
- inline char* getPartPageRectangles()
+ char* getPartPageRectangles()
{
return mpDoc->pClass->getPartPageRectangles(mpDoc);
}
/// Get the current part of the document.
- inline int getPart()
+ int getPart()
{
return mpDoc->pClass->getPart(mpDoc);
}
/// Set the current part of the document.
- inline void setPart(int nPart)
+ void setPart(int nPart)
{
mpDoc->pClass->setPart(mpDoc, nPart);
}
/// Get the current part's name.
- inline char* getPartName(int nPart)
+ char* getPartName(int nPart)
{
return mpDoc->pClass->getPartName(mpDoc, nPart);
}
/// Get the current part's hash.
- inline char* getPartHash(int nPart)
+ char* getPartHash(int nPart)
{
return mpDoc->pClass->getPartHash(mpDoc, nPart);
}
- inline void setPartMode(int nMode)
+ void setPartMode(int nMode)
{
mpDoc->pClass->setPartMode(mpDoc, nMode);
}
@@ -142,7 +142,7 @@ public:
* @param nTileWidth logical width of the rendered rectangle, in TWIPs.
* @param nTileHeight logical height of the rendered rectangle, in TWIPs.
*/
- inline void paintTile(unsigned char* pBuffer,
+ void paintTile(unsigned char* pBuffer,
const int nCanvasWidth,
const int nCanvasHeight,
const int nTilePosX,
@@ -159,13 +159,13 @@ public:
*
* @return an element of the LibreOfficeKitTileMode enum.
*/
- inline int getTileMode()
+ int getTileMode()
{
return mpDoc->pClass->getTileMode(mpDoc);
}
/// Get the document sizes in TWIPs.
- inline void getDocumentSize(long* pWidth, long* pHeight)
+ void getDocumentSize(long* pWidth, long* pHeight)
{
mpDoc->pClass->getDocumentSize(mpDoc, pWidth, pHeight);
}
@@ -190,7 +190,7 @@ public:
*
* @param pArguments arguments of the rendering
*/
- inline void initializeForRendering(const char* pArguments = NULL)
+ void initializeForRendering(const char* pArguments = NULL)
{
mpDoc->pClass->initializeForRendering(mpDoc, pArguments);
}
@@ -202,7 +202,7 @@ public:
* @param pCallback the callback to invoke
* @param pData the user data, will be passed to the callback on invocation
*/
- inline void registerCallback(LibreOfficeKitCallback pCallback, void* pData)
+ void registerCallback(LibreOfficeKitCallback pCallback, void* pData)
{
mpDoc->pClass->registerCallback(mpDoc, pCallback, pData);
}
@@ -214,7 +214,7 @@ public:
* @param nCharCode contains the Unicode character generated by this event
or 0
* @param nKeyCode contains the integer code representing the key of the
event (non-zero for control keys)
*/
- inline void postKeyEvent(int nType, int nCharCode, int nKeyCode)
+ void postKeyEvent(int nType, int nCharCode, int nKeyCode)
{
mpDoc->pClass->postKeyEvent(mpDoc, nType, nCharCode, nKeyCode);
}
@@ -229,7 +229,7 @@ public:
* @param nButtons: which mouse buttons: 1 for left, 2 for middle, 4 right
* @param nModifier: which keyboard modifier: (see
include/rsc/rsc-vcl-shared-types.hxx for possible values)
*/
- inline void postMouseEvent(int nType, int nX, int nY, int nCount, int
nButtons, int nModifier)
+ void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons,
int nModifier)
{
mpDoc->pClass->postMouseEvent(mpDoc, nType, nX, nY, nCount, nButtons,
nModifier);
}
@@ -255,7 +255,7 @@ public:
* @param pCommand uno command to be posted to the document, like
".uno:Bold"
* @param pArguments arguments of the uno command.
*/
- inline void postUnoCommand(const char* pCommand, const char* pArguments =
NULL, bool bNotifyWhenFinished = false)
+ void postUnoCommand(const char* pCommand, const char* pArguments = NULL,
bool bNotifyWhenFinished = false)
{
mpDoc->pClass->postUnoCommand(mpDoc, pCommand, pArguments,
bNotifyWhenFinished);
}
@@ -267,7 +267,7 @@ public:
* @param nX horizontal position in document coordinates
* @param nY vertical position in document coordinates
*/
- inline void setTextSelection(int nType, int nX, int nY)
+ void setTextSelection(int nType, int nX, int nY)
{
mpDoc->pClass->setTextSelection(mpDoc, nType, nX, nY);
}
@@ -278,7 +278,7 @@ public:
* @param pMimeType suggests the return format, for example
text/plain;charset=utf-8.
* @param pUsedMimeType output parameter to inform about the determined
format (suggested one or plain text).
*/
- inline char* getTextSelection(const char* pMimeType, char** pUsedMimeType
= NULL)
+ char* getTextSelection(const char* pMimeType, char** pUsedMimeType = NULL)
{
return mpDoc->pClass->getTextSelection(mpDoc, pMimeType,
pUsedMimeType);
}
@@ -290,7 +290,7 @@ public:
* @param pData the actual data to be pasted.
* @return if the supplied data was pasted successfully.
*/
- inline bool paste(const char* pMimeType, const char* pData, size_t nSize)
+ bool paste(const char* pMimeType, const char* pData, size_t nSize)
{
return mpDoc->pClass->paste(mpDoc, pMimeType, pData, nSize);
}
@@ -302,7 +302,7 @@ public:
* @param nX horizontal position in document coordinates
* @param nY vertical position in document coordinates
*/
- inline void setGraphicSelection(int nType, int nX, int nY)
+ void setGraphicSelection(int nType, int nX, int nY)
{
mpDoc->pClass->setGraphicSelection(mpDoc, nType, nX, nY);
}
@@ -310,7 +310,7 @@ public:
/**
* Gets rid of any text or graphic selection.
*/
- inline void resetSelection()
+ void resetSelection()
{
mpDoc->pClass->resetSelection(mpDoc);
}
@@ -321,7 +321,7 @@ public:
* @param pCommand a uno command for which the possible values are
requested
* @return {commandName: unoCmd, commandValues: {possible_values}}
*/
- inline char* getCommandValues(const char* pCommand)
+ char* getCommandValues(const char* pCommand)
{
return mpDoc->pClass->getCommandValues(mpDoc, pCommand);
}
@@ -334,7 +334,7 @@ public:
* @param nTileTwipWidth - tile width in twips
* @param nTileTwipHeight - tile height in twips
*/
- inline void setClientZoom(
+ void setClientZoom(
int nTilePixelWidth,
int nTilePixelHeight,
int nTileTwipWidth,
@@ -353,7 +353,7 @@ public:
* @param nWidth - area width
* @param nHeight - area height
*/
- inline void setClientVisibleArea(int nX, int nY, int nWidth, int nHeight)
+ void setClientVisibleArea(int nX, int nY, int nWidth, int nHeight)
{
mpDoc->pClass->setClientVisibleArea(mpDoc, nX, nY, nWidth, nHeight);
}
@@ -398,7 +398,7 @@ public:
/**
* Get number of views of this document.
*/
- inline int getViewsCount()
+ int getViewsCount()
{
return mpDoc->pClass->getViewsCount(mpDoc);
}
@@ -407,7 +407,7 @@ public:
* Paints a font name or character if provided to be displayed in the font
list
* @param pFontName the font to be painted
*/
- inline unsigned char* renderFont(const char *pFontName,
+ unsigned char* renderFont(const char *pFontName,
const char *pChar,
int *pFontWidth,
int *pFontHeight)
@@ -421,7 +421,7 @@ public:
* @param nPart the part number of the document of which the tile is
painted.
* @see paintTile.
*/
- inline void paintPartTile(unsigned char* pBuffer,
+ void paintPartTile(unsigned char* pBuffer,
const int nPart,
const int nCanvasWidth,
const int nCanvasHeight,
@@ -446,7 +446,7 @@ public:
* @returns true if pArray was large enough and result is written, false
* otherwise.
*/
- inline bool getViewIds(int* pArray,
+ bool getViewIds(int* pArray,
size_t nSize)
{
return mpDoc->pClass->getViewIds(mpDoc, pArray, nSize);
@@ -463,11 +463,11 @@ private:
public:
/// A lok::Office is typically created by the lok_cpp_init() function.
- inline Office(LibreOfficeKit* pThis) :
+ Office(LibreOfficeKit* pThis) :
mpThis(pThis)
{}
- inline ~Office()
+ ~Office()
{
mpThis->pClass->destroy(mpThis);
}
@@ -479,7 +479,7 @@ public:
* @param pFilterOptions options for the import filter, e.g. SkipImages.
* @since pFilterOptions argument added in LibreOffice 5.0
*/
- inline Document* documentLoad(const char* pUrl, const char* pFilterOptions
= NULL)
+ Document* documentLoad(const char* pUrl, const char* pFilterOptions = NULL)
{
LibreOfficeKitDocument* pDoc = NULL;
@@ -495,7 +495,7 @@ public:
}
/// Returns the last error as a string, the returned pointer has to be
freed by the caller.
- inline char* getError()
+ char* getError()
{
return mpThis->pClass->getError(mpThis);
}
@@ -505,7 +505,7 @@ public:
*
* @since LibreOffice 5.2
*/
- inline void freeError(char* pFree)
+ void freeError(char* pFree)
{
mpThis->pClass->freeError(pFree);
}
@@ -518,7 +518,7 @@ public:
* @param pCallback the callback to invoke
* @param pData the user data, will be passed to the callback on invocation
*/
- inline void registerCallback(LibreOfficeKitCallback pCallback, void* pData)
+ void registerCallback(LibreOfficeKitCallback pCallback, void* pData)
{
mpThis->pClass->registerCallback(mpThis, pCallback, pData);
}
@@ -537,7 +537,7 @@ public:
* }
* }
*/
- inline char* getFilterTypes()
+ char* getFilterTypes()
{
return mpThis->pClass->getFilterTypes(mpThis);
}
@@ -571,7 +571,7 @@ public:
* and a NULL password will continue loading the document in read-only
* mode.
*/
- inline void setDocumentPassword(char const* pURL, char const* pPassword)
+ void setDocumentPassword(char const* pURL, char const* pPassword)
{
mpThis->pClass->setDocumentPassword(mpThis, pURL, pPassword);
}
@@ -587,7 +587,7 @@ public:
* "ProductExtension": ".0.0.alpha0",
* "BuildId": "<full 40 char git hash>"}
*/
- inline char* getVersionInfo()
+ char* getVersionInfo()
{
return mpThis->pClass->getVersionInfo(mpThis);
}
@@ -600,7 +600,7 @@ public:
* @param pURL macro url to run
*/
- inline bool runMacro( const char* pURL)
+ bool runMacro( const char* pURL)
{
return mpThis->pClass->runMacro( mpThis, pURL );
}
diff --git a/mysqlc/source/mysqlc_connection.hxx
b/mysqlc/source/mysqlc_connection.hxx
index 4d2d74f..19f836c 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -184,10 +184,10 @@ namespace connectivity
// TODO: Not used
//sal_Int32 sdbcColumnType(rtl::OUString typeName);
- inline const ConnectionSettings& getConnectionSettings() const {
return m_settings; }
+ const ConnectionSettings& getConnectionSettings() const { return
m_settings; }
rtl::OUString transFormPreparedStatement(const rtl::OUString&
_sSQL);
- inline const MysqlCDriver& getDriver() const { return
m_rDriver;}
+ const MysqlCDriver& getDriver() const { return m_rDriver;}
}; /* OConnection */
// TODO: Not used.
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx
b/mysqlc/source/mysqlc_databasemetadata.hxx
index f32a061..b801176 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -57,7 +57,7 @@ namespace connectivity
bool impl_getRSTypeMetaData( const sal_Char* _methodName, bool
(sql::DatabaseMetaData::*Method)(int), sal_Int32 _resultSetType );
public:
- inline const OConnection& getOwnConnection() const { return
m_rConnection; }
+ const OConnection& getOwnConnection() const { return
m_rConnection; }
explicit ODatabaseMetaData(OConnection& _rCon);
virtual ~ODatabaseMetaData();
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx
b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index a160208..4a52826 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -51,7 +51,7 @@ namespace connectivity
{
}
- inline rtl::OUString convert( const ::std::string& _string ) const
+ rtl::OUString convert( const ::std::string& _string ) const
{
return rtl::OUString( _string.c_str(), _string.size(),
m_encoding );
}
diff --git a/mysqlc/source/mysqlc_services.cxx
b/mysqlc/source/mysqlc_services.cxx
index aaa4099..81b0aa2 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -53,7 +53,7 @@ struct ProviderRequest
{
}
- inline bool CREATE_PROVIDER(
+ bool CREATE_PROVIDER(
const rtl::OUString& Implname,
const Sequence< rtl::OUString > & Services,
::cppu::ComponentInstantiation Factory,
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 00c9962..8a34120 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -48,7 +48,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
{
return m_aUnicodeEntry;
}
- inline SalGenericDataType GetType() const
+ SalGenericDataType GetType() const
{
return m_eType;
}
diff --git a/vcl/inc/unx/gendisp.hxx b/vcl/inc/unx/gendisp.hxx
index 21e1312..435b811 100644
--- a/vcl/inc/unx/gendisp.hxx
+++ b/vcl/inc/unx/gendisp.hxx
@@ -53,7 +53,7 @@ public:
SalGenericDisplay();
virtual ~SalGenericDisplay();
- inline osl::Mutex& getEventGuardMutex() { return m_aEventGuard; }
+ osl::Mutex& getEventGuardMutex() { return m_aEventGuard; }
void registerFrame( SalFrame* pFrame );
virtual void deregisterFrame( SalFrame* pFrame );
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 198e384..bf70ba1 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -258,9 +258,9 @@ public:
GtkSalGraphics(GtkSalFrame *, GtkWidget *window, SalX11Screen nXScreen);
virtual ~GtkSalGraphics() override;
- inline GtkWidget* GetGtkWidget() const { return m_pWindow; }
- inline GdkWindow* GetGdkWindow() const { return m_pWindow->window; }
- inline GtkSalFrame* GetGtkFrame() const { return
static_cast<GtkSalFrame*>(m_pFrame); }
+ GtkWidget* GetGtkWidget() const { return m_pWindow; }
+ GdkWindow* GetGdkWindow() const { return m_pWindow->window; }
+ GtkSalFrame* GetGtkFrame() const { return
static_cast<GtkSalFrame*>(m_pFrame); }
void SetWindow( GtkWidget* window ) { m_pWindow = window; }
// will be set when UI theme was changed
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index a115298..9e89281 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -70,7 +70,7 @@ public:
void DeleteDisplay(); // for shutdown
- inline SalXLib* GetLib() const { return pXLib_; }
+ SalXLib* GetLib() const { return pXLib_; }
static void Timeout( bool idle );
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index d64b67e..de4e93c 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -92,10 +92,10 @@ public:
~SalVisual();
SalVisual( const XVisualInfo* pXVI );
- inline VisualID GetVisualId() const { return visualid; }
- inline Visual *GetVisual() const { return visual; }
- inline int GetClass() const { return c_class; }
- inline int GetDepth() const { return depth; }
+ VisualID GetVisualId() const { return visualid; }
+ Visual *GetVisual() const { return visual; }
+ int GetClass() const { return c_class; }
+ int GetDepth() const { return depth; }
Pixel GetTCPixel( SalColor nColor ) const;
SalColor GetTCColor( Pixel nPixel ) const;
@@ -122,14 +122,14 @@ public:
SalColormap( sal_uInt16 nDepth );
SalColormap();
- inline Colormap GetXColormap() const { return m_hColormap; }
- inline const SalDisplay* GetDisplay() const { return m_pDisplay; }
+ Colormap GetXColormap() const { return m_hColormap; }
+ const SalDisplay* GetDisplay() const { return m_pDisplay; }
inline Display* GetXDisplay() const;
- inline const SalVisual& GetVisual() const { return m_aVisual; }
- inline Visual* GetXVisual() const { return
m_aVisual.GetVisual(); }
- inline Pixel GetWhitePixel() const { return m_nWhitePixel; }
- inline Pixel GetBlackPixel() const { return m_nBlackPixel; }
- inline Pixel GetUsed() const { return m_nUsed; }
+ const SalVisual& GetVisual() const { return m_aVisual; }
+ Visual* GetXVisual() const { return m_aVisual.GetVisual(); }
+ Pixel GetWhitePixel() const { return m_nWhitePixel; }
+ Pixel GetBlackPixel() const { return m_nBlackPixel; }
+ Pixel GetUsed() const { return m_nUsed; }
bool GetXPixels( XColor &rColor,
int r,
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index fb7d0fe..90d3fd6 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -84,11 +84,11 @@ public:
inline Display* GetXDisplay() const;
inline const SalVisual& GetVisual() const;
SalGeometryProvider* GetGeometryProvider() const;
- inline Drawable GetDrawable() const { return hDrawable_; }
+ Drawable GetDrawable() const { return hDrawable_; }
void SetDrawable( Drawable d, SalX11Screen
nXScreen );
XRenderPictFormat* GetXRenderFormat() const;
- inline void SetXRenderFormat( XRenderPictFormat*
pXRenderFormat ) { m_pXRenderFormat = pXRenderFormat; }
- inline const SalColormap& GetColormap() const { return *m_pColormap;
}
+ void SetXRenderFormat( XRenderPictFormat*
pXRenderFormat ) { m_pXRenderFormat = pXRenderFormat; }
+ const SalColormap& GetColormap() const { return *m_pColormap; }
using SalGraphics::GetPixel;
inline Pixel GetPixel( SalColor nSalColor ) const;
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index d774313..740ab26 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -578,9 +578,9 @@ struct YieldEntry
YieldFunc queued; // read and queue up events
YieldFunc handle; // handle pending events
- inline int HasPendingEvent() const { return pending( fd, data ); }
- inline int IsEventQueued() const { return queued( fd, data ); }
- inline void HandleNextEvent() const { handle( fd, data ); }
+ int HasPendingEvent() const { return pending( fd, data ); }
+ int IsEventQueued() const { return queued( fd, data ); }
+ void HandleNextEvent() const { handle( fd, data ); }
};
#define MAX_NUM_DESCRIPTORS 128
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
