diff options
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/prj/build.lst | 2 | ||||
| -rw-r--r-- | unotools/source/config/viewoptions.cxx | 2 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/tempfile.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/unotools/prj/build.lst b/unotools/prj/build.lst index 70402fb3dbd5..d6f10335c254 100644 --- a/unotools/prj/build.lst +++ b/unotools/prj/build.lst @@ -1,4 +1,4 @@ -ut unotools : comphelper cppuhelper offuh tools ucbhelper NULL +ut unotools : LIBXSLT:libxslt comphelper cppuhelper offuh tools ucbhelper NULL ut unotools usr1 - all ut_mkout NULL ut unotools\inc nmake - all ut_inc NULL ut unotools\source\misc nmake - all ut_misc ut_config ut_inc NULL diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 7f2250c611fc..f76ce48eebdf 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -781,7 +781,7 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet xNode = ::comphelper::ConfigurationHelper::makeSureSetNodeExists(m_xRoot, m_sListName, sNode); else { - if (m_xSet.is()) + if (m_xSet.is() && m_xSet->hasByName(sNode) ) m_xSet->getByName(sNode) >>= xNode; } } diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 87fddc0c65cd..26742151ee3d 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -237,7 +237,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru /* RW permission for the user only! */ mode_t old_mode = umask(077); #endif - FileBase::RC err = aFile.open(osl_File_OpenFlag_Create); + FileBase::RC err = aFile.open( osl_File_OpenFlag_Create | osl_File_OpenFlag_NoLock ); #ifdef UNX umask(old_mode); #endif |