[Libreoffice-commits] .: 2 commits - cli_ure/source configure.in libvisio/makefile.mk libwpg/makefile.mk libwps/makefile.mk RepositoryExternal.mk set_soenv.in

[Fridrich Strba]

 RepositoryExternal.mk                    |    4 ++--
 cli_ure/source/climaker/climaker_app.cxx |    2 +-
 cli_ure/source/uno_bridge/cli_data.cxx   |    2 +-
 configure.in                             |    6 +++---
 libvisio/makefile.mk                     |    2 +-
 libwpg/makefile.mk                       |    2 +-
 libwps/makefile.mk                       |    2 +-
 set_soenv.in                             |    4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 3f411f36319d91e1288a8f0d4c9295e7a4b24dc8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Oct 5 10:08:34 2011 +0200

    Adapt to removal of dangerous operators

diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index 907054c..3d34498 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -572,7 +572,7 @@ SAL_IMPLEMENT_MAIN()
         // setup assembly info: xxx todo set more? e.g. avoid strong versioning
         AssemblyName * assembly_name = new AssemblyName();
         assembly_name->set_CodeBase( output_dir );
-        assembly_name->set_Name( name );
+        assembly_name->set_Name( name.getStr() );
         if (kp != NULL)
             assembly_name->set_KeyPair(kp);
 
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 23288d0..30dce98 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -605,7 +605,7 @@ System::String* mapPolymorphicName(System::String* unoName, bool bCliToUno)
             index = cur;
             if (bCliToUno)
             {
-                builder->Append(mapCliTypeName(sParam));
+                builder->Append(mapCliTypeName(sParam).getStr());
             }
             else
             {
commit 8703f3e3585e30631e55dab7d8a8f42e546a7c79
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Oct 5 10:04:04 2011 +0200

    LIBWPD_* -> WPD_* to avoid eventual conflict with pkg-config danse

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index edaf6bf..47a8256 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -532,9 +532,9 @@ ifeq ($(SYSTEM_LIBWPD),YES)
 define gb_LinkTarget__use_wpd
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-    $(LIBWPD_CFLAGS) \
+    $(WPD_CFLAGS) \
 )
-$(call gb_LinkTarget_add_libs,$(1),$(LIBWPD_LIBS))
+$(call gb_LinkTarget_add_libs,$(1),$(WPD_LIBS))
 
 endef
 
diff --git a/configure.in b/configure.in
index 0a2970b..9605c8f 100644
--- a/configure.in
+++ b/configure.in
@@ -4652,15 +4652,15 @@ if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
         test "$with_system_libwpd" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPD=YES
-    PKG_CHECK_MODULES( LIBWPD, libwpd-0.9 libwpd-stream-0.9 )
+    PKG_CHECK_MODULES( WPD, libwpd-0.9 libwpd-stream-0.9 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPD=NO
     BUILD_TYPE="$BUILD_TYPE LIBWPD"
 fi
 AC_SUBST(SYSTEM_LIBWPD)
-AC_SUBST(LIBWPD_CFLAGS)
-AC_SUBST(LIBWPD_LIBS)
+AC_SUBST(WPD_CFLAGS)
+AC_SUBST(WPD_LIBS)
 
 dnl ===================================================================
 dnl Check for system cppunit
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index ce39d64..31b2ad3 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -43,7 +43,7 @@ TARGET=visio
 
 # libvisio depends on the libwpd and libwpg
 .IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
+INCPRE+=$(WPD_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
index ff18fbc..f37eab8 100644
--- a/libwpg/makefile.mk
+++ b/libwpg/makefile.mk
@@ -43,7 +43,7 @@ TARGET=wpg
 
 # libwpg depends on the libwpd framework
 .IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
+INCPRE+=$(WPD_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
index 91e9dbc..4ab39f8 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -43,7 +43,7 @@ TARGET=wps
 
 # libwps depends on the libwpd framework
 .IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
+INCPRE+=$(WPD_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
diff --git a/set_soenv.in b/set_soenv.in
index 09cefdc..4700f1d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1901,8 +1901,8 @@ ToFile( "XRANDR_DLOPEN",     "@XRANDR_DLOPEN@",    "e" );
 ToFile( "LIBPNG_CFLAGS",     "@LIBPNG_CFLAGS@",    "e" );
 ToFile( "LIBPNG_LIBS",       "@LIBPNG_LIBS@",      "e" );
 ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
-ToFile( "LIBWPD_CFLAGS",     "@LIBWPD_CFLAGS@",    "e" );
-ToFile( "LIBWPD_LIBS",       "@LIBWPD_LIBS@",      "e" );
+ToFile( "WPD_CFLAGS",     "@WPD_CFLAGS@",    "e" );
+ToFile( "WPD_LIBS",       "@WPD_LIBS@",      "e" );
 ToFile( "SYSTEM_LIBWPS",     "@SYSTEM_LIBWPS@",    "e" );
 ToFile( "LIBWPS_CFLAGS",     "@LIBWPS_CFLAGS@",    "e" );
 ToFile( "LIBWPS_LIBS",       "@LIBWPS_LIBS@",      "e" );