From 35f7711566bfa7016ce5f838fe9b3c8e84cd7472 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 17 Sep 2010 13:58:19 +0200 Subject: mib19: #163566# do not throw assertion if node is not available --- unotools/source/config/viewoptions.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unotools') 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; } } -- cgit v1.2.3 From 955e88c80e9abce3f15aa55d434dae6ae17d7d43 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 22 Oct 2010 10:37:46 +0200 Subject: sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt --- canvas/prj/build.lst | 2 +- comphelper/prj/build.lst | 2 +- dtrans/prj/build.lst | 2 +- i18npool/prj/build.lst | 2 +- sax/prj/build.lst | 2 +- sot/prj/build.lst | 2 +- svl/prj/build.lst | 2 +- svtools/prj/build.lst | 2 +- toolkit/prj/build.lst | 2 +- unotools/prj/build.lst | 2 +- vcl/prj/build.lst | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'unotools') diff --git a/canvas/prj/build.lst b/canvas/prj/build.lst index cacbdb5bb894..2adfe155e0b1 100644 --- a/canvas/prj/build.lst +++ b/canvas/prj/build.lst @@ -1,4 +1,4 @@ -cv canvas : javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo NULL +cv canvas : javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo LIBXSLT:libxslt NULL cv canvas usr1 - all cv_mkout NULL cv canvas\inc nmake - all cv_inc NULL cv canvas\source\tools nmake - all cv_tools cv_inc NULL diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst index 793d8bf30e09..91e836cabd68 100644 --- a/comphelper/prj/build.lst +++ b/comphelper/prj/build.lst @@ -1,4 +1,4 @@ -ph comphelper : cppuhelper ucbhelper offuh vos salhelper NULL +ph comphelper : cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL ph comphelper usr1 - all ph_mkout NULL ph comphelper\inc nmake - all ph_inc NULL ph comphelper\source\container nmake - all ph_container ph_inc NULL diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst index bd9c73582361..e30eccd59d7e 100644 --- a/dtrans/prj/build.lst +++ b/dtrans/prj/build.lst @@ -1,4 +1,4 @@ -dr dtrans : unotools offapi offuh rdbmaker vos stoc NULL +dr dtrans : unotools offapi offuh rdbmaker vos stoc LIBXSLT:libxslt NULL dr dtrans usr1 - all dr_mkout NULL dr dtrans\inc nmake - all dr_inc NULL dr dtrans\source\cnttype nmake - all dr_cnttype dr_generic dr_inc NULL diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst index 24e9607596ac..22609becbe86 100644 --- a/i18npool/prj/build.lst +++ b/i18npool/prj/build.lst @@ -1,4 +1,4 @@ -inp i18npool : bridges sax stoc comphelper ICU:icu i18nutil regexp NULL +inp i18npool : bridges sax stoc comphelper ICU:icu i18nutil regexp LIBXSLT:libxslt NULL inp i18npool usr1 - all inp_mkout NULL inp i18npool\inc nmake - all inp_inc NULL inp i18npool\source\registerservices nmake - all inp_rserv inp_inc NULL diff --git a/sax/prj/build.lst b/sax/prj/build.lst index 653d77ce9e25..849700087ae7 100644 --- a/sax/prj/build.lst +++ b/sax/prj/build.lst @@ -1,4 +1,4 @@ -ax sax : offapi cppuhelper EXPAT:expat comphelper NULL +ax sax : offapi cppuhelper EXPAT:expat comphelper LIBXSLT:libxslt NULL ax sax usr1 - all ax_mkout NULL ax sax\source\expatwrap nmake - all ax_expatwrap NULL ax sax\source\tools nmake - all ax_tools NULL diff --git a/sot/prj/build.lst b/sot/prj/build.lst index a5ebff311e9c..9d6e785898a5 100644 --- a/sot/prj/build.lst +++ b/sot/prj/build.lst @@ -1,4 +1,4 @@ -to sot : tools ucbhelper unotools NULL +to sot : LIBXSLT:libxslt tools ucbhelper unotools NULL to sot usr1 - all sot_mkout NULL to sot\inc nmake - all sot_inc NULL to sot\prj get - all sot_prj NULL diff --git a/svl/prj/build.lst b/svl/prj/build.lst index d5897d9e9883..6761837fa8f3 100644 --- a/svl/prj/build.lst +++ b/svl/prj/build.lst @@ -1,4 +1,4 @@ -sl svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL +sl svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL sl svl usr1 - all svl_mkout NULL sl svl\inc nmake - all svl_inc NULL sl svl\unx\source\svdde nmake - u svl_usdde svl_inc NULL diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst index a7d8569de301..a48983013d73 100644 --- a/svtools/prj/build.lst +++ b/svtools/prj/build.lst @@ -1,4 +1,4 @@ -st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL +st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL st svtools usr1 - all st_mkout NULL st svtools\inc nmake - all st_inc NULL st svtools\bmpmaker nmake - all st_bmp st_inc NULL diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst index f4854de8e0c4..36ece64d544a 100644 --- a/toolkit/prj/build.lst +++ b/toolkit/prj/build.lst @@ -1,4 +1,4 @@ -ti toolkit : vcl NULL +ti toolkit : LIBXSLT:libxslt vcl NULL ti toolkit usr1 - all ti_mkout NULL ti toolkit\prj get - all ti_prj NULL ti toolkit\inc nmake - all ti_inc NULL 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/vcl/prj/build.lst b/vcl/prj/build.lst index 0a6f6a95f605..af15ad73e19d 100644 --- a/vcl/prj/build.lst +++ b/vcl/prj/build.lst @@ -1,4 +1,4 @@ -vc vcl : l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl NULL +vc vcl : l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl LIBXSLT:libxslt NULL vc vcl usr1 - all vc_mkout NULL vc vcl\inc nmake - all vc_inc NULL vc vcl\source\glyphs nmake - all vc_glyphs vc_inc NULL -- cgit v1.2.3 From 7a2d252ecfb4503de90388f938145e96aa41e3f5 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Thu, 18 Nov 2010 15:48:20 +0100 Subject: fwk160: #i107511# do not lock the file without necessity --- unotools/source/ucbhelper/tempfile.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unotools') 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 -- cgit v1.2.3