INTEGRATION: CWS tl07 (1.20.6); FILE MERGED

2005/02/11 14:12:21 tl 1.20.6.3: #i38930# fix for sometimes missing reference device in Math
2005/01/24 14:34:01 tl 1.20.6.2: RESYNC: (1.20-1.21); FILE MERGED
2004/12/16 12:24:30 tl 1.20.6.1: #i39124# removed code that is used only in the binfilter now
This commit is contained in:
Rüdiger Timm 2005-04-04 07:02:55 +00:00
parent b1b5579001
commit 5dfaf14dc6

View file

@ -2,9 +2,9 @@
*
* $RCSfile: document.hxx,v $
*
* $Revision: 1.21 $
* $Revision: 1.22 $
*
* last change: $Author: rt $ $Date: 2005-01-11 13:08:12 $
* last change: $Author: rt $ $Date: 2005-04-04 08:02:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -150,6 +150,7 @@ public:
class SmDocShell : public SfxObjectShell, public SfxListener
{
friend class SmPrinterAccess;
friend class SmModel;
String aText;
SmFormat aFormat;
@ -176,10 +177,6 @@ class SmDocShell : public SfxObjectShell, public SfxListener
void RestartFocusTimer ();
BOOL Try3x( SvStorage *pStor, StreamMode eMode);
BOOL Try2x( SvStorage *pStor, StreamMode eMode);
BOOL WriteAsMathType3( SfxMedium& );
virtual void Draw(OutputDevice *pDevice,
const JobSetup & rSetup,
USHORT nAspect = ASPECT_CONTENT);
@ -206,9 +203,6 @@ class SmDocShell : public SfxObjectShell, public SfxListener
Printer *GetPrt();
OutputDevice* GetRefDev();
// used to convert the formula text between different office versions
void ConvertText( String &rText, SmConvert eConv );
BOOL IsFormulaArranged() const { return bIsFormulaArranged; }
void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; }
void ArrangeFormula();
@ -216,8 +210,6 @@ class SmDocShell : public SfxObjectShell, public SfxListener
virtual BOOL ConvertFrom(SfxMedium &rMedium);
BOOL InsertFrom(SfxMedium &rMedium);
BOOL ImportSM20File(SvStream *pStream);
void UpdateText();
public: