[Libreoffice-commits] core.git: sd/source

Caolán McNamara caolanm at redhat.com
Fri Mar 3 20:45:46 UTC 2017


 sd/source/filter/ppt/pptin.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 944e95328f7148e9ed45a8c346c4051fa567bd61
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 3 20:43:57 2017 +0000

    avoid config for ppt loader testing
    
    Change-Id: I6508ea7da815290f3bd15ac1d012ebb745090b11

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 0fdf57c..c67ed93 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1947,7 +1947,11 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
                         DffRecordHeader aSoundDataRecHd;
                         if ( SeekToRec( rStCtrl, PPT_PST_SoundData, nStrLen, &aSoundDataRecHd ) )
                         {
-                            OUString aGalleryDir( SvtPathOptions().GetGalleryPath() );
+                            OUString aGalleryDir;
+                            if (utl::ConfigManager::IsAvoidConfig())
+                                osl_getTempDirURL(&aGalleryDir.pData);
+                            else
+                                aGalleryDir = SvtPathOptions().GetGalleryPath();
                             sal_Int32 nTokenCount = comphelper::string::getTokenCount(aGalleryDir, ';');
                             INetURLObject aGalleryUserSound( aGalleryDir.getToken( nTokenCount - 1, ';' ) );
 


More information about the Libreoffice-commits mailing list