summaryrefslogtreecommitdiff
path: root/starmath/inc/document.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:11 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:11 +0200
commit7a9916abd9ead998e6b0b6442bea67827411f4b7 (patch)
tree51da9b48384426b750242e2cd1d26034f2d26cfd /starmath/inc/document.hxx
parentef599bd8ed7aba0240e0d7a4c3f9b744044d34b4 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit a459007bd5e462d85981eaa32e3b970555bcdea6 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:22 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit dce61127f79a7a991ff32208b72e931d2353e1cd Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:54:40 2011 -0500 Remove pesky on-line registration menu entry. (fdo#33112) sw/uiconfig/swform/menubar/menubar.xml | 1 - sw/uiconfig/swreport/menubar/menubar.xml | 1 - sw/uiconfig/swxform/menubar/menubar.xml | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) commit a9c85da2fa4919e2520a6db08d3836e00a2b3fa9 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jan 14 11:44:23 2011 +0000 Resolves: fdo#32633 use standard Edit button width of 50 (cherry picked from commit a3c9ea96b2deee09060fae80d673e262b27872bb) sw/source/ui/misc/titlepage.src | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit a79b457b9123b253bdadcb7c7602b8186b30d701 Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 11 20:33:41 2011 +0000 fix this to build sw/source/core/crsr/pam.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit fec902aecf9b4f5cee9d0fa18e502a136bd52595 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Jan 11 20:18:26 2011 +0100 n#657135: Enhanced fields fixes (key inputs, and 0-length fields import) sw/source/core/crsr/bookmrk.cxx | 2 +- sw/source/core/crsr/pam.cxx | 5 +++-- sw/source/filter/ww8/wrtw8nds.cxx | 6 +++--- sw/source/filter/ww8/ww8scan.hxx | 2 +- sw/source/ui/docvw/edtwin.cxx | 19 ++++++++++++++++--- 5 files changed, 24 insertions(+), 10 deletions(-) commit 8f92e60e028df8c0bd32aa3a04f7105d8446bf4a Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:38 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: writer_libreoffice-3.3.0.4
Diffstat (limited to 'starmath/inc/document.hxx')
-rw-r--r--starmath/inc/document.hxx102
1 files changed, 51 insertions, 51 deletions
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 6f73e2244009..6cf38965deba 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
#ifndef DOCUMENT_HXX
#define DOCUMENT_HXX
-#define SMDLL 1
+#define SMDLL 1
#include <sot/storage.hxx>
#include <sot/sotref.hxx>
@@ -50,20 +50,20 @@ class SfxPrinter;
class Printer;
class SmCursor;
-#define HINT_DATACHANGED 1004
+#define HINT_DATACHANGED 1004
-#define SM30BIDENT ((ULONG)0x534D3033L)
-#define SM30IDENT ((ULONG)0x30334d53L)
+#define SM30BIDENT ((ULONG)0x534D3033L)
+#define SM30IDENT ((ULONG)0x30334d53L)
#define SM304AIDENT ((ULONG)0x34303330L)
#define SM30VERSION ((ULONG)0x00010000L)
-#define SM50VERSION ((ULONG)0x00010001L) //Unterschied zur SM30VERSION ist
+#define SM50VERSION ((ULONG)0x00010001L) //Unterschied zur SM30VERSION ist
//der neue Border im Format.
-#define FRMIDENT ((ULONG)0x03031963L)
-#define FRMVERSION ((ULONG)0x00010001L)
+#define FRMIDENT ((ULONG)0x03031963L)
+#define FRMVERSION ((ULONG)0x00010001L)
-#define STAROFFICE_XML "StarOffice XML (Math)"
-#define MATHML_XML "MathML XML (Math)"
+#define STAROFFICE_XML "StarOffice XML (Math)"
+#define MATHML_XML "MathML XML (Math)"
/* Zugriff auf den Drucker sollte ausschliesslich ueber diese Klasse erfolgen
* ==========================================================================
@@ -111,22 +111,22 @@ class SmDocShell : public SfxObjectShell, public SfxListener
friend class SmModel;
friend class SmCursor;
- String aText;
- SmFormat aFormat;
- SmParser aInterpreter;
+ String aText;
+ SmFormat aFormat;
+ SmParser aInterpreter;
String aAccText;
- SmNode *pTree;
+ SmNode *pTree;
SfxMenuBarManager *pMenuMgr;
- SfxItemPool *pEditEngineItemPool;
- EditEngine *pEditEngine;
- SfxPrinter *pPrinter; //Siehe Kommentar zum SmPrinter Access!
- Printer *pTmpPrinter; //ebenfalls
- long nLeftBorder,
+ SfxItemPool *pEditEngineItemPool;
+ EditEngine *pEditEngine;
+ SfxPrinter *pPrinter; //Siehe Kommentar zum SmPrinter Access!
+ Printer *pTmpPrinter; //ebenfalls
+ long nLeftBorder,
nRightBorder,
nTopBorder,
nBottomBorder;
- USHORT nModifyCount;
- BOOL bIsFormulaArranged;
+ USHORT nModifyCount;
+ BOOL bIsFormulaArranged;
SmCursor *pCursor;
@@ -136,11 +136,11 @@ class SmDocShell : public SfxObjectShell, public SfxListener
BOOL WriteAsMathType3( SfxMedium& );
- virtual void Draw(OutputDevice *pDevice,
+ virtual void Draw(OutputDevice *pDevice,
const JobSetup & rSetup,
USHORT nAspect = ASPECT_CONTENT);
- virtual void FillClass(SvGlobalName* pClassName,
+ virtual void FillClass(SvGlobalName* pClassName,
sal_uInt32* pFormat,
String* pAppName,
String* pFullTypeName,
@@ -148,13 +148,13 @@ class SmDocShell : public SfxObjectShell, public SfxListener
sal_Int32 nFileFormat,
sal_Bool bTemplate = sal_False ) const;
- virtual BOOL SetData( const String& rData );
- virtual ULONG GetMiscStatus() const;
- virtual void OnDocumentPrinterChanged( Printer * );
+ virtual BOOL SetData( const String& rData );
+ virtual ULONG GetMiscStatus() const;
+ virtual void OnDocumentPrinterChanged( Printer * );
virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
virtual BOOL Load( SfxMedium& rMedium );
- void ImplSave( SvStorageStreamRef xStrm );
- virtual BOOL Save();
+ void ImplSave( SvStorageStreamRef xStrm );
+ virtual BOOL Save();
virtual BOOL SaveAs( SfxMedium& rMedium );
virtual BOOL ConvertTo( SfxMedium &rMedium );
virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
@@ -162,10 +162,10 @@ class SmDocShell : public SfxObjectShell, public SfxListener
Printer *GetPrt();
OutputDevice* GetRefDev();
- BOOL IsFormulaArranged() const { return bIsFormulaArranged; }
- void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; }
+ BOOL IsFormulaArranged() const { return bIsFormulaArranged; }
+ void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; }
- virtual BOOL ConvertFrom(SfxMedium &rMedium);
+ virtual BOOL ConvertFrom(SfxMedium &rMedium);
/** Called whenever the formula is changed
* Deletes the current cursor
@@ -179,10 +179,10 @@ public:
SFX_DECL_OBJECTFACTORY();
SmDocShell( const sal_uInt64 i_nSfxCreationFlags );
- virtual ~SmDocShell();
+ virtual ~SmDocShell();
- void LoadSymbols();
- void SaveSymbols();
+ void LoadSymbols();
+ void SaveSymbols();
void ArrangeFormula();
@@ -190,9 +190,9 @@ public:
//und fuer die Kommunikation mit dem SFX!
//Alle internen Verwendungen des Printers sollten ausschlieslich uber
//den SmPrinterAccess funktionieren.
- BOOL HasPrinter() { return 0 != pPrinter; }
- SfxPrinter *GetPrinter() { GetPrt(); return pPrinter; }
- void SetPrinter( SfxPrinter * );
+ BOOL HasPrinter() { return 0 != pPrinter; }
+ SfxPrinter *GetPrinter() { GetPrt(); return pPrinter; }
+ void SetPrinter( SfxPrinter * );
const String GetComment() const;
@@ -200,32 +200,32 @@ public:
sal_Bool ReplaceBadChars();
void UpdateText();
- void SetText(const String& rBuffer);
- String& GetText() { return (aText); }
- void SetFormat(SmFormat& rFormat);
+ void SetText(const String& rBuffer);
+ String& GetText() { return (aText); }
+ void SetFormat(SmFormat& rFormat);
const SmFormat& GetFormat() { return (aFormat); }
- void Parse();
- SmParser & GetParser() { return aInterpreter; }
- const SmNode * GetFormulaTree() const { return pTree; }
- void SetFormulaTree(SmNode *&rTree) { pTree = rTree; }
+ void Parse();
+ SmParser & GetParser() { return aInterpreter; }
+ const SmNode * GetFormulaTree() const { return pTree; }
+ void SetFormulaTree(SmNode *&rTree) { pTree = rTree; }
String GetAccessibleText();
- EditEngine & GetEditEngine();
- SfxItemPool & GetEditEngineItemPool();
+ EditEngine & GetEditEngine();
+ SfxItemPool & GetEditEngineItemPool();
- void DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection = FALSE);
- Size GetSize();
+ void DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection = FALSE);
+ Size GetSize();
void Repaint();
- virtual SfxUndoManager *GetUndoManager ();
+ virtual SfxUndoManager *GetUndoManager ();
virtual SfxItemPool& GetPool() const;
- void Execute( SfxRequest& rReq );
- void GetState(SfxItemSet &);
+ void Execute( SfxRequest& rReq );
+ void GetState(SfxItemSet &);
virtual void SetVisArea (const Rectangle & rVisArea);
virtual void SetModified(BOOL bModified);