diff options
Diffstat (limited to 'framework/source/services')
| -rw-r--r-- | framework/source/services/desktop.cxx | 14 | ||||
| -rw-r--r-- | framework/source/services/pathsettings.cxx | 2 | ||||
| -rw-r--r-- | framework/source/services/tabwindowservice.cxx | 2 | ||||
| -rw-r--r-- | framework/source/services/taskcreatorsrv.cxx | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 4a8cec367202..98190049e2dc 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -227,14 +227,14 @@ sal_Bool SAL_CALL Desktop::terminate() css::uno::Reference< css::frame::XTerminateListener > xSfxTerminator = m_xSfxTerminator; css::lang::EventObject aEvent ( static_cast< ::cppu::OWeakObject* >(this) ); - ::sal_Bool bAskQuickStart = !m_bSuspendQuickstartVeto ; + sal_Bool bAskQuickStart = !m_bSuspendQuickstartVeto ; aReadLock.clear(); // Ask normal terminate listener. They could stop terminate without closing any open document. Desktop::TTerminateListenerList lCalledTerminationListener; - ::sal_Bool bVeto = sal_False; + sal_Bool bVeto = sal_False; impl_sendQueryTerminationEvent(lCalledTerminationListener, bVeto); if ( bVeto ) { @@ -245,8 +245,8 @@ sal_Bool SAL_CALL Desktop::terminate() // try to close all open frames. // Allow using of any UI ... because Desktop.terminate() was designed as UI functionality in the past. - ::sal_Bool bAllowUI = sal_True; - ::sal_Bool bFramesClosed = impl_closeFrames(bAllowUI); + sal_Bool bAllowUI = sal_True; + sal_Bool bFramesClosed = impl_closeFrames(bAllowUI); if ( ! bFramesClosed ) { impl_sendCancelTerminationEvent(lCalledTerminationListener); @@ -270,7 +270,7 @@ sal_Bool SAL_CALL Desktop::terminate() // But some of them can be dangerous. E.g. it would be dangerous if we close our pipe // and dont terminate in real because another listener throws a veto exception .-) - ::sal_Bool bTerminate = sal_False; + sal_Bool bTerminate = sal_False; try { if( @@ -1687,7 +1687,7 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lCalledListener, - ::sal_Bool& bVeto ) + sal_Bool& bVeto ) { bVeto = sal_False; @@ -1783,7 +1783,7 @@ void Desktop::impl_sendNotifyTerminationEvent() } -::sal_Bool Desktop::impl_closeFrames(::sal_Bool bAllowUI) +sal_Bool Desktop::impl_closeFrames(sal_Bool bAllowUI) { SolarMutexClearableGuard aReadLock; css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > lFrames = m_aChildTaskContainer.getAllElements(); diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index bbd035a15248..0ceeebb4c561 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -172,7 +172,7 @@ private: ::cppu::OPropertyArrayHelper* m_pPropHelp; - ::sal_Bool m_bIgnoreEvents; + sal_Bool m_bIgnoreEvents; public: diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 6cee2502bd99..331025b6212a 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -68,7 +68,7 @@ struct TTabPageInfo public: ::sal_Int32 m_nIndex; - ::sal_Bool m_bCreated; + sal_Bool m_bCreated; FwkTabPage* m_pPage; css::uno::Sequence< css::beans::NamedValue > m_lProperties; }; diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 25cd09817cba..2407f739e886 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -178,7 +178,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI // Note: Doing so it's no longer supported, that e.g. our wizards can use findFrame(_blank) // to create it's previes frames. They must do it manually by using WindowDescriptor+Toolkit! css::uno::Reference< css::frame::XDesktop > xDesktop(xParentFrame, css::uno::UNO_QUERY); - ::sal_Bool bTopLevelDocumentWindow = ( + sal_Bool bTopLevelDocumentWindow = ( sRightName.isEmpty() && ( (! xParentFrame.is() ) || |