convert select address book to .ui

Change-Id: I578bd89d2abb077c7b90ec4f75e0b8204dd33f92

sw/AllLangResTarget_sw.mk

@@ -71,7 +71,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/config/mailconfigpage.src \
     sw/source/ui/config/optdlg.src \
     sw/source/ui/config/optload.src \
-    sw/source/ui/dbui/addresslistdialog.src \
     sw/source/ui/dbui/createaddresslistdialog.src \
     sw/source/ui/dbui/dbtablepreviewdialog.src \
     sw/source/ui/dbui/dbui.src \

sw/UIConfig_swriter.mk

@@ -171,6 +171,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/saveashtmldialog \
 	sw/uiconfig/swriter/ui/savelabeldialog \
 	sw/uiconfig/swriter/ui/sectionpage \
+	sw/uiconfig/swriter/ui/selectaddressdialog \
 	sw/uiconfig/swriter/ui/selectautotextdialog \
 	sw/uiconfig/swriter/ui/selectindexdialog \
 	sw/uiconfig/swriter/ui/sidebarpage \

sw/inc/helpid.h

@@ -375,7 +375,6 @@
 #define HID_MM_PREPAREMERGEPAGE                                 "SW_HID_MM_PREPAREMERGEPAGE"
 #define HID_MM_MERGEPAGE                                        "SW_HID_MM_MERGEPAGE"
 #define HID_MM_OUTPUTPAGE                                       "SW_HID_MM_OUTPUTPAGE"
-#define HID_MM_ADDRESSLISTDIALOG                                "SW_HID_MM_ADDRESSLISTDIALOG"
 #define HID_MM_SELECTDBTABLEDDIALOG                             "SW_HID_MM_SELECTDBTABLEDDIALOG"
 #define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX                     "SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX"
 #define HID_MM_DBTABLEPREVIEWDIALOG                             "SW_HID_MM_DBTABLEPREVIEWDIALOG"
@@ -386,7 +385,6 @@
 #define HID_MM_LAYOUT_PAGE                                      "SW_HID_MM_LAYOUT_PAGE"
 #define HID_MM_COPYTO                                           "SW_HID_MM_COPYTO"
 #define HID_MM_ADDRESSLIST_HB                                   "SW_HID_MM_ADDRESSLIST_HB"
-#define HID_MM_ADDRESSLIST_TLB                                  "SW_HID_MM_ADDRESSLIST_TLB"
 #define HID_MM_TESTACCOUNTSETTINGS                              "SW_HID_MM_TESTACCOUNTSETTINGS"
 #define HID_MM_TESTACCOUNTSETTINGS_TLB                          "SW_HID_MM_TESTACCOUNTSETTINGS_TLB"
 #define HID_MM_TESTACCOUNTSETTINGS_HB                           "SW_HID_MM_TESTACCOUNTSETTINGS_HB"

sw/source/ui/dbui/addresslistdialog.hrc

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _ADDRESSLISTDIALOG_HRC
-#define _ADDRESSLISTDIALOG_HRC
-
-#define FI_DESCRIPTION      1
-#define FT_LIST             2
-
-#define PB_EDIT             4
-#define LB_LIST             5
-#define PB_FILTER           6
-#define PB_LOADLIST         7
-#define PB_CREATELIST       8
-#define FL_SEPARATOR        9
-#define PB_OK               12
-#define PB_CANCEL           13
-#define PB_HELP             14
-#define ST_NAME             15
-#define ST_TABLE            16
-#define PB_TABLE            17
-#define ST_CONNECTING       18
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/ui/dbui/addresslistdialog.hxx

@@ -43,32 +43,27 @@ namespace com{namespace sun{namespace star{
     }
 }}}
 class SwMailMergeAddressBlockPage;
+class SwAddrSourceLB;
 
 class SwAddressListDialog : public SfxModalDialog
 {
-    FixedInfo       m_aDescriptionFI;
+    FixedText*      m_pDescriptionFI;
 
-    FixedInfo       m_aListFT;
-    HeaderBar       m_aListHB;
-    SvTabListBox    m_aListLB;
+    SwAddrSourceLB* m_pListLB;
 
-    PushButton      m_aLoadListPB;
-    PushButton      m_aCreateListPB;
-    PushButton      m_aFilterPB;
-    PushButton      m_aEditPB;
-    PushButton      m_aTablePB;
+    PushButton*     m_pLoadListPB;
+    PushButton*     m_pCreateListPB;
+    PushButton*     m_pFilterPB;
+    PushButton*     m_pEditPB;
+    PushButton*     m_pTablePB;
 
-    FixedLine       m_aSeparatorFL;
+    OKButton*       m_pOK;
 
-    OKButton        m_aOK;
-    CancelButton    m_aCancel;
-    HelpButton      m_aHelp;
+    OUString        m_sName;
+    OUString        m_sTable;
+    OUString        m_sConnecting;
 
-    String          m_sName;
-    String          m_sTable;
-    String          m_sConnecting;
-
-    String          m_sCreatedURL;
+    OUString        m_sCreatedURL;
     SvTreeListEntry*    m_pCreatedDataSource;
 
     bool            m_bInSelectHdl;

sw/source/ui/dbui/addresslistdialog.src

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include <addresslistdialog.hrc>
-#include <dbui.hrc>
-#include <helpid.h>
-
-
-ModalDialog DLG_MM_ADDRESSLISTDIALOG
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_MM_ADDRESSLISTDIALOG;
-    Size = MAP_APPFONT ( 260 , 182 ) ;
-    Moveable = TRUE ;
-
-    Text [ en-US ] = "Select Address List";
-
-    FixedText       FI_DESCRIPTION
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 24 ) ;
-        WordBreak = TRUE;
-        Text [ en-US ] = "Select an address list. Click '%1' to select recipients from a different list. If you do not have an address list you can create one by clicking '%2'.";
-    };
-    FixedText       FT_LIST
-    {
-        Pos = MAP_APPFONT ( 6 , 30 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Your recipients are currently selected from:";
-    };
-    Control         LB_LIST
-    {
-        Pos = MAP_APPFONT ( 6 , 43 ) ;
-        Size = MAP_APPFONT ( 182 , 102 ) ;
-        Border = TRUE;
-        TabStop = TRUE ;
-    };
-    PushButton       PB_LOADLIST
-    {
-        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_LOADLIST";
-        Pos = MAP_APPFONT ( 194 , 43 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "~Add...";
-    };
-    PushButton PB_CREATELIST
-    {
-        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_CREATELIST";
-        Pos = MAP_APPFONT ( 194 , 60 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "~Create...";
-    };
-    PushButton      PB_FILTER
-    {
-        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_FILTER";
-        Pos = MAP_APPFONT ( 194 , 77 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "~Filter...";
-    };
-    PushButton PB_EDIT
-    {
-        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_EDIT";
-        Pos = MAP_APPFONT ( 194 , 94 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "~Edit...";
-    };
-    PushButton PB_TABLE
-    {
-        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_TABLE";
-        Pos = MAP_APPFONT ( 194 , 111 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "Change ~Table...";
-    };
-    FixedLine FL_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( 0 , 151 ) ;
-        Size = MAP_APPFONT ( 260 , 8 ) ;
-    };
-    OKButton        PB_OK
-    {
-        Pos = MAP_APPFONT ( 95 , 162 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton        PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( 148 , 162 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton      PB_HELP
-    {
-        Pos = MAP_APPFONT ( 204 , 162 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    String  ST_NAME
-    {
-        Text [ en-US ] = "Name";
-    };
-    String  ST_TABLE
-    {
-        Text [ en-US ] = "Table";
-    };
-    String ST_CONNECTING
-    {
-        Text [ en-US ] = "Connecting to data source...";
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/ui/index/cnttab.cxx

@@ -562,7 +562,6 @@ sal_Bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const String& rName)
 
 class SwIndexTreeLB : public SvSimpleTable
 {
-private:
 public:
     SwIndexTreeLB(SvSimpleTableContainer& rParent, WinBits nBits = 0);
     virtual void KeyInput( const KeyEvent& rKEvt );
@@ -688,7 +687,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
     Size aSize = pHeaderTreeContainer->LogicToPixel(Size(273, 164), MAP_APPFONT);
     pHeaderTreeContainer->set_width_request(aSize.Width());
     pHeaderTreeContainer->set_height_request(aSize.Height());
-    m_pHeaderTree = new SwIndexTreeLB(*get<SvSimpleTableContainer>("styles"));
+    m_pHeaderTree = new SwIndexTreeLB(*pHeaderTreeContainer);
 
     m_pOk->SetClickHdl(LINK(this, SwAddStylesDlg_Impl, OkHdl));
     m_pLeftPB->SetClickHdl(LINK(this, SwAddStylesDlg_Impl, LeftRightHdl));