strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dba17 (1.3.32); FILE MERGED

Browse source 
2004/09/29 09:58:01 fs 1.3.32.1: #i34773# added LineEndFormat property
This commit is contained in:
Pascal Junck 2004-10-22 10:42:08 +00:00
parent db241d6209
commit c704baedb2
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
forms/source/richtext/richtextmodel.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: richtextmodel.cxx,v $ * $RCSfile: richtextmodel.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: obo $ $Date: 2004-07-05 16:20:11 $ * last change: $Author: pjunck $ $Date: 2004-10-22 11:41:54 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -72,6 +72,9 @@
#endif #endif
/** === begin UNO includes === **/ /** === begin UNO includes === **/
#ifndef _COM_SUN_STAR_AWT_LINEENDFORMAT_HPP_
#include <com/sun/star/awt/LineEndFormat.hpp>
#endif
/** === end UNO includes === **/ /** === end UNO includes === **/
#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
@ -261,6 +264,7 @@ namespace frm
REGISTER_PROP_2( MAXTEXTLEN, m_nMaxTextLength, BOUND, MAYBEDEFAULT ); REGISTER_PROP_2( MAXTEXTLEN, m_nMaxTextLength, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( MULTILINE, m_bMultiLine, BOUND, MAYBEDEFAULT ); REGISTER_PROP_2( MULTILINE, m_bMultiLine, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( TEXT, m_sLastKnownEngineText, BOUND, MAYBEDEFAULT ); REGISTER_PROP_2( TEXT, m_sLastKnownEngineText, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( LINEEND_FORMAT, m_nLineEndFormat, BOUND, MAYBEDEFAULT );
REGISTER_VOID_PROP_2( ALIGN, m_aAlign, sal_Int16, BOUND, MAYBEDEFAULT ); REGISTER_VOID_PROP_2( ALIGN, m_aAlign, sal_Int16, BOUND, MAYBEDEFAULT );
} }
@ -463,6 +467,10 @@ namespace frm
switch ( _nHandle ) switch ( _nHandle )
{ {
case PROPERTY_ID_LINEEND_FORMAT:
aDefault <<= (sal_Int16)LineEndFormat::LINE_FEED;
break;
case PROPERTY_ID_ECHO_CHAR: case PROPERTY_ID_ECHO_CHAR:
case PROPERTY_ID_ALIGN: case PROPERTY_ID_ALIGN:
case PROPERTY_ID_MAXTEXTLEN: case PROPERTY_ID_MAXTEXTLEN:

5
forms/source/richtext/richtextmodel.hxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: richtextmodel.hxx,v $ * $RCSfile: richtextmodel.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: obo $ $Date: 2004-07-05 16:20:25 $ * last change: $Author: pjunck $ $Date: 2004-10-22 11:42:08 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -151,6 +151,7 @@ namespace frm
::rtl::OUString m_sHelpText; ::rtl::OUString m_sHelpText;
::rtl::OUString m_sHelpURL; ::rtl::OUString m_sHelpURL;
::rtl::OUString m_sLastKnownEngineText; ::rtl::OUString m_sLastKnownEngineText;
sal_Int16 m_nLineEndFormat;
sal_Int16 m_nBorder; sal_Int16 m_nBorder;
sal_Bool m_bEnabled; sal_Bool m_bEnabled;
sal_Bool m_bHardLineBreaks; sal_Bool m_bHardLineBreaks;