convert versions of dialog to .ui

Change-Id: I1be2211b5c936e6e00f2fe81883b8fb1e67ef550

10 files changed, 22 insertions, 22 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index 51544c59a26b..3904b717e18d 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -20,10 +20,10 @@
 #ifndef _XMLSECURITY_CERTIFICATECHOOSER_HXX
 #define _XMLSECURITY_CERTIFICATECHOOSER_HXX
 
+#include <svtools/simptabl.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <svx/simptabl.hxx>
 
 namespace com {
 namespace sun {
@@ -47,7 +47,7 @@ private:
     css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > maCerts;
     SignatureInformations maCertsToIgnore;
 
-    SvxSimpleTable*     m_pCertLB;
+    SvSimpleTable*     m_pCertLB;
     PushButton*         m_pViewBtn;
     OKButton*           m_pOKBtn;
 
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index 78c6eb2e5f1a..540b1288a8e2 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -26,8 +26,8 @@
 #include <vcl/tabdlg.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
+#include <svtools/simptabl.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svx/simptabl.hxx>
 #include <svtools/svmedit.hxx>
 
 namespace com {
@@ -101,8 +101,8 @@ public:
 class CertificateViewerDetailsTP : public CertificateViewerTP
 {
 private:
-    SvxSimpleTableContainer m_aElementsLBContainer;
-    SvxSimpleTable      maElementsLB;
+    SvSimpleTableContainer m_aElementsLBContainer;
+    SvSimpleTable      maElementsLB;
     MultiLineEdit       maElementML;
     Font                maStdFont;
     Font                maFixedWidthFont;
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 3ca9f757a601..d8423fcc3572 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -23,8 +23,8 @@
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
+#include <svtools/simptabl.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svx/simptabl.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <xmlsecurity/documentsignaturehelper.hxx>
@@ -70,7 +70,7 @@ private:
     FixedText*          m_pHintDocFT;
     FixedText*          m_pHintBasicFT;
     FixedText*          m_pHintPackageFT;
-    SvxSimpleTable*     m_pSignaturesLB;
+    SvSimpleTable*     m_pSignaturesLB;
     FixedImage*         m_pSigsValidImg;
     FixedText*          m_pSigsValidFI;
     FixedImage*         m_pSigsInvalidImg;
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 1136224279db..4a5ed900c6e2 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -26,8 +26,8 @@
 #include <vcl/tabdlg.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
+#include <svtools/simptabl.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svx/simptabl.hxx>
 #include <unotools/securityoptions.hxx>
 
 namespace com {
@@ -112,7 +112,7 @@ class MacroSecurityTrustedSourcesTP : public MacroSecurityTP
 {
 private:
     FixedImage*         m_pTrustCertROFI;
-    SvxSimpleTable*     m_pTrustCertLB;
+    SvSimpleTable*     m_pTrustCertLB;
     PushButton*         m_pViewCertPB;
     PushButton*         m_pRemoveCertPB;
     FixedImage*         m_pTrustFileROFI;
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 28613293f4b2..d339cde84220 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -58,11 +58,11 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X
     Size aControlSize(275, 122);
     const long nControlWidth = aControlSize.Width();
     aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
-    SvxSimpleTableContainer *pSignatures = get<SvxSimpleTableContainer>("signatures");
+    SvSimpleTableContainer *pSignatures = get<SvSimpleTableContainer>("signatures");
     pSignatures->set_width_request(aControlSize.Width());
     pSignatures->set_height_request(aControlSize.Height());
 
-    m_pCertLB = new SvxSimpleTable(*pSignatures);
+    m_pCertLB = new SvSimpleTable(*pSignatures);
     static long nTabs[] = { 3, 0, 30*nControlWidth/100, 60*nControlWidth/100 };
     m_pCertLB->SetTabs( &nTabs[0] );
     OUStringBuffer sHeader;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 71abab4313ae..866a0ded89f2 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -198,11 +198,11 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
     Size aControlSize(275, 109);
     const long nControlWidth = aControlSize.Width();
     aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
-    SvxSimpleTableContainer *pSignatures = get<SvxSimpleTableContainer>("signatures");
+    SvSimpleTableContainer *pSignatures = get<SvSimpleTableContainer>("signatures");
     pSignatures->set_width_request(aControlSize.Width());
     pSignatures->set_height_request(aControlSize.Height());
 
-    m_pSignaturesLB = new SvxSimpleTable(*pSignatures);
+    m_pSignaturesLB = new SvSimpleTable(*pSignatures);
     // #i48253# the tablistbox needs its own unique id
     m_pSignaturesLB->Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG );
     static long aTabs[] = { 4, 0, 6*nControlWidth/100, 36*nControlWidth/100, 74*nControlWidth/100 };
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 19c322811ac6..4ae1f481ab3a 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -325,21 +325,21 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void )
     }
 }
 
-class TrustCertLB : public SvxSimpleTable
+class TrustCertLB : public SvSimpleTable
 {
 public:
-    TrustCertLB(SvxSimpleTableContainer &rContainer)
-        : SvxSimpleTable(rContainer, 0)
+    TrustCertLB(SvSimpleTableContainer &rContainer)
+        : SvSimpleTable(rContainer, 0)
     {
     }
     virtual void Resize()
     {
-        SvxSimpleTable::Resize();
+        SvSimpleTable::Resize();
         if (isInitialLayout(this))
         {
             const long nControlWidth = GetSizePixel().Width();
             long aTabLocs[] = { 3, 0, 35*nControlWidth/100, 70*nControlWidth/100 };
-            SvxSimpleTable::SetTabs(aTabLocs, MAP_PIXEL);
+            SvSimpleTable::SetTabs(aTabLocs, MAP_PIXEL);
         }
     }
 };
@@ -356,7 +356,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, M
     get(m_pAddLocPB, "addfile");
     get(m_pRemoveLocPB, "removefile");
 
-    SvxSimpleTableContainer *pCertificates = get<SvxSimpleTableContainer>("certificates");
+    SvSimpleTableContainer *pCertificates = get<SvSimpleTableContainer>("certificates");
     m_pTrustCertLB = new TrustCertLB(*pCertificates);
     static long aTabs[] = { 3, 0, 0, 0 };
     m_pTrustCertLB->SetTabs( aTabs );
diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
index 56d0e13a18ff..f5b7d73583dc 100644
--- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
+++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
@@ -76,7 +76,7 @@
               </packing>
             </child>
             <child>
-              <object class="svxcorelo-SvxSimpleTableContainer" id="signatures">
+              <object class="svtlo-SvSimpleTableContainer" id="signatures">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
diff --git a/xmlsecurity/uiconfig/ui/securitytrustpage.ui b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
index 57278801bba2..9b2cc18c4ce6 100644
--- a/xmlsecurity/uiconfig/ui/securitytrustpage.ui
+++ b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
@@ -129,7 +129,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxcorelo-SvxSimpleTableContainer" id="certificates">
+                  <object class="svtlo-SvSimpleTableContainer" id="certificates">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index 16dd3fa94708..52dbe1bc7dc0 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -144,7 +144,7 @@
               </packing>
             </child>
             <child>
-              <object class="svxcorelo-SvxSimpleTableContainer" id="signatures">
+              <object class="svtlo-SvSimpleTableContainer" id="signatures">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>