Fix typos
Change-Id: Iadd86c8a62e80f2f7b93e210fa43aa3ab2ea8943 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210161 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
committed by
Julien Nabet
parent
85767714d4
commit
46374adcac
@@ -141,7 +141,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
|
||||
// We have to reject double calls. Otherwise we risk,
|
||||
// that we try to close an already closed resource...
|
||||
// And it is no problem to do nothing then. The UI user will try it again, if
|
||||
// non of these jobs was successful.
|
||||
// none of these jobs was successful.
|
||||
if (m_xSelfHold.is())
|
||||
{
|
||||
aWriteLock.clear();
|
||||
@@ -194,8 +194,8 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
|
||||
|
||||
// OK - URLs are the right ones.
|
||||
// But we can't execute synchronously :-)
|
||||
// May we are called from a generic key-input handler,
|
||||
// which isn't aware that this call kill its own environment...
|
||||
// Maybe we are called from a generic key-input handler,
|
||||
// which isn't aware that this call kills its own environment...
|
||||
// Do it asynchronous every time!
|
||||
|
||||
// But don't forget to hold ourselves alive.
|
||||
@@ -235,9 +235,9 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
|
||||
- close all views to the same document, if needed and possible
|
||||
- make the current frame empty
|
||||
! This step is necessary to handle errors during closing the
|
||||
document inside the frame. May the document shows a dialog and
|
||||
the user ignore it. Then the state of the office can be changed
|
||||
during we try to close frame and document.
|
||||
document inside the frame. Maybe the document shows a dialog and
|
||||
the user ignores it. Then the state of the office can be changed
|
||||
while we try to close frame and document.
|
||||
- check the environment (means count open frames - excluding our
|
||||
current one)
|
||||
- decide then, if we must close this frame only, establish the backing mode
|
||||
@@ -467,7 +467,7 @@ bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< c
|
||||
// Inform user about modified documents or still running jobs (e.g. printing).
|
||||
{
|
||||
css::uno::Reference< css::frame::XController > xController = xFrame->getController();
|
||||
if (xController.is()) // some views don't uses a controller .-( (e.g. the help window)
|
||||
if (xController.is()) // some views don't use a controller .-( (e.g. the help window)
|
||||
{
|
||||
bControllerSuspended = xController->suspend(true);
|
||||
if (! bControllerSuspended)
|
||||
@@ -587,9 +587,9 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig
|
||||
if (xTopWindowCheck.is())
|
||||
{
|
||||
// b1) Note: Toolkit interface XTopWindow sometimes is used by real VCL-child-windows also .-)
|
||||
// Be sure that these window is really a "top system window".
|
||||
// Be sure that this window is really a "top system window".
|
||||
// Attention ! Checking Window->GetParent() isn't the right approach here.
|
||||
// Because sometimes VCL create "implicit border windows" as parents even we created
|
||||
// Because sometimes VCL create "implicit border windows" as parents even if we created
|
||||
// a simple XWindow using the toolkit only .-(
|
||||
SolarMutexGuard aSolarLock;
|
||||
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
|
||||
|
||||
@@ -51,8 +51,8 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
|
||||
{
|
||||
SolarMutexGuard aReadLock;
|
||||
|
||||
// a) first search an interceptor, which match to this URL by its URL pattern registration
|
||||
// Note: if it return NULL - it does not mean an empty interceptor list automatically!
|
||||
// a) first search an interceptor, which matches to this URL by its URL pattern registration
|
||||
// Note: if it returns NULL - it does not mean an empty interceptor list automatically!
|
||||
InterceptorList::const_iterator pIt = m_lInterceptionRegs.findByPattern(aURL.Complete);
|
||||
if (pIt != m_lInterceptionRegs.end())
|
||||
xInterceptor = pIt->xInterceptor;
|
||||
@@ -75,8 +75,8 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
|
||||
// patterns above)
|
||||
}
|
||||
// c) No registered interceptor => use our direct slave.
|
||||
// This helper exist by design and must be valid every time ...
|
||||
// But to be more feature proof - we should check that .-)
|
||||
// This helper exists by design and must be valid every time ...
|
||||
// But to be more future proof - we should check that .-)
|
||||
if (!xInterceptor.is() && m_xSlave.is())
|
||||
xInterceptor = m_xSlave;
|
||||
}
|
||||
@@ -106,8 +106,8 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
|
||||
throw css::uno::RuntimeException(u"NULL references not allowed as in parameter"_ustr, xThis);
|
||||
|
||||
// Fill a new info structure for new interceptor.
|
||||
// Save his reference and try to get an additional URL/pattern list from him.
|
||||
// If no list exist register these interceptor for all dispatch events with "*"!
|
||||
// Save its reference and try to get an additional URL/pattern list from it.
|
||||
// If no list exists register this interceptor for all dispatch events with "*"!
|
||||
InterceptorInfo aInfo;
|
||||
|
||||
aInfo.xInterceptor = xInterceptor;
|
||||
@@ -131,7 +131,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
|
||||
}
|
||||
|
||||
// b) OK - there is at least one interceptor already registered.
|
||||
// It's slave and it's master must be valid references ...
|
||||
// Its slave and its master must be valid references ...
|
||||
// because we created it.
|
||||
|
||||
// insert it before any other existing interceptor - means at the beginning of our list.
|
||||
@@ -172,7 +172,7 @@ void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css::
|
||||
// If it could be located inside cache -
|
||||
// use its slave/master relations to update the interception list;
|
||||
// set empty references for it as new master and slave;
|
||||
// and release it from out cache.
|
||||
// and release it from our cache.
|
||||
InterceptorList::iterator pIt = m_lInterceptionRegs.findByReference(xInterceptor);
|
||||
if (pIt != m_lInterceptionRegs.end())
|
||||
{
|
||||
@@ -227,8 +227,8 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent
|
||||
if (aEvent.Source != xOwner)
|
||||
return;
|
||||
|
||||
// Because every interceptor hold at least one reference to us ... and we destruct this list
|
||||
// of interception objects ... we should hold ourself alive .-)
|
||||
// Because every interceptor holds at least one reference to us ... and we destruct this list
|
||||
// of interception objects ... we should hold ourselves alive .-)
|
||||
css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY_THROW);
|
||||
|
||||
// We need a full copy of all currently registered interceptor objects.
|
||||
|
||||
@@ -84,7 +84,7 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any
|
||||
|
||||
void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aEvent)
|
||||
{
|
||||
// we are interested on events only, which must trigger a title bar update
|
||||
// we are interested in events only, which must trigger a title bar update
|
||||
// because component was changed.
|
||||
if (
|
||||
(aEvent.Action == css::frame::FrameAction_COMPONENT_ATTACHED ) ||
|
||||
@@ -107,7 +107,7 @@ void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&)
|
||||
if (xFrame.is())
|
||||
xFrame->removeFrameActionListener(this);
|
||||
|
||||
// nothing todo here - because we hold the frame as weak reference only
|
||||
// nothing to do here - because we hold the frame as weak reference only
|
||||
}
|
||||
|
||||
//http://live.gnome.org/GnomeShell/ApplicationBased
|
||||
@@ -234,7 +234,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
|
||||
sal_Int32 nIcon = INVALID_ICON_ID;
|
||||
|
||||
// b) try to find information on controller property set directly
|
||||
// Don't forget to catch possible exceptions - because these property is an optional one!
|
||||
// Don't forget to catch possible exceptions - because this property is an optional one!
|
||||
css::uno::Reference< css::beans::XPropertySet > xSet( xController, css::uno::UNO_QUERY );
|
||||
if ( xSet.is() )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user