[Libreoffice-commits] .: xmlsecurity/source

[Noel Power]

 xmlsecurity/source/dialogs/dialogs.hrc         |   12 ++----------
 xmlsecurity/source/dialogs/macrosecurity.cxx   |    2 --
 xmlsecurity/source/dialogs/resourcemanager.cxx |    3 ---
 xmlsecurity/source/dialogs/warnings.cxx        |    6 ------
 4 files changed, 2 insertions(+), 21 deletions(-)

New commits:
commit be428161b58fb2882073938575fb6bfce88e0edd
Author: Luke Petrolekas <luke.petrolekas at gmail.com>
Date:   Thu May 26 18:34:08 2011 -0400

    Remove commented out code.

diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index 9ea22bf..a7c547d 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -84,25 +84,19 @@
 #define FI_STATE_NOTVALIDATED           12
 #define FI_STATE_OLDSIGNATURE           16
 
-//#define DS_WIDTH						DLGS_WIDTH
-//#define DS_HEIGHT						DLGS_HEIGHT
 #define DS_BTNWIDTH_1					70
 #define DS_BTNSPACE_X					RSC_SP_CTRL_X
 #define DS_WIDTH						(RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT+2*DS_BTNSPACE_X+3*DS_BTNWIDTH_1)
 #define DS_HEIGHT						(DLGS_WIDTH*2/3)
 
 #define DS_COL_0						RSC_SP_DLG_INNERBORDER_LEFT
-//#define DS_COL_MID						(DS_WIDTH/2)
-//#define DS_COL_3						(DS_COL_MID-(DS_BTNWIDTH_1/2))
-//#define DS_COL_4						(DS_COL_2+DS_BTNWIDTH_1)
-//#define DS_COL_2						(DS_COL_3-DS_BTNSPACE_X)
-//#define DS_COL_1						(DS_COL_2-DS_BTNWIDTH_1)
+
 #define DS_COL_1						DS_COL_0
 #define DS_COL_2						(DS_COL_1+DS_BTNWIDTH_1)
 #define DS_COL_3						(DS_COL_2+DS_BTNSPACE_X)
 #define DS_COL_4						(DS_COL_3+DS_BTNWIDTH_1)
 #define DS_COL_5						(DS_COL_4+DS_BTNSPACE_X)
-//#define	DS_COL_6						(DS_COL_5+DS_BTNWIDTH_1)
+
 #define DS_COL_7						(DS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
 #define	DS_COL_6						DS_COL_7
 
@@ -242,8 +236,6 @@
 #define CVP_ROW_3                       (CVP_ROW_2+RSC_CD_PUSHBUTTON_HEIGHT)
 #define CVP_ROW_4                       (CVP_ROW_3+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
 
-//#define CV_ROW_0A                      (CV_ROW_0+RSC_SP_CTRL_DESC_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-//#define CV_ROW_2A                      (CV_ROW_2+RSC_SP_CTRL_DESC_Y+RSC_CD_FIXEDTEXT_HEIGHT)
 
 // --------- tab dialog macro security ---------
 
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index e65ff88..a05b0a9 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -370,8 +370,6 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP( Window* _pParent,
     mbAuthorsReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_MACRO_TRUSTEDAUTHORS );
     maTrustCertROFI.Show( mbAuthorsReadonly );
     mbAuthorsReadonly ? maTrustCertLB.DisableTable() : maTrustCertLB.EnableTable();
-//  unused button 
-//    maAddCertPB.Enable( !mbAuthorsReadonly );
 
     FillCertLB();
 
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index cecc68e..8e631a4 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -53,9 +53,6 @@ namespace XmlSec
         if( !pResMgr )
         {
             ByteString	aName( "xmlsec" );
-//    		pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILanguage() );
-//			LanguageType	aLang( LANGUAGE_ENGLISH_US );
-//			pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), aLang );
 // MT: Change to Locale
             pResMgr = ResMgr::CreateResMgr( aName.GetBuffer() );
         }
diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx
index 436eebb..a5cb295 100644
--- a/xmlsecurity/source/dialogs/warnings.cxx
+++ b/xmlsecurity/source/dialogs/warnings.cxx
@@ -77,7 +77,6 @@ MacroWarning::MacroWarning( Window* _pParent, uno::Reference< dcss::xml::crypto:
 
     maViewSignsBtn.SetClickHdl( LINK( this, MacroWarning, ViewSignsBtnHdl ) );
     maEnableBtn.SetClickHdl( LINK( this, MacroWarning, EnableBtnHdl ) );
-//	maDisableBtn.SetClickHdl( LINK( this, MacroWarning, DisableBtnHdl ) );
 
     if( mxCert.is() )
         maSignsFI.SetText( XmlSec::GetContentPart( mxCert->getSubjectName() ) );
@@ -139,9 +138,4 @@ IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG )
     return 0;
 }
 
-/*IMPL_LINK( MacroWarning, DisableBtnHdl, void*, EMPTYARG )
-{
-    return 0;
-}*/
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */