merged in DEV300_m60

3 files changed, 3 insertions, 45 deletions

diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk
index cd52ddfb6c9f..e6a8247480c9 100644
--- a/fpicker/source/aqua/makefile.mk
+++ b/fpicker/source/aqua/makefile.mk
@@ -40,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 DLLPRE=
 
@@ -52,7 +51,7 @@ dummy:
     @echo "Nothing to build. GUIBASE == $(GUIBASE)"
 
 .ELSE # we build for aqua
-
+CFLAGSCXX+=$(OBJCXXFLAGS)
 
 # --- Files --------------------------------------------------------
 
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index d6d852c71d93..09e33a225977 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -1,11 +1,4 @@
 /*************************************************************************
- *
- *
- *
- *
- *
- *
- *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
  *
@@ -136,7 +129,8 @@ namespace
 
 rtl::OUString toOUString(const QString& s)
 {
-    return rtl::OUString(s.toUtf8().data(), s.length(), RTL_TEXTENCODING_UTF8);
+    // QString stores UTF16, just like OUString
+    return rtl::OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length());
 }
 
 QString toQString(const rtl::OUString& s)
diff --git a/fpicker/util/makefile.pmk b/fpicker/util/makefile.pmk
deleted file mode 100644
index 15e00b88eda4..000000000000
--- a/fpicker/util/makefile.pmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(GUIBASE)"=="aqua"
-OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF  # "$(GUIBASE)"=="aqua"