summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-09-18 15:39:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-09-18 21:16:45 +0200
commitbdd797267b1e9e664b64e1c1525d1dde520a7063 (patch)
treef4e7cfe91bb50c9330c7c447392e53164cdcb40e
parentd5e8904920d4189819836f7abc002898322bb061 (diff)
make fuzzer work
Change-Id: I798558260f5f975f92b702ecf6f4504738ffbbfb Reviewed-on: https://gerrit.libreoffice.org/42422 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--include/sfx2/objsh.hxx1
-rw-r--r--sfx2/source/doc/objmisc.cxx5
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.cxx4
4 files changed, 10 insertions, 4 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index bc33bb1dd33d..b514989055bc 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -460,6 +460,7 @@ public:
virtual void SetFormatSpecificCompatibilityOptions( const OUString& /*rFilterTypeName*/ ) { /* Do not do anything here; Derived classes must overload to do actual work */ };
void TemplateDisconnectionAfterLoad();
+ void SetLoading(SfxLoadedFlags nFlags);
bool IsLoading() const;
bool IsLoadingFinished() const;
void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, bool bReload );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 6b7f5a89cc09..d0cce800325e 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1002,6 +1002,11 @@ void SfxObjectShell::SetAutoLoad(
}
}
+void SfxObjectShell::SetLoading(SfxLoadedFlags nFlags)
+{
+ pImpl->nLoadedFlags = nFlags;
+}
+
bool SfxObjectShell::IsLoadingFinished() const
{
return ( pImpl->nLoadedFlags == SfxLoadedFlags::ALL );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 88d7e866d335..2e48c03e90f4 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2248,7 +2248,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBas
Reference< script::XStorageBasedLibraryContainer > xBasicLibraries;
if ( m_pData->m_pObjectShell.is() )
- xBasicLibraries.set( m_pData->m_pObjectShell->GetBasicContainer(), UNO_QUERY_THROW );
+ xBasicLibraries.set(m_pData->m_pObjectShell->GetBasicContainer(), UNO_QUERY);
return xBasicLibraries;
}
@@ -2258,7 +2258,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDia
Reference< script::XStorageBasedLibraryContainer > xDialogLibraries;
if ( m_pData->m_pObjectShell.is() )
- xDialogLibraries.set( m_pData->m_pObjectShell->GetDialogContainer(), UNO_QUERY_THROW );
+ xDialogLibraries.set(m_pData->m_pObjectShell->GetDialogContainer(), UNO_QUERY);
return xDialogLibraries;
}
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 4ea3cebeef1e..fba57d39370a 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1588,9 +1588,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODT(SvStream &rStream)
//by the xml filter and during the init, while its considered uninitialized,
//setting a property will inform the document its modified, which attempts
//to update the properties, which throws cause the properties are uninitialized
-// xDocSh->SetLoading(SfxLoadedFlags::NONE);
+ xDocSh->SetLoading(SfxLoadedFlags::NONE);
bool ret = xFilter->filter(aArgs);
-// xDocSh->SetLoading(SfxLoadedFlags::ALL);
+ xDocSh->SetLoading(SfxLoadedFlags::ALL);
return ret;
}