summaryrefslogtreecommitdiff
path: root/vcl/aqua
diff options
context:
space:
mode:
authorJosh Heidenreich <josh.sickmate@gmail.com>2012-02-21 13:06:11 +1030
committerJosh Heidenreich <josh.sickmate@gmail.com>2012-02-22 09:09:57 +1030
commit936ebcfa4b44a90bdc8789ce7556f1ba3599375c (patch)
tree226f48b0eae7ba432d4cc564cd407074ecf94173 /vcl/aqua
parentb1073d9fa264139333704f82553ade9979e2ca24 (diff)
EasyHack fdo#46258 Removal of VCL testtool support (-enableautomation option)
Diffstat (limited to 'vcl/aqua')
-rw-r--r--vcl/aqua/source/app/salinst.cxx3
-rw-r--r--vcl/aqua/source/window/salmenu.cxx2
2 files changed, 1 insertions, 4 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index adae096e3e0c..7a01b0b0c102 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -206,9 +206,6 @@ static void initNSApp()
selector: @selector(applicationWillResignActive:)
name: @"AppleRemoteWillResignActive"
object: nil ];
-
- if( ImplGetSVData()->mbIsTestTool )
- [NSApp activateIgnoringOtherApps: YES];
}
sal_Bool ImplSVMainHook( int * pnInit )
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 23d01805af24..f358e47c743e 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -542,7 +542,7 @@ sal_Bool AquaSalMenu::VisibleMenuBar()
static const char *pExperimental = getenv ("AQUA_NATIVE_MENUS");
- if ( ImplGetSVData()->mbIsTestTool || (pExperimental && !strcasecmp(pExperimental, "FALSE")) )
+ if ( pExperimental && !strcasecmp(pExperimental, "FALSE") )
return sal_False;
// End of experimental code enable/disable part