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
Diffstat
-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 ] = "Oprateurs u~naires/binaires" ;
- Text [ dutch ] = "~Unaire/binaire operatoren" ;
+ Text [ dutch ] = "~Monadische/binaire operatoren" ;
Text [ portuguese ] = "Operadores ~unrios/binrios" ;
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 ] = "P񍀉Zq(~U)";
- Text[ chinese_traditional ] = "@/GB(~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 ileler";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Operadores ~unarios/binarios";
- Text[ finnish ] = "~Unaari-/binrioperaattorit";
+ 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 ] = "rZ(~R)";
- Text[ chinese_traditional ] = "Y(~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 ] = "likiler";
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 ] = "WZ(~S)";
- Text[ chinese_traditional ] = "ƶqp(~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 ] = "Kme ilemleri";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Operaciones de conjuntos";
- Text[ finnish ] = "~Mrit 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 ] = "L";
+ 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 ] = "Dier";
- 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 ] = "Zq(~P)";
- Text[ chinese_traditional ] = "B(~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 ] = "leler";
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 ] = "znitelikler";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Atributos";
+ Text[ catalan ] = "~Atributs";
Text[ finnish ] = "~Mritteet";
+ 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 ] = "A(~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 ] = "Ayralar";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Parntesis";
+ Text[ catalan ] = "~Parntesi";
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 lnea";
+ Text[ spanish ] = "lnea nueva";
Text[ english_us ] = "New Line";
- Text[ chinese_simplified ] = "";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "换行";
+ Text[ russian ] = " ";
Text[ polish ] = "nowy wiersz";
- Text[ japanese ] = "Vs";
- 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 satr";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "nueva lnea";
- Text[ finnish ] = "Uusi viiva";
+ Text[ catalan ] = "lnia nova";
+ Text[ finnish ] = "Rivinvaihto";
+ Text[ thai ] = "บรรทัดใหม่";
};
MenuItem
{
@@ -1589,20 +1598,21 @@ Menu RID_COMMANDMENU
Text[ dutch ] = "kleine spatie";
Text[ spanish ] = "espacio pequeo";
Text[ english_us ] = "Small Gap";
- Text[ chinese_simplified ] = "С";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "小间隔";
+ Text[ russian ] = " ";
Text[ polish ] = "May odstp";
- Text[ japanese ] = "߰";
- Text[ chinese_traditional ] = "pj";
+ 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 ] = "Kk aralk";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "espacio pequeo";
- Text[ finnish ] = "Pieni vli";
+ Text[ catalan ] = "espai petit";
+ Text[ finnish ] = "Kapea vli";
+ 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 ] = "Odstp ramek";
- Text[ japanese ] = "߰";
- Text[ chinese_traditional ] = "j";
+ Text[ japanese ] = "スペース";
+ Text[ chinese_traditional ] = "間隔";
Text[ dutch ] = "spatie";
- Text[ chinese_simplified ] = "";
+ Text[ chinese_simplified ] = "间隔";
Text[ greek ] = "";
- Text[ korean ] = "";
+ Text[ korean ] = "간격";
Text[ arabic ] = "";
Text[ turkish ] = "Aralk";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "espacio";
+ Text[ catalan ] = "Espai";
Text[ finnish ] = "Vli";
+ 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 ] = "L(~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 ] = "Dier";
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 ] = "Yaztipi:";
@@ -301,7 +301,7 @@ ModalDialog RID_FONTSIZEDIALOG
Text[ polish ] = "Domylnie";
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 ] = "ndisler:";
@@ -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 ] = "leler:";
@@ -562,7 +562,7 @@ ModalDialog RID_FONTSIZEDIALOG
Text[ chinese_traditional ] = "相對大小";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "상대적 크기";
+ Text[ korean ] = "비례하는 크기";
Text[ turkish ] = "Greceli boyutlar";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Mides relatives";
@@ -598,13 +598,13 @@ ModalDialog RID_FONTSIZEDIALOG
Text [ portuguese_brazilian ] = "~Standard" ;
Text [ portuguese ] = "~Padro" ;
Text[ chinese_simplified ] = "标准(~D)";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ polish ] = "Domylnie";
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 ] = "Kullanc yaztipleri";
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 ] = "Domylnie";
Text[ japanese ] = "標準(~D)";
Text[ arabic ] = "";
@@ -1038,7 +1038,7 @@ ModalDialog RID_FONTTYPEDIALOG
Text [ portuguese_brazilian ] = "~Standard" ;
Text [ portuguese ] = "~Padro" ;
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 ] = "Yaztipleri";
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 parnteses todos";
- Text[ russian ] = " ";
+ Text[ russian ] = "~ ";
Text[ dutch ] = "Alle haken op schaal brengen";
Text[ french ] = "Ajuster toutes les parenthses";
Text[ spanish ] = "Dimensionar todos los parntesis";
@@ -1278,13 +1278,13 @@ ModalDialog RID_DISTANCEDIALOG
Text [ portuguese_brazilian ] = "~Standard" ;
Text [ portuguese ] = "~Padro" ;
Text[ chinese_simplified ] = "标准(~D)";
- Text[ russian ] = "";
+ Text[ russian ] = " ";
Text[ polish ] = "Domylnie";
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 ] = "Kk aral:";
@@ -1539,7 +1539,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ polish ] = "Indeks grny";
Text[ portuguese_brazilian ] = "~Sobrescrito:";
Text[ japanese ] = "指数(~S)";
- Text[ korean ] = "위첨자(~S):";
+ Text[ korean ] = "위첨자(~S)";
Text[ chinese_simplified ] = "上标(~S)";
Text[ chinese_traditional ] = "上標(~S)";
Text[ turkish ] = "st simge:";
@@ -1632,7 +1632,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ greek ] = ":";
Text[ dutch ] = "~Noemerhoogte";
Text[ french ] = "Numrateur";
- Text[ spanish ] = "Altura del ~numerador";
+ Text[ spanish ] = "~Numerador";
Text[ finnish ] = "~Osoittaja";
Text[ italian ] = "Dist. ~numeratore";
Text[ danish ] = "~Tllerhjde";
@@ -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 ] = "Blen aral:";
@@ -1715,7 +1715,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ chinese_traditional ] = "分數線";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "분수 줄";
+ Text[ korean ] = "분수 표시줄";
Text[ turkish ] = "Kesir izgisi";
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 ] = "izgi kalnl:";
@@ -1932,7 +1932,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ greek ] = "~ (/):";
Text[ dutch ] = "~links/rechts extra groot:";
Text[ french ] = "Dpassement latral";
- Text[ spanish ] = "~Sobredimensin izq./der.";
+ Text[ spanish ] = "~Tamao lateral excesivo ";
Text[ finnish ] = "~Liskoko (vaakasuunnassa)";
Text[ italian ] = "Sovradim. (sin./des.)";
Text[ danish ] = "~venstre/hjre overstrrelse";
@@ -1962,7 +1962,7 @@ ModalDialog RID_DISTANCEDIALOG
Text [ ENGLISH ] = "~Distance:" ;
Text[ english_us ] = "~Spacing";
Text[ portuguese ] = "~Espaamento";
- Text[ russian ] = "";
+ Text[ russian ] = "~";
Text[ greek ] = "~:";
Text[ dutch ] = "~Afstand";
Text[ french ] = "cart";
@@ -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 ] = "Dpassement";
- Text[ spanish ] = "~Sobredimensin";
+ Text[ spanish ] = "~Tamao excesivo";
Text[ finnish ] = "~Viivan lispituus";
Text[ italian ] = "Sovradimensionato";
Text[ danish ] = "~Overstrrelse";
@@ -2265,7 +2265,7 @@ ModalDialog RID_DISTANCEDIALOG
Text[ greek ] = "~ :";
Text[ dutch ] = "~Extra groot";
Text[ french ] = "Dpassement";
- Text[ spanish ] = "~Sobredimensin";
+ Text[ spanish ] = "~Tamao excesivo";
Text[ finnish ] = "~Liskoko";
Text[ italian ] = "~Sovradimensionato";
Text[ danish ] = "~Overstrrelse";
@@ -2337,7 +2337,7 @@ ModalDialog RID_DISTANCEDIALOG
TEXT[ french ] = "Marges";
TEXT[ swedish ] = "Marginaler";
TEXT[ dutch ] = "Marges";
- TEXT[ spanish ] = "Mrgenes";
+ 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 ] = "~Padro" ;
Text [ portuguese_brazilian ] = "~Standard" ;
Text[ chinese_simplified ] = "标准(~D)";
- Text[ russian ] = "";
+ Text[ russian ] = " ";
Text[ polish ] = "Domylnie";
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 ] = "Gerek 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 ~pgina" ;
+ Text [ spanish ] = "~Ajustar a la pgina" ;
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 ] = "leklendirme";
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 ] = "Yaztipi:";
@@ -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 ] = "Yaztipi 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 ] = "Deitir";
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 ] = "Desea guardar los cambios como predeterminados?\n\nEstos cambios tendrn efecto en todas las nuevas frmulas." ;
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 domylne?\n\nZmiany te maj wpyw na wszystkie nowe formuy.";
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 ] = "Deiiklikler standart deerler olarak kaydedilsin mi?\n\nBu deiiklikler tm yeni formlleri etkileyecektir.";
Message[ language_user1 ] = " ";
Message[ catalan ] = "Voleu desar aquests canvis com a predeterminats?\n\nAquests canvis tindran efecte en totes les noves frmules.";
@@ -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 ] = ", Estndard";
@@ -3858,7 +3858,7 @@ String RID_FONTBOLD
Text[ chinese_traditional ] = "粗體";
Text[ arabic ] = "";
Text[ greek ] = ";";
- Text[ korean ] = ", 굵게";
+ Text[ korean ] = "굵게";
Text[ turkish ] = ", kaln";
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 ] = "Grnm %~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 ] = "Grnm %~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 ] = "Grnm %~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 ] = "Aralklar";
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 izgisi";
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 ] = "Mrgenes";
+ 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 ] = "Mrgenes";
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 ] = "Adio +" ;
Text[ chinese_simplified ] = "加法 +";
@@ -4815,7 +4815,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Multiplikation (punkt)" ;
Text [ danish ] = "multiplikation (punkt)" ;
Text [ italian ] = "Moltiplicazione (punto)" ;
- Text [ spanish ] = "Multiplicacin (Punto)" ;
+ Text [ spanish ] = "Multiplicacin (punto)" ;
Text [ french ] = "Multiplication (point)" ;
Text [ dutch ] = "Vermenigvuldigen (punt)" ;
Text [ portuguese ] = "Multiplicao (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 ] = "Subtraco -" ;
Text[ chinese_simplified ] = "减法 -";
@@ -5004,7 +5004,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "除法(一行雙點)";
Text[ arabic ] = "() ";
Text[ greek ] = "Division ()";
- Text[ korean ] = "나눗셈 ";
+ Text[ korean ] = "나눗셈 (나눗셈 기호)";
Text[ turkish ] = "Blme ()";
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 ] = "Blme (/)";
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 ] = "Eittir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "s igual";
@@ -5166,7 +5166,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "不等於";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "같지 않다.";
+ Text[ korean ] = "같지 않음";
Text[ turkish ] = "Eit deil";
Text[ language_user1 ] = " ";
Text[ catalan ] = "no s igual";
@@ -5195,7 +5195,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "近似等於";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "거의 같다";
+ Text[ korean ] = "거의 같음";
Text[ turkish ] = "Yaklak olarak eit";
Text[ language_user1 ] = " ";
Text[ catalan ] = "s 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 eittir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "s 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 ] = "s 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 ] = "s ortogonal a";
@@ -5466,7 +5466,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "大於或大於";
Text[ arabic ] = " ()";
Text[ greek ] = " ()";
- Text[ korean ] = "크거나 같다";
+ Text[ korean ] = "크거나 같음";
Text[ turkish ] = "Byktr ya da eittir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "s 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 ] = "s semblant a";
@@ -5524,7 +5524,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "全等於";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "에 합동";
+ Text[ korean ] = "합동";
Text[ turkish ] = "rtr";
Text[ language_user1 ] = " ";
Text[ catalan ] = "s congruent amb";
@@ -5590,7 +5590,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "大於或等於";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "크거나 같다";
+ Text[ korean ] = "크거나 같음";
Text[ turkish ] = "Byk ya da eittir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "s 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 ] = "Orantldr";
Text[ language_user1 ] = " ";
Text[ catalan ] = "s proporcional a";
@@ -5648,7 +5648,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "接近";
Text[ arabic ] = "";
Text[ greek ] = " ";
- Text[ korean ] = "진행 방향";
+ Text[ korean ] = "접근";
Text[ turkish ] = "Yn";
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 ift 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 saa ift 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 ] = "Saa ift ok";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Fletxa doble dreta";
@@ -5803,7 +5803,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "finns inte i" ;
Text [ danish ] = "tihrer 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 ] = "no contido em" ;
@@ -5898,7 +5898,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Genomsnitt" ;
Text [ danish ] = "fllesmngde" ;
Text [ italian ] = "Intersezione" ;
- Text [ spanish ] = "Promedio" ;
+ Text [ spanish ] = "Interseccin" ;
Text [ french ] = "Intersection" ;
Text [ dutch ] = "Gemiddelde" ;
Text [ portuguese ] = "Mdia" ;
@@ -6182,7 +6182,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "非子集";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "부분집합이 아니다.";
+ Text[ korean ] = "부분집합 아님";
Text[ turkish ] = "Alt kmesi deil";
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 ] = "st kmesi deil";
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 ] = "s";
TEXT[ language_user1 ] = " ";
TEXT[ catalan ] = "Potncia";
@@ -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 ] = "Arksins";
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 ] = "Kk 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 sins";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Sinus hiperblic d'rea";
@@ -7090,7 +7090,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "餘弦雙曲面";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "면적 쌍곡선 코사인";
+ Text[ korean ] = "쌍곡선 코사인";
Text[ turkish ] = "Alan hiperbolik kosins";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Cosinus hiperblic d'rea";
@@ -7119,7 +7119,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "正切雙曲面";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "면적쌍곡선 탄젠트";
+ Text[ korean ] = "쌍곡선 탄젠트";
Text[ turkish ] = "Alan hiperbolik tanjant";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Tangent hiperblica d'rea";
@@ -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 hiperblica d'rea";
@@ -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 curvilnea" ;
+ Text [ spanish ] = "Integral curvilnea doble" ;
Text [ french ] = "Double intgrale de courbe" ;
Text [ dutch ] = "dubbele boogintegraal" ;
Text [ portuguese ] = "Dupla integral curvilnea" ;
@@ -7539,7 +7539,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Tredubbel kurvintegral" ;
Text [ danish ] = "tredobbelt kurveintegral" ;
Text [ italian ] = "Integrale curvilineo triplo" ;
- Text [ spanish ] = "Triple integral curvilnea" ;
+ Text [ spanish ] = "Integral curvilnea triple" ;
Text [ french ] = "Triple intgrale de courbe" ;
Text [ dutch ] = "drievoudige boogintegraal" ;
Text [ portuguese ] = "Tripla integral curvilnea" ;
@@ -7550,7 +7550,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "三重曲線積分";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "3중 선적분";
+ Text[ korean ] = "삼중 선적분";
Text[ turkish ] = "l eri 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 apka";
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 ] = "st izgi";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Lnia 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 ] = "ift 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 deitir";
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 ] = "Yaztipini deitir";
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 ] = "Keli 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 ] = "ift izgiler";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Lnies dobles";
@@ -8567,7 +8567,7 @@ FloatingWindow RID_TOOLBOXWINDOW
Text[ chinese_traditional ] = "小組括號";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "포괄 괄호";
+ Text[ korean ] = "괄호로 묶기";
Text[ turkish ] = "Gruplama ayralar";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Parntesi 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 sralama (2 e)";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Pila vertical (2 elements)";
@@ -9016,18 +9016,18 @@ FloatingWindow RID_TOOLBOXWINDOW
Text [ swedish ] = "Brja ny rad" ;
Text [ danish ] = "begynd p ny linje" ;
Text [ italian ] = "Inizia riga nuova" ;
- Text [ spanish ] = "Empezar lnea nueva" ;
+ Text [ spanish ] = "Lnea nueva" ;
Text [ french ] = "Aller la ligne" ;
Text [ dutch ] = "met een nieuwe regel beginnen" ;
Text [ portuguese ] = "Comear 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 satr";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Inici nova lnia";
@@ -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 ] = "May odstp";
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 ] = "Saa 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 ] = "Odstp 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 ] = "Tm iin";
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 rodku";
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 ] = "Relaes" ;
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 ] = "Commandos" ; \
- Text [ spanish ] = "Comandos" ; \
+ Text [ spanish ] = "rdenes" ; \
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 ] = "正在装入文档...";
Text[ greek ] = " ...";
- Text[ korean ] = "문서 로드 중...";
+ Text[ korean ] = "문서를 로드하는 중...";
Text[ turkish ] = "Belge ykleniyor...";
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 ] = "正在存盘文档...";
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 Frmula";
+ Text[ spanish ] = "%PRODUCTNAME 6.0 - Frmula";
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 Frmula" ;
+ Text [ spanish ] = "%PRODUCTNAME 5.0 - Frmula" ;
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 Frmula" ;
+ Text [ spanish ] = "%PRODUCTNAME 4.0 - Frmula" ;
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 Frmula" ;
+ Text [ spanish ] = "%PRODUCTNAME 3.0 - Frmula" ;
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 smbols (*.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 olutu";
Text[ language_user1 ] = " ";
Text[ catalan ] = "S'ha produt 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 frvntad" ;
+ Text [ swedish ] = "Identifierare frvntad" ;
Text [ danish ] = "Identifikator forventes" ;
Text [ portuguese_brazilian ] = "Identifier erwartet" ;
Text [ portuguese ] = "Necessrio 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 ] = "Frmula inteira" ;
Text [ portuguese_brazilian ] = "Ganze Formel" ;
Text[ chinese_simplified ] = "整个公式";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Caa formua";
Text[ japanese ] = "数式全体";
Text[ chinese_traditional ] = "整個公式";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "총 수식";
+ Text[ korean ] = "전체 수식";
Text[ turkish ] = "Tm forml";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Frmula 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" ; > ;
- < "mikron" ; > ;
- < "MIKRON" ; > ;
+ < "omicrn" ; > ;
+ < "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" ; > ;
< "grogegen" ; > ;
- < "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" ; > ;
- < "grogegen" ; > ;
- < "ei yht suuri kuin" ; > ;
- < "EXACT" ; > ;
- < "strebt" ; > ;
- < "rettmyys" ; > ;
- < "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
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 08:38:51 +0000