There are many ships in the port of Hamburg but "ownership" is not one

Change-Id: I971390d084b08293b21fdc35beb74482a1560bb8

4 files changed, 10 insertions, 10 deletions

diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index e5da7251c9ce..2dadf9115d8a 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -269,7 +269,7 @@ class Frame :   // interfaces
         //---------------------------------------------------------------------------------------------------------
         //  XCloseable
         //---------------------------------------------------------------------------------------------------------
-        virtual void SAL_CALL close( sal_Bool bDeliverOwnerShip ) throw( css::util::CloseVetoException,
+        virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException,
                                                                          css::uno::RuntimeException   );
 
         //---------------------------------------------------------------------------------------------------------
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 6bb2b8e4659a..ac99882cc565 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -64,7 +64,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un
     @param  xResource
             the object, which should be closed here.
 
-    @param  bDelegateOwnerShip
+    @param  bDelegateOwnership
             used at the XCloseable->close() method to define
             the right owner in case closing failed.
 
@@ -72,7 +72,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un
             sal_True if closing failed.
  */
 inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource         ,
-                       sal_Bool                                     bDelegateOwnerShip)
+                       sal_Bool                                     bDelegateOwnership)
 {
     css::uno::Reference< css::util::XCloseable > xClose  (xResource, css::uno::UNO_QUERY);
     css::uno::Reference< css::lang::XComponent > xDispose(xResource, css::uno::UNO_QUERY);
@@ -80,7 +80,7 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso
     try
     {
         if (xClose.is())
-            xClose->close(bDelegateOwnerShip);
+            xClose->close(bDelegateOwnership);
         else
         if (xDispose.is())
             xDispose->dispose();
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 1b071b65cba7..385b2bffe8cf 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -781,7 +781,7 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr
     @param  aEvent
                 describes the broadcaster and must be the frame instance
 
-    @param  bGetsOwnerShip
+    @param  bGetsOwnership
                 If it's set to <sal_True> and we throw the right veto excepion, we have to close this frame later
                 if our internal processes will be finished. If it's set to <FALSE/> we can ignore it.
 
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 8750e40d290e..e33e93d5af46 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1546,11 +1546,11 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
     @descr      This method ask internal component (controller) if he accept this close request.
                 In case of <TRUE/> nothing will be happen (from point of caller of this close method).
                 In case of <FALSE/> a CloseVetoException is thrown. After such exception given parameter
-                <var>bDeliverOwnerShip</var> regulate which will be the new owner of this instance.
+                <var>bDeliverOwnership</var> regulate which will be the new owner of this instance.
 
     @attention  It's the replacement for XTask::close() which is marked as obsolete method.
 
-    @param      bDeliverOwnerShip
+    @param      bDeliverOwnership
                     If parameter is set to <FALSE/> the original caller will be the owner after thrown
                     veto exception and must try to close this frame at later time again. Otherwhise the
                     source of throwed exception is the right one. May it will be the frame himself.
@@ -1560,7 +1560,7 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
 
     @threadsafe yes
 *//*-*****************************************************************************************************/
-void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::CloseVetoException,
+void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException,
                                                                 css::uno::RuntimeException   )
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1583,7 +1583,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::Close
         {
             try
             {
-                ((css::util::XCloseListener*)pIterator.next())->queryClosing( aSource, bDeliverOwnerShip );
+                ((css::util::XCloseListener*)pIterator.next())->queryClosing( aSource, bDeliverOwnership );
             }
             catch( const css::uno::RuntimeException& )
             {
@@ -1596,7 +1596,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::Close
     // check if this frame is used for any load process currently
     if (isActionLocked())
     {
-        if (bDeliverOwnerShip)
+        if (bDeliverOwnership)
         {
             /* SAFE */
             WriteGuard aWriteLock( m_aLock );