[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 4 commits - framework/AllLangResTarget_fwe.mk framework/inc framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk framework/source

Tor Lillqvist tml at kemper.freedesktop.org
Thu Mar 17 05:34:36 PDT 2011 

 framework/AllLangResTarget_fwe.mk                        |    8 ++++----
 framework/Library_fwe.mk                                 |    6 +++---
 framework/Library_fwi.mk                                 |    6 +++---
 framework/Library_fwk.mk                                 |    6 +++---
 framework/Library_fwl.mk                                 |    6 +++---
 framework/Library_fwm.mk                                 |    6 +++---
 framework/inc/framework/imageproducer.hxx                |    2 +-
 framework/source/uielement/recentfilesmenucontroller.cxx |    3 +++
 8 files changed, 23 insertions(+), 20 deletions(-)

New commits:
commit 068d7f72bca71b319c4bba63aed95b0487376e1b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 14:32:38 2011 +0200

    Bypass ODMA crack for now
    
    It is too hard for me to figure out how to get it to link with
    odma_lib.lib, which is a static library built and delivered over in
    ucb/source/ucp/odma.

diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 3708c4f..dd0c954 100755
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -211,6 +211,8 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
                     else
                         aMenuTitle = aSystemPath;
                 }
+#if 0 // Please don't remove this commented-out code just yet,
+      // we can try to resurrect it later in case somebody complains
 #ifdef WNT
                 else if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_ODMA && ::odma::DMSsAvailable ())
                 {
@@ -246,6 +248,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
                     aTipHelpText = aURLString;
                 }
 #endif
+#endif
                 else
                 {
                     // Use INetURLObject to abbreviate all other URLs
commit 29499a91c300e9cde8955537f1abfc1386e66e78
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 14:31:33 2011 +0200

    Sprinke some realpath goodness here, too

diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index a0d5310..3ffb97e 100755
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,fwm))
 $(eval $(call gb_Library_set_componentfile,fwm,framework/util/fwm))
 
 $(eval $(call gb_Library_set_include,fwm,\
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/source/inc \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/inc) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
commit 2f8f972e8c9a0b6d22412875402824e35988e6af
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 13:36:00 2011 +0200

    Add FWE_DLLPUBLIC

diff --git a/framework/inc/framework/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx
index 801cb34..4c90c2b 100755
--- a/framework/inc/framework/imageproducer.hxx
+++ b/framework/inc/framework/imageproducer.hxx
@@ -49,7 +49,7 @@ typedef Image ( *pfunc_getImage)(
 
 pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
-Image SAL_CALL GetImageFromURL(
+Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     const ::rtl::OUString& aURL,
     bool bBig
commit f2f00bd3752c1dc3a3e47099bd81bc2057577b0d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 13:35:16 2011 +0200

    Use realpath to unbreak compilation for Windows

diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 10baea7..2bf8ccb 100755
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -39,8 +39,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes))
 
 $(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/inc/classes \
+    -I$(realpath $(SRCDIR)/framework/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc/classes) \
     -I$(OUTDIR)/inc \
 ))
 
@@ -52,8 +52,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services))
 
 $(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/inc/services \
+    -I$(realpath $(SRCDIR)/framework/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc/services) \
     -I$(OUTDIR)/inc \
 ))
 
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 1c92711..af5d111 100755
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -28,9 +28,9 @@
 $(eval $(call gb_Library_Library,fwe))
 
 $(eval $(call gb_Library_set_include,fwe,\
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/source/inc \
-    -I$(SRCDIR)/framework/inc \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 1d4bb80..f8d3db9 100755
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -35,9 +35,9 @@ $(eval $(call gb_Library_set_defs,fwi,\
 ))
 
 $(eval $(call gb_Library_set_include,fwi,\
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/source/inc \
-    -I$(SRCDIR)/framework/inc \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index a34a1bc..5e7dcac 100755
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -32,9 +32,9 @@ $(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/
 $(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
 
 $(eval $(call gb_Library_set_include,fwk,\
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/source/inc \
-    -I$(SRCDIR)/framework/inc \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 928c723..5f9799d 100755
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,fwl))
 $(eval $(call gb_Library_set_componentfile,fwl,framework/util/fwl))
 
 $(eval $(call gb_Library_set_include,fwl,\
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/source/inc \
+    -I$(realpath $(SRCDIR)/framework/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \

More information about the Libreoffice-commits mailing list