#i20883#

3 files changed, 13 insertions, 10 deletions

diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index 1751737b7fc7..5acc9152fa5b 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dialogs.hrc,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: gt $ $Date: 2004-07-19 11:08:45 $
+ *  last change: $Author: gt $ $Date: 2004-07-20 05:32:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,7 @@
 #define RID_XMLSECTP_MACROSEC           1006
 #define RID_XMLSECTP_SECLEVEL           1007
 #define RID_XMLSECTP_TRUSTSOURCES       1008
-#define RID_XMLSECTP_SIGNMACROWARN      1009
+#define RID_XMLSECTP_MACROWARN          1009
 
 #define FL_BOTTOM_SEP                   50
 #define BTN_OK                          51
diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx
index 2d34da617214..b888871b1a38 100644
--- a/xmlsecurity/source/dialogs/warnings.cxx
+++ b/xmlsecurity/source/dialogs/warnings.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: warnings.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: gt $ $Date: 2004-07-19 11:09:28 $
+ *  last change: $Author: gt $ $Date: 2004-07-20 05:32:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -155,8 +155,9 @@ MacroWarning::MacroWarning( Window* _pParent )
     maDescr2FI.Hide();
 
     // move hint up to position of signer list
-    maDescr1FI.SetPosPixel( maSignsFI.GetPosPixel() );
+    maDescr1bFI.SetPosPixel( maSignsFI.GetPosPixel() );
 }
+
 MacroWarning::~MacroWarning()
 {
 }
@@ -175,8 +176,10 @@ IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG )
 {
     if( mbSignedMode && maAlwaysTrustCB.IsChecked() )
     {   // insert path into trusted path list
+
     }
 
+    EndDialog( RET_OK );
     return 0;
 }
 
diff --git a/xmlsecurity/source/dialogs/warnings.src b/xmlsecurity/source/dialogs/warnings.src
index b355913795c0..b88743167ca5 100644
--- a/xmlsecurity/source/dialogs/warnings.src
+++ b/xmlsecurity/source/dialogs/warnings.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: warnings.src,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: gt $ $Date: 2004-07-19 11:09:39 $
+ *  last change: $Author: gt $ $Date: 2004-07-20 05:32:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -132,11 +132,11 @@ ModalDialog RID_XMLSECTP_MACROWARN
         Pos = MAP_APPFONT( 0, DLGS_BOTTOM_FL_Y( MW_HEIGHT ) );
         Size = MAP_APPFONT( MW_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
     };
-    OKButton PB_ENABLE
+    PushButton PB_ENABLE
     {
         Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( MW_WIDTH ), DLGS_BOTTOM_BTN_Y( MW_HEIGHT ) );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-        Default = FALSE;
+//      Default = FALSE;
         Text [ de ] = "";
         Text [ en-US ] = "Enable Macros";
     };