summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Library_desktop_detector.mk11
-rw-r--r--vcl/Library_vcl.mk61
-rw-r--r--vcl/Library_vclplug_gen.mk52
-rw-r--r--vcl/Library_vclplug_gtk.mk23
-rw-r--r--vcl/Library_vclplug_kde.mk19
-rw-r--r--vcl/Library_vclplug_kde4.mk19
-rw-r--r--vcl/Library_vclplug_svp.mk10
-rw-r--r--vcl/Package_afmhash.mk2
-rw-r--r--vcl/aqua/source/app/vclnsapp.mm26
-rw-r--r--vcl/aqua/source/gdi/salgdi.cxx4
-rw-r--r--vcl/aqua/source/gdi/salprn.cxx79
-rw-r--r--vcl/aqua/source/window/salframe.cxx5
-rw-r--r--vcl/inc/aqua/saldata.hxx3
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx3
-rw-r--r--vcl/source/gdi/print2.cxx1
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx4
16 files changed, 126 insertions, 196 deletions
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 7a34ee739461..3673218468aa 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,desktop_detector,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,desktop_detector,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,desktop_detector,\
-DDESKTOP_DETECTOR_IMPLEMENTATION \
))
@@ -58,8 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -70,8 +67,14 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
Xext \
SM \
ICE \
+ $(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,desktop_detector,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
vcl/unx/generic/desktopdetect/desktopdetector \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 19c1c9e7fcf6..7ca41baa4b62 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -28,15 +28,15 @@
$(eval $(call gb_Library_Library,vcl))
ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
else ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
else ifeq ($(GUIBASE),android)
$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android,vcl/vcl))
else ifeq ($(OS),IOS)
$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios,vcl/vcl))
else
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
endif
$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
@@ -56,15 +56,14 @@ $(eval $(call gb_Library_set_include,vcl,\
-I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
))
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
$$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
endif
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DVCL_DLLIMPLEMENTATION \
-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
-DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
@@ -83,8 +82,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -94,10 +91,14 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,vcl,\
+ icule \
+ icuuc \
+)
+
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
- $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+ $(gb_OBJCXXFLAGS) \
))
$(eval $(call gb_Library_add_objcxxobjects,vcl,\
vcl/aqua/source/a11y/aqua11yactionwrapper \
@@ -169,16 +170,14 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
endif
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
-DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
))
## handle CUPS
ifneq ($(ENABLE_CUPS),)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_CUPS \
))
endif
@@ -443,34 +442,28 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
endif
## handle Graphite
ifneq ($(ENABLE_GRAPHITE),)
-$(eval $(call gb_Library_set_defs,vcl,\
- $$(DEFS) \
+# add defines, graphite sources for all platforms
+$(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_GRAPHITE \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/glyphs/graphite_features \
vcl/source/glyphs/graphite_layout \
))
+
+# handle X11 platforms, which have additional files and possibly system graphite
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/glyphs/graphite_serverfont \
))
-ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
- $(GRAPHITE_LIBS)
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
- graphite2_off \
-))
-endif
else
$(eval $(call gb_Library_add_linked_libs,vcl,\
graphite2_off \
version \
))
endif
+
+$(call gb_Library_use_external,vcl,graphite)
endif
## handle Cairo
@@ -539,13 +532,11 @@ endif
ifeq ($(OS),SOLARIS)
ifeq ($(CPUNAME)$(CPU),SPARCU)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib/64 \
))
else
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib \
))
endif
@@ -555,8 +546,7 @@ ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Library_add_linked_libs,vcl,\
AppleRemote \
))
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
-framework QuickTime \
-framework Cocoa \
-framework Carbon \
@@ -566,8 +556,7 @@ endif
ifeq ($(OS),WNT)
ifeq ($(COM),MSC)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
/ENTRY:LibMain@12 \
))
endif
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index d1954004b3d3..819d9ce8c301 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -49,8 +49,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -64,11 +62,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_CAIRO),YES)
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
- $$(CAIRO_CFLAGS) \
- -DSYSTEM_CAIRO \
+$(call gb_Library_use_externals,vclplug_gen,\
+ icule \
+ icuuc \
+)
+
))
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
$$(LDFLAGS) \
@@ -134,30 +132,26 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/window/salobj \
))
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
-DVCLPLUG_GEN_IMPLEMENTATION \
))
## handle RandR
ifneq ($(ENABLE_RANDR),)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DUSE_RANDR \
))
ifeq ($(XRANDR_DLOPEN),FALSE)
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gen,\
+ $$(INCLUDE) \
$$(XRANDR_CFLAGS) \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
$(XRANDR_LIBS) \
))
else
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DXRANDR_DLOPEN \
))
endif
@@ -167,37 +161,31 @@ endif
ifneq ($(USE_XINERAMA),NO)
ifneq ($(OS),SOLARIS)
# not Solaris
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DUSE_XINERAMA_XORG \
))
ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-lXinerama \
))
else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
))
endif
else
# Solaris
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DUSE_XINERAMA_XSUN \
))
ifeq ($(USE_XINERAMA_VERSION),Xorg)
# Solaris, Xorg
ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-lXinerama \
))
else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
))
endif
@@ -207,12 +195,10 @@ endif
## handle Render linking
ifeq ($(XRENDER_LINK),YES)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
-DXRENDER_LINK \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
$(shell pkg-config --libs xrender) \
))
endif
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index da001a220565..d9674f03cb8e 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -35,13 +35,12 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gtk,\
+ $$(INCLUDE) \
$$(GTK_CFLAGS) \
))
-$(eval $(call gb_Library_set_defs,vclplug_gtk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
-DVCLPLUG_GTK_IMPLEMENTATION \
-DVERSION=\"$(UPD)$(LAST_MINOR)\" \
))
@@ -51,12 +50,10 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
$$(INCLUDE) \
$(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \
))
-$(eval $(call gb_Library_set_defs,vclplug_gtk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
-DENABLE_DBUS \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
$(shell pkg-config --libs dbus-glib-1)\
))
endif
@@ -66,8 +63,7 @@ $(eval $(call gb_Library_add_api,vclplug_gtk,\
udkapi \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
$$(GTK_LIBS) \
$$(GTHREAD_LIBS) \
))
@@ -82,8 +78,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -97,6 +91,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,vclplug_gtk,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
vcl/unx/gtk/a11y/atkaction \
vcl/unx/gtk/a11y/atkbridge \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index bcec46732b7d..e4586b8a108b 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -35,13 +35,12 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde,\
+ $$(INCLUDE) \
$$(KDE_CFLAGS) \
))
-$(eval $(call gb_Library_set_defs,vclplug_kde,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_kde,\
-DVCLPLUG_KDE_IMPLEMENTATION \
))
@@ -50,9 +49,8 @@ $(eval $(call gb_Library_add_api,vclplug_kde,\
udkapi \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_kde,\
- $$(KDE_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde,\
+ $$(KDE_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
@@ -65,8 +63,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -79,6 +75,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
ICE \
))
+$(call gb_Library_use_externals,vclplug_kde,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
vcl/unx/kde/kdedata \
vcl/unx/kde/salnativewidgets-kde \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index c075ca3ba4e1..bbc64aabcbdc 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -38,13 +38,12 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\
-I$(WORKDIR)/CustomTarget/vcl/unx/kde4 \
))
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde4,\
+ $$(INCLUDE) \
$$(KDE4_CFLAGS) \
))
-$(eval $(call gb_Library_set_defs,vclplug_kde4,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_kde4,\
-DVCLPLUG_KDE4_IMPLEMENTATION \
))
@@ -53,9 +52,8 @@ $(eval $(call gb_Library_add_api,vclplug_kde4,\
udkapi \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
- $$(KDE4_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+ $$(KDE4_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
@@ -68,8 +66,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
basegfx \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -82,6 +78,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
ICE \
))
+$(call gb_Library_use_externals,vclplug_kde4,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
vcl/unx/kde4/KDEData \
vcl/unx/kde4/KDESalDisplay \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 8c222ad05b9b..7616e6c06025 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,vclplug_svp,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_svp,\
-DVCLPLUG_SVP_IMPLEMENTATION \
))
@@ -56,8 +55,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
basebmp \
comphelper \
cppuhelper \
- icuuc \
- icule \
i18nisolang1 \
i18npaper \
i18nutil \
@@ -71,6 +68,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,vclplug_svp,\
+ icule \
+ icuuc \
+)
+
$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
vcl/unx/headless/svpbmp \
vcl/unx/headless/svpdummies \
diff --git a/vcl/Package_afmhash.mk b/vcl/Package_afmhash.mk
index d3de8357eb93..38b9f0db7896 100644
--- a/vcl/Package_afmhash.mk
+++ b/vcl/Package_afmhash.mk
@@ -24,6 +24,6 @@
# instead of those above.
$(eval $(call gb_Package_Package,vcl_afmhash,$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager))
-$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/unx/generic/fontmanager))
+$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/unx/generic/fontmanager,SRCDIR))
# vim: set noet sw=4:
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index e103a6b3e387..2424d373b24e 100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -458,37 +458,51 @@
- (void)applicationWillBecomeActive:(NSNotification *)pNotification
{
(void)pNotification;
- if (GetSalData()->mpMainController->remoteControl) {
-
+ SalData* pSalData = GetSalData();
+ if (pSalData->mpMainController->remoteControl)
+ {
// [remoteControl startListening: self];
// does crash because the right thing to do is
// [GetSalData()->mpMainController->remoteControl startListening: self];
// but the instance variable 'remoteControl' is declared protected
// workaround : declare remoteControl instance variable as public in RemoteMainController.m
- [GetSalData()->mpMainController->remoteControl startListening: self];
+ [pSalData->mpMainController->remoteControl startListening: self];
#ifdef DEBUG
NSLog(@"Apple Remote will become active - Using remote controls");
#endif
}
+ for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin();
+ it != pSalData->maPresentationFrames.end(); ++it )
+ {
+ [(*it)->mpWindow setLevel: NSPopUpMenuWindowLevel];
+ if( [(*it)->mpWindow isVisible] )
+ [(*it)->mpWindow orderFront: NSApp];
+ }
}
- (void)applicationWillResignActive:(NSNotification *)pNotification
{
(void)pNotification;
- if (GetSalData()->mpMainController->remoteControl) {
-
+ SalData* pSalData = GetSalData();
+ if (pSalData->mpMainController->remoteControl)
+ {
// [remoteControl stopListening: self];
// does crash because the right thing to do is
// [GetSalData()->mpMainController->remoteControl stopListening: self];
// but the instance variable 'remoteControl' is declared protected
// workaround : declare remoteControl instance variable as public in RemoteMainController.m
- [GetSalData()->mpMainController->remoteControl stopListening: self];
+ [pSalData->mpMainController->remoteControl stopListening: self];
#ifdef DEBUG
NSLog(@"Apple Remote will resign active - Releasing remote controls");
#endif
}
+ for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin();
+ it != pSalData->maPresentationFrames.end(); ++it )
+ {
+ [(*it)->mpWindow setLevel: NSNormalWindowLevel];
+ }
}
- (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index b47619b45657..3f8829b1e72b 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -2269,8 +2269,8 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
rInfo.m_aFontBBox = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
Point( aTTInfo.xMax, aTTInfo.yMax ) );
rInfo.m_nCapHeight = aTTInfo.yMax; // Well ...
- rInfo.m_nAscent = +aTTInfo.winAscent;
- rInfo.m_nDescent = -aTTInfo.winDescent;
+ rInfo.m_nAscent = aTTInfo.winAscent;
+ rInfo.m_nDescent = aTTInfo.winDescent;
// mac fonts usually do not have an OS2-table
// => get valid ascent/descent values from other tables
if( !rInfo.m_nAscent )
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 5183cb9d9a4c..5011564a9065 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -183,74 +183,6 @@ sal_Bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
// -----------------------------------------------------------------------
-static struct PaperSizeEntry
-{
- double fWidth;
- double fHeight;
- Paper nPaper;
-} aPaperSizes[] =
-{
- { 842, 1191, PAPER_A3 },
- { 595, 842, PAPER_A4 },
- { 420, 595, PAPER_A5 },
- { 612, 792, PAPER_LETTER },
- { 612, 1008, PAPER_LEGAL },
- { 728, 1032, PAPER_B4_JIS },
- { 516, 729, PAPER_B5_JIS },
- { 792, 1224, PAPER_TABLOID }
-};
-
-static bool getPaperSize( double& o_fWidth, double& o_fHeight, const Paper i_ePaper )
-{
- for(unsigned int i = 0; i < SAL_N_ELEMENTS(aPaperSizes); i++ )
- {
- if( aPaperSizes[i].nPaper == i_ePaper )
- {
- o_fWidth = aPaperSizes[i].fWidth;
- o_fHeight = aPaperSizes[i].fHeight;
- return true;
- }
- }
- return false;
-}
-
-static Paper recognizePaper( double i_fWidth, double i_fHeight )
-{
- Paper aPaper = PAPER_USER;
- sal_uInt64 nPaperDesc = 1000000*sal_uInt64(i_fWidth) + sal_uInt64(i_fHeight);
- switch( nPaperDesc )
- {
- case 842001191: aPaper = PAPER_A3; break;
- case 595000842: aPaper = PAPER_A4; break;
- case 420000595: aPaper = PAPER_A5; break;
- case 612000792: aPaper = PAPER_LETTER; break;
- case 728001032: aPaper = PAPER_B4_JIS; break;
- case 516000729: aPaper = PAPER_B5_JIS; break;
- case 612001008: aPaper = PAPER_LEGAL; break;
- case 792001224: aPaper = PAPER_TABLOID; break;
- default:
- aPaper = PAPER_USER;
- break;
- }
-
- if( aPaper == PAPER_USER )
- {
- // search with fuzz factor
- for( unsigned int i = 0; i < SAL_N_ELEMENTS(aPaperSizes); i++ )
- {
- double w = (i_fWidth > aPaperSizes[i].fWidth) ? i_fWidth - aPaperSizes[i].fWidth : aPaperSizes[i].fWidth - i_fWidth;
- double h = (i_fHeight > aPaperSizes[i].fHeight) ? i_fHeight - aPaperSizes[i].fHeight : aPaperSizes[i].fHeight - i_fHeight;
- if( w < 3 && h < 3 )
- {
- aPaper = aPaperSizes[i].nPaper;
- break;
- }
- }
- }
-
- return aPaper;
-}
-
sal_Bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
{
// FIXME: implement driver data
@@ -269,7 +201,9 @@ sal_Bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
NSSize aPaperSize = [mpPrintInfo paperSize];
double width = aPaperSize.width, height = aPaperSize.height;
// set paper
- io_pSetupData->mePaperFormat = recognizePaper( width, height );
+ PaperInfo aInfo( PtTo10Mu( width ), PtTo10Mu( height ) );
+ aInfo.doSloppyFit();
+ io_pSetupData->mePaperFormat = aInfo.getPaper();
if( io_pSetupData->mePaperFormat == PAPER_USER )
{
io_pSetupData->mnPaperWidth = PtTo10Mu( width );
@@ -345,10 +279,9 @@ sal_Bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetu
}
else
{
- double w = 595, h = 842;
- getPaperSize( w, h, io_pSetupData->mePaperFormat );
- width = static_cast<long>(PtTo10Mu( w ));
- height = static_cast<long>(PtTo10Mu( h ));
+ PaperInfo aInfo( io_pSetupData->mePaperFormat );
+ width = aInfo.getWidth();
+ height = aInfo.getHeight();
}
setPaperSize( width, height, mePageOrientation );
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 095427cb1d23..6c06339445a4 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -121,6 +121,7 @@ AquaSalFrame::~AquaSalFrame()
SalData* pSalData = GetSalData();
pSalData->maFrames.remove( this );
pSalData->maFrameCheck.erase( this );
+ pSalData->maPresentationFrames.remove( this );
DBG_ASSERT( this != s_pCaptureFrame, "capture frame destroyed" );
if( this == s_pCaptureFrame )
@@ -852,13 +853,15 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart )
if( bStart )
{
+ GetSalData()->maPresentationFrames.push_back( this );
mpActivityTimer.reset( new PreventSleepTimer() );
- [mpWindow setLevel: NSScreenSaverWindowLevel];
+ [mpWindow setLevel: NSPopUpMenuWindowLevel];
if( mbShown )
[mpWindow makeMainWindow];
}
else
{
+ GetSalData()->maPresentationFrames.remove( this );
mpActivityTimer.reset();
[mpWindow setLevel: NSNormalWindowLevel];
}
diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index ea831f593bfb..5c6fb32acb9d 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -84,8 +84,9 @@ struct SalData
SALTIMERPROC mpTimerProc; // timer callback proc
AquaSalInstance *mpFirstInstance; // pointer of first instance
- std::list<AquaSalFrame*> maFrames; // pointer of first frame
+ std::list<AquaSalFrame*> maFrames; // list of all frames
boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance
+ std::list<AquaSalFrame*> maPresentationFrames; // list of frames in presentation mode
SalObject *mpFirstObject; // pointer of first object window
SalVirtualDevice *mpFirstVD; // first VirDev
SalPrinter *mpFirstPrinter; // first printing printer
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 91aec0e83ba5..e315609165c5 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -10213,9 +10213,6 @@ void PDFWriterImpl::drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
updateGraphicsState();
- if( m_aGraphicsStack.front().m_aLineColor == Color( COL_TRANSPARENT ) &&
- m_aGraphicsStack.front().m_aFillColor == Color( COL_TRANSPARENT ) )
- return;
if( rPolyPoly.Count() )
{
PolyPolygon aPolyPoly( rPolyPoly );
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index bfb28b5b6996..2001968c60e8 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -1227,6 +1227,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
aMapVDev.EnableOutput(sal_False);
VirtualDevice aPaintVDev; // into this one, we render.
+ aPaintVDev.SetBackground( aBackgroundComponent.aBgColor );
rOutMtf.AddAction( new MetaPushAction( PUSH_MAPMODE ) );
rOutMtf.AddAction( new MetaMapModeAction() );
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 3e701ec22d1e..5943c1749761 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2867,8 +2867,8 @@ sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
::GetTTGlobalFontInfo( aSftTTF.get(), &aTTInfo );
rInfo.m_nFontType = FontSubsetInfo::SFNT_TTF;
rInfo.m_aPSName = ImplSalGetUniString( aTTInfo.psname );
- rInfo.m_nAscent = +aTTInfo.winAscent;
- rInfo.m_nDescent = -aTTInfo.winDescent;
+ rInfo.m_nAscent = aTTInfo.winAscent;
+ rInfo.m_nDescent = aTTInfo.winDescent;
rInfo.m_aFontBBox = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
Point( aTTInfo.xMax, aTTInfo.yMax ) );
rInfo.m_nCapHeight = aTTInfo.yMax; // Well ...
generated by cgit (git 2.34.1) at 2024-10-15 16:34:53 +0000