summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/source/container/embeddedobjectcontainer.cxx10
-rw-r--r--embeddedobj/source/inc/commonembobj.hxx2
-rw-r--r--embeddedobj/test/Container1/EmbedContApp.java4
-rw-r--r--odk/examples/java/EmbedDocument/Container1/EmbedContApp.java2
-rw-r--r--sfx2/source/doc/objstor.cxx4
-rw-r--r--sfx2/source/view/ipclient.cxx2
-rw-r--r--svtools/source/misc/embedtransfer.cxx2
-rw-r--r--sw/source/core/ole/ndole.cxx2
-rw-r--r--xmloff/source/draw/shapeexport.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx2
10 files changed, 16 insertions, 16 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 546d51b2ba5b..8c93fadbbbd4 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -438,7 +438,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re
uno::Reference < container::XNameAccess > xAccess( pImpl->mxStorage, uno::UNO_QUERY );
uno::Reference < embed::XEmbedPersist > xEmb( xObj, uno::UNO_QUERY );
uno::Reference < embed::XLinkageSupport > xLink( xEmb, uno::UNO_QUERY );
- // if the object has a persistance and the object is not a link than it must have persistence entry in the storage
+ // if the object has a persistence and the object is not a link than it must have persistence entry in the storage
OSL_ENSURE( !( xEmb.is() && ( !xLink.is() || !xLink->isLink() ) ) || xAccess->hasByName(rName),
"Added element not in storage!" );
#endif
@@ -721,7 +721,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
if ( rName.isEmpty() )
rName = CreateUniqueObjectName();
- // objects without persistance are not really stored by the method
+ // objects without persistence are not really stored by the method
if ( xObj.is() && StoreEmbeddedObject( xObj, rName, true ) )
{
xResult = Get_Impl( rName, xObj);
@@ -830,7 +830,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
}
}
- SAL_WARN_IF( !xResult.is(), "comphelper.container", "Can not copy embedded object that has no persistance!\n" );
+ SAL_WARN_IF( !xResult.is(), "comphelper.container", "Can not copy embedded object that has no persistence!\n" );
if ( xResult.is() )
{
@@ -999,7 +999,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed
uno::Reference < embed::XLinkageSupport > xLink( xPersist, uno::UNO_QUERY );
sal_Bool bIsNotEmbedded = !xPersist.is() || ( xLink.is() && xLink->isLink() );
- // if the object has a persistance and the object is not a link than it must have persistence entry in the storage
+ // if the object has a persistence and the object is not a link than it must have persistence entry in the storage
OSL_ENSURE( bIsNotEmbedded || xAccess->hasByName(aName), "Removing element not present in storage!" );
#endif
@@ -1113,7 +1113,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed
try
{
#if OSL_DEBUG_LEVEL > 1
- // if the object has a persistance and the object is not a link than it must have persistence entry in storage
+ // if the object has a persistence and the object is not a link than it must have persistence entry in storage
OSL_ENSURE( bIsNotEmbedded || pImpl->mxStorage->hasByName( aName ), "The object has no persistence entry in the storage!" );
#endif
if ( xPersist.is() && pImpl->mxStorage->hasByName( aName ) )
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index 77bba8a0f8ca..542a1602162b 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -231,7 +231,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps );
- // no persistance for linked objects, so the descriptors are provided in constructor
+ // no persistence for linked objects, so the descriptors are provided in constructor
OCommonEmbeddedObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps,
diff --git a/embeddedobj/test/Container1/EmbedContApp.java b/embeddedobj/test/Container1/EmbedContApp.java
index 4481a980dcd0..f9bbd9563b6e 100644
--- a/embeddedobj/test/Container1/EmbedContApp.java
+++ b/embeddedobj/test/Container1/EmbedContApp.java
@@ -560,7 +560,7 @@ public class EmbedContApp extends Applet
{
if ( m_xStorage != null && m_xEmbedObj != null )
{
- // if has persistance store there
+ // if has persistence store there
// if not it is and error, SaveAs had to be used
if ( m_bOwnFile )
@@ -1042,7 +1042,7 @@ public class EmbedContApp extends Applet
public void actionPerformed( ActionEvent e )
{
- // if has persistance store there
+ // if has persistence store there
// if not open SaveAs dialog and store
if ( m_xStorage != null && m_xEmbedObj != null )
{
diff --git a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
index a56a2ade020b..5c01baf71aa7 100644
--- a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
+++ b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
@@ -379,7 +379,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
public void actionPerformed( ActionEvent e )
{
- // if has persistance store there
+ // if has persistence store there
// if not open SaveAs dialog and store
if ( m_xStorage != null && m_xEmbedObj != null )
{
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 520d168e0845..9aedbfd4ce2a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1239,9 +1239,9 @@ bool SfxObjectShell::SaveTo_Impl
// The active storage must be switched. The simple saving is not enough.
// The problem is that the target medium contains target MediaDescriptor.
- // In future the switch of the persistance could be done on stream level:
+ // In future the switch of the persistence could be done on stream level:
// a new wrapper service will be implemented that allows to exchange
- // persistance on the fly. So the real persistance will be set
+ // persistence on the fly. So the real persistence will be set
// to that stream only after successful commit of the storage.
// TODO/LATER:
// create wrapper stream based on the URL
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 38c9ad3e9057..7fe0c98adb01 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -224,7 +224,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
// and the user didn't request saving the changes
return;
- // the common persistance is supported by objects and links
+ // the common persistence is supported by objects and links
uno::Reference< embed::XCommonEmbedPersist > xPersist( m_xObject, uno::UNO_QUERY );
if ( !xPersist.is() )
throw uno::RuntimeException();
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 36a00b3a22cf..a87191c12e45 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -140,7 +140,7 @@ bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::DataF
}
else
{
- //TODO/LATER: how to handle objects without persistance?!
+ //TODO/LATER: how to handle objects without persistence?!
}
}
catch ( uno::Exception& )
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 636b6f8eb08c..789929a7fe63 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -873,7 +873,7 @@ sal_Bool SwOLEObj::UnloadObject( uno::Reference< embed::XEmbeddedObject > xObj,
if ( xPers.is() )
xPers->storeOwn();
else {
- OSL_FAIL("Modified object without persistance in cache!");
+ OSL_FAIL("Modified object without persistence in cache!");
}
}
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index f2f7c1bfe3d3..9bd4258ae326 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2751,7 +2751,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
if ( bInternal )
{
- // OOo internal links have no storage persistance, URL is stored in the XML file
+ // OOo internal links have no storage persistence, URL is stored in the XML file
// the result LinkURL is empty in case the object is not a link
xPropSet->getPropertyValue("LinkURL") >>= sURL;
}
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 9387f3c7e764..9c8d504a2a02 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -509,7 +509,7 @@ void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ )
}
else
{
- // it should be an own OOo link that has no storage persistance
+ // it should be an own OOo link that has no storage persistence
xPropSet = GetImport().GetTextImport()
->createAndInsertOOoLink( GetImport(),
sURL,
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-13 22:06:11 +0000