diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-25 23:03:49 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-25 23:58:12 +0200 |
| commit | 07b5102e7b1423becc395660c9f5c02bfab6477a (patch) | |
| tree | 90dbe0518f97b3ce5dfc22e20b2d03a8ef71b711 /sfx2 | |
| parent | vcl: fix typo (diff) | |
| download | core-07b5102e7b1423becc395660c9f5c02bfab6477a.tar.gz core-07b5102e7b1423becc395660c9f5c02bfab6477a.zip | |
There are many ships in the port of Hamburg but "ownership" is not one
Change-Id: I971390d084b08293b21fdc35beb74482a1560bb8
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/viewsh.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index fc789407fcab..5eea56a3481d 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -291,8 +291,8 @@ public: SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const Rectangle& ); SAL_DLLPRIVATE void PushSubShells_Impl( sal_Bool bPush=sal_True ); SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( sal_False ); } - SAL_DLLPRIVATE void TakeOwnerShip_Impl(); - SAL_DLLPRIVATE void TakeFrameOwnerShip_Impl(); + SAL_DLLPRIVATE void TakeOwnership_Impl(); + SAL_DLLPRIVATE void TakeFrameOwnership_Impl(); SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey); }; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 260f6b39ca8a..4614bb2372ec 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -379,12 +379,12 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const EV { if ( bDeliverOwnership && ( !pShell->GetWindow() || !pShell->GetWindow()->IsReallyVisible() ) ) { - // ignore OwnerShip in case of visible frame (will be closed by user) + // ignore Ownership in case of visible frame (will be closed by user) uno::Reference < frame::XModel > xModel( aEvent.Source, uno::UNO_QUERY ); if ( xModel.is() ) - pShell->TakeOwnerShip_Impl(); + pShell->TakeOwnership_Impl(); else - pShell->TakeFrameOwnerShip_Impl(); + pShell->TakeFrameOwnership_Impl(); } throw com::sun::star::util::CloseVetoException(::rtl::OUString("Controller disagree ..."),static_cast< ::cppu::OWeakObject*>(this)); diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index de6b6d39fe43..57ab1077b14a 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -2039,16 +2039,16 @@ sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUStr return sal_True; } -void SfxViewShell::TakeOwnerShip_Impl() +void SfxViewShell::TakeOwnership_Impl() { - // currently there is only one reason to take OwnerShip: a hidden frame is printed + // currently there is only one reason to take Ownership: a hidden frame is printed // so the ViewShell will check this on EndPrint (->prnmon.cxx) pImp->m_bGotOwnership = true; } -void SfxViewShell::TakeFrameOwnerShip_Impl() +void SfxViewShell::TakeFrameOwnership_Impl() { - // currently there is only one reason to take OwnerShip: a hidden frame is printed + // currently there is only one reason to take Ownership: a hidden frame is printed // so the ViewShell will check this on EndPrint (->prnmon.cxx) pImp->m_bGotFrameOwnership = true; } |