dbaccess/source/ext/macromigration/dbmm_global.hrc | 10 +-
dbaccess/source/ext/macromigration/macromigration.hrc | 9 --
dbaccess/source/ext/macromigration/macromigration.src | 43 +++++-------
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 13 +--
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 1
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 16 ----
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 7 -
include/svtools/roadmapwizard.hxx | 4 +
svtools/source/dialogs/roadmapwizard.cxx | 7 +
9 files changed, 38 insertions(+), 72 deletions(-)
New commits:
commit 9c7a7d85aa6de5d4c384608dce157c420bc7c74f
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 22 10:10:15 2014 +0100
convert DLG_MACRO_MIGRATION to widget layout
Change-Id: Ie4cef54a943fc456b042425b53286492a0bed0be
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc
b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index 946b7a5..d32dafe 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -25,13 +25,8 @@
//= bases
#define RID_DBMM_DIALOG_START RID_DBACCESS_START + 0
-#define RID_DBMM_TAPPAGE_START RID_DBACCESS_START + 0
#define RID_DBMM_STRING_START RID_DBACCESS_START + 0
-//= dialogs
-
-#define DLG_MACRO_MIGRATION RID_DBMM_DIALOG_START + 0
-
//= error boxes
#define ERR_INVALID_BACKUP_LOCATION RID_DBMM_DIALOG_START + 0
@@ -58,6 +53,11 @@
#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 )
#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 )
#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 )
+#define STR_STATE_CLOSE_SUB_DOCS ( RID_DBMM_STRING_START + 20 )
+#define STR_STATE_BACKUP_DBDOC ( RID_DBMM_STRING_START + 21 )
+#define STR_STATE_MIGRATE ( RID_DBMM_STRING_START + 22 )
+#define STR_STATE_SUMMARY ( RID_DBMM_STRING_START + 23 )
+#define STR_TITLE_MACRO_MIGRATION ( RID_DBMM_STRING_START + 24 )
#endif // DBACCESS_DBMM_GLOBAL_HRC
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc
b/dbaccess/source/ext/macromigration/macromigration.hrc
index 0cde314..e4bc293 100644
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ b/dbaccess/source/ext/macromigration/macromigration.hrc
@@ -24,12 +24,6 @@
#define TAB_PAGE_WIDTH 280
#define TAB_PAGE_HEIGHT 185
-//... strings ............................................................
-#define STR_STATE_CLOSE_SUB_DOCS 1
-#define STR_STATE_BACKUP_DBDOC 2
-#define STR_STATE_MIGRATE 3
-#define STR_STATE_SUMMARY 4
-
#endif // DBACCESS_MACROMIGRATION_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/macromigration.src
b/dbaccess/source/ext/macromigration/macromigration.src
index ae07e00..4b797ed 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -18,37 +18,30 @@
*/
#include "dbmm_global.hrc"
-#include "macromigration.hrc"
-ModalDialog DLG_MACRO_MIGRATION
+String STR_TITLE_MACRO_MIGRATION
{
- HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION";
- OutputSize = TRUE ;
- Moveable = TRUE;
- Closeable = TRUE ;
- Hide = TRUE;
-
- Text[ en-US ] = "Database Document Macro Migration" ;
+ Text [ en-US ] = "Database Document Macro Migration" ;
+};
- String STR_STATE_CLOSE_SUB_DOCS
- {
- Text [ en-US ] = "Prepare";
- };
+String STR_STATE_CLOSE_SUB_DOCS
+{
+ Text [ en-US ] = "Prepare";
+};
- String STR_STATE_BACKUP_DBDOC
- {
- Text [ en-US ] = "Backup Document";
- };
+String STR_STATE_BACKUP_DBDOC
+{
+ Text [ en-US ] = "Backup Document";
+};
- String STR_STATE_MIGRATE
- {
- Text [ en-US ] = "Migrate";
- };
+String STR_STATE_MIGRATE
+{
+ Text [ en-US ] = "Migrate";
+};
- String STR_STATE_SUMMARY
- {
- Text [ en-US ] = "Summary";
- };
+String STR_STATE_SUMMARY
+{
+ Text [ en-US ] = "Summary";
};
String STR_FORM
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 1f33032..1c007e3 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -126,16 +126,15 @@ namespace dbmm
};
// MacroMigrationDialog
- MacroMigrationDialog::MacroMigrationDialog( Window* _pParent, const
Reference<XComponentContext>& _rContext,
- const Reference< XOfficeDatabaseDocument >& _rxDocument )
- :MacroMigrationDialog_Base( _pParent, MacroMigrationResId(
DLG_MACRO_MIGRATION ) )
- ,m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) )
+ MacroMigrationDialog::MacroMigrationDialog(Window* _pParent, const
Reference<XComponentContext>& _rContext,
+ const Reference< XOfficeDatabaseDocument >& _rxDocument)
+ : MacroMigrationDialog_Base(_pParent)
+ , m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) )
{
OUString sTitlePrepare( MacroMigrationResId( STR_STATE_CLOSE_SUB_DOCS
) );
OUString sTitleStoreAs( MacroMigrationResId( STR_STATE_BACKUP_DBDOC )
);
OUString sTitleMigrate( MacroMigrationResId( STR_STATE_MIGRATE ) );
OUString sTitleSummary( MacroMigrationResId( STR_STATE_SUMMARY ) );
- FreeResource();
describeState( STATE_CLOSE_SUB_DOCS, sTitlePrepare,
&PreparationPage::Create );
describeState( STATE_BACKUP_DBDOC, sTitleStoreAs,
&SaveDBDocPage::Create );
@@ -155,10 +154,6 @@ namespace dbmm
OSL_PRECOND( m_pData->xDocumentModel.is(),
"MacroMigrationDialog::MacroMigrationDialog: illegal document!" );
}
- MacroMigrationDialog::~MacroMigrationDialog()
- {
- }
-
const Reference<XComponentContext>&
MacroMigrationDialog::getComponentContext() const
{
return m_pData->aContext;
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 563bfba..9db6248 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -40,7 +40,6 @@ namespace dbmm
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& _rContext,
const ::com::sun::star::uno::Reference<
::com::sun::star::sdb::XOfficeDatabaseDocument >& _rxDocument
);
- virtual ~MacroMigrationDialog();
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >&
getComponentContext() const;
diff --git a/include/svtools/roadmapwizard.hxx
b/include/svtools/roadmapwizard.hxx
index b6270ca..8dfd111 100644
--- a/include/svtools/roadmapwizard.hxx
+++ b/include/svtools/roadmapwizard.hxx
@@ -77,6 +77,10 @@ namespace svt
const WinBits i_nStyle,
sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH |
WZB_CANCEL | WZB_HELP
);
+ RoadmapWizard(
+ Window* _pParent,
+ sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH |
WZB_CANCEL | WZB_HELP
+ );
virtual ~RoadmapWizard( );
void SetRoadmapHelpId( const OString& _rId );
diff --git a/svtools/source/dialogs/roadmapwizard.cxx
b/svtools/source/dialogs/roadmapwizard.cxx
index e6f8199..b6cf0c4 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -165,7 +165,6 @@ namespace svt
}
#endif
-
RoadmapWizard::RoadmapWizard( Window* _pParent, const ResId& _rRes,
sal_uInt32 _nButtonFlags )
:OWizardMachine( _pParent, _rRes, _nButtonFlags )
,m_pImpl( new RoadmapWizardImpl )
@@ -181,6 +180,12 @@ namespace svt
impl_construct();
}
+ RoadmapWizard::RoadmapWizard( Window* _pParent, sal_uInt32 _nButtonFlags )
+ :OWizardMachine( _pParent, _nButtonFlags )
+ ,m_pImpl( new RoadmapWizardImpl )
+ {
+ impl_construct();
+ }
void RoadmapWizard::impl_construct()
{
commit d8e64d76a8422320caf4980c2fba856c4e1f6785
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 22 09:57:59 2014 +0100
all macromigrate pages are .ui, remove ResId stuff now
Change-Id: Ib92eb813666a418ced584076094cdd6511118d6a
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc
b/dbaccess/source/ext/macromigration/macromigration.hrc
index d63cf5b..0cde314 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 e989f27..04c9cc7 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 91f01a9..46989c5 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
