move xmlsecurity .ui stuff to right place and adapt code to use it

Change-Id: If1f3dbbbef07004ec02a65563524c6c17dc16c00

3 files changed, 23 insertions, 34 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index 8e9b2bac314c..3ce61f2e38da 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -50,16 +50,9 @@ private:
     cssu::Sequence< cssu::Reference< dcss::security::XCertificate > > maCerts;
     SignatureInformations maCertsToIgnore;
 
-    FixedText           maHintFT;
-    SvxSimpleTableContainer m_aCertLBContainer;
-    SvxSimpleTable      maCertLB;
-
-    PushButton          maViewBtn;
-
-    FixedLine           maBottomSepFL;
-    OKButton            maOKBtn;
-    CancelButton        maCancelBtn;
-    HelpButton          maHelpBtn;
+    SvxSimpleTable*     m_pCertLB;
+    PushButton*         m_pViewBtn;
+    OKButton*           m_pOKBtn;
 
     bool                mbInitialized;
 
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 14fbc9a7cf5f..390573d7c6e3 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -67,28 +67,26 @@ private:
     DocumentSignatureMode   meSignatureMode;
     css::uno::Sequence < css::uno::Sequence < css::beans::PropertyValue > > m_manifest;
 
-    FixedText           maHintDocFT;
-    FixedText           maHintBasicFT;
-    FixedText           maHintPackageFT;
-    SvxSimpleTableContainer maSignaturesLBContainer;
-    SvxSimpleTable      maSignaturesLB;
-    FixedImage          maSigsValidImg;
-    FixedInfo           maSigsValidFI;
-    FixedImage          maSigsInvalidImg;
-    FixedInfo           maSigsInvalidFI;
-    FixedImage          maSigsNotvalidatedImg;
-    FixedInfo           maSigsNotvalidatedFI;
-    FixedInfo           maSigsOldSignatureFI;
-
-    PushButton          maViewBtn;
-    PushButton          maAddBtn;
-    PushButton          maRemoveBtn;
-
-    FixedLine           maBottomSepFL;
-    OKButton            maOKBtn;
-    HelpButton          maHelpBtn;
-
-    ::rtl::OUString m_sODFVersion;
+    FixedText*          m_pHintDocFT;
+    FixedText*          m_pHintBasicFT;
+    FixedText*          m_pHintPackageFT;
+    SvxSimpleTable*     m_pSignaturesLB;
+    FixedImage*         m_pSigsValidImg;
+    FixedText*          m_pSigsValidFI;
+    FixedImage*         m_pSigsInvalidImg;
+    FixedText*          m_pSigsInvalidFI;
+    FixedImage*         m_pSigsNotvalidatedImg;
+    FixedText*          m_pSigsNotvalidatedFI;
+    FixedImage*         m_pSigsOldSignatureImg;
+    FixedText*          m_pSigsOldSignatureFI;
+
+    PushButton*         m_pViewBtn;
+    PushButton*         m_pAddBtn;
+    PushButton*         m_pRemoveBtn;
+
+    PushButton*         m_pCloseBtn;
+
+    OUString m_sODFVersion;
     //Signals if the document contains already a document signature. This is only
     //importent when we are signing macros and if the value is true.
     bool m_bHasDocumentSignature;
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc
index 5dee8a7bf3d6..e4393b24f682 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/xmlsecurity/global.hrc
@@ -21,8 +21,6 @@
 
 // global resource ids
 
-#define RID_XMLSECDLG_DIGSIG                1000
-#define RID_XMLSECDLG_CERTCHOOSER           1001
 #define RID_XMLSECDLG_CERTVIEWER            1002
 #define RID_XMLSECTP_GENERAL                1003
 #define RID_XMLSECTP_DETAILS                1004