summaryrefslogtreecommitdiff
path: root/embedserv/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'embedserv/source/inc')
-rw-r--r--embedserv/source/inc/docholder.hxx7
-rw-r--r--embedserv/source/inc/embeddoc.hxx18
-rw-r--r--embedserv/source/inc/embeddocaccess.hxx6
-rw-r--r--embedserv/source/inc/iipaobj.hxx7
-rw-r--r--embedserv/source/inc/intercept.hxx11
-rw-r--r--embedserv/source/inc/servprov.hxx9
-rw-r--r--embedserv/source/inc/stdafx.h1
-rw-r--r--embedserv/source/inc/syswinwrapper.hxx5
8 files changed, 22 insertions, 42 deletions
diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx
index 7cb85af0fbf6..844435e3de83 100644
--- a/embedserv/source/inc/docholder.hxx
+++ b/embedserv/source/inc/docholder.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_DOCHOLDER_HXX
-#define INCLUDED_EMBEDSERV_SOURCE_INC_DOCHOLDER_HXX
+#pragma once
#include "common.h"
#include <com/sun/star/frame/XLayoutManager.hpp>
@@ -62,7 +61,7 @@ private:
::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl > m_xOleAccess;
css::uno::WeakReference< css::frame::XDispatchProviderInterceptor > m_xInterceptorLocker;
- Interceptor* m_pInterceptor;
+ rtl::Reference<Interceptor> m_pInterceptor;
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
@@ -248,6 +247,4 @@ public:
) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 488b142bc1a8..1ff0ed338cf4 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
-#define INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
+#pragma once
#include "common.h"
#include <oleidl.h>
@@ -26,6 +25,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
+#include <rtl/ref.hxx>
#include <unordered_map>
#include "embeddocaccess.hxx"
@@ -63,7 +63,7 @@ public:
virtual ~EmbedDocument_Impl();
/* IUnknown methods */
- STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
+ STDMETHOD(QueryInterface)(REFIID riid, LPVOID* ppvObj) override;
STDMETHOD_(ULONG, AddRef)() override;
STDMETHOD_(ULONG, Release)() override;
@@ -127,10 +127,10 @@ public:
STDMETHOD(GetCurFile) ( LPOLESTR *ppszFileName ) override;
/* IDispatch methods */
- 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;
+ STDMETHOD(GetTypeInfoCount)(unsigned int* pctinfo) override;
+ STDMETHOD(GetTypeInfo)(unsigned int iTInfo, LCID lcid, ITypeInfo** ppTInfo) override;
+ STDMETHOD(GetIDsOfNames)(REFIID riid, OLECHAR** rgszNames, unsigned int cNames, LCID lcid, DISPID* rgDispId) override;
+ STDMETHOD(Invoke)(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, unsigned int* puArgErr) override;
/* IExternalConnection methods */
virtual DWORD STDMETHODCALLTYPE AddConnection( DWORD extconn, DWORD reserved) override;
@@ -152,7 +152,7 @@ protected:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
- DocumentHolder* m_pDocHolder;
+ rtl::Reference<DocumentHolder> m_pDocHolder;
OUString m_aFileName;
CComPtr< IStorage > m_pMasterStorage;
@@ -190,6 +190,4 @@ public:
}
};
-#endif // INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index 8b03900afd82..0a84b92c2cbe 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOCACCESS_HXX
-#define INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOCACCESS_HXX
+#pragma once
#define OLESERV_SAVEOBJECT 1
#define OLESERV_CLOSE 2
@@ -33,7 +32,6 @@
#pragma clang diagnostic ignored "-Wall"
#pragma clang diagnostic ignored "-Wextra"
#pragma clang diagnostic ignored "-Wmicrosoft"
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
#include <atldbcli.h>
#if defined __clang__
@@ -75,6 +73,4 @@ class EmbeddedDocumentInstanceAccess_Impl : public ::cppu::OWeakObject
void ClearEmbedDocument();
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx
index 8bcc04688385..a6851e1277cb 100644
--- a/embedserv/source/inc/iipaobj.hxx
+++ b/embedserv/source/inc/iipaobj.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX
-#define INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX
+#pragma once
#include "stdafx.h"
#include <oleidl.h>
@@ -38,7 +37,7 @@ public:
virtual ~CIIAObj();
/* IUnknown methods */
- STDMETHODIMP QueryInterface(REFIID, LPVOID FAR * ppvObj) override;
+ STDMETHODIMP QueryInterface(REFIID, LPVOID* ppvObj) override;
STDMETHODIMP_(ULONG) AddRef() override;
STDMETHODIMP_(ULONG) Release() override;
@@ -59,6 +58,4 @@ private:
::rtl::Reference< DocumentHolder > m_rDocHolder;
};
-
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx
index ab3fb63cad8f..665f26aa82b9 100644
--- a/embedserv/source/inc/intercept.hxx
+++ b/embedserv/source/inc/intercept.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_INTERCEPT_HXX
-#define INCLUDED_EMBEDSERV_SOURCE_INC_INTERCEPT_HXX
+#pragma once
#include <osl/mutex.hxx>
#include <cppuhelper/implbase.hxx>
+#include <comphelper/multiinterfacecontainer3.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XInterceptorInfo.hpp>
@@ -31,10 +31,11 @@
#include "embeddocaccess.hxx"
-class StatusChangeListenerContainer;
class EmbedDocument_Impl;
class DocumentHolder;
+using StatusChangeListenerContainer = comphelper::OMultiTypeInterfaceContainerHelperVar3<css::frame::XStatusListener, OUString>;
+
class Interceptor
: public ::cppu::WeakImplHelper<
css::frame::XDispatchProviderInterceptor,
@@ -136,7 +137,7 @@ private:
css::uno::Reference< css::frame::XDispatchProvider > m_xMasterDispatchProvider;
- static css::uno::Sequence< OUString > m_aInterceptedURL;
+ static const css::uno::Sequence< OUString > m_aInterceptedURL;
comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners;
StatusChangeListenerContainer* m_pStatCL;
@@ -144,6 +145,4 @@ private:
bool m_bLink;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx
index 6d1d887da4c0..f2b30fb6ccaa 100644
--- a/embedserv/source/inc/servprov.hxx
+++ b/embedserv/source/inc/servprov.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_SERVPROV_HXX
-#define INCLUDED_EMBEDSERV_SOURCE_INC_SERVPROV_HXX
+#pragma once
#include "common.h"
#include <oleidl.h>
@@ -60,12 +59,12 @@ public:
bool deregisterClass();
/* IUnknown methods */
- STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
+ STDMETHOD(QueryInterface)(REFIID riid, LPVOID* ppvObj) override;
STDMETHOD_(ULONG, AddRef)() override;
STDMETHOD_(ULONG, Release)() override;
/* IClassFactory methods */
- STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv) override;
+ STDMETHOD(CreateInstance)(IUnknown* punkOuter, REFIID riid, void** ppv) override;
STDMETHOD(LockServer)(int fLock) override;
protected:
@@ -77,6 +76,4 @@ protected:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h
index 9ec4fffcabee..44b79de4e600 100644
--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -18,7 +18,6 @@
#pragma clang diagnostic ignored "-Winvalid-noreturn"
#pragma clang diagnostic ignored "-Wmicrosoft"
#pragma clang diagnostic ignored "-Wnon-pod-varargs"
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#pragma clang diagnostic ignored "-Wnonportable-include-path"
#pragma clang diagnostic ignored "-Wsequence-point"
#pragma clang diagnostic ignored "-Wtypename-missing"
diff --git a/embedserv/source/inc/syswinwrapper.hxx b/embedserv/source/inc/syswinwrapper.hxx
index f255058bff26..46ec83ae4052 100644
--- a/embedserv/source/inc/syswinwrapper.hxx
+++ b/embedserv/source/inc/syswinwrapper.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_SYSWINWRAPPER_HXX
-#define INCLUDED_EMBEDSERV_SOURCE_INC_SYSWINWRAPPER_HXX
+#pragma once
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
@@ -171,6 +170,4 @@ protected:
}
-#endif // INCLUDED_EMBEDSERV_SOURCE_INC_SYSWINWRAPPER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 15:49:12 +0000