mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typo: persistance -> persistence

Browse Source
This commit is contained in:
Thomas Arnhold 2014-03-29 18:15:35 +01:00
parent 7d3b9d3333
commit ee1de94276
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comphelper/source/container/embeddedobjectcontainer.cxx
View File

@ -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 ) )

2
embeddedobj/source/inc/commonembobj.hxx
View File

@ -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,

4
embeddedobj/test/Container1/EmbedContApp.java
View File

@ -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 )
{

2
odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
View File

@ -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 )
{

4
sfx2/source/doc/objstor.cxx
View File

@ -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

2
sfx2/source/view/ipclient.cxx
View File

@ -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();

2
svtools/source/misc/embedtransfer.cxx
View File

@ -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& )

2
sw/source/core/ole/ndole.cxx
View File

@ -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!");
}
}

2
xmloff/source/draw/shapeexport.cxx
View File

@ -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;
}

2
xmloff/source/text/XMLTextFrameContext.cxx
View File

@ -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,