summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 11:01:26 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 11:01:26 +0000
commit5aff37cd51879a41365f2ceb0e927bdf57ffddb3 (patch)
tree00eecb86eca3db9a8473e55ceecbfa72cdc21d35
parentce25a84957e0b59afdf93f42580c31b5df692497 (diff)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
-rw-r--r--starmath/inc/edit.hxx10
-rw-r--r--starmath/inc/smmod.hxx14
-rw-r--r--starmath/inc/view.hxx10
-rw-r--r--starmath/prj/d.lst2
-rw-r--r--starmath/source/accessibility.cxx171
-rw-r--r--starmath/source/accessibility.hxx8
-rw-r--r--starmath/source/commands.src221
-rw-r--r--starmath/source/edit.cxx10
-rw-r--r--starmath/source/makefile.mk10
-rw-r--r--starmath/source/mathml.cxx51
-rw-r--r--starmath/source/node.cxx20
-rw-r--r--starmath/source/smmod.cxx10
-rw-r--r--starmath/source/smres.src285
-rw-r--r--starmath/source/symbol.src267
-rw-r--r--starmath/source/view.cxx10
-rw-r--r--starmath/util/makefile.mk22
16 files changed, 655 insertions, 466 deletions
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 6de5edb63c78..5475428f8348 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: edit.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: tl $ $Date: 2002-12-12 15:39:00 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -73,8 +73,8 @@
#ifndef _MyEDITDATA_HXX //autogen
#include <svx/editdata.hxx>
#endif
-#ifndef _SVX_COLORCFG_HXX
-#include <svx/colorcfg.hxx>
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
#endif
#ifndef _ACCESSIBILITY_HXX_
@@ -178,7 +178,7 @@ public:
void Flush();
void DeleteEditView( SmViewShell &rView );
- void ApplyColorConfigValues( const svx::ColorConfig &rColorCfg );
+ void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
// for Accessibility
virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > CreateAccessible();
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index c002fbcbd982..3ae8f71d9f29 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: smmod.hxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: tl $ $Date: 2002-12-12 15:39:16 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,8 +68,8 @@
#ifndef _SFXLSTNER_HXX
#include <svtools/lstner.hxx>
#endif
-#ifndef _SVX_COLORCFG_HXX
-#include <svx/colorcfg.hxx>
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
#endif
#ifndef _SMDLL_HXX
@@ -157,7 +157,7 @@ public:
class SmModule : public SmModuleDummy, public SfxListener
{
- svx::ColorConfig *pColorConfig;
+ svtools::ColorConfig *pColorConfig;
SmConfig *pConfig;
SmLocalizedSymbolData *pLocSymbolData;
SmRectCache *pRectCache;
@@ -168,7 +168,7 @@ class SmModule : public SmModuleDummy, public SfxListener
void _CreateSysLocale() const;
void _CreateVirtualDev() const;
- void ApplyColorConfigValues( const svx::ColorConfig &rColorCfg );
+ void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
public:
TYPEINFO();
@@ -183,7 +183,7 @@ public:
// SfxListener
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- svx::ColorConfig & GetColorConfig();
+ svtools::ColorConfig & GetColorConfig();
SmConfig * GetConfig();
SmRectCache * GetRectCache() { return pRectCache; }
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 2fbf9ff82abb..6ac6e416035b 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: view.hxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: tl $ $Date: 2002-12-12 15:39:32 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -82,8 +82,8 @@
#ifndef _SFXVIEWFRM_HXX //autogen
#include <sfx2/viewfrm.hxx>
#endif
-#ifndef _SVX_COLORCFG_HXX
-#include <svx/colorcfg.hxx>
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
#endif
#ifndef EDIT_HXX
@@ -153,7 +153,7 @@ public:
void ShowCursor(BOOL bShow);
const SmNode * SetCursorPos(USHORT nRow, USHORT nCol);
- void ApplyColorConfigValues( const svx::ColorConfig &rColorCfg );
+ void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
// for Accessibility
virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > CreateAccessible();
diff --git a/starmath/prj/d.lst b/starmath/prj/d.lst
index 91ffd9ab999c..7671339733bb 100644
--- a/starmath/prj/d.lst
+++ b/starmath/prj/d.lst
@@ -11,7 +11,7 @@ touch: ..\%__SRC%\misc\sm.hid %_DEST%\bin%_EXT%\sm.hid
..\%__SRC%\bin\sm?????.dll %_DEST%\bin%_EXT%\sm?????.dll
..\%__SRC%\bin\sm?????.res %_DEST%\bin%_EXT%\sm?????.res
..\%__SRC%\bin\sm?????.sym %_DEST%\bin%_EXT%\sm?????.sym
-mkdir: %_DEST%\inc\starmath
+mkdir: %_DEST%\inc%_EXT%\starmath
hedabu: ..\inc\smdll.hxx %_DEST%\inc%_EXT%\starmath\smdll.hxx
hedabu: ..\inc\smdll0.hxx %_DEST%\inc%_EXT%\starmath\smdll0.hxx
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 7fcd321768b0..f086b902b3f6 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: accessibility.cxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: tl $ $Date: 2002-12-09 13:14:34 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -99,6 +99,9 @@
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
#include <unotools/accessiblestatesethelper.hxx>
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
#endif
@@ -111,6 +114,9 @@
#ifndef _VCL_UNOHELP2_HXX
#include <vcl/unohelp2.hxx>
#endif
+#ifndef _SV_GEN_HXX
+#include <tools/gen.hxx>
+#endif
#ifndef _VOS_MUTEX_HXX_
#include <vos/mutex.hxx>
#endif
@@ -156,10 +162,53 @@ using namespace drafts::com::sun::star::accessibility;
//////////////////////////////////////////////////////////////////////
+static awt::Rectangle lcl_GetBounds( Window *pWin )
+{
+ // !! see VCLXAccessibleComponent::implGetBounds()
+
+ //! the coordinates returned are relativ to the parent window !
+ //! Thus the top-left point may be different from (0, 0) !
+
+ awt::Rectangle aBounds;
+ if (pWin)
+ {
+ Rectangle aRect = pWin->GetWindowExtentsRelative( NULL );
+ aBounds.X = aRect.Left();
+ aBounds.Y = aRect.Top();
+ aBounds.Width = aRect.GetWidth();
+ aBounds.Height = aRect.GetHeight();
+ Window* pParent = pWin->GetAccessibleParentWindow();
+ if (pParent)
+ {
+ Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL );
+ awt::Point aParentScreenLoc( aParentRect.Left(), aParentRect.Top() );
+ aBounds.X -= aParentScreenLoc.X;
+ aBounds.Y -= aParentScreenLoc.Y;
+ }
+ }
+ return aBounds;
+}
+
+static awt::Point lcl_GetLocationOnScreen( Window *pWin )
+{
+ // !! see VCLXAccessibleComponent::getLocationOnScreen()
+
+ awt::Point aPos;
+ if (pWin)
+ {
+ Rectangle aRect = pWin->GetWindowExtentsRelative( NULL );
+ aPos.X = aRect.Left();
+ aPos.Y = aRect.Top();
+ }
+ return aPos;
+}
+
+//////////////////////////////////////////////////////////////////////
+
SmGraphicAccessible::SmGraphicAccessible( SmGraphicWindow *pGraphicWin ) :
aAccName ( String(SmResId(RID_DOCUMENTSTR)) ),
pWin (pGraphicWin),
- aAccEventListeners (aListenerMutex)
+ nClientId (0)
{
DBG_ASSERT( pWin, "SmGraphicAccessible: window missing" );
//++aRefCount;
@@ -168,7 +217,7 @@ SmGraphicAccessible::SmGraphicAccessible( SmGraphicWindow *pGraphicWin ) :
SmGraphicAccessible::SmGraphicAccessible( const SmGraphicAccessible &rSmAcc ) :
aAccName ( String(SmResId(RID_DOCUMENTSTR)) ),
- aAccEventListeners (aListenerMutex)
+ nClientId (0)
{
//vos::OGuard aGuard(Application::GetSolarMutex());
pWin = rSmAcc.pWin;
@@ -207,9 +256,11 @@ void SmGraphicAccessible::ClearWin()
{
pWin = 0; // implicitly results in AccessibleStateType::DEFUNC set
- EventObject aEvtObj;
- aEvtObj.Source = (XAccessible *) this;
- aAccEventListeners.disposeAndClear( aEvtObj );
+ if ( nClientId )
+ {
+ comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, *this );
+ nClientId = 0;
+ }
}
void SmGraphicAccessible::LaunchEvent(
@@ -224,13 +275,8 @@ void SmGraphicAccessible::LaunchEvent(
aEvt.NewValue = rNewVal ;
// pass event on to event-listener's
- cppu::OInterfaceIteratorHelper aIt( aAccEventListeners );
- while (aIt.hasMoreElements())
- {
- Reference< XAccessibleEventListener > xRef( aIt.next(), UNO_QUERY );
- if (xRef.is())
- xRef->notifyEvent( aEvt );
- }
+ if (nClientId)
+ comphelper::AccessibleEventNotifier::addEvent( nClientId, aEvt );
}
uno::Reference< XAccessibleContext > SAL_CALL SmGraphicAccessible::getAccessibleContext()
@@ -243,6 +289,9 @@ uno::Reference< XAccessibleContext > SAL_CALL SmGraphicAccessible::getAccessible
sal_Bool SAL_CALL SmGraphicAccessible::contains( const awt::Point& aPoint )
throw (RuntimeException)
{
+ //! the arguments coordinates are relativ to the current window !
+ //! Thus the top-left point is (0, 0)
+
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
@@ -269,10 +318,9 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getBounds()
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
-
- Point aPt( pWin->GetPosPixel() );
- Size aSz( pWin->GetSizePixel() );
- return awt::Rectangle( aPt.X(), aPt.Y(), aSz.Width(), aSz.Height() );
+ DBG_ASSERT(pWin->GetParent()->GetAccessible() == getAccessibleParent(),
+ "mismatch of window parent and accessible parent" );
+ return lcl_GetBounds( pWin );
}
awt::Point SAL_CALL SmGraphicAccessible::getLocation()
@@ -281,9 +329,10 @@ awt::Point SAL_CALL SmGraphicAccessible::getLocation()
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
-
- Point aPt( pWin->GetPosPixel() );
- return awt::Point( aPt.X(), aPt.Y() );
+ DBG_ASSERT(pWin->GetParent()->GetAccessible() == getAccessibleParent(),
+ "mismatch of window parent and accessible parent" );
+ awt::Rectangle aRect( lcl_GetBounds( pWin ) );
+ return awt::Point( aRect.X, aRect.Y );
}
awt::Point SAL_CALL SmGraphicAccessible::getLocationOnScreen()
@@ -292,9 +341,9 @@ awt::Point SAL_CALL SmGraphicAccessible::getLocationOnScreen()
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
-
- Point aPt( pWin->OutputToAbsoluteScreenPixel( Point() ) );
- return awt::Point( aPt.X(), aPt.Y() );
+ DBG_ASSERT(pWin->GetParent()->GetAccessible() == getAccessibleParent(),
+ "mismatch of window parent and accessible parent" );
+ return lcl_GetLocationOnScreen( pWin );
}
awt::Size SAL_CALL SmGraphicAccessible::getSize()
@@ -303,8 +352,15 @@ awt::Size SAL_CALL SmGraphicAccessible::getSize()
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
+ DBG_ASSERT(pWin->GetParent()->GetAccessible() == getAccessibleParent(),
+ "mismatch of window parent and accessible parent" );
Size aSz( pWin->GetSizePixel() );
+#ifdef DEBUG
+ awt::Rectangle aRect( lcl_GetBounds( pWin ) );
+ Size aSz2( aRect.Width, aRect.Height );
+ DBG_ASSERT( aSz == aSz2, "mismatch in width" );
+#endif
return awt::Size( aSz.Width(), aSz.Height() );
}
@@ -465,17 +521,36 @@ void SAL_CALL SmGraphicAccessible::addEventListener(
const Reference< XAccessibleEventListener >& xListener )
throw (RuntimeException)
{
- //vos::OGuard aGuard(Application::GetSolarMutex());
- if (pWin) // not disposing (about to destroy view shell)
- aAccEventListeners.addInterface( xListener );
+ if (xListener.is())
+ {
+ vos::OGuard aGuard(Application::GetSolarMutex());
+ if (pWin)
+ {
+ if (!nClientId)
+ nClientId = comphelper::AccessibleEventNotifier::registerClient( );
+ comphelper::AccessibleEventNotifier::addEventListener( nClientId, xListener );
+ }
+ }
}
void SAL_CALL SmGraphicAccessible::removeEventListener(
const Reference< XAccessibleEventListener >& xListener )
throw (RuntimeException)
{
- //vos::OGuard aGuard(Application::GetSolarMutex());
- aAccEventListeners.removeInterface( xListener );
+ if (xListener.is())
+ {
+ vos::OGuard aGuard(Application::GetSolarMutex());
+ sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( nClientId, xListener );
+ if ( !nListenerCount )
+ {
+ // no listeners anymore
+ // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+ // and at least to us not firing any events anymore, in case somebody calls
+ // NotifyAccessibleEvent, again
+ comphelper::AccessibleEventNotifier::revokeClient( nClientId );
+ nClientId = 0;
+ }
+ }
}
sal_Int32 SAL_CALL SmGraphicAccessible::getCaretPosition()
@@ -1472,7 +1547,6 @@ sal_Bool SmEditViewForwarder::Paste()
SmEditAccessible::SmEditAccessible( SmEditWindow *pEditWin ) :
aAccName ( String(SmResId(STR_CMDBOXWINDOW)) ),
pWin (pEditWin),
- aAccEventListeners (aListenerMutex),
pTextHelper (0)
{
DBG_ASSERT( pWin, "SmEditAccessible: window missing" );
@@ -1481,8 +1555,7 @@ SmEditAccessible::SmEditAccessible( SmEditWindow *pEditWin ) :
SmEditAccessible::SmEditAccessible( const SmEditAccessible &rSmAcc ) :
- aAccName ( String(SmResId(STR_CMDBOXWINDOW)) ),
- aAccEventListeners (aListenerMutex)
+ aAccName ( String(SmResId(STR_CMDBOXWINDOW)) )
{
//vos::OGuard aGuard(Application::GetSolarMutex());
pWin = rSmAcc.pWin;
@@ -1534,10 +1607,6 @@ void SmEditAccessible::ClearWin()
//! (e.g. the one set by the 'SetEventSource' call)
pTextHelper->Dispose();
delete pTextHelper; pTextHelper = 0;
-
- EventObject aEvtObj;
- aEvtObj.Source = (XAccessible *) this;
- aAccEventListeners.disposeAndClear( aEvtObj );
}
// XAccessible
@@ -1552,6 +1621,9 @@ uno::Reference< XAccessibleContext > SAL_CALL SmEditAccessible::getAccessibleCon
sal_Bool SAL_CALL SmEditAccessible::contains( const awt::Point& aPoint )
throw (RuntimeException)
{
+ //! the arguments coordinates are relativ to the current window !
+ //! Thus the top left-point is (0, 0)
+
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
@@ -1576,10 +1648,9 @@ awt::Rectangle SAL_CALL SmEditAccessible::getBounds( )
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
-
- Point aPt( pWin->GetPosPixel() );
- Size aSz( pWin->GetSizePixel() );
- return awt::Rectangle( aPt.X(), aPt.Y(), aSz.Width(), aSz.Height() );
+ DBG_ASSERT(pWin->GetParent()->GetAccessible() == getAccessibleParent(),
+ "mismatch of window parent and accessible parent" );
+ return lcl_GetBounds( pWin );
}
awt::Point SAL_CALL SmEditAccessible::getLocation( )
@@ -1588,9 +1659,10 @@ awt::Point SAL_CALL SmEditAccessible::getLocation( )
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
-
- Point aPt( pWin->GetPosPixel() );
- return awt::Point( aPt.X(), aPt.Y() );
+ DBG_ASSERT(pWin->GetParent()->GetAccessible() == getAccessibleParent(),
+ "mismatch of window parent and accessible parent" );
+ awt::Rectangle aRect( lcl_GetBounds( pWin ) );
+ return awt::Point( aRect.X, aRect.Y );
}
awt::Point SAL_CALL SmEditAccessible::getLocationOnScreen( )
@@ -1599,9 +1671,9 @@ awt::Point SAL_CALL SmEditAccessible::getLocationOnScreen( )
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
-
- Point aPt( pWin->OutputToAbsoluteScreenPixel( Point() ) );
- return awt::Point( aPt.X(), aPt.Y() );
+ DBG_ASSERT(pWin->GetParent()->GetAccessible() == getAccessibleParent(),
+ "mismatch of window parent and accessible parent" );
+ return lcl_GetLocationOnScreen( pWin );
}
awt::Size SAL_CALL SmEditAccessible::getSize( )
@@ -1610,8 +1682,15 @@ awt::Size SAL_CALL SmEditAccessible::getSize( )
vos::OGuard aGuard(Application::GetSolarMutex());
if (!pWin)
throw RuntimeException();
+ DBG_ASSERT(pWin->GetParent()->GetAccessible() == getAccessibleParent(),
+ "mismatch of window parent and accessible parent" );
Size aSz( pWin->GetSizePixel() );
+#ifdef DEBUG
+ awt::Rectangle aRect( lcl_GetBounds( pWin ) );
+ Size aSz2( aRect.Width, aRect.Height );
+ DBG_ASSERT( aSz == aSz2, "mismatch in width" );
+#endif
return awt::Size( aSz.Width(), aSz.Height() );
}
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index ffa409684cc8..3af581c33844 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: accessibility.hxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: tl $ $Date: 2002-12-09 13:14:27 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -148,9 +148,10 @@ class SmGraphicAccessible :
public SmGraphicAccessibleBaseClass
{
//vos::ORefCount aRefCount; // number of references to object
- cppu::OInterfaceContainerHelper aAccEventListeners;
osl::Mutex aListenerMutex;
String aAccName;
+ /// client id in the AccessibleEventNotifier queue
+ sal_uInt32 nClientId;
SmGraphicWindow *pWin;
@@ -390,7 +391,6 @@ SmEditAccessibleBaseClass;
class SmEditAccessible :
public SmEditAccessibleBaseClass
{
- cppu::OInterfaceContainerHelper aAccEventListeners;
osl::Mutex aListenerMutex;
String aAccName;
accessibility::AccessibleTextHelper *pTextHelper;
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index c7dd3fdf36d3..94a5e3bf73e5 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -2,9 +2,9 @@
*
* $RCSfile: commands.src,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: tl $ $Date: 2002-11-06 12:36:12 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -280,7 +280,7 @@ Menu RID_COMMANDMENU
Text [ italian ] = "Operatori unari/binari" ;
Text [ spanish ] = "Operadores ~unarios/binarios" ;
Text [ french ] = "Op閞ateurs u~naires/binaires" ;
- Text [ dutch ] = "~Unaire/binaire operatoren" ;
+ Text [ dutch ] = "~Monadische/binaire operatoren" ;
Text [ portuguese ] = "Operadores ~un醨ios/bin醨ios" ;
SubMenu = Menu
{
@@ -408,20 +408,21 @@ Menu RID_COMMANDMENU
};
};
};
- Text[ chinese_simplified ] = "一元/二元运算符(~U)";
- Text[ russian ] = "禹囵睇/凌磬痦 铒屦囹铕";
+ Text[ chinese_simplified ] = "涓鍏/浜屽厓杩愮畻绗(~U)";
+ Text[ russian ] = "禹囵睇/徼磬痦 铒屦囹铕";
Text[ polish ] = "Unarne/binarne operatory";
- Text[ japanese ] = "扨崁駦墘嶼巕(~U)";
- Text[ chinese_traditional ] = "じ/じ笲衡才(~U)";
- Text[ dutch ] = "~Unaire/binaire operatoren";
- Text[ chinese_simplified ] = "一元/二元运算符(~U)";
+ Text[ japanese ] = "鍗橀爡銉讳簩闋呮紨绠楀瓙(~U)";
+ Text[ chinese_traditional ] = "涓鍏/浜屽厓閬嬬畻绗(~U)";
+ Text[ dutch ] = "~Monadische/binaire operatoren";
+ Text[ chinese_simplified ] = "涓鍏/浜屽厓杩愮畻绗(~U)";
Text[ greek ] = "彭醻溟觑/孽徜殛镞 翦脲篝蒡";
- Text[ korean ] = "窜亲/捞亲 楷魂磊(~U)";
+ Text[ korean ] = "雼暛/鞚错暛 鞐办偘鞛(~U)";
Text[ arabic ] = "阪倾 试垌 猛窍砩/虽瞧砩";
Text[ turkish ] = "Birli/ikili ie鏻er";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Operadores ~unarios/binarios";
- Text[ finnish ] = "~Unaari-/bin滗rioperaattorit";
+ Text[ catalan ] = "~Operadors Monaris/Binaris";
+ Text[ finnish ] = "~Yksi- ja kaksipaikkaiset operaattorit";
+ Text[ thai ] = "喔曕副喔о笡喔忇复喔氞副喔曕复喔佮覆喔Unary/Binary ";
};
MenuItem
{
@@ -578,20 +579,21 @@ Menu RID_COMMANDMENU
};
};
};
- Text[ chinese_simplified ] = "关系(~R)";
+ Text[ chinese_simplified ] = "鍏崇郴(~R)";
Text[ russian ] = "悟眍龛";
Text[ polish ] = "Relacje";
- Text[ japanese ] = "斾妑墘嶼(~R)";
- Text[ chinese_traditional ] = "闽玒(~R)";
+ Text[ japanese ] = "姣旇純婕旂畻(~R)";
+ Text[ chinese_traditional ] = "闂滀總(~R)";
Text[ dutch ] = "~Relaties";
- Text[ chinese_simplified ] = "关系(~R)";
+ Text[ chinese_simplified ] = "鍏崇郴(~R)";
Text[ greek ] = "~喻蒹彘";
- Text[ korean ] = "包拌(~R)";
+ Text[ korean ] = "甏瓿(~R)";
Text[ arabic ] = "卺寝鞘";
Text[ turkish ] = "輑i⺧iler";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Relaciones";
- Text[ finnish ] = "~Suhteet";
+ Text[ catalan ] = "~Relacions";
+ Text[ finnish ] = "~Relaatiot";
+ Text[ thai ] = "~喔勦抚喔侧浮喔副喔∴笧喔编笝喔樴箤";
};
MenuItem
{
@@ -754,20 +756,21 @@ Menu RID_COMMANDMENU
};
};
};
- Text[ chinese_simplified ] = "数量计算(~S)";
- Text[ russian ] = "物屦圉梃 祉铈羼蜮";
+ Text[ chinese_simplified ] = "闆嗗悎杩愮畻(~S)";
+ Text[ russian ] = "物屦圉梃 磬 祉铈羼蜮铎";
Text[ polish ] = "Operacje na zbiorach";
- Text[ japanese ] = "廤崌墘嶼(~S)";
- Text[ chinese_traditional ] = "计秖璸衡(~S)";
+ Text[ japanese ] = "闆嗗悎婕旂畻(~S)";
+ Text[ chinese_traditional ] = "闆嗗悎閬嬬畻(~S)";
Text[ dutch ] = "~Definities";
- Text[ chinese_simplified ] = "数量计算(~S)";
+ Text[ chinese_simplified ] = "闆嗗悎杩愮畻(~S)";
Text[ greek ] = "~旭茴彘 篚睃膣";
- Text[ korean ] = "笼钦 楷魂(~S)";
+ Text[ korean ] = "歆戫暕 鞐办偘(~S)";
Text[ arabic ] = "闾沔谏 阢犴鞘";
Text[ turkish ] = "K黰e iemleri";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Operaciones de conjuntos";
- Text[ finnish ] = "~M滗rit toiminnot";
+ Text[ catalan ] = "~Operacions de conjunts";
+ Text[ finnish ] = "~Joukko-operaattorit";
+ Text[ thai ] = "~喔曕副喙夃竾喔佮覆喔`笡喔忇复喔氞副喔曕复喔佮覆喔";
};
MenuItem
{
@@ -967,37 +970,39 @@ Menu RID_COMMANDMENU
};
};
};
- TEXT[ chinese_simplified ] = "其他";
- TEXT[ russian ] = "漯筱桢";
+ TEXT[ chinese_simplified ] = "鍏朵粬";
+ TEXT[ russian ] = "酿筱桢";
TEXT[ polish ] = "inne";
- TEXT[ japanese ] = "偦偺懠";
- TEXT[ chinese_traditional ] = "ㄤ";
+ TEXT[ japanese ] = "銇濄伄浠";
+ TEXT[ chinese_traditional ] = "鍏朵粬";
TEXT[ language_user1 ] = " ";
TEXT[ dutch ] = "andere";
- TEXT[ chinese_simplified ] = "其他";
+ TEXT[ chinese_simplified ] = "鍏朵粬";
TEXT[ greek ] = "茈脶";
- TEXT[ korean ] = "扁鸥";
+ TEXT[ korean ] = "旮绊儉";
TEXT[ arabic ] = "垌 嗅";
TEXT[ turkish ] = "Di餰r";
- TEXT[ catalan ] = "otros";
+ TEXT[ catalan ] = "altres";
TEXT[ finnish ] = "Lis滗";
+ TEXT[ thai ] = "喔∴覆喔佮竵喔о箞喔";
};
};
};
- Text[ chinese_simplified ] = "函数(~F)";
+ Text[ chinese_simplified ] = "鍑芥暟(~F)";
Text[ russian ] = "泽黻鲨";
Text[ polish ] = "Funkcje";
- Text[ japanese ] = "娭悢(~F)";
- Text[ chinese_traditional ] = "ㄧ计(~F)";
+ Text[ japanese ] = "闁㈡暟(~F)";
+ Text[ chinese_traditional ] = "鍑芥暩(~F)";
Text[ dutch ] = "~Functies";
- Text[ chinese_simplified ] = "函数(~F)";
+ Text[ chinese_simplified ] = "鍑芥暟(~F)";
Text[ greek ] = "~吁磲耵摅彘";
- Text[ korean ] = "窃荐(~F)";
+ Text[ korean ] = "頃垬(~F)";
Text[ arabic ] = "锨崆";
Text[ turkish ] = "Fonksiyon";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Funciones";
- Text[ finnish ] = "~Toiminnot";
+ Text[ catalan ] = "~Funcions";
+ Text[ finnish ] = "~Funktiot";
+ Text[ thai ] = "~喔熰副喔囙竵喙屶笂喔编箞喔";
};
MenuItem
{
@@ -1102,20 +1107,21 @@ Menu RID_COMMANDMENU
};
};
};
- Text[ chinese_simplified ] = "运算符(~P)";
+ Text[ chinese_simplified ] = "杩愮畻绗(~P)";
Text[ russian ] = "物屦囹铕";
Text[ polish ] = "Operatory";
- Text[ japanese ] = "墘嶼巕(~P)";
- Text[ chinese_traditional ] = "笲衡才(~P)";
+ Text[ japanese ] = "婕旂畻瀛(~P)";
+ Text[ chinese_traditional ] = "閬嬬畻绗(~P)";
Text[ dutch ] = "O~peratoren";
- Text[ chinese_simplified ] = "运算符(~P)";
+ Text[ chinese_simplified ] = "杩愮畻绗(~P)";
Text[ greek ] = "~藻脲篝蒡";
- Text[ korean ] = "楷魂(~P)";
+ Text[ korean ] = "鞐办偘鞛(~P)";
Text[ arabic ] = "阪倾 轻试垌";
Text[ turkish ] = "蔺le鏻er";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Operadores";
+ Text[ catalan ] = "O~peradors";
Text[ finnish ] = "~Operaattorit";
+ Text[ thai ] = "喔曕副~喔о笡喔忇复喔氞副喔曕复喔佮覆喔";
};
MenuItem
{
@@ -1129,7 +1135,7 @@ Menu RID_COMMANDMENU
Text [ swedish ] = "~Attribut" ;
Text [ danish ] = "Attributter" ;
Text [ italian ] = "Attributi" ;
- Text [ spanish ] = "~Atributos" ;
+ Text [ spanish ] = "Atributos" ;
Text [ french ] = "~Attributs" ;
Text [ dutch ] = "~Attributen" ;
SubMenu = Menu
@@ -1284,20 +1290,21 @@ Menu RID_COMMANDMENU
};
};
};
- Text[ chinese_simplified ] = "属性(~A)";
+ Text[ chinese_simplified ] = "灞炴(~A)";
Text[ russian ] = "莉痂狍螓";
Text[ polish ] = "Atrybuty";
- Text[ japanese ] = "懏惈(~A)";
- Text[ chinese_traditional ] = "妮┦(~A)";
+ Text[ japanese ] = "灞炴(~A)";
+ Text[ chinese_traditional ] = "灞(~A)";
Text[ dutch ] = "~Attributen";
- Text[ chinese_simplified ] = "属性(~A)";
+ Text[ chinese_simplified ] = "灞炴(~A)";
Text[ greek ] = "~射辄翮翦";
- Text[ korean ] = "加己(~A)";
+ Text[ korean ] = "靻嶌劚(~A)";
Text[ arabic ] = "鱼鞘";
Text[ turkish ] = "謟nitelikler";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Atributos";
+ Text[ catalan ] = "~Atributs";
Text[ finnish ] = "~M滗ritteet";
+ Text[ thai ] = "~喔勦父喔撪弗喔编竵喔┼笓喔";
};
MenuItem
{
@@ -1470,20 +1477,21 @@ Menu RID_COMMANDMENU
};
};
};
- Text[ chinese_simplified ] = "括号(~B)";
+ Text[ chinese_simplified ] = "鎷彿(~B)";
Text[ russian ] = "殃钺觇";
Text[ polish ] = "Nawiasy";
- Text[ japanese ] = "偐偭偙(~B)";
- Text[ chinese_traditional ] = "珹腹(~B)";
+ Text[ japanese ] = "銇嬨仯銇(~B)";
+ Text[ chinese_traditional ] = "鎷櫉(~B)";
Text[ dutch ] = "~Haakjes";
- Text[ chinese_simplified ] = "括号(~B)";
+ Text[ chinese_simplified ] = "鎷彿(~B)";
Text[ greek ] = "~嗅皴龛蒹彘";
- Text[ korean ] = "褒龋(~B)";
+ Text[ korean ] = "甏勴樃(~B)";
Text[ arabic ] = "棉媲";
Text[ turkish ] = "Ayra鏻ar";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Par閚tesis";
+ Text[ catalan ] = "~Par鑞tesi";
Text[ finnish ] = "~Sulkeet";
+ Text[ thai ] = "~喔о竾喙喔ム箛喔氞竵喙夃覆喔∴笡喔";
};
MenuItem
{
@@ -1557,22 +1565,23 @@ Menu RID_COMMANDMENU
Text[ french ] = "nouvelle ligne";
Text[ swedish ] = "ny rad";
Text[ dutch ] = "nieuwe regel";
- Text[ spanish ] = "nueva l韓ea";
+ Text[ spanish ] = "l韓ea nueva";
Text[ english_us ] = "New Line";
- Text[ chinese_simplified ] = "换行";
- Text[ russian ] = "眍忄 耱痤赅";
+ Text[ chinese_simplified ] = "鎹㈣";
+ Text[ russian ] = "杨玟囹 眍怏 耱痤牦";
Text[ polish ] = "nowy wiersz";
- Text[ japanese ] = "怴偟偄峴";
- Text[ chinese_traditional ] = "传︽";
+ Text[ japanese ] = "newline";
+ Text[ chinese_traditional ] = "鎻涜";
Text[ dutch ] = "nieuwe regel";
- Text[ chinese_simplified ] = "换行";
+ Text[ chinese_simplified ] = "鎹㈣";
Text[ greek ] = "洼 泷犰燹";
- Text[ korean ] = "货 青";
+ Text[ korean ] = "靸 頄";
Text[ arabic ] = "呜 滔硐";
Text[ turkish ] = "Yeni sat齬";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "nueva l韓ea";
- Text[ finnish ] = "Uusi viiva";
+ Text[ catalan ] = "l韓ia nova";
+ Text[ finnish ] = "Rivinvaihto";
+ Text[ thai ] = "喔氞福喔`笚喔编笖喙冟斧喔∴箞";
};
MenuItem
{
@@ -1589,20 +1598,21 @@ Menu RID_COMMANDMENU
Text[ dutch ] = "kleine spatie";
Text[ spanish ] = "espacio peque駉";
Text[ english_us ] = "Small Gap";
- Text[ chinese_simplified ] = "小间隔";
- Text[ russian ] = "觐痤蜿栝 镳钺咫";
+ Text[ chinese_simplified ] = "灏忛棿闅";
+ Text[ russian ] = "暑痤蜿栝 镳钺咫";
Text[ polish ] = "Ma硑 odst阷";
- Text[ japanese ] = "彫酵甙";
- Text[ chinese_traditional ] = "丁筳";
+ Text[ japanese ] = "銈广儦銉笺偣灏";
+ Text[ chinese_traditional ] = "灏忛枔闅";
Text[ dutch ] = "kleine spatie";
- Text[ chinese_simplified ] = "小间隔";
+ Text[ chinese_simplified ] = "灏忛棿闅";
Text[ greek ] = "扉犟 溟荜屙";
- Text[ korean ] = "累篮 埃拜";
+ Text[ korean ] = "鞛戩潃 臧勱博";
Text[ arabic ] = "嗜勤 折硌";
Text[ turkish ] = "K黭 aral齥";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "espacio peque駉";
- Text[ finnish ] = "Pieni v鋖i";
+ Text[ catalan ] = "espai petit";
+ Text[ finnish ] = "Kapea v鋖i";
+ Text[ thai ] = "喔娻箞喔竾喔о箞喔侧竾喙喔ム箛喔";
};
MenuItem
{
@@ -1619,20 +1629,21 @@ Menu RID_COMMANDMENU
Text[ dutch ] = "spatie";
Text[ spanish ] = "espacio";
Text[ english_us ] = "Gap";
- Text[ chinese_simplified ] = "间隔";
+ Text[ chinese_simplified ] = "闂撮殧";
Text[ russian ] = "橡钺咫";
Text[ polish ] = "Odst阷 ramek";
- Text[ japanese ] = "酵甙";
- Text[ chinese_traditional ] = "丁筳";
+ Text[ japanese ] = "銈广儦銉笺偣";
+ Text[ chinese_traditional ] = "闁撻殧";
Text[ dutch ] = "spatie";
- Text[ chinese_simplified ] = "间隔";
+ Text[ chinese_simplified ] = "闂撮殧";
Text[ greek ] = "拈荜屙";
- Text[ korean ] = "埃拜";
+ Text[ korean ] = "臧勱博";
Text[ arabic ] = "嗜勤";
Text[ turkish ] = "Aral齥";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "espacio";
+ Text[ catalan ] = "Espai";
Text[ finnish ] = "V鋖i";
+ Text[ thai ] = "喔娻箞喔竾喔о箞喔侧竾";
};
MenuItem
{
@@ -1676,20 +1687,21 @@ Menu RID_COMMANDMENU
};
};
};
- Text[ chinese_simplified ] = "格式化(~M)";
+ Text[ chinese_simplified ] = "鏍煎紡鍖(~M)";
Text[ russian ] = "灶痨囹";
Text[ polish ] = "Formatowania";
- Text[ japanese ] = "彂幃愝掕(~M)";
- Text[ chinese_traditional ] = "Αて(~M)";
+ Text[ japanese ] = "鏇稿紡瑷畾(~M)";
+ Text[ chinese_traditional ] = "鏍煎紡鍖(~M)";
Text[ dutch ] = "~Opmaak";
- Text[ chinese_simplified ] = "格式化(~M)";
+ Text[ chinese_simplified ] = "鏍煎紡鍖(~M)";
Text[ greek ] = "田駘鲲痫檗箦轵";
- Text[ korean ] = "器杆泼(~M)";
+ Text[ korean ] = "靹滌嫕(~M)";
Text[ arabic ] = "输禹";
Text[ turkish ] = "Format";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Formatos";
- Text[ finnish ] = "~Muodot";
+ Text[ catalan ] = "For~mats";
+ Text[ finnish ] = "~Muotoilu";
+ Text[ thai ] = "喔`腹喔涏箒~喔氞笟";
};
MenuItem
{
@@ -1704,7 +1716,7 @@ Menu RID_COMMANDMENU
Text [ italian ] = "Altro" ;
Text [ spanish ] = "~Otros" ;
Text [ french ] = "~Autres" ;
- Text [ dutch ] = "D~iversen" ;
+ Text [ dutch ] = "Over~ige" ;
Text [ portuguese ] = "~Outros" ;
SubMenu = Menu
{
@@ -1834,20 +1846,21 @@ Menu RID_COMMANDMENU
};
};
};
- Text[ chinese_simplified ] = "其他(~O)";
+ Text[ chinese_simplified ] = "鍏朵粬(~O)";
Text[ russian ] = "橡铟邋";
Text[ polish ] = "Inne";
- Text[ japanese ] = "偦偺懠(~O)";
- Text[ chinese_traditional ] = "ㄤ(~O)";
- Text[ dutch ] = "D~iversen";
- Text[ chinese_simplified ] = "其他(~O)";
+ Text[ japanese ] = "銇濄伄浠(~O)";
+ Text[ chinese_traditional ] = "鍏朵粬(~O)";
+ Text[ dutch ] = "Over~ige";
+ Text[ chinese_simplified ] = "鍏朵粬(~O)";
Text[ greek ] = "~拈荟锺";
- Text[ korean ] = "扁鸥(~O)";
+ Text[ korean ] = "旮绊儉(~O)";
Text[ arabic ] = "闱 谙 嗅";
Text[ turkish ] = "Di餰r";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Otros";
+ Text[ catalan ] = "~Altres";
Text[ finnish ] = "~Muut";
+ Text[ thai ] = "~喔阜喙堗笝 喙";
};
};
};
@@ -1872,3 +1885,15 @@ Menu RID_COMMANDMENU
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index f53e73e2633d..d81fea2f58a3 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: edit.cxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
- * last change: $Author: tl $ $Date: 2002-12-12 15:39:52 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -257,13 +257,13 @@ SfxItemPool * SmEditWindow::GetEditEngineItemPool()
return pDoc ? &pDoc->GetEditEngineItemPool() : 0;
}
-void SmEditWindow::ApplyColorConfigValues( const svx::ColorConfig &rColorCfg )
+void SmEditWindow::ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg )
{
// Note: SetBackground still done in SmEditWindow::DataChanged
#ifdef DEBUG
- ColorData nVal = rColorCfg.GetColorValue(svx::FONTCOLOR).nColor;
+ ColorData nVal = rColorCfg.GetColorValue(svtools::FONTCOLOR).nColor;
#endif
- SetTextColor( rColorCfg.GetColorValue(svx::FONTCOLOR).nColor );
+ SetTextColor( rColorCfg.GetColorValue(svtools::FONTCOLOR).nColor );
Invalidate();
}
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
index 5f50450d9807..38a2ab354dd9 100644
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.16 $
+# $Revision: 1.17 $
#
-# last change: $Author: tl $ $Date: 2002-11-06 12:37:08 $
+# last change: $Author: hr $ $Date: 2003-03-27 11:58:18 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -141,12 +141,12 @@ $(SLO)$/smlib.obj : $(INCCOM)$/dllname.hxx
$(INCCOM)$/dllname.hxx: makefile.mk
.IF "$(GUI)"=="UNX"
$(RM) $@
- echo #define DLL_NAME \"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ +echo \#define DLL_NAME \"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ELSE
.IF "$(USE_SHELL)"!="4nt"
- echo \#define DLL_NAME \"sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ +echo \#define DLL_NAME \"sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ELSE # "$(USE_SHELL)"!="4nt"
- echo #define DLL_NAME "sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
+ +echo #define DLL_NAME "sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
.ENDIF # "$(USE_SHELL)"!="4nt"
.ENDIF
diff --git a/starmath/source/mathml.cxx b/starmath/source/mathml.cxx
index a5d502cc2b13..61f2c26a1acf 100644
--- a/starmath/source/mathml.cxx
+++ b/starmath/source/mathml.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: mathml.cxx,v $
*
- * $Revision: 1.61 $
+ * $Revision: 1.62 $
*
- * last change: $Author: cmc $ $Date: 2002-11-25 10:36:14 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -73,8 +73,8 @@ one go*/
#ifndef _TOOLS_DEBUG_H
#include <tools/debug.hxx>
#endif
-#ifndef _TOOLS_SOLMATH_H
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_HXX
+#include <rtl/math.hxx>
#endif
#ifndef _SFXECODE_HXX
#include <svtools/sfxecode.hxx>
@@ -144,6 +144,9 @@ one go*/
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XActiveDataControl.hpp>
+#ifndef _COM_SUN_STAR_PACKAGES_ZIP_ZIPIOEXCEPTION_HPP_
+#include <com/sun/star/packages/zip/ZipIOException.hpp>
+#endif
#ifndef _COM_SUN_STAR_TASK_XSTATUSINDICATORFACTORY_HPP_
#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
#endif
@@ -251,6 +254,10 @@ ULONG SmXMLWrapper::ReadThroughComponent(
if( bEncrypted )
nError = ERRCODE_SFX_WRONGPASSWORD;
}
+ catch( packages::zip::ZipIOException& )
+ {
+ nError = ERRCODE_IO_BROKENPACKAGE;
+ }
catch( io::IOException& )
{
}
@@ -364,23 +371,33 @@ ULONG SmXMLWrapper::Import(SfxMedium &rMedium)
if (xStatusIndicator.is())
xStatusIndicator->setValue(nSteps++);
- ReadThroughComponent(
+ ULONG nWarn = ReadThroughComponent(
rMedium.GetStorage(), xModelComp, "meta.xml", "Meta.xml",
xServiceFactory, "com.sun.star.comp.Math.XMLMetaImporter" );
- if (xStatusIndicator.is())
- xStatusIndicator->setValue(nSteps++);
+ if ( nWarn != ERRCODE_IO_BROKENPACKAGE )
+ {
+ if (xStatusIndicator.is())
+ xStatusIndicator->setValue(nSteps++);
- ReadThroughComponent(
- rMedium.GetStorage(), xModelComp, "settings.xml", 0,
- xServiceFactory, "com.sun.star.comp.Math.XMLSettingsImporter" );
+ nWarn = ReadThroughComponent(
+ rMedium.GetStorage(), xModelComp, "settings.xml", 0,
+ xServiceFactory, "com.sun.star.comp.Math.XMLSettingsImporter" );
- if (xStatusIndicator.is())
- xStatusIndicator->setValue(nSteps++);
+ if ( nWarn != ERRCODE_IO_BROKENPACKAGE )
+ {
+ if (xStatusIndicator.is())
+ xStatusIndicator->setValue(nSteps++);
- nError = ReadThroughComponent(
- rMedium.GetStorage(), xModelComp, "content.xml", "Content.xml",
- xServiceFactory, "com.sun.star.comp.Math.XMLImporter" );
+ nError = ReadThroughComponent(
+ rMedium.GetStorage(), xModelComp, "content.xml", "Content.xml",
+ xServiceFactory, "com.sun.star.comp.Math.XMLImporter" );
+ }
+ else
+ nError = ERRCODE_IO_BROKENPACKAGE;
+ }
+ else
+ nError = ERRCODE_IO_BROKENPACKAGE;
}
else
{
@@ -979,7 +996,7 @@ sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
/*Add xmlns line*/
SvXMLAttributeList &rList = GetAttrList();
rList.AddAttribute(GetNamespaceMap().GetAttrNameByKey(
- XML_NAMESPACE_MATH_IDX),sCDATA,GetNamespaceMap().GetNameByKey(
+ XML_NAMESPACE_MATH_IDX),GetNamespaceMap().GetNameByKey(
XML_NAMESPACE_MATH_IDX));
//I think we need something like ImplExportEntities();
@@ -3997,7 +4014,7 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel)
double mytest = static_cast<double>(aTemp);
- mytest = SolarMath::Round(mytest,1);
+ mytest = ::rtl::math::round(mytest,1);
SvXMLUnitConverter::convertDouble(sStrBuf,mytest);
sStrBuf.append(OUString(
RTL_CONSTASCII_USTRINGPARAM(sXML_unit_pt)));
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 517ceb61d7e1..dc07013e49e3 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: node.cxx,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: tl $ $Date: 2002-12-12 15:40:33 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,8 +68,8 @@
#ifndef _FRACT_HXX //autogen
#include <tools/fract.hxx>
#endif
-#ifndef _TOOLS_SOLMATH_H
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_HXX
+#include <rtl/math.hxx>
#endif
#ifndef _SV_COLOR_HXX //autogen
#include <vcl/color.hxx>
@@ -176,7 +176,7 @@ Color SmTmpDevice::Impl_GetColor( const Color& rColor )
if (OUTDEV_WINDOW == rOutDev.GetOutDevType())
aBgCol = ((Window &) rOutDev).GetDisplayBackground().GetColor();
- nNewCol = SM_MOD1()->GetColorConfig().GetColorValue(svx::FONTCOLOR).nColor;
+ nNewCol = SM_MOD1()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor;
Color aTmpColor( nNewCol );
if (aBgCol.IsDark() && aTmpColor.IsDark())
@@ -319,7 +319,7 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType)
{
Fraction aVal (SmPtsTo100th_mm(rSize.GetNumerator()),
rSize.GetDenominator());
- //long nHeight = SolarMath::Round(aVal);
+ //long nHeight = ::rtl::math::round(aVal);
long nHeight = (long)aVal;
aSize = GetFont().GetSize();
@@ -2056,10 +2056,10 @@ void SmFontNode::CreateTextFromNode(String &rText)
default:
break;
}
- String sResult;
- SolarMath::DoubleToString(sResult,
- static_cast<double>(aFontSize),'A',INT_MAX,'.',sal_True);
- rText.Append(sResult);
+ rText += String( ::rtl::math::doubleToUString(
+ static_cast<double>(aFontSize),
+ rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', sal_True));
rText.Append(' ');
}
break;
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 5d786e64323e..1407b889aac2 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: smmod.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: tl $ $Date: 2002-12-12 15:40:05 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -332,7 +332,7 @@ void SmModule::_CreateVirtualDev() const
pThis->pVirtualDev = new VirtualDevice;
}
-void SmModule::ApplyColorConfigValues( const svx::ColorConfig &rColorCfg )
+void SmModule::ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg )
{
//invalidate all graphic and edit windows
const TypeId aSmViewTypeId = TYPE(SmViewShell);
@@ -351,11 +351,11 @@ void SmModule::ApplyColorConfigValues( const svx::ColorConfig &rColorCfg )
}
}
-svx::ColorConfig & SmModule::GetColorConfig()
+svtools::ColorConfig & SmModule::GetColorConfig()
{
if(!pColorConfig)
{
- pColorConfig = new svx::ColorConfig;
+ pColorConfig = new svtools::ColorConfig;
ApplyColorConfigValues( *pColorConfig );
StartListening( *pColorConfig );
}
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index a1a9b6846072..85fc11718cab 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -2,9 +2,9 @@
*
* $RCSfile: smres.src,v $
*
- * $Revision: 1.88 $
+ * $Revision: 1.89 $
*
- * last change: $Author: tl $ $Date: 2002-12-10 11:23:02 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -116,7 +116,7 @@ ModalDialog RID_FONTDIALOG
Text[ polish ] = "Czcionka";
Text[ portuguese_brazilian ] = "~Fonte:";
Text[ japanese ] = "銉曘偐銉炽儓(~F)";
- Text[ korean ] = "旮昙(~F):";
+ Text[ korean ] = "旮昙(~F)";
Text[ chinese_simplified ] = "瀛椾綋(~F)";
Text[ chinese_traditional ] = "瀛楀瀷(~F)";
Text[ turkish ] = "Yaz齮ipi:";
@@ -301,7 +301,7 @@ ModalDialog RID_FONTSIZEDIALOG
Text[ polish ] = "Domy渓nie";
Text[ portuguese_brazilian ] = "~Tamanho de base:";
Text[ japanese ] = "鍩烘湰銈点偆銈(~S)";
- Text[ korean ] = "旮半掣 韥赴(~S)";
+ Text[ korean ] = "旮办 韥赴(~S)";
Text[ chinese_simplified ] = "鍩烘湰澶у皬(~S)";
Text[ chinese_traditional ] = "鍩烘湰澶у皬(~S)";
Text[ turkish ] = "Temel boyut:";
@@ -386,7 +386,7 @@ ModalDialog RID_FONTSIZEDIALOG
Text[ polish ] = "Indeksy";
Text[ portuguese_brazilian ] = "~?ndices";
Text[ japanese ] = "鎸囨暟銇ㄦ坊銇堝瓧(~I)";
- Text[ korean ] = "靸夓澑(~I):";
+ Text[ korean ] = "靸夓澑(~I)";
Text[ chinese_simplified ] = "鏍囧織(~I)";
Text[ chinese_traditional ] = "妯欒獙(~I)";
Text[ turkish ] = "輓disler:";
@@ -472,7 +472,7 @@ ModalDialog RID_FONTSIZEDIALOG
Text[ polish ] = "Operatory";
Text[ portuguese_brazilian ] = "~Operadores:";
Text[ japanese ] = "婕旂畻瀛(~O)";
- Text[ korean ] = "鞐办偘鞛(~O):";
+ Text[ korean ] = "鞐办偘鞛(~O)";
Text[ chinese_simplified ] = "杩愮畻绗(~O)";
Text[ chinese_traditional ] = "閬嬬畻绗(~O)";
Text[ turkish ] = "蔺le鏻er:";
@@ -562,7 +562,7 @@ ModalDialog RID_FONTSIZEDIALOG
Text[ chinese_traditional ] = "鐩稿皪澶у皬";
Text[ arabic ] = "猛糖 溆软";
Text[ greek ] = "喻弭殛 戾爿桤";
- Text[ korean ] = "靸侂寑鞝 韥赴";
+ Text[ korean ] = "牍勲頃橂姅 韥赴";
Text[ turkish ] = "G鰎eceli boyutlar";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Mides relatives";
@@ -598,13 +598,13 @@ ModalDialog RID_FONTSIZEDIALOG
Text [ portuguese_brazilian ] = "~Standard" ;
Text [ portuguese ] = "~Padr鉶" ;
Text[ chinese_simplified ] = "鏍囧噯(~D)";
- Text[ russian ] = "羊囗溧痱";
+ Text[ russian ] = "杨躔囗栩";
Text[ polish ] = "Domy渓nie";
Text[ japanese ] = "妯欐簴(~D)";
Text[ chinese_traditional ] = "妯欐簴(~D)";
Text[ arabic ] = "禽恃侵";
Text[ greek ] = "旭镥痖腼戕";
- Text[ korean ] = "旮半掣 臧(~D)";
+ Text[ korean ] = "旮半掣臧(~D)";
Text[ turkish ] = "Standart";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Per ~defecte";
@@ -612,7 +612,7 @@ ModalDialog RID_FONTSIZEDIALOG
Text[ thai ] = "~喔勦箞喔侧箑喔`复喙堗浮喔曕箟喔";
};
Text[ chinese_simplified ] = "瀛椾綋";
- Text[ russian ] = "朽珈屦 梏蜞";
+ Text[ russian ] = "朽珈屦 梏蜞";
Text[ polish ] = "Rozmiar czcionek";
Text[ japanese ] = "銉曘偐銉炽儓銈点偆銈";
Text[ chinese_traditional ] = "瀛楀瀷澶у皬";
@@ -705,7 +705,7 @@ ModalDialog RID_FONTTYPEDIALOG
Text [ spanish ] = "Fuentes del usuario" ;
Text [ english_us ] = "Custom fonts" ;
Text[ greek ] = "民犰灬麸箦轳蒡 黢摅翮";
- Text[ korean ] = "靷毄鞛 旮昙";
+ Text[ korean ] = "靷毄鞛 鞝曥潣 旮昙";
Text[ turkish ] = "Kullan齝 yaz齮ipleri";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Tipus de lletra d'usuari";
@@ -724,7 +724,7 @@ ModalDialog RID_FONTTYPEDIALOG
Text[ greek ] = "体翎怆玺蒡:";
Text[ dutch ] = "~Variabelen";
Text[ french ] = "Variables";
- Text[ spanish ] = "~Predeterminaciones";
+ Text[ spanish ] = "~Variables";
Text[ finnish ] = "M~uuttujat";
Text[ italian ] = "~Variabili";
Text[ danish ] = "~Variabler";
@@ -1024,7 +1024,7 @@ ModalDialog RID_FONTTYPEDIALOG
Text [ ENGLISH ] = "~Standard" ;
Text[ chinese_simplified ] = "鏍囧噯(~D)";
Text[ chinese_traditional ] = "妯欐簴(~D)";
- Text[ russian ] = "羊囗溧痱";
+ Text[ russian ] = "杨躔囗栩";
Text[ polish ] = "Domy渓nie";
Text[ japanese ] = "妯欐簴(~D)";
Text[ arabic ] = "禽恃侵";
@@ -1038,7 +1038,7 @@ ModalDialog RID_FONTTYPEDIALOG
Text [ portuguese_brazilian ] = "~Standard" ;
Text [ portuguese ] = "~Padr鉶" ;
Text[ greek ] = "旭镥痖腼戕";
- Text[ korean ] = "旮半掣 臧(~D)";
+ Text[ korean ] = "旮半掣臧(~D)";
Text[ turkish ] = "Standart";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Per ~defecte";
@@ -1046,7 +1046,7 @@ ModalDialog RID_FONTTYPEDIALOG
Text[ thai ] = "~喔勦箞喔侧箑喔`复喙堗浮喔曕箟喔";
};
Text[ greek ] = "札痫 泷犰灬麸箦轳茯";
- Text[ korean ] = "旮昙 鞙犿槙";
+ Text[ korean ] = "旮昙";
Text[ turkish ] = "Yaz齮ipleri";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Tipus de lletra";
@@ -1165,7 +1165,7 @@ ModalDialog RID_DISTANCEDIALOG
Text [ ENGLISH ] = "Scale all Brackets" ;
Text[ english_us ] = "Scale all brackets";
Text[ portuguese ] = "Redimensionar par阯teses todos";
- Text[ russian ] = "锑聒蜞徼痤忄螯 怦 耜钺觇";
+ Text[ russian ] = "~锑聒蜞徼痤忄螯 怦 耜钺觇";
Text[ dutch ] = "Alle haken op schaal brengen";
Text[ french ] = "Ajuster toutes les parenth鑣es";
Text[ spanish ] = "Dimensionar todos los par閚tesis";
@@ -1278,13 +1278,13 @@ ModalDialog RID_DISTANCEDIALOG
Text [ portuguese_brazilian ] = "~Standard" ;
Text [ portuguese ] = "~Padr鉶" ;
Text[ chinese_simplified ] = "鏍囧噯(~D)";
- Text[ russian ] = "羊囗溧痱";
+ Text[ russian ] = "项 箪铍鬣龛";
Text[ polish ] = "Domy渓nie";
Text[ japanese ] = "妯欐簴(~D)";
Text[ chinese_traditional ] = "妯欐簴(~D)";
Text[ arabic ] = "禽恃侵";
Text[ greek ] = "旭镥痖腼戕";
- Text[ korean ] = "旮半掣 臧(~D)";
+ Text[ korean ] = "旮半掣臧(~D)";
Text[ turkish ] = "Standart";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Per ~defecte";
@@ -1476,7 +1476,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ polish ] = "od pierwiastka";
Text[ portuguese_brazilian ] = "~Espa?amento de raiz:";
Text[ japanese ] = "銉兗銉堥枔闅(~R)";
- Text[ korean ] = "鞛愱皠(~R):";
+ Text[ korean ] = "耄姼 臧勱博(~R)";
Text[ chinese_simplified ] = "鏍瑰紡闂撮殧(~R)";
Text[ chinese_traditional ] = "鏍瑰紡闁撻殧(~R)";
Text[ turkish ] = "K鰇 aral:";
@@ -1539,7 +1539,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ polish ] = "Indeks g髍ny";
Text[ portuguese_brazilian ] = "~Sobrescrito:";
Text[ japanese ] = "鎸囨暟(~S)";
- Text[ korean ] = "鞙勳波鞛(~S):";
+ Text[ korean ] = "鞙勳波鞛(~S)";
Text[ chinese_simplified ] = "涓婃爣(~S)";
Text[ chinese_traditional ] = "涓婃(~S)";
Text[ turkish ] = "躶t simge:";
@@ -1632,7 +1632,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ greek ] = "榴殍扃艮:";
Text[ dutch ] = "~Noemerhoogte";
Text[ french ] = "Num閞ateur";
- Text[ spanish ] = "Altura del ~numerador";
+ Text[ spanish ] = "~Numerador";
Text[ finnish ] = "~Osoittaja";
Text[ italian ] = "Dist. ~numeratore";
Text[ danish ] = "~T鎙lerh鴍de";
@@ -1674,7 +1674,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ polish ] = "Mianownik";
Text[ portuguese_brazilian ] = "~Denominador baixo:";
Text[ japanese ] = "鍒嗘瘝(~D)";
- Text[ korean ] = "攵勲(~D):";
+ Text[ korean ] = "攵勲(~D)";
Text[ chinese_simplified ] = "鍒嗘瘝(~D)";
Text[ chinese_traditional ] = "鍒嗘瘝(~D)";
Text[ turkish ] = "B鰈en aral:";
@@ -1715,7 +1715,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ chinese_traditional ] = "鍒嗘暩绶";
Text[ arabic ] = "匝厣 轻哂";
Text[ greek ] = "民犰燧 觌荏灬麸";
- Text[ korean ] = "攵勳垬 欷";
+ Text[ korean ] = "攵勳垬 響滌嫓欷";
Text[ turkish ] = "Kesir 鏸zgisi";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Barra de fraccions";
@@ -1775,7 +1775,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ polish ] = "Grubo滄 linii";
Text[ portuguese_brazilian ] = "~Largura da linha:";
Text[ japanese ] = "绶氥伄澶仌(~W)";
- Text[ korean ] = "欷勳潣 霊愱粯(~W):";
+ Text[ korean ] = "靹 甑店赴(~W)";
Text[ chinese_simplified ] = "鍒掔嚎绮(~W)";
Text[ chinese_traditional ] = "绶氱矖(~W)";
Text[ turkish ] = "莍zgi kal齨l:";
@@ -1932,7 +1932,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ greek ] = "震~羼廛腚镯 燧沐栾 (狁轶翦褴/溴铋):";
Text[ dutch ] = "~links/rechts extra groot:";
Text[ french ] = "D閜assement lat閞al";
- Text[ spanish ] = "~Sobredimensi髇 izq./der.";
+ Text[ spanish ] = "~Tama駉 lateral excesivo ";
Text[ finnish ] = "~Lis鋕oko (vaakasuunnassa)";
Text[ italian ] = "Sovradim. (sin./des.)";
Text[ danish ] = "~venstre/h鴍re overst鴕relse";
@@ -1962,7 +1962,7 @@ ModalDialog RID_DISTANCEDIALOG
Text [ ENGLISH ] = "~Distance:" ;
Text[ english_us ] = "~Spacing";
Text[ portuguese ] = "~Espa鏰mento";
- Text[ russian ] = "软蝈疴嚯";
+ Text[ russian ] = "~软蝈疴嚯";
Text[ greek ] = "~琉翎箸:";
Text[ dutch ] = "~Afstand";
Text[ french ] = "蒫art";
@@ -1996,11 +1996,11 @@ ModalDialog RID_DISTANCEDIALOG
Text [ ENGLISH ] = "~Excess size" ;
Text[ english_us ] = "~Excess size";
Text[ portuguese ] = "~Tamanho excessivo";
- Text[ russian ] = "~蔓耱箫";
+ Text[ russian ] = "聗蝮";
Text[ greek ] = "震~羼廛腚镯 燧沐栾:";
Text[ dutch ] = "~Extra groot";
Text[ french ] = "D閜assement";
- Text[ spanish ] = "~Sobredimensi髇";
+ Text[ spanish ] = "~Tama駉 excesivo";
Text[ finnish ] = "~Viivan lis鋚ituus";
Text[ italian ] = "Sovradimensionato";
Text[ danish ] = "~Overst鴕relse";
@@ -2265,7 +2265,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ greek ] = "震~羼廛腚镯 燧沐栾:";
Text[ dutch ] = "~Extra groot";
Text[ french ] = "D閜assement";
- Text[ spanish ] = "~Sobredimensi髇";
+ Text[ spanish ] = "~Tama駉 excesivo";
Text[ finnish ] = "~Lis鋕oko";
Text[ italian ] = "~Sovradimensionato";
Text[ danish ] = "~Overst鴕relse";
@@ -2337,7 +2337,7 @@ ModalDialog RID_DISTANCEDIALOG
TEXT[ french ] = "Marges";
TEXT[ swedish ] = "Marginaler";
TEXT[ dutch ] = "Marges";
- TEXT[ spanish ] = "M醨genes";
+ TEXT[ spanish ] = "Bordes";
TEXT[ english_us ] = "Borders";
TEXT[ chinese_simplified ] = "杈硅窛";
TEXT[ russian ] = "项";
@@ -2346,7 +2346,7 @@ ModalDialog RID_DISTANCEDIALOG
TEXT[ chinese_traditional ] = "閭婅窛";
TEXT[ arabic ] = "轻彐倾";
TEXT[ greek ] = "绣耖泷莒灬翎";
- TEXT[ korean ] = "韰岆憪毽";
+ TEXT[ korean ] = "鞐氨";
TEXT[ turkish ] = "Kenarlar";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Vores";
@@ -2677,13 +2677,13 @@ ModalDialog RID_ALIGNDIALOG
Text [ portuguese ] = "~Padr鉶" ;
Text [ portuguese_brazilian ] = "~Standard" ;
Text[ chinese_simplified ] = "鏍囧噯(~D)";
- Text[ russian ] = "羊囗溧痱";
+ Text[ russian ] = "项 箪铍鬣龛";
Text[ polish ] = "Domy渓nie";
Text[ japanese ] = "妯欐簴(~D)";
Text[ chinese_traditional ] = "妯欐簴(~D)";
Text[ arabic ] = "禽恃侵";
Text[ greek ] = "旭镥痖腼戕";
- Text[ korean ] = "旮半掣 臧(~D)";
+ Text[ korean ] = "旮半掣臧(~D)";
Text[ turkish ] = "Standart";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Per ~defecte";
@@ -2902,7 +2902,7 @@ TabPage RID_PRINTOPTIONPAGE
Text[ chinese_traditional ] = "鍘熶欢澶у皬(~R)";
Text[ arabic ] = "轻吞 轻谜犴";
Text[ greek ] = "榴鏖挈 燧沐鑯矧";
- Text[ korean ] = "鞗愲灅雽搿(~R)";
+ Text[ korean ] = "鞗愲灅 韥赴(~R)";
Text[ turkish ] = "Ger鏴k boyut";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Mida o~riginal";
@@ -2924,7 +2924,7 @@ TabPage RID_PRINTOPTIONPAGE
Text [ french ] = "~Adapter la page" ;
Text [ swedish ] = "Anpassa ~sida" ;
Text [ dutch ] = "~Pagina aanpassen" ;
- Text [ spanish ] = "Ajustar ~p醙ina" ;
+ Text [ spanish ] = "~Ajustar a la p醙ina" ;
Text [ english_us ] = "Fit to ~page" ;
Text[ chinese_simplified ] = "瀵瑰簲椤甸潰(~P)";
Text[ russian ] = "项 疣珈屦 耱疣龛鳆";
@@ -2964,7 +2964,7 @@ TabPage RID_PRINTOPTIONPAGE
Text[ chinese_traditional ] = "椤ず姣斾緥(~S)";
Text[ arabic ] = "氏秧";
Text[ greek ] = "~孰哽彡";
- Text[ korean ] = "頇曤寑(~S)";
+ Text[ korean ] = "氚办湪(~S)";
Text[ turkish ] = "謑鏴klendirme";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Redimen~sionament";
@@ -3145,7 +3145,7 @@ ModalDialog RID_SYMBOLDIALOG
Text[ chinese_traditional ] = "涓嶆槑";
Text[ arabic ] = "垌 阙焰";
Text[ greek ] = "€睐篝";
- Text[ korean ] = "鞎岆牑鞝 鞛堨 鞎婌潓";
+ Text[ korean ] = "鞎 靾 鞐嗢潓";
Text[ turkish ] = "Bilinmiyor";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Desconegut";
@@ -3180,7 +3180,7 @@ ModalDialog RID_SYMBOLDIALOG
Text[ chinese_traditional ] = "鎺$敤(~I)";
Text[ arabic ] = "畔亚";
Text[ greek ] = "碰狁祜戕";
- Text[ korean ] = "鞝侅毄(~I)";
+ Text[ korean ] = "靷届瀰(~I)";
Text[ turkish ] = "Kullan";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Insereix";
@@ -3396,7 +3396,7 @@ ModalDialog RID_SYMDEFINEDIALOG
Text[ polish ] = "Symbol";
Text[ portuguese_brazilian ] = "~Symbol:";
Text[ japanese ] = "瑷樺彿(~S)";
- Text[ korean ] = "旮绊樃(~S):";
+ Text[ korean ] = "旮绊樃(~S)";
Text[ chinese_simplified ] = "鍥炬爣(~S)";
Text[ chinese_traditional ] = "鍦栫ず(~S)";
Text[ turkish ] = "Simge:";
@@ -3470,7 +3470,7 @@ ModalDialog RID_SYMDEFINEDIALOG
Text[ polish ] = "Czcionka";
Text[ portuguese_brazilian ] = "~Fonte:";
Text[ japanese ] = "銉曘偐銉炽儓(~F)";
- Text[ korean ] = "旮昙(~F):";
+ Text[ korean ] = "旮昙(~F)";
Text[ chinese_simplified ] = "瀛椾綋(~F)";
Text[ chinese_traditional ] = "瀛楀瀷(~F)";
Text[ turkish ] = "Yaz齮ipi:";
@@ -3507,7 +3507,7 @@ ModalDialog RID_SYMDEFINEDIALOG
Text[ polish ] = "~Obszar";
Text[ portuguese_brazilian ] = "~Subset";
Text[ japanese ] = "绋(~S)";
- Text[ korean ] = "鞓侅棴(~S)";
+ Text[ korean ] = "膦呺(~S)";
Text[ chinese_simplified ] = "瀛愰泦(~S)";
Text[ chinese_traditional ] = "瀛愰泦(~S)";
Text[ turkish ] = "~Subset";
@@ -3546,7 +3546,7 @@ ModalDialog RID_SYMDEFINEDIALOG
Text[ polish ] = "Styl";
Text[ portuguese_brazilian ] = "Schriftschni~tt:";
Text[ japanese ] = "銉曘偐銉炽儓銇偣銈裤偆銉(~T)";
- Text[ korean ] = "鞙犿槙(~T):";
+ Text[ korean ] = "鞙犿槙(~T)";
Text[ chinese_simplified ] = "瀛椾綋褰㈢姸(~T)";
Text[ chinese_traditional ] = "瀛楀瀷褰㈢媭(~T)";
Text[ turkish ] = "Yaz齮ipi varyant:";
@@ -3666,7 +3666,7 @@ ModalDialog RID_SYMDEFINEDIALOG
Text [ spanish ] = "Modificar" ;
Text [ english_us ] = "~Modify" ;
Text[ greek ] = "择镳镳镞珞";
- Text[ korean ] = "靾橃爼(~M)";
+ Text[ korean ] = "氤瓴(~M)";
Text[ turkish ] = "De餴⺶ir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Modifica";
@@ -3694,7 +3694,7 @@ ModalDialog RID_SYMDEFINEDIALOG
Text [ french ] = "Supprimer" ;
Text [ swedish ] = "~Radera" ;
Text [ dutch ] = "~Wissen" ;
- Text [ spanish ] = "~Eliminar" ;
+ Text [ spanish ] = "~Borrar" ;
Text [ english_us ] = "~Delete" ;
Text[ greek ] = "拈徙襻鲛";
Text[ korean ] = "靷牅(~D)";
@@ -3767,13 +3767,13 @@ QueryBox RID_DEFAULTSAVEQUERY
Message [ spanish ] = "緿esea guardar los cambios como predeterminados?\n\nEstos cambios tendr醤 efecto en todas las nuevas f髍mulas." ;
Message [ english_us ] = "Should the changes be saved as defaults?\n\nThese changes will apply for all new formulas." ;
Message[ chinese_simplified ] = "瑕佸皢鏇存敼鍐呭浣滀负鏍囧噯鏍煎紡瀛樼洏锛焅n\n杩欎釜鏇存敼浼氬奖鍝嶆墍鏈夋柊鍏紡銆";
- Message[ russian ] = "杨躔囗栩 桤戾礤龛 赅 耱囗溧痱睇 ?\n\n如戾礤龛 狍潴 镳桁屙屙 觐 怦屐 眍恹 纛痨箅囔.";
+ Message[ russian ] = "杨躔囗栩 磬耱痤殛 赅 珥圜屙 镱 箪铍鬣龛?\n\n袜耱痤殛 狍潴 镳桁屙屙 觐 怦屐 眍恹 纛痨箅囔.";
Message[ polish ] = "Czy zapisa zmiany jako domy渓ne?\n\nZmiany te maj wp硑w na wszystkie nowe formu硑.";
Message[ japanese ] = "銇撱伄澶夋洿銈掓婧栥仺銇椼仸淇濆瓨銇椼伨銇欍亱銆俓n\n銇撱伄澶夋洿銇仚銇广仸銇柊銇椼亜鏁板紡銇奖闊裤仐銇俱仚銆";
Message[ chinese_traditional ] = "瑕佸皣璁婃洿鐣朵綔妯欐簴鏍煎紡鍎插瓨锛焅n\n閫欏嬭畩鏇存渻褰遍熆鎵鏈夌殑鏂板叕寮忋";
Message[ arabic ] = "遽 恃硐 洼 轻售眄亚 咔菔亚猪縗n\n渔 磉驿 徨绣 轻售眄亚 盟亚 卺 哚 轻枕 轻滔硐.";
Message[ greek ] = "歪 狃镨珀艴麸 镩 犭脶爿  瘃镥痖腼戕;\n\n祥 犭脶爿 狨糨 栳 蓣秕 屦咪襻箸 箦 秕 麸躜 磔秕 酏痫躜.";
- Message[ korean ] = "氤瓴 靷暛鞚 旮半掣鞙茧 鞝鞛ロ晿瓴犾姷雼堦箤?\n\n鞚 氤瓴 靷暛霌れ潃 氇摖 靸 靾橃嫕鞐 鞓來枼鞚 氙胳供雼堧嫟.";
+ Message[ korean ] = "氤瓴 雮挫毄鞚 旮半掣臧掛溂搿 鞝鞛ロ晿鞁滉矤鞀惦媹旯?\n\n鞚 氤瓴 雮挫毄鞚 氇摖 靸 靾橃嫕鞐 鞓來枼鞚 氙胳供雼堧嫟.";
Message[ turkish ] = "De餴㱮klikler standart de餰rler olarak kaydedilsin mi?\n\nBu de餴㱮klikler t黰 yeni form黮leri etkileyecektir.";
Message[ language_user1 ] = " ";
Message[ catalan ] = "Voleu desar aquests canvis com a predeterminats?\n\nAquests canvis tindran efecte en totes les noves f髍mules.";
@@ -3802,7 +3802,7 @@ String RID_FONTREGULAR
Text[ chinese_traditional ] = "妯欐簴";
Text[ arabic ] = "谇享 ,";
Text[ greek ] = ", 梳盹黹贶";
- Text[ korean ] = ", 氤错喌";
+ Text[ korean ] = "響滌";
Text[ turkish ] = ", standart";
Text[ language_user1 ] = " ";
Text[ catalan ] = ", Est鄋dard";
@@ -3858,7 +3858,7 @@ String RID_FONTBOLD
Text[ chinese_traditional ] = "绮楅珨";
Text[ arabic ] = "谘碇";
Text[ greek ] = ";疙麸盹";
- Text[ korean ] = ", 甑店矊";
+ Text[ korean ] = "甑店矊";
Text[ turkish ] = ", kal齨";
Text[ language_user1 ] = " ";
Text[ catalan ] = ", negreta";
@@ -3907,7 +3907,7 @@ Menu RID_VIEWMENU
Text [ french ] = "Zoom ~50 %" ;
Text [ swedish ] = "Visa ~50%" ;
Text [ dutch ] = "Zoomwaarde ~50%" ;
- Text [ spanish ] = "Zoom ~50%" ;
+ Text [ spanish ] = "Escala ~50%" ;
Text [ english_us ] = "~View 50%" ;
Text[ chinese_simplified ] = "瑙嗗浘 50%(~V)";
Text[ russian ] = "妈 ~50%";
@@ -3916,7 +3916,7 @@ Menu RID_VIEWMENU
Text[ chinese_traditional ] = "妾㈣ 50%(~V)";
Text[ arabic ] = "%谘 50";
Text[ greek ] = "体爿桴眢 ~50%";
- Text[ korean ] = "氤搓赴 50%(~V)";
+ Text[ korean ] = "50% 氚办湪搿 氤搓赴(~V)";
Text[ turkish ] = "G鰎黱黰 %~50";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Zoom ~50%";
@@ -3937,7 +3937,7 @@ Menu RID_VIEWMENU
Text [ french ] = "Zoom ~100 %" ;
Text [ swedish ] = "Visa ~100%" ;
Text [ dutch ] = "Zoomwaarde ~100%" ;
- Text [ spanish ] = "Zoom ~100%" ;
+ Text [ spanish ] = "Escala ~100%" ;
Text [ english_us ] = "View ~100%" ;
Text[ chinese_simplified ] = "瑙嗗浘 100%";
Text[ russian ] = "妈 ~100%";
@@ -3946,7 +3946,7 @@ Menu RID_VIEWMENU
Text[ chinese_traditional ] = "妾㈣ 100%";
Text[ arabic ] = "%谘 100";
Text[ greek ] = "体爿桴眢 ~100%";
- Text[ korean ] = "100%搿 氤搓赴";
+ Text[ korean ] = "100% 氚办湪搿 氤搓赴";
Text[ turkish ] = "G鰎黱黰 %~100";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Zoom ~100%";
@@ -3967,7 +3967,7 @@ Menu RID_VIEWMENU
Text [ french ] = "Zoom ~200 %" ;
Text [ swedish ] = "Visa ~200%" ;
Text [ dutch ] = "Zoomwaarde ~200%" ;
- Text [ spanish ] = "Zoom ~200%" ;
+ Text [ spanish ] = "Escala ~200%" ;
Text [ english_us ] = "View ~200%" ;
Text[ chinese_simplified ] = "瑙嗗浘 200%";
Text[ russian ] = "妈 ~200%";
@@ -3976,7 +3976,7 @@ Menu RID_VIEWMENU
Text[ chinese_traditional ] = "妾㈣ 200%";
Text[ arabic ] = "%谘 200";
Text[ greek ] = "体爿桴眢 ~200%";
- Text[ korean ] = "200%搿 氤搓赴";
+ Text[ korean ] = "200% 氚办湪搿 氤搓赴";
Text[ turkish ] = "G鰎黱黰 %~200";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Zoom ~200%";
@@ -4136,7 +4136,7 @@ Menu RID_DISTANCEMENU
Text[ chinese_traditional ] = "闁撻殧";
Text[ arabic ] = "嗜勤";
Text[ greek ] = "A痫篝荏彘";
- Text[ korean ] = "旃 霛勳毎旮";
+ Text[ korean ] = "臧勱博";
Text[ turkish ] = "Aral齥lar";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Espacios";
@@ -4221,7 +4221,7 @@ Menu RID_DISTANCEMENU
Text[ chinese_traditional ] = "鍒嗘暩绶";
Text[ arabic ] = "匝厣 轻哂";
Text[ greek ] = "民犰燧 觌荏灬麸";
- Text[ korean ] = "攵勳垬 響滌嫓欷";
+ Text[ korean ] = "攵勳垬靹";
Text[ turkish ] = "Kesir 鏸zgisi";
Text[ catalan ] = "Barres de fraccions";
Text[ thai ] = "喔傕傅喔斷箑喔ㄠ俯喔箞喔о笝";
@@ -4334,7 +4334,7 @@ Menu RID_DISTANCEMENU
Text[ chinese_traditional ] = "瑁濋>閮ㄥ垎";
Text[ arabic ] = "雁嬉";
Text[ greek ] = "拈彡扃箸";
- Text[ korean ] = "旮绊樃";
+ Text[ korean ] = "鞛レ嫕 旮绊樃";
Text[ turkish ] = "Simgeler";
Text[ catalan ] = "Ornaments";
Text[ thai ] = "喔副喔嵿弗喔编竵喔┼笓喙";
@@ -4379,16 +4379,16 @@ Menu RID_DISTANCEMENU
TEXT[ french ] = "Marges";
TEXT[ swedish ] = "Marginaler";
TEXT[ dutch ] = "Marges";
- TEXT[ spanish ] = "M醨genes";
+ TEXT[ spanish ] = "Bordes";
TEXT[ english_us ] = "Borders";
TEXT[ chinese_simplified ] = "杈硅窛";
TEXT[ russian ] = "项";
TEXT[ polish ] = "Marginesy";
- TEXT[ japanese ] = "浣欑櫧";
- TEXT[ chinese_traditional ] = "閭婅窛";
+ TEXT[ japanese ] = "鏋犵窔";
+ TEXT[ chinese_traditional ] = "閭婃";
TEXT[ arabic ] = "秘亚";
TEXT[ greek ] = "绣耖泷莒灬翎";
- TEXT[ korean ] = "鞕戈辰靹";
+ TEXT[ korean ] = "鞐氨";
TEXT[ turkish ] = "Kenarlar";
TEXT[ catalan ] = "M醨genes";
TEXT[ finnish ] = "Reunat";
@@ -4415,7 +4415,7 @@ Menu RID_FONTMENU
Text [ french ] = "Variables" ;
Text [ swedish ] = "Variabler" ;
Text [ dutch ] = "Variabelen" ;
- Text [ spanish ] = "Predeterminaciones" ;
+ Text [ spanish ] = "Variables" ;
Text [ english_us ] = "Variables" ;
Text[ chinese_simplified ] = "鍙橀噺";
Text[ russian ] = "襄疱戾眄";
@@ -4538,7 +4538,7 @@ Menu RID_FONTMENU
Text[ chinese_traditional ] = "Serif";
Text[ arabic ] = "Serif";
Text[ greek ] = "Serif";
- Text[ korean ] = "靹鸽Μ頂";
+ Text[ korean ] = "Serif";
Text[ turkish ] = "Serif";
Text[ catalan ] = "Serif";
Text[ thai ] = "Serif";
@@ -4566,7 +4566,7 @@ Menu RID_FONTMENU
Text[ chinese_traditional ] = "Sans";
Text[ arabic ] = "Sans";
Text[ greek ] = "Sans";
- Text[ korean ] = "靷";
+ Text[ korean ] = "Sans";
Text[ turkish ] = "Sans";
Text[ catalan ] = "Sans";
Text[ thai ] = "Sans";
@@ -4594,7 +4594,7 @@ Menu RID_FONTMENU
Text[ chinese_traditional ] = "鍥哄畾鐨";
Text[ arabic ] = "饲仁";
Text[ greek ] = "郁徼羼";
- Text[ korean ] = "瓿犾爼霅";
+ Text[ korean ] = "瓿犾爼";
Text[ turkish ] = "Sabit";
Text[ catalan ] = "Fix";
Text[ thai ] = "喔勦竾喔椸傅喙";
@@ -4787,7 +4787,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ danish ] = "additions +" ;
Text [ italian ] = "Addizione +" ;
Text [ spanish ] = "+ de suma" ;
- Text [ french ] = "+ d'addition" ;
+ Text [ french ] = "Addition (+)" ;
Text [ dutch ] = "Optellen +" ;
Text [ portuguese ] = "Adi玢o +" ;
Text[ chinese_simplified ] = "鍔犳硶 +";
@@ -4815,7 +4815,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Multiplikation (punkt)" ;
Text [ danish ] = "multiplikation (punkt)" ;
Text [ italian ] = "Moltiplicazione (punto)" ;
- Text [ spanish ] = "Multiplicaci髇 (Punto)" ;
+ Text [ spanish ] = "Multiplicaci髇 (punto)" ;
Text [ french ] = "Multiplication (point)" ;
Text [ dutch ] = "Vermenigvuldigen (punt)" ;
Text [ portuguese ] = "Multiplica玢o (ponto)" ;
@@ -4936,7 +4936,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ danish ] = "subtraktions -" ;
Text [ italian ] = "Sottrazione -" ;
Text [ spanish ] = "Restas -" ;
- Text [ french ] = "- de soustraction" ;
+ Text [ french ] = "Soustraction (-)" ;
Text [ dutch ] = "Aftrekken (-)" ;
Text [ portuguese ] = "Subtrac玢o -" ;
Text[ chinese_simplified ] = "鍑忔硶 -";
@@ -5004,7 +5004,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "闄ゆ硶(涓琛岄洐榛)";
Text[ arabic ] = "() 抻闵";
Text[ greek ] = "Division ()";
- Text[ korean ] = "雮橂垪靺 ";
+ Text[ korean ] = "雮橂垪靺 (雮橂垪靺 旮绊樃)";
Text[ turkish ] = "B鰈me ()";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Divisi (dos punts-ratlla)";
@@ -5033,7 +5033,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "闄ゆ硶(鏂滅窔)";
Text[ arabic ] = "(/) 抻闵";
Text[ greek ] = "拈徇皴箸 (受桢麸)";
- Text[ korean ] = "雮橂垪靺 (/)";
+ Text[ korean ] = "雮橂垪靺 (/ 旮绊樃)";
Text[ turkish ] = "B鰈me (/)";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Divisi (barra obliqua)";
@@ -5137,7 +5137,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鐩哥瓑";
Text[ arabic ] = "碛擎";
Text[ greek ] = "暹磲 唧";
- Text[ korean ] = "霌标皜鞛呺媹雼";
+ Text[ korean ] = "臧欖潓";
Text[ turkish ] = "E㱮ttir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 igual";
@@ -5166,7 +5166,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "涓嶇瓑鏂";
Text[ arabic ] = "崆 碛擎";
Text[ greek ] = "暹磲 溟荟锺";
- Text[ korean ] = "臧欖 鞎婋嫟.";
+ Text[ korean ] = "臧欖 鞎婌潓";
Text[ turkish ] = "E㱮t de餴l";
Text[ language_user1 ] = " ";
Text[ catalan ] = "no 閟 igual";
@@ -5195,7 +5195,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "杩戜技绛夋柤";
Text[ arabic ] = "碛擎 兽秧惹";
Text[ greek ] = "暹磲 赆糗 瘃矬葶汩箸 唧";
- Text[ korean ] = "瓯办潣 臧欕嫟";
+ Text[ korean ] = "瓯办潣 臧欖潓";
Text[ turkish ] = "Yaklak olarak e㱮t";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 aprox. igual";
@@ -5345,7 +5345,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鐩镐技鏂兼垨绛夋柤";
Text[ arabic ] = "阍侨 面 阌擎";
Text[ greek ] = "暹磲 镩 唧 戾";
- Text[ korean ] = "鞙犾偓頃橁卑雮 臧欕嫟";
+ Text[ korean ] = "鞙犾偓頃橁卑雮 臧欖潓";
Text[ turkish ] = "Benzer ya da e㱮ttir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 semblant o igual";
@@ -5374,7 +5374,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "骞宠鏂";
Text[ arabic ] = "闶媲翼 阙";
Text[ greek ] = "暹磲 疳褴腚珉 瘃矧";
- Text[ korean ] = "鞐 韽夗枆鞙茧";
+ Text[ korean ] = "韽夗枆";
Text[ turkish ] = "Paraleldir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 paral.lel a";
@@ -5403,7 +5403,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鐩磋鏂";
Text[ arabic ] = "闶谇阆 卺";
Text[ greek ] = "篦珈狒哝彘 锺柁 泫磉 戾";
- Text[ korean ] = "鞐 歆侁皝鞙茧";
+ Text[ korean ] = "歆侁皝";
Text[ turkish ] = "dikgen";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 ortogonal a";
@@ -5466,7 +5466,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "澶ф柤鎴栧ぇ鏂";
Text[ arabic ] = "眠妊 沅 面 碛擎 (闱漆)";
Text[ greek ] = "暹磲 戾汜臊翦耧 唧 戾 (腼钴)";
- Text[ korean ] = "韥卑雮 臧欕嫟";
+ Text[ korean ] = "韥卑雮 臧欖潓";
Text[ turkish ] = "B鼀黭t黵 ya da e㱮ttir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 major que o igual a (obliquo)";
@@ -5495,7 +5495,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鐩镐技鏂";
Text[ arabic ] = "阍侨 ";
Text[ greek ] = "暹磲 镩 戾";
- Text[ korean ] = "鞐 鞙犾偓";
+ Text[ korean ] = "鞙犾偓";
Text[ turkish ] = "Benzerdir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 semblant a";
@@ -5524,7 +5524,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鍏ㄧ瓑鏂";
Text[ arabic ] = "阊窍 ";
Text[ greek ] = "暹磲 轶镤犰 戾";
- Text[ korean ] = "鞐 頃╇彊";
+ Text[ korean ] = "頃╇彊";
Text[ turkish ] = "謗t黵";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 congruent amb";
@@ -5590,7 +5590,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "澶ф柤鎴栫瓑鏂";
Text[ arabic ] = "眠妊 沅 面 碛擎";
Text[ greek ] = "暹磲 戾汜臊翦耧 唧 戾";
- Text[ korean ] = "韥卑雮 臧欕嫟";
+ Text[ korean ] = "韥卑雮 臧欖潓";
Text[ turkish ] = "B鼀黭 ya da e㱮ttir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 mayor que o igual a";
@@ -5619,7 +5619,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鎴愭瘮渚嬫柤";
Text[ arabic ] = "闶淝尤 阙";
Text[ greek ] = "暹磲 犴茈镢 瘃矧";
- Text[ korean ] = "鞐 牍勲";
+ Text[ korean ] = "牍勲";
Text[ turkish ] = "Orant齦齞齬";
Text[ language_user1 ] = " ";
Text[ catalan ] = "閟 proporcional a";
@@ -5648,7 +5648,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鎺ヨ繎";
Text[ arabic ] = "惹侍清";
Text[ greek ] = "翦唔彘 瘃矧";
- Text[ korean ] = "歆勴枆 氚╉枼";
+ Text[ korean ] = "鞝戧芳";
Text[ turkish ] = "Y鰊";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Cap a";
@@ -5685,7 +5685,7 @@ FloatingWindow RID_TOOLBOXWINDOW
TEXT[ chinese_traditional ] = "宸﹀悜闆欑闋";
TEXT[ arabic ] = "渝 阋湘 裴 轻碛茄";
TEXT[ greek ] = "拈痣 廨腼 瘃矧 翎 狁轶翦褴";
- TEXT[ korean ] = "2欷 頇旍偞響, 鞕检鞙茧";
+ TEXT[ korean ] = "鞚挫 頇旍偞響 鞕检鞙茧";
TEXT[ turkish ] = "Sola 鏸ft ok";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Fletxa doble esquerra";
@@ -5714,7 +5714,7 @@ FloatingWindow RID_TOOLBOXWINDOW
TEXT[ chinese_traditional ] = "宸﹀彸鍚戦洐绠牠";
TEXT[ arabic ] = "渝 阋湘 裴 轻碛茄 媲犴沩";
TEXT[ greek ] = "拈痣 廨腼 瘃矧 翎 狁轶翦褴 赆 溴铋";
- TEXT[ korean ] = "2欷 頇旍偞響 鞕检瓿 鞓るジ飒届溂搿";
+ TEXT[ korean ] = "2欷 頇旍偞響滊ゼ 鞕检瓿 鞓るジ飒届溂搿";
TEXT[ turkish ] = "Sola ve sa餫 鏸ft ok";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Fletxa doble esquerra i dreta";
@@ -5743,7 +5743,7 @@ FloatingWindow RID_TOOLBOXWINDOW
TEXT[ chinese_traditional ] = "鍙冲悜闆欑闋";
TEXT[ arabic ] = "渝 阋湘 裴 轻磴礓";
TEXT[ greek ] = "拈痣 廨腼 瘃矧 翎 溴铋";
- TEXT[ korean ] = "2欷 頇旍偞響 鞓るジ飒届溂搿";
+ TEXT[ korean ] = "鞚挫 頇旍偞響 鞓るジ飒届溂搿";
TEXT[ turkish ] = "Sa餫 鏸ft ok";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Fletxa doble dreta";
@@ -5803,7 +5803,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "finns inte i" ;
Text [ danish ] = "tih鴕er ikke" ;
Text [ italian ] = "Non compreso in" ;
- Text [ spanish ] = "no contenido en" ;
+ Text [ spanish ] = "no est contenido en" ;
Text [ french ] = "N'est pas inclus dans" ;
Text [ dutch ] = "is niet in" ;
Text [ portuguese ] = "n鉶 contido em" ;
@@ -5898,7 +5898,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Genomsnitt" ;
Text [ danish ] = "f鎙lesm鎛gde" ;
Text [ italian ] = "Intersezione" ;
- Text [ spanish ] = "Promedio" ;
+ Text [ spanish ] = "Intersecci髇" ;
Text [ french ] = "Intersection" ;
Text [ dutch ] = "Gemiddelde" ;
Text [ portuguese ] = "M閐ia" ;
@@ -6182,7 +6182,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "闈炲瓙闆";
Text[ arabic ] = "犴 闾沔谏 桃祈";
Text[ greek ] = " 躔矬镫";
- Text[ korean ] = "攵攵勳頃╈澊 鞎勲媹雼.";
+ Text[ korean ] = "攵攵勳頃 鞎勲嫎";
Text[ turkish ] = "Alt k黰esi de餴l";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Conjunt no parcial";
@@ -6240,7 +6240,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "涓嶆槸鍏ㄩ泦";
Text[ arabic ] = "犴邮 闾沔谏 谇犴";
Text[ greek ] = "槛 躔羼簖盹腼";
- Text[ korean ] = "齑堨頃╈澊 鞎勲媹雼";
+ Text[ korean ] = "齑堨頃 鞎勲嫎";
Text[ turkish ] = "躶t k黰esi de餴l";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Conjunt no superior";
@@ -6581,7 +6581,7 @@ FloatingWindow RID_TOOLBOXWINDOW
TEXT[ chinese_traditional ] = "涔樺啰";
TEXT[ arabic ] = "轻捩";
TEXT[ greek ] = "凝磲扃";
- TEXT[ korean ] = "瓯半摥鞝滉潮";
+ TEXT[ korean ] = "歆靾";
TEXT[ turkish ] = "躶";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Pot鑞cia";
@@ -6752,7 +6752,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Arcussinus" ;
Text [ danish ] = "arcus sinus" ;
Text [ italian ] = "Arcoseno" ;
- Text [ spanish ] = "Seno de arco" ;
+ Text [ spanish ] = "Arcoseno" ;
Text [ french ] = "Arc sinus" ;
Text [ dutch ] = "Boogsinus" ;
Text [ portuguese ] = "Arcoseno" ;
@@ -6763,7 +6763,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鍙嶆寮";
Text[ arabic ] = "戕侨 轻添";
Text[ greek ] = "渣铒 珈轸秕";
- Text[ korean ] = "鞎勴伂 靷澑";
+ Text[ korean ] = "鞎勴伂靷澑";
Text[ turkish ] = "Arksin黶";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Arcsinus";
@@ -6781,7 +6781,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Arcuscosinus" ;
Text [ danish ] = "arcus cosinus" ;
Text [ italian ] = "Arcocoseno" ;
- Text [ spanish ] = "Coseno de arco" ;
+ Text [ spanish ] = "Arcocoseno" ;
Text [ french ] = "Arc cosinus" ;
Text [ dutch ] = "Boogcosinus" ;
Text [ portuguese ] = "Arco-coseno" ;
@@ -6879,7 +6879,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "n 娆℃牴";
Text[ arabic ] = "绦 闱 (n-th Root)";
Text[ greek ] = "n-矬艮 襁驷";
- Text[ korean ] = "n彀 攴";
+ Text[ korean ] = "n臧滌潣 攴";
Text[ turkish ] = "K鰇 n";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Arrel n";
@@ -7061,7 +7061,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鍙嶉洐鏇叉寮";
Text[ arabic ] = "添 轻仪骓 徂刳 仪葡 徙湄奚";
Text[ greek ] = "另暨篝耧鲲 躔羼怙腴挈 珈唪镯";
- Text[ korean ] = "氅挫爜 鞂嶊场靹 靷澑";
+ Text[ korean ] = "鞂嶊场靹 靷澑";
Text[ turkish ] = "Alan hiperbolik sin黶";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Sinus hiperb騦ic d'鄏ea";
@@ -7090,7 +7090,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "椁樺鸡闆欐洸闈";
Text[ arabic ] = "添 轻抒倾 徂刳 仪葡 徙湄奚";
Text[ greek ] = "另暨篝耧鲲 躔羼怙腴挈 篚礴爝麸盹";
- Text[ korean ] = "氅挫爜 鞂嶊场靹 旖旍偓鞚";
+ Text[ korean ] = "鞂嶊场靹 旖旍偓鞚";
Text[ turkish ] = "Alan hiperbolik kosin黶";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Cosinus hiperb騦ic d'鄏ea";
@@ -7119,7 +7119,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "姝e垏闆欐洸闈";
Text[ arabic ] = "籴 轻仪骓 徂刳 仪葡 徙湄奚";
Text[ greek ] = "另暨篝耧鲧 躔羼怙腴贽 弼狃麸燧礴";
- Text[ korean ] = "氅挫爜鞂嶊场靹 韮勳牋韸";
+ Text[ korean ] = "鞂嶊场靹 韮勳牋韸";
Text[ turkish ] = "Alan hiperbolik tanjant";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Tangent hiperb騦ica d'鄏ea";
@@ -7148,7 +7148,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "浣欏垏闆欐洸闈";
Text[ arabic ] = "籴 轻抒倾 徂刳 仪葡 徙湄奚";
Text[ greek ] = "另暨篝耧鲧 躔羼怙腴贽 篚礤鲠痿镬蓓";
- Text[ korean ] = "氅挫爜鞂嶊场靹 旖旐儎鞝犿姼";
+ Text[ korean ] = "鞂嶊场靹 旖旐儎鞝犿姼";
Text[ turkish ] = "Alan hiperbolik kotanjant";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Cotangent hiperb騦ica d'鄏ea";
@@ -7426,7 +7426,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "涓夐噸绌嶅垎";
Text[ arabic ] = "蔬倾 酸撬";
Text[ greek ] = "择轲朦 镫镪朕聩灬";
- Text[ korean ] = "3欷 鞝侂秳";
+ Text[ korean ] = "靷检 鞝侂秳";
Text[ turkish ] = "茜l integral";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Integral triple";
@@ -7510,7 +7510,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Dubbel kurvintegral" ;
Text [ danish ] = "dobbelt kurveintegral" ;
Text [ italian ] = "Integrale curvilineo doppio" ;
- Text [ spanish ] = "Doble integral curvil韓ea" ;
+ Text [ spanish ] = "Integral curvil韓ea doble" ;
Text [ french ] = "Double int間rale de courbe" ;
Text [ dutch ] = "dubbele boogintegraal" ;
Text [ portuguese ] = "Dupla integral curvil韓ea" ;
@@ -7539,7 +7539,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Tredubbel kurvintegral" ;
Text [ danish ] = "tredobbelt kurveintegral" ;
Text [ italian ] = "Integrale curvilineo triplo" ;
- Text [ spanish ] = "Triple integral curvil韓ea" ;
+ Text [ spanish ] = "Integral curvil韓ea triple" ;
Text [ french ] = "Triple int間rale de courbe" ;
Text [ dutch ] = "drievoudige boogintegraal" ;
Text [ portuguese ] = "Tripla integral curvil韓ea" ;
@@ -7550,7 +7550,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "涓夐噸鏇茬窔绌嶅垎";
Text[ arabic ] = "蔬倾 沅弯 酸撬";
Text[ greek ] = "择轲朦 屦殛犰瘕腴 镫镪朕聩灬";
- Text[ korean ] = "3欷 靹犾爜攵";
+ Text[ korean ] = "靷检 靹犾爜攵";
Text[ turkish ] = "茜l e餽i integrali";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Integral de corba triple";
@@ -7651,7 +7651,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ polish ] = "Akcent w prawo na d蟪";
Text[ portuguese_brazilian ] = "Accent nach links";
Text[ japanese ] = "銈般儸銉笺儢";
- Text[ korean ] = "鞎§劶韸, 鞓るジ飒 鞎勲灅搿";
+ Text[ korean ] = "鞓るジ飒 鞎勲灅搿 鞎§劶韸 攵順";
Text[ chinese_simplified ] = "鍙充笅鏂瑰悜閲嶉煶";
Text[ chinese_traditional ] = "宸﹀悜閲嶉煶绗﹁櫉";
Text[ turkish ] = "Sola vurgu";
@@ -7681,7 +7681,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鍙嶅悜鎶戞彋绗﹁櫉";
Text[ arabic ] = "卺倾 (^) 谶禹";
Text[ greek ] = "另暨篝耧鲧 汜腚殛 疱耖箴蓓";
- Text[ korean ] = "臧曥“旮绊樃毳 鞐溂搿";
+ Text[ korean ] = "臧曥“ 旮绊樃毳 氚橂寑搿";
Text[ turkish ] = "Ters pka";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Circumflex invers";
@@ -7801,7 +7801,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鍔犲湪瑗跨彮鐗欒獮n_瀛椾笂鐨勭櫦闊崇铏";
Text[ arabic ] = "轻梳仙";
Text[ greek ] = "绣耖箴蓓";
- Text[ korean ] = "氚橂车 旮绊樃";
+ Text[ korean ] = "韹鸽嵃";
Text[ turkish ] = "Tilde";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Titlla";
@@ -7859,7 +7859,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "涓婂妰绶";
Text[ arabic ] = "呜 萱";
Text[ greek ] = "民犰燹 茼";
- Text[ korean ] = "靸侅渼 靹";
+ Text[ korean ] = "氚";
Text[ turkish ] = "躶t 鏸zgi";
Text[ language_user1 ] = " ";
Text[ catalan ] = "L韓ia superior";
@@ -7950,7 +7950,7 @@ FloatingWindow RID_TOOLBOXWINDOW
TEXT[ chinese_traditional ] = "瀵殑鍔犲湪瑗跨彮鐗欒獮n_瀛椾笂鐨勭櫦闊崇铏";
TEXT[ arabic ] = "梳仙 谘碇";
TEXT[ greek ] = "体丬腌 疱耖箴蓓";
- TEXT[ korean ] = "韥 氚橂车 旮绊樃";
+ TEXT[ korean ] = "韥 氍缄舶 旮绊樃";
TEXT[ turkish ] = "Geni tilde";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Titlla gran";
@@ -8012,7 +8012,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "闆欓粸";
Text[ arabic ] = "滢厣 阋湘躺";
Text[ greek ] = "拈痣 觑蹶赀溽";
- Text[ korean ] = "鞚挫 鞝";
+ Text[ korean ] = "鞚挫鞝";
Text[ turkish ] = "莍ft nokta";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Punt doble";
@@ -8136,7 +8136,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "涓夐粸";
Text[ arabic ] = "滢厣 酸撬砩";
Text[ greek ] = "择轲朕 觑蹶赀溽";
- Text[ korean ] = "3欷 鞝";
+ Text[ korean ] = "靷检鞝";
Text[ turkish ] = "茜 nokta";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Punt triple";
@@ -8256,7 +8256,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "璁婃洿澶у皬";
Text[ arabic ] = "售眄 轻吞";
Text[ greek ] = "岭脶戕 戾爿栾躜";
- Text[ korean ] = "韥赴 臁办爼";
+ Text[ korean ] = "韥赴 氤瓴";
Text[ turkish ] = "Boyutu de餴⺶ir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Canvia la mida";
@@ -8285,7 +8285,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "璁婃洿瀛楀瀷";
Text[ arabic ] = "售眄 轻呜";
Text[ greek ] = "岭脶戕 泷犰灬麸箦轳茯";
- Text[ korean ] = "旮昙 靾橃爼";
+ Text[ korean ] = "旮昙 氤瓴";
Text[ turkish ] = "Yaz齮ipini de餴⺶ir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Canvia el tipus de lletra";
@@ -8356,7 +8356,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鏂规嫭铏";
Text[ arabic ] = "棉媲 耷沏 轻仪骓";
Text[ greek ] = "徙挲脲";
- Text[ korean ] = "雽甏勴樃";
+ Text[ korean ] = "臧侁磩順";
Text[ turkish ] = "K鳋eli ayra";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Corchetes";
@@ -8443,7 +8443,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "闆欑窔";
Text[ arabic ] = "呜尕 阋湘躺";
Text[ greek ] = "拈痣蒡 泷犰燧";
- Text[ korean ] = "鞚挫 靹";
+ Text[ korean ] = "鞚挫靹";
Text[ turkish ] = "莍ft 鏸zgiler";
Text[ language_user1 ] = " ";
Text[ catalan ] = "L韓ies dobles";
@@ -8567,7 +8567,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "灏忕祫鎷櫉";
Text[ arabic ] = "棉媲 侍沩";
Text[ greek ] = "嗅皴龛蒹彘 镬徜镳镞珞珧";
- Text[ korean ] = "韽磩 甏勴樃";
+ Text[ korean ] = "甏勴樃搿 氍蛾赴";
Text[ turkish ] = "Gruplama ayra鏻ar";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Par鑞tesi d'agrupament";
@@ -8998,7 +8998,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鍨傜洿绶ㄦ帓(2鍊嬪厓绱)";
Text[ arabic ] = "恃薯 幂揄 (阡昭卿)";
Text[ greek ] = "梳翎挈聃鲧 溟荇犷 (2 郁镩麇哚)";
- Text[ korean ] = "靾橃 氚办棿 (2 鞖旍唽)";
+ Text[ korean ] = "靾橃 氚办棿(2 鞖旍唽)";
Text[ turkish ] = "Dikey s齬alama (2 鲳e)";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Pila vertical (2 elements)";
@@ -9016,18 +9016,18 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "B鰎ja ny rad" ;
Text [ danish ] = "begynd p ny linje" ;
Text [ italian ] = "Inizia riga nuova" ;
- Text [ spanish ] = "Empezar l韓ea nueva" ;
+ Text [ spanish ] = "L韓ea nueva" ;
Text [ french ] = "Aller la ligne" ;
Text [ dutch ] = "met een nieuwe regel beginnen" ;
Text [ portuguese ] = "Come鏰r nova linha" ;
Text[ chinese_simplified ] = "鏂拌寮濮";
- Text[ russian ] = "杨玟囹 腓龛";
+ Text[ russian ] = "杨玟囹 眍怏 耱痤牦";
Text[ polish ] = "Rozpocznij now lini";
Text[ japanese ] = "鏀硅";
Text[ chinese_traditional ] = "鏂拌闁嬪";
Text[ arabic ] = "迂 滔硐";
Text[ greek ] = "狁鬓 磔狎 泷犰燹";
- Text[ korean ] = "靸堧鞖 頄 鞁滌瀾";
+ Text[ korean ] = "靸 欷 鞁滌瀾";
Text[ turkish ] = "Yeni sat齬";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Inici nova l韓ia";
@@ -9170,7 +9170,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ dutch ] = "kleine spatie" ;
Text [ portuguese ] = "Intervalo pequeno" ;
Text[ chinese_simplified ] = "Small Gap";
- Text[ russian ] = "暑痤蜿栝 镳铎彐篁铌";
+ Text[ russian ] = "暑痤蜿栝 镳钺咫";
Text[ polish ] = "Ma硑 odst阷";
Text[ japanese ] = "銈广儦銉笺偣灏";
Text[ chinese_traditional ] = "灏忛枔闅";
@@ -9209,7 +9209,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "宸﹀皪榻";
Text[ arabic ] = "阃切巧 裴 轻碛茄";
Text[ greek ] = "郁镞鏖箸 狁轶翦褴";
- Text[ korean ] = "鞕检鞐 毵烄钉";
+ Text[ korean ] = "鞕检 毵烄钉";
Text[ turkish ] = "Sola hizala";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Alinea a l'esquerra";
@@ -9268,7 +9268,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鍙冲皪榻";
Text[ arabic ] = "阃切巧 裴 轻磴礓";
Text[ greek ] = "郁镞鏖箸 溴铋";
- Text[ korean ] = "鞓るジ飒届棎 毵烄钉";
+ Text[ korean ] = "鞓るジ飒 毵烄钉";
Text[ turkish ] = "Sa餫 hizala";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Alinea a la dreta";
@@ -9320,7 +9320,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ dutch ] = "Spatie" ;
Text [ portuguese ] = "Intervalo" ;
Text[ chinese_simplified ] = "Gap";
- Text[ russian ] = "橡铎彐篁铌";
+ Text[ russian ] = "橡钺咫";
Text[ polish ] = "Odst阷 ramek";
Text[ japanese ] = "銈广儦銉笺偣";
Text[ chinese_traditional ] = "闁撻殧";
@@ -9484,7 +9484,7 @@ FloatingWindow RID_TOOLBOXWINDOW
TEXT[ chinese_traditional ] = "閬╃敤鍏ㄩ儴";
TEXT[ arabic ] = "後哚";
TEXT[ greek ] = "瞄 ";
- TEXT[ korean ] = "氇摖 ..鞐 雽頃";
+ TEXT[ korean ] = "氇憪 鞝侅毄";
TEXT[ turkish ] = "T黰 i鏸n";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Per a tots";
@@ -9813,13 +9813,13 @@ FloatingWindow RID_TOOLBOXWINDOW
TEXT[ spanish ] = "Puntos en el medio";
TEXT[ english_us ] = "Dots In Middle";
TEXT[ chinese_simplified ] = "涓悜鐐";
- TEXT[ russian ] = "翌麝 镱 皴疱滂礤";
+ TEXT[ russian ] = "翌麝 镱皴疱滂礤";
TEXT[ polish ] = "Kropki w 渞odku";
TEXT[ japanese ] = "銉夈儍銉堜腑澶";
TEXT[ chinese_traditional ] = "涓悜榛";
TEXT[ arabic ] = "滢秦 蓓 轻嬗";
TEXT[ greek ] = "曙蹶赀溴 赍眙襻耖箪蓓";
- TEXT[ korean ] = "臧鞖措嵃 鞝";
+ TEXT[ korean ] = "鞝愳潉 臧鞖措嵃搿";
TEXT[ turkish ] = "Noktalar (orta)";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Punts a la meitat";
@@ -9970,7 +9970,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ dutch ] = "Relaties" ;
Text [ portuguese ] = "Rela珲es" ;
Text[ chinese_simplified ] = "鍏崇郴";
- Text[ russian ] = "砚玷";
+ Text[ russian ] = "悟眍龛";
Text[ polish ] = "Relacje";
Text[ japanese ] = "姣旇純婕旂畻";
Text[ chinese_traditional ] = "闂滀總";
@@ -10187,7 +10187,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "鏍煎紡鍖";
Text[ arabic ] = "输禹";
Text[ greek ] = "田聆镳镩摅彘";
- Text[ korean ] = "靹滌嫕 歆鞝";
+ Text[ korean ] = "靹滌嫕";
Text[ turkish ] = "Format";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Formats";
@@ -10604,7 +10604,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ french ] = "Commandes" ; \
Text [ swedish ] = "Kommandon" ; \
Text [ dutch ] = "Commando磗" ; \
- Text [ spanish ] = "Comandos" ; \
+ Text [ spanish ] = "觬denes" ; \
Text [ english_us ] = "Commands" ; \
Text[ chinese_simplified ] = "鍛戒护"; \
Text[ russian ] = "暑爨礓"; \
@@ -10785,7 +10785,7 @@ String STR_STATSTR_READING
Text[ dutch ] = "Document wordt geladen...";
Text[ chinese_simplified ] = "姝e湪瑁呭叆鏂囨。...";
Text[ greek ] = "燥 葶泷狯 鲲耵弭衢...";
- Text[ korean ] = "氍胳劀 搿滊摐 欷...";
+ Text[ korean ] = "氍胳劀毳 搿滊摐頃橂姅 欷...";
Text[ turkish ] = "Belge y黭leniyor...";
Text[ catalan ] = "S'est carregant el document...";
Text[ thai ] = "喔佮赋喔ム副喔囙箓喔弗喔斷箑喔竵喔覆喔...";
@@ -10816,7 +10816,7 @@ String STR_STATSTR_WRITING
Text[ dutch ] = "Document wordt opgeslagen...";
Text[ chinese_simplified ] = "姝e湪瀛樼洏鏂囨。...";
Text[ greek ] = "琉镨揸艴箸 邈泷荟秕...";
- Text[ korean ] = "氍胳劀 鞝鞛 欷...";
+ Text[ korean ] = "氍胳劀 鞝鞛ロ晿電 欷...";
Text[ turkish ] = "Belge kaydediliyor...";
Text[ language_user1 ] = " ";
Text[ catalan ] = "S'est desant el document...";
@@ -10834,7 +10834,7 @@ String STR_MATH_DOCUMENT_FULLTYPE_60
Text[ greek ] = "%PRODUCTNAME 6.0 札痫";
Text[ dutch ] = "%PRODUCTNAME 6.0 Formule";
Text[ french ] = "%PRODUCTNAME 6.0 Formule";
- Text[ spanish ] = "%PRODUCTNAME 6.0 F髍mula";
+ Text[ spanish ] = "%PRODUCTNAME 6.0 - F髍mula";
Text[ italian ] = "%PRODUCTNAME 6.0 Formula";
Text[ danish ] = "%PRODUCTNAME 6.0-formel";
Text[ swedish ] = "%PRODUCTNAME 6.0 formel";
@@ -10858,7 +10858,7 @@ String STR_MATH_DOCUMENT_FULLTYPE_50
Text [ swedish ] = "%PRODUCTNAME 5.0 formel" ;
Text [ danish ] = "%PRODUCTNAME 5.0 formel" ;
Text [ italian ] = "Formula %PRODUCTNAME 5.0" ;
- Text [ spanish ] = "%PRODUCTNAME 5.0 F髍mula" ;
+ Text [ spanish ] = "%PRODUCTNAME 5.0 - F髍mula" ;
Text [ french ] = "%PRODUCTNAME 5.0 Formule" ;
Text [ dutch ] = "%PRODUCTNAME 5.0 Formule" ;
Text [ portuguese_brazilian ] = "%PRODUCTNAME 5.0 Formel" ;
@@ -10886,7 +10886,7 @@ String STR_MATH_DOCUMENT_FULLTYPE_40
Text [ swedish ] = "%PRODUCTNAME 4.0 formel" ;
Text [ danish ] = "%PRODUCTNAME 4.0 formel" ;
Text [ italian ] = "Formula %PRODUCTNAME 4.0" ;
- Text [ spanish ] = "%PRODUCTNAME 4.0 F髍mula" ;
+ Text [ spanish ] = "%PRODUCTNAME 4.0 - F髍mula" ;
Text [ french ] = "%PRODUCTNAME 4.0 Formule" ;
Text [ dutch ] = "%PRODUCTNAME 4.0 Formule" ;
Text [ portuguese_brazilian ] = "%PRODUCTNAME 4.0 Formel" ;
@@ -10914,7 +10914,7 @@ String STR_MATH_DOCUMENT_FULLTYPE_31
Text [ swedish ] = "%PRODUCTNAME 3.0 formel" ;
Text [ danish ] = "%PRODUCTNAME 3.0 formel" ;
Text [ italian ] = "Formula %PRODUCTNAME 3.0" ;
- Text [ spanish ] = "%PRODUCTNAME 3.0 F髍mula" ;
+ Text [ spanish ] = "%PRODUCTNAME 3.0 - F髍mula" ;
Text [ french ] = "%PRODUCTNAME 3.0 Formule" ;
Text [ dutch ] = "%PRODUCTNAME 3.0 Formule" ;
Text [ portuguese_brazilian ] = "%PRODUCTNAME 3.0 Formel" ;
@@ -10954,7 +10954,7 @@ String RID_SYMBOLFILESSTR
Text[ chinese_traditional ] = "鍦栫ず妾旀(*.sms)";
Text[ arabic ] = "(*.sms) 汜萸 轻雁嬉";
Text[ greek ] = "榴麇哚 篚焘 (*.sms)";
- Text[ korean ] = "旮绊樃 韺岇澕 (*.sms)";
+ Text[ korean ] = "旮绊樃 韺岇澕(*.sms)";
Text[ turkish ] = "Simge dosyalar (*.sms)";
Text[ catalan ] = "Fitxer de s韒bols (*.sms)";
Text[ finnish ] = "Symbolitiedostot (*.sms)";
@@ -11037,7 +11037,7 @@ String RID_ERR_UNKOWN
Text[ chinese_traditional ] = "鐧肩敓涓鍊嬩笉鏄庣殑閷銆";
Text[ arabic ] = "拖 呜 垌 阙焰";
Text[ greek ] = "嗅耧躞檐篝珀 茔睐篝 篥茈灬";
- Text[ korean ] = "鞎岆牑鞝 鞛堨 鞎婌潃 鞓る 氚滌儩";
+ Text[ korean ] = "鞎 靾 鞐嗠姅 鞓る臧 氚滌儩頄堨姷雼堧嫟";
Text[ turkish ] = "Bilinmeyen bir hata olu⺶u";
Text[ language_user1 ] = " ";
Text[ catalan ] = "S'ha produ飔 un error desconegut";
@@ -11336,7 +11336,7 @@ String RID_ERR_IDENTEXPECTED
Text [ italian ] = "Atteso identifier" ;
Text [ spanish ] = "Se requiere un identificador" ;
Text [ french ] = "Identificateur requis" ;
- Text [ swedish ] = "Identifier f鰎v鋘tad" ;
+ Text [ swedish ] = "Identifierare f鰎v鋘tad" ;
Text [ danish ] = "Identifikator forventes" ;
Text [ portuguese_brazilian ] = "Identifier erwartet" ;
Text [ portuguese ] = "Necess醨io identificador" ;
@@ -11403,7 +11403,7 @@ String RID_ERR_COLOREXPECTED
Text[ chinese_traditional ] = "鏈熷緟椤忚壊";
Text[ arabic ] = "阖徭 徭";
Text[ greek ] = "琉衢翦唪衢 黢";
- Text[ korean ] = "靸夓儊, 頃勳殧頃";
+ Text[ korean ] = "靸夓儊鞚 頃勳殧頃╇媹雼.";
Text[ turkish ] = "Renk gerekli";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Es necessita un color";
@@ -11650,13 +11650,13 @@ ToolBox RID_MATH_TOOLBOX
Text [ portuguese ] = "F髍mula inteira" ;
Text [ portuguese_brazilian ] = "Ganze Formel" ;
Text[ chinese_simplified ] = "鏁翠釜鍏紡";
- Text[ russian ] = "埋 纛痨箅";
+ Text[ russian ] = "项赅玎螯 怦";
Text[ polish ] = "Ca砤 formu砤";
Text[ japanese ] = "鏁板紡鍏ㄤ綋";
Text[ chinese_traditional ] = "鏁村嬪叕寮";
Text[ arabic ] = "枕凵 咔汜";
Text[ greek ] = "想腌耧 酏痫";
- Text[ korean ] = "齑 靾橃嫕";
+ Text[ korean ] = "鞝勳泊 靾橃嫕";
Text[ turkish ] = "T黰 form黮";
Text[ language_user1 ] = " ";
Text[ catalan ] = "F髍mula completa";
@@ -11812,3 +11812,8 @@ String RID_MATH_TOOLBOX
+
+
+
+
+
diff --git a/starmath/source/symbol.src b/starmath/source/symbol.src
index 5e7dac5ef318..01dfd78ac485 100644
--- a/starmath/source/symbol.src
+++ b/starmath/source/symbol.src
@@ -2,9 +2,9 @@
*
* $RCSfile: symbol.src,v $
*
- * $Revision: 1.40 $
+ * $Revision: 1.41 $
*
- * last change: $Author: kz $ $Date: 2002-09-05 18:20:43 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:22 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -252,8 +252,8 @@ Resource RID_LOCALIZED_NAMES
};
ItemList [ russian ] =
{
- < "灭鬻羼觇 嚯羿忤" ; > ;
- < "扬弼栲朦睇 耔焘铍" ; > ;
+ < "灭鬻羼觇" ; > ;
+ < "扬弼栲朦睇" ; > ;
};
ItemList [ greek ] =
{
@@ -277,8 +277,8 @@ Resource RID_LOCALIZED_NAMES
};
ItemList [ finnish ] =
{
- < "kreikka" ; > ;
- < "Erikoinen" ; > ;
+ < "kreikkalaiset" ; > ;
+ < "erikoismerkit" ; > ;
};
ItemList [ italian ] =
{
@@ -313,7 +313,7 @@ Resource RID_LOCALIZED_NAMES
ItemList [ korean ] =
{
< "攴鸽Μ鞀れ柎" ; > ;
- < "鞝勳毄" ; > ;
+ < "靾橅暀 韸轨垬旮绊樃" ; > ;
};
ItemList [ chinese_simplified ] =
{
@@ -337,9 +337,14 @@ Resource RID_LOCALIZED_NAMES
};
ItemList [ catalan ] =
{
- < "Griechisch" ; > ;
+ < "Grec" ; > ;
< "Especialitzat" ; > ;
};
+ ItemList [ thai ] =
+ {
+ < "喔佮福喔掂竵" ; > ;
+ < "喔炧复喙喔ㄠ俯" ; > ;
+ };
};
StringArray RID_EXPORT_SYMBOL_NAMES
@@ -784,7 +789,7 @@ Resource RID_LOCALIZED_NAMES
< "赅镲" ; > ;
< "世舷" ; > ;
< "灬溧" ; > ;
- < "死塘睦" ; > ;
+ < "诉塘睦" ; > ;
< "忐" ; > ;
< "剔" ; > ;
< "睨" ; > ;
@@ -817,14 +822,14 @@ Resource RID_LOCALIZED_NAMES
< "嚯屦磬. 痤" ; > ;
< "嚯屦磬. 耔沆" ; > ;
< "嚯屦磬. 翳" ; > ;
- < "屐屙" ; > ;
- < "徨鏮屐屙蜞" ; > ;
- < "戾睃_麇" ; > ;
- < "犷朦_麇" ; > ;
- < "礤_疣忭" ; > ;
+ < "镳桧噤脲骅" ; > ;
+ < "礤 镳桧噤脲骅" ; > ;
+ < "戾睃 麇" ; > ;
+ < "犷朦 麇" ; > ;
+ < "礤 疣忭" ; > ;
< "桎屙蜩黜" ; > ;
- < "镳栳腓驽眄" ; > ;
- < "徨耜铐鬻眍" ; > ;
+ < "耱疱扈蝰 " ; > ;
+ < "徨耜铐鬻眍耱" ; > ;
< "筱铍" ; > ;
< "镳铎桦脲" ; > ;
< "" ; > ;
@@ -1067,8 +1072,8 @@ Resource RID_LOCALIZED_NAMES
< "NY" ; > ;
< "xi" ; > ;
< "XI" ; > ;
- < "髆ikron" ; > ;
- < "覯IKRON" ; > ;
+ < "omicr髇" ; > ;
+ < "OMICRON" ; > ;
< "pi" ; > ;
< "PI" ; > ;
< "rho" ; > ;
@@ -1179,10 +1184,10 @@ Resource RID_LOCALIZED_NAMES
{
< "alpha" ; > ;
< "ALPHA" ; > ;
- < "Beta" ; > ;
- < "Beta" ; > ;
- < "Gamma" ; > ;
- < "Gamma" ; > ;
+ < "beta" ; > ;
+ < "BETA" ; > ;
+ < "gamma" ; > ;
+ < "GAMMA" ; > ;
< "delta" ; > ;
< "DELTA" ; > ;
< "epsilon" ; > ;
@@ -1197,8 +1202,8 @@ Resource RID_LOCALIZED_NAMES
< "JOTA" ; > ;
< "kappa" ; > ;
< "KAPPA" ; > ;
- < "Lambda" ; > ;
- < "Lambda" ; > ;
+ < "lambda" ; > ;
+ < "LAMBDA" ; > ;
< "my" ; > ;
< "MY" ; > ;
< "ny" ; > ;
@@ -1207,7 +1212,7 @@ Resource RID_LOCALIZED_NAMES
< "XI " ; > ;
< "omikron" ; > ;
< "OMIKRON" ; > ;
- < "PI" ; > ;
+ < "pi" ; > ;
< "PI" ; > ;
< "rho" ; > ;
< "RHO" ; > ;
@@ -1578,15 +1583,15 @@ Resource RID_LOCALIZED_NAMES
< "varphi" ; > ;
< "鞖旍唽" ; > ;
< "鞖旍唽鞐嗢潓" ; > ;
- < "鞐愲箘頃挫瀾鞚" ; > ;
- < "鞐愲箘頃错伡" ; > ;
+ < "牍勴暣鞛戩潓" ; > ;
+ < "氤措嫟 韥" ; > ;
< "臧欖鞎婌潓" ; > ;
< "鞚检箻" ; > ;
- < "瓴巾枼" ; > ;
+ < "鞝戧芳" ; > ;
< "氍错暅" ; > ;
- < "臧" ; > ;
- < "觳滊秳鞚橃澕" ; > ;
- < "攴鸽Μ瓿" ; > ;
+ < "臧侂弰" ; > ;
+ < "觳滊秳鞙" ; > ;
+ < "鞕(瓿)" ; > ;
< "霕愲姅" ; > ;
};
ItemList [ chinese_simplified ] =
@@ -1867,8 +1872,8 @@ Resource RID_LOCALIZED_NAMES
};
ItemList [ catalan ] =
{
- < "Alfa" ; > ;
- < "Alfa" ; > ;
+ < "alpha" ; > ;
+ < "ALPHA" ; > ;
< "beta" ; > ;
< "BETA" ; > ;
< "gamma" ; > ;
@@ -1925,8 +1930,8 @@ Resource RID_LOCALIZED_NAMES
< "keinelement" ; > ;
< "kleingegen" ; > ;
< "gro遟egen" ; > ;
- < "diferent" ; > ;
- < "EXACT" ; > ;
+ < "ungleich" ; > ;
+ < "identisch" ; > ;
< "strebt" ; > ;
< "unendlich" ; > ;
< "winkel" ; > ;
@@ -1942,66 +1947,135 @@ Resource RID_LOCALIZED_NAMES
< "beeta" ; > ;
< "Gamma" ; > ;
< "Gamma" ; > ;
- < "delta" ; > ;
- < "DELTA" ; > ;
- < "epsilon" ; > ;
- < "EPSILON" ; > ;
- < "zeta" ; > ;
- < "ZETA" ; > ;
- < "eta" ; > ;
- < "ETA" ; > ;
- < "theta" ; > ;
- < "THETA" ; > ;
- < "jota" ; > ;
- < "JOTA" ; > ;
- < "kappa" ; > ;
- < "KAPPA" ; > ;
- < "lambda" ; > ;
- < "LAMBDA" ; > ;
- < "my" ; > ;
- < "MY" ; > ;
- < "ny" ; > ;
- < "NY" ; > ;
- < "xi" ; > ;
- < "XI" ; > ;
- < "omikron" ; > ;
- < "OMIKRON" ; > ;
- < "PI" ; > ;
- < "PI" ; > ;
- < "rho" ; > ;
- < "RHO" ; > ;
- < "sigma" ; > ;
- < "SIGMA" ; > ;
- < "tau" ; > ;
- < "TAU" ; > ;
- < "ypsilon" ; > ;
- < "YPSILON" ; > ;
- < "phi" ; > ;
- < "PHI" ; > ;
- < "chi" ; > ;
- < "CHI" ; > ;
- < "psi" ; > ;
- < "PSI" ; > ;
- < "omega" ; > ;
- < "OMEGA" ; > ;
- < "varepsilon" ; > ;
- < "vartheta" ; > ;
- < "varpi" ; > ;
- < "varrho" ; > ;
- < "varsigma" ; > ;
- < "varphi" ; > ;
+ < "Delta" ; > ;
+ < "Delta" ; > ;
+ < "Epsilon" ; > ;
+ < "Epsilon" ; > ;
+ < "Zeeta" ; > ;
+ < "Zeeta" ; > ;
+ < "Eeta" ; > ;
+ < "Eeta" ; > ;
+ < "Theeta" ; > ;
+ < "Theeta" ; > ;
+ < "Ioota" ; > ;
+ < "Ioota" ; > ;
+ < "Kappa" ; > ;
+ < "Kappa" ; > ;
+ < "Lambda" ; > ;
+ < "Lambda" ; > ;
+ < "Myy" ; > ;
+ < "Myy" ; > ;
+ < "Nyy" ; > ;
+ < "Nyy" ; > ;
+ < "Ksii" ; > ;
+ < "Ksii" ; > ;
+ < "Omikron" ; > ;
+ < "Omikron" ; > ;
+ < "Pii" ; > ;
+ < "Pii" ; > ;
+ < "Rhoo" ; > ;
+ < "Rhoo" ; > ;
+ < "Sigma" ; > ;
+ < "Sigma" ; > ;
+ < "Tau" ; > ;
+ < "Tau" ; > ;
+ < "Ypsilon" ; > ;
+ < "Ypsilon" ; > ;
+ < "Fii" ; > ;
+ < "Fii" ; > ;
+ < "Khii" ; > ;
+ < "Khii" ; > ;
+ < "Psii" ; > ;
+ < "Psii" ; > ;
+ < "Omega" ; > ;
+ < "Omega" ; > ;
+ < "Varepsilon" ; > ;
+ < "Vartheeta" ; > ;
+ < "Varpii" ; > ;
+ < "Varrhoo" ; > ;
+ < "Varsigma" ; > ;
+ < "Varfii" ; > ;
< "element" ; > ;
- < "keinelement" ; > ;
- < "kleingegen" ; > ;
- < "gro遟egen" ; > ;
- < "ei yht suuri kuin" ; > ;
- < "EXACT" ; > ;
- < "strebt" ; > ;
- < "匿rett鰉yys" ; > ;
- < "Kulma" ; > ;
- < "promille" ; > ;
- < "ja" ; > ;
- < "Tai" ; > ;
+ < "noelement" ; > ;
+ < "strictlylessthan" ; > ;
+ < "strictlygreaterthan" ; > ;
+ < "notequal" ; > ;
+ < "identical" ; > ;
+ < "tendto" ; > ;
+ < "infinite" ; > ;
+ < "angle" ; > ;
+ < "perthousand" ; > ;
+ < "and" ; > ;
+ < "or" ; > ;
+ };
+ ItemList [ thai ] =
+ {
+ < "喔副喔ム笩喙堗覆" ; > ;
+ < "喔副喔ム笩喙堗覆" ; > ;
+ < "喙喔氞笗喙夃覆" ; > ;
+ < "喙喔氞笗喙夃覆" ; > ;
+ < "喙佮竵喔∴浮喙堗覆" ; > ;
+ < "喙佮竵喔∴浮喙堗覆" ; > ;
+ < "喙喔斷弗喔曕箟喔" ; > ;
+ < "喙喔斷弗喔曕箟喔" ; > ;
+ < "喙喔笧喔嬥复喔ム腑喔" ; > ;
+ < "喙喔笧喔嬥复喔ム腑喔" ; > ;
+ < "喔嬥傅喔曕箟喔" ; > ;
+ < "喔嬥傅喔曕箟喔" ; > ;
+ < "喔傅喔曕箟喔" ; > ;
+ < "喔傅喔曕箟喔" ; > ;
+ < "喔樴傅喔曕箟喔" ; > ;
+ < "喔樴傅喔曕箟喔" ; > ;
+ < "喙勦腑喙傕腑喔曕箟喔" ; > ;
+ < "喙勦腑喙傕腑喔曕箟喔" ; > ;
+ < "喙佮竸喔涏笡喙夃覆" ; > ;
+ < "喙佮竸喔涏笡喙夃覆" ; > ;
+ < "喙佮弗喔∴笟喙屶笖喙夃覆" ; > ;
+ < "喙佮弗喔∴笟喙屶笖喙夃覆" ; > ;
+ < "喔∴复喔" ; > ;
+ < "喔∴复喔" ; > ;
+ < "喔權复喔" ; > ;
+ < "喔權复喔" ; > ;
+ < "喙勦笅" ; > ;
+ < "喙勦笅" ; > ;
+ < "喙傕腑喙勦浮喔勦福喔笝" ; > ;
+ < "喙傕腑喙勦浮喔勦福喔笝" ; > ;
+ < "喙勦笧" ; > ;
+ < "喙勦笧" ; > ;
+ < "喙傕福" ; > ;
+ < "喙傕福" ; > ;
+ < "喔嬥复喔佮浮喙堗覆" ; > ;
+ < "喔嬥复喔佮浮喙堗覆" ; > ;
+ < "喔椸腑" ; > ;
+ < "喔椸腑" ; > ;
+ < "喔副喔炧笅喔脆弗喔笝" ; > ;
+ < "喔副喔炧笅喔脆弗喔笝" ; > ;
+ < "喙勦笩" ; > ;
+ < "喙勦笩" ; > ;
+ < "喙勦竸" ; > ;
+ < "喙勦竸" ; > ;
+ < "喔炧箘喔" ; > ;
+ < "喔炧箘喔" ; > ;
+ < "喙傕腑喙喔∴竵喙夃覆" ; > ;
+ < "喙傕腑喙喔∴竵喙夃覆" ; > ;
+ < "喔о覆喔`箤喙喔笧喔嬥复喔ム腑喔" ; > ;
+ < "喔о覆喔`箤喙喔樴笗喔" ; > ;
+ < "喔о覆喔`箤喙勦笧" ; > ;
+ < "喔о覆喔`箤喙傕福" ; > ;
+ < "喔о覆喔`箤喔嬥复喔佮浮喙堗覆" ; > ;
+ < "喔о覆喔`箤喙勦笩" ; > ;
+ < "喔竾喔勦箤喔涏福喔班竵喔笟" ; > ;
+ < "喙勦浮喙堗浮喔掂腑喔囙竸喙屶笡喔`赴喔佮腑喔" ; > ;
+ < "喔堗赋喔佮副喔斷笝喙夃腑喔⑧竵喔о箞喔" ; > ;
+ < "喔堗赋喔佮副喔斷浮喔侧竵喔佮抚喙堗覆" ; > ;
+ < "喙勦浮喙堗箑喔椸箞喔侧竵喔编笟" ; > ;
+ < "喙喔浮喔粪腑喔權竵喔编笝" ; > ;
+ < "喙傕笝喙夃浮喙喔傅喔⑧竾喙勦笡喔⑧副喔" ; > ;
+ < "喔笝喔编笝喔曕箤" ; > ;
+ < "喔∴父喔" ; > ;
+ < "喔曕箞喔笧喔编笝" ; > ;
+ < "喙佮弗喔" ; > ;
+ < "or" ; > ;
};
};
};
@@ -2030,3 +2104,8 @@ Resource RID_LOCALIZED_NAMES
+
+
+
+
+
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 5aee9869b91a..7e3a790a4acf 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: view.cxx,v $
*
- * $Revision: 1.27 $
+ * $Revision: 1.28 $
*
- * last change: $Author: tl $ $Date: 2002-12-12 15:40:19 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:58:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -214,14 +214,14 @@ void SmGraphicWindow::StateChanged( StateChangedType eType )
}
-void SmGraphicWindow::ApplyColorConfigValues( const svx::ColorConfig &rColorCfg )
+void SmGraphicWindow::ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg )
{
// Note: SetTextColor not necessary since the nodes that
// get painted have the color information.
#ifdef DEBUG
- ColorData nVal = rColorCfg.GetColorValue(svx::DOCCOLOR).nColor;
+ ColorData nVal = rColorCfg.GetColorValue(svtools::DOCCOLOR).nColor;
#endif
- SetBackground( Color( (ColorData) rColorCfg.GetColorValue(svx::DOCCOLOR).nColor ) );
+ SetBackground( Color( (ColorData) rColorCfg.GetColorValue(svtools::DOCCOLOR).nColor ) );
Invalidate();
}
diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk
index c9c078b0ab53..e65576944ea5 100644
--- a/starmath/util/makefile.mk
+++ b/starmath/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
-# last change: $Author: tl $ $Date: 2002-07-22 13:21:05 $
+# last change: $Author: hr $ $Date: 2003-03-27 11:58:27 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -66,6 +66,7 @@ PRJNAME=SM
TARGET=smath3
LIBTARGET=NO
GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
USE_DEFFILE=TRUE
# --- Settings -----------------------------------------------------------
@@ -125,13 +126,6 @@ DEF1EXPORTFILE= exports.dxp
# --- Targets -------------------------------------------------------------
-.IF "$(depend)" == ""
-
-ALL: \
- $(SRS)$/hidother.hid\
- ALLTAR
-.ENDIF
-
.INCLUDE : target.mk
.IF "$(depend)" == ""
@@ -145,13 +139,3 @@ $(MISC)$/$(SHL1TARGET).flt:
.ENDIF
-$(MISC)$/$(PRJNAME).hid : $(SRS)$/hidother.hid
-
-$(SRS)$/hidother.hid: hidother.src
-.IF "$(GUI)$(CPU)"=="WNTI"
-.IF "$(BUILD_SOSL)"==""
- @+-mhids hidother.src $(SRS) $(PRJNAME) dummy $(INCLUDE)
-.ENDIF
-.ELSE
- @echo nix
-.ENDIF