diff options
| -rw-r--r-- | include/sfx2/objsh.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index c1b879ac261e..1047542f468d 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -626,7 +626,7 @@ public: SAL_DLLPRIVATE std::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( bool bFullContent ) const; - SAL_DLLPRIVATE bool IsOwnStorageFormat_Impl(const SfxMedium &) const; + bool IsOwnStorageFormat(const SfxMedium &) const; SAL_DLLPRIVATE bool IsPackageStorageFormat_Impl(const SfxMedium &) const; diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 5192e9e8c3be..ea1ea377a365 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -514,7 +514,7 @@ bool SfxObjectShell::IsHelpDocument() const void SfxObjectShell::ResetFromTemplate( const OUString& rTemplateName, const OUString& rFileName ) { // only care about reseting this data for openoffice formats otherwise - if ( IsOwnStorageFormat_Impl( *GetMedium()) ) + if ( IsOwnStorageFormat( *GetMedium()) ) { uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties()); xDocProps->setTemplateURL( OUString() ); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 836b6ffe046c..a58785ead036 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -426,7 +426,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) return; } - if ( !IsOwnStorageFormat_Impl( *GetMedium() ) ) + if ( !IsOwnStorageFormat( *GetMedium() ) ) return; ScopedVclPtrInstance< SfxVersionDialog > pDlg( pFrame, IsSaveVersionOnClose() ); @@ -993,7 +993,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) } if ( !pFrame || !pDoc->HasName() || - !IsOwnStorageFormat_Impl( *pDoc->GetMedium() ) ) + !IsOwnStorageFormat( *pDoc->GetMedium() ) ) rSet.DisableItem( nWhich ); break; } @@ -1291,7 +1291,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::ImplAnal uno::Reference< security::XDocumentDigitalSignatures > xLocSigner = xSigner; bool bSupportsSigning = GetMedium() && GetMedium()->GetFilter() && GetMedium()->GetFilter()->GetSupportsSigning(); - if (GetMedium() && !GetMedium()->GetName().isEmpty() && (IsOwnStorageFormat_Impl(*GetMedium()) || bSupportsSigning) && GetMedium()->GetStorage().is()) + if (GetMedium() && !GetMedium()->GetName().isEmpty() && (IsOwnStorageFormat(*GetMedium()) || bSupportsSigning) && GetMedium()->GetStorage().is()) { try { diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index f19d863fb615..894900e45637 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -659,7 +659,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) pImpl->bModelInitialized = false; //TODO/LATER: make a clear strategy how to handle "UsesStorage" etc. - bool bOwnStorageFormat = IsOwnStorageFormat_Impl( *pMedium ); + bool bOwnStorageFormat = IsOwnStorageFormat( *pMedium ); bool bHasStorage = IsPackageStorageFormat_Impl( *pMedium ); if ( pMedium->GetFilter() ) { @@ -835,7 +835,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) ) FinishedLoading( SfxLoadedFlags::MAINDOCUMENT ); - if( IsOwnStorageFormat_Impl(*pMed) && pMed->GetFilter() ) + if( IsOwnStorageFormat(*pMed) && pMed->GetFilter() ) { } Broadcast( SfxSimpleHint(SFX_HINT_NAMECHANGED) ); @@ -972,7 +972,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo } -bool SfxObjectShell::IsOwnStorageFormat_Impl(const SfxMedium &rMedium) const +bool SfxObjectShell::IsOwnStorageFormat(const SfxMedium &rMedium) const { return !rMedium.GetFilter() || // Embedded ( rMedium.GetFilter()->IsOwnFormat() && @@ -1119,8 +1119,8 @@ bool SfxObjectShell::SaveTo_Impl bool bStorageBasedSource = IsPackageStorageFormat_Impl( *pMedium ); bool bStorageBasedTarget = IsPackageStorageFormat_Impl( rMedium ); - bool bOwnSource = IsOwnStorageFormat_Impl( *pMedium ); - bool bOwnTarget = IsOwnStorageFormat_Impl( rMedium ); + bool bOwnSource = IsOwnStorageFormat( *pMedium ); + bool bOwnTarget = IsOwnStorageFormat( rMedium ); // Examine target format to determine whether to query if any password // protected libraries exceed the size we can handler |