Fold BreakIterator_CTL into BreakIterator_th

The split is pointless and misleading, there are no other subclasses of
BreakIterator_CTL.

Change-Id: I66e66834e6e064cea29f543434a35682ee7cd35d
Reviewed-on: https://gerrit.libreoffice.org/54638
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>

2 files changed, 23 insertions, 65 deletions

diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
deleted file mode 100644
index a533b4bb7a15..000000000000
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_CTL_HXX
-#define INCLUDED_I18NPOOL_INC_BREAKITERATOR_CTL_HXX
-
-#include "breakiterator_unicode.hxx"
-#include "xdictionary.hxx"
-
-namespace i18npool {
-
-
-//  class BreakIterator_CTL
-
-class BreakIterator_CTL : public BreakIterator_Unicode
-{
-public:
-    BreakIterator_CTL();
-    virtual ~BreakIterator_CTL() override;
-    virtual sal_Int32 SAL_CALL previousCharacters(const OUString& text, sal_Int32 start,
-        const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
-        sal_Int32& nDone) override;
-    virtual sal_Int32 SAL_CALL nextCharacters(const OUString& text, sal_Int32 start,
-        const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
-        sal_Int32& nDone) override;
-    virtual css::i18n::LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const css::i18n::LineBreakHyphenationOptions& hOptions,
-        const css::i18n::LineBreakUserOptions& bOptions ) override;
-protected:
-    OUString cachedText; // for cell index
-    sal_Int32* nextCellIndex;
-    sal_Int32* previousCellIndex;
-    sal_Int32 cellIndexSize;
-
-    /// @throws css::uno::RuntimeException
-    virtual void makeIndex(const OUString& text, sal_Int32 pos);
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index 112d4327a56d..5c0119fbe919 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -18,25 +18,42 @@
  */
 #ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
 #define INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
-#include "breakiterator_ctl.hxx"
+
+#include "breakiterator_unicode.hxx"
+#include "xdictionary.hxx"
 
 namespace i18npool {
 
 
 //  class BreakIterator_th
 
-class BreakIterator_th : public BreakIterator_CTL
+class BreakIterator_th : public BreakIterator_Unicode
 {
 public:
     BreakIterator_th();
     virtual ~BreakIterator_th() override;
-
-protected:
-    void makeIndex(const OUString& text, sal_Int32 pos) override;
+    virtual sal_Int32 SAL_CALL previousCharacters(const OUString& text, sal_Int32 start,
+        const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
+        sal_Int32& nDone) override;
+    virtual sal_Int32 SAL_CALL nextCharacters(const OUString& text, sal_Int32 start,
+        const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
+        sal_Int32& nDone) override;
+    virtual css::i18n::LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
+        const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
+        const css::i18n::LineBreakHyphenationOptions& hOptions,
+        const css::i18n::LineBreakUserOptions& bOptions ) override;
+
+private:
+    OUString cachedText; // for cell index
+    sal_Int32* nextCellIndex;
+    sal_Int32* previousCellIndex;
+    sal_Int32 cellIndexSize;
+
+    void makeIndex(const OUString& text, sal_Int32 pos);
 };
 
 }
 
-#endif // INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */