cws tl74: merge

5 files changed, 76 insertions, 61 deletions

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 94bffbaad48d..210f2022b760 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -38,11 +38,10 @@
 #include <svl/lstner.hxx>
 #include <sfx2/docfac.hxx>
 #include <vcl/virdev.hxx>
+
 #include "format.hxx"
 #include "parse.hxx"
-#ifndef SMMOD_HXX
 #include "smmod.hxx"
-#endif
 
 #include <vcl/jobset.hxx>
 
@@ -84,6 +83,8 @@ class Printer;
 class SmDocShell;
 class EditEngine;
 
+////////////////////////////////////////////////////////////
+
 class SmPrinterAccess
 {
     Printer* pPrinter;
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 0f93e6551cc9..96f405ed7e8e 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -103,6 +103,8 @@
 #define RID_SYMBOLDIALOG            (RID_APP_START + 8)
 #define RID_SYMDEFINEDIALOG         (RID_APP_START + 9)
 #define RID_EXTRAOPTIONPAGE         (RID_APP_START + 10)
+#define RID_PRINTUIOPTIONS          (RID_APP_START + 11)
+
 #define RID_MATH_TOOLBOX            (RID_APP_START + 50)
 // wegen #58705# entfernt
 //#define RID_DRAW_OBJECTBAR            (RID_APP_START + 51)
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index 3cf63b076391..be3db98dbd94 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -31,9 +31,9 @@
 #define TYPES_HXX
 
 #include <sal/types.h>
+#include <tools/debug.hxx>
 
-#define FONTNAME_MATH   "StarSymbol"
-#define FONTNAME_MATH2  "OpenSymbol"
+#define FONTNAME_MATH   "OpenSymbol"
 
 /////////////////////////////////////////////////////////////////
 
@@ -54,19 +54,8 @@ inline sal_Bool IsInPrivateUseArea( sal_Unicode cChar ) { return 0xE000 <= cChar
 inline sal_Bool IsGreekChar( sal_Unicode cChar ) { return 0x0370 <= cChar  &&  cChar <= 0x03FF; }
 
 sal_Unicode ConvertMathPrivateUseAreaToUnicode( sal_Unicode cChar );
-#ifdef TL_NOT_YET_USED
-sal_Unicode ConvertUnicodeToMathPrivateUseArea( sal_Unicode cChar );
-
-sal_Unicode ConvertMathToMathType( sal_Unicode cChar );
-sal_Unicode ConvertMathTypeToMath( sal_Unicode cChar );
-#endif //TL_NOT_YET_USED
 
 sal_Unicode ConvertMathToMathML( sal_Unicode cChar );
-#ifdef TL_NOT_YET_USED
-sal_Unicode ConvertMathMLToMath( sal_Unicode cChar );
-
-sal_Unicode GetTokenChar( sal_Unicode cChar, sal_Bool bConvertForExport );
-#endif //TL_NOT_YET_USED
 
 /////////////////////////////////////////////////////////////////
 // enum definitions for characters from the 'StarSymbol' font
@@ -84,14 +73,14 @@ enum MathSymbol
     MS_DRARROW      = (sal_Unicode) 0x21D2,
     MS_DLARROW      = (sal_Unicode) 0x21D0,
     MS_DLRARROW     = (sal_Unicode) 0x21D4,
-    MS_UNDERBRACE   = (sal_Unicode) 0xE081,
-    MS_OVERBRACE    = (sal_Unicode) 0xE082,
-    MS_CIRC         = (sal_Unicode) 0x00B0,
+    MS_OVERBRACE    = (sal_Unicode) 0x23DE,
+    MS_UNDERBRACE   = (sal_Unicode) 0x23DF,
+    MS_CIRC         = (sal_Unicode) 0x2218,
     MS_ASSIGN       = (sal_Unicode) 0x003D,
     MS_ERROR        = (sal_Unicode) 0x00BF,
 
     MS_NEQ          = (sal_Unicode) 0x2260,
-    MS_PLUS         = (sal_Unicode) 0xE083,
+    MS_PLUS         = (sal_Unicode) 0x002B,
     MS_MINUS        = (sal_Unicode) 0x2212,
     MS_MULTIPLY     = (sal_Unicode) 0x2217,
     MS_TIMES        = (sal_Unicode) 0x00D7,
@@ -107,23 +96,23 @@ enum MathSymbol
     MS_UNION        = (sal_Unicode) 0x222A,
     MS_INTERSECT    = (sal_Unicode) 0x2229,
 
-    MS_LT           = (sal_Unicode) 0xE084,
-    MS_GT           = (sal_Unicode) 0xE085,
+    MS_LT           = (sal_Unicode) 0x003C,
+    MS_GT           = (sal_Unicode) 0x003E,
     MS_LE           = (sal_Unicode) 0x2264,
     MS_GE           = (sal_Unicode) 0x2265,
-    MS_LESLANT      = (sal_Unicode) 0xE086,
-    MS_GESLANT      = (sal_Unicode) 0xE087,
+    MS_LESLANT      = (sal_Unicode) 0x2A7D,
+    MS_GESLANT      = (sal_Unicode) 0x2A7E,
     MS_LL           = (sal_Unicode) 0x226A,
     MS_GG           = (sal_Unicode) 0x226B,
-    MS_SIM          = (sal_Unicode) 0x007E,
+    MS_SIM          = (sal_Unicode) 0x223C,
     MS_SIMEQ        = (sal_Unicode) 0x2243,
     MS_APPROX       = (sal_Unicode) 0x2248,
     MS_DEF          = (sal_Unicode) 0x225D,
     MS_EQUIV        = (sal_Unicode) 0x2261,
     MS_PROP         = (sal_Unicode) 0x221D,
     MS_PARTIAL      = (sal_Unicode) 0x2202,
-    MS_SUBSET       = (sal_Unicode) 0x2282,
 
+    MS_SUBSET       = (sal_Unicode) 0x2282,
     MS_SUPSET       = (sal_Unicode) 0x2283,
     MS_SUBSETEQ     = (sal_Unicode) 0x2286,
     MS_SUPSETEQ     = (sal_Unicode) 0x2287,
@@ -143,70 +132,69 @@ enum MathSymbol
     MS_LINE         = (sal_Unicode) 0x2223,
     MS_DLINE        = (sal_Unicode) 0x2225,
     MS_ORTHO        = (sal_Unicode) 0x22A5,
-    MS_DOTSLOW      = (sal_Unicode) 0xE08B,
+    MS_DOTSLOW      = (sal_Unicode) 0x2026,
     MS_DOTSAXIS     = (sal_Unicode) 0x22EF,
     MS_DOTSVERT     = (sal_Unicode) 0x22EE,
     MS_DOTSUP       = (sal_Unicode) 0x22F0,
     MS_DOTSDOWN     = (sal_Unicode) 0x22F1,
     MS_TRANSR       = (sal_Unicode) 0x22B6,
     MS_TRANSL       = (sal_Unicode) 0x22B7,
-    MS_RIGHTARROW   = (sal_Unicode) 0xE08C,
     MS_BACKSLASH    = (sal_Unicode) 0x2216,
     MS_NEG          = (sal_Unicode) 0x00AC,
 
+    MS_FORALL       = (sal_Unicode) 0x2200,
+    MS_NABLA        = (sal_Unicode) 0x2207,
+    MS_PROD         = (sal_Unicode) 0x220F,
+    MS_COPROD       = (sal_Unicode) 0x2210,
+    MS_SUM          = (sal_Unicode) 0x2211,
+    MS_SQRT         = (sal_Unicode) 0x221A,
     MS_INT          = (sal_Unicode) 0x222B,
     MS_IINT         = (sal_Unicode) 0x222C,
     MS_IIINT        = (sal_Unicode) 0x222D,
     MS_LINT         = (sal_Unicode) 0x222E,
     MS_LLINT        = (sal_Unicode) 0x222F,
     MS_LLLINT       = (sal_Unicode) 0x2230,
-    MS_SQRT         = (sal_Unicode) 0xE08D,
-    MS_COPROD       = (sal_Unicode) 0x2210,
-    MS_PROD         = (sal_Unicode) 0x220F,
-    MS_SUM          = (sal_Unicode) 0x2211,
-    MS_NABLA        = (sal_Unicode) 0x2207,
-    MS_FORALL       = (sal_Unicode) 0x2200,
 
-    MS_HAT          = (sal_Unicode) 0xE091,
-    MS_CHECK        = (sal_Unicode) 0xE092,
-    MS_BREVE        = (sal_Unicode) 0xE093,
-    MS_ACUTE        = (sal_Unicode) 0xE094,
-    MS_GRAVE        = (sal_Unicode) 0xE095,
-    MS_TILDE        = (sal_Unicode) 0xE096,
-    MS_BAR          = (sal_Unicode) 0xE097,
-    MS_VEC          = (sal_Unicode) 0xE098,
+    MS_GRAVE        = (sal_Unicode) 0x0300,
+    MS_ACUTE        = (sal_Unicode) 0x0301,
+    MS_HAT          = (sal_Unicode) 0x0302,
+    MS_TILDE        = (sal_Unicode) 0x0303,
+    MS_BAR          = (sal_Unicode) 0x0304,
+    MS_BREVE        = (sal_Unicode) 0x0306,
+    MS_CIRCLE       = (sal_Unicode) 0x030A,
+    MS_CHECK        = (sal_Unicode) 0x030C,
+    MS_VEC          = (sal_Unicode) 0x20D7,
     MS_DOT          = (sal_Unicode) 0x02D9,
     MS_DDOT         = (sal_Unicode) 0x00A8,
-    MS_DDDOT        = (sal_Unicode) 0xE09B,
-    MS_CIRCLE       = (sal_Unicode) 0x02DA,
+    MS_DDDOT        = (sal_Unicode) 0x20DB,
     MS_AND          = (sal_Unicode) 0x2227,
     MS_OR           = (sal_Unicode) 0x2228,
     MS_NI           = (sal_Unicode) 0x220B,
     MS_EMPTYSET     = (sal_Unicode) 0x2205,
 
-    MS_LBRACE       = (sal_Unicode) 0x007B,
-    MS_RBRACE       = (sal_Unicode) 0x007D,
-    MS_LPARENT      = (sal_Unicode) 0xE09E,
-    MS_RPARENT      = (sal_Unicode) 0xE09F,
-    MS_LANGLE       = (sal_Unicode) 0x2329,
-    MS_RANGLE       = (sal_Unicode) 0x232A,
+    MS_LPARENT      = (sal_Unicode) 0x0028,
+    MS_RPARENT      = (sal_Unicode) 0x0029,
     MS_LBRACKET     = (sal_Unicode) 0x005B,
     MS_RBRACKET     = (sal_Unicode) 0x005D,
-
-    MS_LDBRACKET    = (sal_Unicode) 0x301A,
-    MS_RDBRACKET    = (sal_Unicode) 0x301B,
-    MS_PLACE        = (sal_Unicode) 0xE0AA,
-
+    MS_LBRACE       = (sal_Unicode) 0x007B,
+    MS_RBRACE       = (sal_Unicode) 0x007D,
     MS_LCEIL        = (sal_Unicode) 0x2308,
-    MS_LFLOOR       = (sal_Unicode) 0x230A,
     MS_RCEIL        = (sal_Unicode) 0x2309,
+    MS_LFLOOR       = (sal_Unicode) 0x230A,
     MS_RFLOOR       = (sal_Unicode) 0x230B,
+    MS_LANGLE       = (sal_Unicode) 0x2329,
+    MS_RANGLE       = (sal_Unicode) 0x232A,
+    MS_LDBRACKET    = (sal_Unicode) 0x27E6,
+    MS_RDBRACKET    = (sal_Unicode) 0x27E7,
+
+    MS_PLACE        = (sal_Unicode) 0x2751,
 
-    MS_HBAR         = (sal_Unicode) 0x210F,
     MS_LAMBDABAR    = (sal_Unicode) 0x019B,
-    MS_LEFTARROW    = (sal_Unicode) 0xE0DB,
-    MS_UPARROW      = (sal_Unicode) 0xE0DC,
-    MS_DOWNARROW    = (sal_Unicode) 0xE0DD,
+    MS_HBAR         = (sal_Unicode) 0x210F,
+    MS_LEFTARROW    = (sal_Unicode) 0x2190,
+    MS_UPARROW      = (sal_Unicode) 0x2191,
+    MS_RIGHTARROW   = (sal_Unicode) 0x2192,
+    MS_DOWNARROW    = (sal_Unicode) 0x2193,
     MS_SETN         = (sal_Unicode) 0x2115,
     MS_SETZ         = (sal_Unicode) 0x2124,
     MS_SETQ         = (sal_Unicode) 0x211A,
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 50cdc372d593..f05c4beec7ae 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -35,11 +35,30 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/view/XRenderable.hpp>
+
 #include <sfx2/sfxbasemodel.hxx>
 #include <comphelper/propertysethelper.hxx>
+#include <vcl/print.hxx>
 
 class SmFormat;
 
+////////////////////////////////////////////////////////////
+
+#define PRTUIOPT_TITLE_ROW          "TitleRow"
+#define PRTUIOPT_FORMULA_TEXT       "FormulaText"
+#define PRTUIOPT_BORDER             "Border"
+#define PRTUIOPT_PRINT_FORMAT       "PrintFormat"
+#define PRTUIOPT_PRINT_SCALE        "PrintScale"
+
+class SmPrintUIOptions : public vcl::PrinterOptionsHelper
+{
+public:
+    SmPrintUIOptions();
+};
+
+
+////////////////////////////////////////////////////////////
+
 #define A2OU(pText)     rtl::OUString::createFromAscii(pText)
 
 //-----------------------------------------------------------------------------
@@ -48,6 +67,7 @@ class SmModel : public SfxBaseModel,
                 public com::sun::star::lang::XServiceInfo,
                 public com::sun::star::view::XRenderable
 {
+    SmPrintUIOptions* m_pPrintUIOptions;
 protected:
     virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues )
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
@@ -86,4 +106,7 @@ public:
     static ::rtl::OUString getImplementationName_Static();
 };
 
+////////////////////////////////////////////////////////////
+
 #endif
+
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 8c89d9517898..3aaa9455baf6 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -47,6 +47,7 @@ class DataChangedEvent;
 class SmClipboardChangeListener;
 class SmDocShell;
 class SmViewShell;
+class SmPrintUIOptions;
 
 /**************************************************************************/
 
@@ -292,8 +293,8 @@ public:
     virtual void Execute( SfxRequest& rReq );
     virtual void GetState(SfxItemSet &);
 
-    void Impl_Print( OutputDevice &rOutDev, const SmPrintSize ePrintSize,
-                     Rectangle aOutRect, Point aZeroPoint );
+    void Impl_Print( OutputDevice &rOutDev, const SmPrintUIOptions &rPrintUIOptions,
+            Rectangle aOutRect, Point aZeroPoint );
 };
 
 #endif