Merge "Notify multiline hint to IMF context" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-controller-impl.h

diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h
index b97a419..f47fd54 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-impl.h
+++ b/dali-toolkit/internal/text/text-controller-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_H__
 
 /*
 #define __DALI_TOOLKIT_TEXT_CONTROLLER_IMPL_H__
 
 /*

- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -166,7 +166,6 @@ struct FontDefaults
 {
   FontDefaults()
   : mFontDescription(),
 {
   FontDefaults()
   : mFontDescription(),

-    mFontStyle(),

     mDefaultPointSize( 0.f ),
     mFontId( 0u ),
     familyDefined( false ),
     mDefaultPointSize( 0.f ),
     mFontId( 0u ),
     familyDefined( false ),


@@ -192,7 +191,6 @@ struct FontDefaults
   }
 
   TextAbstraction::FontDescription mFontDescription;  ///< The default font's description.
   }
 
   TextAbstraction::FontDescription mFontDescription;  ///< The default font's description.

-  std::string                      mFontStyle;        ///< The font's style string set through the property system.

   float                            mDefaultPointSize; ///< The default font's point size.
   FontId                           mFontId;           ///< The font's id of the default font.
   bool familyDefined:1; ///< Whether the default font's family name is defined.
   float                            mDefaultPointSize; ///< The default font's point size.
   FontId                           mFontId;           ///< The font's id of the default font.
   bool familyDefined:1; ///< Whether the default font's family name is defined.