diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-10-31 21:04:59 -0400 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2015-11-07 21:22:01 +0000 |
| commit | 04783fd91832fa01a5b096f395edd7ad4f9c0f6b (patch) | |
| tree | fd677ba54851b1742ad163e3a27bc6cea314052c /sw/inc/dbmgr.hxx | |
| parent | 12d973aa9b6b3d962702f27fc46ef05b0151cabc (diff) | |
Misc tweaks and cleanups.
Streamlined a couple of hotspots and some
minor cleanups.
Change-Id: I85a9423e03f7e20ce78736a44d668da859a443cd
Reviewed-on: https://gerrit.libreoffice.org/19720
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw/inc/dbmgr.hxx')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index b74140d1a8e4..ca7fc51e3540 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -250,7 +250,7 @@ public: inline void SetMergeSilent( bool bVal ) { bMergeSilent = bVal; } /// Merging of data records into fields. - bool MergeNew( const SwMergeDescriptor& rMergeDesc, vcl::Window* pParent = NULL ); + bool MergeNew( const SwMergeDescriptor& rMergeDesc, vcl::Window* pParent = nullptr ); static bool Merge(SwWrtShell* pSh); void MergeCancel(); @@ -335,7 +335,7 @@ public: static OUString GetDBField( css::uno::Reference< css::beans::XPropertySet > xColumnProp, const SwDBFormatData& rDBFormatData, - double *pNumber = NULL); + double *pNumber = nullptr); static css::uno::Reference< css::sdbc::XConnection> GetConnection(const OUString& rDataSource, |