Resolves: fdo#36534 rework SvxSimpleTable to not manage its own parent

8 files changed, 17 insertions, 10 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index 867eee8997b1..65c69f691aff 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -61,7 +61,8 @@ private:
     SignatureInformations maCertsToIgnore;
 
     FixedText           maHintFT;
-    SvxSimpleTable      maCertLB;   // #i48648 now SvHeaderTabListBox
+    SvxSimpleTableContainer m_aCertLBContainer;
+    SvxSimpleTable      maCertLB;
 
     PushButton          maViewBtn;
 
@@ -73,7 +74,6 @@ private:
     sal_Bool                mbInitialized;
 
     sal_uInt16              GetSelectedEntryPos( void ) const;
-//  DECL_LINK(          Initialize, void* );
     DECL_LINK(          ViewButtonHdl, Button* );
     DECL_LINK(          CertificateHighlightHdl, void* );
     DECL_LINK(          CertificateSelectHdl, void* );
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index 1734d69aeb4a..fa0ca5963353 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -114,7 +114,8 @@ public:
 class CertificateViewerDetailsTP : public CertificateViewerTP
 {
 private:
-    SvxSimpleTable      maElementsLB;   // #i48648 now SvHeaderTabListBox
+    SvxSimpleTableContainer m_aElementsLBContainer;
+    SvxSimpleTable      maElementsLB;
     MultiLineEdit       maElementML;
     Font                maStdFont;
     Font                maFixedWidthFont;
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 74a5b8073af6..7bc0a1b29de6 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -80,7 +80,8 @@ private:
     FixedText           maHintDocFT;
     FixedText           maHintBasicFT;
     FixedText           maHintPackageFT;
-    SvxSimpleTable      maSignaturesLB; // #i48648 now SvHeaderTabListBox
+    SvxSimpleTableContainer maSignaturesLBContainer;
+    SvxSimpleTable      maSignaturesLB;
     FixedImage          maSigsValidImg;
     FixedInfo           maSigsValidFI;
     FixedImage          maSigsInvalidImg;
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index da4a43e5cf60..178d44555f9b 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -138,7 +138,8 @@ class MacroSecurityTrustedSourcesTP : public MacroSecurityTP
 private:
     FixedLine           maTrustCertFL;
     ReadOnlyImage       maTrustCertROFI;
-    SvxSimpleTable      maTrustCertLB;  // #i48648 now SvHeaderTabListBox
+    SvxSimpleTableContainer m_aTrustCertLBContainer;
+    SvxSimpleTable      maTrustCertLB;
     PushButton          maAddCertPB;
     PushButton          maViewCertPB;
     PushButton          maRemoveCertPB;
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 873c537399ab..a251654bc264 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -68,7 +68,8 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X
     :ModalDialog    ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTCHOOSER ) )
     ,maCertsToIgnore( _rCertsToIgnore )
     ,maHintFT       ( this, XMLSEC_RES( FT_HINT_SELECT ) )
-    ,maCertLB       ( this, XMLSEC_RES( LB_SIGNATURES ) )
+    ,m_aCertLBContainer(this, XMLSEC_RES(LB_SIGNATURES))
+    ,maCertLB(m_aCertLBContainer)
     ,maViewBtn      ( this, XMLSEC_RES( BTN_VIEWCERT ) )
     ,maBottomSepFL  ( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
     ,maOKBtn        ( this, XMLSEC_RES( BTN_OK ) )
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 1a75d47931cd..1c69f9c2161b 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -255,7 +255,8 @@ void CertificateViewerDetailsTP::InsertElement( const String& _rField, const Str
 
 CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, CertificateViewer* _pDlg )
     :CertificateViewerTP    ( _pParent, XMLSEC_RES( RID_XMLSECTP_DETAILS ), _pDlg  )
-    ,maElementsLB           ( this, XMLSEC_RES( LB_ELEMENTS ) )
+    ,m_aElementsLBContainer(this, XMLSEC_RES(LB_ELEMENTS))
+    ,maElementsLB(m_aElementsLBContainer)
     ,maElementML            ( this, XMLSEC_RES( ML_ELEMENT ) )
     ,maStdFont              ( maElementML.GetControlFont() )
     ,maFixedWidthFont       ( OutputDevice::GetDefaultFont( DEFAULTFONT_UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) )
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index a40e1626404e..471e7fbb6f9e 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -191,7 +191,8 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
     ,maHintDocFT        ( this, XMLSEC_RES( FT_HINT_DOC ) )
     ,maHintBasicFT      ( this, XMLSEC_RES( FT_HINT_BASIC ) )
     ,maHintPackageFT    ( this, XMLSEC_RES( FT_HINT_PACK ) )
-    ,maSignaturesLB     ( this, XMLSEC_RES( LB_SIGNATURES ) )
+    ,maSignaturesLBContainer(this, XMLSEC_RES(LB_SIGNATURES))
+    ,maSignaturesLB(maSignaturesLBContainer)
     ,maSigsValidImg     ( this, XMLSEC_RES( IMG_STATE_VALID ) )
     ,maSigsValidFI      ( this, XMLSEC_RES( FI_STATE_VALID ) )
     ,maSigsInvalidImg   ( this, XMLSEC_RES( IMG_STATE_BROKEN ) )
@@ -209,7 +210,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
     ,m_bHasDocumentSignature(bHasDocumentSignature)
     ,m_bWarningShowSignMacro(false)
 {
-    // --> PB #i48253 the tablistbox needs its own unique id
+    // #i48253# the tablistbox needs its own unique id
     maSignaturesLB.Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG );
     Size aControlSize( maSignaturesLB.GetSizePixel() );
     aControlSize = maSignaturesLB.PixelToLogic( aControlSize, MapMode( MAP_APPFONT ) );
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 90c7179e9c64..c50eb835a4fc 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -337,7 +337,8 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP( Window* _pParent,
     :MacroSecurityTP    ( _pParent, XMLSEC_RES( RID_XMLSECTP_TRUSTSOURCES ), _pDlg )
     ,maTrustCertFL      ( this, XMLSEC_RES( FL_TRUSTCERT ) )
     ,maTrustCertROFI    ( this, XMLSEC_RES( FI_TRUSTCERT_RO ) )
-    ,maTrustCertLB      ( this, XMLSEC_RES( LB_TRUSTCERT ) )
+    ,m_aTrustCertLBContainer(this, XMLSEC_RES(LB_TRUSTCERT))
+    ,maTrustCertLB(m_aTrustCertLBContainer)
     ,maAddCertPB        ( this, XMLSEC_RES( PB_ADD_TRUSTCERT ) )
     ,maViewCertPB       ( this, XMLSEC_RES( PB_VIEW_TRUSTCERT ) )
     ,maRemoveCertPB     ( this, XMLSEC_RES( PB_REMOVE_TRUSTCERT ) )