avmedia/source/quicktime/player.cxx | 2 +-
bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk | 4 ++--
svx/source/sidebar/EmptyPanel.src | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a01c392ef8fa564ce58579632dd41ec3a085327b
Author: Herbert Dürr <h...@apache.org>
Date: Mon May 6 11:54:52 2013 +0000
replace deprecated method NSString::cString()
diff --git a/avmedia/source/quicktime/player.cxx
b/avmedia/source/quicktime/player.cxx
index 7121308..86329fe 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -148,7 +148,7 @@ bool Player::create( const ::rtl::OUString& rURL )
{
OSL_TRACE( "NSMovie create failed with error %ld (%s)",
(long)[pErr code],
- [[pErr localizedDescription] cString]
+ [[pErr localizedDescription] UTF8String]
);
}
[pool release];
commit 80f62d986be5d32935280c0db3fd522a5fda099e
Author: Herbert Dürr <h...@apache.org>
Date: Mon May 6 10:54:35 2013 +0000
allow non-gcc to build the mac-i386 UNO bridge
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
b/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
index 49f5fa8..9cad6d8 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
@@ -24,7 +24,7 @@
PRJ=..$/..$/..
PRJNAME=bridges
-TARGET=gcc3_uno
+TARGET=$(COMNAME)_uno
LIBTARGET=no
ENABLE_EXCEPTIONS=TRUE
@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCMACOSXIgcc3"
+.IF "$(OS)$(CPU)" == "MACOSXI"
.IF "$(cppu_no_leak)" == ""
CFLAGS += -DLEAK_STATIC_DATA
commit 1f317e0580d267b3cc6b6b410bc3d14a4e70e1fe
Author: Andre Fischer <a...@apache.org>
Date: Mon May 6 08:40:39 2013 +0000
122049: Changed text of 'empty' panel.
diff --git a/svx/source/sidebar/EmptyPanel.src
b/svx/source/sidebar/EmptyPanel.src
index 1a008f9..6063ed0 100644
--- a/svx/source/sidebar/EmptyPanel.src
+++ b/svx/source/sidebar/EmptyPanel.src
@@ -28,6 +28,6 @@ Control RID_SIDEBAR_EMPTY_PANEL
{
Pos = MAP_APPFONT(2,2);
Size = MAP_APPFONT(100,24);
- Text [en-US] = "Properties for the task that you are performing are
not available in the sidebar at this time.";
+ Text [en-US] = "Properties for the task that you are performing are
not available for the current selection";
};
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
