summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-07-22 09:57:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-07-22 12:21:53 +0100
commitd8e64d76a8422320caf4980c2fba856c4e1f6785 (patch)
tree212437cc0bf5f6df4d8f2742387761907f663ea4 /dbaccess
parentecbc20d0c7d58c3c6cd0e1c517848157107120a0 (diff)
all macromigrate pages are .ui, remove ResId stuff now
Change-Id: Ib92eb813666a418ced584076094cdd6511118d6a
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ext/macromigration/macromigration.hrc3
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.cxx16
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.hxx7
3 files changed, 1 insertions, 25 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc
index d63cf5bf7a4b..0cde314859ef 100644
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ b/dbaccess/source/ext/macromigration/macromigration.hrc
@@ -24,9 +24,6 @@
#define TAB_PAGE_WIDTH 280
#define TAB_PAGE_HEIGHT 185
-//... fixed texts .......................................................
-#define FT_HEADER 1
-
//... strings ............................................................
#define STR_STATE_CLOSE_SUB_DOCS 1
#define STR_STATE_BACKUP_DBDOC 2
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index e989f2731987..04c9cc7aaf73 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -45,25 +45,9 @@ namespace dbmm
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::frame::XModel;
- // MacroMigrationPage
- MacroMigrationPage::MacroMigrationPage( MacroMigrationDialog& _rParentDialog, const ResId& _rRes )
- :MacroMigrationPage_Base( &_rParentDialog, _rRes )
- {
- m_pHeader = new FixedText(this, MacroMigrationResId(FT_HEADER));
- Font aFont( m_pHeader->GetFont() );
- aFont.SetWeight( WEIGHT_BOLD );
- m_pHeader->SetFont( aFont );
- }
-
MacroMigrationPage::MacroMigrationPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription)
: MacroMigrationPage_Base(pParent, rID, rUIXMLDescription)
- , m_pHeader(0) //remove when upper ctor is removed
- {
- }
-
- MacroMigrationPage::~MacroMigrationPage()
{
- delete m_pHeader;
}
const MacroMigrationDialog& MacroMigrationPage::getDialog() const
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 91f01a950c7e..46989c58cb78 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -45,16 +45,11 @@ namespace dbmm
class MacroMigrationPage : public MacroMigrationPage_Base
{
public:
- MacroMigrationPage( MacroMigrationDialog& _rParentDialog, const ResId& _rRes );
MacroMigrationPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription);
- virtual ~MacroMigrationPage();
protected:
const MacroMigrationDialog& getDialog() const;
- MacroMigrationDialog& getDialog() ;
-
- protected:
- FixedText* m_pHeader;
+ MacroMigrationDialog& getDialog();
};
// PreparationPage