basic: Merge macro snippet tests

Change-Id: Ia2d8944227c6be8b5ae7b42f7d566ac150d522b9

basic/qa/cppunit/test_vba.cxx

@@ -7,15 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 #include "basictest.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <comphelper/processfactory.hxx>
+#include <unotools/syslocaleoptions.hxx>
+
 using namespace ::com::sun::star;
 
 namespace
 {
-
-
     class VBATest : public test::BootstrapFixture
     {
         public:
@@ -58,9 +56,10 @@ void VBATest::testMiscVBAFunctions()
     };
     OUString sMacroPathURL = getURLFromSrc("/basic/qa/vba_tests/");
     // Some test data expects the uk locale
-    AllSettings aSettings = Application::GetSettings();
-    aSettings.SetLanguageTag( LanguageTag( LANGUAGE_ENGLISH_UK ) );
-    Application::SetSettings( aSettings );
+    LanguageTag aLocale(LANGUAGE_ENGLISH_UK);
+    SvtSysLocaleOptions aLocalOptions;
+    aLocalOptions.SetLocaleConfigString( aLocale.getBcp47() );
+
     for ( sal_uInt32  i=0; i<SAL_N_ELEMENTS( macroSource ); ++i )
     {
         OUString sMacroURL( sMacroPathURL );
@@ -141,11 +140,8 @@ void VBATest::testMiscOLEStuff()
 #endif
 }
 
-  // Put the test suite in the registry
-
   // Put the test suite in the registry
   CPPUNIT_TEST_SUITE_REGISTRATION(VBATest);
-} // namespace
-CPPUNIT_PLUGIN_IMPLEMENT();
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */