cws tlmath01: #i972# Math baseline alignment

3 files changed, 17 insertions, 14 deletions

diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx
index 5776cc9f3dd8..a1f16874bc3e 100644
--- a/sw/source/ui/inc/frmdlg.hxx
+++ b/sw/source/ui/inc/frmdlg.hxx
@@ -41,6 +41,7 @@ class SwFrmDlg : public SfxTabDialog
     BOOL                m_bFormat;
     BOOL                m_bNew;
     BOOL                m_bHTMLMode;
+    bool                m_bEnableVertPos;
     const SfxItemSet&   m_rSet;
     USHORT              m_nDlgType;
     SwWrtShell*         m_pWrtShell;
@@ -63,4 +64,4 @@ public:
 };
 
 
-#endif // _FRMDLG_HXX
+#endif // _FRMDLG_HXX
\ No newline at end of file
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index 219f6c37a308..918a7042675c 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -28,27 +28,17 @@
 #ifndef _FRMPAGE_HXX
 #define _FRMPAGE_HXX
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 #include <sfx2/tabdlg.hxx>
 #include <svx/swframeposstrings.hxx>
 #include <swtypes.hxx>
 #include <bmpwin.hxx>
 #include <svx/swframeexample.hxx>
 #include <prcntfld.hxx>
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
 
 
 namespace sfx2{class FileDialogHelper;}
@@ -142,6 +132,10 @@ class SwFrmPage: public SfxTabPage
     FrmMap* pVMap;
     FrmMap* pHMap;
 
+    bool    m_bAllowVertPositioning;
+    bool    m_bIsMathOLE;
+    bool    m_bIsMathBaselineAlignment;
+
     virtual void    ActivatePage(const SfxItemSet& rSet);
     virtual int     DeactivatePage(SfxItemSet *pSet);
 
@@ -205,6 +199,7 @@ public:
     void            SetFormatUsed(BOOL bFmt);
     void            SetFrmType(USHORT nType)    { nDlgType  = nType;     }
     inline BOOL     IsInGraficMode( void )      { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; }
+    void            EnableVerticalPositioning( bool bEnable );
 };
 
 class SwGrfExtPage: public SfxTabPage
@@ -341,4 +336,4 @@ public:
 
 };
 
-#endif // _FRMPAGE_HXX
+#endif // _FRMPAGE_HXX
\ No newline at end of file
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index d05e68588b2d..61b8056aa309 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -353,6 +353,12 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage
     FixedLine       aCrsrOptFL;
     CheckBox        aCrsrInProtCB;
 
+    FixedLine       m_aLayoutOptionsFL;
+    CheckBox        m_aMathBaselineAlignmentCB;
+
+    SwWrtShell *    m_pWrtShell;
+
+
     SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
     ~SwShdwCrsrOptionsTabPage();
 
@@ -362,6 +368,9 @@ public:
 
     virtual BOOL        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
+
+    void    SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; }
+    virtual void        PageCreated( SfxAllItemSet aSet );
 };
 
 /*-----------------------------------------------------------------------
@@ -498,5 +507,3 @@ private:
 };
 #endif //PRODUCT
 #endif
-
-