[Libreoffice-commits] core.git: 2 commits - fpicker/source Makefile.in

[Tor Lillqvist]

 Makefile.in                                    |   10 +++++++++-
 fpicker/source/aqua/SalAquaFilePicker.hxx      |    1 +
 fpicker/source/win32/filepicker/FilePicker.hxx |    1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 648d6e516251318e8bd56f088277a08ff775fb9a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 19 10:44:19 2013 +0200

    Include the XInitialization header
    
    Change-Id: I662dc0615d6fae752a22000bea750e7d59f98472

diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index d38a0a2..50c5aa8 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -21,6 +21,7 @@
 #define _SALAQUAFILEPICKER_HXX_
 
 #include <cppuhelper/compbase4.hxx>
+#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 73bc3d5..8791661 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -22,6 +22,7 @@
 
 #include <cppuhelper/compbase6.hxx>
 #include <osl/mutex.hxx>
+#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
commit 95e2c26a08fa22dba7333774ebb1899539213c57
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 19 10:38:12 2013 +0200

    How to run the "make dev-install" result is platform-specific
    
    Change-Id: I48353df6fbcb960e660202392107432654207e39

diff --git a/Makefile.in b/Makefile.in
index e7c47f1..0eedd22 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -382,13 +382,21 @@ else
 endif
 endif
 	@rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install
+ifeq ($(OS),LINUX)
 	@echo
 	@echo "Developer installation finished, you can now execute:"
 	@echo
 	@echo "  cd $(SRCDIR)/install/program"
 	@echo "  . ./ooenv"
 	@echo "  ./soffice.bin"
-
+else ifeq ($(OS),MACOSX)
+	@echo
+	@echo "Developer installation finished, you can now run:"
+	@echo
+	@echo "  open $(SRCDIR)/install/LibreOffice.app"
+	@echo
+	@echo "To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice"
+endif
 
 dev-install-nocheck : export SKIP_TESTS := YES
 dev-install-nocheck : dev-install