13 files changed, 14 insertions, 45 deletions
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
index 210ea8e43fea..d9842a81e526 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
@@ -19,6 +19,7 @@
 
 
 #include "aqua/salinst.h"
+#include "quartz/utils.h"
 
 #include "aqua11yactionwrapper.h"
 
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
index eb48a17c9eb2..41df52bf10e0 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include "quartz/utils.h"
 #include "aqua11ycomponentwrapper.h"
 #include "aqua11yrolehelper.h"
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 9ac7876bf98a..f53170fb1976 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -19,6 +19,7 @@
 
 
 #include "aqua/salinst.h"
+#include "quartz/utils.h"
 
 #include "aqua11ytextattributeswrapper.h"
 
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
index 2ae1d5a0b7a9..4d4b75cfe45d 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
@@ -19,7 +19,7 @@
 
 
 #include "aqua/salinst.h"
-
+#include "quartz/utils.h"
 #include "aqua11ytextwrapper.h"
 #include "aqua11ytextattributeswrapper.h"
 #include "aqua11yutil.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 0e0ad5081c2e..04c29ad8bdc6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -26,6 +26,8 @@
 #include "aqua/aqua11yfactory.h"
 #include "aqua/aqua11yfocustracker.hxx"
 
+#include "quartz/utils.h"
+
 #include "aqua11yfocuslistener.hxx"
 #include "aqua11yactionwrapper.h"
 #include "aqua11ycomponentwrapper.h"
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 40a0e5579062..0c104009ea75 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -38,6 +38,7 @@
 #include "aqua/salsys.h"
 #include "aqua/salvd.h"
 #include "quartz/salbmp.h"
+#include "quartz/utils.h"
 #include "aqua/salprn.h"
 #include "aqua/saltimer.h"
 #include "aqua/vclnsapp.h"
@@ -1139,49 +1140,6 @@ YieldMutexReleaser::~YieldMutexReleaser()
         GetSalData()->mpFirstInstance->AcquireYieldMutex( mnCount );
 }
 
-//////////////////////////////////////////////////////////////
-rtl::OUString GetOUString( CFStringRef rStr )
-{
-    if( rStr == 0 )
-        return rtl::OUString();
-    CFIndex nLength = CFStringGetLength( rStr );
-    if( nLength == 0 )
-        return rtl::OUString();
-    const UniChar* pConstStr = CFStringGetCharactersPtr( rStr );
-    if( pConstStr )
-        return rtl::OUString( pConstStr, nLength );
-    UniChar* pStr = reinterpret_cast<UniChar*>( rtl_allocateMemory( sizeof(UniChar)*nLength ) );
-    CFRange aRange = { 0, nLength };
-    CFStringGetCharacters( rStr, aRange, pStr );
-    rtl::OUString aRet( pStr, nLength );
-    rtl_freeMemory( pStr );
-    return aRet;
-}
-
-rtl::OUString GetOUString( NSString* pStr )
-{
-    if( ! pStr )
-        return rtl::OUString();
-    int nLen = [pStr length];
-    if( nLen == 0 )
-        return rtl::OUString();
-
-    rtl::OUStringBuffer aBuf( nLen+1 );
-    aBuf.setLength( nLen );
-    [pStr getCharacters: const_cast<sal_Unicode*>(aBuf.getStr())];
-    return aBuf.makeStringAndClear();
-}
-
-CFStringRef CreateCFString( const rtl::OUString& rStr )
-{
-    return CFStringCreateWithCharacters(kCFAllocatorDefault, rStr.getStr(), rStr.getLength() );
-}
-
-NSString* CreateNSString( const rtl::OUString& rStr )
-{
-    return [[NSString alloc] initWithCharacters: rStr.getStr() length: rStr.getLength()];
-}
-
 CGImageRef CreateCGImage( const Image& rImage )
 {
     BitmapEx aBmpEx( rImage.GetBitmapEx() );
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 7cf724ccf539..e849f013cbee 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -25,6 +25,7 @@
 #include "aqua/salsys.h"
 #include "aqua/saldata.hxx"
 #include "aqua/salinst.h"
+#include "quartz/utils.h"
 
 #include "svids.hrc"
 
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index db736634a7d8..5a8ed3595b85 100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -28,6 +28,7 @@
 #include "aqua/saldata.hxx"
 #include "aqua/salframe.h"
 #include "aqua/salframeview.h"
+#include "quartz/utils.h"
 
 #include "impimagetree.hxx"
 
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 190e16ecb161..67714ba3eabe 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -28,6 +28,7 @@
 
 #include "aqua/aquaprintview.h"
 #include "aqua/salinst.h"
+#include "quartz/utils.h"
 
 #include "svdata.hxx"
 #include "svids.hrc"
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index d27361a81f7d..d32c6d943b0d 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -29,6 +29,7 @@
 #include "aqua/aquaprintview.h"
 #include "aqua/salgdi.h"
 #include "aqua/saldata.hxx"
+#include "quartz/utils.h"
 
 #include "jobset.h"
 #include "salptype.hxx"
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 10eb3c24e067..2d5bb47ba433 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -36,6 +36,7 @@
 #include "aqua/salinst.h"
 #include "aqua/salframeview.h"
 #include "aqua/aqua11yfactory.h"
+#include "quartz/utils.h"
 
 #include "salwtype.hxx"
 
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index d6861a489277..aea29a43d5de 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -29,6 +29,7 @@
 #include "aqua/salframe.h"
 #include "aqua/salframeview.h"
 #include "aqua/aqua11yfactory.h"
+#include "quartz/utils.h"
 
 #define WHEEL_EVENT_FACTOR 1.5
 
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 72cd828c3628..8f37ddc41d24 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -32,6 +32,7 @@
 #include "aqua/salnsmenu.h"
 #include "aqua/salframe.h"
 #include "aqua/aqua11ywrapper.h"
+#include "quartz/utils.h"
 
 #include "svids.hrc"
 #include "window.h"