summaryrefslogtreecommitdiff
path: root/uui/source
diff options
context:
space:
mode:
Diffstat (limited to 'uui/source')
-rw-r--r--uui/source/iahndl.cxx30
-rw-r--r--uui/source/secmacrowarnings.cxx2
-rw-r--r--uui/source/secmacrowarnings.hxx2
3 files changed, 15 insertions, 19 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 30ea6ef76a21..9d5ba366f9d1 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -1156,25 +1156,21 @@ UUIInteractionHelper::handleMacroConfirmRequest(
bool bApprove = false;
- std::unique_ptr< ResMgr > pResMgr( ResMgr::CreateResMgr( "uui" ) );
- if ( pResMgr.get() )
- {
- bool bShowSignatures = aSignInfo.getLength() > 0;
- ScopedVclPtrInstance<MacroWarning> aWarning(
- getParentProperty(), bShowSignatures, *pResMgr.get() );
-
- aWarning->SetDocumentURL( aDocumentURL );
- if ( aSignInfo.getLength() > 1 )
- {
- aWarning->SetStorage( xZipStorage, aDocumentVersion, aSignInfo );
- }
- else if ( aSignInfo.getLength() == 1 )
- {
- aWarning->SetCertificate( aSignInfo[ 0 ].Signer );
- }
+ bool bShowSignatures = aSignInfo.getLength() > 0;
+ ScopedVclPtrInstance<MacroWarning> aWarning(
+ getParentProperty(), bShowSignatures );
- bApprove = aWarning->Execute() == RET_OK;
+ aWarning->SetDocumentURL( aDocumentURL );
+ if ( aSignInfo.getLength() > 1 )
+ {
+ aWarning->SetStorage( xZipStorage, aDocumentVersion, aSignInfo );
}
+ else if ( aSignInfo.getLength() == 1 )
+ {
+ aWarning->SetCertificate( aSignInfo[ 0 ].Signer );
+ }
+
+ bApprove = aWarning->Execute() == RET_OK;
if ( bApprove && xApprove.is() )
xApprove->select();
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index cea5868c08d8..04fb3a6b0b0a 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -64,7 +64,7 @@ namespace
}
-MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr& )
+MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures )
:ModalDialog ( _pParent, "MacroWarnMedium", "uui/ui/macrowarnmedium.ui" )
,mpInfos ( nullptr )
,mbSignedMode ( true )
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index f6eb1e0bd58e..b94a8baeb3c1 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -64,7 +64,7 @@ private:
void InitControls();
public:
- MacroWarning( vcl::Window* pParent, bool _bShowSignatures, ResMgr& rResMgr );
+ MacroWarning( vcl::Window* pParent, bool _bShowSignatures );
virtual ~MacroWarning() override;
virtual void dispose() override;