[Libreoffice-commits] .: desktop/source sal/qa vcl/generic vcl/source

[Libreoffice Gerrit user]

 desktop/source/app/langselect.cxx      |    1 -
 sal/qa/rtl/locale/rtl_locale.cxx       |   13 -------------
 vcl/generic/fontmanager/fontconfig.cxx |    1 -
 vcl/source/app/brand.cxx               |    1 -
 4 files changed, 16 deletions(-)

New commits:
commit f36aec428390eb7145a466e9773e04271038247d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 30 20:45:29 2012 +0100

    eradicate all traces of OLocale and rtl/locale.hxx
    
    ... damn language tags breaking builds left and right ...
    
    Change-Id: I73224cb3fb2bb98779fdcace700cad2a4fb7cd0e

diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 085e0a7..e254493 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/lang/XLocalizable.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include "com/sun/star/util/XFlushable.hpp"
-#include <rtl/locale.hxx>
 #include <rtl/instance.hxx>
 #include <osl/process.h>
 #include <osl/file.hxx>
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 6607b76..5494a18 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -48,18 +48,6 @@ public:
     {
     }
 
-    // insert your test code here.
-    void getDefault_000()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        // due to the fact, we set the default locale at first, this test is no longer possible
-       // ::rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
-        // CPPUNIT_ASSERT_MESSAGE("locale must be null", aLocale.getData() == NULL);
-
-    }
-
     void getDefault_001()
     {
         rtl_Locale* pData = rtl_locale_getDefault();
@@ -71,7 +59,6 @@ public:
     // because these macros are need by auto register mechanism.
 
     CPPUNIT_TEST_SUITE(getDefault);
-    CPPUNIT_TEST(getDefault_000);
     CPPUNIT_TEST(getDefault_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class getDefault
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 86c4ff5..b707b78 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -87,7 +87,6 @@ using namespace psp;
 #include "osl/process.h"
 
 #include "rtl/ustrbuf.hxx"
-#include "rtl/locale.hxx"
 
 #include "sal/alloca.h"
 
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 74d5510..33b8bdd 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -19,7 +19,6 @@
 
 #include <rtl/ustring.hxx>
 #include <rtl/bootstrap.hxx>
-#include <rtl/locale.hxx>
 #include <osl/process.h>
 #include <tools/urlobj.hxx>
 #include <tools/stream.hxx>