summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-26 10:51:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-26 11:05:29 +0100
commita523b7c434f252a90f6cf9563a24ea230c9fcc20 (patch)
tree0ae05f4c7860575bef761f7f961b3b2f0dc37476 /sfx2
parente3771338eee211dbac7cad961a4a81342f2a56c9 (diff)
add ppt to fftester
Change-Id: I49162355ce5a58c6aaadfcfb9f45471e5c2a1424
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/docfile.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 284c581f362b..c19f7d28a6e6 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -65,6 +65,7 @@
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
#include <tools/urlobj.hxx>
+#include <unotools/configmgr.hxx>
#include <unotools/tempfile.hxx>
#include <comphelper/fileurl.hxx>
#include <comphelper/processfactory.hxx>
@@ -450,7 +451,7 @@ OUString SfxMedium::GetBaseURL( bool bForSaving )
const SfxStringItem* pBaseURLItem = static_cast<const SfxStringItem*>( GetItemSet()->GetItem(SID_DOC_BASEURL) );
if ( pBaseURLItem )
aBaseURL = pBaseURLItem->GetValue();
- else if ( GetContent().is() )
+ else if (!utl::ConfigManager::IsAvoidConfig() && GetContent().is())
{
try
{