[Libreoffice-commits] core.git: sw/source unotools/source

Michael Stahl mstahl at redhat.com
Tue Apr 8 12:56:28 PDT 2014


 sw/source/ui/index/cnttab.cxx          |    1 -
 unotools/source/config/pathoptions.cxx |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d2a73cf32375608a93175a221c769d667140d073
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 8 21:23:29 2014 +0200

    SwMultiTOXTabDialog: fortunately the bogus SetTemplatePath call
    
    ... fails with exception and does not modify the configuration.
    
    (regression from 1b0f7ee1e04d7b0fe81f7458ae2116615e0f6889)
    
    Change-Id: I0e12cf0b531bc68147cf2be22c28c75c0f05f3ff

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index a296eeb..8737774 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -476,7 +476,6 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
             OUString sTemplate("internal/idxexample.odt");
 
             SvtPathOptions aOpt;
-            aOpt.SetTemplatePath(OUString(LIBO_SHARE_FOLDER "/template/common"));
             bool bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
 
             if(!bExist)
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 63a3fbc..1900531 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -287,8 +287,9 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const OUString&
         {
             m_xPathSettings->setFastPropertyValue( m_aMapEnumToPropHandle[ (sal_Int32)ePath], a );
         }
-        catch (const Exception&)
+        catch (const Exception& e)
         {
+            SAL_WARN("unotools.config", "SetPath: exception: " << e.Message);
         }
     }
 }


More information about the Libreoffice-commits mailing list