summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-18 10:11:06 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-11-18 09:03:16 +0000
commit5a4d508bd6711def27c7738f7ac68c2da478e48c (patch)
treec688427afbce033c04009d71c4b2c256ec784da2 /vcl/source/window
parentd30a44aff1fb049a71e4eb2612be65a735fbe918 (diff)
com::sun::star->css in vcl/
Change-Id: Ifad76177673cf93746ba221838be80ff76fed228 Reviewed-on: https://gerrit.libreoffice.org/20032 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/accessibility.cxx8
-rw-r--r--vcl/source/window/brdwin.cxx4
-rw-r--r--vcl/source/window/dlgctrl.cxx2
-rw-r--r--vcl/source/window/dndevdis.cxx2
-rw-r--r--vcl/source/window/dockmgr.cxx6
-rw-r--r--vcl/source/window/layout.cxx6
-rw-r--r--vcl/source/window/menu.cxx4
-rw-r--r--vcl/source/window/menufloatingwindow.cxx2
-rw-r--r--vcl/source/window/mnemonic.cxx4
-rw-r--r--vcl/source/window/mouseevent.cxx16
-rw-r--r--vcl/source/window/msgbox.cxx2
-rw-r--r--vcl/source/window/settings.cxx2
-rw-r--r--vcl/source/window/syswin.cxx2
-rw-r--r--vcl/source/window/toolbox2.cxx4
-rw-r--r--vcl/source/window/winproc.cxx15
-rw-r--r--vcl/source/window/wrkwin.cxx12
16 files changed, 44 insertions, 47 deletions
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index e0a708f78ff9..87af1209a5e4 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -124,7 +124,7 @@ ImplAccessibleInfos::~ImplAccessibleInfos()
namespace vcl {
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate )
+css::uno::Reference< css::accessibility::XAccessible > Window::GetAccessible( bool bCreate )
{
// do not optimize hierarchy for the top level border win (ie, when there is no parent)
/* // do not optimize accessible hierarchy at all to better reflect real VCL hierarchy
@@ -144,13 +144,13 @@ namespace vcl {
return mpWindowImpl->mxAccessible;
}
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::CreateAccessible()
+css::uno::Reference< css::accessibility::XAccessible > Window::CreateAccessible()
{
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc( GetComponentInterface(), ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::accessibility::XAccessible > xAcc( GetComponentInterface(), css::uno::UNO_QUERY );
return xAcc;
}
-void Window::SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > x )
+void Window::SetAccessible( css::uno::Reference< css::accessibility::XAccessible > x )
{
mpWindowImpl->mxAccessible = x;
}
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index f65e69ec26d7..eb839d2298c8 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1726,7 +1726,7 @@ void ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, sal
void ImplBorderWindow::ImplInit( vcl::Window* pParent,
WinBits nStyle, sal_uInt16 nTypeStyle,
- const ::com::sun::star::uno::Any& )
+ const css::uno::Any& )
{
ImplInit( pParent, nStyle, nTypeStyle, nullptr );
}
@@ -1821,7 +1821,7 @@ ImplBorderWindow::ImplBorderWindow( vcl::Window* pParent, WinBits nStyle ,
sal_uInt16 nTypeStyle ) :
Window( WINDOW_BORDERWINDOW )
{
- ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() );
+ ImplInit( pParent, nStyle, nTypeStyle, css::uno::Any() );
}
ImplBorderWindow::~ImplBorderWindow()
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 11f3c3c96fbd..3895ae2f4b50 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -396,7 +396,7 @@ vcl::Window* ImplFindAccelWindow( vcl::Window* pParent, sal_uInt16& rIndex, sal_
if ( !xCharClass.is() )
xCharClass = vcl::unohelper::CreateCharacterClassification();
- const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale();
+ const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale();
cCharCode = xCharClass->toUpper( OUString(cCharCode), 0, 1, rLocale )[0];
if ( i < nFormEnd )
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index a436bdefa002..050b74983766 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -444,7 +444,7 @@ sal_Int32 DNDEventDispatcher::fireDragGestureEvent( vcl::Window *pWindow,
const Reference< XDragSource >& xSource, const Any& event,
const Point& rOrigin, const sal_Int8 nDragAction
)
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
sal_Int32 n = 0;
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index b3fc00522b08..20950c6f23e6 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -481,7 +481,7 @@ public:
virtual ~ImplPopupFloatWin();
virtual void dispose() override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
virtual void MouseMove( const MouseEvent& rMEvt ) override;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
@@ -525,7 +525,7 @@ void ImplPopupFloatWin::dispose()
FloatingWindow::dispose();
}
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ImplPopupFloatWin::CreateAccessible()
+css::uno::Reference< css::accessibility::XAccessible > ImplPopupFloatWin::CreateAccessible()
{
// switch off direct accessibilty support for this window
@@ -533,7 +533,7 @@ void ImplPopupFloatWin::dispose()
// as this window is only used as a helper for subtoolbars that are not teared-off, the parent toolbar
// has to provide accessibility support (as implemented in the toolkit)
// so the contained toolbar should appear as child of the correponsing toolbar item of the parent toolbar
- return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >();
+ return css::uno::Reference< css::accessibility::XAccessible >();
}
vcl::Window* ImplPopupFloatWin::GetPreferredKeyInputWindow()
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 62e9e4fd7682..e4efb2667270 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -28,7 +28,7 @@ VclContainer::VclContainer(vcl::Window *pParent, WinBits nStyle)
sal_uInt16 VclContainer::getDefaultAccessibleRole() const
{
- return com::sun::star::accessibility::AccessibleRole::PANEL;
+ return css::accessibility::AccessibleRole::PANEL;
}
Size VclContainer::GetOptimalSize() const
@@ -327,9 +327,9 @@ sal_uInt16 VclBox::getDefaultAccessibleRole() const
#if defined(WNT)
//fdo#74284 call Boxes Panels, keep then as "Filler" under
//at least Linux seeing as that's what Gtk does for GtkBoxes
- return com::sun::star::accessibility::AccessibleRole::PANEL;
+ return css::accessibility::AccessibleRole::PANEL;
#else
- return com::sun::star::accessibility::AccessibleRole::FILLER;
+ return css::accessibility::AccessibleRole::FILLER;
#endif
}
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index f12a855d48b4..7c36353f5a4e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -146,13 +146,13 @@ Menu::~Menu()
MenuFloatingWindow* pFloat = static_cast<MenuFloatingWindow*>(pWindow.get());
if( pFloat->pMenu == this )
pFloat->pMenu = nullptr;
- pWindow->SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() );
+ pWindow->SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() );
}
// dispose accessible components
if ( mxAccessible.is() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> xComponent( mxAccessible, ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::lang::XComponent> xComponent( mxAccessible, css::uno::UNO_QUERY );
if ( xComponent.is() )
xComponent->dispose();
}
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 327af121ba1d..2128f08cce28 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -87,7 +87,7 @@ void MenuFloatingWindow::doShutdown()
}
// free the reference to the accessible component
- SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() );
+ SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() );
aHighlightChangedTimer.Stop();
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 9ccb441f2800..530e5ff626fa 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -72,7 +72,7 @@ sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey )
void MnemonicGenerator::RegisterMnemonic( const OUString& rKey )
{
- const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale();
+ const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale();
uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass();
// Don't crash even when we don't have access to i18n service
@@ -116,7 +116,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
if ( _rKey.isEmpty() || ImplFindMnemonic( _rKey ) )
return _rKey;
- const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale();
+ const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale();
uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass();
// Don't crash even when we don't have access to i18n service
diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx
index d4a493c71449..581c1643fc72 100644
--- a/vcl/source/window/mouseevent.cxx
+++ b/vcl/source/window/mouseevent.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/awt/MouseButton.hpp>
/** inits this vcl KeyEvent with all settings from the given awt event **/
-MouseEvent::MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent )
+MouseEvent::MouseEvent( const css::awt::MouseEvent& rEvent )
: maPos( rEvent.X, rEvent.Y )
, mnMode( MouseEventModifiers::NONE )
, mnClicks( static_cast< sal_uInt16 >( rEvent.ClickCount ) )
@@ -32,23 +32,23 @@ MouseEvent::MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent )
{
if( rEvent.Modifiers )
{
- if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::SHIFT) != 0 )
+ if( (rEvent.Modifiers & css::awt::KeyModifier::SHIFT) != 0 )
mnCode |= KEY_SHIFT;
- if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD1) != 0 )
+ if( (rEvent.Modifiers & css::awt::KeyModifier::MOD1) != 0 )
mnCode |= KEY_MOD1;
- if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD2) != 0 )
+ if( (rEvent.Modifiers & css::awt::KeyModifier::MOD2) != 0 )
mnCode |= KEY_MOD2;
- if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD3) != 0 )
+ if( (rEvent.Modifiers & css::awt::KeyModifier::MOD3) != 0 )
mnCode |= KEY_MOD3;
}
if( rEvent.Buttons )
{
- if( (rEvent.Buttons & ::com::sun::star::awt::MouseButton::LEFT) != 0 )
+ if( (rEvent.Buttons & css::awt::MouseButton::LEFT) != 0 )
mnCode |= MOUSE_LEFT;
- if( (rEvent.Buttons & ::com::sun::star::awt::MouseButton::RIGHT) != 0 )
+ if( (rEvent.Buttons & css::awt::MouseButton::RIGHT) != 0 )
mnCode |= MOUSE_RIGHT;
- if( (rEvent.Buttons & ::com::sun::star::awt::MouseButton::MIDDLE) != 0 )
+ if( (rEvent.Buttons & css::awt::MouseButton::MIDDLE) != 0 )
mnCode |= MOUSE_MIDDLE;
}
}
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index e892c1d3c7be..6f84fbcd4778 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -456,7 +456,7 @@ Image ErrorBox::GetStandardImage()
{
ImplInitMsgBoxImageList();
}
- catch (const ::com::sun::star::uno::Exception &)
+ catch (const css::uno::Exception &)
{
// During early bootstrap we can have no initialized
// ucb and hence no ability to get this image, so nop.
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index 500dede9626f..e54a4382c747 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -247,7 +247,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
"org.openoffice.Office.Common/Accessibility" ); // note: case sensitive !
if ( aNode.isValid() )
{
- ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("AutoDetectSystemHC") );
+ css::uno::Any aValue = aNode.getNodeValue( OUString("AutoDetectSystemHC") );
bool bTmp = false;
if( aValue >>= bTmp )
bAutoHCMode = bTmp;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index d353f4607d7d..218bcf6fcd60 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -922,7 +922,7 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar)
if ( pOldWindow )
{
CallEventListeners( VCLEVENT_WINDOW_MENUBARREMOVED, static_cast<void*>(pOldMenuBar) );
- pOldWindow->SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() );
+ pOldWindow->SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() );
}
if ( pMenuBar )
{
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 1de2f21de8d6..d8eb3289882f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1997,7 +1997,7 @@ bool ToolBox::AlwaysLocked()
{
// feature enabled ?
bool bStatesEnabled = bool();
- ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("StatesEnabled") );
+ css::uno::Any aValue = aNode.getNodeValue( OUString("StatesEnabled") );
if( aValue >>= bStatesEnabled )
{
if( bStatesEnabled )
@@ -2008,7 +2008,7 @@ bool ToolBox::AlwaysLocked()
"/org.openoffice.Office.UI.GlobalSettings/Toolbars/States" ); // note: case sensitive !
bool bLocked = bool();
- ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString("Locked") );
+ css::uno::Any aValue2 = aNode2.getNodeValue( OUString("Locked") );
if( aValue2 >>= bLocked )
nAlwaysLocked = bLocked ? 1 : 0;
}
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 544ea6e95d3a..ef4cb769e18e 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -475,9 +475,9 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
if( pMouseDownWin->ImplGetFrameData()->mbInternalDragGestureRecognizer )
{
// query DropTarget from child window
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > xDragGestureRecognizer =
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > ( pMouseDownWin->ImplGetWindowImpl()->mxDNDListenerContainer,
- ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > xDragGestureRecognizer =
+ css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > ( pMouseDownWin->ImplGetWindowImpl()->mxDNDListenerContainer,
+ css::uno::UNO_QUERY );
if( xDragGestureRecognizer.is() )
{
@@ -487,10 +487,9 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
pMouseDownWin->ImplGetFrameData()->mnFirstMouseY ) );
// create a uno mouse event out of the available data
- ::com::sun::star::awt::MouseEvent aMouseEvent(
- static_cast < ::com::sun::star::uno::XInterface * > ( nullptr ),
+ css::awt::MouseEvent aMouseEvent( static_cast < css::uno::XInterface * > ( nullptr ),
#ifdef MACOSX
- nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3),
+ nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3),
#else
nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2),
#endif
@@ -503,12 +502,12 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
SolarMutexReleaser aReleaser;
// FIXME: where do I get Action from ?
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > xDragSource = pMouseDownWin->GetDragSource();
+ css::uno::Reference< css::datatransfer::dnd::XDragSource > xDragSource = pMouseDownWin->GetDragSource();
if( xDragSource.is() )
{
static_cast < DNDListenerContainer * > ( xDragGestureRecognizer.get() )->fireDragGestureEvent( 0,
- relLoc.X(), relLoc.Y(), xDragSource, ::com::sun::star::uno::makeAny( aMouseEvent ) );
+ relLoc.X(), relLoc.Y(), xDragSource, css::uno::makeAny( aMouseEvent ) );
}
}
}
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 78dc4bb06e0d..cd32d25a8e57 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -67,11 +67,11 @@ void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentDat
SetActivateMode( ActivateModeFlags::GrabFocus );
}
-void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken )
+void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const css::uno::Any& aSystemWorkWindowToken )
{
if( aSystemWorkWindowToken.hasValue() )
{
- ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
+ css::uno::Sequence< sal_Int8 > aSeq;
aSystemWorkWindowToken >>= aSeq;
SystemParentData* pData = reinterpret_cast<SystemParentData*>(aSeq.getArray());
DBG_ASSERT( aSeq.getLength() == sizeof( SystemParentData ) && pData->nSize == sizeof( SystemParentData ), "WorkWindow::WorkWindow( vcl::Window*, const Any&, WinBits ) called with invalid Any" );
@@ -95,7 +95,7 @@ WorkWindow::WorkWindow( vcl::Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-WorkWindow::WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) :
+WorkWindow::WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) :
SystemWindow( WINDOW_WORKWINDOW )
{
ImplInitWorkWindowData();
@@ -142,12 +142,10 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr
{
// Dispose of the canvas implementation, which might rely on
// screen-specific system data.
- com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas > xCanvas( mpWindowImpl->mxCanvas );
+ css::uno::Reference< css::rendering::XCanvas > xCanvas( mpWindowImpl->mxCanvas );
if( xCanvas.is() )
{
- com::sun::star::uno::Reference< com::sun::star::lang::XComponent >
- xCanvasComponent( xCanvas,
- com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::lang::XComponent > xCanvasComponent( xCanvas, css::uno::UNO_QUERY );
if( xCanvasComponent.is() )
xCanvasComponent->dispose();
}