Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
4fe9ef81
Kaydet (Commit)
4fe9ef81
authored
Agu 22, 2013
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
The AppleRemote code is blocked by sandboxing so bypass it in that case
Change-Id: I0e86c82fb81732468cf0a60eb8ff1d0579986767
üst
680ff754
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
7 deletions
+25
-7
Module_apple_remote.mk
apple_remote/Module_apple_remote.mk
+2
-0
Library_vcl.mk
vcl/Library_vcl.mk
+3
-3
saldata.cxx
vcl/aqua/source/app/saldata.cxx
+5
-0
salinst.cxx
vcl/aqua/source/app/salinst.cxx
+3
-1
vclnsapp.mm
vcl/aqua/source/app/vclnsapp.mm
+4
-2
saldata.hxx
vcl/inc/aqua/saldata.hxx
+4
-1
vclnsapp.h
vcl/inc/aqua/vclnsapp.h
+4
-0
No files found.
apple_remote/Module_apple_remote.mk
Dosyayı görüntüle @
4fe9ef81
...
...
@@ -10,10 +10,12 @@
$(eval
$(call
gb_Module_Module,apple_remote))
ifeq
($(OS),MACOSX)
ifneq
($(ENABLE_MACOSX_SANDBOX),YES)
$(eval
$(call
gb_Module_add_targets,apple_remote,\
Library_AppleRemote
\
))
endif
endif
# vim: set noet sw=4 ts=4:
vcl/Library_vcl.mk
Dosyayı görüntüle @
4fe9ef81
...
...
@@ -443,9 +443,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/aqua/source/window/salmenu \
vcl/aqua/source/window/salobj \
))
$(eval $(call gb_Library_use_libraries,vcl,\
AppleRemote \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
$(if $(filter X86_64,$(CPUNAME)),,QuickTime) \
Cocoa \
...
...
@@ -453,11 +450,14 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
CoreFoundation \
))
ifneq ($(ENABLE_MACOSX_SANDBOX),YES)
$(eval $(call gb_Library_use_libraries,vcl,\
AppleRemote \
))
endif
endif
vcl_really_generic_code= \
vcl/generic/app/gensys \
vcl/generic/app/geninst \
...
...
vcl/aqua/source/app/saldata.cxx
Dosyayı görüntüle @
4fe9ef81
...
...
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "aqua/saldata.hxx"
#include "aqua/salnsmenu.h"
...
...
@@ -47,7 +48,9 @@ SalData::SalData()
mxP50Pattern
(
NULL
),
maCursors
(
POINTER_COUNT
,
INVALID_CURSOR_PTR
),
mbIsScrollbarDoubleMax
(
false
),
#if !HAVE_FEATURE_MACOSX_SANDBOX
mpMainController
(
NULL
),
#endif
mpDockIconClickHandler
(
nil
),
mnDPIX
(
0
),
mnDPIY
(
0
)
...
...
@@ -82,8 +85,10 @@ SalData::~SalData()
osl_destroyThreadKey
(
s_aAutoReleaseKey
);
s_aAutoReleaseKey
=
0
;
}
#if !HAVE_FEATURE_MACOSX_SANDBOX
if
(
mpMainController
)
[
mpMainController
release
];
#endif
}
void
SalData
::
ensureThreadAutoreleasePool
()
...
...
vcl/aqua/source/app/salinst.cxx
Dosyayı görüntüle @
4fe9ef81
...
...
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include <stdio.h>
...
...
@@ -167,7 +168,7 @@ static void initNSApp()
selector
:
@
selector
(
scrollbarSettingsChanged
:
)
name
:
@
"AppleNoRedisplayAppearancePreferenceChanged"
object
:
nil
];
#if !HAVE_FEATURE_MACOSX_SANDBOX
// Initialize Apple Remote
GetSalData
()
->
mpMainController
=
[[
MainController
alloc
]
init
];
...
...
@@ -180,6 +181,7 @@ static void initNSApp()
selector
:
@
selector
(
applicationWillResignActive
:
)
name
:
@
"AppleRemoteWillResignActive"
object
:
nil
];
#endif
}
sal_Bool
ImplSVMainHook
(
int
*
pnInit
)
...
...
vcl/aqua/source/app/vclnsapp.mm
Dosyayı görüntüle @
4fe9ef81
...
...
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_features.h>
#include "sal/config.h"
#include <vector>
...
...
@@ -439,8 +441,7 @@
// for Apple Remote implementation
#pragma mark -
#pragma mark NSApplication Delegates
#if !HAVE_FEATURE_MACOSX_SANDBOX
- (void)applicationWillBecomeActive:(NSNotification *)pNotification
{
(void)pNotification;
...
...
@@ -490,6 +491,7 @@
[(*it)->mpWindow setLevel: NSNormalWindowLevel];
}
}
#endif
- (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible
{
...
...
vcl/inc/aqua/saldata.hxx
Dosyayı görüntüle @
4fe9ef81
...
...
@@ -20,6 +20,8 @@
#ifndef _SV_SALDATA_HXX
#define _SV_SALDATA_HXX
#include <config_features.h>
#include "premac.h"
#include <Cocoa/Cocoa.h>
#include "postmac.h"
...
...
@@ -89,8 +91,9 @@ public:
static
oslThreadKey
s_aAutoReleaseKey
;
bool
mbIsScrollbarDoubleMax
;
// TODO: support DoubleMin and DoubleBoth too
#if !HAVE_FEATURE_MACOSX_SANDBOX
MainController
*
mpMainController
;
// Apple Remote
#endif
NSObject
*
mpDockIconClickHandler
;
long
mnDPIX
;
// #i100617# read DPI only once per office life
long
mnDPIY
;
// #i100617# read DPI only once per office life
...
...
vcl/inc/aqua/vclnsapp.h
Dosyayı görüntüle @
4fe9ef81
...
...
@@ -20,6 +20,8 @@
#ifndef _VCL_VCLNSAPP_H
#define _VCL_VCLNSAPP_H
#include <config_features.h>
#include "premac.h"
#include "Cocoa/Cocoa.h"
#include "postmac.h"
...
...
@@ -51,8 +53,10 @@ class AquaSalFrame;
-
(
void
)
addFallbackMenuItem
:
(
NSMenuItem
*
)
pNewItem
;
-
(
void
)
removeFallbackMenuItem
:
(
NSMenuItem
*
)
pOldItem
;
-
(
void
)
addDockMenuItem
:
(
NSMenuItem
*
)
pNewItem
;
#if !HAVE_FEATURE_MACOSX_SANDBOX
-
(
void
)
applicationWillBecomeActive
:
(
NSNotification
*
)
pNotification
;
-
(
void
)
applicationWillResignActive
:
(
NSNotification
*
)
pNotification
;
#endif
-
(
BOOL
)
applicationShouldHandleReopen
:
(
NSApplication
*
)
pApp
hasVisibleWindows
:
(
BOOL
)
bWinVisible
;
-
(
void
)
setDockIconClickHandler
:
(
NSObject
*
)
pHandler
;
-
(
void
)
cycleFrameForward
:
(
AquaSalFrame
*
)
pCurFrame
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment