bin/find-can-be-private-symbols.functions.results | 2 +- include/sfx2/objsh.hxx | 2 +- sfx2/source/doc/objstor.cxx | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 5cd672ee291f47ff0f5ea9cba828639a41ae40a7 Author: Andrea Gelmini <andrea.gelm...@gelma.net> AuthorDate: Tue Feb 1 15:19:55 2022 +0100 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Thu Feb 10 07:22:21 2022 +0100 Fixed function name It passed "make check" Change-Id: I0828ea2c2531cb970f32581333776f02a46a8d5e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129314 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index be8116b9ff90..2039061f1477 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -7185,7 +7185,7 @@ SfxObjectShell::SetNoName() SfxObjectShell::SetReadOnly() SfxObjectShell::SetSecurityOptOpenReadOnly(bool) SfxObjectShell::SignDocumentContent(weld::Window*) -SfxObjectShell::SwitchChildrenPersistance(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, bool) +SfxObjectShell::SwitchChildrenPersistence(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, bool) SfxObjectShell::SwitchPersistence(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&) SfxObjectShell::TemplateDisconnectionAfterLoad() SfxObjectShell::UnTrustedScript(rtl::OUString const&) diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 7440674d6656..c44a56b858da 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -329,7 +329,7 @@ public: void SaveChildren(bool bObjectsOnly=false); bool SaveAsChildren( SfxMedium &rMedium ); - bool SwitchChildrenPersistance( + bool SwitchChildrenPersistence( const css::uno::Reference< css::embed::XStorage >& xStorage, bool bForceNonModified = false ); bool SaveCompletedChildren(); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index c5ad72f500ae..4c3dcf140b94 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3304,7 +3304,7 @@ bool SfxObjectShell::SaveCompletedChildren() return bResult; } -bool SfxObjectShell::SwitchChildrenPersistance( const uno::Reference< embed::XStorage >& xStorage, +bool SfxObjectShell::SwitchChildrenPersistence( const uno::Reference< embed::XStorage >& xStorage, bool bForceNonModified ) { if ( !xStorage.is() ) @@ -3339,7 +3339,7 @@ bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >& xSt if ( pImpl->mxObjectContainer ) GetEmbeddedObjectContainer().SwitchPersistence( xStorage ); - bResult = SwitchChildrenPersistance( xStorage, true ); + bResult = SwitchChildrenPersistence( xStorage, true ); } if ( bResult ) @@ -3363,7 +3363,7 @@ bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >& xSt GetEmbeddedObjectContainer().SwitchPersistence( pImpl->m_xDocStorage ); // let already successfully connected objects be switched back - SwitchChildrenPersistance( pImpl->m_xDocStorage, true ); + SwitchChildrenPersistence( pImpl->m_xDocStorage, true ); } if ( bSendNotification ) @@ -3475,7 +3475,7 @@ bool SfxObjectShell::SwitchPersistence( const uno::Reference< embed::XStorage >& { if ( pImpl->mxObjectContainer ) GetEmbeddedObjectContainer().SwitchPersistence( xStorage ); - bResult = SwitchChildrenPersistance( xStorage ); + bResult = SwitchChildrenPersistence( xStorage ); // TODO/LATER: substorages that have unknown mimetypes probably should be copied to the target storage here OSL_ENSURE( StoragesOfUnknownMediaTypeAreCopied_Impl( pImpl->m_xDocStorage, xStorage ),