This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new e70725cb01 Fixed typo (conteiner -> container) and some other
e70725cb01 is described below
commit e70725cb013e408f1854910efa4b3090a88845e3
Author: mseidel <msei...@apache.org>
AuthorDate: Mon Feb 3 02:12:40 2025 +0100
Fixed typo (conteiner -> container) and some other
(cherry picked from commit 2cdca4f8f4e1bc306b29ac0bbc93007bc8416da5)
---
.../source/container/embeddedobjectcontainer.cxx | 8 ++++----
main/sw/source/core/ole/ndole.cxx | 17 ++++++++---------
main/ucb/source/core/ucbstore.cxx | 15 +++++++--------
3 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/main/comphelper/source/container/embeddedobjectcontainer.cxx
b/main/comphelper/source/container/embeddedobjectcontainer.cxx
index 26e4be902d..1ee9e6f19f 100644
--- a/main/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/main/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_comphelper.hxx"
#include <com/sun/star/container/XChild.hpp>
@@ -530,7 +528,7 @@ sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject(
const uno::Reference < em
xPersist->storeToEntry( pImpl->mxStorage,
rName, aSeq, aSeq );
else
{
- // TODO/LATER: possible optimisation, don't
store immediately
+ // TODO/LATER: possible optimization, don't
store immediately
//xPersist->setPersistentEntry(
pImpl->mxStorage, rName, embed::EntryInitModes::ENTRY_NO_INIT, aSeq, aSeq );
xPersist->storeAsEntry( pImpl->mxStorage,
rName, aSeq, aSeq );
xPersist->saveCompleted( sal_True );
@@ -1482,7 +1480,7 @@ sal_Bool
EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo
{
try
{
- // the substorage still can not be locked by the
embedded object conteiner
+ // the substorage still can not be locked by the
embedded object container
::rtl::OUString aObjReplElement(
RTL_CONSTASCII_USTRINGPARAM( "ObjectReplacements" ) );
if ( _xStorage->hasByName( aObjReplElement ) &&
_xStorage->isStorageElement( aObjReplElement ) )
_xStorage->removeElement( aObjReplElement );
@@ -1706,3 +1704,5 @@ void
EmbeddedObjectContainer::setUserAllowsLinkUpdate(bool bNew)
}
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/core/ole/ndole.cxx
b/main/sw/source/core/ole/ndole.cxx
index eb909b7538..b08404b9aa 100644
--- a/main/sw/source/core/ole/ndole.cxx
+++ b/main/sw/source/core/ole/ndole.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
@@ -359,7 +357,7 @@ sal_Bool SwOLENode::SavePersistentData()
xChild->setParent( 0 );
// pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False );
- /* #i119941: When cut or move the chart, SwUndoFlyBase::DelFly will
call SaveSection to store the comtent to strorage.
+ /* #i119941: When cut or move the chart, SwUndoFlyBase::DelFly will
call SaveSection to store the content to storage.
In this step, chart filter functions will be called. And chart
filter will call chart core functions to create the chart again.
Then chart core function will call the class
ExplicitCategoryProvider to create data source.
In this step, when SW data source provider create the data source,
it will create a new SwFlyFrm.
@@ -384,7 +382,7 @@ sal_Bool SwOLENode::SavePersistentData()
// TODO/LATER: aOLEObj.aName has no meaning here, since
the undo container contains the object
- // by different name, in future it might makes sence
that the name is transported here.
+ // by different name, in future it might makes sense
that the name is transported here.
aOLEObj.xOLERef.AssignToContainer( 0, aOLEObj.aName );
try
{
@@ -737,7 +735,7 @@ SwOLEObj::~SwOLEObj()
// successful closing of the object will automatically
clear the reference then
xOLERef.Lock(sal_False);
- // Always remove object from conteiner it is connected
to
+ // Always remove object from container it is connected
to
try
{
pCnt->RemoveEmbeddedObject( aName );
@@ -1042,3 +1040,4 @@ void SwOLELRUCache::RemoveObj( SwOLEObj& rObj )
DELETEZ( pOLELRU_Cache );
}
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/ucb/source/core/ucbstore.cxx
b/main/ucb/source/core/ucbstore.cxx
index b4bc1996d1..221ecf985b 100644
--- a/main/ucb/source/core/ucbstore.cxx
+++ b/main/ucb/source/core/ucbstore.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_ucb.hxx"
@@ -440,7 +438,7 @@ PropertySetRegistry::openPropertySet( const OUString& key,
sal_Bool create )
OSL_ENSURE( xContainer.is(),
"PropertySetRegistry::openPropertySet - "
- "No conteiner!"
);
+ "No container!"
);
if ( xFac.is() && xBatch.is() &&
xContainer.is() )
{
@@ -552,7 +550,7 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const
OUString& key )
OSL_ENSURE( xContainer.is(),
"PropertySetRegistry::removePropertySet
- "
- "No conteiner!" );
+ "No container!" );
if ( xBatch.is() && xContainer.is() )
{
@@ -2764,3 +2762,4 @@ sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName(
return sal_False;
}
+/* vim: set noet sw=4 ts=4: */
