#i10000#ooo/DEV300_m89

49 files changed, 2449 insertions, 3480 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 239b3c2d38..b57cb6bf54 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -30,9 +30,7 @@
 #include <vcl/image.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/image.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <vcl/combobox.hxx>
@@ -403,8 +401,8 @@ public:
     {
     }
 
-    void	SetChar(xub_Unicode aChar);
-    void	SetFont(const Font &rFont);
+    void    SetSymbol( const SmSym *pSym );
+    void    SetSymbol( sal_UCS4 cChar, const Font &rFont );
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 34838682b0..5853a24c0f 100644..100755
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -35,28 +35,28 @@
 #define SID_PREVERR 				(SID_SMA_START + 2)
 #define SID_NEXTMARK				(SID_SMA_START + 3)
 #define SID_PREVMARK				(SID_SMA_START + 4)
-#define SID_SYMBOLS_CATALOGUE                   (SID_SMA_START + 5)
+#define SID_SYMBOLS_CATALOGUE       (SID_SMA_START + 5)
 #define SID_PREFERENCES 			(SID_SMA_START + 6)
 #define SID_VIEW050 				(SID_SMA_START + 7)
 #define SID_VIEW100 				(SID_SMA_START + 8)
 #define SID_VIEW200 				(SID_SMA_START + 9)
-#define SID_ZOOMIN                              (SID_SMA_START + 10)
+#define SID_ZOOMIN                  (SID_SMA_START + 10)
 #define SID_ZOOMOUT 				(SID_SMA_START + 11)
-#define SID_DRAW                                (SID_SMA_START + 12)
-#define SID_ADJUST                              (SID_SMA_START + 13)
+#define SID_DRAW                    (SID_SMA_START + 12)
+#define SID_ADJUST                  (SID_SMA_START + 13)
 #define SID_TOOLBOX 				(SID_SMA_START + 14)
 #define SID_FORMULACURSOR			(SID_SMA_START + 15)
-#define SID_FONT                                (SID_SMA_START + 50)
+#define SID_FONT                    (SID_SMA_START + 50)
 #define SID_FONTSIZE				(SID_SMA_START + 51)
 #define SID_DISTANCE				(SID_SMA_START + 52)
-#define SID_ALIGN                               (SID_SMA_START + 53)
+#define SID_ALIGN                   (SID_SMA_START + 53)
 
 #define SID_AUTO_REDRAW 			(SID_SMA_START + 55)
 #define SID_SYMBOLS 				(SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden !
 #define SID_TEXTMODE 				(SID_SMA_START + 57)
-#define SID_INSERT_FORMULA			(SID_SMA_START + 58)
-#define SID_TEXT                                (SID_SMA_START + 100)
-#define SID_GAPHIC_SM                           (SID_SMA_START + 101)
+#define SID_IMPORT_FORMULA          (SID_SMA_START + 58)
+#define SID_TEXT                    (SID_SMA_START + 100)
+#define SID_GAPHIC_SM               (SID_SMA_START + 101)
 #define SID_FITINWINDOW 			(SID_SMA_START + 103)
 #define SID_INSERTTEXT				(SID_SMA_START + 104)
 #define SID_INSERTCOMMAND			(SID_SMA_START + 105)
@@ -81,7 +81,7 @@
 #define SID_CMDBOXWINDOW			(SID_SMA_START + 122)
 #define SID_TOOLBOXWINDOW			(SID_SMA_START + 123)
 #define SID_NO_RIGHT_SPACES			(SID_SMA_START + 124)
-#define SID_DUMMY                               (SID_SMA_START + 254)
+#define SID_DUMMY                   (SID_SMA_START + 254)
 
 //#define GID_FORMEL                            (RID_GROUPS_OFFSET + 1)
 //#define GID_ERROR                             (RID_GROUPS_OFFSET + 2)
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 2cd7c545f5..c7b55c91c6 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -82,24 +82,24 @@ class SmSym
     String              m_aName;
     String              m_aExportName;
     String              m_aSetName;
-    sal_Unicode         m_cChar;
+    sal_UCS4            m_cChar;
     BOOL                m_bPredefined;
     BOOL                m_bDocSymbol;
 
 public:
     SmSym();
-    SmSym(const String& rName, const Font& rFont, sal_Unicode cChar,
+    SmSym(const String& rName, const Font& rFont, sal_UCS4 cChar,
           const String& rSet, BOOL bIsPredefined = FALSE);
     SmSym(const SmSym& rSymbol);
 
     SmSym&	   	operator = (const SmSym& rSymbol);
 
     const Font&     GetFace() const { return m_aFace; }
-    sal_Unicode     GetCharacter() const { return m_cChar; }
+    sal_UCS4        GetCharacter() const { return m_cChar; }
     const String&   GetName() const { return m_aName; }
 
     void            SetFace( const Font& rFont )        { m_aFace = rFont; }
-    void            SetCharacter( sal_Unicode cChar )   { m_cChar = cChar; }
+    void            SetCharacter( sal_UCS4 cChar )   { m_cChar = cChar; }
 
 //! since the symbol name is also used as key in the map it should not be possible to change the name
 //! because ten the key would not be the same as its supposed copy here
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index b41102f57e..49583a7b5e 100644..100755
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -30,12 +30,10 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/childwin.hxx>
 #include <vcl/toolbox.hxx>
+
 #include "smmod.hxx"
 #include "config.hxx"
-
-#include "dialog.hrc"
-
-#define NUM_TBX_CATEGORIES	9
+#include "toolbox.hrc"
 
 class SmToolBoxWindow : public SfxFloatingWindow
 {
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 7ccf6fa015..1b3da15bfa 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -42,10 +42,6 @@ class String;
 
 #define C2S(cChar) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
 
-/////////////////////////////////////////////////////////////////
-
-const ByteString    ExportString( const String& rString );
-const String        ImportString( const ByteString& rByteString );
 
 /////////////////////////////////////////////////////////////////
 
diff --git a/starmath/prj/d.lst b/starmath/prj/d.lst
index bc48875e81..78bae57498 100644
--- a/starmath/prj/d.lst
+++ b/starmath/prj/d.lst
@@ -19,3 +19,5 @@ mkdir: %_DEST%\inc%_EXT%\starmath
 ..\uiconfig\smath\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar\*.xml
 ..\uiconfig\smath\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar\*.xml
 ..\uiconfig\smath\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar\*.xml
+..\%__SRC%\misc\sm.component %_DEST%\xml%_EXT%\sm.component
+..\%__SRC%\misc\smd.component %_DEST%\xml%_EXT%\smd.component
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index f62dd0b5c4..3c5540926f 100644..100755
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -403,8 +403,8 @@ SfxVoidItem InsertConfigName SID_INSERTTEXT
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormula SID_INSERT_FORMULA
-(SfxStringItem Name SID_INSERT_FORMULA,SfxStringItem Filter FN_PARAM_1)
+SfxBoolItem ImportFormula SID_IMPORT_FORMULA
+(SfxStringItem Name SID_IMPORT_FORMULA,SfxStringItem Filter FN_PARAM_1)
 [
     /* flags: */  
     AutoUpdate = FALSE, 
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 92eb8ded63..f7cd56c88f 100644..100755
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -275,12 +275,12 @@ interface FormulaView
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-        SID_INSERT_FORMULA //idlpp ole : no , status : no
-        [
-                ExecMethod = Execute ;
-                StateMethod = GetState ;
-                Export = FALSE ;
-        ]
+    SID_IMPORT_FORMULA //idlpp ole : no , status : no
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState ;
+        Export = FALSE ;
+    ]
     //idlpp kein Menueeintrag , also keine Texte
     SID_ATTR_ZOOM //idlpp ole : no , status : no
     [
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index bbc129484e..2e00505920 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -490,7 +490,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
     {
         const Any * pValue = aValues.getConstArray();
         Font        aFont;
-        sal_Unicode cChar = '\0';
+        sal_UCS4    cChar = '\0';
         String      aSet;
         BOOL        bPredefined = FALSE;
 
@@ -500,7 +500,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
 
         BOOL bOK = TRUE;
         if (pValue->hasValue()  &&  (*pValue >>= nTmp32))
-            cChar = (sal_Unicode) nTmp32;
+            cChar = static_cast< sal_UCS4 >( nTmp32 );
         else
             bOK = FALSE;
         ++pValue;
@@ -624,7 +624,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
         // Char
         pVal->Name  = aNodeNameDelim;
         pVal->Name += *pName++;
-        pVal->Value <<= (INT32) rSymbol.GetCharacter();
+        pVal->Value <<= static_cast< sal_UCS4 >( rSymbol.GetCharacter() );
         pVal++;
         // Set
         pVal->Name  = aNodeNameDelim;
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
index 602c99bb1b..5d8c809b2b 100644
--- a/starmath/source/detreg.cxx
+++ b/starmath/source/detreg.cxx
@@ -48,29 +48,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-sal_Bool SAL_CALL component_writeInfo(  void*   /*pServiceManager*/,
-                                        void*	pRegistryKey	)
-{
-    Reference< ::registry::XRegistryKey >
-            xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
-
-    OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
-    OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
-    // Eigentliche Implementierung und ihre Services registrieren
-    sal_Int32 i;
-    Reference< ::registry::XRegistryKey >  xNewKey;
-
-    xNewKey = xKey->createKey( aDelimiter + SmFilterDetect::impl_getStaticImplementationName() +
-                               aUnoServices );
-
-    Sequence< OUString > aServices = SmFilterDetect::impl_getStaticSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    return sal_True;
-}
-
 void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* /*pRegistryKey*/ )
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 916891c1b7..095c39fa75 100644..100755
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -50,17 +50,18 @@
 #include <svx/ucsubset.hxx>
 
 
-#include "config.hxx"
 #include "dialog.hxx"
-#ifndef _STARMATH_HRC
 #include "starmath.hrc"
-#endif
-
+#include "config.hxx"
 #include "dialog.hrc"
 #include "smmod.hxx"
 #include "symbol.hxx"
 #include "view.hxx"
 #include "document.hxx"
+#include "unomodel.hxx"
+
+
+using ::rtl::OUString;
 
 ////////////////////////////////////////
 //
@@ -1157,11 +1158,13 @@ void SmShowSymbolSet::Paint(const Rectangle&)
         SetTextColor( aTxtColor );
 
         int   nIV 	= i - v;
-        Size  aSize(GetTextWidth(aSymbol.GetCharacter()), GetTextHeight());
+        sal_UCS4 cChar = aSymbol.GetCharacter();
+        String aText( OUString( &cChar, 1 ) );
+        Size  aSize( GetTextWidth( aText ), GetTextHeight());
 
         DrawText(Point((nIV % nColumns) * nLen + (nLen - aSize.Width()) / 2,
                        (nIV / nColumns) * nLen + (nLen - aSize.Height()) / 2),
-                 aSymbol.GetCharacter());
+                 aText);
     }
 
     if (nSelectSymbol != SYMBOL_NONE)
@@ -1333,7 +1336,7 @@ void SmShowSymbol::Paint(const Rectangle &rRect)
     Size            aTextSize(GetTextWidth(rText), GetTextHeight());
 
     DrawText(Point((GetOutputSize().Width()  - aTextSize.Width())  / 2,
-                   (GetOutputSize().Height() - aTextSize.Height()) / 2), rText);
+                   (GetOutputSize().Height() * 7/10)), rText);
 }
 
 
@@ -1350,17 +1353,14 @@ void SmShowSymbol::SetSymbol(const SmSym *pSymbol)
 {
     if (pSymbol)
     {
-        Color aTxtColor( GetTextColor() );
-
         Font aFont (pSymbol->GetFace());
         aFont.SetSize(Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3));
-        aFont.SetAlign(ALIGN_TOP);
+        aFont.SetAlign(ALIGN_BASELINE);
         SetFont(aFont);
 
-        // keep old text color (font may have different color set)
-        SetTextColor(aTxtColor);
-
-        SetText(XubString(pSymbol->GetCharacter()));
+        sal_UCS4 cChar = pSymbol->GetCharacter();
+        String aText( OUString( &cChar, 1 ) );
+        SetText( aText );
     }
 
     // 'Invalidate' fuellt den background mit der background-Farbe.
@@ -1483,7 +1483,7 @@ IMPL_LINK( SmSymbolDialog, GetClickHdl, Button *, EMPTYARG pButton )
     const SmSym *pSym = GetSymbol();
     if (pSym)
     {
-        XubString	aText ('%');
+        String	aText ('%');
         aText += pSym->GetName();
         aText += (sal_Unicode)' ';
 
@@ -1644,42 +1644,43 @@ void SmShowChar::Paint(const Rectangle &rRect)
 {
     Control::Paint( rRect );
 
-    XubString Text (GetText ());
-    if (Text.Len() > 0)
+    OUString aText( GetText() );
+    if (aText.getLength() > 0)
     {
-        Size aTextSize(GetTextWidth(Text), GetTextHeight());
+#if OSL_DEBUG_LEVEL > 1
+        sal_Int32 nPos = 0;
+        sal_UCS4 cChar = aText.iterateCodePoints( &nPos );
+        (void) cChar;
+#endif
+        Size aTextSize(GetTextWidth(aText), GetTextHeight());
 
         DrawText(Point((GetOutputSize().Width()  - aTextSize.Width())  / 2,
-                       (GetOutputSize().Height() - aTextSize.Height()) / 2), Text);
+                       (GetOutputSize().Height() * 7/10)), aText);
     }
 }
 
 
-void SmShowChar::SetChar(xub_Unicode aChar)
+void SmShowChar::SetSymbol( const SmSym *pSym )
 {
-    SetText(XubString(aChar));
-    Invalidate();
+    if (pSym)
+        SetSymbol( pSym->GetCharacter(), pSym->GetFace() );
 }
 
 
-void SmShowChar::SetFont(const Font &rFont)
+void SmShowChar::SetSymbol( sal_UCS4 cChar, const Font &rFont )
 {
-    Color aTxtColor( GetTextColor() );
-
-    Font  aFont (rFont);
-    Size  aSize (Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3));
+    Font aFont( rFont );
+    aFont.SetSize( Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3) );
+    aFont.SetAlign(ALIGN_BASELINE);
+    SetFont(aFont);
 
-    aFont.SetSize(aSize);
-    aFont.SetAlign(ALIGN_TOP);
-    aFont.SetTransparent(TRUE);
-    Control::SetFont(aFont);
-
-    // keep text color (new font may have different one)
-    SetTextColor( aTxtColor );
+    String aText( OUString( &cChar, 1) );
+    SetText( aText );
 
     Invalidate();
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////
 
 void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, BOOL bDeleteText)
@@ -1866,7 +1867,7 @@ IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, EMPTYARG pComboBox )
 
 IMPL_LINK( SmSymDefineDialog, CharHighlightHdl, Control *, EMPTYARG )
 {
-    sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter();
+   sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter();
 
 #if OSL_DEBUG_LEVEL > 1
     DBG_ASSERT( pSubsetMap, "SubsetMap missing" );
@@ -1880,9 +1881,18 @@ IMPL_LINK( SmSymDefineDialog, CharHighlightHdl, Control *, EMPTYARG )
             aFontsSubsetLB.SetNoSelection();
     }
 
-    // TO_DO_UCS4 (#i74049): get rid of cast without loosing UCS4 functionality
-    aSymbolDisplay.SetChar( sal::static_int_cast< sal_Unicode >(cChar) );
+    aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() );
+
     UpdateButtons();
+
+    // display Unicode position as symbol name while iterating over characters 
+    const String aHex( String::CreateFromInt64( cChar, 16 ).ToUpperAscii() );
+    const String aPattern( A2OU( aHex.Len() > 4 ? "Ux000000" : "Ux0000" ) );
+    String aUnicodePos( aPattern.Copy( 0, aPattern.Len() - aHex.Len() ) );
+    aUnicodePos += aHex;
+    aSymbols.SetText( aUnicodePos );
+    aSymbolName.SetText( aUnicodePos );
+
     return 0;
 }
 
@@ -1896,16 +1906,13 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton )
 #endif
 
     // add symbol
-    // TO_DO_UCS4 (#i74049): get rid of cast without loosing UCS4 functionality
     const SmSym aNewSymbol( aSymbols.GetText(), aCharsetDisplay.GetFont(),
-            sal::static_int_cast< sal_Unicode >( aCharsetDisplay.GetSelectCharacter() ),
-            aSymbolSets.GetText() );
+            aCharsetDisplay.GetSelectCharacter(), aSymbolSets.GetText() );
     //DBG_ASSERT( aSymbolMgrCopy.GetSymbolByName(aTmpSymbolName) == NULL, "symbol already exists" );
     aSymbolMgrCopy.AddOrReplaceSymbol( aNewSymbol );
 
     // update display of new symbol
-    aSymbolDisplay.SetChar( aNewSymbol.GetCharacter() );
-    aSymbolDisplay.SetFont( aNewSymbol.GetFace() );
+    aSymbolDisplay.SetSymbol( &aNewSymbol );
     aSymbolName.SetText( aNewSymbol.GetName() );
     aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() );
 
@@ -1932,10 +1939,8 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
     // get new Sybol to use
     //! get font from symbol-disp lay since charset-display does not keep
     //! the bold attribut.
-    // TO_DO_UCS4 (#i74049): get rid of cast without loosing UCS4 functionality
     const SmSym aNewSymbol( aSymbols.GetText(), aCharsetDisplay.GetFont(),
-            sal::static_int_cast< sal_Unicode >( aCharsetDisplay.GetSelectCharacter() ),
-            aSymbolSets.GetText() );
+            aCharsetDisplay.GetSelectCharacter(), aSymbolSets.GetText() );
 
     // remove old symbol if the name was changed then add new one
 //    const bool bSetNameChanged    = aOldSymbolSets.GetText() != aSymbolSets.GetText();
@@ -1949,8 +1954,7 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
         SetOrigSymbol(NULL, XubString());
 
     // update display of new symbol
-    aSymbolDisplay.SetChar( aNewSymbol.GetCharacter() );
-    aSymbolDisplay.SetFont( aNewSymbol.GetFace() );
+    aSymbolDisplay.SetSymbol( &aNewSymbol );
     aSymbolName.SetText( aNewSymbol.GetName() );
     aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() );
     
@@ -1959,7 +1963,7 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
     FillSymbolSets(aSymbolSets,    FALSE);
     FillSymbols(aOldSymbols ,FALSE);
     FillSymbols(aSymbols    ,FALSE);
-    
+
     UpdateButtons();
 
     return 0;
@@ -2083,8 +2087,8 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
 
     // auto completion is troublesome since that symbols character also gets automatically selected in the 
     // display and if the user previously selected a character to define/redefine that one this is bad
-   aOldSymbols.EnableAutocomplete( FALSE, TRUE );
-   aSymbols   .EnableAutocomplete( FALSE, TRUE );
+    aOldSymbols.EnableAutocomplete( FALSE, TRUE );
+    aSymbols   .EnableAutocomplete( FALSE, TRUE );
 
     FillFonts();
     if (aFonts.GetEntryCount() > 0)
@@ -2270,8 +2274,7 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol,
 
         aSymName    = pSymbol->GetName();
         aSymSetName = rSymbolSetName;
-        aOldSymbolDisplay.SetFont(pSymbol->GetFace());
-        aOldSymbolDisplay.SetChar(pSymbol->GetCharacter());
+        aOldSymbolDisplay.SetSymbol( pSymbol );
     }
     else
     {   // loeschen des angezeigten Symbols
@@ -2325,6 +2328,10 @@ BOOL SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
 
                 // das zugehoerige Zeichen auswaehlen
                 SelectChar(pSymbol->GetCharacter());
+
+                // since SelectChar will also set the unicode point as text in the
+                // symbols box, we have to set the symbol name again to get that one displayed
+                aSymbols.SetText( pSymbol->GetName() );
             }
         }
 
@@ -2381,7 +2388,7 @@ void SmSymDefineDialog::SetFont(const XubString &rFontName, const XubString &rSt
         aFontsSubsetLB.SetEntryData( nPos, (void *) pSubset );
         // subset must live at least as long as the selected font !!!
         if( bFirst )
-        aFontsSubsetLB.SelectEntryPos( nPos );
+            aFontsSubsetLB.SelectEntryPos( nPos );
         bFirst = false;
     }
     if( bFirst )
@@ -2401,7 +2408,11 @@ BOOL SmSymDefineDialog::SelectFont(const XubString &rFontName, BOOL bApplyFont)
         if (aStyles.GetEntryCount() > 0)
             SelectStyle(aStyles.GetEntry(0));
         if (bApplyFont)
+        {
             SetFont(aFonts.GetSelectEntry(), aStyles.GetText());
+            // update preview to use new font
+            aSymbolDisplay.SetSymbol( aCharsetDisplay.GetSelectCharacter(), aCharsetDisplay.GetFont() );
+        }
         bRet = TRUE;
     }
     else
@@ -2428,7 +2439,11 @@ BOOL SmSymDefineDialog::SelectStyle(const XubString &rStyleName, BOOL bApplyFont
     {
         aStyles.SetText(aStyles.GetEntry(nPos));
         if (bApplyFont)
+        {
             SetFont(aFonts.GetSelectEntry(), aStyles.GetText());
+            // update preview to use new font
+            aSymbolDisplay.SetSymbol( aCharsetDisplay.GetSelectCharacter(), aCharsetDisplay.GetFont() );
+        }
         bRet = TRUE;
     }
     else
@@ -2443,7 +2458,7 @@ BOOL SmSymDefineDialog::SelectStyle(const XubString &rStyleName, BOOL bApplyFont
 void SmSymDefineDialog::SelectChar(xub_Unicode cChar)
 {
     aCharsetDisplay.SelectCharacter( cChar );
-    aSymbolDisplay.SetChar( cChar );
+    aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() );
 
     UpdateButtons();
 }
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
index a409e55d24..0e038bb9c7 100644..100755
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@ -47,6 +47,7 @@ SMDLL=TRUE
 SRS2NAME =smres
 SRC2FILES = smres.src   \
             symbol.src	\
+            toolbox.src \
             commands.src
 
 SLO1FILES =  \
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index a01cab246c..1bb3b6a925 100755
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -48,10 +48,15 @@
 #include <math.h>
 #include <float.h>
 
+
+#define APPEND(str,ascii) str.AppendAscii(RTL_CONSTASCII_STRINGPARAM(ascii))
+
 // define this to draw rectangles for debugging
 //#define SM_RECT_DEBUG
 
-#define APPEND(str,ascii) str.AppendAscii(RTL_CONSTASCII_STRINGPARAM(ascii))
+
+using ::rtl::OUString;
+
 
 ////////////////////////////////////////
 // SmTmpDevice
@@ -2471,6 +2476,12 @@ void SmTextNode::Draw(OutputDevice &rDev, const Point& rPosition) const
     // auf Pixelkoordinaten runden
     aPos = rDev.PixelToLogic( rDev.LogicToPixel(aPos) );
 
+#if OSL_DEBUG_LEVEL > 1
+    sal_Int32 nPos = 0;
+    sal_UCS4 cChar = OUString( aText ).iterateCodePoints( &nPos );
+    (void) cChar;
+#endif
+
     rDev.DrawStretchText(aPos, GetWidth(), aText);
 
 #ifdef SM_RECT_DEBUG
@@ -2851,7 +2862,9 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell
     String aName( GetToken().aText.Copy(1) );
     if (NULL != (pSym = pp->GetSymbolManager().GetSymbolByName( aName )))
     {
-        SetText( pSym->GetCharacter() );
+        sal_UCS4 cChar = pSym->GetCharacter();
+        String aTmp( OUString( &cChar, 1 ) );
+        SetText( aTmp );
         GetFont() = pSym->GetFace();
     }
     else
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index 7e393fe606..59fecfcb2f 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -118,92 +118,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-sal_Bool SAL_CALL component_writeInfo(  void*   /*pServiceManager*/,
-                                        void*	pRegistryKey	)
-{
-    Reference< registry::XRegistryKey >
-            xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ) ;
-
-    OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
-    OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
-    // Eigentliche Implementierung und ihre Services registrieren
-    sal_Int32 i;
-    Reference< registry::XRegistryKey >  xNewKey;
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLImport_getImplementationName() +
-                               aUnoServices );
-
-    Sequence< OUString > aServices = SmXMLImport_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExport_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExport_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLImportMeta_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLImportMeta_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportMetaOOO_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportMetaOOO_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportMeta_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportMeta_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLImportSettings_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLImportSettings_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportSettingsOOO_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportSettingsOOO_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportSettings_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportSettings_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportContent_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportContent_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmDocument_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmDocument_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    return sal_True;
-}
-
 void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* /*pRegistryKey*/ )
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 7270427e0b..72b0c20794 100755
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -30,7 +30,6 @@
 #include <svx/globlmn.hrc>
 #include "starmath.hrc"
 #include "dialog.hrc"
-#include "toolbox.hrc"
 
 #define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
 #define IMAGE_STDBTN_COLOR_HC IMAGE_STDBTN_COLOR
@@ -1147,7 +1146,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     ComboBox 1
     {
         Pos = MAP_APPFONT ( 59 , 6 ) ;
-        Size = MAP_APPFONT ( 80 , 50 ) ;
+        Size = MAP_APPFONT ( 80 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = TRUE ;
@@ -1162,7 +1161,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     ComboBox 2
     {
         Pos = MAP_APPFONT ( 210 , 6 ) ;
-        Size = MAP_APPFONT ( 80 , 50 ) ;
+        Size = MAP_APPFONT ( 80 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = TRUE ;
@@ -1186,7 +1185,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     ComboBox 4
     {
         Pos = MAP_APPFONT ( 80 , 115 ) ;
-        Size = MAP_APPFONT ( 100 , 80 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = TRUE ;
@@ -1201,7 +1200,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     ComboBox 5
     {
         Pos = MAP_APPFONT ( 80 , 130 ) ;
-        Size = MAP_APPFONT ( 100 , 50 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = TRUE ;
@@ -1217,7 +1216,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 145 ) ;
-        Size = MAP_APPFONT ( 100 , 50 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         Sort = TRUE ;
         DropDown = TRUE ;
@@ -1233,7 +1232,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 160 ) ;
-        Size = MAP_APPFONT ( 100 , 50 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         Sort = FALSE ;
         DropDown = TRUE ;
@@ -1249,7 +1248,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     {
         Border = TRUE;
         Pos = MAP_APPFONT ( 80 , 175 ) ;
-        Size = MAP_APPFONT ( 100 , 50 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = FALSE ;
@@ -1542,1420 +1541,6 @@ Menu RID_FONTMENU
     };
 };
 
-FloatingWindow RID_TOOLBOXWINDOW
-{
-    HelpId = HID_SMA_OPERATOR_WIN ;
-    Border = TRUE ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 0 , 0 ) ;
-    Text [ en-US ] = "Elements" ;
-
-    ToolBox 1
-    {
-        // unary/binary operators
-        HelpId = HID_SMA_UNBINOPS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 4 ;
-
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_PLUSX ;
-                HelpId = HID_SMA_PLUSX ;
-                Text [ en-US ] = "+ Sign" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_MINUSX ;
-                HelpId = HID_SMA_MINUSX ;
-                Text [ en-US ] = "- Sign" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_PLUSMINUSX ;
-                HelpId = HID_SMA_PLUSMINUSX ;
-                Text [ en-US ] = "+- Sign" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_MINUSPLUSX ;
-                HelpId = HID_SMA_MINUSPLUSX ;
-                Text [ en-US ] = "-+ Sign" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_NEGX ;
-                HelpId = HID_SMA_NEGX ;
-                Text [ en-US ] = "Boolean NOT" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XPLUSY ;
-                HelpId = HID_SMA_XPLUSY ;
-                Text [ en-US ] = "Addition +" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XCDOTY ;
-                HelpId = HID_SMA_XCDOTY ;
-                Text [ en-US ] = "Multiplication (Dot )" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XTIMESY ;
-                HelpId = HID_SMA_XTIMESY ;
-                Text [ en-US ] = "Multiplication (x)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSYMTIMESY ;
-                HelpId = HID_SMA_XSYMTIMESY ;
-                Text [ en-US ] = "Multiplication (*)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XANDY ;
-                HelpId = HID_SMA_XANDY ;
-                Text [ en-US ] = "Boolean AND" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XMINUSY ;
-                HelpId = HID_SMA_XMINUSY ;
-                Text [ en-US ] = "Subtraction -" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XOVERY ;
-                HelpId = HID_SMA_XOVERY ;
-                Text [ en-US ] = "Division (Fraction)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XDIVY ;
-                HelpId = HID_SMA_XDIVY ;
-                Text [ en-US ] = "Division (÷)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSYMDIVIDEY ;
-                HelpId = HID_SMA_XSYMDIVIDEY ;
-                Text [ en-US ] = "Division (Slash)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XORY ;
-                HelpId = HID_SMA_XORY ;
-                Text [ en-US ] = "Boolean OR" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XCIRCY ;
-                HelpId = HID_SMA_XCIRCY ;
-                Text [ en-US ] = "Concatenate";
-            };
-        };
-    };
-    ToolBox 2
-    {
-        // relations
-        HelpId = HID_SMA_RELATIONS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_XEQY ;
-                HelpId = HID_SMA_XEQY ;
-                Text [ en-US ] = "Is Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNEQY ;
-                HelpId = HID_SMA_XNEQY ;
-                Text [ en-US ] = "Is Not Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XAPPROXY ;
-                HelpId = HID_SMA_XAPPROXY ;
-                Text [ en-US ] = "Is Approximately Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XDIVIDESY ;
-                HelpId = HID_SMA_XDIVIDESY ;
-                Text [ en-US ] = "Divides";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNDIVIDESY ;
-                HelpId = HID_SMA_XNDIVIDESY ;
-                Text [ en-US ] = "Does Not Divide";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XLTY ;
-                HelpId = HID_SMA_XLTY ;
-                Text [ en-US ] = "Is Less Than" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XGTY ;
-                HelpId = HID_SMA_XGTY ;
-                Text [ en-US ] = "Is Greater Than" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSIMEQY ;
-                HelpId = HID_SMA_XSIMEQY ;
-                /* ### ACHTUNG: Neuer Text in Resource? ist �hnlich oder gleich : ist �hnlich oder glech */
-                Text [ en-US ] = "Is Similar Or Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XPARALLELY ;
-                HelpId = HID_SMA_XPARALLELY ;
-                Text [ en-US ] = "Is Parallel To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XORTHOY ;
-                HelpId = HID_SMA_XORTHOY ;
-                Text [ en-US ] = "Is Orthogonal To" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XLESLANTY ;
-                HelpId = HID_SMA_XLESLANTY ;
-                Text [ en-US ] = "Is Less Than Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XGESLANTY ;
-                HelpId = HID_SMA_XGESLANTY ;
-                Text [ en-US ] = "Is Greater Than Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSIMY ;
-                HelpId = HID_SMA_XSIMY ;
-                Text [ en-US ] = "Is Similar To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XEQUIVY ;
-                HelpId = HID_SMA_XEQUIVY ;
-                Text [ en-US ] = "Is Congruent To" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XLEY ;
-                HelpId = HID_SMA_XLEY ;
-                Text [ en-US ] = "Is Less Than Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XGEY ;
-                HelpId = HID_SMA_XGEY ;
-                Text [ en-US ] = "Is Greater Than Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XPROPY ;
-                HelpId = HID_SMA_XPROPY ;
-                Text [ en-US ] = "Is Proportional To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XTOWARDY ;
-                HelpId = HID_SMA_XTOWARDY ;
-                Text [ en-US ] = "Toward" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DLARROW ;
-                HelpId = HID_SMA_DLARROW ;
-                Text [ en-US ] = "Double Arrow Left";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DLRARROW ;
-                HelpId = HID_SMA_DLRARROW ;
-                Text [ en-US ] = "Double Arrow Left And Right";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DRARROW ;
-                HelpId = HID_SMA_DRARROW ;
-                Text [ en-US ] = "Double Arrow Right";
-            };
-        };
-    };
-    ToolBox 3
-    {
-        // set operations
-        HelpId = HID_SMA_SETOPERATIONS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_XINY ;
-                HelpId = HID_SMA_XINY ;
-                Text [ en-US ] = "Is In" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNOTINY ;
-                HelpId = HID_SMA_XNOTINY ;
-                Text [ en-US ] = "Is Not In" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XOWNSY ;
-                HelpId = HID_SMA_XOWNSY ;
-                Text [ en-US ] = "Owns" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_EMPTYSET ;
-                HelpId = HID_SMA_EMPTYSET ;
-                Text [ en-US ] = "Empty Set";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XINTERSECTIONY ;
-                HelpId = HID_SMA_XINTERSECTIONY ;
-                Text [ en-US ] = "Intersection" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XUNIONY ;
-                HelpId = HID_SMA_XUNIONY ;
-                Text [ en-US ] = "Union" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSETMINUSY ;
-                HelpId = HID_SMA_XSETMINUSY ;
-                Text [ en-US ] = "Difference" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSLASHY ;
-                HelpId = HID_SMA_XSLASHY ;
-                Text [ en-US ] = "Quotient Set" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ALEPH ;
-                HelpId = HID_SMA_ALEPH ;
-                Text [ en-US ] = "Aleph";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSUBSETY ;
-                HelpId = HID_SMA_XSUBSETY ;
-                Text [ en-US ] = "Subset" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSUBSETEQY ;
-                HelpId = HID_SMA_XSUBSETEQY ;
-                Text [ en-US ] = "Subset Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSUPSETY ;
-                HelpId = HID_SMA_XSUPSETY ;
-                Text [ en-US ] = "Superset" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSUPSETEQY ;
-                HelpId = HID_SMA_XSUPSETEQY ;
-                Text [ en-US ] = "Superset Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNSUBSETY ;
-                HelpId = HID_SMA_XNSUBSETY ;
-                Text [ en-US ] = "Not Subset" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNSUBSETEQY ;
-                HelpId = HID_SMA_XNSUBSETEQY ;
-                Text [ en-US ] = "Not Subset Or Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNSUPSETY ;
-                HelpId = HID_SMA_XNSUPSETY ;
-                Text [ en-US ] = "Not Superset" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNSUPSETEQY ;
-                HelpId = HID_SMA_XNSUPSETEQY ;
-                Text [ en-US ] = "Not Superset Or Equal" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETN ;
-                HelpId = HID_SMA_SETN ;
-                Text [ en-US ] = "Natural Numbers Set";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETZ ;
-                HelpId = HID_SMA_SETZ ;
-                Text [ en-US ] = "Integers Set";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETQ ;
-                HelpId = HID_SMA_SETQ ;
-                Text [ en-US ] = "Set of Rational Numbers";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETR ;
-                HelpId = HID_SMA_SETR ;
-                Text [ en-US ] = "Real Numbers Set";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETC ;
-                HelpId = HID_SMA_SETC ;
-                Text [ en-US ] = "Complex Numbers Set";
-            };
-        };
-    };
-    ToolBox 4
-    {
-        // functions
-        HelpId = HID_SMA_FUNCTIONS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_EX ;
-                HelpId = HID_SMA_EX ;
-                Text [ en-US ] = "Exponential Function" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LNX ;
-                HelpId = HID_SMA_LNX ;
-                Text [ en-US ] = "Natural Logarithm" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_EXPX ;
-                HelpId = HID_SMA_EXPX ;
-                Text [ en-US ] = "Exponential Function" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LOGX ;
-                HelpId = HID_SMA_LOGX ;
-                Text [ en-US ] = "Logarithm" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RSUPX ;
-                HelpId = HID_SMA_RSUPX ;
-                Text [ en-US ] = "Power";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SINX ;
-                HelpId = HID_SMA_SINX ;
-                Text [ en-US ] = "Sine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COSX ;
-                HelpId = HID_SMA_COSX ;
-                Text [ en-US ] = "Cosine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_TANX ;
-                HelpId = HID_SMA_TANX ;
-                Text [ en-US ] = "Tangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COTX ;
-                HelpId = HID_SMA_COTX ;
-                Text [ en-US ] = "Cotangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SQRTX ;
-                HelpId = HID_SMA_SQRTX ;
-                Text [ en-US ] = "Square Root" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCSINX ;
-                HelpId = HID_SMA_ARCSINX ;
-                Text [ en-US ] = "Arcsine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCCOSX ;
-                HelpId = HID_SMA_ARCCOSX ;
-                Text [ en-US ] = "Arccosine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCTANX ;
-                HelpId = HID_SMA_ARCTANX ;
-                Text [ en-US ] = "Arctangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCCOTX ;
-                HelpId = HID_SMA_ARCCOTX ;
-                Text [ en-US ] = "Arccotangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_NROOTXY ;
-                HelpId = HID_SMA_NROOTXY ;
-                Text [ en-US ] = "N-th Root" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SINHX ;
-                HelpId = HID_SMA_SINHX ;
-                Text [ en-US ] = "Hyperbolic Sine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COSHX ;
-                HelpId = HID_SMA_COSHX ;
-                Text [ en-US ] = "Hyperbolic Cosine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_TANHX ;
-                HelpId = HID_SMA_TANHX ;
-                Text [ en-US ] = "Hyperbolic Tangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COTHX ;
-                HelpId = HID_SMA_COTHX ;
-                Text [ en-US ] = "Hyperbolic Cotangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ABSX ;
-                HelpId = HID_SMA_ABSX ;
-                Text [ en-US ] = "Absolute Value" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARSINHX ;
-                HelpId = HID_SMA_ARSINHX ;
-                Text [ en-US ] = "Area Hyperbolic Sine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCOSHX ;
-                HelpId = HID_SMA_ARCOSHX ;
-                Text [ en-US ] = "Area Hyperbolic Cosine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARTANHX ;
-                HelpId = HID_SMA_ARTANHX ;
-                Text [ en-US ] = "Area Hyperbolic Tangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCOTHX ;
-                HelpId = HID_SMA_ARCOTHX ;
-                Text [ en-US ] = "Area Hyperbolic Cotangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FACTX ;
-                HelpId = HID_SMA_FACTX ;
-                Text [ en-US ] = "Factorial" ;
-            };
-        };
-    };
-    ToolBox 5
-    {
-        // operators
-        HelpId = HID_SMA_OPERATORS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 3 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_LIMX ;
-                HelpId = HID_SMA_LIMX ;
-                Text [ en-US ] = "Limes" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SUMX ;
-                HelpId = HID_SMA_SUMX ;
-                Text [ en-US ] = "Sum" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_PRODX ;
-                HelpId = HID_SMA_PRODX ;
-                Text [ en-US ] = "Product" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COPRODX ;
-                HelpId = HID_SMA_COPRODX ;
-                Text [ en-US ] = "Coproduct" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FROMXTOY ;
-                HelpId = HID_SMA_FROMXTOY ;
-                Text [ en-US ] = "Upper And Lower Limit" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_INTX ;
-                HelpId = HID_SMA_INTX ;
-                Text [ en-US ] = "Integral" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_IINTX ;
-                HelpId = HID_SMA_IINTX ;
-                Text [ en-US ] = "Double Integral" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_IIINTX ;
-                HelpId = HID_SMA_IIINTX ;
-                Text [ en-US ] = "Triple Integral" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FROMX ;
-                HelpId = HID_SMA_FROMX ;
-                Text [ en-US ] = "Lower Limit" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LINTX ;
-                HelpId = HID_SMA_LINTX ;
-                Text [ en-US ] = "Curve Integral" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LLINTX ;
-                HelpId = HID_SMA_LLINTX ;
-                Text [ en-US ] = "Double Curve Integral" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LLLINTX ;
-                HelpId = HID_SMA_LLLINTX ;
-                Text [ en-US ] = "Triple Curve Integral" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_TOX ;
-                HelpId = HID_SMA_TOX ;
-                Text [ en-US ] = "Upper Limit" ;
-            };
-        };
-    };
-    ToolBox 6
-    {
-        // attributs
-        HelpId = HID_SMA_ATTRIBUTES_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_ACUTEX ;
-                HelpId = HID_SMA_ACUTEX ;
-                Text [ en-US ] = "Acute Accent";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_GRAVEX ;
-                HelpId = HID_SMA_GRAVEX ;
-                Text [ en-US ] = "Grave Accent";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_CHECKX ;
-                HelpId = HID_SMA_CHECKX ;
-                Text [ en-US ] = "Reverse Circumflex" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BREVEX ;
-                HelpId = HID_SMA_BREVEX ;
-                Text [ en-US ] = "Breve" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_CIRCLEX ;
-                HelpId = HID_SMA_CIRCLEX ;
-                Text [ en-US ] = "Circle" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_VECX ;
-                HelpId = HID_SMA_VECX ;
-                Text [ en-US ] = "Vector Arrow" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_TILDEX ;
-                HelpId = HID_SMA_TILDEX ;
-                Text [ en-US ] = "Tilde" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_HATX ;
-                HelpId = HID_SMA_HATX ;
-                Text [ en-US ] = "Circumflex" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BARX ;
-                HelpId = HID_SMA_BARX ;
-                Text [ en-US ] = "Line Above" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTX ;
-                HelpId = HID_SMA_DOTX ;
-                Text [ en-US ] = "Dot" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_WIDEVECX ;
-                HelpId = HID_SMA_WIDEVECX ;
-                Text [ en-US ] = "Large Vector Arrow";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_WIDETILDEX ;
-                HelpId = HID_SMA_WIDETILDEX ;
-                Text [ en-US ] = "Large Tilde";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_WIDEHATX ;
-                HelpId = HID_SMA_WIDEHATX ;
-                Text [ en-US ] = "Large Circumflex";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DDOTX ;
-                HelpId = HID_SMA_DDOTX ;
-                Text [ en-US ] = "Double Dot" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_OVERLINEX ;
-                HelpId = HID_SMA_OVERLINEX ;
-                Text [ en-US ] = "Line Over" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_UNDERLINEX ;
-                HelpId = HID_SMA_UNDERLINEX ;
-                Text [ en-US ] = "Line Below" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_OVERSTRIKEX ;
-                HelpId = HID_SMA_OVERSTRIKEX ;
-                Text [ en-US ] = "Line Through" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DDDOTX ;
-                HelpId = HID_SMA_DDDOTX ;
-                Text [ en-US ] = "Triple Dot" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_PHANTOMX ;
-                HelpId = HID_SMA_PHANTOMX ;
-                Text [ en-US ] = "Transparent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BOLDX ;
-                HelpId = HID_SMA_BOLDX ;
-                Text [ en-US ] = "Bold Font" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ITALX ;
-                HelpId = HID_SMA_ITALX ;
-                Text [ en-US ] = "Italic Font" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SIZEXY ;
-                HelpId = HID_SMA_SIZEXY ;
-                Text [ en-US ] = "Resize" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FONTXY ;
-                HelpId = HID_SMA_FONTXY ;
-                Text [ en-US ] = "Change Font" ;
-            };
-        };
-    };
-    ToolBox 7
-    {
-        // parentheses
-        HelpId = HID_SMA_BRACKETS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_LRPARENTX ;
-                HelpId = HID_SMA_LRPARENTX ;
-                Text [ en-US ] = "Round Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRBRACKETX ;
-                HelpId = HID_SMA_LRBRACKETX ;
-                Text [ en-US ] = "Square Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRDBRACKETX ;
-                HelpId = HID_SMA_LRDBRACKETX ;
-                Text [ en-US ] = "Double Square Brackets";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRLINEX ;
-                HelpId = HID_SMA_LRLINEX ;
-                Text [ en-US ] = "Single Lines" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRDLINEX ;
-                HelpId = HID_SMA_LRDLINEX ;
-                Text [ en-US ] = "Double Lines" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRBRACEX ;
-                HelpId = HID_SMA_LRBRACEX ;
-                Text [ en-US ] = "Braces" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRANGLEX ;
-                HelpId = HID_SMA_LRANGLEX ;
-                Text [ en-US ] = "Angle Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LMRANGLEXY ;
-                HelpId = HID_SMA_LMRANGLEXY ;
-                Text [ en-US ] = "Operator Brackets";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRGROUPX ;
-                HelpId = HID_SMA_LRGROUPX ;
-                Text [ en-US ] = "Group Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRPARENTX ;
-                HelpId = HID_SMA_SLRPARENTX ;
-                Text [ en-US ] = "Round Brackets (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRBRACKETX ;
-                HelpId = HID_SMA_SLRBRACKETX ;
-                Text [ en-US ] = "Square Brackets (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRDBRACKETX ;
-                HelpId = HID_SMA_SLRDBRACKETX ;
-                Text [ en-US ] = "Double Square Brackets (Scalable)";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRLINEX ;
-                HelpId = HID_SMA_SLRLINEX ;
-                Text [ en-US ] = "Single Lines (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRDLINEX ;
-                HelpId = HID_SMA_SLRDLINEX ;
-                Text [ en-US ] = "Double Lines (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRBRACEX ;
-                HelpId = HID_SMA_SLRBRACEX ;
-                Text [ en-US ] = "Braces (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRANGLEX ;
-                HelpId = HID_SMA_SLRANGLEX ;
-                Text [ en-US ] = "Angle Brackets (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLMRANGLEXY ;
-                HelpId = HID_SMA_SLMRANGLEXY ;
-                Text [ en-US ] = "Operator Brackets (Scalable)";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XOVERBRACEY ;
-                HelpId = HID_SMA_XOVERBRACEY ;
-                Text [ en-US ] = "Braces Top (Scalable)";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XUNDERBRACEY ;
-                HelpId = HID_SMA_XUNDERBRACEY ;
-                Text [ en-US ] = "Braces Bottom (Scalable)";
-            };
-        };
-    };
-    ToolBox 8
-    {
-        // format
-        HelpId = HID_SMA_FORMAT_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 3 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_LSUPX ;
-                HelpId = HID_SMA_LSUPX ;
-                Text [ en-US ] = "Superscript Left" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_CSUPX ;
-                HelpId = HID_SMA_CSUPX ;
-                Text [ en-US ] = "Superscript Top";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RSUPX ;
-                HelpId = HID_SMA_RSUPX ;
-                Text [ en-US ] = "Superscript Right" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BINOMXY ;
-                HelpId = HID_SMA_BINOMXY ;
-                Text [ en-US ] = "Vertical Stack (2 Elements)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_NEWLINE ;
-                HelpId = HID_SMA_NEWLINE ;
-                Text [ en-US ] = "New Line" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LSUBX ;
-                HelpId = HID_SMA_LSUBX ;
-                Text [ en-US ] = "Subscript Left" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_CSUBX ;
-                HelpId = HID_SMA_CSUBX ;
-                Text [ en-US ] = "Subscript Bottom";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RSUBX ;
-                HelpId = HID_SMA_RSUBX ;
-                Text [ en-US ] = "Subscript Right" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_STACK ;
-                HelpId = HID_SMA_STACK ;
-                Text [ en-US ] = "Vertical Stack" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SBLANK ;
-                HelpId = HID_SMA_SBLANK ;
-                Text [ en-US ] = "Small Gap" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ALIGNLX ;
-                HelpId = HID_SMA_ALIGNLX ;
-                Text [ en-US ] = "Align Left" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ALIGNCX ;
-                HelpId = HID_SMA_ALIGNCX ;
-                Text [ en-US ] = "Align Center" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ALIGNRX ;
-                HelpId = HID_SMA_ALIGNRX ;
-                Text [ en-US ] = "Align Right" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_MATRIX ;
-                HelpId = HID_SMA_MATRIX ;
-                Text [ en-US ] = "Matrix Stack" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BLANK ;
-                HelpId = HID_SMA_BLANK ;
-                Text [ en-US ] = "Gap" ;
-            };
-        };
-    };
-    ToolBox 9
-    {
-        // misc
-        HelpId = HID_SMA_FORMAT_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 4 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_INFINITY ;
-                HelpId = HID_SMA_INFINITY ;
-                Text [ en-US ] = "infinite";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_PARTIAL ;
-                HelpId = HID_SMA_PARTIAL ;
-                Text [ en-US ] = "Partial";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_NABLA ;
-                HelpId = HID_SMA_NABLA ;
-                Text [ en-US ] = "Nabla";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_EXISTS ;
-                HelpId = HID_SMA_EXISTS ;
-                Text [ en-US ] = "There Exists";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FORALL ;
-                HelpId = HID_SMA_FORALL ;
-                Text [ en-US ] = "For All";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_HBAR ;
-                HelpId = HID_SMA_HBAR ;
-                Text [ en-US ] = "h Bar";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LAMBDABAR ;
-                HelpId = HID_SMA_LAMBDABAR ;
-                Text [ en-US ] = "Lambda Bar";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RE ;
-                HelpId = HID_SMA_RE ;
-                Text [ en-US ] = "Real Part";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_IM ;
-                HelpId = HID_SMA_IM ;
-                Text [ en-US ] = "Imaginary Part";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_WP ;
-                HelpId = HID_SMA_WP ;
-                Text [ en-US ] = "Weierstrass p";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LEFTARROW ;
-                HelpId = HID_SMA_LEFTARROW ;
-                Text [ en-US ] = "Left Arrow";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RIGHTARROW ;
-                HelpId = HID_SMA_RIGHTARROW ;
-                Text [ en-US ] = "Right Arrow";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_UPARROW ;
-                HelpId = HID_SMA_UPARROW ;
-                Text [ en-US ] = "Up Arrow";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOWNARROW ;
-                HelpId = HID_SMA_DOWNARROW ;
-                Text [ en-US ] = "Down Arrow";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSLOW ;
-                HelpId = HID_SMA_DOTSLOW ;
-                Text [ en-US ] = "Dots At Bottom";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSAXIS ;
-                HelpId = HID_SMA_DOTSAXIS ;
-                Text [ en-US ] = "Dots In Middle";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSVERT ;
-                HelpId = HID_SMA_DOTSVERT ;
-                Text [ en-US ] = "Dots Vertically";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSUP ;
-                HelpId = HID_SMA_DOTSUP ;
-                Text [ en-US ] = "Dots To Top";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSDOWN ;
-                HelpId = HID_SMA_DOTSDOWN ;
-                Text [ en-US ] = "Dots to Bottom";
-            };
-        };
-    };
-    ToolBox 10
-    {
-        // main menu of selection-window
-        HelpId = HID_SMA_SELECTION_TBX ;
-        Pos = MAP_APPFONT ( 0 , 0 ) ;
-        Size = MAP_APPFONT ( 65 , 38 ) ;
-        SVLook = TRUE ;
-        LineCount = 2 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_UNBINOPS_CAT ;
-                HelpId = HID_SMA_UNBINOPS_CAT ;
-                Text [ en-US ] = "Unary/Binary Operators" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RELATIONS_CAT ;
-                HelpId = HID_SMA_RELATIONS_CAT ;
-                Text [ en-US ] = "Relations" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETOPERATIONS_CAT ;
-                HelpId = HID_SMA_SETOPERATIONS_CAT ;
-                Text [ en-US ] = "Set Operations" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FUNCTIONS_CAT ;
-                HelpId = HID_SMA_FUNCTIONS_CAT ;
-                Text [ en-US ] = "Functions" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_OPERATORS_CAT ;
-                HelpId = HID_SMA_OPERATORS_CAT ;
-                Text [ en-US ] = "Operators" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ATTRIBUTES_CAT ;
-                HelpId = HID_SMA_ATTRIBUTES_CAT ;
-                Text [ en-US ] = "Attributes" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_MISC_CAT ;
-                HelpId = HID_SMA_MISC_CAT ;
-                Text [ en-US ] = "Others";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BRACKETS_CAT ;
-                HelpId = HID_SMA_BRACKETS_CAT ;
-                Text [ en-US ] = "Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FORMAT_CAT ;
-                HelpId = HID_SMA_FORMAT_CAT ;
-                Text [ en-US ] = "Formats" ;
-            };
-        };
-    };
-    FixedLine FL_TOOLBOX_CAT_DELIM
-    {
-        Pos = MAP_APPFONT ( 0 , 44 ) ;
-        Size = MAP_APPFONT ( 65 , 4 ) ;
-    };
-};
-
 #define CMDBOXWINDOW_TEXT           \
     Text [ en-US ] = "Commands" ;              \
 
@@ -2974,380 +1559,6 @@ DockingWindow RID_CMDBOXWINDOW\
 };
 
 
-#define UNBINOPS_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_PLUSX ;         \
-        RID_MINUSX ;        \
-        RID_PLUSMINUSX ;    \
-        RID_MINUSPLUSX ;    \
-        RID_XPLUSY ;        \
-        RID_XCDOTY ;        \
-        RID_XTIMESY ;       \
-        RID_XSYMTIMESY ;    \
-        RID_XMINUSY ;       \
-        RID_XOVERY ;        \
-        RID_XDIVY ;         \
-        RID_XSYMDIVIDEY ;   \
-        RID_NEGX ;          \
-        RID_XANDY ;         \
-        RID_XORY ;          \
-        RID_XCIRCY ;        \
-    };                      \
-    IdCount = { 16 ; };
-
-    ImageList RID_IL_UNBINOPS
-    {
-        Prefix = "un";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        UNBINOPS_IDLIST
-    };
-    ImageList RID_ILH_UNBINOPS
-    {
-        Prefix = "unh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        UNBINOPS_IDLIST
-    };
-
-#define RELATIONS_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_XEQY ;          \
-        RID_XNEQY ;         \
-        RID_XEQUIVY ;       \
-        RID_XORTHOY ;       \
-        RID_XLTY ;          \
-        RID_XGTY ;          \
-        RID_XAPPROXY ;      \
-        RID_XPARALLELY ;    \
-        RID_XLESLANTY ;     \
-        RID_XGESLANTY ;     \
-        RID_XSIMEQY ;       \
-        RID_XPROPY ;        \
-        RID_XLEY ;          \
-        RID_XGEY ;          \
-        RID_XSIMY ;         \
-        RID_XTOWARDY ;      \
-        RID_XDIVIDESY ;     \
-        RID_XNDIVIDESY;     \
-        RID_DLARROW ;       \
-        RID_DLRARROW ;      \
-        RID_DRARROW ;       \
-    };                      \
-    IdCount ={ 21 ; };
-
-    ImageList RID_IL_RELATIONS
-    {
-        Prefix = "bi";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        RELATIONS_IDLIST
-    };
-    ImageList RID_ILH_RELATIONS
-    {
-        Prefix = "bih";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        RELATIONS_IDLIST
-    };
-
-#define SETOPERATIONS_IDLIST             \
-    IdList =                    \
-    {                           \
-        RID_XINY ;              \
-        RID_XNOTINY ;           \
-        RID_XOWNSY ;            \
-        RID_XINTERSECTIONY ;    \
-        RID_XUNIONY ;           \
-        RID_XSETMINUSY ;        \
-        RID_XSLASHY ;           \
-        RID_XSUBSETY ;          \
-        RID_XSUBSETEQY ;        \
-        RID_XSUPSETY ;          \
-        RID_XSUPSETEQY ;        \
-        RID_XNSUBSETY ;         \
-        RID_XNSUBSETEQY ;       \
-        RID_XNSUPSETY ;         \
-        RID_XNSUPSETEQY ;       \
-        RID_EMPTYSET ;          \
-        RID_ALEPH ;             \
-        RID_SETN ;              \
-        RID_SETZ ;              \
-        RID_SETQ ;              \
-        RID_SETR ;              \
-        RID_SETC ;              \
-    };                          \
-    IdCount = { 22 ; };
-
-    ImageList RID_IL_SETOPERATIONS
-    {
-        Prefix = "op";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        SETOPERATIONS_IDLIST
-    };
-    ImageList RID_ILH_SETOPERATIONS
-    {
-        Prefix = "oph";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        SETOPERATIONS_IDLIST
-    };
-
-#define FUNCTIONS_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_ABSX ;          \
-        RID_FACTX ;         \
-        RID_SQRTX ;         \
-        RID_NROOTXY ;       \
-        RID_EX ;            \
-        RID_LNX ;           \
-        RID_EXPX ;          \
-        RID_LOGX ;          \
-        RID_SINX ;          \
-        RID_COSX ;          \
-        RID_TANX ;          \
-        RID_COTX ;          \
-        RID_SINHX ;         \
-        RID_COSHX ;         \
-        RID_TANHX ;         \
-        RID_COTHX ;         \
-        RID_ARCSINX ;       \
-        RID_ARCCOSX ;       \
-        RID_ARCTANX ;       \
-        RID_ARCCOTX ;       \
-        RID_ARSINHX ;       \
-        RID_ARCOSHX ;       \
-        RID_ARTANHX ;       \
-        RID_ARCOTHX ;       \
-        RID_RSUPX ;         \
-    };                      \
-    IdCount = { 25 ; };
-
-    ImageList RID_IL_FUNCTIONS
-    {
-        Prefix = "fu";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        FUNCTIONS_IDLIST
-    };
-    ImageList RID_ILH_FUNCTIONS
-    {
-        Prefix = "fuh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        FUNCTIONS_IDLIST
-    };
-
-#define OPERATORS_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_LIMX ;          \
-        RID_SUMX ;          \
-        RID_PRODX ;         \
-        RID_COPRODX ;       \
-        RID_INTX ;          \
-        RID_IINTX ;         \
-        RID_IIINTX ;        \
-        RID_LINTX ;         \
-        RID_LLINTX ;        \
-        RID_LLLINTX ;       \
-        RID_FROMXTOY ;      \
-        RID_FROMX ;         \
-        RID_TOX ;           \
-    };                      \
-    IdCount = { 13 ; };
-
-    ImageList RID_IL_OPERATORS
-    {
-        Prefix = "fo";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        OPERATORS_IDLIST
-    };
-    ImageList RID_ILH_OPERATORS
-    {
-        Prefix = "foh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        OPERATORS_IDLIST
-    };
-
-#define ATTRIBUTES_IDLIST             \
-    IdList =                    \
-    {                           \
-        RID_ACUTEX ;            \
-        RID_GRAVEX ;            \
-        RID_CHECKX ;            \
-        RID_BREVEX ;            \
-        RID_BARX ;              \
-        RID_VECX ;              \
-        RID_HATX ;              \
-        RID_TILDEX ;            \
-        RID_CIRCLEX ;           \
-        RID_DOTX ;              \
-        RID_DDOTX ;             \
-        RID_DDDOTX ;            \
-        RID_OVERLINEX ;         \
-        RID_UNDERLINEX ;        \
-        RID_OVERSTRIKEX ;       \
-        RID_PHANTOMX ;          \
-        RID_BOLDX ;             \
-        RID_ITALX ;             \
-        RID_SIZEXY ;            \
-        RID_FONTXY ;            \
-        RID_WIDEHATX ;          \
-        RID_WIDETILDEX ;        \
-        RID_WIDEVECX ;          \
-    };                          \
-    IdCount = { 23 ; };
-
-    ImageList RID_IL_ATTRIBUTES
-    {
-        Prefix = "at";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        ATTRIBUTES_IDLIST
-    };
-    ImageList RID_ILH_ATTRIBUTES
-    {
-        Prefix = "ath";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        ATTRIBUTES_IDLIST
-    };
-
-#define BRACKETS_IDLIST             \
-    IdList =                    \
-    {                           \
-        RID_LRPARENTX ;         \
-        RID_LRBRACKETX ;        \
-        RID_LRANGLEX ;          \
-        RID_LRBRACEX ;          \
-        RID_LRLINEX ;           \
-        RID_LRDLINEX ;          \
-        RID_LMRANGLEXY ;        \
-        RID_LRGROUPX ;          \
-        RID_SLRPARENTX ;        \
-        RID_SLRBRACKETX ;       \
-        RID_SLRANGLEX ;         \
-        RID_SLRBRACEX ;         \
-        RID_SLRLINEX ;          \
-        RID_SLRDLINEX ;         \
-        RID_SLMRANGLEXY ;       \
-        RID_LRDBRACKETX ;       \
-        RID_SLRDBRACKETX ;      \
-        RID_XOVERBRACEY ;       \
-        RID_XUNDERBRACEY ;      \
-    };                          \
-    IdCount = { 19 ; };
-
-    ImageList RID_IL_BRACKETS
-    {
-        Prefix = "al";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        BRACKETS_IDLIST
-    };
-    ImageList RID_ILH_BRACKETS
-    {
-        Prefix = "alh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        BRACKETS_IDLIST
-    };
-
-#define FORMAT_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_NEWLINE ;       \
-        RID_SBLANK ;        \
-        RID_BLANK ;         \
-        RID_BINOMXY ;       \
-        RID_STACK ;         \
-        RID_MATRIX ;        \
-        RID_ALIGNLX ;       \
-        RID_ALIGNCX ;       \
-        RID_ALIGNRX ;       \
-        RID_RSUBX ;         \
-        RID_RSUPX ;         \
-        RID_LSUBX ;         \
-        RID_LSUPX ;         \
-        RID_CSUBX ;         \
-        RID_CSUPX ;         \
-    };                      \
-    IdCount = { 15 ; };
-
-    ImageList RID_IL_FORMAT
-    {
-        Prefix = "co";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        FORMAT_IDLIST
-    };
-    ImageList RID_ILH_FORMAT
-    {
-        Prefix = "coh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        FORMAT_IDLIST
-    };
-
-#define MISC_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_INFINITY ;      \
-        RID_PARTIAL ;       \
-        RID_NABLA ;         \
-        RID_EXISTS ;        \
-        RID_FORALL ;        \
-        RID_HBAR;           \
-        RID_LAMBDABAR ;     \
-        RID_RE ;            \
-        RID_IM ;            \
-        RID_WP ;            \
-        RID_LEFTARROW ;     \
-        RID_RIGHTARROW ;    \
-        RID_UPARROW ;       \
-        RID_DOWNARROW ;     \
-        RID_DOTSLOW ;       \
-        RID_DOTSAXIS ;      \
-        RID_DOTSVERT ;      \
-        RID_DOTSUP ;        \
-        RID_DOTSDOWN ;      \
-    };                      \
-    IdCount = { 19 ; };
-
-    ImageList RID_IL_MISC
-    {
-        Prefix = "mi";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        MISC_IDLIST
-    };
-    ImageList RID_ILH_MISC
-    {
-        Prefix = "mih";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        MISC_IDLIST
-    };
-
-#define CATALOG_IDLIST                  \
-    IdList =                        \
-    {                               \
-        RID_UNBINOPS_CAT ;          \
-        RID_RELATIONS_CAT ;         \
-        RID_SETOPERATIONS_CAT ;     \
-        RID_FUNCTIONS_CAT ;         \
-        RID_OPERATORS_CAT ;         \
-        RID_ATTRIBUTES_CAT ;        \
-        RID_MISC_CAT ;              \
-        RID_BRACKETS_CAT ;          \
-        RID_FORMAT_CAT ;            \
-    };                              \
-    IdCount = { 9 ; };
-
-    ImageList RID_IL_CATALOG
-    {
-        Prefix = "im";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        CATALOG_IDLIST
-    };
-    ImageList RID_ILH_CATALOG
-    {
-        Prefix = "imh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        CATALOG_IDLIST
-    };
-
-
-
 String STR_CMDBOXWINDOW
 {
     CMDBOXWINDOW_TEXT
@@ -3568,9 +1779,9 @@ StringArray RID_PRINTUIOPTIONS
         < "Adjusts the formula to the page format used in the printout."; >;
         < "~Scaling"; >;
         < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >;
-        < "Miscellaneous options"; >;
-        < "Ig~nore ~~ and ` at the end of the line"; >;
-        < "Specfies that these space wildcards will be removed if they are at the end of a line."; >;
+//        < "Miscellaneous options"; >;
+//        < "Ig~nore ~~ and ` at the end of the line"; >;
+//        < "Specfies that these space wildcards will be removed if they are at the end of a line."; >;
     };
 };
 
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 6c23a079db..ceeb494fa8 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -78,7 +78,7 @@ SmSym::SmSym(const SmSym& rSymbol)
 }
 
 
-SmSym::SmSym(const String& rName, const Font& rFont, sal_Unicode cChar,
+SmSym::SmSym(const String& rName, const Font& rFont, sal_UCS4 cChar,
              const String& rSet, BOOL bIsPredefined)
 {
     m_aName     = m_aExportName   = rName;
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index d5995e10a7..d7ad42949a 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -135,7 +135,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
                                  SfxChildWindow *pChildWindow,
                                  Window *pParent) :
     SfxFloatingWindow(pTmpBindings, pChildWindow, pParent, SmResId(RID_TOOLBOXWINDOW)),
-    aToolBoxCat(this, SmResId(NUM_TBX_CATEGORIES + 1)),
+    aToolBoxCat(this, SmResId(TOOLBOX_CATALOG)),
     aToolBoxCat_Delim(this, SmResId( FL_TOOLBOX_CAT_DELIM ))
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmToolBoxWindow::SmToolBoxWindow" );
@@ -143,14 +143,14 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
     // allow for cursor travelling between toolbox and sub-categories
     SetStyle( GetStyle() | WB_DIALOGCONTROL );
 
-    nActiveCategoryRID = sal::static_int_cast< USHORT >(-1);
+    nActiveCategoryRID = USHRT_MAX;
     
     aToolBoxCat.SetClickHdl(LINK(this, SmToolBoxWindow, CategoryClickHdl));
 
     USHORT i;
-    for (i = 0;  i < NUM_TBX_CATEGORIES;  i++)
+    for (i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
     {
-        ToolBox *pBox = new ToolBox(this, SmResId (i+1));
+        ToolBox *pBox = new ToolBox(this, SmResId( TOOLBOX_CAT_A + i ));
         vToolBoxCategories[i] = pBox;
         pBox->SetSelectHdl(LINK(this, SmToolBoxWindow, CmdSelectHdl));
     }
@@ -163,15 +163,12 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
     }
 
     FreeResource();
-
-    ApplyImageLists( RID_UNBINOPS_CAT );
-    SetCategory( RID_UNBINOPS_CAT );
 }
 
 SmToolBoxWindow::~SmToolBoxWindow()
 {
     int i;
-    for (i = 0;  i < NUM_TBX_CATEGORIES;  i++)
+    for (i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
     {
         ToolBox *pBox = vToolBoxCategories[i];
         delete pBox;
@@ -249,11 +246,11 @@ void SmToolBoxWindow::StateChanged( StateChangedType nStateChange )
     static BOOL bSetPosition = TRUE;
     if (STATE_CHANGE_INITSHOW == nStateChange)
     {
+        SetCategory( nActiveCategoryRID == USHRT_MAX ? RID_UNBINOPS_CAT : nActiveCategoryRID );
+
         // calculate initial position to be used after creation of the window...
         AdjustPosSize( bSetPosition );
         bSetPosition = FALSE;
-
-        SetCategory(RID_UNBINOPS_CAT);
     }
     //... otherwise the base class will remember the last position of the window
     SfxFloatingWindow::StateChanged( nStateChange );
@@ -263,7 +260,7 @@ void SmToolBoxWindow::StateChanged( StateChangedType nStateChange )
 void SmToolBoxWindow::AdjustPosSize( BOOL bSetPos )
 {
     Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
-    Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 5 ) );
+    Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 4 /* see nLines in SetCategory*/ ) );
     DBG_ASSERT( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
 
     // catalog settings
@@ -271,14 +268,12 @@ void SmToolBoxWindow::AdjustPosSize( BOOL bSetPos )
     aToolBoxCat.SetSizePixel( aCatSize );
     // settings for catalog / category delimiter
     Point aP( aToolBoxCat_Delim.GetPosPixel() );
-    aP.X() += 5;
+    aP.X() = 0;
     aToolBoxCat_Delim.SetPosPixel( aP );
-    Size  aS( aCatSize.Width() - 10, 10 );
-    aToolBoxCat_Delim.SetSizePixel( aS );
+    aToolBoxCat_Delim.SetSizePixel( Size( aCatSize.Width(), aToolBoxCat_Delim.GetSizePixel().Height() ) );
     // category settings
-    aP.X() = 0;
     aP.Y() += aToolBoxCat_Delim.GetSizePixel().Height();
-    for (int i = 0;  i < NUM_TBX_CATEGORIES;  i++)
+    for (int i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
     {
         vToolBoxCategories[i]->SetPosPixel( aP );
         vToolBoxCategories[i]->SetSizePixel( aCmdSize );
@@ -327,63 +322,60 @@ void SmToolBoxWindow::GetFocus()
 void SmToolBoxWindow::SetCategory(USHORT nCategoryRID)
 {
     if (nCategoryRID != nActiveCategoryRID)
-    {
         ApplyImageLists( nCategoryRID );
 
-        USHORT nLines;
-        // check for valid resource id
-        switch (nCategoryRID)
-        {
-            case RID_UNBINOPS_CAT :     nLines = 4; break;
-            case RID_RELATIONS_CAT:     nLines = 5; break;
-            case RID_SETOPERATIONS_CAT: nLines = 5; break;
-            case RID_FUNCTIONS_CAT:     nLines = 5; break;
-            case RID_OPERATORS_CAT:     nLines = 3; break;
-            case RID_ATTRIBUTES_CAT:    nLines = 5; break;
-            case RID_MISC_CAT:          nLines = 4; break;
-            case RID_BRACKETS_CAT:      nLines = 5; break;
-            case RID_FORMAT_CAT:        nLines = 3; break;
-            default:
-                // nothing to be done
-                return;
-        }
+    USHORT nLines;
+    // check for valid resource id
+    switch (nCategoryRID)
+    {
+        case RID_UNBINOPS_CAT :     nLines = 4; break;
+        case RID_RELATIONS_CAT:     nLines = 4; break;
+        case RID_SETOPERATIONS_CAT: nLines = 4; break;
+        case RID_FUNCTIONS_CAT:     nLines = 4; break;
+        case RID_OPERATORS_CAT:     nLines = 3; break;
+        case RID_ATTRIBUTES_CAT:    nLines = 4; break;
+        case RID_MISC_CAT:          nLines = 4; break;
+        case RID_BRACKETS_CAT:      nLines = 4; break;
+        case RID_FORMAT_CAT:        nLines = 3; break;
+        default:
+            // nothing to be done
+            return;
+    }
 
-        pToolBoxCmd->Hide();
+    pToolBoxCmd->Hide();
 
-        sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
-        DBG_ASSERT( nIdx >= 0, "unkown category" );
-        if (nIdx >= 0)
-            pToolBoxCmd = vToolBoxCategories[nIdx];
+    sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
+    DBG_ASSERT( nIdx >= 0, "unkown category" );
+    if (nIdx >= 0)
+        pToolBoxCmd = vToolBoxCategories[nIdx];
 
-        // calculate actual size of window to use
-        Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
-        Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( nLines ) );
-        DBG_ASSERT( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
-        // main window settings
-        Size  aWndSize ( aCatSize.Width(), pToolBoxCmd->GetPosPixel().Y() + aCmdSize.Height() + 3);
-        SetOutputSizePixel( aWndSize );
+    // calculate actual size of window to use
+    Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
+    Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( nLines ) );
+    DBG_ASSERT( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
+    // main window settings
+    Size  aWndSize ( aCatSize.Width(), pToolBoxCmd->GetPosPixel().Y() + aCmdSize.Height() + 3);
+    SetOutputSizePixel( aWndSize );
 
-        if (nActiveCategoryRID)
-            aToolBoxCat.CheckItem(nActiveCategoryRID, FALSE);
-        nActiveCategoryRID = nCategoryRID;
-        aToolBoxCat.CheckItem(nActiveCategoryRID, TRUE);
+    if (nActiveCategoryRID)
+        aToolBoxCat.CheckItem(nActiveCategoryRID, FALSE);
+    nActiveCategoryRID = nCategoryRID;
+    aToolBoxCat.CheckItem(nActiveCategoryRID, TRUE);
 
-        pToolBoxCmd->Show();
-    }
+    pToolBoxCmd->Show();
 }
 
 
-IMPL_LINK_INLINE_START( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox)
+IMPL_LINK( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox)
 {
     int nItemId = pToolBox->GetCurItemId();
     if (nItemId != 0)
         SetCategory( sal::static_int_cast< USHORT >(nItemId) );
     return 0;
 }
-IMPL_LINK_INLINE_END( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox)
 
 
-IMPL_LINK_INLINE_START( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
+IMPL_LINK( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
 {
     SmViewShell *pViewSh = GetView();
     if (pViewSh)
@@ -392,7 +384,6 @@ IMPL_LINK_INLINE_START( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
                 new SfxInt16Item(SID_INSERTCOMMAND, pToolBox->GetCurItemId()), 0L);
     return 0;
 }
-IMPL_LINK_INLINE_END( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
 
 
 /**************************************************************************/
diff --git a/starmath/source/toolbox.hrc b/starmath/source/toolbox.hrc
index 9b15d99e20..c4fc6f3bce 100644..100755
--- a/starmath/source/toolbox.hrc
+++ b/starmath/source/toolbox.hrc
@@ -28,7 +28,19 @@
 #ifndef _TOOLBOX_HRC_
 #define _TOOLBOX_HRC_
 
-#define FL_TOOLBOX_CAT_DELIM    21
+#define FL_TOOLBOX_CAT_DELIM    1
+#define TOOLBOX_CATALOG     10
+#define TOOLBOX_CAT_A       11
+#define TOOLBOX_CAT_B       12
+#define TOOLBOX_CAT_C       13
+#define TOOLBOX_CAT_D       14
+#define TOOLBOX_CAT_E       15
+#define TOOLBOX_CAT_F       16
+#define TOOLBOX_CAT_G       17
+#define TOOLBOX_CAT_H       18
+#define TOOLBOX_CAT_I       19
+
+#define NUM_TBX_CATEGORIES  (TOOLBOX_CAT_I - TOOLBOX_CAT_A + 1)
 
 #endif
 
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
new file mode 100755
index 0000000000..ca10554700
--- /dev/null
+++ b/starmath/source/toolbox.src
@@ -0,0 +1,1837 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#include <sfx2/sfx.hrc>
+#include <svx/globlmn.hrc>
+#include "starmath.hrc"
+#include "toolbox.hrc"
+
+#define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
+#define IMAGE_STDBTN_COLOR_HC IMAGE_STDBTN_COLOR
+
+
+FloatingWindow RID_TOOLBOXWINDOW
+{
+    HelpId = HID_SMA_OPERATOR_WIN ;
+    Border = TRUE ;
+    Moveable = TRUE ;
+    Closeable = TRUE ;
+    Hide = TRUE ;
+    OutputSize = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 0 , 0 ) ;  // to be calculated programmatically
+    Text [ en-US ] = "Elements" ;
+
+    ToolBox TOOLBOX_CATALOG
+    {
+        // main menu of selection-window
+        HelpId = HID_SMA_SELECTION_TBX ;
+        Pos = MAP_APPFONT ( 0 , 0 ) ;
+        Size = MAP_APPFONT ( 65 , 38 ) ;
+        SVLook = TRUE ;
+        LineCount = 2 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_UNBINOPS_CAT ;
+                HelpId = HID_SMA_UNBINOPS_CAT ;
+                Text [ en-US ] = "Unary/Binary Operators" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RELATIONS_CAT ;
+                HelpId = HID_SMA_RELATIONS_CAT ;
+                Text [ en-US ] = "Relations" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETOPERATIONS_CAT ;
+                HelpId = HID_SMA_SETOPERATIONS_CAT ;
+                Text [ en-US ] = "Set Operations" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FUNCTIONS_CAT ;
+                HelpId = HID_SMA_FUNCTIONS_CAT ;
+                Text [ en-US ] = "Functions" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_OPERATORS_CAT ;
+                HelpId = HID_SMA_OPERATORS_CAT ;
+                Text [ en-US ] = "Operators" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ATTRIBUTES_CAT ;
+                HelpId = HID_SMA_ATTRIBUTES_CAT ;
+                Text [ en-US ] = "Attributes" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_MISC_CAT ;
+                HelpId = HID_SMA_MISC_CAT ;
+                Text [ en-US ] = "Others";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BRACKETS_CAT ;
+                HelpId = HID_SMA_BRACKETS_CAT ;
+                Text [ en-US ] = "Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FORMAT_CAT ;
+                HelpId = HID_SMA_FORMAT_CAT ;
+                Text [ en-US ] = "Formats" ;
+            };
+        };
+    };
+    
+    FixedLine FL_TOOLBOX_CAT_DELIM
+    {
+        Pos = MAP_APPFONT ( 0 , 44 ) ;
+        Size = MAP_APPFONT ( 65 , 8 ) ;
+    };
+
+    ToolBox TOOLBOX_CAT_A
+    {
+        // unary/binary operators
+        HelpId = HID_SMA_UNBINOPS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 4 ;
+
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_PLUSX ;
+                HelpId = HID_SMA_PLUSX ;
+                Text [ en-US ] = "+ Sign" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_MINUSX ;
+                HelpId = HID_SMA_MINUSX ;
+                Text [ en-US ] = "- Sign" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_PLUSMINUSX ;
+                HelpId = HID_SMA_PLUSMINUSX ;
+                Text [ en-US ] = "+- Sign" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_MINUSPLUSX ;
+                HelpId = HID_SMA_MINUSPLUSX ;
+                Text [ en-US ] = "-+ Sign" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_NEGX ;
+                HelpId = HID_SMA_NEGX ;
+                Text [ en-US ] = "Boolean NOT" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XPLUSY ;
+                HelpId = HID_SMA_XPLUSY ;
+                Text [ en-US ] = "Addition +" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XCDOTY ;
+                HelpId = HID_SMA_XCDOTY ;
+                Text [ en-US ] = "Multiplication (Dot )" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XTIMESY ;
+                HelpId = HID_SMA_XTIMESY ;
+                Text [ en-US ] = "Multiplication (x)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSYMTIMESY ;
+                HelpId = HID_SMA_XSYMTIMESY ;
+                Text [ en-US ] = "Multiplication (*)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XANDY ;
+                HelpId = HID_SMA_XANDY ;
+                Text [ en-US ] = "Boolean AND" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XMINUSY ;
+                HelpId = HID_SMA_XMINUSY ;
+                Text [ en-US ] = "Subtraction -" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XOVERY ;
+                HelpId = HID_SMA_XOVERY ;
+                Text [ en-US ] = "Division (Fraction)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XDIVY ;
+                HelpId = HID_SMA_XDIVY ;
+                Text [ en-US ] = "Division (÷)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSYMDIVIDEY ;
+                HelpId = HID_SMA_XSYMDIVIDEY ;
+                Text [ en-US ] = "Division (Slash)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XORY ;
+                HelpId = HID_SMA_XORY ;
+                Text [ en-US ] = "Boolean OR" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XCIRCY ;
+                HelpId = HID_SMA_XCIRCY ;
+                Text [ en-US ] = "Concatenate";
+            };
+        };
+    };
+    
+    ToolBox TOOLBOX_CAT_B
+    {
+        // relations
+        HelpId = HID_SMA_RELATIONS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_XEQY ;
+                HelpId = HID_SMA_XEQY ;
+                Text [ en-US ] = "Is Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNEQY ;
+                HelpId = HID_SMA_XNEQY ;
+                Text [ en-US ] = "Is Not Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XAPPROXY ;
+                HelpId = HID_SMA_XAPPROXY ;
+                Text [ en-US ] = "Is Approximately Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XDIVIDESY ;
+                HelpId = HID_SMA_XDIVIDESY ;
+                Text [ en-US ] = "Divides";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNDIVIDESY ;
+                HelpId = HID_SMA_XNDIVIDESY ;
+                Text [ en-US ] = "Does Not Divide";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XLTY ;
+                HelpId = HID_SMA_XLTY ;
+                Text [ en-US ] = "Is Less Than" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XGTY ;
+                HelpId = HID_SMA_XGTY ;
+                Text [ en-US ] = "Is Greater Than" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSIMEQY ;
+                HelpId = HID_SMA_XSIMEQY ;
+                /* ### ACHTUNG: Neuer Text in Resource? ist �hnlich oder gleich : ist �hnlich oder glech */
+                Text [ en-US ] = "Is Similar Or Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XPARALLELY ;
+                HelpId = HID_SMA_XPARALLELY ;
+                Text [ en-US ] = "Is Parallel To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XORTHOY ;
+                HelpId = HID_SMA_XORTHOY ;
+                Text [ en-US ] = "Is Orthogonal To" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XLESLANTY ;
+                HelpId = HID_SMA_XLESLANTY ;
+                Text [ en-US ] = "Is Less Than Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XGESLANTY ;
+                HelpId = HID_SMA_XGESLANTY ;
+                Text [ en-US ] = "Is Greater Than Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSIMY ;
+                HelpId = HID_SMA_XSIMY ;
+                Text [ en-US ] = "Is Similar To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XEQUIVY ;
+                HelpId = HID_SMA_XEQUIVY ;
+                Text [ en-US ] = "Is Congruent To" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XLEY ;
+                HelpId = HID_SMA_XLEY ;
+                Text [ en-US ] = "Is Less Than Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XGEY ;
+                HelpId = HID_SMA_XGEY ;
+                Text [ en-US ] = "Is Greater Than Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XPROPY ;
+                HelpId = HID_SMA_XPROPY ;
+                Text [ en-US ] = "Is Proportional To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XTOWARDY ;
+                HelpId = HID_SMA_XTOWARDY ;
+                Text [ en-US ] = "Toward" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DLARROW ;
+                HelpId = HID_SMA_DLARROW ;
+                Text [ en-US ] = "Double Arrow Left";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DLRARROW ;
+                HelpId = HID_SMA_DLRARROW ;
+                Text [ en-US ] = "Double Arrow Left And Right";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DRARROW ;
+                HelpId = HID_SMA_DRARROW ;
+                Text [ en-US ] = "Double Arrow Right";
+            };
+        };
+    };
+    
+    ToolBox TOOLBOX_CAT_C
+    {
+        // set operations
+        HelpId = HID_SMA_SETOPERATIONS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_XINY ;
+                HelpId = HID_SMA_XINY ;
+                Text [ en-US ] = "Is In" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNOTINY ;
+                HelpId = HID_SMA_XNOTINY ;
+                Text [ en-US ] = "Is Not In" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XOWNSY ;
+                HelpId = HID_SMA_XOWNSY ;
+                Text [ en-US ] = "Owns" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_EMPTYSET ;
+                HelpId = HID_SMA_EMPTYSET ;
+                Text [ en-US ] = "Empty Set";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XINTERSECTIONY ;
+                HelpId = HID_SMA_XINTERSECTIONY ;
+                Text [ en-US ] = "Intersection" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XUNIONY ;
+                HelpId = HID_SMA_XUNIONY ;
+                Text [ en-US ] = "Union" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSETMINUSY ;
+                HelpId = HID_SMA_XSETMINUSY ;
+                Text [ en-US ] = "Difference" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSLASHY ;
+                HelpId = HID_SMA_XSLASHY ;
+                Text [ en-US ] = "Quotient Set" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ALEPH ;
+                HelpId = HID_SMA_ALEPH ;
+                Text [ en-US ] = "Aleph";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSUBSETY ;
+                HelpId = HID_SMA_XSUBSETY ;
+                Text [ en-US ] = "Subset" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSUBSETEQY ;
+                HelpId = HID_SMA_XSUBSETEQY ;
+                Text [ en-US ] = "Subset Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSUPSETY ;
+                HelpId = HID_SMA_XSUPSETY ;
+                Text [ en-US ] = "Superset" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSUPSETEQY ;
+                HelpId = HID_SMA_XSUPSETEQY ;
+                Text [ en-US ] = "Superset Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNSUBSETY ;
+                HelpId = HID_SMA_XNSUBSETY ;
+                Text [ en-US ] = "Not Subset" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNSUBSETEQY ;
+                HelpId = HID_SMA_XNSUBSETEQY ;
+                Text [ en-US ] = "Not Subset Or Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNSUPSETY ;
+                HelpId = HID_SMA_XNSUPSETY ;
+                Text [ en-US ] = "Not Superset" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNSUPSETEQY ;
+                HelpId = HID_SMA_XNSUPSETEQY ;
+                Text [ en-US ] = "Not Superset Or Equal" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETN ;
+                HelpId = HID_SMA_SETN ;
+                Text [ en-US ] = "Natural Numbers Set";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETZ ;
+                HelpId = HID_SMA_SETZ ;
+                Text [ en-US ] = "Integers Set";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETQ ;
+                HelpId = HID_SMA_SETQ ;
+                Text [ en-US ] = "Set of Rational Numbers";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETR ;
+                HelpId = HID_SMA_SETR ;
+                Text [ en-US ] = "Real Numbers Set";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETC ;
+                HelpId = HID_SMA_SETC ;
+                Text [ en-US ] = "Complex Numbers Set";
+            };
+        };
+    };
+    
+    ToolBox TOOLBOX_CAT_D
+    {
+        // functions
+        HelpId = HID_SMA_FUNCTIONS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_EX ;
+                HelpId = HID_SMA_EX ;
+                Text [ en-US ] = "Exponential Function" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LNX ;
+                HelpId = HID_SMA_LNX ;
+                Text [ en-US ] = "Natural Logarithm" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_EXPX ;
+                HelpId = HID_SMA_EXPX ;
+                Text [ en-US ] = "Exponential Function" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LOGX ;
+                HelpId = HID_SMA_LOGX ;
+                Text [ en-US ] = "Logarithm" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RSUPX ;
+                HelpId = HID_SMA_RSUPX ;
+                Text [ en-US ] = "Power";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SINX ;
+                HelpId = HID_SMA_SINX ;
+                Text [ en-US ] = "Sine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COSX ;
+                HelpId = HID_SMA_COSX ;
+                Text [ en-US ] = "Cosine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_TANX ;
+                HelpId = HID_SMA_TANX ;
+                Text [ en-US ] = "Tangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COTX ;
+                HelpId = HID_SMA_COTX ;
+                Text [ en-US ] = "Cotangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SQRTX ;
+                HelpId = HID_SMA_SQRTX ;
+                Text [ en-US ] = "Square Root" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCSINX ;
+                HelpId = HID_SMA_ARCSINX ;
+                Text [ en-US ] = "Arcsine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCCOSX ;
+                HelpId = HID_SMA_ARCCOSX ;
+                Text [ en-US ] = "Arccosine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCTANX ;
+                HelpId = HID_SMA_ARCTANX ;
+                Text [ en-US ] = "Arctangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCCOTX ;
+                HelpId = HID_SMA_ARCCOTX ;
+                Text [ en-US ] = "Arccotangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_NROOTXY ;
+                HelpId = HID_SMA_NROOTXY ;
+                Text [ en-US ] = "N-th Root" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SINHX ;
+                HelpId = HID_SMA_SINHX ;
+                Text [ en-US ] = "Hyperbolic Sine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COSHX ;
+                HelpId = HID_SMA_COSHX ;
+                Text [ en-US ] = "Hyperbolic Cosine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_TANHX ;
+                HelpId = HID_SMA_TANHX ;
+                Text [ en-US ] = "Hyperbolic Tangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COTHX ;
+                HelpId = HID_SMA_COTHX ;
+                Text [ en-US ] = "Hyperbolic Cotangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ABSX ;
+                HelpId = HID_SMA_ABSX ;
+                Text [ en-US ] = "Absolute Value" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARSINHX ;
+                HelpId = HID_SMA_ARSINHX ;
+                Text [ en-US ] = "Area Hyperbolic Sine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCOSHX ;
+                HelpId = HID_SMA_ARCOSHX ;
+                Text [ en-US ] = "Area Hyperbolic Cosine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARTANHX ;
+                HelpId = HID_SMA_ARTANHX ;
+                Text [ en-US ] = "Area Hyperbolic Tangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCOTHX ;
+                HelpId = HID_SMA_ARCOTHX ;
+                Text [ en-US ] = "Area Hyperbolic Cotangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FACTX ;
+                HelpId = HID_SMA_FACTX ;
+                Text [ en-US ] = "Factorial" ;
+            };
+        };
+    };
+    
+    ToolBox TOOLBOX_CAT_E
+    {
+        // operators
+        HelpId = HID_SMA_OPERATORS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 3 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_LIMX ;
+                HelpId = HID_SMA_LIMX ;
+                Text [ en-US ] = "Limes" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SUMX ;
+                HelpId = HID_SMA_SUMX ;
+                Text [ en-US ] = "Sum" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_PRODX ;
+                HelpId = HID_SMA_PRODX ;
+                Text [ en-US ] = "Product" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COPRODX ;
+                HelpId = HID_SMA_COPRODX ;
+                Text [ en-US ] = "Coproduct" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FROMXTOY ;
+                HelpId = HID_SMA_FROMXTOY ;
+                Text [ en-US ] = "Upper And Lower Limit" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_INTX ;
+                HelpId = HID_SMA_INTX ;
+                Text [ en-US ] = "Integral" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_IINTX ;
+                HelpId = HID_SMA_IINTX ;
+                Text [ en-US ] = "Double Integral" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_IIINTX ;
+                HelpId = HID_SMA_IIINTX ;
+                Text [ en-US ] = "Triple Integral" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FROMX ;
+                HelpId = HID_SMA_FROMX ;
+                Text [ en-US ] = "Lower Limit" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LINTX ;
+                HelpId = HID_SMA_LINTX ;
+                Text [ en-US ] = "Curve Integral" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LLINTX ;
+                HelpId = HID_SMA_LLINTX ;
+                Text [ en-US ] = "Double Curve Integral" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LLLINTX ;
+                HelpId = HID_SMA_LLLINTX ;
+                Text [ en-US ] = "Triple Curve Integral" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_TOX ;
+                HelpId = HID_SMA_TOX ;
+                Text [ en-US ] = "Upper Limit" ;
+            };
+        };
+    };
+    
+    ToolBox TOOLBOX_CAT_F
+    {
+        // attributs
+        HelpId = HID_SMA_ATTRIBUTES_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_ACUTEX ;
+                HelpId = HID_SMA_ACUTEX ;
+                Text [ en-US ] = "Acute Accent";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_GRAVEX ;
+                HelpId = HID_SMA_GRAVEX ;
+                Text [ en-US ] = "Grave Accent";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_CHECKX ;
+                HelpId = HID_SMA_CHECKX ;
+                Text [ en-US ] = "Reverse Circumflex" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BREVEX ;
+                HelpId = HID_SMA_BREVEX ;
+                Text [ en-US ] = "Breve" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_CIRCLEX ;
+                HelpId = HID_SMA_CIRCLEX ;
+                Text [ en-US ] = "Circle" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_VECX ;
+                HelpId = HID_SMA_VECX ;
+                Text [ en-US ] = "Vector Arrow" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_TILDEX ;
+                HelpId = HID_SMA_TILDEX ;
+                Text [ en-US ] = "Tilde" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_HATX ;
+                HelpId = HID_SMA_HATX ;
+                Text [ en-US ] = "Circumflex" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BARX ;
+                HelpId = HID_SMA_BARX ;
+                Text [ en-US ] = "Line Above" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTX ;
+                HelpId = HID_SMA_DOTX ;
+                Text [ en-US ] = "Dot" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_WIDEVECX ;
+                HelpId = HID_SMA_WIDEVECX ;
+                Text [ en-US ] = "Large Vector Arrow";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_WIDETILDEX ;
+                HelpId = HID_SMA_WIDETILDEX ;
+                Text [ en-US ] = "Large Tilde";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_WIDEHATX ;
+                HelpId = HID_SMA_WIDEHATX ;
+                Text [ en-US ] = "Large Circumflex";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DDOTX ;
+                HelpId = HID_SMA_DDOTX ;
+                Text [ en-US ] = "Double Dot" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_OVERLINEX ;
+                HelpId = HID_SMA_OVERLINEX ;
+                Text [ en-US ] = "Line Over" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_UNDERLINEX ;
+                HelpId = HID_SMA_UNDERLINEX ;
+                Text [ en-US ] = "Line Below" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_OVERSTRIKEX ;
+                HelpId = HID_SMA_OVERSTRIKEX ;
+                Text [ en-US ] = "Line Through" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DDDOTX ;
+                HelpId = HID_SMA_DDDOTX ;
+                Text [ en-US ] = "Triple Dot" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_PHANTOMX ;
+                HelpId = HID_SMA_PHANTOMX ;
+                Text [ en-US ] = "Transparent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BOLDX ;
+                HelpId = HID_SMA_BOLDX ;
+                Text [ en-US ] = "Bold Font" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ITALX ;
+                HelpId = HID_SMA_ITALX ;
+                Text [ en-US ] = "Italic Font" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SIZEXY ;
+                HelpId = HID_SMA_SIZEXY ;
+                Text [ en-US ] = "Resize" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FONTXY ;
+                HelpId = HID_SMA_FONTXY ;
+                Text [ en-US ] = "Change Font" ;
+            };
+        };
+    };
+    
+    ToolBox TOOLBOX_CAT_G
+    {
+        // parentheses
+        HelpId = HID_SMA_BRACKETS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_LRPARENTX ;
+                HelpId = HID_SMA_LRPARENTX ;
+                Text [ en-US ] = "Round Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRBRACKETX ;
+                HelpId = HID_SMA_LRBRACKETX ;
+                Text [ en-US ] = "Square Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRDBRACKETX ;
+                HelpId = HID_SMA_LRDBRACKETX ;
+                Text [ en-US ] = "Double Square Brackets";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRLINEX ;
+                HelpId = HID_SMA_LRLINEX ;
+                Text [ en-US ] = "Single Lines" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRDLINEX ;
+                HelpId = HID_SMA_LRDLINEX ;
+                Text [ en-US ] = "Double Lines" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRBRACEX ;
+                HelpId = HID_SMA_LRBRACEX ;
+                Text [ en-US ] = "Braces" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRANGLEX ;
+                HelpId = HID_SMA_LRANGLEX ;
+                Text [ en-US ] = "Angle Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LMRANGLEXY ;
+                HelpId = HID_SMA_LMRANGLEXY ;
+                Text [ en-US ] = "Operator Brackets";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRGROUPX ;
+                HelpId = HID_SMA_LRGROUPX ;
+                Text [ en-US ] = "Group Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRPARENTX ;
+                HelpId = HID_SMA_SLRPARENTX ;
+                Text [ en-US ] = "Round Brackets (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRBRACKETX ;
+                HelpId = HID_SMA_SLRBRACKETX ;
+                Text [ en-US ] = "Square Brackets (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRDBRACKETX ;
+                HelpId = HID_SMA_SLRDBRACKETX ;
+                Text [ en-US ] = "Double Square Brackets (Scalable)";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRLINEX ;
+                HelpId = HID_SMA_SLRLINEX ;
+                Text [ en-US ] = "Single Lines (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRDLINEX ;
+                HelpId = HID_SMA_SLRDLINEX ;
+                Text [ en-US ] = "Double Lines (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRBRACEX ;
+                HelpId = HID_SMA_SLRBRACEX ;
+                Text [ en-US ] = "Braces (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRANGLEX ;
+                HelpId = HID_SMA_SLRANGLEX ;
+                Text [ en-US ] = "Angle Brackets (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLMRANGLEXY ;
+                HelpId = HID_SMA_SLMRANGLEXY ;
+                Text [ en-US ] = "Operator Brackets (Scalable)";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XOVERBRACEY ;
+                HelpId = HID_SMA_XOVERBRACEY ;
+                Text [ en-US ] = "Braces Top (Scalable)";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XUNDERBRACEY ;
+                HelpId = HID_SMA_XUNDERBRACEY ;
+                Text [ en-US ] = "Braces Bottom (Scalable)";
+            };
+        };
+    };
+    
+    ToolBox TOOLBOX_CAT_H
+    {
+        // format
+        HelpId = HID_SMA_FORMAT_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 3 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_LSUPX ;
+                HelpId = HID_SMA_LSUPX ;
+                Text [ en-US ] = "Superscript Left" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_CSUPX ;
+                HelpId = HID_SMA_CSUPX ;
+                Text [ en-US ] = "Superscript Top";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RSUPX ;
+                HelpId = HID_SMA_RSUPX ;
+                Text [ en-US ] = "Superscript Right" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BINOMXY ;
+                HelpId = HID_SMA_BINOMXY ;
+                Text [ en-US ] = "Vertical Stack (2 Elements)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_NEWLINE ;
+                HelpId = HID_SMA_NEWLINE ;
+                Text [ en-US ] = "New Line" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LSUBX ;
+                HelpId = HID_SMA_LSUBX ;
+                Text [ en-US ] = "Subscript Left" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_CSUBX ;
+                HelpId = HID_SMA_CSUBX ;
+                Text [ en-US ] = "Subscript Bottom";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RSUBX ;
+                HelpId = HID_SMA_RSUBX ;
+                Text [ en-US ] = "Subscript Right" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_STACK ;
+                HelpId = HID_SMA_STACK ;
+                Text [ en-US ] = "Vertical Stack" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SBLANK ;
+                HelpId = HID_SMA_SBLANK ;
+                Text [ en-US ] = "Small Gap" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ALIGNLX ;
+                HelpId = HID_SMA_ALIGNLX ;
+                Text [ en-US ] = "Align Left" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ALIGNCX ;
+                HelpId = HID_SMA_ALIGNCX ;
+                Text [ en-US ] = "Align Center" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ALIGNRX ;
+                HelpId = HID_SMA_ALIGNRX ;
+                Text [ en-US ] = "Align Right" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_MATRIX ;
+                HelpId = HID_SMA_MATRIX ;
+                Text [ en-US ] = "Matrix Stack" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BLANK ;
+                HelpId = HID_SMA_BLANK ;
+                Text [ en-US ] = "Gap" ;
+            };
+        };
+    };
+    
+    ToolBox TOOLBOX_CAT_I
+    {
+        // misc
+        HelpId = HID_SMA_FORMAT_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 4 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_INFINITY ;
+                HelpId = HID_SMA_INFINITY ;
+                Text [ en-US ] = "infinite";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_PARTIAL ;
+                HelpId = HID_SMA_PARTIAL ;
+                Text [ en-US ] = "Partial";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_NABLA ;
+                HelpId = HID_SMA_NABLA ;
+                Text [ en-US ] = "Nabla";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_EXISTS ;
+                HelpId = HID_SMA_EXISTS ;
+                Text [ en-US ] = "There Exists";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FORALL ;
+                HelpId = HID_SMA_FORALL ;
+                Text [ en-US ] = "For All";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_HBAR ;
+                HelpId = HID_SMA_HBAR ;
+                Text [ en-US ] = "h Bar";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LAMBDABAR ;
+                HelpId = HID_SMA_LAMBDABAR ;
+                Text [ en-US ] = "Lambda Bar";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RE ;
+                HelpId = HID_SMA_RE ;
+                Text [ en-US ] = "Real Part";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_IM ;
+                HelpId = HID_SMA_IM ;
+                Text [ en-US ] = "Imaginary Part";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_WP ;
+                HelpId = HID_SMA_WP ;
+                Text [ en-US ] = "Weierstrass p";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LEFTARROW ;
+                HelpId = HID_SMA_LEFTARROW ;
+                Text [ en-US ] = "Left Arrow";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RIGHTARROW ;
+                HelpId = HID_SMA_RIGHTARROW ;
+                Text [ en-US ] = "Right Arrow";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_UPARROW ;
+                HelpId = HID_SMA_UPARROW ;
+                Text [ en-US ] = "Up Arrow";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOWNARROW ;
+                HelpId = HID_SMA_DOWNARROW ;
+                Text [ en-US ] = "Down Arrow";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSLOW ;
+                HelpId = HID_SMA_DOTSLOW ;
+                Text [ en-US ] = "Dots At Bottom";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSAXIS ;
+                HelpId = HID_SMA_DOTSAXIS ;
+                Text [ en-US ] = "Dots In Middle";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSVERT ;
+                HelpId = HID_SMA_DOTSVERT ;
+                Text [ en-US ] = "Dots Vertically";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSUP ;
+                HelpId = HID_SMA_DOTSUP ;
+                Text [ en-US ] = "Dots To Top";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSDOWN ;
+                HelpId = HID_SMA_DOTSDOWN ;
+                Text [ en-US ] = "Dots to Bottom";
+            };
+        };
+    };
+};
+
+
+
+#define UNBINOPS_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_PLUSX ;         \
+        RID_MINUSX ;        \
+        RID_PLUSMINUSX ;    \
+        RID_MINUSPLUSX ;    \
+        RID_XPLUSY ;        \
+        RID_XCDOTY ;        \
+        RID_XTIMESY ;       \
+        RID_XSYMTIMESY ;    \
+        RID_XMINUSY ;       \
+        RID_XOVERY ;        \
+        RID_XDIVY ;         \
+        RID_XSYMDIVIDEY ;   \
+        RID_NEGX ;          \
+        RID_XANDY ;         \
+        RID_XORY ;          \
+        RID_XCIRCY ;        \
+    };                      \
+    IdCount = { 16 ; };
+
+    ImageList RID_IL_UNBINOPS
+    {
+        Prefix = "un";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        UNBINOPS_IDLIST
+    };
+    ImageList RID_ILH_UNBINOPS
+    {
+        Prefix = "unh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        UNBINOPS_IDLIST
+    };
+
+#define RELATIONS_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_XEQY ;          \
+        RID_XNEQY ;         \
+        RID_XEQUIVY ;       \
+        RID_XORTHOY ;       \
+        RID_XLTY ;          \
+        RID_XGTY ;          \
+        RID_XAPPROXY ;      \
+        RID_XPARALLELY ;    \
+        RID_XLESLANTY ;     \
+        RID_XGESLANTY ;     \
+        RID_XSIMEQY ;       \
+        RID_XPROPY ;        \
+        RID_XLEY ;          \
+        RID_XGEY ;          \
+        RID_XSIMY ;         \
+        RID_XTOWARDY ;      \
+        RID_XDIVIDESY ;     \
+        RID_XNDIVIDESY;     \
+        RID_DLARROW ;       \
+        RID_DLRARROW ;      \
+        RID_DRARROW ;       \
+    };                      \
+    IdCount ={ 21 ; };
+
+    ImageList RID_IL_RELATIONS
+    {
+        Prefix = "bi";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        RELATIONS_IDLIST
+    };
+    ImageList RID_ILH_RELATIONS
+    {
+        Prefix = "bih";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        RELATIONS_IDLIST
+    };
+
+#define SETOPERATIONS_IDLIST             \
+    IdList =                    \
+    {                           \
+        RID_XINY ;              \
+        RID_XNOTINY ;           \
+        RID_XOWNSY ;            \
+        RID_XINTERSECTIONY ;    \
+        RID_XUNIONY ;           \
+        RID_XSETMINUSY ;        \
+        RID_XSLASHY ;           \
+        RID_XSUBSETY ;          \
+        RID_XSUBSETEQY ;        \
+        RID_XSUPSETY ;          \
+        RID_XSUPSETEQY ;        \
+        RID_XNSUBSETY ;         \
+        RID_XNSUBSETEQY ;       \
+        RID_XNSUPSETY ;         \
+        RID_XNSUPSETEQY ;       \
+        RID_EMPTYSET ;          \
+        RID_ALEPH ;             \
+        RID_SETN ;              \
+        RID_SETZ ;              \
+        RID_SETQ ;              \
+        RID_SETR ;              \
+        RID_SETC ;              \
+    };                          \
+    IdCount = { 22 ; };
+
+    ImageList RID_IL_SETOPERATIONS
+    {
+        Prefix = "op";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        SETOPERATIONS_IDLIST
+    };
+    ImageList RID_ILH_SETOPERATIONS
+    {
+        Prefix = "oph";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        SETOPERATIONS_IDLIST
+    };
+
+#define FUNCTIONS_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_ABSX ;          \
+        RID_FACTX ;         \
+        RID_SQRTX ;         \
+        RID_NROOTXY ;       \
+        RID_EX ;            \
+        RID_LNX ;           \
+        RID_EXPX ;          \
+        RID_LOGX ;          \
+        RID_SINX ;          \
+        RID_COSX ;          \
+        RID_TANX ;          \
+        RID_COTX ;          \
+        RID_SINHX ;         \
+        RID_COSHX ;         \
+        RID_TANHX ;         \
+        RID_COTHX ;         \
+        RID_ARCSINX ;       \
+        RID_ARCCOSX ;       \
+        RID_ARCTANX ;       \
+        RID_ARCCOTX ;       \
+        RID_ARSINHX ;       \
+        RID_ARCOSHX ;       \
+        RID_ARTANHX ;       \
+        RID_ARCOTHX ;       \
+        RID_RSUPX ;         \
+    };                      \
+    IdCount = { 25 ; };
+
+    ImageList RID_IL_FUNCTIONS
+    {
+        Prefix = "fu";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        FUNCTIONS_IDLIST
+    };
+    ImageList RID_ILH_FUNCTIONS
+    {
+        Prefix = "fuh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        FUNCTIONS_IDLIST
+    };
+
+#define OPERATORS_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_LIMX ;          \
+        RID_SUMX ;          \
+        RID_PRODX ;         \
+        RID_COPRODX ;       \
+        RID_INTX ;          \
+        RID_IINTX ;         \
+        RID_IIINTX ;        \
+        RID_LINTX ;         \
+        RID_LLINTX ;        \
+        RID_LLLINTX ;       \
+        RID_FROMXTOY ;      \
+        RID_FROMX ;         \
+        RID_TOX ;           \
+    };                      \
+    IdCount = { 13 ; };
+
+    ImageList RID_IL_OPERATORS
+    {
+        Prefix = "fo";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        OPERATORS_IDLIST
+    };
+    ImageList RID_ILH_OPERATORS
+    {
+        Prefix = "foh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        OPERATORS_IDLIST
+    };
+
+#define ATTRIBUTES_IDLIST             \
+    IdList =                    \
+    {                           \
+        RID_ACUTEX ;            \
+        RID_GRAVEX ;            \
+        RID_CHECKX ;            \
+        RID_BREVEX ;            \
+        RID_BARX ;              \
+        RID_VECX ;              \
+        RID_HATX ;              \
+        RID_TILDEX ;            \
+        RID_CIRCLEX ;           \
+        RID_DOTX ;              \
+        RID_DDOTX ;             \
+        RID_DDDOTX ;            \
+        RID_OVERLINEX ;         \
+        RID_UNDERLINEX ;        \
+        RID_OVERSTRIKEX ;       \
+        RID_PHANTOMX ;          \
+        RID_BOLDX ;             \
+        RID_ITALX ;             \
+        RID_SIZEXY ;            \
+        RID_FONTXY ;            \
+        RID_WIDEHATX ;          \
+        RID_WIDETILDEX ;        \
+        RID_WIDEVECX ;          \
+    };                          \
+    IdCount = { 23 ; };
+
+    ImageList RID_IL_ATTRIBUTES
+    {
+        Prefix = "at";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        ATTRIBUTES_IDLIST
+    };
+    ImageList RID_ILH_ATTRIBUTES
+    {
+        Prefix = "ath";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        ATTRIBUTES_IDLIST
+    };
+
+#define BRACKETS_IDLIST             \
+    IdList =                    \
+    {                           \
+        RID_LRPARENTX ;         \
+        RID_LRBRACKETX ;        \
+        RID_LRANGLEX ;          \
+        RID_LRBRACEX ;          \
+        RID_LRLINEX ;           \
+        RID_LRDLINEX ;          \
+        RID_LMRANGLEXY ;        \
+        RID_LRGROUPX ;          \
+        RID_SLRPARENTX ;        \
+        RID_SLRBRACKETX ;       \
+        RID_SLRANGLEX ;         \
+        RID_SLRBRACEX ;         \
+        RID_SLRLINEX ;          \
+        RID_SLRDLINEX ;         \
+        RID_SLMRANGLEXY ;       \
+        RID_LRDBRACKETX ;       \
+        RID_SLRDBRACKETX ;      \
+        RID_XOVERBRACEY ;       \
+        RID_XUNDERBRACEY ;      \
+    };                          \
+    IdCount = { 19 ; };
+
+    ImageList RID_IL_BRACKETS
+    {
+        Prefix = "al";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        BRACKETS_IDLIST
+    };
+    ImageList RID_ILH_BRACKETS
+    {
+        Prefix = "alh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        BRACKETS_IDLIST
+    };
+
+#define FORMAT_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_NEWLINE ;       \
+        RID_SBLANK ;        \
+        RID_BLANK ;         \
+        RID_BINOMXY ;       \
+        RID_STACK ;         \
+        RID_MATRIX ;        \
+        RID_ALIGNLX ;       \
+        RID_ALIGNCX ;       \
+        RID_ALIGNRX ;       \
+        RID_RSUBX ;         \
+        RID_RSUPX ;         \
+        RID_LSUBX ;         \
+        RID_LSUPX ;         \
+        RID_CSUBX ;         \
+        RID_CSUPX ;         \
+    };                      \
+    IdCount = { 15 ; };
+
+    ImageList RID_IL_FORMAT
+    {
+        Prefix = "co";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        FORMAT_IDLIST
+    };
+    ImageList RID_ILH_FORMAT
+    {
+        Prefix = "coh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        FORMAT_IDLIST
+    };
+
+#define MISC_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_INFINITY ;      \
+        RID_PARTIAL ;       \
+        RID_NABLA ;         \
+        RID_EXISTS ;        \
+        RID_FORALL ;        \
+        RID_HBAR;           \
+        RID_LAMBDABAR ;     \
+        RID_RE ;            \
+        RID_IM ;            \
+        RID_WP ;            \
+        RID_LEFTARROW ;     \
+        RID_RIGHTARROW ;    \
+        RID_UPARROW ;       \
+        RID_DOWNARROW ;     \
+        RID_DOTSLOW ;       \
+        RID_DOTSAXIS ;      \
+        RID_DOTSVERT ;      \
+        RID_DOTSUP ;        \
+        RID_DOTSDOWN ;      \
+    };                      \
+    IdCount = { 19 ; };
+
+    ImageList RID_IL_MISC
+    {
+        Prefix = "mi";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        MISC_IDLIST
+    };
+    ImageList RID_ILH_MISC
+    {
+        Prefix = "mih";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        MISC_IDLIST
+    };
+
+#define CATALOG_IDLIST                  \
+    IdList =                        \
+    {                               \
+        RID_UNBINOPS_CAT ;          \
+        RID_RELATIONS_CAT ;         \
+        RID_SETOPERATIONS_CAT ;     \
+        RID_FUNCTIONS_CAT ;         \
+        RID_OPERATORS_CAT ;         \
+        RID_ATTRIBUTES_CAT ;        \
+        RID_MISC_CAT ;              \
+        RID_BRACKETS_CAT ;          \
+        RID_FORMAT_CAT ;            \
+    };                              \
+    IdCount = { 9 ; };
+
+    ImageList RID_IL_CATALOG
+    {
+        Prefix = "im";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        CATALOG_IDLIST
+    };
+    ImageList RID_ILH_CATALOG
+    {
+        Prefix = "imh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        CATALOG_IDLIST
+    };
+
+
+
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index a3139d0de8..77b404b2ee 100644..100755
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -81,8 +81,8 @@ using namespace ::com::sun::star::script;
 SmPrintUIOptions::SmPrintUIOptions()
 {
     ResStringArray      aLocalizedStrings( SmResId( RID_PRINTUIOPTIONS ) );
-    DBG_ASSERT( aLocalizedStrings.Count() >= 18, "resource incomplete" );
-    if( aLocalizedStrings.Count() < 18 ) // bad resource ?
+    DBG_ASSERT( aLocalizedStrings.Count() >= 15, "resource incomplete" );
+    if( aLocalizedStrings.Count() < 15 ) // bad resource ?
         return;
 
     SmModule *pp = SM_MOD();
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 520181e3c1..07fa3bb814 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -45,6 +45,8 @@
 #include "smdll.hxx"
 
 
+////////////////////////////////////////////////////////////
+
 // return pointer to active SmViewShell, if this is not possible
 // return 0 instead.
 //!! Since this method is based on the current focus it is somewhat 
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 1e6e59ad17..f0286bd161 100755
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1551,7 +1551,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
             break;
         }
 
-        case SID_INSERT_FORMULA:
+        case SID_IMPORT_FORMULA:
         {
             delete pImpl->pRequest;
             pImpl->pRequest = new SfxRequest( rReq );
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index 63bf72c0cf..7c82d733fa 100644..100755
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -83,7 +83,7 @@
   <menu:menu menu:id=".uno:ToolsMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:SymbolCatalogue"/>
-      <menu:menuitem menu:id=".uno:InsertFormula"/>
+      <menu:menuitem menu:id=".uno:ImportFormula"/>
       <menu:menuseparator/>
       <menu:menu menu:id=".uno:MacrosMenu">
         <menu:menupopup>
diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk
index 1ba52411d7..08f673452f 100644
--- a/starmath/util/makefile.mk
+++ b/starmath/util/makefile.mk
@@ -112,3 +112,17 @@ SHL1RES=	$(RCTARGET)
 
 .INCLUDE :  target.mk
 
+
+ALLTAR : $(MISC)/sm.component $(MISC)/smd.component
+
+$(MISC)/sm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sm.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sm.component
+
+$(MISC)/smd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        smd.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt smd.component
diff --git a/starmath/util/sm.component b/starmath/util/sm.component
new file mode 100644
index 0000000000..8047662e29
--- /dev/null
+++ b/starmath/util/sm.component
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Math.FormulaDocument">
+    <service name="com.sun.star.formula.FormulaProperties"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLContentExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLImporter">
+    <service name="com.sun.star.xml.XMLImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLMetaExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLOasisMetaExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLOasisMetaImporter">
+    <service name="com.sun.star.xml.XMLImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLOasisSettingsExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLOasisSettingsImporter">
+    <service name="com.sun.star.xml.XMLImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLSettingsExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+</component>
diff --git a/starmath/util/smd.component b/starmath/util/smd.component
new file mode 100644
index 0000000000..9f56686448
--- /dev/null
+++ b/starmath/util/smd.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.math.FormatDetector">
+    <service name="com.sun.star.frame.ExtendedTypeDetection"/>
+  </implementation>
+</component>
diff --git a/sw/prj/d.lst b/sw/prj/d.lst
index d7e75a0956..0cb261c5f0 100644
--- a/sw/prj/d.lst
+++ b/sw/prj/d.lst
@@ -36,6 +36,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar
 ..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll
 ..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res
 ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\misc\swd.component %_DEST%\xml%_EXT%\swd.component
 
 ..\uiconfig\swriter\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar\*.xml
 ..\uiconfig\swxform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar\*.xml
@@ -57,3 +58,5 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar
 ..\uiconfig\swreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar\*.xml
 
 ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
+..\%__SRC%\misc\sw.component %_DEST%\xml%_EXT%\sw.component
+..\%__SRC%\misc\vbaswobj.component %_DEST%\xml%_EXT%\vbaswobj.component
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 14124b6fcf..291b845e5b 100755..100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1714,16 +1714,22 @@ sal_uInt16 SwDoc::GetPageCount() const
 const Size SwDoc::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const
 {
     Size aSize;
-    if( GetRootFrm() && nPageNum )
+    if ( GetRootFrm() && nPageNum )
     {
         const SwPageFrm* pPage = static_cast<const SwPageFrm*>
                                  (GetRootFrm()->Lower());
 
-        while( --nPageNum && pPage->GetNext() )
+        while ( --nPageNum && pPage->GetNext() )
+        {        
             pPage = static_cast<const SwPageFrm*>( pPage->GetNext() );
+        }
 
-        if( !bSkipEmptyPages && pPage->IsEmptyPage() && pPage->GetNext() )
+        // switch to next page for an empty page, if empty pages are not skipped
+        // in order to get a sensible page size for an empty page - e.g. for printing.
+        if ( !bSkipEmptyPages && pPage->IsEmptyPage() && pPage->GetNext() )
+        {        
             pPage = static_cast<const SwPageFrm*>( pPage->GetNext() );
+        }
 
         aSize = pPage->Frm().SSize();
     }
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 60798250b9..2af7adb394 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1396,6 +1396,37 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                 DisconnectFromLayout( false );
                 break;
             }
+        case SDRUSERCALL_CHILD_INSERTED :
+        case SDRUSERCALL_CHILD_REMOVED :
+        {
+            // --> AW, OD 2010-09-13 #i113730#
+            // force layer of controls for group objects containing control objects
+            if(dynamic_cast< SdrObjGroup* >(maAnchoredDrawObj.DrawObj()))
+            {
+                if(::CheckControlLayer(maAnchoredDrawObj.DrawObj()))
+                {
+                    const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrmFmt*>(pRegisteredIn)->getIDocumentDrawModelAccess();
+                    const SdrLayerID aCurrentLayer(maAnchoredDrawObj.DrawObj()->GetLayer());
+                    const SdrLayerID aControlLayerID(pIDDMA->GetControlsId());
+                    const SdrLayerID aInvisibleControlLayerID(pIDDMA->GetInvisibleControlsId());
+
+                    if(aCurrentLayer != aControlLayerID && aCurrentLayer != aInvisibleControlLayerID)
+                    {
+                        if ( aCurrentLayer == pIDDMA->GetInvisibleHellId() ||
+                             aCurrentLayer == pIDDMA->GetInvisibleHeavenId() )
+                        {
+                            maAnchoredDrawObj.DrawObj()->SetLayer(aInvisibleControlLayerID);
+                        }
+                        else
+                        {        
+                            maAnchoredDrawObj.DrawObj()->SetLayer(aControlLayerID);
+                        }
+                    }
+                }
+            }
+            // fallthrough intended here
+            // <--
+        }
         case SDRUSERCALL_MOVEONLY:
         case SDRUSERCALL_RESIZE:
         case SDRUSERCALL_CHILD_MOVEONLY :
@@ -1403,8 +1434,6 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
         case SDRUSERCALL_CHILD_CHGATTR :
         case SDRUSERCALL_CHILD_DELETE :
         case SDRUSERCALL_CHILD_COPY :
-        case SDRUSERCALL_CHILD_INSERTED :
-        case SDRUSERCALL_CHILD_REMOVED :
         {
             // --> OD 2004-08-04 #i31698# - improvement:
             // get instance <SwAnchoredDrawObject> only once
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 045ffe54ac..af73e87a7d 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -599,7 +599,7 @@ bool SwFEShell::IsSelContainsControl() const
         // if we have one marked object, get the SdrObject and check
         // whether it contains a control
         const SdrObject* pSdrObject = pMarkList->GetMark( 0 )->GetMarkedSdrObj();
-        bRet = CheckControlLayer( pSdrObject );
+        bRet = ::CheckControlLayer( pSdrObject );
     }
     return bRet;
 }
@@ -994,8 +994,14 @@ void SwFEShell::ChangeOpaque( SdrLayerID nLayerId )
             SdrObject* pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
             // OD 21.08.2003 #i18447# - no change of layer for controls
             // or group objects containing controls.
-            const bool bControlObj = ::CheckControlLayer( pObj );
-            //if ( pObj->GetLayer() != nLayerId && pObj->GetLayer() != nControls )
+            // --> OD 2010-09-14 #i113730#
+            // consider that a member of a drawing group has been selected.
+            const SwContact* pContact = ::GetUserCall( pObj );
+            ASSERT( pContact && pContact->GetMaster(), "<SwFEShell::ChangeOpaque(..)> - missing contact or missing master object at contact!" );
+            const bool bControlObj = ( pContact && pContact->GetMaster() )
+                                     ? ::CheckControlLayer( pContact->GetMaster() )
+                                     : ::CheckControlLayer( pObj );
+            // <--
             if ( !bControlObj && pObj->GetLayer() != nLayerId )
             {
                 pObj->SetLayer( nLayerId );
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index feee382b5e..7b09b9983e 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -51,6 +51,9 @@
 #include <layhelp.hxx>
 #include <ndtxt.hxx>
 
+// --> OD 2010-09-14 #i113730#
+#include <svx/svdogrp.hxx>
+// <--
 // OD 16.04.2003 #i13147# - for <SwFlyFrm::GetContour(..)>
 #include <ndgrf.hxx>
 // OD 29.10.2003 #113049#
@@ -2250,6 +2253,30 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj )
         _rNewObj.ChgAnchorFrm( this );
     }
 
+    // --> OD 2010-09-14 #i113730#
+    // Assure the control objects and group objects containing controls are on the control layer
+    if ( ::CheckControlLayer( _rNewObj.DrawObj() ) )
+    {
+        const IDocumentDrawModelAccess* pIDDMA = GetUpper()->GetFmt()->getIDocumentDrawModelAccess();
+        const SdrLayerID aCurrentLayer(_rNewObj.DrawObj()->GetLayer());
+        const SdrLayerID aControlLayerID(pIDDMA->GetControlsId());
+        const SdrLayerID aInvisibleControlLayerID(pIDDMA->GetInvisibleControlsId());
+
+        if(aCurrentLayer != aControlLayerID && aCurrentLayer != aInvisibleControlLayerID)
+        {
+            if ( aCurrentLayer == pIDDMA->GetInvisibleHellId() ||
+                 aCurrentLayer == pIDDMA->GetInvisibleHeavenId() )
+            {
+                _rNewObj.DrawObj()->SetLayer(aInvisibleControlLayerID);
+            }
+            else
+            {        
+                _rNewObj.DrawObj()->SetLayer(aControlLayerID);
+            }
+        }
+    }
+    // <--
+
     // no direct positioning needed, but invalidate the drawing object position
     _rNewObj.InvalidateObjPos();
 
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 3d7d44f50c..1fbbf83aa1 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -127,30 +127,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xNewKey1(
-                    static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(                                
-                        OUString::createFromAscii( IMPL_NAME "/UNO/SERVICES/" ) ) );
-            xNewKey1->createKey( DocxExport_getSupportedServiceNames().getConstArray()[0] );
-
-            bRet = sal_True;
-        }
-        catch( registry::InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index e0a73cae15..7277d7a235 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -926,9 +926,15 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
 
             if( MID_PAGEDESC_PAGENUMOFFSET==nMemberId )
             {
-
-                rUnitConverter.convertNumber(
-                    aOut, (sal_Int32)pPageDesc->GetNumOffset() );
+                sal_Int32 const number(pPageDesc->GetNumOffset());
+                if (0 >= number)
+                {
+                    aOut.append(GetXMLToken(XML_AUTO));
+                }
+                else // #i114163# positiveInteger only!
+                {
+                    rUnitConverter.convertNumber(aOut, number);
+                }
                 bOk = sal_True;
             }
         }
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index b5639ca6c6..98eaf8d466 100644..100755
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -823,7 +823,6 @@ void SwSpellPopup::Execute( USHORT nId )
     else if (MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END)
     {
             OUString aWord( xSpellAlt->getWord() );
-//            DBG_ASSERT( nDicIdx < aDics.getLength(), "dictionary index out of range" );
             
             PopupMenu *pMenu = GetPopupMenu(MN_ADD_TO_DIC);
             String aDicName ( pMenu->GetItemText(nId) );
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 4aaa2fd56c..a633abb3e9 100644..100755
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -171,7 +171,7 @@ void lcl_InvalidateZoomSlots(SfxBindings& rBindings)
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
-
+    
 // erstmal der Zoom-Dialog
 
 class SwPreViewZoomDlg : public SvxStandardDialog
@@ -217,8 +217,7 @@ SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin& rParent ) :
     Beschreibung:
  --------------------------------------------------------------------*/
 
-
- SwPreViewZoomDlg::~SwPreViewZoomDlg() {}
+SwPreViewZoomDlg::~SwPreViewZoomDlg() {}
 
 
 void  SwPreViewZoomDlg::Apply()
@@ -228,491 +227,6 @@ void  SwPreViewZoomDlg::Apply()
                 BYTE(aColEdit.GetValue()) );
 }
 
-/*  */
-/* -----------------20.08.98 15:25-------------------
- * Vorschau fuer den Seitendruck
- * --------------------------------------------------*/
-struct PrintSettingsStruct;
-class PrtPrvWindow : public Window
-{
-        const PrintSettingsStruct& 	rSettings;
-
-        virtual void 	Paint(const Rectangle&);
-public :
-    PrtPrvWindow(Window* pParent, const ResId& rResId, const PrintSettingsStruct& 	rSett) :
-        Window(pParent, rResId), rSettings(rSett){}
-};
-/*--------------------------------------------------------------------
-    Beschreibung: Optionen fuer das Drucken der Preview
- --------------------------------------------------------------------*/
-struct PrintSettingsStruct
-{
-    Size				aPageMaxSize;	// groesste Seite
-    Size				aPrtSize;		// Papiergroesse
-    Size				aPrvPrtSize;	// Groesse innerhalb der LRTB-Raender
-    Size 				aGridSize;		// Groesse fuer jede Seite, enthaelt je
-                                        // die Haelfte von H- und V-Distance
-
-    long 				nLeft;
-    long 				nRight;
-    long				nTop;
-    long 				nBottom;
-    long 				nHori;
-    long 				nVert;
-
-    USHORT 				nRows;
-    USHORT				nCols;
-
-    BOOL 				bPrinterLandscape;		// Ausrichtung
-};
-
-class SwPreviewPrintOptionsDialog : public SvxStandardDialog
-{
-    FixedLine            aRowColFL;
-    FixedText   		aRowsFT;
-    NumericField 		aRowsNF;
-    FixedText   		aColsFT;
-    NumericField 		aColsNF;
-
-    FixedLine            aMarginFL;
-    FixedText			aLSpaceFT;
-    MetricField 		aLSpaceMF;
-    FixedText   		aRSpaceFT;
-    MetricField 		aRSpaceMF;
-    FixedText   		aTSpaceFT;
-    MetricField 		aTSpaceMF;
-    FixedText   		aBSpaceFT;
-    MetricField 		aBSpaceMF;
-    FixedLine            aDistanceFL;
-    FixedText   		aHSpaceFT;
-    MetricField 		aHSpaceMF;
-    FixedText   		aVSpaceFT;
-    MetricField 		aVSpaceMF;
-
-    RadioButton			aLandscapeRB;
-    RadioButton			aPortraitRB;
-    FixedLine            aOrientationFL;
-
-    PrtPrvWindow 		aPreviewWin;
-
-    OKButton	 		aOkBtn;
-    CancelButton 		aCancelBtn;
-    HelpButton 			aHelpBtn;
-
-    PushButton 			aStandardPB;
-
-    SwPagePreView&		rPreView;
-    SwPagePreViewWin&   rParentWin;
-    PrintSettingsStruct aSettings;
-/*	Size				aPageMaxSize;
-    Size				aPrtSize;
-
-    BOOL 				bOrientation;
-*/
-    BOOL 				bStandard;
-
-    virtual void 		Apply();
-    void				FillControls(SwPagePreViewPrtData& rData);
-
-            DECL_LINK( ModifyHdl, Edit* );
-            DECL_LINK( StandardHdl, PushButton* );
-
-public:
-    SwPreviewPrintOptionsDialog(SwPagePreViewWin& rParent, SwPagePreView&	rView);
-    ~SwPreviewPrintOptionsDialog();
-};
-
-/* -----------------19.08.98 13:35-------------------
- *
- * --------------------------------------------------*/
-SwPreviewPrintOptionsDialog::SwPreviewPrintOptionsDialog( SwPagePreViewWin& rParent, SwPagePreView&	rView ) :
-    SvxStandardDialog( &rParent, SW_RES(DLG_PAGEPREVIEW_PRINTOPTIONS) ),
-    aRowColFL(this,SW_RES(  FL_ROWCOL)),
-    aRowsFT(this,SW_RES(	FT_ROWS)),
-    aRowsNF(this,SW_RES(	NF_ROWS)),
-    aColsFT(this,SW_RES(	FT_COLS)),
-    aColsNF(this,SW_RES(	NF_COLS)),
-    aMarginFL(this,SW_RES(  FL_MARGINS)),
-    aLSpaceFT(this,SW_RES(	FT_LMARGIN)),
-    aLSpaceMF(this,SW_RES(	MF_LMARGIN)),
-    aRSpaceFT(this,SW_RES(	FT_RMARGIN)),
-    aRSpaceMF(this,SW_RES(	MF_RMARGIN)),
-    aTSpaceFT(this,SW_RES(	FT_TMARGIN)),
-    aTSpaceMF(this,SW_RES(	MF_TMARGIN)),
-    aBSpaceFT(this,SW_RES(	FT_BMARGIN)),
-    aBSpaceMF(this,SW_RES(	MF_BMARGIN)),
-    aDistanceFL(this,SW_RES(FL_DISTANCE)),
-    aHSpaceFT(this,SW_RES(	FT_HMARGIN)),
-    aHSpaceMF(this,SW_RES(	MF_HMARGIN)),
-    aVSpaceFT(this,SW_RES(	FT_VMARGIN)),
-    aVSpaceMF(this,SW_RES(	MF_VMARGIN)),
-    aLandscapeRB(this,SW_RES(	RB_LANDSCAPE)),
-    aPortraitRB(this,SW_RES(	RB_PORTRAIT)),
-    aOrientationFL(this,SW_RES( FL_ORIENTATION)),
-    aPreviewWin(this,SW_RES(	WIN_PREVIEW), aSettings),
-    aOkBtn(this,SW_RES(BT_OK)),
-    aCancelBtn(this,SW_RES(BT_CANCEL)),
-    aHelpBtn(this,SW_RES(BT_HELP)),
-    aStandardPB(this,SW_RES(PB_STANDARD)),
-    rPreView(rView),
-    rParentWin(rParent),
-    bStandard(TRUE)
-{
-    FreeResource();
-    ViewShell& rViewSh = *rPreView.GetViewShell();
-    // OD 18.12.2002 #103492#
-    aSettings.aPageMaxSize = rViewSh.PagePreviewLayout()->GetMaxPageSize();
-    SfxPrinter*  pPrinter = rViewSh.getIDocumentDeviceAccess()->getPrinter( true );
-    aSettings.aPrtSize = pPrinter->GetPaperSize();
-    //#97682# make sure that no division by zero occurs
-    if(!aSettings.aPrtSize.Width() || !aSettings.aPrtSize.Height())
-        aSettings.aPrtSize = SvxPaperInfo::GetPaperSize(PAPER_A4);
-    aSettings.bPrinterLandscape = pPrinter->GetOrientation() == ORIENTATION_LANDSCAPE;
-
-
-    SwDocShell* pDocShell = rPreView.GetDocShell();
-    const SwMasterUsrPref *pUsrPref = SW_MOD()->GetUsrPref(0 != PTR_CAST(SwWebDocShell, pDocShell));
-    FieldUnit eFieldUnit = pUsrPref->GetMetric();
-    ::SetFieldUnit( aLSpaceMF, eFieldUnit );
-    ::SetFieldUnit( aRSpaceMF, eFieldUnit );
-    ::SetFieldUnit( aTSpaceMF, eFieldUnit );
-    ::SetFieldUnit( aBSpaceMF, eFieldUnit );
-    ::SetFieldUnit( aHSpaceMF, eFieldUnit );
-    ::SetFieldUnit( aVSpaceMF, eFieldUnit );
-
-    SwDoc* pDoc = pDocShell->GetDoc();
-    SwPagePreViewPrtData aData;
-    if(pDoc->GetPreViewPrtData())
-    {
-        aData = *pDoc->GetPreViewPrtData();
-        bStandard = FALSE;
-    }
-    else
-    {
-        // Orientation der PreviewData an den Drucker anpassen
-        aData.SetLandscape(aSettings.bPrinterLandscape);
-        aData.SetRow(rParent.GetRow());
-        aData.SetCol(rParent.GetCol());
-    }
-    FillControls(aData);
-
-    aLSpaceMF.SaveValue();
-    aRSpaceMF.SaveValue();
-    aTSpaceMF.SaveValue();
-    aBSpaceMF.SaveValue();
-    aHSpaceMF.SaveValue();
-    aVSpaceMF.SaveValue();
-    aRowsNF.SaveValue();
-    aColsNF.SaveValue();
-    aLandscapeRB.SaveValue();
-    aPortraitRB.SaveValue();
-
-    aStandardPB.SetClickHdl(LINK(this, SwPreviewPrintOptionsDialog, StandardHdl));
-    Link aLk = LINK(this, SwPreviewPrintOptionsDialog, ModifyHdl);
-    aLSpaceMF.SetUpHdl(aLk);
-    aRSpaceMF.SetUpHdl(aLk);
-    aTSpaceMF.SetUpHdl(aLk);
-    aBSpaceMF.SetUpHdl(aLk);
-    aHSpaceMF.SetUpHdl(aLk);
-    aVSpaceMF.SetUpHdl(aLk);
-    aRowsNF.SetUpHdl(aLk);
-    aColsNF.SetUpHdl(aLk);
-    aLSpaceMF.SetDownHdl(aLk);
-    aRSpaceMF.SetDownHdl(aLk);
-    aTSpaceMF.SetDownHdl(aLk);
-    aBSpaceMF.SetDownHdl(aLk);
-    aHSpaceMF.SetDownHdl(aLk);
-    aVSpaceMF.SetDownHdl(aLk);
-    aRowsNF.SetDownHdl(aLk);
-    aColsNF.SetDownHdl(aLk);
-    aLSpaceMF.SetLoseFocusHdl(aLk);
-    aRSpaceMF.SetLoseFocusHdl(aLk);
-    aTSpaceMF.SetLoseFocusHdl(aLk);
-    aBSpaceMF.SetLoseFocusHdl(aLk);
-    aHSpaceMF.SetLoseFocusHdl(aLk);
-    aVSpaceMF.SetLoseFocusHdl(aLk);
-    aRowsNF.SetLoseFocusHdl(aLk);
-    aColsNF.SetLoseFocusHdl(aLk);
-    aLandscapeRB.SetClickHdl(aLk);
-    aPortraitRB.SetClickHdl(aLk);
-
-    ModifyHdl(0);
-    if(bStandard)
-        StandardHdl(&aStandardPB);
-}
-
-
-/* -----------------19.08.98 13:36-------------------
- *
- * --------------------------------------------------*/
-SwPreviewPrintOptionsDialog::~SwPreviewPrintOptionsDialog()
-{
-}
-/* -----------------12.11.98 11:32-------------------
- *
- * --------------------------------------------------*/
-void	SwPreviewPrintOptionsDialog::FillControls(SwPagePreViewPrtData& rData)
-{
-    aLSpaceMF.SetValue(aLSpaceMF.Normalize(rData.GetLeftSpace()  ), FUNIT_TWIP);
-    aRSpaceMF.SetValue(aRSpaceMF.Normalize(rData.GetRightSpace() ), FUNIT_TWIP);
-    aTSpaceMF.SetValue(aTSpaceMF.Normalize(rData.GetTopSpace()   ), FUNIT_TWIP);
-    aBSpaceMF.SetValue(aBSpaceMF.Normalize(rData.GetBottomSpace()), FUNIT_TWIP);
-    aHSpaceMF.SetValue(aHSpaceMF.Normalize(rData.GetHorzSpace()  ), FUNIT_TWIP);
-    aVSpaceMF.SetValue(aVSpaceMF.Normalize(rData.GetVertSpace()  ), FUNIT_TWIP);
-    aRowsNF.SetValue(rData.GetRow());
-    aColsNF.SetValue(rData.GetCol());
-    aSettings.bPrinterLandscape ? aLandscapeRB.Check() : aPortraitRB.Check();
-    // wenn Drucker und Einstellungen nicht uebereinstimmen, dann Seiten tauschen
-    if( rData.GetLandscape() != aSettings.bPrinterLandscape )
-    {
-        Size aTmp(aSettings.aPrtSize.Height(), aSettings.aPrtSize.Width());
-        aSettings.aPrtSize = aTmp;
-        aSettings.bPrinterLandscape = !aSettings.bPrinterLandscape;
-        // nochmal setzen, denn auch wenn nur die Default-Orientierung dem Drucker
-        // angepasst wurde, sollen die Einstellungen gespeichert werden
-        aSettings.bPrinterLandscape ? aLandscapeRB.Check() : aPortraitRB.Check();
-    }
-    aLandscapeRB.SaveValue();
-    aPortraitRB.SaveValue();
-
-    aSettings.nLeft		= rData.GetLeftSpace()  ;
-    aSettings.nRight    = rData.GetRightSpace() ;
-    aSettings.nTop      = rData.GetTopSpace()   ;
-    aSettings.nBottom   = rData.GetBottomSpace();
-    aSettings.nHori     = rData.GetHorzSpace()  ;
-    aSettings.nVert     = rData.GetVertSpace()  ;
-    aSettings.nRows	    = rData.GetRow()        ;
-    aSettings.nCols     = rData.GetCol()        ;
-    aSettings.aPrvPrtSize = aSettings.aPrtSize	;
-}
-
-/* -----------------19.08.98 14:31-------------------
- *
- * --------------------------------------------------*/
-void SwPreviewPrintOptionsDialog::Apply()
-{
-
-    SwDoc* pDoc = rPreView.GetDocShell()->GetDoc();
-    if(bStandard)
-        pDoc->SetPreViewPrtData(0);
-    else if(	aLSpaceMF.GetSavedValue() != aLSpaceMF.GetText() ||
-        aRSpaceMF.GetSavedValue() != aRSpaceMF.GetText() ||
-        aTSpaceMF.GetSavedValue() != aTSpaceMF.GetText() ||
-        aBSpaceMF.GetSavedValue() != aBSpaceMF.GetText() ||
-        aHSpaceMF.GetSavedValue() != aHSpaceMF.GetText() ||
-        aVSpaceMF.GetSavedValue() != aVSpaceMF.GetText() ||
-        aRowsNF.GetSavedValue() != aRowsNF.GetText() ||
-        aColsNF.GetSavedValue() != aColsNF.GetText() ||
-        aLandscapeRB.GetSavedValue() != aLandscapeRB.IsChecked() ||
-        aPortraitRB.GetSavedValue() != aPortraitRB.IsChecked() )
-    {
-        SwPagePreViewPrtData aData;
-        if(pDoc->GetPreViewPrtData())
-            aData = *pDoc->GetPreViewPrtData();
-        aData.SetLeftSpace( static_cast< ULONG >(aLSpaceMF.Denormalize(aLSpaceMF.GetValue(FUNIT_TWIP))) );
-        aData.SetRightSpace( static_cast< ULONG >(aRSpaceMF.Denormalize(aRSpaceMF.GetValue(FUNIT_TWIP))) );
-        aData.SetTopSpace( static_cast< ULONG >(aTSpaceMF.Denormalize(aTSpaceMF.GetValue(FUNIT_TWIP))) );
-        aData.SetBottomSpace( static_cast< ULONG >(aBSpaceMF.Denormalize(aBSpaceMF.GetValue(FUNIT_TWIP))) );
-
-        aData.SetHorzSpace( static_cast< ULONG >(aHSpaceMF.Denormalize(aHSpaceMF.GetValue(FUNIT_TWIP))) );
-        aData.SetVertSpace( static_cast< ULONG >(aVSpaceMF.Denormalize(aVSpaceMF.GetValue(FUNIT_TWIP))) );
-        aData.SetRow((BYTE)aRowsNF.GetValue());
-        aData.SetCol((BYTE)aColsNF.GetValue());
-        aData.SetLandscape(aLandscapeRB.IsChecked());
-
-        ViewShell& rViewSh = *rPreView.GetViewShell();
-        SfxPrinter*  pPrinter = rViewSh.getIDocumentDeviceAccess()->getPrinter( true );
-        if((pPrinter->GetOrientation() == ORIENTATION_LANDSCAPE)
-                        != aData.GetLandscape())
-                    pPrinter->SetOrientation(aData.GetLandscape() ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
-
-
-        pDoc->SetPreViewPrtData(&aData);
-
-    }
-}
-/* -----------------20.08.98 08:48-------------------
- *
- * --------------------------------------------------*/
-IMPL_LINK( SwPreviewPrintOptionsDialog, ModifyHdl, Edit*, pEdit )
-{
-    if(bStandard && pEdit)
-    {
-        aLSpaceMF.SetUserValue(aLSpaceMF.GetValue());
-        aRSpaceMF.SetUserValue(aRSpaceMF.GetValue());
-        aTSpaceMF.SetUserValue(aTSpaceMF.GetValue());
-        aBSpaceMF.SetUserValue(aBSpaceMF.GetValue());
-        aHSpaceMF.SetUserValue(aHSpaceMF.GetValue());
-        aVSpaceMF.SetUserValue(aVSpaceMF.GetValue());
-        aRowsNF.  SetUserValue(aRowsNF  .GetValue());
-        aColsNF.  SetUserValue(aColsNF  .GetValue());
-
-        bStandard = FALSE;
-    }
-    BOOL bOrientChanged = aSettings.bPrinterLandscape != aLandscapeRB.IsChecked();;
-    if(pEdit == &aLSpaceMF)
-        aSettings.nLeft     = static_cast< long >(aLSpaceMF.Denormalize(aLSpaceMF.GetValue(FUNIT_TWIP)));
-    else if(pEdit == &aRSpaceMF)
-        aSettings.nRight    =  static_cast< long >(aRSpaceMF.Denormalize(aRSpaceMF.GetValue(FUNIT_TWIP)));
-    else if(pEdit == &aTSpaceMF)
-        aSettings.nTop      =  static_cast< long >(aTSpaceMF.Denormalize(aTSpaceMF.GetValue(FUNIT_TWIP)));
-    else if(pEdit == &aBSpaceMF)
-        aSettings.nBottom   =  static_cast< long >(aBSpaceMF.Denormalize(aBSpaceMF.GetValue(FUNIT_TWIP)));
-    else if(pEdit == &aHSpaceMF)
-        aSettings.nHori     =  static_cast< long >(aHSpaceMF.Denormalize(aHSpaceMF.GetValue(FUNIT_TWIP)));
-    else if(pEdit == &aVSpaceMF)
-        aSettings.nVert     =  static_cast< long >(aVSpaceMF.Denormalize(aVSpaceMF.GetValue(FUNIT_TWIP)));
-    else if(pEdit == &aRowsNF)
-        aSettings.nRows	= (USHORT)aRowsNF.GetValue();
-    else if(pEdit == &aColsNF)
-        aSettings.nCols = (USHORT)aColsNF.GetValue();
-    else if(pEdit == (Edit*)&aLandscapeRB)
-        aSettings.bPrinterLandscape = aLandscapeRB.IsChecked();
-    else if(pEdit == (Edit*)&aPortraitRB)
-        aSettings.bPrinterLandscape = aLandscapeRB.IsChecked();
-
-    if(bOrientChanged)
-    {
-        Size aTmp(aSettings.aPrtSize.Height(), aSettings.aPrtSize.Width());
-        aSettings.aPrtSize = aTmp;
-    }
-
-
-    aSettings.aPrvPrtSize = Size(aSettings.aPrtSize.Width()  - aSettings.nRight - aSettings.nLeft,
-                            aSettings.aPrtSize.Height() - aSettings.nTop - aSettings.nBottom);
-    aSettings.aGridSize = Size(aSettings.aPrvPrtSize.Width() / aSettings.nCols,
-                                aSettings.aPrvPrtSize.Height() / aSettings.nRows	);
-    // was fehlt noch: Orientation auswerten, minimalrand ausrechnen, Beispiel fuettern
-
-
-    //am Ende Maximalwerte setzen
-    long n20Percent = aSettings.aPrtSize.Width() / 5;
-    aLSpaceMF.SetMax(aLSpaceMF.Normalize(aSettings.aPrtSize.Width() - aSettings.nRight - n20Percent), FUNIT_TWIP);
-    aRSpaceMF.SetMax(aRSpaceMF.Normalize(aSettings.aPrtSize.Width() - aSettings.nLeft - n20Percent), FUNIT_TWIP);
-    n20Percent = aSettings.aPrtSize.Height() / 5;
-    aTSpaceMF.SetMax(aTSpaceMF.Normalize(aSettings.aPrtSize.Height() - aSettings.nBottom - n20Percent), FUNIT_TWIP);
-    aBSpaceMF.SetMax(aBSpaceMF.Normalize(aSettings.aPrtSize.Height() - aSettings.nTop - n20Percent), FUNIT_TWIP);
-
-    long n80Percent = aSettings.aPrvPrtSize.Width() * 4 / 5;
-    aHSpaceMF.SetMax(aHSpaceMF.Normalize(n80Percent / aSettings.nRows), FUNIT_TWIP);
-    n80Percent = aSettings.aPrvPrtSize.Height()* 4 / 5;
-    aVSpaceMF.SetMax(aVSpaceMF.Normalize(n80Percent / aSettings.nCols), FUNIT_TWIP);
-    aHSpaceMF.Enable(aSettings.nCols > 1);
-    aVSpaceMF.Enable(aSettings.nRows > 1);
-    aRowsNF.SetMin(1);// nur damit auch nach Standard wieder der Inhalt angezeigt wird
-    aColsNF.SetMin(1);
-
-
-    aPreviewWin.Invalidate();
-    return 0;
-}
-/* -----------------28.08.98 14:59-------------------
- *
- * --------------------------------------------------*/
-IMPL_LINK( SwPreviewPrintOptionsDialog, StandardHdl, PushButton*, EMPTYARG )
-{
-    SetUpdateMode(TRUE);
-    SwPagePreViewPrtData aData;
-    aData.SetRow(rParentWin.GetRow());
-    aData.SetCol(rParentWin.GetCol());
-    FillControls(aData);
-    bStandard = TRUE;
-    aLSpaceMF.SetText(aEmptyStr);
-    aRSpaceMF.SetText(aEmptyStr);
-    aTSpaceMF.SetText(aEmptyStr);
-    aBSpaceMF.SetText(aEmptyStr);
-    aHSpaceMF.SetText(aEmptyStr);
-    aVSpaceMF.SetText(aEmptyStr);
-    aPreviewWin.Invalidate();
-    SetUpdateMode(FALSE);
-    return 0;
-}
-/* -----------------20.08.98 15:28-------------------
- * Preview anzeigen
- * --------------------------------------------------*/
-void 	PrtPrvWindow::Paint(const Rectangle&)
-{
-        Size aWinSize(GetOutputSizePixel());
-        long nWidth = rSettings.aPrtSize.Width();
-        long nHeight = rSettings.aPrtSize.Height();
-        BOOL bHoriValid = (aWinSize.Width() * 100 / aWinSize.Height()) <
-                    (rSettings.aPrtSize.Width() * 100/ rSettings.aPrtSize.Height());
-        Fraction aXScale( aWinSize.Width(), Max( nWidth , 1L ) );
-        Fraction aYScale( aWinSize.Height(), Max( nHeight, 1L ) );
-        MapMode aMapMode( GetMapMode() );
-        aMapMode.SetScaleX( bHoriValid ? aXScale : aYScale);
-        aMapMode.SetScaleY( bHoriValid ? aXScale : aYScale);
-        SetMapMode( aMapMode );
-
-        aWinSize = GetOutputSize();
-
-        Point aOffset(0,0);
-        if(bHoriValid)
-            aOffset.Y() = (aWinSize.Height() - rSettings.aPrtSize.Height()) / 2;
-        else
-            aOffset.X() = (aWinSize.Width() - rSettings.aPrtSize.Width()) / 2;;
-
-
-        BOOL bUseSystemColors = SvtAccessibilityOptions().GetIsForPagePreviews()
-                                && GetSettings().GetStyleSettings().GetHighContrastMode();
-
-        //der weisse Seitenhintergrund
-        Rectangle aRect(aOffset, rSettings.aPrtSize);
-        if(bUseSystemColors)
-        {
-            SetFillColor( GetSettings().GetStyleSettings().GetWindowColor() );
-            SetLineColor( SwViewOption::GetFontColor() );
-        }
-        else
-        {
-            SetFillColor( Color( COL_WHITE ) );
-            SetLineColor(Color( COL_BLACK ) );
-        }
-
-        DrawRect(aRect);
-
-        Point aTL(aOffset);
-        aTL.X() += rSettings.nLeft;
-        aTL.Y() += rSettings.nTop;
-
-        Size aPrvPageSize((rSettings.aPrvPrtSize.Width() - (rSettings.nCols - 1) * rSettings.nHori) / rSettings.nCols,
-            (rSettings.aPrvPrtSize.Height() - (rSettings.nRows - 1) * rSettings.nVert) / rSettings.nRows);
-        // jetzt muss noch das unterschiedliche Groessenverhaeltnis berechnet werden, um es an
-        // der richtigen Seite abzuziehen.
-        //...
-        long nSourceScale = rSettings.aPageMaxSize.Width() * 100 / rSettings.aPageMaxSize.Height();
-        long nDestScale = aPrvPageSize.Width() * 100  / aPrvPageSize.Height() ;
-        if(nSourceScale > nDestScale) // die Seite ist relativ breiter als das vorhandene Rechteck
-        {
-            aPrvPageSize.Height() = aPrvPageSize.Width() * 100 / nSourceScale;
-        }
-        else
-        {
-            aPrvPageSize.Width() = aPrvPageSize.Height() * nSourceScale / 100;
-        }
-
-        if(bUseSystemColors)
-            SetFillColor( GetSettings().GetStyleSettings().GetWindowColor() );
-        else
-            SetFillColor( Color( COL_GRAY ) );
-
-
-        aRect = Rectangle(aTL, aPrvPageSize);
-        for(USHORT i = 0; i < rSettings.nRows; i++)
-        {
-            for(USHORT j = 0; j < rSettings.nCols; j++)
-            {
-                DrawRect(aRect);
-                aRect.Move(aPrvPageSize.Width() + rSettings.nHori, 0);
-            }
-
-            aRect.Move( 0, aPrvPageSize.Height() + rSettings.nVert);
-            aRect.SetPos(Point(aTL.X(), aRect.TopLeft().Y()));
-        }
-    //rSettings;
-}
-
-/*  */
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
diff --git a/sw/source/ui/uiview/pview.src b/sw/source/ui/uiview/pview.src
index 57fb35d27a..4b97c83c43 100644..100755
--- a/sw/source/ui/uiview/pview.src
+++ b/sw/source/ui/uiview/pview.src
@@ -29,272 +29,7 @@
 #include "pview.hrc"
 #include "helpid.h"
 #include "cmdid.h"
-ModalDialog DLG_PAGEPREVIEW_PRINTOPTIONS
-{
-    HelpID = HID_DLG_PRV_PRT_OPTIONS ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Moveable = TRUE ;
-    Size = MAP_APPFONT ( 312 , 131 ) ;
-    FixedLine FL_ROWCOL
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 150 , 8 ) ;
-
-        Text [ en-US ] = "Distribution";
-    };
-    FixedText FT_ROWS
-    {
-        Pos = MAP_APPFONT ( 12 , 15 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "Ro~ws";
-    };
-    NumericField NF_ROWS
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 45 , 14 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = PVIEW_MIN_ROW ;
-        Maximum = PVIEW_MAX_ROW ;
-        Value = 1 ;
-        First = PVIEW_MIN_COL ;
-        Last = PVIEW_MAX_COL ;
-    };
-    FixedText FT_COLS
-    {
-        Pos = MAP_APPFONT ( 84 , 15 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "~Columns";
-    };
-    NumericField NF_COLS
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 14 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = PVIEW_MIN_COL ;
-        Maximum = PVIEW_MAX_COL ;
-        Value = 1 ;
-        First = PVIEW_MIN_COL ;
-        Last = PVIEW_MAX_COL ;
-    };
-    FixedLine FL_MARGINS
-    {
-        Pos = MAP_APPFONT ( 6 , 32 ) ;
-        Size = MAP_APPFONT ( 150 , 8 ) ;
 
-        Text [ en-US ] = "Margins";
-    };
-    FixedText FT_LMARGIN
-    {
-        Pos = MAP_APPFONT ( 12 , 44 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "L~eft";
-    };
-    MetricField MF_LMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 45 , 43 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        DecimalDigits = 1 ;
-        Unit = FUNIT_CM ;
-        SpinSize = 10 ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        First = 0 ;
-        Last = 2000 ;
-    };
-    FixedText FT_RMARGIN
-    {
-        Pos = MAP_APPFONT ( 84 , 44 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "~Right";
-    };
-    MetricField MF_RMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 43 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        DecimalDigits = 1 ;
-        Unit = FUNIT_CM ;
-        SpinSize = 10 ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        First = 0 ;
-        Last = 2000 ;
-    };
-    FixedText FT_TMARGIN
-    {
-        Pos = MAP_APPFONT ( 12 , 59 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "~Top";
-    };
-    MetricField MF_TMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 45 , 58 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        DecimalDigits = 1 ;
-        Unit = FUNIT_CM ;
-        SpinSize = 10 ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        First = 0 ;
-        Last = 2000 ;
-    };
-    FixedText FT_BMARGIN
-    {
-        Pos = MAP_APPFONT ( 84 , 59 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "~Bottom";
-    };
-    MetricField MF_BMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 58 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        DecimalDigits = 1 ;
-        Unit = FUNIT_CM ;
-        SpinSize = 10 ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        First = 0 ;
-        Last = 2000 ;
-    };
-    FixedLine FL_DISTANCE
-    {
-        Pos = MAP_APPFONT ( 6 , 76 ) ;
-        Size = MAP_APPFONT ( 150 , 8 ) ;
-
-        Text [ en-US ] = "Spacing";
-    };
-    FixedText FT_HMARGIN
-    {
-        Pos = MAP_APPFONT ( 12 , 88 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "Hori~zontal";
-    };
-
-    MetricField MF_HMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 45 , 87 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        DecimalDigits = 1 ;
-        Unit = FUNIT_CM ;
-        SpinSize = 10 ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        First = 0 ;
-        Last = 2000 ;
-    };
-    FixedText FT_VMARGIN
-    {
-        Pos = MAP_APPFONT ( 84 , 88 ) ;
-        Size = MAP_APPFONT ( 32 , 10 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "~Vertically";
-    };
-
-    MetricField MF_VMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 87 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        DecimalDigits = 1 ;
-        Unit = FUNIT_CM ;
-        SpinSize = 10 ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        First = 0 ;
-        Last = 2000 ;
-    };
-    FixedLine FL_ORIENTATION
-    {
-        Pos = MAP_APPFONT ( 6 , 102 ) ;
-        Size = MAP_APPFONT ( 150 , 8 ) ;
-        Text [ en-US ] = "Format";
-    };
-    RadioButton RB_LANDSCAPE
-    {
-        Pos = MAP_APPFONT ( 12 , 113 ) ;
-        Size = MAP_APPFONT ( 60 , 12 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-        Text [ en-US ] = "~Landscape";
-    };
-    RadioButton RB_PORTRAIT
-    {
-        Pos = MAP_APPFONT ( 84 , 113 ) ;
-        Size = MAP_APPFONT ( 60 , 12 ) ;
-        Text [ en-US ] = "P~ortrait";
-    };
-    Window WIN_PREVIEW
-    {
-        Pos = MAP_APPFONT ( 162 , 7 ) ;
-        Size = MAP_APPFONT ( 90 , 113 ) ;
-    };
-
-    OKButton BT_OK
-    {
-        Pos = MAP_APPFONT ( 258 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BT_CANCEL
-    {
-        Pos = MAP_APPFONT ( 258 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BT_HELP
-    {
-        Pos = MAP_APPFONT ( 258 , 49 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    PushButton PB_STANDARD
-    {
-        Pos = MAP_APPFONT ( 258 , 66 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Default";
-    };
-    Text [ en-US ] = "Print Options";
-};
 ModalDialog DLG_PAGEPREVIEW_ZOOM
 {
     HelpID = HID_PPREV_ZOOM ;
@@ -460,31 +195,3 @@ ToolBox RID_PVIEW_TOOLBOX
     Scroll = TRUE ;
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc
index a2b828bb2c..e05b61e751 100644..100755
--- a/sw/source/ui/uiview/view.hrc
+++ b/sw/source/ui/uiview/view.hrc
@@ -77,7 +77,6 @@
 
 #define DLG_SPECIAL_FORCED  			(RC_VIEW_BEGIN)
 #define DLG_PAGEPREVIEW_ZOOM			(RC_VIEW_BEGIN + 1)
-#define DLG_PAGEPREVIEW_PRINTOPTIONS	(RC_VIEW_BEGIN + 2)
 
 // Ueberlaufpruefung -----------------------------------------------------
 
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index cbfe8617ad..36b7d7afd6 100644..100755
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -31,7 +31,6 @@
 #include <vos/mutex.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
 #include <SwXDocumentSettings.hxx>
-#include <SwXPrintPreviewSettings.hxx>
 #include <comphelper/MasterPropertySetInfo.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
@@ -221,7 +220,6 @@ SwXDocumentSettings::SwXDocumentSettings ( SwXTextDocument * pModel )
 , mpPrinter( NULL )
 {
     registerSlave ( new SwXPrintSettings ( PRINT_SETTINGS_DOCUMENT, mpModel->GetDocShell()->GetDoc() ) );
-    registerSlave ( new SwXPrintPreviewSettings ( mpModel->GetDocShell()->GetDoc() ) );
 }
 
 SwXDocumentSettings::~SwXDocumentSettings()
diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx
deleted file mode 100644
index ba39ed59a2..0000000000
--- a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx
+++ /dev/null
@@ -1,375 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sw.hxx"
-#include <SwXPrintPreviewSettings.hxx>
-#include <comphelper/ChainablePropertySetInfo.hxx>
-#include <pvprtdat.hxx>
-#include <swtypes.hxx>
-#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#include <doc.hxx>
-#include <vcl/svapp.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::comphelper;
-using ::rtl::OUString;
-
-enum SwPrintSettingsPropertyHandles
-{
-    HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN,
-    HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN,
-    HANDLE_PRINTSET_PREVIEW_TOP_MARGIN,
-    HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN,
-    HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING,
-    HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING,
-    HANDLE_PRINTSET_PREVIEW_NUM_ROWS,
-    HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS,
-    HANDLE_PRINTSET_PREVIEW_LANDSCAPE
-};
-
-static ChainablePropertySetInfo * lcl_createPrintPreviewSettingsInfo()
-{
-    static PropertyInfo aPrintPreviewSettingsMap_Impl[] =
-    {
-        { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLeftMargin" ),	HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN,	CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
-        { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintRightMargin" ),	HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN,	CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
-        { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintTopMargin" ),	HANDLE_PRINTSET_PREVIEW_TOP_MARGIN,		CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
-        { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintBottomMargin" ),HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN,	CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
-        { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintHorizontalSpacing" ),HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING,	CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
-        { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintVerticalSpacing" ),	HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING,	CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
-        { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumRows" ),	HANDLE_PRINTSET_PREVIEW_NUM_ROWS,			CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 },
-        { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumColumns" ),	HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS,	CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 },
-        { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLandscape" ),	HANDLE_PRINTSET_PREVIEW_LANDSCAPE,		CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0 },
-        { 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
-    };
-    return new ChainablePropertySetInfo ( aPrintPreviewSettingsMap_Impl );
-}
-SwXPrintPreviewSettings::SwXPrintPreviewSettings( SwDoc *pDoc)
-: ChainablePropertySet ( lcl_createPrintPreviewSettingsInfo (), &Application::GetSolarMutex() )
-, mbPreviewDataChanged( sal_False )
-, mpDoc( pDoc)
-{
-}
-/*-- 17.12.98 12:54:05---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
-SwXPrintPreviewSettings::~SwXPrintPreviewSettings()
-    throw()
-{
-}
-
-Any SAL_CALL SwXPrintPreviewSettings::queryInterface( const Type& rType )
-    throw(RuntimeException)
-{
-        return ::cppu::queryInterface ( rType										,
-                                        // OWeakObject interfaces
-                                        dynamic_cast< XInterface* >( dynamic_cast< OWeakObject* >(this) )  ,
-                                        dynamic_cast< XWeak* >( this )   ,
-                                        // my own interfaces
-                                        dynamic_cast< XServiceInfo* >( this )   ,
-                                        dynamic_cast< XPropertySet* >( this )   ,
-                                        dynamic_cast< XMultiPropertySet* >( this ) );
-}
-void SwXPrintPreviewSettings::acquire ()
-    throw ()
-{
-    OWeakObject::acquire();
-}
-void SwXPrintPreviewSettings::release ()
-    throw ()
-{
-    OWeakObject::release();
-}
-
-void SwXPrintPreviewSettings::_preSetValues ()
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
-{
-    if ( mpDoc )
-    {
-        const SwPagePreViewPrtData *pConstPrtData = mpDoc->GetPreViewPrtData();
-        mpPreViewData = new SwPagePreViewPrtData;
-        if ( pConstPrtData )
-        {
-            mpPreViewData->SetLeftSpace 	( pConstPrtData->GetLeftSpace() );
-            mpPreViewData->SetRightSpace 	( pConstPrtData->GetRightSpace() );
-            mpPreViewData->SetTopSpace 		( pConstPrtData->GetTopSpace() );
-            mpPreViewData->SetBottomSpace 	( pConstPrtData->GetBottomSpace() );
-            mpPreViewData->SetHorzSpace 	( pConstPrtData->GetHorzSpace() );
-            mpPreViewData->SetVertSpace 	( pConstPrtData->GetVertSpace() );
-            mpPreViewData->SetRow 			( pConstPrtData->GetRow() );
-            mpPreViewData->SetCol 			( pConstPrtData->GetCol() );
-            mpPreViewData->SetLandscape 	( pConstPrtData->GetLandscape() );
-        }
-    }
-}
-
-void SwXPrintPreviewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue )
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
-{
-    switch( rInfo.mnHandle )
-    {
-        case HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN:
-        {
-            sal_Int32 nVal = 0;
-            rValue >>= nVal;
-            nVal = MM100_TO_TWIP( nVal );
-            if ( nVal != static_cast < sal_Int32 > (mpPreViewData->GetLeftSpace() ) )
-            {
-                mbPreviewDataChanged = sal_True;
-                mpPreViewData->SetLeftSpace( nVal );
-            }
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN:
-        {
-            sal_Int32 nVal = 0;
-            rValue >>= nVal;
-            nVal = MM100_TO_TWIP( nVal );
-            if ( nVal != static_cast < sal_Int32 > (mpPreViewData->GetRightSpace() ) )
-            {
-                mbPreviewDataChanged = sal_True;
-                mpPreViewData->SetRightSpace( nVal );
-            }
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_TOP_MARGIN:
-        {
-            sal_Int32 nVal = 0;
-            rValue >>= nVal;
-            nVal = MM100_TO_TWIP( nVal );
-            if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetTopSpace() ) )
-            {
-                mbPreviewDataChanged = sal_True;
-                mpPreViewData->SetTopSpace( nVal );
-            }
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN:
-        {
-            sal_Int32 nVal = 0;
-            rValue >>= nVal;
-            nVal = MM100_TO_TWIP( nVal );
-            if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetBottomSpace() ) )
-            {
-                mbPreviewDataChanged = sal_True;
-                mpPreViewData->SetBottomSpace( nVal );
-            }
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING:
-        {
-            sal_Int32 nVal = 0;
-            rValue >>= nVal;
-            nVal = MM100_TO_TWIP( nVal );
-            if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetHorzSpace() ) )
-            {
-                mbPreviewDataChanged = sal_True;
-                mpPreViewData->SetHorzSpace( nVal );
-            }
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING:
-        {
-            sal_Int32 nVal = 0;
-            rValue >>= nVal;
-            nVal = MM100_TO_TWIP( nVal );
-            if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetVertSpace() ) )
-            {
-                mbPreviewDataChanged = sal_True;
-                mpPreViewData->SetVertSpace( nVal );
-            }
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_NUM_ROWS:
-        {
-            sal_Int8 nVal = 0;
-            rValue >>= nVal;
-            if ( nVal != mpPreViewData->GetRow() )
-            {
-                mbPreviewDataChanged = sal_True;
-                mpPreViewData->SetRow( nVal );
-            }
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS:
-        {
-            sal_Int8 nVal = 0;
-            rValue >>= nVal;
-            if ( nVal != mpPreViewData->GetCol() )
-            {
-                mbPreviewDataChanged = sal_True;
-                mpPreViewData->SetCol( nVal );
-            }
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_LANDSCAPE:
-        {
-            sal_Bool bVal = *(sal_Bool*)rValue.getValue();
-            if ( bVal != mpPreViewData->GetLandscape() )
-            {
-                mbPreviewDataChanged = sal_True;
-                mpPreViewData->SetLandscape ( bVal );
-            }
-        }
-        break;
-        default:
-            throw UnknownPropertyException();
-    }
-}
-void SwXPrintPreviewSettings::_postSetValues ()
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
-{
-    if ( mbPreviewDataChanged )
-    {
-        mpDoc->SetPreViewPrtData ( mpPreViewData );
-        mbPreviewDataChanged = sal_False;
-    }
-    delete mpPreViewData;
-    mpPreViewData = NULL;
-}
-
-void SwXPrintPreviewSettings::_preGetValues ()
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
-{
-    if (mpDoc)
-        mpConstPreViewData = mpDoc->GetPreViewPrtData();
-}
-void SwXPrintPreviewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue )
-    throw(UnknownPropertyException, WrappedTargetException )
-{
-    sal_Bool bBool = TRUE;
-    sal_Bool bBoolVal;
-    switch( rInfo.mnHandle )
-    {
-        case HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN:
-        {
-            bBool = FALSE;
-            if ( mpConstPreViewData )
-                rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetLeftSpace() ) );
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN:
-        {
-            bBool = FALSE;
-            if ( mpConstPreViewData )
-                rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetRightSpace() ) );
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_TOP_MARGIN:
-        {
-            bBool = FALSE;
-            if ( mpConstPreViewData )
-                rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetTopSpace() ) );
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN:
-        {
-            bBool = FALSE;
-            if ( mpConstPreViewData )
-                rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetBottomSpace() ) );
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING:
-        {
-            bBool = FALSE;
-            if ( mpConstPreViewData )
-                rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetHorzSpace() ) );
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING:
-        {
-            bBool = FALSE;
-            if ( mpConstPreViewData )
-                rValue <<= static_cast < sal_Int32 > ( TWIP_TO_MM100_UNSIGNED( mpConstPreViewData->GetVertSpace() ) );
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_NUM_ROWS:
-        {
-            bBool = FALSE;
-            if ( mpConstPreViewData )
-                rValue <<= static_cast < sal_Int8 > ( mpConstPreViewData->GetRow() );
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS:
-        {
-            bBool = FALSE;
-            if ( mpConstPreViewData )
-                rValue <<= static_cast < sal_Int8 > ( mpConstPreViewData->GetCol() );
-        }
-        break;
-        case HANDLE_PRINTSET_PREVIEW_LANDSCAPE:
-        {
-            if (mpConstPreViewData)
-                bBoolVal = mpConstPreViewData->GetLandscape();
-            else
-                bBool = FALSE;
-        }
-        break;
-        default:
-            throw UnknownPropertyException();
-    }
-    if(bBool)
-        rValue.setValue(&bBoolVal, ::getBooleanCppuType());
-}
-void SwXPrintPreviewSettings::_postGetValues ()
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
-{
-    mpConstPreViewData = NULL;
-}
-/* -----------------------------06.04.00 11:02--------------------------------
-
- ---------------------------------------------------------------------------*/
-OUString SwXPrintPreviewSettings::getImplementationName(void) throw( RuntimeException )
-{
-    return OUString( RTL_CONSTASCII_USTRINGPARAM ( "SwXPrintPreviewSettings" ) );
-}
-/* -----------------------------06.04.00 11:02--------------------------------
-
- ---------------------------------------------------------------------------*/
-sal_Bool SwXPrintPreviewSettings::supportsService(const OUString& rServiceName) throw( RuntimeException )
-{
-    return rServiceName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.text.PrintPreviewSettings") );
-}
-/* -----------------------------06.04.00 11:02--------------------------------
-
- ---------------------------------------------------------------------------*/
-Sequence< OUString > SwXPrintPreviewSettings::getSupportedServiceNames(void) throw( RuntimeException )
-{
-    Sequence< OUString > aRet(1);
-    OUString* pArray = aRet.getArray();
-    pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.PrintPreviewSettings" ) );
-    return aRet;
-}
-
diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx
deleted file mode 100644
index 8cbc3e0567..0000000000
--- a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SW_XPRINTPREVIEWSETTINGS_HXX_
-#define _SW_XPRINTPREVIEWSETTINGS_HXX_
-
-#ifdef PRECOMPILED
-#include "ui_pch.hxx"
-#endif
-#include <comphelper/ChainablePropertySet.hxx>
-#ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP
-#include <com/sun/star/text/XTextDocument.hpp>
-#endif
-#include <cppuhelper/weak.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-class SwDoc;
-class SwPagePreViewPrtData;
-
-class SwXPrintPreviewSettings :public comphelper::ChainablePropertySet,
-                        public cppu::OWeakObject,
-                        public com::sun::star::lang::XServiceInfo
-{
-    friend class SwXDocumentSettings;
-protected:
-    sal_Bool 		mbPreviewDataChanged;
-    SwDoc*			mpDoc;
-    SwPagePreViewPrtData *mpPreViewData;
-    const SwPagePreViewPrtData *mpConstPreViewData;
-
-    virtual void _preSetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
-    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
-    virtual void _postSetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
-
-    virtual void _preGetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
-    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException );
-    virtual void _postGetValues ()
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
-    virtual ~SwXPrintPreviewSettings()
-        throw();
-public:
-    SwXPrintPreviewSettings(SwDoc *pDoc);
-
-
-    // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire(  )
-        throw ();
-    virtual void SAL_CALL release(  )
-        throw ();
-
-    //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void)
-        throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
-        throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
-        throw( ::com::sun::star::uno::RuntimeException );
-};
-#endif
diff --git a/sw/source/ui/uno/detreg.cxx b/sw/source/ui/uno/detreg.cxx
index 3a7741e2a5..06cd210b70 100644
--- a/sw/source/ui/uno/detreg.cxx
+++ b/sw/source/ui/uno/detreg.cxx
@@ -43,30 +43,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void*	/*pServiceManager*/,
-    void*	pRegistryKey	)
-{
-    Reference< ::registry::XRegistryKey >
-            xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
-
-    OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
-    OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
-    // Eigentliche Implementierung und ihre Services registrieren
-    sal_Int32 i;
-    Reference< ::registry::XRegistryKey >  xNewKey;
-
-    xNewKey = xKey->createKey( aDelimiter + SwFilterDetect::impl_getStaticImplementationName() +
-                               aUnoServices );
-
-    Sequence< OUString > aServices = SwFilterDetect::impl_getStaticSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    return sal_True;
-}
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
     const sal_Char* pImplementationName,
     void* pServiceManager,
diff --git a/sw/source/ui/uno/makefile.mk b/sw/source/ui/uno/makefile.mk
index 0023fd52f5..ac4b6dde69 100644..100755
--- a/sw/source/ui/uno/makefile.mk
+++ b/sw/source/ui/uno/makefile.mk
@@ -55,7 +55,6 @@ SLO1FILES =  \
         $(SLO)$/dlelstnr.obj \
         $(SLO)$/unofreg.obj \
         $(SLO)$/SwXDocumentSettings.obj \
-        $(SLO)$/SwXPrintPreviewSettings.obj \
         $(SLO)$/SwXFilterOptions.obj\
         $(SLO)$/RefreshListenerContainer.obj \
         $(SLO)$/unomodule.obj \
diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx
index 8be7174c77..9ad0a44617 100644
--- a/sw/source/ui/uno/unofreg.cxx
+++ b/sw/source/ui/uno/unofreg.cxx
@@ -154,99 +154,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-static void lcl_uno_writeInfo(
-        registry::XRegistryKey * pRegistryKey,
-        const OUString& rImplementationName,
-        const uno::Sequence< OUString >& rServices )
-{
-    uno::Reference< registry::XRegistryKey > xNewKey(
-        pRegistryKey->createKey(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) );
-
-    for( sal_Int32 i = 0; i < rServices.getLength(); i++ )
-        xNewKey->createKey( rServices.getConstArray()[i]);
-}
-
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-        void * /*pServiceManager*/,
-        void * pRegistryKey )
-{
-    if( pRegistryKey )
-    {
-        try
-        {
-            registry::XRegistryKey *pKey =
-                reinterpret_cast< registry::XRegistryKey * >( pRegistryKey );
-
-
-            // xml filter
-            lcl_uno_writeInfo( pKey, SwXMLImport_getImplementationName(),
-                               SwXMLImport_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLImportStyles_getImplementationName(),
-                               SwXMLImportStyles_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey,SwXMLImportContent_getImplementationName(),
-                               SwXMLImportContent_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLImportMeta_getImplementationName(),
-                               SwXMLImportMeta_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLImportSettings_getImplementationName(),
-                               SwXMLImportSettings_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLExportOOO_getImplementationName(),
-                               SwXMLExportOOO_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLExportStylesOOO_getImplementationName(),
-                               SwXMLExportStylesOOO_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey,SwXMLExportContentOOO_getImplementationName(),
-                               SwXMLExportContentOOO_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLExportMetaOOO_getImplementationName(),
-                               SwXMLExportMetaOOO_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLExportSettingsOOO_getImplementationName(),
-                               SwXMLExportSettingsOOO_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLExport_getImplementationName(),
-                               SwXMLExport_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLExportStyles_getImplementationName(),
-                               SwXMLExportStyles_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey,SwXMLExportContent_getImplementationName(),
-                               SwXMLExportContent_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLExportMeta_getImplementationName(),
-                               SwXMLExportMeta_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMLExportSettings_getImplementationName(),
-                               SwXMLExportSettings_getSupportedServiceNames() );
-            //API objects
-            lcl_uno_writeInfo( pKey, SwXAutoTextContainer_getImplementationName(),
-                               SwXAutoTextContainer_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXModule_getImplementationName(),
-                               SwXModule_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwXMailMerge_getImplementationName(),
-                               SwXMailMerge_getSupportedServiceNames() );
-            //Filter options
-            lcl_uno_writeInfo( pKey, SwXFilterOptions::getImplementationName_Static(),
-                               SwXFilterOptions::getSupportedServiceNames_Static() );
-
-            // documents
-            lcl_uno_writeInfo( pKey, SwTextDocument_getImplementationName(),
-                               SwTextDocument_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey, SwWebDocument_getImplementationName(),
-                               SwWebDocument_getSupportedServiceNames() );
-            lcl_uno_writeInfo( pKey,SwGlobalDocument_getImplementationName(),
-                               SwGlobalDocument_getSupportedServiceNames() );
-
-            // module
-            lcl_uno_writeInfo( pKey, SwUnoModule_getImplementationName(),
-                               SwUnoModule_getSupportedServiceNames() );
-            // --> OD 2007-05-24 #i73788#
-            lcl_uno_writeInfo( pKey,
-                               comp_FinalThreadManager::_getImplementationName(),
-                               comp_FinalThreadManager::_getSupportedServiceNames() );
-            // <--
-
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_True;
-}
-
 static ::cppu::ImplementationEntry const entries[] = {
     { &comp_FinalThreadManager::_create,
       &comp_FinalThreadManager::_getImplementationName,
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index e3f1322bed..3e74670dc5 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -82,6 +82,7 @@
 #include <svx/xmleohlp.hxx>
 #include <globals.hrc>
 #include <unomid.h>
+#include <unotools/printwarningoptions.hxx>
 
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
@@ -107,7 +108,6 @@
 #include <swcont.hxx>
 #include <unodefaults.hxx>
 #include <SwXDocumentSettings.hxx>
-#include <SwXPrintPreviewSettings.hxx>
 #include <doc.hxx>
 #include <editeng/forbiddencharacterstable.hxx>
 #include <svl/zforlist.hxx>
@@ -1809,9 +1809,7 @@ Reference< XInterface >  SwXTextDocument::createInstance(const OUString& rServic
             }
             else if (sCategory == C2U ("text") )
             {
-                if( 0 == rServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.PrintPreviewSettings") ) )
-                    xRet = Reference < XInterface > ( *new SwXPrintPreviewSettings ( pDocShell->GetDoc() ) );
-                else if( 0 == rServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.DocumentSettings") ) )
+                if( 0 == rServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.DocumentSettings") ) )
                     xRet = Reference < XInterface > ( *new SwXDocumentSettings ( this ) );
             }
             else if (sCategory == C2U ("chart2") )
@@ -2732,10 +2730,21 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             // since printing now also use the API for PDF export this option
             // should be set for printing as well ...
             pWrtShell->SetPDFExportOption( sal_True );
+            bool bOrigStatus = pRenderDocShell->IsEnableSetModified();
+            // check configuration: shall update of printing information in DocInfo set the document to "modified"?
+            bool bStateChanged = false;
+            if ( bOrigStatus && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
+            {
+                pRenderDocShell->EnableSetModified( sal_False );                
+                bStateChanged = true;
+            }
+            
 
             // --> FME 2005-05-23 #122919# Force field update before PDF export:
             pWrtShell->ViewShell::UpdateFlds(TRUE);
             // <--
+            if( bStateChanged )
+                pRenderDocShell->EnableSetModified( sal_True );
 
             // there is some redundancy between those two function calls, but right now
             // there is no time to sort this out.
@@ -2844,7 +2853,10 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
     uno::Sequence< beans::PropertyValue > aRenderer;
     if (m_pRenderData)
     {
-        const USHORT nPage = nRenderer + 1;
+        // --> TL, OD 2010-09-07 #i114210#
+        // determine the correct page number from the renderer index
+        const USHORT nPage = m_pRenderData->GetPagesToPrint()[ nRenderer ];
+        // <--
         
         // get paper tray to use ... 
         sal_Int32 nPrinterPaperTray = -1;
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index 8200e323b8..3fe4f316df 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -66,16 +66,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    sal_Bool SAL_CALL component_writeInfo( 
-        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-    {
-        OSL_TRACE("In component_writeInfo");
-
-    // Component registration
-        return component_writeInfoHelper( pServiceManager, pRegistryKey, 
-        globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl, vbaeventshelper::serviceDecl ); 
-    }
-
     void * SAL_CALL component_getFactory( 
         const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
         registry::XRegistryKey * pRegistryKey )
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index ce1419b340..6fa4bd5432 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -374,3 +374,23 @@ SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib
 .ENDIF # .IF "$(ENABLE_VBA)" == "YES"
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/sw.component $(MISC)/swd.component $(MISC)/vbaswobj.component
+
+$(MISC)/sw.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sw.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sw.component
+
+$(MISC)/swd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        swd.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt swd.component
+
+$(MISC)/vbaswobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        vbaswobj.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt vbaswobj.component
diff --git a/sw/util/sw.component b/sw/util/sw.component
new file mode 100644
index 0000000000..e76cec637d
--- /dev/null
+++ b/sw/util/sw.component
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="SwXAutoTextContainer">
+    <service name="com.sun.star.text.AutoTextContainer"/>
+  </implementation>
+  <implementation name="SwXMailMerge">
+    <service name="com.sun.star.sdb.DataAccessDescriptor"/>
+    <service name="com.sun.star.text.MailMerge"/>
+  </implementation>
+  <implementation name="SwXModule">
+    <service name="com.sun.star.text.GlobalSettings"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.FilterOptionsDialog">
+    <service name="com.sun.star.ui.dialogs.FilterOptionsDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.GlobalDocument">
+    <service name="com.sun.star.text.GlobalDocument"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.TextDocument">
+    <service name="com.sun.star.text.TextDocument"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.WebDocument">
+    <service name="com.sun.star.text.WebDocument"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.WriterModule">
+    <service name="com.sun.star.text.ModuleDispatcher"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLContentExporter">
+    <service name="com.sun.star.comp.Writer.XMLContentExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLExporter">
+    <service name="com.sun.star.comp.Writer.XMLExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLMetaExporter">
+    <service name="com.sun.star.comp.Writer.XMLMetaExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisContentExporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisContentExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisContentImporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisContentImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisExporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisImporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisMetaExporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisMetaExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisMetaImporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisMetaImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisSettingsExporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisSettingsExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisSettingsImporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisSettingsImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisStylesExporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisStylesExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLOasisStylesImporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisStylesImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLSettingsExporter">
+    <service name="com.sun.star.comp.Writer.XMLSettingsExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLStylesExporter">
+    <service name="com.sun.star.comp.Writer.XMLStylesExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.util.comp.FinalThreadManager">
+    <service name="com.sun.star.util.JobManager"/>
+  </implementation>
+</component>
diff --git a/sw/util/swd.component b/sw/util/swd.component
new file mode 100644
index 0000000000..c89c007ec3
--- /dev/null
+++ b/sw/util/swd.component
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.writer.FormatDetector">
+    <service name="com.sun.star.frame.ExtendedTypeDetection"/>
+    <service name="com.sun.star.text.FormatDetector"/>
+    <service name="com.sun.star.text.W4WFormatDetector"/>
+  </implementation>
+</component>
diff --git a/sw/util/vbaswobj.component b/sw/util/vbaswobj.component
new file mode 100644
index 0000000000..e6c6fe4a41
--- /dev/null
+++ b/sw/util/vbaswobj.component
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="SwVbaDocument">
+    <service name="ooo.vba.word.Document"/>
+  </implementation>
+  <implementation name="SwVbaEventsHelper">
+    <service name="com.sun.star.document.vba.VBATextEventProcessor"/>
+  </implementation>
+  <implementation name="SwVbaGlobals">
+    <service name="ooo.vba.word.Globals"/>
+  </implementation>
+  <implementation name="SwVbaWrapFormat">
+    <service name="ooo.vba.word.WrapFormat"/>
+  </implementation>
+</component>