Tag: odbmacros_2_5 User: fs Date: 2008-02-14 12:16:45+0000 Modified: dba/dbaccess/source/ext/macromigration/dbmm_global.hrc dba/dbaccess/source/ext/macromigration/macromigration.hrc dba/dbaccess/source/ext/macromigration/macromigration.src dba/dbaccess/source/ext/macromigration/macromigrationdialog.cxx dba/dbaccess/source/ext/macromigration/macromigrationpages.cxx dba/dbaccess/source/ext/macromigration/macromigrationpages.hxx dba/dbaccess/source/ext/macromigration/makefile.mk
Log: '#' File Changes: Directory: /dba/dbaccess/source/ext/macromigration/ =================================================== File [changed]: dbmm_global.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/dbmm_global.hrc?r1=1.1.2.1&r2=1.1.2.1.2.1 Delta lines: +13 -4 -------------------- --- dbmm_global.hrc 2008-01-16 16:00:29+0000 1.1.2.1 +++ dbmm_global.hrc 2008-02-14 12:16:43+0000 1.1.2.1.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbmm_global.hrc,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.1.2.1 $ * - * last change: $Author: fs $ $Date: 2008/01/16 16:00:29 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:16:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,6 +43,7 @@ //===================================================================== #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 @@ -59,4 +60,12 @@ #define TP_MIGRATE ( RID_DBMM_TAPPAGE_START + 2 ) #define TP_SUMMARY ( RID_DBMM_TAPPAGE_START + 3 ) +//===================================================================== +//= strings +//===================================================================== + +#define STR_FORM ( RID_DBMM_STRING_START + 0 ) +#define STR_REPORT ( RID_DBMM_STRING_START + 1 ) +#define STR_OVERALL_PROGRESS ( RID_DBMM_STRING_START + 2 ) + #endif // DBACCESS_DBMM_GLOBAL_HRC File [changed]: macromigration.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/macromigration.hrc?r1=1.1.2.4&r2=1.1.2.4.2.1 Delta lines: +10 -11 --------------------- --- macromigration.hrc 2008-01-28 11:36:27+0000 1.1.2.4 +++ macromigration.hrc 2008-02-14 12:16:43+0000 1.1.2.4.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: macromigration.hrc,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.4.2.1 $ * - * last change: $Author: fs $ $Date: 2008/01/28 11:36:27 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:16:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,15 +69,14 @@ #define FT_START_MIGRATION 5 #define FT_CURRENT_OBJECT_LABEL 6 #define FT_CURRENT_OBJECT 7 -#define FT_CURRENT_ACTION_LABEL 8 -#define FT_CURRENT_ACTION 9 -#define FT_CURRENT_PROGRESS_LABEL 10 -#define FT_ALL_PROGRESS_LABEL 11 -#define FT_CHANGES_LABEL 12 -#define FT_OBJECT_COUNT 13 -#define FT_OBJECT_COUNT_PROGRESS 14 -#define FT_MIGRATION_DONE 15 -#define FT_CLOSE_DOC_ERROR 16 +#define FT_CURRENT_PROGRESS_LABEL 8 +#define FT_CURRENT_PROGRESS 9 +#define FT_ALL_PROGRESS_LABEL 10 +#define FT_CHANGES_LABEL 11 +#define FT_OBJECT_COUNT 12 +#define FT_OBJECT_COUNT_PROGRESS 13 +#define FT_MIGRATION_DONE 14 +#define FT_CLOSE_DOC_ERROR 15 //... windows ............................................................ File [changed]: macromigration.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/macromigration.src?r1=1.1.2.5&r2=1.1.2.5.2.1 Delta lines: +26 -20 --------------------- --- macromigration.src 2008-01-30 13:50:48+0000 1.1.2.5 +++ macromigration.src 2008-02-14 12:16:43+0000 1.1.2.5.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: macromigration.src,v $ * - * $Revision: 1.1.2.5 $ + * $Revision: 1.1.2.5.2.1 $ * - * last change: $Author: fs $ $Date: 2008/01/30 13:50:48 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:16:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -240,16 +240,16 @@ Text [ en-US ] = "Form 1"; }; - FixedText FT_CURRENT_ACTION_LABEL + FixedText FT_CURRENT_PROGRESS_LABEL { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED ); Size = MAP_APPFONT( 60, FIXED_TEXT_HEIGHT ); - Text [ en-US ] = "Current action:"; + Text [ en-US ] = "Current progress:"; }; - FixedText FT_CURRENT_ACTION + FixedText FT_CURRENT_PROGRESS { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60, CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED ); @@ -258,21 +258,10 @@ Text [ en-US ] = "loading ..."; }; - FixedText FT_CURRENT_PROGRESS_LABEL - { - Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, - CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED ); - Size = MAP_APPFONT( 60, PROGRESS_HEIGHT ); - - VCenter = TRUE; - - Text [ en-US ] = "Current progress:"; - }; - Window WND_CURRENT_PROGRESS { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60, - CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED ); + CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED ); Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ) - TAB_PAGE_CONTENT_MARGIN, PROGRESS_HEIGHT ); Border = TRUE; @@ -281,7 +270,7 @@ FixedText FT_ALL_PROGRESS_LABEL { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, - CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + PROGRESS_HEIGHT + SPACING_UNRELATED ); + CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED + PROGRESS_HEIGHT + SPACING_UNRELATED ); Size = MAP_APPFONT( 60, FIXED_TEXT_HEIGHT ); VCenter = TRUE; @@ -292,7 +281,7 @@ FixedText FT_OBJECT_COUNT_PROGRESS { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60, - CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + PROGRESS_HEIGHT + SPACING_UNRELATED ); + CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED + PROGRESS_HEIGHT + SPACING_UNRELATED ); Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ) - TAB_PAGE_CONTENT_MARGIN, FIXED_TEXT_HEIGHT ); Text [ en-US ] = "document $current$ of $overall$"; @@ -301,7 +290,7 @@ Window WND_ALL_PROGRESS { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60, - CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + PROGRESS_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED ); + CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED + PROGRESS_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_RELATED ); Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ) - TAB_PAGE_CONTENT_MARGIN, PROGRESS_HEIGHT ); Border = TRUE; @@ -357,3 +346,20 @@ BorderStyle = WINDOW_BORDER_MONO; }; }; + +String STR_FORM +{ + Text [ en-US ] = "Form: $name$"; + Text [ x-comment ] = "This refers to a form document inside a database document."; +}; + +String STR_REPORT +{ + Text [ en-US ] = "Report: $name$"; + Text [ x-comment ] = "This refers to a report document inside a database document."; +}; + +String STR_OVERALL_PROGRESS +{ + Text [ en-US ] = "document $current$ of $overall$"; +}; File [changed]: macromigrationdialog.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/macromigrationdialog.cxx?r1=1.1.2.8&r2=1.1.2.8.2.1 Delta lines: +6 -23 -------------------- --- macromigrationdialog.cxx 2008-02-13 11:50:07+0000 1.1.2.8 +++ macromigrationdialog.cxx 2008-02-14 12:16:43+0000 1.1.2.8.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: macromigrationdialog.cxx,v $ * - * $Revision: 1.1.2.8 $ + * $Revision: 1.1.2.8.2.1 $ * - * last change: $Author: fs $ $Date: 2008/02/13 11:50:07 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:16:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,8 +36,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#include "dbmm_module.hxx" #include "dbmm_global.hrc" +#include "dbmm_module.hxx" +#include "docerrorhandling.hxx" #include "macromigration.hrc" #include "macromigrationdialog.hxx" #include "macromigrationpages.hxx" @@ -46,12 +47,9 @@ #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/frame/XModel.hpp> /** === end UNO includes === **/ -#include <comphelper/interaction.hxx> -#include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/exc_hlp.hxx> #include <tools/diagnose_ex.h> @@ -85,7 +83,6 @@ using ::com::sun::star::frame::XStorable; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::PropertyValue; - using ::com::sun::star::task::XInteractionHandler; using ::com::sun::star::frame::XModel; /** === end UNO using === **/ @@ -274,22 +271,8 @@ if ( !aError.hasValue() ) return true; - // use an interaction handler to display the error - try - { - Reference< XInteractionHandler > xHandler( m_aContext.createComponent( "com.sun.star.task.InteractionHandler" ), UNO_QUERY_THROW ); - // check whether the DB doc has an own interaction handler set - Reference< XModel > xDocModel( m_xDocument, UNO_QUERY_THROW ); - ::comphelper::NamedValueCollection aDocArgs( xDocModel->getArgs() ); - xHandler = aDocArgs.getOrDefault( "InteractionHandler", xHandler ); - xHandler->handle( - new ::comphelper::OInteractionRequest( aError ) - ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } + // display the error to the user + DocumentErrorHandling::reportError( m_aContext, m_xDocument, aError ); return false; } File [changed]: macromigrationpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/macromigrationpages.cxx?r1=1.1.2.8&r2=1.1.2.8.2.1 Delta lines: +4 -5 ------------------- --- macromigrationpages.cxx 2008-02-11 11:18:26+0000 1.1.2.8 +++ macromigrationpages.cxx 2008-02-14 12:16:43+0000 1.1.2.8.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: macromigrationpages.cxx,v $ * - * $Revision: 1.1.2.8 $ + * $Revision: 1.1.2.8.2.1 $ * - * last change: $Author: fs $ $Date: 2008/02/11 11:18:26 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:16:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -221,9 +221,8 @@ ,m_aObjectCount ( this, MacroMigrationResId( FT_OBJECT_COUNT ) ) ,m_aCurrentObjectLabel ( this, MacroMigrationResId( FT_CURRENT_OBJECT_LABEL ) ) ,m_aCurrentObject ( this, MacroMigrationResId( FT_CURRENT_OBJECT ) ) - ,m_aCurrentActionLabel ( this, MacroMigrationResId( FT_CURRENT_ACTION_LABEL ) ) - ,m_aCurrentAction ( this, MacroMigrationResId( FT_CURRENT_ACTION ) ) - ,m_aCurrentProgressLabel ( this, MacroMigrationResId( FT_CURRENT_PROGRESS_LABEL ) ) + ,m_aCurrentActionLabel ( this, MacroMigrationResId( FT_CURRENT_PROGRESS_LABEL ) ) + ,m_aCurrentAction ( this, MacroMigrationResId( FT_CURRENT_PROGRESS ) ) ,m_aCurrentProgress ( this, MacroMigrationResId( WND_CURRENT_PROGRESS ) ) ,m_aAllProgressLabel ( this, MacroMigrationResId( FT_ALL_PROGRESS_LABEL ) ) ,m_aObjectCountProgress ( this, MacroMigrationResId( FT_OBJECT_COUNT_PROGRESS ) ) File [changed]: macromigrationpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/macromigrationpages.hxx?r1=1.1.2.6&r2=1.1.2.6.2.1 Delta lines: +2 -3 ------------------- --- macromigrationpages.hxx 2008-02-11 11:18:26+0000 1.1.2.6 +++ macromigrationpages.hxx 2008-02-14 12:16:43+0000 1.1.2.6.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: macromigrationpages.hxx,v $ * - * $Revision: 1.1.2.6 $ + * $Revision: 1.1.2.6.2.1 $ * - * last change: $Author: fs $ $Date: 2008/02/11 11:18:26 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:16:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -141,7 +141,6 @@ FixedText m_aCurrentObject; FixedText m_aCurrentActionLabel; FixedText m_aCurrentAction; - FixedText m_aCurrentProgressLabel; ProgressBar m_aCurrentProgress; FixedText m_aAllProgressLabel; FixedText m_aObjectCountProgress; File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/makefile.mk?r1=1.1.2.2&r2=1.1.2.2.2.1 Delta lines: +4 -2 ------------------- --- makefile.mk 2008-01-30 13:50:48+0000 1.1.2.2 +++ makefile.mk 2008-02-14 12:16:43+0000 1.1.2.2.2.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.2.2 $ +# $Revision: 1.1.2.2.2.1 $ # -# last change: $Author: fs $ $Date: 2008/01/30 13:50:48 $ +# last change: $Author: fs $ $Date: 2008/02/14 12:16:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -59,6 +59,8 @@ $(SLO)$/macromigrationpages.obj \ $(SLO)$/dbmm_module.obj \ $(SLO)$/dbmm_services.obj \ + $(SLO)$/migrationengine.obj \ + $(SLO)$/docerrorhandling.obj \ # --- library ----------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
