[Libreoffice-commits] .: 3 commits - framework/source sfx2/prj xmlscript/Library_xcr.mk

[Caolán McNamara]

 framework/source/jobs/jobexecutor.cxx |    1 -
 sfx2/prj/build.lst                    |    2 +-
 xmlscript/Library_xcr.mk              |    4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit efab1498fde2629a95648ca2e181d2ae710a393f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 4 14:24:26 2011 +0100

    realpaths to get windows building here

diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
index dc15be3..c6812af 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xcr.mk
@@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_package_headers,xcr,xmlscript_inc))
 $(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr))
 
 $(eval $(call gb_Library_set_include,xcr,\
-	-I$(SRCDIR)/xmlscript/source/inc \
-	-I$(SRCDIR)/xmlscript/inc/pch \
+	-I$(realpath $(SRCDIR)/xmlscript/source/inc) \
+	-I$(realpath $(SRCDIR)/xmlscript/inc/pch) \
 	$$(INCLUDE) \
 ))
 
commit baec9d612ac88e38d11b52fcd7591191b8551042
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 4 14:13:34 2011 +0100

    bad merge, setup_native depends on sfx2 now

diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 52f145a..e56d894 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,2 +1,2 @@
-sf      sfx2    :    TRANSLATIONS:translations NATIVE:idl basic xmlscript framework readlicense_oo shell DESKTOP:setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
+sf      sfx2    :    TRANSLATIONS:translations NATIVE:idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
 sf	sfx2\prj								nmake	-	all	sf_prj NULL
commit bced63335cf2d0415b77565d5a616b1bbb01f8a2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 4 13:58:38 2011 +0100

    don't annoy us

diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index bb78d10..86b68b4 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -160,7 +160,6 @@ JobExecutor::~JobExecutor()
     css::uno::Reference< css::container::XContainer > xNotifier(m_aConfig.cfg(), css::uno::UNO_QUERY);
     if (xNotifier.is())
         xNotifier->removeContainerListener(m_xConfigListener);
-    LOG_ASSERT(m_aConfig.getMode() == ConfigAccess::E_CLOSED, "JobExecutor::~JobExecutor()\nConfiguration don't send dispoing() message!\n")
 }
 
 //________________________________