[Libreoffice-commits] core.git: i18npool/inc i18npool/source

[Stephan Bergmann]

 i18npool/inc/breakiterator_unicode.hxx                  |    2 +-
 i18npool/source/breakiterator/breakiterator_th.cxx      |    2 +-
 i18npool/source/breakiterator/breakiterator_unicode.cxx |    7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 3b6ee58652d99accd610425264114d1d5b3330df
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 15 23:04:36 2014 +0200

    Remove unused BreakIterator_Unicode::wordRule
    
    Change-Id: I8cde0dfd7b760d8075f53b9de8a8d3a81a57dc27

diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index c72c2d6..072fcd7 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -72,7 +72,7 @@ public:
         throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 protected:
-    const sal_Char *cBreakIterator, *wordRule, *lineRule;
+    const sal_Char *cBreakIterator, *lineRule;
     Boundary result; // for word break iterator
 
     struct BI_Data
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index d81ef13a..cdd4c4a 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 BreakIterator_th::BreakIterator_th()
 {
     cBreakIterator = "com.sun.star.i18n.BreakIterator_th";
-    wordRule=lineRule=NULL;
+    lineRule=NULL;
 }
 
 BreakIterator_th::~BreakIterator_th()
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 658d4ff..933e775 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -42,7 +42,6 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 BreakIterator_Unicode::BreakIterator_Unicode()
     : cBreakIterator( "com.sun.star.i18n.BreakIterator_Unicode" )    // implementation name
-    , wordRule( "word" )
     , lineRule( "line" )
     , icuBI( NULL )
     , aBreakType(0)
@@ -91,12 +90,12 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
             switch (nWordType) {
                 case WordType::ANY_WORD: break; // odd but previous behavior
                 case WordType::ANYWORD_IGNOREWHITESPACES:
-                    breakType = 0; rule = wordRule = "edit_word"; break;
+                    breakType = 0; rule = "edit_word"; break;
                 case WordType::DICTIONARY_WORD:
-                    breakType = 1; rule = wordRule = "dict_word"; break;
+                    breakType = 1; rule = "dict_word"; break;
                 default:
                 case WordType::WORD_COUNT:
-                    breakType = 2; rule = wordRule = "count_word"; break;
+                    breakType = 2; rule = "count_word"; break;
             }
             break;
         case LOAD_SENTENCE_BREAKITERATOR: icuBI=&sentence; breakType = 5; break;