admin/Slnkdwf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enkele compiler warnings verwijderd over throw-functies

Browse Source 
svn path=/Slnkdwf/trunk/; revision=26206
This commit is contained in:
Jos Groot Lipman
2015-09-06 11:13:49 +00:00
parent 76d3cce070
commit 41fc5beaf5
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SlnkDWFImpl/Whip2DCImpl.cpp
View File

@@ -16,7 +16,7 @@
// CWhip2DC
STDMETHODIMP CWhip2DCImpl::Load(HDC hDC, CEPlotSectionImpl *EPlotStream,
int CWhip2DCImpl::Load(HDC hDC, CEPlotSectionImpl *EPlotStream,
const CString &WhipPath,
const CString & RegExp, long sizeX, long sizeY,
VARIANT_BOOL centerImage, VARIANT_BOOL maximize,/*=FALSE*/
@@ -167,7 +167,7 @@ CSize &CWhip2DCImpl::get_Size()
return m_State.m_Size;
}
STDMETHODIMP CWhip2DCImpl::Paint(VARIANT_BOOL forceBW, VARIANT_BOOL markers /* = VARIANT_FALSE */)
int CWhip2DCImpl::Paint(VARIANT_BOOL forceBW, VARIANT_BOOL markers /* = VARIANT_FALSE */)
{
#ifdef _DEBUG
/// CneutralGDI neutralGDI("CWhip2DCImpl::Paint");
@@ -369,7 +369,7 @@ STDMETHODIMP CWhip2DCImpl::Paint(VARIANT_BOOL forceBW, VARIANT_BOOL markers /* =
}
// Zoek alle teksten in de tekening op en lever ze op als array
STDMETHODIMP CWhip2DCImpl::FindTexts(const CString &findText)
int CWhip2DCImpl::FindTexts(const CString &findText)
{
CmyTimer Timer("CWhip2DCImpl::FindText");
@@ -436,7 +436,7 @@ STDMETHODIMP CWhip2DCImpl::FindTexts(const CString &findText)
* TODO: AsMap wordt voor steeds meer doeleinden gebruikt. Oppassen dat
* bijvoorbeeld extents wel correct worden bepaald
*****************************************************************************/
STDMETHODIMP CWhip2DCImpl::Find(LONG findX, LONG findY,
int CWhip2DCImpl::Find(LONG findX, LONG findY,
BYTE AsMap,
CString & pContourKey, CString & pContourLayer,
CString & pTextLabel, CString & pTextLayer,
@@ -536,7 +536,7 @@ STDMETHODIMP CWhip2DCImpl::Find(LONG findX, LONG findY,
}
// Call Find() or Paint() first!!
STDMETHODIMP CWhip2DCImpl::DPtoDWG(LONG findX, LONG findY,
int CWhip2DCImpl::DPtoDWG(LONG findX, LONG findY,
DOUBLE* resX, DOUBLE* resY)
{
m_State.LPfindXY = CPoint(findX, findY);
@@ -559,7 +559,7 @@ STDMETHODIMP CWhip2DCImpl::DPtoDWG(LONG findX, LONG findY,
}
// Call Find() or Paint() first!!
STDMETHODIMP CWhip2DCImpl::DWGExtents(DOUBLE* resminX, DOUBLE* resminY,
int CWhip2DCImpl::DWGExtents(DOUBLE* resminX, DOUBLE* resminY,
DOUBLE* resmaxX, DOUBLE* resmaxY)
{
if (resminX && resminY && resmaxX && resmaxY)
@@ -1778,14 +1778,14 @@ WT_Result CWhip2DCImpl::my_process_fillPattern (WT_Fill_Pattern & fillPattern, W
return WT_Result::Success;
}
STDMETHODIMP CWhip2DCImpl::get_LayerCount(LONG* pVal)
int CWhip2DCImpl::get_LayerCount(LONG* pVal)
{
(*pVal) = (LONG)m_State.m_Layernames.GetSize();
return S_OK;
}
STDMETHODIMP CWhip2DCImpl::get_TextCount(LONG* pVal)
int CWhip2DCImpl::get_TextCount(LONG* pVal)
{
(*pVal) = (LONG)m_State.m_FoundTexts.GetCount();
@@ -1793,7 +1793,7 @@ STDMETHODIMP CWhip2DCImpl::get_TextCount(LONG* pVal)
}
STDMETHODIMP CWhip2DCImpl::get_TextItem(LONG i, CFoundText &pVal)
int CWhip2DCImpl::get_TextItem(LONG i, CFoundText &pVal)
{
if (i<0 || i>=(LONG)m_State.m_FoundTexts.GetCount())
return E_INVALIDARG;
@@ -1802,7 +1802,7 @@ STDMETHODIMP CWhip2DCImpl::get_TextItem(LONG i, CFoundText &pVal)
return S_OK;
}
STDMETHODIMP CWhip2DCImpl::get_LayerItem(LONG i, CString* pVal)
int CWhip2DCImpl::get_LayerItem(LONG i, CString* pVal)
{
if (i<0 || i>=(LONG)m_State.m_Layernames.GetSize())
return E_INVALIDARG;
@@ -1811,14 +1811,14 @@ STDMETHODIMP CWhip2DCImpl::get_LayerItem(LONG i, CString* pVal)
return S_OK;
}
STDMETHODIMP CWhip2DCImpl::get_paperColor(LONG* pVal)
int CWhip2DCImpl::get_paperColor(LONG* pVal)
{
(*pVal) = m_State.m_paperColor;
return S_OK;
}
STDMETHODIMP CWhip2DCImpl::put_paperColor(LONG newVal)
int CWhip2DCImpl::put_paperColor(LONG newVal)
{
m_State.m_forcePaper = true;
m_State.m_paperColor = newVal;
@@ -1826,7 +1826,7 @@ STDMETHODIMP CWhip2DCImpl::put_paperColor(LONG newVal)
return S_OK;
}
STDMETHODIMP CWhip2DCImpl::ReplaceColor(LONG paperColor, LONG oldColor, LONG newColor)
int CWhip2DCImpl::ReplaceColor(LONG paperColor, LONG oldColor, LONG newColor)
{
m_State.m_replaceColors[paperColor] = CFromTo(oldColor, newColor);

26
SlnkDWFImpl/Whip2DCImpl.h
View File

@@ -122,25 +122,25 @@ protected:
WHIP2DC_Progress_Action m_progress_action;
void * m_progress_param;
public:
STDMETHOD(Load)(HDC hDC, CEPlotSectionImpl *EPlotSection, const CString &WhipPath,
int Load(HDC hDC, CEPlotSectionImpl *EPlotSection, const CString &WhipPath,
const CString &RegExp, long sizeX, long sizeY,
VARIANT_BOOL centerImage, VARIANT_BOOL maximize=FALSE,
double dwgScale=0.0);
STDMETHOD(Paint)(VARIANT_BOOL forceBW, VARIANT_BOOL markers = VARIANT_FALSE);
STDMETHOD(Find)(LONG findX, LONG findY, BYTE AsMap,
int Paint(VARIANT_BOOL forceBW, VARIANT_BOOL markers = VARIANT_FALSE);
int Find(LONG findX, LONG findY, BYTE AsMap,
CString &pContourKey, CString &pContourLayer,
CString &pTextLabel, CString &pTextLayer,
double &EdgeAngle, double &EdgeDistance);
STDMETHOD(FindTexts) (const CString &findText);
STDMETHOD(DPtoDWG)(LONG findX, LONG findY, DOUBLE* resX, DOUBLE* resY);
STDMETHOD(DWGExtents)(DOUBLE* resminX, DOUBLE* resminY, DOUBLE* resmaxX, DOUBLE* resmaxY);
STDMETHOD(get_LayerCount)(LONG* pVal);
STDMETHOD(get_LayerItem)(LONG i, CString* pVal);
STDMETHOD(get_TextCount)(LONG* pVal);
STDMETHOD(get_TextItem)(LONG i, CFoundText &pVal);
STDMETHOD(get_paperColor)(LONG* pVal);
STDMETHOD(put_paperColor)(LONG newVal);
STDMETHOD(ReplaceColor)(LONG paperColor, LONG oldColor, LONG newColor);
int FindTexts(const CString &findText);
int DPtoDWG(LONG findX, LONG findY, DOUBLE* resX, DOUBLE* resY);
int DWGExtents(DOUBLE* resminX, DOUBLE* resminY, DOUBLE* resmaxX, DOUBLE* resmaxY);
int get_LayerCount(LONG* pVal);
int get_LayerItem(LONG i, CString* pVal);
int get_TextCount(LONG* pVal);
int get_TextItem(LONG i, CFoundText &pVal);
int get_paperColor(LONG* pVal);
int put_paperColor(LONG newVal);
int ReplaceColor(LONG paperColor, LONG oldColor, LONG newColor);
CSize &get_Size();
void set_progress_action(WHIP2DC_Progress_Action action, void * param)

12
SlnkDWFImpl/myEPlotSectionImpl.cpp
View File

@@ -93,7 +93,7 @@ double CEPlotSectionImpl::get_PaperClipHeight()
return -1; // Invalid
}
STDMETHODIMP CEPlotSectionImpl::Open(BOOL bForWrite)
int CEPlotSectionImpl::Open(BOOL bForWrite)
{
#ifdef DWFTK_READ_ONLY
ATLASSERT(!bForWrite);
@@ -189,7 +189,7 @@ void const CEPlotSectionImpl::addProperty( const DWFString& zCategory,
}
HRESULT CEPlotSectionImpl::Read( void *pv, ULONG cb, ULONG *pcbRead)
int CEPlotSectionImpl::Read( void *pv, ULONG cb, ULONG *pcbRead)
{
ATLASSERT(m_pW2DInStream); // Open first!
@@ -201,7 +201,7 @@ HRESULT CEPlotSectionImpl::Read( void *pv, ULONG cb, ULONG *pcbRead)
return S_OK;
};
HRESULT CEPlotSectionImpl::Seek( ULONG cb, ULONG *pcbRead)
int CEPlotSectionImpl::Seek( ULONG cb, ULONG *pcbRead)
{
ATLASSERT(m_pW2DInStream); // Open first!
@@ -225,7 +225,7 @@ HRESULT CEPlotSectionImpl::Write( const void *pv, ULONG cb, ULONG *pcbWritten)
};
#endif
STDMETHODIMP CEPlotSectionImpl::Close(void)
int CEPlotSectionImpl::Close(void)
{
// Don't bother ASSERT(m_pW2DInStream); // Open first!
// if (m_pW2DOutStream)
@@ -236,14 +236,14 @@ STDMETHODIMP CEPlotSectionImpl::Close(void)
return S_OK;
}
STDMETHODIMP CEPlotSectionImpl::get_SourceDescription(CString & pVal)
int CEPlotSectionImpl::get_SourceDescription(CString & pVal)
{
pVal = m_SourceDescription;
return S_OK;
}
#ifndef DWFTK_READ_ONLY
STDMETHODIMP CEPlotSectionImpl::get_PropertiesXML(CString &pVal)
int CEPlotSectionImpl::get_PropertiesXML(CString &pVal)
{
if (m_pSection!=NULL)
{

12
SlnkDWFImpl/myeplotsectionimpl.h
View File

@@ -47,9 +47,9 @@ public:
const CString get_Name();
const CString get_Title();
STDMETHOD(Open)(BOOL bForWrite);
STDMETHOD(Read) ( void *pv, ULONG cb, ULONG *pcbRead);
STDMETHOD(Seek) ( ULONG cb, ULONG *pcbRead);
int Open(BOOL bForWrite);
int Read(void *pv, ULONG cb, ULONG *pcbRead);
int Seek(ULONG cb, ULONG *pcbRead);
const DWFProperty* const findProperty( const DWFString& zName,
const DWFString& zCategory = L"" );
void const addProperty( const DWFString& zCategory,
@@ -61,12 +61,12 @@ public:
bool SaveAsAscii(const CString &destpath, EPlot_Progress_Action action = NULL);
STDMETHOD(Write)( const void *pv, ULONG cb,ULONG *pcbWritten);
#endif
STDMETHOD(Close)(void);
int Close(void);
ULONG get_PaperColor();
DWFToolkit::DWFEPlotSection* const get_Section() { return m_pSection; };
STDMETHOD(get_SourceDescription)(CString &pVal);
int get_SourceDescription(CString &pVal);
#ifndef DWFTK_READ_ONLY
STDMETHOD(get_PropertiesXML)(CString & pVal);
int get_PropertiesXML(CString & pVal);
#endif
double get_PaperClipWidth();
double get_PaperClipHeight();