convert versions of dialog to .ui

Change-Id: I1be2211b5c936e6e00f2fe81883b8fb1e67ef550

9 files changed, 23 insertions, 30 deletions

diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index fd84d86969f0..5ef3382c6b78 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -24,12 +24,12 @@
 #include <vcl/combobox.hxx>
 #include <vcl/group.hxx>
 #include <svtools/headbar.hxx>
+#include <svtools/simptabl.hxx>
 #include <svtools/svtabbx.hxx>
 #include "rangenam.hxx"
 #include "anyrefdg.hxx"
 #include <vcl/lstbox.hxx>
 #include <svx/ctredlin.hxx>
-#include <svx/simptabl.hxx>
 #include "chgtrack.hxx"
 #include "chgviset.hxx"
 #include <vcl/timer.hxx>
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index a70133251eeb..64e56ee3e3e0 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -138,7 +138,7 @@ class ScConflictsDlg : public ModalDialog
 {
 private:
     FixedText           maFtConflicts;
-    SvxSimpleTableContainer m_aLbConflictsContainer;
+    SvSimpleTableContainer m_aLbConflictsContainer;
     SvxRedlinTable      maLbConflicts;
     PushButton          maBtnKeepMine;
     PushButton          maBtnKeepOther;
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index b7895138df0c..34aaa5ea654f 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -24,16 +24,15 @@
 #include <vcl/combobox.hxx>
 #include <vcl/group.hxx>
 #include <svtools/headbar.hxx>
+#include <svtools/simptabl.hxx>
 #include <svtools/svtabbx.hxx>
 
-
 #include "rangenam.hxx"
 #include "anyrefdg.hxx"
 
 #include <vcl/lstbox.hxx>
 
 #include <svx/ctredlin.hxx>
-#include <svx/simptabl.hxx>
 #include "chgtrack.hxx"
 #include "chgviset.hxx"
 
diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx
index 3c806cd960fb..6f11ec972dcf 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <svx/simptabl.hxx>
+#include <svtools/simptabl.hxx>
 #include <vcl/ctrl.hxx>
 
 #include "scresid.hxx"
@@ -30,7 +30,7 @@ struct ScRangeNameLine
 //TODO: cache the lines for performance improvements
 //otherwise handling of a large set of range names might get extremely slow
 //Need some sort of a filter to handle several range names
-class SC_DLLPUBLIC ScRangeManagerTable : public SvxSimpleTable
+class SC_DLLPUBLIC ScRangeManagerTable : public SvSimpleTable
 {
 private:
     OUString maGlobalString;
@@ -51,7 +51,7 @@ private:
     void setColWidths();
 
 public:
-    ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos );
+    ScRangeManagerTable( SvSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos );
     virtual ~ScRangeManagerTable();
 
     virtual void Resize();
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index f0760e2b32ea..bd76d8ebae02 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -23,7 +23,7 @@
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#include <svx/simptabl.hxx>
+#include <svtools/simptabl.hxx>
 
 class ScViewData;
 class ScDocShell;
@@ -38,7 +38,7 @@ class ScShareDocumentDlg : public ModalDialog
 private:
     CheckBox*           m_pCbShare;
     FixedText*          m_pFtWarning;
-    SvxSimpleTable*     m_pLbUsers;
+    SvSimpleTable*      m_pLbUsers;
 
     OUString            m_aStrNoUserData;
     OUString            m_aStrUnknownUser;
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index af56056ef983..9bdd24c944c9 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <osl/security.hxx>
+#include <sfx2/dialoghelper.hxx>
 #include <svl/sharecontrolfile.hxx>
 #include <unotools/useroptions.hxx>
 
@@ -35,24 +36,19 @@
 
 using namespace ::com::sun::star;
 
-class ScShareTable : public SvxSimpleTable
+class ScShareTable : public SvSimpleTable
 {
 private:
     OUString m_sWidestAccessString;
 public:
-    ScShareTable(SvxSimpleTableContainer& rParent)
-        : SvxSimpleTable(rParent)
+    ScShareTable(SvSimpleTableContainer& rParent)
+        : SvSimpleTable(rParent)
     {
-        Date aDate(22, 12, 2000);
-        Time aTime(22, 59);
-        DateTime aDateTime(aDate, aTime);
-        m_sWidestAccessString += ScGlobal::pLocaleData->getDate(aDateTime);
-        m_sWidestAccessString += OUString(' ');
-        m_sWidestAccessString += ScGlobal::pLocaleData->getTime(aDateTime, false);
+        m_sWidestAccessString = getWidestTime(*ScGlobal::pLocaleData);
     }
     virtual void Resize()
     {
-        SvxSimpleTable::Resize();
+        SvSimpleTable::Resize();
         if (isInitialLayout(this))
             setColWidths();
     }
@@ -70,7 +66,7 @@ public:
             GetSizePixel().Width() - nAccessedWidth);
         long aStaticTabs[]= { 2, 0, 0 };
         aStaticTabs[2] = nWebSiteWidth;
-        SvxSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
+        SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
     }
 };
 
@@ -90,7 +86,7 @@ ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData )
     get(m_pCbShare, "share");
     get(m_pFtWarning, "warning");
 
-    SvxSimpleTableContainer *pCtrl = get<SvxSimpleTableContainer>("users");
+    SvSimpleTableContainer *pCtrl = get<SvSimpleTableContainer>("users");
     pCtrl->set_height_request(pCtrl->GetTextHeight()*9);
     m_pLbUsers = new ScShareTable(*pCtrl);
 
@@ -188,9 +184,7 @@ void ScShareDocumentDlg::UpdateView()
 
                         String aString( aUser );
                         aString += '\t';
-                        aString += ScGlobal::pLocaleData->getDate( aDateTime );
-                        aString += ' ';
-                        aString += ScGlobal::pLocaleData->getTime( aDateTime, false );
+                        aString += formatTime(aDateTime, *ScGlobal::pLocaleData);
 
                         m_pLbUsers->InsertEntry( aString, NULL );
                     }
@@ -244,7 +238,7 @@ void ScShareDocumentDlg::UpdateView()
         Time t(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds);
         DateTime aDateTime(d,t);
 
-        aString += ScGlobal::pLocaleData->getDate( aDateTime );
+        aString += formatTime(aDateTime, *ScGlobal::pLocaleData);
         aString += ' ';
         aString += ScGlobal::pLocaleData->getTime( aDateTime, false );
 
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index d3718a05c270..10080fbd6294 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -114,7 +114,7 @@ void ScNameDlg::Init()
     //init UI
     m_pFtInfo->SetStyle(WB_VCENTER);
 
-    SvxSimpleTableContainer *pCtrl = get<SvxSimpleTableContainer>("names");
+    SvSimpleTableContainer *pCtrl = get<SvSimpleTableContainer>("names");
     pCtrl->set_height_request(pCtrl->GetTextHeight()*12);
 
     m_pRangeManagerTable = new ScRangeManagerTable(*pCtrl, maRangeMap, maCursorPos);
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index b7305fc16b08..c7e4040a4621 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -37,8 +37,8 @@ String createEntryString(const ScRangeNameLine& rLine)
     return aRet;
 }
 
-ScRangeManagerTable::ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& rRangeMap, const ScAddress& rPos ):
-    SvxSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
+ScRangeManagerTable::ScRangeManagerTable( SvSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& rRangeMap, const ScAddress& rPos ):
+    SvSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
     maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE)),
     mrRangeMap( rRangeMap ),
     maPos( rPos )
@@ -73,7 +73,7 @@ ScRangeManagerTable::ScRangeManagerTable( SvxSimpleTableContainer& rParent, boos
 
 void ScRangeManagerTable::Resize()
 {
-    SvxSimpleTable::Resize();
+    SvSimpleTable::Resize();
     if (isInitialLayout(this))
         setColWidths();
 }
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 64a296c90e0d..e29eff38e977 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -53,7 +53,7 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool )
 
     ScViewData* pViewData = pShell->GetViewData();
     ScAddress aPos(pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo());
-    SvxSimpleTableContainer *pContainer = get<SvxSimpleTableContainer>("ctrl");
+    SvSimpleTableContainer *pContainer = get<SvSimpleTableContainer>("ctrl");
     Size aControlSize(210, 0);
     aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
     pContainer->set_width_request(aControlSize.Width());