[Libreoffice-commits] core.git: 2 commits - sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Sat Aug 31 09:23:06 PDT 2013
sw/AllLangResTarget_sw.mk | 1
sw/UIConfig_swriter.mk | 1
sw/inc/dbui.hrc | 2
sw/inc/helpid.h | 1
sw/inc/swabstdlg.hxx | 4
sw/source/core/docnode/swbaslnk.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 504 ++++++++--------
sw/source/ui/dbui/dbinsdlg.hrc | 67 --
sw/source/ui/dbui/dbinsdlg.src | 323 ----------
sw/source/ui/dbui/dbmgr.cxx | 3
sw/source/ui/dialog/swdlgfact.cxx | 18
sw/source/ui/dialog/swdlgfact.hxx | 4
sw/source/ui/inc/dbinsdlg.hxx | 59 -
sw/source/ui/shells/textsh2.cxx | 5
sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui | 744 ++++++++++++++++++++++++
15 files changed, 1030 insertions(+), 708 deletions(-)
New commits:
commit 7f69473ef582577b9ae37900e6860630bc8cd85d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 30 20:19:48 2013 +0100
convert insert database columns dialog to .ui
Change-Id: Ia2d6b89a1e369adf55ffcabe189d34d46a4d7525
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 67bb0b4..148ad76 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dbui/addresslistdialog.src \
sw/source/ui/dbui/createaddresslistdialog.src \
sw/source/ui/dbui/customizeaddresslistdialog.src \
- sw/source/ui/dbui/dbinsdlg.src \
sw/source/ui/dbui/dbtablepreviewdialog.src \
sw/source/ui/dbui/dbui.src \
sw/source/ui/dbui/mailmergechildwindow.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index b680fe3..5f73cd9 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -116,6 +116,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertbookmark \
sw/uiconfig/swriter/ui/insertbreak \
sw/uiconfig/swriter/ui/insertcaption \
+ sw/uiconfig/swriter/ui/insertdbcolumnsdialog \
sw/uiconfig/swriter/ui/insertfootnote \
sw/uiconfig/swriter/ui/insertsectiondialog \
sw/uiconfig/swriter/ui/insertscript \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 760835e..7103489 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -24,8 +24,6 @@
// Dialoge --------------------------------------------------------------------
-#define DLG_AP_INSERT_DB_SEL (RC_DBUI_BEGIN + 2)
-
#define DLG_MAILMERGEWIZARD (RC_DBUI_BEGIN + 3)
#define DLG_MM_DOCSELECT_PAGE (RC_DBUI_BEGIN + 4)
#define DLG_MM_OUTPUTTYPE_PAGE (RC_DBUI_BEGIN + 5)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 9f77da3..3b76017 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -302,7 +302,6 @@
#define HID_SELECT_TEMPLATE "SW_HID_SELECT_TEMPLATE"
-#define HID_AP_INSERT_DB_SEL "SW_HID_AP_INSERT_DB_SEL"
#define HID_NUM_RESET "SW_HID_NUM_RESET"
#define HID_AUTOFORMAT_REJECT "SW_HID_AUTOFORMAT_REJECT"
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 9d6f988..0e7f178 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -344,10 +344,10 @@ public:
virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0; //add for SwConvertTableDlg
virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0; //add for SwCaptionDialog
- virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot( SwView& rView, // add for SwInsertDBColAutoPilot
+ virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, // add for SwInsertDBColAutoPilot
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp,
- const SwDBData& rData, int nResId) = 0;
+ const SwDBData& rData) = 0;
virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) = 0;//add for SwFootNoteOptionDlg
//add for DropDownFieldDialog
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 34d385b..ce767ba 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -79,7 +79,6 @@
#include <poolfmt.hxx>
#include <crsskip.hxx>
-#include <dbinsdlg.hrc>
#include <dbui.hrc>
#include <cmdid.h>
@@ -190,59 +189,50 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
Reference<XDataSource> xDataSource,
Reference<sdbcx::XColumnsSupplier> xColSupp,
const SwDBData& rData )
- : SfxModalDialog( rView.GetWindow(), SW_RES( DLG_AP_INSERT_DB_SEL )),
- ConfigItem("Office.Writer/InsertData/DataSet", CONFIG_MODE_DELAYED_UPDATE),
- aFtInsertData( this, SW_RES( FT_INSERT_DATA )),
- aRbAsTable( this, SW_RES( RB_AS_TABLE )),
- aRbAsField( this, SW_RES( RB_AS_FIELD )),
- aRbAsText( this, SW_RES( RB_AS_TEXT )),
-
- aFlHead( this, SW_RES( FL_HEAD )),
- aFtDbColumn( this, SW_RES( FT_DB_COLUMN )),
-
- aLbTblDbColumn( this, SW_RES( LB_TBL_DB_COLUMN )),
- aLbTxtDbColumn( this, SW_RES( LB_TXT_DB_COLUMN )),
-
- aFlFormat( this, SW_RES( FL_FORMAT )),
- aRbDbFmtFromDb( this, SW_RES( RB_DBFMT_FROM_DB )),
- aRbDbFmtFromUsr( this, SW_RES( RB_DBFMT_FROM_USR )),
- aLbDbFmtFromUsr( this, &rView, SW_RES( LB_DBFMT_FROM_USR )),
-
- aIbDbcolToEdit( this, SW_RES( IB_DBCOL_TOEDIT )),
- aEdDbText( this, SW_RES( ED_DB_TEXT )),
- aFtDbParaColl( this, SW_RES( FT_DB_PARA_COLL )),
- aLbDbParaColl( this, SW_RES( LB_DB_PARA_COLL )),
-
- aIbDbcolAllTo( this, SW_RES( IB_DBCOL_ALL_TO )),
- aIbDbcolOneTo( this, SW_RES( IB_DBCOL_ONE_TO )),
- aIbDbcolOneFrom( this, SW_RES( IB_DBCOL_ONE_FROM )),
- aIbDbcolAllFrom( this, SW_RES( IB_DBCOL_ALL_FROM )),
- aFtTableCol( this, SW_RES( FT_TABLE_COL )),
- aLbTableCol( this, SW_RES( LB_TABLE_COL )),
- aCbTableHeadon( this, SW_RES( CB_TABLE_HEADON )),
- aRbHeadlColnms( this, SW_RES( RB_HEADL_COLNMS )),
- aRbHeadlEmpty( this, SW_RES( RB_HEADL_EMPTY )),
- aPbTblFormat( this, SW_RES( PB_TBL_FORMAT )),
- aPbTblAutofmt( this, SW_RES( PB_TBL_AUTOFMT )),
-
- aBtOk( this, SW_RES( BT_OK )),
- aBtCancel( this, SW_RES( BT_CANCEL )),
- aBtHelp( this, SW_RES( BT_HELP )),
-
- aFlBottom( this, SW_RES( FL_BOTTOM )),
-
- aDBData(rData),
-
- aOldNumFmtLnk( aLbDbFmtFromUsr.GetSelectHdl() ),
- sNoTmpl( SW_RES( STR_NOTEMPL )),
- pView( &rView ),
- pTAutoFmt( 0 ),
- pTblSet( 0 ),
- pRep( 0 )
+ : SfxModalDialog(rView.GetWindow(), "InsertDbColumnsDialog",
+ "modules/swriter/ui/insertdbcolumnsdialog.ui")
+ , ConfigItem("Office.Writer/InsertData/DataSet",
+ CONFIG_MODE_DELAYED_UPDATE)
+ , aDBData(rData)
+ , sNoTmpl(SW_RESSTR(SW_STR_NONE))
+ , pView(&rView)
+ , pTAutoFmt(0)
+ , pTblSet(0)
+ , pRep(0)
{
- FreeResource();
-
- nGBFmtLen = aFlFormat.GetText().getLength();
+ get(m_pRbAsTable, "astable");
+ get(m_pRbAsField, "asfields");
+ get(m_pRbAsText, "astext");
+ get(m_pHeadFrame, "dbframe");
+ get(m_pLbTblDbColumn, "tabledbcols");
+ get(m_pLbTxtDbColumn, "tabletxtcols");
+ m_pLbTblDbColumn->SetDropDownLineCount(8);
+ m_pLbTxtDbColumn->SetDropDownLineCount(8);
+ get(m_pFormatFrame, "formatframe");
+ get(m_pRbDbFmtFromDb, "fromdatabase");
+ get(m_pRbDbFmtFromUsr, "userdefined");
+ get(m_pLbDbFmtFromUsr, "numformat");
+ aOldNumFmtLnk = m_pLbDbFmtFromUsr->GetSelectHdl();
+ get(m_pIbDbcolToEdit, "toedit");
+ get(m_pEdDbText, "textview");
+ m_pEdDbText->set_width_request(m_pEdDbText->approximate_char_width() * 46);
+ get(m_pFtDbParaColl, "parastylelabel");
+ get(m_pLbDbParaColl, "parastyle");
+ m_pLbDbParaColl->SetStyle(m_pLbDbParaColl->GetStyle() | WB_SORT);
+ get(m_pIbDbcolAllTo, "oneright");
+ get(m_pIbDbcolOneTo, "allright");
+ get(m_pIbDbcolOneFrom, "oneleft");
+ get(m_pIbDbcolAllFrom, "allleft");
+ get(m_pFtTableCol, "tablecolft");
+ get(m_pLbTableCol, "tablecols");
+ m_pLbTableCol->SetDropDownLineCount(8);
+ get(m_pCbTableHeadon, "tableheading");
+ get(m_pRbHeadlColnms, "columnname");
+ get(m_pRbHeadlEmpty, "rowonly");
+ get(m_pPbTblFormat, "tableformat");
+ get(m_pPbTblAutofmt, "autoformat");
+
+ nGBFmtLen = m_pFormatFrame->get_label().getLength();
if(xColSupp.is())
{
@@ -349,75 +339,77 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
{
SfxStyleSheetBasePool* pPool = pView->GetDocShell()->GetStyleSheetPool();
pPool->SetSearchMask( SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL );
- aLbDbParaColl.InsertEntry( sNoTmpl );
+ m_pLbDbParaColl->InsertEntry( sNoTmpl );
const SfxStyleSheetBase* pBase = pPool->First();
while( pBase )
{
- aLbDbParaColl.InsertEntry( pBase->GetName() );
+ m_pLbDbParaColl->InsertEntry( pBase->GetName() );
pBase = pPool->Next();
}
- aLbDbParaColl.SelectEntryPos( 0 );
+ m_pLbDbParaColl->SelectEntryPos( 0 );
}
// when the cursor is inside of a table, table must NEVER be selectable
if( pView->GetWrtShell().GetTableFmt() )
{
- aRbAsTable.Enable( sal_False );
- aRbAsField.Check( sal_True );
- aRbDbFmtFromDb.Check( sal_True );
+ m_pRbAsTable->Enable( sal_False );
+ m_pRbAsField->Check( sal_True );
+ m_pRbDbFmtFromDb->Check( sal_True );
}
else
{
- aRbAsTable.Check( sal_True );
- aRbDbFmtFromDb.Check( sal_True );
- aIbDbcolOneFrom.Enable( sal_False );
- aIbDbcolAllFrom.Enable( sal_False );
+ m_pRbAsTable->Check( sal_True );
+ m_pRbDbFmtFromDb->Check( sal_True );
+ m_pIbDbcolOneFrom->Enable( sal_False );
+ m_pIbDbcolAllFrom->Enable( sal_False );
}
- aRbAsTable.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl ));
- aRbAsField.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl ));
- aRbAsText.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl ));
+ m_pRbAsTable->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl ));
+ m_pRbAsField->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl ));
+ m_pRbAsText->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl ));
- aRbDbFmtFromDb.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, DBFormatHdl ));
- aRbDbFmtFromUsr.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, DBFormatHdl ));
+ m_pRbDbFmtFromDb->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, DBFormatHdl ));
+ m_pRbDbFmtFromUsr->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, DBFormatHdl ));
- aPbTblFormat.SetClickHdl(LINK(this, SwInsertDBColAutoPilot, TblFmtHdl ));
- aPbTblAutofmt.SetClickHdl(LINK(this, SwInsertDBColAutoPilot, AutoFmtHdl ));
+ m_pPbTblFormat->SetClickHdl(LINK(this, SwInsertDBColAutoPilot, TblFmtHdl ));
+ m_pPbTblAutofmt->SetClickHdl(LINK(this, SwInsertDBColAutoPilot, AutoFmtHdl ));
- aIbDbcolAllTo.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
- aIbDbcolOneTo.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
- aIbDbcolOneFrom.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
- aIbDbcolAllFrom.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
- aIbDbcolToEdit.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+ m_pIbDbcolAllTo->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+ m_pIbDbcolOneTo->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+ m_pIbDbcolOneFrom->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+ m_pIbDbcolAllFrom->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+ m_pIbDbcolToEdit->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
- aCbTableHeadon.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
- aRbHeadlColnms.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
- aRbHeadlEmpty.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
+ m_pCbTableHeadon->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
+ m_pRbHeadlColnms->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
+ m_pRbHeadlEmpty->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
- aLbTxtDbColumn.SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
- aLbTblDbColumn.SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
- aLbDbFmtFromUsr.SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
- aLbTableCol.SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
+ m_pLbTxtDbColumn->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
+ m_pLbTblDbColumn->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
+ m_pLbDbFmtFromUsr->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
+ m_pLbTableCol->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
- aLbTxtDbColumn.SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
- aLbTblDbColumn.SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
- aLbTableCol.SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
+ m_pLbTxtDbColumn->SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
+ m_pLbTblDbColumn->SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
+ m_pLbTableCol->SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
for( sal_uInt16 n = 0; n < aDBColumns.size(); ++n )
{
const String& rS = aDBColumns[ n ]->sColumn;
- aLbTblDbColumn.InsertEntry( rS, n );
- aLbTxtDbColumn.InsertEntry( rS, n );
+ m_pLbTblDbColumn->InsertEntry( rS, n );
+ m_pLbTxtDbColumn->InsertEntry( rS, n );
}
- aLbTxtDbColumn.SelectEntryPos( 0 );
- aLbTblDbColumn.SelectEntryPos( 0 );
+ m_pLbTxtDbColumn->SelectEntryPos( 0 );
+ m_pLbTblDbColumn->SelectEntryPos( 0 );
// read configuration
Load();
+ // lock size to widest config
+ m_pHeadFrame->set_width_request(m_pHeadFrame->get_preferred_size().Width());
// initialise Controls:
- PageHdl( aRbAsTable.IsChecked() ? &aRbAsTable : &aRbAsField );
+ PageHdl( m_pRbAsTable->IsChecked() ? m_pRbAsTable : m_pRbAsField );
}
SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot()
@@ -430,52 +422,52 @@ SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot()
IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, Button*, pButton )
{
- sal_Bool bShowTbl = pButton == &aRbAsTable;
-
- String sTxt( pButton->GetText() );
- aFlHead.SetText( MnemonicGenerator::EraseAllMnemonicChars( sTxt ) );
-
- aLbTxtDbColumn.Show( !bShowTbl );
- aIbDbcolToEdit.Show( !bShowTbl );
- aEdDbText.Show( !bShowTbl );
- aFtDbParaColl.Show( !bShowTbl );
- aLbDbParaColl.Show( !bShowTbl );
-
- aLbTblDbColumn.Show( bShowTbl );
- aIbDbcolAllTo.Show( bShowTbl );
- aIbDbcolOneTo.Show( bShowTbl );
- aIbDbcolOneFrom.Show( bShowTbl );
- aIbDbcolAllFrom.Show( bShowTbl );
- aFtTableCol.Show( bShowTbl );
- aLbTableCol.Show( bShowTbl );
- aCbTableHeadon.Show( bShowTbl );
- aRbHeadlColnms.Show( bShowTbl );
- aRbHeadlEmpty.Show( bShowTbl );
- aPbTblFormat.Show( bShowTbl );
- aPbTblAutofmt.Show( bShowTbl );
+ bool bShowTbl = pButton == m_pRbAsTable;
+
+ OUString sTxt(pButton->GetText());
+ m_pHeadFrame->set_label(MnemonicGenerator::EraseAllMnemonicChars(sTxt));
+
+ m_pLbTxtDbColumn->Show( !bShowTbl );
+ m_pIbDbcolToEdit->Show( !bShowTbl );
+ m_pEdDbText->Show( !bShowTbl );
+ m_pFtDbParaColl->Show( !bShowTbl );
+ m_pLbDbParaColl->Show( !bShowTbl );
+
+ m_pLbTblDbColumn->Show( bShowTbl );
+ m_pIbDbcolAllTo->Show( bShowTbl );
+ m_pIbDbcolOneTo->Show( bShowTbl );
+ m_pIbDbcolOneFrom->Show( bShowTbl );
+ m_pIbDbcolAllFrom->Show( bShowTbl );
+ m_pFtTableCol->Show( bShowTbl );
+ m_pLbTableCol->Show( bShowTbl );
+ m_pCbTableHeadon->Show( bShowTbl );
+ m_pRbHeadlColnms->Show( bShowTbl );
+ m_pRbHeadlEmpty->Show( bShowTbl );
+ m_pPbTblFormat->Show( bShowTbl );
+ m_pPbTblAutofmt->Show( bShowTbl );
if( bShowTbl )
- aPbTblFormat.Enable( 0 != aLbTableCol.GetEntryCount() );
+ m_pPbTblFormat->Enable( 0 != m_pLbTableCol->GetEntryCount() );
- SelectHdl( bShowTbl ? &aLbTblDbColumn : &aLbTxtDbColumn );
+ SelectHdl( bShowTbl ? m_pLbTblDbColumn : m_pLbTxtDbColumn );
return 0;
}
IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton )
{
- ListBox& rBox = aRbAsTable.IsChecked()
- ? ( 0 == aLbTableCol.GetEntryData( 0 )
- ? aLbTblDbColumn
- : aLbTableCol )
- : aLbTxtDbColumn;
+ ListBox& rBox = m_pRbAsTable->IsChecked()
+ ? ( 0 == m_pLbTableCol->GetEntryData( 0 )
+ ? *m_pLbTblDbColumn
+ : *m_pLbTableCol )
+ : *m_pLbTxtDbColumn;
SwInsDBColumn aSrch( rBox.GetSelectEntry(), 0 );
SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
- sal_Bool bFromDB = &aRbDbFmtFromDb == pButton;
+ sal_Bool bFromDB = m_pRbDbFmtFromDb == pButton;
(*it)->bIsDBFmt = bFromDB;
- aLbDbFmtFromUsr.Enable( !bFromDB );
+ m_pLbDbFmtFromUsr->Enable( !bFromDB );
return 0;
}
@@ -483,53 +475,53 @@ IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton )
IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
{
sal_Bool bChgEnable = sal_True, bEnableTo = sal_True, bEnableFrom = sal_True;
- aLbTblDbColumn.SetUpdateMode( sal_False );
- aLbTableCol.SetUpdateMode( sal_False );
+ m_pLbTblDbColumn->SetUpdateMode( sal_False );
+ m_pLbTableCol->SetUpdateMode( sal_False );
- if( pButton == &aIbDbcolAllTo )
+ if( pButton == m_pIbDbcolAllTo )
{
bEnableTo = sal_False;
- sal_uInt16 n, nInsPos = aLbTableCol.GetSelectEntryPos(),
- nCnt = aLbTblDbColumn.GetEntryCount();
+ sal_uInt16 n, nInsPos = m_pLbTableCol->GetSelectEntryPos(),
+ nCnt = m_pLbTblDbColumn->GetEntryCount();
if( LISTBOX_APPEND == nInsPos )
for( n = 0; n < nCnt; ++n )
- aLbTableCol.InsertEntry( aLbTblDbColumn.GetEntry( n ),
+ m_pLbTableCol->InsertEntry( m_pLbTblDbColumn->GetEntry( n ),
LISTBOX_APPEND );
else
for( n = 0; n < nCnt; ++n, ++nInsPos )
- aLbTableCol.InsertEntry( aLbTblDbColumn.GetEntry( n ), nInsPos );
- aLbTblDbColumn.Clear();
- aLbTableCol.SelectEntryPos( nInsPos );
- aLbTblDbColumn.SelectEntryPos( LISTBOX_APPEND );
+ m_pLbTableCol->InsertEntry( m_pLbTblDbColumn->GetEntry( n ), nInsPos );
+ m_pLbTblDbColumn->Clear();
+ m_pLbTableCol->SelectEntryPos( nInsPos );
+ m_pLbTblDbColumn->SelectEntryPos( LISTBOX_APPEND );
}
- else if( pButton == &aIbDbcolOneTo &&
- LISTBOX_ENTRY_NOTFOUND != aLbTblDbColumn.GetSelectEntryPos() )
+ else if( pButton == m_pIbDbcolOneTo &&
+ LISTBOX_ENTRY_NOTFOUND != m_pLbTblDbColumn->GetSelectEntryPos() )
{
- sal_uInt16 nInsPos = aLbTableCol.GetSelectEntryPos(),
- nDelPos = aLbTblDbColumn.GetSelectEntryPos(),
- nTopPos = aLbTblDbColumn.GetTopEntry();
- aLbTableCol.InsertEntry( aLbTblDbColumn.GetEntry( nDelPos ), nInsPos );
- aLbTblDbColumn.RemoveEntry( nDelPos );
-
- aLbTableCol.SelectEntryPos( nInsPos );
- if( nDelPos >= aLbTblDbColumn.GetEntryCount() )
- nDelPos = aLbTblDbColumn.GetEntryCount() - 1;
- aLbTblDbColumn.SelectEntryPos( nDelPos );
- aLbTblDbColumn.SetTopEntry( nTopPos );
-
- bEnableTo = 0 != aLbTblDbColumn.GetEntryCount();
+ sal_uInt16 nInsPos = m_pLbTableCol->GetSelectEntryPos(),
+ nDelPos = m_pLbTblDbColumn->GetSelectEntryPos(),
+ nTopPos = m_pLbTblDbColumn->GetTopEntry();
+ m_pLbTableCol->InsertEntry( m_pLbTblDbColumn->GetEntry( nDelPos ), nInsPos );
+ m_pLbTblDbColumn->RemoveEntry( nDelPos );
+
+ m_pLbTableCol->SelectEntryPos( nInsPos );
+ if( nDelPos >= m_pLbTblDbColumn->GetEntryCount() )
+ nDelPos = m_pLbTblDbColumn->GetEntryCount() - 1;
+ m_pLbTblDbColumn->SelectEntryPos( nDelPos );
+ m_pLbTblDbColumn->SetTopEntry( nTopPos );
+
+ bEnableTo = 0 != m_pLbTblDbColumn->GetEntryCount();
}
- else if( pButton == &aIbDbcolOneFrom )
+ else if( pButton == m_pIbDbcolOneFrom )
{
- if( LISTBOX_ENTRY_NOTFOUND != aLbTableCol.GetSelectEntryPos() )
+ if( LISTBOX_ENTRY_NOTFOUND != m_pLbTableCol->GetSelectEntryPos() )
{
sal_uInt16 nInsPos,
- nDelPos = aLbTableCol.GetSelectEntryPos(),
- nTopPos = aLbTableCol.GetTopEntry();
+ nDelPos = m_pLbTableCol->GetSelectEntryPos(),
+ nTopPos = m_pLbTableCol->GetTopEntry();
// look for the right InsertPos!!
- SwInsDBColumn aSrch( aLbTableCol.GetEntry( nDelPos ), 0 );
+ SwInsDBColumn aSrch( m_pLbTableCol->GetEntry( nDelPos ), 0 );
SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
if( it == aDBColumns.begin() || (it+1) == aDBColumns.end() )
nInsPos = it - aDBColumns.begin();
@@ -537,48 +529,48 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
{
nInsPos = LISTBOX_ENTRY_NOTFOUND;
while( ++it != aDBColumns.end() &&
- LISTBOX_ENTRY_NOTFOUND == (nInsPos = aLbTblDbColumn.
+ LISTBOX_ENTRY_NOTFOUND == (nInsPos = m_pLbTblDbColumn->
GetEntryPos( String( (*it)->sColumn ))) )
;
}
- aLbTblDbColumn.InsertEntry( aSrch.sColumn, nInsPos );
- aLbTableCol.RemoveEntry( nDelPos );
+ m_pLbTblDbColumn->InsertEntry( aSrch.sColumn, nInsPos );
+ m_pLbTableCol->RemoveEntry( nDelPos );
- if( nInsPos >= aLbTblDbColumn.GetEntryCount() )
- nInsPos = aLbTblDbColumn.GetEntryCount() - 1;
- aLbTblDbColumn.SelectEntryPos( nInsPos );
+ if( nInsPos >= m_pLbTblDbColumn->GetEntryCount() )
+ nInsPos = m_pLbTblDbColumn->GetEntryCount() - 1;
+ m_pLbTblDbColumn->SelectEntryPos( nInsPos );
- if( nDelPos >= aLbTableCol.GetEntryCount() )
- nDelPos = aLbTableCol.GetEntryCount() - 1;
- aLbTableCol.SelectEntryPos( nDelPos );
- aLbTableCol.SetTopEntry( nTopPos );
+ if( nDelPos >= m_pLbTableCol->GetEntryCount() )
+ nDelPos = m_pLbTableCol->GetEntryCount() - 1;
+ m_pLbTableCol->SelectEntryPos( nDelPos );
+ m_pLbTableCol->SetTopEntry( nTopPos );
}
else
- bEnableTo = 0 != aLbTblDbColumn.GetEntryCount();
+ bEnableTo = 0 != m_pLbTblDbColumn->GetEntryCount();
- bEnableFrom = 0 != aLbTableCol.GetEntryCount();
+ bEnableFrom = 0 != m_pLbTableCol->GetEntryCount();
}
- else if( pButton == &aIbDbcolAllFrom )
+ else if( pButton == m_pIbDbcolAllFrom )
{
bEnableFrom = sal_False;
- aLbTblDbColumn.Clear();
- aLbTableCol.Clear();
+ m_pLbTblDbColumn->Clear();
+ m_pLbTableCol->Clear();
for( sal_uInt16 n = 0; n < aDBColumns.size(); ++n )
- aLbTblDbColumn.InsertEntry( aDBColumns[ n ]->sColumn, n );
- aLbTblDbColumn.SelectEntryPos( 0 );
+ m_pLbTblDbColumn->InsertEntry( aDBColumns[ n ]->sColumn, n );
+ m_pLbTblDbColumn->SelectEntryPos( 0 );
}
- else if( pButton == &aIbDbcolToEdit )
+ else if( pButton == m_pIbDbcolToEdit )
{
bChgEnable = sal_False;
// move data to Edit:
- String aFld( aLbTxtDbColumn.GetSelectEntry() );
+ String aFld( m_pLbTxtDbColumn->GetSelectEntry() );
if( aFld.Len() )
{
- String aStr( aEdDbText.GetText() );
- sal_uInt16 nPos = (sal_uInt16)aEdDbText.GetSelection().Min();
- sal_uInt16 nSel = sal_uInt16(aEdDbText.GetSelection().Max()) - nPos;
+ String aStr( m_pEdDbText->GetText() );
+ sal_uInt16 nPos = (sal_uInt16)m_pEdDbText->GetSelection().Min();
+ sal_uInt16 nSel = sal_uInt16(m_pEdDbText->GetSelection().Max()) - nPos;
if( nSel )
// first delete the existing selection
aStr.Erase( nPos, nSel );
@@ -602,27 +594,27 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
}
aStr.Insert( aFld, nPos );
- aEdDbText.SetText( aStr );
+ m_pEdDbText->SetText( aStr );
nPos = nPos + aFld.Len();
- aEdDbText.SetSelection( Selection( nPos ));
+ m_pEdDbText->SetSelection( Selection( nPos ));
}
}
if( bChgEnable )
{
- aIbDbcolOneTo.Enable( bEnableTo );
- aIbDbcolAllTo.Enable( bEnableTo );
- aIbDbcolOneFrom.Enable( bEnableFrom );
- aIbDbcolAllFrom.Enable( bEnableFrom );
+ m_pIbDbcolOneTo->Enable( bEnableTo );
+ m_pIbDbcolAllTo->Enable( bEnableTo );
+ m_pIbDbcolOneFrom->Enable( bEnableFrom );
+ m_pIbDbcolAllFrom->Enable( bEnableFrom );
- aRbDbFmtFromDb.Enable( sal_False );
- aRbDbFmtFromUsr.Enable( sal_False );
- aLbDbFmtFromUsr.Enable( sal_False );
+ m_pRbDbFmtFromDb->Enable( sal_False );
+ m_pRbDbFmtFromUsr->Enable( sal_False );
+ m_pLbDbFmtFromUsr->Enable( sal_False );
- aPbTblFormat.Enable( bEnableFrom );
+ m_pPbTblFormat->Enable( bEnableFrom );
}
- aLbTblDbColumn.SetUpdateMode( sal_True );
- aLbTableCol.SetUpdateMode( sal_True );
+ m_pLbTblDbColumn->SetUpdateMode( sal_True );
+ m_pLbTableCol->SetUpdateMode( sal_True );
return 0;
}
@@ -630,12 +622,12 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox*, pBox )
{
Button* pButton = 0;
- if( pBox == &aLbTxtDbColumn )
- pButton = &aIbDbcolToEdit;
- else if( pBox == &aLbTblDbColumn && aIbDbcolOneTo.IsEnabled() )
- pButton = &aIbDbcolOneTo;
- else if( pBox == &aLbTableCol && aIbDbcolOneFrom.IsEnabled() )
- pButton = &aIbDbcolOneFrom;
+ if( pBox == m_pLbTxtDbColumn )
+ pButton = m_pIbDbcolToEdit;
+ else if( pBox == m_pLbTblDbColumn && m_pIbDbcolOneTo->IsEnabled() )
+ pButton = m_pIbDbcolOneTo;
+ else if( pBox == m_pLbTableCol && m_pIbDbcolOneFrom->IsEnabled() )
+ pButton = m_pIbDbcolOneFrom;
if( pButton )
TblToFromHdl( pButton );
@@ -721,11 +713,11 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
::GetHtmlMode( pView->GetDocShell() )));
}
- if( aLbTableCol.GetEntryCount() != pRep->GetAllColCount() )
+ if( m_pLbTableCol->GetEntryCount() != pRep->GetAllColCount() )
{
// Number of columns has changed: then the TabCols have to be adjusted
long nWidth = pRep->GetWidth();
- sal_uInt16 nCols = aLbTableCol.GetEntryCount() - 1;
+ sal_uInt16 nCols = m_pLbTableCol->GetEntryCount() - 1;
SwTabCols aTabCols( nCols );
aTabCols.SetRight( nWidth );
aTabCols.SetRightMax( nWidth );
@@ -776,41 +768,41 @@ IMPL_LINK( SwInsertDBColAutoPilot, AutoFmtHdl, PushButton*, pButton )
IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
{
- ListBox* pGetBox = pBox == &aLbDbFmtFromUsr
- ? ( aRbAsTable.IsChecked()
- ? ( 0 == aLbTableCol.GetEntryData( 0 )
- ? &aLbTblDbColumn
- : &aLbTableCol )
- : &aLbTxtDbColumn )
+ ListBox* pGetBox = pBox == m_pLbDbFmtFromUsr
+ ? ( m_pRbAsTable->IsChecked()
+ ? ( 0 == m_pLbTableCol->GetEntryData( 0 )
+ ? m_pLbTblDbColumn
+ : m_pLbTableCol )
+ : m_pLbTxtDbColumn )
: pBox;
SwInsDBColumn aSrch( pGetBox->GetSelectEntry(), 0 );
SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
- if( pBox == &aLbDbFmtFromUsr )
+ if( pBox == m_pLbDbFmtFromUsr )
{
if( !aSrch.sColumn.isEmpty() )
{
aOldNumFmtLnk.Call( pBox );
- (*it)->nUsrNumFmt = aLbDbFmtFromUsr.GetFormat();
+ (*it)->nUsrNumFmt = m_pLbDbFmtFromUsr->GetFormat();
}
}
else
{
// set the selected FieldName at the FormatGroupBox, so that
// it's clear what field is configured by the format!
- String sTxt( aFlFormat.GetText().copy( 0, nGBFmtLen ));
+ String sTxt( m_pFormatFrame->get_label().copy( 0, nGBFmtLen ));
if( aSrch.sColumn.isEmpty() )
{
- aRbDbFmtFromDb.Enable( sal_False );
- aRbDbFmtFromUsr.Enable( sal_False );
- aLbDbFmtFromUsr.Enable( sal_False );
+ m_pRbDbFmtFromDb->Enable( sal_False );
+ m_pRbDbFmtFromUsr->Enable( sal_False );
+ m_pLbDbFmtFromUsr->Enable( sal_False );
}
else
{
sal_Bool bEnableFmt = (*it)->bHasFmt;
- aRbDbFmtFromDb.Enable( bEnableFmt );
- aRbDbFmtFromUsr.Enable( bEnableFmt );
+ m_pRbDbFmtFromDb->Enable( bEnableFmt );
+ m_pRbDbFmtFromUsr->Enable( bEnableFmt );
if( bEnableFmt )
{
@@ -818,31 +810,31 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
}
sal_Bool bIsDBFmt = (*it)->bIsDBFmt;
- aRbDbFmtFromDb.Check( bIsDBFmt );
- aRbDbFmtFromUsr.Check( !bIsDBFmt );
- aLbDbFmtFromUsr.Enable( !bIsDBFmt );
+ m_pRbDbFmtFromDb->Check( bIsDBFmt );
+ m_pRbDbFmtFromUsr->Check( !bIsDBFmt );
+ m_pLbDbFmtFromUsr->Enable( !bIsDBFmt );
if( !bIsDBFmt )
- aLbDbFmtFromUsr.SetDefFormat( (*it)->nUsrNumFmt );
+ m_pLbDbFmtFromUsr->SetDefFormat( (*it)->nUsrNumFmt );
}
- aFlFormat.SetText( sTxt );
+ m_pFormatFrame->set_label(sTxt);
// to know later on, what ListBox was the "active", a Flag
// is remembered in the 1st entry
- void* pPtr = pBox == &aLbTableCol ? &aLbTableCol : 0;
- aLbTableCol.SetEntryData( 0, pPtr );
+ void* pPtr = pBox == m_pLbTableCol ? m_pLbTableCol : 0;
+ m_pLbTableCol->SetEntryData( 0, pPtr );
}
return 0;
}
IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton )
{
- if( pButton == &aCbTableHeadon )
+ if( pButton == m_pCbTableHeadon )
{
- sal_Bool bEnable = aCbTableHeadon.IsChecked();
+ sal_Bool bEnable = m_pCbTableHeadon->IsChecked();
- aRbHeadlColnms.Enable( bEnable );
- aRbHeadlEmpty.Enable( bEnable );
+ m_pRbHeadlColnms->Enable( bEnable );
+ m_pRbHeadlEmpty->Enable( bEnable );
}
return 0;
}
@@ -971,7 +963,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
if( bUndo )
rSh.StartUndo( UNDO_EMPTY );
- sal_Bool bAsTable = aRbAsTable.IsChecked();
+ sal_Bool bAsTable = m_pRbAsTable->IsChecked();
SvNumberFormatter& rNumFmtr = *rSh.GetNumberFormatter();
if( rSh.HasSelection() )
@@ -987,8 +979,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
{
rSh.DoUndo( sal_False );
- sal_uInt16 n, nRows = 0, nCols = aLbTableCol.GetEntryCount();
- if( aCbTableHeadon.IsChecked() )
+ sal_uInt16 n, nRows = 0, nCols = m_pLbTableCol->GetEntryCount();
+ if( m_pCbTableHeadon->IsChecked() )
nRows++;
if( pSelection )
@@ -1000,7 +992,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
std::vector<SwInsDBColumn*> aColFlds;
for( n = 0; n < nCols; ++n )
{
- SwInsDBColumn aSrch( aLbTableCol.GetEntry( n ), 0 );
+ SwInsDBColumn aSrch( m_pLbTableCol->GetEntry( n ), 0 );
SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
if (it != aDBColumns.end())
aColFlds.push_back(*it);
@@ -1038,11 +1030,11 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
rSh.SetAutoUpdateCells( sal_False );
- if( aCbTableHeadon.IsChecked() )
+ if( m_pCbTableHeadon->IsChecked() )
{
for( n = 0; n < nCols; ++n )
{
- if( aRbHeadlColnms.IsChecked() )
+ if( m_pRbHeadlColnms->IsChecked() )
{
rSh.SwEditShell::Insert2( aColFlds[ n ]->sColumn );
}
@@ -1179,7 +1171,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
else // add data as fields/text
{
_DB_Columns aColArr;
- if( SplitTextToColArr( aEdDbText.GetText(), aColArr, aRbAsField.IsChecked() ) )
+ if( SplitTextToColArr( m_pEdDbText->GetText(), aColArr, m_pRbAsField->IsChecked() ) )
{
// now for each data set, we can iterate over the array
// and add the data
@@ -1196,7 +1188,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
SwTxtFmtColl* pColl = 0;
{
- String sTmplNm( aLbDbParaColl.GetSelectEntry() );
+ String sTmplNm( m_pLbDbParaColl->GetSelectEntry() );
if( sNoTmpl != sTmplNm )
{
pColl = rSh.FindTxtFmtCollByName( sTmplNm );
@@ -1383,7 +1375,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
else if( i+1 >= rSelection.getLength() )
break;
- if( aRbAsField.IsChecked() )
+ if( m_pRbAsField->IsChecked() )
rSh.Insert( aNxtDBFld );
if( !rSh.IsSttPara() )
@@ -1567,32 +1559,32 @@ void SwInsertDBColAutoPilot::Commit()
pValues[0].Value <<= OUString(aDBData.sDataSource);
pValues[1].Value <<= OUString(aDBData.sCommand);
pValues[2].Value <<= aDBData.nCommandType;
- pValues[3].Value <<= OUString(aEdDbText.GetText());
+ pValues[3].Value <<= OUString(m_pEdDbText->GetText());
OUString sTmp;
- for( sal_uInt16 n = 0, nCnt = aLbTableCol.GetEntryCount(); n < nCnt; ++n )
- (sTmp += aLbTableCol.GetEntry(n)) += "\x0a";
+ for( sal_uInt16 n = 0, nCnt = m_pLbTableCol->GetEntryCount(); n < nCnt; ++n )
+ (sTmp += m_pLbTableCol->GetEntry(n)) += "\x0a";
if (!sTmp.isEmpty())
pValues[4].Value <<= sTmp;
- if( sNoTmpl != (sTmp = aLbDbParaColl.GetSelectEntry()) )
+ if( sNoTmpl != (sTmp = m_pLbDbParaColl->GetSelectEntry()) )
pValues[5].Value <<= sTmp;
if( pTAutoFmt )
pValues[6].Value <<= OUString(pTAutoFmt->GetName());
const Type& rBoolType = ::getBooleanCppuType();
- sal_Bool bTmp = aRbAsTable.IsChecked();
+ sal_Bool bTmp = m_pRbAsTable->IsChecked();
pValues[7].Value.setValue(&bTmp, rBoolType);
- bTmp = aRbAsField.IsChecked();
+ bTmp = m_pRbAsField->IsChecked();
pValues[8].Value.setValue(&bTmp, rBoolType);
- bTmp = aCbTableHeadon.IsChecked();
+ bTmp = m_pCbTableHeadon->IsChecked();
pValues[9].Value.setValue(&bTmp, rBoolType);
- bTmp = aRbHeadlEmpty.IsChecked();
+ bTmp = m_pRbHeadlEmpty->IsChecked();
pValues[10].Value.setValue(&bTmp, rBoolType);
SetSetProperties(OUString(), aValues);
@@ -1754,28 +1746,28 @@ void SwInsertDBColAutoPilot::Load()
do {
String sEntry( sTmp.GetToken( 0, '\x0a', n ) );
//preselect column - if they still exist!
- if(aLbTblDbColumn.GetEntryPos(sEntry) != LISTBOX_ENTRY_NOTFOUND)
+ if(m_pLbTblDbColumn->GetEntryPos(sEntry) != LISTBOX_ENTRY_NOTFOUND)
{
- aLbTableCol.InsertEntry( sEntry );
- aLbTblDbColumn.RemoveEntry( sEntry );
+ m_pLbTableCol->InsertEntry( sEntry );
+ m_pLbTblDbColumn->RemoveEntry( sEntry );
}
} while( n < sTmp.Len() );
- if( !aLbTblDbColumn.GetEntryCount() )
+ if( !m_pLbTblDbColumn->GetEntryCount() )
{
- aIbDbcolAllTo.Enable( sal_False );
- aIbDbcolOneTo.Enable( sal_False );
+ m_pIbDbcolAllTo->Enable( sal_False );
+ m_pIbDbcolOneTo->Enable( sal_False );
}
- aIbDbcolOneFrom.Enable( sal_True );
- aIbDbcolAllFrom.Enable( sal_True );
+ m_pIbDbcolOneFrom->Enable( sal_True );
+ m_pIbDbcolAllFrom->Enable( sal_True );
}
- aEdDbText.SetText( pNewData->sEdit );
+ m_pEdDbText->SetText( pNewData->sEdit );
sTmp = pNewData->sTmplNm;
if( sTmp.Len() )
- aLbDbParaColl.SelectEntry( sTmp );
+ m_pLbDbParaColl->SelectEntry( sTmp );
else
- aLbDbParaColl.SelectEntryPos( 0 );
+ m_pLbDbParaColl->SelectEntryPos( 0 );
delete pTAutoFmt, pTAutoFmt = 0;
sTmp = pNewData->sTAutoFmtNm;
@@ -1792,14 +1784,14 @@ void SwInsertDBColAutoPilot::Load()
}
}
- aRbAsTable.Check( pNewData->bIsTable );
- aRbAsField.Check( pNewData->bIsField );
- aRbAsText.Check( !pNewData->bIsTable && !pNewData->bIsField );
+ m_pRbAsTable->Check( pNewData->bIsTable );
+ m_pRbAsField->Check( pNewData->bIsField );
+ m_pRbAsText->Check( !pNewData->bIsTable && !pNewData->bIsField );
- aCbTableHeadon.Check( pNewData->bIsHeadlineOn );
- aRbHeadlColnms.Check( !pNewData->bIsEmptyHeadln );
- aRbHeadlEmpty.Check( pNewData->bIsEmptyHeadln );
- HeaderHdl(&aCbTableHeadon);
+ m_pCbTableHeadon->Check( pNewData->bIsHeadlineOn );
+ m_pRbHeadlColnms->Check( !pNewData->bIsEmptyHeadln );
+ m_pRbHeadlEmpty->Check( pNewData->bIsEmptyHeadln );
+ HeaderHdl(m_pCbTableHeadon);
// now copy the user defined Numberformat strings to the
// Shell. Then only these are available as ID
@@ -1830,8 +1822,8 @@ void SwInsertDBColAutoPilot::Load()
}
// when the cursor is inside of a table, table must NEVER be selectable
- if( !aRbAsTable.IsEnabled() && aRbAsTable.IsChecked() )
- aRbAsField.Check( sal_True );
+ if( !m_pRbAsTable->IsEnabled() && m_pRbAsTable->IsChecked() )
+ m_pRbAsField->Check( sal_True );
delete pNewData;
break;
}
diff --git a/sw/source/ui/dbui/dbinsdlg.hrc b/sw/source/ui/dbui/dbinsdlg.hrc
deleted file mode 100644
index 8b8d5c4..0000000
--- a/sw/source/ui/dbui/dbinsdlg.hrc
+++ /dev/null
@@ -1,67 +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 _DBINSDLG_HRC
-#define _DBINSDLG_HRC
-
-
-#define FT_INSERT_DATA 1
-#define RB_AS_TABLE 2
-#define RB_AS_FIELD 3
-#define RB_AS_TEXT 4
-#define BT_OK 5
-#define BT_CANCEL 6
-#define BT_HELP 7
-#define FL_HEAD 8
-#define FT_DB_COLUMN 10
-#define FL_FORMAT 11
-#define RB_DBFMT_FROM_DB 12
-#define RB_DBFMT_FROM_USR 13
-#define LB_DBFMT_FROM_USR 14
-
-/* ------------- Page Text/Field ------------------ */
-#define LB_TXT_DB_COLUMN 15
-
-#define IB_DBCOL_TOEDIT 16
-#define ED_DB_TEXT 17
-#define FT_DB_PARA_COLL 18
-#define LB_DB_PARA_COLL 19
-
-/* ------------- Page Table -------------------- */
-#define LB_TBL_DB_COLUMN 20
-
-#define IB_DBCOL_ALL_TO 21
-#define IB_DBCOL_ONE_TO 22
-#define IB_DBCOL_ONE_FROM 23
-#define IB_DBCOL_ALL_FROM 24
-#define FT_TABLE_COL 25
-#define LB_TABLE_COL 26
-#define FL_BOTTOM 27
-#define CB_TABLE_HEADON 28
-#define RB_HEADL_COLNMS 29
-#define RB_HEADL_EMPTY 30
-#define PB_TBL_FORMAT 31
-#define PB_TBL_AUTOFMT 32
-
-#define STR_NOTEMPL 33
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src
deleted file mode 100644
index 305a4a8..0000000
--- a/sw/source/ui/dbui/dbinsdlg.src
+++ /dev/null
@@ -1,323 +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 "dbinsdlg.hrc"
-#include "dbui.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-ModalDialog DLG_AP_INSERT_DB_SEL
-{
- HelpID = HID_AP_INSERT_DB_SEL ;
- OUTPUTSIZE = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 291 , 189 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- SVLOOK = TRUE ;
- FixedText FT_INSERT_DATA
- {
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 66 , 8 ) ;
- Text [ en-US ] = "Insert data as:" ;
- };
- RadioButton RB_AS_TABLE
- {
- HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE";
- Pos = MAP_APPFONT ( 80 , 6 ) ;
- Size = MAP_APPFONT ( 60 , 10 ) ;
- TabStop = TRUE ;
- Check = TRUE ;
- Text [ en-US ] = "T~able" ;
- };
- RadioButton RB_AS_FIELD
- {
- HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD";
- Pos = MAP_APPFONT ( 145 , 6 ) ;
- Size = MAP_APPFONT ( 60 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Fields" ;
- };
- RadioButton RB_AS_TEXT
- {
- HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT";
- Pos = MAP_APPFONT ( 210 , 6 ) ;
- Size = MAP_APPFONT ( 60 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Text" ;
- };
- OKButton BT_OK
- {
- Pos = MAP_APPFONT ( 123 , 172 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BT_CANCEL
- {
- Pos = MAP_APPFONT ( 179 , 172 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BT_HELP
- {
- Pos = MAP_APPFONT ( 235 , 172 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedLine FL_HEAD
- {
- Pos = MAP_APPFONT ( 6 , 19 ) ;
- Size = MAP_APPFONT ( 279 , 8 ) ;
- /* wird dynamisch gesetzt! */
- Text = "" ;
- };
- FixedText FT_DB_COLUMN
- {
- Pos = MAP_APPFONT ( 12 , 31 ) ;
- Size = MAP_APPFONT ( 72 , 8 ) ;
- Text [ en-US ] = "Database ~columns" ;
- };
- FixedLine FL_FORMAT
- {
- Pos = MAP_APPFONT ( 6 , 117 ) ;
- Size = MAP_APPFONT ( 279 , 8 ) ;
- Text [ en-US ] = "For~mat" ;
- };
- RadioButton RB_DBFMT_FROM_DB
- {
- HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB";
- Pos = MAP_APPFONT ( 15 , 128 ) ;
- Size = MAP_APPFONT ( 90 , 10 ) ;
- TabStop = TRUE ;
- Check = TRUE ;
- Text [ en-US ] = "From ~database" ;
- };
- RadioButton RB_DBFMT_FROM_USR
- {
- HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR";
- Pos = MAP_APPFONT ( 15 , 143 ) ;
- Size = MAP_APPFONT ( 10 , 10 ) ;
- TabStop = TRUE ;
- };
- ListBox LB_DBFMT_FROM_USR
- {
- HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 30 , 142 ) ;
- Size = MAP_APPFONT ( 75 , 44 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- AutoHScroll = TRUE ;
- };
- /* -------------- Page Text / Fields -------------------------------- */
- ListBox LB_TXT_DB_COLUMN
- {
- HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 41 ) ;
- Size = MAP_APPFONT ( 93 , 70 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
- };
- ImageButton IB_DBCOL_TOEDIT
- {
- HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT";
- Pos = MAP_APPFONT ( 111 , 41 ) ;
- Size = MAP_APPFONT ( 20 , 12 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "one_right.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
- };
- };
- MultiLineEdit ED_DB_TEXT
- {
- HelpID = "sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 137 , 41 ) ;
- Size = MAP_APPFONT ( 142 , 70 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- VScroll = TRUE ;
- HScroll = TRUE ;
- Hide = TRUE ;
- IgnoreTab = TRUE;
- };
- FixedText FT_DB_PARA_COLL
- {
- Pos = MAP_APPFONT ( 118 , 129 ) ;
- Size = MAP_APPFONT ( 58 , 8 ) ;
- Text [ en-US ] = "Paragraph ~Style:" ;
- Hide = TRUE ;
- };
- ListBox LB_DB_PARA_COLL
- {
- HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 182 , 127 ) ;
- Size = MAP_APPFONT ( 97 , 59 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- Hide = TRUE ;
- Sort = TRUE ;
- };
- /* -------------- Page Table ---------------------------------------- */
- ListBox LB_TBL_DB_COLUMN
- {
- HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 41 ) ;
- Size = MAP_APPFONT ( 93 , 70 ) ;
- TabStop = TRUE ;
- };
- ImageButton IB_DBCOL_ALL_TO
- {
- HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO";
- Pos = MAP_APPFONT ( 111 , 41 ) ;
- Size = MAP_APPFONT ( 20 , 12 ) ;
- TabStop = TRUE ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "all_right.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
- };
- };
- ImageButton IB_DBCOL_ONE_TO
- {
- HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO";
- Pos = MAP_APPFONT ( 111 , 56 ) ;
- Size = MAP_APPFONT ( 20 , 12 ) ;
- TabStop = TRUE ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "one_right.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
- };
- };
- ImageButton IB_DBCOL_ONE_FROM
- {
- HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM";
- Pos = MAP_APPFONT ( 111 , 84 ) ;
- Size = MAP_APPFONT ( 20 , 12 ) ;
- TabStop = TRUE ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "one_left.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
- };
- };
- ImageButton IB_DBCOL_ALL_FROM
- {
- HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM";
- Pos = MAP_APPFONT ( 111 , 99 ) ;
- Size = MAP_APPFONT ( 20 , 12 ) ;
- TabStop = TRUE ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "all_left.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
- };
- };
- FixedText FT_TABLE_COL
- {
- Pos = MAP_APPFONT ( 137 , 31 ) ;
- Size = MAP_APPFONT ( 75 , 8 ) ;
-
- Text [ en-US ] = "Tab~le column(s)" ;
- };
- ListBox LB_TABLE_COL
- {
- HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 137 , 41 ) ;
- Size = MAP_APPFONT ( 75 , 70 ) ;
- TabStop = TRUE ;
- };
- FixedLine FL_BOTTOM
- {
- Pos = MAP_APPFONT ( 0 , 164 ) ;
- Size = MAP_APPFONT ( 291, 8 ) ;
- };
- CheckBox CB_TABLE_HEADON
- {
- HelpID = "sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON";
- Pos = MAP_APPFONT ( 111 , 128 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- TabStop = TRUE ;
- Check = TRUE ;
- Text [ en-US ] = "Insert table heading";
- };
- RadioButton RB_HEADL_COLNMS
- {
- HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS";
- Pos = MAP_APPFONT ( 120 , 142 ) ;
- Size = MAP_APPFONT ( 90 , 10 ) ;
- TabStop = TRUE ;
- Check = TRUE ;
- Text [ en-US ] = "Apply column ~name";
- };
- RadioButton RB_HEADL_EMPTY
- {
- HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY";
- Pos = MAP_APPFONT ( 120 , 155 ) ;
- Size = MAP_APPFONT ( 90 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Create row only";
- };
- PushButton PB_TBL_FORMAT
- {
- HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT";
- Pos = MAP_APPFONT ( 214 , 128 ) ;
- Size = MAP_APPFONT ( 65 , 12 ) ;
- Text [ en-US ] = "Pr~operties..." ;
- TabStop = TRUE ;
- };
- PushButton PB_TBL_AUTOFMT
- {
- HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT";
- Pos = MAP_APPFONT ( 214 , 144 ) ;
- Size = MAP_APPFONT ( 65 , 12 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Aut~oFormat..." ;
- };
- String STR_NOTEMPL
- {
- Text [ en-US ] = "<none>" ;
- };
- Text [ en-US ] = "Insert Database Columns" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 5f97d75..9bae960 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -2567,8 +2567,7 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh,
AbstractSwInsertDBColAutoPilot* pDlg = pFact->CreateSwInsertDBColAutoPilot( rSh.GetView(),
xSource,
xColSupp,
- aDBData,
- DLG_AP_INSERT_DB_SEL );
+ aDBData );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if( RET_OK == pDlg->Execute() )
{
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 2f55dc6..8ec2ab2 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -739,22 +739,10 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( Window
AbstractSwInsertDBColAutoPilot* SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView, // add for SwInsertDBColAutoPilot
uno::Reference< sdbc::XDataSource> rxSource,
uno::Reference<sdbcx::XColumnsSupplier> xColSupp,
- const SwDBData& rData, int nResId)
+ const SwDBData& rData)
{
- SwInsertDBColAutoPilot* pDlg=NULL;
- switch ( nResId )
- {
- case DLG_AP_INSERT_DB_SEL :
- pDlg = new SwInsertDBColAutoPilot( rView, rxSource, xColSupp, rData );
- break;
-
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSwInsertDBColAutoPilot_Impl( pDlg );
- return 0;
+ SwInsertDBColAutoPilot* pDlg = new SwInsertDBColAutoPilot( rView, rxSource, xColSupp, rData );
+ return new AbstractSwInsertDBColAutoPilot_Impl( pDlg );
}
SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh)
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 8076924..91413ce 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -448,10 +448,10 @@ public:
virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable); //add for SwConvertTableDlg
virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId); //add for SwCaptionDialog
- virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot( SwView& rView, // add for SwInsertDBColAutoPilot
+ virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, // add for SwInsertDBColAutoPilot
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp,
- const SwDBData& rData, int nResId);
+ const SwDBData& rData);
virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh);//add for SwFootNoteOptionDlg
//add for DropDownFieldDialog
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx
index aa1207f..0257e55 100644
--- a/sw/source/ui/inc/dbinsdlg.hxx
+++ b/sw/source/ui/inc/dbinsdlg.hxx
@@ -25,6 +25,7 @@
#include <vcl/group.hxx>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
+#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <svtools/svmedit.hxx>
#include <sfx2/basedlgs.hxx>
@@ -88,46 +89,38 @@ public:
class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
{
- FixedText aFtInsertData;
- RadioButton aRbAsTable;
- RadioButton aRbAsField;
- RadioButton aRbAsText;
+ RadioButton* m_pRbAsTable;
+ RadioButton* m_pRbAsField;
+ RadioButton* m_pRbAsText;
- FixedLine aFlHead;
- FixedText aFtDbColumn;
+ VclFrame* m_pHeadFrame;
- ListBox aLbTblDbColumn;
- ListBox aLbTxtDbColumn;
+ ListBox* m_pLbTblDbColumn;
+ ListBox* m_pLbTxtDbColumn;
- FixedLine aFlFormat;
- RadioButton aRbDbFmtFromDb;
- RadioButton aRbDbFmtFromUsr;
- NumFormatListBox aLbDbFmtFromUsr;
+ VclFrame* m_pFormatFrame;
+ RadioButton* m_pRbDbFmtFromDb;
+ RadioButton* m_pRbDbFmtFromUsr;
+ NumFormatListBox* m_pLbDbFmtFromUsr;
/* ----- Page Text/Field ------- */
- ImageButton aIbDbcolToEdit;
- MultiLineEdit aEdDbText;
- FixedText aFtDbParaColl;
- ListBox aLbDbParaColl;
+ PushButton* m_pIbDbcolToEdit;
+ VclMultiLineEdit* m_pEdDbText;
+ FixedText* m_pFtDbParaColl;
+ ListBox* m_pLbDbParaColl;
/* ----- Page Table ------------ */
- ImageButton aIbDbcolAllTo;
- ImageButton aIbDbcolOneTo;
- ImageButton aIbDbcolOneFrom;
- ImageButton aIbDbcolAllFrom;
- FixedText aFtTableCol;
- ListBox aLbTableCol;
- CheckBox aCbTableHeadon;
- RadioButton aRbHeadlColnms;
- RadioButton aRbHeadlEmpty;
- PushButton aPbTblFormat;
- PushButton aPbTblAutofmt;
-
- OKButton aBtOk;
- CancelButton aBtCancel;
- HelpButton aBtHelp;
-
- FixedLine aFlBottom;
+ PushButton* m_pIbDbcolAllTo;
+ PushButton* m_pIbDbcolOneTo;
+ PushButton* m_pIbDbcolOneFrom;
+ PushButton* m_pIbDbcolAllFrom;
+ FixedText* m_pFtTableCol;
+ ListBox* m_pLbTableCol;
+ CheckBox* m_pCbTableHeadon;
+ RadioButton* m_pRbHeadlColnms;
+ RadioButton* m_pRbHeadlEmpty;
+ PushButton* m_pPbTblFormat;
+ PushButton* m_pPbTblAutofmt;
SwInsDBColumns aDBColumns;
const SwDBData aDBData;
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 8adea0b..003de77 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -263,11 +263,10 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct )
SwDBData aDBData = pDBStruct->aDBData;
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- ::std::auto_ptr<AbstractSwInsertDBColAutoPilot>pDlg (pFact->CreateSwInsertDBColAutoPilot( pThis->GetView(),
+ ::std::auto_ptr<AbstractSwInsertDBColAutoPilot>pDlg (pFact->CreateSwInsertDBColAutoPilot(pThis->GetView(),
xSource,
xColSupp,
- aDBData,
- DLG_AP_INSERT_DB_SEL ));
+ aDBData));
if( RET_OK == pDlg->Execute() )
{
Reference <XResultSet> xResSet = pDBStruct->xCursor;
diff --git a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
new file mode 100644
index 0000000..1d004d3
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
@@ -0,0 +1,744 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkDialog" id="InsertDbColumnsDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Insert Database Columns</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="vexpand">True</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Insert data as:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">grid3</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="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="astable">
+ <property name="label" translatable="yes">T_able</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">asfields</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="GtkRadioButton" id="asfields">
+ <property name="label" translatable="yes">_Fields</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">astext</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>
+ <child>
+ <object class="GtkRadioButton" id="astext">
+ <property name="label" translatable="yes">_Text</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">astable</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</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">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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="dbframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <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="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Database _columns</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">box2</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="tablecolft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Tab_le column(s)</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">tablecols:border</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</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="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="allright">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image1</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="oneright">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image2</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="toedit">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="image">image5</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="oneleft">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image3</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="allleft">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image4</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ <property name="secondary">True</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="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkTreeView" id="tablecols:border">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="hscrollbar_policy">always</property>
+ <property name="vscrollbar_policy">always</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="textview:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkTreeView" id="tabledbcols: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="treeview-selection4"/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTreeView" id="tabletxtcols: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="treeview-selection3"/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">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>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </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="GtkFrame" id="formatframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="tableheading">
+ <property name="label" translatable="yes">Insert table heading</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </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="GtkRadioButton" id="columnname">
+ <property name="label" translatable="yes">Apply column _name</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">rowonly</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rowonly">
+ <property name="label" translatable="yes">Create row only</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">columnname</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="tableformat">
+ <property name="label" translatable="yes">Pr_operties...</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="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="GtkButton" id="autoformat">
+ <property name="label" translatable="yes">Aut_oFormat...</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="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="parastylelabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Paragraph _Style:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">parastyle</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="GtkComboBoxText" id="parastyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <accessibility>
+ <relation type="labelled-by" target="userdefined"/>
+ </accessibility>
+ </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>
+ <child>
+ <placeholder/>
+ </child>
+ </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>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkRadioButton" id="fromdatabase">
+ <property name="label" translatable="yes">From _database</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">userdefined</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="GtkRadioButton" id="userdefined">
+ <property name="label" translatable="yes">_User-Defined</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">fromdatabase</property>
+ <accessibility>
+ <relation type="label-for" target="numformat"/>
+ </accessibility>
+ </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="swlo-NumFormatListBox" id="numformat">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <accessibility>
+ <relation type="labelled-by" target="userdefined"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Format</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</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>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list