summaryrefslogtreecommitdiff
path: root/embedserv/source/inc/embeddoc.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'embedserv/source/inc/embeddoc.hxx')
-rw-r--r--embedserv/source/inc/embeddoc.hxx18
1 files changed, 8 insertions, 10 deletions
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: */