[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Wed Sep 11 08:29:29 PDT 2013
sw/AllLangResTarget_sw.mk | 1
sw/UIConfig_swriter.mk | 1
sw/inc/helpid.h | 2
sw/source/ui/dbui/addresslistdialog.cxx | 227 ++++++++++----------
sw/source/ui/dbui/addresslistdialog.hrc | 41 ---
sw/source/ui/dbui/addresslistdialog.hxx | 31 +-
sw/source/ui/dbui/addresslistdialog.src | 124 ----------
sw/source/ui/index/cnttab.cxx | 3
sw/uiconfig/swriter/ui/selectaddressdialog.ui | 295 ++++++++++++++++++++++++++
9 files changed, 428 insertions(+), 297 deletions(-)
New commits:
commit f27ee66f2b1f086baf8feb6054d4e6d77a4a30e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 11 14:11:54 2013 +0100
convert select address book to .ui
Change-Id: I578bd89d2abb077c7b90ec4f75e0b8204dd33f92
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index b5f1687..4392c77 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/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 \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 5016644..f903b9b 100644
--- a/sw/UIConfig_swriter.mk
+++ b/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 \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 5bdcc27..2314270 100644
--- a/sw/inc/helpid.h
+++ b/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"
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 5934046..79e85f9 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -32,7 +32,8 @@
#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/types.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/simptabl.hxx>
+#include <svtools/treelistentry.hxx>
#include <com/sun/star/sdbc/XCloseable.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -53,7 +54,6 @@
#include <vcl/waitobj.hxx>
#include <unotools/pathoptions.hxx>
#include <svl/urihelper.hxx>
-#include <addresslistdialog.hrc>
#include <dbui.hrc>
#include <helpid.h>
@@ -139,72 +139,80 @@ static OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSourceProp
return sURL;
}
-SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
- SfxModalDialog(pParent, SW_RES(DLG_MM_ADDRESSLISTDIALOG)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
- m_aDescriptionFI( this, SW_RES( FI_DESCRIPTION )),
- m_aListFT( this, SW_RES( FT_LIST )),
- m_aListHB( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER),
- m_aListLB( this, SW_RES( LB_LIST )),
- m_aLoadListPB( this, SW_RES( PB_LOADLIST )),
- m_aCreateListPB(this, SW_RES( PB_CREATELIST )),
- m_aFilterPB( this, SW_RES( PB_FILTER )),
- m_aEditPB(this, SW_RES( PB_EDIT )),
- m_aTablePB(this, SW_RES( PB_TABLE )),
- m_aSeparatorFL(this, SW_RES( FL_SEPARATOR )),
- m_aOK( this, SW_RES( PB_OK )),
- m_aCancel( this, SW_RES( PB_CANCEL )),
- m_aHelp( this, SW_RES( PB_HELP )),
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
- m_sName( SW_RES( ST_NAME )),
- m_sTable( SW_RES( ST_TABLE )),
- m_sConnecting( SW_RES( ST_CONNECTING )),
+class SwAddrSourceLB : public SvSimpleTable
+{
+public:
+ SwAddrSourceLB(SvSimpleTableContainer& rParent, WinBits nBits = 0)
+ : SvSimpleTable(rParent, nBits)
+ {
+ }
+ virtual void Resize();
+ void setColSizes();
+};
+
+void SwAddrSourceLB::Resize()
+{
+ SvSimpleTable::Resize();
+ setColSizes();
+}
+
+void SwAddrSourceLB::setColSizes()
+{
+ HeaderBar &rHB = GetTheHeaderBar();
+ if (rHB.GetItemCount() < 2)
+ return;
+
+ long nWidth = rHB.GetSizePixel().Width();
+
+ long nTabs[] = { 2, 0, nWidth/2 };
+
+ SvSimpleTable::SetTabs(&nTabs[0], MAP_PIXEL);
+}
+
+SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
+ : SfxModalDialog(pParent, "SelectAddressDialog",
+ "modules/swriter/ui/selectaddressdialog.ui")
+
+ ,
+
m_pCreatedDataSource(0),
m_bInSelectHdl(false),
m_pAddressPage(pParent)
{
- FreeResource();
- String sTemp(m_aDescriptionFI.GetText());
- sTemp.SearchAndReplaceAscii("%1", m_aLoadListPB.GetText());
- sTemp.SearchAndReplaceAscii("%2", m_aCreateListPB.GetText());
- m_aDescriptionFI.SetText(sTemp);
- m_aFilterPB.SetClickHdl( LINK( this, SwAddressListDialog, FilterHdl_Impl ));
- m_aLoadListPB.SetClickHdl( LINK( this, SwAddressListDialog, LoadHdl_Impl ));
- m_aCreateListPB.SetClickHdl( LINK( this, SwAddressListDialog,CreateHdl_Impl ));
- m_aEditPB.SetClickHdl(LINK( this, SwAddressListDialog, EditHdl_Impl));
- m_aTablePB.SetClickHdl(LINK( this, SwAddressListDialog, TableSelectHdl_Impl));
-
- Size aLBSize(m_aListLB.GetSizePixel());
- m_aListHB.SetSizePixel(aLBSize);
- Size aHeadSize(m_aListHB.CalcWindowSizePixel());
- aHeadSize.Width() = aLBSize.Width();
- m_aListHB.SetSizePixel(aHeadSize);
- Point aLBPos(m_aListLB.GetPosPixel());
- m_aListHB.SetPosPixel(aLBPos);
- aLBPos.Y() += aHeadSize.Height();
- aLBSize.Height() -= aHeadSize.Height();
- m_aListLB.SetPosSizePixel(aLBPos, aLBSize);
-
- Size aSz(m_aListHB.GetOutputSizePixel());
- m_aListHB.InsertItem( ITEMID_NAME, m_sName,
- aSz.Width()/2,
- HIB_LEFT | HIB_VCENTER | HIB_FIXED | HIB_FIXEDPOS/*| HIB_CLICKABLE | HIB_UPARROW */);
- m_aListHB.InsertItem( ITEMID_TABLE, m_sTable,
- aSz.Width()/2,
- HIB_LEFT | HIB_VCENTER | HIB_FIXED | HIB_FIXEDPOS /*| HIB_CLICKABLE | HIB_UPARROW */);
- m_aListHB.SetHelpId(HID_MM_ADDRESSLIST_HB );
- m_aListHB.Show();
-
- m_aListLB.SetHelpId(HID_MM_ADDRESSLIST_TLB);
- static long nTabs[] = {2, 0, aSz.Width()/2 };
- m_aListLB.SetStyle( m_aListLB.GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
- m_aListLB.SetSelectionMode( SINGLE_SELECTION );
- m_aListLB.SetTabs(&nTabs[0], MAP_PIXEL);
- m_aOK.SetClickHdl( LINK( this, SwAddressListDialog, OKHdl_Impl));
+ get(m_pDescriptionFI, "desc");
+ get(m_pLoadListPB, "add");
+ get(m_pCreateListPB, "create");
+ get(m_pFilterPB, "filter");
+ get(m_pEditPB, "edit");
+ get(m_pTablePB, "changetable");
+ get(m_pOK, "ok");
+
+ m_sName = get<FixedText>("name")->GetText();
+ m_sTable = get<FixedText>("table")->GetText();
+ m_sConnecting = get<FixedText>("connecting")->GetText();
+
+ OUString sTemp(m_pDescriptionFI->GetText());
+ sTemp = sTemp.replaceFirst("%1", m_pLoadListPB->GetText());
+ sTemp = sTemp.replaceFirst("%2", m_pCreateListPB->GetText());
+ m_pDescriptionFI->SetText(sTemp);
+ m_pFilterPB->SetClickHdl( LINK( this, SwAddressListDialog, FilterHdl_Impl ));
+ m_pLoadListPB->SetClickHdl( LINK( this, SwAddressListDialog, LoadHdl_Impl ));
+ m_pCreateListPB->SetClickHdl( LINK( this, SwAddressListDialog,CreateHdl_Impl ));
+ m_pEditPB->SetClickHdl(LINK( this, SwAddressListDialog, EditHdl_Impl));
+ m_pTablePB->SetClickHdl(LINK( this, SwAddressListDialog, TableSelectHdl_Impl));
+
+ SvSimpleTableContainer *pHeaderTreeContainer = get<SvSimpleTableContainer>("sources");
+ Size aSize = pHeaderTreeContainer->LogicToPixel(Size(182 , 102), MAP_APPFONT);
+ pHeaderTreeContainer->set_width_request(aSize.Width());
+ pHeaderTreeContainer->set_height_request(aSize.Height());
+ m_pListLB = new SwAddrSourceLB(*pHeaderTreeContainer);
+
+ m_pListLB->InsertHeaderEntry(m_sName + "\t" + m_sTable);
+ m_pListLB->setColSizes();
+
+ m_pListLB->SetStyle( m_pListLB->GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
+ m_pListLB->SetSelectionMode( SINGLE_SELECTION );
+ m_pOK->SetClickHdl( LINK( this, SwAddressListDialog, OKHdl_Impl));
uno::Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
m_xDBContext = DatabaseContext::create(xContext);
@@ -214,7 +222,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
sal_Bool bEnableEdit = sal_False;
sal_Bool bEnableOK = sal_True;
- m_aListLB.SelectAll( sal_False );
+ m_pListLB->SelectAll( sal_False );
SwDBConfig aDb;
OUString sBibliography = aDb.GetBibliographySource().sDataSource;
@@ -224,13 +232,13 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
{
if ( pNames[nName] == sBibliography )
continue;
- SvTreeListEntry* pEntry = m_aListLB.InsertEntry(pNames[nName]);
+ SvTreeListEntry* pEntry = m_pListLB->InsertEntry(pNames[nName]);
AddressUserData_Impl* pUserData = new AddressUserData_Impl();
pEntry->SetUserData(pUserData);
if(pNames[nName] == rCurrentData.sDataSource)
{
- m_aListLB.Select(pEntry);
- m_aListLB.SetEntryText(rCurrentData.sCommand, pEntry, ITEMID_TABLE - 1);
+ m_pListLB->Select(pEntry);
+ m_pListLB->SetEntryText(rCurrentData.sCommand, pEntry, ITEMID_TABLE - 1);
pUserData->nCommandType = rCurrentData.nCommandType;
pUserData->xSource = rConfigItem.GetSource();
pUserData->xConnection = rConfigItem.GetConnection();
@@ -255,31 +263,32 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
}
}
- m_aOK.Enable(m_aListLB.GetEntryCount()>0 && bEnableOK);
- m_aEditPB.Enable(bEnableEdit);
- m_aListLB.SetSelectHdl(LINK(this, SwAddressListDialog, ListBoxSelectHdl_Impl));
+ m_pOK->Enable(m_pListLB->GetEntryCount()>0 && bEnableOK);
+ m_pEditPB->Enable(bEnableEdit);
+ m_pListLB->SetSelectHdl(LINK(this, SwAddressListDialog, ListBoxSelectHdl_Impl));
TableSelectHdl_Impl(NULL);
}
SwAddressListDialog::~SwAddressListDialog()
{
- SvTreeListEntry* pEntry = m_aListLB.First();
+ SvTreeListEntry* pEntry = m_pListLB->First();
while(pEntry)
{
AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pEntry->GetUserData());
delete pUserData;
- pEntry = m_aListLB.Next( pEntry );
+ pEntry = m_pListLB->Next( pEntry );
}
+ delete m_pListLB;
}
IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
{
- SvTreeListEntry* pSelect = m_aListLB.FirstSelected();
+ SvTreeListEntry* pSelect = m_pListLB->FirstSelected();
uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
if(pSelect)
{
- String sCommand = m_aListLB.GetEntryText(pSelect, ITEMID_TABLE - 1);
- if ( !sCommand.Len() )
+ OUString sCommand = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
+ if (sCommand.isEmpty())
return 0;
AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData());
@@ -295,7 +304,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY);
uno::Reference<XPropertySet> xRowProperties(xRowSet, UNO_QUERY);
xRowProperties->setPropertyValue("DataSourceName",
- makeAny(OUString(m_aListLB.GetEntryText(pSelect, ITEMID_NAME - 1))));
+ makeAny(OUString(m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1))));
xRowProperties->setPropertyValue("Command", makeAny(
OUString(sCommand)));
xRowProperties->setPropertyValue("CommandType", makeAny(pUserData->nCommandType));
@@ -332,9 +341,9 @@ IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl)
String sNewSource = SwNewDBMgr::LoadAndRegisterDataSource();
if(sNewSource.Len())
{
- SvTreeListEntry* pNewSource = m_aListLB.InsertEntry(sNewSource);
+ SvTreeListEntry* pNewSource = m_pListLB->InsertEntry(sNewSource);
pNewSource->SetUserData(new AddressUserData_Impl());
- m_aListLB.Select(pNewSource);
+ m_pListLB->Select(pNewSource);
}
return 0;
}
@@ -413,12 +422,12 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton)
String sEntry(sFind);
sEntry += '\t';
sEntry += String(aFilters[0]);
- m_pCreatedDataSource = m_aListLB.InsertEntry(sEntry);
+ m_pCreatedDataSource = m_pListLB->InsertEntry(sEntry);
AddressUserData_Impl* pUserData = new AddressUserData_Impl();
pUserData->sURL = sURL;
m_pCreatedDataSource->SetUserData(pUserData);
- m_aListLB.Select(m_pCreatedDataSource);
- m_aCreateListPB.Enable(sal_False);
+ m_pListLB->Select(m_pCreatedDataSource);
+ m_pCreateListPB->Enable(sal_False);
}
catch (const Exception&)
@@ -431,7 +440,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton)
IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton)
{
- SvTreeListEntry* pEntry = m_aListLB.FirstSelected();
+ SvTreeListEntry* pEntry = m_pListLB->FirstSelected();
AddressUserData_Impl* pUserData = pEntry ? static_cast<AddressUserData_Impl*>(pEntry->GetUserData()) : 0;
if(pUserData && !pUserData->sURL.isEmpty())
{
@@ -463,7 +472,7 @@ IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton)
IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl)
{
- SvTreeListEntry* pSelect = m_aListLB.FirstSelected();
+ SvTreeListEntry* pSelect = m_pListLB->FirstSelected();
Application::PostUserEvent( STATIC_LINK( this, SwAddressListDialog,
StaticListBoxSelectHdl_Impl ), pSelect );
return 0;
@@ -479,12 +488,12 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEnt
AddressUserData_Impl* pUserData = 0;
if(pSelect)
{
- String sTable = pThis->m_aListLB.GetEntryText(pSelect, ITEMID_TABLE - 1);
+ String sTable = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
if(!sTable.Len())
{
- pThis->m_aListLB.SetEntryText(pThis->m_sConnecting, pSelect, ITEMID_TABLE - 1);
+ pThis->m_pListLB->SetEntryText(pThis->m_sConnecting, pSelect, ITEMID_TABLE - 1);
// allow painting of the new entry
- pThis->m_aListLB.Window::Invalidate(INVALIDATE_UPDATE);
+ pThis->m_pListLB->Window::Invalidate(INVALIDATE_UPDATE);
for (sal_uInt16 i = 0; i < 10; i++)
Application::Reschedule();
}
@@ -503,22 +512,22 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEnt
* Most expedient thing to do is to manually end the parent selection
* here.
*/
- pThis->m_aListLB.EndSelection();
+ pThis->m_pListLB->EndSelection();
pThis->DetectTablesAndQueries(pSelect, !sTable.Len());
}
else
{
//otherwise set the selected db-data
- pThis->m_aDBData.sDataSource = pThis->m_aListLB.GetEntryText(pSelect, ITEMID_NAME - 1);
- pThis->m_aDBData.sCommand = pThis->m_aListLB.GetEntryText(pSelect, ITEMID_TABLE - 1);
+ pThis->m_aDBData.sDataSource = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1);
+ pThis->m_aDBData.sCommand = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
pThis->m_aDBData.nCommandType = pUserData->nCommandType;
- pThis->m_aOK.Enable(sal_True);
+ pThis->m_pOK->Enable(sal_True);
}
- sTable = pThis->m_aListLB.GetEntryText(pSelect, ITEMID_TABLE - 1);
+ sTable = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
if(sTable == pThis->m_sConnecting)
- pThis->m_aListLB.SetEntryText(String(), pSelect, ITEMID_TABLE - 1);
+ pThis->m_pListLB->SetEntryText(String(), pSelect, ITEMID_TABLE - 1);
}
- pThis->m_aEditPB.Enable(pUserData && !pUserData->sURL.isEmpty() &&
+ pThis->m_pEditPB->Enable(pUserData && !pUserData->sURL.isEmpty() &&
SWUnoHelper::UCB_IsFile( pUserData->sURL ) && //#i97577#
!SWUnoHelper::UCB_IsReadOnlyFileName( pUserData->sURL ) );
pThis->m_bInSelectHdl = false;
@@ -538,7 +547,7 @@ void SwAddressListDialog::DetectTablesAndQueries(
uno::Reference<XCompletedConnection> xComplConnection;
if(!pUserData->xConnection.is())
{
- m_aDBData.sDataSource = m_aListLB.GetEntryText(pSelect, ITEMID_NAME - 1);
+ m_aDBData.sDataSource = m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1);
m_xDBContext->getByName(m_aDBData.sDataSource) >>= xComplConnection;
pUserData->xSource = uno::Reference<XDataSource>(xComplConnection, UNO_QUERY);
@@ -570,7 +579,7 @@ void SwAddressListDialog::DetectTablesAndQueries(
{
//now call the table select dialog - if more than one table exists
SwSelectDBTableDialog* pDlg = new SwSelectDBTableDialog(this, pUserData->xConnection);
- String sTable = m_aListLB.GetEntryText(pSelect, ITEMID_TABLE - 1);
+ String sTable = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
if(sTable.Len())
pDlg->SetSelectedTable(sTable, pUserData->nCommandType == CommandType::TABLE);
if(RET_OK == pDlg->Execute())
@@ -608,32 +617,32 @@ void SwAddressListDialog::DetectTablesAndQueries(
SW_DB_SELECT_TABLE : SW_DB_SELECT_QUERY );
//#i97577#
if( pUserData->xColumnsSupplier.is() )
- m_aListLB.SetEntryText(m_aDBData.sCommand, pSelect, ITEMID_TABLE - 1);
+ m_pListLB->SetEntryText(m_aDBData.sCommand, pSelect, ITEMID_TABLE - 1);
else
- m_aListLB.SetEntryText(String(), pSelect, ITEMID_TABLE - 1);
+ m_pListLB->SetEntryText(String(), pSelect, ITEMID_TABLE - 1);
}
- String sCommand = m_aListLB.GetEntryText(pSelect, ITEMID_TABLE - 1);
- m_aOK.Enable(pSelect && sCommand.Len());
- m_aFilterPB.Enable( pUserData->xConnection.is() && sCommand.Len() );
- m_aTablePB.Enable( pUserData->nTableAndQueryCount > 1 );
+ String sCommand = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
+ m_pOK->Enable(pSelect && sCommand.Len());
+ m_pFilterPB->Enable( pUserData->xConnection.is() && sCommand.Len() );
+ m_pTablePB->Enable( pUserData->nTableAndQueryCount > 1 );
}
catch (const Exception&)
{
OSL_FAIL("exception caught in SwAddressListDialog::DetectTablesAndQueries");
- m_aOK.Enable( sal_False );
+ m_pOK->Enable( sal_False );
}
}
IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton)
{
EnterWait();
- SvTreeListEntry* pSelect = m_aListLB.FirstSelected();
+ SvTreeListEntry* pSelect = m_pListLB->FirstSelected();
if(pSelect)
{
AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData());
//only call the table select dialog if tables have not been searched for or there
//are more than 1
- String sTable = m_aListLB.GetEntryText(pSelect, ITEMID_TABLE - 1);
+ String sTable = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
if( pUserData->nTableAndQueryCount > 1 || pUserData->nTableAndQueryCount == -1)
{
DetectTablesAndQueries(pSelect, (pButton != 0) || (!sTable.Len()));
@@ -653,7 +662,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, OKHdl_Impl)
uno::Reference< XDataSource> SwAddressListDialog::GetSource()
{
uno::Reference< XDataSource> xRet;
- SvTreeListEntry* pSelect = m_aListLB.FirstSelected();
+ SvTreeListEntry* pSelect = m_pListLB->FirstSelected();
if(pSelect)
{
AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData());
@@ -666,7 +675,7 @@ uno::Reference< XDataSource> SwAddressListDialog::GetSource()
SharedConnection SwAddressListDialog::GetConnection()
{
SharedConnection xRet;
- SvTreeListEntry* pSelect = m_aListLB.FirstSelected();
+ SvTreeListEntry* pSelect = m_pListLB->FirstSelected();
if(pSelect)
{
AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData());
@@ -678,7 +687,7 @@ SharedConnection SwAddressListDialog::GetConnection()
uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier()
{
uno::Reference< XColumnsSupplier> xRet;
- SvTreeListEntry* pSelect = m_aListLB.FirstSelected();
+ SvTreeListEntry* pSelect = m_pListLB->FirstSelected();
if(pSelect)
{
AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData());
@@ -690,7 +699,7 @@ uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier()
OUString SwAddressListDialog::GetFilter()
{
OUString sRet;
- SvTreeListEntry* pSelect = m_aListLB.FirstSelected();
+ SvTreeListEntry* pSelect = m_pListLB->FirstSelected();
if(pSelect)
{
AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData());
diff --git a/sw/source/ui/dbui/addresslistdialog.hrc b/sw/source/ui/dbui/addresslistdialog.hrc
deleted file mode 100644
index f3b052f..0000000
--- a/sw/source/ui/dbui/addresslistdialog.hrc
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- 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: */
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 0b5c819..0fddfde 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/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;
diff --git a/sw/source/ui/dbui/addresslistdialog.src b/sw/source/ui/dbui/addresslistdialog.src
deleted file mode 100644
index 1b91ccd..0000000
--- a/sw/source/ui/dbui/addresslistdialog.src
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- 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: */
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 77dd117..4e772a4 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/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));
diff --git a/sw/uiconfig/swriter/ui/selectaddressdialog.ui b/sw/uiconfig/swriter/ui/selectaddressdialog.ui
new file mode 100644
index 0000000..c95b4d2
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/selectaddressdialog.ui
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkDialog" id="SelectAddressDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Select Address List</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="desc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">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'.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">52</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Your recipients are currently selected from:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="homogeneous">True</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="add">
+ <property name="label" translatable="yes">_Add...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="create">
+ <property name="label" translatable="yes">_Create...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="filter">
+ <property name="label" translatable="yes">_Filter...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="edit">
+ <property name="label" translatable="yes">_Edit...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="changetable">
+ <property name="label" translatable="yes">Change _Table...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="svtlo-SvSimpleTableContainer" id="sources:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Simple Table Container-selection4"/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="name">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">Name</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="table">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">Table</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="connecting">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">Connecting to data source...</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list