mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS presfixes01 (1.2.10); FILE MERGED

Browse Source 
2005/02/16 11:14:16 fs 1.2.10.3: #i42558# drafts.com.sun.star.drawing/rendering/geometry moved to com.sun.star.*
2005/02/07 01:09:50 thb 1.2.10.2: #i38960# Added todo
2005/01/26 11:28:43 thb 1.2.10.1: #116716# Corrected text direction setup; text layout always outputs LTR
This commit is contained in:
Vladimir Glazounov
2005-03-10 11:01:22 +00:00
parent c8fd0cf2ac
commit 12f849f726
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
canvas/source/vcl/textlayout.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: textlayout.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: rt $ $Date: 2004-11-26 17:16:04 $
* last change: $Author: vg $ $Date: 2005-03-10 12:01:22 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -66,8 +66,8 @@
#include <boost/scoped_array.hpp>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_TEXTDIRECTION_HPP_
#include <drafts/com/sun/star/rendering/TextDirection.hpp>
#ifndef _COM_SUN_STAR_RENDERING_TEXTDIRECTION_HPP_
#include <com/sun/star/rendering/TextDirection.hpp>
#endif
#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -82,7 +82,6 @@
using namespace ::com::sun::star;
using namespace ::drafts::com::sun::star;
namespace vclcanvas
{
@@ -237,12 +236,17 @@ namespace vclcanvas
break;
}
rOutDev.SetLayoutMode( nLayoutMode );
// set calculated layout mode. Origin is always the left edge,
// as required at the API spec
rOutDev.SetLayoutMode( nLayoutMode | TEXT_LAYOUT_TEXTORIGIN_LEFT );
// TODO(P2): cache that
::boost::scoped_array< long > aOffsets(new long[maLogicalAdvancements.getLength()]);
setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState );
// TODO(F3): ensure correct length and termination for DX
// array (last entry _must_ contain the overall width)
rOutDev.DrawTextArray( rOutpos,
maText.Text,
aOffsets.get(),
@@ -306,7 +310,7 @@ namespace vclcanvas
}
#define SERVICE_NAME "drafts.com.sun.star.rendering.TextLayout"
#define SERVICE_NAME "com.sun.star.rendering.TextLayout"
::rtl::OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException )
{