Kaydet (Commit) 501b1f5c authored tarafından Caolán McNamara's avatar Caolán McNamara

fix dubious casts post VclPtr-ing

Change-Id: I6269eacb7ed1eb5ebd03a9a1b549a3e25e5f00c3
üst d01810b7
...@@ -114,7 +114,7 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg ) ...@@ -114,7 +114,7 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg )
{ {
m_pUpdReqDialog = VclPtr<UpdateRequiredDialog>::Create( nullptr, this ); m_pUpdReqDialog = VclPtr<UpdateRequiredDialog>::Create( nullptr, this );
delete m_pExecuteCmdQueue; delete m_pExecuteCmdQueue;
m_pExecuteCmdQueue = new ExtensionCmdQueue( (DialogHelper*) m_pUpdReqDialog, this, m_xContext ); m_pExecuteCmdQueue = new ExtensionCmdQueue( m_pUpdReqDialog.get(), this, m_xContext );
createPackageList(); createPackageList();
} }
} }
...@@ -122,7 +122,7 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg ) ...@@ -122,7 +122,7 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg )
{ {
m_pExtMgrDialog = VclPtr<ExtMgrDialog>::Create( m_pParent, this ); m_pExtMgrDialog = VclPtr<ExtMgrDialog>::Create( m_pParent, this );
delete m_pExecuteCmdQueue; delete m_pExecuteCmdQueue;
m_pExecuteCmdQueue = new ExtensionCmdQueue( (DialogHelper*) m_pExtMgrDialog, this, m_xContext ); m_pExecuteCmdQueue = new ExtensionCmdQueue( m_pExtMgrDialog.get(), this, m_xContext );
m_pExtMgrDialog->setGetExtensionsURL( m_sGetExtensionsURL ); m_pExtMgrDialog->setGetExtensionsURL( m_sGetExtensionsURL );
createPackageList(); createPackageList();
} }
......
...@@ -70,8 +70,18 @@ public: ...@@ -70,8 +70,18 @@ public:
void createDialog( const bool bCreateUpdDlg ); void createDialog( const bool bCreateUpdDlg );
sal_Int16 execute(); sal_Int16 execute();
Dialog* getDialog() { return m_pExtMgrDialog ? (Dialog*) m_pExtMgrDialog : (Dialog*) m_pUpdReqDialog; } Dialog* getDialog()
DialogHelper* getDialogHelper() { return m_pExtMgrDialog ? (DialogHelper*) m_pExtMgrDialog : (DialogHelper*) m_pUpdReqDialog; } {
if (m_pExtMgrDialog)
return m_pExtMgrDialog.get();
return m_pUpdReqDialog.get();
}
DialogHelper* getDialogHelper()
{
if (m_pExtMgrDialog)
return m_pExtMgrDialog.get();
return m_pUpdReqDialog.get();
}
ExtensionCmdQueue* getCmdQueue() const { return m_pExecuteCmdQueue; } ExtensionCmdQueue* getCmdQueue() const { return m_pExecuteCmdQueue; }
void SetText( const OUString &rTitle ); void SetText( const OUString &rTitle );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment