[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - editeng/AllLangResTarget_editeng.mk editeng/Library_editeng.mk sfx2/source

[Tor Lillqvist]

 editeng/AllLangResTarget_editeng.mk |    2 +-
 editeng/Library_editeng.mk          |    4 ++--
 sfx2/source/dialog/passwd.cxx       |    2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ee429287783ba7f9fe100cb3b32e64076d39c0c9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 15:36:21 2011 +0200

    Add realpath calls to unbreak build on Windows

diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk
index e2bd16e..bcc2c63 100755
--- a/editeng/AllLangResTarget_editeng.mk
+++ b/editeng/AllLangResTarget_editeng.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,editeng/res))
 
 $(eval $(call gb_SrsTarget_set_include,editeng/res,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/editeng/inc \
+    -I$(realpath $(SRCDIR)/editeng/inc) \
 ))
 
 # add src files here (complete path relative to repository root)
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index fb82ea0..408d8de 100755
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pc
 
 $(eval $(call gb_Library_set_include,editeng,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/editeng/inc/pch \
-    -I$(SRCDIR)/editeng/inc \
+    -I$(realpath $(SRCDIR)/editeng/inc/pch) \
+    -I$(realpath $(SRCDIR)/editeng/inc) \
     -I$(OUTDIR)/inc/offuh \
 ))
 
commit 17ec4acbb0f70732209ce35c5fa7f04e7369efd2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 15:21:30 2011 +0200

    No #warning in MSVC

diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 6d6c970..45ba22e 100755
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -249,7 +249,9 @@ short SfxPasswordDialog::Execute()
         maPasswordFT.Show();
     if( (mnExtras & SHOWEXTRAS_USER ) )
     {
+#ifndef _MSC_VER
 #warning Inevitably this layout logic will be wrong post merge until we can see the dialog to test it.
+#endif
         Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT );
         Size a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
         long nMinHeight = maHelpBtn.GetPosPixel().Y() +