CWS-TOOLING: integrate CWS tl66

2009-05-15 12:28:55 +0200 tl  r271932 : #i91812# include fixed
2009-05-07 16:52:41 +0200 tl  r271680 : #i97200# one more MathML export problem to fix
2009-05-05 08:33:29 +0200 tl  r271494 : #i99401# positiv user-dicts vs negativ user-dicts
2009-05-04 14:14:03 +0200 tl  r271452 : #i97200# warning free code; MathML 2.0 export
2009-05-04 13:26:30 +0200 tl  r271448 : #i97200# write valid MathML 2.0 on export
2009-04-29 14:21:54 +0200 tl  r271371 : #i97200# new MathML token
2009-04-29 11:12:07 +0200 tl  r271360 : #i97200# inroducing separate files for import and export
2009-04-28 16:47:42 +0200 tl  r271331 : #i97200# better MathML pretty printing
2009-04-28 11:21:57 +0200 tl  r271315 : #i97200# MathML attributes and default namespace for MathML
2009-04-28 11:21:24 +0200 tl  r271314 : #i97200# MathML attributes and default namespace for MathML
2009-04-23 12:44:18 +0200 tl  r271154 : #i97200# math.dtd removed
2009-04-23 12:31:56 +0200 tl  r271151 : #i97200# MathML: don't use namespace on attributes
2009-04-22 13:21:11 +0200 tl  r271099 : warning-free code
2009-04-22 12:20:13 +0200 tl  r271092 : #i100757# loop fixed
2009-04-22 11:29:51 +0200 tl  r271086 : #97327# adding mongolian fingerprint for language guessing
2009-04-22 11:25:56 +0200 tl  r271083 : #97327# adding mongolian fingerprint for language guessing
2009-04-21 10:39:21 +0200 tl  r271025 : #99599# code fix for LRE/RLE embedding
2009-04-20 16:36:33 +0200 tl  r270992 : #i99604# HasDigits fixed
2009-04-20 14:44:19 +0200 tl  r270985 : #i99604# warning-free code for Windows
2009-04-20 13:48:13 +0200 tl  r270980 : #i99604# HasDigits fix for non-ASCII characters
2009-04-20 13:47:50 +0200 tl  r270979 : #i99604# HasDigits fix for non-ASCII characters
2009-04-20 12:28:15 +0200 tl  r270973 : warning-free code after merging
2009-04-20 10:16:19 +0200 tl  r270964 : warning-free code after merging
2009-04-17 14:43:36 +0200 tl  r270948 : #i96846#
2009-04-16 13:09:15 +0200 tl  r270883 : CWS-TOOLING: rebase CWS tl66 to trunk@270723 (milestone: DEV300:m46)
2009-04-14 14:34:08 +0200 tl  r270770 : #101067# warning-free code
2009-04-02 09:07:44 +0200 tl  r270368 : #i100757# performance patch for start-up (initialize language guessing on demand only)
2009-03-11 10:37:59 +0100 tl  r269301 : #i100083# fixed system dictionary lookup
2009-03-06 13:10:23 +0100 tl  r268998 : warning-free code for Windows non-pro
2009-02-23 14:01:23 +0100 tl  r268355 : #i99401# winning rules for user-dictionaries changed
2009-02-19 14:05:57 +0100 tl  r268281 : #i98644# suggestion improvement when first checker does not know any suggestions
2009-02-19 14:05:02 +0100 tl  r268280 : #i98644# suggestion improvement when first checker does not know any suggestions
2009-02-19 13:58:51 +0100 tl  r268279 : #i98644# suggestion improvement when first checker does not know any suggestions
2009-02-19 11:38:03 +0100 tl  r268266 : #i98644# suggestion improvement when first checker does not know any suggestions
2009-02-12 11:58:34 +0100 tl  r267642 : #i96846# some properties declared as maybevoid
2009-02-06 12:43:55 +0100 tl  r267454 : #i98644# provide sugestions from secondary spell checkers if the primary does not provide ones
2009-02-05 13:02:26 +0100 tl  r267418 : #i98880# a bit clean-up in the grammar checking framework
2009-02-04 12:15:37 +0100 tl  r267363 : #i91812# remove unused/duplicate code
2009-02-04 12:09:34 +0100 tl  r267362 : #i91812# remove unused/duplicate code
2009-02-04 11:07:57 +0100 tl  r267355 : #i91812# remove unused code
2009-02-04 11:06:48 +0100 tl  r267354 : #i91812# remove unused code
2009-02-03 14:52:43 +0100 tl  r267331 : #i91812# remove unused code
2009-02-03 14:26:00 +0100 tl  r267324 : #i91198# adding fingerprint for luxembourgish
2009-02-03 14:20:58 +0100 tl  r267323 : #i91198# adding fingerprint for luxembourgish
2009-02-03 14:18:33 +0100 tl  r267322 : #i91198# adding fingerprint for luxembourgish
2009-02-03 13:56:39 +0100 tl  r267319 : #i91812# remove unused code
2009-02-03 12:41:50 +0100 tl  r267314 : #i48400# auto-spellcheck improvement when deleting wrong chars
2009-02-03 11:48:51 +0100 tl  r267310 : #i91812# remove unused code
2009-02-03 11:14:29 +0100 tl  r267307 : warning free code
2009-02-03 10:45:21 +0100 tl  r267306 : #i91812# remove unused code
2009-02-03 10:37:04 +0100 tl  r267304 : #i33387# name change for 'View/Selection'
2009-02-03 10:36:17 +0100 tl  r267303 : #i33387# name change for 'View/Selection'
2009-02-03 10:32:12 +0100 tl  r267302 : #i30642# spelling error in context menu fixed
2009-02-03 10:27:34 +0100 tl  r267301 : #i92210# remove unused code types.cxx cfgitem.*

1 files changed, 54 insertions, 59 deletions

diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 271f3dd805..125ad39f56 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -33,84 +33,79 @@
 
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/uno/Any.h>
+
+#include <comphelper/accessibletexthelper.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/storagehelper.hxx>
 #include <rtl/logfile.hxx>
 #include <rtl/ustring.hxx>
-#include <ucbhelper/content.hxx>
-#include <sot/formats.hxx>
-#include <sot/storage.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/pathoptions.hxx>
-#ifndef _SO_CLSIDS_HXX //autogen
+#include <sfx2/app.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/docfile.hxx>
+#include <sfx2/docfilt.hxx>
+#include <sfx2/fcontnr.hxx>
+#include <sfx2/msg.hxx>
+#include <sfx2/objface.hxx>
+#include <sfx2/printer.hxx>
+#include <sfx2/request.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <sot/clsids.hxx>
-#endif
 #include <sot/exchange.hxx>
-#include <vcl/msgbox.hxx>
-
-#include <vcl/mapunit.hxx>
-#include <vcl/mapmod.hxx>
-#include <comphelper/storagehelper.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/accessibletexthelper.hxx>
+#include <sot/formats.hxx>
+#include <sot/storage.hxx>
 #include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svtools/fstathelper.hxx>
 #include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svtools/itempool.hxx>
+#include <svtools/lingucfg.hxx>
+#include <svtools/linguprops.hxx>
+#include <svtools/pathoptions.hxx>
 #include <svtools/ptitem.hxx>
+#include <svtools/sfxecode.hxx>
+#include <svtools/slstitm.hxx>
+#include <svtools/smplhint.hxx>
+#include <svtools/stritem.hxx>
+#include <svtools/transfer.hxx>
 #include <svtools/undo.hxx>
-#include <svtools/itempool.hxx>
 #include <svtools/urihelper.hxx>
-#include <svtools/fstathelper.hxx>
-#include <svtools/transfer.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <svtools/sfxecode.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/docfilt.hxx>
-#include <svtools/itempool.hxx>
+#include <svtools/whiter.hxx>
 #include <svx/editeng.hxx>
-#include <svx/eeitem.hxx>
 #include <svx/editstat.hxx>
-#include <svx/fontitem.hxx>
+#include <svx/eeitem.hxx>
 #include <svx/fhgtitem.hxx>
+#include <svx/fontitem.hxx>
 #include <svx/unolingu.hxx>
-#include <svtools/slstitm.hxx>
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/lang/Locale.hpp>
+#include <ucbhelper/content.hxx>
+#include <vcl/mapmod.hxx>
+#include <vcl/mapunit.hxx>
+#include <vcl/msgbox.hxx>
 
-#ifndef STARMATH_HRC
-#include <starmath.hrc>
-#endif
 #include <document.hxx>
-#include <unomodel.hxx>
+#include <action.hxx>
 #include <config.hxx>
+#include <dialog.hxx>
+#include <format.hxx>
+#include <smdll.hxx>
+#include <starmath.hrc>
 #include <symbol.hxx>
 #include <toolbox.hxx>
-#include <dialog.hxx>
-#include <action.hxx>
-#include <view.hxx>
+#include <unomodel.hxx>
 #include <utility.hxx>
-#include <format.hxx>
-#include <mathtype.hxx>
-#include <mathml.hxx>
+#include <view.hxx>
+#include "mathtype.hxx"
+#include "mathmlimport.hxx"
+#include "mathmlexport.hxx"
 
-#include <smdll.hxx>
 
-#include <sfx2/fcontnr.hxx>
-#include <sfx2/msg.hxx>
-#include <sfx2/objface.hxx>
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::accessibility;
 
-#define A2OU(x)        rtl::OUString::createFromAscii( x )
 
 #define DOCUMENT_BUFFER_SIZE	(USHORT)32768
 
@@ -266,7 +261,7 @@ void SmDocShell::ArrangeFormula()
     if (IsFormulaArranged())
         return;
 
-    //! Nur für die Dauer der Existenz dieses Objekts sind am Drucker die
+    //! Nur f�r die Dauer der Existenz dieses Objekts sind am Drucker die
     //! richtigen Einstellungen garantiert.
     SmPrinterAccess  aPrtAcc(*this);
 //	OutputDevice	*pOutDev = aPrtAcc.GetPrinter();
@@ -279,7 +274,7 @@ void SmDocShell::ArrangeFormula()
 #endif
     }
 
-    // falls nötig ein anderes OutputDevice holen für das formatiert wird
+    // falls n�tig ein anderes OutputDevice holen f�r das formatiert wird
     if (!pOutDev)
     {
         SmViewShell *pView = SmGetActiveView();
@@ -761,7 +756,7 @@ BOOL SmDocShell::ConvertFrom(SfxMedium &rMedium)
             pTree = 0;
         }
         Reference<com::sun::star::frame::XModel> xModel(GetModel());
-        SmXMLWrapper aEquation(xModel);
+        SmXMLImportWrapper aEquation(xModel);
         bSuccess = 0 == aEquation.Import(rMedium);
     }
     else
@@ -835,7 +830,7 @@ BOOL SmDocShell::Load( SfxMedium& rMedium )
         {
             // is this a fabulous math package ?
             Reference<com::sun::star::frame::XModel> xModel(GetModel());
-            SmXMLWrapper aEquation(xModel);
+            SmXMLImportWrapper aEquation(xModel);
             ULONG nError = aEquation.Import(rMedium);
             bRet = 0 == nError;
             SetError( nError );
@@ -870,7 +865,7 @@ BOOL SmDocShell::Save()
             ArrangeFormula();
 
         Reference<com::sun::star::frame::XModel> xModel(GetModel());
-        SmXMLWrapper aEquation(xModel);
+        SmXMLExportWrapper aEquation(xModel);
         aEquation.SetFlat(sal_False);
         return aEquation.Export(*GetMedium());
     }
@@ -943,7 +938,7 @@ BOOL SmDocShell::SaveAs( SfxMedium& rMedium )
             ArrangeFormula();
 
         Reference<com::sun::star::frame::XModel> xModel(GetModel());
-        SmXMLWrapper aEquation(xModel);
+        SmXMLExportWrapper aEquation(xModel);
         aEquation.SetFlat(sal_False);
         bRet = aEquation.Export(rMedium);
     }
@@ -967,14 +962,14 @@ BOOL SmDocShell::ConvertTo( SfxMedium &rMedium )
         if(rFltName.EqualsAscii( STAROFFICE_XML ))
         {
             Reference<com::sun::star::frame::XModel> xModel(GetModel());
-            SmXMLWrapper aEquation(xModel);
+            SmXMLExportWrapper aEquation(xModel);
             aEquation.SetFlat(sal_False);
             bRet = aEquation.Export(rMedium);
         }
         else if(rFltName.EqualsAscii( MATHML_XML ))
         {
             Reference<com::sun::star::frame::XModel> xModel(GetModel());
-            SmXMLWrapper aEquation(xModel);
+            SmXMLExportWrapper aEquation(xModel);
             aEquation.SetFlat(sal_True);
             bRet = aEquation.Export(rMedium);
         }