working vewrsion

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@56906 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/clipboard/src/base/strings/sys_string_conversions_mac.mm

@@ -152,13 +152,26 @@ CFStringRef SysUTF16ToCFStringRef(const string16& utf16) {
   return STLStringToCFStringWithEncodingsT(utf16, kMediumStringEncoding);
 }
 
+void* CFTypeRefToNSObjectAutorelease(CFTypeRef cf_object) {
+  // When GC is on, NSMakeCollectable marks cf_object for GC and autorelease
+  // is a no-op.
+  //
+  // In the traditional GC-less environment, NSMakeCollectable is a no-op,
+  // and cf_object is autoreleased, balancing out the caller's ownership claim.
+  //
+  // NSMakeCollectable returns nil when used on a NULL object.
+  return [NSMakeCollectable(cf_object) autorelease];
+}
+
 NSString* SysUTF8ToNSString(const std::string& utf8) {
-  return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease(
+  //return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease(
+    return (NSString*) CFTypeRefToNSObjectAutorelease(
       SysUTF8ToCFStringRef(utf8));
 }
 
 NSString* SysUTF16ToNSString(const string16& utf16) {
-  return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease(
+  //return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease(
+    return (NSString*) CFTypeRefToNSObjectAutorelease(
       SysUTF16ToCFStringRef(utf16));
 }
 

DesktopEditor/clipboard/src/ui/base/clipboard/clipboard_mac.mm

@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 //#include "base/logging.h"
-#include "base/mac/mac_util.h"
+//#include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/stl_util.h"