Revert "[Tizen] Sorts text sequences in LTR and RTL by system language direction."

This reverts commit 41ee2413bb9ab0bcc0bee6d52cbaac876520daf7.

diff --git a/dali/devel-api/text-abstraction/bidirectional-support.cpp b/dali/devel-api/text-abstraction/bidirectional-support.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 79389ae..b60f896
--- a/dali/devel-api/text-abstraction/bidirectional-support.cpp
+++ b/dali/devel-api/text-abstraction/bidirectional-support.cpp
@@ -46,14 +46,10 @@ BidirectionalSupport BidirectionalSupport::Get()
 }
 
 BidiInfoIndex BidirectionalSupport::CreateInfo( const Character* const paragraph,
-                                                Length numberOfCharacters,
-                                                bool matchSystemLanguageDirection,
-                                                LayoutDirection::Type layoutDirection )
+                                                Length numberOfCharacters )
 {
   return GetImplementation( *this ).CreateInfo( paragraph,
-                                                numberOfCharacters,
-                                                matchSystemLanguageDirection,
-                                                layoutDirection );
+                                                numberOfCharacters );
 }
 
 void BidirectionalSupport::DestroyInfo( BidiInfoIndex bidiInfoIndex )

diff --git a/dali/devel-api/text-abstraction/bidirectional-support.h b/dali/devel-api/text-abstraction/bidirectional-support.h
index 142cdab..55ba1f9 100755 (executable)
--- a/dali/devel-api/text-abstraction/bidirectional-support.h
+++ b/dali/devel-api/text-abstraction/bidirectional-support.h
@@ -23,7 +23,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/actors/actor-enumerations.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
@@ -82,14 +81,11 @@ public:
    *
    * @param[in] paragraph Pointer to the first character of the paragraph coded in UTF32.
    * @param[in] numberOfCharacters The number of characters of the paragraph.
-   * @param[in] matchSystemLanguageDirection Whether match for system language direction or not.
-   * @param[in] layoutDirection The direction of the system language.
+   *
    * @return An index of an object inside a table storing the bidirectional data.
    */
   BidiInfoIndex CreateInfo( const Character* const paragraph,
-                            Length numberOfCharacters,
-                            bool matchSystemLanguageDirection,
-                            LayoutDirection::Type layoutDirection );
+                            Length numberOfCharacters );
 
   /**
    * @brief Destroys the bidirectional data.

diff --git a/dali/internal/text/text-abstraction/bidirectional-support-impl.cpp b/dali/internal/text/text-abstraction/bidirectional-support-impl.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 29bd3b9..5d096c3
--- a/dali/internal/text/text-abstraction/bidirectional-support-impl.cpp
+++ b/dali/internal/text/text-abstraction/bidirectional-support-impl.cpp
@@ -126,9 +126,7 @@ struct BidirectionalSupport::Plugin
   }
 
   BidiInfoIndex CreateInfo( const Character* const paragraph,
-                            Length numberOfCharacters,
-                            bool matchSystemLanguageDirection,
-                            LayoutDirection::Type layoutDirection )
+                            Length numberOfCharacters )
   {
     // Reserve memory for the paragraph's bidirectional info.
     BidirectionalInfo* bidirectionalInfo = new BidirectionalInfo();
@@ -152,9 +150,7 @@ struct BidirectionalSupport::Plugin
     fribidi_get_bidi_types( paragraph, numberOfCharacters, bidirectionalInfo->characterTypes );
 
     // Retrieve the paragraph's direction.
-    bidirectionalInfo->paragraphDirection = matchSystemLanguageDirection == true ?
-                                           ( layoutDirection == LayoutDirection::RIGHT_TO_LEFT ? FRIBIDI_PAR_RTL : FRIBIDI_PAR_LTR ) :
-                                           ( fribidi_get_par_direction( bidirectionalInfo->characterTypes, numberOfCharacters ) );
+    bidirectionalInfo->paragraphDirection = fribidi_get_par_direction( bidirectionalInfo->characterTypes, numberOfCharacters );
 
     // Retrieve the embedding levels.
     if (fribidi_get_par_embedding_levels( bidirectionalInfo->characterTypes, numberOfCharacters, &bidirectionalInfo->paragraphDirection, bidirectionalInfo->embeddedLevels ) == 0)
@@ -394,16 +390,12 @@ TextAbstraction::BidirectionalSupport BidirectionalSupport::Get()
 }
 
 BidiInfoIndex BidirectionalSupport::CreateInfo( const Character* const paragraph,
-                                                Length numberOfCharacters,
-                                                bool matchSystemLanguageDirection,
-                                                Dali::LayoutDirection::Type layoutDirection )
+                                                Length numberOfCharacters )
 {
   CreatePlugin();
 
   return mPlugin->CreateInfo( paragraph,
-                              numberOfCharacters,
-                              matchSystemLanguageDirection,
-                              layoutDirection );
+                              numberOfCharacters );
 }
 
 void BidirectionalSupport::DestroyInfo( BidiInfoIndex bidiInfoIndex )

diff --git a/dali/internal/text/text-abstraction/bidirectional-support-impl.h b/dali/internal/text/text-abstraction/bidirectional-support-impl.h
old mode 100755 (executable)
new mode 100644 (file)
index 8964856..ab180c2
--- a/dali/internal/text/text-abstraction/bidirectional-support-impl.h
+++ b/dali/internal/text/text-abstraction/bidirectional-support-impl.h
@@ -60,9 +60,7 @@ public:
    * @copydoc Dali::BidirectionalSupport::CreateInfo()
    */
   BidiInfoIndex CreateInfo( const Character* const paragraph,
-                            Length numberOfCharacters,
-                            bool matchSystemLanguageDirection,
-                            LayoutDirection::Type layoutDirection );
+                            Length numberOfCharacters );
 
   /**
    * @copydoc Dali::BidirectionalSupport::DestroyInfo()