summaryrefslogtreecommitdiff
path: root/dtrans/source/win32/dtobj
diff options
context:
space:
mode:
Diffstat (limited to 'dtrans/source/win32/dtobj')
-rw-r--r--dtrans/source/win32/dtobj/APNDataObject.hxx4
-rw-r--r--dtrans/source/win32/dtobj/DTransHelper.hxx6
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.hxx2
-rw-r--r--dtrans/source/win32/dtobj/Fetc.hxx2
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.cxx8
5 files changed, 12 insertions, 10 deletions
diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx
index 9522aae05129..86dd355bfb7e 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.hxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.hxx
@@ -32,8 +32,8 @@
class CAPNDataObject : public IDataObject
{
public:
- CAPNDataObject( IDataObjectPtr rIDataObject );
- virtual ~CAPNDataObject( );
+ explicit CAPNDataObject(IDataObjectPtr rIDataObject);
+ virtual ~CAPNDataObject();
//IUnknown interface methods
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index 7754ec302c20..ce0e3b4fcf50 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -43,7 +43,7 @@ public:
{
public:
HRESULT m_hr;
- CStgTransferException( HRESULT hr ) : m_hr( hr ) {};
+ explicit CStgTransferException( HRESULT hr ) : m_hr( hr ) {};
};
public:
@@ -95,7 +95,7 @@ public:
// ctor
- CRawHGlobalPtr( HGLOBAL hGlob ) :
+ explicit CRawHGlobalPtr( HGLOBAL hGlob ) :
m_hGlob( hGlob ),
m_bIsLocked( FALSE ),
m_pGlobMem( NULL )
@@ -104,7 +104,7 @@ public:
// ctor
- CRawHGlobalPtr( const CStgTransferHelper& theHGlobalHelper ) :
+ explicit CRawHGlobalPtr( const CStgTransferHelper& theHGlobalHelper ) :
m_hGlob( theHGlobalHelper.getHGlobal( ) ),
m_bIsLocked( FALSE ),
m_pGlobMem( NULL )
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index f3a00cd698a2..716d96e7268d 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -41,7 +41,7 @@ class CFormatEtc;
class CDataFormatTranslator
{
public:
- CDataFormatTranslator( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
+ explicit CDataFormatTranslator( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
CFormatEtc getFormatEtcFromDataFlavor( const css::datatransfer::DataFlavor& aDataFlavor ) const;
css::datatransfer::DataFlavor getDataFlavorFromFormatEtc(
diff --git a/dtrans/source/win32/dtobj/Fetc.hxx b/dtrans/source/win32/dtobj/Fetc.hxx
index 4f86c691bc94..86edb83e8b9d 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/dtrans/source/win32/dtobj/Fetc.hxx
@@ -42,7 +42,7 @@ class CFormatEtc
{
public:
CFormatEtc( );
- CFormatEtc( const FORMATETC& aFormatEtc );
+ explicit CFormatEtc( const FORMATETC& aFormatEtc );
CFormatEtc( CLIPFORMAT cf, DWORD tymed = TYMED_HGLOBAL, DVTARGETDEVICE* ptd = NULL, DWORD dwAspect = DVASPECT_CONTENT, LONG lindex = -1 );
CFormatEtc( const CFormatEtc& theOther );
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 3c8a93731945..7f3a46cf0a72 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -58,7 +58,7 @@ class CInvalidFormatEtcException
{
public:
HRESULT m_hr;
- CInvalidFormatEtcException( HRESULT hr ) : m_hr( hr ) {};
+ explicit CInvalidFormatEtcException( HRESULT hr ) : m_hr( hr ) {};
};
// ctor
@@ -137,7 +137,8 @@ STDMETHODIMP CXTDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium
{
HRESULT hr = DV_E_FORMATETC;
- if ( m_FormatRegistrar.isSynthesizeableFormat( *pFormatetc ) )
+ CFormatEtc aFormatetc(*pFormatetc);
+ if (m_FormatRegistrar.isSynthesizeableFormat(aFormatetc))
hr = renderSynthesizedFormatAndSetupStgMedium( *pFormatetc, *pmedium );
return hr;
@@ -479,7 +480,8 @@ STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc )
InitializeFormatEtcContainer( );
- return m_FormatEtcContainer.hasFormatEtc( *pFormatetc ) ? S_OK : S_FALSE;
+ CFormatEtc aFormatetc(*pFormatetc);
+ return m_FormatEtcContainer.hasFormatEtc(aFormatetc) ? S_OK : S_FALSE;
}
// IDataObject->GetDataHere