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 /desktop/source/deployment/gui/license_dialog.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 'desktop/source/deployment/gui/license_dialog.cxx')
| -rw-r--r-- | desktop/source/deployment/gui/license_dialog.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 183504801d00..ff375208630d 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -55,7 +55,7 @@ class LicenseView : public MultiLineEdit, public SfxListener Link maScrolledHdl; public: - LicenseView( Window* pParent, WinBits nStyle ); + LicenseView( vcl::Window* pParent, WinBits nStyle ); virtual ~LicenseView(); void ScrollDown( ScrollType eScroll ); @@ -94,7 +94,7 @@ struct LicenseDialogImpl : public ModalDialog bool m_bLicenseRead; LicenseDialogImpl( - Window * pParent, + vcl::Window * pParent, css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & sExtensionName, const OUString & sLicenseText); @@ -103,7 +103,7 @@ struct LicenseDialogImpl : public ModalDialog }; -LicenseView::LicenseView( Window* pParent, WinBits nStyle ) +LicenseView::LicenseView( vcl::Window* pParent, WinBits nStyle ) : MultiLineEdit( pParent, nStyle ) { SetLeftMargin( 5 ); @@ -111,7 +111,7 @@ LicenseView::LicenseView( Window* pParent, WinBits nStyle ) StartListening( *GetTextEngine() ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLicenseView(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -182,7 +182,7 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) LicenseDialogImpl::LicenseDialogImpl( - Window * pParent, + vcl::Window * pParent, cssu::Reference< cssu::XComponentContext > const & xContext, const OUString & sExtensionName, const OUString & sLicenseText) |