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 /sfx2/source/appl/appopen.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 'sfx2/source/appl/appopen.cxx')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 7bc992a85ca9..22908faf7a7f 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -220,7 +220,7 @@ sal_uInt32 CheckPasswd_Impl if ( bIsEncrypted ) { - Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : NULL; + vcl::Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : NULL; if ( pWin ) pWin->Show(); @@ -461,7 +461,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) if ( !pTemplNameItem && !pTemplFileNameItem ) { bool bNewWin = false; - Window* pTopWin = GetTopWindow(); + vcl::Window* pTopWin = GetTopWindow(); SfxTemplateManagerDlg aTemplDlg; int nRet = aTemplDlg.Execute(); @@ -830,7 +830,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP ) { SolarMutexGuard aGuard; - Window *pWindow = SfxGetpApp()->GetTopWindow(); + vcl::Window *pWindow = SfxGetpApp()->GetTopWindow(); MessageDialog aSecurityWarningBox(pWindow, SfxResId(STR_SECURITY_WARNING_NO_HYPERLINKS), |