CWS-TOOLING: integrate CWS tl79

7 files changed, 43 insertions, 307 deletions

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 685fa024fa62..b360a5cedfde 100644..100755
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -1329,17 +1329,10 @@ SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet
     ,maMacroSecFL       ( this, CUI_RES( FL_SEC_MACROSEC ) )
     ,maMacroSecFI       ( this, CUI_RES( FI_SEC_MACROSEC ) )
     ,maMacroSecPB       ( this, CUI_RES( PB_SEC_MACROSEC ) )
-    ,maFilesharingFL    ( this, CUI_RES( FL_SEC_FILESHARING ) )
-    ,maRecommReadOnlyCB ( this, CUI_RES( CB_SEC_RECOMMREADONLY ) )
-    ,maRecordChangesCB  ( this, CUI_RES( CB_SEC_RECORDCHANGES ) )
-    ,maProtectRecordsPB ( this, CUI_RES( PB_SEC_PROTRECORDS ) )
 
     ,mpSecOptions       ( new SvtSecurityOptions )
     ,mpSecOptDlg        ( NULL )
-    ,meRedlingMode      ( RL_NONE )
 
-    ,msProtectRecordsStr(               CUI_RES( STR_SEC_PROTRECORDS ) )
-    ,msUnprotectRecordsStr(             CUI_RES( STR_SEC_UNPROTRECORDS ) )
     ,msPasswordStoringDeactivateStr(    CUI_RES( STR_SEC_NOPASSWDSAVE ) )
 
 {
@@ -1353,8 +1346,6 @@ SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet
     maMasterPasswordCB.SetClickHdl( LINK( this, SvxSecurityTabPage, MasterPasswordCBHdl ) );
     maShowConnectionsPB.SetClickHdl( LINK( this, SvxSecurityTabPage, ShowPasswordsHdl ) );
     maMacroSecPB.SetClickHdl( LINK( this, SvxSecurityTabPage, MacroSecPBHdl ) );
-    maProtectRecordsPB.SetClickHdl( LINK( this, SvxSecurityTabPage, ProtectRecordsPBHdl ) );
-    maRecordChangesCB.SetClickHdl( LINK( this, SvxSecurityTabPage, RecordChangesCBHdl ) );
 
     ActivatePage( rSet );
 }
@@ -1524,127 +1515,6 @@ IMPL_LINK( SvxSecurityTabPage, MacroSecPBHdl, void*, EMPTYARG )
     return 0;
 }
 
-namespace
-{
-    enum RedlineFunc    { RF_ON, RF_PROTECT };
-
-    const SfxBoolItem* ExecuteRecordChangesFunc( SvxSecurityTabPage::RedliningMode _eMode, RedlineFunc _eFunc, BOOL _bVal, Window* _pParent = NULL )
-    {
-        const SfxBoolItem* pRet = NULL;
-
-        if( _eMode != SvxSecurityTabPage::RL_NONE )
-        {
-            USHORT nSlot;
-            if ( _eMode == SvxSecurityTabPage::RL_WRITER )
-                nSlot = ( _eFunc == RF_ON )? FN_REDLINE_ON : FN_REDLINE_PROTECT;
-            else
-                nSlot = ( _eFunc == RF_ON )? FID_CHG_RECORD : SID_CHG_PROTECT;
-
-            // execute
-            SfxViewShell* pViewSh = SfxViewShell::Current();
-            if( pViewSh )
-            {
-                bool bNeedItem = ( _eMode == SvxSecurityTabPage::RL_WRITER || _eFunc != RF_ON );
-                SfxBoolItem* pItem = bNeedItem ? new SfxBoolItem( nSlot, _bVal ) : NULL;
-                SfxDispatcher* pDisp = pViewSh->GetDispatcher();
-                if ( _pParent )
-                {
-                    OfaPtrItem aParentItem( SID_ATTR_PARENTWINDOW, _pParent );
-                    pRet = static_cast< const SfxBoolItem* >(
-                        pDisp->Execute( nSlot, SFX_CALLMODE_SYNCHRON, &aParentItem, pItem, 0L ) );
-                }
-                else
-                    pRet = static_cast< const SfxBoolItem* >(
-                        pDisp->Execute( nSlot, SFX_CALLMODE_SYNCHRON, pItem, 0L ) );
-                delete pItem;
-            }
-        }
-
-        return pRet;
-    }
-
-    bool QueryState( USHORT _nSlot, bool& _rValue )
-    {
-        bool bRet = false;
-
-        SfxViewShell* pViewSh = SfxViewShell::Current();
-        if( pViewSh )
-        {
-            const SfxPoolItem* pItem;
-            SfxDispatcher* pDisp = pViewSh->GetDispatcher();
-            bRet = SFX_ITEM_AVAILABLE <= pDisp->QueryState( _nSlot, pItem );
-            if( bRet )
-                _rValue = ( static_cast< const SfxBoolItem* >( pItem ) )->GetValue();
-        }
-
-        return bRet;
-    }
-
-    bool QueryRecordChangesProtectionState( SvxSecurityTabPage::RedliningMode _eMode, bool& _rValue )
-    {
-        bool bRet = false;
-
-        if( _eMode != SvxSecurityTabPage::RL_NONE )
-        {
-            USHORT nSlot = ( _eMode == SvxSecurityTabPage::RL_WRITER )? FN_REDLINE_PROTECT : SID_CHG_PROTECT;
-            bRet = QueryState( nSlot, _rValue );
-        }
-
-        return bRet;
-    }
-
-    bool QueryRecordChangesState( SvxSecurityTabPage::RedliningMode _eMode, bool& _rValue )
-    {
-        bool bRet = false;
-
-        if( _eMode != SvxSecurityTabPage::RL_NONE )
-        {
-            USHORT nSlot = ( _eMode == SvxSecurityTabPage::RL_WRITER )? FN_REDLINE_ON : FID_CHG_RECORD;
-            bRet = QueryState( nSlot, _rValue );
-        }
-
-        return bRet;
-    }
-}
-
-IMPL_LINK( SvxSecurityTabPage, RecordChangesCBHdl, void*, EMPTYARG )
-{
-    ExecuteRecordChangesFunc( meRedlingMode, RF_ON, maRecordChangesCB.IsChecked(), this );
-    CheckRecordChangesState();
-    return 0;
-}
-
-IMPL_LINK( SvxSecurityTabPage, ProtectRecordsPBHdl, void*, EMPTYARG )
-{
-    bool bProt;
-    QueryRecordChangesProtectionState( meRedlingMode, bProt );
-    ExecuteRecordChangesFunc( meRedlingMode, RF_PROTECT, !bProt, this );
-    CheckRecordChangesState();
-
-    if ( QueryRecordChangesProtectionState( meRedlingMode, bProt ) )
-    {
-        // RecordChangesCB is enabled if protection is off
-        maRecordChangesCB.Enable( !bProt );
-        // toggle text of button "Protect" <-> "Unprotect"
-        String sNewText = bProt ? msUnprotectRecordsStr : msProtectRecordsStr;
-        maProtectRecordsPB.SetText( sNewText );
-    }
-    return 0;
-}
-
-void SvxSecurityTabPage::CheckRecordChangesState( void )
-{
-    bool bVal;
-    if( QueryRecordChangesState( meRedlingMode, bVal ) )
-    {
-        maRecordChangesCB.Enable();
-        maRecordChangesCB.Check( bVal );
-    }
-    else
-        maRecordChangesCB.Disable();        // because now we don't know the state!
-
-    maProtectRecordsPB.Enable( QueryRecordChangesProtectionState( meRedlingMode, bVal ) );
-}
 
 void SvxSecurityTabPage::InitControls()
 {
@@ -1661,30 +1531,13 @@ void SvxSecurityTabPage::InitControls()
         maMacroSecFL.Hide();
         maMacroSecFI.Hide();
         maMacroSecPB.Hide();
-
-        // rearrange the following controls
-        Point aNewPos = maFilesharingFL.GetPosPixel();
-        long nDelta = aNewPos.Y() - maMacroSecFL.GetPosPixel().Y();
-
-        Window* pWins[] =
-        {
-            &maFilesharingFL, &maRecommReadOnlyCB, &maRecordChangesCB, &maProtectRecordsPB
-        };
-        Window** pCurrent = pWins;
-        const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] );
-        for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent )
-        {
-            aNewPos = (*pCurrent)->GetPosPixel();
-            aNewPos.Y() -= nDelta;
-            (*pCurrent)->SetPosPixel( aNewPos );
-        }
     }
 
     // one button too small for its text?
     sal_Int32 i = 0;
     long nBtnTextWidth = 0;
     Window* pButtons[] = { &maSecurityOptionsPB, &maMasterPasswordPB,
-                            &maShowConnectionsPB, &maMacroSecPB, &maProtectRecordsPB };
+                           &maShowConnectionsPB, &maMacroSecPB };
     Window** pButton = pButtons;
     const sal_Int32 nBCount = sizeof( pButtons ) / sizeof( pButtons[ 0 ] );
     for ( ; i < nBCount; ++i, ++pButton )
@@ -1724,8 +1577,7 @@ void SvxSecurityTabPage::InitControls()
         }
 
         Window* pControls[] = { &maSecurityOptionsFI, &maSavePasswordsCB,
-                                &maMasterPasswordFI, &maMacroSecFI,
-                                &maRecommReadOnlyCB, &maRecordChangesCB };
+                                &maMasterPasswordFI, &maMacroSecFI };
         Window** pControl = pControls;
         const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[ 0 ] );
         for ( i = 0; i < nCCount; ++i, ++pControl )
@@ -1844,15 +1696,6 @@ BOOL SvxSecurityTabPage::FillItemSet( SfxItemSet& )
         CheckAndSave( *mpSecOptions, SvtSecurityOptions::E_CTRLCLICK_HYPERLINK, mpSecOptDlg->IsCtrlHyperlinkChecked(), bModified );
     }
 
-    // document options
-    SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
-    if( pCurDocShell )
-    {
-        if( pCurDocShell->HasSecurityOptOpenReadOnly() )
-            pCurDocShell->SetSecurityOptOpenReadOnly( maRecommReadOnlyCB.IsChecked() );
-
-    }
-
     return bModified;
 }
 
@@ -1860,65 +1703,10 @@ BOOL SvxSecurityTabPage::FillItemSet( SfxItemSet& )
 
 void SvxSecurityTabPage::Reset( const SfxItemSet& )
 {
-    String sNewText = msProtectRecordsStr;
     SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
     if( pCurDocShell )
     {
-        bool bIsHTMLDoc = false;
-        SfxViewShell* pViewSh = SfxViewShell::Current();
-        if( pViewSh )
-        {
-            const SfxPoolItem* pItem;
-            SfxDispatcher* pDisp = pViewSh->GetDispatcher();
-            if ( SFX_ITEM_AVAILABLE <= pDisp->QueryState( SID_HTML_MODE, pItem ) )
-            {
-                USHORT nMode = static_cast< const SfxUInt16Item* >( pItem )->GetValue();
-                bIsHTMLDoc = ( ( nMode & HTMLMODE_ON ) != 0 );
-            }
-        }
-
-        sal_Bool bIsReadonly = pCurDocShell->IsReadOnly();
-        if( pCurDocShell->HasSecurityOptOpenReadOnly() && !bIsHTMLDoc )
-        {
-            maRecommReadOnlyCB.Check( pCurDocShell->IsSecurityOptOpenReadOnly() );
-            maRecommReadOnlyCB.Enable( !bIsReadonly );
-        }
-        else
-            maRecommReadOnlyCB.Disable();
-
-        bool bVal;
-        if ( QueryRecordChangesState( RL_WRITER, bVal ) && !bIsHTMLDoc )
-            meRedlingMode = RL_WRITER;
-        else if( QueryRecordChangesState( RL_CALC, bVal ) )
-            meRedlingMode = RL_CALC;
-        else
-            meRedlingMode = RL_NONE;
-
-        if ( meRedlingMode != RL_NONE )
-        {
-            maRecordChangesCB.Check( bVal );
-            maRecordChangesCB.Enable( !bVal && !bIsReadonly );
-            maProtectRecordsPB.Enable(
-                QueryRecordChangesProtectionState( meRedlingMode, bVal ) && !bIsReadonly );
-            // set the right text
-            if ( bVal )
-                sNewText = msUnprotectRecordsStr;
-        }
-        else
-        {
-            // only Writer and Calc support redlining
-            maRecordChangesCB.Disable();
-            maProtectRecordsPB.Disable();
-        }
     }
-    else
-    {   // no doc -> hide document settings
-        maRecommReadOnlyCB.Disable();
-        maRecordChangesCB.Disable();
-        maProtectRecordsPB.Disable();
-    }
-
-    maProtectRecordsPB.SetText( sNewText );
 }
 
 //added by jmeng begin
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 09de829ae132..1bd09225ac9b 100644..100755
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -116,13 +116,7 @@
 #define FL_SEC_MACROSEC             19
 #define FI_SEC_MACROSEC             20
 #define PB_SEC_MACROSEC             21
-#define FL_SEC_FILESHARING          22
-#define CB_SEC_RECOMMREADONLY       23
-#define CB_SEC_RECORDCHANGES        24
-#define PB_SEC_PROTRECORDS          25
 
-#define STR_SEC_PROTRECORDS         10
-#define STR_SEC_UNPROTRECORDS       11
 #define STR_SEC_NOPASSWDSAVE        12
 
 #define TP_WIDTH                    260
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 588549787d99..f75ff7d05c44 100644..100755
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -232,8 +232,6 @@ class SvxSecurityTabPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
-public:
-    enum RedliningMode  { RL_NONE, RL_WRITER, RL_CALC };
 
 private:
     FixedLine           maSecurityOptionsFL;
@@ -251,17 +249,10 @@ private:
     FixedInfo           maMacroSecFI;
     PushButton          maMacroSecPB;
 
-    FixedLine           maFilesharingFL;
-    CheckBox            maRecommReadOnlyCB;
-    CheckBox            maRecordChangesCB;
-    PushButton          maProtectRecordsPB;
 
     SvtSecurityOptions*         mpSecOptions;
     svx::SecurityOptionsDialog* mpSecOptDlg;
 
-    RedliningMode       meRedlingMode;
-    String              msProtectRecordsStr;
-    String              msUnprotectRecordsStr;
     String              msPasswordStoringDeactivateStr;
 
     DECL_LINK(          SecurityOptionsHdl, PushButton* );
@@ -270,10 +261,7 @@ private:
     DECL_LINK(          MasterPasswordCBHdl, void* );
     DECL_LINK(          ShowPasswordsHdl, PushButton* );
     DECL_LINK(          MacroSecPBHdl, void* );
-    DECL_LINK(          RecordChangesCBHdl, void* );
-    DECL_LINK(          ProtectRecordsPBHdl, void* );
 
-    void                CheckRecordChangesState( void );
     void                InitControls();
 
                 SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 2b2829d9f2e5..9023dfa52394 100644..100755
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -507,37 +507,6 @@ TabPage RID_SVXPAGE_INET_SECURITY
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Macro Security...";
     };
-    FixedLine FL_SEC_FILESHARING
-    {
-        Pos = MAP_APPFONT( COL_0, ROW_7 );
-        Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "File sharing options for this document";
-    };
-    CheckBox CB_SEC_RECOMMREADONLY
-    {
-        Pos = MAP_APPFONT( COL_1, ROW_8 );
-        Size = MAP_APPFONT( COL_2-COL_1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "Open this document in read-only mode";
-    };
-    CheckBox CB_SEC_RECORDCHANGES
-    {
-        Pos = MAP_APPFONT( COL_1, ROW_9 );
-        Size = MAP_APPFONT( COL_2-COL_1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "Record changes";
-    };
-    PushButton PB_SEC_PROTRECORDS
-    {
-        Pos = MAP_APPFONT( COL_3, ROW_9-2 );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-    };
-    String STR_SEC_PROTRECORDS
-    {
-        Text [ en-US ] = "Protect...";
-    };
-    String STR_SEC_UNPROTRECORDS
-    {
-        Text [ en-US ] = "Unprotect...";
-    };
     String STR_SEC_NOPASSWDSAVE
     {
         Text [ en-US ] = "Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.\n\nDo you want to delete password list and reset master password?";
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 60093fc37137..4d48aad47555 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -94,7 +94,6 @@ private:
 
     FixedLine           maBottomSepFL;
     OKButton            maOKBtn;
-    CancelButton        maCancelBtn;
     HelpButton          maHelpBtn;
 
     ::rtl::OUString m_sODFVersion;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 5ea3fbb47a38..df032dcbe5ef 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -203,7 +203,6 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
     ,maRemoveBtn        ( this, XMLSEC_RES( BTN_REMOVECERT ) )
     ,maBottomSepFL      ( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
     ,maOKBtn            ( this, XMLSEC_RES( BTN_OK ) )
-    ,maCancelBtn        ( this, XMLSEC_RES( BTN_CANCEL ) )
     ,maHelpBtn          ( this, XMLSEC_RES( BTN_HELP ) )
     ,m_sODFVersion (sODFVersion)
     ,m_bHasDocumentSignature(bHasDocumentSignature)
@@ -212,7 +211,10 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
     // --> PB #i48253 the tablistbox needs its own unique id
     maSignaturesLB.Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG );
     // <--
-    static long nTabs[] = { 4, 0, 6*DS_LB_WIDTH/100, 36*DS_LB_WIDTH/100, 74*DS_LB_WIDTH/100 };
+    Size aControlSize( maSignaturesLB.GetSizePixel() );
+    aControlSize = maSignaturesLB.PixelToLogic( aControlSize, MapMode( MAP_APPFONT ) );
+    const long nControlWidth = aControlSize.Width();
+    static long nTabs[] = { 4, 0, 6*nControlWidth/100, 36*nControlWidth/100, 74*nControlWidth/100 };
     maSignaturesLB.SetTabs( &nTabs[ 0 ] );
     maSignaturesLB.InsertHeaderEntry( String( XMLSEC_RES( STR_HEADERBAR ) ) );
 
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index e0cada1d0d5c..87d2de520103 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -32,7 +32,7 @@
 ModalDialog RID_XMLSECDLG_DIGSIG
 {
     HelpId = HID_XMLSEC_DLG_DIGSIG;
-    Size = MAP_APPFONT( DS_WIDTH, DS_HEIGHT );
+    Size = MAP_APPFONT( 234, 191 );
     OutputSize = TRUE;
     Closeable = TRUE;
     Moveable = TRUE;
@@ -42,30 +42,30 @@ ModalDialog RID_XMLSECDLG_DIGSIG
 
     FixedText FT_HINT_DOC
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_0 );
-        Size = MAP_APPFONT( DS_COL_7-DS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
+        Pos = MAP_APPFONT( 6, 3 );
+        Size = MAP_APPFONT( 222, 8 );
         Hide = TRUE;
         Text [ en-US ] = "The following have signed the document content:";
     };
     FixedText FT_HINT_BASIC
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_0 );
-        Size = MAP_APPFONT( DS_COL_7-DS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
+        Pos = MAP_APPFONT( 6, 3 );
+        Size = MAP_APPFONT( 222, 8 );
         Hide = TRUE;
         Text [ en-US ] = "The following have signed the document macro:";
     };
     FixedText FT_HINT_PACK
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_0 );
-        Size = MAP_APPFONT( DS_COL_7-DS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
+        Pos = MAP_APPFONT( 6, 3 );
+        Size = MAP_APPFONT( 222, 8 );
         Hide = TRUE;
         Text [ en-US ] = "The following have signed this package:";
     };
     Control LB_SIGNATURES
     {
         HelpId = HID_XMLSEC_CTRL_SIGNATURESDLG;
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_1 );
-        Size = MAP_APPFONT( DS_LB_WIDTH, DS_ROW_2-DS_ROW_1 );
+        Pos = MAP_APPFONT( 6, 14 );
+        Size = MAP_APPFONT( 222, 109 );
         SVLook = TRUE;
         Border = TRUE;
     };
@@ -88,8 +88,8 @@ ModalDialog RID_XMLSECDLG_DIGSIG
 
     FixedImage IMG_STATE_VALID
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_2A );
-        Size = MAP_APPFONT( IMG1_WIDTH, IMG1_HEIGHT );
+        Pos = MAP_APPFONT( 6, 127 );
+        Size = MAP_APPFONT( 33, 22 );
         Fixed = Image
         {
             ImageBitmap = Bitmap { File = "signet_11x16.png"; };
@@ -98,22 +98,22 @@ ModalDialog RID_XMLSECDLG_DIGSIG
     };
     FixedText FI_STATE_VALID
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_2A );
-        Size = MAP_APPFONT( DS_COL_7-DS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
+        Pos = MAP_APPFONT( 6, 127 );
+        Size = MAP_APPFONT( 222, 8 );
         Hide = TRUE;
         Text [ en-US ] = "The signatures in this document are valid";
     };
     FixedText FI_STATE_OLDSIGNATURE
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_2A );
-        Size = MAP_APPFONT( DS_COL_7-DS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
+        Pos = MAP_APPFONT( 6, 127 );
+        Size = MAP_APPFONT( 222, 8 );
         Hide = TRUE;
         Text [ en-US ] = "Not all parts of the document are signed";
     };
     FixedImage IMG_STATE_BROKEN
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_2A );
-        Size = MAP_APPFONT( IMG1_WIDTH, IMG1_HEIGHT );
+        Pos = MAP_APPFONT( 6, 127 );
+        Size = MAP_APPFONT( 33, 22 );
         Fixed = Image
         {
             ImageBitmap = Bitmap { File = "caution_11x16.png"; };
@@ -122,15 +122,15 @@ ModalDialog RID_XMLSECDLG_DIGSIG
     };
     FixedText FI_STATE_BROKEN
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_2A );
-        Size = MAP_APPFONT( DS_COL_7-DS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
+        Pos = MAP_APPFONT( 6, 127 );
+        Size = MAP_APPFONT( 222, 8 );
         Hide = TRUE;
         Text [ en-US ] = "The signatures in this document are invalid";
     };
     FixedImage IMG_STATE_NOTVALIDATED
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_2A );
-        Size = MAP_APPFONT( IMG1_WIDTH, IMG1_HEIGHT );
+        Pos = MAP_APPFONT( 6, 127 );
+        Size = MAP_APPFONT( 33, 22 );
         Fixed = Image
         {
             ImageBitmap = Bitmap { File = "notcertificate_16.png"; };
@@ -139,48 +139,44 @@ ModalDialog RID_XMLSECDLG_DIGSIG
     };
     FixedText FI_STATE_NOTVALIDATED
     {
-        Pos = MAP_APPFONT( DS_COL_0, DS_ROW_2A );
-        Size = MAP_APPFONT( DS_COL_7-DS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
+        Pos = MAP_APPFONT( 6, 127 );
+        Size = MAP_APPFONT( 222, 8 );
         Hide = TRUE;
     };
     PushButton BTN_VIEWCERT
     {
-        Pos = MAP_APPFONT( DS_COL_1, DS_ROW_3 );
-        Size = MAP_APPFONT( DS_COL_2-DS_COL_1, RSC_CD_PUSHBUTTON_HEIGHT );
+        Pos = MAP_APPFONT( 6, 142 );
+        Size = MAP_APPFONT( 70, 14 );
         Text [ en-US ] = "View Certificate...";
     };
     PushButton BTN_ADDCERT
     {
-        Pos = MAP_APPFONT( DS_COL_3, DS_ROW_3 );
-        Size = MAP_APPFONT( DS_COL_4-DS_COL_3, RSC_CD_PUSHBUTTON_HEIGHT );
-        Text [ en-US ] = "Add...";
+        Pos = MAP_APPFONT( 82, 142 );
+        Size = MAP_APPFONT( 70, 14 );
+        Text [ en-US ] = "Sign Document...";
     };
     PushButton BTN_REMOVECERT
     {
-        Pos = MAP_APPFONT( DS_COL_5, DS_ROW_3 );
-        Size = MAP_APPFONT( DS_COL_6-DS_COL_5, RSC_CD_PUSHBUTTON_HEIGHT );
+        Pos = MAP_APPFONT( 158, 142 );
+        Size = MAP_APPFONT( 70, 14 );
         Text [ en-US ] = "Remove";
     };
     FixedLine FL_BOTTOM_SEP
     {
-        Pos = MAP_APPFONT( 0, DLGS_BOTTOM_FL_Y( DS_HEIGHT ) );
-        Size = MAP_APPFONT( DS_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+        Pos = MAP_APPFONT( 0, 160 );
+        Size = MAP_APPFONT( 234, 8 );
     };
     OKButton BTN_OK
     {
         DefButton = TRUE;
-        Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( DS_WIDTH ), DLGS_BOTTOM_BTN_Y( DS_HEIGHT ) );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT( DLGS_BOTTOM_CANCEL_X( DS_WIDTH ), DLGS_BOTTOM_BTN_Y( DS_HEIGHT ) );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+        Pos = MAP_APPFONT( 178, 171 );
+        Size = MAP_APPFONT( 50, 14 );
+        Text [ en-US ] = "Close";
     };
     HelpButton BTN_HELP
     {
-        Pos = MAP_APPFONT( DLGS_BOTTOM_HELP_X( DS_WIDTH ), DLGS_BOTTOM_BTN_Y( DS_HEIGHT ) );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+        Pos = MAP_APPFONT( 6, 171 );
+        Size = MAP_APPFONT( 50, 14 );
     };
     Image IMG_STATE_VALID_HC
     {