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 /svtools/source/control/toolbarmenuacc.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 'svtools/source/control/toolbarmenuacc.cxx')
| -rw-r--r-- | svtools/source/control/toolbarmenuacc.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index a8bae45688eb..2464694faa0c 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -182,7 +182,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R Reference< XAccessible > xRet; - Window* pParent = mpParent->mrMenu.GetParent(); + vcl::Window* pParent = mpParent->mrMenu.GetParent(); if( pParent ) xRet = pParent->GetAccessible(); @@ -196,7 +196,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); - Window* pParent = mpParent->mrMenu.GetParent(); + vcl::Window* pParent = mpParent->mrMenu.GetParent(); if( pParent ) { for( sal_uInt16 i = 0, nCount = pParent->GetChildCount(); i < nCount ; i++ ) @@ -238,7 +238,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, s if( aRet.isEmpty() ) { - Window* pLabel = mpParent->mrMenu.GetAccessibleRelationLabeledBy(); + vcl::Window* pLabel = mpParent->mrMenu.GetAccessibleRelationLabeledBy(); if( pLabel && pLabel != &mpParent->mrMenu ) aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() ); } |