diff options
Diffstat (limited to 'sw/source/ui/dbui')
69 files changed, 393 insertions, 393 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 18c2c2f234df..fbe08ef44d2f 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/addresslistdialog.hrc b/sw/source/ui/dbui/addresslistdialog.hrc index 821ddd81b4f0..4715507951f2 100644 --- a/sw/source/ui/dbui/addresslistdialog.hrc +++ b/sw/source/ui/dbui/addresslistdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index bf84b16a8157..ab7e993975bb 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/addresslistdialog.src b/sw/source/ui/dbui/addresslistdialog.src index 38a82e65ea76..64fcaf7806ef 100644 --- a/sw/source/ui/dbui/addresslistdialog.src +++ b/sw/source/ui/dbui/addresslistdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 30c648f9455e..2ec78179d29f 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/createaddresslistdialog.hrc b/sw/source/ui/dbui/createaddresslistdialog.hrc index d843acbcf63f..90554fae05e2 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hrc +++ b/sw/source/ui/dbui/createaddresslistdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,5 +60,5 @@ #define ST_ADD_BUTTON 4 #define PB_FIND 5 - -#endif + +#endif diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index 6c9b64546a05..caf1baf4451a 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/createaddresslistdialog.src b/sw/source/ui/dbui/createaddresslistdialog.src index b43a373cd047..c1c0c1c74849 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.src +++ b/sw/source/ui/dbui/createaddresslistdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <helpid.h> /*-- 13.04.2004 13:58:13--------------------------------------------------- - + -----------------------------------------------------------------------*/ ModalDialog DLG_MM_CREATEADDRESSLIST { @@ -165,7 +165,7 @@ ModalDialog DLG_MM_CREATEADDRESSLIST }; /*-- 13.04.2004 13:58:13--------------------------------------------------- - + -----------------------------------------------------------------------*/ ModelessDialog DLG_MM_FIND_ENTRY { diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 06a8c074fa79..6d8f3b06a823 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hrc b/sw/source/ui/dbui/customizeaddresslistdialog.hrc index 8e04f81a07b3..af09b30c5906 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hrc +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,5 +45,5 @@ #define ST_RENAME_TITLE 3 #define ST_ADD_BUTTON 4 - -#endif + +#endif diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index a8c10a42e958..a7a535da277d 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.src b/sw/source/ui/dbui/customizeaddresslistdialog.src index 21e32ecb89c4..05892d90ecb5 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.src +++ b/sw/source/ui/dbui/customizeaddresslistdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <helpid.h> /*-- 13.04.2004 13:58:13--------------------------------------------------- - + -----------------------------------------------------------------------*/ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST { @@ -109,7 +109,7 @@ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST }; }; /*-- 13.04.2004 13:58:13--------------------------------------------------- - + -----------------------------------------------------------------------*/ ModalDialog DLG_MM_ADD_RENAME_ENTRY { diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 068da50c985f..c6ac31da3e68 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,8 +125,8 @@ using namespace ::com::sun::star::beans; // tblafmt.hxx SV_IMPL_PTRARR( _SwTableAutoFmtTbl, SwTableAutoFmt* ) -const char cDBFldStart = '<'; -const char cDBFldEnd = '>'; +const char cDBFldStart = '<'; +const char cDBFldEnd = '>'; // Hilfsstruktur fuers einfuegen von Datenbankspalten als Felder oder Text struct _DB_Column @@ -185,9 +185,9 @@ SV_IMPL_OP_PTRARR_SORT( SwInsDBColumns, SwInsDBColumnPtr ) /* */ -#define DBCOLUMN_CONFIG_VERSION1 1 -#define DBCOLUMN_CONFIG_VERSION DBCOLUMN_CONFIG_VERSION1 -#define DBCOLUMN_MAXDATA 5 +#define DBCOLUMN_CONFIG_VERSION1 1 +#define DBCOLUMN_CONFIG_VERSION DBCOLUMN_CONFIG_VERSION1 +#define DBCOLUMN_MAXDATA 5 struct _DB_ColumnConfigData { @@ -455,7 +455,7 @@ SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot() delete pTblSet; delete pRep; -// delete pConfig; +// delete pConfig; delete pTAutoFmt; } @@ -619,13 +619,13 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton ) aFld += cDBFldEnd; if( aStr.Len() ) { - if( nPos ) // ein Space davor + if( nPos ) // ein Space davor { sal_Unicode c = aStr.GetChar( nPos-1 ); if( '\n' != c && '\r' != c ) aFld.Insert( ' ', 0 ); } - if( nPos < aStr.Len() ) // ein Space dahinter + if( nPos < aStr.Len() ) // ein Space dahinter { sal_Unicode c = aStr.GetChar( nPos ); if( '\n' != c && '\r' != c ) @@ -1017,7 +1017,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, Reference <XNameAccess> xCols = xColsSupp->getColumns(); do{ // middle checked loop!! - if( bAsTable ) // Daten als Tabelle einfuegen + if( bAsTable ) // Daten als Tabelle einfuegen { rSh.DoUndo( FALSE ); @@ -1137,7 +1137,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, if( xColumn.is() ) { double fVal = xColumn->getDouble(); - if( xColumn->wasNull() ) + if( xColumn->wasNull() ) aTblSet.ClearItem( RES_BOXATR_VALUE ); else { @@ -1215,7 +1215,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, } rSh.SetAutoUpdateCells( bIsAutoUpdateCells ); } - else // Daten als Felder/Text einfuegen + else // Daten als Felder/Text einfuegen { _DB_Columns aColArr; if( SplitTextToColArr( aEdDbText.GetText(), aColArr, aRbAsField.IsChecked() ) ) @@ -1347,7 +1347,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, Any aType = xColumnProps->getPropertyValue(C2U("Type")); sal_Int32 eDataType = 0; aType >>= eDataType; - if( DataType::DATE == eDataType || DataType::TIME == eDataType || + if( DataType::DATE == eDataType || DataType::TIME == eDataType || DataType::TIMESTAMP == eDataType) { @@ -1806,7 +1806,7 @@ void SwInsertDBColAutoPilot::Load() pInsDBColumn->nUsrNumFmt = rNFmtr.GetEntryKey( pInsDBColumn->sUsrNumFmt, pInsDBColumn->eUsrNumFmtLng ); -// pInsDBColumn->nDBNumFmt +// pInsDBColumn->nDBNumFmt pNewData->aDBColumns.Insert(pInsDBColumn); } diff --git a/sw/source/ui/dbui/dbinsdlg.hrc b/sw/source/ui/dbui/dbinsdlg.hrc index fd2bdcf3d776..4bc8164f8ea7 100644 --- a/sw/source/ui/dbui/dbinsdlg.hrc +++ b/sw/source/ui/dbui/dbinsdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,45 +29,45 @@ #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 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 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 +#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 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 +#define FT_DB_PARA_COLL 18 +#define LB_DB_PARA_COLL 19 /* ------------- Page Table -------------------- */ -#define LB_TBL_DB_COLUMN 20 +#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 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 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 +#define STR_NOTEMPL 33 #endif diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src index 28e045a3a235..d08305dde17e 100644 --- a/sw/source/ui/dbui/dbinsdlg.src +++ b/sw/source/ui/dbui/dbinsdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -248,7 +248,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL { Pos = MAP_APPFONT ( 137 , 31 ) ; Size = MAP_APPFONT ( 75 , 8 ) ; - + Text [ en-US ] = "Tab~le column(s)" ; }; ListBox LB_TABLE_COL diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index eb9321926c25..e28ae1dd5f36 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -155,8 +155,8 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::task; using namespace ::com::sun::star::ui::dialogs; -#define DB_SEP_SPACE 0 -#define DB_SEP_TAB 1 +#define DB_SEP_SPACE 0 +#define DB_SEP_TAB 1 #define DB_SEP_RETURN 2 #define DB_SEP_NEWLINE 3 @@ -479,7 +479,7 @@ BOOL SwNewDBMgr::Merge(SwWrtShell* pSh) return TRUE; } -void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh ) +void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh ) { if(pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB) { @@ -513,7 +513,7 @@ void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh ) } } -String lcl_FindColumn(const String& sFormatStr,USHORT &nUsedPos, BYTE &nSeparator) +String lcl_FindColumn(const String& sFormatStr,USHORT &nUsedPos, BYTE &nSeparator) { String sReturn; USHORT nLen = sFormatStr.Len(); @@ -557,7 +557,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh) const char cSpace = ' '; const char cTab = '\t'; USHORT nUsedPos = 0; - BYTE nSeparator; + BYTE nSeparator; String sColumn = lcl_FindColumn(sFormatStr, nUsedPos, nSeparator); while( sColumn.Len() ) { @@ -569,7 +569,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh) if(xColumnProp.is()) { SwDBFormatData aDBFormat; - String sInsert = GetDBField( xColumnProp, aDBFormat); + String sInsert = GetDBField( xColumnProp, aDBFormat); if( DB_SEP_SPACE == nSeparator ) sInsert += cSpace; else if( DB_SEP_TAB == nSeparator) @@ -609,7 +609,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh) sStr += '\t'; } pSh->SwEditShell::Insert2(sStr); - pSh->SwFEShell::SplitNode(); // Zeilenvorschub + pSh->SwFEShell::SplitNode(); // Zeilenvorschub } } } @@ -758,7 +758,7 @@ SwNewDBMgr::~SwNewDBMgr() } /*-------------------------------------------------------------------- - Beschreibung: Serienbriefe als einzelne Dokumente speichern + Beschreibung: Serienbriefe als einzelne Dokumente speichern --------------------------------------------------------------------*/ String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageDesc, ULONG nDocNo ) { @@ -981,7 +981,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, SwDBFormatData aDBFormat; aDBFormat.xFormatter = pImpl->pMergeData->xFormatter; aDBFormat.aNullDate = pImpl->pMergeData->aNullDate; - sAddress = GetDBField( xColumnProp, aDBFormat); + sAddress = GetDBField( xColumnProp, aDBFormat); if (!sAddress.Len()) sAddress = '_'; sPath += sAddress; @@ -1017,7 +1017,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, { INetURLObject aTempFileURL(aTempFile->GetURL()); aPrtMonDlg.aPrinter.SetText( aTempFileURL.GetBase() ); - String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief + String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief sStat += ' '; sStat += String::CreateFromInt32( nDocNo ); aPrtMonDlg.aPrintInfo.SetText(sStat); @@ -1233,9 +1233,9 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, nEndRow = pImpl->pMergeData ? pImpl->pMergeData->xResultSet->getRow() : 0; } while( !bCancel && (bSynchronizedDoc && (nStartRow != nEndRow)? ExistsNextRecord() : ToNextMergeRecord())); - + aPrtMonDlg.Show( FALSE ); - + // save the single output document if(rMergeDescriptor.bCreateSingleFile || bAsSingleFile) { @@ -1281,18 +1281,18 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, aVal >>= _sVal; } #endif - // printing should be done synchronously otherwise the document + // printing should be done synchronously otherwise the document // might already become invalid during the process uno::Sequence< beans::PropertyValue > aOptions( rMergeDescriptor.aPrintOptions ); const sal_Int32 nOpts = aOptions.getLength(); aOptions.realloc( nOpts + 1 ); aOptions[ nOpts ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait")); aOptions[ nOpts ].Value <<= sal_True ; -// aPrintArgs.Put(SfxBoolItem(FN_QRY_MERGE, TRUE) ); +// aPrintArgs.Put(SfxBoolItem(FN_QRY_MERGE, TRUE) ); // // #i52629# aynchronous printing should only be done in silent mode - otherwise // // the printer dialog does not come up // aPrintArgs.Put( SfxBoolItem( SID_ASYNCHRON, rMergeDescriptor.bPrintAsync )); - // move print options + // move print options const beans::PropertyValue* pPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray(); for( sal_Int32 nOption = 0; nOption < rMergeDescriptor.aPrintOptions.getLength(); ++nOption) { @@ -1311,11 +1311,11 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, // const SwModuleOptions * pModOpt = SW_MOD()->GetModuleConfig(); // if (pModOpt->IsSinglePrintJob()) // { -// } +// } // else // { pTargetView->ExecPrint( aOptions, IsMergeSilent(), rMergeDescriptor.bPrintAsync ); -// } +// } } xTargetDocShell->DoClose(); } @@ -1591,7 +1591,7 @@ uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const String& rData uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Reference<sdbc::XConnection> xConnection, const String& rTableOrQuery, - BYTE eTableOrQuery) + BYTE eTableOrQuery) { Reference< sdbcx::XColumnsSupplier> xRet; try @@ -1710,7 +1710,7 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps, } // releases the merge data source table or query after merge is completed -void SwNewDBMgr::EndMerge() +void SwNewDBMgr::EndMerge() { OSL_ENSURE(bInMerge, "merge is not active"); bInMerge = FALSE; @@ -1900,9 +1900,9 @@ BOOL SwNewDBMgr::ExistsNextRecord() const return pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB; } -sal_uInt32 SwNewDBMgr::GetSelectedRecordId() +sal_uInt32 SwNewDBMgr::GetSelectedRecordId() { - sal_uInt32 nRet = 0; + sal_uInt32 nRet = 0; OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge"); if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()) return FALSE; @@ -2034,7 +2034,7 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId( if(pFound && pFound->xResultSet.is()) { try - { //if a selection array is set the current row at the result set may not be set yet + { //if a selection array is set the current row at the result set may not be set yet if(pFound->aSelection.getLength()) { sal_Int32 nSelIndex = pFound->nSelectionIndex; @@ -2054,7 +2054,7 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId( // close all data sources - after fields were updated -void SwNewDBMgr::CloseAll(BOOL bIncludingMerge) +void SwNewDBMgr::CloseAll(BOOL bIncludingMerge) { //the only thing done here is to reset the selection index //all connections stay open @@ -2162,7 +2162,7 @@ SwDSParam* SwNewDBMgr::FindDSConnection(const rtl::OUString& rDataSource, BOOL return pFound; } -const SwDBData& SwNewDBMgr::GetAddressDBName() +const SwDBData& SwNewDBMgr::GetAddressDBName() { return SW_MOD()->GetDBConfig()->GetAddressSource(); } @@ -2374,7 +2374,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource() } -void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, +void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, const Sequence<PropertyValue>& rProperties, BOOL bWithDataSourceBrowser) { @@ -2389,8 +2389,8 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, ODataAccessDescriptor aDescriptor(rProperties); sDataSource = aDescriptor.getDataSource(); - aDescriptor[daCommand] >>= sDataTableOrQuery; - aDescriptor[daCommandType] >>= nCmdType; + aDescriptor[daCommand] >>= sDataTableOrQuery; + aDescriptor[daCommandType] >>= nCmdType; if ( aDescriptor.has(daSelection) ) aDescriptor[daSelection] >>= aSelection; @@ -2472,7 +2472,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, pWorkDoc->SetNewDBMgr( this ); SwMergeDescriptor aMergeDesc( pImpl->pMergeDialog->GetMergeType(), pView->GetWrtShell(), aDescriptor ); - aMergeDesc.sSaveToFilter = pImpl->pMergeDialog->GetSaveFilter(); + aMergeDesc.sSaveToFilter = pImpl->pMergeDialog->GetSaveFilter(); aMergeDesc.bCreateSingleFile= true; MergeNew(aMergeDesc); diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index 3b477725ae07..cf83bcba429c 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hrc b/sw/source/ui/dbui/dbtablepreviewdialog.hrc index 645cbe92ab74..a260f9fa98dd 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.hrc +++ b/sw/source/ui/dbui/dbtablepreviewdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx index 3c4b790e8fd4..c100e377e3c2 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <vcl/button.hxx> #include <com/sun/star/uno/Sequence.h> -namespace com{ namespace sun{ namespace star{ +namespace com{ namespace sun{ namespace star{ namespace beans{ struct PropertyValue; } namespace frame{ class XFrame; } }}} @@ -45,11 +45,11 @@ class SwDBTablePreviewDialog : public SfxModalDialog OKButton m_aOK; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; -public: +public: SwDBTablePreviewDialog(Window* pParent, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rValues ); ~SwDBTablePreviewDialog(); - + }; #endif diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.src b/sw/source/ui/dbui/dbtablepreviewdialog.src index a52290db80fb..3ad385ebbd09 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.src +++ b/sw/source/ui/dbui/dbtablepreviewdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index 4cf314bf3111..a717f8454c56 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -193,12 +193,12 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId, SwWrtShell* pSh, const String& rDefDBName, const BOOL bShowCol): - SvTreeListBox (pParent, rResId), + SvTreeListBox (pParent, rResId), aImageList (SW_RES(ILIST_DB_DLG )), aImageListHC (SW_RES(ILIST_DB_DLG_HC )), - sDefDBName (rDefDBName), + sDefDBName (rDefDBName), bInitialized (FALSE), - bShowColumns (bShowCol), + bShowColumns (bShowCol), pImpl(new SwDBTreeList_Impl(pSh)) { SetHelpId(HID_DB_SELECTION_TLB); @@ -276,7 +276,7 @@ void SwDBTreeList::ShowColumns(BOOL bShowCol) while (pEntry) { pEntry = (SvLBoxEntry*)GetRootLevelParent( pEntry ); - Collapse(pEntry); // zuklappen + Collapse(pEntry); // zuklappen SvLBoxEntry* pChild; while ((pChild = FirstChild(pEntry)) != 0L) @@ -287,7 +287,7 @@ void SwDBTreeList::ShowColumns(BOOL bShowCol) if (sDBName.Len()) { - Select(sDBName, sTableName, sColumnName); // force RequestingChilds + Select(sDBName, sTableName, sColumnName); // force RequestingChilds } SetUpdateMode(TRUE); } @@ -297,7 +297,7 @@ void SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent) { if (!pParent->HasChilds()) { - if (GetParent(pParent)) // column names + if (GetParent(pParent)) // column names { try { @@ -433,7 +433,7 @@ IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData ) if (GetParent(pRight) && GetParent(GetParent(pRight))) return COMPARE_GREATER; // don't sort column names - return DefaultCompare(pData); // Sonst Basisklasse rufen + return DefaultCompare(pData); // Sonst Basisklasse rufen } String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, BOOL* pbIsTable) @@ -459,7 +459,7 @@ String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, BOOL* p } /*------------------------------------------------------------------------ - Beschreibung: Format: Datenbank.Tabelle + Beschreibung: Format: Datenbank.Tabelle ------------------------------------------------------------------------*/ void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const String& rColumnName) { diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index 45ddaa496613..e4faad79b069 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,14 +37,14 @@ #include "dbui.hxx" PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType ) -: ModelessDialog( pParent, SW_RES(DLG_PRINTMONITOR) ), - aDocName (this, SW_RES( FT_DOCNAME )), - aPrinting (this, SW_RES( - eType == MONITOR_TYPE_MAIL ? +: ModelessDialog( pParent, SW_RES(DLG_PRINTMONITOR) ), + aDocName (this, SW_RES( FT_DOCNAME )), + aPrinting (this, SW_RES( + eType == MONITOR_TYPE_MAIL ? FT_SENDING : eType == MONITOR_TYPE_SAVE ? FT_SAVING : FT_PRINTING )), - aPrinter (this, SW_RES( FT_PRINTER )), - aPrintInfo (this, SW_RES( FT_PRINTINFO )), - aCancel (this, SW_RES( PB_CANCELPRNMON )) + aPrinter (this, SW_RES( FT_PRINTER )), + aPrintInfo (this, SW_RES( FT_PRINTINFO )), + aCancel (this, SW_RES( PB_CANCELPRNMON )) { switch (eType) { @@ -58,14 +58,14 @@ PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType ) void lcl_ResizeControl( Window* pWin, long nDiff ) { Size aSize( pWin->GetSizePixel() ); - aSize.Width() += nDiff; - pWin->SetSizePixel( aSize ); -} + aSize.Width() += nDiff; + pWin->SetSizePixel( aSize ); +} void lcl_RePosControl( Window* pWin, long nDiff ) { Point aPos( pWin->GetPosPixel() ); - aPos.X() += nDiff; - pWin->SetPosPixel( aPos ); + aPos.X() += nDiff; + pWin->SetPosPixel( aPos ); } void PrintMonitor::ResizeControls() @@ -80,29 +80,29 @@ void PrintMonitor::ResizeControls() long nDiff = nPrinterTextWidth - aPrinterSize.Width(); if( nDiff > 2 * aDlgSize.Width() ) { - aPrinter.SetStyle( WB_RIGHT | aPrinter.GetStyle() ); + aPrinter.SetStyle( WB_RIGHT | aPrinter.GetStyle() ); nDiff = 2 * aDlgSize.Width(); } aDlgSize.Width() += nDiff; SetSizePixel(aDlgSize); - lcl_ResizeControl( &aPrinter, nDiff ); + lcl_ResizeControl( &aPrinter, nDiff ); nDiff /= 2; - lcl_RePosControl( &aDocName, nDiff ); - lcl_RePosControl( &aPrinting, nDiff ); + lcl_RePosControl( &aDocName, nDiff ); + lcl_RePosControl( &aPrinting, nDiff ); lcl_RePosControl( &aPrintInfo, nDiff ); - lcl_RePosControl( &aCancel, nDiff ); + lcl_RePosControl( &aCancel, nDiff ); } } // Progress Indicator for Creation of personalized Mail Merge documents: CreateMonitor::CreateMonitor( Window *pParent ) -: ModelessDialog( pParent, SW_RES(DLG_MM_CREATIONMONITOR) ), - m_aStatus (this, SW_RES( FT_STATUS )), - m_aProgress (this, SW_RES( FT_PROGRESS )), - m_aCreateDocuments (this, SW_RES( FT_CREATEDOCUMENTS )), - m_aCounting (this, SW_RES( FT_COUNTING )), - m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )), +: ModelessDialog( pParent, SW_RES(DLG_MM_CREATIONMONITOR) ), + m_aStatus (this, SW_RES( FT_STATUS )), + m_aProgress (this, SW_RES( FT_PROGRESS )), + m_aCreateDocuments (this, SW_RES( FT_CREATEDOCUMENTS )), + m_aCounting (this, SW_RES( FT_COUNTING )), + m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )), m_sCountingPattern(), m_sVariable_Total( String::CreateFromAscii("%Y") ), m_sVariable_Position( String::CreateFromAscii("%X") ), @@ -117,7 +117,7 @@ CreateMonitor::CreateMonitor( Window *pParent ) void CreateMonitor::UpdateCountingText() { - String sText(m_sCountingPattern); + String sText(m_sCountingPattern); sText.SearchAndReplaceAll( m_sVariable_Total, String::CreateFromInt32( m_nTotalCount ) ); sText.SearchAndReplaceAll( m_sVariable_Position, String::CreateFromInt32( m_nCurrentPosition ) ); m_aCounting.SetText(sText); diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src index 92c087677db5..ce6b29706418 100644 --- a/sw/source/ui/dbui/dbui.src +++ b/sw/source/ui/dbui/dbui.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -210,9 +210,9 @@ ModelessDialog DLG_MM_CREATIONMONITOR _HEIGHT = 52 ; MOVEABLE = TRUE ; APP = FALSE ; - + Text [ en-US ] = "Mail Merge" ; - + FixedText FT_STATUS { HIDE = FALSE ; diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx index ef073f6ebabf..d2c9e28fbf9a 100644 --- a/sw/source/ui/dbui/maildispatcher.cxx +++ b/sw/source/ui/dbui/maildispatcher.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,30 +41,30 @@ typedef std::list< ::rtl::Reference<IMailDispatcherListener> > MailDispatcherLis namespace /* private */ { - /* Generic event notifier for started, - stopped, and idle events which are + /* Generic event notifier for started, + stopped, and idle events which are very similary */ class GenericEventNotifier { public: // pointer to virtual function typedef typedef void (IMailDispatcherListener::*GenericNotificationFunc_t)(::rtl::Reference<MailDispatcher>); - + GenericEventNotifier( - GenericNotificationFunc_t notification_function, + GenericNotificationFunc_t notification_function, ::rtl::Reference<MailDispatcher> mail_dispatcher) : notification_function_(notification_function), mail_dispatcher_(mail_dispatcher) {} - + void operator() (::rtl::Reference<IMailDispatcherListener> listener) const { (listener.get()->*notification_function_)(mail_dispatcher_); } - + private: GenericNotificationFunc_t notification_function_; ::rtl::Reference<MailDispatcher> mail_dispatcher_; }; - + class MailDeliveryNotifier { public: @@ -72,77 +72,77 @@ namespace /* private */ mail_dispatcher_(xMailDispatcher), message_(message) {} - + void operator() (::rtl::Reference<IMailDispatcherListener> listener) const - { listener->mailDelivered(mail_dispatcher_, message_); } - + { listener->mailDelivered(mail_dispatcher_, message_); } + private: ::rtl::Reference<MailDispatcher> mail_dispatcher_; uno::Reference<mail::XMailMessage> message_; }; - + class MailDeliveryErrorNotifier { public: MailDeliveryErrorNotifier( ::rtl::Reference<MailDispatcher> xMailDispatcher, - uno::Reference<mail::XMailMessage> message, - const ::rtl::OUString& error_message) : + uno::Reference<mail::XMailMessage> message, + const ::rtl::OUString& error_message) : mail_dispatcher_(xMailDispatcher), message_(message), error_message_(error_message) {} - + void operator() (::rtl::Reference<IMailDispatcherListener> listener) const { listener->mailDeliveryError(mail_dispatcher_, message_, error_message_); } - + private: ::rtl::Reference<MailDispatcher> mail_dispatcher_; uno::Reference<mail::XMailMessage> message_; ::rtl::OUString error_message_; }; - + } // namespace private - + MailDispatcher::MailDispatcher(uno::Reference<mail::XSmtpService> mailserver) : mailserver_ (mailserver), - run_(false), + run_(false), shutdown_requested_(false) -{ +{ wakening_call_.reset(); mail_dispatcher_active_.reset(); - - if (!create()) - throw uno::RuntimeException(); - - // wait until the mail dispatcher thread is really alive - // and has aquired a reference to this instance of the - // class - mail_dispatcher_active_.wait(); + + if (!create()) + throw uno::RuntimeException(); + + // wait until the mail dispatcher thread is really alive + // and has aquired a reference to this instance of the + // class + mail_dispatcher_active_.wait(); } MailDispatcher::~MailDispatcher() -{ +{ } void MailDispatcher::enqueueMailMessage(uno::Reference<mail::XMailMessage> message) -{ - ::osl::MutexGuard thread_status_guard(thread_status_mutex_); +{ + ::osl::MutexGuard thread_status_guard(thread_status_mutex_); ::osl::MutexGuard message_container_guard(message_container_mutex_); - + OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - - messages_.push_back(message); + + messages_.push_back(message); if (run_) - wakening_call_.set(); + wakening_call_.set(); } uno::Reference<mail::XMailMessage> MailDispatcher::dequeueMailMessage() -{ +{ ::osl::MutexGuard guard(message_container_mutex_); uno::Reference<mail::XMailMessage> message; if(!messages_.empty()) - { + { message = messages_.front(); messages_.pop_front(); } @@ -150,51 +150,51 @@ uno::Reference<mail::XMailMessage> MailDispatcher::dequeueMailMessage() } void MailDispatcher::start() -{ - OSL_PRECOND(!isStarted(), "MailDispatcher is already started!"); - - ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); - +{ + OSL_PRECOND(!isStarted(), "MailDispatcher is already started!"); + + ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); + OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + if (!shutdown_requested_) { run_ = true; wakening_call_.set(); thread_status_guard.clear(); - - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::started, this)); - } + + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::started, this)); + } } void MailDispatcher::stop() { - OSL_PRECOND(isStarted(), "MailDispatcher not started!"); - - ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); - + OSL_PRECOND(isStarted(), "MailDispatcher not started!"); + + ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); + OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + if (!shutdown_requested_) { run_ = false; wakening_call_.reset(); thread_status_guard.clear(); - - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::stopped, this)); + + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::stopped, this)); } } void MailDispatcher::shutdown() -{ - ::osl::MutexGuard thread_status_guard(thread_status_mutex_); - +{ + ::osl::MutexGuard thread_status_guard(thread_status_mutex_); + OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + shutdown_requested_ = true; - wakening_call_.set(); + wakening_call_.set(); } bool MailDispatcher::isStarted() const @@ -205,7 +205,7 @@ bool MailDispatcher::isStarted() const void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> listener) { OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + ::osl::MutexGuard guard(listener_container_mutex_); listeners_.push_back(listener); } @@ -213,7 +213,7 @@ void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> liste void MailDispatcher::removeListener(::rtl::Reference<IMailDispatcherListener> listener) { OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already"); - + ::osl::MutexGuard guard(listener_container_mutex_); listeners_.remove(listener); } @@ -228,67 +228,67 @@ void MailDispatcher::sendMailMessageNotifyListener(uno::Reference<mail::XMailMes { try { - mailserver_->sendMailMessage(message); - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryNotifier(this, message)); + mailserver_->sendMailMessage(message); + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryNotifier(this, message)); } catch (mail::MailException& ex) - { - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message)); + { + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message)); } catch (uno::RuntimeException& ex) - { - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message)); + { + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message)); } } void MailDispatcher::run() -{ +{ // aquire a self reference in order to avoid race // conditions. The last client of this class must - // call shutdown before releasing his last reference + // call shutdown before releasing his last reference // to this class in order to shutdown this thread // which will release his (the very last reference - // to the class and so force their destruction - m_xSelfReference = this; - + // to the class and so force their destruction + m_xSelfReference = this; + // signal that the mail dispatcher thread is now alive mail_dispatcher_active_.set(); - + for(;;) - { + { wakening_call_.wait(); - - ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); + + ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_); if (shutdown_requested_) break; - + ::osl::ClearableMutexGuard message_container_guard(message_container_mutex_); - + if (messages_.size()) - { - thread_status_guard.clear(); + { + thread_status_guard.clear(); uno::Reference<mail::XMailMessage> message = messages_.front(); messages_.pop_front(); message_container_guard.clear(); sendMailMessageNotifyListener(message); } - else // idle - put ourself to sleep + else // idle - put ourself to sleep { wakening_call_.reset(); message_container_guard.clear(); thread_status_guard.clear(); - MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); - std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::idle, this)); - } + MailDispatcherListenerContainer_t listeners_cloned(cloneListener()); + std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::idle, this)); + } } // end for SSH ALI } -void MailDispatcher::onTerminated() +void MailDispatcher::onTerminated() { - //keep the reference until the end of onTerminated() because of the call order in the + //keep the reference until the end of onTerminated() because of the call order in the //_threadFunc() from osl/thread.hxx m_xSelfReference = 0; } diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 35013652c83b..c384c51956ac 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mailmergechildwindow.hrc b/sw/source/ui/dbui/mailmergechildwindow.hrc index 9b5931522975..edba002b0d3f 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.hrc +++ b/sw/source/ui/dbui/mailmergechildwindow.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src index 3caf5b1a7607..187f50b5848c 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.src +++ b/sw/source/ui/dbui/mailmergechildwindow.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 16332e3825f2..6aa9f1241c0a 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 4b2d7103f524..a9192ebdd60e 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mailmergewizard.hrc b/sw/source/ui/dbui/mailmergewizard.hrc index f6b00013b2fe..02a2c08130a7 100644 --- a/sw/source/ui/dbui/mailmergewizard.hrc +++ b/sw/source/ui/dbui/mailmergewizard.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src index d3da4d7c9945..ad7d57480092 100644 --- a/sw/source/ui/dbui/mailmergewizard.src +++ b/sw/source/ui/dbui/mailmergewizard.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index d4c0a01edda0..2c7fed8c045b 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -210,7 +210,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton) for(sal_Int32 nAddress = 0; nAddress < aBlocks.getLength(); ++nAddress) m_aSettingsWIN.AddAddress(aBlocks[nAddress]); m_aSettingsWIN.SelectAddress(0); - m_aSettingsWIN.Invalidate(); // #i40408 + m_aSettingsWIN.Invalidate(); // #i40408 rConfig.SetCountrySettings(pDlg->IsIncludeCountry(), pDlg->GetCountry()); InsertDataHdl_Impl(0); } @@ -492,7 +492,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton m_aPreview.SelectAddress(nSelect); } m_aDeletePB.Enable( m_aAddressBlocks.getLength() > 1); - } + } delete pDlg; return 0; } @@ -513,7 +513,7 @@ void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt) if(rEvt.GetCharCode()) { String sKey = rEvt.GetCharCode(); - if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) + if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) bCallParent = FALSE; } if(bCallParent) diff --git a/sw/source/ui/dbui/mmaddressblockpage.hrc b/sw/source/ui/dbui/mmaddressblockpage.hrc index 8dbae66b94e6..99887597a253 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hrc +++ b/sw/source/ui/dbui/mmaddressblockpage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,12 +66,12 @@ #define IB_INSERTFIELD 42 #define IB_REMOVEFIELD 43 #define FT_DRAG 48 -#define ED_DRAG 49 +#define ED_DRAG 49 #define IB_UP 50 #define IB_LEFT 51 #define IB_RIGHT 52 #define IB_DOWN 53 -#define FT_FIELD 54 +#define FT_FIELD 54 #define CB_FIELD 55 #define ST_SALUTATION 56 #define ST_PUNCTUATION 57 @@ -85,7 +85,7 @@ #define ST_INSERTSALUTATIONFIELD 65 #define ST_REMOVESALUTATIONFIELD 66 #define ST_DRAGSALUTATION 67 -#define ST_TITLE_EDIT 68 +#define ST_TITLE_EDIT 68 #define FI_MATCHING 70 @@ -93,7 +93,7 @@ #define ST_SALUTATIONPREVIEW 72 #define ST_SALUTATIONMATCHING 73 #define ST_SALUTATIONELEMENT 74 -#define CB_HIDE_EMPTY_PARA 75 +#define CB_HIDE_EMPTY_PARA 75 #define FI_FIRST 76 #define FL_FIRST 77 #define FL_SECOND 78 diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index b5e90d7fc4f2..b6c0d0d8cd3a 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage FixedInfo m_aAddressListFI; PushButton m_aAddressListPB; FixedInfo m_aCurrentAddressFI; - + FixedLine m_aFirstFL; - + FixedInfo m_aSecondFI; FixedInfo m_aSettingsFI; CheckBox m_aAddressCB; @@ -67,7 +67,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage FixedInfo m_aMatchFieldsFI; PushButton m_aAssignPB; - + FixedLine m_aThirdFL; FixedInfo m_aFourthFI; @@ -91,14 +91,14 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage DECL_LINK(InsertDataHdl_Impl, ImageButton*); DECL_LINK(AddressBlockSelectHdl_Impl, SwAddressPreview*); DECL_LINK(HideParagraphsHdl_Impl, CheckBox*); - + void EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective); - + virtual void ActivatePage(); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); virtual bool canAdvance() const; -public: +public: SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent); ~SwMailMergeAddressBlockPage(); @@ -112,19 +112,19 @@ class SwSelectAddressBlockDialog : public SfxModalDialog PushButton m_aNewPB; PushButton m_aCustomizePB; PushButton m_aDeletePB; - + FixedInfo m_aSettingsFI; RadioButton m_aNeverRB; RadioButton m_aAlwaysRB; RadioButton m_aDependentRB; Edit m_aCountryED; - + FixedLine m_aSeparatorFL; - + OKButton m_aOK; CancelButton m_aCancel; HelpButton m_aHelp; - + com::sun::star::uno::Sequence< ::rtl::OUString> m_aAddressBlocks; SwMailMergeConfigItem& m_rConfig; @@ -145,16 +145,16 @@ public: void SetSettings(sal_Bool bIsCountry, ::rtl::OUString sCountry); sal_Bool IsIncludeCountry() const {return !m_aNeverRB.IsChecked();} ::rtl::OUString GetCountry() const; -}; +}; class SwCustomizeAddressBlockDialog; class DDListBox : public SvTreeListBox { SwCustomizeAddressBlockDialog* m_pParentDialog; -public: +public: DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId); ~DDListBox(); - + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); }; @@ -167,19 +167,19 @@ class AddressMultiLineEdit : public MultiLineEdit, public SfxListener { Link m_aSelectionLink; SwCustomizeAddressBlockDialog* m_pParentDialog; - + using Window::Notify; using MultiLineEdit::SetText; protected: long PreNotify( NotifyEvent& rNEvt ); -public: +public: AddressMultiLineEdit(SwCustomizeAddressBlockDialog* pParent, const ResId& rResId); ~AddressMultiLineEdit(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - + void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;} void SetText( const String& rStr ); @@ -194,22 +194,22 @@ public: bool HasCurrentItem(); String GetCurrentItem(); void SelectCurrentItem(); -}; +}; // Dialog is used to create custom address blocks as well as custom greeting lines class SwRestrictedComboBox : public ComboBox -{ +{ String sForbiddenChars; protected: virtual void KeyInput( const KeyEvent& ); - virtual void Modify(); -public: + virtual void Modify(); +public: SwRestrictedComboBox(Window* pParent, const ResId& rResId): ComboBox( pParent, rResId ){} - - ~SwRestrictedComboBox(); - + + ~SwRestrictedComboBox(); + void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;} }; @@ -224,8 +224,8 @@ public: ADDRESSBLOCK_EDIT, GREETING_FEMALE, GREETING_MALE - }; -private: + }; +private: FixedText m_aAddressElementsFT; DDListBox m_aAddressElementsLB; @@ -271,7 +271,7 @@ private: bool HasItem_Impl(sal_Int32 nUserData); sal_Int32 GetSelectedItem_Impl(); void UpdateImageButtons_Impl(); - void MoveFocus( Window* pMember, bool bNext ); + void MoveFocus( Window* pMember, bool bNext ); public: SwCustomizeAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig, DialogType); @@ -279,19 +279,19 @@ public: void SetAddress(const ::rtl::OUString& rAddress); ::rtl::OUString GetAddress(); -}; +}; class SwAssignFieldsControl; class SwAssignFieldsDialog : public SfxModalDialog { FixedInfo m_aMatchingFI; SwAssignFieldsControl* m_pFieldsControl; - + FixedInfo m_aPreviewFI; SwAddressPreview m_aPreviewWIN; - + FixedLine m_aSeparatorFL; - + OKButton m_aOK; CancelButton m_aCancel; HelpButton m_aHelp; @@ -300,18 +300,18 @@ class SwAssignFieldsDialog : public SfxModalDialog ::rtl::OUString m_rPreviewString; SwMailMergeConfigItem& m_rConfigItem; - + ::com::sun::star::uno::Sequence< ::rtl::OUString > CreateAssignments(); DECL_LINK(OkHdl_Impl, PushButton*); DECL_LINK(AssignmentModifyHdl_Impl, void*); public: - SwAssignFieldsDialog(Window* pParent, - SwMailMergeConfigItem& rConfigItem, + SwAssignFieldsDialog(Window* pParent, + SwMailMergeConfigItem& rConfigItem, const ::rtl::OUString& rPreview, bool bIsAddressBlock); ~SwAssignFieldsDialog(); -}; +}; #endif diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src index 238d1cfa1260..7052b27f2512 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.src +++ b/sw/source/ui/dbui/mmaddressblockpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,12 +78,12 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE Hide = TRUE; Text[ en-US ] = "Current address list: %1"; }; - FixedLine FL_FIRST + FixedLine FL_FIRST { Pos = MAP_APPFONT ( 6 , 55 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; }; - FixedText FI_SECOND + FixedText FI_SECOND { Pos = MAP_APPFONT ( 6 , 66 ) ; Size = MAP_APPFONT ( 10 , 8 ) ; @@ -138,7 +138,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE Size = MAP_APPFONT ( 60 , 14 ) ; Text[ en-US ] = "Match ~Fields..."; }; - FixedLine FL_THIRD + FixedLine FL_THIRD { Pos = MAP_APPFONT ( 6 , 169 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; @@ -149,19 +149,19 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE Size = MAP_APPFONT ( 10 , 8 ) ; Text[ en-US ] = "4."; }; - FixedText FI_PREVIEW + FixedText FI_PREVIEW { Pos = MAP_APPFONT ( 16 , 180 ) ; Size = MAP_APPFONT ( 228 , 8 ) ; Text[ en-US ] = "Check if the address data matches correctly."; }; - Window WIN_PREVIEW + Window WIN_PREVIEW { Border = TRUE; Pos = MAP_APPFONT ( 12 , 191 ) ; Size = MAP_APPFONT ( 176 , 46 ) ; }; - FixedText FI_DOCINDEX + FixedText FI_DOCINDEX { Pos = MAP_APPFONT ( 111 , 239 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; @@ -302,8 +302,8 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK HelpID = HID_MM_CUSTOMIZEADDRESSBLOCK; Size = MAP_APPFONT ( 320 , 176 ) ; Moveable = TRUE ; - - WORKAROUND + + WORKAROUND String ST_TITLE_EDIT { diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index 2b9f64f61b50..331215ea72ba 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 2f519ea069f7..a01650832d1b 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmdocselectpage.hrc b/sw/source/ui/dbui/mmdocselectpage.hrc index f3c5698214ff..d2ebb3ae84cc 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hrc +++ b/sw/source/ui/dbui/mmdocselectpage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 76ced703a4ac..a24df215194b 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,12 +44,12 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage RadioButton m_aLoadDocRB; RadioButton m_aLoadTemplateRB; RadioButton m_aRecentDocRB; - + PushButton m_aBrowseDocPB; PushButton m_aBrowseTemplatePB; - + ListBox m_aRecentDocLB; - + String m_sLoadFileName; String m_sLoadTemplateName; @@ -57,10 +57,10 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage DECL_LINK(DocSelectHdl, RadioButton*); DECL_LINK(FileSelectHdl, PushButton*); - + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); -public: +public: SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent); ~SwMailMergeDocSelectPage(); diff --git a/sw/source/ui/dbui/mmdocselectpage.src b/sw/source/ui/dbui/mmdocselectpage.src index 9bc2077c6619..ace679af4f97 100644 --- a/sw/source/ui/dbui/mmdocselectpage.src +++ b/sw/source/ui/dbui/mmdocselectpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index cb691460ed97..c8cd2d8cd79b 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmgreetingspage.hrc b/sw/source/ui/dbui/mmgreetingspage.hrc index 422d04983e49..508c247f9775 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hrc +++ b/sw/source/ui/dbui/mmgreetingspage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index d0376ca72649..687f4afdf236 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,12 +39,12 @@ class SwMailMergeWizard; -class SwGreetingsHandler +class SwGreetingsHandler { friend class SwMailBodyDialog; friend class SwMailMergeGreetingsPage; CheckBox* m_pGreetingLineCB; - + CheckBox* m_pPersonalizedCB; FixedText* m_pFemaleFT; @@ -60,30 +60,30 @@ class SwGreetingsHandler ListBox* m_pFemaleColumnLB; FixedText* m_pFemaleFieldFT; ComboBox* m_pFemaleFieldCB; - + FixedText* m_pNeutralFT; ComboBox* m_pNeutralCB; bool m_bIsTabPage; SwMailMergeWizard* m_pWizard; - + DECL_LINK(IndividualHdl_Impl, CheckBox*); DECL_LINK(GreetingHdl_Impl, PushButton*); - + void Contains(sal_Bool bContainsGreeting); virtual void UpdatePreview(); -}; +}; -class SwMailMergeGreetingsPage : public svt::OWizardPage, +class SwMailMergeGreetingsPage : public svt::OWizardPage, public SwGreetingsHandler { SwBoldFixedInfo m_aHeaderFI; - + CheckBox m_aGreetingLineCB; - + CheckBox m_aPersonalizedCB; - + FixedText m_aFemaleFT; ListBox m_aFemaleLB; PushButton m_aFemalePB; @@ -97,19 +97,19 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, ListBox m_aFemaleColumnLB; FixedText m_aFemaleFieldFT; ComboBox m_aFemaleFieldCB; - + FixedText m_aNeutralFT; ComboBox m_aNeutralCB; - + FixedInfo m_aPreviewFI; SwAddressPreview m_aPreviewWIN; PushButton m_aAssignPB; FixedInfo m_aDocumentIndexFI; ImageButton m_aPrevSetIB; ImageButton m_aNextSetIB; - + String m_sDocument; - + DECL_LINK(ContainsHdl_Impl, CheckBox*); DECL_LINK(InsertDataHdl_Impl, ImageButton*); DECL_LINK(GreetingSelectHdl_Impl, ListBox*); @@ -118,7 +118,7 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, virtual void UpdatePreview(); virtual void ActivatePage(); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); -public: +public: SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent); ~SwMailMergeGreetingsPage(); @@ -127,9 +127,9 @@ public: class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler { CheckBox m_aGreetingLineCB; - + CheckBox m_aPersonalizedCB; - + FixedText m_aFemaleFT; ListBox m_aFemaleLB; PushButton m_aFemalePB; @@ -143,10 +143,10 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler ListBox m_aFemaleColumnLB; FixedText m_aFemaleFieldFT; ComboBox m_aFemaleFieldCB; - + FixedText m_aNeutralFT; ComboBox m_aNeutralCB; - + FixedText m_aBodyFT; MultiLineEdit m_aBodyMLE; FixedLine m_aSeparatorFL; @@ -157,7 +157,7 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler DECL_LINK(ContainsHdl_Impl, CheckBox*); DECL_LINK(OKHdl, PushButton*); -public: +public: SwMailBodyDialog(Window* pParent, SwMailMergeWizard* pWizard); ~SwMailBodyDialog(); diff --git a/sw/source/ui/dbui/mmgreetingspage.src b/sw/source/ui/dbui/mmgreetingspage.src index a9447034d749..fff77d9240db 100644 --- a/sw/source/ui/dbui/mmgreetingspage.src +++ b/sw/source/ui/dbui/mmgreetingspage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ StringList [en-US]= \ { \ < "< not available >" ; > ; \ - }; + }; #define GREETINGS_BODY \ @@ -150,23 +150,23 @@ TabPage DLG_MM_GREETINGS_PAGE }; GREETINGS_BODY FixedText FI_PREVIEW - { + { Pos = MAP_APPFONT ( 12 , 168 ) ; - Size = MAP_APPFONT ( 242 , 8 ) ; + Size = MAP_APPFONT ( 242 , 8 ) ; Text[ en-US ] = "Preview"; - }; + }; Window WIN_PREVIEW - { + { Pos = MAP_APPFONT ( 12 , 179 ); - Size = MAP_APPFONT ( 186 , 21 ) ; + Size = MAP_APPFONT ( 186 , 21 ) ; Border = TRUE; - }; + }; PushButton PB_ASSIGN - { + { Pos = MAP_APPFONT ( 204 , 179 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "~Match fields..."; - }; + }; FixedText FI_DOCINDEX { Pos = MAP_APPFONT ( 121 , 206 ) ; @@ -193,7 +193,7 @@ TabPage DLG_MM_GREETINGS_PAGE }; }; -#undef TOP_OFFSET +#undef TOP_OFFSET #undef LEFT_OFFSET #define TOP_OFFSET 0 @@ -207,11 +207,11 @@ ModalDialog DLG_MM_MAILBODY Moveable = TRUE ; Text [ en-US ] = "E-Mail Message"; CheckBox CB_GREETINGLINE - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 242 , 10 ) ; + { + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 242 , 10 ) ; Text[ en-US ] = "This e-mail should contain a salutation"; - }; + }; GREETINGS_BODY FixedText FT_BODY { diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 2a44623325a3..0bcda18f4f53 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : m_aTopMF.SetUpHdl(aFrameHdl); m_aTopMF.SetDownHdl(aFrameHdl); m_aTopMF.SetLoseFocusHdl(aFrameHdl); - + FieldUnit eFieldUnit = ::GetDfltMetric(sal_False); ::SetFieldUnit( m_aLeftMF, eFieldUnit ); ::SetFieldUnit( m_aTopMF, eFieldUnit ); diff --git a/sw/source/ui/dbui/mmlayoutpage.hrc b/sw/source/ui/dbui/mmlayoutpage.hrc index a54ba58fa025..10d334e62ab4 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hrc +++ b/sw/source/ui/dbui/mmlayoutpage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,6 +43,6 @@ #define WIN_EXAMPLECONTAINER 13 #define FT_ZOOM 14 #define LB_ZOOM 15 - -#endif - + +#endif + diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index b3191f04da64..c9e24cd12830 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,24 +47,24 @@ namespace com{ namespace sun{ namespace star{ namespace beans{ class XPropertySe class SwMailMergeLayoutPage : public svt::OWizardPage { SwBoldFixedInfo m_aHeaderFI; - + FixedLine m_aPositionFL; - + CheckBox m_aAlignToBodyCB; FixedText m_aLeftFT; MetricField m_aLeftMF; FixedText m_aTopFT; MetricField m_aTopMF; - + FixedLine m_aGreetingLineFL; FixedText m_aUpFT; PushButton m_aUpPB; FixedText m_aDownFT; PushButton m_aDownPB; - + Window m_aExampleContainerWIN; Window m_aExampleWIN; - + FixedText m_aZoomFT; ListBox m_aZoomLB; @@ -75,7 +75,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage SwFrmFmt* m_pAddressBlockFormat; bool m_bIsGreetingInserted; - + SwMailMergeWizard* m_pWizard; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xViewProperties; @@ -87,21 +87,21 @@ class SwMailMergeLayoutPage : public svt::OWizardPage DECL_LINK(AlignToTextHdl_Impl, CheckBox*); static SwFrmFmt* InsertAddressFrame( - SwWrtShell& rShell, - SwMailMergeConfigItem& rConfigItem, - const Point& rDestination, - bool bAlignToBody, + SwWrtShell& rShell, + SwMailMergeConfigItem& rConfigItem, + const Point& rDestination, + bool bAlignToBody, bool bExample); static void InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample); virtual void ActivatePage(); virtual sal_Bool commitPage(::svt::WizardTypes::CommitPageReason _eReason); -public: +public: SwMailMergeLayoutPage( SwMailMergeWizard* _pParent); ~SwMailMergeLayoutPage(); - static SwFrmFmt* InsertAddressAndGreeting(SwView* pView, - SwMailMergeConfigItem& rConfigItem, + static SwFrmFmt* InsertAddressAndGreeting(SwView* pView, + SwMailMergeConfigItem& rConfigItem, const Point& rAddressPos, bool bAlignToBody); }; diff --git a/sw/source/ui/dbui/mmlayoutpage.src b/sw/source/ui/dbui/mmlayoutpage.src index 8e012674719d..07582a45efdc 100644 --- a/sw/source/ui/dbui/mmlayoutpage.src +++ b/sw/source/ui/dbui/mmlayoutpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index 442380f0a484..ed4d2585b077 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmmergepage.hrc b/sw/source/ui/dbui/mmmergepage.hrc index bf9c730bf743..b7c3762c8321 100644 --- a/sw/source/ui/dbui/mmmergepage.hrc +++ b/sw/source/ui/dbui/mmmergepage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx index 03a644c6fcdd..6f512c77ce73 100644 --- a/sw/source/ui/dbui/mmmergepage.hxx +++ b/sw/source/ui/dbui/mmmergepage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,15 +39,15 @@ class SwMailMergeWizard; class SwMailMergeMergePage : public svt::OWizardPage { SwBoldFixedInfo m_aHeaderFI; - + FixedInfo m_aEditFI; PushButton m_aEditPB; - + FixedLine m_aFindFL; FixedText m_aFineFT; ReturnActionEdit m_aFindED; PushButton m_aFindPB; - + CheckBox m_aWholeWordsCB; CheckBox m_aBackwardsCB; CheckBox m_aMatchCaseCB; @@ -58,7 +58,7 @@ class SwMailMergeMergePage : public svt::OWizardPage DECL_LINK(FindHdl_Impl, PushButton*); DECL_LINK(EnteredFindStringHdl_Impl, void*); -public: +public: SwMailMergeMergePage( SwMailMergeWizard* _pParent); ~SwMailMergeMergePage(); diff --git a/sw/source/ui/dbui/mmmergepage.src b/sw/source/ui/dbui/mmmergepage.src index d2f55bceb978..fd9fffc0de8e 100644 --- a/sw/source/ui/dbui/mmmergepage.src +++ b/sw/source/ui/dbui/mmmergepage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 5a5ba88615c3..f6d0409700a5 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -914,7 +914,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG) rConfigItem.SetPrintRange( (USHORT)nBegin, (USHORT)nEnd ); SwDocMergeInfo& rStartInfo = rConfigItem.GetDocumentMergeInfo(nBegin); SwDocMergeInfo& rEndInfo = rConfigItem.GetDocumentMergeInfo(nEnd - 1); - + rtl::OUString sPages(rtl::OUString::valueOf( rStartInfo.nStartPageInTarget )); sPages += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - ")); sPages += rtl::OUString::valueOf( rEndInfo.nEndPageInTarget ); @@ -939,7 +939,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG) aProps[0].Value <<= sal_True; aProps[1]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pages")); aProps[1]. Value <<= sPages; - + pTargetView->ExecPrint( aProps, false, true ); SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), pObjSh)); diff --git a/sw/source/ui/dbui/mmoutputpage.hrc b/sw/source/ui/dbui/mmoutputpage.hrc index f8daf2734b0c..ec64620eb0a0 100644 --- a/sw/source/ui/dbui/mmoutputpage.hrc +++ b/sw/source/ui/dbui/mmoutputpage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #define PB_PRINTERSETTINGS 23 #define RB_PRINTALL 24 #define RB_PRINTCURRENT 25 -#define PB_PRINTNOW 26 +#define PB_PRINTNOW 26 #define ST_SAVESTART 27 #define ST_SAVEMERGED 28 #define ST_PRINT 29 diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 6a7f9052d585..11f5daf4c6a7 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ class SwMailMergeOutputPage : public svt::OWizardPage long m_nFromToFTPos; long m_nFromToNFPos; long m_nRBOffset; - + bool m_bCancelSaving; SwMailMergeWizard* m_pWizard; diff --git a/sw/source/ui/dbui/mmoutputpage.src b/sw/source/ui/dbui/mmoutputpage.src index efe84e34bfe9..29e54bbb403b 100644 --- a/sw/source/ui/dbui/mmoutputpage.src +++ b/sw/source/ui/dbui/mmoutputpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 4b6df926daf7..36916aa7fa68 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmoutputtypepage.hrc b/sw/source/ui/dbui/mmoutputtypepage.hrc index 6deff71251b9..da8d34fe5814 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hrc +++ b/sw/source/ui/dbui/mmoutputtypepage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 236b0fd6f40a..d79aad5eff66 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage FixedInfo m_aTypeFT; RadioButton m_aLetterRB; RadioButton m_aMailRB; - + SwBoldFixedInfo m_aHintHeaderFI; FixedInfo m_aHintFI; FixedInfo m_aNoMailHintFI; @@ -54,7 +54,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage DECL_LINK(TypeHdl_Impl, RadioButton*); -public: +public: SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent); ~SwMailMergeOutputTypePage(); diff --git a/sw/source/ui/dbui/mmoutputtypepage.src b/sw/source/ui/dbui/mmoutputtypepage.src index 3c776ff8fb59..a6dd74cc7a07 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.src +++ b/sw/source/ui/dbui/mmoutputtypepage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index da927a1ddf9c..e4ae3072c3a0 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmpreparemergepage.hrc b/sw/source/ui/dbui/mmpreparemergepage.hrc index 958df827749b..d5a89256d419 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hrc +++ b/sw/source/ui/dbui/mmpreparemergepage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 73b138938305..18f8f20d7ad7 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,22 +48,22 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage PushButton m_aNextPB; PushButton m_aLastPB; CheckBox m_ExcludeCB; - + FixedLine m_aNoteHeaderFL; FixedInfo m_aEditFI; PushButton m_aEditPB; - + SwMailMergeWizard* m_pWizard; - + DECL_LINK(EditDocumentHdl_Impl, PushButton*); DECL_LINK(ExcludeHdl_Impl, CheckBox*); DECL_LINK(MoveHdl_Impl, void*); - + virtual void ActivatePage(); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); -public: +public: SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent); ~SwMailMergePrepareMergePage(); diff --git a/sw/source/ui/dbui/mmpreparemergepage.src b/sw/source/ui/dbui/mmpreparemergepage.src index eac858b1b814..b1ecd375d45a 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.src +++ b/sw/source/ui/dbui/mmpreparemergepage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index e3f4f3faa224..1e31befb3dc2 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/selectdbtabledialog.hrc b/sw/source/ui/dbui/selectdbtabledialog.hrc index 24ed1183f97b..a5c55ff480d9 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hrc +++ b/sw/source/ui/dbui/selectdbtabledialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index c69cae53572a..a3398936f242 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,9 +61,9 @@ class SwSelectDBTableDialog : public SfxModalDialog ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; DECL_LINK(PreviewHdl, PushButton*); -public: - - SwSelectDBTableDialog(Window* pParent, +public: + + SwSelectDBTableDialog(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection ); ~SwSelectDBTableDialog(); diff --git a/sw/source/ui/dbui/selectdbtabledialog.src b/sw/source/ui/dbui/selectdbtabledialog.src index 271201463fef..467cb8333e68 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.src +++ b/sw/source/ui/dbui/selectdbtabledialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index 351be634b75e..c27dfe3205be 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,7 +148,7 @@ void SwDbtoolsClient::getFactory() { registerClient(); if(getDbToolsClientFactoryFunction()) - { // loading the lib succeeded + { // loading the lib succeeded void* pUntypedFactory = (*getDbToolsClientFactoryFunction())(); IDataAccessToolsFactory* pDBTFactory = static_cast<IDataAccessToolsFactory*>(pUntypedFactory); OSL_ENSURE(pDBTFactory, "SwDbtoolsClient::SwDbtoolsClient: no factory returned!"); |