Navigation Menu

Skip to content

Commit

Permalink
Remove invalid/crashing QgsComposerHtml constructor (fixes #12009)
Browse files Browse the repository at this point in the history
  • Loading branch information
wonder-sk committed Jun 18, 2015
1 parent 99c16bb commit 0c5352f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 27 deletions.
3 changes: 0 additions & 3 deletions python/core/composer/qgscomposerhtml.sip
Expand Up @@ -16,9 +16,6 @@ class QgsComposerHtml: QgsComposerMultiFrame

QgsComposerHtml( QgsComposition* c /TransferThis/, bool createUndoCommands );

//should be private - fix for QGIS 3.0
QgsComposerHtml();

~QgsComposerHtml();

/**Sets the source mode for item's HTML content.
Expand Down
21 changes: 0 additions & 21 deletions src/core/composer/qgscomposerhtml.cpp
Expand Up @@ -87,27 +87,6 @@ QgsComposerHtml::QgsComposerHtml( QgsComposition* c, bool createUndoCommands )

}

QgsComposerHtml::QgsComposerHtml()
: QgsComposerMultiFrame( 0, false )
, mContentMode( QgsComposerHtml::Url )
, mWebPage( 0 )
, mLoaded( false )
, mHtmlUnitsToMM( 1.0 )
, mRenderedPage( 0 )
, mEvaluateExpressions( true )
, mUseSmartBreaks( true )
, mMaxBreakDistance( 10 )
, mExpressionFeature( 0 )
, mExpressionLayer( 0 )
, mDistanceArea( 0 )
, mEnableUserStylesheet( false )
, mFetcher( 0 )
{
mDistanceArea = new QgsDistanceArea();
mFetcher = new QgsNetworkContentFetcher();
connect( mFetcher, SIGNAL( finished() ), this, SLOT( frameLoaded() ) );
}

QgsComposerHtml::~QgsComposerHtml()
{
delete mDistanceArea;
Expand Down
3 changes: 0 additions & 3 deletions src/core/composer/qgscomposerhtml.h
Expand Up @@ -41,9 +41,6 @@ class CORE_EXPORT QgsComposerHtml: public QgsComposerMultiFrame

QgsComposerHtml( QgsComposition* c, bool createUndoCommands );

//should be private - fix for QGIS 3.0
QgsComposerHtml();

~QgsComposerHtml();

/**Sets the source mode for item's HTML content.
Expand Down

0 comments on commit 0c5352f

Please sign in to comment.