diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /extensions/source/bibliography/datman.cxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'extensions/source/bibliography/datman.cxx')
| -rw-r--r-- | extensions/source/bibliography/datman.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index f314500fccf5..49fa9581a30a 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -237,7 +237,7 @@ class MappingDialog_Impl : public ModalDialog DECL_LINK(ListBoxSelectHdl, ListBox*); public: - MappingDialog_Impl(Window* pParent, BibDataManager* pDatMan); + MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pDatMan); virtual ~MappingDialog_Impl(); void SetModified() {bModified = true;} @@ -255,7 +255,7 @@ static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , return USHRT_MAX; } -MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) +MappingDialog_Impl::MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pMan) : ModalDialog(pParent, "MappingDialog", "modules/sbibliography/ui/mappingdialog.ui") , pDatMan(pMan) , sNone(BIB_RESSTR(RID_BIB_STR_NONE)) @@ -432,13 +432,13 @@ class DBChangeDialog_Impl : public ModalDialog DECL_LINK(DoubleClickHdl, SvTabListBox*); public: - DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ); + DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan ); virtual ~DBChangeDialog_Impl(); OUString GetCurrentURL()const; }; -DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) +DBChangeDialog_Impl::DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan ) : ModalDialog(pParent, "ChooseDataSourceDialog", "modules/sbibliography/ui/choosedatasourcedialog.ui") , @@ -1432,7 +1432,7 @@ void BibDataManager::RemoveMeAsUidListener() } } -void BibDataManager::CreateMappingDialog(Window* pParent) +void BibDataManager::CreateMappingDialog(vcl::Window* pParent) { boost::scoped_ptr<MappingDialog_Impl> pDlg(new MappingDialog_Impl(pParent, this)); if(RET_OK == pDlg->Execute() && pBibView) @@ -1441,7 +1441,7 @@ void BibDataManager::CreateMappingDialog(Window* pParent) } } -OUString BibDataManager::CreateDBChangeDialog(Window* pParent) +OUString BibDataManager::CreateDBChangeDialog(vcl::Window* pParent) { OUString uRet; boost::scoped_ptr<DBChangeDialog_Impl> pDlg(new DBChangeDialog_Impl(pParent, this )); |