[Libreoffice-commits] core.git: chart2/source dbaccess/source desktop/test filter/source framework/source odk/examples sw/source
Tor Lillqvist
tml at collabora.com
Fri Jan 23 06:24:27 PST 2015
chart2/source/view/charttypes/NetChart.hxx | 2 +-
dbaccess/source/ui/app/AppControllerDnD.cxx | 2 +-
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 2 +-
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 2 +-
desktop/test/deployment/options/readme.txt | 2 +-
filter/source/config/cache/typedetection.hxx | 4 ++--
framework/source/dispatch/closedispatcher.cxx | 2 +-
framework/source/inc/loadenv/loadenvexception.hxx | 2 +-
framework/source/services/frame.cxx | 2 +-
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java | 2 +-
sw/source/core/docnode/ndtbl.cxx | 2 +-
sw/source/uibase/uno/unomailmerge.cxx | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit d2ac4c3e68cf21c3ac9ba4f1dc55761298a12696
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Jan 23 16:23:26 2015 +0200
'Ownership' is one word, as is 'relationship'
Change-Id: I45c441f68ed5f20cfc87e34e7bfb529a30952f81
diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx
index fd11c6d..f44b5aa 100644
--- a/chart2/source/view/charttypes/NetChart.hxx
+++ b/chart2/source/view/charttypes/NetChart.hxx
@@ -33,7 +33,7 @@ public:
::com::sun::star::chart2::XChartType >& xChartTypeModel
, sal_Int32 nDimensionCount
, bool bNoArea
- , PlottingPositionHelper* pPlottingPositionHelper //takes owner ship
+ , PlottingPositionHelper* pPlottingPositionHelper //takes ownership
);
virtual ~NetChart();
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index b32f45b..6e0dd75 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -564,7 +564,7 @@ TransferableHelper* OApplicationController::copyObject()
break;
}
- // the owner ship goes to ODataClipboards
+ // the ownership goes to ODataClipboards
return pData;
}
catch(const SQLException&)
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 0403fba..b89d337 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -78,7 +78,7 @@ namespace dbaui
else
pData = new ODataClipboard(aDSName, _nCommandType, aName, getNumberFormatter(), getORB());
- // the owner ship goes to ODataClipboards
+ // the ownership goes to ODataClipboards
return pData;
}
catch(const SQLException& )
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 26e8323..7372ec7 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -68,7 +68,7 @@ namespace dbaui
Reference< ::com::sun::star::util::XCloseable > xCloseable(m_xBeamer,UNO_QUERY);
m_xBeamer = NULL;
if(xCloseable.is())
- xCloseable->close(sal_False); // false - holds the owner ship of this frame
+ xCloseable->close(sal_False); // false - holds the ownership of this frame
}
boost::scoped_ptr<vcl::Window> aTemp(m_pSplitter);
diff --git a/desktop/test/deployment/options/readme.txt b/desktop/test/deployment/options/readme.txt
index da339ad..58274ec 100644
--- a/desktop/test/deployment/options/readme.txt
+++ b/desktop/test/deployment/options/readme.txt
@@ -134,7 +134,7 @@ modules1.oxt: Defines two Modules and three Nodes. The Nodes may not
be displayed in OOo's options dialog because there is currently no application
which uses this Module. However the Nodes are displayed in the options dialog
of the Extension Manager.
-There are three Nodes defined. The relation ship is this:
+There are three Nodes defined. The relationship is this:
-module1
-node 1
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index 6c91529..1694e0c 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -226,7 +226,7 @@ private:
- /** @short validate the specified type and its relation ships
+ /** @short validate the specified type and its relationships
and set all needed information related to this type
in the specified descriptor.
@@ -249,7 +249,7 @@ private:
- /** @short validate the specified filter and its relation ships
+ /** @short validate the specified filter and its relationships
and set all needed information related to this filter
in the specified descriptor.
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index fd32da6..90540f2 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -485,7 +485,7 @@ bool CloseDispatcher::implts_closeFrame()
if ( ! xFrame.is() )
return true;
- // dont deliver owner ship; our "UI user" will try it again if it failed.
+ // dont deliver ownership; our "UI user" will try it again if it failed.
// OK - he will get an empty frame then. But normally an empty frame
// should be closeable always :-)
if (!fpf::closeIt(xFrame, false))
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index e67a91f..c5e6d31 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -50,7 +50,7 @@ class LoadEnvException
ID_NO_CONFIG_ACCESS,
/** @short Some data obtained from the filter configuration seems to incorrect.
- @descr Might a filter-type relation ship seem to be damaged. */
+ @descr Might a filter-type relationship seem to be damaged. */
ID_INVALID_FILTER_CONFIG,
/** @short indicates a corrupted media descriptor.
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 7e50b81..b5b69ea 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -3094,7 +3094,7 @@ void Frame::implts_checkSuicide()
m_bSelfClose = false;
aReadLock.clear();
/* } SAFE */
- // force close and deliver owner ship to source of possible throwed veto exception
+ // force close and deliver ownership to source of possible throwed veto exception
// Attention: Because this method is not designed to throw such exception we must suppress
// it for outside code!
try
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 576fb50..9d9116c 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -765,7 +765,7 @@ public class FunctionHelper
com.sun.star.util.XCloseable.class, xFrame);
if (xCloseable!=null)
{
- // We deliver the owner ship of this frame not to the (possible)
+ // We deliver the ownership of this frame not to the (possible)
// source which throw a CloseVetoException. We whishto have it
// under our own control.
try
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 9636edf..dd83a47 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1331,7 +1331,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
SwNodeIndex aInsertIndex( rTableNodes.rbegin()->rbegin()->aEnd );
++aInsertIndex;
- //!! owner ship will be transferred in c-tor to SwNodes array.
+ //!! ownership will be transferred in c-tor to SwNodes array.
//!! Thus no real problem here...
new SwEndNode( aInsertIndex, *pTblNd );
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 5d96097..30adba6 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -402,7 +402,7 @@ SwXMailMerge::~SwXMailMerge()
//! because there is no automatism that will do that later.
//! #120086#
if ( eVetoed == CloseModelAndDocSh( xModel, xDocSh ) )
- OSL_FAIL("owner ship transferred to vetoing object!" );
+ OSL_FAIL("ownership transferred to vetoing object!" );
xModel = 0;
xDocSh = 0; // destroy doc shell
More information about the Libreoffice-commits
mailing list