RID_DLG_ADDRESSBOOKSOURCEPILOT conversion to .ui

Change-Id: I43049f1164e2bcdf46cbe0b4d145d96fbd27c5d4
Reviewed-on: https://gerrit.libreoffice.org/10491Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

extensions/source/abpilot/abpresid.hrc

@@ -25,7 +25,6 @@
 
 // basics
 
-#define RID_DIALOG_START                RID_ABP_START
 #define RID_PAGE_START                  RID_ABP_START
 #define RID_STRING_START                RID_ABP_START
 #define RID_ERRORBOX_START              RID_ABP_START
@@ -33,13 +32,6 @@
 #define RID_QUERYBOX_START              RID_ABP_START
 #define RID_BITMAP_START                RID_ABP_START
 
-// dialogs
-
-#define RID_DLG_ADDRESSBOOKSOURCEPILOT  ( RID_DIALOG_START +  0 )
-// please adjust RID_DIALOG_END (below) when adding new dialogs
-
-#define RID_DIALOG_END                  RID_DLG_ADDRESSBOOKSOURCEPILOT
-
 // strings
 
 #define RID_STR_DEFAULT_NAME            ( RID_STRING_START +  0 )
@@ -48,9 +40,15 @@
 #define RID_STR_PLEASECHECKSETTINGS     ( RID_STRING_START +  3 )
 #define RID_STR_FIELDDIALOGTITLE        ( RID_STRING_START +  4 )
 #define RID_STR_NOFIELDSASSIGNED        ( RID_STRING_START +  5 )
+#define RID_STR_ABSOURCEDIALOGTITLE     ( RID_STRING_START +  6 )
+#define RID_STR_SELECT_ABTYPE           ( RID_STRING_START +  7 )
+#define RID_STR_INVOKE_ADMIN_DIALOG     ( RID_STRING_START +  8 )
+#define RID_STR_TABLE_SELECTION         ( RID_STRING_START +  9 )
+#define RID_STR_MANUAL_FIELD_MAPPING    ( RID_STRING_START +  10 )
+#define RID_STR_FINAL_CONFIRM           ( RID_STRING_START +  11 )
 // please adjust RID_STRING_END (below) when adding new strings
 
-#define RID_STRING_END                  RID_STR_NOFIELDSASSIGNED
+#define RID_STRING_END                  RID_STR_FINAL_CONFIRM
 
 // error boxes
 
@@ -84,9 +82,6 @@
 
 //= range checks
 
-#if RID_DIALOG_END > RID_ABP_END
-    #error "please adjust the resource id ranges!!"
-#endif
 #if RID_STRING_END > RID_ABP_END
     #error "please adjust the resource id ranges!!"
 #endif
@@ -108,12 +103,6 @@
 
 #define FT_NAME_EXPL             4
 
-#define STR_SELECT_ABTYPE           1
-#define STR_INVOKE_ADMIN_DIALOG     2
-#define STR_TABLE_SELECTION         3
-#define STR_MANUAL_FIELD_MAPPING    4
-#define STR_FINAL_CONFIRM           5
-
 // some defines
 #define WINDOW_SIZE_X   240
 #define WINDOW_SIZE_Y   185

extensions/source/abpilot/abspilot.cxx

@@ -59,8 +59,8 @@ namespace abp
 
 
     OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const Reference< XComponentContext >& _rxORB)
-        :OAddessBookSourcePilot_Base( _pParent, ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ),
-            WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT | WZB_PREVIOUS )
+        :OAddessBookSourcePilot_Base( _pParent,
+            static_cast<sal_uInt32>(WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT | WZB_PREVIOUS) )
         ,m_xORB(_rxORB)
         ,m_aNewDataSource(_rxORB)
         ,m_eNewDataSourceType( AST_INVALID )
@@ -126,11 +126,13 @@ namespace abp
         ActivatePage();
 
         typeSelectionChanged( m_aSettings.eType );
+
+        OUString sDialogTitle = ModuleRes(RID_STR_ABSOURCEDIALOGTITLE).toString();
+        SetText(sDialogTitle);
     }
 
     OAddessBookSourcePilot::~OAddessBookSourcePilot()
     {
-        FreeResource();
     }
 
 
@@ -139,18 +141,17 @@ namespace abp
         sal_uInt16 nResId = 0;
         switch ( _nState )
         {
-            case STATE_SELECT_ABTYPE:        nResId = STR_SELECT_ABTYPE; break;
-            case STATE_INVOKE_ADMIN_DIALOG:  nResId = STR_INVOKE_ADMIN_DIALOG; break;
-            case STATE_TABLE_SELECTION:      nResId = STR_TABLE_SELECTION; break;
-            case STATE_MANUAL_FIELD_MAPPING: nResId = STR_MANUAL_FIELD_MAPPING; break;
-            case STATE_FINAL_CONFIRM:        nResId = STR_FINAL_CONFIRM; break;
+            case STATE_SELECT_ABTYPE:        nResId = RID_STR_SELECT_ABTYPE; break;
+            case STATE_INVOKE_ADMIN_DIALOG:  nResId = RID_STR_INVOKE_ADMIN_DIALOG; break;
+            case STATE_TABLE_SELECTION:      nResId = RID_STR_TABLE_SELECTION; break;
+            case STATE_MANUAL_FIELD_MAPPING: nResId = RID_STR_MANUAL_FIELD_MAPPING; break;
+            case STATE_FINAL_CONFIRM:        nResId = RID_STR_FINAL_CONFIRM; break;
         }
         DBG_ASSERT( nResId, "OAddessBookSourcePilot::getStateDisplayName: don't know this state!" );
 
         OUString sDisplayName;
         if ( nResId )
         {
-            svt::OLocalResourceAccess aAccess( ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ), RSC_MODALDIALOG );
             sDisplayName = ModuleRes(nResId).toString();
         }
 

extensions/source/abpilot/abspilot.src

@@ -19,44 +19,37 @@
 
 #include "abpresid.hrc"
 
-ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT
+String RID_STR_ABSOURCEDIALOGTITLE
 {
-    Text [ en-US ] = "Address Book Data Source Wizard" ;
-
-    HelpId = HID_ABSPILOT;
-
-    OutputSize      = TRUE ;
-    SVLook          = TRUE ;
-    Moveable        = TRUE ;
-    Closeable       = TRUE ;
-    Hide            = TRUE;
+    Text [ en-US ] = "Address Book Data Source Wizard";
+};
 
-    String STR_SELECT_ABTYPE
-    {
-        Text [ en-US ] = "Address book type";
-    };
+String RID_STR_SELECT_ABTYPE
+{
+    Text [ en-US ] = "Address book type";
+};
 
-    String STR_INVOKE_ADMIN_DIALOG
-    {
-        Text [ en-US ] = "Connection Settings";
-    };
+String RID_STR_INVOKE_ADMIN_DIALOG
+{
+    Text [ en-US ] = "Connection Settings";
+};
 
-    String STR_TABLE_SELECTION
-    {
-        Text [ en-US ] = "Table selection";
-    };
+ String RID_STR_TABLE_SELECTION
+{
+    Text [ en-US ] = "Table selection";
+};
 
-    String STR_MANUAL_FIELD_MAPPING
-    {
-        Text [ en-US ] = "Field Assignment";
-    };
+String RID_STR_MANUAL_FIELD_MAPPING
+{
+    Text [ en-US ] = "Field Assignment";
+};
 
-    String STR_FINAL_CONFIRM
-    {
-        Text [ en-US ] = "Data Source Title";
-    };
+String RID_STR_FINAL_CONFIRM
+{
+    Text [ en-US ] = "Data Source Title";
 };
 
+
 ErrorBox RID_ERR_NEEDTYPESELECTION
 {
     Buttons = WB_OK;