0 Replies Latest reply on Mar 24, 2010 5:53 PM by Carol L. Frampton

    [svn:fx-trunk] 15011: Merge changes 14914,14929,14952,14961,14987  from 4. x to trunk.

    Carol L. Frampton Level 2

      Revision: 15011

      Revision: 15011

      Author:   cframpto@adobe.com

      Date:     2010-03-24 17:53:17 -0700 (Wed, 24 Mar 2010)

      Log Message:

      ***********

      Merge changes 14914,14929,14952,14961,14987  from 4.x to trunk.  Includes TLF1.1 Build 587 and mirroring changes.

       

      Modified Paths:

      **************

          flex/sdk/trunk/frameworks/air-config.xml

          flex/sdk/trunk/frameworks/flex-config.xml

          flex/sdk/trunk/frameworks/libs/textLayout.swc

          flex/sdk/trunk/frameworks/projects/airframework/src/mx/core/Window.as

          flex/sdk/trunk/frameworks/projects/textLayout/ReleaseNotes.txt

          flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.compos e.xml

          flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.contai ner.xml

          flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.conver sion.xml

          flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.elemen ts.xml

          flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.format s.xml

          flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.undo.xml

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/BuildInfo.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/BaseCompose.a s

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/ComposeState. as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/SimpleCompose .as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/StandardFlowC omposer.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/TextFlowLine. as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/TextLineRecyc ler.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/container/ContainerCo ntroller.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/container/TextContain erManager.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/conversion/HtmlImport er.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/conversion/TextConver ter.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/conversion/TextLayout Importer.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/edit/EditManager.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/edit/IMEClient.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/edit/SelectionManager .as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/FlowElement. as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/FlowGroupEle ment.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/FlowLeafElem ent.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/GlobalSettin gs.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/InlineGraphi cElement.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/LinkElement. as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/ParagraphEle ment.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/SpanElement. as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/SubParagraph GroupElement.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/TextFlow.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/factory/StringTextLin eFactory.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/factory/TextFlowTextL ineFactory.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/factory/TextLineFacto ryBase.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/ITabStopForma t.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/ITextLayoutFo rmat.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TabStopFormat .as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TabStopFormat Inc.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TextLayoutFor mat.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TextLayoutFor matInc.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TextLayoutFor matValueHolder.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/operations/InsertText Operation.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/property/Property.as

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/undo/UndoManager.as

       

      Added Paths:

      ***********

          flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/utils/Twips.as

          flex/sdk/trunk/frameworks/rsls/textLayout_1.1.0.597.swf

       

      Removed Paths:

      *************

          flex/sdk/trunk/frameworks/rsls/textLayout_1.0.0.595.swf

       

      Property Changed:

      ****************

          flex/sdk/trunk/