INTEGRATION: CWS c17v003_DEV300 (1.43.16); FILE MERGED

2008/04/09 10:10:57 sj 1.43.16.1: #b662077# now exporting also text language settings
This commit is contained in:
Kurt Zenker 2008-05-20 16:18:15 +00:00
parent 0bd135a4aa
commit e5e03dbec6

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: eppt.hxx,v $ * $RCSfile: eppt.hxx,v $
* $Revision: 1.46 $ * $Revision: 1.47 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@ -93,6 +93,7 @@
#include <com/sun/star/awt/FontPitch.hpp> #include <com/sun/star/awt/FontPitch.hpp>
#include <com/sun/star/awt/CharSet.hpp> #include <com/sun/star/awt/CharSet.hpp>
#include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/lang/Locale.hpp>
enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 }; enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
@ -546,6 +547,7 @@ class PortionObj : public PropStateValue
::com::sun::star::beans::PropertyState meFontName; ::com::sun::star::beans::PropertyState meFontName;
::com::sun::star::beans::PropertyState meAsianOrComplexFont; ::com::sun::star::beans::PropertyState meAsianOrComplexFont;
::com::sun::star::beans::PropertyState meCharEscapement; ::com::sun::star::beans::PropertyState meCharEscapement;
::com::sun::star::lang::Locale meCharLocale;
sal_uInt16 mnCharAttrHard; sal_uInt16 mnCharAttrHard;
sal_uInt32 mnCharColor; sal_uInt32 mnCharColor;
@ -673,6 +675,7 @@ class TextObj
sal_uInt32 Count() const { return mpImplTextObj->mnTextSize; }; sal_uInt32 Count() const { return mpImplTextObj->mnTextSize; };
int GetInstance() const { return mpImplTextObj->mnInstance; }; int GetInstance() const { return mpImplTextObj->mnInstance; };
sal_Bool HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; }; sal_Bool HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; };
void WriteTextSpecInfo( SvStream* pStrm );
TextObj& operator=( TextObj& rTextObj ); TextObj& operator=( TextObj& rTextObj );
}; };