summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2016-06-28 12:37:11 +1000
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-06-28 07:04:35 +0000
commitd37e39081328e94b7106c8f3ca1dbc629ecb9a80 (patch)
tree20a8756356162543582340171a5ebf2f8edb84d4 /sfx2
parent9c4d92c93976a390a98b61c34b24ba78d5640772 (diff)
tdf#99729 related: make SfxObjectShell::IsOwnStorageFormat acccessible
This patch removes SAL_DLLPRIVATE attribute and renames SfxObjectShell::IsOwnStorageFormat_impl() to SfxObjectShell::IsOwnStorageFormat() to allow unsing in derived classes in other modules. Change-Id: I24650ad4624adc117d08b0e747c05ff050b4046d Reviewed-on: https://gerrit.libreoffice.org/26732 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/objcont.cxx2
-rw-r--r--sfx2/source/doc/objserv.cxx6
-rw-r--r--sfx2/source/doc/objstor.cxx10
3 files changed, 9 insertions, 9 deletions
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