[Libreoffice-commits] .: 3 commits - basegfx/CppunitTest_basegfx.mk basegfx/Library_basegfx.mk basegfx/StaticLibrary_basegfx_s.mk ucbhelper/source

[Caolán McNamara]

 basegfx/CppunitTest_basegfx.mk      |    2 +-
 basegfx/Library_basegfx.mk          |    6 +++---
 basegfx/StaticLibrary_basegfx_s.mk  |    6 +++---
 ucbhelper/source/client/content.cxx |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit fbb7d298d7107031fba9f8f9425b49f872e83b10
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 3 09:48:13 2011 +0100

    get this working under windows again

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 6c73b87..50d2add 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -33,9 +33,9 @@ $(eval $(call gb_Library_add_package_headers,basegfx,basegfx_inc))
 $(eval $(call gb_Library_add_precompiled_header,basegfx,$(SRCDIR)/basegfx/inc/pch/precompiled_basegfx))
 
 $(eval $(call gb_Library_set_include,basegfx,\
-	-I$(SRCDIR)/basegfx/inc \
-	-I$(SRCDIR)/basegfx/source/inc \
-	-I$(SRCDIR)/basegfx/inc/pch \
+	-I$(realpath $(SRCDIR)/basegfx/inc) \
+	-I$(realpath $(SRCDIR)/basegfx/source/inc) \
+	-I$(realpath $(SRCDIR)/basegfx/inc/pch) \
 	$$(INCLUDE) \
 ))
 
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index 76c807e..e64f565 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -33,10 +33,10 @@ $(eval $(call gb_StaticLibrary_add_package_headers,basegfx_s,basegfx_inc))
 $(eval $(call gb_StaticLibrary_add_precompiled_header,basegfx_s,$(SRCDIR)/basegfx/inc/pch/precompiled_basegfx))
 
 $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
-	-I$(SRCDIR)/basegfx/inc \
-	-I$(SRCDIR)/basegfx/source/inc \
+	-I$(realpath $(SRCDIR)/basegfx/inc) \
+	-I$(realpath $(SRCDIR)/basegfx/source/inc) \
 	$$(INCLUDE) \
-	-I$(SRCDIR)/basegfx/inc/pch \
+	-I$(realpath $(SRCDIR)/basegfx/inc/pch) \
 	-I$(OUTDIR)/inc \
 ))
 
commit 02db2086ceb7eb99dac10914936e8e72ef1b9863
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 3 09:40:51 2011 +0100

    get this working under windows again

diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 5e67b1e..df33393 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
 
 $(eval $(call gb_CppunitTest_set_include,basegfx_test,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/basegfx/inc/pch \
+	-I$(realpath $(SRCDIR)/basegfx/inc/pch) \
 	-I$(OUTDIR)/inc/offuh \
 ))
 
commit 379795b5a9b34edc591ca8fd57a1324e1b54d5be
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 2 22:40:08 2011 +0100

    make exception useful, state *what* url is invalid

diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index fc55576..e93fdfc 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -240,7 +240,7 @@ static void ensureContentProviderForURL( const ContentBroker & rBroker,
         {
             throw ContentCreationException(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "No Content Provider available for given URL!" )),
+                    "No Content Provider available for URL: ")) + rURL,
                 Reference< XInterface >(),
                 ContentCreationError_NO_CONTENT_PROVIDER );
         }