4 files changed, 4 insertions, 48 deletions
diff --git a/vcl/aqua/inc/salbmp.h b/vcl/aqua/inc/salbmp.h
index a4ea1bcaee49..1c427cce0cd5 100644
--- a/vcl/aqua/inc/salbmp.h
+++ b/vcl/aqua/inc/salbmp.h
@@ -36,7 +36,6 @@
 #include "salconst.h"
 #include "vcl/salvd.hxx"
 #include "salcolorutils.hxx"
-#include "salpixmaputils.hxx"
 #include "vcl/salbmp.hxx"
 #include "salgdi.h"
 #include "basebmp/bitmapdevice.hxx"
diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h
index fd783270875e..c2ded3267f45 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/aqua/inc/salframe.h
@@ -184,6 +184,8 @@ public:
     NSView* getView() const { return mpView; }
     unsigned int getStyleMask() const { return mnStyleMask; }
 
+    void getResolution( long& o_rDPIX, long& o_rDPIY );
+
     // actually the follwing methods do the same thing: flipping y coordinates
     // but having two of them makes clearer what the coordinate system
     // is supposed to be before and after
diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h
index 8a44f7ef3304..0bceb99d1d0e 100644
--- a/vcl/aqua/inc/salinst.h
+++ b/vcl/aqua/inc/salinst.h
@@ -32,6 +32,7 @@
 #include "vos/mutex.hxx"
 #include "vos/thread.hxx"
 #include "vcl/salinst.hxx"
+#include "osl/conditn.h"
 
 #include "aquavcltypes.h"
 
@@ -96,6 +97,7 @@ public:
     int                                     mnActivePrintJobs;
     std::list< SalUserEvent >               maUserEvents;
     oslMutex                                maUserEventListMutex;
+    oslCondition                            maWaitingYieldCond;
 
     typedef std::list<const ApplicationEvent*> AppEventList;
     static AppEventList aAppEventList;
diff --git a/vcl/aqua/inc/salpixmaputils.hxx b/vcl/aqua/inc/salpixmaputils.hxx
deleted file mode 100755
index 18d00b9856a0..000000000000
--- a/vcl/aqua/inc/salpixmaputils.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _SV_SALPIXMAPUTILS_HXX
-#define _SV_SALPIXMAPUTILS_HXX
-
-#include "premac.h"
-#include <ApplicationServices/ApplicationServices.h>
-#include "postmac.h"
-
-#include "tools/gen.hxx"
-#include "vcl/salbtype.hxx"
-#include "vcl/salgtype.hxx"
-#include "salconst.h"
-#include "salcolorutils.hxx"
-
-// ------------------------------------------------------------------
-
-// Empty. Do we need this?
-
-// ------------------------------------------------------------------
-
-#endif  // _SV_SALPIXMAPUTILS_HXX