summaryrefslogtreecommitdiff
path: root/embedserv/source/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-14 16:56:18 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-16 14:19:18 +0000
commit3b658759c945a5e2da7b2c6acfdecc9c3d9c6a34 (patch)
treeed79ef1d1dd3683e371b02d0b402aa45f654590a /embedserv/source/inc
parentd11ac6045926d4c6e392b3797939fbb7c7d37b27 (diff)
clang-cl loplugin: embedserv
Change-Id: I9901dac882a74453015881ded2355ff0a51b50d5 Reviewed-on: https://gerrit.libreoffice.org/29868 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'embedserv/source/inc')
-rw-r--r--embedserv/source/inc/docholder.hxx38
-rw-r--r--embedserv/source/inc/embeddoc.hxx132
-rw-r--r--embedserv/source/inc/iipaobj.hxx18
-rw-r--r--embedserv/source/inc/intercept.hxx26
-rw-r--r--embedserv/source/inc/servprov.hxx16
-rw-r--r--embedserv/source/inc/syswinwrapper.hxx4
-rw-r--r--embedserv/source/inc/xwin.hxx44
7 files changed, 139 insertions, 139 deletions
diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx
index 9daab2220c59..e350b434d337 100644
--- a/embedserv/source/inc/docholder.hxx
+++ b/embedserv/source/inc/docholder.hxx
@@ -90,7 +90,7 @@ private:
CComPtr< IDispatch > m_pIDispatch;
- sal_Bool m_bLink;
+ bool m_bLink;
css::uno::Reference< css::frame::XFrame2 > DocumentFrame();
@@ -101,7 +101,7 @@ private:
void ClearInterceptorInternally();
- void LoadDocInFrame( sal_Bool bPluginMode );
+ void LoadDocInFrame( bool bPluginMode );
public:
@@ -122,7 +122,7 @@ public:
const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory,
const ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl >& xOleAccess );
- ~DocumentHolder();
+ ~DocumentHolder() override;
// Methods for inplace activation
@@ -136,19 +136,19 @@ public:
BOOL InPlaceMenuCreate();
BOOL InPlaceMenuDestroy();
- void OpenIntoWindow();
- BOOL Undo();
+ static void OpenIntoWindow();
+ static BOOL Undo();
// further methods
void SetDocument(
const css::uno::Reference< css::frame::XModel >& xDoc,
- sal_Bool bLink = sal_False
+ bool bLink = false
);
- sal_Bool ExecuteSuspendCloseFrame();
+ bool ExecuteSuspendCloseFrame();
- void DisconnectFrameDocument( sal_Bool bComplete = sal_False );
+ void DisconnectFrameDocument( bool bComplete = false );
void CloseDocument();
void CloseFrame();
void ClearInterceptor();
@@ -164,8 +164,8 @@ public:
void OnPosRectChanged(LPRECT lpRect) const;
void show();
- sal_Bool HasFrame() { return m_xFrame.is(); }
- sal_Bool IsLink() { return m_bLink; }
+ bool HasFrame() { return m_xFrame.is(); }
+ bool IsLink() { return m_bLink; }
/** hides the document window, even in case of an external container
* side managed window.
@@ -198,7 +198,7 @@ public:
// XEventListener
virtual void SAL_CALL
disposing( const css::lang::EventObject& aSource )
- throw( css::uno::RuntimeException );
+ throw( css::uno::RuntimeException ) override;
// XCloseListener
virtual void SAL_CALL
@@ -208,13 +208,13 @@ public:
)
throw(
css::util::CloseVetoException
- );
+ ) override;
virtual void SAL_CALL
notifyClosing(
const css::lang::EventObject& aSource
)
- throw( css::uno::RuntimeException );
+ throw( css::uno::RuntimeException ) override;
// XTerminateListener
virtual void SAL_CALL
@@ -223,13 +223,13 @@ public:
)
throw(
css::frame::TerminationVetoException
- );
+ ) override;
virtual void SAL_CALL
notifyTermination(
const css::lang::EventObject& aSource
)
- throw( css::uno::RuntimeException );
+ throw( css::uno::RuntimeException ) override;
// XModifyListener
@@ -239,7 +239,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
// XDockingAreaAcceptor
@@ -249,7 +249,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual sal_Bool SAL_CALL
requestDockingAreaSpace(
@@ -257,7 +257,7 @@ public:
)
throw(
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
setDockingAreaSpace(
@@ -265,7 +265,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
};
#endif
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 1c8e4606fbf5..ce3e70f02101 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -51,15 +51,15 @@ class EmbedDocument_Impl
{
protected:
css::uno::Sequence< css::beans::PropertyValue >
- fillArgsForLoading_Impl( css::uno::Reference< css::io::XInputStream > xStream,
+ fillArgsForLoading_Impl( css::uno::Reference< css::io::XInputStream > const & xStream,
DWORD nStreamMode,
- LPCOLESTR pFilePath = NULL );
+ LPCOLESTR pFilePath = nullptr );
css::uno::Sequence< css::beans::PropertyValue >
- fillArgsForStoring_Impl( css::uno::Reference< css::io::XOutputStream > xStream );
+ fillArgsForStoring_Impl( css::uno::Reference< css::io::XOutputStream > const & xStream );
HRESULT SaveTo_Impl( IStorage* pStg );
- sal_uInt64 getMetaFileHandle_Impl( sal_Bool isEnhMeta );
+ sal_uInt64 getMetaFileHandle_Impl( bool isEnhMeta );
public:
EmbedDocument_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory >& smgr,
@@ -67,78 +67,78 @@ public:
virtual ~EmbedDocument_Impl();
/* IUnknown methods */
- STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj);
- STDMETHOD_(ULONG, AddRef)();
- STDMETHOD_(ULONG, Release)();
+ STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
+ STDMETHOD_(ULONG, AddRef)() override;
+ STDMETHOD_(ULONG, Release)() override;
/* IPersistMethod */
- STDMETHOD(GetClassID)(CLSID *pClassID);
+ STDMETHOD(GetClassID)(CLSID *pClassID) override;
/* IPersistStorage methods */
- STDMETHOD(IsDirty) ();
- STDMETHOD(InitNew) ( IStorage *pStg );
- STDMETHOD(Load) ( IStorage* pStr );
- STDMETHOD(Save) ( IStorage *pStgSave, BOOL fSameAsLoad );
- STDMETHOD(SaveCompleted) ( IStorage *pStgNew );
- STDMETHOD(HandsOffStorage) (void);
+ STDMETHOD(IsDirty) () override;
+ STDMETHOD(InitNew) ( IStorage *pStg ) override;
+ STDMETHOD(Load) ( IStorage* pStr ) override;
+ STDMETHOD(Save) ( IStorage *pStgSave, BOOL fSameAsLoad ) override;
+ STDMETHOD(SaveCompleted) ( IStorage *pStgNew ) override;
+ STDMETHOD(HandsOffStorage) (void) override;
/* IDataObject methods */
- STDMETHOD(GetData) ( FORMATETC * pFormatetc, STGMEDIUM * pMedium );
- STDMETHOD(GetDataHere) ( FORMATETC * pFormatetc, STGMEDIUM * pMedium );
- STDMETHOD(QueryGetData) ( FORMATETC * pFormatetc );
- STDMETHOD(GetCanonicalFormatEtc) ( FORMATETC * pFormatetcIn, FORMATETC * pFormatetcOut );
- STDMETHOD(SetData) ( FORMATETC * pFormatetc, STGMEDIUM * pMedium, BOOL fRelease );
- STDMETHOD(EnumFormatEtc) ( DWORD dwDirection, IEnumFORMATETC ** ppFormatetc );
- STDMETHOD(DAdvise) ( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD * pdwConnection );
- STDMETHOD(DUnadvise) ( DWORD dwConnection );
- STDMETHOD(EnumDAdvise) ( IEnumSTATDATA ** ppenumAdvise );
+ STDMETHOD(GetData) ( FORMATETC * pFormatetc, STGMEDIUM * pMedium ) override;
+ STDMETHOD(GetDataHere) ( FORMATETC * pFormatetc, STGMEDIUM * pMedium ) override;
+ STDMETHOD(QueryGetData) ( FORMATETC * pFormatetc ) override;
+ STDMETHOD(GetCanonicalFormatEtc) ( FORMATETC * pFormatetcIn, FORMATETC * pFormatetcOut ) override;
+ STDMETHOD(SetData) ( FORMATETC * pFormatetc, STGMEDIUM * pMedium, BOOL fRelease ) override;
+ STDMETHOD(EnumFormatEtc) ( DWORD dwDirection, IEnumFORMATETC ** ppFormatetc ) override;
+ STDMETHOD(DAdvise) ( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD * pdwConnection ) override;
+ STDMETHOD(DUnadvise) ( DWORD dwConnection ) override;
+ STDMETHOD(EnumDAdvise) ( IEnumSTATDATA ** ppenumAdvise ) override;
/* IOleObject methods */
- STDMETHOD(SetClientSite) ( IOleClientSite* pSite );
- STDMETHOD(GetClientSite) ( IOleClientSite** pSite );
- STDMETHOD(SetHostNames) ( LPCOLESTR szContainerApp, LPCOLESTR szContainerObj );
- STDMETHOD(Close) ( DWORD dwSaveOption);
- STDMETHOD(SetMoniker) ( DWORD dwWhichMoniker, IMoniker *pmk );
- STDMETHOD(GetMoniker) ( DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk );
- STDMETHOD(InitFromData) ( IDataObject *pDataObject, BOOL fCreation, DWORD dwReserved );
- STDMETHOD(GetClipboardData) ( DWORD dwReserved, IDataObject **ppDataObject );
- STDMETHOD(DoVerb) ( LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect );
- STDMETHOD(EnumVerbs) ( IEnumOLEVERB **ppEnumOleVerb );
- STDMETHOD(Update) ();
- STDMETHOD(IsUpToDate) ();
- STDMETHOD(GetUserClassID) ( CLSID *pClsid );
- STDMETHOD(GetUserType) ( DWORD dwFormOfType, LPOLESTR *pszUserType );
- STDMETHOD(SetExtent) ( DWORD dwDrawAspect, SIZEL *psizel );
- STDMETHOD(GetExtent) ( DWORD dwDrawAspect, SIZEL *psizel );
- STDMETHOD(Advise) ( IAdviseSink *pAdvSink, DWORD *pdwConnection );
- STDMETHOD(Unadvise) ( DWORD dwConnection );
- STDMETHOD(EnumAdvise) ( IEnumSTATDATA **ppenumAdvise );
- STDMETHOD(GetMiscStatus) ( DWORD dwAspect, DWORD *pdwStatus );
- STDMETHOD(SetColorScheme) ( LOGPALETTE *pLogpal );
+ STDMETHOD(SetClientSite) ( IOleClientSite* pSite ) override;
+ STDMETHOD(GetClientSite) ( IOleClientSite** pSite ) override;
+ STDMETHOD(SetHostNames) ( LPCOLESTR szContainerApp, LPCOLESTR szContainerObj ) override;
+ STDMETHOD(Close) ( DWORD dwSaveOption) override;
+ STDMETHOD(SetMoniker) ( DWORD dwWhichMoniker, IMoniker *pmk ) override;
+ STDMETHOD(GetMoniker) ( DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk ) override;
+ STDMETHOD(InitFromData) ( IDataObject *pDataObject, BOOL fCreation, DWORD dwReserved ) override;
+ STDMETHOD(GetClipboardData) ( DWORD dwReserved, IDataObject **ppDataObject ) override;
+ STDMETHOD(DoVerb) ( LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect ) override;
+ STDMETHOD(EnumVerbs) ( IEnumOLEVERB **ppEnumOleVerb ) override;
+ STDMETHOD(Update) () override;
+ STDMETHOD(IsUpToDate) () override;
+ STDMETHOD(GetUserClassID) ( CLSID *pClsid ) override;
+ STDMETHOD(GetUserType) ( DWORD dwFormOfType, LPOLESTR *pszUserType ) override;
+ STDMETHOD(SetExtent) ( DWORD dwDrawAspect, SIZEL *psizel ) override;
+ STDMETHOD(GetExtent) ( DWORD dwDrawAspect, SIZEL *psizel ) override;
+ STDMETHOD(Advise) ( IAdviseSink *pAdvSink, DWORD *pdwConnection ) override;
+ STDMETHOD(Unadvise) ( DWORD dwConnection ) override;
+ STDMETHOD(EnumAdvise) ( IEnumSTATDATA **ppenumAdvise ) override;
+ STDMETHOD(GetMiscStatus) ( DWORD dwAspect, DWORD *pdwStatus ) override;
+ STDMETHOD(SetColorScheme) ( LOGPALETTE *pLogpal ) override;
/* IOleInPlaceObject methods */
- STDMETHOD(GetWindow)(HWND *);
- STDMETHOD(ContextSensitiveHelp)(BOOL);
- STDMETHOD(InPlaceDeactivate)();
- STDMETHOD(UIDeactivate)();
- STDMETHOD(SetObjectRects)(LPCRECT, LPCRECT);
- STDMETHOD(ReactivateAndUndo)();
+ STDMETHOD(GetWindow)(HWND *) override;
+ STDMETHOD(ContextSensitiveHelp)(BOOL) override;
+ STDMETHOD(InPlaceDeactivate)() override;
+ STDMETHOD(UIDeactivate)() override;
+ STDMETHOD(SetObjectRects)(LPCRECT, LPCRECT) override;
+ STDMETHOD(ReactivateAndUndo)() override;
/* IPersistFile methods */
- STDMETHOD(Load) ( LPCOLESTR pszFileName, DWORD dwMode );
- STDMETHOD(Save) ( LPCOLESTR pszFileName, BOOL fRemember );
- STDMETHOD(SaveCompleted) ( LPCOLESTR pszFileName );
- STDMETHOD(GetCurFile) ( LPOLESTR *ppszFileName );
+ STDMETHOD(Load) ( LPCOLESTR pszFileName, DWORD dwMode ) override;
+ STDMETHOD(Save) ( LPCOLESTR pszFileName, BOOL fRemember ) override;
+ STDMETHOD(SaveCompleted) ( LPCOLESTR pszFileName ) override;
+ STDMETHOD(GetCurFile) ( LPOLESTR *ppszFileName ) override;
/* IDispatch methods */
- STDMETHOD(GetTypeInfoCount) ( unsigned int FAR* pctinfo );
- STDMETHOD(GetTypeInfo) ( unsigned int iTInfo, LCID lcid, ITypeInfo FAR* FAR* ppTInfo );
- STDMETHOD(GetIDsOfNames) ( REFIID riid, OLECHAR FAR* FAR* rgszNames, unsigned int cNames, LCID lcid, DISPID FAR* rgDispId );
- STDMETHOD(Invoke) ( DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult, EXCEPINFO FAR* pExcepInfo, unsigned int FAR* puArgErr );
+ STDMETHOD(GetTypeInfoCount) ( unsigned int FAR* pctinfo ) override;
+ STDMETHOD(GetTypeInfo) ( unsigned int iTInfo, LCID lcid, ITypeInfo FAR* FAR* ppTInfo ) override;
+ STDMETHOD(GetIDsOfNames) ( REFIID riid, OLECHAR FAR* FAR* rgszNames, unsigned int cNames, LCID lcid, DISPID FAR* rgDispId ) override;
+ STDMETHOD(Invoke) ( DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult, EXCEPINFO FAR* pExcepInfo, unsigned int FAR* puArgErr ) override;
/* IExternalConnection methods */
- virtual DWORD STDMETHODCALLTYPE AddConnection( DWORD extconn, DWORD reserved);
- virtual DWORD STDMETHODCALLTYPE ReleaseConnection( DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses);
+ virtual DWORD STDMETHODCALLTYPE AddConnection( DWORD extconn, DWORD reserved) override;
+ virtual DWORD STDMETHODCALLTYPE ReleaseConnection( DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) override;
// c++ - methods
@@ -164,7 +164,7 @@ protected:
CComPtr< IStream > m_pExtStream;
GUID m_guid;
- sal_Bool m_bIsDirty;
+ bool m_bIsDirty;
CComPtr< IOleClientSite > m_pClientSite;
CComPtr< IDataAdviseHolder > m_pDAdviseHolder;
@@ -174,23 +174,23 @@ protected:
::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl > m_xOwnAccess;
- sal_Bool m_bIsInVerbHandling;
+ bool m_bIsInVerbHandling;
};
class BooleanGuard_Impl
{
- sal_Bool& m_bValue;
+ bool& m_bValue;
public:
- BooleanGuard_Impl( sal_Bool& bValue )
+ BooleanGuard_Impl( bool& bValue )
: m_bValue( bValue )
{
- m_bValue = sal_True;
+ m_bValue = true;
}
~BooleanGuard_Impl()
{
- m_bValue = sal_False;
+ m_bValue = false;
}
};
diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx
index ba0e476c574d..7ae08932fdd5 100644
--- a/embedserv/source/inc/iipaobj.hxx
+++ b/embedserv/source/inc/iipaobj.hxx
@@ -41,19 +41,19 @@ public:
virtual ~CIIAObj();
/* IUnknown methods */
- STDMETHODIMP QueryInterface(REFIID, LPVOID FAR * ppvObj);
- STDMETHODIMP_(ULONG) AddRef();
- STDMETHODIMP_(ULONG) Release();
+ STDMETHODIMP QueryInterface(REFIID, LPVOID FAR * ppvObj) override;
+ STDMETHODIMP_(ULONG) AddRef() override;
+ STDMETHODIMP_(ULONG) Release() override;
/* IOleInPlaceActiveObject methods */
- STDMETHODIMP GetWindow(HWND *);
- STDMETHODIMP ContextSensitiveHelp(BOOL);
+ STDMETHODIMP GetWindow(HWND *) override;
+ STDMETHODIMP ContextSensitiveHelp(BOOL) override;
STDMETHODIMP TranslateAccelerator(LPMSG);
- STDMETHODIMP OnFrameWindowActivate(BOOL);
- STDMETHODIMP OnDocWindowActivate(BOOL);
+ STDMETHODIMP OnFrameWindowActivate(BOOL) override;
+ STDMETHODIMP OnDocWindowActivate(BOOL) override;
STDMETHODIMP ResizeBorder(LPCRECT, LPOLEINPLACEUIWINDOW
- , BOOL);
- STDMETHODIMP EnableModeless(BOOL);
+ , BOOL) override;
+ STDMETHODIMP EnableModeless(BOOL) override;
private:
diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx
index 3dc08c790efa..739c9ae6320c 100644
--- a/embedserv/source/inc/intercept.hxx
+++ b/embedserv/source/inc/intercept.hxx
@@ -46,9 +46,9 @@ public:
Interceptor(
const ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl >& xOleAccess,
DocumentHolder* pDocH,
- sal_Bool bLink );
+ bool bLink );
- ~Interceptor();
+ ~Interceptor() override;
void DisconnectDocHolder();
@@ -76,7 +76,7 @@ public:
dispatch(
const css::util::URL& URL,
const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException) override;
virtual void SAL_CALL
addStatusListener(
@@ -84,7 +84,7 @@ public:
const css::util::URL& URL )
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
removeStatusListener(
@@ -92,14 +92,14 @@ public:
const css::util::URL& URL )
throw (
css::uno::RuntimeException
- );
+ ) override;
//XInterceptorInfo
virtual css::uno::Sequence< OUString >
SAL_CALL getInterceptedURLs( )
throw (
css::uno::RuntimeException
- );
+ ) override;
//XDispatchProvider ( inherited by XDispatchProviderInterceptor )
@@ -111,7 +111,7 @@ public:
sal_Int32 SearchFlags )
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
queryDispatches(
@@ -119,7 +119,7 @@ public:
css::frame::DispatchDescriptor >& Requests )
throw (
css::uno::RuntimeException
- );
+ ) override;
//XDispatchProviderInterceptor
@@ -127,27 +127,27 @@ public:
getSlaveDispatchProvider( )
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
setSlaveDispatchProvider(
const css::uno::Reference< css::frame::XDispatchProvider >& NewDispatchProvider )
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
getMasterDispatchProvider( )
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
setMasterDispatchProvider(
const css::uno::Reference< css::frame::XDispatchProvider >& NewSupplier )
throw (
css::uno::RuntimeException
- );
+ ) override;
private:
@@ -168,7 +168,7 @@ private:
comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners;
StatusChangeListenerContainer* m_pStatCL;
- sal_Bool m_bLink;
+ bool m_bLink;
};
#endif
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx
index a775303021ba..ab0c78d843ef 100644
--- a/embedserv/source/inc/servprov.hxx
+++ b/embedserv/source/inc/servprov.hxx
@@ -35,7 +35,7 @@ class EmbedServer_Impl: public cppu::WeakImplHelper<css::lang::XServiceInfo>
{
public:
EmbedServer_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > &xFactory );
- virtual ~EmbedServer_Impl();
+ virtual ~EmbedServer_Impl() override;
OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
@@ -59,17 +59,17 @@ public:
EmbedProviderFactory_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory, const GUID* pGuid);
virtual ~EmbedProviderFactory_Impl();
- sal_Bool registerClass();
- sal_Bool deregisterClass();
+ bool registerClass();
+ bool deregisterClass();
/* IUnknown methods */
- STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj);
- STDMETHOD_(ULONG, AddRef)();
- STDMETHOD_(ULONG, Release)();
+ STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
+ STDMETHOD_(ULONG, AddRef)() override;
+ STDMETHOD_(ULONG, Release)() override;
/* IClassFactory methods */
- STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv);
- STDMETHOD(LockServer)(int fLock);
+ STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv) override;
+ STDMETHOD(LockServer)(int fLock) override;
protected:
diff --git a/embedserv/source/inc/syswinwrapper.hxx b/embedserv/source/inc/syswinwrapper.hxx
index 52bf7d03d19c..fde21349095b 100644
--- a/embedserv/source/inc/syswinwrapper.hxx
+++ b/embedserv/source/inc/syswinwrapper.hxx
@@ -94,7 +94,7 @@ namespace winwrap {
void GetTrueRect(LPRECT lpTrueRect) const;
BOOL SetCursor(HWND hWnd,UINT nHitTest) const;
BOOL Track(HWND hWnd,POINT point,BOOL bAllowInvert = FALSE,
- HWND hWndClipTo = NULL);
+ HWND hWndClipTo = nullptr);
// BOOL TrackRubberBand(HWND hWnd,POINT point,BOOL bAllowInvert = TRUE);
int HitTest(POINT point) const;
int NormalizeHit(int nHandle) const;
@@ -123,7 +123,7 @@ protected:
void GetHandleRect(int nHandle,RECT* pHandleRect) const;
void GetModifyPointers(
int nHandle,int**ppx, int**ppy, int* px, int*py);
- virtual int GetHandleSize(LPRECT lpRect = NULL) const;
+ virtual int GetHandleSize(LPRECT lpRect = nullptr) const;
BOOL TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo);
void Construct();
};
diff --git a/embedserv/source/inc/xwin.hxx b/embedserv/source/inc/xwin.hxx
index b3952114101d..48834299c721 100644
--- a/embedserv/source/inc/xwin.hxx
+++ b/embedserv/source/inc/xwin.hxx
@@ -38,7 +38,7 @@ public:
ContainerWindowWrapper(HWND aHwnd);
- ~ ContainerWindowWrapper();
+ ~ ContainerWindowWrapper() override;
// XComponent
@@ -48,7 +48,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
addEventListener(
@@ -56,7 +56,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
removeEventListener(
@@ -64,7 +64,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
// XSystemDependentWindowPeer
@@ -76,7 +76,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
// XWindow
@@ -89,14 +89,14 @@ public:
sal_Int16 Flags
)
throw (
- css::uno::RuntimeException);
+ css::uno::RuntimeException) override;
virtual css::awt::Rectangle SAL_CALL
getPosSize(
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
setVisible(
@@ -104,7 +104,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
setEnable(
@@ -112,14 +112,14 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
setFocus(
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
addWindowListener(
@@ -127,7 +127,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
removeWindowListener(
@@ -135,7 +135,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
addFocusListener(
@@ -143,7 +143,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
removeFocusListener(
@@ -151,7 +151,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
addKeyListener(
@@ -160,7 +160,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
removeKeyListener(
@@ -168,7 +168,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
addMouseListener(
@@ -176,7 +176,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
removeMouseListener(
@@ -185,7 +185,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
addMouseMotionListener(
@@ -194,7 +194,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
removeMouseMotionListener(
@@ -202,7 +202,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
addPaintListener(
@@ -210,7 +210,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
virtual void SAL_CALL
removePaintListener(
@@ -218,7 +218,7 @@ public:
)
throw (
css::uno::RuntimeException
- );
+ ) override;
private: