diff options
Diffstat (limited to 'sw/source')
364 files changed, 22931 insertions, 16732 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 2864690d86c9..253de82cdd06 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acccell.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: mib $ $Date: 2002-11-25 15:14:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -380,11 +380,14 @@ Sequence< Type > SAL_CALL SwAccessibleCell::getTypes() throw(RuntimeException) Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index a215555e7c45..cbb2b6413ba5 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acccontext.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: mib $ $Date: 2002-12-05 14:10:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -139,6 +139,9 @@ #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX #include <svx/AccessibleShape.hxx> #endif +#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER +#include <comphelper/accessibleeventnotifier.hxx> +#endif #if defined DEBUG && defined TEST_MIB #define DBG_MSG( _msg ) \ @@ -532,31 +535,8 @@ void SwAccessibleContext::FireAccessibleEvent( AccessibleEventObject& rEvent ) rEvent.Source = xThis; } - ::cppu::OInterfaceIteratorHelper aIter( aAccessibleEventListeners ); - while( aIter.hasMoreElements() ) - { - Reference < XAccessibleEventListener > xListener( aIter.next(), - UNO_QUERY ); - if( xListener.is() ) // TODO: test is unneccessary soon - { - try - { - xListener->notifyEvent( rEvent ); - } - catch( ::com::sun::star::uno::RuntimeException& r ) - { -#ifdef DEBUG - ByteString aError( "Runtime exception caught for event" ); - aError += ByteString::CreateFromInt32( rEvent.EventId ); - aError += ".:\n"; - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - DBG_ERROR( aError.GetBuffer() ); -#endif -// aIter.remove(); - } - } - } - + if (nClientId) + comphelper::AccessibleEventNotifier::addEvent( nClientId, rEvent ); } void SwAccessibleContext::FireVisibleDataEvent() @@ -615,10 +595,10 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM, const SwFrm *pF ) : SwAccessibleFrame( pM->GetVisArea().SVRect(), pF, pM->GetShell()->IsPreView() ), - aAccessibleEventListeners( aListenerMutex ), pMap( pM ), nRole( nR ), - bDisposing( sal_False ) + bDisposing( sal_False ), + nClientId(0) { InitStates(); DBG_MSG_CD( "constructed" ) @@ -631,10 +611,10 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM, SwAccessibleFrame( pM->GetVisArea().SVRect(), pF, pM->GetShell()->IsPreView() ), sName( rName ), - aAccessibleEventListeners( aListenerMutex ), pMap( pM ), nRole( nR ), - bDisposing( sal_False ) + bDisposing( sal_False ), + nClientId(0) { InitStates(); DBG_MSG_CD( "constructed" ) @@ -816,7 +796,14 @@ void SAL_CALL SwAccessibleContext::addEventListener( throw (::com::sun::star::uno::RuntimeException) { DBG_MSG( "accessible event listener added" ) - aAccessibleEventListeners.addInterface( xListener ); + + if (xListener.is()) + { + vos::OGuard aGuard(Application::GetSolarMutex()); + if (!nClientId) + nClientId = comphelper::AccessibleEventNotifier::registerClient( ); + comphelper::AccessibleEventNotifier::addEventListener( nClientId, xListener ); + } } void SAL_CALL SwAccessibleContext::removeEventListener( @@ -824,7 +811,21 @@ void SAL_CALL SwAccessibleContext::removeEventListener( throw (::com::sun::star::uno::RuntimeException) { DBG_MSG( "accessible event listener removed" ) - aAccessibleEventListeners.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; + } + } } static sal_Bool lcl_PointInRectangle(const awt::Point & aPoint, @@ -866,8 +867,8 @@ Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAt( Point aPixPoint( aPoint.X, aPoint.Y ); // px rel to parent if( !GetFrm()->IsRootFrm() ) { - Point aLogPos( GetBounds( GetFrm() ).Pos() ); // twip rel to doc root - Point aPixPos( GetMap()->CoreToPixel( aLogPos ) ); + SwRect aLogBounds( GetBounds( GetFrm() ) ); // twip rel to doc root + Point aPixPos( GetMap()->CoreToPixel( aLogBounds.SVRect() ).TopLeft() ); aPixPoint.X() += aPixPos.X(); aPixPoint.Y() += aPixPos.Y(); } @@ -924,15 +925,20 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative) { ASSERT( GetShell()->IsPreView(), "empty page accessible?" ); if( GetShell()->IsPreView() ) - aLogBounds.SSize( GetMap()->GetPreViewPageSize() ); + { + // OD 15.01.2003 #103492# - adjust method call <GetMap()->GetPreViewPageSize()> + sal_uInt16 nPageNum = + static_cast < const SwPageFrm * >( GetFrm() )->GetPhyPageNum(); + aLogBounds.SSize( GetMap()->GetPreViewPageSize( nPageNum ) ); + } } if( !aLogBounds.IsEmpty() ) { aPixBounds = GetMap()->CoreToPixel( aLogBounds.SVRect() ); if( !pParent->IsRootFrm() && bRelative) { - Point aParentLogPos( GetBounds( pParent ).Pos() ); // twip rel to doc root - Point aParentPixPos( GetMap()->CoreToPixel( aParentLogPos ) ); + SwRect aParentLogBounds( GetBounds( pParent ) ); // twip rel to doc root + Point aParentPixPos( GetMap()->CoreToPixel( aParentLogBounds.SVRect() ).TopLeft() ); aPixBounds.Move( -aParentPixPos.X(), -aParentPixPos.Y() ); } } @@ -1150,10 +1156,10 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive ) } // broadcast dispose event + if ( nClientId ) { - EventObject aEvent; - aEvent.Source = xThis; - aAccessibleEventListeners.disposeAndClear( aEvent ); + comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, *this ); + nClientId = 0; DBG_MSG_CD( "dispose" ) } diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index e1a984d95a72..832d64d41d2d 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: acccontext.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: mib $ $Date: 2002-10-29 14:05:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -140,7 +140,6 @@ protected: private: ::rtl::OUString sName; // immutable outside constructor - ::cppu::OInterfaceContainerHelper aAccessibleEventListeners; // The parent if it has been retrieved. This is always an // SwAccessibleContext. (protected by Mutex) @@ -149,6 +148,7 @@ private: SwAccessibleMap *pMap; // must be protected by solar mutex + sal_uInt32 nClientId; // client id in the AccessibleEventNotifier queue sal_Int16 nRole; // immutable outside constructor // The current states (protected by mutex) diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index f58ea220b161..6398729b0baf 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accdoc.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hbrinkm $ $Date: 2002-10-02 08:48:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -514,11 +514,14 @@ Sequence< Type > SAL_CALL SwAccessibleDocument::getTypes() throw(RuntimeExceptio Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 53acc19460d6..331ae57e14c6 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accembedded.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mib $ $Date: 2002-08-15 10:25:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,10 @@ #pragma hdrstop +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif + #ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_ #include <drafts/com/sun/star/accessibility/AccessibleRole.hpp> #endif @@ -132,10 +136,13 @@ Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServiceNam Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index c8d9874f642c..ea272622d3c8 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accfootnote.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mib $ $Date: 2002-12-05 14:32:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,11 +213,14 @@ Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames() Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index f958e8828fc6..8a5680659eed 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accgraphic.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mib $ $Date: 2002-08-15 10:25:12 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,10 @@ #pragma hdrstop +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif + #ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_ #include <drafts/com/sun/star/accessibility/AccessibleRole.hpp> #endif @@ -131,10 +135,13 @@ Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames() Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index 15604c509ab6..c61e327c18a9 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accheaderfooter.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mib $ $Date: 2002-12-05 14:32:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -190,10 +190,13 @@ Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 90c9fff643b9..bf09b4b517fb 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accmap.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: mib $ $Date: 2002-09-27 11:44:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -184,7 +184,10 @@ #ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> #endif - +// OD 15.01.2003 #103492# +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif using namespace ::com::sun::star::uno; using namespace ::drafts::com::sun::star::accessibility; @@ -1084,27 +1087,23 @@ Reference< XAccessible > SwAccessibleMap::GetDocumentView( ) return _GetDocumentView( sal_False ); } +// OD 14.01.2003 #103492# - complete re-factoring of method due to new page/print +// preview functionality. Reference<XAccessible> SwAccessibleMap::GetDocumentPreview( - sal_uInt8 nRow, - sal_uInt8 nColumn, - sal_Int16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - sal_uInt16 nSelectedPage ) + const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ) { // create & update preview data object if( mpPreview == NULL ) mpPreview = new SwAccPreviewData(); - mpPreview->Update( nRow, nColumn, nStartPage, - rPageSize, rFreePoint, rScale, GetShell(), - nSelectedPage ); + mpPreview->Update( _rPrevwPages, _rScale, _pSelectedPageFrm, _rPrevwWinSize ); Reference<XAccessible> xAcc = _GetDocumentView( sal_True ); return xAcc; } - Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm, sal_Bool bCreate ) { @@ -1836,19 +1835,18 @@ void SwAccessibleMap::InvalidateRelationSet( const SwFrm* pMaster, _InvalidateRelationSet( pFollow, sal_True ); } -void SwAccessibleMap::UpdatePreview( sal_uInt8 nRow, sal_uInt8 nColumn, - sal_Int16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - sal_uInt16 nSelectedPage ) +// OD 15.01.2003 #103492# - complete re-factoring of method due to new page/print +// preview functionality. +void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ) { DBG_ASSERT( GetShell()->IsPreView(), "no preview?" ); DBG_ASSERT( mpPreview != NULL, "no preview data?" ); - mpPreview->Update( nRow, nColumn, nStartPage, - rPageSize, rFreePoint, rScale, GetShell(), - nSelectedPage ); + // OD 15.01.2003 #103492# - adjustments for changed method signature + mpPreview->Update( _rPrevwPages, _rScale, _pSelectedPageFrm, _rPrevwWinSize ); // propagate change of VisArea through the document's // accessibility tree; this will also send appropriate scroll @@ -1885,7 +1883,8 @@ void SwAccessibleMap::InvalidatePreViewSelection( sal_uInt16 nSelPage ) DBG_ASSERT( GetShell()->IsPreView(), "no preview?" ); DBG_ASSERT( mpPreview != NULL, "no preview data?" ); - mpPreview->InvalidateSelection( nSelPage ); + // OD 16.01.2003 #103492# - changed metthod call due to method signature change. + mpPreview->InvalidateSelection( GetShell()->GetLayout()->GetPageByPageNum( nSelPage ) ); Reference < XAccessible > xOldAcc; Reference < XAccessible > xAcc; @@ -1974,7 +1973,10 @@ Point SwAccessibleMap::LogicToPixel( const Point& rPoint ) const Window *pWin = GetShell()->GetWin(); if( pWin ) { - aPoint = pWin->LogicToPixel( aPoint ); + // OD 16.01.2003 #103492# - get mapping mode for LogicToPixel conversion + MapMode aMapMode; + GetMapMode( aPoint, aMapMode ); + aPoint = pWin->LogicToPixel( aPoint, aMapMode ); aPoint = pWin->OutputToAbsoluteScreenPixel( aPoint ); } @@ -1988,7 +1990,10 @@ Size SwAccessibleMap::LogicToPixel( const Size& rSize ) const Size aSize( OutputDevice::LogicToLogic( rSize, aSrc, aDest ) ); if( GetShell()->GetWin() ) { - aSize = GetShell()->GetWin()->LogicToPixel( aSize ); + // OD 16.01.2003 #103492# - get mapping mode for LogicToPixel conversion + MapMode aMapMode; + GetMapMode( Point(0,0), aMapMode ); + aSize = GetShell()->GetWin()->LogicToPixel( aSize, aMapMode ); } return aSize; @@ -2001,7 +2006,10 @@ Point SwAccessibleMap::PixelToLogic( const Point& rPoint ) const if( pWin ) { aPoint = pWin->ScreenToOutputPixel( rPoint ); - aPoint = pWin->PixelToLogic( aPoint ); + // OD 16.01.2003 #103492# - get mapping mode for PixelToLogic conversion + MapMode aMapMode; + GetMapMode( aPoint, aMapMode ); + aPoint = pWin->PixelToLogic( aPoint, aMapMode ); MapMode aSrc( MAP_TWIP ); MapMode aDest( MAP_100TH_MM ); aPoint = OutputDevice::LogicToLogic( aPoint, aSrc, aDest ); @@ -2015,7 +2023,10 @@ Size SwAccessibleMap::PixelToLogic( const Size& rSize ) const Size aSize; if( GetShell()->GetWin() ) { - aSize = GetShell()->GetWin()->PixelToLogic( rSize ); + // OD 16.01.2003 #103492# - get mapping mode for PixelToLogic conversion + MapMode aMapMode; + GetMapMode( Point(0,0), aMapMode ); + aSize = GetShell()->GetWin()->PixelToLogic( rSize, aMapMode ); MapMode aSrc( MAP_TWIP ); MapMode aDest( MAP_100TH_MM ); aSize = OutputDevice::LogicToLogic( aSize, aSrc, aDest ); @@ -2102,24 +2113,15 @@ sal_Bool SwAccessibleMap::ReplaceChild ( return sal_True; } -Point SwAccessibleMap::CoreToPixel( const Point& rPoint ) const -{ - Point aPoint; - if( GetShell()->GetWin() ) - { - PreviewAdjust( rPoint, sal_False ); - aPoint = GetShell()->GetWin()->LogicToPixel( rPoint ); - } - return aPoint; -} - Point SwAccessibleMap::PixelToCore( const Point& rPoint ) const { Point aPoint; if( GetShell()->GetWin() ) { - PreviewAdjust( rPoint, sal_True ); - aPoint = GetShell()->GetWin()->PixelToLogic( rPoint ); + // OD 15.01.2003 #103492# - replace <PreviewAdjust(..)> by <GetMapMode(..)> + MapMode aMapMode; + GetMapMode( rPoint, aMapMode ); + aPoint = GetShell()->GetWin()->PixelToLogic( rPoint, aMapMode ); } return aPoint; } @@ -2162,10 +2164,12 @@ Rectangle SwAccessibleMap::CoreToPixel( const Rectangle& rRect ) const Rectangle aRect; if( GetShell()->GetWin() ) { - PreviewAdjust( rRect.TopLeft(), sal_False ); - aRect = GetShell()->GetWin()->LogicToPixel( rRect ); + // OD 15.01.2003 #103492# - replace <PreviewAdjust(..)> by <GetMapMode(..)> + MapMode aMapMode; + GetMapMode( rRect.TopLeft(), aMapMode ); + aRect = GetShell()->GetWin()->LogicToPixel( rRect, aMapMode ); - Rectangle aTmpRect = GetShell()->GetWin()->PixelToLogic( aRect ); + Rectangle aTmpRect = GetShell()->GetWin()->PixelToLogic( aRect, aMapMode ); lcl_CorrectRectangle(aRect, rRect, aTmpRect); } @@ -2177,38 +2181,69 @@ Rectangle SwAccessibleMap::PixelToCore( const Rectangle& rRect ) const Rectangle aRect; if( GetShell()->GetWin() ) { - PreviewAdjust( rRect.TopLeft(), sal_True ); - aRect = GetShell()->GetWin()->PixelToLogic( rRect ); + // OD 15.01.2003 #103492# - replace <PreviewAdjust(..)> by <GetMapMode(..)> + MapMode aMapMode; + GetMapMode( rRect.TopLeft(), aMapMode ); + aRect = GetShell()->GetWin()->PixelToLogic( rRect, aMapMode ); - Rectangle aTmpRect = GetShell()->GetWin()->LogicToPixel( aRect ); + Rectangle aTmpRect = GetShell()->GetWin()->LogicToPixel( aRect, aMapMode ); lcl_CorrectRectangle(aRect, rRect, aTmpRect); } return aRect; } -inline void SwAccessibleMap::PreviewAdjust( const Point& rPoint, - sal_Bool bFromPreview ) const +/** get mapping mode for LogicToPixel and PixelToLogic conversions + + OD 15.01.2003 #103492# + Replacement method <PreviewAdjust(..)> by new method <GetMapMode>. + Method returns mapping mode of current output device and adjusts it, + if the shell is in page/print preview. + Necessary, because <PreviewAdjust(..)> changes mapping mode at current + output device for mapping logic document positions to page preview window + positions and vice versa and doesn't take care to recover its changes. + + @author OD +*/ +void SwAccessibleMap::GetMapMode( const Point& _rPoint, + MapMode& _orMapMode ) const { + MapMode aMapMode = GetShell()->GetWin()->GetMapMode(); if( GetShell()->IsPreView() ) { DBG_ASSERT( mpPreview != NULL, "need preview data" ); - Window* pWin = GetShell()->GetWin(); - MapMode aMode = pWin->GetMapMode(); - mpPreview->AdjustMapMode( aMode, rPoint, sal_True ); - pWin->SetMapMode( aMode ); + mpPreview->AdjustMapMode( aMapMode, _rPoint ); } + _orMapMode = aMapMode; } +/** get size of a dedicated preview page + + OD 15.01.2003 #103492# + + @author OD +*/ +Size SwAccessibleMap::GetPreViewPageSize( sal_uInt16 _nPrevwPageNum ) const +{ + DBG_ASSERT( mpVSh->IsPreView(), "no page preview accessible." ); + DBG_ASSERT( mpVSh->IsPreView() && ( mpPreview != NULL ), + "missing accessible preview data at page preview" ); + if ( mpVSh->IsPreView() && ( mpPreview != NULL ) ) + { + return mpVSh->PagePreviewLayout()->GetPrevwPageSizeByPageNum( _nPrevwPageNum ); + } + else + { + return Size( 0, 0 ); + } +} // // SwAccPreviewData // SwAccPreviewData::SwAccPreviewData() : - mpStartPage( 0 ), - mpSelPage( 0 ), - mnStartPage( 0 ) + mpSelPage( 0 ) { } @@ -2216,139 +2251,61 @@ SwAccPreviewData::~SwAccPreviewData() { } -void SwAccPreviewData::Update( sal_uInt8 nRow, - sal_uInt8 nColumn, - sal_uInt16 nStartPage, - const Size& rPageSize, - const Point& rFreePixel, - const Fraction& rScale, - ViewShell* pShell, - sal_uInt16 nSelPage ) -{ - DBG_ASSERT( nRow > 0, "invalid row value" ); - DBG_ASSERT( nColumn > 0, "invalid column value" ); - DBG_ASSERT( nStartPage >= 0, "invalid start page" ); - DBG_ASSERT( pShell != NULL, "need view shell" ); - DBG_ASSERT( pShell->IsPreView(), "not inpreview?" ); - - // store the rScale (for AdjustMapMode; will be called from here, too) - maScale = rScale; - maPageSize = rPageSize; - - // get first page frame from layout, and iterate to page nSttPage - SwRootFrm* pRoot = pShell->GetLayout(); - DBG_ASSERT( pRoot != NULL, "No layout?" ); - - SwPageFrm* pPage = static_cast<SwPageFrm*>( pRoot->Lower() ); - DBG_ASSERT( pPage != NULL, "No page?" ); - - // adjust for the first page (which is always a right page) if - // there is more than one column - sal_Bool bSkipFirstPage = (nStartPage == 0) && (nColumn != 1); - - // get offset of selected page - mnStartPage = nStartPage; - nSelPage -= nStartPage; - - // we'll count on nStartPage, so it should be zero-based - if( nStartPage > 0 ) - nStartPage--; - - // iterate until nStartPage is found - sal_Int32 nPage = 0; - while( (nStartPage > 0) && (pPage != NULL) ) - { - pPage = static_cast<SwPageFrm*>( pPage->GetNext() ); - nStartPage--; - - // if pPage isn't valid, thethe parameter checking allowed an - // invalid index - DBG_ASSERT( pPage != NULL, "non-existing start page" ); - } - - // iterate over pages and collect data - // 1) VisArea as union of visible pages - // 2) areas of visible pages for preview/logic mapping - mpStartPage = pPage; - mpSelPage = 0; - if( pPage != NULL ) - { - // first page: use to initialize VisArea - SwFrmOrObj aPage( pPage ); - maVisArea = aPage.GetBox(); - maPreviewRects.clear(); - maLogicRects.clear(); - - // compute free point - MapMode aMapMode( MAP_TWIP ); - AdjustMapMode( aMapMode ); - Point aFreePoint = pShell->GetWin()->PixelToLogic( rFreePixel, - aMapMode ); - - // loop over col*row pages, and advance aCurrentPoint to start - // of this page's previeww - Point aCurrentPoint = aFreePoint; - for( sal_uInt8 nR = 0; (pPage != NULL) && (nR < nRow); nR++ ) - { - aCurrentPoint.X() = aFreePoint.X(); +// OD 13.01.2003 #103492# - complete re-factoring of method due to new page/print +// preview functionality. +void SwAccPreviewData::Update( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ) +{ + // store preview scaling, maximal preview page size and selected page + maScale = _rScale; + mpSelPage = _pSelectedPageFrm; + + // prepare loop on preview pages + maPreviewRects.clear(); + maLogicRects.clear(); + SwFrmOrObj aPage; + maVisArea.Clear(); + + // loop on preview pages to calculate <maPreviewRects>, <maLogicRects> and + // <maVisArea> + for ( std::vector<PrevwPage*>::const_iterator aPageIter = _rPrevwPages.begin(); + aPageIter != _rPrevwPages.end(); + ++aPageIter ) + { + aPage = (*aPageIter)->pPage; + + // add preview page rectangle to <maPreviewRects> + Rectangle aPrevwPgRect( (*aPageIter)->aPrevwWinPos, (*aPageIter)->aPageSize ); + maPreviewRects.push_back( aPrevwPgRect ); - for( sal_uInt8 nC = 0; (pPage != NULL) && (nC < nColumn); nC++ ) + // add logic page rectangle to <maLogicRects> + SwRect aLogicPgSwRect( aPage.GetBox() ); + Rectangle aLogicPgRect( aLogicPgSwRect.SVRect() ); + maLogicRects.push_back( aLogicPgRect ); + // union visible area with visible part of logic page rectangle + if ( (*aPageIter)->bVisible ) + { + if ( !(*aPageIter)->pPage->IsEmptyPage() ) { - if( bSkipFirstPage ) - { - aCurrentPoint.X() += rPageSize.Width(); - bSkipFirstPage = sal_False; - // DON'T proceed to next page! - } - else - { - // collect data - aPage = pPage; - SwRect aSwRect = aPage.GetBox(); - maVisArea.Union( aSwRect ); - - Rectangle aRect = aSwRect.SVRect(); - maLogicRects.push_back( aRect ); - aRect.SetPos( aCurrentPoint ); - maPreviewRects.push_back( aRect ); - - aCurrentPoint.X() += pPage->IsEmptyPage() - ? rPageSize.Width() - : aSwRect.Width(); - if( 0 == nSelPage ) - mpSelPage = pPage; - - pPage = static_cast<SwPageFrm*>( pPage->GetNext() ); - } - aCurrentPoint.X() += aFreePoint.X() +1; - nSelPage--; + AdjustLogicPgRectToVisibleArea( aLogicPgSwRect, + SwRect( aPrevwPgRect ), + _rPrevwWinSize ); } - aCurrentPoint.Y() += rPageSize.Height() + 1 + aFreePoint.Y(); + if ( maVisArea.IsEmpty() ) + maVisArea = aLogicPgSwRect; + else + maVisArea.Union( aLogicPgSwRect ); } } } -void SwAccPreviewData::InvalidateSelection( sal_uInt16 nSelPage ) +// OD 16.01.2003 #103492# - complete re-factoring of method due to new page/print +// preview functionality. +void SwAccPreviewData::InvalidateSelection( const SwPageFrm* _pSelectedPageFrm ) { - mpSelPage = 0; - nSelPage -= mnStartPage; - ASSERT( nSelPage >= 0, "invalid selected page" ); - ASSERT( mpStartPage, "no start page" ); - if( mpStartPage != NULL ) - { - const SwPageFrm *pPage = mpStartPage; - - // loop over col*row pages, and advance aCurrentPoint to start - // of this page's preview - while( mpSelPage == 0 && pPage != 0 ) - { - if( 0 == nSelPage ) - mpSelPage = pPage; - - pPage = static_cast<const SwPageFrm*>( pPage->GetNext() ); - nSelPage--; - } - } + mpSelPage = _pSelectedPageFrm; ASSERT( mpSelPage, "selected page not found" ); } @@ -2367,67 +2324,16 @@ const SwRect& SwAccPreviewData::GetVisArea() const return maVisArea; } -Point SwAccPreviewData::PreviewToLogic(const Point& rPoint) const -{ - Rectangles::const_iterator aIter = find_if( maPreviewRects.begin(), - maPreviewRects.end(), - ContainsPredicate( rPoint ) ); - if( aIter != maPreviewRects.end() ) - { - Point aPoint = rPoint; - aPoint -= aIter->TopLeft(); - aPoint += (maLogicRects.begin() + ( aIter - maPreviewRects.begin() )) - ->TopLeft(); - return aPoint; - } - else - return Point(0,0); -} - -Point SwAccPreviewData::LogicToPreview(const Point& rPoint) const -{ - Rectangles::const_iterator aIter = find_if( maLogicRects.begin(), - maLogicRects.end(), - ContainsPredicate( rPoint ) ); - if( aIter != maLogicRects.end() ) - { - Point aPoint = rPoint; - aPoint -= aIter->TopLeft(); - aPoint += (maPreviewRects.begin() + ( aIter - maLogicRects.begin() )) - ->TopLeft(); - return aPoint; - } - else - return Point(0,0); -} - -void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode ) const +void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode, + const Point& rPoint ) const { // adjust scale rMapMode.SetScaleX( maScale ); rMapMode.SetScaleY( maScale ); -} - -void SwAccPreviewData::DisposePage(const SwPageFrm *pPageFrm ) -{ - if( mpStartPage == pPageFrm ) - mpStartPage = 0; - if( mpSelPage == pPageFrm ) - mpSelPage = 0; -} - - -void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode, - const Point& rPoint, - sal_Bool bFromPreview ) const -{ - // adjust scale - AdjustMapMode( rMapMode ); // find proper rectangle - const Rectangles& rRects = bFromPreview ? maLogicRects : maPreviewRects; - Rectangles::const_iterator aBegin = rRects.begin(); - Rectangles::const_iterator aEnd = rRects.end(); + Rectangles::const_iterator aBegin = maLogicRects.begin(); + Rectangles::const_iterator aEnd = maLogicRects.end(); Rectangles::const_iterator aFound = find_if( aBegin, aEnd, ContainsPredicate( rPoint ) ); @@ -2440,3 +2346,45 @@ void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode, } // else: don't adjust MapMode } + +void SwAccPreviewData::DisposePage(const SwPageFrm *pPageFrm ) +{ + if( mpSelPage == pPageFrm ) + mpSelPage = 0; +} + +/** adjust logic page retangle to its visible part + + OD 17.01.2003 #103492# + + @author OD +*/ +void SwAccPreviewData::AdjustLogicPgRectToVisibleArea( + SwRect& _iorLogicPgSwRect, + const SwRect& _rPrevwPgSwRect, + const Size& _rPrevwWinSize ) +{ + // determine preview window rectangle + const SwRect aPrevwWinSwRect( Point( 0, 0 ), _rPrevwWinSize ); + // calculate visible preview page rectangle + SwRect aVisPrevwPgSwRect( _rPrevwPgSwRect ); + aVisPrevwPgSwRect.Intersection( aPrevwWinSwRect ); + // adjust logic page rectangle + SwTwips nTmpDiff; + // left + nTmpDiff = aVisPrevwPgSwRect.Left() - _rPrevwPgSwRect.Left(); + if ( nTmpDiff > 0 ) + _iorLogicPgSwRect.Left( _iorLogicPgSwRect.Left() + nTmpDiff ); + // top + nTmpDiff = aVisPrevwPgSwRect.Top() - _rPrevwPgSwRect.Top(); + if ( nTmpDiff > 0 ) + _iorLogicPgSwRect.Top( _iorLogicPgSwRect.Top() + nTmpDiff ); + // right + nTmpDiff = _rPrevwPgSwRect.Right() - aVisPrevwPgSwRect.Right(); + if ( nTmpDiff > 0 ) + _iorLogicPgSwRect.Right( _iorLogicPgSwRect.Right() - nTmpDiff ); + // bottom + nTmpDiff = _rPrevwPgSwRect.Bottom() - aVisPrevwPgSwRect.Bottom(); + if ( nTmpDiff > 0 ) + _iorLogicPgSwRect.Bottom( _iorLogicPgSwRect.Bottom() - nTmpDiff ); +} diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index d8e3f977a097..bab45c3cbf39 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accpage.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mib $ $Date: 2002-08-15 12:18:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -249,11 +249,14 @@ Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( ) Sequence< sal_Int8 > SAL_CALL SwAccessiblePage::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 5f596d0508ef..4feca8692506 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accpara.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: mib $ $Date: 2002-12-05 14:10:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1099,11 +1099,14 @@ Sequence< Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(RuntimeExcepti Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } @@ -1263,8 +1266,8 @@ com::sun::star::awt::Rectangle SwAccessibleParagraph::getCharacterBounds( CHECK_FOR_WINDOW( XAccessibleComponent, pWin ); Rectangle aScreenRect( GetMap()->CoreToPixel( aCoreRect.SVRect() )); - Point aFrmLogPos( GetBounds().Pos() ); // twip rel to doc root - Point aFrmPixPos( GetMap()->CoreToPixel( aFrmLogPos ) ); + SwRect aFrmLogBounds( GetBounds() ); // twip rel to doc root + Point aFrmPixPos( GetMap()->CoreToPixel( aFrmLogBounds.SVRect() ).TopLeft() ); aScreenRect.Move( -aFrmPixPos.X(), -aFrmPixPos.Y() ); // convert into AWT Rectangle @@ -1288,6 +1291,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const com::sun::star::awt::Poi { vos::OGuard aGuard(Application::GetSolarMutex()); + CHECK_FOR_DEFUNC( XAccessibleText ); // construct SwPosition (where GetCrsrOfst() will put the result into) @@ -1300,7 +1304,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const com::sun::star::awt::Poi CHECK_FOR_WINDOW( XAccessibleComponent, pWin ); Point aPoint( rPoint.X, rPoint.Y ); SwRect aLogBounds( GetBounds( GetFrm() ) ); // twip rel to doc root - Point aPixPos( GetMap()->CoreToPixel( aLogBounds.Pos() ) ); + Point aPixPos( GetMap()->CoreToPixel( aLogBounds.SVRect() ).TopLeft() ); aPoint.X() += aPixPos.X(); aPoint.Y() += aPixPos.Y(); MapMode aMapMode = pWin->GetMapMode(); diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 89acf5d63ad4..dac84cd53299 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accpreview.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mib $ $Date: 2002-08-15 10:25:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,10 @@ #pragma hdrstop +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif + #ifndef _RTL_UUID_H_ #include <rtl/uuid.h> #endif @@ -131,10 +135,13 @@ Sequence<OUString> SwAccessiblePreview::getSupportedServiceNames( ) Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 18524e54915d..3cdb7ff3b82f 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acctable.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hbrinkm $ $Date: 2002-09-11 13:50:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -916,11 +916,14 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL SwAccessibleTable::getTypes() t Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index acb0b890cca1..6e890ce25e2e 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acctextframe.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mib $ $Date: 2002-08-15 10:25:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -206,11 +206,14 @@ Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNames() Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx index 69ad8c6b0894..afd1c7f135a7 100644 --- a/sw/source/core/bastyp/bparr.cxx +++ b/sw/source/core/bastyp/bparr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bparr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mib $ $Date: 2001-11-28 13:47:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,11 +117,11 @@ BigPtrArray::~BigPtrArray() BlockInfo** pp = ppInf; for( USHORT n = 0; n < nBlock; ++n, ++pp ) { - __DELETE( (*pp)->nElem ) (*pp)->pData; - delete *pp; + delete[] (*pp)->pData; + delete *pp; } } - __DELETE( nMaxBlock ) ppInf; + delete[] ppInf; } // Einfachst-Implementation, evtl. spaeter mal komplexer @@ -278,7 +278,7 @@ BlockInfo* BigPtrArray::InsBlock( USHORT pos ) // dann sollte wir mal das Array erweitern BlockInfo** ppNew = new BlockInfo* [ nMaxBlock + nBlockGrowSize ]; memcpy( ppNew, ppInf, nMaxBlock * sizeof( BlockInfo* )); - __DELETE( nMaxBlock ) ppInf; + delete[] ppInf; nMaxBlock += nBlockGrowSize; ppInf = ppNew; } @@ -309,7 +309,7 @@ void BigPtrArray::BlockDel( USHORT nDel ) nDel = (( nBlock / nBlockGrowSize ) + 1 ) * nBlockGrowSize; BlockInfo** ppNew = new BlockInfo* [ nDel ]; memcpy( ppNew, ppInf, nBlock * sizeof( BlockInfo* )); - __DELETE( nMaxBlock ) ppInf; + delete[] ppInf; ppInf = ppNew; nMaxBlock = nDel; } @@ -449,7 +449,7 @@ void BigPtrArray::Remove( ULONG pos, ULONG n ) if( !p->nElem ) { // eventuell Block ganz entfernen - delete p->pData; + delete[] p->pData; nBlkdel++; if( USHRT_MAX == nBlk1del ) nBlk1del = cur; @@ -588,8 +588,8 @@ USHORT BigPtrArray::Compress( short nMax ) if( !p->nElem ) { // dann kann der entfernt werden - delete p->pData; - delete p, p = 0; + delete[] p->pData; + delete p, p = 0; ++nBlkdel; } else diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index c2ffd57314c2..342e2bff30ee 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: calc.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: fme $ $Date: 2002-11-07 09:43:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,8 +83,8 @@ #include <tools/svwin.h> #endif -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _SVX_ADRITEM_HXX //autogen #include <svx/adritem.hxx> @@ -144,6 +144,9 @@ #ifndef _SWUNODEF_HXX #include <swunodef.hxx> #endif +#ifndef _SWTYPES_HXX +#include <swtypes.hxx> +#endif // tippt sich schneller #define RESOURCE ViewShell::GetShellRes() @@ -556,13 +559,11 @@ String SwCalc::GetStrResult( double nValue, BOOL bRound ) } USHORT nDec = 15; //pLclData->getNumDigits(); - String aRetStr; - - SolarMath::DoubleToString( aRetStr, nValue, - 'A', /// 'F' 'E' 'G' 'A' - nDec, /// Nachkommastellen - pLclData->getNumDecimalSep().GetChar(0), /// Dezimalseparator - TRUE ); + String aRetStr( ::rtl::math::doubleToUString( nValue, + rtl_math_StringFormat_Automatic, + nDec, + pLclData->getNumDecimalSep().GetChar(0), + true )); return aRetStr; } @@ -1628,18 +1629,20 @@ FASTBOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos, if( !pLclD ) pLclD = &GetAppLocaleData(); - const xub_Unicode *pEnd, nCurrCmdPos = rCommandPos; - int nErrno; - rVal = SolarMath::StringToDouble( rCommand.GetBuffer() + rCommandPos, - pLclD->getNumThousandSep().GetChar(0), - pLclD->getNumDecimalSep().GetChar(0), - nErrno, &pEnd ); + const xub_Unicode nCurrCmdPos = rCommandPos; + rtl_math_ConversionStatus eStatus; + const sal_Unicode* pEnd; + rVal = rtl_math_uStringToDouble( rCommand.GetBuffer() + rCommandPos, + rCommand.GetBuffer() + rCommand.Len(), + pLclD->getNumDecimalSep().GetChar(0), + pLclD->getNumThousandSep().GetChar(0), + &eStatus, &pEnd ); rCommandPos = pEnd - rCommand.GetBuffer(); if( !pLclData && pLclD != &GetAppLocaleData() ) delete (LocaleDataWrapper*)pLclD; - return 0 == nErrno && nCurrCmdPos != rCommandPos; + return rtl_math_ConversionStatus_Ok == eStatus && nCurrCmdPos != rCommandPos; } FASTBOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos, @@ -1656,18 +1659,20 @@ FASTBOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos, SvxCreateLocale( eLang ) ); } - const xub_Unicode *pEnd, nCurrCmdPos = rCommandPos; - int nErrno; - rVal = SolarMath::StringToDouble( rCommand.GetBuffer() + rCommandPos, - pLclD->getNumThousandSep().GetChar(0), - pLclD->getNumDecimalSep().GetChar(0), - nErrno, &pEnd ); + const xub_Unicode nCurrCmdPos = rCommandPos; + rtl_math_ConversionStatus eStatus; + const sal_Unicode* pEnd; + rVal = rtl_math_uStringToDouble( rCommand.GetBuffer() + rCommandPos, + rCommand.GetBuffer() + rCommand.Len(), + pLclD->getNumDecimalSep().GetChar(0), + pLclD->getNumThousandSep().GetChar(0), + &eStatus, &pEnd ); rCommandPos = pEnd - rCommand.GetBuffer(); if( pLclD != &GetAppLocaleData() ) delete (LocaleDataWrapper*)pLclD; - return 0 == nErrno && nCurrCmdPos != rCommandPos; + return rtl_math_ConversionStatus_Ok == eStatus && nCurrCmdPos != rCommandPos; } //------------------------------------------------------------------------------ @@ -1740,7 +1745,6 @@ SwSbxValue::~SwSbxValue() { } - BOOL SwSbxValue::GetBool() const { return SbxSTRING == GetType() ? 0 != GetString().Len() @@ -1755,6 +1759,10 @@ double SwSbxValue::GetDouble() const xub_StrLen nStt = 0; SwCalc::Str2Double( GetString(), nStt, nRet ); } + else if (IsBool()) + { + nRet = 0 != GetBool() ? 1.0 : 0.0; + } else nRet = SbxValue::GetDouble(); return nRet; diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index a6b85ced9b74..ead3be0207b1 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -2,9 +2,9 @@ * * $RCSfile: init.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: os $ $Date: 2002-08-26 11:36:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -991,7 +991,7 @@ void _FinitCore() #ifndef PRODUCT //Defaultattribut freigeben lassen um asserts zu vermeiden. - if ( aAttrTab[0]->GetRef() ) + if ( aAttrTab[0]->GetRefCount() ) SfxItemPool::ReleaseDefaults( aAttrTab, POOLATTR_END-POOLATTR_BEGIN, FALSE); #endif delete SwDoc::pACmpltWords; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index d44181235787..2dddf0139e2a 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: crsrsh.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-03 14:13:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,6 +143,9 @@ #ifndef _DOCSH_HXX #include <docsh.hxx> #endif +#ifndef _DRAWFONT_HXX +#include <drawfont.hxx> +#endif #ifndef _SWGLOBDOCSH_HXX //autogen #include <globdoc.hxx> #endif @@ -437,7 +440,8 @@ FASTBOOL SwCrsrShell::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, return bLeft ? GoPrevCell() : GoNextCell(); SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen - FASTBOOL bRet = pCurCrsr->LeftRight( bLeft, nCnt, nMode, bVisualAllowed ); + FASTBOOL bRet = pCurCrsr->LeftRight( bLeft, nCnt, nMode, bVisualAllowed, + ! IsOverwriteCrsr() ); if( bRet ) UpdateCrsr(); return bRet; @@ -2344,6 +2348,8 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pWin ) eMvState = MV_NONE; // Status fuers Crsr-Travelling - GetCrsrOfst pVisCrsr = new SwVisCrsr( this ); // UpdateCrsr( 0 ); + // OD 11.02.2003 #100556# + mbMacroExecAllowed = rShell.IsMacroExecAllowed(); } @@ -2392,6 +2398,8 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pWin, SwRootFrm *pRoot, pVisCrsr = new SwVisCrsr( this ); // UpdateCrsr( 0 ); + // OD 11.02.2003 #100556# + mbMacroExecAllowed = true; } @@ -2785,7 +2793,9 @@ FASTBOOL SwCrsrShell::IsInVerticalText( const Point* pPt ) const FASTBOOL SwCrsrShell::IsInRightToLeftText( const Point* pPt ) const { const short nDir = GetTextDirection( pPt ); - return FRMDIR_HORI_RIGHT_TOP == nDir; + // GetTextDirection uses FRMDIR_VERT_TOP_LEFT to indicate RTL in + // vertical environment + return FRMDIR_VERT_TOP_LEFT == nDir || FRMDIR_HORI_RIGHT_TOP == nDir; } #else diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 699ec063b2cf..2d8e8f3ccf3e 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pam.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2002-02-01 12:37:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -552,6 +552,8 @@ SwPaM &SwPaM::operator=( SwPaM &rPam ) SetMark(); *pMark = *( rPam.pMark ); } + else + DeleteMark(); return *this; } diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 886d81c78081..ace4e9f419fd 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swcrsr.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: fme $ $Date: 2002-12-03 12:58:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -420,35 +420,32 @@ FASTBOOL SwCursor::IsSelOvr( int eFlags ) if( pNd->IsCntntNode() && 0 == (SwUnoCrsr*)*this ) { const SwCntntFrm* pFrm = ((SwCntntNode*)pNd)->GetFrm(); - if( pFrm && pFrm->IsValid() && 0 == pFrm->Frm().Height() ) + if( pFrm && pFrm->IsValid() && 0 == pFrm->Frm().Height() && + 0 != ( SELOVER_CHANGEPOS & eFlags ) ) { - if( 0 != ( SELOVER_CHANGEPOS & eFlags ) ) + // skip to the next / prev valida paragraph with a layout + SwNodeIndex& rPtIdx = GetPoint()->nNode; + int bGoNxt = pSavePos->nNode < rPtIdx.GetIndex(); + while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextCntntFrm() + : pFrm->GetPrevCntntFrm() )) && + 0 == pFrm->Frm().Height() ) + ; + + SwCntntNode* pCNd; + if( pFrm && 0 != (pCNd = (SwCntntNode*)pFrm->GetNode()) ) { - // skip to the next / prev valida paragraph with a layout - SwNodeIndex& rPtIdx = GetPoint()->nNode; - int bGoNxt = pSavePos->nNode < rPtIdx.GetIndex(); - while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextCntntFrm() - : pFrm->GetPrevCntntFrm() )) && - 0 == pFrm->Frm().Height() ) - ; - - SwCntntNode* pCNd; - if( pFrm && 0 != (pCNd = (SwCntntNode*)pFrm->GetNode()) ) - { - // set this cntntNode as new position - rPtIdx = *pCNd; - pNd = pCNd; + // set this cntntNode as new position + rPtIdx = *pCNd; + pNd = pCNd; - // ContentIndex noch anmelden: - xub_StrLen nTmpPos = bGoNxt ? 0 : pCNd->Len(); - GetPoint()->nContent.Assign( pCNd, nTmpPos ); - // sollten wir in einer Tabelle gelandet sein? - if( IsInProtectTable( TRUE ) ) - pFrm = 0; - } + // ContentIndex noch anmelden: + xub_StrLen nTmpPos = bGoNxt ? 0 : pCNd->Len(); + GetPoint()->nContent.Assign( pCNd, nTmpPos ); + + // sollten wir in einer Tabelle gelandet sein? + if( IsInProtectTable( TRUE ) ) + pFrm = 0; } - else - pFrm = 0; } if( !pFrm ) @@ -1097,7 +1094,7 @@ ULONG SwCursor::FindAll( SwFindParas& rParas, *GetMark() = aMarkPos; } - if( nFound && SwCursor::IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ) ) + if( nFound && SwCursor::IsSelOvr( SELOVER_TOGGLE ) ) nFound = 0; return nFound; } @@ -1289,10 +1286,12 @@ FASTBOOL SwCursor::GoPrevWord() { SwCrsrSaveState aSave( *this ); xub_StrLen nPtPos = GetPoint()->nContent.GetIndex(); + const xub_StrLen nPtStart = nPtPos; + if( nPtPos ) --nPtPos; nPtPos = (xub_StrLen)pBreakIt->xBreak->previousWord( - pTxtNd->GetTxt(), nPtPos, + pTxtNd->GetTxt(), nPtStart, pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ), WordType::ANYWORD_IGNOREWHITESPACES ).startPos; @@ -1391,53 +1390,56 @@ FASTBOOL SwCursor::GoSentence( SentenceMoveType eMoveType ) FASTBOOL SwCursor::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, - BOOL bVisualAllowed ) + BOOL bVisualAllowed, BOOL bInsertCrsr ) { SwTableCursor* pTblCrsr = (SwTableCursor*)*this; if( pTblCrsr ) return bLeft ? pTblCrsr->GoPrevCell( nCnt ) : pTblCrsr->GoNextCell( nCnt ); - + // calculate cursor bidi level + const SwCntntFrm* pSttFrm = NULL; SwNode& rNode = GetPoint()->nNode.GetNode(); - const BOOL bIsUnoCrsr = 0 != (SwUnoCrsr*)*this; + const BOOL bDoNotSetBidiLevel = 0 != (SwUnoCrsr*)*this; - // The visual cursor travelling requires a layout. Therefore we do not - // want this for an UnoCursor. - if ( ! bIsUnoCrsr && rNode.IsTxtNode() ) + if ( ! bDoNotSetBidiLevel ) { - const SwTxtNode& rTNd = *rNode.GetTxtNode(); - SwIndex& rIdx = GetPoint()->nContent; - xub_StrLen nPos = rIdx.GetIndex(); - - SvtCTLOptions aCTLOptions; - if ( bVisualAllowed && aCTLOptions.IsCTLFontEnabled() && - SvtCTLOptions::MOVEMENT_VISUAL == - aCTLOptions.GetCTLCursorMovement() ) + if( rNode.IsTxtNode() ) { - // for visual cursor travelling (used in bidi layout) - // we first have to convert the logic to a visual position - Point aPt; - SwCntntFrm* pFrm = rTNd.GetFrm( &aPt, GetPoint() ); - if( pFrm ) + const SwTxtNode& rTNd = *rNode.GetTxtNode(); + SwIndex& rIdx = GetPoint()->nContent; + xub_StrLen nPos = rIdx.GetIndex(); + + SvtCTLOptions aCTLOptions; + if ( bVisualAllowed && aCTLOptions.IsCTLFontEnabled() && + SvtCTLOptions::MOVEMENT_VISUAL == + aCTLOptions.GetCTLCursorMovement() ) { - BYTE nCrsrLevel = GetCrsrBidiLevel(); - sal_Bool bForward = ! bLeft; - ((SwTxtFrm*)pFrm)->PrepareVisualMove( nPos, nCrsrLevel, bForward ); - rIdx = nPos; - SetCrsrBidiLevel( nCrsrLevel ); - bLeft = ! bForward; + // for visual cursor travelling (used in bidi layout) + // we first have to convert the logic to a visual position + Point aPt; + pSttFrm = rTNd.GetFrm( &aPt, GetPoint() ); + if( pSttFrm ) + { + BYTE nCrsrLevel = GetCrsrBidiLevel(); + sal_Bool bForward = ! bLeft; + ((SwTxtFrm*)pSttFrm)->PrepareVisualMove( nPos, nCrsrLevel, + bForward, bInsertCrsr ); + rIdx = nPos; + SetCrsrBidiLevel( nCrsrLevel ); + bLeft = ! bForward; + } } - } - else - { - const SwScriptInfo* pScriptInfo = SwScriptInfo::GetScriptInfo( rTNd ); - if ( pScriptInfo ) + else { - const xub_StrLen nMoveOverPos = bLeft ? - ( nPos ? nPos - 1 : 0 ) : - nPos; - SetCrsrBidiLevel( pScriptInfo->DirType( nMoveOverPos ) ); + const SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( rTNd ); + if ( pSI ) + { + const xub_StrLen nMoveOverPos = bLeft ? + ( nPos ? nPos - 1 : 0 ) : + nPos; + SetCrsrBidiLevel( pSI->DirType( nMoveOverPos ) ); + } } } } @@ -1449,6 +1451,27 @@ FASTBOOL SwCursor::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, while( nCnt && Move( fnMove, fnGo ) ) --nCnt; + // here come some special rules for visual cursor travelling + if ( pSttFrm ) + { + SwNode& rTmpNode = GetPoint()->nNode.GetNode(); + if ( &rTmpNode != &rNode && rTmpNode.IsTxtNode() ) + { + Point aPt; + const SwCntntFrm* pEndFrm = ((SwTxtNode&)rTmpNode).GetFrm( &aPt, GetPoint() ); + if ( pEndFrm ) + { + if ( ! pEndFrm->IsRightToLeft() != ! pSttFrm->IsRightToLeft() ) + { + if ( ! bLeft ) + pEndFrm->RightMargin( this ); + else + pEndFrm->LeftMargin( this ); + } + } + } + } + return 0 == nCnt && !IsInProtectTable( TRUE ) && !IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ); } @@ -1540,6 +1563,37 @@ FASTBOOL SwCursor::UpDown( BOOL bUp, USHORT nCnt, } else *GetPoint() = aOldPos; + + // calculate cursor bidi level + const BOOL bDoNotSetBidiLevel = 0 != (SwUnoCrsr*)*this; + + if ( ! bDoNotSetBidiLevel ) + { + SwNode& rNode = GetPoint()->nNode.GetNode(); + if ( rNode.IsTxtNode() ) + { + const SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( (SwTxtNode&)rNode ); + if ( pSI ) + { + SwIndex& rIdx = GetPoint()->nContent; + xub_StrLen nPos = rIdx.GetIndex(); + + if( nPos && nPos < ((SwTxtNode&)rNode).GetTxt().Len() ) + { + const BYTE nCurrLevel = pSI->DirType( nPos ); + const BYTE nPrevLevel = pSI->DirType( nPos - 1 ); + + if ( nCurrLevel % 2 != nPrevLevel % 2 ) + { + // set cursor level to the lower of the two levels + SetCrsrBidiLevel( Min( nCurrLevel, nPrevLevel ) ); + } + else + SetCrsrBidiLevel( nCurrLevel ); + } + } + } + } } return bRet; } @@ -1548,6 +1602,11 @@ FASTBOOL SwCursor::LeftRightMargin( BOOL bLeft, BOOL bAPI ) { Point aPt; SwCntntFrm * pFrm = GetCntntNode()->GetFrm( &aPt, GetPoint() ); + + // calculate cursor bidi level + if ( pFrm ) + SetCrsrBidiLevel( pFrm->IsRightToLeft() ? 1 : 0 ); + return pFrm && (bLeft ? pFrm->LeftMargin( this ) : pFrm->RightMargin( this, bAPI )); } diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index af41f46db34b..8071a0502e4e 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viscrs.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: fme $ $Date: 2002-09-17 14:34:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,6 +125,9 @@ #ifndef _NDTXT_HXX #include <ndtxt.hxx> #endif +#ifndef _DRAWFONT_HXX +#include <drawfont.hxx> +#endif #ifndef _MDIEXP_HXX #include <mdiexp.hxx> // GetSearchDialog @@ -134,7 +137,8 @@ #endif -extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); +// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx> +//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); extern void SwCalcPixStatics( OutputDevice *pOut ); @@ -528,6 +532,30 @@ void SwVisCrsr::_SetPosAndShow() Size( pCrsrShell->aCharRect.Width(), nTmpY ) ); aRect.Pos().Y() += pCrsrShell->aCrsrHeight.X(); } + + // check if cursor should show the current cursor bidi level + aTxtCrsr.SetDirection( CURSOR_DIRECTION_NONE ); + const SwCursor* pTmpCrsr = pCrsrShell->_GetCrsr(); + + if ( pTmpCrsr && !pCrsrShell->IsOverwriteCrsr() ) + { + SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode(); + if( rNode.IsTxtNode() ) + { + const SwTxtNode& rTNd = *rNode.GetTxtNode(); + const SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( rTNd ); + + // cursor level has to be shown + if ( pSI && pSI->CountDirChg() > 1 ) + { + aTxtCrsr.SetDirection( + ( pTmpCrsr->GetCrsrBidiLevel() % 2 ) ? + CURSOR_DIRECTION_RTL : + CURSOR_DIRECTION_LTR ); + } + } + } + if( aRect.Height() ) { ::SwCalcPixStatics( pCrsrShell->GetOut() ); diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 5a9f5fab487c..f2316267cf8a 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SwStyleNameMapper.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-06-05 14:48:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1116,3 +1116,57 @@ const SvStringsDtor& SwStyleNameMapper::GetNumRuleProgNameArray() *NewProgNameArray( pNumRuleProgNameArray, NumRuleProgNameTable, sizeof ( NumRuleProgNameTable ) / sizeof ( SwTableEntry ) ); } + + +const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIName ) +{ + String aRes = rExtraUIName; + BOOL bChgName = FALSE; + const SvStringsDtor& rExtraArr = GetExtraUINameArray(); + static sal_uInt16 nIds[] = + { + RES_POOLCOLL_LABEL_DRAWING - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_ABB - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_TABLE - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_FRAME- RES_POOLCOLL_EXTRA_BEGIN, + 0 + }; + for (const sal_uInt16 * pIds = nIds; *pIds; ++pIds) + { + if (aRes == *rExtraArr[ *pIds ]) + { + bChgName = TRUE; + break; + } + } + if (bChgName) + aRes = *GetExtraProgNameArray()[*pIds]; + return aRes; +} + +const String SwStyleNameMapper::GetSpecialExtraUIName( const String& rExtraProgName ) +{ + String aRes = rExtraProgName; + BOOL bChgName = FALSE; + const SvStringsDtor& rExtraArr = GetExtraProgNameArray(); + static sal_uInt16 nIds[] = + { + RES_POOLCOLL_LABEL_DRAWING - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_ABB - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_TABLE - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_FRAME- RES_POOLCOLL_EXTRA_BEGIN, + 0 + }; + for (const sal_uInt16 * pIds = nIds; *pIds; ++pIds) + { + if (aRes == *rExtraArr[ *pIds ]) + { + bChgName = TRUE; + break; + } + } + if (bChgName) + aRes = *GetExtraUINameArray()[*pIds]; + return aRes; +} + diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 740f3b663033..3d3c6a154a73 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docbm.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dvo $ $Date: 2002-11-07 18:39:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -480,17 +480,16 @@ void _DelBookmarks( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, for( nCnt = 0; nCnt < rTbl.Count(); ++nCnt ) { // liegt auf der Position ?? + int eType = BKMK_POS_NONE; SwRedline* pRedl = rTbl[ nCnt ]; - // get start/end positions - SwPosition *pRStt = pRedl->GetPoint(), - *pREnd = pRedl->GetMark(); + SwPosition *pRStt = &pRedl->GetBound(TRUE), + *pREnd = &pRedl->GetBound(FALSE); if( *pRStt > *pREnd ) { - SwPosition *pTmp = pRStt; pRStt = pREnd; pREnd = pTmp; + SwPosition *pTmp = pRStt; pRStt = pREnd, pREnd = pTmp; } - // treat start position if( Greater( *pRStt, rStt, pSttIdx ) && Lower( *pRStt, rEnd, pEndIdx )) { pRStt->nNode = rEnd; @@ -514,10 +513,7 @@ void _DelBookmarks( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, pRStt->nContent.Assign( pCNd, nTmp ); } } - - // treat end position (unless start == end, i.e. no mark) - if( ( pRStt != pREnd ) && - Greater( *pREnd, rStt, pSttIdx ) && Lower( *pREnd, rEnd, pEndIdx )) + if( Greater( *pREnd, rStt, pSttIdx ) && Lower( *pREnd, rEnd, pEndIdx )) { pREnd->nNode = rStt; if( pSttIdx ) diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 3c65a80803ee..bb5d1081705f 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: doccomp.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dvo $ $Date: 2002-11-11 15:24:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,13 +91,6 @@ #include <sfx2/docinf.hxx> #endif -#ifdef JP_DUMP -#include <stdio.h> -#ifndef _STREAM_HXX //autogen -#include <tools/stream.hxx> -#endif -#endif - #ifndef _DOC_HXX #include <doc.hxx> #endif @@ -200,11 +193,6 @@ public: { return aLines.GetObject( nLine ); } void InsertLine( CompareLine* pLine ) { aLines.Insert( pLine, LIST_APPEND ); } - -#ifdef JP_DUMP - // zum Debuggen! - virtual void Dump(); -#endif }; class Hash @@ -306,12 +294,6 @@ void CompareData::SetIndex( ULONG nLine, ULONG nIndex ) pIndex[ nLine ] = nIndex; } -#ifdef JP_DUMP -void CompareData::Dump() -{ -} -#endif - void CompareData::SetChanged( ULONG nLine, BOOL bFlag ) { if( !pChangedFlag ) @@ -719,9 +701,6 @@ Compare::CompareSequence::CompareSequence( pFDiag = pMemory + ( rMD2.GetCount() + 1 ); pBDiag = pMemory + ( nSize + rMD2.GetCount() + 1 ); -#ifdef JP_DUMP - rD1.Dump(), rD2.Dump(); -#endif Compare( 0, rMD1.GetCount(), 0, rMD2.GetCount() ); } @@ -977,11 +956,6 @@ public: virtual ~SwCompareData(); void SetRedlinesToDoc( BOOL bUseDocInfo, const SwDoc& rSrcDoc ); - -#ifdef JP_DUMP - // zum Debuggen! - virtual void Dump(); -#endif }; // ---------------------------------------------------------------- @@ -1576,34 +1550,6 @@ void SwCompareData::SetRedlinesToDoc( BOOL bUseDocInfo, const SwDoc& rSrcDoc ) } } -#ifdef JP_DUMP -void SwCompareData::Dump() -{ - static int nFirst = 1; - SvFileStream aStrm( "d:\\tmp\\compare.dmp", nFirst - ? STREAM_WRITE | STREAM_TRUNC - : STREAM_WRITE | STREAM_NOCREATE ); - if( !nFirst ) - aStrm.Seek( STREAM_SEEK_TO_END ); - - nFirst = 0; - - aStrm << "\n"; - ULONG nLCount = aLines.Count(); - for( ULONG n = 0; n < nLCount; ++n ) - { - SwCompareLine* pLine = (SwCompareLine*)GetLine( n ); - String sTxt( pLine->GetText() ); - char sBuffer[ 20 ]; - sprintf( sBuffer, "[%4ld][%3ld][%1d]", - pLine->GetNode().GetIndex(), - GetIndex( n ), GetChanged( n ) ); - ( aStrm << sBuffer ).WriteByteString( sTxt ) << '\n'; - } -} - -#endif - /* */ @@ -1639,10 +1585,6 @@ long SwDoc::CompareDoc( const SwDoc& rDoc ) SetModified(); } -#ifdef JP_DUMP - aD0.Dump(), aD1.Dump(); -#endif - rSrcDoc.SetRedlineMode( eSrcRedlMode ); SetRedlineMode( REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE ); diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 33095bf50dd6..c57cdf9401b3 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docdesc.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 14:34:31 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -687,8 +687,6 @@ void SwDoc::DelPageDesc( USHORT i ) |* |*************************************************************************/ -extern SvxFrameDirection lcl_GetFrameDirection(ULONG aLanguage); - USHORT SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy, BOOL bRegardLanguage) { @@ -712,7 +710,7 @@ USHORT SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy, GetPrt(), FALSE ); SvxFrameDirection aFrameDirection = bRegardLanguage ? - lcl_GetFrameDirection(GetAppLanguage()) + GetDefaultFrameDirection(GetAppLanguage()) : FRMDIR_HORI_LEFT_TOP; pNew->GetMaster().SetAttr( SvxFrameDirectionItem(aFrameDirection) ); diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 22c0db2a7b6b..706c62a7aae8 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docedt.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: dvo $ $Date: 2002-10-10 16:29:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2181,13 +2181,19 @@ sal_Bool SwDoc::DelFullPara( SwPaM& rPam ) pNd->StartOfSectionIndex(); sal_uInt32 nNodeDiff = rEnd.nNode.GetIndex() - rStt.nNode.GetIndex(); - if( nSectDiff-2 <= nNodeDiff || IsRedlineOn() ) + if ( nSectDiff-2 <= nNodeDiff || IsRedlineOn() || + /* #i9185# Prevent getting the node after the end node (see below) */ + rEnd.nNode.GetIndex() + 1 == aNodes.Count() ) return sal_False; // harte SeitenUmbrueche am nachfolgenden Node verschieben sal_Bool bSavePageBreak = sal_False, bSavePageDesc = sal_False; + + /* #i9185# This whould lead to a segmentation fault if not catched + above. */ sal_uInt32 nNextNd = rEnd.nNode.GetIndex() + 1; - SwTableNode* pTblNd = GetNodes()[ nNextNd ]->GetTableNode(); + SwTableNode* pTblNd = aNodes[ nNextNd ]->GetTableNode(); + if( pTblNd && pNd->IsCntntNode() ) { SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt(); @@ -2277,6 +2283,7 @@ sal_Bool SwDoc::DelFullPara( SwPaM& rPam ) } rPam.DeleteMark(); SetModified(); + return sal_True; } diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 2190d1a92ee6..0c639a029ff6 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfld.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: od $ $Date: 2002-10-10 09:14:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1279,6 +1279,10 @@ void SwDoc::FldsToExpand( SwHash**& ppHashTbl, USHORT& rTblSize, if( !aNew.Len() ) // nichts gefunden, dann ist aNew = pSFld->GetFormula(); // die Formel der neue Wert + // OD 11.02.2003 #i3141# - update expression of field as in + // method <SwDoc::UpdateExpFlds(..)> for string/text fields + pSFld->ChgExpStr( aNew ); + // suche den Namen vom Feld aNew = ((SwSetExpFieldType*)pSFld->GetTyp())->GetSetRefName(); // Eintrag vorhanden ? @@ -2150,6 +2154,8 @@ void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames, String sFormel(rFormel); String sNewName( rNewName ); sNewName.SearchAndReplace( DB_DELIM, '.'); + //the command type is not part of the condition + sNewName = sNewName.GetToken(0, DB_DELIM); String sUpperNewNm( sNewName ); @@ -2158,7 +2164,9 @@ void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames, String sDBName( *rUsedDBNames.GetObject( i ) ); sDBName.SearchAndReplace( DB_DELIM, '.'); - if( sDBName.Equals( sUpperNewNm )) + //cut off command type + sDBName = sDBName.GetToken(0, DB_DELIM); + if( !sDBName.Equals( sUpperNewNm )) { xub_StrLen nPos = 0; @@ -2169,6 +2177,10 @@ void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames, { rFormel.Erase( nPos, sDBName.Len() ); rFormel.Insert( sNewName, nPos ); + //prevent re-searching - this is useless and provokes + //endless loops when names containing each other and numbers are exchanged + //e.g.: old 12345.12345 new: i12345.12345 + nPos += sNewName.Len(); sFormel = rFormel; } } @@ -2643,7 +2655,7 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich ) Point aPt; const SwCntntFrm* pFrm = rTxtNd.GetFrm( &aPt, 0, FALSE ); - _SetGetExpFld* pNew; + _SetGetExpFld* pNew = NULL; BOOL bIsInBody = FALSE; if( !pFrm || pFrm->IsInDocBody() ) @@ -2651,7 +2663,13 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich ) // einen Index fuers bestimmen vom TextNode anlegen SwNodeIndex aIdx( rTxtNd ); bIsInBody = rDoc.GetNodes().GetEndOfExtras().GetIndex() < aIdx.GetIndex(); - pNew = new _SetGetExpFld( aIdx, &rTFld ); + + // #104291# dvo: We don't want to update fields in redlines, or those + // in frames whose anchor is in redline. However, we do want to update + // fields in hidden sections. So: In order to be updated, a field 1) + // must have a frame, or 2) it must be in the document body. + if( (pFrm != NULL) || bIsInBody ) + pNew = new _SetGetExpFld( aIdx, &rTFld ); } else { @@ -2677,8 +2695,9 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich ) pDBFld->ChgBodyTxtFlag( bIsInBody ); } - if( !pFldSortLst->Insert( pNew )) - delete pNew; + if( pNew != NULL ) + if( !pFldSortLst->Insert( pNew )) + delete pNew; } void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd ) diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index cac250512e4e..319cace70c0e 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -2,9 +2,9 @@ * * $RCSfile: doclay.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mib $ $Date: 2002-07-24 13:12:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1135,11 +1135,43 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts, |* |*************************************************************************/ +/* #i6447# changed behaviour if lcl_CpyAttr: + + If the old item set contains the item to set (no inheritance) copy the item + into the new set. + + If the old item set contains the item by inheritance and the new set + contains the item, too: + If the two items differ copy the item from the old set to the new set. + + Otherwise the new set will not be changed. +*/ + void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uInt16 nWhich ) { - const SfxPoolItem *pItem; - if ( SFX_ITEM_SET == (rOldSet.GetItemState( nWhich, sal_False, &pItem))) - rNewSet.Put( *pItem ); + const SfxPoolItem *pOldItem = NULL, *pNewItem = NULL; + + rOldSet.GetItemState( nWhich, sal_False, &pOldItem); + if (pOldItem != NULL) + rNewSet.Put( *pOldItem ); + else + { + pOldItem = rOldSet.GetItem( nWhich, sal_True); + if (pOldItem != NULL) + { + pNewItem = rNewSet.GetItem( nWhich, sal_True); + if (pNewItem != NULL) + { + if (*pOldItem != *pNewItem) + rNewSet.Put( *pOldItem ); + } + else + ASSERT(0, "What am I doing here?"); + } + else + ASSERT(0, "What am I doing here?"); + } + } @@ -1229,11 +1261,14 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, ASSERT( pOldFmt, "Format des Fly nicht gefunden." ); pOldFmt->DelFrms(); - SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( sal_False ); - pNewFmt = MakeFlyFrmFmt( GetUniqueFrameName(), GetFrmFmtFromPool( RES_POOLFRM_FRAME )); + /* #i6447#: Only the selected items are copied from the old + format. */ + SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( sal_True ); + + //Diejenigen Attribute uebertragen die auch gesetzt sind, //andere sollen weiterhin aus den Vorlagen gueltig werden. lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_PRINT ); @@ -1244,6 +1279,7 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_HORI_ORIENT ); lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_LR_SPACE ); lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_UL_SPACE ); + lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_BACKGROUND ); if( bCpyBrd ) { // JP 07.07.99: Bug 67029 - if at Grafik no BoxItem but @@ -1322,6 +1358,7 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, pNewSet->ClearItem(); pNewSet->Put( SwFmtSurround( SURROUND_NONE ) ); + pNewSet->Put( SvxOpaqueItem( RES_OPAQUE, sal_True ) ); pNewSet->Put( SwFmtVertOrient( VERT_TOP ) ); pNewSet->Put( SwFmtHoriOrient( HORI_CENTER ) ); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index d7afd642216b..188ca770dead 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docnum.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: od $ $Date: 2002-12-10 16:03:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -505,8 +505,10 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName ) sName.Erase( 0, nPos ); nPos = 0; sNum = sName.GetToken( 0, '.', nPos ); + // #i4533# without this check all parts delimited by a dot are treated as outline numbers + if(!ByteString(sNum, gsl_getSystemTextEncoding()).IsNumericAscii()) + nPos = STRING_NOTFOUND; } - rName = sName; // das ist der nachfolgende Text. // alle Levels gelesen, dann suche mal im Document nach dieser @@ -591,7 +593,21 @@ BOOL SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const if( USHRT_MAX != nFndPos ) { SwTxtNode* pNd = rOutlNds[ nFndPos ]->GetTxtNode(); - if( !pNd->GetExpandTxt().Equals( sName ) ) + String sExpandedText = pNd->GetExpandTxt(); + //#i4533# leading numbers followed by a dot have been remove while + //searching for the outline position + //to compensate this they must be removed from the paragraphs text content, too + USHORT nPos = 0; + String sTempNum; + while(sExpandedText.Len() && (sTempNum = sExpandedText.GetToken(0, '.', nPos)).Len() && + STRING_NOTFOUND != nPos && + ByteString(sTempNum, gsl_getSystemTextEncoding()).IsNumericAscii()) + { + sExpandedText.Erase(0, nPos); + nPos = 0; + } + + if( !sExpandedText.Equals( sName ) ) { USHORT nTmp = ::lcl_FindOutlineName( GetNodes(), sName, TRUE ); if( USHRT_MAX != nTmp ) // ueber den Namen gefunden diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index db7a1aedca84..1169ef788152 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docredln.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: dvo $ $Date: 2002-11-28 17:45:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,6 +162,14 @@ for( USHORT i = 0; i < rTbl.Count(); ++i ) lcl_CheckPam( rTbl[ i ] ); + for( USHORT j = 0; j < rTbl.Count(); ++j ) + { + // check for empty redlines + ASSERT( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) || + ( rTbl[j]->GetContentIdx() != NULL ), + "redline table corrupted: empty redline" ); + } + // verify proper redline sorting for( USHORT n = 1; n < rTbl.Count(); ++n ) { @@ -291,11 +299,24 @@ BOOL SwDoc::AppendRedline( SwRedline* pNewRedl, BOOL bCallDelete ) for( ; pNewRedl && n < pRedlineTbl->Count(); ++n ) { + +#ifdef DVO_TEST + _CHECK_REDLINE( this ) +#endif + SwRedline* pRedl = (*pRedlineTbl)[ n ]; SwPosition* pRStt = pRedl->Start(), * pREnd = pRStt == pRedl->GetPoint() ? pRedl->GetMark() : pRedl->GetPoint(); + // #i8518# remove empty redlines while we're at it + if( ( *pRStt == *pREnd ) && + ( pRedl->GetContentIdx() == NULL ) ) + { + pRedlineTbl->DeleteAndDestroy(n); + continue; + } + SwComparePosition eCmpPos = ComparePosition( *pStt, *pEnd, *pRStt, *pREnd ); switch( pNewRedl->GetType() ) @@ -336,6 +357,14 @@ BOOL SwDoc::AppendRedline( SwRedline* pNewRedl, BOOL bCallDelete ) pRedlineTbl->Remove( n ); pRedlineTbl->Insert( pRedl ); } + else if ( POS_OUTSIDE == eCmpPos ) + { + // #107164# own insert-over-insert + // redlines: just scrap the inside ones + pRedlineTbl->Remove( n ); + n--; + break; + } else if( POS_INSIDE != eCmpPos && POS_EQUAL != eCmpPos) break; @@ -372,6 +401,18 @@ BOOL SwDoc::AppendRedline( SwRedline* pNewRedl, BOOL bCallDelete ) pNewRedl->SetStart( *pREnd ); pRedlineTbl->Insert( pSplit ); } + else if ( POS_OVERLAP_BEHIND == eCmpPos ) + { + // #107164# handle overlapping redlines in broken + // documents + pNewRedl->SetStart( *pREnd ); + } + else if ( POS_OVERLAP_BEFORE == eCmpPos ) + { + // #107164# handle overlapping redlines in broken + // documents + pNewRedl->SetEnd( *pRStt ); + } break; case REDLINE_DELETE: if( POS_INSIDE == eCmpPos ) @@ -518,7 +559,27 @@ BOOL SwDoc::AppendRedline( SwRedline* pNewRedl, BOOL bCallDelete ) pNewRedl->SetStart( *pRStt, pStt ); else pNewRedl->SetEnd( *pREnd, pEnd ); - pRedlineTbl->DeleteAndDestroy( n-- ); + + // delete current (below), and restart process with + // previous + USHORT nToBeDeleted = n; + n--; + + // #107359# Do it again, Sam! + // If you can do it for them, you can do it for me. + if( *(pNewRedl->Start()) <= *pREnd ) + { + // Whoooah, we just extended the new 'redline' + // beyond previous redlines, so better start + // again. Of course this is not supposed to + // happen, and in an ideal world it doesn't, + // but unfortunately this code is buggy and + // totally rotten so it does happen and we + // better fix it. + n = -1; + } + + pRedlineTbl->DeleteAndDestroy( nToBeDeleted ); } break; } diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index eca9c8744e38..256efbf7d70e 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsort.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2002-03-21 13:12:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,8 +69,8 @@ #include <hintids.hxx> #endif -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _UNOTOOLS_COLLATORWRAPPER_HXX #include <unotools/collatorwrapper.hxx> @@ -213,14 +213,14 @@ double SwSortElement::StrToDouble( const String& rStr ) const pLclData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), *pLocale ); - const xub_Unicode *pEnd; - int nErrno; - double nRet = SolarMath::StringToDouble( rStr.GetBuffer(), - pLclData->getNumThousandSep().GetChar(0), + rtl_math_ConversionStatus eStatus; + sal_Int32 nEnd; + double nRet = ::rtl::math::stringToDouble( rStr, pLclData->getNumDecimalSep().GetChar(0), - nErrno, &pEnd ); + pLclData->getNumThousandSep().GetChar(0), + &eStatus, &nEnd ); - if( 0 != nErrno || pEnd == rStr.GetBuffer() ) + if( rtl_math_ConversionStatus_Ok != eStatus || nEnd == 0 ) nRet = 0.0; return nRet; } @@ -587,7 +587,12 @@ BOOL SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt) // Auf gehts sortieren // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara );; + } + if(!aFndBox.GetLines().Count()) return FALSE; diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 85e233701fef..c4d880840052 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: doctxm.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hbrinkm $ $Date: 2002-10-29 14:37:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1493,7 +1493,15 @@ void SwTOXBaseSection::UpdateAuthorities( const SwTxtNode* pOwnChapterNode, rTxtNode.GetNodes().IsDocNodes() /*&& (!IsFromChapter() || pChapterCompareNode == pOwnChapterNode) */) { - SwTOXAuthority* pNew = new SwTOXAuthority( rTxtNode, *pFmtFld, rIntl ); + //#106485# the body node has to be used! + SwCntntFrm *pFrm = rTxtNode.GetFrm(); + SwPosition aFldPos(rTxtNode); + const SwTxtNode* pTxtNode = 0; + if(pFrm && !pFrm->IsInDocBody()) + pTxtNode = GetBodyTxtNode( *pDoc, aFldPos, *pFrm ); + if(!pTxtNode) + pTxtNode = &rTxtNode; + SwTOXAuthority* pNew = new SwTOXAuthority( *pTxtNode, *pFmtFld, rIntl ); InsertSorted(pNew); } diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 7bbbdae60267..b4831304a9ed 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: notxtfrm.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: od $ $Date: 2002-11-29 15:09:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,11 +213,12 @@ #define DEFTEXTSIZE 12 -/// OD 25.09.2002 #99739# - insert declaration of global methods <SwAlignRect> -/// and <SwAlignGrtRect>. -/// Methods are implemented in /core/layout/paintfrm.cxx -extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); -extern void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut ); +// OD 25.09.2002 #99739# - insert declaration of global methods <SwAlignRect> +// and <SwAlignGrtRect>. +// Methods are implemented in /core/layout/paintfrm.cxx +// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx> +//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); +//extern void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut ); //Zum asynchronen (erstmaligem) anfordern von Grafiken class SwRequestGraphic : public SwClient @@ -485,7 +486,8 @@ void SwNoTxtFrm::Paint( const SwRect &rRect ) const if( !pSh->GetViewOptions()->IsGraphic() ) { StopAnimation(); - if ( pSh->GetWin() ) + // OD 10.01.2003 #i6467# - no paint of placeholder for page preview + if ( pSh->GetWin() && !pSh->IsPreView() ) { const SwNoTxtNode* pNd = GetNode()->GetNoTxtNode(); String aTxt( pNd->GetAlternateText() ); diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 829b5cdb41b3..21616f836f74 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: poolfmt.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 14:38:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,6 +138,9 @@ #ifndef _SVX_FRMDIRITEM_HXX #include <svx/frmdiritem.hxx> #endif +#ifndef _SVX_EMPHITEM_HXX +#include <svx/emphitem.hxx> +#endif #ifndef _VIEWOPT_HXX #include <viewopt.hxx> #endif @@ -435,7 +438,7 @@ void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl, // Ist der String-Pointer definiert, dann erfrage nur die // Beschreibung der Attribute, !! es legt keine Vorlage an !! -SvxFrameDirection lcl_GetFrameDirection(ULONG nLanguage) +SvxFrameDirection GetDefaultFrameDirection(ULONG nLanguage) { SvxFrameDirection eResult = FRMDIR_HORI_LEFT_TOP; @@ -555,7 +558,8 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool // allgemeine Inhaltsformen case RES_POOLCOLL_STANDARD: if (bRegardLanguage && - lcl_GetFrameDirection(GetAppLanguage()) == FRMDIR_HORI_RIGHT_TOP) + GetDefaultFrameDirection(GetAppLanguage()) == + FRMDIR_HORI_RIGHT_TOP) { SvxAdjustItem aAdjust(SVX_ADJUST_RIGHT); aSet.Put(aAdjust); @@ -1432,6 +1436,8 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId, String* pDesc, long nH = ((SvxFontHeightItem*)GetDfltAttr( RES_CHRATR_CJK_FONTSIZE ))->GetHeight() / 2; SetAllScriptItem( aSet, SvxFontHeightItem( nH )); + aSet.Put(SvxUnderlineItem( UNDERLINE_NONE )); + aSet.Put(SvxEmphasisMarkItem( EMPHASISMARK_NONE) ); } break; diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index e11da889ac06..612fb927667e 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tblcpy.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2002-03-21 13:12:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -392,7 +392,12 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes, USHORT nLn, nBx; _FndLine *pFLine, *pInsFLine = 0; - _FndBox aFndBox( rSelBoxes ); + _FndBox aFndBox( 0, 0 ); + // suche alle Boxen / Lines + { + _FndPara aPara( rSelBoxes, &aFndBox ); + ((SwTableLines&)GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); + } // JP 06.09.96: Sonderfall - eine Box in der Tabelle -> in alle // selektierten Boxen kopieren! diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index eebcef006252..736b703f5691 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tblrwcl.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: fme $ $Date: 2002-11-15 09:31:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -588,7 +588,11 @@ BOOL SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -625,7 +629,11 @@ BOOL SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -702,6 +710,41 @@ BOOL SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, return TRUE; } +BOOL _FndBoxAppendRowLine( const SwTableLine*& rpLine, void* pPara ); + +BOOL _FndBoxAppendRowBox( const SwTableBox*& rpBox, void* pPara ) +{ + _FndPara* pFndPara = (_FndPara*)pPara; + _FndBox* pFndBox = new _FndBox( (SwTableBox*)rpBox, pFndPara->pFndLine ); + if( rpBox->GetTabLines().Count() ) + { + _FndPara aPara( *pFndPara, pFndBox ); + pFndBox->GetBox()->GetTabLines().ForEach( &_FndBoxAppendRowLine, &aPara ); + if( !pFndBox->GetLines().Count() ) + delete pFndBox; + } + else + pFndPara->pFndLine->GetBoxes().C40_INSERT( _FndBox, pFndBox, + pFndPara->pFndLine->GetBoxes().Count() ); + return TRUE; +} + +BOOL _FndBoxAppendRowLine( const SwTableLine*& rpLine, void* pPara ) +{ + _FndPara* pFndPara = (_FndPara*)pPara; + _FndLine* pFndLine = new _FndLine( (SwTableLine*)rpLine, pFndPara->pFndBox ); + _FndPara aPara( *pFndPara, pFndLine ); + pFndLine->GetLine()->GetTabBoxes().ForEach( &_FndBoxAppendRowBox, &aPara ); + if( pFndLine->GetBoxes().Count() ) + { + pFndPara->pFndBox->GetLines().C40_INSERT( _FndLine, pFndLine, + pFndPara->pFndBox->GetLines().Count() ); + } + else + delete pFndLine; + return TRUE; +} + BOOL SwTable::AppendRow( SwDoc* pDoc, USHORT nCnt ) { @@ -710,7 +753,15 @@ BOOL SwTable::AppendRow( SwDoc* pDoc, USHORT nCnt ) return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( *GetTabLines()[ GetTabLines().Count()-1 ] ); + _FndBox aFndBox( 0, 0 ); + { + const SwTableLine* pLLine = GetTabLines()[ GetTabLines().Count()-1 ]; + + const SwSelBoxes* pBxs = 0; // Dummy !!! + _FndPara aPara( *pBxs, &aFndBox ); + + _FndBoxAppendRowLine( pLLine, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -1683,7 +1734,11 @@ BOOL SwTable::Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -1953,7 +2008,11 @@ BOOL SwTable::CopyHeadlineIntoTable( SwTableNode& rTblNd ) pBox = GetTblBox( pBox->GetSttNd()->FindStartNode()->GetIndex() + 1 ); SelLineFromBox( pBox, aSelBoxes, TRUE ); - _FndBox aFndBox( aSelBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( aSelBoxes, &aFndBox ); + ((SwTableLines&)GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -1978,7 +2037,11 @@ BOOL SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, BOOL bCpyName ) const { // suche alle Boxen / Lines - _FndBox aFndBox( rSelBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rSelBoxes, &aFndBox ); + ((SwTableLines&)GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -3285,15 +3348,13 @@ _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo, rTbl.GetTabSortBoxes().Count() ) return 0; - _FndBox* pFndBox; + _FndBox* pFndBox = new _FndBox( 0, 0 ); if( rParam.bBigger ) - { - pFndBox = new _FndBox( 0, 0 ); pFndBox->SetTableLines( rParam.aBoxes, rTbl ); - } else { - pFndBox = new _FndBox( rParam.aBoxes ); + _FndPara aPara( rParam.aBoxes, pFndBox ); + rTbl.GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); ASSERT( pFndBox->GetLines().Count(), "Wo sind die Boxen" ); pFndBox->SetTableLines( rTbl ); @@ -3813,15 +3874,13 @@ _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo, rTbl.GetTabSortBoxes().Count() ) return 0; - _FndBox* pFndBox; + _FndBox* pFndBox = new _FndBox( 0, 0 ); if( !rParam.bBigger ) - { - pFndBox = new _FndBox( 0, 0 ); pFndBox->SetTableLines( rParam.aBoxes, rTbl ); - } else { - pFndBox = new _FndBox( rParam.aBoxes ); + _FndPara aPara( rParam.aBoxes, pFndBox ); + rTbl.GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); ASSERT( pFndBox->GetLines().Count(), "Wo sind die Boxen" ); pFndBox->SetTableLines( rTbl ); diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index be8dfb911719..55ee8ff4b5b4 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndcopy.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hbrinkm $ $Date: 2002-11-05 12:37:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,7 +148,6 @@ #include <poolfmt.hxx> #endif - // Struktur fuer das Mappen von alten und neuen Frame-Formaten an den // Boxen und Lines einer Tabelle @@ -902,6 +901,23 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, } } + const SfxPoolItem * pItem = NULL; + SwAttrSet * pAttrSet = pDestNd->GetpSwAttrSet(); + + /* #107213#: Safe numrule item at destination. */ + int aState = SFX_ITEM_UNKNOWN; + SwNumRuleItem aNumRuleItem; + + if (pAttrSet != NULL) + { + aState = pAttrSet->GetItemState + (RES_PARATR_NUMRULE, FALSE, &pItem); + + if (SFX_ITEM_SET == aState) + aNumRuleItem = *((SwNumRuleItem *) pItem); + } + /* #107213# */ + if( !bCopyOk ) { xub_StrLen nCpyLen = ( bOneNode ? pEnd->nContent.GetIndex() @@ -918,11 +934,21 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, if( bCopyCollFmt ) { pSttNd->CopyCollFmt( *pDestNd ); - if( pSttNd->GetNum() ) - pDestNd->UpdateNum( *pSttNd->GetNum() ); + + if (pSttNd->GetNum()) + pDestNd->UpdateNum(*pSttNd->GetNum()); + + /* #107213# If only a part of one paragraph is copied + restore the numrule at the destination. */ + if (SFX_ITEM_SET == aState) + pDestNd->SwCntntNode::SetAttr(aNumRuleItem); + else + pDestNd->ResetAttr(RES_PARATR_NUMRULE); } + break; } + aRg.aStart++; } } @@ -983,6 +1009,23 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, aInsPos--; } + const SfxPoolItem * pItem = NULL; + SwAttrSet * pAttrSet = pDestNd->GetpSwAttrSet(); + + /* #107213# Save numrule at destination */ + int aState = SFX_ITEM_UNKNOWN; + SwNumRuleItem aNumRuleItem; + + if (pAttrSet != NULL) + { + aState = pAttrSet->GetItemState + (RES_PARATR_NUMRULE, FALSE, &pItem); + + if (SFX_ITEM_SET == aState) + aNumRuleItem = *((SwNumRuleItem *) pItem); + } + /* #107213# */ + BOOL bEmptyDestNd = 0 == pDestNd->GetTxt().Len(); pEndNd->Copy( pDestNd, aDestIdx, SwIndex( pEndNd ), pEnd->nContent.GetIndex() ); @@ -991,8 +1034,19 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, if( bCopyCollFmt && ( bOneNode || bEmptyDestNd )) { pEndNd->CopyCollFmt( *pDestNd ); - if( pEndNd->GetNum() ) + + if (pEndNd->GetNum()) pDestNd->UpdateNum( *pEndNd->GetNum() ); + + if (bOneNode) + { + /* #107213# If only a part of one paragraph is copied + restore the numrule at the destination. */ + if (SFX_ITEM_SET == aState) + pDestNd->SwCntntNode::SetAttr(aNumRuleItem); + else + pDestNd->ResetAttr(RES_PARATR_NUMRULE); + } } } @@ -1065,6 +1119,7 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, } pDoc->SetRedlineMode_intern( eOld ); pDoc->SetModified(); + return TRUE; } diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 5a812a85ee1e..e1e97e2bc7ec 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndsect.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: od $ $Date: 2002-11-15 11:07:52 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -412,8 +412,8 @@ USHORT SwDoc::IsInsRegionAvailable( const SwPaM& rRange, const SwCntntNode* pCNd = pEnd->nNode.GetNode().GetCntntNode(); const SwNode* pNd = &pStt->nNode.GetNode(); const SwSectionNode* pSectNd = pNd->FindSectionNode(); - const SwSectionNode* pEndSectNd = pCNd->FindSectionNode(); - if( pSectNd && pEndSectNd && pSectNd != pCNd->FindSectionNode() ) + const SwSectionNode* pEndSectNd = pCNd ? pCNd->FindSectionNode() : 0; + if( pSectNd && pEndSectNd && pSectNd != pEndSectNd ) { // versuche eine umschliessende Section zu erzeugen // Aber, nur wenn der Start am Sectionanfang und das Ende am diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 9e5d7e7eec53..301091d13c4b 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndtbl.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fme $ $Date: 2002-11-15 09:51:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,6 +115,9 @@ #ifndef _CELLFRM_HXX //autogen #include <cellfrm.hxx> #endif +#ifndef _PAGEFRM_HXX +#include <pagefrm.hxx> +#endif #ifndef _TABCOL_HXX //autogen #include <tabcol.hxx> #endif @@ -249,17 +252,17 @@ class lcl_DelRedlines SwDoc* pDoc; public: lcl_DelRedlines( const SwTableNode& rNd, BOOL bCheckForOwnRedline ); - lcl_DelRedlines( SwPaM& rPam ) - : pDoc( rPam.GetDoc() ) - { - pDoc->StartUndo(); - if( !pDoc->IsIgnoreRedline() && pDoc->GetRedlineTbl().Count() ) - pDoc->DeleteRedline( rPam ); - } + lcl_DelRedlines( SwPaM& rPam ); ~lcl_DelRedlines() { pDoc->EndUndo(); } }; +lcl_DelRedlines::lcl_DelRedlines( SwPaM & rPam) : pDoc( rPam.GetDoc() ) +{ + pDoc->StartUndo(); + if( !pDoc->IsIgnoreRedline() && pDoc->GetRedlineTbl().Count() ) + pDoc->AcceptRedline( rPam ); +} void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, BYTE nId ) { @@ -514,6 +517,9 @@ const SwTable* SwDoc::InsertTable( const SwPosition& rPos, USHORT nRows, if( (nInsTblFlags & HEADLINE) && (1 != nRows || !bDfltBorders) ) pHeadColl = GetTxtCollFromPool( RES_POOLCOLL_TABLE_HDLN ); + /* #106283# Save content node to extract FRAMEDIR from. */ + const SwCntntNode * pCntntNd = rPos.nNode.GetNode().GetCntntNode(); + SwTableNode *pTblNd = GetNodes().InsertTable( rPos.nNode, nCols, pBodyColl, nRows, pHeadColl ); @@ -521,6 +527,20 @@ const SwTable* SwDoc::InsertTable( const SwPosition& rPos, USHORT nRows, SwTableLineFmt* pLineFmt = MakeTableLineFmt(); SwTableFmt* pTableFmt = MakeTblFrmFmt( GetUniqueTblName(), GetDfltFrmFmt() ); + /* #106283# If the node to insert the table at is a context node and has a + non-default FRAMEDIR propagate it to the table. */ + if (pCntntNd) + { + const SwAttrSet & aNdSet = pCntntNd->GetSwAttrSet(); + const SfxPoolItem *pItem = NULL; + + if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, TRUE, &pItem ) + && pItem != NULL) + { + pTableFmt->SetAttr( *pItem ); + } + } + //Orientation am Fmt der Table setzen pTableFmt->SetAttr( SwFmtHoriOrient( 0, eAdjust ) ); // alle Zeilen haben die Fill-Order von links nach rechts ! @@ -716,6 +736,9 @@ const SwTable* SwDoc::TextToTable( const SwPaM& rRange, sal_Unicode cCh, return 0; } + /* #106283# Save first node in the selection if it is a context node. */ + SwCntntNode * pSttCntntNd = pStt->nNode.GetNode().GetCntntNode(); + SwPaM aOriginal( *pStt, *pEnd ); pStt = aOriginal.GetMark(); pEnd = aOriginal.GetPoint(); @@ -786,6 +809,21 @@ const SwTable* SwDoc::TextToTable( const SwPaM& rRange, sal_Unicode cCh, if( !(nInsTblFlags & SPLIT_LAYOUT) ) pTableFmt->SetAttr( SwFmtLayoutSplit( FALSE )); + /* #106283# If the first node in the selection is a context node and if it + has an item FRAMEDIR set (no default) propagate the item to the + replacing table. */ + if (pSttCntntNd) + { + const SwAttrSet & aNdSet = pSttCntntNd->GetSwAttrSet(); + const SfxPoolItem *pItem = NULL; + + if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, TRUE, &pItem ) + && pItem != NULL) + { + pTableFmt->SetAttr( *pItem ); + } + } + SwTableNode* pTblNd = GetNodes().TextToTable( aRg, cCh, pTableFmt, pLineFmt, pBoxFmt, GetTxtCollFromPool( RES_POOLCOLL_STANDARD ), @@ -1526,7 +1564,12 @@ BOOL SwDoc::DeleteRow( const SwCursor& rCursor ) return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( aBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( aBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } + if( !aFndBox.GetLines().Count() ) return FALSE; @@ -2133,18 +2176,19 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, } //Fix-Punkte setzen, LeftMin in Dokumentkoordinaten die anderen relativ. -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) - rFill.SetLeftMin ( (USHORT)(pTab->Frm().*fnRect->fnGetLeft)() ); + const SwPageFrm* pPage = pTab->FindPageFrm(); + const ULONG nLeftMin = (pTab->Frm().*fnRect->fnGetLeft)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + const ULONG nRightMax = (pTab->Frm().*fnRect->fnGetRight)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + + rFill.SetLeftMin ( nLeftMin ); rFill.SetLeft ( (pTab->Prt().*fnRect->fnGetLeft)() ); rFill.SetRight ( (pTab->Prt().*fnRect->fnGetRight)()); - rFill.SetRightMax( (USHORT)(pTab->Frm().*fnRect->fnGetRight)() - rFill.GetLeftMin() ); -#else - rFill.SetLeftMin ( (USHORT)pTab->Frm().Left() ); - rFill.SetLeft ( pTab->Prt().Left() ); - rFill.SetRight ( pTab->Prt().Right()); - rFill.SetRightMax( (USHORT)pTab->Frm().Right() - rFill.GetLeftMin() ); -#endif + rFill.SetRightMax( nRightMax - nLeftMin ); pTab->GetTable()->GetTabCols( rFill, pBox ); } @@ -2205,18 +2249,19 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, BOOL bCurRowOnly, SwTabCols aOld( rNew.Count() ); + const SwPageFrm* pPage = pTab->FindPageFrm(); + const ULONG nLeftMin = (pTab->Frm().*fnRect->fnGetLeft)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + const ULONG nRightMax = (pTab->Frm().*fnRect->fnGetRight)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + //Fix-Punkte setzen, LeftMin in Dokumentkoordinaten die anderen relativ. -#ifdef VERTICAL_LAYOUT - aOld.SetLeftMin ( (USHORT)(pTab->Frm().*fnRect->fnGetLeft)() ); + aOld.SetLeftMin ( nLeftMin ); aOld.SetLeft ( (pTab->Prt().*fnRect->fnGetLeft)() ); aOld.SetRight ( (pTab->Prt().*fnRect->fnGetRight)()); - aOld.SetRightMax( (USHORT)(pTab->Frm().*fnRect->fnGetRight)() - aOld.GetLeftMin() ); -#else - aOld.SetLeftMin ( (USHORT)pTab->Frm().Left() ); - aOld.SetLeft ( pTab->Prt().Left() ); - aOld.SetRight ( pTab->Prt().Right()); - aOld.SetRightMax( (USHORT)pTab->Frm().Right() - aOld.GetLeftMin() ); -#endif + aOld.SetRightMax( nRightMax - nLeftMin ); /* if( DoesUndo() ) { @@ -3018,7 +3063,11 @@ BOOL SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -3089,7 +3138,11 @@ BOOL SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet ) return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -3890,7 +3943,10 @@ lcl_DelRedlines::lcl_DelRedlines( const SwTableNode& rNd, } } if( bDelete ) - pDoc->DeleteRedline( rNd ); + { + SwPaM aPam(*rNd.EndOfSectionNode(), rNd); + pDoc->AcceptRedline( aPam ); + } } } diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index a9fb82f3c6ae..1e1a5cf41211 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndtbl1.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: fme $ $Date: 2002-12-02 12:24:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -287,7 +287,6 @@ BOOL _FindLine( const _FndLine*& rpLine, void* pPara ) return TRUE; } - void lcl_CollectLines( SvPtrarr &rArr, const SwCursor& rCursor ) { //Zuerst die selektierten Boxen einsammeln. @@ -296,11 +295,15 @@ void lcl_CollectLines( SvPtrarr &rArr, const SwCursor& rCursor ) return ; //Die selektierte Struktur kopieren. - _FndBox aFndBox( aBoxes ); - - //Diejenigen Lines einsammeln, die nur selektierte Boxen enthalten. const SwTable &rTable = aBoxes[0]->GetSttNd()->FindTableNode()->GetTable(); LinesAndTable aPara( rArr, rTable ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( aBoxes, &aFndBox ); + ((SwTableLines&)rTable.GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); + } + + //Diejenigen Lines einsammeln, die nur selektierte Boxen enthalten. const _FndBox *pTmp = &aFndBox; ::_FindBox( pTmp, &aPara ); @@ -1427,6 +1430,9 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, BOOL bBalance ) SwTabCols aTabCols; GetTabCols( aTabCols, 0, (SwCellFrm*)pBoxFrm ); + if ( ! aTabCols.Count() ) + return; + const BYTE nTmp = (BYTE)Max( USHORT(255), USHORT(aTabCols.Count() + 1) ); SvUShorts aWish( nTmp, nTmp ), aMins( nTmp, nTmp ); @@ -1501,13 +1507,13 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, BOOL bBalance ) else nDiff -= aTabCols[i] - aTabCols[i-1]; - USHORT nTabRight = aTabCols.GetRight() + nDiff; + long nTabRight = aTabCols.GetRight() + nDiff; //Wenn die Tabelle zu breit wuerde begrenzen wir die Anpassung //auf das erlaubte Maximum. if ( !bBalance && nTabRight > aTabCols.GetRightMax() ) { - const USHORT nTmp = nTabRight - aTabCols.GetRightMax(); + const long nTmp = nTabRight - aTabCols.GetRightMax(); nDiff -= nTmp; nTabRight -= nTmp; } diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 41cce89dd5de..422e6c295369 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -2,9 +2,9 @@ * * $RCSfile: nodes.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: od $ $Date: 2003-02-28 12:41:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index dcd8db0e9f74..386169d1b4c1 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swbaslnk.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2001-07-04 18:13:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,13 @@ #include <hintids.hxx> +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif +#ifndef _SV_OUTDEV_HXX +#include <vcl/outdev.hxx> +#endif + #ifndef _LNKBASE_HXX //autogen #include <so3/lnkbase.hxx> #endif @@ -146,7 +153,7 @@ #include <htmltbl.hxx> #endif -BOOL SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd ); +BOOL SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd ); TYPEINIT1( SwBaseLink, ::so3::SvBaseLink ); @@ -228,7 +235,7 @@ void SwBaseLink::DataChanged( const String& rMimeType, FASTBOOL bGraphicArrived = FALSE; FASTBOOL bGraphicPieceArrived = FALSE; FASTBOOL bDontNotify = FALSE; - Size aGrfSz; + Size aGrfSz, aFrmFmtSz; if( pCntntNode->IsGrfNode() ) { @@ -246,6 +253,18 @@ void SwBaseLink::DataChanged( const String& rMimeType, GRAPHIC_DEFAULT != rGrfObj.GetType() ) ) { aGrfSz = ::GetGraphicSizeTwip( aGrf, 0 ); + if( static_cast< const SwGrfNode * >( pCntntNode )->IsChgTwipSizeFromPixel() ) + { + const MapMode aMapTwip( MAP_TWIP ); + aFrmFmtSz = + Application::GetDefaultDevice()->PixelToLogic( + aGrf.GetSizePixel(), aMapTwip ); + + } + else + { + aFrmFmtSz = aGrfSz; + } Size aSz( ((SwGrfNode*)pCntntNode)->GetTwipSize() ); if( bGraphicPieceArrived && GRAPHIC_DEFAULT != aGrf.GetType() && @@ -341,11 +360,11 @@ void SwBaseLink::DataChanged( const String& rMimeType, IsGrafikArrived() ); // Fly der Grafik anpassen ! - if( !::SetGrfFlySize( aGrfSz, pGrfNd ) ) + if( !::SetGrfFlySize( aGrfSz, aFrmFmtSz, pGrfNd ) ) ::lcl_CallModify( *pGrfNd, aMsgHint ); } else if( pBLink == this && - !::SetGrfFlySize( aGrfSz, pGrfNd ) ) + !::SetGrfFlySize( aGrfSz, aFrmFmtSz, pGrfNd ) ) // Fly der Grafik anpassen ! ::lcl_CallModify( *pGrfNd, aMsgHint ); } @@ -387,7 +406,7 @@ FASTBOOL SwBaseLink::IsShowQuickDrawBmp() const } -BOOL SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd ) +BOOL SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd ) { BOOL bRet = FALSE; ViewShell *pSh; @@ -406,15 +425,15 @@ BOOL SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd ) Size aCalcSz( aSz ); if ( !aSz.Height() && aSz.Width() ) //passende Hoehe ausrechnen. - aCalcSz.Height() = rGrfSz.Height() * - aSz.Width() / rGrfSz.Width(); + aCalcSz.Height() = rFrmSz.Height() * + aSz.Width() / rFrmSz.Width(); else if ( !aSz.Width() && aSz.Height() ) //passende Breite ausrechnen - aCalcSz.Width() = rGrfSz.Width() * - aSz.Height() / rGrfSz.Height(); + aCalcSz.Width() = rFrmSz.Width() * + aSz.Height() / rFrmSz.Height(); else //Hoehe und Breite uebernehmen - aCalcSz = rGrfSz; + aCalcSz = rFrmSz; const SvxBoxItem &rBox = pFmt->GetBox(); aCalcSz.Width() += rBox.CalcLineSpace(BOX_LINE_LEFT) + diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 7c29ff6851d1..b37fd7e988d8 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dflyobj.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fme $ $Date: 2002-10-10 08:45:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -301,16 +301,22 @@ SdrObject* __EXPORT SwVirtFlyDrawObj::CheckHit( const Point& rPnt, USHORT nTol, && !rURL.GetURL().Len() && !rURL.GetMap() */ ) { - //Vor dem Return noch 3a (siehe oben) pruefen. - SdrPage *pPg = GetPage(); - for ( UINT32 i = GetOrdNumDirect()+1; i < pPg->GetObjCount(); ++i ) - { - SdrObject *pObj = pPg->GetObj( i ); - if ( pObj->IsWriterFlyFrame() && - ((SwVirtFlyDrawObj*)pObj)->GetBoundRect().IsInside( rPnt ) ) - return 0; - } + // #107513# + // This test needs to be done outside, since also drawing layer HitTest + // methods are called. Not all drawing objects are derived and the + // CheckHit() overloaded. That's an conceptual error here. return (SdrObject*)this; + + //Vor dem Return noch 3a (siehe oben) pruefen. + //SdrPage *pPg = GetPage(); + //for ( UINT32 i = GetOrdNumDirect()+1; i < pPg->GetObjCount(); ++i ) + //{ + // SdrObject *pObj = pPg->GetObj( i ); + // if ( pObj->IsWriterFlyFrame() && + // ((SwVirtFlyDrawObj*)pObj)->GetBoundRect().IsInside( rPnt ) ) + // return 0; + //} + //return (SdrObject*)this; } else { diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 5cbd2c28745b..4277d6505d73 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dpage.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2000-11-27 07:50:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,10 +168,12 @@ SwDPage::~SwDPage() } -Point SwDPage::GetOffset() const -{ - return Point( DOCUMENTBORDER, DOCUMENTBORDER ); -} +// #i3694# +// This GetOffset() method is not needed anymore, it even leads to errors. +//Point SwDPage::GetOffset() const +//{ +// return Point( DOCUMENTBORDER, DOCUMENTBORDER ); +//} /************************************************************************* |* diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 2133aec830e5..d32c209ce6e1 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawdoc.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: ka $ $Date: 2001-11-02 16:05:52 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -244,6 +244,8 @@ SwDrawDocument::SwDrawDocument( SfxItemPool *pPool, SwDocShell *pDocSh ) SwDrawDocument::~SwDrawDocument() { + Broadcast(SdrHint(HINT_MODELCLEARED)); + Clear(); } diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 13aaecf3083b..d6948d20bb9d 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acorrect.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: jp $ $Date: 2002-02-22 12:00:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -472,6 +472,7 @@ BOOL SwAutoCorrDoc::ChgAutoCorrWord( xub_StrLen & rSttPos, xub_StrLen nEndPos, pDoc->DontExpandFmt( *aPam.GetPoint() ); pDoc->Insert( aPam, pCorr->Correct() ); + pDoc->AppendTmpCorr(sKurz, pCorr->Correct()); bRet = TRUE; } } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 62a31723b732..53881e32594c 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: autofmt.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: iha $ $Date: 2002-11-28 12:12:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -961,9 +961,14 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos, // Numerierung mit c oder d anfangen will, werden diese erstmal // zu chars und spaeter ggfs. zu romischen Zeichen! // if( strchr( "mdclxvi", cLow )) +#ifdef WITH_ALPHANUM_AS_NUMFMT + //detection of 'c' and 'd' a ROMAN numbering should not be done here if( 256 > cLow &&( (eScan & (LOWER_ROMAN|UPPER_ROMAN)) ? strchr( "mdclxvi", cLow ) : strchr( "mlxvi", cLow ) )) +#else + if( 256 > cLow && ( strchr( "mdclxvi", cLow ) )) +#endif { if( bIsUpper ) cNumTyp = '0' + SVX_NUM_ROMAN_UPPER, eTmpScan = UPPER_ROMAN; diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 9f3eda4c4408..137b20354461 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edattr.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:26:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,11 +149,15 @@ using namespace ::com::sun::star::i18n; // wenn Selektion groesser Max Nodes oder mehr als Max Selektionen // => keine Attribute -static const USHORT nMaxLookup = 255; +const USHORT& getMaxLookup() +{ + static const USHORT nMaxLookup = 1000; + return nMaxLookup; +} BOOL SwEditShell::GetAttr( SfxItemSet& rSet ) const { - if( GetCrsrCnt() > nMaxLookup ) + if( GetCrsrCnt() > getMaxLookup() ) { rSet.InvalidateAllItems(); return FALSE; @@ -175,7 +179,7 @@ BOOL SwEditShell::GetAttr( SfxItemSet& rSet ) const nTmp = nSttCnt; nSttCnt = nEndCnt; nEndCnt = (xub_StrLen)nTmp; } - if( nEndNd - nSttNd >= nMaxLookup ) + if( nEndNd - nSttNd >= getMaxLookup() ) { rSet.ClearItem(); rSet.InvalidateAllItems(); @@ -246,7 +250,7 @@ SwTxtFmtColl* SwEditShell::GetCurTxtFmtColl() const { SwTxtFmtColl *pFmt = 0; - if ( GetCrsrCnt() > nMaxLookup ) + if ( GetCrsrCnt() > getMaxLookup() ) return 0; FOREACHPAM_START(this) @@ -262,7 +266,7 @@ SwTxtFmtColl* SwEditShell::GetCurTxtFmtColl() const nTmp = nSttCnt; nSttCnt = nEndCnt; nEndCnt = (xub_StrLen)nTmp; } - if( nEndNd - nSttNd >= nMaxLookup ) + if( nEndNd - nSttNd >= getMaxLookup() ) { pFmt = 0; break; @@ -480,10 +484,41 @@ inline USHORT lcl_SetScriptFlags( USHORT nType ) } BOOL lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos, - USHORT &rScrpt, BOOL bInSelection ) + USHORT &rScrpt, BOOL bInSelection, BOOL bNum ) { BOOL bRet = FALSE; const String& rTxt = rTNd.GetTxt(); + String sExp; + + // consider numbering + if ( bNum ) + { + bRet = FALSE; + + const SwNumRule* pNumRule = rTNd.GetNumRule(); + const SwNodeNum* pNum = rTNd.GetNum(); + + if( !pNumRule ) // oder sollte OutlineNum an sein? + { + pNum = rTNd.GetOutlineNum(); + if( pNum ) + pNumRule = rTNd.GetDoc()->GetOutlineNumRule(); + } + + if( pNumRule && pNum && MAXLEVEL > pNum->GetLevel() ) + { + const SwNumFmt &rNumFmt = pNumRule->Get( pNum->GetLevel() ); + + if( SVX_NUM_BITMAP != rNumFmt.GetNumberingType() ) + { + sExp = ( SVX_NUM_CHAR_SPECIAL == rNumFmt.GetNumberingType() ? + rNumFmt.GetBulletChar() : + pNumRule->MakeNumString( *pNum ) ); + } + } + } + + // and fields const SwTxtAttr* pTFld; if( CH_TXTATR_BREAKWORD == rTxt.GetChar( nPos ) && 0 != ( pTFld = rTNd.GetTxtAttr( nPos ) ) ) @@ -491,27 +526,32 @@ BOOL lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos, bRet = TRUE; // all other then fields can be // defined as weak-script ? const SwField* pFld; - String sExp; if( RES_TXTATR_FIELD == pTFld->Which() && - 0 != (pFld = pTFld->GetFld().GetFld() ) && - (sExp = pFld->Expand()).Len() ) + 0 != (pFld = pTFld->GetFld().GetFld() ) ) + { + sExp += pFld->Expand(); + } + } + + xub_StrLen nEnd = sExp.Len(); + if ( nEnd ) + { + xub_StrLen n; + if( bInSelection ) { - xub_StrLen n, nEnd = sExp.Len(); - if( bInSelection ) + USHORT nScript; + for( n = 0; n < nEnd; n = (xub_StrLen) + pBreakIt->xBreak->endOfScript( sExp, n, nScript )) { - USHORT nScript; - for( n = 0; n < nEnd; n = (xub_StrLen) - pBreakIt->xBreak->endOfScript( sExp, n, nScript )) - { - nScript = pBreakIt->xBreak->getScriptType( sExp, n ); - rScrpt |= nScript; - } + nScript = pBreakIt->xBreak->getScriptType( sExp, n ); + rScrpt |= lcl_SetScriptFlags( nScript ); } - else - rScrpt |= lcl_SetScriptFlags( pBreakIt->xBreak-> - getScriptType( sExp, nEnd-1 )); } + else + rScrpt |= lcl_SetScriptFlags( pBreakIt->xBreak-> + getScriptType( sExp, nEnd-1 )); } + return bRet; } @@ -557,7 +597,7 @@ USHORT SwEditShell::GetScriptType( USHORT nFlags ) const else nScript = GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() ); - if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nPos, nRet, FALSE )) + if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nPos, nRet, FALSE, FALSE )) nRet |= lcl_SetScriptFlags( nScript ); } } @@ -581,6 +621,7 @@ USHORT SwEditShell::GetScriptType( USHORT nFlags ) const ? pEnd->nContent.GetIndex() : rTxt.Len(), nSttPos = nChg; + ASSERT( nEndPos <= rTxt.Len(), "Index outside the range - endless loop!" ); if( nEndPos > rTxt.Len() ) nEndPos = rTxt.Len(); @@ -593,7 +634,8 @@ USHORT SwEditShell::GetScriptType( USHORT nFlags ) const pBreakIt->xBreak->getScriptType( rTxt, nChg ); - if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nChg, nRet, TRUE ) ) + if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nChg, nRet, TRUE, + 0 == nChg && rTxt.Len() == nEndPos ) ) nRet |= lcl_SetScriptFlags( nScript ); if( (SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 62922b838f79..57282dbf4cf8 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: editsh.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: os $ $Date: 2002-08-26 14:39:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -172,6 +172,9 @@ #ifndef _CRSSKIP_HXX #include <crsskip.hxx> #endif +#ifndef _DRAWFONT_HXX +#include <drawfont.hxx> +#endif #ifndef _UNOOBJ_HXX #include <unoobj.hxx> #endif @@ -217,6 +220,57 @@ void SwEditShell::Insert(const String &rStr) SaveTblBoxCntnt( PCURCRSR->GetPoint() ); FOREACHPAM_END() + + // calculate cursor bidi level + SwCursor* pTmpCrsr = _GetCrsr(); + const BOOL bDoNotSetBidiLevel = ! pTmpCrsr || + ( 0 != (SwUnoCrsr*)*pTmpCrsr ); + + if ( ! bDoNotSetBidiLevel ) + { + SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode(); + if ( rNode.IsTxtNode() ) + { + SwIndex& rIdx = pTmpCrsr->GetPoint()->nContent; + xub_StrLen nPos = rIdx.GetIndex(); + xub_StrLen nPrevPos = nPos; + if ( nPrevPos ) + --nPrevPos; + + // If some day the font fallback works, we should do this here: + // 1. get script info + // 2. call InitScriptInfo( rNode, bRTL ) + // This would avoid calling UpdateBidiInfo here, instead it would + // be called within InitScriptInfo and only if there are complex + // characters in the string. + + SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( ((SwTxtNode&)rNode), + sal_True ); + + BYTE nLevel = 0; + if ( ! pSI ) + { + // seems to be an empty paragraph. + Point aPt; + SwCntntFrm* pFrm = + ((SwTxtNode&)rNode).GetFrm( &aPt, pTmpCrsr->GetPoint(), + sal_False ); + + SwScriptInfo aScriptInfo; + aScriptInfo.SetDefaultDir( pFrm->IsRightToLeft() ); + aScriptInfo.UpdateBidiInfo( ((SwTxtNode&)rNode).GetTxt() ); + nLevel = aScriptInfo.DirType( nPrevPos ); + } + else + { + pSI->UpdateBidiInfo( ((SwTxtNode&)rNode).GetTxt() ); + nLevel = pSI->DirType( nPrevPos ); + } + + pTmpCrsr->SetCrsrBidiLevel( nLevel ); + } + } + EndAllAction(); } @@ -1071,7 +1125,14 @@ String SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, BOOL bInsText ) StartAllAction(); pDel->SetInsText( bInsText ); SetOverwriteCrsr( pDel->IsOverwriteCursor() ); + const SwPosition aPos( *pDel->GetPoint() ); GetDoc()->DeleteExtTextInput( pDel ); + + // In this case, the "replace" function did not set the cursor + // to the original position. Therefore we have to do this manually. + if ( ! bInsText && IsOverwriteCrsr() ) + *GetCrsr()->GetPoint() = aPos; + EndAllAction(); } return sRet; diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index 1eca7b181411..d8da67c80ef6 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edsect.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2001-05-08 08:58:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -371,140 +371,149 @@ USHORT SwEditShell::GetFullSelectedSectionCount() const return nRet; } -// is the cursor at the last contentposition of any section and is the -// insertposition not readonly? -// The return have 3 values: -// 0 - not at start or end of Section -// 1 - at start of Section -// 2 - at End of Section -int SwEditShell::CanInsertNodeAtEndOfSection() const + +/** + * Find the suitable node for a special insert (alt-enter). + * This should enable inserting text before/after sections and tables. + * + * A node is found if: + * 1) the innermost table/section is not in a write-protected area + * 2) pCurrentPos is at or just before an end node + * (or at or just after a start node) + * 3) there are only start/end nodes between pCurrentPos and the innermost + * table/section + * + * If a suitable node is found, an SwNode* is returned; else it is NULL. + */ +const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos) { - int nRet = 0; - if( !IsTableMode() ) + const SwNode* pReturn = NULL; + + // the current position + // const SwPosition* pCurrentPos = GetCrsr()->GetPoint(); + DBG_ASSERT( pCurrentPos != NULL, "Strange, we have no position!" ); + const SwNode& rCurrentNode = pCurrentPos->nNode.GetNode(); + + + // find innermost section or table. At the end of this scope, + // pInntermostNode contain the section/table before/after which we should + // insert our empty paragraph, or it will be NULL if none is found. + const SwNode* pInnermostNode = NULL; { - const SwPosition& rPos = *GetCrsr()->GetPoint(); - const SwSectionNode* pSectNd = rPos.nNode.GetNode().FindSectionNode(); - if( pSectNd ) + const SwNode* pTableNode = rCurrentNode.FindTableNode(); + const SwNode* pSectionNode = rCurrentNode.FindSectionNode(); + + // find the table/section which is close + if( pTableNode == NULL ) + pInnermostNode = pSectionNode; + else if ( pSectionNode == NULL ) + pInnermostNode = pTableNode; + else { - BOOL bEnd = FALSE, bStart = FALSE; - const SwCntntNode* pCntNd = rPos.nNode.GetNode().GetCntntNode(); - - SwNodeIndex aEnd( rPos.nNode, 1 ); - while( aEnd.GetNode().IsEndNode() && - (const SwNode*)&aEnd.GetNode() != - pSectNd->EndOfSectionNode() ) - aEnd++; - - if( aEnd.GetNode().IsEndNode() && - ( !pCntNd || pCntNd->Len() == rPos.nContent.GetIndex() )) - bEnd = TRUE; - else - { - aEnd = rPos.nNode; - aEnd--; - while( aEnd.GetNode().IsStartNode() && - (const SwNode*)&aEnd.GetNode() != pSectNd ) - aEnd--; - - if( (const SwNode*)&aEnd.GetNode() == pSectNd && - ( !pCntNd || !rPos.nContent.GetIndex() )) - bStart = TRUE; - } + // compare and choose the larger one + pInnermostNode = + ( pSectionNode->GetIndex() > pTableNode->GetIndex() ) + ? pSectionNode : pTableNode; + } + } - if( bEnd || bStart ) - { - // is the insertposition readonly? - if( bEnd ) - { - aEnd = *pSectNd->EndOfSectionNode(); - aEnd++; - } - else - { - aEnd = *pSectNd; - aEnd--; - // the IsProtect-Method of SwNode test by sectionnode - // his parent! - if( aEnd.GetNode().IsSectionNode() ) - aEnd = *pSectNd; - } + // The previous version had a check to skip empty read-only sections. Those + // shouldn't occur, so we only need to check whether our pInnermostNode is + // inside a protected area. - do { - if( !aEnd.GetNode().IsProtect() ) - { - nRet = bStart ? 1 : 2; - break; - } - else - { - // skip protected sections without any content at - // start or end - if( bStart ) - { - if( !aEnd.GetNode().IsSectionNode() || - !aEnd.GetNode().StartOfSectionIndex() ) - break; - aEnd--; - } - else - { - if( !aEnd.GetNode().IsEndNode() || - !aEnd.GetNode().StartOfSectionNode()-> - IsSectionNode() ) - break; - aEnd++; - } - } - } while( TRUE ); - } - } + // Now, pInnermostNode is NULL or the innermost section or table node. + if( (pInnermostNode != NULL) && !pInnermostNode->IsProtect() ) + { + DBG_ASSERT( pInnermostNode->IsTableNode() || + pInnermostNode->IsSectionNode(), "wrong node found" ); + DBG_ASSERT( ( pInnermostNode->GetIndex() <= rCurrentNode.GetIndex() )&& + ( pInnermostNode->EndOfSectionNode()->GetIndex() >= + rCurrentNode.GetIndex() ), "wrong node found" ); + + // we now need to find the possible start/end positions + + // we found a start if + // - we're at or just before a start node + // - there are only start nodes between the current and pInnermostNode + SwNodeIndex aBegin( pCurrentPos->nNode ); + if( rCurrentNode.IsCntntNode() && + (pCurrentPos->nContent.GetIndex() == 0)) + aBegin--; + while( (aBegin != pInnermostNode->GetIndex()) && + aBegin.GetNode().IsStartNode() ) + aBegin--; + bool bStart = ( aBegin == pInnermostNode->GetIndex() ); + + // we found an end if + // - we're at or just before an end node + // - there are only end nodes between the current node and + // pInnermostNode's end node + SwNodeIndex aEnd( pCurrentPos->nNode ); + if( rCurrentNode.IsCntntNode() && + ( pCurrentPos->nContent.GetIndex() == + rCurrentNode.GetCntntNode()->Len() ) ) + aEnd++; + while( (aEnd != pInnermostNode->EndOfSectionNode()->GetIndex()) && + aEnd.GetNode().IsEndNode() ) + aEnd++; + bool bEnd = ( aEnd == pInnermostNode->EndOfSectionNode()->GetIndex() ); + + // evalutate result: if both start + end, end is preferred + if( bEnd ) + pReturn = pInnermostNode->EndOfSectionNode(); + else if ( bStart ) + pReturn = pInnermostNode; + // else pReturn = NULL; } - return nRet; + // else: pReturn = NULL + + + DBG_ASSERT( ( pReturn == NULL ) || pReturn->IsStartNode() || + pReturn->IsEndNode(), + "SpecialInsertNode failed" ); + return pReturn; } -BOOL SwEditShell::AppendNodeInSection() + +/** a node can be special-inserted (alt-Enter) whenever lcl_SpecialInsertNode + finds a suitable position +*/ +bool SwEditShell::CanSpecialInsert() const +{ + return NULL != lcl_SpecialInsertNode( GetCrsr()->GetPoint() ); +} + + +/** check whether a node cen be special-inserted (alt-Enter), and do so. Return + whether insertion was possible. + */ +bool SwEditShell::DoSpecialInsert() { - int nRet = CanInsertNodeAtEndOfSection(); - if( nRet ) + bool bRet = false; + + // get current node + SwPosition* pCursorPos = GetCrsr()->GetPoint(); + const SwNode* pInsertNode = lcl_SpecialInsertNode( pCursorPos ); + if( pInsertNode != NULL ) { StartAllAction(); - SwPosition& rPos = *GetCrsr()->GetPoint(); - const SwSectionNode* pSectNd = rPos.nNode.GetNode().FindSectionNode(); - SwPosition aPos( *pSectNd ); - if( 1 == nRet ) - { - do { - const SwNode* pPrvNd = &aPos.nNode.GetNode(); - aPos.nNode--; - if( !aPos.nNode.GetNode().IsSectionNode() || - !pPrvNd->IsProtect() ) - break; - } while( TRUE ); - } - else - { - SwNodeIndex aIdx( *pSectNd->EndOfSectionNode(), 1 ); - do { - if( !aIdx.GetNode().IsEndNode() || - !aIdx.GetNode().FindStartNode()->IsSectionNode() || - !aIdx.GetNode().IsProtect() ) - break; - aIdx++; - } while( TRUE ); - aIdx--; - aPos.nNode = aIdx; - } + // adjust insert position to insert before start nodes and after end + // nodes + SwNodeIndex aInsertIndex( *pInsertNode, + pInsertNode->IsStartNode() ? -1 : 0 ); + SwPosition aInsertPos( aInsertIndex ); - GetDoc()->AppendTxtNode( aPos ); - rPos = aPos; + // insert a new text node, and set the cursor + bRet = GetDoc()->AppendTxtNode( aInsertPos ); + *pCursorPos = aInsertPos; - // rufe das AttrChangeNotify auf der UI-Seite. + // call AttrChangeNotify for the UI CallChgLnk(); + EndAllAction(); } - return 0 != nRet; -} - + return bRet; +} diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 017583b06693..e031972b937e 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: authfld.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: os $ $Date: 2002-10-30 10:38:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,15 @@ #ifndef _AUTHFLD_HXX #include <authfld.hxx> #endif +#ifndef _EXPFLD_HXX +#include <expfld.hxx> +#endif +#ifndef _PAM_HXX +#include <pam.hxx> +#endif +#ifndef _CNTFRM_HXX +#include <cntfrm.hxx> +#endif #ifndef _TOX_HXX #include <tox.hxx> #endif @@ -531,12 +540,22 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle) #endif continue; } - const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode(); - ULONG nPos = rTxtNode.GetIndex(); - if( rTxtNode.GetTxt().Len() && rTxtNode.GetFrm() && - rTxtNode.GetNodes().IsDocNodes() ) + const SwTxtNode& rFldTxtNode = pTxtFld->GetTxtNode(); + SwPosition aFldPos(rFldTxtNode); + SwDoc& rDoc = *(SwDoc*)rFldTxtNode.GetDoc(); + SwCntntFrm *pFrm = rFldTxtNode.GetFrm(); + const SwTxtNode* pTxtNode = 0; + if(pFrm && !pFrm->IsInDocBody()) + pTxtNode = GetBodyTxtNode( rDoc, aFldPos, *pFrm ); + //if no text node could be found or the field is in the document + //body the directly available text node will be used + if(!pTxtNode) + pTxtNode = &rFldTxtNode; + ULONG nPos = pTxtNode->GetIndex(); + if( pTxtNode->GetTxt().Len() && pTxtNode->GetFrm() && + pTxtNode->GetNodes().IsDocNodes() ) { - SwTOXAuthority* pNew = new SwTOXAuthority( rTxtNode, + SwTOXAuthority* pNew = new SwTOXAuthority( *pTxtNode, *pFmtFld, aIntl ); for(short i = 0; i < aSortArr.Count(); ++i) diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 565ce94eb4dd..04fc46d127ac 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldbas.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2002-11-15 11:43:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,8 @@ #endif #include <float.h> -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _ZFORLIST_HXX //autogen #include <svtools/zforlist.hxx> @@ -800,9 +800,8 @@ void SwValueFieldType::DoubleToString( String &rValue, const double &rVal, nLng = LANGUAGE_SYSTEM; pFormatter->ChangeIntl( nLng ); // Separator in der richtigen Sprache besorgen - rValue.Erase(); - SolarMath::DoubleToString( rValue, rVal, 'F', 12, - pFormatter->GetDecSep(), TRUE ); + rValue = ::rtl::math::doubleToUString( rVal, rtl_math_StringFormat_F, 12, + pFormatter->GetDecSep(), true ); } /*-------------------------------------------------------------------- diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index f8a1f6f53e20..1fcaf5b76d6d 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fecopy.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: fme $ $Date: 2002-09-16 08:46:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,6 +124,9 @@ #ifndef _SVDPAGE_HXX #include <svx/svdpage.hxx> #endif +#ifndef _SVDOGRP_HXX +#include <svx/svdogrp.hxx> +#endif #ifndef _XOUTBMP_HXX #include <svx/xoutbmp.hxx> #endif @@ -389,9 +392,10 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) aSet.Put( aAnchor ); SdrObject* pNew = pClpDoc->CloneSdrObj( *pObj, FALSE, TRUE ); + //JP 07.01.00: why move?? // pNew->NbcMove( aSiz ); - pClpDoc->Insert( SwPaM( aPos ), *pNew, &aSet ); + pClpDoc->Insert( SwPaM( aPos ), *pNew, &aSet ); } else { @@ -953,7 +957,8 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc ) if( !Imp()->GetDrawView() ) MakeDrawView(); - Size aSiz( 0, GetCharRect().Top() ); + // FME: removed for #105977# + // Size aSiz( 0, GetCharRect().Top() ); for ( USHORT i = 0; i < pClpDoc->GetSpzFrmFmts()->Count(); ++i ) { BOOL bInsWithFmt = TRUE; @@ -968,9 +973,40 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc ) { SdrObject* pNew = GetDoc()->CloneSdrObj( *pSdrObj, FALSE, FALSE ); - pNew->NbcMove( aSiz ); + + // FME: removed for #105977# + // pNew->NbcMove( aSiz ); + + // Insert object sets any anchor position to 0. + // Therefore we calculate the absolute position here + // and after the insert the anchor of the object + // is set to the anchor of the group object. + Rectangle aSnapRect = pNew->GetSnapRect(); + if( pNew->GetAnchorPos().X() || pNew->GetAnchorPos().Y() ) + { + const Point aPoint( 0, 0 ); + pNew->NbcSetAnchorPos( aPoint ); + pNew->NbcSetSnapRect( aSnapRect ); + } + Imp()->GetDrawView()->InsertObject( pNew, *Imp()->GetPageView() ); + + Point aGrpAnchor( 0, 0 ); + SdrObjList* pList = pNew->GetObjList(); + if ( pList ) + { + SdrObject* pOwner = pList->GetOwnerObj(); + if ( pOwner ) + { + SdrObjGroup* pThisGroup = PTR_CAST(SdrObjGroup, pOwner); + aGrpAnchor = pThisGroup->GetAnchorPos(); + } + } + + pNew->NbcSetAnchorPos( aGrpAnchor ); + pNew->NbcSetSnapRect( aSnapRect ); + bInsWithFmt = FALSE; } } diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index ba22928cdc72..b8d3ffdcba97 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fefly1.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: fme $ $Date: 2002-09-16 08:46:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -321,6 +321,9 @@ BOOL lcl_FindAnchorPos( SwDoc& rDoc, const Point& rPt, const SwFrm& rFrm, return bRet; } +// +//! also used in unoframe.cxx +// sal_Bool lcl_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ) { const SwFrmFmt& rFmt = *rFly.GetFmt(); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index d6163f34607c..70d309f53f13 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: feshview.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: od $ $Date: 2002-12-10 14:12:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1262,6 +1262,44 @@ int SwFEShell::IsObjSelectable( const Point& rPt ) #endif } +// #107513# +// Test if there is a draw object at that position and if it should be selected. +// The 'should' is aimed at Writer text fly frames which may be in front of +// the draw object. +sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) +{ + SET_CURR_SHELL(this); + SwDrawView *pDrawView = Imp()->GetDrawView(); + sal_Bool bRet(sal_False); + + if(pDrawView) + { + SdrObject* pObj; + SdrPageView* pPV; + sal_uInt16 nOld(pDrawView->GetHitTolerancePixel()); + + pDrawView->SetHitTolerancePixel(pDrawView->GetMarkHdlSizePixel()/2); + bRet = pDrawView->PickObj(rPt, pObj, pPV, SDRSEARCH_PICKMARKABLE); + pDrawView->SetHitTolerancePixel(nOld); + + if(bRet && pObj) + { + SdrPage* pPage = GetDoc()->GetDrawModel()->GetPage(0); + + for(sal_uInt32 a(pObj->GetOrdNumDirect() + 1); bRet && a < pPage->GetObjCount(); a++) + { + SdrObject *pCandidate = pPage->GetObj(a); + + if(pCandidate->IsWriterFlyFrame() && ((SwVirtFlyDrawObj*)pCandidate)->GetBoundRect().IsInside(rPt)) + { + bRet = sal_False; + } + } + } + } + + return bRet; +} /************************************************************************* |* @@ -1464,6 +1502,10 @@ BOOL SwFEShell::GotoObj( BOOL bNext, GotoObjType eType ) if( pBest ) { + // OD 11.02.2003 #100556# - set flag value to avoid macro execution. + bool bSavedFlagValue = IsMacroExecAllowed(); + SetMacroExecAllowed( false ); + BOOL bFlyFrm = pBest->IsWriterFlyFrame(); if( bFlyFrm ) { @@ -1479,6 +1521,10 @@ BOOL SwFEShell::GotoObj( BOOL bNext, GotoObjType eType ) if( !ActionPend() ) MakeVisible( pBest->GetBoundRect() ); } + + // OD 11.02.2003 #100556# - reset flag value + SetMacroExecAllowed( bSavedFlagValue ); + CallChgLnk(); bRet = TRUE; } @@ -2566,10 +2612,8 @@ BOOL SwFEShell::IsAlignPossible() const { SdrObject *pO = Imp()->GetDrawView()->GetMarkList().GetMark(0)->GetObj(); SwDrawContact *pC = (SwDrawContact*)GetUserCall(pO); - if (pC->GetFmt()->GetAnchor().GetAnchorId() == FLY_AT_CNTNT) - bRet = FALSE; - else - bRet = pC->GetAnchor() ? pC->GetAnchor()->IsInDocBody() : FALSE; + //only as character bound drawings can be aligned + bRet = pC->GetFmt()->GetAnchor().GetAnchorId() == FLY_IN_CNTNT; } if ( bRet ) return Imp()->GetDrawView()->IsAlignPossible(); @@ -2947,8 +2991,6 @@ void SwFEShell::CreateDefaultShape(UINT16 eSdrObjectKind, const Rectangle& rRect pObj->SetItemSet(aSet); } - String aText = SW_RESSTR(STR_POOLCOLL_LABEL_FRAME); - ((SdrCaptionObj*)pObj)->SetText(aText); ((SdrCaptionObj*)pObj)->SetLogicRect(aRect); ((SdrCaptionObj*)pObj)->SetTailPos( aRect.TopLeft() - Point(aRect.GetWidth() / 2, aRect.GetHeight() / 2)); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index b8b771211be0..59e6a3057b49 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1,10 +1,18 @@ -/************************************************************************* + /************************************************************************* * * $RCSfile: fetab.cxx,v $ * - * $Revision: 1.11 $ +<<<<<<< fetab.cxx + * $Revision: 1.12 $ +======= + * $Revision: 1.12 $ +>>>>>>> 1.4.2.6.2.1.20.2 * - * last change: $Author: fme $ $Date: 2002-11-15 09:54:42 $ +<<<<<<< fetab.cxx + * last change: $Author: hr $ $Date: 2003-03-27 15:40:03 $ +======= + * last change: $Author: hr $ $Date: 2003-03-27 15:40:03 $ +>>>>>>> 1.4.2.6.2.1.20.2 * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -166,7 +174,6 @@ #include <swerror.h> #endif - //siehe auch swtable.cxx #define COLFUZZY 20L @@ -202,6 +209,89 @@ inline const SwCursor& GetShellCursor( const SwCrsrShell& rShell ) return *pCrsr; } +void SwFEShell::ParkCursorInTab() +{ + SwCursor * pSwCrsr = GetSwCrsr(); + + ASSERT(pSwCrsr, "no SwCursor"); + + SwPosition aStartPos = *pSwCrsr->GetPoint(), aEndPos = aStartPos; + + SwCursor * pTmpCrsr = (SwCursor *) pSwCrsr; + + /* Search least and greatest position in current cursor ring. + */ + do + { + const SwPosition * pPt = pTmpCrsr->GetPoint(), + * pMk = pTmpCrsr->GetMark(); + + if (*pPt < aStartPos) + aStartPos = *pPt; + + if (*pPt > aEndPos) + aEndPos = *pPt; + + if (*pMk < aStartPos) + aStartPos = *pMk; + + if (*pMk > aEndPos) + aEndPos = *pMk; + + pTmpCrsr = (SwCursor *) pTmpCrsr->GetNext(); + } + while (pTmpCrsr != pSwCrsr); + + KillPams(); + + /* Set cursor to end of selection to ensure IsLastCellInRow works + properly. */ + { + SwCursor aTmpCrsr(aEndPos); + *pSwCrsr = aTmpCrsr; + } + + /* Move the cursor out of the columns to delete and stay in the + same row. If the table has only one column the cursor will + stay in the row and the shell will take care of it. */ + if (IsLastCellInRow()) + { + /* If the cursor is in the last row of the table, first + try to move it to the previous cell. If that fails move + it to the next cell. */ + + { + SwCursor aTmpCrsr(aStartPos); + *pSwCrsr = aTmpCrsr; + } + + if (! pSwCrsr->GoPrevCell()) + { + SwCursor aTmpCrsr(aEndPos); + *pSwCrsr = aTmpCrsr; + pSwCrsr->GoNextCell(); + } + } + else + { + /* If the cursor is not in the last row of the table, first + try to move it to the next cell. If that fails move it + to the previous cell. */ + + { + SwCursor aTmpCrsr(aEndPos); + *pSwCrsr = aTmpCrsr; + } + + if (! pSwCrsr->GoNextCell()) + { + SwCursor aTmpCrsr(aStartPos); + *pSwCrsr = aTmpCrsr; + pSwCrsr->GoPrevCell(); + } + } +} + /*********************************************************************** #* Class : SwFEShell #* Methoden : GetStartEndCell @@ -301,6 +391,26 @@ BOOL SwFEShell::InsertCol( USHORT nCnt, BOOL bBehind ) #* Datum : MA 03. May. 93 #* Update : MA 19. Apr. 95 #***********************************************************************/ + +/** + Determines if the current cursor is in the last row of the table. +*/ +BOOL SwFEShell::IsLastCellInRow() const +{ + SwTabCols aTabCols; + GetTabCols( aTabCols ); + BOOL bResult = FALSE; + + if (IsTableRightToLeft()) + /* If the table is right-to-left the last row is the most left one. */ + bResult = 0 == GetCurTabColNum(); + else + /* If the table is left-to-right the last row is the most right one. */ + bResult = aTabCols.Count() == GetCurTabColNum(); + + return bResult; +} + BOOL SwFEShell::DeleteCol() { // pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen @@ -331,13 +441,16 @@ BOOL SwFEShell::DeleteCol() // Dokument-Position werden sie dann immer an die alte Position gesetzt. while( !pFrm->IsCellFrm() ) pFrm = pFrm->GetUpper(); - ParkCrsr( SwNodeIndex( *((SwCellFrm*)pFrm)->GetTabBox()->GetSttNd() )); + + ParkCursorInTab(); // dann loesche doch die Spalten bRet = GetDoc()->DeleteRowCol( aBoxes ); + } else bRet = FALSE; + EndAllActionAndCall(); return bRet; } @@ -377,7 +490,12 @@ BOOL SwFEShell::DeleteRow() SwTableNode* pTblNd = ((SwCntntFrm*)pFrm)->GetNode()->FindTableNode(); // suche alle Boxen / Lines - _FndBox aFndBox( aBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( aBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } + if( !aFndBox.GetLines().Count() ) { EndAllActionAndCall(); @@ -553,20 +671,30 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const if ( pLastTable == pTab->GetTable() ) { bDel = FALSE; -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) -#endif + + const SwPageFrm* pPage = pTab->FindPageFrm(); + const ULONG nLeftMin = (pTab->Frm().*fnRect->fnGetLeft)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + const ULONG nRightMax = (pTab->Frm().*fnRect->fnGetRight)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + if ( pLastTabFrm != pTab ) { //Wenn der TabFrm gewechselt hat, brauchen wir bei gleicher //Breite nur ein wenig shiften. -#ifdef VERTICAL_LAYOUT SWRECTFNX( pLastTabFrm ) if( (pLastTabFrm->Frm().*fnRect->fnGetWidth)() == (pTab->Frm().*fnRect->fnGetWidth)() ) { - pLastCols->SetLeftMin( (USHORT) - (pTab->Frm().*fnRect->fnGetLeft)() ); + pLastCols->SetLeftMin( nLeftMin ); + + ASSERT( bVert || + pLastCols->GetLeftMin() == (pTab->Frm().*fnRect->fnGetLeft)(), + "GetTabCols: wrong result" ) + pLastTabFrm = pTab; } else @@ -574,28 +702,10 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const } if ( !bDel && - pLastCols->GetLeftMin () == (USHORT)(pTab->Frm().*fnRect->fnGetLeft)() && + pLastCols->GetLeftMin () == (USHORT)nLeftMin && pLastCols->GetLeft () == (USHORT)(pTab->Prt().*fnRect->fnGetLeft)() && pLastCols->GetRight () == (USHORT)(pTab->Prt().*fnRect->fnGetRight)()&& - pLastCols->GetRightMax() == - (USHORT)(pTab->Frm().*fnRect->fnGetRight)() - pLastCols->GetLeftMin() ) -#else - if ( pLastTabFrm->Frm().Width() == pTab->Frm().Width() ) - { - pLastCols->SetLeftMin( (USHORT)pTab->Frm().Left() ); - pLastTabFrm = pTab; - } - else - bDel = TRUE; - } - - if ( !bDel && - pLastCols->GetLeftMin () == (USHORT)pTab->Frm().Left() && - pLastCols->GetLeft () == (USHORT)pTab->Prt().Left() && - pLastCols->GetRight () == (USHORT)pTab->Prt().Right()&& - pLastCols->GetRightMax() == - (USHORT)pTab->Frm().Right() - pLastCols->GetLeftMin() ) -#endif + pLastCols->GetRightMax() == (USHORT)nRightMax - pLastCols->GetLeftMin() ) { if ( pLastCellFrm != pBox ) { @@ -894,7 +1004,7 @@ void SwFEShell::ProtectCells() { if( IsTableMode() ) ClearMark(); - ParkCrsr( GetCrsr()->GetPoint()->nNode ); + ParkCursorInTab(); } EndAllActionAndCall(); } @@ -1240,27 +1350,43 @@ USHORT SwFEShell::GetCurTabColNum() const // dem CellFrame vergleichen???? pFrm = pFrm->GetUpper(); } while ( !pFrm->IsCellFrm() ); -#ifdef VERTICAL_LAYOUT SWRECTFN( pFrm ) const long nX = (pFrm->Frm().*fnRect->fnGetLeft)(); -#else - const long nX = pFrm->Frm().Left(); -#endif //TabCols besorgen, den nur ueber diese erreichen wir die Position. SwTabCols aTabCols; GetTabCols( aTabCols ); - const long nLeft = aTabCols.GetLeftMin(); + if( pFrm->FindTabFrm()->IsRightToLeft() ) + { + long nX = (pFrm->Frm().*fnRect->fnGetRight)(); + const long nRight = aTabCols.GetLeftMin() + aTabCols.GetRight();; - if ( !::IsSame( nX, nLeft + aTabCols.GetLeft() ) ) + if ( !::IsSame( nX, nRight ) ) + { + nX = nRight - nX + aTabCols.GetLeft(); + for ( USHORT i = 0; i < aTabCols.Count(); ++i ) + if ( ::IsSame( nX, aTabCols[i] ) ) + { + nRet = i + 1; + break; + } + } + } + else { - for ( USHORT i = 0; i < aTabCols.Count(); ++i ) - if ( ::IsSame( nX, nLeft + aTabCols[i] ) ) - { - nRet = i + 1; - break; - } + const long nX = (pFrm->Frm().*fnRect->fnGetLeft)(); + const long nLeft = aTabCols.GetLeftMin(); + + if ( !::IsSame( nX, nLeft + aTabCols.GetLeft() ) ) + { + for ( USHORT i = 0; i < aTabCols.Count(); ++i ) + if ( ::IsSame( nX, nLeft + aTabCols[i] ) ) + { + nRet = i + 1; + break; + } + } } } return nRet; @@ -1327,7 +1453,6 @@ const SwFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt, SwTwips nFu pFrm = pFrm->GetUpper(); if ( pFrm ) { -#ifdef VERTICAL_LAYOUT if( pFrm->IsVertical() ) { if ( ::IsSame(pFrm->Frm().Top(), rPt.Y()) || @@ -1340,13 +1465,6 @@ const SwFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt, SwTwips nFu ::IsSame(pFrm->Frm().Right(),rPt.X()) ) return pFrm; } -#else - if ( ::IsSame(pFrm->Frm().Left(), rPt.X()) || - ::IsSame(pFrm->Frm().Right(),rPt.X()) ) - { - return pFrm; - } -#endif pFrm = pFrm->GetUpper(); } } while ( pFrm ); @@ -1558,12 +1676,8 @@ BOOL SwFEShell::SetColRowWidthHeight( USHORT eType, USHORT nDiff ) // sollte die Tabelle noch auf relativen Werten (USHRT_MAX) stehen // dann muss es jetzt auf absolute umgerechnet werden. const SwFmtFrmSize& rTblFrmSz = pTab->GetFmt()->GetFrmSize(); -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) long nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)(); -#else - long nPrtWidth = pTab->Prt().Width(); -#endif if( TBLVAR_CHGABS == pTab->GetTable()->GetTblChgMode() && ( eType & WH_COL_LEFT || eType & WH_COL_RIGHT ) && HORI_NONE == pTab->GetFmt()->GetHoriOrient().GetHoriOrient() && @@ -1576,11 +1690,7 @@ BOOL SwFEShell::SetColRowWidthHeight( USHORT eType, USHORT nDiff ) if( (eType & (WH_FLAG_BIGGER | WH_FLAG_INSDEL)) == (WH_FLAG_BIGGER | WH_FLAG_INSDEL) ) -#ifdef VERTICAL_LAYOUT nDiff = USHORT((pFrm->Frm().*fnRect->fnGetWidth)()); -#else - nDiff = USHORT(pFrm->Frm().Width()); -#endif SwTwips nLogDiff = nDiff; nLogDiff *= pTab->GetFmt()->GetFrmSize().GetWidth(); @@ -1762,7 +1872,7 @@ BOOL SwFEShell::GetAutoSum( String& rFml ) const return TRUE; } -/* -----------------------------22.08.2002 12:37------------------------------ +/* -----------------------------22.08.2002 12:50------------------------------ ---------------------------------------------------------------------------*/ BOOL SwFEShell::IsTableRightToLeft() const @@ -1783,3 +1893,4 @@ BOOL SwFEShell::IsMouseTableRightToLeft(const Point &rPt) const ASSERT( pTabFrm, "Table not found" ); return pTabFrm ? pTabFrm->IsRightToLeft() : FALSE; } + diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 4e40a6c9b087..448a8a38be3c 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tblsel.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: fme $ $Date: 2002-09-26 13:17:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -159,7 +159,6 @@ //siehe auch swtable.cxx #define COLFUZZY 20L - // defines, die bestimmen, wie Tabellen Boxen gemergt werden: // - 1. alle leeren Zeilen entfernen, alle Boxen werden mit Blank, // alle Lines mit ParaBreak getrennt @@ -1575,7 +1574,11 @@ USHORT CheckMergeSel( const SwSelBoxes& rBoxes ) { eRet = TBLMERGE_OK; - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + _FndPara aPara( rBoxes, &aFndBox ); + const SwTableNode* pTblNd = aPara.rBoxes[0]->GetSttNd()->FindTableNode(); + ((SwTable&)pTblNd->GetTable()).GetTabLines().ForEach( + &_FndLineCopyCol, &aPara ); if( aFndBox.GetLines().Count() ) { BOOL bMergeSelOk = TRUE; @@ -1616,8 +1619,8 @@ SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish, #ifdef BIDI const sal_Bool bRTL = pCell->IsRightToLeft(); SwTwips nRet = bRTL ? - nAct - pCell->GetFmt()->GetFrmSize().GetWidth() * nAct / nWish : - 0; + nAct - pCell->Frm().Width() : + 0; #else SwTwips nRet = 0; #endif @@ -2172,6 +2175,51 @@ void lcl_InsertRow( SwTableLine &rLine, SwLayoutFrm *pUpper, SwFrm *pSibling ) } +BOOL _FndBoxCopyCol( const SwTableBox*& rpBox, void* pPara ) +{ + _FndPara* pFndPara = (_FndPara*)pPara; + _FndBox* pFndBox = new _FndBox( (SwTableBox*)rpBox, pFndPara->pFndLine ); + if( rpBox->GetTabLines().Count() ) + { + _FndPara aPara( *pFndPara, pFndBox ); + pFndBox->GetBox()->GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + if( !pFndBox->GetLines().Count() ) + { + delete pFndBox; + return TRUE; + } + } + else + { + SwTableBoxPtr pSrch = (SwTableBoxPtr)rpBox; + USHORT nFndPos; + if( !pFndPara->rBoxes.Seek_Entry( pSrch, &nFndPos )) + { + delete pFndBox; + return TRUE; + } + } + pFndPara->pFndLine->GetBoxes().C40_INSERT( _FndBox, pFndBox, + pFndPara->pFndLine->GetBoxes().Count() ); + return TRUE; +} + +BOOL _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara ) +{ + _FndPara* pFndPara = (_FndPara*)pPara; + _FndLine* pFndLine = new _FndLine( (SwTableLine*)rpLine, pFndPara->pFndBox ); + _FndPara aPara( *pFndPara, pFndLine ); + pFndLine->GetLine()->GetTabBoxes().ForEach( &_FndBoxCopyCol, &aPara ); + if( pFndLine->GetBoxes().Count() ) + { + pFndPara->pFndBox->GetLines().C40_INSERT( _FndLine, pFndLine, + pFndPara->pFndBox->GetLines().Count() ); + } + else + delete pFndLine; + return TRUE; +} + void _FndBox::SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable ) { //Pointer auf die Lines vor und hinter den zu verarbeitenden Bereich @@ -2429,6 +2477,7 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const USHORT nNumber, SwTabFrm *pTable; for ( pTable = (SwTabFrm*)aTabIter.First( TYPE(SwFrm) ); pTable; pTable = (SwTabFrm*)aTabIter.Next() ) + { if( !pTable->IsFollow() ) { SwFrm *pSibling = 0; @@ -2497,29 +2546,33 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const USHORT nNumber, ((SwTabFrm*)pUpper)->SetCalcLowers(); } } + } //Die Headlines mussen ggf. auch verarbeitet werden. Um gut arbeitenden //Code nicht zu zerfasern wird hier nochmals iteriert. if ( !bBehind && nBfPos == USHRT_MAX && rTable.IsHeadlineRepeat() ) { - SwTabFrm *pTab = (SwTabFrm*)aTabIter.First( TYPE(SwFrm) ); - if ( pTab->Lower() ) + for ( pTable = (SwTabFrm*)aTabIter.First( TYPE(SwFrm) ); pTable; + pTable = (SwTabFrm*)aTabIter.Next() ) { - if ( pTab->IsFollow() ) - { - //Alte Headline vernichten - SwFrm *pLow = pTab->Lower(); - pLow->Cut(); - delete pLow; - } - if ( ((SwRowFrm*)pTab->Lower())->GetTabLine() != - rTable.GetTabLines()[0] ) + if ( pTable->Lower() ) { - //Neue Headline einsetzen - SwRowFrm *pRow = new SwRowFrm( *rTable.GetTabLines()[0]); - pRow->Paste( pTab, pTab->Lower() ); - pRow->RegistFlys(); - pTab->SetCalcLowers(); + if ( pTable->IsFollow() ) + { + //Alte Headline vernichten + SwFrm *pLow = pTable->Lower(); + pLow->Cut(); + delete pLow; + } + if ( ((SwRowFrm*)pTable->Lower())->GetTabLine() != + rTable.GetTabLines()[0] ) + { + //Neue Headline einsetzen + SwRowFrm *pRow = new SwRowFrm( *rTable.GetTabLines()[0]); + pRow->Paste( pTable, pTable->Lower() ); + pRow->RegistFlys(); + pTable->SetCalcLowers(); + } } } } @@ -2626,112 +2679,6 @@ const SwTableBox *lcl_FindLastBox( const SwTable &rTable ) return pBox; } - // fill the structure from the selection (the selboxes) into - // his own structure. Works only if the box contains no data! -_FndBox::_FndBox( const SwSelBoxes& rBoxes ) - : pBox( 0 ), pUpper( 0 ), pLineBefore( 0 ), pLineBehind( 0 ) -{ - if( 1 == rBoxes.Count() ) - { - _FndBox *pTmp = this; - AddToFndBox( pTmp, *rBoxes[0] ); - } - else - { - SwSelBoxes aBoxes; - aBoxes.Insert( &rBoxes ); - const SwTable &rTable = rBoxes[0]->GetSttNd()->FindTableNode()->GetTable(); - for( USHORT n = 0, nEnd = rTable.GetTabLines().Count(); - n < nEnd && aBoxes.Count(); ++n ) - _FndBox::AddSelLine( *this, *rTable.GetTabLines()[ n ], aBoxes ); - } -} - -_FndBox::_FndBox( const SwTableLine& rLine ) - : pBox( 0 ), pUpper( 0 ), pLineBefore( 0 ), pLineBehind( 0 ) -{ - AppendLine( *this, rLine ); -} - -void _FndBox::AddToFndBox( _FndBox*& rpParent, const SwTableBox& rBox ) -{ - // search the toplevel parent - if( rBox.GetUpper()->GetUpper() ) - _FndBox::AddToFndBox( rpParent, *rBox.GetUpper()->GetUpper() ); - - _FndLine* pFndLine = new _FndLine( (SwTableLine*)rBox.GetUpper(), - rpParent ); - rpParent->GetLines().C40_INSERT( _FndLine, pFndLine, 0 ); - _FndBox* pFndBox = new _FndBox( (SwTableBox*)&rBox, pFndLine ); - pFndLine->GetBoxes().C40_INSERT( _FndBox, pFndBox, 0 ); - - rpParent = pFndBox; -} - - -void _FndBox::AppendLine( _FndBox& rBox, const SwTableLine& rLine ) -{ - USHORT n = 0, nEnd = rLine.GetTabBoxes().Count(); - if( nEnd ) - { - _FndLine* pFndLine = new _FndLine( (SwTableLine*)&rLine, &rBox ); - rBox.GetLines().C40_INSERT( _FndLine, pFndLine, rBox.GetLines().Count() ); - for( ; n < nEnd; ++n ) - _FndBox::AppendBox( *pFndLine, *rLine.GetTabBoxes()[ n ] ); - } -} - -void _FndBox::AppendBox( _FndLine& rLine, const SwTableBox& rBox ) -{ - _FndBox* pFndBox = new _FndBox( (SwTableBox*)&rBox, &rLine ); - rLine.GetBoxes().C40_INSERT( _FndBox, pFndBox, rLine.GetBoxes().Count() ); - for( USHORT n = 0, nEnd = rBox.GetTabLines().Count(); n < nEnd; ++n ) - _FndBox::AppendLine( *pFndBox, *rBox.GetTabLines()[ n ] ); -} - -void _FndBox::AddSelLine( _FndBox& rBox, const SwTableLine& rLine, - SwSelBoxes& rBoxes ) -{ - _FndLine* pFndLine = new _FndLine( (SwTableLine*)&rLine, &rBox ); - for( USHORT n = 0, nEnd = rLine.GetTabBoxes().Count(); - n < nEnd && rBoxes.Count(); ++n ) - _FndBox::AddSelBox( *pFndLine, *rLine.GetTabBoxes()[ n ], rBoxes ); - - if( pFndLine->GetBoxes().Count() ) - rBox.GetLines().C40_INSERT( _FndLine, pFndLine, rBox.GetLines().Count() ); - else - delete pFndLine; -} - -void _FndBox::AddSelBox( _FndLine& rLine, const SwTableBox& rBox, - SwSelBoxes& rBoxes ) -{ - _FndBox* pFndBox; - USHORT n = 0, nEnd = rBox.GetTabLines().Count(); - if( nEnd ) - { - pFndBox = new _FndBox( (SwTableBox*)&rBox, &rLine ); - for( ; n < nEnd && rBoxes.Count(); ++n ) - _FndBox::AddSelLine( *pFndBox, *rBox.GetTabLines()[ n ], rBoxes ); - if( !pFndBox->GetLines().Count() ) - delete pFndBox, pFndBox = 0; - } - else - { - SwTableBoxPtr pSrch = (SwTableBoxPtr)&rBox; - USHORT nFndPos; - if( rBoxes.Seek_Entry( pSrch, &nFndPos )) - { - pFndBox = new _FndBox( pSrch, &rLine ); - rBoxes.Remove( nFndPos ); - } - else - pFndBox = 0; - } - if( pFndBox ) - rLine.GetBoxes().C40_INSERT( _FndBox, pFndBox, rLine.GetBoxes().Count() ); -} - //GPF bei Tab in letzer Zelle mit MSC4 #pragma optimize("",off) @@ -2834,4 +2781,3 @@ void _FndBox::RestoreChartData( const SwTable &rTable ) #pragma optimize("",on) - diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 7d5377c1f80d..9e1e5a95d835 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndgrf.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: od $ $Date: 2002-09-17 13:47:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -164,8 +164,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ) { aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); - bInSwapIn = bChgTwipSize = bLoadLowResGrf = bFrameInPaint = - bScaleImageMap = FALSE; + bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = + bFrameInPaint = bScaleImageMap = FALSE; bGrafikArrived = TRUE; ReRead( rGrfName, rFltName, pGraphic, 0, FALSE ); } @@ -179,8 +179,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); if( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() ) aGrfObj.SetSwapState(); - bInSwapIn = bChgTwipSize = bLoadLowResGrf = bFrameInPaint = - bScaleImageMap = FALSE; + bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf = + bFrameInPaint = bScaleImageMap = FALSE; bGrafikArrived = TRUE; } @@ -199,8 +199,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, Graphic aGrf; aGrf.SetDefaultType(); aGrfObj.SetGraphic( aGrf, rGrfName ); - bInSwapIn = bChgTwipSize = bLoadLowResGrf = bFrameInPaint = - bScaleImageMap = FALSE; + bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = + bFrameInPaint = bScaleImageMap = FALSE; bGrafikArrived = TRUE; InsertLink( rGrfName, rFltName ); diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index 462623d484c4..9c1f690bbb52 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drawfont.hxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:27:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -153,20 +153,28 @@ private: SvXub_StrLens aCompLen; SvBytes aCompType; xub_StrLen nInvalidityPos; + BYTE nDefaultDir; + sal_Bool bBidiInfoValid; public: enum CompType { KANA, SPECIAL_LEFT, SPECIAL_RIGHT, NONE }; - inline SwScriptInfo() : nInvalidityPos( 0 ) {}; + inline SwScriptInfo() : nInvalidityPos( 0 ), nDefaultDir( 0 ), + bBidiInfoValid( sal_False ) {}; // determines script changes void InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, const OutputDevice& rOut ); + void UpdateBidiInfo( const String& rTxt ); // set/get position from which data is invalid inline void SetInvalidity( const xub_StrLen nPos ); inline xub_StrLen GetInvalidity() const { return nInvalidityPos; }; + // get default direction for paragraph + inline BYTE GetDefaultDir() const { return nDefaultDir; }; + inline void SetDefaultDir( BYTE nNew ) { nDefaultDir = nNew; }; + // array operations, nCnt refers to array position inline USHORT CountScriptChg() const; inline xub_StrLen GetScriptChg( const USHORT nCnt ) const; @@ -263,13 +271,15 @@ public: long* pScrArray, xub_StrLen nIdx, xub_StrLen nLen, USHORT nSpace = 0 ); - static const SwScriptInfo* GetScriptInfo( const SwTxtNode& rNode ); + static SwScriptInfo* GetScriptInfo( const SwTxtNode& rNode, + sal_Bool bAllowInvalid = sal_False ); }; inline void SwScriptInfo::SetInvalidity( const xub_StrLen nPos ) { if ( nPos < nInvalidityPos ) nInvalidityPos = nPos; + bBidiInfoValid = sal_False; }; inline USHORT SwScriptInfo::CountScriptChg() const { return aScriptChg.Count(); } inline xub_StrLen SwScriptInfo::GetScriptChg( const USHORT nCnt ) const @@ -356,6 +366,7 @@ class SwDrawTextInfo short nSperren; short nKern; short nSpace; + BYTE nCursorBidiLevel; BOOL bBullet : 1; BOOL bUpper : 1; // Fuer Kapitaelchen: Grossbuchstaben-Flag BOOL bDrawSpace : 1; // Fuer Kapitaelchen: Unter/Durchstreichung @@ -396,239 +407,384 @@ public: BOOL bOfst : 1; BOOL bHyph : 1; #endif + SwDrawTextInfo( ViewShell *pS, OutputDevice &rO, const SwScriptInfo* pSI, const XubString &rSt, xub_StrLen nI, xub_StrLen nL, - USHORT nW = 0, BOOL bB = FALSE) - { pSh = pS; pOut = &rO; pScriptInfo = pSI; pText = &rSt; nIdx = nI; - nLen = nL; nKern = 0; nCompress = 0; nWidth = nW; - bBullet = bB; pUnderFnt = 0; bGreyWave = bSpaceStop = -#ifdef BIDI - bSnapToGrid = bIgnoreFrmRTL = FALSE; -#else + USHORT nW = 0, BOOL bB = FALSE ) + { + pFrm = NULL; + pSh = pS; + pOut = &rO; + pScriptInfo = pSI; + pText = &rSt; + nIdx = nI; + nLen = nL; + nKern = 0; + nCompress = 0; + nWidth = nW; + nCursorBidiLevel = 0; + bBullet = bB; + pUnderFnt = 0; + bGreyWave = FALSE; + bSpaceStop = FALSE; bSnapToGrid = FALSE; +#ifdef BIDI + bIgnoreFrmRTL = FALSE; #endif - pFrm = 0; #ifndef PRODUCT bOut = bText = bIdx = bLen = bWidth = bKern = bBull = bSpec = - bGreyWv = TRUE; + bGreyWv = TRUE; + bPos = bWrong = bSize = bFnt = bAscent = bSpace = bUppr = - bDrawSp = bLeft = bRight = bKana = bOfst = bHyph = FALSE; + bDrawSp = bLeft = bRight = bKana = bOfst = bHyph = FALSE; #endif } - const SwTxtFrm* GetFrm() const { return pFrm; } - void SetFrm( const SwTxtFrm* pNewFrm ) { pFrm = pNewFrm; } + const SwTxtFrm* GetFrm() const + { + return pFrm; + } + + void SetFrm( const SwTxtFrm* pNewFrm ) + { + pFrm = pNewFrm; + } + + ViewShell *GetShell() const + { + return pSh; + } - ViewShell *GetShell() const { return pSh; } - OutputDevice& GetOut() const { + OutputDevice& GetOut() const + { ASSERT( bOut, "DrawTextInfo: Undefined Outputdevice" ); return *pOut; } - OutputDevice *GetpOut() const { + + OutputDevice *GetpOut() const + { ASSERT( bOut, "DrawTextInfo: Undefined Outputdevice" ); return pOut; } - const SwScriptInfo* GetScriptInfo() const { + + const SwScriptInfo* GetScriptInfo() const + { return pScriptInfo; } - const Point &GetPos() const { + + const Point &GetPos() const + { ASSERT( bPos, "DrawTextInfo: Undefined Position" ); return *pPos; } - xub_StrLen *GetHyphPos() const { + + xub_StrLen *GetHyphPos() const + { ASSERT( bHyph, "DrawTextInfo: Undefined Hyph Position" ); return pHyphPos; } - const Fraction &GetZoom() const { return aZoom; } - Fraction &GetZoom() { return aZoom; } + const Fraction &GetZoom() const + { + return aZoom; + } + + Fraction &GetZoom() + { + return aZoom; + } - const XubString &GetText() const { + const XubString &GetText() const + { ASSERT( bText, "DrawTextInfo: Undefined String" ); return *pText; } - const SwWrongList* GetWrong() const { + + const SwWrongList* GetWrong() const + { ASSERT( bWrong, "DrawTextInfo: Undefined WrongList" ); return pWrong; } - const Size &GetSize() const { + + const Size &GetSize() const + { ASSERT( bSize, "DrawTextInfo: Undefined Size" ); return *pSize; } - SwFont* GetFont() const { + + SwFont* GetFont() const + { ASSERT( bFnt, "DrawTextInfo: Undefined Font" ); return pFnt; } - SwUnderlineFont* GetUnderFnt() const { + + SwUnderlineFont* GetUnderFnt() const + { ASSERT( bSpec, "DrawTextInfo: Undefined Underlinefont" ); return pUnderFnt; } - xub_StrLen GetIdx() const { + + xub_StrLen GetIdx() const + { ASSERT( bIdx, "DrawTextInfo: Undefined Index" ); return nIdx; } - xub_StrLen GetLen() const { + + xub_StrLen GetLen() const + { ASSERT( bLen, "DrawTextInfo: Undefined Length" ); return nLen; } - xub_StrLen GetOfst() const { + + xub_StrLen GetOfst() const + { ASSERT( bOfst, "DrawTextInfo: Undefined Offset" ); return nOfst; } - xub_StrLen GetEnd() const { + + xub_StrLen GetEnd() const + { ASSERT( bIdx, "DrawTextInfo: Undefined Index" ); ASSERT( bLen, "DrawTextInfo: Undefined Length" ); return nIdx + nLen; } - long GetLeft() const { + + long GetLeft() const + { ASSERT( bLeft, "DrawTextInfo: Undefined left range" ); return nLeft; } - long GetRight() const { + + long GetRight() const + { ASSERT( bRight, "DrawTextInfo: Undefined right range" ); return nRight; } - long GetKanaDiff() const { + + long GetKanaDiff() const + { ASSERT( bKana, "DrawTextInfo: Undefined kana difference" ); return nKanaDiff; } - USHORT GetWidth() const { + + USHORT GetWidth() const + { ASSERT( bWidth, "DrawTextInfo: Undefined Width" ); return nWidth; } - USHORT GetAscent() const { + + USHORT GetAscent() const + { ASSERT( bAscent, "DrawTextInfo: Undefined Ascent" ); return nAscent; } - USHORT GetKanaComp() const { + + USHORT GetKanaComp() const + { return nCompress; } - short GetSperren() const { + + short GetSperren() const + { ASSERT( bSperr, "DrawTextInfo: Undefined >Sperren<" ); return nSperren; } - short GetKern() const { + + short GetKern() const + { ASSERT( bKern, "DrawTextInfo: Undefined Kerning" ); return nKern; } - short GetSpace() const { + + short GetSpace() const + { ASSERT( bSpace, "DrawTextInfo: Undefined Spacing" ); return nSpace; } - BOOL GetBullet() const { + + BYTE GetCursorBidiLevel() const + { + return nCursorBidiLevel; + } + + BOOL GetBullet() const + { ASSERT( bBull, "DrawTextInfo: Undefined Bulletflag" ); return bBullet; } - BOOL GetUpper() const { + + BOOL GetUpper() const + { ASSERT( bUppr, "DrawTextInfo: Undefined Upperflag" ); return bUpper; } - BOOL GetDrawSpace() const { + + BOOL GetDrawSpace() const + { ASSERT( bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" ); return bDrawSpace; } - BOOL GetGreyWave() const { + + BOOL GetGreyWave() const + { ASSERT( bGreyWv, "DrawTextInfo: Undefined GreyWave" ); return bGreyWave; } - BOOL IsSpaceStop() const { + + BOOL IsSpaceStop() const + { return bSpaceStop; } - BOOL SnapToGrid() const { + + BOOL SnapToGrid() const + { return bSnapToGrid; } - BOOL IsIgnoreFrmRTL() const { + BOOL IsIgnoreFrmRTL() const + { return bIgnoreFrmRTL; } - void SetOut( OutputDevice &rNew ){ pOut = &rNew; + void SetOut( OutputDevice &rNew ) + { + pOut = &rNew; #ifndef PRODUCT bOut = TRUE; #endif } - void SetPos( const Point &rNew ){ pPos = &rNew; + + void SetPos( const Point &rNew ) + { + pPos = &rNew; #ifndef PRODUCT bPos = TRUE; #endif } - void SetHyphPos( xub_StrLen *pNew ){ pHyphPos = pNew; + + void SetHyphPos( xub_StrLen *pNew ) + { + pHyphPos = pNew; #ifndef PRODUCT bHyph = TRUE; #endif } - void SetText( const XubString &rNew ){ pText = &rNew; + + void SetText( const XubString &rNew ) + { + pText = &rNew; #ifndef PRODUCT bText = TRUE; #endif } - void SetWrong( const SwWrongList* pNew ){ pWrong = pNew; + + void SetWrong( const SwWrongList* pNew ) + { + pWrong = pNew; #ifndef PRODUCT bWrong = TRUE; #endif } - void SetSize( const Size &rNew ){ pSize = &rNew; + + void SetSize( const Size &rNew ) + { + pSize = &rNew; #ifndef PRODUCT bSize = TRUE; #endif } - void SetFont( SwFont* pNew ){ pFnt = pNew; + + void SetFont( SwFont* pNew ) + { + pFnt = pNew; #ifndef PRODUCT bFnt = TRUE; #endif } - void SetIdx( xub_StrLen nNew ){ nIdx = nNew; + + void SetIdx( xub_StrLen nNew ) + { + nIdx = nNew; #ifndef PRODUCT bIdx = TRUE; #endif } - void SetLen( xub_StrLen nNew ){ nLen = nNew; + + void SetLen( xub_StrLen nNew ) + { + nLen = nNew; #ifndef PRODUCT bLen = TRUE; #endif } - void SetOfst( xub_StrLen nNew ){ nOfst = nNew; + + void SetOfst( xub_StrLen nNew ) + { + nOfst = nNew; #ifndef PRODUCT bOfst = TRUE; #endif } - void SetLeft( long nNew ){ nLeft = nNew; + + void SetLeft( long nNew ) + { + nLeft = nNew; #ifndef PRODUCT bLeft = TRUE; #endif } - void SetRight( long nNew ){ nRight = nNew; + + void SetRight( long nNew ) + { + nRight = nNew; #ifndef PRODUCT bRight = TRUE; #endif } - void SetKanaDiff( long nNew ){ nKanaDiff = nNew; + + void SetKanaDiff( long nNew ) + { + nKanaDiff = nNew; #ifndef PRODUCT bKana = TRUE; #endif } - void SetWidth( USHORT nNew ){ nWidth = nNew; + + void SetWidth( USHORT nNew ) + { + nWidth = nNew; #ifndef PRODUCT bWidth = TRUE; #endif } - void SetAscent( USHORT nNew ){ nAscent = nNew; + + void SetAscent( USHORT nNew ) + { + nAscent = nNew; #ifndef PRODUCT bAscent = TRUE; #endif } - void SetKern( short nNew ){ nKern = nNew; + + void SetKern( short nNew ) + { + nKern = nNew; #ifndef PRODUCT bKern = TRUE; #endif } - void SetSperren( short nNew ){ nSperren = nNew; + + void SetSperren( short nNew ) + { + nSperren = nNew; #ifndef PRODUCT bSperr = TRUE; #endif } - void SetSpace( short nNew ){ + + void SetSpace( short nNew ) + { if( nNew < 0 ) { SetSperren( -nNew ); @@ -643,40 +799,72 @@ public: bSpace = TRUE; #endif } - void SetKanaComp( short nNew ){ + + void SetCursorBidiLevel( BYTE nNew ) + { + nCursorBidiLevel = nNew; + } + + void SetKanaComp( short nNew ) + { nCompress = nNew; } - void SetBullet( BOOL bNew ){ bBullet = bNew; + + void SetBullet( BOOL bNew ) + { + bBullet = bNew; #ifndef PRODUCT bBull = TRUE; #endif } - void SetUnderFnt( SwUnderlineFont* pFnt ){ pUnderFnt = pFnt; + + void SetUnderFnt( SwUnderlineFont* pFnt ) + { + pUnderFnt = pFnt; #ifndef PRODUCT bSpec = TRUE; #endif } - void SetUpper( BOOL bNew ){ bUpper = bNew; + + void SetUpper( BOOL bNew ) + { + bUpper = bNew; #ifndef PRODUCT bUppr = TRUE; #endif } - void SetDrawSpace( BOOL bNew ){ bDrawSpace = bNew; + + void SetDrawSpace( BOOL bNew ) + { + bDrawSpace = bNew; #ifndef PRODUCT bDrawSp = TRUE; #endif } - void SetGreyWave( BOOL bNew ){ bGreyWave = bNew; + + void SetGreyWave( BOOL bNew ) + { + bGreyWave = bNew; #ifndef PRODUCT bGreyWv = TRUE; #endif } - void SetSpaceStop( BOOL bNew ) { bSpaceStop = bNew; } - void SetSnapToGrid( BOOL bNew ) { bSnapToGrid = bNew; } + void SetSpaceStop( BOOL bNew ) + { + bSpaceStop = bNew; + } + + void SetSnapToGrid( BOOL bNew ) + { + bSnapToGrid = bNew; + } #ifdef BIDI - void SetIgnoreFrmRTL( BOOL bNew ) { bIgnoreFrmRTL = bNew; } + void SetIgnoreFrmRTL( BOOL bNew ) + { + bIgnoreFrmRTL = bNew; + } #endif void Shift( USHORT nDir ); diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 8ba389020e5c..e24d1d299d82 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frmtool.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: od $ $Date: 2002-10-11 11:05:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,12 +95,20 @@ class SwCrsrShell; #define GRFNUM_REPLACE 2 //Painten des Hintergrunds. Mit Brush oder Graphic. -/// OD 05.08.2002 #99657# - add 6th parameter to indicate that method should -/// consider background transparency, saved in the color of the brush item +// OD 05.08.2002 #99657# - add 6th parameter to indicate that method should +// consider background transparency, saved in the color of the brush item void MA_FASTCALL DrawGraphic( const SvxBrushItem *, OutputDevice *, const SwRect &rOrg, const SwRect &rOut, const BYTE nGrfNum = GRFNUM_NO, const sal_Bool bConsiderBackgroundTransparency = sal_False ); +// OD 24.01.2003 #106593# - method to align rectangle +// Created declaration here to avoid <extern> declarations +void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); + +// OD 24.01.2003 #106593# - method to align graphic rectangle +// Created declaration here to avoid <extern> declarations +void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut ); + //Fly besorgen, wenn keine List hineingereicht wird, wir die der aktuellen //Shell benutzt. //Implementierung in feshview.cxx @@ -239,6 +247,8 @@ public: //!!!Achtung: Wenn weitere Attribute gecached werden muss unbedingt die //Methode Modify::Modify mitgepflegt werden!!! +// OD 23.01.2003 #106895# - delete old method <SwBorderAttrs::CalcRight()> and +// the stuff that belongs to it. class SwBorderAttrs : public SwCacheObj { const SwAttrSet &rAttrSet; @@ -247,7 +257,6 @@ class SwBorderAttrs : public SwCacheObj const SvxBoxItem &rBox; const SvxShadowItem &rShadow; const Size aFrmSize; //Die FrmSize - long nRight; BOOL bBorderDist :1; //Ist's ein Frm der auch ohne Linie //einen Abstand haben kann? @@ -260,7 +269,6 @@ class SwBorderAttrs : public SwCacheObj BOOL bRightLine :1; BOOL bTop :1; BOOL bBottom :1; - BOOL bRight :1; BOOL bLine :1; BOOL bIsLine :1; //Umrandung an mind. einer Kante? @@ -288,7 +296,6 @@ class SwBorderAttrs : public SwCacheObj //Lines + Shadow + Abstaende void _CalcTop(); void _CalcBottom(); - void _CalcRight(); void _IsLine(); @@ -318,10 +325,7 @@ public: inline USHORT CalcTop() const; inline USHORT CalcBottom() const; long CalcLeft( const SwFrm *pCaller ) const; -#ifdef BIDI - long CalcRight( const SwFrm *pCaller ); -#endif - inline long CalcRight() const; + long CalcRight( const SwFrm *pCaller ) const; inline BOOL IsLine() const; @@ -447,12 +451,6 @@ inline USHORT SwBorderAttrs::CalcBottom() const ((SwBorderAttrs*)this)->_CalcBottom(); return nBottom; } -inline long SwBorderAttrs::CalcRight() const -{ - if ( bRight ) - ((SwBorderAttrs*)this)->_CalcRight(); - return nRight; -} inline BOOL SwBorderAttrs::IsLine() const { if ( bLine ) diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 92891e48cf6d..d1e65e54188f 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pagefrm.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: od $ $Date: 2002-11-20 13:14:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,6 +121,11 @@ class SwPageFrm: public SwFtnBossFrm #ifdef VERTICAL_LAYOUT BOOL bHasGrid :1; // Grid for Asian layout #endif + + // OD 12.02.2003 #i9719#, #105645# + static const sal_Int8 mnBorderPxWidth; + static const sal_Int8 mnShadowPxWidth; + //Anpassung der RootSize und Benachrichtigungen beim Einsetzen, //Entfernen und Groessenaenderungen der Seite. void AdjustRootSize( const SwPageChg eChgType, const SwRect *pOld ); @@ -131,6 +136,75 @@ class SwPageFrm: public SwFtnBossFrm // Anpassen der max. Fussnotenhoehen in den einzelnen Spalten void SetColMaxFtnHeight(); + /** determine rectangle for page border + + OD 12.02.2003 for #i9719# and #105645# + + @author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, for which the rectangle + has to be generated. + + @param _orBorderRect + output parameter - instance reference of the border rectangle for + the given page rectangle + */ + void GetBorderRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBorderRect ) const; + + /** determine rectangle for right page shadow + + OD 12.02.2003 for #i9719# and #105645# + + @author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, for which the rectangle + has to be generated. + + @param _orRightShadowRect + output parameter - instance reference of the right shadow rectangle for + the given page rectangle + */ + void GetRightShadowRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orRightShadowRect ) const; + + /** determine rectangle for bottom page shadow + + OD 12.02.2003 for #i9719# and #105645# + + @author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, for which the rectangle + has to be generated. + + @param _orBottomShadowRect + output parameter - instance reference of the bottom shadow rectangle for + the given page rectangle + */ + void GetBottomShadowRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBottomShadowRect ) const; + protected: virtual void MakeAll(); @@ -271,6 +345,58 @@ public: */ void PaintMarginArea( const SwRect& _rOutputRect, ViewShell* _pViewShell ) const; + + /** paint page border and shadow + + OD 12.02.2003 for #i9719# and #105645# + implement paint of page border and shadow + + @author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, on which the output + has to be generated. + */ + void PaintBorderAndShadow( const SwRect& _rPageRect, + ViewShell* _pViewShell ) const; + + /** get bound rectangle of border and shadow for repaints + + OD 12.02.2003 for #i9719# and #105645# + + author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, for which the rectangle + has to be generated. + + @param _orBorderAndShadowBoundRect + output parameter - instance reference of the bounded border and shadow + rectangle for the given page rectangle + */ + void GetBorderAndShadowBoundRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBorderAndShadowBoundRect ) const; + + // OD 12.02.2003 #i9719#, #105645# + inline sal_Int8 BorderPxWidth() const + { + return mnBorderPxWidth; + } + inline sal_Int8 ShadowPxWidth() const + { + return mnShadowPxWidth; + } }; inline SwCntntFrm *SwPageFrm::FindFirstBodyCntnt() diff --git a/sw/source/core/inc/prevwpage.hxx b/sw/source/core/inc/prevwpage.hxx new file mode 100644 index 000000000000..65dc4542557d --- /dev/null +++ b/sw/source/core/inc/prevwpage.hxx @@ -0,0 +1,38 @@ +#ifndef _PREVIEWPAGES_HXX +#define _PREVIEWPAGES_HXX + +// classes <Point>, <Size> and <Rectangle> +#ifndef _GEN_HXX +#include <tools/gen.hxx> +#endif + +class SwPageFrm; + +/** data structure for a preview page in the current preview layout + + OD 12.12.2002 #103492# - struct <PrevwPage> + + @author OD +*/ +struct PrevwPage +{ + const SwPageFrm* pPage; + bool bVisible; + Size aPageSize; + Point aPrevwWinPos; + Point aLogicPos; + Point aMapOffset; + + inline PrevwPage(); +}; + +inline PrevwPage::PrevwPage() + : pPage( 0 ), + bVisible( false ), + aPageSize( Size(0,0) ), + aPrevwWinPos( Point(0,0) ), + aLogicPos( Point(0,0) ), + aMapOffset( Point(0,0) ) +{}; + +#endif diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 62907753f669..8f344b079661 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: rootfrm.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: ama $ $Date: 2002-05-06 10:04:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -324,6 +324,22 @@ public: void AddAccessibleShell() { ++nAccessibleShells; } void RemoveAccessibleShell() { --nAccessibleShells; } #endif + + /** get page frame by phyiscal page number + + OD 14.01.2003 #103492# + looping through the lowers, which are page frame, in order to find the + page frame with the given physical page number. + if no page frame is found, 0 is returned. + Note: Empty page frames are also returned. + + @param _nPageNum + input parameter - physical page number of page frame to be searched and + returned. + + @return pointer to the page frame with the given physical page number + */ + SwPageFrm* GetPageByPageNum( sal_uInt16 _nPageNum ) const; }; inline long SwRootFrm::GetBrowseWidth() const diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 21d417d6c8e7..4ce78723c2be 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swfont.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: fme $ $Date: 2002-11-14 08:54:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,7 +145,7 @@ class SwSubFont : public SvxFont inline void SetStrikeout( const FontStrikeout eStrikeout ); inline void SetItalic( const FontItalic eItalic ); inline void SetOutline( const BOOL bOutline ); - inline void SetVertical( const USHORT nDir ); + inline void SetVertical( const USHORT nDir, const BOOL bVertFormat ); inline void SetShadow( const BOOL bShadow ); inline void SetAutoKern( const BYTE nAutoKern ); inline void SetWordLineMode( const BOOL bWordLineMode ); @@ -836,10 +836,10 @@ inline void SwFont::SetNoCol( const BOOL bNew ) bNoColReplace = bNew; } -inline void SwSubFont::SetVertical( const USHORT nDir ) +inline void SwSubFont::SetVertical( const USHORT nDir, const BOOL bVertFormat ) { pMagic = 0; - Font::SetVertical( nDir > 1000 ); + Font::SetVertical( bVertFormat ); Font::SetOrientation( nDir ); } diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index d16e1c325c22..6eec5990a0fa 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfrm.hxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:27:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -272,7 +272,10 @@ public: sal_Bool _UnitDown(SwPaM *, const SwTwips nOffset = 0, sal_Bool bSetInReadOnly = sal_False ) const; - void PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, sal_Bool& bRight ); + // Prepares the cursor position for a visual cursor move (BiDi). + // The behaviour is different for insert and overwrite cursors + void PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, + sal_Bool& bRight, sal_Bool bInsertCrsr ); // Methoden zur Verwaltung von FolgeFrames SwCntntFrm *SplitFrm( const xub_StrLen nTxtPos ); diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 0e9d3a6d2864..2b2cad189bf6 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: viewimp.hxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: od $ $Date: 2002-12-10 14:16:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,6 @@ #endif #include "swtypes.hxx" #include "swrect.hxx" -// OD 04.12.2002 #103492# -#include "previewdata.hxx" class ViewShell; class SwFlyFrm; @@ -94,6 +92,14 @@ class SwAccessibleMap; class SdrObject; class Fraction; #endif +// OD 12.12.2002 #103492# +class SwPagePreviewLayout; +// OD 15.01.2003 #103492# +#ifndef _PREVWPAGE_HXX +#include <prevwpage.hxx> +#endif +// OD 15.01.2003 #103492# +#include <vector> class SwViewImp { @@ -102,6 +108,9 @@ class SwViewImp friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus. friend class SwLayIdle; + // OD 12.12.2002 #103492# - for paint of page preview + friend class SwPagePreviewLayout; + ViewShell *pSh; //Falls jemand einen Imp durchreicht und doch //mal eine ViewShell braucht hier die //Rueckwaertsverkettung. @@ -143,8 +152,8 @@ class SwViewImp USHORT nRestoreActions ; //Die Anzahl der zu restaurierenden Actions (UNO) SwRect aSmoothRect; - // OD 27.11.2002 #103492# - CurrentPreviewData* mpCurrPreviewData; + // OD 12.12.2002 #103492# + SwPagePreviewLayout* mpPgPrevwLayout; /** Signal whether to stop printing. @@ -284,16 +293,13 @@ public: void SetRestoreActions(USHORT nSet){nRestoreActions = nSet;} USHORT GetRestoreActions() const{return nRestoreActions;} - // OD 04.12.2002 #103492# - inline void InitPreviewData() - { - mpCurrPreviewData = new CurrentPreviewData; - } + // OD 12.12.2002 #103492# + void InitPagePreviewLayout(); - // OD 04.12.2002 #103492# - inline CurrentPreviewData* CurrPrevwData() + // OD 12.12.2002 #103492# + inline SwPagePreviewLayout* PagePreviewLayout() { - return mpCurrPreviewData; + return mpPgPrevwLayout; } #ifdef ACCESSIBLE_LAYOUT @@ -340,12 +346,12 @@ public: const SwFlyFrm *pFollow ); // update data for accessible preview - void UpdateAccessiblePreview( sal_uInt8 nRow, sal_uInt8 nColumn, - sal_Int16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - USHORT nSelectedPage ); + // OD 15.01.2003 #103492# - change method signature due to new page preview + // functionality + void UpdateAccessiblePreview( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ); void InvalidateAccessiblePreViewSelection( sal_uInt16 nSelPage ); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index e94437df50d8..99a1d65d94be 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: atrfrm.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: od $ $Date: 2002-10-11 11:39:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -569,7 +569,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) { sal_Int16 nSet; rVal >>= nSet; - if(nSet >= 0 && nSet <= 100) + if(nSet >= 0 && nSet <= 0xfe) SetHeightPercent((BYTE)nSet); else bRet = sal_False; diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 5495398e4a2e..5095c65d200b 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -2,9 +2,9 @@ * * $RCSfile: calcmove.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: od $ $Date: 2002-11-11 09:40:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,10 @@ #ifndef _FMTANCHR_HXX //autogen #include <fmtanchr.hxx> #endif +#ifndef _FMTCLBL_HXX +#include <fmtclbl.hxx> +#endif + #include "tabfrm.hxx" #include "ftnfrm.hxx" #include "txtfrm.hxx" @@ -979,7 +983,18 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) //4. Der Abstand fuer TextFrms entspricht mindestens dem Durchschuss nUpper = CalcUpperSpace( &rAttrs, NULL ); - SwTwips nLower = rAttrs.GetBottomLine( this ); + // in balanced columned section frames we do not want the + // common border + sal_Bool bCommonBorder = sal_True; + if ( IsInSct() && GetUpper()->IsColBodyFrm() ) + { + const SwSectionFrm* pSct = FindSctFrm(); + bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue(); + } + SwTwips nLower = bCommonBorder ? + rAttrs.GetBottomLine( this ) : + rAttrs.CalcBottomLine(); + (Prt().*fnRect->fnSetPosY)( (!bVert || bReverse) ? nUpper : nLower); nUpper += nLower; nUpper -= (Frm().*fnRect->fnGetHeight)() - @@ -1453,10 +1468,25 @@ void SwCntntFrm::MakeAll() ((SwSectionFrm*)pOldUp->GetUpper()->GetUpper())->MoveAllowed(this) ) bMovedFwd = FALSE; + const sal_Bool bCheckForGrownBody = pOldUp->IsBodyFrm(); + const long nOldBodyHeight = (pOldUp->Frm().*fnRect->fnGetHeight)(); + if ( !bMovedFwd && !MoveFwd( bMakePage, FALSE ) ) bMakePage = FALSE; SWREFRESHFN( this ) - bMovedFwd = TRUE; + + // If MoveFwd moves the paragraph to the next page, a following + // paragraph, which contains footnotes can can cause the old upper + // frame to grow. In this case we explicitely allow a new check + // for MoveBwd. Robust: We also check the bMovedBwd flag again. + // If pOldUp was a footnote frame, it has been deleted inside MoveFwd. + // Therefore we only check for growing body frames. + if ( bCheckForGrownBody && ! bMovedBwd && pOldUp != GetUpper() && + (pOldUp->Frm().*fnRect->fnGetHeight)() > nOldBodyHeight ) + bMovedFwd = FALSE; + else + bMovedFwd = TRUE; + bFormatted = FALSE; if ( bMoveOrFit && GetUpper() == pOldUp ) { @@ -1649,7 +1679,17 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, SwLayoutFrm *pNewUpper, BOOL bTstMov nUpper = CalcUpperSpace( NULL, pPrev ); SwBorderAttrAccess aAccess( SwFrm::GetCache(), pFrm ); const SwBorderAttrs &rAttrs = *aAccess.Get(); - nUpper += rAttrs.GetBottomLine( pFrm ); + // in balanced columned section frames we do not want the + // common border + sal_Bool bCommonBorder = sal_True; + if ( pFrm->IsInSct() && pFrm->GetUpper()->IsColBodyFrm() ) + { + const SwSectionFrm* pSct = pFrm->FindSctFrm(); + bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue(); + } + nUpper += bCommonBorder ? + rAttrs.GetBottomLine( pFrm ) : + rAttrs.CalcBottomLine(); } else { diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 003b6de4a3ea..3ae5574e7ba9 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: findfrm.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: od $ $Date: 2002-11-11 09:36:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -736,6 +736,13 @@ SwFrm *SwFrm::_FindNext() if( ((SwCntntFrm*)this)->GetFollow() ) return ((SwCntntFrm*)this)->GetFollow(); } + else if ( IsRowFrm() ) + { + SwFrm* pUpper = GetUpper(); + if ( pUpper->IsTabFrm() && ((SwTabFrm*)pUpper)->GetFollow() ) + return ((SwTabFrm*)pUpper)->GetFollow()->GetLower(); + else return NULL; + } else return NULL; diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index c1dd7c23ed46..638670e7e1b5 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: flowfrm.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: fme $ $Date: 2002-11-13 09:40:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1070,7 +1070,7 @@ BOOL SwFlowFrm::IsPrevObjMove() const pPreUp = pPreUp->GetUpper(); else if( pPreUp->IsColBodyFrm() && pPreUp->GetUpper()->GetUpper()->IsSctFrm() ) - pPreUp = pPreUp->GetUpper()->GetUpper(); + pPreUp = pPreUp->GetUpper()->GetUpper()->GetUpper(); } const long nBottom = pPreUp->Frm().Bottom(); const long nRight = pPreUp->Frm().Right(); diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 24ecaa6587bf..a863e146b0de 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fly.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: fme $ $Date: 2002-11-05 12:30:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1461,6 +1461,7 @@ void CalcCntnt( SwLayoutFrm *pLay, BOOL bNoColl ) if ( ((SwTabFrm*)pFrm)->IsFollow() ) ((SwTabFrm*)pFrm)->bLockBackMove = FALSE; } + pFrm = pFrm->FindNext(); if( pFrm && pFrm->IsSctFrm() && pSect ) { @@ -2180,12 +2181,15 @@ void SwFrm::CalcFlys( BOOL bPosOnly ) { // change anchor position pO->SetAnchorPos( GetAnchorPos() ); - SwPageFrm* pPage = FindPageFrm(); - if ( pPage ) + if ( GetValidPosFlag() ) { - // check if the new position - // would not exceed the margins of the page - CaptureDrawObj( *pO, pPage->Frm() ); + SwPageFrm* pPage = FindPageFrm(); + if ( pPage && ! pPage->IsInvalidLayout() ) + { + // check if the new position + // would not exceed the margins of the page + CaptureDrawObj( *pO, pPage->Frm() ); + } } ((SwDrawContact*)GetUserCall(pO))->ChkPage(); diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index cdda6682195e..d585f2fb3135 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: flycnt.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: fme $ $Date: 2002-10-30 15:04:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1100,11 +1100,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) const SwRect aOld( AddSpacesToFrm() ); Point aNew( rNew ); -#ifdef BIDI if( GetAnchor()->IsVertical() || GetAnchor()->IsRightToLeft() ) -#else - if( GetAnchor()->IsVertical() ) -#endif aNew.X() += Frm().Width(); SwCntntFrm *pCnt = (SwCntntFrm*)::FindAnchor( GetAnchor(), aNew ); @@ -1113,7 +1109,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) SwPageFrm *pPage = 0; SWRECTFN( pCnt ) -#ifdef BIDI const sal_Bool bRTL = pCnt->IsRightToLeft(); if( ( bVert != GetAnchor()->IsVertical() ) || @@ -1124,15 +1119,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) else aNew.X() -= Frm().Width(); } -#else - if( ( bVert != GetAnchor()->IsVertical() ) - { - if( bVert ) - aNew.X() += Frm().Width(); - else - aNew.X() -= Frm().Width(); - } -#endif if ( pCnt->IsInDocBody() ) { @@ -1214,20 +1200,16 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) { if( !pFrm ) { -#ifdef BIDI if ( pCnt->IsRightToLeft() ) nX += pCnt->Frm().Right() - rNew.X() - Frm().Width(); else -#endif nX += rNew.X() - pCnt->Frm().Left(); } else { -#ifdef BIDI if ( pFrm->IsRightToLeft() ) nX += pFrm->Frm().Right() - rNew.X() - Frm().Width(); else -#endif nX = rNew.X() - pFrm->Frm().Left(); } } @@ -1479,6 +1461,22 @@ void SwFlyAtCntFrm::AssertPage() if ( Frm().Top() < pNewPage->Frm().Top() && pNewPage->GetPrev() ) { pNewPage = (SwPageFrm*)pNewPage->GetPrev(); + // OD 19.02.2003 #105643# - skip empty page and consider empty + // page at the beginning of the document. + // Assumption about document layout: + // No two empty pages following each other. + if ( pNewPage->IsEmptyPage() ) + { + if ( pNewPage->GetPrev() ) + { + pNewPage = static_cast<SwPageFrm*>(pNewPage->GetPrev()); + } + else + { + bFound = TRUE; + pNewPage = static_cast<SwPageFrm*>(pNewPage->GetNext()); + } + } if ( nDir == 2 ) { bFound = TRUE; @@ -2127,12 +2125,8 @@ void SwFlyAtCntFrm::MakeFlyPos() nRelPosX += aHori.GetPos(); } else if( bToggle || ( !aHori.IsPosToggle() && bR2L ) ) -#ifdef BIDI nRelPosX = nWidth - aFrm.Width() - aHori.GetPos() + ( bR2L ? nAdd : 0 ); -#else - nRelPosX = nWidth - aFrm.Width() - aHori.GetPos(); -#endif else nRelPosX += aHori.GetPos(); //Da die relative Position immer zum Anker relativ ist, diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 4fda29b450f4..bdad954d2e90 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmtool.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: fme $ $Date: 2002-12-09 10:37:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1630,7 +1630,7 @@ SwBorderAttrs::SwBorderAttrs( const SwModify *pMod, const SwFrm *pConstructor ) //Muessen alle einmal berechnet werden: bTopLine = bBottomLine = bLeftLine = bRightLine = - bTop = bBottom = bRight = bLine = TRUE; + bTop = bBottom = bLine = TRUE; bCacheGetLine = bCachedGetTopLine = bCachedGetBottomLine = FALSE; @@ -1668,56 +1668,49 @@ void SwBorderAttrs::_CalcBottom() bBottom = FALSE; } -void SwBorderAttrs::_CalcRight() +long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const { - nRight = CalcRightLine() + rLR.GetRight(); - bRight = FALSE; -} - + long nRight; -#ifdef BIDI + // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left + // and right border are painted on the right respectively left. + if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() ) + nRight = CalcLeftLine(); + else + nRight = CalcRightLine(); -long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) -{ // for paragraphs, "left" is "before text" and "right" is "after text" - nRight = CalcRightLine() + - ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ? - rLR.GetLeft() : - rLR.GetRight() ); + if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ) + nRight += rLR.GetLeft(); + else + nRight += rLR.GetRight(); return nRight; } long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const { - // for paragraphs, "left" is "before text" and "right" is "after text" - long nLeft = CalcLeftLine() + - ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ? - rLR.GetRight() : - rLR.GetLeft() ); + long nLeft; -#ifdef NUM_RELSPACE - if ( pCaller->IsTxtFrm() ) - nLeft += ((SwTxtFrm*)pCaller)->GetTxtNode()->GetLeftMarginWithNum(); -#endif - return nLeft; -} + // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left + // and right border are painted on the right respectively left. + if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() ) + nLeft = CalcRightLine(); + else + nLeft = CalcLeftLine(); -#else + // for paragraphs, "left" is "before text" and "right" is "after text" + if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ) + nLeft += rLR.GetRight(); + else + nLeft += rLR.GetLeft(); -long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const -{ - long nLeft = rLR.GetLeft() + CalcLeftLine(); -#ifdef NUM_RELSPACE if ( pCaller->IsTxtFrm() ) nLeft += ((SwTxtFrm*)pCaller)->GetTxtNode()->GetLeftMarginWithNum(); -#endif + return nLeft; } -#endif - - /************************************************************************* |* |* SwBorderAttrs::CalcTopLine(), CalcBottomLine(), diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 3bce18e8f25b..98a96d6bacac 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hffrm.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: fme $ $Date: 2002-10-23 11:16:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,7 +237,8 @@ void SwHeadFootFrm::FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs) nUL = pAttrs->CalcBottom() + nSpace; /* set print area */ - SwTwips nLR = pAttrs->CalcLeft(this) + pAttrs->CalcRight(); + // OD 23.01.2003 #106895# - add first parameter to <SwBorderAttrs::CalcRight(..)> + SwTwips nLR = pAttrs->CalcLeft( this ) + pAttrs->CalcRight( this ); aPrt.Left(pAttrs->CalcLeft(this)); @@ -266,7 +267,8 @@ void SwHeadFootFrm::FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs) //Sizes einstellen; die Groesse gibt der umgebende Frm vor, die //die Raender werden einfach abgezogen. - SwTwips nLR = pAttrs->CalcLeft(this) + pAttrs->CalcRight(); + // OD 23.01.2003 #106895# - add first parameter to <SwBorderAttrs::CalcRight(..)> + SwTwips nLR = pAttrs->CalcLeft( this ) + pAttrs->CalcRight( this ); aPrt.Width ( aFrm.Width() - nLR ); aPrt.Height( aFrm.Height()- nUL ); @@ -313,6 +315,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) } nRemaining = 0; pFrm = Lower(); + while ( pFrm ) { nRemaining += pFrm->Frm().Height(); @@ -372,6 +375,18 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) pTmpFrm->Prepare(PREP_ADJUST_FRM); } } + /* #i3568# Undersized sections need to be + invalidated too. */ + else if (pFrm->IsSctFrm()) + { + SwSectionFrm * pTmpFrm = + (SwSectionFrm*) pFrm; + if (pTmpFrm->IsUndersized() ) + { + pTmpFrm->InvalidateSize(); + pTmpFrm->Prepare(PREP_ADJUST_FRM); + } + } pFrm = pFrm->GetNext(); } } diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 125e76073ccd..2d52c361df48 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layact.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: od $ $Date: 2002-11-15 10:46:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1536,13 +1536,21 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) if ( !bNoPaint && IsPaint() && bAddRect && (pLay->IsCompletePaint() || bChanged) ) { SwRect aPaint( pLay->Frm() ); - // OD 11.11.2002 #104414# - not necessary to enlarge paint area - /* - aPaint.Pos().Y() -= 1; - aPaint.Pos().X() -= 1; - aPaint.SSize().Height() += 2; - aPaint.SSize().Width() += 2; - */ + // OD 13.02.2003 #i9719#, #105645# - consider border and shadow for + // page frames -> enlarge paint rectangle correspondingly. + if ( pLay->IsPageFrm() ) + { + SwPageFrm* pPageFrm = static_cast<SwPageFrm*>(pLay); + const nBorderWidth = + pImp->GetShell()->GetOut()->PixelToLogic( Size( pPageFrm->BorderPxWidth(), 0 ) ).Width(); + const nShadowWidth = + pImp->GetShell()->GetOut()->PixelToLogic( Size( pPageFrm->ShadowPxWidth(), 0 ) ).Width(); + aPaint.Left( aPaint.Left() - nBorderWidth ); + aPaint.Top( aPaint.Top() - nBorderWidth ); + aPaint.Right( aPaint.Right() + nBorderWidth + nShadowWidth ); + aPaint.Bottom( aPaint.Bottom() + nBorderWidth + nShadowWidth ); + } + if ( pLay->IsPageFrm() && pLay->GetFmt()->GetDoc()->IsBrowseMode() ) { @@ -1567,22 +1575,6 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) pImp->GetShell()->AddPaintRect( aRegion[i] ); } - //ggf. die Zwischenraeume mit invalidieren. - if ( pLay->GetPrev() ) - { - SwRect aTmp( aPaint ); - long nTmp = aTmp.Top() - DOCUMENTBORDER/2; - if ( nTmp >= 0 ) - aTmp.Top( nTmp ); - aTmp.Bottom( pLay->Frm().Top() ); - pImp->GetShell()->AddPaintRect( aTmp ); - } - if ( pLay->GetNext() ) - { - aPaint.Bottom( aPaint.Bottom() + DOCUMENTBORDER/2 ); - aPaint.Top( pLay->Frm().Bottom() ); - pImp->GetShell()->AddPaintRect( aPaint ); - } } else { @@ -1591,6 +1583,29 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) // OD 11.11.2002 #104414# - remember frame at complete paint aFrmAtCompletePaint = pLay->Frm(); } + + // OD 13.02.2003 #i9719#, #105645# - provide paint of spacing + // between pages (not only for in online mode). + if ( pLay->IsPageFrm() ) + { + if ( pLay->GetPrev() ) + { + SwRect aSpaceToPrevPage( pLay->Frm() ); + SwTwips nTop = aSpaceToPrevPage.Top() - DOCUMENTBORDER/2; + if ( nTop >= 0 ) + aSpaceToPrevPage.Top( nTop ); + aSpaceToPrevPage.Bottom( pLay->Frm().Top() ); + pImp->GetShell()->AddPaintRect( aSpaceToPrevPage ); + } + if ( pLay->GetNext() ) + { + SwRect aSpaceToNextPage( pLay->Frm() ); + aSpaceToNextPage.Bottom( aSpaceToNextPage.Bottom() + DOCUMENTBORDER/2 ); + aSpaceToNextPage.Top( pLay->Frm().Bottom() ); + pImp->GetShell()->AddPaintRect( aSpaceToNextPage ); + } + } + } pLay->ResetCompletePaint(); } diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 3fd57b8fbbf1..1fc5e788d781 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pagechg.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: od $ $Date: 2002-11-01 11:10:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -341,6 +341,11 @@ SwPageFrm::~SwPageFrm() pImp->SetFirstVisPageInvalid(); if ( pImp->IsAction() ) pImp->GetLayAction().SetAgain(); + // OD 12.02.2003 #i9719#, #105645# - retouche area of page + // including border and shadow area. + SwRect aRetoucheRect; + GetBorderAndShadowBoundRect( Frm(), pSh, aRetoucheRect ); + pSh->AddPaintRect( aRetoucheRect ); } } } @@ -636,7 +641,7 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, /* kein break hier */ case RES_FRM_SIZE: { - const SwRect aOldRect( Frm() ); + const SwRect aOldPageFrmRect( Frm() ); if ( GetFmt()->GetDoc()->IsBrowseMode() ) { bValidSize = FALSE; @@ -659,14 +664,20 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, Frm().Height( Max( rSz.GetHeight(), long(MINLAY) ) ); Frm().Width ( Max( rSz.GetWidth(), long(MINLAY) ) ); - AdjustRootSize( CHG_CHGPAGE, &aOldRect ); + AdjustRootSize( CHG_CHGPAGE, &aOldPageFrmRect ); } //Window aufraeumen. ViewShell *pSh; - if ( 0 != (pSh = GetShell()) && pSh->GetWin() && aOldRect.HasArea() ) - pSh->InvalidateWindows( aOldRect ); + if ( 0 != (pSh = GetShell()) && pSh->GetWin() && aOldPageFrmRect.HasArea() ) + { + // OD 12.02.2003 #i9719#, #105645# - consider border and shadow of + // page frame for determine 'old' rectangle - it's used for invalidating. + SwRect aOldRectWithBorderAndShadow; + GetBorderAndShadowBoundRect( aOldPageFrmRect, pSh, aOldRectWithBorderAndShadow ); + pSh->InvalidateWindows( aOldRectWithBorderAndShadow ); + } rInvFlags |= 0x03; - if ( aOldRect.Height() != Frm().Height() ) + if ( aOldPageFrmRect.Height() != Frm().Height() ) rInvFlags |= 0x04; } break; @@ -1886,7 +1897,8 @@ void SwRootFrm::ImplCalcBrowseWidth() switch ( rHori.GetHoriOrient() ) { case HORI_NONE: - nWidth += rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight(); + // OD 23.01.2003 #106895# - add 1st param to <SwBorderAttrs::CalcRight(..)> + nWidth += rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight( pFrm ); break; case HORI_LEFT_AND_WIDTH: nWidth += rAttrs.CalcLeft( pFrm ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index ed0cae1bf92f..d8d2ba18fddc 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: paintfrm.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: od $ $Date: 2002-12-10 14:24:00 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -209,6 +209,14 @@ #ifndef _ACCESSIBILITYOPTIONS_HXX #include <accessibilityoptions.hxx> #endif +// OD 20.12.2002 #94627# +#ifndef _DOCSH_HXX +#include <docsh.hxx> +#endif +// OD 28.02.2003 #b4779636#, #107692# +#ifndef _SWTABLE_HXX +#include <swtable.hxx> +#endif #define GETOBJSHELL() ((SfxObjectShell*)rSh.GetDoc()->GetDocShell()) @@ -298,12 +306,6 @@ public: static ViewShell *pGlobalShell = 0; -/// OD 05.09.2002 #102912# - <bPageOnly> no longer needed -/* -//Fuer PaintBackground, eigentlich lokal, aber fuer SwSavePaintStatics jetzt global -static FASTBOOL bPageOnly = FALSE; -*/ - //Wenn durchsichtige FlyInCnts im PaintBackground gepainted werden so soll der //Hintergrund nicht mehr retouchiert werden. //static FASTBOOL bLockFlyBackground = FALSE; @@ -411,13 +413,10 @@ public: }; SwSavePaintStatics::SwSavePaintStatics() : -// bSLockFlyBackground ( bLockFlyBackground), bSFlyMetafile ( bFlyMetafile ), bSPixelHeightOdd ( bPixelHeightOdd ), bSPixelWidthOdd ( bPixelWidthOdd ), bSOneBeepOnly ( bOneBeepOnly ), -/// OD 05.09.2002 #102912# - <bPageOnly> no longer needed -// bSPageOnly ( bPageOnly ), pSGlobalShell ( pGlobalShell ), pSFlyMetafileOut ( pFlyMetafileOut ), pSRetoucheFly ( pRetoucheFly ), @@ -436,8 +435,7 @@ SwSavePaintStatics::SwSavePaintStatics() : aSScaleX ( aScaleX ), aSScaleY ( aScaleY ) { - /// OD 05.09.2002 #102912# - <bPageOnly> no longer needed - /*bPageOnly = *//*bLockFlyBackground = */bFlyMetafile = FALSE; + bFlyMetafile = FALSE; pFlyMetafileOut = 0; pRetoucheFly = 0; pRetoucheFly2 = 0; @@ -455,14 +453,11 @@ SwSavePaintStatics::SwSavePaintStatics() : SwSavePaintStatics::~SwSavePaintStatics() { -// bLockFlyBackground = bSLockFlyBackground; pGlobalShell = pSGlobalShell; bFlyMetafile = bSFlyMetafile; bPixelHeightOdd = bSPixelHeightOdd; bPixelWidthOdd = bSPixelWidthOdd; bOneBeepOnly = bSOneBeepOnly; -/// OD 05.09.2002 #102912# - <bPageOnly> no longer needed -// bPageOnly = bSPageOnly; pFlyMetafileOut = pSFlyMetafileOut; pRetoucheFly = pSRetoucheFly; pRetoucheFly2 = pSRetoucheFly2; @@ -742,7 +737,10 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) // an <insert> may destroy the object due to a necessary array resize. const SwLineRect aSubsLineRect = SwLineRect( operator[](i) ); - if ( aSubsLineRect.IsPainted() ) + // OD 19.12.2002 #106318# - add condition <aSubsLineRect.IsLocked()> + // in order to consider only border lines, which are *not* locked. + if ( aSubsLineRect.IsPainted() || + aSubsLineRect.IsLocked() ) continue; const bool bVerticalSubs = aSubsLineRect.Height() > aSubsLineRect.Width(); @@ -761,6 +759,12 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) { SwLineRect &rLine = rRects[k]; + // OD 20.12.2002 #106318# - do *not* consider painted or locked + // border lines. + // OD 20.01.2003 #i1837# - locked border lines have to be considered. + if ( rLine.IsLocked () ) + continue; + if ( !bVerticalSubs == rLine.Height() > rLine.Width() ) //gleiche Ausrichtung? continue; @@ -996,10 +1000,24 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, { pOut->Push( PUSH_FILLCOLOR ); + // OD 14.01.2003 #106660# - reset draw mode in high contrast + // mode in order to get fill color set at output device. + // Recover draw mode after draw of lines. + // Necessary for the subsidiary lines painted by the fly frames. + ULONG nOldDrawMode = pOut->GetDrawMode(); + if( pGlobalShell->GetWin() && + Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) + { + pOut->SetDrawMode( 0 ); + } + for ( USHORT i = 0; i < Count(); ++i ) { SwLineRect &rLRect = operator[](i); - if ( !rLRect.IsPainted() ) + // OD 19.12.2002 #106318# - add condition <!rLRect.IsLocked()> + // to prevent paint of locked subsidiary lines. + if ( !rLRect.IsPainted() && + !rLRect.IsLocked() ) { const Color *pCol; switch ( rLRect.GetSubColor() ) @@ -1010,12 +1028,18 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, case SUBCOL_SECT: pCol = &SwViewOption::GetSectionBoundColor(); break; case SUBCOL_BREAK: pCol = &SwViewOption::GetPageBreakColor(); break; } + if ( pOut->GetFillColor() != *pCol ) pOut->SetFillColor( *pCol ); pOut->DrawRect( rLRect.SVRect() ); + rLRect.SetPainted(); } } + + // OD 14.01.2003 #106660# - recovering draw mode + pOut->SetDrawMode( nOldDrawMode ); + pOut->Pop(); } } @@ -1024,6 +1048,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, //------------------------------------------------------------------------- //Diverse Functions die in diesem File so verwendet werden. +// OD 20.02.2003 - Note: function <SwAlignRect(..)> also used outside this file. void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ) { if( !rRect.HasArea() ) @@ -1158,7 +1183,15 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, const SwBorderAttrs &rAttrs, const BOOL bShadow ) { - if( pFrm->IsSctFrm() ) + // OD 23.01.2003 #106386# - special handling for cell frames. + // The printing area of a cell frame is completely enclosed in the frame area + // and a cell frame has no shadow. Thus, for cell frames the calculated + // area equals the frame area. + // Notes: Borders of cell frames in R2L text direction will switch its side + // - left border is painted on the right; right border on the left. + // See <lcl_PaintLeftLine> and <lcl_PaintRightLine>. + if( pFrm->IsSctFrm() || + pFrm->IsCellFrm() ) rRect = pFrm->Frm(); else { @@ -1176,7 +1209,9 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, SwTwips nDiff = rBox.GetTop() ? rBox.CalcLineSpace( BOX_LINE_TOP ) : ( rAttrs.IsBorderDist() ? - rBox.GetDistance( BOX_LINE_TOP ) + 1 : 0 ); + // OD 23.01.2003 #106386# - increase of distance by + // one twip is incorrect. + rBox.GetDistance( BOX_LINE_TOP ) : 0 ); if( nDiff ) (rRect.*fnRect->fnSubTop)( nDiff ); } @@ -1187,20 +1222,24 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, SwTwips nDiff = rBox.GetBottom() ? rBox.CalcLineSpace( BOX_LINE_BOTTOM ) : ( rAttrs.IsBorderDist() ? - rBox.GetDistance( BOX_LINE_BOTTOM ) + 1 : 0 ); + // OD 23.01.2003 #106386# - increase of distance by + // one twip is incorrect. + rBox.GetDistance( BOX_LINE_BOTTOM ) : 0 ); if( nDiff ) (rRect.*fnRect->fnAddBottom)( nDiff ); } if ( rBox.GetLeft() ) - (rRect.*fnRect->fnSubLeft)( rBox.CalcLineSpace(BOX_LINE_LEFT) ); + (rRect.*fnRect->fnSubLeft)( rBox.CalcLineSpace( BOX_LINE_LEFT ) ); else if ( rAttrs.IsBorderDist() ) - (rRect.*fnRect->fnSubLeft)(rBox.GetDistance( BOX_LINE_LEFT )+1); + // OD 23.01.2003 #106386# - increase of distance by one twip is incorrect. + (rRect.*fnRect->fnSubLeft)( rBox.GetDistance( BOX_LINE_LEFT ) ); if ( rBox.GetRight() ) - (rRect.*fnRect->fnAddRight)(rBox.CalcLineSpace(BOX_LINE_RIGHT)); + (rRect.*fnRect->fnAddRight)( rBox.CalcLineSpace( BOX_LINE_RIGHT ) ); else if ( rAttrs.IsBorderDist() ) - (rRect.*fnRect->fnAddRight)(rBox.GetDistance(BOX_LINE_RIGHT)+1); + // OD 23.01.2003 #106386# - increase of distance by one twip is incorrect. + (rRect.*fnRect->fnAddRight)( rBox.GetDistance( BOX_LINE_RIGHT ) ); if ( bShadow && rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE ) { @@ -1407,32 +1446,6 @@ inline FASTBOOL IsShortCut( const SwRect &rRect, const SwRect &rFrmRect ) (rFrmRect.Left() > rRect.Right()) ); } - -void lcl_PaintShadow( const SwRect& aFrm, ViewShell* pSh ) -{ - const Color& rColor = SwViewOption::GetFontColor(); - Color aFill( pSh->GetOut()->GetFillColor() ); - Color aLine( pSh->GetOut()->GetLineColor() ); - pSh->GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - pSh->GetOut()->SetLineColor( rColor ); - Rectangle aPageRect( aFrm.SVRect() ); - pSh->GetOut()->DrawRect( aPageRect ); - aPageRect = pSh->GetOut()->LogicToPixel( aPageRect ); - Rectangle aShadow( aPageRect.Left()+2, aPageRect.Bottom()+1, - aPageRect.Right()+2, aPageRect.Bottom()+2 ); - pSh->GetOut()->SetFillColor( rColor ); - aShadow = pSh->GetOut()->PixelToLogic( aShadow ); - pSh->GetOut()->DrawRect( aShadow ); - aShadow.Left() = aPageRect.Right() + 1; - aShadow.Right() = aShadow.Left() + 1; - aShadow.Top() = aPageRect.Top() + 2; - aShadow.Bottom() = aPageRect.Bottom(); - aShadow = pSh->GetOut()->PixelToLogic( aShadow ); - pSh->GetOut()->DrawRect( aShadow ); - pSh->GetOut()->SetFillColor( aFill ); - pSh->GetOut()->SetLineColor( aLine ); -} - //---------------- Ausgabe fuer das BrushItem ---------------- /** lcl_DrawGraphicBackgrd - local help method to draw a background for a graphic @@ -2122,8 +2135,17 @@ void SwRootFrm::Paint( const SwRect& rRect ) const } pPage->Paint( aPaintRect ); - if( pSh->GetWin() ) - lcl_PaintShadow( pPage->Frm(), pSh ); + + // OD 20.12.2002 #94627# - no paint of page border and shadow, if + // writer is in place mode. + if( pSh->GetWin() && + !pSh->GetDoc()->GetDocShell()->GetProtocol().IsInPlaceActive() ) + { + // OD 12.02.2003 #i9719#, #105645# - use new method + // <SwPageFrm::PaintBorderAndShadow(..)>. + pPage->PaintBorderAndShadow( pPage->Frm(), pSh ); + } + pLines->PaintLines( pSh->GetOut() ); BOOL bControlExtra = FALSE; @@ -2311,7 +2333,7 @@ void SwLayoutFrm::Paint( const SwRect& rRect ) const if ( pFrm->IsRetoucheFrm() && bWin && !pFrm->GetNext() ) { if ( !pPage ) pPage = FindPageFrm(); - pFrm->Retouche( pPage, rRect ); + pFrm->Retouche( pPage, rRect ); } pFrm->ResetRetouche(); } @@ -2579,10 +2601,10 @@ void SwFlyFrm::Paint( const SwRect& rRect ) const SwRect aRect( rRect ); aRect._Intersection( Frm() ); - OutputDevice *pOut = pGlobalShell->GetOut(); + OutputDevice* pOut = pGlobalShell->GetOut(); pOut->Push( PUSH_CLIPREGION ); pOut->SetClipRegion(); - const SwPageFrm *pPage = FindPageFrm(); + const SwPageFrm* pPage = FindPageFrm(); const SwNoTxtFrm *pNoTxt = Lower() && Lower()->IsNoTxtFrm() ? (SwNoTxtFrm*)Lower() : 0; @@ -2640,31 +2662,14 @@ void SwFlyFrm::Paint( const SwRect& rRect ) const SwBorderAttrAccess aAccess( SwFrm::GetCache(), (SwFrm*)this ); const SwBorderAttrs &rAttrs = *aAccess.Get(); -/* //Das Paint der FlyInCnt's wird vom Paint der Lines gerufen. Damit - //der Rand (UL-/LRSpace) mit der richtigen Farbe retouchiert wird, - //muss Das Paint an den Anker weitergereicht werden. - FASTBOOL bUnlock = FALSE; - if ( IsFlyInCntFrm() ) - { - bLockFlyBackground = bUnlock = TRUE; - SwBorderAttrAccess aAccess( SwFrm::GetCache(), GetAnchor()); - const SwBorderAttrs &rAttrs = *aAccess.Get(); - GetAnchor()->PaintBackground( aRect, pPage, rAttrs, FALSE ); - } -*/ - - /// OD 06.08.2002 #99657# - paint border before painting background - /// paint border + // OD 06.08.2002 #99657# - paint border before painting background + // paint border { SwRect aTmp( rRect ); -//?? aTmp._Intersection( Frm() ); PaintBorder( aTmp, pPage, rAttrs ); -/* if ( bUnlock ) - bLockFlyBackground = FALSE; -*/ } - /// paint background + // paint background { SwRegionRects aRegion( aRect ); if ( pNoTxt && !bIsGraphicTransparent ) @@ -2694,11 +2699,65 @@ void SwFlyFrm::Paint( const SwRect& rRect ) const } } + // OD 19.12.2002 #106318# - fly frame will paint it's subsidiary lines and + // the subsidiary lines of its lowers on its own, due to overlapping with + // other fly frames or other objects. + if( pGlobalShell->GetWin() ) + { + bool bSubsLineRectsCreated; + if ( pSubsLines ) + { + // Lock already existing subsidiary lines + pSubsLines->LockLines( TRUE ); + bSubsLineRectsCreated = false; + } + else + { + // create new subsidiardy lines + pSubsLines = new SwSubsRects; + bSubsLineRectsCreated = true; + } + + bool bSpecSubsLineRectsCreated; + if ( pSpecSubsLines ) + { + // Lock already existing special subsidiary lines + pSpecSubsLines->LockLines( TRUE ); + bSpecSubsLineRectsCreated = false; + } + else + { + // create new special subsidiardy lines + pSpecSubsLines = new SwSubsRects; + bSpecSubsLineRectsCreated = true; + } + // Add subsidiary lines of fly frame and its lowers + RefreshLaySubsidiary( pPage, aRect ); + // paint subsidiary lines of fly frame and its lowers + pSpecSubsLines->PaintSubsidiary( pOut, NULL ); + pSubsLines->PaintSubsidiary( pOut, pLines ); + if ( !bSubsLineRectsCreated ) + // unlock subsidiary lines + pSubsLines->LockLines( FALSE ); + else + // delete created subsidiary lines container + DELETEZ( pSubsLines ); + + if ( !bSpecSubsLineRectsCreated ) + // unlock special subsidiary lines + pSpecSubsLines->LockLines( FALSE ); + else + // delete created special subsidiary lines container + DELETEZ( pSpecSubsLines ); + } + SwLayoutFrm::Paint( aRect ); Validate(); - pLines->LockLines( FALSE ); + // OD 19.12.2002 #106318# - first paint lines added by fly frame paint + // and then unlock other lines. pLines->PaintLines( pOut ); + pLines->LockLines( FALSE ); pOut->Pop(); @@ -2716,12 +2775,20 @@ void SwFlyFrm::Paint( const SwRect& rRect ) const void SwTabFrm::Paint( const SwRect& rRect ) const { - if( pGlobalShell->GetViewOptions()->IsTable() ) + if ( pGlobalShell->GetViewOptions()->IsTable() ) + { SwLayoutFrm::Paint( rRect ); - else if( pGlobalShell->GetWin() ) + } + // OD 10.01.2003 #i6467# - no light grey rectangle for page preview + else if ( pGlobalShell->GetWin() && !pGlobalShell->IsPreView() ) { + // OD 10.01.2003 #i6467# - intersect output rectangle with table frame + SwRect aTabRect( Prt() ); + aTabRect.Pos() += Frm().Pos(); + SwRect aTabOutRect( rRect ); + aTabOutRect.Intersection( aTabRect ); pGlobalShell->GetViewOptions()-> - DrawRect( pGlobalShell->GetOut(), rRect, COL_LIGHTGRAY ); + DrawRect( pGlobalShell->GetOut(), aTabOutRect, COL_LIGHTGRAY ); } ((SwTabFrm*)this)->ResetComplete(); } @@ -2922,12 +2989,12 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, { SwRect &rOut = aRegion[i]; aOut = rOut; - /// OD 30.09.2002 #103636# - no SwAlign of shadow rectangle - /// no alignment necessary, because (1) <rRect> is already aligned - /// and because (2) paint of border and background will occur later. - /// Thus, (1) assures that no conflicts with neighbour object will occure - /// and (2) assures that border and background is not affected by the - /// shadow paint. + // OD 30.09.2002 #103636# - no SwAlign of shadow rectangle + // no alignment necessary, because (1) <rRect> is already aligned + // and because (2) paint of border and background will occur later. + // Thus, (1) assures that no conflicts with neighbour object will occure + // and (2) assures that border and background is not affected by the + // shadow paint. /* ::SwAlignRect( aOut, pGlobalShell ); */ @@ -3163,6 +3230,144 @@ void MA_FASTCALL lcl_PaintBottomLine( const SwFrm *pFrm, const SwPageFrm *pPage, |* |*************************************************************************/ +/** local method to determine cell frame, from which the border attributes + for paint of top/bottom border has to be used. + + OD 21.02.2003 #b4779636#, #107692# + + @author OD + + + @param _pCellFrm + input parameter - constant pointer to cell frame for which the cell frame + for the border attributes has to be determined. + + @param _rCellBorderAttrs + input parameter - constant reference to the border attributes of cell frame + <_pCellFrm>. + + @param _bTop + input parameter - boolean, that controls, if cell frame for top border or + for bottom border has to be determined. + + @return constant pointer to cell frame, for which the border attributes has + to be used +*/ +const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm* _pCellFrm, + const SwBorderAttrs& _rCellBorderAttrs, + const bool _bTop ) +{ + // determine, if cell frame is at bottom/top border of a table frame and + // the table frame has/is a follow. + const SwFrm* pTmpFrm = _pCellFrm; + bool bCellAtBorder = true; + while( !pTmpFrm->IsRowFrm() || !pTmpFrm->GetUpper()->IsTabFrm() ) + { + pTmpFrm = pTmpFrm->GetUpper(); + if ( pTmpFrm->IsRowFrm() && + (_bTop ? pTmpFrm->GetPrev() : pTmpFrm->GetNext()) + ) + { + bCellAtBorder = false; + } + } + ASSERT( pTmpFrm && pTmpFrm->IsRowFrm(), "No RowFrm available" ); + + const SwLayoutFrm* pParentRowFrm = static_cast<const SwLayoutFrm*>(pTmpFrm); + const SwTabFrm* pParentTabFrm = + static_cast<const SwTabFrm*>(pParentRowFrm->GetUpper()); + + const bool bCellNeedsAttribute = bCellAtBorder && + ( _bTop ? + // bCellInFirstRowWithMaster + ( !pParentRowFrm->GetPrev() && + pParentTabFrm->IsFollow() && + !pParentTabFrm->GetTable()->IsHeadlineRepeat() ) : + // bCellInLastRowWithFollow + ( !pParentRowFrm->GetNext() && + pParentTabFrm->GetFollow() ) + ); + + const SwFrm* pRet = _pCellFrm; + if ( bCellNeedsAttribute ) + { + // determine, if cell frame has no borders inside the table. + const SvxBoxItem aBorderBox = _rCellBorderAttrs.GetBox(); + const bool bNoBordersInside = + ( !aBorderBox.GetTop() || !pParentRowFrm->GetPrev() ) && + ( !aBorderBox.GetLeft() || !_pCellFrm->GetPrev() ) && + ( !aBorderBox.GetRight() || !_pCellFrm->GetNext() ) && + ( !aBorderBox.GetBottom() || !pParentRowFrm->GetNext() ); + + if ( bNoBordersInside ) + { + if ( _bTop && !_rCellBorderAttrs.GetBox().GetTop() ) + { + // #b4779636#-hack: + // Cell frame has no top border and no border inside the table, but + // it is at the top border of a table frame, which is a follow. + // Thus, use border attributes of cell frame in first row of complete table. + // First, determine first table frame of complete table. + SwTabFrm* pMasterTabFrm = const_cast<SwTabFrm*>(pParentTabFrm->FindMaster()); + while ( pMasterTabFrm->IsFollow() ) + { + pMasterTabFrm = pMasterTabFrm->FindMaster(); + } + // determine first row of complete table. + const SwFrm* pFirstRow = pMasterTabFrm->GetLower(); + // return first cell in first row + SwFrm* pTmpFrm = const_cast<SwFrm*>(pFirstRow->GetLower()); + while ( !pTmpFrm->IsCellFrm() || + ( pTmpFrm->GetLower() && pTmpFrm->GetLower()->IsLayoutFrm() ) + ) + { + pTmpFrm = pTmpFrm->GetLower(); + } + ASSERT( pTmpFrm && pTmpFrm->IsCellFrm(), "No CellFrm available" ); + pRet = pTmpFrm; + } + else if ( !_bTop && !_rCellBorderAttrs.GetBox().GetBottom() ) + { + // #b4779636#-hack: + // Cell frame has no bottom border and no border inside the table, + // but it is at the bottom border of a table frame, which has a follow. + // Thus, use border attributes of cell frame in last row of complete table. + // First, determine last table frame of complete table. + SwTabFrm* pLastTabFrm = const_cast<SwTabFrm*>(pParentTabFrm->GetFollow()); + while ( pLastTabFrm->GetFollow() ) + { + pLastTabFrm = pLastTabFrm->GetFollow(); + } + // determine last row of complete table. + SwFrm* pLastRow = pLastTabFrm->GetLower(); + while ( pLastRow->GetNext() ) + { + pLastRow = pLastRow->GetNext(); + } + // return first bottom border cell in last row + SwFrm* pTmpFrm = const_cast<SwFrm*>(pLastRow->GetLower()); + while ( !pTmpFrm->IsCellFrm() || + ( pTmpFrm->GetLower() && pTmpFrm->GetLower()->IsLayoutFrm() ) + ) + { + if ( pTmpFrm->IsRowFrm() ) + { + while ( pTmpFrm->GetNext() ) + { + pTmpFrm = pTmpFrm->GetNext(); + } + } + pTmpFrm = pTmpFrm->GetLower(); + } + ASSERT( pTmpFrm && pTmpFrm->IsCellFrm(), "No CellFrm available" ); + pRet = pTmpFrm; + } + } + } + + return pRet; +} + void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, const SwBorderAttrs &rAttrs ) const { @@ -3175,9 +3380,29 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, !pGlobalShell->GetViewOptions()->IsTable() ) return; - const FASTBOOL bLine = rAttrs.IsLine(); - const FASTBOOL bShadow = rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE; - if ( bLine || bShadow ) + const bool bLine = rAttrs.IsLine() ? true : false; + const bool bShadow = rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE; + + // OD 24.02.2003 #b4779636#, #107692# - flag to control, + // if #b4779636#-hack has to be used. + const bool bb4779636HackActive = true; + // OD 21.02.2003 #b4779636#, #107692# + const SwFrm* pCellFrmForBottomBorderAttrs = 0; + const SwFrm* pCellFrmForTopBorderAttrs = 0; + bool bFoundCellForTopOrBorderAttrs = false; + if ( bb4779636HackActive && IsCellFrm() ) + { + pCellFrmForBottomBorderAttrs = lcl_GetCellFrmForBorderAttrs( this, rAttrs, false ); + if ( pCellFrmForBottomBorderAttrs != this ) + bFoundCellForTopOrBorderAttrs = true; + pCellFrmForTopBorderAttrs = lcl_GetCellFrmForBorderAttrs( this, rAttrs, true ); + if ( pCellFrmForTopBorderAttrs != this ) + bFoundCellForTopOrBorderAttrs = true; + } + + // OD 24.02.2003 #b4779636#, #107692# - add condition <bFoundCellForTopOrBorderAttrs> + // for #b4779636#-hack + if ( bLine || bShadow || bFoundCellForTopOrBorderAttrs ) { //Wenn das Rechteck vollstandig innerhalb der PrtArea liegt, //so braucht kein Rand gepainted werden. @@ -3186,21 +3411,21 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, SwRect aRect( Prt() ); aRect += Frm().Pos(); ::SwAlignRect( aRect, pGlobalShell ); - /// OD 27.09.2002 #103636# - new local boolean variable in order to - /// suspend border paint under special cases - see below. - /// NOTE: This is a fix for the implementation of feature #99657#. + // OD 27.09.2002 #103636# - new local boolean variable in order to + // suspend border paint under special cases - see below. + // NOTE: This is a fix for the implementation of feature #99657#. bool bDrawOnlyShadowForTransparentFrame = false; if ( aRect.IsInside( rRect ) ) { - /// OD 27.09.2002 #103636# - paint shadow, if background is transparent. - /// Because of introduced transparent background for fly frame #99657#, - /// the shadow have to be drawn if the background is transparent, - /// in spite the fact that the paint rectangle <rRect> lies fully - /// in the printing area. - /// NOTE to chosen solution: - /// On transparent background, continue processing, but suspend - /// drawing of border by setting <bDrawOnlyShadowForTransparentFrame> - /// to true. + // OD 27.09.2002 #103636# - paint shadow, if background is transparent. + // Because of introduced transparent background for fly frame #99657#, + // the shadow have to be drawn if the background is transparent, + // in spite the fact that the paint rectangle <rRect> lies fully + // in the printing area. + // NOTE to chosen solution: + // On transparent background, continue processing, but suspend + // drawing of border by setting <bDrawOnlyShadowForTransparentFrame> + // to true. if ( IsLayoutFrm() && static_cast<const SwLayoutFrm*>(this)->GetFmt()->IsBackgroundTransparent() ) { @@ -3219,17 +3444,50 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, rAttrs.SetGetCacheLine( TRUE ); if ( bShadow ) PaintShadow( rRect, aRect, pPage, rAttrs ); - /// OD 27.09.2002 #103636# - suspend drawing of border - /// add condition < NOT bDrawOnlyShadowForTransparentFrame > - see above - if ( bLine && !bDrawOnlyShadowForTransparentFrame ) + // OD 27.09.2002 #103636# - suspend drawing of border + // add condition < NOT bDrawOnlyShadowForTransparentFrame > - see above + // OD 24.02.2003 #b4779636#, #107692# - add condition <bFoundCellForTopOrBorderAttrs> + // for #b4779636#-hack. + if ( ( bLine || bFoundCellForTopOrBorderAttrs ) && + !bDrawOnlyShadowForTransparentFrame ) { SWRECTFN( this ) ::lcl_PaintLeftLine ( this, pPage, aRect, rRect, rAttrs, fnRect ); ::lcl_PaintRightLine ( this, pPage, aRect, rRect, rAttrs, fnRect ); if ( !IsCntntFrm() || rAttrs.GetTopLine( this ) ) - ::lcl_PaintTopLine( this, pPage, aRect, rRect, rAttrs, fnRect ); + { + // OD 21.02.2003 #b4779636#, #107692# - + // #b4779636#-hack: If another cell frame for top border + // paint is found, paint its top border. + if ( IsCellFrm() && pCellFrmForTopBorderAttrs != this ) + { + SwBorderAttrAccess aAccess( SwFrm::GetCache(), + pCellFrmForTopBorderAttrs ); + const SwBorderAttrs &rTopAttrs = *aAccess.Get(); + ::lcl_PaintTopLine( this, pPage, aRect, rRect, rTopAttrs, fnRect ); + } + else + { + ::lcl_PaintTopLine( this, pPage, aRect, rRect, rAttrs, fnRect ); + } + } if ( !IsCntntFrm() || rAttrs.GetBottomLine( this ) ) - ::lcl_PaintBottomLine(this, pPage, aRect, rRect, rAttrs,fnRect); + { + // OD 21.02.2003 #b4779636#, #107692# - + // #b4779636#-hack: If another cell frame for bottom border + // paint is found, paint its bottom border. + if ( IsCellFrm() && pCellFrmForBottomBorderAttrs != this ) + { + SwBorderAttrAccess aAccess( SwFrm::GetCache(), + pCellFrmForBottomBorderAttrs ); + const SwBorderAttrs &rBottomAttrs = *aAccess.Get(); + ::lcl_PaintBottomLine(this, pPage, aRect, rRect, rBottomAttrs, fnRect); + } + else + { + ::lcl_PaintBottomLine(this, pPage, aRect, rRect, rAttrs, fnRect); + } + } } rAttrs.SetGetCacheLine( FALSE ); } @@ -3379,7 +3637,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const { SwRect aGrid( pBody->Prt() ); aGrid += pBody->Frm().Pos(); - // ::SwAlignRect( aGrid, pGlobalShell ); + SwRect aInter( aGrid ); aInter.Intersection( rRect ); if( aInter.HasArea() ) @@ -3712,6 +3970,149 @@ void SwPageFrm::PaintMarginArea( const SwRect& _rOutputRect, } } +// ---------------------------------------------------------------------- +// +// const SwPageFrm::mnBorderPxWidth, const SwPageFrm::mnShadowPxWidth +// SwPageFrm::GetBorderRect (..), SwPageFrm::GetRightShadowRect(..), +// SwPageFrm::GetBottomShadowRect(..), +// SwPageFrm::PaintBorderAndShadow(..), +// SwPageFrm::GetBorderAndShadowBoundRect(..) +// +// OD 12.02.2003 for #i9719# and #105645# +// ---------------------------------------------------------------------- + +const sal_Int8 SwPageFrm::mnBorderPxWidth = 1; +const sal_Int8 SwPageFrm::mnShadowPxWidth = 2; + +/** determine rectangle for page border + + OD 12.02.2003 for #i9719# and #105645# + + @author OD +*/ +void SwPageFrm::GetBorderRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBorderRect ) const +{ + SwRect aAlignedPageRect( _rPageRect ); + SwAlignRect( aAlignedPageRect, _pViewShell ); + Rectangle aBorderPxRect = + _pViewShell->GetOut()->LogicToPixel( aAlignedPageRect.SVRect() ); + + aBorderPxRect.Left() = aBorderPxRect.Left() - mnBorderPxWidth; + aBorderPxRect.Top() = aBorderPxRect.Top() - mnBorderPxWidth; + aBorderPxRect.Right() = aBorderPxRect.Right() + mnBorderPxWidth; + aBorderPxRect.Bottom() = aBorderPxRect.Bottom() + mnBorderPxWidth; + + _orBorderRect = + SwRect( _pViewShell->GetOut()->PixelToLogic( aBorderPxRect ) ); +} + +/** determine rectangle for right page shadow + + OD 12.02.2003 for #i9719# and #105645# + + @author OD +*/ +void SwPageFrm::GetRightShadowRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orRightShadowRect ) const +{ + SwRect aAlignedPageRect( _rPageRect ); + SwAlignRect( aAlignedPageRect, _pViewShell ); + Rectangle aPagePxRect = + _pViewShell->GetOut()->LogicToPixel( aAlignedPageRect.SVRect() ); + + Rectangle aRightShadowPxRect( + aPagePxRect.Right() + mnShadowPxWidth, + aPagePxRect.Top() + 1, + aPagePxRect.Right() + mnBorderPxWidth + mnShadowPxWidth, + aPagePxRect.Bottom() + mnBorderPxWidth + mnShadowPxWidth ); + + _orRightShadowRect = + SwRect( _pViewShell->GetOut()->PixelToLogic( aRightShadowPxRect ) ); +} + +/** determine rectangle for bottom page shadow + + OD 12.02.2003 for #i9719# and #105645# + + @author OD +*/ +void SwPageFrm::GetBottomShadowRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBottomShadowRect ) const +{ + SwRect aAlignedPageRect( _rPageRect ); + SwAlignRect( aAlignedPageRect, _pViewShell ); + Rectangle aPagePxRect = + _pViewShell->GetOut()->LogicToPixel( aAlignedPageRect.SVRect() ); + + Rectangle aBottomShadowPxRect( + aPagePxRect.Left() + 1, + aPagePxRect.Bottom() + mnShadowPxWidth, + aPagePxRect.Right() + mnBorderPxWidth + mnShadowPxWidth, + aPagePxRect.Bottom() + mnBorderPxWidth + mnShadowPxWidth ); + + _orBottomShadowRect = + SwRect( _pViewShell->GetOut()->PixelToLogic( aBottomShadowPxRect ) ); +} + +/** paint page border and shadow + + OD 12.02.2003 for #i9719# and #105645# + implement paint of page border and shadow + + @author OD +*/ +void SwPageFrm::PaintBorderAndShadow( const SwRect& _rPageRect, + ViewShell* _pViewShell ) const +{ + // get color for page border and shadow paint + const Color& rColor = SwViewOption::GetFontColor(); + + // save current fill and line color of output device + Color aFill( _pViewShell->GetOut()->GetFillColor() ); + Color aLine( _pViewShell->GetOut()->GetLineColor() ); + + // paint page border + _pViewShell->GetOut()->SetFillColor(); // OD 20.02.2003 #107369# - no fill color + _pViewShell->GetOut()->SetLineColor( rColor ); + SwRect aPaintRect; + GetBorderRect( _rPageRect, _pViewShell, aPaintRect ); + _pViewShell->GetOut()->DrawRect( aPaintRect.SVRect() ); + + // paint shadow + _pViewShell->GetOut()->SetFillColor( rColor ); + GetRightShadowRect( _rPageRect, _pViewShell, aPaintRect ); + _pViewShell->GetOut()->DrawRect( aPaintRect.SVRect() ); + GetBottomShadowRect( _rPageRect, _pViewShell, aPaintRect ); + _pViewShell->GetOut()->DrawRect( aPaintRect.SVRect() ); + + _pViewShell->GetOut()->SetFillColor( aFill ); + _pViewShell->GetOut()->SetLineColor( aLine ); + +} + +/** get bound rectangle of border and shadow for repaints + + OD 12.02.2003 for #i9719# and #105645# + + author OD +*/ +void SwPageFrm::GetBorderAndShadowBoundRect( + const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBorderAndShadowBoundRect ) const +{ + SwRect aTmpRect; + GetBorderRect( _rPageRect, _pViewShell, _orBorderAndShadowBoundRect ); + GetRightShadowRect( _rPageRect, _pViewShell, aTmpRect ); + _orBorderAndShadowBoundRect.Union( aTmpRect ); + GetBottomShadowRect( _rPageRect, _pViewShell, aTmpRect ); + _orBorderAndShadowBoundRect.Union( aTmpRect ); +} + /************************************************************************* |* |* SwFrm::PaintBaBo() @@ -3788,6 +4189,14 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, const BOOL bLowerMode, const BOOL bLowerBorder ) const { + // OD 20.01.2003 #i1837# - no paint of table background, if corresponding + // option is *not* set. + if( IsTabFrm() && + !pGlobalShell->GetViewOptions()->IsTable() ) + { + return; + } + ViewShell *pSh = pGlobalShell; const FASTBOOL bWin = pSh->GetWin() ? TRUE : FALSE; const SvxBrushItem* pItem; @@ -3804,19 +4213,34 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, bool bNoFlyBackground = !bFlyMetafile && !bBack && IsFlyFrm(); if ( bNoFlyBackground ) { - /// OD 05.09.2002 #102912# - Fly frame has no background. - /// Try to find background brush at parents, if previous call of - /// <GetBackgroundBrush> disabled this option with the parameter <bLowerMode> + // OD 05.09.2002 #102912# - Fly frame has no background. + // Try to find background brush at parents, if previous call of + // <GetBackgroundBrush> disabled this option with the parameter <bLowerMode> if ( bLowerMode ) { bBack = GetBackgroundBrush( pItem, pCol, aOrigBackRect, false ); } - /// If still no background found for the fly frame, initialize the - /// background brush <pItem> with global retouche color and set <bBack> - /// to TRUE, that fly frame will paint its background using this color. + // If still no background found for the fly frame, initialize the + // background brush <pItem> with global retouche color and set <bBack> + // to TRUE, that fly frame will paint its background using this color. if ( !bBack ) { - pTmpBackBrush = new SvxBrushItem( aGlobalRetoucheColor ); + // OD 10.01.2003 #i6467# - on print output, pdf output and + // in embedded mode not editing color COL_WHITE is used instead of + // the global retouche color. + if ( pSh->GetOut()->GetOutDevType() == OUTDEV_PRINTER || + pSh->GetViewOptions()->IsPDFExport() || + ( pSh->GetDoc()->GetDocShell()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && + !pSh->GetDoc()->GetDocShell()->GetProtocol().IsInPlaceActive() + ) + ) + { + pTmpBackBrush = new SvxBrushItem( Color( COL_WHITE ) ); + } + else + { + pTmpBackBrush = new SvxBrushItem( aGlobalRetoucheColor ); + } pItem = pTmpBackBrush; bBack = true; } @@ -3950,7 +4374,9 @@ void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const if ( IS_SUBS || IS_SUBS_TABLE || IS_SUBS_SECTION || IS_SUBS_FLYS ) { SwRect aRect( rRect ); - ::SwAlignRect( aRect, pGlobalShell ); + // OD 18.02.2003 #104989# - Not necessary and incorrect alignment of + // the output rectangle. + //::SwAlignRect( aRect, pGlobalShell ); if ( aRect.HasArea() ) { //Beim Paint ueber die Root wird das Array von dort gesteuert. @@ -3959,30 +4385,20 @@ void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const if ( !pSubsLines ) { pSubsLines = new SwSubsRects; + // OD 20.12.2002 #106318# - create container for special subsidiary lines + pSpecSubsLines = new SwSubsRects; bDelSubs = TRUE; } RefreshLaySubsidiary( this, aRect ); - if ( GetSortedObjs() ) - { - const SwSortDrawObjs &rObjs = *GetSortedObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) - { - SdrObject *pO = rObjs[i]; - if ( pO->IsWriterFlyFrame() ) - { - const SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm(); - if ( pFly->Frm().IsOver( aRect ) ) - { - if ( !pFly->Lower() || !pFly->Lower()->IsNoTxtFrm() || - !((SwNoTxtFrm*)pFly->Lower())->HasAnimation()) - pFly->RefreshLaySubsidiary( this, aRect ); - } - } - } - } + if ( bDelSubs ) { + // OD 20.12.2002 #106318# - paint special subsidiary lines + // and delete its container + pSpecSubsLines->PaintSubsidiary( pGlobalShell->GetOut(), NULL ); + DELETEZ( pSpecSubsLines ); + pSubsLines->PaintSubsidiary( pGlobalShell->GetOut(), pLines ); DELETEZ( pSubsLines ); } @@ -4132,7 +4548,16 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay, //Mir selbst weiche ich natuerlich nicht aus. Auch wenn ich //_in_ dem Fly sitze weiche ich nicht aus. if ( !pFly || (pFly == pLay || pFly->IsAnLower( pLay )) ) - { aIter.Next(); + { + aIter.Next(); + continue; + } + + // OD 19.12.2002 #106318# - do *not* consider fly frames with + // a transparent background. + if ( pFly->IsBackgroundTransparent() ) + { + aIter.Next(); continue; } @@ -4174,9 +4599,21 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, const bool bCell = IsCellFrm() ? true : false; // use frame area for cells - SwRect aOriginal( bCell ? Frm() : Prt() ); - if ( !bCell ) + // OD 13.02.2003 #i3662# - for section use also frame area + const bool bUseFrmArea = bCell || IsSctFrm(); + SwRect aOriginal( bUseFrmArea ? Frm() : Prt() ); + if ( !bUseFrmArea ) aOriginal.Pos() += Frm().Pos(); + // OD 13.02.2003 #i3662# - enlarge top of column body frame's printing area + // in sections to top of section frame. + const bool bColBodyInSection = IsBodyFrm() && + !IsPageBodyFrm() && + GetUpper()->GetUpper()->IsSctFrm(); + if ( bColBodyInSection ) + { + aOriginal.Top( GetUpper()->GetUpper()->Frm().Top() ); + } + ::SwAlignRect( aOriginal, pGlobalShell ); if ( !aOriginal.IsOver( rRect ) ) @@ -4184,7 +4621,13 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, SwRect aOut( aOriginal ); aOut._Intersection( rRect ); - aOut.Intersection( PaintArea() ); + // OD 13.02.2003 #i3662# - do not intersect *enlarged* column body frame's + // printing area with the paint area of the body frame. Otherwise enlargement + // will get lost. + if ( !bColBodyInSection ) + { + aOut.Intersection( PaintArea() ); + } const SwTwips nRight = aOut.Right(); const SwTwips nBottom= aOut.Bottom(); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index dfa982ed3942..d0ea64989fa7 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sectfrm.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: od $ $Date: 2002-11-15 11:00:24 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1214,6 +1214,13 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) //Inhalt selbst verantwortlich. BOOL bMaximize = ToMaximize( FALSE ); + // Column widths have to be adjusted before calling _CheckClipping. + // _CheckClipping can cause the formatting of the lower frames + // which still have a width of 0. + const sal_Bool bHasColumns = Lower() && Lower()->IsColumnFrm(); + if ( bHasColumns && Lower()->GetNext() ) + AdjustColumns( 0, FALSE ); + if( GetUpper() ) { long nWidth = (GetUpper()->Prt().*fnRect->fnGetWidth)(); @@ -1228,13 +1235,8 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) } //Breite der Spalten pruefen und ggf. einstellen. - if ( Lower() && Lower()->IsColumnFrm() ) - { - if( Lower()->GetNext() ) - AdjustColumns( 0, FALSE ); - else if( bMaximize ) - ((SwColumnFrm*)Lower())->Lower()->Calc(); - } + if ( bHasColumns && ! Lower()->GetNext() && bMaximize ) + ((SwColumnFrm*)Lower())->Lower()->Calc(); if ( !bMaximize ) { @@ -1674,7 +1676,12 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType eMakeFtn ) pLayLeaf = pLayLeaf->GetPrevLayoutLeaf(); else if ( bBody && pLayLeaf->IsInDocBody() ) { - if ( pLayLeaf->Lower() ) + // If there is a pLayLeaf has a lower pLayLeaf is the frame we are looking for. + // Exception: pLayLeaf->Lower() is a zombie section frame + const SwFrm* pTmp = pLayLeaf->Lower(); + if ( pTmp && + ( ! pTmp->IsSctFrm() || + ((SwSectionFrm*)pTmp)->GetSection() ) ) break; pPrevLeaf = pLayLeaf; pLayLeaf = pLayLeaf->GetPrevLayoutLeaf(); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 5bbdf5d615f8..edbf5086c01a 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabfrm.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: fme $ $Date: 2002-11-13 09:45:35 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -238,16 +238,11 @@ void SwTabFrm::RegistFlys() |*************************************************************************/ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) ASSERT( bVert ? nCutPos >= Frm().Left() && nCutPos <= Frm().Left() + Frm().Width() : nCutPos >= Frm().Top() && nCutPos <= Frm().Bottom(), "SplitLine out of table." ); -#else - ASSERT( nCutPos >= Frm().Top() && nCutPos <= Frm().Bottom(), - "SplitLine ausserhalb der Tabelle." ); -#endif //Um die Positionen der Zellen mit der CutPos zu vergleichen muessen sie //ausgehend von der Tabelle nacheinander berechnet werden. Sie koennen @@ -256,22 +251,14 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) SwFrm *pRow = Lower(); if( !pRow ) return 0; -#ifdef VERTICAL_LAYOUT SwTwips nCut = (*fnRect->fnYDiff)( nCutPos, (Frm().*fnRect->fnGetTop)() ); nCut -= (this->*fnRect->fnGetTopMargin)(); SwTwips nRowPos = (pRow->Frm().*fnRect->fnGetHeight)(); -#else - SwTwips nRowPos = Frm().Top() + Prt().Top() + pRow->Frm().Height(); -#endif const BOOL bRepeat = GetTable()->IsHeadlineRepeat(); pRow = pRow->GetNext(); if( pRow && bRepeat ) { -#ifdef VERTICAL_LAYOUT nRowPos += (pRow->Frm().*fnRect->fnGetHeight)(); -#else - nRowPos += pRow->Frm().Height(); -#endif pRow = pRow->GetNext(); } // No break before the first row and, in case of repeated headlines, @@ -279,15 +266,9 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) if( !pRow ) return 0; -#ifdef VERTICAL_LAYOUT while( pRow && nCut >= ( nRowPos + (pRow->Frm().*fnRect->fnGetHeight)() ) ) { nRowPos += (pRow->Frm().*fnRect->fnGetHeight)(); -#else - while ( pRow && nCutPos > (nRowPos + pRow->Frm().Height() - 1) ) - { - nRowPos += pRow->Frm().Height(); -#endif pRow = pRow->GetNext(); } @@ -354,11 +335,7 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) while ( pRow ) { pNxt = pRow->GetNext(); -#ifdef VERTICAL_LAYOUT nRet += (pRow->Frm().*fnRect->fnGetHeight)(); -#else - nRet += pRow->Frm().Height(); -#endif pRow->Remove(); pRow->InsertBehind( pFoll, pPrv ); pRow->_InvalidateAll(); @@ -374,7 +351,6 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) while ( pRow ) { pNxt = pRow->GetNext(); -#ifdef VERTICAL_LAYOUT nRet += (pRow->Frm().*fnRect->fnGetHeight)(); pRow->Remove(); pRow->Paste( pFoll, pPrv ); @@ -385,16 +361,6 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) ASSERT( !bNewFollow || !(pFoll->Frm().*fnRect->fnGetHeight)(), "Dont care about Performance"); Shrink( nRet ); -#else - nRet += pRow->Frm().Height(); - pRow->Remove(); - pRow->Paste( pFoll, pPrv ); - pRow = pNxt; - } - } - ASSERT( !bNewFollow || !pFoll->Frm().Height(), "Dont care about Performance"); - Shrink( nRet PHEIGHT ); -#endif return nRet; } @@ -405,9 +371,7 @@ SwTwips SwTabFrm::Join() if ( !pFoll->IsJoinLocked() ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) -#endif pFoll->Cut(); //Erst ausschneiden um unuetze Benachrichtigungen zu //minimieren. @@ -423,17 +387,11 @@ SwTwips SwTabFrm::Join() while ( pRow ) { pNxt = pRow->GetNext(); -#ifdef VERTICAL_LAYOUT nHeight += (pRow->Frm().*fnRect->fnGetHeight)(); -#else - nHeight += pRow->Frm().Height(); -#endif pRow->Remove(); pRow->_InvalidateAll(); pRow->InsertBehind( this, pPrv ); -#ifdef VERTICAL_LAYOUT pRow->CheckDirChange(); -#endif pPrv = pRow; pRow = pNxt; } @@ -454,9 +412,9 @@ SwTwips SwTabFrm::Join() |*************************************************************************/ void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom ) { -#ifdef VERTICAL_LAYOUT + // LONG_MAX == nBottom means we have to calculate all + BOOL bAll = LONG_MAX == nBottom; SWRECTFN( pFrm ) -#endif do { pFrm->_InvalidatePos(); pFrm->_InvalidateSize(); @@ -468,32 +426,25 @@ void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom ) else pFrm->Prepare( PREP_ADJUST_FRM ); pFrm = pFrm->GetNext(); -#ifdef VERTICAL_LAYOUT - } while ( pFrm && (*fnRect->fnYDiff)( (pFrm->Frm().*fnRect->fnGetTop)(), - nBottom ) < 0 ); -#else - } while ( pFrm && pFrm->Frm().Top() < nBottom ); -#endif + } while ( pFrm && + ( bAll || + (*fnRect->fnYDiff)( (pFrm->Frm().*fnRect->fnGetTop)(), nBottom ) < 0 ) ); } BOOL MA_FASTCALL lcl_CalcLowers( SwLayoutFrm *pLay, long nBottom ) { + // LONG_MAX == nBottom means we have to calculate all + BOOL bAll = LONG_MAX == nBottom; BOOL bRet = FALSE; SwCntntFrm *pCnt = pLay->ContainsCntnt(); -#ifdef VERTICAL_LAYOUT SWRECTFN( pLay ) -#endif while ( pCnt && pLay->GetUpper()->IsAnLower( pCnt ) ) { bRet |= !pCnt->IsValid(); pCnt->CalcFlys( FALSE ); pCnt->Calc(); pCnt->GetUpper()->Calc(); -#ifdef VERTICAL_LAYOUT - if( (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 ) -#else - if ( pCnt->Frm().Top() > nBottom ) -#endif + if( ! bAll && (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 ) break; pCnt = pCnt->GetNextCntntFrm(); } @@ -502,6 +453,8 @@ BOOL MA_FASTCALL lcl_CalcLowers( SwLayoutFrm *pLay, long nBottom ) BOOL MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom ) { + // LONG_MAX == nBottom means we have to calculate all + BOOL bAll = LONG_MAX == nBottom; BOOL bRet = FALSE; const SwFrm* pOldUp = pFrm->GetUpper(); SWRECTFN( pFrm ) @@ -516,7 +469,8 @@ BOOL MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom ) } pFrm = pFrm->GetNext(); } while( pFrm && - (*fnRect->fnYDiff)((pFrm->Frm().*fnRect->fnGetTop)(), nBottom) < 0 + ( bAll || + (*fnRect->fnYDiff)((pFrm->Frm().*fnRect->fnGetTop)(), nBottom) < 0 ) && pFrm->GetUpper() == pOldUp ); return bRet; } @@ -540,7 +494,6 @@ void MA_FASTCALL lcl_CalcLayout( SwLayoutFrm *pLay, long nBottom ) void MA_FASTCALL lcl_FirstTabCalc( SwTabFrm *pTab ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) if ( !pTab->IsFollow() && !pTab->GetTable()->IsTblComplex() ) { @@ -582,53 +535,6 @@ void MA_FASTCALL lcl_FirstTabCalc( SwTabFrm *pTab ) if ( pTab->GetFmt()->GetDoc()->IsBrowseMode() ) nBottom += pUp->Grow( LONG_MAX, TRUE ); lcl_CalcLowers( (SwLayoutFrm*)pTab->Lower(), nBottom ); -#else - //Ersteinmal koennen wir die Strukturen auf die richtige Groesse - //bringen. - if ( !pTab->IsFollow() && !pTab->GetTable()->IsTblComplex() ) - { - SwLayoutFrm *pRow = (SwLayoutFrm*)pTab->Lower(); - do - { - SwLayoutFrm *pCell = (SwLayoutFrm*)pRow->Lower(); - SwFrm *pCnt = pCell->Lower(); - pCnt->Calc(); - const long nCellHeight = pCell->Frm().Height(); - const long nCellY = pCell->Frm().Top()-1; - const long nCntHeight = pCnt->Frm().Height(); - const long nCntY = pCnt->Frm().Top()-1; - if ( 0 != (pCell = (SwLayoutFrm*)pCell->GetNext()) ) - do - { pCell->Frm().SSize().Height() = - pCell->Prt().SSize().Height() = nCellHeight; - pCell->Frm().Pos().Y() = nCellY; - pCell->_InvalidateAll(); - - pCnt = pCell->Lower(); - pCnt->Frm().SSize().Height() = - pCnt->Prt().SSize().Height() = nCntHeight; - pCnt->Frm().Pos().Y() = nCntY; - pCnt->_InvalidateAll(); - - pCell = (SwLayoutFrm*)pCell->GetNext(); - } while ( pCell ); - - SwTwips nRowTop = pRow->Frm().Top(); - SwTwips nUpBot = pTab->GetUpper()->Frm().Bottom(); - if( nUpBot < nRowTop ) - break; - pRow = (SwLayoutFrm*)pRow->GetNext(); - - } while ( pRow ); - } - //MA 28. Nov. 95: einen weiteren habe ich noch: Es braucht - //nur soweit formatiert werden, wie Platz vorhanden ist. - SwFrm *pUp = pTab->GetUpper(); - long nBottom = pUp->Prt().Bottom() + pUp->Frm().Top(); - if ( pTab->GetFmt()->GetDoc()->IsBrowseMode() ) - nBottom += pUp->Grow( LONG_MAX PHEIGHT, TRUE ); - lcl_CalcLowers( (SwLayoutFrm*)pTab->Lower(), nBottom ); -#endif } void MA_FASTCALL lcl_Recalc( SwTabFrm *pTab, @@ -637,7 +543,6 @@ void MA_FASTCALL lcl_Recalc( SwTabFrm *pTab, { if ( pTab->Lower() ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) const SwTwips nOldHeight = (pTab->Frm().*fnRect->fnGetHeight)(); const SwTwips nOldWidth = (pTab->Frm().*fnRect->fnGetWidth)(); @@ -658,25 +563,6 @@ void MA_FASTCALL lcl_Recalc( SwTabFrm *pTab, rNotify.AddWidthOfst( nNew - nOldWidth ); else if ( nOldWidth > nNew ) rNotify.SubtractWidthOfst( nOldWidth - nNew ); -#else - const SwTwips nOldHeight = pTab->Frm().Height(); - const SwTwips nOldWidth = pTab->Frm().Width(); - if ( !pFirstRow ) - { - pFirstRow = (SwLayoutFrm*)pTab->Lower(); - rNotify.SetLowersComplete( TRUE ); - } - ::SwInvalidatePositions( pFirstRow, LONG_MAX ); - ::lcl_CalcLayout( pFirstRow, LONG_MAX ); - if ( nOldHeight < pTab->Frm().Height() ) - rNotify.AddHeightOfst( pTab->Frm().Height() - nOldHeight ); - else if ( nOldHeight > pTab->Frm().Height() ) - rNotify.SubtractHeightOfst( nOldHeight - pTab->Frm().Height() ); - if ( nOldWidth < pTab->Frm().Width() ) - rNotify.AddWidthOfst( pTab->Frm().Width() - nOldWidth ); - else if ( nOldWidth > pTab->Frm().Width() ) - rNotify.SubtractWidthOfst( nOldWidth - pTab->Frm().Width() ); -#endif } } @@ -767,7 +653,7 @@ void SwTabFrm::MakeAll() delete pAccess; bCalcLowers |= pLayout->Resize( pLayout->GetBrowseWidthByTabFrm( *this ), FALSE ); - pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); + pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } @@ -1146,6 +1032,8 @@ void SwTabFrm::MakeAll() //Follow gleich gueltig gemacht werden. if ( GetFollow() ) { + SWRECTFN( GetFollow() ) + static BYTE nStack = 0; if ( !StackHack::IsLocked() && nStack < 4 ) { @@ -1158,7 +1046,7 @@ void SwTabFrm::MakeAll() pAttrs = pAccess->Get(); ((SwTabFrm*)GetFollow())->SetLowersFormatted(FALSE); ::lcl_CalcLayout((SwLayoutFrm*)GetFollow()->Lower(), - GetFollow()->GetUpper()->Frm().Bottom() ); + (GetFollow()->GetUpper()->Frm().*fnRect->fnGetBottom)() ); if ( !GetFollow()->GetFollow() ) { SwFrm *pNxt = ((SwFrm*)GetFollow())->FindNext(); @@ -1255,7 +1143,6 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, const SwFlyFrm* pMyFly = FindFlyFrm(); if ( pPage->GetSortedObjs() ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) long nPrtPos = (Frm().*fnRect->fnGetTop)(); nPrtPos = (*fnRect->fnYInc)( nPrtPos, rUpper ); @@ -1272,9 +1159,10 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, const SwRect aFlyRect = pFly->AddSpacesToFrm(); if ( WEIT_WECH != (pFly->Frm().*fnRect->fnGetTop)() && pFly->IsFlyAtCntFrm() && aFlyRect.IsOver( aRect ) && + // OD 25.02.2003 #i9040# - use '<=' instead of '<' (*fnRect->fnYDiff)( (pFly->GetAnchor()->Frm().*fnRect->fnGetBottom)(), - (Frm().*fnRect->fnGetTop)() ) < 0 && + (Frm().*fnRect->fnGetTop)() ) <= 0 && !IsAnLower( pFly ) && !pFly->IsAnLower( this ) && ( !pMyFly || pMyFly->IsAnLower( pFly ) ) && pPage->GetPhyPageNum() >= @@ -1313,58 +1201,6 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, } } rUpper = (*fnRect->fnYDiff)( nPrtPos, (Frm().*fnRect->fnGetTop)() ); -#else - long nPrtPos = Frm().Top() + rUpper; - SwRect aRect( Frm() ); - if ( Prt().Top() - rUpper > 0 ) - aRect.SSize().Height() -= Prt().Top() - rUpper; - for ( USHORT i = 0; i < pPage->GetSortedObjs()->Count(); ++i ) - { - SdrObject *pObj = (*pPage->GetSortedObjs())[i]; - if ( pObj->IsWriterFlyFrame() ) - { - SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm(); - const SwRect aFlyRect = pFly->AddSpacesToFrm(); - if ( WEIT_WECH != pFly->Frm().Top() && - pFly->IsFlyAtCntFrm() && aFlyRect.IsOver( aRect ) && - pFly->GetAnchor()->Frm().Bottom() < Frm().Top() && - !IsAnLower( pFly ) && !pFly->IsAnLower( this ) && - ( !pMyFly || pMyFly->IsAnLower( pFly ) ) && - pPage->GetPhyPageNum() >= - pFly->GetAnchor()->FindPageFrm()->GetPhyPageNum() ) - { - const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround(); - const SwFmtHoriOrient &rHori= pFly->GetFmt()->GetHoriOrient(); - if ( SURROUND_NONE == rSur.GetSurround() ) - { - nPrtPos = Max( nPrtPos, aFlyRect.Bottom() + 1L ); - bInvalidatePrtArea = TRUE; - } - if ( (SURROUND_RIGHT == rSur.GetSurround() || - SURROUND_PARALLEL == rSur.GetSurround())&& - HORI_LEFT == rHori.GetHoriOrient() ) - { - //Der Rahmen kann auch noch einem anderen Rahmen - //ausgewichen sein. - const long nWidth = aFlyRect.Width() + - aFlyRect.Left() - pFly->GetAnchor()->Frm().Left(); - rLeftOffset = Max( rLeftOffset, nWidth ); - bInvalidatePrtArea = TRUE; - } - if ( (SURROUND_LEFT == rSur.GetSurround() || - SURROUND_PARALLEL == rSur.GetSurround())&& - HORI_RIGHT == rHori.GetHoriOrient() ) - { - const long nWidth = aFlyRect.Width() + - pFly->GetAnchor()->Frm().Right() - aFlyRect.Right(); - rRightOffset = Max( rRightOffset, nWidth ); - bInvalidatePrtArea = TRUE; - } - } - } - } - rUpper = nPrtPos - Frm().Top(); -#endif } return bInvalidatePrtArea; @@ -1384,7 +1220,6 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) { ASSERT( pAttrs, "TabFrm::Format, pAttrs ist 0." ); -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) if ( !bValidSize ) { @@ -1393,11 +1228,6 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) if( nDiff ) (aFrm.*fnRect->fnAddRight)( nDiff ); } -#else - //FixSize einstellen - if ( !bValidSize ) - aFrm.Width( GetUpper()->Prt().Width() ); -#endif //VarSize ist immer die Hoehe. //Fuer den oberen/unteren Rand gelten die selben Regeln wie fuer @@ -1429,13 +1259,8 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) //Wenn das Adjustment 0 ist, so werden die Rander anhand des //Randattributes eingestellt. -#ifdef VERTICAL_LAYOUT const SwTwips nOldHeight = (Prt().*fnRect->fnGetHeight)(); const SwTwips nMax = (aFrm.*fnRect->fnGetWidth)(); -#else - const SwTwips nOldHeight = Prt().Height(); - const SwTwips nMax = aFrm.Width(); -#endif SwTwips nLeft = pAttrs->CalcLeftLine(); SwTwips nRight = pAttrs->CalcRightLine(); @@ -1515,7 +1340,8 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) nLeft = 0; nLeft += nLeftOffset; } - nRight = pAttrs->CalcRight(); + // OD 23.01.2003 #106895# - add 1st param to <SwBorderAttrs::CalcRight(..)> + nRight = pAttrs->CalcRight( this ); if( nRightOffset ) { if( nRight < 0 ) @@ -1541,26 +1367,12 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) default: ASSERT( FALSE, "Ungueltige orientation fuer Table." ); } -#ifdef VERTICAL_LAYOUT (this->*fnRect->fnSetYMargins)( nUpper, nLower ); if( (nMax - MINLAY) < (nLeft + nRight) ) (this->*fnRect->fnSetXMargins)( 0, 0 ); else (this->*fnRect->fnSetXMargins)( nLeft, nRight ); -#else - Prt().Top( nUpper ); - Prt().Height( aFrm.Height() - (nUpper + nLower) ); - if ( (nMax - MINLAY) < (nLeft + nRight) ) - { //Wenn die Raender garnicht passen lasse ich sie lieber gleich weg. - Prt().Left( 0 ); - Prt().Width( nMax ); - } - else - { - Prt().Left( nLeft ); - Prt().Width( nMax - (nLeft + nRight) ); - } -#endif + ViewShell *pSh; if ( bCheckBrowseWidth && GetFmt()->GetDoc()->IsBrowseMode() && GetUpper()->IsPageBodyFrm() && // nur PageBodyFrms, nicht etwa ColBodyFrms @@ -1576,11 +1388,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) Prt().Width( Min( nWidth, Prt().Width() ) ); } -#ifdef VERTICAL_LAYOUT if ( nOldHeight != (Prt().*fnRect->fnGetHeight)() ) -#else - if ( nOldHeight != Prt().Height() ) -#endif bValidSize = FALSE; } @@ -1592,21 +1400,14 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) SwTwips nRemaining = 0, nDiff; SwFrm *pFrm = pLower; while ( pFrm ) -#ifdef VERTICAL_LAYOUT - { nRemaining += (pFrm->Frm().*fnRect->fnGetHeight)(); -#else - { nRemaining += pFrm->Frm().Height(); -#endif + { + nRemaining += (pFrm->Frm().*fnRect->fnGetHeight)(); pFrm = pFrm->GetNext(); } //Jetzt noch die Raender addieren nRemaining += nUpper + nLower; -#ifdef VERTICAL_LAYOUT nDiff = (Frm().*fnRect->fnGetHeight)() - nRemaining; -#else - nDiff = Frm().Height() - nRemaining; -#endif if ( nDiff > 0 ) Shrink( nDiff PHEIGHT ); else if ( nDiff < 0 ) @@ -1621,24 +1422,12 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) |* Letzte Aenderung MA 23. Sep. 96 |* |*************************************************************************/ -#ifdef VERTICAL_LAYOUT SwTwips SwTabFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) { SWRECTFN( this ) SwTwips nHeight =(Frm().*fnRect->fnGetHeight)(); if( nHeight > 0 && nDist > ( LONG_MAX - nHeight ) ) nDist = LONG_MAX - nHeight; -#else -SwTwips SwTabFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, - BOOL bTst, BOOL bInfo ) -{ - if( pDirection == pWidth ) - return 0; - - if ( Frm().SSize().*pDirection > 0 && - nDist > (LONG_MAX - Frm().SSize().*pDirection) ) - nDist = LONG_MAX - Frm().SSize().*pDirection; -#endif //Tabelle waechst immer (sie kann ja ggf. aufgespalten werden). if ( !bTst ) @@ -1647,7 +1436,6 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, { //Der Upper wird nur soweit wie notwendig gegrowed. In nReal wird erstmal //die bereits zur Verfuegung stehende Strecke bereitgestellt. -#ifdef VERTICAL_LAYOUT SwTwips nReal = (GetUpper()->Prt().*fnRect->fnGetHeight)(); SwFrm *pFrm = GetUpper()->Lower(); while ( pFrm ) @@ -1655,9 +1443,7 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, pFrm = pFrm->GetNext(); } -#ifdef ACCESSIBLE_LAYOUT SwRect aOldFrm( Frm() ); -#endif nHeight = (Frm().*fnRect->fnGetHeight)(); (Frm().*fnRect->fnSetHeight)( nHeight + nDist ); if( IsVertical() && !IsReverse() ) @@ -1665,52 +1451,27 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, if ( nReal < nDist ) GetUpper()->Grow( nDist - (nReal>0 ? nReal : 0), bTst, bInfo ); -#ifdef ACCESSIBLE_LAYOUT SwRootFrm *pRootFrm = FindRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() && pRootFrm->GetCurrShell() ) { pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); } -#endif } else { ASSERT( !this, "Table without Upper" ); -#ifdef ACCESSIBLE_LAYOUT SwRect aOldFrm( Frm() ); -#endif nHeight = (Frm().*fnRect->fnGetHeight)(); (Frm().*fnRect->fnSetHeight)( nHeight + nDist ); if( IsVertical() && !IsReverse() ) Frm().Pos().X() -= nDist; -#ifdef ACCESSIBLE_LAYOUT SwRootFrm *pRootFrm = FindRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() && pRootFrm->GetCurrShell() ) { pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); } -#endif -#else - SwTwips nReal = GetUpper()->Prt().SSize().*pDirection; - SwFrm *pFrm = GetUpper()->Lower(); - while ( pFrm ) - { nReal -= pFrm->Frm().SSize().*pDirection; - pFrm = pFrm->GetNext(); - } - - Frm().SSize().*pDirection += nDist; - - if ( nReal < nDist ) - GetUpper()->Grow( nDist - (nReal > 0 ? nReal : 0), - pDirection, bTst, bInfo ); - } - else - { - ASSERT( !this, "Table without Upper" ); - Frm().SSize().*pDirection += nDist; -#endif } SwPageFrm *pPage = FindPageFrm(); @@ -2032,7 +1793,6 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReform BOOL bMoveAnyway = FALSE; SwTwips nSpace = 0; -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) if ( !SwFlowFrm::IsMoveBwdJump() ) { @@ -2077,41 +1837,6 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReform nHeight += (Lower()->Frm().*fnRect->fnGetHeight)(); return nHeight <= nSpace; } -#else - if ( !SwFlowFrm::IsMoveBwdJump() && - Abs(pNewUpper->Prt().Width() - GetUpper()->Prt().Width()) < 2 ) - { - if ( FALSE == (bMoveAnyway = BwdMoveNecessary( pOldPage, Frm() ) > 1) ) - { - //Das Rechteck, in dem ich landen wuerde berechenen. - SwRect aRect( pNewUpper->Prt() ); - aRect.Pos() += pNewUpper->Frm().Pos(); - const SwFrm *pPrevFrm = pNewUpper->Lower(); - while ( pPrevFrm ) - { - aRect.Top( pPrevFrm->Frm().Bottom() ); - pPrevFrm = pPrevFrm->GetNext(); - } - bMoveAnyway = BwdMoveNecessary( pNewPage, aRect) > 1; - nSpace = aRect.Height(); - if ( GetFmt()->GetDoc()->IsBrowseMode() ) - nSpace += pNewUpper->Grow( LONG_MAX PHEIGHT, TRUE ); - } - } - else if ( SwFlowFrm::IsMoveBwdJump() || !bLockBackMove ) - bMoveAnyway = TRUE; - - if ( bMoveAnyway ) - return rReformat = TRUE; - else if ( !bLockBackMove ) - { const BOOL bRepeat = GetTable()->IsHeadlineRepeat(); - SwTwips nHeight = bRepeat && Lower()->GetNext() ? - Lower()->GetNext()->Frm().Height() : Lower()->Frm().Height(); - if ( bHead && bRepeat && Lower()->GetNext() ) - nHeight += Lower()->Frm().Height(); - return nHeight <= nSpace; - } -#endif } return FALSE; } @@ -2180,9 +1905,7 @@ void SwTabFrm::Cut() //Erst removen, dann Upper Shrinken. SwLayoutFrm *pUp = GetUpper(); -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) -#endif Remove(); if ( pUp ) { @@ -2197,12 +1920,30 @@ void SwTabFrm::Cut() pSct->_InvalidateSize(); } } -#ifdef VERTICAL_LAYOUT else if( (Frm().*fnRect->fnGetHeight)() ) -#else - else if ( Frm().Height() ) -#endif + { + // OD 24.02.2003 #104992# - unlock section the table frame was in. + // Otherwise, the section will not shrink. + // The section will be locked in this situation, if table is + // converted to text and the table was the only content in the + // section beside a footnote. + // Note: lock state will be restored. + bool bOldLock; + if ( pSct ) + { + bOldLock = pSct->IsColLocked() ? true : false; + pSct->ColUnlock(); + } pUp->Shrink( Frm().Height() PHEIGHT ); + // OD 24.02.2003 #104992# - restore section lock state. + if ( pSct ) + { + if ( bOldLock ) + { + pSct->ColLock(); + } + } + } } if ( pPage && !IsFollow() && pPage->GetUpper() ) @@ -2241,20 +1982,12 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) GetNext()->InvalidatePage( pPage ); } -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) if( (Frm().*fnRect->fnGetHeight)() ) pParent->Grow( (Frm().*fnRect->fnGetHeight)() ); if( (Frm().*fnRect->fnGetWidth)() != (pParent->Prt().*fnRect->fnGetWidth)() ) Prepare( PREP_FIXSIZE_CHG ); -#else - if ( Frm().Height() ) - pParent->Grow( Frm().Height() PHEIGHT ); - - if ( Frm().Width() != pParent->Prt().Width() ) - Prepare( PREP_FIXSIZE_CHG ); -#endif if ( GetPrev() ) { if ( !IsFollow() ) @@ -2286,7 +2019,6 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) } } -#ifdef VERTICAL_LAYOUT /************************************************************************* |* |* SwTabFrm::Prepare() @@ -2300,7 +2032,6 @@ void SwTabFrm::Prepare( const PrepareHint eHint, const void *, BOOL ) if( PREP_BOSS_CHGD == eHint ) CheckDirChange(); } -#endif /************************************************************************* |* @@ -2323,9 +2054,6 @@ SwRowFrm::SwRowFrm( const SwTableLine &rLine ): { SwCellFrm *pNew = new SwCellFrm( *rBoxes[i] ); pNew->InsertBehind( this, pPrev ); -#ifndef VERTICAL_LAYOUT - pNew->bVarHeight = FALSE; -#endif pPrev = pNew; } } @@ -2413,9 +2141,7 @@ void SwRowFrm::MakeAll() |*************************************************************************/ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pFrm ) -#endif long nHeight = 0; const SwFrm* pTmp = pFrm->IsSctFrm() ? ((SwSectionFrm*)pFrm)->ContainsCntnt() : pFrm; @@ -2466,9 +2192,7 @@ SwTwips MA_FASTCALL lcl_CalcMinRowHeight( SwLayoutFrm *pRow ); SwTwips MA_FASTCALL lcl_CalcMinCellHeight( SwLayoutFrm *pCell, const SwBorderAttrs *pAttrs = 0 ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pCell ) -#endif SwTwips nHeight = 0; SwFrm *pLow = pCell->Lower(); if ( pLow ) @@ -2478,14 +2202,9 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( SwLayoutFrm *pCell, { if( pLow->IsCntntFrm() || pLow->IsSctFrm() ) { -#ifdef VERTICAL_LAYOUT long nLowHeight = (pLow->Frm().*fnRect->fnGetHeight)(); nHeight += nLowHeight; nFlyAdd = Max( 0L, nFlyAdd - nLowHeight ); -#else - nHeight += pLow->Frm().Height(); - nFlyAdd = Max( 0L, nFlyAdd - pLow->Frm().Height() ); -#endif nFlyAdd = Max( nFlyAdd, ::CalcHeightWidthFlys( pLow ) ); } else @@ -2512,14 +2231,9 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( SwLayoutFrm *pCell, SwTwips MA_FASTCALL lcl_CalcMinRowHeight( SwLayoutFrm *pRow ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pRow ) if ( pRow->HasFixSize() ) return (pRow->Frm().*fnRect->fnGetHeight)(); -#else - if ( pRow->HasFixSize( pHeight ) ) - return pRow->Frm().Height(); -#endif SwTwips nHeight = 0; SwLayoutFrm *pLow = (SwLayoutFrm*)pRow->Lower(); @@ -2538,9 +2252,7 @@ SwTwips MA_FASTCALL lcl_CalcMinRowHeight( SwLayoutFrm *pRow ) void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) -#endif ASSERT( pAttrs, "SwRowFrm::Format ohne Attrs." ); const BOOL bFix = BFIXHEIGHT; @@ -2560,7 +2272,6 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) { bValidSize = TRUE; -#ifdef VERTICAL_LAYOUT #ifndef PRODUCT if ( HasFixSize() ) { @@ -2571,18 +2282,6 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) const SwTwips nDiff = (Frm().*fnRect->fnGetHeight)() - (HasFixSize() ? pAttrs->GetSize().Height() : ::lcl_CalcMinRowHeight( this )); -#else -#ifndef PRODUCT - if ( HasFixSize( pHeight ) ) - { - const SwFmtFrmSize &rFrmSize = GetFmt()->GetFrmSize(); - ASSERT( rFrmSize.GetSize().Height() > 0, "Hat ihn" ); - } -#endif - const SwTwips nDiff = Frm().Height() - (HasFixSize( pHeight ) ? - pAttrs->GetSize().Height() : - ::lcl_CalcMinRowHeight( this )); -#endif if ( nDiff ) { BFIXHEIGHT = FALSE; @@ -2596,17 +2295,10 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) if ( !GetNext() ) { //Der letzte fuellt den verbleibenden Raum im Upper aus. -#ifdef VERTICAL_LAYOUT SwTwips nDiff = (GetUpper()->Prt().*fnRect->fnGetHeight)(); SwFrm *pSibling = GetUpper()->Lower(); do { nDiff -= (pSibling->Frm().*fnRect->fnGetHeight)(); -#else - SwTwips nDiff = GetUpper()->Prt().Height(); - SwFrm *pSibling = GetUpper()->Lower(); - do - { nDiff -= pSibling->Frm().Height(); -#endif pSibling = pSibling->GetNext(); } while ( pSibling ); if ( nDiff > 0 ) @@ -2632,21 +2324,15 @@ void SwRowFrm::AdjustCells( const SwTwips nHeight, const BOOL bHeight ) SwFrm *pFrm = Lower(); if ( bHeight ) { -#ifdef ACCESSIBLE_LAYOUT SwRootFrm *pRootFrm = 0; -#endif -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) while ( pFrm ) { long nDiff = nHeight - (pFrm->Frm().*fnRect->fnGetHeight)(); if( nDiff ) { -#ifdef ACCESSIBLE_LAYOUT SwRect aOldFrm( pFrm->Frm() ); -#endif (pFrm->Frm().*fnRect->fnAddBottom)( nDiff ); -#ifdef ACCESSIBLE_LAYOUT if( !pRootFrm ) pRootFrm = FindRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() && @@ -2654,13 +2340,6 @@ void SwRowFrm::AdjustCells( const SwTwips nHeight, const BOOL bHeight ) { pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( pFrm, aOldFrm ); } -#endif -#else - while ( pFrm ) - { if ( pFrm->Frm().Height() != nHeight ) - { - pFrm->Frm().Height( nHeight ); -#endif pFrm->_InvalidatePrt(); } pFrm = pFrm->GetNext(); @@ -2705,7 +2384,6 @@ void SwRowFrm::Cut() |* |*************************************************************************/ -#ifdef VERTICAL_LAYOUT SwTwips SwRowFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) { @@ -2820,118 +2498,6 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) return nReal; } -#else - -SwTwips SwRowFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, - BOOL bTst, BOOL bInfo ) -{ - const SwTwips nReal = SwLayoutFrm::GrowFrm( nDist, pDirection, bTst, bInfo); - - //Hoehe der Zellen auf den neuesten Stand bringen. - if ( !bTst ) - { - AdjustCells( Prt().SSize().*pDirection + nReal, - pDirection == pHeight ? TRUE : FALSE ); - if ( nReal ) - SetCompletePaint(); - } - return nReal; -} -/************************************************************************* -|* -|* SwRowFrm::ShrinkFrm() -|* -|* Ersterstellung MA 15. Mar. 93 -|* Letzte Aenderung MA 20. Jun. 96 -|* -|*************************************************************************/ -SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, const SzPtr pDirection, - BOOL bTst, BOOL bInfo ) -{ - BOOL bVariable = - pDirection == pHeight; - if ( HasFixSize( pDirection ) ) - { - AdjustCells( Prt().SSize().*pDirection, bVariable ); - return 0L; - } - - //bInfo wird ggf. vom SwRowFrm::Format auf TRUE gesetzt, hier muss dann - //entsprechend reagiert werden - const BOOL bShrinkAnyway = bInfo; - - //Nur soweit Shrinken, wie es der Inhalt der groessten Zelle zulaesst. - SwTwips nRealDist = nDist; - if ( bVariable ) - { - const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize(); - SwTwips nMinHeight = rSz.GetSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0; - SwLayoutFrm *pCell = (SwLayoutFrm*)Lower(); - if ( nMinHeight < Frm().SSize().*pDirection ) - { - SwLayoutFrm *pCell = (SwLayoutFrm*)Lower(); - while ( pCell ) - { - SwTwips nAct = ::lcl_CalcMinCellHeight( pCell ); - if ( nAct > nMinHeight ) - nMinHeight = nAct; - if ( nMinHeight >= Frm().SSize().*pDirection ) - break; - pCell = (SwLayoutFrm*)pCell->GetNext(); - } - } - if ( (Frm().SSize().*pDirection - nRealDist) < nMinHeight ) - nRealDist = Frm().SSize().*pDirection - nMinHeight; - } - if ( nRealDist < 0 ) - nRealDist = 0; - - SwTwips nReal = nRealDist; - if ( nReal ) - { - if ( !bTst ) - Frm().SSize().*pDirection -= nReal; - - SwTwips nTmp = GetUpper()->Shrink( nReal, pDirection, bTst ); - if ( !bShrinkAnyway && !GetNext() && nTmp != nReal ) - { - //Der letzte bekommt den Rest im Upper und nimmt deshalb - //ggf. Ruecksichten (sonst: Endlosschleife) - if ( !bTst ) - { - nReal -= nTmp; - Frm().SSize().*pDirection += nReal; - } - nReal = nTmp; - } - } - - //Geeignet invalidieren und die Hoehe der Zellen auf den neuesten - //Stand bringen. - if ( !bTst ) - { - if ( nReal ) - { - if ( GetNext() ) - GetNext()->_InvalidatePos(); - _InvalidateAll(); - SetCompletePaint(); - - SwTabFrm *pTab = FindTabFrm(); - if ( pTab->IsFollow() && - (!GetPrev() || - (pTab->GetTable()->IsHeadlineRepeat() && !GetPrev()->GetPrev()))) - { - pTab->FindMaster()->InvalidatePos(); - } - } - AdjustCells( Prt().SSize().*pDirection - nReal, bVariable ); - } - return nReal; -} - - -#endif /************************************************************************* |* @@ -2972,7 +2538,6 @@ SwCellFrm::~SwCellFrm() SwModify* pMod = GetFmt(); if( pMod ) { -#ifdef ACCESSIBLE_LAYOUT // At this stage the lower frames aren't destroyed already, // therfor we have to do a recursive dispose. SwRootFrm *pRootFrm = FindRootFrm(); @@ -2981,7 +2546,7 @@ SwCellFrm::~SwCellFrm() { pRootFrm->GetCurrShell()->Imp()->DisposeAccessibleFrm( this, sal_True ); } -#endif + pMod->Remove( this ); // austragen, if( !pMod->GetDepends() ) delete pMod; // und loeschen @@ -3001,7 +2566,6 @@ BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva ) BOOL bRet = FALSE; SwFrm *pFrm = pLay->Lower(); SwPageFrm* pPg = NULL; -#ifdef VERTICAL_LAYOUT SWRECTFN( pLay ) while ( pFrm ) { @@ -3063,95 +2627,26 @@ BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva ) (pFrm->Frm().*fnRect->fnGetHeight)() ); pFrm = pFrm->GetNext(); } -#else - while ( pFrm ) - { - if ( pFrm->Frm().Top() != lYStart ) - { - bRet = TRUE; - const long lDiff = lYStart - pFrm->Frm().Top(); - pFrm->Frm().Pos().Y() = lYStart; - pFrm->SetCompletePaint(); - if ( !pFrm->GetNext() ) - pFrm->SetRetouche(); - if( bInva ) - pFrm->Prepare( PREP_POS_CHGD ); - if ( pFrm->IsLayoutFrm() && ((SwLayoutFrm*)pFrm)->Lower() ) - lcl_ArrangeLowers( (SwLayoutFrm*)pFrm, - ((SwLayoutFrm*)pFrm)->Lower()->Frm().Top()+lDiff, bInva ); - if ( pFrm->GetDrawObjs() ) - { - for ( USHORT i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) - { - SdrObject *pO = (*pFrm->GetDrawObjs())[i]; - if ( pO->IsWriterFlyFrame() ) - { - SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm(); - if ( WEIT_WECH != pFly->Frm().Top() ) - pFly->Frm().Pos().Y() += lDiff; - pFly->GetVirtDrawObj()->_SetRectsDirty(); - if ( pFly->IsFlyInCntFrm() ) - ((SwFlyInCntFrm*)pFly)->AddRefOfst( lDiff ); - else - { - if( !pPg ) - pPg = pLay->FindPageFrm(); - SwPageFrm* pOld = pFly->FindPageFrm(); - if( pPg != pOld ) - pOld->MoveFly( pFly, pPg ); - if( pFly->IsAutoPos() ) - ((SwFlyAtCntFrm*)pFly)->AddLastCharY( lDiff ); - } - if ( ::lcl_ArrangeLowers( pFly, pFly->Frm().Top() + - pFly->Prt().Top(), bInva ) ) - pFly->SetCompletePaint(); - } - else - pO->SetAnchorPos( pFrm->Frm().Pos() ); - } - } - } - // Columns and cells are ordered horizontal, not vertical - if( !pFrm->IsColumnFrm() && !pFrm->IsCellFrm() ) - lYStart += pFrm->Frm().Height(); - pFrm = pFrm->GetNext(); - } -#endif return bRet; } void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) { ASSERT( pAttrs, "CellFrm::Format, pAttrs ist 0." ); -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) if ( !bValidPrtArea ) { bValidPrtArea = TRUE; //Position einstellen. - long nTmp1 = pAttrs->CalcLeft( this ); - long nTmp2 = pAttrs->CalcRight(); - (this->*fnRect->fnSetXMargins)( nTmp1, nTmp2 ); - nTmp1 = pAttrs->CalcTop(); - nTmp2 = pAttrs->CalcBottom(); - (this->*fnRect->fnSetYMargins)( nTmp1, nTmp2 ); + long nLeftSpace = pAttrs->CalcLeft( this ); + // OD 23.01.2003 #106895# - add 1st param to <SwBorderAttrs::CalcRight(..)> + long nRightSpace = pAttrs->CalcRight( this ); + (this->*fnRect->fnSetXMargins)( nLeftSpace, nRightSpace ); + long nTopSpace = pAttrs->CalcTop(); + long nBottomSpace = pAttrs->CalcBottom(); + (this->*fnRect->fnSetYMargins)( nTopSpace, nBottomSpace ); } -#else - if ( !bValidPrtArea ) - { - bValidPrtArea = TRUE; - - //Position einstellen. - aPrt.Left( pAttrs->CalcLeft( this ) ); - aPrt.Top( pAttrs->CalcTop() ); - - //Sizes einstellen; die Groesse gibt der umgebende Frm vor, die - //die Raender werden einfach abgezogen. - aPrt.Width ( aFrm.Width() - (aPrt.Left() + pAttrs->CalcRight()) ); - aPrt.Height( aFrm.Height()- (aPrt.Top() + pAttrs->CalcBottom())); - } -#endif long nRemaining = ::lcl_CalcMinCellHeight( this, pAttrs ); if ( !bValidSize ) { @@ -3178,7 +2673,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) ASSERT( nWidth <= nWish, "Zelle breiter als Tabelle." ); ASSERT( nWidth > 0, "Box without width" ); -#ifdef VERTICAL_LAYOUT long nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)(); if ( nWish != nPrtWidth ) { @@ -3206,31 +2700,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) //Jetzt die Hoehe einstellen, sie wird vom Inhalt und den Raendern //bestimmt. const long nDiffHeight = nRemaining - (Frm().*fnRect->fnGetHeight)(); -#else - if ( nWish != pTab->Prt().Width() ) - { - nWidth *= pTab->Prt().Width(); - nWidth /= nWish; - } - } - else - { - ASSERT( pAttrs->GetSize().Width() > 0, "Box without width" ); - nWidth = GetUpper()->Prt().Width(); - SwFrm *pPre = GetUpper()->Lower(); - while ( pPre != this ) - { nWidth -= pPre->Frm().Width(); - pPre = pPre->GetNext(); - } - } - const long nDiff = nWidth - Frm().Width(); - Frm().Width( nWidth ); - Prt().Width( Prt().Width() + nDiff ); - - //Jetzt die Hoehe einstellen, sie wird vom Inhalt und den Raendern - //bestimmt. - const long nDiffHeight = nRemaining - Frm().Height(); -#endif if ( nDiffHeight ) { if ( nDiffHeight > 0 ) @@ -3295,7 +2764,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) } } } -#ifdef VERTICAL_LAYOUT long nPrtHeight = (Prt().*fnRect->fnGetHeight)(); if( ( bVertDir && ( nRemaining -= (pAttrs->CalcTop() + pAttrs->CalcBottom())) < nPrtHeight ) || @@ -3304,14 +2772,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) { long lTopOfst = 0, nDiff = (Prt().*fnRect->fnGetHeight)() - nRemaining; -#else - if ( (bVertDir && - (nRemaining -= (pAttrs->CalcTop() + pAttrs->CalcBottom())) < Prt().Height()) || - Lower()->Frm().Top() > Frm().Top()+Prt().Top() ) - { - long lTopOfst = 0, - nDiff = Prt().Height() - nRemaining; -#endif if ( nDiff >= 0 ) { if ( bVertDir ) @@ -3322,14 +2782,9 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) case VERT_BOTTOM: lTopOfst = nDiff; break; }; } -#ifdef VERTICAL_LAYOUT long nTmp = (*fnRect->fnYInc)( (this->*fnRect->fnGetPrtTop)(), lTopOfst ); if ( lcl_ArrangeLowers( this, nTmp, !bVertDir ) ) -#else - if ( lcl_ArrangeLowers( this, Frm().Top()+Prt().Top()+lTopOfst, - !bVertDir ) ) -#endif SetCompletePaint(); } } @@ -3339,11 +2794,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) //Ist noch eine alte Ausrichtung beruecksichtigt worden? if ( Lower()->IsCntntFrm() ) { -#ifdef VERTICAL_LAYOUT const long lYStart = (this->*fnRect->fnGetPrtTop)(); -#else - const long lYStart = Frm().Top()+Prt().Top(); -#endif lcl_ArrangeLowers( this, lYStart, TRUE ); } } @@ -3373,12 +2824,8 @@ void SwCellFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) if ( VERT_NONE == ((SwFmtVertOrient*)pItem)->GetVertOrient() && Lower()->IsCntntFrm() ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) const long lYStart = (this->*fnRect->fnGetPrtTop)(); -#else - const long lYStart = Frm().Top()+Prt().Top(); -#endif bInva = lcl_ArrangeLowers( this, lYStart, FALSE ); } if ( bInva ) @@ -3388,7 +2835,6 @@ void SwCellFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } } -#ifdef ACCESSIBLE_LAYOUT if( (bAttrSetChg && SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_PROTECT, FALSE )) || RES_PROTECT == pNew->Which() ) @@ -3397,8 +2843,6 @@ void SwCellFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) if( pSh && pSh->GetLayout()->IsAnyShellAccessible() ) pSh->Imp()->InvalidateAccessibleEditableState( sal_True, this ); } -#endif SwLayoutFrm::Modify( pOld, pNew ); } - diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 6d0ce935bba7..d8e89f10d8c2 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: trvlfrm.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: fme $ $Date: 2002-11-15 15:58:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -238,7 +238,6 @@ BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, { BOOL bRet = FALSE; const SwPageFrm *pPage = this; -#ifdef VERTICAL_LAYOUT Point aStPoint( rPoint ); Point aPoint; while ( !bRet && pPage ) @@ -276,56 +275,6 @@ BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, aPoint.X() = nVarA; else if ( nVarB < aPoint.X() ) aPoint.X() = nVarB; -#else - const PtPtr pFix = pFIXPOS; - const PtPtr pVar = pVARPOS; - Point aStPoint( rPoint ); - Point aPoint; - while ( !bRet && pPage ) - { - aPoint = aStPoint; - - //Wenn der Point in der VarRichtung zwischen zwei Seiten liegt - //erhaelt die Seite die dem Point naeher steht den Zuschlag. - SwTwips nTmp = bVarHeight ? pPage->Frm().Top() : - pPage->Frm().Left(); - if ( pPage->GetPrev() ) - { - const SwTwips nPreTmp = bVarHeight ? - pPage->GetPrev()->Frm().Bottom() : - pPage->GetPrev()->Frm().Right(); - if ( (aPoint.*pVar > nPreTmp) && - (aPoint.*pVar < nTmp) && - ((aPoint.*pVar - nPreTmp) >= (nTmp - aPoint.*pVar)) ) - aPoint.*pVar = nTmp; - } - else if ( aPoint.*pVar < nTmp ) - aPoint.*pVar = nTmp; - - nTmp = bVarHeight ? pPage->Frm().Bottom() : pPage->Frm().Right(); - if ( pPage->GetNext() ) - { - const SwTwips nNxtTmp = bVarHeight ? - pPage->GetNext()->Frm().Top() : - pPage->GetNext()->Frm().Left(); - if ( (aPoint.*pVar > nTmp) && - (aPoint.*pVar < nNxtTmp) && - ((nNxtTmp - aPoint.*pVar) >= (aPoint.*pVar - nTmp)) ) - aPoint.*pVar = nTmp; - } - else if ( aPoint.*pVar > nTmp ) - aPoint.*pVar = nTmp; - - //Wenn der Punkt in der Fix-Richtung neben der Seite liegt wird er - //hineingezogen. - const SwTwips nVarA = pPage->Frm().Pos().*pFix; - const SwTwips nVarB = bVarHeight ? pPage->Frm().Right() : - pPage->Frm().Bottom(); - if ( nVarA > aPoint.*pFix ) - aPoint.*pFix = nVarA; - else if ( nVarB < aPoint.*pFix ) - aPoint.*pFix = nVarB; -#endif //Weitere versuche mit der aktuellen Seite nur dann, wenn sich der //Point innerhalb der Seite befindet. @@ -1075,6 +1024,31 @@ BOOL GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, return FALSE; else { + // repeated headlines in tables + if ( pCnt->IsInTab() && fnPosPage == GetFirstSub ) + { + const SwTabFrm* pTab = pCnt->FindTabFrm(); + if ( pTab->IsFollow() && pTab->GetTable()->IsHeadlineRepeat() ) + { + const SwFrm* pTmpFrm = pCnt; + while( !pTmpFrm->IsRowFrm() || !pTmpFrm->GetUpper()->IsTabFrm() ) + pTmpFrm = pTmpFrm->GetUpper(); + + ASSERT( pTmpFrm && pTmpFrm->IsRowFrm(), "No RowFrm available" ) + + if ( ! pTmpFrm->GetPrev() && pTmpFrm->GetNext() ) + { + // We are in the first line of a follow table + // with repeated headings. + // To actually make a "real" move we take the first content + // of the next row + pCnt = ((SwLayoutFrm*)pTmpFrm->GetNext())->ContainsCntnt(); + if ( ! pCnt ) + return FALSE; + } + } + } + SwCntntNode *pCNd = (SwCntntNode*)pCnt->GetNode(); pPam->GetPoint()->nNode = *pCNd; xub_StrLen nIdx; @@ -1570,6 +1544,31 @@ Point SwRootFrm::GetPagePos( USHORT nPageNum ) const return pPage->Frm().Pos(); } +/** get page frame by phyiscal page number + + OD 14.01.2003 #103492# + + @return pointer to the page frame with the given physical page number +*/ +SwPageFrm* SwRootFrm::GetPageByPageNum( sal_uInt16 _nPageNum ) const +{ + for ( const SwPageFrm* pPageFrm = static_cast<const SwPageFrm*>( Lower() ); + pPageFrm && pPageFrm->GetPhyPageNum() < _nPageNum; + pPageFrm = static_cast<const SwPageFrm*>( pPageFrm->GetNext() ) ) + { + // empty body of for-loop + } + + if ( pPageFrm && pPageFrm->GetPhyPageNum() == _nPageNum ) + { + return const_cast<SwPageFrm*>( pPageFrm ); + } + else + { + return 0; + } +} + /************************************************************************* |* |* SwRootFrm::IsDummyPage(USHORT) @@ -2060,11 +2059,15 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) SwCrsrMoveState aTmpState( MV_NONE ); aTmpState.b2Lines = sal_True; aTmpState.bNoScroll = sal_True; + aTmpState.nCursorBidiLevel = pStartFrm->IsRightToLeft() ? 1 : 0; + //CntntRects zu Start- und EndFrms. SwRect aStRect, aEndRect; pStartFrm->GetCharRect( aStRect, *pStartPos, &aTmpState ); Sw2LinesPos *pSt2Pos = aTmpState.p2Lines; aTmpState.p2Lines = NULL; + aTmpState.nCursorBidiLevel = pEndFrm->IsRightToLeft() ? 1 : 0; + pEndFrm->GetCharRect ( aEndRect, *pEndPos, &aTmpState ); Sw2LinesPos *pEnd2Pos = aTmpState.p2Lines; @@ -2074,9 +2077,10 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) pEndFrm->UnionFrm( sal_True ) ); if( pStartFrm != pEndFrm ) aEndFrm.Intersection( pEndFrm->PaintArea() ); -#ifdef VERTICAL_LAYOUT SWRECTFN( pStartFrm ) - BOOL bR2L = pStartFrm->IsRightToLeft(); + const BOOL bR2L = pStartFrm->IsRightToLeft(); + const BOOL bEndR2L = pEndFrm->IsRightToLeft(); + // If there's no doubleline portion involved or start and end are both // in the same doubleline portion, all works fine, but otherwise // we need the following... @@ -2090,21 +2094,51 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) if( pSt2Pos ) { SwRect aTmp( aStRect ); + // BiDi-Portions are swimming against the current. - BOOL bPorR2L = (MT_BIDI == pSt2Pos->nMultiType) ? !bR2L : bR2L; - if( bPorR2L ) - (aTmp.*fnRect->fnSetLeft)( - (pSt2Pos->aPortion.*fnRect->fnGetLeft)() ); + const sal_Bool bPorR2L = ( MT_BIDI == pSt2Pos->nMultiType ) ? + ! bR2L : + bR2L; + + if( MT_BIDI == pSt2Pos->nMultiType && + (pSt2Pos->aPortion2.*fnRect->fnGetWidth)() ) + { + // nested bidi portion + long nRightAbs = (pSt2Pos->aPortion.*fnRect->fnGetRight)(); + nRightAbs -= (pSt2Pos->aPortion2.*fnRect->fnGetLeft)(); + long nLeftAbs = nRightAbs - (pSt2Pos->aPortion2.*fnRect->fnGetWidth)(); + + (aTmp.*fnRect->fnSetRight)( nRightAbs ); + + if ( ! pEnd2Pos || pEnd2Pos->aPortion != pSt2Pos->aPortion ) + { + SwRect aTmp2( pSt2Pos->aPortion ); + (aTmp2.*fnRect->fnSetRight)( nLeftAbs ); + aTmp2.Intersection( aEndFrm ); + Sub( aRegion, aTmp2 ); + } + } else - (aTmp.*fnRect->fnSetRight)( - (pSt2Pos->aPortion.*fnRect->fnGetRight)() ); + { + if( bPorR2L ) + (aTmp.*fnRect->fnSetLeft)( + (pSt2Pos->aPortion.*fnRect->fnGetLeft)() ); + else + (aTmp.*fnRect->fnSetRight)( + (pSt2Pos->aPortion.*fnRect->fnGetRight)() ); + } + if( MT_ROT_90 == pSt2Pos->nMultiType || (pSt2Pos->aPortion.*fnRect->fnGetTop)() == (aTmp.*fnRect->fnGetTop)() ) + { (aTmp.*fnRect->fnSetTop)( (pSt2Pos->aLine.*fnRect->fnGetTop)() ); + } + aTmp.Intersection( aStFrm ); Sub( aRegion, aTmp ); + SwTwips nTmp = (pSt2Pos->aLine.*fnRect->fnGetBottom)(); if( MT_ROT_90 != pSt2Pos->nMultiType && (aStRect.*fnRect->fnBottomDist)( nTmp ) > 0 ) @@ -2124,32 +2158,63 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) aTmp.Intersection( aStFrm ); Sub( aRegion, aTmp ); } + aStRect = pSt2Pos->aLine; (aStRect.*fnRect->fnSetLeft)( bR2L ? (pSt2Pos->aPortion.*fnRect->fnGetLeft)() : (pSt2Pos->aPortion.*fnRect->fnGetRight)() ); (aStRect.*fnRect->fnSetWidth)( 1 ); } + if( pEnd2Pos ) { SWRECTFN( pEndFrm ) SwRect aTmp( aEndRect ); - BOOL bEndR2L = pEndFrm->IsRightToLeft(); - BOOL bPorR2L = ( MT_BIDI == pEnd2Pos->nMultiType ) ? - !bEndR2L : bEndR2L; - if( bPorR2L ) - (aTmp.*fnRect->fnSetRight)( - (pEnd2Pos->aPortion.*fnRect->fnGetRight)() ); + + // BiDi-Portions are swimming against the current. + const sal_Bool bPorR2L = ( MT_BIDI == pEnd2Pos->nMultiType ) ? + ! bEndR2L : + bEndR2L; + + if( MT_BIDI == pEnd2Pos->nMultiType && + (pEnd2Pos->aPortion2.*fnRect->fnGetWidth)() ) + { + // nested bidi portion + long nRightAbs = (pEnd2Pos->aPortion.*fnRect->fnGetRight)(); + nRightAbs = nRightAbs - (pEnd2Pos->aPortion2.*fnRect->fnGetLeft)(); + long nLeftAbs = nRightAbs - (pEnd2Pos->aPortion2.*fnRect->fnGetWidth)(); + + (aTmp.*fnRect->fnSetLeft)( nLeftAbs ); + + if ( ! pSt2Pos || pSt2Pos->aPortion != pEnd2Pos->aPortion ) + { + SwRect aTmp2( pEnd2Pos->aPortion ); + (aTmp2.*fnRect->fnSetLeft)( nRightAbs ); + aTmp2.Intersection( aEndFrm ); + Sub( aRegion, aTmp2 ); + } + } else - (aTmp.*fnRect->fnSetLeft)( - (pEnd2Pos->aPortion.*fnRect->fnGetLeft)() ); + { + if ( bPorR2L ) + (aTmp.*fnRect->fnSetRight)( + (pEnd2Pos->aPortion.*fnRect->fnGetRight)() ); + else + (aTmp.*fnRect->fnSetLeft)( + (pEnd2Pos->aPortion.*fnRect->fnGetLeft)() ); + } + if( MT_ROT_90 == pEnd2Pos->nMultiType || (pEnd2Pos->aPortion.*fnRect->fnGetBottom)() == (aEndRect.*fnRect->fnGetBottom)() ) + { (aTmp.*fnRect->fnSetBottom)( (pEnd2Pos->aLine.*fnRect->fnGetBottom)() ); + } + aTmp.Intersection( aEndFrm ); Sub( aRegion, aTmp ); + // The next statement means neither ruby nor rotate(90): if( !( MT_RUBY & pEnd2Pos->nMultiType ) ) { @@ -2171,6 +2236,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) Sub( aRegion, aTmp ); } } + aEndRect = pEnd2Pos->aLine; (aEndRect.*fnRect->fnSetLeft)( bEndR2L ? (pEnd2Pos->aPortion.*fnRect->fnGetRight)() : @@ -2178,62 +2244,50 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) (aEndRect.*fnRect->fnSetWidth)( 1 ); } } -#else - if( pSt2Pos != pEnd2Pos && ( !pSt2Pos || !pEnd2Pos || - pSt2Pos->aPortion != pEnd2Pos->aPortion ) ) + else if( pSt2Pos && pEnd2Pos && + MT_BIDI == pSt2Pos->nMultiType && + MT_BIDI == pEnd2Pos->nMultiType && + pSt2Pos->aPortion == pEnd2Pos->aPortion && + pSt2Pos->aPortion2 != pEnd2Pos->aPortion2 ) { - // If we have a start(end) position inside a doubleline portion - // the surrounded part of the doubleline portion is subtracted - // from the region and the aStRect(aEndRect) is set to the - // end(start) of the doubleline portion. - if( pSt2Pos ) + // This is the ugly special case, where the selection starts and + // ends in the same bidi portion but one start or end is inside a + // nested bidi portion. + + if ( (pSt2Pos->aPortion2.*fnRect->fnGetWidth)() ) { - SwRect aTmp( aStRect.Pos(), - Point( pSt2Pos->aPortion.Right(), aStRect.Bottom() ) ); - if( MT_ROT_90 == pSt2Pos->nMultiType || - pSt2Pos->aPortion.Top() == aTmp.Top() ) - aTmp.Top( pSt2Pos->aLine.Top() ); + SwRect aTmp( aStRect ); + long nRightAbs = (pSt2Pos->aPortion.*fnRect->fnGetRight)(); + nRightAbs -= (pSt2Pos->aPortion2.*fnRect->fnGetLeft)(); + long nLeftAbs = nRightAbs - (pSt2Pos->aPortion2.*fnRect->fnGetWidth)(); + + (aTmp.*fnRect->fnSetRight)( nRightAbs ); aTmp.Intersection( aStFrm ); Sub( aRegion, aTmp ); - if( MT_ROT_90 != pSt2Pos->nMultiType && - aStRect.Bottom() < pSt2Pos->aLine.Bottom() ) - { - aTmp.Top( aTmp.Bottom() ); - aTmp.Bottom( pSt2Pos->aLine.Bottom() ); - if( aStRect.Bottom() < pSt2Pos->aPortion.Bottom() ) - aTmp.Left( pSt2Pos->aPortion.Left() ); - aTmp.Intersection( aStFrm ); - Sub( aRegion, aTmp ); - } - aStRect = SwRect( Point( pSt2Pos->aPortion.Right(), - pSt2Pos->aLine.Top()), Size(1,pSt2Pos->aLine.Height())); + + aStRect = pSt2Pos->aLine; + (aStRect.*fnRect->fnSetLeft)( bR2L ? nRightAbs : nLeftAbs ); + (aStRect.*fnRect->fnSetWidth)( 1 ); } - if( pEnd2Pos ) + + SWRECTFN( pEndFrm ) + if ( (pEnd2Pos->aPortion2.*fnRect->fnGetWidth)() ) { - SwRect aTmp(Point(pEnd2Pos->aPortion.Left(),aEndRect.Top()), - Point( aEndRect.Left() + aEndRect.Width(), - aEndRect.Top() + aEndRect.Height() ) ); - if( MT_ROT_90 == pEnd2Pos->nMultiType || - pEnd2Pos->aPortion.Bottom() == aEndRect.Bottom() ) - aTmp.Bottom( pEnd2Pos->aLine.Bottom() ); + SwRect aTmp( aEndRect ); + long nRightAbs = (pEnd2Pos->aPortion.*fnRect->fnGetRight)(); + nRightAbs -= (pEnd2Pos->aPortion2.*fnRect->fnGetLeft)(); + long nLeftAbs = nRightAbs - (pEnd2Pos->aPortion2.*fnRect->fnGetWidth)(); + + (aTmp.*fnRect->fnSetLeft)( nLeftAbs ); aTmp.Intersection( aEndFrm ); Sub( aRegion, aTmp ); - if( !( MT_RUBY & pEnd2Pos->nMultiType ) && - aEndRect.Top() > pEnd2Pos->aLine.Top() ) - { - aTmp.Bottom( aTmp.Top() ); - aTmp.Top( pEnd2Pos->aLine.Top() ); - if( aEndRect.Top() > pEnd2Pos->aPortion.Top() ) - aTmp.Right( pEnd2Pos->aPortion.Right() ); - aTmp.Intersection( aEndFrm ); - Sub( aRegion, aTmp ); - } - aEndRect = SwRect( Point( pEnd2Pos->aPortion.Left(), - pEnd2Pos->aLine.Top() ), - Size( 1, pEnd2Pos->aLine.Height() ) ); + + aEndRect = pEnd2Pos->aLine; + (aEndRect.*fnRect->fnSetLeft)( bEndR2L ? nLeftAbs : nRightAbs ); + (aEndRect.*fnRect->fnSetWidth)( 1 ); } } -#endif + // The charrect may be outside the paintarea (for cursortravelling) // but the selection has to be restricted to the paintarea if( aStRect.Left() < aStFrm.Left() ) @@ -2255,7 +2309,6 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) else if( nTmp > aEndFrm.Right() ) aEndRect.Right( aEndFrm.Right() ); -#ifdef VERTICAL_LAYOUT if( pStartFrm == pEndFrm ) { sal_Bool bSameRotatedOrBidi = pSt2Pos && pEnd2Pos && @@ -2412,7 +2465,6 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) //At least the endframe... bVert = pEndFrm->IsVertical(); bRev = pEndFrm->IsReverse(); - bR2L = pEndFrm->IsRightToLeft(); fnRect = bVert ? ( bRev ? fnRectVL2R : fnRectVert ) : ( bRev ? fnRectB2T : fnRectHori ); nTmp = (aEndRect.*fnRect->fnGetTop)(); @@ -2423,147 +2475,13 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) Sub( aRegion, aSubRect ); } aSubRect = aEndRect; - if( bR2L ) + if( bEndR2L ) (aSubRect.*fnRect->fnSetRight)((aEndFrm.*fnRect->fnGetRight)()); else (aSubRect.*fnRect->fnSetLeft)( (aEndFrm.*fnRect->fnGetLeft)() ); Sub( aRegion, aSubRect ); } -#else - if( pStartFrm == pEndFrm ) - { - sal_Bool bSameRotatedLine = - pSt2Pos && pEnd2Pos && ( 2 & pSt2Pos->nMultiType ) && - pSt2Pos->aPortion == pEnd2Pos->aPortion; - //Fall 1: (Gleicher Frame und gleiche Zeile) - if( aStRect.Top() == aEndRect.Top() || bSameRotatedLine ) - { - Point aTmpSt( aStRect.Pos() ); - Point aTmpEnd( aEndRect.Right(), aEndRect.Bottom() ); - if( bSameRotatedLine && aTmpSt.Y() > aTmpEnd.Y() ) - { - long nTmpY = aTmpEnd.Y(); - aTmpEnd.Y() = aTmpSt.Y(); - aTmpSt.Y() = nTmpY; - } - SwRect aTmp = SwRect( aTmpSt, aTmpEnd ); - // Bug 34888: falls Inhalt selektiert ist, der keinen Platz - // einnimmt (z.B. PostIts,RefMarks, TOXMarks), - // dann mindestens die Breite des Crsr setzen. - if( 1 == aTmp.Width() && pStartPos->nContent.GetIndex() != - pEndPos->nContent.GetIndex() ) - { - OutputDevice* pOut = pSh->GetOut(); - long nCrsrWidth = pOut->GetSettings().GetStyleSettings(). - GetCursorSize(); - aTmp.Width( pOut->PixelToLogic( Size( nCrsrWidth, 0 ) ).Width() ); - } - aTmp.Intersection( aStFrm ); - Sub( aRegion, aTmp ); - } - //Fall 2: (Gleicher Frame ueber mehr als eine Zeile) - else - { - SwTwips lLeft, lRight; - if( pSt2Pos && pEnd2Pos && pSt2Pos->aPortion == pEnd2Pos->aPortion ) - { - lLeft = pSt2Pos->aPortion.Left(); - lRight = pSt2Pos->aPortion.Right(); - } - else - { - lLeft = pStartFrm->Frm().Left() + pStartFrm->Prt().Left(); - lRight = pStartFrm->Frm().Left() + pStartFrm->Prt().Right(); - } - if( lLeft < aStFrm.Left() ) - lLeft = aStFrm.Left(); - if( lRight > aStFrm.Right() ) - lRight = aStFrm.Right(); - //Erste Zeile - Sub( aRegion, SwRect( aStRect.Pos(),Point( lRight, aStRect.Bottom()))); - - //Wenn mindestens ein Twips zwischen Start- und Endzeile liegt, - //so wird halt alles dazwischenliegende mit aufgenommen. - if( (aStRect.Pos().Y()+aStRect.SSize().Height()) != aEndRect.Top() ) - Sub( aRegion, SwRect( Point( lLeft, - (aStRect.Pos().Y()+aStRect.SSize().Height()) ), - Point( lRight, aEndRect.Top()-1 ))); - - //und die letzte Zeile - Sub( aRegion, SwRect( Point( lLeft, aEndRect.Top() ), - Point( aEndRect.Left(), aEndRect.Bottom() ))); - } - } - //Fall 3: (Unterschiedliche Frm's, moeglicherweise auch welche - // dazwischen) - else - { - //Erst den StartFrm verknurpseln... - Sub( aRegion, SwRect( aStRect.Pos(), - Point( aStFrm.Right(), aStRect.Bottom()))); - - if( aStFrm.Bottom() != aStRect.Bottom() ) - Sub( aRegion, SwRect( Point( aStFrm.Left(), - (aStRect.Pos().Y()+aStRect.SSize().Height()) ), - Point( aStFrm.Right(), aStFrm.Bottom() ))); - - //Nun alles dazwischenliegende (kann auch nix sein)... - BOOL bBody = pStartFrm->IsInDocBody(); - const SwCntntFrm *pCntnt = pStartFrm->GetNextCntntFrm(); - SwRect aPrvRect; - -// JP - 24.11.93: -// wie kann man die Schleife noch optimieren, damit nur die Frames, die -// in der VisArea liegen, beachtet werden - - while ( pCntnt != pEndFrm ) - { - if ( pCntnt->IsInFly() ) - { - const SdrObjectPtr pObj = (SdrObject*)pCntnt->FindFlyFrm()->GetVirtDrawObj(); - aSortObjs.Insert( pObj ); - } - - //Wenn ich im DocumentBody war, so beachte ich nur Frm's - //die im Body liegen und umgekehrt. - if ( bBody == pCntnt->IsInDocBody() ) - { - SwRect aCRect( pCntnt->UnionFrm( sal_True ) ); - aCRect.Intersection( pCntnt->PaintArea() ); - if( aCRect.IsOver( aRegion.GetOrigin() )) - { - SwRect aTmp( aPrvRect ); - aTmp.Union( aCRect ); - if ( (aPrvRect.Height() * aPrvRect.Width() + - aCRect.Height() * aCRect.Width()) == - (aTmp.Height() * aTmp.Width()) ) - { - aPrvRect.Union( aCRect ); - } - else - { - if ( aPrvRect.HasArea() ) - Sub( aRegion, aPrvRect ); - aPrvRect = aCRect; - } - } - } - pCntnt = pCntnt->GetNextCntntFrm(); - } - if ( aPrvRect.HasArea() ) - Sub( aRegion, aPrvRect ); - - //Jetzt den EndFrm... - if ( aEndFrm.Top() != aEndRect.Top() ) - Sub( aRegion, SwRect( aEndFrm.Pos(), - Point( aEndFrm.Right(), aEndRect.Top()-1 ) )); - - Sub( aRegion, SwRect( aEndFrm.Pos(), - Point( aEndRect.Left(), aEndRect.Bottom() ))); - - } -#endif // aRegion.Compress( FALSE ); aRegion.Invert(); delete pSt2Pos; diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index e5c0617ab824..412d29d86a43 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wsfrm.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: fme $ $Date: 2002-12-09 10:37:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -916,6 +916,15 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) GetPrev()->Prt().Height() + GetPrev()->Prt().Top() ) //Umrandung zu beruecksichtigen? GetPrev()->_InvalidatePrt(); + // OD 18.02.2003 #104989# - force complete paint of previous frame, + // if frame is inserted at the end of a section frame, in order to + // get subsidiary lines repainted for the section. + if ( pParent->IsSctFrm() && !GetNext() ) + { + // force complete paint of previous frame, if new inserted frame + // in the section is the last one. + GetPrev()->SetCompletePaint(); + } GetPrev()->InvalidatePage( pPage ); } } @@ -3287,19 +3296,21 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, SwTwips nWidth = rCol.CalcColWidth( i, nPrtWidth ); if ( i == (nNumCols - 1) ) //Dem Letzten geben wir wie nWidth = nAvail; //immer den Rest. - nWidth -= (pCol->Frm().*fnRect->fnGetWidth)(); - if( nWidth ) + + SwTwips nWidthDiff = nWidth - (pCol->Frm().*fnRect->fnGetWidth)(); + if( nWidthDiff ) { - (pCol->Frm().*fnRect->fnAddBottom)( nWidth ); + (pCol->Frm().*fnRect->fnAddRight)( nWidthDiff ); pCol->_InvalidatePrt(); if ( pCol->GetNext() ) pCol->GetNext()->_InvalidatePos(); } - nWidth = (Prt().*fnRect->fnGetHeight)() - - (pCol->Frm().*fnRect->fnGetHeight)(); - if( nWidth ) + + SwTwips nHeightDiff = (Prt().*fnRect->fnGetHeight)() - + (pCol->Frm().*fnRect->fnGetHeight)(); + if( nHeightDiff ) { - (pCol->Frm().*fnRect->fnAddBottom)( nWidth ); + (pCol->Frm().*fnRect->fnAddBottom)( nHeightDiff ); pCol->_InvalidatePrt(); } pCol->Calc(); @@ -3348,8 +3359,8 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, pLay = (SwLayoutFrm*)pLay->GetNext(); ASSERT( pLay->IsFtnContFrm(),"FtnContainer exspected" ); nInnerHeight += pLay->InnerHeight(); - nInnerHeight = (pLay->Frm().*fnRect->fnGetHeight)() - - (pLay->Prt().*fnRect->fnGetHeight)(); + nInnerHeight += (pLay->Frm().*fnRect->fnGetHeight)() - + (pLay->Prt().*fnRect->fnGetHeight)(); } nInnerHeight -= (pCol->Prt().*fnRect->fnGetHeight)(); if( nInnerHeight > nDiff ) diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 691b069848ad..2cc96f1c9420 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmcrsr.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:28:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,6 +95,7 @@ #include <pormulti.hxx> // SwMultiPortion #endif +#include <unicode/ubidi.h> #include "frmsh.hxx" #include "txtcfg.hxx" @@ -604,12 +605,6 @@ sal_Bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint, while( aLine.GetLineNr() > 1 ) aLine.Prev(); - // Set the cursor bidi level to the default level. If the cursor is - // inside a bidi portion, the level is set again inside the - // GetCrsrOfst function. - if ( pCMS ) - ((SwCrsrMoveState*)pCMS)->nCursorBidiLevel = IsRightToLeft() ? 1 : 0; - xub_StrLen nOffset = aLine.GetCrsrOfst( pPos, rPoint, bChgFrm, pCMS ); if( pCMS && pCMS->eState == MV_NONE && aLine.GetEnd() == nOffset ) @@ -954,27 +949,12 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset, // nPos: the new visual position // bLeft: whether the break iterator has to add or subtract from the // current position -void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, - sal_Bool& bRight ) +void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, xub_StrLen nIdx, + xub_StrLen& nPos, sal_Bool& bRight, + BYTE& nCrsrLevel, BYTE nDefaultDir ) { - if( IsEmpty() || IsHiddenNow() ) - return; - - ((SwTxtFrm*)this)->GetFormatted(); - - SwTxtSizeInfo aInf( (SwTxtFrm*)this ); - SwTxtCursor aLine( ((SwTxtFrm*)this), &aInf ); - - if( nPos ) - aLine.CharCrsrToLine( nPos ); - else - aLine.Top(); - - const SwLineLayout* pCurrLine = aLine.GetCurr(); - const SwLinePortion* pPor = pCurrLine->GetFirstPortion(); + const SwLinePortion* pPor = rCurrLine.GetFirstPortion(); const SwLinePortion* pLast = 0; - const BYTE nDefaultDir = IsRightToLeft() ? 1 : 0; - USHORT nIdx = aLine.GetStart(); // what's the current portion while ( pPor && nIdx + pPor->GetLen() <= nPos ) @@ -984,135 +964,240 @@ void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, pPor = pPor->GetPortion(); } - xub_StrLen nNewPos = 0; - BYTE nNewCrsrLevel = nCrsrLevel; - sal_Bool bForward = bRight; - if ( bRight ) { - // 1. jump case, at beginning of bidi portion - if ( pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() && - nIdx == nPos ) + sal_Bool bRecurse = pPor && pPor->IsMultiPortion() && + ((SwMultiPortion*)pPor)->IsBidi(); + + // 1. special case: at beginning of bidi portion + if ( bRecurse && nIdx == nPos ) { - nNewPos = nPos + pPor->GetLen(); + nPos += pPor->GetLen(); - // enter bidi portion - if ( nCrsrLevel == nDefaultDir ) - { - bForward = sal_False; - nNewCrsrLevel = ((SwBidiPortion*)pPor)->GetLevel(); - } // leave bidi portion - else + if ( nCrsrLevel != nDefaultDir ) { - bForward = sal_True; - nNewCrsrLevel = nDefaultDir; + bRecurse = sal_False; } + else + // special case: + // buffer: abcXYZ123 in LTR paragraph + // view: abc123ZYX + // cursor is between c and X in the buffer and cursor level = 0 + nCrsrLevel++; } - // 2. jump case, at beginning of portion after bidi portion - else if ( pLast && pLast->IsMultiPortion() && ((SwMultiPortion*)pLast)->IsBidi() && - nIdx == nPos ) + // 2. special case: at beginning of portion after bidi portion + else if ( pLast && pLast->IsMultiPortion() && + ((SwMultiPortion*)pLast)->IsBidi() && nIdx == nPos ) { - nNewPos = nPos; - // enter bidi portion if ( nCrsrLevel != nDefaultDir ) { - bForward = sal_False; - nNewCrsrLevel = ((SwBidiPortion*)pLast)->GetLevel(); - } - else - { - bForward = sal_True; - nNewCrsrLevel = nDefaultDir; + bRecurse = sal_True; + nIdx -= pLast->GetLen(); + pPor = pLast; } } - // go backward - else if ( pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) + // Recursion + if ( bRecurse ) { - nNewPos = nPos; - bForward = sal_False; - nNewCrsrLevel = ((SwBidiPortion*)pPor)->GetLevel(); + const SwLineLayout& rLine = ((SwMultiPortion*)pPor)->GetRoot(); + xub_StrLen nTmpPos = nPos - nIdx; + sal_Bool bTmpForward = ! bRight; + BYTE nTmpCrsrLevel = nCrsrLevel; + lcl_VisualMoveRecursion( rLine, 0, nTmpPos, bTmpForward, + nTmpCrsrLevel, nDefaultDir + 1 ); + + nPos = nTmpPos + nIdx; + bRight = bTmpForward; + nCrsrLevel = nTmpCrsrLevel; } - // go forward - else //if ( pPor && ( ! pPor->IsMultiPortion() || ! ((SwMultiPortion*)pPor)->IsBidi() ) ) + else { - nNewPos = nPos; - bForward = sal_True; - nNewCrsrLevel = nDefaultDir; + bRight = sal_True; + nCrsrLevel = nDefaultDir; } } else { - // 1. jump case, at beginning of bidi portion - if ( pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() && - nIdx == nPos ) - { - nNewPos = nPos; + sal_Bool bRecurse = pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi(); + // 1. special case: at beginning of bidi portion + if ( bRecurse && nIdx == nPos ) + { // leave bidi portion if ( nCrsrLevel == nDefaultDir ) { - bForward = sal_False; - nNewCrsrLevel = nDefaultDir; - } - // enter bidi portion - else - { - bForward = sal_True; - nNewCrsrLevel = ((SwBidiPortion*)pPor)->GetLevel(); + bRecurse = sal_False; } } - // 2. jump case, at beginning of portion after bidi portion - else if ( pLast && pLast->IsMultiPortion() && ((SwMultiPortion*)pLast)->IsBidi() && - nIdx == nPos ) + // 2. special case: at beginning of portion after bidi portion + else if ( pLast && pLast->IsMultiPortion() && + ((SwMultiPortion*)pLast)->IsBidi() && nIdx == nPos ) { - nNewPos = nPos - pLast->GetLen(); + nPos -= pLast->GetLen(); // enter bidi portion - if ( nCrsrLevel != nDefaultDir ) + if ( nCrsrLevel % 2 == nDefaultDir % 2 ) { - bForward = sal_False; - nNewCrsrLevel = nDefaultDir; + bRecurse = sal_True; + nIdx -= pLast->GetLen(); + pPor = pLast; + + // special case: + // buffer: abcXYZ123 in LTR paragraph + // view: abc123ZYX + // cursor is behind 3 in the buffer and cursor level = 2 + if ( nDefaultDir + 2 == nCrsrLevel ) + nPos += pLast->GetLen(); } - else + } + + // go forward + if ( bRecurse ) + { + const SwLineLayout& rLine = ((SwMultiPortion*)pPor)->GetRoot(); + xub_StrLen nTmpPos = nPos - nIdx; + sal_Bool bTmpForward = ! bRight; + BYTE nTmpCrsrLevel = nCrsrLevel; + lcl_VisualMoveRecursion( rLine, 0, nTmpPos, bTmpForward, + nTmpCrsrLevel, nDefaultDir + 1 ); + + // special case: + // buffer: abcXYZ123 in LTR paragraph + // view: abc123ZYX + // cursor is between Z and 1 in the buffer and cursor level = 2 + if ( nTmpPos == pPor->GetLen() && nTmpCrsrLevel == nDefaultDir + 1 ) { - bForward = sal_True; - nNewCrsrLevel = ((SwBidiPortion*)pLast)->GetLevel(); + nTmpPos -= pPor->GetLen(); + nTmpCrsrLevel = nDefaultDir; + bTmpForward = ! bTmpForward; } + + nPos = nTmpPos + nIdx; + bRight = bTmpForward; + nCrsrLevel = nTmpCrsrLevel; } // go backward - else if ( pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) + else { - nNewPos = nPos; - bForward = sal_True; - nNewCrsrLevel = ((SwBidiPortion*)pPor)->GetLevel(); + bRight = sal_False; + nCrsrLevel = nDefaultDir; } + } +} - // bo forward - else //if ( pPor && ( ! pPor->IsMultiPortion() || ! ((SwMultiPortion*)pPor)->IsBidi() ) ) +void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, + sal_Bool& bForward, sal_Bool bInsertCrsr ) +{ + if( IsEmpty() || IsHiddenNow() ) + return; + + ((SwTxtFrm*)this)->GetFormatted(); + + SwTxtSizeInfo aInf( (SwTxtFrm*)this ); + SwTxtCursor aLine( ((SwTxtFrm*)this), &aInf ); + + if( nPos ) + aLine.CharCrsrToLine( nPos ); + else + aLine.Top(); + + const SwLineLayout* pLine = aLine.GetCurr(); + const xub_StrLen nStt = aLine.GetStart(); + const xub_StrLen nLen = pLine->GetLen(); + + // We have to distinguish between an insert and overwrite cursor: + // The insert cursor position depends on the cursor level: + // buffer: abcXYZdef in LTR paragraph + // display: abcZYXdef + // If cursor is between c and X in the buffer and cursor level is 0, + // the cursor blinks between c and Z and -> sets the cursor between Z and Y. + // If the cursor level is 1, the cursor blinks between X and d and + // -> sets the cursor between d and e. + // The overwrite cursor simply travels to the next visual character. + if ( bInsertCrsr ) + { + lcl_VisualMoveRecursion( *pLine, nStt, nPos, bForward, + nCrsrLevel, IsRightToLeft() ? 1 : 0 ); + return; + } + + const BYTE nDefaultDir = IsRightToLeft() ? UBIDI_RTL : UBIDI_LTR; + const sal_Bool bVisualRight = ( nDefaultDir == UBIDI_LTR && bForward ) || + ( nDefaultDir == UBIDI_RTL && ! bForward ); + + // + // Bidi functions from icu 2.0 + // + const sal_Unicode* pLineString = GetTxtNode()->GetTxt().GetBuffer(); + pLine += nStt; + + UErrorCode nError = U_ZERO_ERROR; + UBiDi* pBidi = ubidi_openSized( nLen, 0, &nError ); + ubidi_setPara( pBidi, pLineString, nLen, nDefaultDir, NULL, &nError ); + + xub_StrLen nTmpPos; + sal_Bool bOutOfBounds = sal_False; + + if ( nPos < nStt + nLen ) + { + nTmpPos = (xub_StrLen)ubidi_getVisualIndex( pBidi, nPos, &nError ); + + // visual indices are always LTR aligned + if ( bVisualRight ) + { + if ( nTmpPos + 1 < nStt + nLen ) + ++nTmpPos; + else + { + nPos = nDefaultDir == UBIDI_RTL ? 0 : nStt + nLen; + bOutOfBounds = sal_True; + } + } + else { - nNewPos = nPos; - bForward = sal_False; - nNewCrsrLevel = nDefaultDir; + if ( nTmpPos ) + --nTmpPos; + else + { + nPos = nDefaultDir == UBIDI_RTL ? nStt + nLen : 0; + bOutOfBounds = sal_True; + } } } + else + { + nTmpPos = nDefaultDir == UBIDI_LTR ? nPos - 1 : 0; + } - ASSERT( 0 <= nNewPos && ( nNewPos <= GetTxtNode()->GetTxt().Len() || ! bForward ), - "ConvertLogic2Visual failed" ) + if ( ! bOutOfBounds ) + { + nPos = (xub_StrLen)ubidi_getLogicalIndex( pBidi, nTmpPos, &nError ); - nPos = nNewPos; - nCrsrLevel = nNewCrsrLevel; - bRight = bForward; -} + if ( bForward ) + { + if ( nPos ) + --nPos; + else + { + ++nPos; + bForward = ! bForward; + } + } + else + ++nPos; + } + ubidi_close( pBidi ); +} /************************************************************************* * SwTxtFrm::_UnitDown() diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index d6ccdf242631..56f45c7920f3 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmform.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: fme $ $Date: 2002-11-22 15:58:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2333,6 +2333,11 @@ void SwTxtFrm::Format( const SwBorderAttrs * ) ChgThisLines(); + // the PrepMustFit should not survive a Format operation + SwParaPortion *pPara = GetPara(); + if ( pPara ) + pPara->SetPrepMustFit( sal_False ); + #ifdef DEBUG // Hier ein Instrumentarium, um ungewoehnlichen Master/Follow-Kombinationen, // insbesondere bei Fussnoten, auf die Schliche zu kommen diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 0364f41f42b9..aaf771c979f7 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmpaint.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: fme $ $Date: 2002-12-10 11:05:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,9 @@ #ifndef _SVX_PGRDITEM_HXX #include <svx/pgrditem.hxx> #endif +#ifndef _SVX_LRSPITEM_HXX //autogen +#include <svx/lrspitem.hxx> +#endif #ifndef _PAGEDESC_HXX #include <pagedesc.hxx> // SwPageDesc #endif @@ -566,7 +569,8 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const SwRect aRect; if( bCheck && aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) ) return sal_False; - else if( OUTDEV_WINDOW == pSh->GetOut()->GetOutDevType() ) + else if( OUTDEV_PRINTER != pSh->GetOut()->GetOutDevType() && + ! pSh->GetViewOptions()->IsPDFExport() ) { SwFont *pFnt; const SwTxtNode& rTxtNode = *GetTxtNode(); @@ -617,6 +621,13 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const pFnt->Invalidate(); pFnt->ChgPhysFnt( pSh, pSh->GetOut() ); Point aPos = Frm().Pos() + Prt().Pos(); + + const SvxLRSpaceItem &rSpace = + GetTxtNode()->GetSwAttrSet().GetLRSpace(); + + if ( rSpace.GetTxtFirstLineOfst() > 0 ) + aPos.X() += rSpace.GetTxtFirstLineOfst(); + SwSaveClip *pClip; if( IsUndersized() ) { diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 659e5f4c14b5..f1890f35d8fc 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: inftxt.cxx,v $ * - * $Revision: 1.83 $ + * $Revision: 1.84 $ * - * last change: $Author: fme $ $Date: 2002-12-10 09:35:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,7 +203,8 @@ using namespace ::com::sun::star::beans; // steht im number.cxx extern const sal_Char __FAR_DATA sBulletFntName[]; -extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); +// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx> +//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); #ifndef PRODUCT // Test2: WYSIWYG++ @@ -1650,6 +1651,7 @@ sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr ) { bRet = sal_True; SetLineHeight( nHeight ); + SetLineNettoHeight( pCurr->Height() ); break; } pPor = pPor->GetPortion(); @@ -1664,14 +1666,17 @@ sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr ) * SwTxtFormatInfo::ScanPortionEnd() *************************************************************************/ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart, - const xub_StrLen nEnd, - sal_Bool bSkip ) + const xub_StrLen nEnd ) { cHookChar = 0; const xub_Unicode cTabDec = GetLastTab() ? (sal_Unicode)GetTabDecimal() : 0; xub_StrLen i = nStart; - if ( bSkip && i < nEnd ) - ++i; + + // Removed for i7288. bSkip used to be passed from SwFldPortion::Format + // as IsFollow(). Therefore more than one special character was not + // handled correctly at the beginning of follow fields. +// if ( bSkip && i < nEnd ) +// ++i; for( ; i < nEnd; ++i ) { diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index b7f97bbc6221..3c348554826e 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: inftxt.hxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: fme $ $Date: 2002-11-14 08:55:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -759,8 +759,7 @@ public: // Sucht ab nIdx bis nEnd nach Tabs, TabDec, TXTATR und BRK. // Return: gefundene Position, setzt ggf. cHookChar - xub_StrLen ScanPortionEnd( const xub_StrLen nStart, const xub_StrLen nEnd, - sal_Bool bSkip = sal_False ); + xub_StrLen ScanPortionEnd( const xub_StrLen nStart, const xub_StrLen nEnd ); // friend ostream &operator<<( ostream &rOS, const SwTxtFormatInfo &rInf ); friend SvStream &operator<<( SvStream &rOS, const SwTxtFormatInfo &rInf ); diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 5e250674029e..d5a4b2e55cf8 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: itrcrsr.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:28:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -516,6 +516,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, SwTwips nX = 0; SwTwips nFirst = 0; SwLinePortion *pPor = pCurr->GetFirstPortion(); + SwBidiPortion* pLastBidiPor = 0; SvShorts* pSpaceAdd = pCurr->GetpSpaceAdd(); SvUShorts* pKanaComp = pCurr->GetpKanaComp(); MSHORT nSpaceIdx = 0; @@ -605,8 +606,16 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, nPorHeight = pPor->Height(); nPorAscent = pPor->GetAscent(); } - if ( aInf.GetIdx() + pPor->GetLen() < nOfst + - ( pPor->IsMultiPortion() && !bWidth ? 0 : 1 ) ) + + // If we are behind the portion, we add the portion width to + // nX. Special case: nOfst = aInf.GetIdx() + pPor->GetLen(). + // For common portions (including BidiPortions) we want to add + // the portion width to nX. For MultiPortions, nExtra = 0, + // therefore we go to the 'else' branch and start a recursion. + const BYTE nExtra = pPor->IsMultiPortion() && + ! ((SwMultiPortion*)pPor)->IsBidi() && + ! bWidth ? 0 : 1; + if ( aInf.GetIdx() + pPor->GetLen() < nOfst + nExtra ) { if ( pPor->InSpaceGrp() && nSpaceAdd ) nX += pPor->PrtWidth() + @@ -633,19 +642,29 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, !pPor->GetPortion()->IsMarginPortion() ) ) nX += pPor->PrtWidth(); } - if( pPor->IsMultiPortion() && - ((SwMultiPortion*)pPor)->HasTabulator() ) + if( pPor->IsMultiPortion() ) { - if ( pSpaceAdd ) + if ( ((SwMultiPortion*)pPor)->HasTabulator() ) { - if ( ++nSpaceIdx < pSpaceAdd->Count() ) - nSpaceAdd = (*pSpaceAdd)[nSpaceIdx]; - else - nSpaceAdd = 0; + if ( pSpaceAdd ) + { + if ( ++nSpaceIdx < pSpaceAdd->Count() ) + nSpaceAdd = (*pSpaceAdd)[nSpaceIdx]; + else + nSpaceAdd = 0; + } + + if( pKanaComp && ( nKanaIdx + 1 ) < pKanaComp->Count() ) + ++nKanaIdx; } - if( pKanaComp && ( nKanaIdx + 1 ) < pKanaComp->Count() ) - ++nKanaIdx; + // if we are right behind a BidiPortion, we have to + // hold a pointer to the BidiPortion in order to + // find the correct cursor position, depending on the + // cursor level + if ( ((SwMultiPortion*)pPor)->IsBidi() && + aInf.GetIdx() + pPor->GetLen() == nOfst ) + pLastBidiPor = (SwBidiPortion*)pPor; } aInf.SetIdx( aInf.GetIdx() + pPor->GetLen() ); @@ -666,8 +685,14 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, if( pCMS && pCMS->b2Lines ) { - pCMS->p2Lines = new Sw2LinesPos(); - pCMS->p2Lines->aLine = SwRect(aCharPos, aCharSize); + sal_Bool bRecursion = sal_True; + if ( ! pCMS->p2Lines ) + { + pCMS->p2Lines = new Sw2LinesPos; + pCMS->p2Lines->aLine = SwRect(aCharPos, aCharSize); + bRecursion = sal_False; + } + if( ((SwMultiPortion*)pPor)->HasRotation() ) { if( ((SwMultiPortion*)pPor)->IsRevers() ) @@ -677,18 +702,22 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, } else if( ((SwMultiPortion*)pPor)->IsDouble() ) pCMS->p2Lines->nMultiType = MT_TWOLINE; -#ifdef BIDI else if( ((SwMultiPortion*)pPor)->IsBidi() ) pCMS->p2Lines->nMultiType = MT_BIDI; -#endif else pCMS->p2Lines->nMultiType = MT_RUBY; + SwTwips nTmpWidth = pPor->Width(); if( nSpaceAdd ) nTmpWidth += pPor->CalcSpacing(nSpaceAdd, aInf); - pCMS->p2Lines->aPortion = - SwRect( Point(aCharPos.X() + nX, pOrig->Top()), - Size( nTmpWidth, pPor->Height() ) ); + + SwRect aRect( Point(aCharPos.X() + nX, pOrig->Top() ), + Size( nTmpWidth, pPor->Height() ) ); + + if ( ! bRecursion ) + pCMS->p2Lines->aPortion = aRect; + else + pCMS->p2Lines->aPortion2 = aRect; } // In a multi-portion we use GetCharRect()-function @@ -859,22 +888,6 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, const SwTwips nInsideOfst = pOrig->Pos().X(); pOrig->Pos().X() = nX + nPorWidth - nInsideOfst - pOrig->Width(); - if ( nInsideOfst == nPorWidth ) - { - // logical position is behind multi portion - USHORT nDefaultDir = GetTxtFrm()->IsRightToLeft() ? - 1 : 0; - if ( pCMS && - pCMS->nCursorBidiLevel == nDefaultDir ) - pOrig->Pos().X() += nPorWidth; - - // actually we are not in a bidi portion - if ( pCMS && pCMS->p2Lines ) - { - delete pCMS->p2Lines; - pCMS->p2Lines = 0; - } - } } else pOrig->Pos().X() += nX; @@ -1080,19 +1093,6 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, pOrig->Width( nTmp ); } - if ( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) - { - // logical position is at beginning of bidi portion - // we determine if the cursor has to blink before or behind - // the bidi portion - USHORT nDefaultDir = GetTxtFrm()->IsRightToLeft() ? 1 : 0; - if ( pCMS->nCursorBidiLevel != nDefaultDir ) - { - pOrig->Pos().X() += pPor->Width() + - pPor->CalcSpacing( nSpaceAdd, aInf ); - } - } - // travel inside field portion? if ( pCMS->pSpecialPos ) { @@ -1102,6 +1102,59 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, } } } + + // special case: We are at the beginning of a BidiPortion or + // directly behind a BidiPortion + if ( pCMS && + ( pLastBidiPor || + ( pPor && + pPor->IsMultiPortion() && + ((SwMultiPortion*)pPor)->IsBidi() ) ) ) + { + // we determine if the cursor has to blink before or behind + // the bidi portion + if ( pLastBidiPor ) + { + const BYTE nPortionLevel = pLastBidiPor->GetLevel(); + + if ( pCMS->nCursorBidiLevel >= nPortionLevel ) + { + // we came from inside the bidi portion, we want to blink + // behind the portion + pOrig->Pos().X() -= pLastBidiPor->Width() + + pLastBidiPor->CalcSpacing( nSpaceAdd, aInf ); + + // Again, there is a special case: logically behind + // the portion can actually mean that the cursor is inside + // the portion. This can happen is the last portion + // inside the bidi portion is a nested bidi portion + SwLineLayout& rLineLayout = + ((SwMultiPortion*)pLastBidiPor)->GetRoot(); + + const SwLinePortion *pLast = rLineLayout.FindLastPortion(); + if ( pLast->IsMultiPortion() ) + { + ASSERT( ((SwMultiPortion*)pLast)->IsBidi(), + "Non-BidiPortion inside BidiPortion" ) + pOrig->Pos().X() += pLast->Width() + + pLast->CalcSpacing( nSpaceAdd, aInf ); + } + } + } + else + { + const BYTE nPortionLevel = ((SwBidiPortion*)pPor)->GetLevel(); + + if ( pCMS->nCursorBidiLevel >= nPortionLevel ) + { + // we came from inside the bidi portion, we want to blink + // behind the portion + pOrig->Pos().X() += pPor->Width() + + pPor->CalcSpacing( nSpaceAdd, aInf ); + } + } + } + pOrig->Pos().X() += nX; if ( pCMS && pCMS->bRealHeight ) @@ -1431,7 +1484,9 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, // Sonst kommen wir nicht mehr in zeichengeb. Rahmen hinein... if( !( nChgNode && pPos && pPor->IsFlyCntPortion() ) ) { - if ( pPor->InFldGrp() ) + if ( pPor->InFldGrp() || + ( pPor->IsMultiPortion() && + ((SwMultiPortion*)pPor)->IsBidi() ) ) { KSHORT nHeight = 0; if( !bFieldInfo ) @@ -1440,8 +1495,9 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, if ( !nHeight || nHeight > nWidth ) nHeight = nWidth; } - if( !((SwFldPortion*)pPor)->HasFollow() && - nWidth - nHeight/2 <= nX ) + if( nWidth - nHeight/2 <= nX && + ( ! pPor->InFldGrp() || + !((SwFldPortion*)pPor)->HasFollow() ) ) ++nCurrStart; } else if ( ( !pPor->IsFlyPortion() || ( pPor->GetPortion() && @@ -1505,12 +1561,7 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, { const BYTE nBidiLevel = ((SwBidiPortion*)pPor)->GetLevel(); aLayoutModeModifier.Modify( nBidiLevel % 2 ); - if ( pCMS ) - ((SwCrsrMoveState*)pCMS)->nCursorBidiLevel = nBidiLevel; } - else if ( pCMS ) - ((SwCrsrMoveState*)pCMS)->nCursorBidiLevel = - GetTxtFrm()->IsRightToLeft() ? 1 : 0; #else SwTxtCursorSave aSave( (SwTxtCursor*)this, (SwMultiPortion*)pPor, nTmpY, nCurrStart, nSpaceAdd ); @@ -1579,6 +1630,10 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, nLength = aSizeInf.GetFont()->_GetCrsrOfst( aDrawInf ); + if ( pCMS ) + ((SwCrsrMoveState*)pCMS)->nCursorBidiLevel = + aDrawInf.GetCursorBidiLevel(); + if( bFieldInfo && nLength == pPor->GetLen() && ( ! pPor->GetPortion() || ! pPor->GetPortion()->IsPostItsPortion() ) ) diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index a63c96f7016d..c32327627910 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: itrform2.cxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.73 $ * - * last change: $Author: fme $ $Date: 2002-12-10 14:44:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -675,9 +675,10 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) // offset: // 1. Underlined portions due to special underline feature // 2. Right Tab - // 3. Multiportions - // 4. DropCaps - // 5. Grid Mode + // 3. BidiPortions + // 4. other Multiportions + // 5. DropCaps + // 6. Grid Mode else if ( ( ! rInf.GetPaintOfst() || nUnderLineStart < rInf.GetPaintOfst() ) && // 1. Underlined portions nUnderLineStart && @@ -694,11 +695,13 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) else if ( ! rInf.GetPaintOfst() && // 2. Right Tab ( ( pPor->InTabGrp() && !pPor->IsTabLeftPortion() ) || - // 3. Multi Portion and 4. Drop Caps - ( ( pPor->IsDropPortion() || pPor->IsMultiPortion() )&& + // 3. BidiPortions + ( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) || + // 4. Multi Portion and 5. Drop Caps + ( ( pPor->IsDropPortion() || pPor->IsMultiPortion() ) && rInf.GetReformatStart() >= rInf.GetIdx() && rInf.GetReformatStart() <= rInf.GetIdx() + pPor->GetLen() ) - // 5. Grid Mode + // 6. Grid Mode || ( bHasGrid && SW_CJK != pFnt->GetActual() ) ) ) diff --git a/sw/source/core/text/makefile.mk b/sw/source/core/text/makefile.mk index ffa799f33a81..02d9ee595880 100644 --- a/sw/source/core/text/makefile.mk +++ b/sw/source/core/text/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: fme $ $Date: 2002-04-10 06:18:20 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:41:01 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index f2969f4c3e12..7c89bb3813be 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: porfld.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: fme $ $Date: 2002-11-18 12:17:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -368,7 +368,7 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf ) else { nFullLen = rInf.ScanPortionEnd( rInf.GetIdx(), - rInf.GetIdx() + nOldFullLen, IsFollow() ) - rInf.GetIdx(); + rInf.GetIdx() + nOldFullLen ) - rInf.GetIdx(); if( nFullLen && CH_BREAK == aExpand.GetChar( nFullLen - 1 ) ) --nFullLen; @@ -681,8 +681,33 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const return; } - // Dies ist eine freizuegige Auslegung der Hintergrundbelegung ... - rInf.DrawViewOpt( *this, POR_NUMBER ); + // calculate the width of the number portion, including follows + const KSHORT nOldWidth = Width(); + USHORT nSumWidth = 0; + USHORT nOffset = 0; + + const SwLinePortion* pTmp = this; + while ( pTmp && pTmp->InNumberGrp() ) + { + nSumWidth += pTmp->Width(); + if ( ((SwNumberPortion*)pTmp)->HasFollow() ) + pTmp = pTmp->GetPortion(); + else + { + nOffset = pTmp->Width() - ((SwNumberPortion*)pTmp)->nFixWidth; + break; + } + } + + // The master portion takes care for painting the background of the + // follow field portions + if ( ! IsFollow() ) + { + SwLinePortion *pThis = (SwLinePortion*)this; + pThis->Width( nSumWidth ); + rInf.DrawViewOpt( *this, POR_NUMBER ); + pThis->Width( nOldWidth ); + } if( aExpand.Len() ) { @@ -697,13 +722,12 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const SwFontSave aSave( rInf, pFnt ); - if( nFixWidth == Width() ) + if( nFixWidth == Width() && ! HasFollow() ) SwExpandPortion::Paint( rInf ); else { // logisches const: Width wird wieder zurueckgesetzt SwLinePortion *pThis = (SwLinePortion*)this; - const KSHORT nOldWidth = Width(); bPaintSpace = bPaintSpace && nFixWidth < nOldWidth; KSHORT nSpaceOffs = nFixWidth; pThis->Width( nFixWidth ); @@ -714,7 +738,6 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const else { SwTxtPaintInfo aInf( rInf ); - KSHORT nOffset = nOldWidth - nFixWidth; if( nOffset < nMinDist ) nOffset = 0; else @@ -723,7 +746,7 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const { nOffset /= 2; if( nOffset < nMinDist ) - nOffset = nOldWidth - nFixWidth - nMinDist; + nOffset = 2 * nOffset - nMinDist; } else nOffset -= nMinDist; diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index 0fe6b2d45964..f639d9e4ff88 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: porfly.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: fme $ $Date: 2002-08-27 13:40:00 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -679,7 +679,9 @@ void SwFlyCntPortion::SetBase( const Point &rBase, long nLnAscent, aDiff = Point( -aDiff.Y(), aDiff.X() ); } - pSdrObj->ImpSetAnchorPos( aAnchorBase ); + // There used to be a ImpSetAnchorPos here. Very dangerous + // for group object. + pSdrObj->NbcSetAnchorPos( aAnchorBase ); // #80046# here a Move() is necessary, a NbcMove() is NOT ENOUGH(!) pSdrObj->Move( Size( aDiff.X(), aDiff.Y() ) ); diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 080e71edac3a..6a93d0a72c4f 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -2,9 +2,9 @@ * * $RCSfile: porlay.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:28:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -566,16 +566,20 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, return; xub_StrLen nChg = nInvalidityPos; + // STRING_LEN means the data structure is up to date nInvalidityPos = STRING_LEN; + // this is the default direction + nDefaultDir = TEXT_LAYOUT_BIDI_STRONG != rOut.GetLayoutMode() ? + UBIDI_RTL : + UBIDI_LTR; + // counter for script info arrays USHORT nCnt = 0; // counter for compression information arrays USHORT nCntComp = 0; #ifdef BIDI - // counter for direction information arrays - USHORT nCntDir = 0; // counter for kashida array USHORT nCntKash = 0; #endif @@ -694,15 +698,13 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, aCompType.Remove( nCntComp, nCompRemove ); #ifdef BIDI - // remove invalid entries from direction information arrays - const USHORT nDirRemove = aDirChg.Count(); - aDirChg.Remove( 0, nDirRemove ); - aDirType.Remove( 0, nDirRemove ); - // get the start of the last kashida group - USHORT nLastKashida = 0; - if( nCntKash ) - nLastKashida = GetKashida( nCntKash - 1 ); + USHORT nLastKashida = nChg; + if( nCntKash && i18n::ScriptType::COMPLEX == nScript ) + { + --nCntKash; + nLastKashida = GetKashida( nCntKash ); + } // remove invalid entries from kashida array aKashida.Remove( nCntKash, aKashida.Count() - nCntKash ); @@ -803,7 +805,6 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, (BYTE)WEAK; } - // // UPDATE THE SCRIPT INFO ARRAYS: // @@ -913,6 +914,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, while ( aScanner.NextWord() ) { const XubString& rWord = aScanner.GetWord(); + xub_StrLen nIdx = 0; xub_StrLen nKashidaPos = STRING_LEN; xub_Unicode cCh; @@ -1019,41 +1021,71 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, } while ( TRUE ); -#ifdef BIDI - // Perform Unicode Bidi Algorithm for text direction information - nCnt = 0; - sal_Bool bLatin = sal_False; - sal_Bool bAsian = sal_False; - sal_Bool bComplex = sal_False; - - while( nCnt < CountScriptChg() ) +#ifndef PRODUCT + // check kashida data + long nTmpKashidaPos = -1; + sal_Bool bWrongKash = sal_False; + for ( USHORT i = 0; i < aKashida.Count(); ++i ) { - nScript = GetScriptType( nCnt++ ); - switch ( nScript ) + long nCurrKashidaPos = GetKashida( i ); + if ( nCurrKashidaPos <= nTmpKashidaPos ) { - case i18n::ScriptType::LATIN: - bLatin = sal_True; - break; - case i18n::ScriptType::ASIAN: - bAsian = sal_True; - break; - case i18n::ScriptType::COMPLEX: - bComplex = sal_True; + bWrongKash = sal_True; break; - default: - ASSERT( ! rTxt.Len(), "Wrong script found" ) } + nTmpKashidaPos = nCurrKashidaPos; } + ASSERT( ! bWrongKash, "Kashida array contains wrong data" ) +#endif - // this is the default direction - const BYTE nDefaultDir = TEXT_LAYOUT_BIDI_STRONG != rOut.GetLayoutMode() ? - UBIDI_RTL : - UBIDI_LTR; + // remove invalid entries from direction information arrays + if ( ! bBidiInfoValid ) + { + const USHORT nDirRemove = aDirChg.Count(); + aDirChg.Remove( 0, nDirRemove ); + aDirType.Remove( 0, nDirRemove ); + + // Perform Unicode Bidi Algorithm for text direction information + nCnt = 0; + sal_Bool bLatin = sal_False; + sal_Bool bAsian = sal_False; + sal_Bool bComplex = sal_False; - // do not call the unicode bidi algorithm if not required - if ( UBIDI_LTR == nDefaultDir && ! bComplex ) + while( nCnt < CountScriptChg() ) + { + nScript = GetScriptType( nCnt++ ); + switch ( nScript ) + { + case i18n::ScriptType::LATIN: + bLatin = sal_True; + break; + case i18n::ScriptType::ASIAN: + bAsian = sal_True; + break; + case i18n::ScriptType::COMPLEX: + bComplex = sal_True; + break; + default: + ASSERT( ! rTxt.Len(), "Wrong script found" ) + } + } + + // do not call the unicode bidi algorithm if not required + if ( UBIDI_LTR != nDefaultDir || bComplex ) + UpdateBidiInfo( rTxt ); + } +} + +void SwScriptInfo::UpdateBidiInfo( const String& rTxt ) +{ + if ( bBidiInfoValid ) return; + // remove invalid entries from direction information arrays + const USHORT nDirRemove = aDirChg.Count(); + aDirChg.Remove( 0, nDirRemove ); + aDirType.Remove( 0, nDirRemove ); + // // Bidi functions from icu 2.0 // @@ -1068,6 +1100,8 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, UTextOffset nStart = 0; UTextOffset nEnd; UBiDiLevel nCurrDir; + // counter for direction information arrays + USHORT nCntDir = 0; for ( USHORT nIdx = 0; nIdx < nCount; ++nIdx ) { @@ -1078,10 +1112,10 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, } ubidi_close( pBidi ); -#endif - + bBidiInfoValid = sal_True; } + /************************************************************************* * SwScriptInfo::NextScriptChg(..) * returns the position of the next character which belongs to another script @@ -1442,20 +1476,21 @@ USHORT SwScriptInfo::ThaiJustify( const XubString& rTxt, long* pKernArray, * SwScriptInfo::GetScriptInfo() *************************************************************************/ -const SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTxtNode& rTNd ) +SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTxtNode& rTNd, + sal_Bool bAllowInvalid ) { SwClientIter aClientIter( (SwTxtNode&)rTNd ); SwClient* pLast = aClientIter.GoStart(); - const SwScriptInfo* pScriptInfo = 0; + SwScriptInfo* pScriptInfo = 0; while( pLast ) { if ( pLast->ISA( SwTxtFrm ) ) { - pScriptInfo = ((SwTxtFrm*)pLast)->GetScriptInfo(); + pScriptInfo = (SwScriptInfo*)((SwTxtFrm*)pLast)->GetScriptInfo(); if ( pScriptInfo ) { - if ( STRING_LEN != pScriptInfo->GetInvalidity() ) + if ( ! bAllowInvalid && STRING_LEN != pScriptInfo->GetInvalidity() ) pScriptInfo = 0; else break; } diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 3f5dc5334842..9542d8a2e181 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pormulti.cxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.73 $ * - * last change: $Author: fme $ $Date: 2002-12-10 14:44:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2307,6 +2307,25 @@ BOOL SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, if ( ! rMulti.GetLen() ) lcl_TruncateMultiPortion( rMulti, rInf, nStartIdx ); + // If there is a HolePortion at the end of the bidi portion, + // it has to be moved behind the bidi portion. Otherwise + // the visual cursor travelling gets into trouble. + SwLineLayout& aRoot = rMulti.GetRoot(); + SwLinePortion* pPor = aRoot.GetFirstPortion(); + while ( pPor ) + { + if ( pPor->GetPortion() && pPor->GetPortion()->IsHolePortion() ) + { + SwLinePortion* pHolePor = pPor->GetPortion(); + pPor->SetPortion( NULL ); + aRoot.SetLen( aRoot.GetLen() - pHolePor->GetLen() ); + rMulti.SetLen( rMulti.GetLen() - pHolePor->GetLen() ); + rMulti.SetPortion( pHolePor ); + break; + } + pPor = pPor->GetPortion(); + } + pTmp = new SwBidiPortion( nMultiLen + rInf.GetIdx(), ((SwBidiPortion&)rMulti).GetLevel() ); } diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index b2d800e96f28..7377440cd2c2 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: portxt.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: fme $ $Date: 2002-10-23 14:54:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -420,8 +420,9 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) else if ( aGuess.BreakPos() >= rInf.GetIdx() && aGuess.BreakPos() != STRING_LEN ) { // case B1 - if( aGuess.HyphWord().is() && ( aGuess.BreakPos() > rInf.GetIdx() || - ( rInf.GetLast() && ! rInf.GetLast()->IsFlyPortion() ) ) ) + if( aGuess.HyphWord().is() && aGuess.BreakPos() > rInf.GetLineStart() + && ( aGuess.BreakPos() > rInf.GetIdx() || + ( rInf.GetLast() && ! rInf.GetLast()->IsFlyPortion() ) ) ) { CreateHyphen( rInf, aGuess ); if ( rInf.GetFly() ) @@ -667,6 +668,7 @@ xub_StrLen SwTxtPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf, ((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin ); nCnt += lcl_AddSpace( rInf, &aStr, *this ); + nPos = aStr.Len(); } } else if( !IsDropPortion() ) diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx index 5faa3b49ebfe..574b1fb9e16b 100644 --- a/sw/source/core/text/txtcache.cxx +++ b/sw/source/core/text/txtcache.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtcache.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mh $ $Date: 2001-10-25 17:18:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,6 +66,7 @@ #pragma hdrstop #include "errhdl.hxx" +#include "segmentc.hxx" #include "txtcache.hxx" #include "txtfrm.hxx" diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 4a1c5966c290..c7a5547e2d15 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfly.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: aw $ $Date: 2002-10-30 15:13:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1227,8 +1227,6 @@ void SwTxtFly::DrawFlyRect( OutputDevice *pOut, const SwRect &rRect, if( bOn && ( 0 != ( nCount = GetFlyList()->Count() ) ) ) { MSHORT nHellId = pPage->GetShell()->GetDoc()->GetHellId(); - Size aPixelSz = Size( 1, 1 ); - aPixelSz = pOut->PixelToLogic( aPixelSz ); for( MSHORT i = 0; i < nCount; ++i ) { const SdrObject *pTmp = (*pFlyList)[ i ]; @@ -1238,12 +1236,20 @@ void SwTxtFly::DrawFlyRect( OutputDevice *pOut, const SwRect &rRect, ((SwContact*)GetUserCall(pTmp))->GetFmt(); const SwFmtSurround &rSur = pFmt->GetSurround(); - if( ( SURROUND_THROUGHT == rSur.GetSurround() ) ? - pTmp->GetLayer() != nHellId : !rSur.IsContour() ) + // OD 24.01.2003 #106593# - correct clipping of fly frame area. + // Consider that fly frame background/shadow can be transparent + // and <SwAlignRect(..)> fly frame area + const SwFlyFrm *pFly = static_cast<const SwVirtFlyDrawObj*>(pTmp)->GetFlyFrm(); + bool bClipFlyArea = + ( (SURROUND_THROUGHT == rSur.GetSurround()) ? + (pTmp->GetLayer() != nHellId) : !rSur.IsContour() ) && + !pFly->IsBackgroundTransparent() && + !pFly->IsShadowTransparent(); + if ( bClipFlyArea ) { SwRect aFly( pTmp->GetBoundRect() ); - aFly.Left( aFly.Left() - aPixelSz.Width() ); - aFly.Top( aFly.Top() - aPixelSz.Height() ); + // OD 24.01.2003 #106593# + ::SwAlignRect( aFly, pPage->GetShell() ); if( aFly.Width() > 0 && aFly.Height() > 0 ) aRegion -= aFly; } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 3d6037e8282a..a217a3e1d0c1 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfrm.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: od $ $Date: 2002-12-10 14:02:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -786,6 +786,11 @@ void SwTxtFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) Prepare( PREP_CLEAR ); _InvalidatePrt(); SET_WRONG( 0, STRING_LEN, Invalidate ); + SetDerivedR2L( sal_False ); + CheckDirChange(); + // OD 09.12.2002 #105576# - Force complete paint due to existing + // indents. + SetCompletePaint(); InvalidateLineNum(); } return; @@ -1750,7 +1755,8 @@ SwTestFormat::SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPre, SwTwips nMaxHe (pFrm->Prt().*fnRect->fnGetTop)() - nLower ) ); (pFrm->Prt().*fnRect->fnSetWidth)( (pFrm->Frm().*fnRect->fnGetWidth)() - - ( rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight() ) ); + // OD 23.01.2003 #106895# - add 1st param to <SwBorderAttrs::CalcRight(..)> + ( rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight( pFrm ) ) ); pOldPara = pFrm->HasPara() ? pFrm->GetPara() : NULL; pFrm->SetPara( new SwParaPortion(), sal_False ); diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index e75f1e92a1ff..f2ef21592abc 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtftn.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: od $ $Date: 2002-11-11 09:43:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,6 +77,9 @@ #ifndef _TXTFTN_HXX //autogen #include <txtftn.hxx> #endif +#ifndef _FLYFRM_HXX +#include <flyfrm.hxx> +#endif #ifndef _FMTFTN_HXX //autogen #include <fmtftn.hxx> #endif @@ -86,12 +89,18 @@ #ifndef _CHARFMT_HXX //autogen #include <charfmt.hxx> #endif +#ifndef _DFLYOBJ_HXX +#include <dflyobj.hxx> +#endif #ifndef _SVX_BRSHITEM_HXX //autogen #include <svx/brshitem.hxx> #endif #ifndef _SVX_CHARROTATEITEM_HXX #include <svx/charrotateitem.hxx> #endif +#ifndef _SVDOBJ_HXX //autogen +#include <svx/svdobj.hxx> +#endif #ifndef _BREAKIT_HXX #include <breakit.hxx> #endif @@ -973,9 +982,43 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf, nLower += nAdd; #endif - //6995: Wir frischen nur auf. Das Connect tut fuer diesen Fall nix - //Brauchbares, sondern wuerde stattdessen fuer diesen Fall meist die - //Ftn wegwerfen und neu erzeugen. + // #i10770#: If there are fly frames anchored at previous paragraphs, + // the deadline should consider their lower borders. + SwFrm* pStartFrm = pFrm->GetUpper()->GetLower(); + ASSERT( pStartFrm, "Upper has no lower" ) + SwTwips nFlyLower = bVert ? LONG_MAX : 0; + while ( pStartFrm != pFrm ) + { + ASSERT( pStartFrm, "Frame chain is broken" ) + if ( pStartFrm->GetDrawObjs() ) + { + const SwDrawObjs &rObjs = *pStartFrm->GetDrawObjs(); + for ( USHORT i = 0; i < rObjs.Count(); ++i ) + { + SdrObject *pO = rObjs[i]; + SwRect aRect( pO->GetBoundRect() ); + + if ( ! pO->IsWriterFlyFrame() || + ((SwVirtFlyDrawObj*)pO)->GetFlyFrm()->IsValid() ) + { + const SwTwips nBottom = (aRect.*fnRect->fnGetBottom)(); + if ( (*fnRect->fnYDiff)( nBottom, nFlyLower ) > 0 ) + nFlyLower = nBottom; + } + } + } + + pStartFrm = pStartFrm->GetNext(); + } + + if ( bVert ) + nLower = Min( nLower, nFlyLower ); + else + nLower = Max( nLower, nFlyLower ); + + //6995: Wir frischen nur auf. Das Connect tut fuer diesen Fall nix + //Brauchbares, sondern wuerde stattdessen fuer diesen Fall meist die + //Ftn wegwerfen und neu erzeugen. if( !rInf.IsQuick() ) pFrm->ConnectFtn( pFtn, nLower ); diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx index ee23f6fa9a3c..6a96c0b43496 100644 --- a/sw/source/core/text/txtio.cxx +++ b/sw/source/core/text/txtio.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtio.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: fme $ $Date: 2001-10-19 08:38:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,7 +100,7 @@ // So kann man die Layoutstruktur ausgeben lassen // #define AMA_LAYOUT #ifdef AMA_LAYOUT -#include <stdio.h> // sprintf +#include <stdio.h> #include <stdlib.h> // getenv() #include <flowfrm.hxx> #include <pagefrm.hxx> @@ -290,9 +290,9 @@ void LayOutPut( const SwFrm* pFrm ) // fuer dieses new wird es kein delete geben. pOutName = new char[nLen + strlen(pName) + 3]; if(nLen && (pPath[nLen-1] == '\\') || (pPath[nLen-1] == '/')) - sprintf( pOutName, "%s%s", pPath, pName ); + snprintf( pOutName, sizeof(pOutName), "%s%s", pPath, pName ); else - sprintf( pOutName, "%s/%s", pPath, pName ); + snprintf( pOutName, sizeof(pOutName), "%s/%s", pPath, pName ); } } SvFileStream aStream( pOutName, (bFirstOpen diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index f4b2fecaadff..660b8b743e66 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txttab.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: fme $ $Date: 2002-11-22 12:30:24 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,8 +158,10 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf ) const konvertiert (vgl. rInf.GetTabPos). */ const SwTwips nTabLeft = pFrm->Frm().Left() + - pFrm->GetAttrSet()->GetLRSpace().GetTxtLeft(); - // + KSHORT(pFrm->GetTxtNode()->GetLeftMarginWithNum( sal_True )); + ( pFrm->IsRightToLeft() ? + pFrm->GetAttrSet()->GetLRSpace().GetRight() : + pFrm->GetAttrSet()->GetLRSpace().GetTxtLeft() ); + const SwTwips nLinePos = GetLeftMargin(); const SwTwips nLineTab = nLinePos + nTabPos; SwTwips nRight = Right(); @@ -197,14 +199,11 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf ) const } SwTwips nCount = nLineTab; nCount -= nTabLeft; - // Bei negativen Werten rundet "/" auf, "%" liefert negative Reste, // bei positiven Werten rundet "/" ab, "%" liefert positvie Reste! - if ( nCount < 0 ) - nCount = 0; - + KSHORT nPlus = nCount < 0 ? 0 : 1; nCount /= nDefTabDist; - nNextPos = ( nCount + 1 ) * nDefTabDist ; + nNextPos = ( nCount + nPlus ) * nDefTabDist ; if( nNextPos + nTabLeft <= nLineTab + 50 ) nNextPos += nDefTabDist; cFill = 0; @@ -458,8 +457,8 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const #ifndef PRODUCT // Wir wollen uns die Fixbreite anzeigen if( rInf.OnWin() && OPTDBG( rInf ) && - !rInf.GetOpt().IsPagePreview() && - !rInf.GetOpt().IsReadonly() && + !rInf.GetOpt().IsPagePreview() && \ + !rInf.GetOpt().IsReadonly() && \ SwViewOption::IsFieldShadings() ) { const KSHORT nWidth = PrtWidth(); diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 27f7206c2c6e..9bcdc42a01af 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txmsrt.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: os $ $Date: 2002-10-30 10:38:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -754,7 +754,8 @@ void SwTOXPara::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT ) const ++nStt; */ pSrc->GetExpandTxt( rNd, &rInsPos, nStt, - nEndIndex == STRING_LEN ? STRING_LEN : nEndIndex - nStt ); + nEndIndex == STRING_LEN ? STRING_LEN : nEndIndex - nStt, + FALSE, FALSE ); } else { @@ -797,12 +798,14 @@ String SwTOXPara::GetURL() const { // dann noch die rel. Nummer davor setzen const SwNumRule& rRule = *pNd->GetDoc()->GetOutlineNumRule(); - for( int n = 0; n <= pNum->GetLevel(); ++n ) - { - int nNum = pNum->GetLevelVal()[ n ]; - nNum -= ( rRule.Get( n ).GetStart() - 1 ); - ( aTxt += String::CreateFromInt32( nNum )) += '.'; - } + const USHORT nCurrLevel = pNum->GetLevel(); + if(nCurrLevel <= MAXLEVEL) + for( int n = 0; n <= nCurrLevel; ++n ) + { + int nNum = pNum->GetLevelVal()[ n ]; + nNum -= ( rRule.Get( n ).GetStart() - 1 ); + ( aTxt += String::CreateFromInt32( nNum )) += '.'; + } } aTxt += ((SwTxtNode*)pNd)->GetExpandTxt(); ( aTxt += cMarkSeperator ).AppendAscii( pMarkToOutline ); diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index fcbe545373b0..08dab4445c88 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fntcache.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: fme $ $Date: 2002-12-05 10:06:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -746,9 +746,6 @@ BYTE lcl_WhichPunctuation( xub_Unicode cChar ) void SwFntObj::DrawText( SwDrawTextInfo &rInf ) { - - -static sal_Char __READONLY_DATA sDoubleSpace[] = " "; BOOL bPrt = OUTDEV_PRINTER == rInf.GetOut().GetOutDevType(); Font* pTmpFont = bPrt ? pPrtFont : GetScrFont(); @@ -1038,9 +1035,10 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " "; // handelt, muessen wir zwei ausgeben: if( 1 == rInf.GetLen() ) { - pKernArray[0] = nSpaceAdd; - rInf.GetOut().DrawTextArray( aPos, XubString( sDoubleSpace, - RTL_TEXTENCODING_MS_1252 ), pKernArray, 0, 2 ); + pKernArray[0] = rInf.GetWidth() + nSpaceAdd; + + rInf.GetOut().DrawTextArray( aPos, rInf.GetText(), + pKernArray, rInf.GetIdx(), 1 ); } else { @@ -1248,16 +1246,6 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " "; xub_Unicode cBulletChar = CH_BULLET; - if ( rInf.GetFont() ) - { - // Some Asian fonts do not have the middot (0xB7), - // others do not have the Asian middot (0xFF65). - // Until we find a better solution we do not paint - // middots with Asian fonts. - if ( SW_CJK == rInf.GetFont()->GetActual() ) - cBulletChar = CH_BLANK; // 0xFF65; - } - for( xub_StrLen i = 0; i < aStr.Len(); ++i ) if( CH_BLANK == aStr.GetChar( i ) ) aStr.SetChar( i, cBulletChar ); @@ -1284,7 +1272,7 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " "; // im Blocksatz handelt, muessen wir zwei ausgeben: if ( ( nCnt == 1 ) && rInf.GetSpace() && ( cChPrev == CH_BLANK ) ) { - pKernArray[0] = rInf.GetSpace() + rInf.GetKern(); + pKernArray[0] = rInf.GetWidth() + rInf.GetSpace() + rInf.GetKern(); #ifdef BIDI if ( bSwitchL2R ) @@ -1294,8 +1282,8 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " "; if ( bSwitchH2V ) rInf.GetFrm()->SwitchHorizontalToVertical( aPos ); - rInf.GetOut().DrawTextArray( aPos, XubString( sDoubleSpace, - RTL_TEXTENCODING_MS_1252 ), pKernArray, 0, 2 ); + rInf.GetOut().DrawTextArray( aPos, rInf.GetText(), + pKernArray, rInf.GetIdx(), 1 ); if( bBullet ) rInf.GetOut().DrawTextArray( aPos, *pStr, pKernArray, rInf.GetIdx() ? 1 : 0, 1 ); @@ -1829,10 +1817,10 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) rInf.GetpOut()->GetTextArray( rInf.GetText(), pKernArray, rInf.GetIdx(), rInf.GetLen() ); + const SwScriptInfo* pSI = rInf.GetScriptInfo(); if ( rInf.GetFont() && rInf.GetLen() ) { const BYTE nActual = rInf.GetFont()->GetActual(); - const SwScriptInfo* pSI = rInf.GetScriptInfo(); // Kana Compression if ( SW_CJK == nActual && rInf.GetKanaComp() && pSI && pSI->CountCompChg() ) @@ -1968,9 +1956,12 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) // step back if position is before the middle of the character if ( nIdx > rInf.GetIdx() && ( nRight > long( rInf.GetOfst() ) ) && ( nRight - rInf.GetOfst() > rInf.GetOfst() - nLeft ) ) - nCnt = nLastIdx - rInf.GetIdx(); + nCnt = nLastIdx - rInf.GetIdx(); // first half else - nCnt = nIdx - rInf.GetIdx(); + nCnt = nIdx - rInf.GetIdx(); // second half + + if ( pSI ) + rInf.SetCursorBidiLevel( pSI->DirType( nLastIdx ) ); delete[] pKernArray; return nCnt; diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 663645a0b8dd..7972a16ab20f 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fntcap.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: fme $ $Date: 2002-06-19 07:43:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,6 +90,9 @@ #ifndef _BREAKIT_HXX #include <breakit.hxx> #endif +#ifndef _TXTFRM_HXX +#include <txtfrm.hxx> // SwTxtFrm +#endif using namespace ::com::sun::star::i18n; @@ -293,11 +296,25 @@ void SwDoDrawCapital::Do() void SwDoDrawCapital::DrawSpace( Point &rPos ) { static sal_Char __READONLY_DATA sDoubleSpace[] = " "; - const USHORT nDiff = (USHORT)( rInf.GetPos().X() - rPos.X() ); + + long nDiff = rInf.GetPos().X() - rPos.X(); + + Point aPos( rPos ); +#ifdef BIDI + if ( rInf.GetFrm()->IsRightToLeft() ) + { + rInf.GetFrm()->SwitchLTRtoRTL( aPos ); + nDiff = -nDiff; + } +#endif + + if ( rInf.GetFrm()->IsVertical() ) + rInf.GetFrm()->SwitchHorizontalToVertical( aPos ); + if ( nDiff ) { rInf.ApplyAutoColor(); - GetOut()->DrawStretchText( rPos, nDiff, + GetOut()->DrawStretchText( aPos, nDiff, XubString( sDoubleSpace, RTL_TEXTENCODING_MS_1252 ), 0, 2 ); } rPos.X() = rInf.GetPos().X() + rInf.GetWidth(); diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index e20d1ab1828d..56d5eb9d3c7c 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndtxt.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: od $ $Date: 2002-11-11 09:37:58 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2603,7 +2603,8 @@ XubString SwTxtNode::GetExpandTxt( const xub_StrLen nIdx, const xub_StrLen nLen, } BOOL SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx, - xub_StrLen nIdx, xub_StrLen nLen, BOOL bWithNum ) const + xub_StrLen nIdx, xub_StrLen nLen, BOOL bWithNum, + BOOL bWithFtn ) const { if( &rDestNd == this ) return FALSE; @@ -2669,26 +2670,29 @@ BOOL SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx, case RES_TXTATR_FTN: { - const SwFmtFtn& rFtn = pHt->GetFtn(); - XubString sExpand; - if( rFtn.GetNumStr().Len() ) - sExpand = rFtn.GetNumStr(); - else if( rFtn.IsEndNote() ) - sExpand = GetDoc()->GetEndNoteInfo().aFmt. - GetNumStr( rFtn.GetNumber() ); - else - sExpand = GetDoc()->GetFtnInfo().aFmt. - GetNumStr( rFtn.GetNumber() ); - if( sExpand.Len() ) + if ( bWithFtn ) { - aDestIdx++; // dahinter einfuegen; - rDestNd.Insert( SvxEscapementItem( - SVX_ESCAPEMENT_SUPERSCRIPT ), - aDestIdx.GetIndex(), - aDestIdx.GetIndex() ); - rDestNd.Insert( sExpand, aDestIdx, INS_EMPTYEXPAND ); - aDestIdx = nInsPos + nAttrStartIdx; - nInsPos += sExpand.Len(); + const SwFmtFtn& rFtn = pHt->GetFtn(); + XubString sExpand; + if( rFtn.GetNumStr().Len() ) + sExpand = rFtn.GetNumStr(); + else if( rFtn.IsEndNote() ) + sExpand = GetDoc()->GetEndNoteInfo().aFmt. + GetNumStr( rFtn.GetNumber() ); + else + sExpand = GetDoc()->GetFtnInfo().aFmt. + GetNumStr( rFtn.GetNumber() ); + if( sExpand.Len() ) + { + aDestIdx++; // dahinter einfuegen; + rDestNd.Insert( SvxEscapementItem( + SVX_ESCAPEMENT_SUPERSCRIPT ), + aDestIdx.GetIndex(), + aDestIdx.GetIndex() ); + rDestNd.Insert( sExpand, aDestIdx, INS_EMPTYEXPAND ); + aDestIdx = nInsPos + nAttrStartIdx; + nInsPos += sExpand.Len(); + } } rDestNd.Erase( aDestIdx, 1 ); --nInsPos; diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index c431f90abbc0..46541b9f3ee7 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swfont.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 09:42:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -290,9 +290,9 @@ void SwFont::SetVertical( USHORT nDir, const BOOL bVertFormat ) if( nDir != aSub[0].GetOrientation() ) { bFntChg = TRUE; - aSub[0].SetVertical( nDir ); - aSub[1].SetVertical( nDir ); - aSub[2].SetVertical( nDir ); + aSub[0].SetVertical( nDir, bVertFormat ); + aSub[1].SetVertical( nDir, bVertFormat || nDir > 1000 ); + aSub[2].SetVertical( nDir, bVertFormat ); } } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 9cd61f51517d..88181432f21f 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtedt.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: fme $ $Date: 2002-11-07 09:44:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,7 @@ #include <stdlib.h> // getenv() #include <time.h> // clock() #include "viewsh.hxx" // ViewShell::GetHyphenator + #include <tools/stream.hxx> #endif #ifndef _HINTIDS_HXX @@ -561,8 +562,30 @@ BOOL SwScanner::NextWord() else bStart = FALSE; - nBegin = (xub_StrLen)aBound.startPos; - nLen = aBound.endPos - nBegin; + // restrict boundaries to script boundaries and nEndPos + const USHORT nCurrScript = + pBreakIt->xBreak->getScriptType( rText, nBegin ); + + // restrict word end to next script change position + ASSERT( aBound.endPos >= nBegin, "SwScanner is getting into trouble" ) + XubString aTmpWord = rText.Copy( nBegin, aBound.endPos - nBegin ); + long nScriptEnd = nBegin + + pBreakIt->xBreak->endOfScript( aTmpWord, 0, nCurrScript ); + long nEnd = Min( aBound.endPos, nScriptEnd ); + + // restrict word start to last script change position + long nScriptBegin = aBound.startPos; + if ( aBound.startPos < nBegin ) + { + // search from nBegin backwards until the next script change + aTmpWord = rText.Copy( aBound.startPos, nBegin - aBound.startPos + 1 ); + nScriptBegin = aBound.startPos + + pBreakIt->xBreak->beginOfScript( aTmpWord, nBegin - aBound.startPos, + nCurrScript ); + } + + nBegin = Max( aBound.startPos, nScriptBegin ); + nLen = nEnd - nBegin; if( ! nLen ) return FALSE; @@ -1304,12 +1327,12 @@ void SwLinguStatistik::Flush() // fuer dieses new wird es kein delete geben. pLogName = new char[nLen + strlen(pName) + 3]; if(nLen && (pPath[nLen-1] == '\\') || (pPath[nLen-1] == '/')) - sprintf( pLogName, "%s%s", pPath, pName ); + snprintf( pLogName, sizeof(pLogName), "%s%s", pPath, pName ); else - sprintf( pLogName, "%s/%s", pPath, pName ); + snprintf( pLogName, sizeof(pLogName), "%s/%s", pPath, pName ); } } - SvFileStream aStream( pLogName, (bFirstOpen + SvFileStream aStream( String::CreateFromAscii(pLogName), (bFirstOpen ? STREAM_WRITE | STREAM_TRUNC : STREAM_WRITE )); @@ -1347,7 +1370,7 @@ void SwLinguStatistik::Flush() nWords = nWrong = nAlter = nSynonym = nNoSynonym = nHyphens = nNoHyph = nHyphErr = nSpellTime = nTheTime = nHyphTime = 0; - pThes = NULL; + //pThes = NULL; #endif } diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index e19576fe1680..e7099d5c023a 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swunohelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: jp $ $Date: 2001-10-18 11:42:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -255,6 +255,33 @@ BOOL UCB_IsReadOnlyFileName( const String& rURL ) return bIsReadOnly; } +BOOL UCB_IsFile( const String& rURL ) +{ + BOOL bExists = FALSE; + try + { + ::ucb::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() ); + bExists = aContent.isDocument(); + } + catch (UNO_NMSPC::Exception &) + { + } + return bExists; +} + +BOOL UCB_IsDirectory( const String& rURL ) +{ + BOOL bExists = FALSE; + try + { + ::ucb::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() ); + bExists = aContent.isFolder(); + } + catch (UNO_NMSPC::Exception &) + { + } + return bExists; +} // get a list of files from the folder of the URL // options: pExtension = 0 -> all, else this specific extension diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index e5804c3f02e5..f6f8739651b0 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unocrsrhelper.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: os $ $Date: 2002-11-05 08:42:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -165,6 +165,9 @@ #ifndef _DOC_HXX //autogen #include <doc.hxx> #endif +#ifndef _FCHRFMT_HXX +#include <fchrfmt.hxx> +#endif #ifndef _SVX_FLSTITEM_HXX //autogen #include <svx/flstitem.hxx> #endif @@ -174,6 +177,9 @@ #ifndef _CTRLTOOL_HXX #include <svtools/ctrltool.hxx> #endif +#define _SVSTDARR_USHORTS +#define _SVSTDARR_USHORTSSORT +#include <svtools/svstdarr.hxx> #ifndef _SFX_DOCFILT_HACK_HXX //autogen #include <sfx2/docfilt.hxx> #endif @@ -493,6 +499,67 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertyMap* pMap eNewState = PropertyState_DEFAULT_VALUE; } break; + case FN_UNO_CHARFMT_SEQUENCE: + { + + SwTxtNode* pTxtNode; + if((pTxtNode = (SwTxtNode*)rPam.GetNode( TRUE )) == rPam.GetNode(FALSE) && + pTxtNode->GetpSwpHints()) + { + USHORT nPaMStart = rPam.GetPoint()->nContent.GetIndex(); + USHORT nPaMEnd = rPam.GetMark() ? rPam.GetMark()->nContent.GetIndex() : nPaMStart; + if(nPaMStart > nPaMEnd) + { + USHORT nTmp = nPaMStart; + nPaMStart = nPaMEnd; + nPaMEnd = nTmp; + } + Sequence< ::rtl::OUString> aCharStyles; + USHORT nCharStylesFound = 0; + SwpHints* pHints = pTxtNode->GetpSwpHints(); + for(USHORT nAttr = 0; nAttr < pHints->GetStartCount(); nAttr++ ) + { + SwTxtAttr* pAttr = pHints->GetStart( nAttr ); + if(pAttr->Which() != RES_TXTATR_CHARFMT) + continue; + USHORT nAttrStart = *pAttr->GetStart(); + USHORT nAttrEnd = *pAttr->GetEnd(); + //check if the attribute touches the selection + if(nAttrEnd > nPaMStart && nAttrStart < nPaMEnd && nAttrEnd > nPaMStart) + { + //check for overlapping + if(nAttrStart > nPaMStart || + nAttrEnd < nPaMEnd) + { + aCharStyles.realloc(0); + eNewState = PropertyState_AMBIGUOUS_VALUE; + break; + } + else + { + //now the attribute should start before or at the selection + //and it should end at the end of the selection or behind + DBG_ASSERT(nAttrStart <= nPaMStart && nAttrEnd >=nPaMEnd, + "attribute overlaps or is outside"); + //now the name of the style has to be added to the sequence + aCharStyles.realloc(aCharStyles.getLength() + 1); + DBG_ASSERT(pAttr->GetCharFmt().GetCharFmt(), "no character format set"); + aCharStyles.getArray()[aCharStyles.getLength() - 1] = + SwStyleNameMapper::GetProgName( + pAttr->GetCharFmt().GetCharFmt()->GetName(), GET_POOLID_CHRFMT); + } + } + + } + if(aCharStyles.getLength()) + eNewState = PropertyState_DIRECT_VALUE; + if(pAny) + (*pAny) <<= aCharStyles; + } + else + eNewState = PropertyState_DEFAULT_VALUE; + } + break; case RES_TXTATR_CHARFMT: // kein break hier! default: bDone = sal_False; @@ -694,6 +761,13 @@ void resetCrsrPropertyValue(const SfxItemPropertyMap* pMap, SwPaM& rPam) case FN_UNO_NUM_RULES: // lcl_setNumberingProperty(aValue, pUnoCrsr); break; + case FN_UNO_CHARFMT_SEQUENCE: + { + SvUShortsSort aWhichIds; + aWhichIds.Insert(RES_TXTATR_CHARFMT); + pDoc->ResetAttr(rPam, sal_True, &aWhichIds); + } + break; } } /* -----------------21.07.98 11:36------------------- diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 64ba2e37357b..74d554d44556 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unodraw.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: tl $ $Date: 2002-10-30 13:03:24 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1048,7 +1048,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a if(!bDone) throw IllegalArgumentException(); } - else if(RES_OPAQUE == pMap->nWID) + else if(RES_OPAQUE == pMap->nWID) { SvxShape* pSvxShape = GetSvxShape(); DBG_ASSERT(pSvxShape, "No SvxShape found!") @@ -1177,7 +1177,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) aRet.setValue(&bOpaque, ::getBooleanCppuType()); } } - if(FN_ANCHOR_POSITION == pMap->nWID) + else if(FN_ANCHOR_POSITION == pMap->nWID) { SvxShape* pSvxShape = GetSvxShape(); DBG_ASSERT(pSvxShape, "No SvxShape found!") diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 5f01460de16c..2de8a9764ffe 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unofield.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: dvo $ $Date: 2002-11-21 15:31:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1309,6 +1309,8 @@ void SwXTextField::attachTextFieldMaster(const uno::Reference< XPropertySet > & if(!m_bIsDescriptor) throw uno::RuntimeException(); uno::Reference< XUnoTunnel > xMasterTunnel(xFieldMaster, uno::UNO_QUERY); + if (!xMasterTunnel.is()) + throw IllegalArgumentException(); SwXFieldMaster* pMaster = (SwXFieldMaster*)xMasterTunnel->getSomething( SwXFieldMaster::getUnoTunnelId()); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index c739dbcb6a85..660c63817a0b 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoframe.cxx,v $ * - * $Revision: 1.74 $ + * $Revision: 1.75 $ * - * last change: $Author: mib $ $Date: 2002-11-26 12:35:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -264,6 +264,10 @@ #include <svx/frmdiritem.hxx> #endif +#include <so3/outplace.hxx> + +// from fefly1.cxx +extern sal_Bool lcl_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ); using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1203,9 +1207,28 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a SwFrmFmt *pFrmFmt = lcl_GetFrmFmt( aValue, pFmt->GetDoc() ); if( pFrmFmt ) { -// pSh->SetFrmFmt( pStyle->GetFrmFmt() ); UnoActionContext aAction(pFmt->GetDoc()); - pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt ); + + // see SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocPos ) + SwFlyFrm *pFly = 0; + const SwFrmFmt* pFmtXX = pFmt; + if (PTR_CAST(SwFlyFrmFmt, pFmtXX)) + pFly = ((SwFlyFrmFmt*)pFmtXX)->GetFrm(); + SfxItemSet* pSet = 0; + if (pFly) + { + const SfxPoolItem* pItem; + if( SFX_ITEM_SET == pFrmFmt->GetItemState( RES_ANCHOR, sal_False, &pItem )) + { + pSet = new SfxItemSet( pDoc->GetAttrPool(), aFrmFmtSetRange ); + pSet->Put( *pItem ); + if( !::lcl_ChkAndSetNewAnchor( *pFly, *pSet )) + delete pSet, pSet = 0; + } + } + + pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt, pSet, FALSE ); + delete pSet; } else throw IllegalArgumentException(); @@ -1440,7 +1463,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) } else if(pFmt) { - if(eType == FLYCNTTYPE_GRF && + if( ((eType == FLYCNTTYPE_GRF) || (eType == FLYCNTTYPE_OLE)) && pCur && ((pCur->nWID >= RES_GRFATR_BEGIN && pCur->nWID < RES_GRFATR_END )|| @@ -2239,10 +2262,14 @@ uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL SwXTextFrame::getTypes( ) ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) throw(RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } /*-- 11.12.98 15:23:03--------------------------------------------------- @@ -2579,10 +2606,14 @@ uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXTextGraphicObject::getImplementationId( ) throw(RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } /*-- 11.12.98 16:02:27--------------------------------------------------- @@ -2755,10 +2786,14 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextEmbeddedObject::getTypes( ) throw(Ru ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXTextEmbeddedObject::getImplementationId( ) throw(RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } /*-- 11.12.98 16:16:54--------------------------------------------------- @@ -2802,6 +2837,8 @@ void SwXTextEmbeddedObject::removeEventListener(const uno::Reference< XEventList -----------------------------------------------------------------------*/ +static uno::Reference< util::XModifyListener > xSwXOLEListener; + uno::Reference< XComponent > SwXTextEmbeddedObject::getEmbeddedObject(void) throw( RuntimeException ) { uno::Reference< XComponent > xRet; @@ -2831,18 +2868,21 @@ uno::Reference< XComponent > SwXTextEmbeddedObject::getEmbeddedObject(void) thr uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY); if( xBrdcst.is() ) { - SwClientIter aIter( *pFmt ); - SwXOLEListener* pListener = (SwXOLEListener*)aIter. - First( TYPE( SwXOLEListener )); - //create a new one if the OLE object doesn't have one already - if( !pListener ) - { - uno::Reference< util::XModifyListener > xOLEListener = new SwXOLEListener(*pFmt, xModel); - xBrdcst->addModifyListener( xOLEListener ); - } + SwXOLEListener* pSwOLEListener = (SwXOLEListener*) + xSwXOLEListener.get(); + if( !pSwOLEListener ) + xSwXOLEListener = pSwOLEListener = new SwXOLEListener; + if( pSwOLEListener->AddOLEFmt( *pFmt ) ) + xBrdcst->addModifyListener( xSwXOLEListener ); } } } + else + { + SvOutPlaceObjectRef xOut( pOleNode->GetOLEObj().GetOleRef() ); + if ( xOut.Is() ) + xRet = xOut->GetUnoComponent(); + } } } return xRet; @@ -2903,41 +2943,16 @@ uno::Reference<container::XNameReplace> SAL_CALL /****************************************************************** * ******************************************************************/ -TYPEINIT1(SwXOLEListener, SwClient); -/* -----------------------------18.01.2002 09:59------------------------------ - - ---------------------------------------------------------------------------*/ -SwXOLEListener::SwXOLEListener( SwFmt& rOLEFmt, uno::Reference< XModel > xOLE) : - SwClient(&rOLEFmt), - xOLEModel(xOLE) -{ -} -/* -----------------------------18.01.2002 09:59------------------------------ - - ---------------------------------------------------------------------------*/ -SwXOLEListener::~SwXOLEListener() -{} void SwXOLEListener::modified( const EventObject& rEvent ) throw( RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); - SwOLENode* pNd = 0; - SwFmt* pFmt = GetFmt(); - if(pFmt) - {const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx(); - if(pIdx) - { - SwNodeIndex aIdx(*pIdx, 1); - SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode(); - pNd = pNoTxt->GetOLENode(); - } - } - if(!pNd) - throw RuntimeException(); - if( !pNd->GetOLEObj().IsOleRef() || - !pNd->GetOLEObj().GetOleRef()->GetProtocol().IsInPlaceActive() ) + SwOLENode* pNd; + sal_uInt16 nFndPos = FindEntry( rEvent, &pNd ); + if( USHRT_MAX != nFndPos && ( !pNd->GetOLEObj().IsOleRef() || + !pNd->GetOLEObj().GetOleRef()->GetProtocol().IsInPlaceActive() )) { // if the OLE-Node is UI-Active do nothing pNd->SetOLESizeInvalid( sal_True ); @@ -2954,27 +2969,156 @@ void SwXOLEListener::disposing( const EventObject& rEvent ) uno::Reference< util::XModifyListener > xListener( this ); + SwOLENode* pNd; + sal_uInt16 nFndPos = FindEntry( rEvent, &pNd ); + if( USHRT_MAX != nFndPos ) + { + SwDepend* pDepend = (SwDepend*)aFmts[ nFndPos ]; + aFmts.Remove( nFndPos, 1 ); - uno::Reference< frame::XModel > xModel( rEvent.Source, uno::UNO_QUERY ); - uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY); + uno::Reference< frame::XModel > xModel( rEvent.Source, uno::UNO_QUERY ); + uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY); - try - { if( xBrdcst.is() ) xBrdcst->removeModifyListener( xListener ); + + delete pDepend; + if( !aFmts.Count() ) + { + // we are the last? + // then can we delete us + xSwXOLEListener = 0; + } } - catch(Exception& rEx) +} +/* --------------------------------------------------------------------------- + + ---------------------------------------------------------------------------*/ +sal_Bool SwXOLEListener::AddOLEFmt( SwFrmFmt& rFmt ) +{ + for( sal_uInt16 n = 0, nCnt = aFmts.Count(); n < nCnt; ++n ) + if( &rFmt == ((SwDepend*)aFmts[ n ])->GetRegisteredIn() ) + return sal_False; // is in the array + + SwDepend* pNew = new SwDepend( this, &rFmt ); + aFmts.Insert( pNew, aFmts.Count() ); + return sal_True; +} +/* --------------------------------------------------------------------------- + + ---------------------------------------------------------------------------*/ +void SwXOLEListener::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) +{ + const SwClient* pClient = 0; + + switch( pOld ? pOld->Which() : 0 ) { - DBG_ERROR("OLE Listener couldn't be removed") + case RES_REMOVE_UNO_OBJECT: + case RES_OBJECTDYING: + pClient = (SwClient*)((SwPtrMsgPoolItem *)pOld)->pObject; + break; + + case RES_FMT_CHG: + // wurden wir an das neue umgehaengt und wird das alte geloscht? + if( ((SwFmtChg*)pOld)->pChangedFmt->IsFmtInDTOR() ) + { + pClient = ((SwFmtChg*)pNew)->pChangedFmt; + } + break; + } + + if( pClient ) + { + uno::Reference< util::XModifyListener > xListener( this ); + + SwDepend* pDepend; + for( sal_uInt16 n = 0, nCnt = aFmts.Count(); n < nCnt; ++n ) + { + if( pClient == (pDepend = (SwDepend*)aFmts[ n ])->GetRegisteredIn() ) + { + aFmts.Remove( n, 1 ); + + uno::Reference<frame::XModel> xModel = GetModel( *(SwFmt*)pClient ); + if( xModel.is() ) + { + uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY); + if( xBrdcst.is() ) + xBrdcst->removeModifyListener( xListener ); + } + + delete pDepend; + if( !aFmts.Count() ) + { + // we are the last? + // then can we delete us + xSwXOLEListener = 0; + } + break; + } + } } } /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -void SwXOLEListener::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) +uno::Reference< frame::XModel > SwXOLEListener::GetModel( const SwFmt& rFmt, SwOLENode** ppNd ) const { - ClientModify(this, pOld, pNew); - if(!GetRegisteredIn()) - xOLEModel = 0; + SfxObjectShell* pObjSh = GetObjShell( rFmt, ppNd ); + return pObjSh ? pObjSh->GetBaseModel() : (uno::Reference< frame::XModel >)0; +} +/* --------------------------------------------------------------------------- + + ---------------------------------------------------------------------------*/ +SfxObjectShell* SwXOLEListener::GetObjShell( const SwFmt& rFmt, + SwOLENode** ppNd ) const +{ + SfxObjectShell* pShell = 0; + const SwFmtCntnt& rCnt = rFmt.GetCntnt(); + if( rCnt.GetCntntIdx() ) + { + SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 1 ); + SwOLENode* pOleNode = aIdx.GetNode().GetOLENode(); + if( pOleNode && pOleNode->GetOLEObj().IsOleRef() ) + { + SfxInPlaceObjectRef xIP( pOleNode->GetOLEObj().GetOleRef() ); + if( xIP.Is() ) + pShell = xIP->GetObjectShell(); + } + if( ppNd ) + *ppNd = pOleNode; + } + return pShell; +} +/* --------------------------------------------------------------------------- + + ---------------------------------------------------------------------------*/ +sal_uInt16 SwXOLEListener::FindEntry( const EventObject& rEvent,SwOLENode** ppNd) +{ + sal_uInt16 nRet = USHRT_MAX; + uno::Reference< frame::XModel > xSrch( rEvent.Source, uno::UNO_QUERY ); + + for( sal_uInt16 n = 0, nCnt = aFmts.Count(); n < nCnt; ++n ) + { + SwDepend* pDepend = (SwDepend*)aFmts[ n ]; + SwFrmFmt* pFmt = (SwFrmFmt*)pDepend->GetRegisteredIn(); + if( !pFmt ) + { + ASSERT( pFmt, "wo ist das Format geblieben?" ); + aFmts.Remove( n, 1 ); + delete pDepend; + --n; + --nCnt; + } + else + { + uno::Reference< frame::XModel > xFmt( GetModel( *pFmt, ppNd ), uno::UNO_QUERY); + if( xFmt == xSrch ) + { + nRet = n; + break; + } + } + } + return nRet; } diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 1c11e955c517..70d55da7aab9 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoftn.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: tl $ $Date: 2002-09-13 12:45:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -227,12 +227,13 @@ uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL SwXFootnote::getTypes( ) ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXFootnote::getImplementationId( ) throw(uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -319,7 +320,7 @@ void SwXFootnote::attachToRange(const uno::Reference< text::XTextRange > & xText aFootNote.SetNumStr(m_sLabel); SfxItemSet aSet(pDoc->GetAttrPool(), RES_TXTATR_FTN, RES_TXTATR_FTN, 0L); aSet.Put(aFootNote); - SwXTextCursor::SetCrsrAttr(aPam, aSet); + SwXTextCursor::SetCrsrAttr(aPam, aSet, 0); pTxtAttr = aPam.GetNode()->GetTxtNode()->GetTxtAttr( aPam.GetPoint()->nContent.GetIndex()-1, RES_TXTATR_FTN ); @@ -460,11 +461,13 @@ uno::Reference< text::XTextCursor > SwXFootnote::createTextCursorByRange( if(pFmt && SwXTextRange::XTextRangeToSwPaM(aPam, aTextPosition)) { const SwTxtFtn* pTxtFtn = pFmt->GetTxtFtn(); -#ifdef DEBUG - const SwStartNode* p1 = aPam.GetNode()->FindFootnoteStartNode(); - const SwNode& rStNode = pTxtFtn->GetStartNode()->GetNode(); -#endif - if(aPam.GetNode()->FindStartNode() == &pTxtFtn->GetStartNode()->GetNode()) + + // skip section nodes to find 'true' start node + const SwNode* pStart = aPam.GetNode()->FindFootnoteStartNode(); + while( pStart->IsSectionNode() ) + pStart = pStart->FindStartNode(); + + if( pStart == &pTxtFtn->GetStartNode()->GetNode()) aRef = (text::XWordCursor*)new SwXTextCursor(this , *aPam.GetPoint(), CURSOR_FOOTNOTE, GetDoc(), aPam.GetMark()); } else diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 966537b8ed73..1e5003a80aff 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoidx.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: os $ $Date: 2002-11-01 15:27:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -616,7 +616,13 @@ void SwXDocumentIndex::setPropertyValue(const OUString& rPropertyName, aForm.SetCommaSeparated(lcl_AnyToBool(aValue)); break; case WID_LABEL_CATEGORY : - pTOXBase->SetSequenceName(lcl_AnyToString(aValue)); + { + // convert file-format/API/external programmatic english name + // to internal UI name before usage + String aName( SwStyleNameMapper::GetSpecialExtraUIName( + lcl_AnyToString(aValue) ) ); + pTOXBase->SetSequenceName( aName ); + } break; case WID_LABEL_DISPLAY_TYPE : { @@ -888,8 +894,15 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName) bRet = rForm.IsCommaSeparated(); break; case WID_LABEL_CATEGORY : - aRet <<= OUString(pTOXBase->GetSequenceName()); + { + // convert internal UI name to + // file-format/API/external programmatic english name + // before usage + String aName( SwStyleNameMapper::GetSpecialExtraProgName( + pTOXBase->GetSequenceName() ) ); + aRet <<= OUString( aName ); bBOOL = sal_False; + } break; case WID_LABEL_DISPLAY_TYPE : { @@ -1587,6 +1600,7 @@ void SwXDocumentIndexMark::attachToRange(const Reference< text::XTextRange > & x aMark.SetPrimaryKeyReading(sPrimaryKeyReading); if(sSecondaryKeyReading.Len()) aMark.SetSecondaryKeyReading(sSecondaryKeyReading); + aMark.SetMainEntry(bMainEntry); break; case TOX_USER: case TOX_CONTENT: diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index c4f57b63e4e5..a01918657d6d 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unomap.cxx,v $ * - * $Revision: 1.146 $ + * $Revision: 1.147 $ * - * last change: $Author: os $ $Date: 2002-11-15 11:17:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -399,7 +399,9 @@ void SwUnoPropertyMapProvider::Sort( sal_uInt16 nId ) COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \ COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN \ COMMON_HYPERLINK_PROPERTIES \ - { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0}, + { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0},\ + { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAMES), FN_UNO_CHARFMT_SEQUENCE, CPPU_E2T(CPPUTYPE_OUSTRINGS), PropertyAttribute::MAYBEVOID, 0}, + #define COMMON_CRSR_PARA_PROPERTIES_2 \ COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \ @@ -667,6 +669,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP { SW_PROP_NMID(UNO_NAME_IS_AUTO_UPDATE), FN_UNO_IS_AUTO_UPDATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, { SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0}, { SW_PROP_NMID(UNO_NAME_CATEGORY), FN_UNO_CATEGORY, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , 0 }, + { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 }, {0,0,0,0,0} }; aMapArr[nPropertyId] = aParaStyleMap; @@ -679,6 +682,8 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP { SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ANCHOR_PAGENUM }, { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR), PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE}, { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR }, + { SW_PROP_NMID(UNO_NAME_BACK_COLOR_R_G_B), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B}, \ + { SW_PROP_NMID(UNO_NAME_BACK_COLOR_TRANSPARENCY), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY}, \ // { SW_PROP_NMID(UNO_NAME_CHAIN_NEXT_NAME), RES_CHAIN, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_CHAIN_NEXTNAME}, // { SW_PROP_NMID(UNO_NAME_CHAIN_PREV_NAME), RES_CHAIN, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_CHAIN_PREVNAME}, /*not impl*/ { SW_PROP_NMID(UNO_NAME_CLIENT_MAP), RES_URL, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_URL_CLIENTMAP }, @@ -1180,6 +1185,8 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP static SfxItemPropertyMap aEmbeddedPropertyMap_Impl[] = { COMMON_FRAME_PROPERTIES + { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUR }, + { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE}, { SW_PROP_NMID(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_COUNTOUR_PP, CPPU_E2T(CPPUTYPE_PNTSEQSEQ), PropertyAttribute::MAYBEVOID, 0 }, { SW_PROP_NMID(UNO_NAME_IS_PIXEL_CONTOUR), FN_UNO_IS_PIXEL_CONTOUR, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 }, { SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_CONTOUR), FN_UNO_IS_AUTOMATIC_CONTOUR , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 }, @@ -2317,14 +2324,42 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP } break; case PROPERTY_MAP_TEXT : + { static SfxItemPropertyMap aTextMap[] = { _REDLINE_NODE_PROPERTIES {0,0,0,0} }; aMapArr[nPropertyId] = aTextMap; - + } break; + case PROPERTY_MAP_MAILMERGE : + { + static SfxItemPropertyMap aMailMergeMap[] = + { + { SW_PROP_NMID(UNO_NAME_SELECTION), WID_SELECTION, CPPU_E2T(CPPUTYPE_SEQANY), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_RESULT_SET), WID_RESULT_SET, CPPU_E2T(CPPUTYPE_REFRESULTSET), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_CONNECTION), WID_CONNECTION, CPPU_E2T(CPPUTYPE_REFCONNECTION), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_MODEL), WID_MODEL, CPPU_E2T(CPPUTYPE_REFMODEL), PropertyAttribute::READONLY, 0}, + { SW_PROP_NMID(UNO_NAME_DATA_SOURCE_NAME), WID_DATA_SOURCE_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_DATA_COMMAND), WID_DATA_COMMAND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_FILTER), WID_FILTER, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_DOCUMENT_URL), WID_DOCUMENT_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_OUTPUT_URL), WID_OUTPUT_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), WID_DATA_COMMAND_TYPE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_OUTPUT_TYPE), WID_OUTPUT_TYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_ESCAPE_PROCESSING), WID_ESCAPE_PROCESSING, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_SINGLE_PRINT_JOBS), WID_SINGLE_PRINT_JOBS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_FILE_NAME_FROM_COLUMN), WID_FILE_NAME_FROM_COLUMN, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_FILE_NAME_PREFIX), WID_FILE_NAME_PREFIX, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + {0,0,0,0} + }; + aMapArr[nPropertyId] = aMailMergeMap; + } + break; + + default: + DBG_ERROR( "unexpected property map ID" ); } Sort(nPropertyId); } diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 05df943f13c0..7158b79d9f42 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoobj.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: cmc $ $Date: 2002-10-16 09:19:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -713,6 +713,28 @@ sal_Bool lcl_setCrsrPropertyValue(const SfxItemPropertyMap* pMap, case RES_TXTATR_CHARFMT: lcl_setCharStyle(rPam.GetDoc(), aValue, rSet.GetItemSet() ); break; + case FN_UNO_CHARFMT_SEQUENCE: + { + Sequence<OUString> aCharStyles; + if(aValue >>= aCharStyles) + { + for(sal_Int32 nStyle = 0; nStyle < aCharStyles.getLength(); nStyle++) + { + Any aStyle; + rPam.GetDoc()->StartUndo( UNDO_START ); + aStyle <<= aCharStyles.getConstArray()[nStyle]; + //create a local set and apply each format directly + SfxItemSet aSet(rPam.GetDoc()->GetAttrPool(), RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT ); + lcl_setCharStyle(rPam.GetDoc(), aStyle, aSet ); + //the first style should replace the current attributes, all other have to be added + SwXTextCursor::SetCrsrAttr(rPam, aSet, nStyle ? CRSR_ATTR_MODE_DONTREPLACE : 0); + rPam.GetDoc()->EndUndo( UNDO_START ); + } + } + else + bRet = sal_False; + } + break; case FN_UNO_PARA_STYLE : lcl_SetTxtFmtColl(aValue, rPam); break; @@ -855,7 +877,7 @@ return bRet; * --------------------------------------------------*/ SwFmtColl* SwXTextCursor::GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional) { - static const sal_uInt16 nMaxLookup = 255; + static const sal_uInt16 nMaxLookup = 1000; SwFmtColl *pFmt = 0; // if ( GetCrsrCnt() > nMaxLookup ) @@ -1619,10 +1641,21 @@ sal_Bool SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw( uno::RuntimeExc SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) { + BOOL bWasEOS = isEndOfSentence(); SwXTextCursor::SelectPam(*pUnoCrsr, Expand); bRet = pUnoCrsr->GoSentence(SwCursor::NEXT_SENT); if(!bRet) bRet = pUnoCrsr->MovePara(fnParaNext, fnParaStart); + + // if at the end of the sentence (i.e. at the space after the '.') + // advance to next word in order for GoSentence to work properly + // next time and have isStartOfSentence return true after this call + if (!pUnoCrsr->IsStartWord()) + { + BOOL bNextWord = pUnoCrsr->GoNextWord(); + if (bWasEOS && !bNextWord) + bRet = sal_False; + } } else throw uno::RuntimeException(); @@ -1943,7 +1976,7 @@ void SwXTextCursor::SetPropertyValue( if(!lcl_setCrsrPropertyValue( pMap, rPaM, aSet, aValue )) rPropSet.setPropertyValue(*pMap, aValue, aSet.GetItemSet( &rPaM ) ); if( aSet.GetItemSetPtr() ) - SwXTextCursor::SetCrsrAttr(rPaM, aSet.GetItemSet() ); + SwXTextCursor::SetCrsrAttr(rPaM, aSet.GetItemSet(), 0 ); } else throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( 0 ) ); diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 7201cf1c9194..2106a6baeb73 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoobj2.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: mib $ $Date: 2002-11-26 14:25:48 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -904,9 +904,11 @@ SwDoc* SwXTextCursor::GetDoc() /*-- 09.12.98 14:19:03--------------------------------------------------- -----------------------------------------------------------------------*/ -void SwXTextCursor::SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, sal_Bool bTableMode) +void SwXTextCursor::SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, USHORT nAttrMode) { sal_uInt16 nFlags = SETATTR_APICALL; + if(nAttrMode & CRSR_ATTR_MODE_DONTREPLACE) + nFlags |= SETATTR_DONTREPLACE; SwDoc* pDoc = rPam.GetDoc(); //StartEndAction UnoActionContext aAction(pDoc); @@ -918,7 +920,7 @@ void SwXTextCursor::SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, sal_Bool bT SwPaM *_pStartCrsr = &rPam; do { - if( _pStartCrsr->HasMark() && ( bTableMode || + if( _pStartCrsr->HasMark() && ( (CRSR_ATTR_MODE_TABLE & nAttrMode) || *_pStartCrsr->GetPoint() != *_pStartCrsr->GetMark() )) pDoc->Insert(*_pStartCrsr, rSet, nFlags ); } while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != &rPam ); @@ -937,7 +939,7 @@ void SwXTextCursor::SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, sal_Bool bT -----------------------------------------------------------------------*/ void SwXTextCursor::GetCrsrAttr(SwPaM& rPam, SfxItemSet& rSet, BOOL bCurrentAttrOnly) { -static const sal_uInt16 nMaxLookup = 255; + static const sal_uInt16 nMaxLookup = 1000; SfxItemSet aSet( *rSet.GetPool(), rSet.GetRanges() ); SfxItemSet *pSet = &rSet; SwPaM *_pStartCrsr = &rPam; diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index d22db893db7b..0705752a848b 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoport.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: tl $ $Date: 2002-09-26 07:30:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -318,7 +318,6 @@ uno::Reference< beans::XPropertySetInfo > SwXTextPortion::getPropertySetInfo(vo xRedlPorRef = SfxItemPropertySet( aSwMapProvider.GetPropertyMap( PROPERTY_MAP_REDLINE_PORTION) ).getPropertySetInfo(); - return (PORTION_REDLINE_START == ePortionType || PORTION_REDLINE_END == ePortionType) ? xRedlPorRef : xTxtPorExtRef; } @@ -531,7 +530,7 @@ void SwXTextPortion::setPropertyValues( if (!pMap) throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if ( pMap->nFlags & PropertyAttribute::READONLY) - throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); SwXTextCursor::SetPropertyValue( *pUnoCrsr, aPropSet, sTmp, pValues[nProp], pMap); } diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 1f992a277d4d..fb86b6958933 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoportenum.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: jp $ $Date: 2002-02-01 12:42:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -255,7 +255,7 @@ void lcl_InsertRefMarkPortion( if(!bEnd) { rArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_REFMARK_START)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_REFMARK_START)), rArr.Count()); pPortion->SetRefMark(xContent); pPortion->SetCollapsed(pAttr->GetEnd() ? FALSE : TRUE); @@ -263,7 +263,7 @@ void lcl_InsertRefMarkPortion( else { rArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_REFMARK_END)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_REFMARK_END)), rArr.Count()); pPortion->SetRefMark(xContent); } @@ -295,7 +295,7 @@ void lcl_InsertTOXMarkPortion( if(!bEnd) { rArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_TOXMARK_START)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_TOXMARK_START)), rArr.Count()); pPortion->SetTOXMark(xContent); pPortion->SetCollapsed(pAttr->GetEnd() ? FALSE : TRUE); @@ -303,7 +303,7 @@ void lcl_InsertTOXMarkPortion( if(bEnd) { rArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_TOXMARK_END)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_TOXMARK_END)), rArr.Count()); pPortion->SetTOXMark(xContent); } @@ -357,7 +357,7 @@ void lcl_ExportBookmark( if(BKM_TYPE_START == pPtr->nBkmType || BKM_TYPE_START_END == pPtr->nBkmType) { rPortionArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_BOOKMARK_START)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_BOOKMARK_START)), rPortionArr.Count()); pPortion->SetBookmark(pPtr->xBookmark); pPortion->SetCollapsed(BKM_TYPE_START_END == pPtr->nBkmType ? TRUE : FALSE); @@ -366,7 +366,7 @@ void lcl_ExportBookmark( if(BKM_TYPE_END == pPtr->nBkmType) { rPortionArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_BOOKMARK_END)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_BOOKMARK_END)), rPortionArr.Count()); pPortion->SetBookmark(pPtr->xBookmark); } @@ -501,7 +501,7 @@ Reference<XTextRange> lcl_ExportHints(SwpHints* pHints, { pUnoCrsr->Right(1,CRSR_SKIP_CHARS); SwXTextPortion* pPortion; - xRef = pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_FOOTNOTE); + xRef = pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_FOOTNOTE); Reference<XTextContent> xContent = Reference<XTextContent>( SwXFootnotes::GetObject(*pDoc, pAttr->SwTxtAttr::GetFtn()), @@ -517,7 +517,7 @@ Reference<XTextRange> lcl_ExportHints(SwpHints* pHints, rPortionArr.Insert( new Reference< XTextRange >( pPortion = new SwXTextPortion( - *pUnoCrsr, rParent, PORTION_CONTROL_CHAR)), + pUnoCrsr, rParent, PORTION_CONTROL_CHAR)), rPortionArr.Count()); pPortion->SetControlChar(3); ePortionType = PORTION_TEXT; @@ -530,7 +530,7 @@ Reference<XTextRange> lcl_ExportHints(SwpHints* pHints, rPortionArr.Insert( new Reference< XTextRange >( pPortion = new SwXTextPortion( - *pUnoCrsr, rParent, PORTION_CONTROL_CHAR)), + pUnoCrsr, rParent, PORTION_CONTROL_CHAR)), rPortionArr.Count()); const SwFmtHardBlank& rFmt = pAttr->GetHardBlank(); if(rFmt.GetChar() == '-') @@ -818,7 +818,7 @@ void SwXTextPortionEnumeration::CreatePortions() { lcl_ExportBkmAndRedline(aBkmArr, aRedArr, 0, pUnoCrsr, xParent, aPortionArr); // the paragraph is empty - xRef = new SwXTextPortion(*pUnoCrsr, xParent, ePortionType); + xRef = new SwXTextPortion(pUnoCrsr, xParent, ePortionType); // are there any frames? while(aFrameArr.Count()) { @@ -827,7 +827,7 @@ void SwXTextPortionEnumeration::CreatePortions() { //the previously created portion has to be inserted here aPortionArr.Insert(new Reference<XTextRange>(xRef), aPortionArr.Count()); - xRef = new SwXTextPortion(*pUnoCrsr, xParent, + xRef = new SwXTextPortion(pUnoCrsr, xParent, *(SwFrmFmt*)pCurDepend->GetRegisteredIn()); } delete pCurDepend; @@ -867,7 +867,7 @@ void SwXTextPortionEnumeration::CreatePortions() //ist hier schon ein Rahmen faellig? if(nCurrentIndex == nFirstFrameIndex) { - xRef = new SwXTextPortion(*pUnoCrsr, xParent, + xRef = new SwXTextPortion(pUnoCrsr, xParent, *(SwFrmFmt*)pFirstFrameDepend->GetRegisteredIn()); SwDepend* pCurDepend = aFrameArr.GetObject(0); delete pCurDepend; @@ -913,7 +913,7 @@ void SwXTextPortionEnumeration::CreatePortions() } } if(!xRef.is() && pUnoCrsr->HasMark() ) - xRef = new SwXTextPortion(*pUnoCrsr, xParent, ePortionType); + xRef = new SwXTextPortion(pUnoCrsr, xParent, ePortionType); if(xRef.is()) aPortionArr.Insert(new Reference<XTextRange>(xRef), aPortionArr.Count()); } @@ -960,7 +960,7 @@ void SwXTextPortionEnumeration::CreatePortions() SwDepend* pCurDepend = aFrameArr.GetObject(0); if(pCurDepend->GetRegisteredIn()) { - Reference<XTextRange> xRef = new SwXTextPortion(*pUnoCrsr, xParent, + Reference<XTextRange> xRef = new SwXTextPortion(pUnoCrsr, xParent, *(SwFrmFmt*)pCurDepend->GetRegisteredIn()); aPortionArr.Insert(new Reference<XTextRange>(xRef), aPortionArr.Count()); } diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx index 12160bb3e002..cb2b705efe56 100644 --- a/sw/source/core/unocore/unoprnms.cxx +++ b/sw/source/core/unocore/unoprnms.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoprnms.cxx,v $ * - * $Revision: 1.82 $ + * $Revision: 1.83 $ * - * last change: $Author: os $ $Date: 2002-11-15 11:10:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -717,7 +717,22 @@ const SwPropNameTab aPropNameTab = { /* 0635 UNO_NAME_HEADER_DYNAMIC_SPACING */ {MAP_CHAR_LEN("HeaderDynamicSpacing")}, /* 0636 UNO_NAME_FOOTER_DYNAMIC_SPACING */ {MAP_CHAR_LEN("FooterDynamicSpacing")}, /* 0637 UNO_NAME_BASIC_LIBRARIES */ {MAP_CHAR_LEN("BasicLibraries")}, -/* 0638 UNO_NAME_IS_FIXED_LANGUAGE */ {MAP_CHAR_LEN("IsFixedLanguage")} +/* 0638 UNO_NAME_IS_FIXED_LANGUAGE */ {MAP_CHAR_LEN("IsFixedLanguage")}, +/* 0639 UNO_NAME_SELECTION */ {MAP_CHAR_LEN("Selection")}, +/* 0640 UNO_NAME_RESULT_SET */ {MAP_CHAR_LEN("ResultSet")}, +/* 0641 UNO_NAME_CONNECTION */ {MAP_CHAR_LEN("Connection")}, +/* 0642 UNO_NAME_MODEL */ {MAP_CHAR_LEN("Model")}, +/* 0643 UNO_NAME_DATA_SOURCE_NAME */ {MAP_CHAR_LEN("DataSourceName")}, +/* 0644 UNO_NAME_DATA_COMMAND */ {MAP_CHAR_LEN("DataCommand")}, +/* 0645 UNO_NAME_FILTER */ {MAP_CHAR_LEN("Filter")}, +/* 0646 UNO_NAME_DOCUMENT_URL */ {MAP_CHAR_LEN("DocumentURL")}, +/* 0647 UNO_NAME_OUTPUT_URL */ {MAP_CHAR_LEN("OutputURL")}, +/* 0648 UNO_NAME_OUTPUT_TYPE */ {MAP_CHAR_LEN("OutputType")}, +/* 0649 UNO_NAME_ESCAPE_PROCESSING */ {MAP_CHAR_LEN("EscapeProcessing")}, +/* 0650 UNO_NAME_SINGLE_PRINT_JOBS */ {MAP_CHAR_LEN("SinglePrintJobs")}, +/* 0651 UNO_NAME_FILE_NAME_FROM_COLUMN */ {MAP_CHAR_LEN("FileNameFromColumn")}, +/* 0652 UNO_NAME_FILE_NAME_PREFIX */ {MAP_CHAR_LEN("FileNamePrefix")}, +/* 0653 UNO_NAME_CHAR_STYLE_NAMES */ {MAP_CHAR_LEN("CharStyleNames")} }; #ifndef PRODUCT diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index d2b62c899ed7..c24c8dc77a27 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoredline.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: dvo $ $Date: 2002-08-02 10:36:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -194,12 +194,12 @@ Sequence<sal_Int8> SwXRedlineText::getImplementationId() throw(RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); - static uno::Sequence< sal_Int8 > aId( 16 ); - static sal_Bool bInit = FALSE; + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -435,12 +435,13 @@ void SwXRedlinePortion::Validate() throw( RuntimeException ) ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId( ) throw(uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -709,11 +710,6 @@ Any SwXRedline::getPropertyValue( const OUString& rPropertyName ) DBG_ASSERT(0, "Empty section in redline portion! (end node immediately follows start node)"); } } - else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_START_REDLINE))|| - rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_END_REDLINE))) - { - //this will always be empty - redlines at the start or end of a redlined text cannot occur - } else aRet = SwXRedlinePortion::GetPropertyValue(rPropertyName, *pRedline); return aRet; @@ -881,12 +877,12 @@ Sequence<sal_Int8> SwXRedline::getImplementationId() throw(RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); - static uno::Sequence< sal_Int8 > aId( 16 ); - static sal_Bool bInit = FALSE; + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 9ef88966f9bf..063f2a882f82 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unorefmk.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: os $ $Date: 2002-12-05 13:29:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -190,7 +190,7 @@ void SwXReferenceMark::InsertRefMark(SwPaM& rPam, SwDoc* pDoc) SfxItemSet aSet(pDoc->GetAttrPool(), RES_TXTATR_REFMARK, RES_TXTATR_REFMARK, 0L); aSet.Put(aRefMark); sal_Bool bMark = *rPam.GetPoint() != *rPam.GetMark(); - SwXTextCursor::SetCrsrAttr(rPam, aSet); + SwXTextCursor::SetCrsrAttr(rPam, aSet, 0); if( bMark && *rPam.GetPoint() > *rPam.GetMark()) rPam.Exchange(); diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 9a578cb24ecd..b7b1aa628eb5 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unotbl.cxx,v $ * - * $Revision: 1.71 $ + * $Revision: 1.72 $ * - * last change: $Author: ab $ $Date: 2002-11-11 15:14:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -861,12 +861,13 @@ Sequence< uno::Type > SAL_CALL SwXCell::getTypes( ) throw(::com::sun::star::uno ---------------------------------------------------------------------------*/ Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -1847,7 +1848,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, 0L); SwXTextCursor::GetCrsrAttr(pTblCrsr->GetSelRing(), rSet); aPropSet.setPropertyValue(*pMap, aValue, rSet); - SwXTextCursor::SetCrsrAttr(pTblCrsr->GetSelRing(), rSet, sal_True); + SwXTextCursor::SetCrsrAttr(pTblCrsr->GetSelRing(), rSet, CRSR_ATTR_MODE_TABLE); } } } @@ -4952,7 +4953,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u SwTableLines& rLines = pTable->GetTabLines(); SwTableLine* pLine = rLines.GetObject(0); SwTableBoxes& rBoxes = pLine->GetTabBoxes(); - pTLBox = rBoxes.GetObject(0); + pTLBox = rBoxes.GetObject(rBoxes.Count() - 1); } if(pTLBox) { @@ -4961,6 +4962,12 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u UnoActionContext aAction(pFrmFmt->GetDoc()); SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); pUnoCrsr->Move( fnMoveForward, fnGoNode ); + + { + // hier muessen die Actions aufgehoben werden + UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc()); + } + pFrmFmt->GetDoc()->InsertCol(*pUnoCrsr, (sal_uInt16)nCount, bAppend); delete pUnoCrsr; } diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index ef38a8b62f63..4e72c77dd869 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unotext.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: os $ $Date: 2002-05-30 14:46:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -330,6 +330,7 @@ void SwXText::insertString(const uno::Reference< XTextRange > & xTextRange, { //hier wird ein PaM angelegt, der vor dem Parameter-PaM liegt, damit der //Text davor eingefuegt wird + UnoActionContext aContext(GetDoc()); const SwPosition* pPos = pCursor ? pCursor->GetCrsr()->Start() : &pRange->GetBookmark()->GetPos(); SwPaM aInsertPam(*pPos); sal_Bool bGroupUndo = GetDoc()->DoesGroupUndo(); @@ -1455,12 +1456,13 @@ uno::Sequence< uno::Type > SwXBodyText::getTypes( ) throw(uno::RuntimeException ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SwXBodyText::getImplementationId( ) throw(uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -1693,12 +1695,13 @@ uno::Sequence< ::com::sun::star::uno::Type > SwXHeadFootText::getTypes( ) throw ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SwXHeadFootText::getImplementationId( ) throw(uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } diff --git a/sw/source/core/view/makefile.mk b/sw/source/core/view/makefile.mk index d82555c74548..a6851400ef57 100644 --- a/sw/source/core/view/makefile.mk +++ b/sw/source/core/view/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-19 00:08:29 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:41:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -92,7 +92,8 @@ CXXFILES = \ viewsh.cxx \ viewpg.cxx \ vnew.cxx \ - vprint.cxx + vprint.cxx \ + pagepreviewlayout.cxx @@ -103,7 +104,8 @@ SLOFILES = \ $(SLO)$/viewsh.obj \ $(SLO)$/viewpg.obj \ $(SLO)$/vnew.obj \ - $(SLO)$/vprint.obj + $(SLO)$/vprint.obj \ + $(SLO)$/pagepreviewlayout.obj # --- Targets ------------------------------------------------------- diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx new file mode 100644 index 000000000000..535006d5f7e4 --- /dev/null +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -0,0 +1,1424 @@ +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif +#ifndef _PREVWPAGE_HXX +#include <prevwpage.hxx> +#endif + +#include <algorithm> + +#ifndef _SV_WINDOW_HXX +#include <vcl/window.hxx> +#endif +#ifndef _SV_OUTDEV_HXX +#include <vcl/outdev.hxx> +#endif +#ifndef _SV_MAPMOD_HXX +#include <vcl/mapmod.hxx> +#endif + +#ifndef _ROOTFRM_HXX +#include <rootfrm.hxx> +#endif +#ifndef _PAGEFRM_HXX +#include <pagefrm.hxx> +#endif +#ifndef _VIEWSH_HXX +#include <viewsh.hxx> +#endif +#ifndef _VIEWIMP_HXX +#include <viewimp.hxx> +#endif +#ifndef _VIEWOPT_HXX +#include <viewopt.hxx> +#endif +#ifndef _SWREGION_HXX +#include <swregion.hxx> +#endif +#ifndef _COMCORE_HRC +#include <comcore.hrc> +#endif +// OD 19.02.2003 #107369# - method <SwAlignRect(..)> +#ifndef _FRMTOOL_HXX +#include <frmtool.hxx> +#endif + +// OD 20.02.2003 #107369# - method to update statics for paint +// Note: method defined in '/sw/source/core/layout/paintfrm.cxx' +extern void SwCalcPixStatics( OutputDevice *pOut ); + +// ============================================================================= +// methods to initialize page preview layout +// ============================================================================= +SwPagePreviewLayout::SwPagePreviewLayout( ViewShell& _rParentViewShell, + const SwRootFrm& _rLayoutRootFrm ) + : mnXFree ( 4*142 ), + mnYFree ( 4*142 ), + mrParentViewShell( _rParentViewShell ), + mrLayoutRootFrm ( _rLayoutRootFrm ) +{ + _Clear(); +} + +void SwPagePreviewLayout::_Clear() +{ + mbLayoutInfoValid = mbLayoutSizesValid = mbPaintInfoValid = false; + + maWinSize.Width() = 0; + maWinSize.Height() = 0; + mnCols = mnRows = 0; + // OD 19.02.2003 #107369# + mbLeaveLeftTopBlank = false; + + _ClearPrevwLayoutSizes(); + + mbDoesLayoutRowsFitIntoWindow = false; + mbDoesLayoutColsFitIntoWindow = false; + + mnPaintPhyStartPageNum = 0; + mnPaintStartCol = mnPaintStartRow = 0; + mbNoPageVisible = false; + maPaintStartPageOffset.X() = 0; + maPaintStartPageOffset.Y() = 0; + maPaintPreviewDocOffset.X() = 0; + maPaintPreviewDocOffset.Y() = 0; + maAdditionalPaintOffset.X() = 0; + maAdditionalPaintOffset.Y() = 0; + maPaintedPrevwDocRect.Left() = 0; + maPaintedPrevwDocRect.Top() = 0; + maPaintedPrevwDocRect.Right() = 0; + maPaintedPrevwDocRect.Bottom() = 0; + mnSelectedPageNum = 0; + mpSelectedPageFrm = 0; + _ClearPrevwPageData(); +} + +void SwPagePreviewLayout::_ClearPrevwLayoutSizes() +{ + mnPages = 0; + + maMaxPageSize.Width() = 0; + maMaxPageSize.Height() = 0; + maPreviewDocRect.Left() = maPreviewDocRect.Top() = 0; + maPreviewDocRect.Right() = maPreviewDocRect.Bottom() = 0; + mnColWidth = mnRowHeight = 0; + mnPrevwLayoutWidth = mnPrevwLayoutHeight = 0; +} + +void SwPagePreviewLayout::_ClearPrevwPageData() +{ + for ( std::vector<PrevwPage*>::iterator aPageDelIter = maPrevwPages.begin(); + aPageDelIter != maPrevwPages.end(); + ++aPageDelIter ) + { + delete (*aPageDelIter); + } + maPrevwPages.clear(); +} + +/** calculate page preview layout sizes + + OD 18.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::_CalcPrevwLayoutSizes() +{ + // calculate maximal page size; calculate also number of pages + + const SwPageFrm* pPage = static_cast<const SwPageFrm*>(mrLayoutRootFrm.Lower()); + while ( pPage ) + { + ++mnPages; + pPage->Calc(); + register const Size& rPageSize = pPage->Frm().SSize(); + if ( rPageSize.Width() > maMaxPageSize.Width() ) + maMaxPageSize.Width() = rPageSize.Width(); + if ( rPageSize.Height() > maMaxPageSize.Height() ) + maMaxPageSize.Height() = rPageSize.Height(); + pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); + } + // calculate and set column width and row height + mnColWidth = maMaxPageSize.Width() + mnXFree; + mnRowHeight = maMaxPageSize.Height() + mnYFree; + + // calculate and set preview layout width and height + mnPrevwLayoutWidth = mnCols * mnColWidth + mnXFree; + mnPrevwLayoutHeight = mnRows * mnRowHeight + mnYFree; + + // calculate document rectangle in preview layout + { + Size aDocSize; + // document width + aDocSize.Width() = mnPrevwLayoutWidth; + + // document height + // determine number of rows needed for <nPages> in preview layout + // OD 19.02.2003 #107369# - use method <GetRowOfPage(..)>. + sal_uInt16 nDocRows = GetRowOfPage( mnPages ); + aDocSize.Height() = nDocRows * maMaxPageSize.Height() + + (nDocRows+1) * mnYFree; + maPreviewDocRect.SetPos( Point( 0, 0 ) ); + maPreviewDocRect.SetSize( aDocSize ); + } +} + +/** init page preview layout + + OD 11.12.2002 #103492# + initialize the page preview settings for a given layout. + side effects: + (1) If parameter <_bCalcScale> is true, mapping mode with calculated + scaling is set at the output device and the zoom at the view options of + the given view shell is set with the calculated scaling. + + @author OD +*/ +bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, + const sal_uInt16 _nRows, + const Size& _rPxWinSize, + const bool _bCalcScale + ) +{ + // check environment and parameters + { + bool bColsRowsValid = (_nCols != 0) && (_nRows != 0); + ASSERT( bColsRowsValid, "preview layout parameters not correct - preview layout can *not* be initialized" ); + if ( !bColsRowsValid ) + return false; + + bool bPxWinSizeValid = (_rPxWinSize.Width() >= 0) && + (_rPxWinSize.Height() >= 0); + ASSERT( bPxWinSizeValid, "no window size - preview layout can *not* be initialized" ); + if ( !bPxWinSizeValid ) + return false; + } + + // environment and parameters ok + + // clear existing preview settings + _Clear(); + + // set layout information columns and rows + mnCols = _nCols; + mnRows = _nRows; + + _CalcPrevwLayoutSizes(); + + // validate layout information + mbLayoutInfoValid = true; + + if ( _bCalcScale ) + { + // calculate scaling + MapMode aMapMode( MAP_TWIP ); + Size aWinSize = mrParentViewShell.GetOut()->PixelToLogic( _rPxWinSize, aMapMode ); + Fraction aXScale( aWinSize.Width(), mnPrevwLayoutWidth ); + Fraction aYScale( aWinSize.Height(), mnPrevwLayoutHeight ); + if( aXScale < aYScale ) + aYScale = aXScale; + { + // adjust scaling for Drawing layer. + aYScale *= Fraction( 1000, 1 ); + long nNewNuminator = aYScale.operator long(); + if( nNewNuminator < 1 ) + nNewNuminator = 1; + aYScale = Fraction( nNewNuminator, 1000 ); + // propagate scaling as zoom percentage to view options for font cache + _ApplyNewZoomAtViewShell( static_cast<sal_uInt8>(nNewNuminator/10) ); + } + aMapMode.SetScaleY( aYScale ); + aMapMode.SetScaleX( aYScale ); + // set created mapping mode with calculated scaling at output device. + mrParentViewShell.GetOut()->SetMapMode( aMapMode ); + // OD 20.02.2003 #107369# - update statics for paint. + ::SwCalcPixStatics( mrParentViewShell.GetOut() ); + } + + // set window size in twips + maWinSize = mrParentViewShell.GetOut()->PixelToLogic( _rPxWinSize ); + // validate layout sizes + mbLayoutSizesValid = true; + + return true; +} + +/** apply new zoom at given view shell + + OD 11.12.2002 #103492# - implementation of <_ApplyNewZoomAtViewShell> + + @author OD +*/ +void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ) +{ + SwViewOption aNewViewOptions = *(mrParentViewShell.GetViewOptions()); + if ( aNewViewOptions.GetZoom() != _aNewZoom ) + { + aNewViewOptions.SetZoom( _aNewZoom ); + mrParentViewShell.ApplyViewOptions( aNewViewOptions ); + } +} + +/** method to adjust page preview layout to document changes + + OD 18.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::ReInit() +{ + // check environment and parameters + { + bool bLayoutSettingsValid = mbLayoutInfoValid && mbLayoutSizesValid; + ASSERT( bLayoutSettingsValid, + "no valid preview layout info/sizes - no re-init of page preview layout"); + if ( !bLayoutSettingsValid ) + return false; + } + + _ClearPrevwLayoutSizes(); + _CalcPrevwLayoutSizes(); + + return true; +} + +// ============================================================================= +// methods to prepare paint of page preview +// ============================================================================= +/** prepare paint of page preview + + OD 12.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum, + const Point _aProposedStartPos, + const Size& _rPxWinSize, + sal_uInt16& _onStartPageNum, + sal_uInt16& _onStartPageVirtNum, + Rectangle& _orDocPreviewPaintRect, + const bool _bStartWithPageAtFirstCol + ) +{ + sal_uInt16 nProposedStartPageNum = _nProposedStartPageNum; + // check environment and parameters + { + bool bLayoutSettingsValid = mbLayoutInfoValid && mbLayoutSizesValid; + ASSERT( bLayoutSettingsValid, + "no valid preview layout info/sizes - no prepare of preview paint"); + if ( !bLayoutSettingsValid ) + return false; + + bool bStartPageRangeValid = _nProposedStartPageNum <= mnPages; + ASSERT( bStartPageRangeValid, + "proposed start page not existing - no prepare of preview paint"); + if ( !bStartPageRangeValid ) + return false; + + bool bStartPosRangeValid = + _aProposedStartPos.X() >= 0 && _aProposedStartPos.Y() >= 0 && + _aProposedStartPos.X() <= maPreviewDocRect.Right() && + _aProposedStartPos.Y() <= maPreviewDocRect.Bottom(); + ASSERT( bStartPosRangeValid, + "proposed start position out of range - no prepare of preview paint"); + if ( !bStartPosRangeValid ) + return false; + + bool bWinSizeValid = _rPxWinSize.Width() != 0 && _rPxWinSize.Height() != 0; + ASSERT ( bWinSizeValid, "no window size - no prepare of preview paint"); + if ( !bWinSizeValid ) + return false; + + bool bStartInfoValid = _nProposedStartPageNum > 0 || + _aProposedStartPos != Point(0,0); + if ( !bStartInfoValid ) + nProposedStartPageNum = 1; + } + + // environment and parameter ok + + // update window size at preview setting data + maWinSize = mrParentViewShell.GetOut()->PixelToLogic( _rPxWinSize ); + + mbNoPageVisible = false; + if ( nProposedStartPageNum > 0 ) + { + // determine column and row of proposed start page in virtual preview layout + sal_uInt16 nColOfProposed = GetColOfPage( nProposedStartPageNum ); + sal_uInt16 nRowOfProposed = GetRowOfPage( nProposedStartPageNum ); + // determine start page + if ( _bStartWithPageAtFirstCol ) + { + // OD 19.02.2003 #107369# - leaving left-top-corner blank is + // controlled by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank && + ( nProposedStartPageNum == 1 || nRowOfProposed == 1 ) + ) + mnPaintPhyStartPageNum = 1; + else + mnPaintPhyStartPageNum = nProposedStartPageNum - (nColOfProposed-1); + } + else + mnPaintPhyStartPageNum = nProposedStartPageNum; + // set starting column + if ( _bStartWithPageAtFirstCol ) + mnPaintStartCol = 1; + else + mnPaintStartCol = nColOfProposed; + // set starting row + mnPaintStartRow = nRowOfProposed; + // page offset == (-1,-1), indicating no offset and paint of free space. + maPaintStartPageOffset.X() = -1; + maPaintStartPageOffset.Y() = -1; + // virtual preview document offset. + if ( _bStartWithPageAtFirstCol ) + maPaintPreviewDocOffset.X() = 0; + else + maPaintPreviewDocOffset.X() = (nColOfProposed-1) * mnColWidth; + maPaintPreviewDocOffset.Y() = (nRowOfProposed-1) * mnRowHeight; + } + else + { + // determine column and row of proposed start position. + // Note: paint starts at point (0,0) + sal_uInt16 nColOfProposed = + static_cast<sal_uInt16>(_aProposedStartPos.X() / mnColWidth) + 1; + sal_uInt16 nRowOfProposed = + static_cast<sal_uInt16>(_aProposedStartPos.Y() / mnRowHeight) + 1; + // determine start page == page at proposed start position + // OD 19.02.2003 #107369# - leaving left-top-corner blank is + // controlled by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank && + ( nRowOfProposed == 1 && nColOfProposed == 1 ) + ) + mnPaintPhyStartPageNum = 1; + else + { + // OD 19.02.2003 #107369# - leaving left-top-corner blank is + // controlled by <mbLeaveLeftTopBlank>. + mnPaintPhyStartPageNum = (nRowOfProposed-1) * mnCols + nColOfProposed; + if ( mbLeaveLeftTopBlank ) + --mnPaintPhyStartPageNum; + if ( mnPaintPhyStartPageNum > mnPages ) + { + // no page will be visible, because shown part of document + // preview is the last row to the right of the last page + mnPaintPhyStartPageNum = mnPages; + mbNoPageVisible = true; + } + } + // set starting column and starting row + mnPaintStartCol = nColOfProposed; + mnPaintStartRow = nRowOfProposed; + // page offset + maPaintStartPageOffset.X() = + (_aProposedStartPos.X() % mnColWidth) - mnXFree; + maPaintStartPageOffset.Y() = + (_aProposedStartPos.Y() % mnRowHeight) - mnYFree; + // virtual preview document offset. + maPaintPreviewDocOffset = _aProposedStartPos; + } + + // determine additional paint offset, if preview layout fits into window. + _CalcAdditionalPaintOffset(); + + // determine rectangle to be painted from document preview + _CalcDocPrevwPaintRect(); + _orDocPreviewPaintRect = maPaintedPrevwDocRect; + + // OD 20.01.2003 #103492# - shift visible preview document area to the left, + // if on the right is an area left blank. + if ( !mbDoesLayoutColsFitIntoWindow && + maPaintedPrevwDocRect.GetWidth() < maWinSize.Width() ) + { + maPaintedPrevwDocRect.Move( + -(maWinSize.Width() - maPaintedPrevwDocRect.GetWidth()), 0 ); + Prepare( 0, maPaintedPrevwDocRect.TopLeft(), + _rPxWinSize, _onStartPageNum, _onStartPageVirtNum, + _orDocPreviewPaintRect, _bStartWithPageAtFirstCol ); + } + + /* OD 23.01.2003 - deactivate code, but not delete, because probably useful in the future + // OD 20.01.2003 #103492# - shift visible preview document area to the top, + // if on the botton is an area left blank. + if ( maPaintedPrevwDocRect.Bottom() == maPreviewDocRect.Bottom() && + maPaintedPrevwDocRect.GetHeight() < maWinSize.Height() ) + { + if ( mbDoesLayoutRowsFitIntoWindow ) + { + if ( maPaintedPrevwDocRect.GetHeight() < mnPrevwLayoutHeight) + { + maPaintedPrevwDocRect.Move( + 0, -(mnPrevwLayoutHeight - maPaintedPrevwDocRect.GetHeight()) ); + Prepare( 0, maPaintedPrevwDocRect.TopLeft(), + _rPxWinSize, _onStartPageNum, _onStartPageVirtNum, + _orDocPreviewPaintRect, _bStartWithPageAtFirstCol ); + } + } + else + { + maPaintedPrevwDocRect.Move( + 0, -(maWinSize.Height() - maPaintedPrevwDocRect.GetHeight()) ); + Prepare( 0, maPaintedPrevwDocRect.TopLeft(), + _rPxWinSize, _onStartPageNum, _onStartPageVirtNum, + _orDocPreviewPaintRect, _bStartWithPageAtFirstCol ); + } + } + */ + + // determine preview pages - visible pages with needed data for paint and + // accessible pages with needed data. + _CalcPreviewPages(); + + // validate paint data + mbPaintInfoValid = true; + + // return start page + _onStartPageNum = mnPaintPhyStartPageNum; + // return virtual page number of start page + _onStartPageVirtNum = 0; + if ( mnPaintPhyStartPageNum <= mnPages ) + { + const SwPageFrm* pPage = static_cast<const SwPageFrm*>( mrLayoutRootFrm.Lower() ); + while ( pPage && pPage->GetPhyPageNum() < mnPaintPhyStartPageNum ) + { + pPage = static_cast<const SwPageFrm*>( pPage->GetNext() ); + } + if ( pPage ) + _onStartPageVirtNum = pPage->GetVirtPageNum(); + } + return true; +} + +/** calculate additional paint offset + + OD 12.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::_CalcAdditionalPaintOffset() +{ + if ( mnPrevwLayoutWidth <= maWinSize.Width() && + maPaintStartPageOffset.X() <= 0 ) + { + mbDoesLayoutColsFitIntoWindow = true; + maAdditionalPaintOffset.X() = (maWinSize.Width() - mnPrevwLayoutWidth) / 2; + } + else + { + mbDoesLayoutColsFitIntoWindow = false; + maAdditionalPaintOffset.X() = 0; + } + + if ( mnPrevwLayoutHeight <= maWinSize.Height() && + maPaintStartPageOffset.Y() <= 0 ) + { + mbDoesLayoutRowsFitIntoWindow = true; + maAdditionalPaintOffset.Y() = (maWinSize.Height() - mnPrevwLayoutHeight) / 2; + } + else + { + mbDoesLayoutRowsFitIntoWindow = false; + maAdditionalPaintOffset.Y() = 0; + } +} + +/** calculate painted preview document rectangle + + OD 12.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::_CalcDocPrevwPaintRect() +{ + Point aTopLeftPos = maPaintPreviewDocOffset; + maPaintedPrevwDocRect.SetPos( aTopLeftPos ); + + Size aSize; + if ( mbDoesLayoutColsFitIntoWindow ) + //aSize.Width() = mnPrevwLayoutWidth; + aSize.Width() = Min( mnPrevwLayoutWidth, + maPreviewDocRect.GetWidth() - aTopLeftPos.X() ); + else + aSize.Width() = Min( maPreviewDocRect.GetWidth() - aTopLeftPos.X(), + maWinSize.Width() - maAdditionalPaintOffset.X() ); + if ( mbDoesLayoutRowsFitIntoWindow ) + //aSize.Height() = mnPrevwLayoutHeight; + aSize.Height() = Min( mnPrevwLayoutHeight, + maPreviewDocRect.GetHeight() - aTopLeftPos.Y() ); + else + aSize.Height() = Min( maPreviewDocRect.GetHeight() - aTopLeftPos.Y(), + maWinSize.Height() - maAdditionalPaintOffset.Y() ); + maPaintedPrevwDocRect.SetSize( aSize ); + long nHTmp = maPaintedPrevwDocRect.GetHeight(); + long nWTmp = maPaintedPrevwDocRect.GetWidth(); +} + +/** calculate preview pages + + OD 12.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::_CalcPreviewPages() +{ + _ClearPrevwPageData(); + + if ( mbNoPageVisible ) + return; + + // determine start page frame + const SwPageFrm* pStartPage = mrLayoutRootFrm.GetPageByPageNum( mnPaintPhyStartPageNum ); + + // calculate initial paint offset + Point aInitialPaintOffset; + if ( maPaintStartPageOffset != Point( -1, -1 ) ) + aInitialPaintOffset = Point(0,0) - maPaintStartPageOffset; + else + aInitialPaintOffset = Point( mnXFree, mnYFree ); + aInitialPaintOffset += maAdditionalPaintOffset; + + // prepare loop data + const SwPageFrm* pPage = pStartPage; + sal_uInt16 nCurrCol = mnPaintStartCol; + sal_uInt16 nConsideredRows = 0; + Point aCurrPaintOffset = aInitialPaintOffset; + // loop on pages to determine preview background retangles + while ( pPage && + (!mbDoesLayoutRowsFitIntoWindow || nConsideredRows < mnRows) && + aCurrPaintOffset.Y() < maWinSize.Height() + ) + { + pPage->Calc(); + + // consider only pages, which have to be painted. + if ( nCurrCol < mnPaintStartCol ) + { + // calculate data of unvisible page needed for accessibility + PrevwPage* pPrevwPage = new PrevwPage; + Point aCurrAccOffset = aCurrPaintOffset - + Point( (mnPaintStartCol-nCurrCol) * mnColWidth, 0 ); + _CalcPreviewDataForPage( *(pPage), aCurrAccOffset, pPrevwPage ); + pPrevwPage->bVisible = false; + maPrevwPages.push_back( pPrevwPage ); + // continue with next page and next column + pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); + ++nCurrCol; + continue; + } + if ( aCurrPaintOffset.X() < maWinSize.Width() ) + { + // OD 19.02.2003 #107369# - leaving left-top-corner blank is + // controlled by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank && + pPage->GetPhyPageNum() == 1 && mnCols != 1 && nCurrCol == 1 + ) + { + // first page in 2nd column + // --> continue with increased paint offset and next column + aCurrPaintOffset.X() += mnColWidth; + ++nCurrCol; + continue; + } + + // calculate data of visible page + PrevwPage* pPrevwPage = new PrevwPage; + _CalcPreviewDataForPage( *(pPage), aCurrPaintOffset, pPrevwPage ); + pPrevwPage->bVisible = true; + maPrevwPages.push_back( pPrevwPage ); + } + else + { + // calculate data of unvisible page needed for accessibility + PrevwPage* pPrevwPage = new PrevwPage; + _CalcPreviewDataForPage( *(pPage), aCurrPaintOffset, pPrevwPage ); + pPrevwPage->bVisible = false; + maPrevwPages.push_back( pPrevwPage ); + } + + // prepare data for next loop + pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); + aCurrPaintOffset.X() += mnColWidth; + ++nCurrCol; + if ( nCurrCol > mnCols ) + { + ++nConsideredRows; + aCurrPaintOffset.X() = aInitialPaintOffset.X(); + nCurrCol = 1; + aCurrPaintOffset.Y() += mnRowHeight; + } + } +} + +/** determines preview data for a given page and a given preview offset + + OD 13.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage, + const Point& _rPrevwOffset, + PrevwPage* _opPrevwPage ) +{ + // page frame + _opPrevwPage->pPage = &_rPage; + // size of page frame + if ( _rPage.IsEmptyPage() ) + { + if ( _rPage.GetPhyPageNum() % 2 == 0 ) + _opPrevwPage->aPageSize = _rPage.GetPrev()->Frm().SSize(); + else + _opPrevwPage->aPageSize = _rPage.GetNext()->Frm().SSize(); + } + else + _opPrevwPage->aPageSize = _rPage.Frm().SSize(); + // position of page in preview window + Point aPrevwWinOffset( _rPrevwOffset ); + if ( _opPrevwPage->aPageSize.Width() < maMaxPageSize.Width() ) + aPrevwWinOffset.X() += ( maMaxPageSize.Width() - _opPrevwPage->aPageSize.Width() ) / 2; + if ( _opPrevwPage->aPageSize.Height() < maMaxPageSize.Height() ) + aPrevwWinOffset.Y() += ( maMaxPageSize.Height() - _opPrevwPage->aPageSize.Height() ) / 2; + _opPrevwPage->aPrevwWinPos = aPrevwWinOffset; + // logic position of page and mapping offset for paint + if ( _rPage.IsEmptyPage() ) + { + _opPrevwPage->aLogicPos = _opPrevwPage->aPrevwWinPos; + _opPrevwPage->aMapOffset = Point( 0, 0 ); + } + else + { + _opPrevwPage->aLogicPos = _rPage.Frm().Pos(); + _opPrevwPage->aMapOffset = _opPrevwPage->aPrevwWinPos - _opPrevwPage->aLogicPos; + } + + return true; +} + +// ============================================================================= +// methods to determine new data for changing the current shown part of the +// document preview. +// ============================================================================= +/** calculate start position for new scale + + OD 12.12.2002 #103492# + + @author OD +*/ +Point SwPagePreviewLayout::GetPreviewStartPosForNewScale( + const Fraction& _aNewScale, + const Fraction& _aOldScale, + const Size& _aNewWinSize ) const +{ + Point aNewPaintStartPos = maPaintedPrevwDocRect.TopLeft(); + if ( _aNewScale < _aOldScale ) + { + // increase paint width by moving start point to left. + if ( mnPrevwLayoutWidth < _aNewWinSize.Width() ) + aNewPaintStartPos.X() = 0; + else if ( maPaintedPrevwDocRect.GetWidth() < _aNewWinSize.Width() ) + { + aNewPaintStartPos.X() -= + (_aNewWinSize.Width() - maPaintedPrevwDocRect.GetWidth()) / 2; + if ( aNewPaintStartPos.X() < 0) + aNewPaintStartPos.X() = 0; + } + + if ( !mbDoesLayoutRowsFitIntoWindow ) + { + // increase paint height by moving start point to top. + if ( mnPrevwLayoutHeight < _aNewWinSize.Height() ) + { + aNewPaintStartPos.Y() = + ( (mnPaintStartRow - 1) * mnRowHeight ); + } + else if ( maPaintedPrevwDocRect.GetHeight() < _aNewWinSize.Height() ) + { + aNewPaintStartPos.Y() -= + (_aNewWinSize.Height() - maPaintedPrevwDocRect.GetHeight()) / 2; + if ( aNewPaintStartPos.Y() < 0) + aNewPaintStartPos.Y() = 0; + } + } + } + else + { + // decrease paint width by moving start point to right + if ( maPaintedPrevwDocRect.GetWidth() > _aNewWinSize.Width() ) + aNewPaintStartPos.X() += + (maPaintedPrevwDocRect.GetWidth() - _aNewWinSize.Width()) / 2; + // decrease paint height by moving start point to bottom + if ( maPaintedPrevwDocRect.GetHeight() > _aNewWinSize.Height() ) + { + aNewPaintStartPos.Y() += + (maPaintedPrevwDocRect.GetHeight() - _aNewWinSize.Height()) / 2; + // check, if new y-position is outside document preview + if ( aNewPaintStartPos.Y() > maPreviewDocRect.Bottom() ) + aNewPaintStartPos.Y() = + Max( 0L, maPreviewDocRect.Bottom() - mnPrevwLayoutHeight ); + } + } + + return aNewPaintStartPos; +} + +/** determines, if page with given page number is visible in preview + + OD 12.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::IsPageVisible( const sal_uInt16 _nPageNum ) const +{ + const PrevwPage* pPrevwPage = _GetPrevwPageByPageNum( _nPageNum ); + return pPrevwPage && pPrevwPage->bVisible; +} + +/** calculate data to bring new selected page into view. + + OD 12.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove( + const sal_Int16 _nHoriMove, + const sal_Int16 _nVertMove, + sal_uInt16& _orNewSelectedPage, + sal_uInt16& _orNewStartPage, + Point& _orNewStartPos ) const +{ + // determine position of current selected page + sal_uInt16 nTmpSelPageNum = mnSelectedPageNum; + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: consider that left-top-corner is left blank --> +1 + ++nTmpSelPageNum; + } + sal_uInt16 nTmpCol = nTmpSelPageNum % mnCols; + sal_uInt16 nCurrCol = nTmpCol > 0 ? nTmpCol : mnCols; + sal_uInt16 nCurrRow = nTmpSelPageNum / mnCols; + if ( nTmpCol > 0 ) + ++nCurrRow; + + // determine new selected page number + sal_uInt16 nNewSelectedPageNum = mnSelectedPageNum; + { + if ( _nHoriMove != 0 ) + { + if ( (nNewSelectedPageNum + _nHoriMove) < 1 ) + nNewSelectedPageNum = 1; + else if ( (nNewSelectedPageNum + _nHoriMove) > mnPages ) + nNewSelectedPageNum = mnPages; + else + nNewSelectedPageNum += _nHoriMove; + } + if ( _nVertMove != 0 ) + { + if ( (nNewSelectedPageNum + (_nVertMove * mnCols)) < 1 ) + nNewSelectedPageNum = 1; + else if ( (nNewSelectedPageNum + (_nVertMove * mnCols)) > mnPages ) + nNewSelectedPageNum = mnPages; + else + nNewSelectedPageNum += ( _nVertMove * mnCols ); + } + } + + sal_uInt16 nNewStartPage = mnPaintPhyStartPageNum; + Point aNewStartPos = Point(0,0); + + if ( !IsPageVisible( nNewSelectedPageNum ) ) + { + if ( _nHoriMove != 0 && _nVertMove != 0 ) + { + ASSERT( false, "missing implementation for moving preview selected page horizontal AND vertical"); + return false; + } + + // new selected page has to be brought into view considering current + // visible preview. + sal_Int16 nTotalRows = GetRowOfPage( mnPages ); + if ( (_nHoriMove > 0 || _nVertMove > 0) && + mbDoesLayoutRowsFitIntoWindow && + mbDoesLayoutColsFitIntoWindow && // OD 20.02.2003 #107369# - add condition + nCurrRow > nTotalRows - mnRows + ) + // new proposed start page = left-top-corner of last possible + // preview page. + nNewStartPage = (nTotalRows - mnRows) * mnCols + 1; + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: decrease new proposed start page number by one, + // because of blank left-top-corner + --nNewStartPage; + } + else + // new proposed start page = new selected page. + nNewStartPage = nNewSelectedPageNum; + } + + _orNewSelectedPage = nNewSelectedPageNum; + _orNewStartPage = nNewStartPage; + _orNewStartPos = aNewStartPos; + + return true; +} + +/** checks, if given position is inside a shown document page + + OD 17.12.2002 #103492# + + @author OD +*/ +struct PrevwPosInsidePagePred +{ + const Point mnPrevwPos; + PrevwPosInsidePagePred( const Point _nPrevwPos ) : mnPrevwPos( _nPrevwPos ) {}; + bool operator() ( const PrevwPage* _pPrevwPage ) + { + if ( _pPrevwPage->bVisible ) + { + Rectangle aPrevwPageRect( _pPrevwPage->aPrevwWinPos, _pPrevwPage->aPageSize ); + return aPrevwPageRect.IsInside( mnPrevwPos ) ? true : false; + } + else + return false; + } +}; + +bool SwPagePreviewLayout::IsPrevwPosInDocPrevwPage( const Point _aPrevwPos, + Point& _orDocPos, + bool& _obPosInEmptyPage, + sal_uInt16& _onPageNum ) const +{ + bool bIsPosInsideDoc; + + // initialize variable parameter values. + _orDocPos.X() = 0; + _orDocPos.Y() = 0; + _obPosInEmptyPage = false; + _onPageNum = 0; + + std::vector<PrevwPage*>::const_iterator aFoundPrevwPageIter = + std::find_if( maPrevwPages.begin(), maPrevwPages.end(), + PrevwPosInsidePagePred( _aPrevwPos ) ); + + if ( aFoundPrevwPageIter == maPrevwPages.end() ) + // given preview position outside a document page. + bIsPosInsideDoc = false; + else + { + _onPageNum = (*aFoundPrevwPageIter)->pPage->GetPhyPageNum(); + if ( (*aFoundPrevwPageIter)->pPage->IsEmptyPage() ) + { + // given preview position inside an empty page + bIsPosInsideDoc = false; + _obPosInEmptyPage = true; + } + else + { + // given preview position inside a normal page + bIsPosInsideDoc = true; + _orDocPos = _aPrevwPos - + (*aFoundPrevwPageIter)->aPrevwWinPos + + (*aFoundPrevwPageIter)->aLogicPos; + } + } + + return bIsPosInsideDoc; +} + +/** determine window page scroll amount + + OD 17.12.2002 #103492# + + @author OD +*/ +SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount( + const sal_Int16 _nWinPagesToScroll ) const +{ + SwTwips nScrollAmount; + if ( mbDoesLayoutRowsFitIntoWindow ) + { + nScrollAmount = (mnPrevwLayoutHeight - mnYFree) * _nWinPagesToScroll; + } + else + nScrollAmount = _nWinPagesToScroll * maPaintedPrevwDocRect.GetHeight(); + + // OD 19.02.2003 #107369# - check, if preview layout size values are valid. + // If not, the checks for an adjustment of the scroll amount aren't useful. + if ( mbLayoutSizesValid ) + { + if ( (maPaintedPrevwDocRect.Top() + nScrollAmount) <= 0 ) + nScrollAmount = -maPaintedPrevwDocRect.Top(); + + // OD 14.02.2003 #107369# - correct scroll amount + if ( nScrollAmount > 0 && + maPaintedPrevwDocRect.Bottom() == maPreviewDocRect.Bottom() + ) + { + nScrollAmount = 0; + } + else + { + while ( (maPaintedPrevwDocRect.Top() + nScrollAmount + mnYFree) >= maPreviewDocRect.GetHeight() ) + { + nScrollAmount -= mnRowHeight; + } + } + } + + return nScrollAmount; +} + +/** determine window preview page the page with the given number is on. + + OD 17.01.2003 #103492# + + @author OD + + @param _nPageNum + input parameter - physical page number of page, for which the preview + window page number has to be calculated. + + @return number of preview window page the page with the given physical + page number is on +*/ +sal_uInt16 SwPagePreviewLayout::GetWinPageNumOfPage( sal_uInt16 _nPageNum ) const +{ + ASSERT( PreviewLayoutValid(), "PagePreviewLayout not valid" ); + { + ASSERT( _nPageNum <= mnPages, + "parameter <_nPageNum> out of range - SwPagePreviewLayout::GetWinPageNumOfPage() will return 0!" ); + if ( _nPageNum > mnPages ) + return 0; + } + + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: increase given physical page number by one, because left-top-corner + // in the preview layout is left blank. + ++_nPageNum; + } + + sal_uInt16 nPagesPerWinPage = mnRows * mnCols; + + sal_uInt16 nWinPageNum = (_nPageNum) / nPagesPerWinPage; + if ( ( (_nPageNum) % nPagesPerWinPage ) > 0 ) + ++nWinPageNum; + + return nWinPageNum; +} + +// ============================================================================= +// methods to paint page preview layout +// ============================================================================= +/** paint prepared preview + + OD 12.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const +{ + // check environment and parameters + { + if ( !mrParentViewShell.GetWin() && + !mrParentViewShell.GetOut()->GetConnectMetaFile() ) + return false; + + ASSERT( mbPaintInfoValid, + "invalid preview settings - no paint of preview" ); + if ( !mbPaintInfoValid ) + return false; + } + + // environment and parameter ok + + OutputDevice* pOutputDev = mrParentViewShell.GetOut(); + + // prepare paint + if ( maPrevwPages.size() > 0 ) + { + mrParentViewShell.Imp()->bFirstPageInvalid = FALSE; + mrParentViewShell.Imp()->pFirstVisPage = + const_cast<SwPageFrm*>(maPrevwPages[0]->pPage); + } + + // paint preview background + { + SwRegionRects aPreviewBackgrdRegion( _aOutRect ); + // calculate preview background rectangles + for ( std::vector<PrevwPage*>::const_iterator aPageIter = maPrevwPages.begin(); + aPageIter != maPrevwPages.end(); + ++aPageIter ) + { + if ( (*aPageIter)->bVisible ) + { + aPreviewBackgrdRegion -= + SwRect( (*aPageIter)->aPrevwWinPos, (*aPageIter)->aPageSize ); + } + } + // paint preview background rectangles + mrParentViewShell._PaintDesktop( aPreviewBackgrdRegion ); + } + + // prepare data for paint of pages + const Rectangle aPxOutRect( pOutputDev->LogicToPixel( _aOutRect ) ); + + MapMode aMapMode( pOutputDev->GetMapMode() ); + MapMode aSavedMapMode = aMapMode; + + Font* pEmptyPgFont = 0; + + Color aEmptyPgShadowBorderColor = SwViewOption::GetFontColor(); + + for ( std::vector<PrevwPage*>::const_iterator aPageIter = maPrevwPages.begin(); + aPageIter != maPrevwPages.end(); + ++aPageIter ) + { + if ( !(*aPageIter)->bVisible ) + continue; + + Rectangle aPageRect( (*aPageIter)->aLogicPos, (*aPageIter)->aPageSize ); + aMapMode.SetOrigin( (*aPageIter)->aMapOffset ); + pOutputDev->SetMapMode( aMapMode ); + Rectangle aPxPaintRect = pOutputDev->LogicToPixel( aPageRect ); + if ( aPxOutRect.IsOver( aPxPaintRect) ) + { + if ( (*aPageIter)->pPage->IsEmptyPage() ) + { + const Color aRetouche( mrParentViewShell.Imp()->GetRetoucheColor() ); + if( pOutputDev->GetFillColor() != aRetouche ) + pOutputDev->SetFillColor( aRetouche ); + pOutputDev->SetLineColor(); // OD 20.02.2003 #107369# - no line color + // OD 20.02.2003 #107369# - use aligned page rectangle + { + SwRect aTmpPageRect( aPageRect ); + ::SwAlignRect( aTmpPageRect, &mrParentViewShell); + aPageRect = aTmpPageRect.SVRect(); + } + pOutputDev->DrawRect( aPageRect ); + // paint empty page text + if( !pEmptyPgFont ) + { + pEmptyPgFont = new Font; + pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt + pEmptyPgFont->SetWeight( WEIGHT_BOLD ); + pEmptyPgFont->SetStyleName( aEmptyStr ); + pEmptyPgFont->SetName( String::CreateFromAscii( + RTL_CONSTASCII_STRINGPARAM( "Helvetica" )) ); + pEmptyPgFont->SetFamily( FAMILY_SWISS ); + pEmptyPgFont->SetTransparent( TRUE ); + pEmptyPgFont->SetColor( COL_GRAY ); + } + Font aOldFont( pOutputDev->GetFont() ); + pOutputDev->SetFont( *pEmptyPgFont ); + pOutputDev->DrawText( aPageRect, SW_RESSTR( STR_EMPTYPAGE ), + TEXT_DRAW_VCENTER | + TEXT_DRAW_CENTER | + TEXT_DRAW_CLIP ); + pOutputDev->SetFont( aOldFont ); + // paint shadow and border for empty page + // OD 19.02.2003 #107369# - use new method to paint page border and + // shadow + (*aPageIter)->pPage->PaintBorderAndShadow( aPageRect, &mrParentViewShell ); + } + else + { + mrParentViewShell.aVisArea = aPageRect; + aPxPaintRect.Intersection( aPxOutRect ); + Rectangle aPaintRect = pOutputDev->PixelToLogic( aPxPaintRect ); + mrParentViewShell.Paint( aPaintRect ); + } + if ( (*aPageIter)->pPage->GetPhyPageNum() == mnSelectedPageNum ) + { + _PaintSelectMarkAtPage( (*aPageIter) ); + } + } + } + + // update at accessiblilty interface + mrParentViewShell.Imp()->UpdateAccessiblePreview( + maPrevwPages, + aMapMode.GetScaleX(), + mrLayoutRootFrm.GetPageByPageNum( mnSelectedPageNum ), + maWinSize ); + + delete pEmptyPgFont; + pOutputDev->SetMapMode( aSavedMapMode ); + mrParentViewShell.aVisArea.Clear(); + + return true; +} + +/** repaint pages on page preview + + OD 18.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const +{ + // check environment and parameters + { + if ( !mrParentViewShell.GetWin() && + !mrParentViewShell.GetOut()->GetConnectMetaFile() ) + return; + + ASSERT( mbPaintInfoValid, + "invalid preview settings - no paint of preview" ); + if ( !mbPaintInfoValid ) + return; + } + + // environment and parameter ok + + // prepare paint + if ( maPrevwPages.size() > 0 ) + { + mrParentViewShell.Imp()->bFirstPageInvalid = FALSE; + mrParentViewShell.Imp()->pFirstVisPage = + const_cast<SwPageFrm*>(maPrevwPages[0]->pPage); + } + + // invalidate visible pages, which overlap the invalid core rectangle + for ( std::vector<PrevwPage*>::const_iterator aPageIter = maPrevwPages.begin(); + aPageIter != maPrevwPages.end(); + ++aPageIter ) + { + if ( !(*aPageIter)->bVisible ) + continue; + + Rectangle aPageRect( (*aPageIter)->aLogicPos, (*aPageIter)->aPageSize ); + if ( _aInvalidCoreRect.IsOver( aPageRect ) ) + { + aPageRect.Intersection( _aInvalidCoreRect ); + Rectangle aInvalidPrevwRect = aPageRect; + aInvalidPrevwRect.SetPos( aInvalidPrevwRect.TopLeft() - + (*aPageIter)->aLogicPos + + (*aPageIter)->aPrevwWinPos ); + mrParentViewShell.GetWin()->Invalidate( aInvalidPrevwRect ); + } + } +} + +/** paint selection mark at page + + OD 17.12.2002 #103492# + + @author OD +*/ +const void SwPagePreviewLayout::_PaintSelectMarkAtPage( + const PrevwPage* _aSelectedPrevwPage ) const +{ + OutputDevice* pOutputDev = mrParentViewShell.GetOut(); + MapMode aMapMode( pOutputDev->GetMapMode() ); + // save mapping mode of output device + MapMode aSavedMapMode = aMapMode; + // save fill and line color of output device + Color aFill( pOutputDev->GetFillColor() ); + Color aLine( pOutputDev->GetLineColor() ); + + // determine selection mark color + Color aSelPgLineColor(COL_LIGHTBLUE); + const StyleSettings& rSettings = + mrParentViewShell.GetWin()->GetSettings().GetStyleSettings(); + if ( rSettings.GetHighContrastMode() ) + aSelPgLineColor = rSettings.GetHighlightTextColor(); + + // set needed mapping mode at output device + aMapMode.SetOrigin( _aSelectedPrevwPage->aMapOffset ); + pOutputDev->SetMapMode( aMapMode ); + + // calculate page rectangle in pixel coordinates + SwRect aPageRect( _aSelectedPrevwPage->aLogicPos, + _aSelectedPrevwPage->aPageSize ); + // OD 19.02.2003 #107369# - use aligned page rectangle, as it is used for + // page border and shadow paint - see <SwPageFrm::PaintBorderAndShadow(..)> + ::SwAlignRect( aPageRect, &mrParentViewShell); + Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() ); + + // draw two rectangle + // OD 19.02.2003 #107369# - adjust position of select mark rectangle + Rectangle aRect( aPxPageRect.Left(), aPxPageRect.Top(), + aPxPageRect.Right(), aPxPageRect.Bottom() ); + aRect = pOutputDev->PixelToLogic( aRect ); + pOutputDev->SetFillColor(); // OD 20.02.2003 #107369# - no fill color + pOutputDev->SetLineColor( aSelPgLineColor ); + pOutputDev->DrawRect( aRect ); + // OD 19.02.2003 #107369# - adjust position of select mark rectangle + aRect = Rectangle( aPxPageRect.Left()+1, aPxPageRect.Top()+1, + aPxPageRect.Right()-1, aPxPageRect.Bottom()-1 ); + aRect = pOutputDev->PixelToLogic( aRect ); + pOutputDev->DrawRect( aRect ); + + // reset fill and line color of output device + pOutputDev->SetFillColor( aFill ); + pOutputDev->SetLineColor( aLine ); + + // reset mapping mode of output device + pOutputDev->SetMapMode( aSavedMapMode ); +} + +/** paint to mark new selected page + + OD 17.12.2002 #103492# + Perform paint for current selected page in order to unmark it. + Set new selected page and perform paint to mark this page. + + @author OD +*/ +void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) +{ + sal_uInt16 nOldSelectedPageNum = mnSelectedPageNum; + mnSelectedPageNum = _nSelectedPage; + + // re-paint for current selected page in order to umark it. + const PrevwPage* pOldSelectedPrevwPage = _GetPrevwPageByPageNum( nOldSelectedPageNum ); + if ( pOldSelectedPrevwPage && pOldSelectedPrevwPage->bVisible ) + { + // OD 20.02.2003 #107369# - invalidate only areas of selection mark. + SwRect aPageRect( pOldSelectedPrevwPage->aPrevwWinPos, + pOldSelectedPrevwPage->aPageSize ); + ::SwAlignRect( aPageRect, &mrParentViewShell); + OutputDevice* pOutputDev = mrParentViewShell.GetOut(); + Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() ); + // invalidate top mark line + Rectangle aInvalPxRect( aPxPageRect.Left(), aPxPageRect.Top(), + aPxPageRect.Right(), aPxPageRect.Top()+1 ); + mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); + // invalidate right mark line + aInvalPxRect = Rectangle( aPxPageRect.Right()-1, aPxPageRect.Top(), + aPxPageRect.Right(), aPxPageRect.Bottom() ); + mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); + // invalidate bottom mark line + aInvalPxRect = Rectangle( aPxPageRect.Left(), aPxPageRect.Bottom()-1, + aPxPageRect.Right(), aPxPageRect.Bottom() ); + mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); + // invalidate left mark line + aInvalPxRect = Rectangle( aPxPageRect.Left(), aPxPageRect.Top(), + aPxPageRect.Left()+1, aPxPageRect.Bottom() ); + mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); + } + + // re-paint for new selected page in order to mark it. + const PrevwPage* pNewSelectedPrevwPage = _GetPrevwPageByPageNum( _nSelectedPage ); + if ( pNewSelectedPrevwPage && pNewSelectedPrevwPage->bVisible ) + _PaintSelectMarkAtPage( pNewSelectedPrevwPage ); +} + + +// ============================================================================= +// helper methods +// ============================================================================= +/** get preview page by physical page number + + OD 17.12.2002 #103492# + + @author OD +*/ +struct EqualsPageNumPred +{ + const sal_uInt16 mnPageNum; + EqualsPageNumPred( const sal_uInt16 _nPageNum ) : mnPageNum( _nPageNum ) {}; + bool operator() ( const PrevwPage* _pPrevwPage ) + { + return _pPrevwPage->pPage->GetPhyPageNum() == mnPageNum; + } +}; + +const PrevwPage* SwPagePreviewLayout::_GetPrevwPageByPageNum( const sal_uInt16 _nPageNum ) const +{ + std::vector<PrevwPage*>::const_iterator aFoundPrevwPageIter = + std::find_if( maPrevwPages.begin(), maPrevwPages.end(), + EqualsPageNumPred( _nPageNum ) ); + + if ( aFoundPrevwPageIter == maPrevwPages.end() ) + return 0; + else + return (*aFoundPrevwPageIter); +} + +/** determine row the page with the given number is in + + OD 17.01.2003 #103492# + + @author OD +*/ +sal_uInt16 SwPagePreviewLayout::GetRowOfPage( sal_uInt16 _nPageNum ) const +{ + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: increase given physical page number by one, because left-top-corner + // in the preview layout is left blank. + ++_nPageNum; + } + + sal_uInt16 nRow = (_nPageNum) / mnCols; + if ( ( (_nPageNum) % mnCols ) > 0 ) + ++nRow; + + return nRow; +} + +/** determine column the page with the given number is in + + OD 17.01.2003 #103492# + + @author OD +*/ +sal_uInt16 SwPagePreviewLayout::GetColOfPage( sal_uInt16 _nPageNum ) const +{ + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: increase given physical page number by one, because left-top-corner + // in the preview layout is left blank. + ++_nPageNum; + } + + sal_uInt16 nCol = (_nPageNum) % mnCols; + if ( nCol == 0 ) + nCol = mnCols; + + return nCol; +} + +Size SwPagePreviewLayout::GetMaxPageSize() const +{ + ASSERT( PreviewLayoutValid(), "PagePreviewLayout not valid" ); + return maMaxPageSize; +} + +Size SwPagePreviewLayout::GetPrevwDocSize() const +{ + ASSERT( PreviewLayoutValid(), "PagePreviewLayout not valid" ); + return maPreviewDocRect.GetSize(); +} + +/** get size of a preview page by its physical page number + + OD 15.01.2003 #103492# + + @author OD +*/ +Size SwPagePreviewLayout::GetPrevwPageSizeByPageNum( sal_uInt16 _nPageNum ) const +{ + const PrevwPage* pPrevwPage = _GetPrevwPageByPageNum( _nPageNum ); + if ( pPrevwPage ) + { + return pPrevwPage->aPageSize; + } + else + { + return Size( 0, 0 ); + } +} diff --git a/sw/source/core/view/scrrect.cxx b/sw/source/core/view/scrrect.cxx index 89438b152ed0..d4a76989d3c8 100644 --- a/sw/source/core/view/scrrect.cxx +++ b/sw/source/core/view/scrrect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scrrect.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-12-05 13:29:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,10 @@ #ifndef _SCRRECT_HXX #include <scrrect.hxx> // SwScrollRect, SwScrollRects #endif +// OD 18.02.2003 #107562# - <SwAlignRect> for <ViewShell::Scroll()> +#ifndef _FRMTOOL_HXX +#include <frmtool.hxx> +#endif #ifndef _TOOLS_DEBUG_HXX //autogen #include <tools/debug.hxx> #endif @@ -175,10 +179,8 @@ void ViewShell::Scroll() //- Bei einem pos. Ofst muss von hinten nach vorn gescrollt werden. //- Bei einem neg. Ofst muss von vorn nach hinten gescrollt werden. BOOL bPositive = (*pScrollRects)[0]->GetOffs() > 0; -#ifdef VERTICAL_LAYOUT if( (*pScrollRects)[0]->IsVertical() ) bPositive = !bPositive; -#endif int i = bPositive ? pScrollRects->Count()-1 : 0; for ( ; bPositive ? i >= 0 : i < (int)pScrollRects->Count(); @@ -192,7 +194,6 @@ void ViewShell::Scroll() bPositive ? --j : ++j ) { const SwStripes& rStripes = *rScroll[j]; -#ifdef VERTICAL_LAYOUT if( rScroll.IsVertical() ) { Rectangle aRectangle( rStripes.GetY() - @@ -200,10 +201,13 @@ void ViewShell::Scroll() rStripes.GetMin(), rStripes.GetY() + rScroll.GetOffs(), rStripes.GetMax() ); - GetWin()->Scroll( -rScroll.GetOffs(), 0, aRectangle, - SCROLL_CHILDREN); + // OD 18.02.2003 #107562# - align rectangle for scrolling + SwRect aAlignedScrollRect( aRectangle ); + ::SwAlignRect( aAlignedScrollRect, this ); + GetWin()->Scroll( -rScroll.GetOffs(), 0, + aAlignedScrollRect.SVRect(), + SCROLL_CHILDREN ); SwRect aRect( aRectangle ); - /// ??? Imp()->ScrolledRect( aRect, -rScroll.GetOffs() ); if ( bPositive ) aRect.Right( aRect.Left() + rScroll.GetOffs()-1 ); @@ -212,14 +216,17 @@ void ViewShell::Scroll() Imp()->AddPaintRect( aRect ); } else -#endif { Rectangle aRectangle( rStripes.GetMin(), rStripes.GetY() - rScroll.GetOffs(), rStripes.GetRight(), rStripes.GetBottom() - rScroll.GetOffs() ); - GetWin()->Scroll( 0, rScroll.GetOffs(), aRectangle, - SCROLL_CHILDREN); + // OD 18.02.2003 #107562# - use aligned rectangle for scrolling + SwRect aAlignedScrollRect( aRectangle ); + ::SwAlignRect( aAlignedScrollRect, this ); + GetWin()->Scroll( 0, rScroll.GetOffs(), + aAlignedScrollRect.SVRect(), + SCROLL_CHILDREN ); SwRect aRect( aRectangle ); Imp()->ScrolledRect( aRect, rScroll.GetOffs() ); if ( bPositive ) @@ -274,18 +281,15 @@ void SwViewImp::AddScrollRect( const SwFrm *pFrm, const SwRect &rRect, { ASSERT( nOffs != 0, "Scrollen ohne Ofst." ); SwRect aRect( rRect ); -#ifdef VERTICAL_LAYOUT BOOL bVert = pFrm->IsVertical(); if( bVert ) aRect.Pos().X() += nOffs; else -#endif aRect.Pos().Y() -= nOffs; if( aRect.IsOver( pSh->VisArea() ) ) { ASSERT( pSh->GetWin(), "Scrolling without outputdevice" ); aRect._Intersection( pSh->VisArea() ); -#ifdef VERTICAL_LAYOUT SwStripes *pStr; if ( !pScrollRects ) pScrollRects = new SwScrollAreas; @@ -313,17 +317,6 @@ void SwViewImp::AddScrollRect( const SwFrm *pFrm, const SwRect &rRect, pScrollRects->InsertCol( SwScrollColumn( pFrm->Frm().Left(), pFrm->Frm().Width(), nOffs, bVert ), pStr ); } -#else - aRect.Pos().Y() += nOffs; - SwStripes *pStripes = new SwStripes( aRect ); - if( pFrm->IsTxtFrm() ) - ((SwTxtFrm*)pFrm)->CriticalLines(*pSh->GetWin(), *pStripes, nOffs); - else - pStripes->Insert( SwStripe( aRect.Top(), aRect.Height() ), 0 ); - if ( !pScrollRects ) - pScrollRects = new SwScrollAreas; - pScrollRects->InsertCol( SwScrollColumn(pFrm->Frm(),nOffs), pStripes ); -#endif } else AddPaintRect( rRect ); @@ -385,7 +378,6 @@ void SwViewImp::FlushScrolledArea() while( nCnt ) { SwStripes* pStripes = (*pScroll)[--nCnt]; -#ifdef VERTICAL_LAYOUT if( pScroll->IsVertical() ) { SwRect aRect( 0, pStripes->GetMin(), 0, pStripes->GetWidth() ); @@ -397,7 +389,6 @@ void SwViewImp::FlushScrolledArea() AddPaintRect( aRect ); } } -#endif { SwRect aRect( pStripes->GetMin(), 0, pStripes->GetWidth(), 0 ); for( USHORT i = 0; i < pStripes->Count(); ++i ) @@ -440,7 +431,6 @@ BOOL SwViewImp::_FlushScrolledArea( SwRect& rRect ) SwStripes* pStripes = (*pScroll)[--j]; if( pStripes->Count() ) { -#ifdef VERTICAL_LAYOUT if( pScroll->IsVertical() ) { SwRect aRect( pStripes->GetY() - pStripes->GetHeight(), @@ -464,7 +454,6 @@ BOOL SwViewImp::_FlushScrolledArea( SwRect& rRect ) } } else -#endif { SwRect aRect( pStripes->GetMin(), pStripes->GetY(), pStripes->GetWidth(), pStripes->GetHeight() ); @@ -550,16 +539,11 @@ IMPL_LINK( SwViewImp, RefreshScrolledHdl, Timer *, EMPTYARG ) SwStripes* pStripes = pScroll->GetObject(0); ASSERT( pStripes->Count() > 1, "Empty scrollstripes" ); const SwStripe &rStripe = pStripes->GetObject(1); -#ifdef VERTICAL_LAYOUT SwRect aTmpRect = pScroll->IsVertical() ? SwRect( rStripe.GetY() - rStripe.GetHeight(), pScroll->GetX(), rStripe.GetHeight(), pScroll->GetWidth() ) : SwRect( pScroll->GetX(), rStripe.GetY(), pScroll->GetWidth(), rStripe.GetHeight() ); -#else - SwRect aTmpRect( pScroll->GetX(), rStripe.GetY(), - pScroll->GetWidth(), rStripe.GetHeight() ); -#endif if( aTmpRect.IsOver( aRect ) ) { SwSaveHdl aSaveHdl( this ); @@ -620,7 +604,6 @@ void SwViewImp::_ScrolledRect( const SwRect& rRect, long nOffs ) SwStripes* pStripes = (*pScroll)[0]; if( pStripes->Count() ) { -#ifdef VERTICAL_LAYOUT SwRect aRect = pScroll->IsVertical() ? SwRect( pStripes->GetY() - pStripes->GetHeight(), pStripes->GetMin(), pStripes->GetHeight(), @@ -628,16 +611,11 @@ void SwViewImp::_ScrolledRect( const SwRect& rRect, long nOffs ) SwRect( pStripes->GetMin(), pStripes->GetY(), pStripes->GetWidth(), pStripes->GetHeight() ); -#else - SwRect aRect( pStripes->GetMin(), pStripes->GetY(), - pStripes->GetWidth(), pStripes->GetHeight() ); -#endif if( rRect.IsOver( aRect ) ) { BOOL bRecalc = FALSE; for( USHORT nI = pStripes->Count(); nI; ) { -#ifdef VERTICAL_LAYOUT if( pScroll->IsVertical() ) { long nWidth = (*pStripes)[--nI].GetHeight(); @@ -645,7 +623,6 @@ void SwViewImp::_ScrolledRect( const SwRect& rRect, long nOffs ) aRect.Width( nWidth ); } else -#endif { aRect.Top( (*pStripes)[--nI].GetY() ); aRect.Height( (*pStripes)[nI].GetHeight() ); @@ -657,11 +634,7 @@ void SwViewImp::_ScrolledRect( const SwRect& rRect, long nOffs ) } } if( bRecalc ) -#ifdef VERTICAL_LAYOUT pStripes->Recalc( pScroll->IsVertical() ); -#else - pStripes->Recalc(); -#endif } } } @@ -841,22 +814,16 @@ void SwViewImp::RefreshScrolledArea( SwRect &rRect ) SwStripes* pStripes = (*pScroll)[--j]; if( pStripes->Count() ) { -#ifdef VERTICAL_LAYOUT SwRect aRect = pScroll->IsVertical() ? SwRect( pStripes->GetY() - pStripes->GetHeight(), pStripes->GetMin(), pStripes->GetHeight(), pStripes->GetWidth() ) : SwRect( pStripes->GetMin(), pStripes->GetY(), pStripes->GetWidth(), pStripes->GetHeight() ); -#else - SwRect aRect( pStripes->GetMin(), pStripes->GetY(), - pStripes->GetWidth(), pStripes->GetHeight() ); -#endif if( rRect.IsOver( aRect ) ) { for( USHORT nI = pStripes->Count(); nI; ) { -#ifdef VERTICAL_LAYOUT if( pScroll->IsVertical() ) { long nWidth = (*pStripes)[--nI].GetHeight(); @@ -864,7 +831,6 @@ void SwViewImp::RefreshScrolledArea( SwRect &rRect ) aRect.Width( nWidth ); } else -#endif { aRect.Top( (*pStripes)[--nI].GetY() ); aRect.Height( (*pStripes)[nI].GetHeight() ); @@ -905,11 +871,7 @@ void SwViewImp::RefreshScrolledArea( SwRect &rRect ) } } -#ifdef VERTICAL_LAYOUT SwStripes& SwStripes::Plus( const SwStripes& rOther, BOOL bVert ) -#else -SwStripes& SwStripes::operator+=( const SwStripes& rOther ) -#endif { if( !Count() ) { @@ -925,7 +887,6 @@ SwStripes& SwStripes::operator+=( const SwStripes& rOther ) ChkMin( rOther.GetMin() ); ChkMax( rOther.GetMax() ); USHORT nStart = 0; -#ifdef VERTICAL_LAYOUT if( bVert ) for( USHORT nIdx = 0; nIdx < nCnt; ++nIdx ) { @@ -970,7 +931,6 @@ SwStripes& SwStripes::operator+=( const SwStripes& rOther ) } } else -#endif for( USHORT nIdx = 0; nIdx < nCnt; ++nIdx ) { const SwStripe& rAdd = rOther[ nIdx ]; @@ -1017,16 +977,11 @@ SwStripes& SwStripes::operator+=( const SwStripes& rOther ) return *this; } -#ifdef VERTICAL_LAYOUT BOOL SwStripes::Recalc( BOOL bVert ) -#else -BOOL SwStripes::Recalc() -#endif { if( !Count() ) return TRUE; Y() = GetObject(0).GetY(); -#ifdef VERTICAL_LAYOUT if( bVert ) { long nTmpMin = GetObject(0).GetY() - GetObject(0).Height(); @@ -1041,7 +996,6 @@ BOOL SwStripes::Recalc() Height() = GetY() - nTmpMin; } else -#endif { long nTmpMax = GetObject(0).GetY() + GetObject(0).Height(); for( USHORT nIdx = 1; nIdx < Count(); ) @@ -1063,33 +1017,20 @@ BOOL SwScrollArea::Compress() return TRUE; for( USHORT nIdx = Count() - 1; nIdx > 0; --nIdx ) { -#ifdef VERTICAL_LAYOUT GetObject(0)->Plus( *GetObject(nIdx), IsVertical() ); -#else - *GetObject(0) += *GetObject(nIdx); -#endif delete GetObject( nIdx ); Remove( nIdx, 1 ); } ClrOffs(); -#ifdef VERTICAL_LAYOUT return GetObject(0)->Recalc( IsVertical() ); -#else - return GetObject(0)->Recalc(); -#endif } void SwScrollArea::Add( SwScrollArea *pScroll ) { ASSERT( pScroll->Count() == 1, "Missing scrollarea compression 2" ); ASSERT( Count() == 1, "Missing scrollarea compression 3" ); -#ifdef VERTICAL_LAYOUT GetObject(0)->Plus( *pScroll->GetObject(0), IsVertical() ); GetObject(0)->Recalc( IsVertical() ); -#else - *GetObject(0) += *pScroll->GetObject(0); - GetObject(0)->Recalc(); -#endif delete pScroll->GetObject( 0 ); pScroll->Remove( (USHORT)0, 1 ); delete pScroll; @@ -1120,7 +1061,6 @@ void SwScrollArea::SmartInsert( SwStripes* pStripes ) { ASSERT( pStripes, "Insert empty scrollstripe?" ); BOOL bNotInserted = TRUE; -#ifdef VERTICAL_LAYOUT if( IsVertical() ) for( USHORT nIdx = 0; nIdx < Count() && bNotInserted; ) { @@ -1146,32 +1086,29 @@ void SwScrollArea::SmartInsert( SwStripes* pStripes ) } } else -#endif - for( USHORT nIdx = 0; nIdx < Count() && bNotInserted; ) - { - SwStripes* pTmp = GetObject( nIdx++ ); - if( pTmp->GetY() + pTmp->GetHeight() == pStripes->GetY() ) - { - pTmp->Height() += pStripes->GetHeight(); - pTmp->ChkMin( pStripes->GetMin() ); - pTmp->ChkMax( pStripes->GetMax() ); - if( pStripes->Count() ) - pTmp->Insert( (SwStripeArr*)pStripes, pTmp->Count(), 0 ); - bNotInserted = FALSE; - } - else if( pTmp->GetY() == pStripes->GetY() + pStripes->GetHeight() ) + for( USHORT nIdx = 0; nIdx < Count() && bNotInserted; ) { - pTmp->Height() += pStripes->GetHeight(); - pTmp->Y() = pStripes->GetY(); - pTmp->ChkMin( pStripes->GetMin() ); - pTmp->ChkMax( pStripes->GetMax() ); - if( pStripes->Count() ) - pTmp->Insert( (SwStripeArr*)pStripes, 0, 0 ); - bNotInserted = FALSE; + SwStripes* pTmp = GetObject( nIdx++ ); + if( pTmp->GetY() + pTmp->GetHeight() == pStripes->GetY() ) + { + pTmp->Height() += pStripes->GetHeight(); + pTmp->ChkMin( pStripes->GetMin() ); + pTmp->ChkMax( pStripes->GetMax() ); + if( pStripes->Count() ) + pTmp->Insert( (SwStripeArr*)pStripes, pTmp->Count(), 0 ); + bNotInserted = FALSE; + } + else if( pTmp->GetY() == pStripes->GetY() + pStripes->GetHeight() ) + { + pTmp->Height() += pStripes->GetHeight(); + pTmp->Y() = pStripes->GetY(); + pTmp->ChkMin( pStripes->GetMin() ); + pTmp->ChkMax( pStripes->GetMax() ); + if( pStripes->Count() ) + pTmp->Insert( (SwStripeArr*)pStripes, 0, 0 ); + bNotInserted = FALSE; + } } - } if( !bNotInserted || !Insert( pStripes ) ) delete pStripes; } - - diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 19bc15f78d7e..bcaa357af414 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewimp.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: od $ $Date: 2002-12-06 16:25:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,8 +79,8 @@ #include "swregion.hxx" #include "dflyobj.hxx" #include "dview.hxx" -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef _SHL_HXX #include <tools/shl.hxx> @@ -97,6 +97,11 @@ #endif #endif +// OD 12.12.2002 #103492# +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif + /************************************************************************* |* |* SwViewImp::Init() @@ -173,8 +178,8 @@ SwViewImp::SwViewImp( ViewShell *pParent ) : pSdrPageView( 0 ), pDrawView( 0 ), nRestoreActions( 0 ), - // OD 04.12.2002 #103492# - mpCurrPreviewData( 0 ) + // OD 12.12.2002 #103492# + mpPgPrevwLayout( 0 ) #ifdef ACCESSIBLE_LAYOUT ,pAccMap( 0 ) #endif @@ -204,8 +209,8 @@ SwViewImp::~SwViewImp() delete pAccMap; #endif - // OD 04.12.2002 #103492# - delete mpCurrPreviewData; + // OD 12.12.2002 #103492# + delete mpPgPrevwLayout; //JP 29.03.96: nach ShowPage muss auch HidePage gemacht werden!!! if( pDrawView ) @@ -395,6 +400,19 @@ Color SwViewImp::GetRetoucheColor() const return aRet; } +/** create page preview layout + + OD 12.12.2002 #103492# + + @author OD +*/ +void SwViewImp::InitPagePreviewLayout() +{ + ASSERT( pSh->GetLayout(), "no layout - page preview layout can not be created."); + if ( pSh->GetLayout() ) + mpPgPrevwLayout = new SwPagePreviewLayout( *pSh, *(pSh->GetLayout()) ); +} + #ifdef ACCESSIBLE_LAYOUT void SwViewImp::UpdateAccessible() { @@ -503,17 +521,15 @@ void SwViewImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster, } while ( pTmp != pVSh ); } -void SwViewImp::UpdateAccessiblePreview( sal_uInt8 nRow, sal_uInt8 nColumn, - sal_Int16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - sal_uInt16 nSelectedPage ) +// OD 15.01.2003 #103492# - method signature change due to new page preview functionality +void SwViewImp::UpdateAccessiblePreview( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ) { if( IsAccessible() ) - GetAccessibleMap().UpdatePreview( nRow, nColumn, nStartPage, - rPageSize, rFreePoint, rScale, - nSelectedPage ); + GetAccessibleMap().UpdatePreview( _rPrevwPages, _rScale, + _pSelectedPageFrm, _rPrevwWinSize ); } void SwViewImp::InvalidateAccessiblePreViewSelection( sal_uInt16 nSelPage ) diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index fb0d8da3a3f0..0dfc9e75c195 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewpg.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: fme $ $Date: 2002-12-10 10:22:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,1492 +125,38 @@ #ifndef _COMCORE_HRC #include <comcore.hrc> #endif -// OD 05.12.2002 #103492# -#include <algorithm> const SwTwips nXFree = 4*142; // == 0.25 cm * 4 const SwTwips nYFree = 4*142; static USHORT nPrevViewXFreePix = 0; static USHORT nPrevViewYFreePix = 0; -SwPageFrm* lcl_GetSttPage( BYTE& rRow, BYTE& rCol, USHORT& rSttPage, - const SwRootFrm* pRoot ) +// OD 12.12.2002 #103492# +SwPagePreviewLayout* ViewShell::PagePreviewLayout() { - USHORT nCalcSttPg = rSttPage; - if( nCalcSttPg ) - --nCalcSttPg; - if( !rCol ) - ++rCol; - if( !rRow ) - ++rRow; - - // suche die Start-Seite - SwPageFrm *pSttPage = (SwPageFrm*)pRoot->Lower(), *pPrevPage = pSttPage; - while( pSttPage && nCalcSttPg ) - { - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetNext(); - --nCalcSttPg; - } - - // keine Seiten mehr ?? - if( !pSttPage ) - { - pSttPage = pPrevPage; - rSttPage -= nCalcSttPg; // das sind die tatsaechlichen - if( 1 == (rSttPage & 1 )) // eine rechte Seite? - ++rSttPage; // dann sorge dafuer das sie rechts steht - - // dann dem Wunsch entsprechend Rueckwaerts - for( USHORT n = rRow * rCol; n && pSttPage; --n ) - { - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetPrev(); - --rSttPage; - } - if( !pSttPage ) - { - pSttPage = pPrevPage; - rSttPage = 1; - } - } - return pSttPage; + return Imp()->PagePreviewLayout(); } -USHORT ViewShell::CalcPreViewPage( - const Size& rWinSize, // auf diese Size die Scalierung errechnen - USHORT& rRowCol, // Zeilen/Spalten (Row im Hi, Col im LowByte!) - USHORT nSttPage, // Start ab dieser Seite, eine gueltige ?? - Size& rMaxSize, // MaxSize einer Seite - USHORT& rVirtPageNo, // virtuelle SeitenNummer - USHORT nAccSelPage ) // selected page for accessibility -{ - const SwRootFrm* pRoot = GetLayout(); - ASSERT( pRoot, "Wo ist mein Layout?" ); - - // ohne Win-Size ist nichts los - if( !rWinSize.Width() || !rWinSize.Height() ) - return 0; - - // von allen Seiten die Size holen. Das Max entscheidet - // ueber die Scalierung. (So macht es WW) - register SwTwips nMaxRowSz = 0, nMaxColSz = 0; - register USHORT nCalcSttPg = nSttPage; - if( nCalcSttPg ) - --nCalcSttPg; - - BYTE nRow = BYTE(rRowCol >> 8), nCol = BYTE(rRowCol & 0xff); - if( !nCol ) - ++nCol; - if( !nRow ) - ++nRow; - - // suche bestimme die Max-Breite - register SwPageFrm *pSttPage = (SwPageFrm*)pRoot->Lower(), - *pPrevPage = pSttPage; - while( pSttPage && nCalcSttPg ) - { - pSttPage->Calc(); - register Size& rSize = pSttPage->Frm().SSize(); - if( nMaxColSz < rSize.Width() ) - nMaxColSz = rSize.Width(); - if( nMaxRowSz < rSize.Height() ) - nMaxRowSz = rSize.Height(); - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetNext(); - --nCalcSttPg; - } - - // keine Seiten mehr ?? - if( !pSttPage ) - { - pSttPage = pPrevPage; - nSttPage -= nCalcSttPg; // das sind die tatsaechlichen -#if OLD -// hiermit stimmt die Errechnung der vir. PageNo nicht !! - if( 1 == (nSttPage & 1 )) // eine rechte Seite? - ++nSttPage; // dann sorge dafuer das sie rechts steht - - // dann dem Wunsch entsprechend Rueckwaerts - for( USHORT n = nRow * nCol; n && pSttPage; --n ) - { - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetPrev(); - --nSttPage; - } -#else - USHORT n = nRow * nCol; - if( 1 == (nSttPage & 1 )) // eine rechte Seite? - --n; // dann sorge dafuer das sie rechts steht - - // dann dem Wunsch entsprechend Rueckwaerts - for( ; n && pSttPage; --n ) - { - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetPrev(); - --nSttPage; - } -#endif - if( !pSttPage ) - { - pSttPage = pPrevPage; - nSttPage = 0; - } - rVirtPageNo = pPrevPage->GetVirtPageNum(); - } - else // dann haben wir unsere StartSeite, - // also weiter und das Max bestimmen - { - rVirtPageNo = pSttPage->GetVirtPageNum(); - while( pSttPage ) - { - pSttPage->Calc(); - register Size& rSize = pSttPage->Frm().SSize(); - if( nMaxColSz < rSize.Width() ) - nMaxColSz = rSize.Width(); - if( nMaxRowSz < rSize.Height() ) - nMaxRowSz = rSize.Height(); - pSttPage = (SwPageFrm*)pSttPage->GetNext(); - } - } - - rMaxSize.Height() = nMaxRowSz; - rMaxSize.Width() = nMaxColSz; - rRowCol = (nRow << 8) + nCol; // und wieder returnen - - // Jetzt die Scalierung incl. der gewuenschten Zwischenraueme errechnen - nMaxColSz = nCol * nMaxColSz; - nMaxRowSz = nRow * nMaxRowSz; - - MapMode aMapMode( MAP_TWIP ); - // falls die Abstaende zwischen den Seiten noch nicht berechnet wurden - if( !nPrevViewXFreePix || !nPrevViewYFreePix ) - { - Size aTmpSz( nXFree, nYFree ); - aTmpSz = GetOut()->LogicToPixel( aTmpSz, aMapMode ); - nPrevViewXFreePix = USHORT( aTmpSz.Width() ); - nPrevViewYFreePix = USHORT( aTmpSz.Height() ); - } - Size aSz( rWinSize.Width() - ((nCol+1) * nPrevViewXFreePix), - rWinSize.Height() - ( (nRow+1) * nPrevViewYFreePix ) ); - aSz = GetOut()->PixelToLogic( aSz, aMapMode ); - Fraction aScX( aSz.Width(), nMaxColSz ); - Fraction aScY( aSz.Height(), nMaxRowSz ); - if( aScX < aScY ) - aScY = aScX; - - { - // fuer Drawing, damit diese ihre Objecte vernuenftig Painten - // koennen, auf "glatte" Prozentwerte setzen - aScY *= Fraction( 1000, 1 ); - long nTmp = (long)aScY; - if( 1 < nTmp ) - --nTmp; - else - nTmp = 1; - aScY = Fraction( nTmp, 1000 ); - if( pOpt ) // fuer den Font-Cache die - pOpt->SetZoom( USHORT(nTmp / 10)); // Options mitpflegen! - } - aMapMode.SetScaleY( aScY ); - aMapMode.SetScaleX( aScY ); - -#ifdef ACCESSIBLE_LAYOUT - if( USHRT_MAX == nAccSelPage ) - nAccSelPage = nSttPage; - else if(nAccSelPage < nSttPage || nAccSelPage > nSttPage + (nRow * nCol) ) - nAccSelPage = nSttPage ? nSttPage : 1; - - Imp()->UpdateAccessiblePreview( nRow, nCol, nSttPage, rMaxSize, - GetPreviewFreePix(), aScY, nAccSelPage ); -#endif - - // was machen wir, wenn der MapMode unter einer - // gewissen Schwelle (z.B. 10% (WW6)) ist ??? - - GetOut()->SetMapMode( aMapMode ); - return nSttPage; -} -#ifdef ACCESSIBLE_LAYOUT void ViewShell::ShowPreViewSelection( sal_uInt16 nSelPage ) { Imp()->InvalidateAccessiblePreViewSelection( nSelPage ); } -#endif - -void ViewShell::PreViewPage( - const Rectangle& rRect, // Paint-Rect von Windows - USHORT nRowCol, // Anzahl Zeilen/Spalten - USHORT nSttPage, // Start ab dieser Seite, eine gueltige ?? - const Size& rPageSize, // MaxSize einer Seite - sal_uInt16 nSelectedPage ) // Page to be highlighted -{ - if( !GetWin() && !GetOut()->GetConnectMetaFile() ) - return; //Fuer den Drucker tun wir hier nix - - SET_CURR_SHELL( this ); - - const SwRootFrm* pRoot = GetLayout(); - ASSERT( pRoot, "Wo ist mein Layout?" ); - - BYTE nRow = BYTE(nRowCol >> 8), nCol = BYTE(nRowCol & 0xff); - SwPageFrm* pSttPage = ::lcl_GetSttPage( nRow, nCol, nSttPage, pRoot ); - - // damit auch die Seiten im Paint angezeigt werden, gleich die richtigen - // Werte setzen! (siehe auch Bug 24575) - Imp()->bFirstPageInvalid = FALSE; - Imp()->pFirstVisPage = pSttPage; - - const Rectangle aPixRect( GetOut()->LogicToPixel( rRect ) ); - - MapMode aMapMode( GetOut()->GetMapMode() ); - MapMode aCalcMapMode( aMapMode ); - aCalcMapMode.SetOrigin( Point() ); - - SwRegionRects aRegion( rRect );//fuer die Wiese - - Point aFreePt( nPrevViewXFreePix, nPrevViewYFreePix ); - aFreePt = GetOut()->PixelToLogic( aFreePt, aCalcMapMode ); - Point aCalcPt( aFreePt ); - long nPageHeight = aFreePt.Y() + rPageSize.Height()+1; - SwPageFrm* pPage = pSttPage; - - // erstmal die Wiese - // Sonderbehandlung fuer die erste Seite - // JP 19.08.98: aber nur wenn sie mehrspaltig angezeigt wird - int bFirstPg = !nSttPage && 1 != nCol; - - for( BYTE nCntRow = 0; pPage && nCntRow < nRow; ++nCntRow ) - { - aCalcPt.X() = aFreePt.X(); - for( BYTE nCntCol = 0; pPage && nCntCol < nCol; ++nCntCol ) - { - pPage->Calc(); - - // Sonderbehandlung fuer 1. Seite, ist immer eine rechte - if( bFirstPg ) - { - bFirstPg = FALSE; - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - continue; - } - - if( pPage->IsEmptyPage() ) - { - aRegion -= SwRect( aCalcPt, rPageSize ); - aCalcPt.X() += rPageSize.Width()+1 + aFreePt.X(); - } - else - { - aRegion -= SwRect( aCalcPt, pPage->Frm().SSize() ); - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - } - pPage = (SwPageFrm*)pPage->GetNext(); - } - aCalcPt.Y() += nPageHeight; - } - GetOut()->SetMapMode( aCalcMapMode ); - _PaintDesktop( aRegion ); - - // und dann das Dokument - bFirstPg = !nSttPage && 1 != nCol; - aCalcPt = aFreePt; - pPage = pSttPage; - Font* pEmptyPgFont = 0; - nSelectedPage -= nSttPage; - Color aLineColor(COL_LIGHTBLUE); - DBG_ASSERT(pWin, "no window available") - const StyleSettings& rSettings = GetWin()->GetSettings().GetStyleSettings(); - if(rSettings.GetHighContrastMode()) - aLineColor = rSettings.GetHighlightTextColor(); - const Color& rColor = SwViewOption::GetFontColor(); - for( nCntRow = 0; pPage && nCntRow < nRow; ++nCntRow ) - { - aCalcPt.X() = aFreePt.X(); - for( BYTE nCntCol = 0; pPage && nCntCol < nCol; ++nCntCol ) - { - // Sonderbehandlung fuer 1. Seite, ist immer eine rechte - if( bFirstPg ) - { - bFirstPg = FALSE; - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - nSelectedPage--; - continue; - } - - Rectangle aPageRect; - - if( pPage->IsEmptyPage() ) - { - Rectangle aRect( aCalcPt, rPageSize ); - - aMapMode.SetOrigin( Point(0,0) ); - GetOut()->SetMapMode( aMapMode ); - - const Color aRetouche( Imp()->GetRetoucheColor() ); - - if( GetOut()->GetFillColor() != aRetouche ) - GetOut()->SetFillColor( aRetouche ); - - GetOut()->DrawRect( aRect ); - - if( !pEmptyPgFont ) - { - pEmptyPgFont = new Font; - pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt - pEmptyPgFont->SetWeight( WEIGHT_BOLD ); - pEmptyPgFont->SetStyleName( aEmptyStr ); - pEmptyPgFont->SetName( String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "Helvetica" )) ); - pEmptyPgFont->SetFamily( FAMILY_SWISS ); - pEmptyPgFont->SetTransparent( TRUE ); - pEmptyPgFont->SetColor( COL_GRAY ); - } - Font aOldFont( GetOut()->GetFont() ); - GetOut()->SetFont( *pEmptyPgFont ); - GetOut()->DrawText( aRect, SW_RESSTR( STR_EMPTYPAGE ), - TEXT_DRAW_VCENTER | - TEXT_DRAW_CENTER | - TEXT_DRAW_CLIP ); - GetOut()->SetFont( aOldFont ); - aPageRect = GetOut()->LogicToPixel( aRect ); - - aCalcPt.X() += rPageSize.Width()+1 + aFreePt.X(); - } - else - { - aVisArea = pPage->Frm(); - - Point aPos( aCalcPt ); - aPos -= aVisArea.Pos(); - - aMapMode.SetOrigin( aPos ); - GetOut()->SetMapMode( aMapMode ); - - Rectangle aSVRect( GetOut()->LogicToPixel( aVisArea.SVRect() ) ); - aPageRect = aSVRect; - if( aPixRect.IsOver( aSVRect ) ) - { - aSVRect.Intersection( aPixRect ); - aSVRect = GetOut()->PixelToLogic( aSVRect ); - - Paint( aSVRect ); - } - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - } - - Rectangle aShadow( aPageRect.Left()+2, aPageRect.Bottom()+1, - aPageRect.Right()+2, aPageRect.Bottom()+2 ); - Color aFill( GetOut()->GetFillColor() ); - Color aLine( GetOut()->GetLineColor() ); - GetOut()->SetFillColor( rColor ); - GetOut()->SetLineColor( rColor ); - aShadow = GetOut()->PixelToLogic( aShadow ); - GetOut()->DrawRect( aShadow ); - aShadow.Left() = aPageRect.Right() + 1; - aShadow.Right() = aShadow.Left() + 1; - aShadow.Top() = aPageRect.Top() + 2; - aShadow.Bottom() = aPageRect.Bottom(); - aShadow = GetOut()->PixelToLogic( aShadow ); - GetOut()->DrawRect( aShadow ); - aShadow = GetOut()->PixelToLogic( aPageRect ); - GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - GetOut()->DrawRect( aShadow ); - if( !nSelectedPage ) - { - aShadow.Right() = aPageRect.Right() - 1; - aShadow.Left() = aPageRect.Left() + 1; - aShadow.Top() = aPageRect.Top() + 1; - aShadow.Bottom() = aPageRect.Bottom() - 1; - aShadow = GetOut()->PixelToLogic( aShadow ); - GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - GetOut()->SetLineColor( aLineColor ); - GetOut()->DrawRect( aShadow ); - aShadow.Right() = aPageRect.Right() - 2; - aShadow.Left() = aPageRect.Left() + 2; - aShadow.Top() = aPageRect.Top() + 2; - aShadow.Bottom() = aPageRect.Bottom() - 2; - aShadow = GetOut()->PixelToLogic( aShadow ); - GetOut()->DrawRect( aShadow ); - } - GetOut()->SetFillColor( aFill ); - GetOut()->SetLineColor( aLine ); - - pPage = (SwPageFrm*)pPage->GetNext(); - nSelectedPage--; - } - aCalcPt.Y() += nPageHeight; - } - - delete pEmptyPgFont; - GetOut()->SetMapMode( aCalcMapMode ); - aVisArea.Clear(); // verhinder internes Painten !! -} - -/** init page preview layout - new method, replacing <CalcPreViewPage> - - OD 27.11.2002 #103492# - initialize the page preview settings for a given layout. - side effects: - (1) data struture for current preview settings are initialized and set. - (2) if parameter <_bCalcScale> is true, mapping mode with calculated - scaling is set at the output device and the zoom at the view options is - set with the calculated scaling. - - @author OD - - @param _nCols - input parameter - initial number of page columns in the preview. - - @param _nRows - input parameter - initial number of page rows in the preview. - - @param _orMaxPageSize - output parameter - maximal size in width and height of all pages - - @param _orPreviewDocSize - output parameter - size of the document in the proposed preview layout - included the spacing between the pages. - - @param _bCalcScale - input parameter - control, if method should calculate the needed - scaling for the proposed preview layout for the given window size - and sets the scaling at the output device and the view options. - - @param _pPxWinSize - input parameter - window size in which the preview will be displayed and - for which the scaling will be calculated. - - @return boolean, indicating, if preview layout is successful initialized. -*/ -bool ViewShell::InitPreviewLayout( const sal_uInt16 _nCols, - const sal_uInt16 _nRows, - Size& _orMaxPageSize, - Size& _orPreviewDocSize, - const bool _bCalcScale, - const Size* _pPxWinSize - ) -{ - const SwRootFrm* pRootFrm = GetLayout(); - // check environment and parameters - { - ASSERT( pRootFrm, "No layout - preview layout can *not* be initialized" ); - if ( !pRootFrm ) - return false; - - bool bColsRowsValid = (_nCols != 0) && (_nRows != 0); - ASSERT( bColsRowsValid, "preview layout parameters not correct - preview layout can *not* be initialized" ); - if ( !bColsRowsValid ) - return false; - - bool bPxWinSizeValid = _pPxWinSize && - (_pPxWinSize->Width() != 0) && (_pPxWinSize->Height() != 0); - ASSERT( bPxWinSizeValid, "no window size - preview layout can *not* be initialized" ); - if ( !bPxWinSizeValid ) - return false; - } - - // environment and parameters ok - - // clear existing preview settings - Imp()->CurrPrevwData()->Clear(); - - // set layout information at preview settings - Imp()->CurrPrevwData()->nCols = _nCols; - Imp()->CurrPrevwData()->nRows = _nRows; - - // calculate maximal page size; calculate also number of pages - const SwPageFrm* pPage = static_cast<const SwPageFrm*>(pRootFrm->Lower()); - register Size aMaxPageSize( 0,0 ); - register sal_uInt16 nPages = 0; - while ( pPage ) - { - ++nPages; - pPage->Calc(); - register const Size& rPageSize = pPage->Frm().SSize(); - if ( rPageSize.Width() > aMaxPageSize.Width() ) - aMaxPageSize.Width() = rPageSize.Width(); - if ( rPageSize.Height() > aMaxPageSize.Height() ) - aMaxPageSize.Height() = rPageSize.Height(); - pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); - } - // set maximal page size, column width and row height at preview settings - Imp()->CurrPrevwData()->aMaxPageSize = aMaxPageSize; - Imp()->CurrPrevwData()->nColWidth = aMaxPageSize.Width() + nXFree; - Imp()->CurrPrevwData()->nRowHeight = aMaxPageSize.Height() + nYFree; - - // set number of pages at preview settings - Imp()->CurrPrevwData()->nPages = nPages; - // validate layout information - Imp()->CurrPrevwData()->bLayoutInfoValid = true; - - // return calculated maximal size in width and height of all pages - _orMaxPageSize = Imp()->CurrPrevwData()->aMaxPageSize; - - // calculate document size in preview layout and set it at preview settings - { - // document width - Imp()->CurrPrevwData()->aPreviewDocSize.Width() = - _nCols * aMaxPageSize.Width() + (_nCols+1) * nXFree; - - // document height - // determine number of rows needed for <nPages> in preview layout - // <nPages + 1>, because top-left-corner of preview layout is left free. - sal_uInt16 nDocRows = (nPages + 1) / _nCols; - if ( ( (nPages + 1) % _nCols ) > 0 ) - ++nDocRows; - Imp()->CurrPrevwData()->aPreviewDocSize.Height() = - nDocRows * aMaxPageSize.Height() + (nDocRows+1) * nYFree; - } - // return calculated document size in preview layout - _orPreviewDocSize = Imp()->CurrPrevwData()->aPreviewDocSize; - - if ( _bCalcScale ) - { - // calculate scaling - SwTwips nInitLayoutWidth = _nCols * aMaxPageSize.Width() + - (_nCols+1) * nXFree; - SwTwips nInitLayoutHeight = _nRows * aMaxPageSize.Height() + - (_nRows+1) * nYFree; - MapMode aMapMode( MAP_TWIP ); - Size aWinSize = GetOut()->PixelToLogic( *(_pPxWinSize), aMapMode ); - Fraction aXScale( aWinSize.Width(), nInitLayoutWidth ); - Fraction aYScale( aWinSize.Height(), nInitLayoutHeight ); - if( aXScale < aYScale ) - aYScale = aXScale; - { - // adjust scaling for Drawing layer. - aYScale *= Fraction( 1000, 1 ); - long nNewNuminator = aYScale.operator long(); - if( nNewNuminator < 1 ) - nNewNuminator = 1; - aYScale = Fraction( nNewNuminator, 1000 ); - // propagate scaling as zoom percentation to view option for font cache - if( pOpt ) - pOpt->SetZoom( USHORT(nNewNuminator / 10)); - } - aMapMode.SetScaleY( aYScale ); - aMapMode.SetScaleX( aYScale ); - // set created mapping mode with calculated scaling at output device. - GetOut()->SetMapMode( aMapMode ); - } - - // set window size in twips at preview settings - Imp()->CurrPrevwData()->aWinSize = - GetOut()->PixelToLogic( *(_pPxWinSize) ); - // validate layout sizes - Imp()->CurrPrevwData()->bLayoutSizesValid = true; - - return true; -} - -/** calculate visible pages and further needed data for current preview settings - - OD 04.12.2002 #103492# - - @author OD -*/ -void ViewShell::_CalcVisiblePagesForPreview() -{ - // determine start page frame - const SwRootFrm* pRootFrm = GetLayout(); - ASSERT( pRootFrm, "No layout - no prepare of preview paint"); - sal_uInt16 nStartPageNum = Imp()->CurrPrevwData()->nPaintPhyStartPageNum; - const SwPageFrm* pStartPage = static_cast<const SwPageFrm*>( pRootFrm->Lower() ); - while ( pStartPage && pStartPage->GetPhyPageNum() < nStartPageNum ) - { - pStartPage = static_cast<const SwPageFrm*>( pStartPage->GetNext() ); - } - - // get necessary preview layout data - sal_uInt16 nCols = Imp()->CurrPrevwData()->nCols; - sal_uInt16 nRows = Imp()->CurrPrevwData()->nRows; - bool bDoesLayoutFits = Imp()->CurrPrevwData()->bDoesLayoutRowsFitIntoWindow; - SwTwips nColWidth = Imp()->CurrPrevwData()->nColWidth; - SwTwips nRowHeight = Imp()->CurrPrevwData()->nRowHeight; - Size aMaxPageSize = Imp()->CurrPrevwData()->aMaxPageSize; - Size aPrevwWinSize = Imp()->CurrPrevwData()->aWinSize; - sal_uInt16 nStartCol = Imp()->CurrPrevwData()->nPaintStartCol; - - // calculate initial paint offset - Point aInitialPaintOffset; - if ( Imp()->CurrPrevwData()->aPaintStartPageOffset != Point( -1, -1 ) ) - { - aInitialPaintOffset = Point(0,0) - Imp()->CurrPrevwData()->aPaintStartPageOffset; - } - else - aInitialPaintOffset = Point( nXFree, nYFree ); - aInitialPaintOffset += Imp()->CurrPrevwData()->aAdditionalPaintOffset; - - // prepare loop data - Imp()->CurrPrevwData()->aVisPages.clear(); - const SwPageFrm* pPage = pStartPage; - sal_uInt16 nCurrCol = nStartCol; - sal_uInt16 nConsideredRows = 0; - Point aCurrPaintOffset = aInitialPaintOffset; - // loop on pages to determine preview background retangles - while ( pPage && - (!bDoesLayoutFits || nConsideredRows < nRows) && - //aCurrPaintOffset.X() < aPrevwWinSize.Width() && - aCurrPaintOffset.Y() < aPrevwWinSize.Height() - ) - { - pPage->Calc(); // don't know, if necessary. - - // consider only pages, which have to be painted. - if ( nCurrCol < nStartCol ) - { - // continue with next page and next column - pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); - ++nCurrCol; - continue; - } - if ( aCurrPaintOffset.X() < aPrevwWinSize.Width() ) - { - if ( pPage->GetPhyPageNum() == 1 && nCols != 1 && nCurrCol == 1) - { - // first page always in 2nd column - // --> continue with increased paint offset and next column - aCurrPaintOffset.X() += nColWidth; - ++nCurrCol; - continue; - } - - // calculate data of visible page - PrevwVisiblePage aVisPage; - // page frame - aVisPage.pPage = pPage; - // size of page frame - if ( pPage->IsEmptyPage() ) - { - if ( pPage->GetPhyPageNum() % 2 == 0 ) - aVisPage.aPageSize = pPage->GetPrev()->Frm().SSize(); - else - aVisPage.aPageSize = pPage->GetNext()->Frm().SSize(); - } - else - aVisPage.aPageSize = pPage->Frm().SSize(); - // position of page in preview window - Point aPrevwWinOffset( aCurrPaintOffset ); - if ( aVisPage.aPageSize.Width() < aMaxPageSize.Width() ) - aPrevwWinOffset.X() += ( aMaxPageSize.Width() - aVisPage.aPageSize.Width() ) / 2; - if ( aVisPage.aPageSize.Height() < aMaxPageSize.Height() ) - aPrevwWinOffset.Y() += ( aMaxPageSize.Height() - aVisPage.aPageSize.Height() ) / 2; - aVisPage.aPrevwWinPos = aPrevwWinOffset; - // logic position of page and mapping offset for paint - if ( pPage->IsEmptyPage() ) - { - aVisPage.aLogicPos = aVisPage.aPrevwWinPos; - aVisPage.aMapOffset = Point( 0, 0 ); - } - else - { - aVisPage.aLogicPos = pPage->Frm().Pos(); - aVisPage.aMapOffset = aVisPage.aPrevwWinPos - aVisPage.aLogicPos; - } - - Imp()->CurrPrevwData()->aVisPages.push_back( aVisPage ); - } - - // prepare data for next loop - pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); - aCurrPaintOffset.X() += nColWidth; - ++nCurrCol; - if ( nCurrCol > nCols ) - { - ++nConsideredRows; - aCurrPaintOffset.X() = aInitialPaintOffset.X(); - nCurrCol = 1; - aCurrPaintOffset.Y() += nRowHeight; - } - } -}; - -/** prepare paint of page preview - - With the valid preview layout settings - calculated and set by method - <InitPreviewLayout> - the paint of a specific part of the virtual - preview document is prepared. The corresponding part is given by either - a start page (parameter <_nProposedStartPageNum>) or a absolute position - (parameter <_aProposedStartPoint>). - The accessibility preview will also be updated via a corresponding - method call. - - @author OD - - @param _nProposedStartPageNum [0..<number of document pages>] - input parameter - proposed number of page, which should be painted in - the left-top-corner in the current output device. - - @param _nProposedStartPos [(0,0)..<PreviewDocumentSize>] - input parameter - proposed absolute position in the virtual preview - document, which should be painted in the left-top-corner in the current - output device. - - @param _onStartPageNum - output parameter - physical number of page, which will be painted in the - left-top-corner in the current output device. - - @param _onStartPageVirtNum - output parameter - virtual number of page, which will be painted in the - left-top-corner in the current output device. - - @param _orDocPreviewPaintRect - output parameter - rectangle of preview document, which will be painted. - - @return boolean, indicating, if prepare of preview paint was successful. -*/ -extern void lcl_CalcAdditionalPaintOffset( CurrentPreviewData* _pPrevwData ); -extern void lcl_CalcDocPrevwPaintRect( const CurrentPreviewData* _pPrevwData, - Rectangle& _orDocPrevwPaintRect ); - -bool ViewShell::PreparePreviewPaint( const sal_uInt16 _nProposedStartPageNum, - const Point _aProposedStartPos, - const Size* _pPxWinSize, - sal_uInt16& _onStartPageNum, - sal_uInt16& _onStartPageVirtNum, - Rectangle& _orDocPreviewPaintRect, - const bool _bPaintPageAtFirstCol - ) -{ - sal_uInt16 nProposedStartPageNum = _nProposedStartPageNum; - const SwRootFrm* pRootFrm = GetLayout(); - // check environment and parameters - { - ASSERT( pRootFrm, "No layout - no prepare of preview paint"); - if ( !pRootFrm ) - return false; - - bool bLayoutSettingsValid = Imp()->CurrPrevwData()->bLayoutInfoValid && - Imp()->CurrPrevwData()->bLayoutSizesValid; - ASSERT( bLayoutSettingsValid, - "no valid preview layout info/sizes - no prepare of preview paint"); - if ( !bLayoutSettingsValid ) - return false; - - bool bStartPageRangeValid = - _nProposedStartPageNum <= Imp()->CurrPrevwData()->nPages; - ASSERT( bStartPageRangeValid, - "proposed start page not existing - no prepare of preview paint"); - if ( !bStartPageRangeValid ) - return false; - - bool bStartPosRangeValid = - _aProposedStartPos.X() <= Imp()->CurrPrevwData()->aPreviewDocSize.Width() && - _aProposedStartPos.Y() <= Imp()->CurrPrevwData()->aPreviewDocSize.Height(); - ASSERT( bStartPosRangeValid, - "proposed start position out of range - no prepare of preview paint"); - if ( !bStartPosRangeValid ) - return false; - - bool bWinSizeValid = _pPxWinSize->Width() != 0 && _pPxWinSize->Height() != 0; - ASSERT ( bWinSizeValid, "no window size - no prepare of preview paint"); - if ( !bWinSizeValid ) - return false; - - bool bStartInfoValid = _nProposedStartPageNum > 0 || - _aProposedStartPos != Point(0,0); - if ( !bStartInfoValid ) - nProposedStartPageNum = 1; - } - - // environment and parameter ok - - // update window size at preview setting data - Imp()->CurrPrevwData()->aWinSize = GetOut()->PixelToLogic( *(_pPxWinSize) ); - - // get preview setting data - sal_uInt16 nCols = Imp()->CurrPrevwData()->nCols; - sal_uInt16 nRows = Imp()->CurrPrevwData()->nRows; - sal_uInt16 nPages = Imp()->CurrPrevwData()->nPages; - sal_uInt16 nColWidth = static_cast<sal_uInt16>(Imp()->CurrPrevwData()->nColWidth); - sal_uInt16 nRowHeight = static_cast<sal_uInt16>(Imp()->CurrPrevwData()->nRowHeight); - - sal_uInt16 nStartPageNum, nColOfProposed, nStartCol, nRowOfProposed; - Point aStartPageOffset; - Point aPreviewDocOffset; - if ( nProposedStartPageNum > 0 ) - { - // determine column and row of proposed start page in virtual preview layout - sal_uInt16 nTmpCol = (nProposedStartPageNum+1) % nCols; - nColOfProposed = nTmpCol ? nTmpCol : nCols; - sal_uInt16 nTmpRow = (nProposedStartPageNum+1) / nCols; - nRowOfProposed = nTmpCol ? nTmpRow+1 : nTmpRow; - // determine start page - if ( _bPaintPageAtFirstCol ) - { - if ( nProposedStartPageNum == 1 || nRowOfProposed == 1 ) - nStartPageNum = 1; - else - nStartPageNum = nProposedStartPageNum - (nColOfProposed-1); - } - else - nStartPageNum = nProposedStartPageNum; - // set starting column - if ( _bPaintPageAtFirstCol ) - nStartCol = 1; - else - nStartCol = nColOfProposed; - // page offset == (-1,-1), indicating no offset and paint of free space. - aStartPageOffset.X() = -1; - aStartPageOffset.Y() = -1; - // virtual preview document offset. - if ( _bPaintPageAtFirstCol ) - aPreviewDocOffset.X() = 0; - else - { - if ( nColOfProposed == 1) - aPreviewDocOffset.X() = 0; - else - aPreviewDocOffset.X() = (nColOfProposed-1) * nColWidth + 1; - } - if ( nRowOfProposed == 1) - aPreviewDocOffset.Y() = 0; - else - aPreviewDocOffset.Y() = (nRowOfProposed-1) * nRowHeight + 1; - } - else - { - // determine column and row of proposed start position - if ( _aProposedStartPos.X() == 0 ) - nColOfProposed = 1; - else - { - sal_uInt16 nTmpCol = _aProposedStartPos.X() / nColWidth; - nColOfProposed = - (_aProposedStartPos.X() % nColWidth) ? nTmpCol+1 : nTmpCol; - } - if ( _aProposedStartPos.Y() == 0 ) - nRowOfProposed = 1; - else - { - sal_uInt16 nTmpRow = _aProposedStartPos.Y() / nRowHeight; - nRowOfProposed = - (_aProposedStartPos.Y() % nRowHeight) ? nTmpRow+1 : nTmpRow; - } - // determine start page == page at proposed start position - if ( nRowOfProposed == 1 && nColOfProposed == 1 ) - nStartPageNum = 1; - else - nStartPageNum = (nRowOfProposed-1) * nCols + (nColOfProposed-1); - // set starting column - nStartCol = nColOfProposed; -// NOTE: <nStartPageNum> can be greater than <nPages> - consider case later - // page offset - aStartPageOffset.X() = (_aProposedStartPos.X() % nColWidth) - nXFree; - aStartPageOffset.Y() = (_aProposedStartPos.Y() % nRowHeight) - nYFree; - // virtual preview document offset. - aPreviewDocOffset = _aProposedStartPos; - } - - // set paint data at preview settings - Imp()->CurrPrevwData()->nPaintPhyStartPageNum = nStartPageNum; - Imp()->CurrPrevwData()->nPaintStartCol = nStartCol; - Imp()->CurrPrevwData()->nPaintStartRow = nRowOfProposed; - Imp()->CurrPrevwData()->aPaintStartPageOffset = aStartPageOffset; - Imp()->CurrPrevwData()->aPaintPreviewDocOffset = aPreviewDocOffset; - - // determine additional paint offset, if preview layout fits into window. - lcl_CalcAdditionalPaintOffset( Imp()->CurrPrevwData() ); - - // determine rectangle to be painted from document preview - lcl_CalcDocPrevwPaintRect( Imp()->CurrPrevwData(), _orDocPreviewPaintRect ); - Imp()->CurrPrevwData()->aPaintedPrevwDocRect = _orDocPreviewPaintRect; - - // determine pages, which are visible in the preview, and calculate needed - // paint data - _CalcVisiblePagesForPreview(); - - // validate paint data - Imp()->CurrPrevwData()->bPaintInfoValid = true; - - // return start page - _onStartPageNum = nStartPageNum; - // return virtual page number of start page - _onStartPageVirtNum = 0; - if ( nStartPageNum <= nPages ) - { - const SwPageFrm* pPage = static_cast<const SwPageFrm*>( pRootFrm->Lower() ); - while ( pPage && pPage->GetPhyPageNum() < nStartPageNum ) - { - pPage = static_cast<const SwPageFrm*>( pPage->GetNext() ); - } - if ( pPage ) - _onStartPageVirtNum = pPage->GetVirtPageNum(); - } - - return true; -}; - -void lcl_CalcAdditionalPaintOffset( CurrentPreviewData* _pPrevwData ) -{ - Size aWinSize = _pPrevwData->aWinSize; - - SwTwips nPrevwLayoutHeight = - _pPrevwData->nRows * _pPrevwData->nRowHeight + nYFree; - if ( nPrevwLayoutHeight <= aWinSize.Height() && - _pPrevwData->aPaintStartPageOffset.Y() <= 0 ) - { - _pPrevwData->bDoesLayoutRowsFitIntoWindow = true; - _pPrevwData->aAdditionalPaintOffset.Y() = - (aWinSize.Height() - nPrevwLayoutHeight) / 2; - } - else - { - _pPrevwData->bDoesLayoutRowsFitIntoWindow = false; - _pPrevwData->aAdditionalPaintOffset.Y() = 0; - } - - SwTwips nPrevwLayoutWidth = - _pPrevwData->nCols * _pPrevwData->nColWidth + nXFree; - if ( nPrevwLayoutWidth <= aWinSize.Width() && - _pPrevwData->aPaintStartPageOffset.X() <= 0 ) - { - _pPrevwData->bDoesLayoutColsFitIntoWindow = true; - _pPrevwData->aAdditionalPaintOffset.X() = - (aWinSize.Width() - nPrevwLayoutWidth) / 2; - } - else - { - _pPrevwData->bDoesLayoutColsFitIntoWindow = false; - _pPrevwData->aAdditionalPaintOffset.X() = 0; - } - -} - -void lcl_CalcDocPrevwPaintRect( const CurrentPreviewData* _pPrevwData, - Rectangle& _orDocPrevwPaintRect ) -{ - Point aTopLeftPos = _pPrevwData->aPaintPreviewDocOffset; - _orDocPrevwPaintRect.SetPos( aTopLeftPos ); - - Size aSize; - aSize.Width() = Min( _pPrevwData->aPreviewDocSize.Width() - - aTopLeftPos.X(), - _pPrevwData->aWinSize.Width() - - _pPrevwData->aAdditionalPaintOffset.X() ); - if ( _pPrevwData->bDoesLayoutRowsFitIntoWindow ) - aSize.Height() = _pPrevwData->nRows * _pPrevwData->nRowHeight + nYFree; - else - aSize.Height() = Min( _pPrevwData->aPreviewDocSize.Height() - - aTopLeftPos.Y(), - _pPrevwData->aWinSize.Height() - - _pPrevwData->aAdditionalPaintOffset.Y() ); - _orDocPrevwPaintRect.SetSize( aSize ); -} - -/** property <DoesPreviewLayoutRowsFitIntoWin> of current preview layout - - OD 03.12.2002 #103492# - - @author OD - - @return boolean, indicating that the rows of the current preview layout - fit into the current window size. -*/ -bool ViewShell::DoesPreviewLayoutRowsFitIntoWindow() -{ - ASSERT( IsPreView(), "method <ViewShell::DoesPreviewLayoutRowsFitIntoWindow called for a non-preview view shell" ); - if ( !IsPreView() ) - return false; - - return Imp()->CurrPrevwData()->bDoesLayoutRowsFitIntoWindow; -} - -/** property <DoesPreviewLayoutColsFitIntoWin> of current preview layout - - OD 03.12.2002 #103492# - - @author OD - - @return boolean, indicating that the columns of the current preview layout - fit into the current window size. -*/ -bool ViewShell::DoesPreviewLayoutColsFitIntoWindow() -{ - ASSERT( IsPreView(), "method <ViewShell::DoesPreviewLayoutColsFitIntoWindow called for a non-preview view shell" ); - if ( !IsPreView() ) - return false; - - return Imp()->CurrPrevwData()->bDoesLayoutColsFitIntoWindow; -} -/** calculate start position for new scaling - - OD 04.12.2002 #103492# - - @author OD - - @return Point, start position for new scale -*/ -Point ViewShell::GetPreviewStartPosForNewScale( const Fraction& _aNewScale, - const Fraction& _aOldScale, - const Size& _aNewWinSize ) -{ - ASSERT( IsPreView(), "method <ViewShell::GetPreviewStartPosForNewScale called for a non-preview view shell" ); - if ( !IsPreView() ) - return Point(0,0); - - const Rectangle aPaintedPrevwDocRect = - Imp()->CurrPrevwData()->aPaintedPrevwDocRect; - Point aNewPaintStartPos = aPaintedPrevwDocRect.TopLeft(); - if ( _aNewScale < _aOldScale ) - { - // increase paint width by moving start point to left. - SwTwips nPrevwLayoutWidth = nXFree + - Imp()->CurrPrevwData()->nCols * Imp()->CurrPrevwData()->nColWidth; - if ( nPrevwLayoutWidth < _aNewWinSize.Width() ) - { - aNewPaintStartPos.X() = 0; - } - else if ( aPaintedPrevwDocRect.GetWidth() < _aNewWinSize.Width() ) - { - aNewPaintStartPos.X() -= (_aNewWinSize.Width() - aPaintedPrevwDocRect.GetWidth()) / 2; - if ( aNewPaintStartPos.X() < 0) - aNewPaintStartPos.X() = 0; - } - - if ( !Imp()->CurrPrevwData()->bDoesLayoutRowsFitIntoWindow ) - { - // increase paint height by moving start point to top. - SwTwips nPrevwLayoutHeight = nYFree + - Imp()->CurrPrevwData()->nRows * Imp()->CurrPrevwData()->nRowHeight; - if ( nPrevwLayoutHeight < _aNewWinSize.Height() ) - { - if ( Imp()->CurrPrevwData()->nPaintStartRow == 1) - aNewPaintStartPos.Y() = 0; - else - aNewPaintStartPos.Y() = - ( (Imp()->CurrPrevwData()->nPaintStartRow - 1) * - Imp()->CurrPrevwData()->nRowHeight - ) + 1; - } - else if ( aPaintedPrevwDocRect.GetHeight() < _aNewWinSize.Height() ) - { - aNewPaintStartPos.Y() -= (_aNewWinSize.Height() - aPaintedPrevwDocRect.GetHeight()) / 2; - if ( aNewPaintStartPos.Y() < 0) - aNewPaintStartPos.Y() = 0; - } - } - } - else - { - // decrease paint width by moving start point to right - if ( aPaintedPrevwDocRect.GetWidth() > _aNewWinSize.Width() ) - aNewPaintStartPos.X() += (aPaintedPrevwDocRect.GetWidth() - _aNewWinSize.Width()) / 2; - // decrease paint height by moving start point to bottom - if ( aPaintedPrevwDocRect.GetHeight() > _aNewWinSize.Height() ) - aNewPaintStartPos.Y() += (aPaintedPrevwDocRect.GetHeight() - _aNewWinSize.Height()) / 2; - } - return aNewPaintStartPos; -} - -/** prepares re-paint of preview to bring new selected page into view. - OD 06.12.2002 #103492# +/** adjust view options for page preview - @author OD + OD 09.01.2003 #i6467# */ -bool ViewShell::MovePreviewSelectedPage( const sal_uInt16 _nCurrSelectedPage, - const sal_Int16 _nHoriMove, - const sal_Int16 _nVertMove, - sal_uInt16& _orNewSelectedPage, - sal_uInt16& _orNewStartPage, - Point& _orNewStartPos ) +void ViewShell::AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions ) { - ASSERT( IsPreView(), "method <ViewShell::MovePreviewSelectedPage called for a non-preview view shell" ); if ( !IsPreView() ) - return false;; - - // check parameters - { - bool bCurrSelectedPageNumValid = _nCurrSelectedPage > 0 && - _nCurrSelectedPage <= Imp()->CurrPrevwData()->nPages; - ASSERT( bCurrSelectedPageNumValid, "current selected page number out of range" ); - if ( !bCurrSelectedPageNumValid ) - return false; - } - - // get needed preview layout data - sal_uInt16 nCols = Imp()->CurrPrevwData()->nCols; - sal_uInt16 nRows = Imp()->CurrPrevwData()->nRows; - sal_uInt16 nPages = Imp()->CurrPrevwData()->nPages; - - // determine position of current selected page - sal_uInt16 nTmpCol = (_nCurrSelectedPage+1) % nCols; - sal_uInt16 nCurrCol = nTmpCol > 0 ? nTmpCol : nCols; - sal_uInt16 nCurrRow = (_nCurrSelectedPage+1) / nCols; - if ( nTmpCol > 0 ) - ++nCurrRow; - - // determine new selected page number - sal_uInt16 nNewSelectedPageNum = _nCurrSelectedPage; - { - if ( _nHoriMove != 0 ) - { - if ( (nNewSelectedPageNum + _nHoriMove) < 1 ) - nNewSelectedPageNum = 1; - else if ( (nNewSelectedPageNum + _nHoriMove) > nPages ) - nNewSelectedPageNum = nPages; - else - nNewSelectedPageNum += _nHoriMove; - } - if ( _nVertMove != 0 ) - { - if ( (nNewSelectedPageNum + (_nVertMove * nCols)) < 1 ) - nNewSelectedPageNum = 1; - else if ( (nNewSelectedPageNum + (_nVertMove * nCols)) > nPages ) - nNewSelectedPageNum = nPages; - else - nNewSelectedPageNum += ( _nVertMove * nCols ); - } - } - - sal_uInt16 nNewStartPage = Imp()->CurrPrevwData()->nPaintPhyStartPageNum; - Point aNewStartPos = Point(0,0); - - if ( !IsPageVisibleInCurrPreview( nNewSelectedPageNum ) ) { - if ( _nHoriMove != 0 && _nVertMove != 0 ) - { - ASSERT( false, "missing implementation for moving preview selected page horizontal AND vertical"); - return false; - } - - // new selected page has to be brought into view considering current - // visible preview. - // determine position of current selected page - sal_uInt16 nTmpCol = (nNewSelectedPageNum+1) % nCols; - sal_uInt16 nNewCol = nTmpCol > 0 ? nTmpCol : nCols; - sal_uInt16 nNewRow = (nNewSelectedPageNum+1) / nCols; - if ( nTmpCol > 0 ) - ++nNewRow; - - if ( _nHoriMove != 0 && _nVertMove == 0 ) - { - nNewStartPage = nNewSelectedPageNum; - } - else if ( _nHoriMove == 0 && _nVertMove != 0 ) - { - sal_Int16 nTotalRows = (nPages+1) / nCols; - if ( (nPages+1) % nCols > 0 ) - ++nTotalRows; - if ( _nVertMove > 0 && - Imp()->CurrPrevwData()->bDoesLayoutRowsFitIntoWindow && - nCurrRow > nTotalRows - nRows - ) - nNewStartPage = (nTotalRows - nRows) * nCols; - else - nNewStartPage = nNewSelectedPageNum; - } - } - - _orNewSelectedPage = nNewSelectedPageNum; - ShowPreViewSelection( nNewSelectedPageNum ); - _orNewStartPage = nNewStartPage; - _orNewStartPos = aNewStartPos; - - return true; -} - -/** determines, if page with given page number is visible in preview - - OD 05.12.2002 #103492# - - @author OD - - @return boolean, indicating, if page with given page number is visible - in preview -*/ -// predicate (unary function) for stl-algorithm "find_if" needed for method -// <ViewShell::IsPageVisibleInCurrPreview>. -struct EqualsPageNumPred -{ - const sal_uInt16 mnPageNum; - EqualsPageNumPred( const sal_uInt16 _nPageNum ) : mnPageNum( _nPageNum ) {}; - bool operator() ( const PrevwVisiblePage& _rVisPage ) - { - return _rVisPage.pPage->GetPhyPageNum() == mnPageNum; - } -}; -bool ViewShell::IsPageVisibleInCurrPreview( const sal_uInt16 _nPageNum ) -{ - ASSERT( IsPreView(), "method <ViewShell::IsPageVisibleInCurrPreview called for a non-preview view shell" ); - if ( !IsPreView() ) - return false; - - PrevwVisiblePageConstIter aFoundVisPageIter = - std::find_if( Imp()->CurrPrevwData()->aVisPages.begin(), - Imp()->CurrPrevwData()->aVisPages.end(), - EqualsPageNumPred( _nPageNum ) ); - - bool bPageVisibleInPrevw = - aFoundVisPageIter != Imp()->CurrPrevwData()->aVisPages.end(); - - return bPageVisibleInPrevw; -} - -/** helper method for <ViewShell::PaintPreview(..)> - - OD 03.12.2002 #103492# - - @author OD -*/ -void lcl_CalcPrevwBackgrd( const PrevwVisiblePages _aVisPages, - SwRegionRects& _orPrevwBackgrdRegion ) -{ - PrevwVisiblePageConstIter aPageIter = _aVisPages.begin(); - while ( aPageIter != _aVisPages.end() ) - { - _orPrevwBackgrdRegion -= - SwRect( (*aPageIter).aPrevwWinPos, (*aPageIter).aPageSize ); - ++aPageIter; - } -} -/** paint prepared preview - - OD 28.11.2002 #103492# - - @author OD - - @param _nSelectedPageNum - input parameter - physical number of page, which should be painted as - selected by am extra border in color COL_LIGHTBLUE. - - @param _aOutRect - input parameter - Twip rectangle of window, which should be painted. - - @return boolean, indicating, if paint of preview was performed -*/ -bool ViewShell::PaintPreview( const sal_uInt16 _nSelectedPageNum, - const Rectangle _aOutRect ) -{ - const SwRootFrm* pRootFrm = GetLayout(); - // check environment and parameters - { - ASSERT( pRootFrm, "No layout - no paint of preview" ); - if ( !pRootFrm ) - return false; - - ASSERT( Imp()->CurrPrevwData()->bPaintInfoValid, - "invalid preview settings - no paint of preview" ); - if ( !Imp()->CurrPrevwData()->bPaintInfoValid ) - return false; - } - - // environment and parameter ok - - if ( !GetWin() && !GetOut()->GetConnectMetaFile() ) - return false;; - - SET_CURR_SHELL( this ); - - // prepare paint - if ( Imp()->CurrPrevwData()->aVisPages.size() > 0 ) - { - Imp()->bFirstPageInvalid = FALSE; - Imp()->pFirstVisPage = - const_cast<SwPageFrm*>(Imp()->CurrPrevwData()->aVisPages[0].pPage); - } - - // paint preview background - { - SwRegionRects aPreviewBackgrdRegion( _aOutRect ); - // calculate preview background rectangles - PrevwVisiblePageConstIter aPageIter = - Imp()->CurrPrevwData()->aVisPages.begin(); - while ( aPageIter != Imp()->CurrPrevwData()->aVisPages.end() ) - { - aPreviewBackgrdRegion -= - SwRect( (*aPageIter).aPrevwWinPos, (*aPageIter).aPageSize ); - ++aPageIter; - } - // paint preview background rectangles - _PaintDesktop( aPreviewBackgrdRegion ); - } - - // prepare data for paint of pages - const Rectangle aPxOutRect( GetOut()->LogicToPixel( _aOutRect ) ); - MapMode aMapMode( GetOut()->GetMapMode() ); - MapMode aSavedMapMode = aMapMode; - - Font* pEmptyPgFont = 0; - - Color aSelPgLineColor(COL_LIGHTBLUE); - const StyleSettings& rSettings = GetWin()->GetSettings().GetStyleSettings(); - if ( rSettings.GetHighContrastMode() ) - aSelPgLineColor = rSettings.GetHighlightTextColor(); - - Color aEmptyPgShadowBorderColor = SwViewOption::GetFontColor(); - - { - PrevwVisiblePageConstIter aPageIter = - Imp()->CurrPrevwData()->aVisPages.begin(); - while ( aPageIter != Imp()->CurrPrevwData()->aVisPages.end() ) - { - Rectangle aPageRect( (*aPageIter).aLogicPos, (*aPageIter).aPageSize ); - aMapMode.SetOrigin( (*aPageIter).aMapOffset ); - GetOut()->SetMapMode( aMapMode ); - Rectangle aPxPageRect = GetOut()->LogicToPixel( aPageRect ); - if ( (*aPageIter).pPage->IsEmptyPage() ) - { - const Color aRetouche( Imp()->GetRetoucheColor() ); - if( GetOut()->GetFillColor() != aRetouche ) - GetOut()->SetFillColor( aRetouche ); - GetOut()->DrawRect( aPageRect ); - // paint empty page text - if( !pEmptyPgFont ) - { - pEmptyPgFont = new Font; - pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt - pEmptyPgFont->SetWeight( WEIGHT_BOLD ); - pEmptyPgFont->SetStyleName( aEmptyStr ); - pEmptyPgFont->SetName( String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "Helvetica" )) ); - pEmptyPgFont->SetFamily( FAMILY_SWISS ); - pEmptyPgFont->SetTransparent( TRUE ); - pEmptyPgFont->SetColor( COL_GRAY ); - } - Font aOldFont( GetOut()->GetFont() ); - GetOut()->SetFont( *pEmptyPgFont ); - GetOut()->DrawText( aPageRect, SW_RESSTR( STR_EMPTYPAGE ), - TEXT_DRAW_VCENTER | - TEXT_DRAW_CENTER | - TEXT_DRAW_CLIP ); - GetOut()->SetFont( aOldFont ); - // paint shadow and border for empty page - Color aFill( GetOut()->GetFillColor() ); - Color aLine( GetOut()->GetLineColor() ); - GetOut()->SetFillColor( aEmptyPgShadowBorderColor ); - GetOut()->SetLineColor( aEmptyPgShadowBorderColor ); - // bottom shadow - Rectangle aRect( aPxPageRect.Left()+2, aPxPageRect.Bottom()+1, - aPxPageRect.Right()+2, aPxPageRect.Bottom()+2 ); - aRect = GetOut()->PixelToLogic( aRect ); - GetOut()->DrawRect( aRect ); - // right shadow - aRect.Left() = aPxPageRect.Right() + 1; - aRect.Right() = aRect.Left() + 1; - aRect.Top() = aPxPageRect.Top() + 2; - aRect.Bottom() = aPxPageRect.Bottom(); - aRect = GetOut()->PixelToLogic( aRect ); - GetOut()->DrawRect( aRect ); - // border - aRect = GetOut()->PixelToLogic( aPxPageRect ); - GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - GetOut()->DrawRect( aRect ); - GetOut()->SetFillColor( aFill ); - GetOut()->SetLineColor( aLine ); - } - else - { - aVisArea = aPageRect; - Rectangle aPxPaintRect = aPxPageRect; - if ( aPxOutRect.IsOver( aPxPaintRect) ) - { - aPxPaintRect.Intersection( aPxOutRect ); - Rectangle aPaintRect = GetOut()->PixelToLogic( aPxPaintRect ); - Paint( aPaintRect ); - } - } - if ( (*aPageIter).pPage->GetPhyPageNum() == _nSelectedPageNum ) - { - Color aFill( GetOut()->GetFillColor() ); - Color aLine( GetOut()->GetLineColor() ); - Rectangle aRect( aPxPageRect.Left()+1, aPxPageRect.Top()+1, - aPxPageRect.Right()-1, aPxPageRect.Bottom()-1 ); - aRect = GetOut()->PixelToLogic( aRect ); - GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - GetOut()->SetLineColor( aSelPgLineColor ); - GetOut()->DrawRect( aRect ); - aRect = Rectangle( aPxPageRect.Left()+2, aPxPageRect.Top()+2, - aPxPageRect.Right()-2, aPxPageRect.Bottom()-2 ); - aRect = GetOut()->PixelToLogic( aRect ); - GetOut()->DrawRect( aRect ); - GetOut()->SetFillColor( aFill ); - GetOut()->SetLineColor( aLine ); - } - - ++aPageIter; - } + ASSERT( false, "view shell doesn't belongs to a page preview - no adjustment of its view options"); + return; } - delete pEmptyPgFont; - GetOut()->SetMapMode( aSavedMapMode ); - aVisArea.Clear(); + PrepareForPrint( _rPrintOptions ); - return true; -} - -void ViewShell::RepaintCoreRect( - const SwRect& rRect, // Paint-Rect der Core - USHORT nRowCol, // Anzahl Zeilen/Spalten - USHORT nSttPage, // Start ab dieser Seite, eine gueltige ?? - const Size& rPageSize ) // MaxSize einer Seite -{ - if( !GetWin() && !GetOut()->GetConnectMetaFile() ) - return; //Fuer den Drucker tun wir hier nix - - SET_CURR_SHELL( this ); - - const SwRootFrm* pRoot = GetLayout(); - ASSERT( pRoot, "Wo ist mein Layout?" ); - - BYTE nRow = BYTE(nRowCol >> 8), nCol = BYTE(nRowCol & 0xff); - SwPageFrm* pSttPage = ::lcl_GetSttPage( nRow, nCol, nSttPage, pRoot ); - - // damit auch die Seiten im Paint angezeigt werden, gleich die richtigen - // Werte setzen! (siehe auch Bug 24575) - Imp()->bFirstPageInvalid = FALSE; - Imp()->pFirstVisPage = pSttPage; - -// const Rectangle aPixRect( GetOut()->LogicToPixel( rRect ) ); - - MapMode aMapMode( GetOut()->GetMapMode() ); - MapMode aCalcMapMode( aMapMode ); - aCalcMapMode.SetOrigin( Point() ); - - Point aFreePt( nPrevViewXFreePix, nPrevViewYFreePix ); - aFreePt = GetOut()->PixelToLogic( aFreePt, aCalcMapMode ); - Point aCalcPt( aFreePt ); - long nPageHeight = aFreePt.Y() + rPageSize.Height()+1; - SwPageFrm* pPage = pSttPage; - - // Sonderbehandlung fuer die erste Seite - // JP 19.08.98: aber nur wenn sie mehrspaltig angezeigt wird - int bFirstPg = !nSttPage && 1 != nCol; - for( BYTE nCntRow = 0; pPage && nCntRow < nRow; ++nCntRow ) - { - aCalcPt.X() = aFreePt.X(); - for( BYTE nCntCol = 0; pPage && nCntCol < nCol; ++nCntCol ) - { - // Sonderbehandlung fuer 1. Seite, ist immer eine rechte - if( bFirstPg ) - { - bFirstPg = FALSE; - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - continue; - } - - SwRect aTmpRect( pPage->Frm() ); - if( rRect.IsOver( aTmpRect )) - { - Point aPos( aCalcPt ); - aPos -= aTmpRect.Pos(); - - aMapMode.SetOrigin( aPos ); - - aTmpRect._Intersection( rRect ); - Rectangle aSVRect( GetOut()-> - LogicToLogic( aTmpRect.SVRect(), &aMapMode, &aCalcMapMode ) ); - GetWin()->Invalidate( aSVRect ); - } - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - pPage = (SwPageFrm*)pPage->GetNext(); - } - aCalcPt.Y() += nPageHeight; - } - - aVisArea.Clear(); // verhinder internes Painten !! + return; } // und jetzt mal raus auf den Drucker @@ -2243,100 +789,3 @@ void ViewShell::PrintProspect( SwPrtOptions& rOptions, } pFntCache->Flush(); } - - -BOOL ViewShell::IsPreViewDocPos( - Point& rDocPt, // DocPos die bestimmt und auf - // Layout Korrdination einer View umge- - // rechnet werden soll - USHORT nRowCol, // Zeilen/Spalten (Row im Hi, Col im LowByte!) - USHORT nSttPage, // Start ab dieser Seite, eine gueltige ?? - const Size& rPageSize // (Max)Size einer Seite - ) -{ -#ifdef DEBUG - ASSERT( false, "ViewShell::IsPreViewDocPos called [Debug-Assertion by OD]"); -#endif - BOOL bRet = FALSE; - SET_CURR_SHELL( this ); - - const SwRootFrm* pRoot = GetLayout(); - ASSERT( pRoot, "Wo ist mein Layout?" ); - - BYTE nRow = BYTE(nRowCol >> 8), nCol = BYTE(nRowCol & 0xff); - SwPageFrm* pSttPage = ::lcl_GetSttPage( nRow, nCol, nSttPage, pRoot ); - - MapMode aMapMode( GetOut()->GetMapMode() ); - MapMode aCalcMapMode( aMapMode ); - aCalcMapMode.SetOrigin( Point() ); - - Point aFreePt( nPrevViewXFreePix, nPrevViewYFreePix ); - aFreePt = GetOut()->PixelToLogic( aFreePt, aCalcMapMode ); - Point aCalcPt( aFreePt ); - long nPageHeight = aFreePt.Y() + rPageSize.Height()+1; - SwPageFrm* pPage = pSttPage; - - // Sonderbehandlung fuer die erste Seite - // JP 19.08.98: aber nur wenn sie mehrspaltig angezeigt wird - int bFirstPg = !nSttPage && 1 != nCol; - - for( BYTE nCntRow = 0; pPage && nCntRow < nRow; ++nCntRow ) - { - aCalcPt.X() = aFreePt.X(); - for( BYTE nCntCol = 0; pPage && nCntCol < nCol; ++nCntCol ) - { - // Sonderbehandlung fuer 1. Seite, ist immer eine rechte - if( bFirstPg ) - { - bFirstPg = FALSE; - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - continue; - } - - if( pPage->IsEmptyPage() ) - aCalcPt.X() += rPageSize.Width()+1 + aFreePt.X(); - else - { - SwRect aPgRect( aCalcPt, pPage->Frm().SSize() ); - if( aPgRect.IsInside( rDocPt )) - { - // dann den richtigen Point errechnen: - Point aOffset( rDocPt ); - aOffset -= aCalcPt; - aOffset += pPage->Frm().Pos(); - rDocPt = aOffset; - bRet = TRUE; - break; - } - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - } - pPage = (SwPageFrm*)pPage->GetNext(); - } - if( bRet ) - break; - - aCalcPt.Y() += nPageHeight; - } - return bRet; -} - -Size ViewShell::GetPagePreViewPrtMaxSize() const -{ - Size aMaxSize; - register const SwFrm *pSttPage = GetLayout()->Lower(); - while( pSttPage ) - { - register const Size& rSize = pSttPage->Frm().SSize(); - if( aMaxSize.Width() < rSize.Width() ) - aMaxSize.Width() = rSize.Width(); - if( aMaxSize.Height() < rSize.Height() ) - aMaxSize.Height() = rSize.Height(); - pSttPage = pSttPage->GetNext(); - } - return aMaxSize; -} - -Point ViewShell::GetPreviewFreePix() const -{ - return Point( nPrevViewXFreePix, nPrevViewYFreePix ); -} diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index d7dcd42c8e8b..a383606bb05f 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewsh.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: fme $ $Date: 2002-12-06 09:31:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,8 +169,8 @@ #include <accmap.hxx> #endif #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef INCLUDED_SVTOOLS_ACCESSIBILITYOPTIONS_HXX #include <svtools/accessibilityoptions.hxx> @@ -181,6 +181,10 @@ #ifndef _STATSTR_HRC #include <statstr.hrc> #endif +// OD 14.01.2003 #103492# +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif BOOL ViewShell::bLstAct = FALSE; ShellResource *ViewShell::pShellRes = 0; @@ -1057,16 +1061,22 @@ void ViewShell::VisPortChgd( const SwRect &rRect) const SwTwips nRight = aBoth.Right(); SwTwips nMinLeft = LONG_MAX; SwTwips nMaxRight= 0; - const nShadow = GetOut()->PixelToLogic( Size( 2, 0 ) ).Width(); while ( pPage && !((pPage->Frm().Top() > nBottom) || (pPage->Frm().Left() > nRight))) { if ( pPage->Frm().IsOver( aBoth ) ) { - if( pPage->Frm().Left() < nMinLeft ) - nMinLeft = pPage->Frm().Left(); - long nPageRight = pPage->Frm().Right() + nShadow; + // OD 12.02.2003 #i9719#, #105645# - consider new border + // and shadow width + const nBorderWidth = + GetOut()->PixelToLogic( Size( pPage->BorderPxWidth(), 0 ) ).Width(); + const nShadowWidth = + GetOut()->PixelToLogic( Size( pPage->ShadowPxWidth(), 0 ) ).Width(); + sal_Int16 nPageLeft = pPage->Frm().Left() - nBorderWidth; + if( nPageLeft < nMinLeft ) + nMinLeft = nPageLeft; + sal_Int16 nPageRight = pPage->Frm().Right() + nBorderWidth + nShadowWidth; if( nPageRight > nMaxRight ) nMaxRight = nPageRight; //Zus. auf die Zeichenobjekte abgleichen. @@ -1406,8 +1416,12 @@ void ViewShell::PaintDesktop( const SwRect &rRect ) void ViewShell::_PaintDesktop( const SwRegionRects &rRegion ) { GetOut()->Push( PUSH_FILLCOLOR ); + // OD 14.02.2003 #107424# - no longer needed, because color configuration + // is loaded in constructor of <SwModule>. + /* //make sure the color configuration has been loaded SW_MOD()->GetColorConfig(); + */ GetOut()->SetFillColor( SwViewOption::GetAppBackgroundColor()); for ( USHORT i = 0; i < rRegion.Count(); ++i ) GetOut()->DrawRect( rRegion[i].SVRect() ); @@ -2124,10 +2138,8 @@ void ViewShell::SetReadonlyOption(BOOL bSet) } else if ( GetWin() ) GetWin()->Invalidate(); -#ifdef ACCESSIBLE_LAYOUT if( Imp()->IsAccessible() ) Imp()->InvalidateAccessibleEditableState( sal_False ); -#endif } } /* -----------------------------2002/07/31 17:06------------------------------ @@ -2197,7 +2209,6 @@ BOOL ViewShell::IsNewLayout() const return GetLayout()->IsNewLayout(); } -#ifdef ACCESSIBLE_LAYOUT ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > ViewShell::CreateAccessible() { @@ -2219,13 +2230,7 @@ BOOL ViewShell::IsNewLayout() const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > -ViewShell::CreateAccessiblePreview( sal_uInt8 nRow, - sal_uInt8 nColumn, - sal_uInt16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - sal_uInt16 nSelectedPage ) +ViewShell::CreateAccessiblePreview() { using ::com::sun::star::uno::Reference; using ::drafts::com::sun::star::accessibility::XAccessible; @@ -2237,10 +2242,16 @@ ViewShell::CreateAccessiblePreview( sal_uInt8 nRow, ASSERT( pDoc->GetRootFrm(), "no layout, no access" ); ASSERT( GetWin(), "no window, no access" ); - if( pDoc->GetRootFrm() && GetWin() ) + // OD 15.01.2003 #103492# - add condition <IsPreView()> + if ( IsPreView() && pDoc->GetRootFrm() && GetWin() ) + { + // OD 14.01.2003 #103492# - adjustment for new method signature return Imp()->GetAccessibleMap().GetDocumentPreview( - nRow, nColumn, nStartPage, rPageSize, rFreePoint, rScale, - nSelectedPage ); + PagePreviewLayout()->maPrevwPages, + GetWin()->GetMapMode().GetScaleX(), + pDoc->GetRootFrm()->GetPageByPageNum( PagePreviewLayout()->mnSelectedPageNum ), + PagePreviewLayout()->maWinSize ); + } return NULL; } @@ -2249,7 +2260,6 @@ void ViewShell::InvalidateAccessibleFocus() if( Imp()->IsAccessible() ) Imp()->GetAccessibleMap().InvalidateFocus(); } -#endif /* -----------------------------06.05.2002 13:23------------------------------ diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 99d711ba463d..e20582ec8163 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -2,9 +2,9 @@ * * $RCSfile: vnew.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: od $ $Date: 2002-12-06 16:23:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -224,9 +224,11 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, bEndActionByVirDev = FALSE; bPaintWorks = bEnableSmooth = TRUE; bPreView = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags ); - // OD 04.12.2002 #103492# if ( bPreView ) - pImp->InitPreviewData(); + { + // OD 12.12.2002 #103492# - init page preview layout + pImp->InitPagePreviewLayout(); + } pDoc->AddLink(); pOutput = pOut; @@ -279,9 +281,9 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow, bPaintInProgress = bViewLocked = bInEndAction = bFrameView = bEndActionByVirDev = FALSE; bPreView = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags ); - // OD 04.12.2002 #103492# + // OD 12.12.2002 #103492# if ( bPreView ) - pImp->InitPreviewData(); + pImp->InitPagePreviewLayout(); SET_CURR_SHELL( this ); diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 53f6aed47a04..2c363d089eed 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: vprint.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: tl $ $Date: 2002-11-14 10:34:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1189,6 +1189,11 @@ BOOL ViewShell::Prt( SwPrtOptions& rOptions, SfxProgress& rProgress, pShell->CalcPagesForPrint( (USHORT)aPages.Max(), &rProgress, pStr, nMergeAct, nMergeCnt ); + // Some field types, can require a valid layout + // (expression fields in tables). For these we do an UpdateFlds + // here after calculation of the pages. + pShell->UpdateFlds(TRUE); + if( ! pShell->Imp()->IsStopPrt() && (pPDFOut || rOptions.GetJobName().Len() || pPrt->IsJobActive()) ) { @@ -1385,39 +1390,54 @@ BOOL ViewShell::Prt( SwPrtOptions& rOptions, SfxProgress& rProgress, ( (bRightPg && rOptions.bPrintRightPage) || (!bRightPg && rOptions.bPrintLeftPage) ) ) { - if ( bSetPrt && pLastPageDesc != pStPage->GetPageDesc() ) + if ( bSetPrt ) { - pLastPageDesc = pStPage->GetPageDesc(); - BOOL bLandScp = pLastPageDesc->GetLandscape(); + // check for empty page + const SwPageFrm* pFormatPage = NULL; - if(bSetPaperBin ) // Schacht einstellen. - pPrt->SetPaperBin( pStPage->GetFmt()-> - GetPaperBin().GetValue() ); - if (bSetPaperSz ) + // for empty pages, take the format of the partner + // page + if ( pStPage->IsEmptyPage() ) { - Size aSize = pStPage->Frm().SSize(); - if ( bLandScp && bSetOrient ) - { - long nWidth = aSize.Width(); - aSize.Width() = aSize.Height(); - aSize.Height() = nWidth; - } - Paper ePaper = SvxPaperInfo::GetSvPaper(aSize,MAP_TWIP,TRUE); - if ( PAPER_USER == ePaper ) - pPrt->SetPaperSizeUser( aSize ); + if ( bRightPg ) + pFormatPage = (SwPageFrm*)pStPage->GetNext(); else - pPrt->SetPaper( ePaper ); + pFormatPage = (SwPageFrm*)pStPage->GetPrev(); } - if (bSetOrient ) + + if ( ! pFormatPage ) + pFormatPage = pStPage; + + if ( pLastPageDesc != pFormatPage->GetPageDesc() ) { - // Orientation einstellen: Breiter als Hoch - // -> Landscape, sonst -> Portrait. - if( bLandScp ) - pPrt->SetOrientation(ORIENTATION_LANDSCAPE); - else - pPrt->SetOrientation(ORIENTATION_PORTRAIT); + pLastPageDesc = pFormatPage->GetPageDesc(); + + const BOOL bLandScp = + pFormatPage->GetPageDesc()->GetLandscape(); + + if( bSetPaperBin ) // Schacht einstellen. + pPrt->SetPaperBin( pFormatPage->GetFmt()-> + GetPaperBin().GetValue() ); + + if (bSetOrient ) + { + // Orientation einstellen: Breiter als Hoch + // -> Landscape, sonst -> Portrait. + if( bLandScp ) + pPrt->SetOrientation(ORIENTATION_LANDSCAPE); + else + pPrt->SetOrientation(ORIENTATION_PORTRAIT); + } + if (bSetPaperSz ) + { + Size aSize = pStPage->Frm().SSize(); + + // Let VCL decide which printer paper should be used for printing + pPrt->SetPaperSizeUser( aSize ); + } } } + // Wenn PostIts nach Seite gedruckt werden sollen, // jedoch Reverse eingestellt ist ... if( rOptions.bPrintReverse && @@ -1623,10 +1643,10 @@ BOOL ViewShell::Prt( SwPrtOptions& rOptions, SfxProgress& rProgress, -void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, +void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, SwPrtOptions& rOptions, OutputDevice* pOleOut, const Rectangle& rRect ) { - //Wir brauchen eine Shell fuer das Drucken. Entweder hat das Doc schon + //Wir brauchen eine Shell fuer das Drucken. Entweder hat das Doc schon //eine, dann legen wir uns eine neue Sicht an, oder das Doc hat noch //keine, dann erzeugen wir die erste Sicht. ViewShell *pSh; @@ -1637,6 +1657,7 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, { SET_CURR_SHELL( pSh ); + pSh->PrepareForPrint( rOptions ); pSh->SetPrtFormatOption( TRUE ); SwRect aSwRect( rRect ); @@ -1765,7 +1786,7 @@ SwDrawViewSave::~SwDrawViewSave() } - +// OD 09.01.2003 #i6467# - method also called for page preview void ViewShell::PrepareForPrint( const SwPrtOptions &rOptions ) { // Viewoptions fuer den Drucker setzen @@ -1780,15 +1801,32 @@ void ViewShell::PrepareForPrint( const SwPrtOptions &rOptions ) { SdrView *pDrawView = GetDrawView(); FASTBOOL bDraw = rOptions.bPrintDraw; - pDrawView->SetLineDraftPrn( !bDraw ); - pDrawView->SetFillDraftPrn( !bDraw ); - pDrawView->SetGrafDraftPrn( !bDraw ); - pDrawView->SetTextDraftPrn( !bDraw ); + // OD 09.01.2003 #i6467# - consider, if view shell belongs to page preview + if ( !IsPreView() ) + { + pDrawView->SetLineDraftPrn( !bDraw ); + pDrawView->SetFillDraftPrn( !bDraw ); + pDrawView->SetGrafDraftPrn( !bDraw ); + pDrawView->SetTextDraftPrn( !bDraw ); + } + else + { + pDrawView->SetLineDraft( !bDraw ); + pDrawView->SetFillDraft( !bDraw ); + pDrawView->SetGrafDraft( !bDraw ); + pDrawView->SetTextDraft( !bDraw ); + } String sLayerNm; sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Controls" )); - pDrawView->SetLayerPrintable( sLayerNm, rOptions.bPrintControl ); + // OD 09.01.2003 #i6467# - consider, if view shell belongs to page preview + if ( !IsPreView() ) + { + pDrawView->SetLayerPrintable( sLayerNm, rOptions.bPrintControl ); + } + else + { + pDrawView->SetLayerVisible( sLayerNm, rOptions.bPrintControl ); + } } } - - diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index f6954fdb6099..940a1baa7193 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: parasc.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 14:51:35 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PCH #include "filt_pch.hxx" #endif @@ -135,409 +137,6 @@ #define ASC_BUFFLEN 4096 - -#ifdef ASYNCHRON - -class _SvLockBytes -{ - AutoTimer aTimer; - SvStream& rIn; - - ULONG nDataRead; - Link aCallDataRead; - - DECL_STATIC_LINK( _SvLockBytes, DataRead, Timer* ); - -public: - _SvLockBytes( SvStream& rInput, const Link& rCallBack ); - ~_SvLockBytes(); - - ErrCode ReadAt( ULONG nPos, void* pArr, ULONG nCount, ULONG* pReadCnt ); - - SvStream& GetStream() const { return rIn; } -}; - - -// client vom Standard SwPageDesc. Wird dieser geloescht, dann -// der Reader auch beendet werden!! -class SwAsynchLoader : public SvRefBase, public SwClient -{ -protected: - - SwDoc* pDoc; - SwPaM* pPam; - - BOOL bInCall; - _SvLockBytes* pLoader; - - DECL_STATIC_LINK( SwAsynchLoader, NewData, _SvLockBytes* ); - -protected: - virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); - virtual ~SwAsynchLoader(); - - virtual ULONG NextData() = 0; - -public: - SwAsynchLoader( SvStream& rIn, const SwPaM& rCrsr ); - - ULONG CallParser(); -}; - -SV_DECL_REF(SwAsynchLoader) -SV_IMPL_REF(SwAsynchLoader) - - -class SwASCIIParser : public SwAsynchLoader -{ - char* pArr, *pStt, *pEnd, *pLastStt; - - long nLineLen; - ULONG nError, nReadCnt, nFileSize; - - const SwAsciiOptions& rOpt; - char cLastCRLF; - - virtual ULONG NextData(); - -protected: - virtual ~SwASCIIParser(); - -public: - SwASCIIParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, - int bReadNewDoc, const SwAsciiOptions& rOpts); -}; - -SV_DECL_REF(SwASCIIParser) -SV_IMPL_REF(SwASCIIParser) - - -// Aufruf fuer die allg. Reader-Schnittstelle -ULONG AsciiReader::Read( SwDoc &rDoc, SwPaM &rPam, const String & ) -{ - if( !pStrm ) - { - ASSERT( !this, "ASCII-Read ohne Stream" ); - return ERR_SWG_READ_ERROR; - } - - //JP 18.01.96: Alle Ueberschriften sind normalerweise ohne - // Kapitelnummer. Darum hier explizit abschalten - // weil das Default jetzt wieder auf AN ist. - if( !bInsertMode ) - Reader::SetNoOutlineNum( rDoc ); - - SwASCIIParserRef xParser( new SwASCIIParser( &rDoc, rPam, *pStrm, - !bInsertMode, eCodeSet )); - ULONG nRet = xParser->CallParser(); - // nach dem Lesen sofort wieder defaulten - eCodeSet = GetSystemCharSet(); - return ERRCODE_IO_PENDING == nRet ? 0 : nRet; -} - - -/* */ - -SwASCIIParser::SwASCIIParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, - int bReadNewDoc, CharSet eSrc ) - : SwAsynchLoader( rIn, rCrsr ), - eCodeSet( eSrc ) -{ - pArr = new char [ ASC_BUFFLEN + 1 ]; - - pStt = pEnd = pLastStt = pArr; - - cLastCRLF = 0; - nLineLen = 0; - nError = 0; - nReadCnt = 0; - - rIn.Seek(STREAM_SEEK_TO_END); - rIn.ResetError(); - - nFileSize = rIn.Tell(); - rIn.Seek(STREAM_SEEK_TO_BEGIN); - rIn.ResetError(); - -} - -SwASCIIParser::~SwASCIIParser() -{ - delete pArr; -} - - -ULONG SwASCIIParser::NextData() -{ - SvStream& rInput = pLoader->GetStream(); - do { - if( pStt >= pEnd ) - { - if( pLastStt != pStt ) - { - pDoc->Insert( *pPam, pLastStt, eCodeSet ); - pLastStt = pStt; - } - - // lese einen neuen Block ein - ULONG lGCount; - - if (SVSTREAM_OK != rInput.GetError() || 0 != ( nError = pLoader-> - ReadAt( nReadCnt, pArr, ASC_BUFFLEN, &lGCount )) || - ( rInput.IsEof() && !lGCount )) - { - if( ERRCODE_IO_PENDING != nError || !lGCount ) - break; // aus der WHILE-Schleife heraus - } - - pEnd = pArr + lGCount; - nReadCnt += lGCount; - *pEnd = 0; - pStt = pLastStt = pArr; - - ::SetProgressState( nReadCnt, pDoc->GetDocShell() ); - - if( cLastCRLF ) - { - if( ( 0x0a == *pStt && 0x0d == cLastCRLF ) || - ( 0x0d == *pStt && 0x0a == cLastCRLF )) - pLastStt = ++pStt; - cLastCRLF = 0; - nLineLen = 0; - // JP 03.04.96: das letze am Ende nehmen wir nicht - if( !rInput.IsEof() || !(pEnd == pStt || - ( !*pEnd && pEnd == pStt+1 ) ) ) - pDoc->SplitNode( *pPam->GetPoint() ); - } - } - - BOOL bIns = TRUE, bSplitNode = FALSE; - switch( *pStt ) - { - case 0: - pEnd = pStt; - bIns = FALSE; - break; - - case 0x0a: - bIns = FALSE; - *pStt = 0; - if( ++pStt == pEnd ) - cLastCRLF = 0x0a; - else - { - if( 0x0d == *pStt ) - pStt++; - // JP 03.04.96: das letze am Ende nehmen wir nicht - if( !rInput.IsEof() || !(pEnd == pStt || - ( !*pEnd && pEnd == pStt+1 ) ) ) - bSplitNode = TRUE; - } - break; - - case 0x0d: - bIns = FALSE; - *pStt = 0; - if( ++pStt == pEnd ) - cLastCRLF = 0x0d; - else - { - if( 0x0a == *pStt ) - pStt++; - // JP 03.04.96: das letze am Ende nehmen wir nicht - if( !rInput.IsEof() || !(pEnd == pStt || - ( !*pEnd && pEnd == pStt+1 ) ) ) - bSplitNode = TRUE; - } - break; - - case '\t': break; - - case 0x0c: - { - // dann mal einen harten Seitenumbruch einfuegen - *pStt++ = 0; - if( nLineLen ) - pDoc->Insert( *pPam, pLastStt, eCodeSet ); - pDoc->SplitNode( *pPam->GetPoint() ); - pDoc->Insert( *pPam, SvxFmtBreakItem( - SVX_BREAK_PAGE_BEFORE )); - pLastStt = pStt; - nLineLen = 0; - bIns = FALSE; - } - break; - - case 0x1a: - if( nReadCnt == nFileSize && pStt+1 == pEnd ) - *pStt = 0; - else - *pStt = '#'; // Ersatzdarstellung - break; - - default: - - if( (BYTE)' ' > (BYTE)*pStt ) - // Ctrl-Zchn gefunden ersetze durch '#' - *pStt = '#'; - } - - if( bIns ) - { - if( ( nLineLen >= MAX_ASCII_PARA - 100 ) && - ( ( *pStt == ' ' ) || ( nLineLen >= MAX_ASCII_PARA - 1 ) ) ) - { - char c = *pStt; - *pStt = 0; - pDoc->Insert( *pPam, pLastStt, eCodeSet ); - pDoc->SplitNode( *pPam->GetPoint() ); - pLastStt = pStt; - nLineLen = 0; - *pStt = c; - } - ++pStt; - ++nLineLen; - } - else if( bSplitNode ) - { - // es wurde ein CR/LF erkannt, also speichere den Text - pDoc->Insert( *pPam, pLastStt, eCodeSet ); - pDoc->SplitNode( *pPam->GetPoint() ); - pLastStt = pStt; - nLineLen = 0; - } - } while( TRUE ); - - return nError; -} - - -/* */ - -SwAsynchLoader::SwAsynchLoader( SvStream& rIn, const SwPaM& rCrsr ) - : SwClient( 0 ) -{ - bInCall = FALSE; - pDoc = (SwDoc*)rCrsr.GetDoc(); - pPam = new SwPaM( pDoc, *rCrsr.GetPoint() ); - - SwPageDesc& rDesc = pDoc->_GetPageDesc( 0 ); - rDesc.Add( this ); - - pLoader = new _SvLockBytes( rIn, - STATIC_LINK( this, SwAsynchLoader, NewData ) ); -} - -SwAsynchLoader::~SwAsynchLoader() -{ - delete pPam; - delete pLoader; -} - -void SwAsynchLoader::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) -{ - switch( pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ) - { - case RES_OBJECTDYING: - if( ((SwPtrMsgPoolItem *)pOld)->pObject == pRegisteredIn ) - { - // dann uns selbst beenden - pRegisteredIn->Remove( this ); - ReleaseRef(); // ansonsten sind wir fertig! - } - break; - } -} - -IMPL_STATIC_LINK( SwAsynchLoader, NewData, _SvLockBytes*, p ) -{ - ULONG nRet = 0; - if( !pThis->bInCall ) // kein mehrfaches Aufrufen - { - pThis->bInCall = TRUE; - - BOOL bModify = pThis->pDoc->IsModified(); - nRet = pThis->NextData(); - if( !bModify ) - pThis->pDoc->ResetModified(); - - if( ERRCODE_IO_PENDING != nRet ) - pThis->ReleaseRef(); // ansonsten sind wir fertig! - - pThis->bInCall = FALSE; - } - - return nRet; -} - - -ULONG SwAsynchLoader::CallParser() -{ - bInCall = TRUE; - AddRef(); - ULONG nRet = NextData(); - if( ERRCODE_IO_PENDING != nRet ) - ReleaseRef(); // ansonsten sind wir fertig! - - // Sind wir im Pending-Status, wird ueber den Callback "geidelt" bis - // alles gelesen ist oder ein Fehler aufgetreten ist! - - // Was passiert dann ??? - - bInCall = FALSE; - return nRet; -} - -/* */ - -_SvLockBytes::_SvLockBytes( SvStream& rInput, const Link& rCallback ) - : rIn( rInput ), aCallDataRead( rCallback ) -{ - nDataRead = 0; - - aTimer.SetTimeout( 1000 ); // jede Sekunde 100 Zeichen lesen - aTimer.SetTimeoutHdl( STATIC_LINK( this, _SvLockBytes, DataRead )); - aTimer.Start(); -} - -_SvLockBytes::~_SvLockBytes() -{ - aTimer.Stop(); -} - -ErrCode _SvLockBytes::ReadAt( ULONG nPos, void* pArr, ULONG nCount, - ULONG* pReadCnt ) -{ - ErrCode nRet = 0; - if( nPos + nCount > nDataRead ) - { - nCount = nDataRead - nPos; - nRet = ERRCODE_IO_PENDING; - } - - if( nCount ) - { - rIn.Seek( nPos ); - *pReadCnt = rIn.Read( pArr, nCount ); - } - else - *pReadCnt = 0; - return rIn.GetError() ? rIn.GetError() - : ( rIn.IsEof() ? 0 : nRet ); -} - -IMPL_STATIC_LINK( _SvLockBytes, DataRead, Timer*, pTimer ) -{ - pThis->nDataRead += 100; - pThis->aCallDataRead.Call( pThis ); - - return 0; -} - -/* */ - -#else - class SwASCIIParser { SwDoc* pDoc; @@ -548,7 +147,7 @@ class SwASCIIParser SfxItemSet* pItemSet; long nFileSize; USHORT nScript; - BOOL bNewDoc; + bool bNewDoc; ULONG ReadChars(); void InsertText( const String& rStr ); @@ -612,7 +211,7 @@ SwASCIIParser::SwASCIIParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, } if( rOpt.GetFontName().Len() ) { - BOOL bDelete = FALSE; + bool bDelete = false; const SfxFont* pFnt = 0; if( pDoc->GetPrt() ) pFnt = pDoc->GetPrt()->GetFontByName( rOpt.GetFontName() ); @@ -620,7 +219,7 @@ SwASCIIParser::SwASCIIParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, if( !pFnt ) { pFnt = new SfxFont( FAMILY_DONTKNOW, rOpt.GetFontName() ); - bDelete = TRUE; + bDelete = true; } SvxFontItem aFont( pFnt->GetFamily(), pFnt->GetName(), aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet() ); @@ -662,6 +261,17 @@ ULONG SwASCIIParser::CallParser() nSttCntnt = pPam->GetPoint()->nContent.GetIndex(); } + SwTxtFmtColl *pColl = 0; + + if (bNewDoc) + { + pColl = pDoc->GetTxtCollFromPoolSimple(RES_POOLCOLL_HTML_PRE, false); + if (!pColl) + pColl = pDoc->GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD,false); + if (pColl) + pDoc->SetTxtFmtColl(*pPam, pColl); + } + ULONG nError = ReadChars(); if( pItemSet ) @@ -686,40 +296,39 @@ ULONG SwASCIIParser::CallParser() { if( bNewDoc ) { - // Using the pool defaults for the font causes significant - // trouble for the HTML filter, because it is not able - // to export the pool defaults (or to be more precice: - // the HTML filter is not able to detect whether a pool - // default has changed or not. Even a comparison with the - // HTMLi template does not work, because the defaults are - // not copied when a new doc is created. The result of - // comparing pool defaults therfor would be that the - // defaults are exported always if the have changed for - // text documents in general. That's not sensible, as well - // as it is not sensible to export them always. - SwTxtFmtColl *pColl = 0; - sal_uInt16 aWhichIds[4] = { RES_CHRATR_FONT, - RES_CHRATR_CJK_FONT, - RES_CHRATR_CTL_FONT, - 0 }; - sal_uInt16 *pWhichIds = aWhichIds; - const SfxPoolItem *pItem; - while( *pWhichIds ) + if (pColl) { - if( SFX_ITEM_SET == pItemSet->GetItemState( *pWhichIds, - sal_False, - &pItem ) ) + // Using the pool defaults for the font causes significant + // trouble for the HTML filter, because it is not able + // to export the pool defaults (or to be more precice: + // the HTML filter is not able to detect whether a pool + // default has changed or not. Even a comparison with the + // HTMLi template does not work, because the defaults are + // not copied when a new doc is created. The result of + // comparing pool defaults therfor would be that the + // defaults are exported always if the have changed for + // text documents in general. That's not sensible, as well + // as it is not sensible to export them always. + sal_uInt16 aWhichIds[4] = + { + RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, + RES_CHRATR_CTL_FONT, 0 + }; + sal_uInt16 *pWhichIds = aWhichIds; + while (*pWhichIds) { - if( !pColl ) - pColl = pDoc->GetTxtCollFromPoolSimple - ( RES_POOLCOLL_STANDARD, FALSE ); - pColl->SetAttr( *pItem ); - pItemSet->ClearItem( *pWhichIds ); + const SfxPoolItem *pItem; + if (SFX_ITEM_SET == pItemSet->GetItemState(*pWhichIds, + false, &pItem)) + { + pColl->SetAttr( *pItem ); + pItemSet->ClearItem( *pWhichIds ); + } + ++pWhichIds; } - ++pWhichIds; } - if( pItemSet->Count() ) - pDoc->SetDefault( *pItemSet ); + if (pItemSet->Count()) + pDoc->SetDefault(*pItemSet); } else if( pInsPam ) { @@ -829,7 +438,8 @@ ULONG SwASCIIParser::ReadChars() ( RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT | - RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT + RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT | + RTL_TEXTTOUNICODE_FLAGS_GLOBAL_SIGNATURE ), &nInfo, &nCntBytes ); @@ -875,35 +485,35 @@ ULONG SwASCIIParser::ReadChars() } } - BOOL bIns = TRUE, bSplitNode = FALSE; + bool bIns = true, bSplitNode = false; switch( *pStt ) { //JP 12.11.2001: task 94636 - don't ignore all behind the zero character, // change it to the default "control character" // case 0: // pEnd = pStt; -// bIns = FALSE; +// bIns = false ; // break; case 0x0a: if( LINEEND_LF == pUseMe->GetParaFlags() ) { - bIns = FALSE; + bIns = false; *pStt = 0; ++pStt; // JP 03.04.96: das letze am Ende nehmen wir nicht if( !rInput.IsEof() || pEnd != pStt ) - bSplitNode = TRUE; + bSplitNode = true; } break; case 0x0d: if( LINEEND_LF != pUseMe->GetParaFlags() ) { - bIns = FALSE; + bIns = false; *pStt = 0; ++pStt; - BOOL bChkSplit = FALSE; + bool bChkSplit = false; if( LINEEND_CRLF == pUseMe->GetParaFlags() ) { if( pStt == pEnd ) @@ -911,15 +521,15 @@ ULONG SwASCIIParser::ReadChars() else if( 0x0a == *pStt ) { ++pStt; - bChkSplit = TRUE; + bChkSplit = true; } } else - bChkSplit = TRUE; + bChkSplit = true; // JP 03.04.96: das letze am Ende nehmen wir nicht if( bChkSplit && ( !rInput.IsEof() || pEnd != pStt )) - bSplitNode = TRUE; + bSplitNode = true; } break; @@ -938,7 +548,7 @@ ULONG SwASCIIParser::ReadChars() SVX_BREAK_PAGE_BEFORE )); pLastStt = pStt; nLineLen = 0; - bIns = FALSE; + bIns = false; } break; @@ -983,7 +593,7 @@ ULONG SwASCIIParser::ReadChars() pLastStt = pStt; nLineLen = 0; } - } while( TRUE ); + } while(true); if( hConverter ) { @@ -1002,6 +612,4 @@ void SwASCIIParser::InsertText( const String& rStr ) nScript |= pBreakIt->GetAllScriptsOfText( rStr ); } - -#endif - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 92423f1b210b..e590db76f459 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fltini.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: cmc $ $Date: 2002-10-31 12:39:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -376,28 +376,24 @@ ULONG StgReader::OpenMainStream( SvStorageStreamRef& rRef, USHORT& rBuffSize ) ULONG Sw3Reader::Read( SwDoc &rDoc, SwPaM &rPam, const String & ) { ULONG nRet; - if( pStg ) + if( pStg && pIO ) { - Sw3Io aSw3Io( rDoc ); - if( bOrganizerMode ) - nRet = aSw3Io.LoadStyles( pStg ); - else + // TRUE: Vorlagen ueberschreiben + pIO->SetReadOptions( aOpt,TRUE ); + if( !bInsertMode ) { - // TRUE: Vorlagen ueberschreiben - aSw3Io.SetReadOptions( aOpt,TRUE ); - if( !bInsertMode ) - { - // Im Laden-Modus darf der PaM-Content-Teil nicht - // in den Textbereich zeigen (Nodes koennen geloescht werden) - rPam.GetBound( TRUE ).nContent.Assign( 0, 0 ); - rPam.GetBound( FALSE ).nContent.Assign( 0, 0 ); - } - nRet = aSw3Io.Load( pStg, bInsertMode ? &rPam : 0 ); + // Im Laden-Modus darf der PaM-Content-Teil nicht + // in den Textbereich zeigen (Nodes koennen geloescht werden) + rPam.GetBound( TRUE ).nContent.Assign( 0, 0 ); + rPam.GetBound( FALSE ).nContent.Assign( 0, 0 ); } + nRet = pIO->Load( pStg, bInsertMode ? &rPam : 0 ); + aOpt.ResetAllFmtsOnly(); + pIO->SetReadOptions( aOpt, TRUE ); } else { - ASSERT( !this, "Sw3-Read ohne Storage" ); + ASSERT( !this, "Sw3-Read ohne Storage und/oder IO-System" ); nRet = ERR_SWG_READ_ERROR; } return nRet; @@ -415,10 +411,8 @@ USHORT Sw3Reader::GetSectionList( SfxMedium& rMedium, if( pFlt && pFlt->GetVersion() ) aStg->SetVersion( (long)pFlt->GetVersion() ); - { - Sw3Io aSw3Io; - aSw3Io.GetSectionList( &aStg, rStrings ); - } + if( pIO ) + pIO->GetSectionList( &aStg, rStrings ); return rStrings.Count(); } @@ -426,13 +420,21 @@ USHORT Sw3Reader::GetSectionList( SfxMedium& rMedium, ULONG Sw3Writer::WriteStorage() { ULONG nRet; + if( pIO ) + { + // der gleiche Storage -> Save, sonst SaveAs aufrufen + if( !bSaveAs ) + nRet = pIO->Save( pOrigPam, bWriteAll ); + else + nRet = pIO->SaveAs( pStg, pOrigPam, bWriteAll ); - // der gleiche Storage -> Save, sonst SaveAs aufrufen - Sw3Io aSw3Io( *pDoc ); - if( bOrganizerMode ) - nRet = aSw3Io.SaveStyles( pStg ); + pIO = 0; // nach dem Schreiben ist der Pointer ungueltig !! + } else - nRet = aSw3Io.SaveAs( pStg, pOrigPam, bWriteAll ); + { + ASSERT( !this, "Sw3-Writer ohne IO-System" ) + nRet = ERR_SWG_WRITE_ERROR; + } return nRet; } @@ -916,7 +918,6 @@ void CalculateFlySize( SfxItemSet& rFlySet, SwNodeIndex& rAnchor, } /* */ - struct CharSetNameMap { rtl_TextEncoding eCode; @@ -1002,6 +1003,7 @@ const CharSetNameMap *GetCharSetNameMap() IMPLENTRY(ISO_2022_JP), IMPLENTRY(ISO_2022_CN), IMPLENTRY(KOI8_R), + IMPLENTRY(KOI8_U), IMPLENTRY(UTF7), IMPLENTRY(UTF8), IMPLENTRY(ISO_8859_10), @@ -1307,6 +1309,7 @@ static String NameFromLanguage(LanguageType nLang) return String::CreateFromAscii(pRet); } + // for the automatic conversion (mail/news/...) // The user data contains the options for the ascii import/export filter. // The format is: diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 637a5fdd46ad..6a7fd522b949 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shellio.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 15:14:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,6 +201,11 @@ ULONG SwReader::Read( const Reader& rOptions ) GetDoc(); + // am Sw3-Reader noch den pIo-Pointer "loeschen" + if( po == ReadSw3 && pDoc->GetDocShell() && + ((Sw3Reader*)po)->GetSw3Io() != pDoc->GetDocShell()->GetIoSystem() ) + ((Sw3Reader*)po)->SetSw3Io( pDoc->GetDocShell()->GetIoSystem() ); + // waehrend des einlesens kein OLE-Modified rufen Link aOLELink( pDoc->GetOle2Link() ); pDoc->SetOle2Link( Link() ); @@ -465,15 +470,18 @@ ULONG SwReader::Read( const Reader& rOptions ) } if(bUpdate) { + SfxMedium* pMedium = pDoc->GetDocShell()->GetMedium(); + SfxFrame* pFrm = pMedium ? pMedium->GetLoadTargetFrame() : 0; + Window* pDlgParent = pFrm ? &pFrm->GetWindow() : 0; if( pDoc->GetRootFrm() && !pDoc->GetEditShell( &pVSh ) && !pVSh ) { ViewShell aVSh( *pDoc, 0, 0 ); SET_CURR_SHELL( &aVSh ); - pDoc->GetLinkManager().UpdateAllLinks( bAskUpdate , TRUE, FALSE ); + pDoc->GetLinkManager().UpdateAllLinks( bAskUpdate , TRUE, FALSE, pDlgParent ); } else - pDoc->GetLinkManager().UpdateAllLinks( bAskUpdate, TRUE, FALSE ); + pDoc->GetLinkManager().UpdateAllLinks( bAskUpdate, TRUE, FALSE, pDlgParent ); } } @@ -488,6 +496,9 @@ ULONG SwReader::Read( const Reader& rOptions ) if( pCrsr ) // das Doc ist jetzt modifiziert pDoc->SetModified(); + if( po == ReadSw3 ) // am Sw3-Reader noch den pIo-Pointer "loeschen" + ((Sw3Reader*)po)->SetSw3Io( 0 ); + po->SetReadUTF8( FALSE ); po->SetBlockMode( FALSE ); po->SetOrganizerMode( FALSE ); diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 6c43b78a2af2..884c0dc9ea52 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlatr.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 15:25:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -354,6 +354,14 @@ void SwHTMLWriter::OutAndSetDefList( USHORT nNewLvl ) // eventuell muss erst mal eine Liste aufgemacht werden if( nDefListLvl < nNewLvl ) { + // output </pre> for the previous(!) pararagraph, if required. + // Preferable, the <pre> is exported by OutHTML_SwFmtOff for the + // previous paragraph already, but that's not possible, because a very + // deep look at the next paragraph (this one) is required to figure + // out that a def list starts here. + + ChangeParaToken( 0 ); + // entsprechend dem Level-Unterschied schreiben! for( USHORT i=nDefListLvl; i<nNewLvl; i++ ) { diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 29edf7bb5c77..195a182f9a4a 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlbas.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: os $ $Date: 2001-09-28 06:27:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,7 +170,7 @@ void SwHTMLParser::EndScript() // Ausser StarBasic und unbenutzem JavaScript jedes Script oder den // Modulnamen in einem Feld merken merken - if( bInsSrcIntoFld ) + if( bInsSrcIntoFld && !bIgnoreHTMLComments ) { SwScriptFieldType *pType = (SwScriptFieldType*)pDoc->GetSysFldType( RES_SCRIPTFLD ); diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index e1b8d81dd4b6..7fae34471223 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlfly.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: mib $ $Date: 2002-11-21 13:11:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,6 +98,9 @@ #ifndef _GOODIES_IMAPOBJ_HXX #include <svtools/imapobj.hxx> #endif +#ifndef _OFA_HTMLCFG_HXX //autogen +#include <offmgr/htmlcfg.hxx> +#endif #ifndef _XOUTBMP_HXX //autogen #include <svx/xoutbmp.hxx> @@ -403,6 +406,9 @@ USHORT SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt, void SwHTMLWriter::CollectFlyFrms() { + ASSERT( HTML_CFG_MAX+1 == MAX_BROWSERS, + "number of browser configurations has changed" ); + BYTE nSz = (BYTE)Min( pDoc->GetSpzFrmFmts()->Count(), USHORT(255) ); SwPosFlyFrms aFlyPos( nSz, nSz ); pDoc->GetAllFlyFmts( aFlyPos, bWriteAll ? 0 : pCurPam, TRUE ); diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 3b8c2346f81c..a6e6166a059a 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlfly.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,7 +125,7 @@ enum SwHTMLFrmType const USHORT MAX_FRMTYPES = HTML_FRMTYPE_END; -const USHORT MAX_BROWSERS = 5; +const USHORT MAX_BROWSERS = 4; extern BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS]; extern BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS]; diff --git a/sw/source/filter/html/htmlflyt.cxx b/sw/source/filter/html/htmlflyt.cxx index ee8f2f272ad5..0cff3aa7d54e 100644 --- a/sw/source/filter/html/htmlflyt.cxx +++ b/sw/source/filter/html/htmlflyt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlflyt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-09-28 06:27:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(DIV, PREFIX, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(DIV, PREFIX, NONE), // SW TE(DIV, PREFIX, NONE) // Netscape 4! }, @@ -83,7 +82,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle und Ueberschrift TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(DIV, PREFIX, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(DIV, PREFIX, NONE), // SW TE(DIV, PREFIX, NONE) // Netscape 4 }, @@ -91,7 +89,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, PREFIX, NONE), // IE 4 - TE(MULTICOL,BEFORE, NONE), // Netscape 3 TE(MULTICOL,PREFIX, NONE), // SW TE(MULTICOL,PREFIX, DIV) // Netscape 4 }, @@ -99,7 +96,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(DIV, PREFIX, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(DIV, PREFIX, NONE), // SW TE(DIV, PREFIX, NONE) // Netscape 4 }, @@ -107,7 +103,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(DIV, PREFIX, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(DIV, PREFIX, NONE), // SW TE(DIV, PREFIX, NONE) // Netscape 4 }, @@ -115,7 +110,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, INSIDE, NONE), // HTML 3.2 TE(GRFNODE, PREFIX, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // Netscape 3 TE(GRFNODE, PREFIX, NONE), // SW TE(GRFNODE, PREFIX, SPAN) // Netscape 4 }, @@ -123,7 +117,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, PREFIX, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, PREFIX, NONE), // SW TE(OLENODE, PREFIX, SPAN) // Netscape 4 }, @@ -131,7 +124,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, PREFIX, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, PREFIX, NONE), // SW TE(OLENODE, PREFIX, SPAN) // Netscape 4 }, @@ -139,7 +131,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLENODE, PREFIX, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLENODE, PREFIX, NONE), // SW TE(OLEGRF, PREFIX, SPAN) // Netscape 4 }, @@ -147,7 +138,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLEGRF, PREFIX, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLEGRF, PREFIX, NONE), // SW TE(OLEGRF, PREFIX, SPAN) // Netscape 4 }, @@ -155,7 +145,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Laufschrift TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(AMARQUEE,PREFIX, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(AMARQUEE,PREFIX, NONE), // SW TE(GRFFRM, PREFIX, SPAN) // Netscape 4 }, @@ -163,7 +152,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, PREFIX, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, PREFIX, NONE), // SW // Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus. TE(CONTROL, INSIDE, NONE) // Netscape 4 @@ -172,7 +160,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, PREFIX, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, PREFIX, NONE), // SW TE(GRFFRM, PREFIX, SPAN) // Netscape 4 } @@ -184,7 +171,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(TBLNODE, BEFORE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(TBLNODE, BEFORE, NONE), // SW TE(TBLNODE, BEFORE, NONE) // Netscape 4 }, @@ -192,7 +178,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle und Ueberschrift TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(DIV, BEFORE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(DIV, BEFORE, NONE), // SW TE(TBLNODE, BEFORE, NONE) // Netscape 4 }, @@ -200,7 +185,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(GRFFRM, BEFORE, NONE), // IE 4 - TE(MULTICOL,BEFORE, NONE), // Netscape 3 TE(MULTICOL,BEFORE, NONE), // SW TE(MULTICOL,BEFORE, DIV) // Netscape 4 }, @@ -208,7 +192,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(DIV, BEFORE, NONE), // IE 4 - TE(SPACER, BEFORE, NONE), // Netscape 3 TE(SPACER, BEFORE, NONE), // SW TE(SPACER, BEFORE, NONE) // Netscape 4 }, @@ -216,7 +199,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(DIV, BEFORE, NONE), // IE 4 - TE(GRFFRM, BEFORE, NONE), // Netscape 3 TE(DIV, BEFORE, NONE), // SW TE(DIV, BEFORE, NONE) // Netscape 4 }, @@ -224,7 +206,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, BEFORE, NONE), // HTML 3.2 TE(GRFNODE, BEFORE, NONE), // IE 4 - TE(GRFNODE, BEFORE, NONE), // Netscape 3 TE(GRFNODE, BEFORE, NONE), // SW TE(GRFNODE, BEFORE, NONE) // Netscape 4 }, @@ -232,7 +213,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, BEFORE, NONE), // HTML 3.2 TE(OLENODE, BEFORE, NONE), // IE 4 - TE(OLENODE, BEFORE, NONE), // Netscape 3 TE(OLENODE, BEFORE, NONE), // SW TE(OLENODE, BEFORE, NONE) // Netscape 4 }, @@ -240,7 +220,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, BEFORE, NONE), // HTML 3.2 TE(OLENODE, BEFORE, NONE), // IE 4 - TE(OLENODE, BEFORE, NONE), // Netscape 3 TE(OLENODE, BEFORE, NONE), // SW TE(OLENODE, BEFORE, NONE) // Netscape 4 }, @@ -248,7 +227,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, BEFORE, NONE), // HTML 3.2 TE(OLENODE, BEFORE, NONE), // IE 4 - TE(OLEGRF, BEFORE, NONE), // Netscape 3 TE(OLENODE, BEFORE, NONE), // SW TE(OLEGRF, BEFORE, NONE) // Netscape 4 }, @@ -256,7 +234,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, BEFORE, NONE), // HTML 3.2 TE(OLEGRF, BEFORE, NONE), // IE 4 - TE(OLEGRF, BEFORE, NONE), // Netscape 3 TE(OLEGRF, BEFORE, NONE), // SW TE(OLEGRF, BEFORE, NONE) // Netscape 4 }, @@ -265,7 +242,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // die LAufschrift an der richtigen Stelle erscheint TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(AMARQUEE,BEFORE, NONE), // IE 4 - TE(GRFFRM, BEFORE, NONE), // Netscape 3 TE(AMARQUEE,BEFORE, NONE), // SW TE(GRFFRM, BEFORE, NONE) // Netscape 4 }, @@ -273,7 +249,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, BEFORE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, BEFORE, NONE), // SW // hier koennte man einen Container draus machen (Import fehlt) TE(CONTROL, BEFORE, NONE) // Netscape 4 @@ -282,7 +257,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(GRFFRM, BEFORE, NONE), // IE 4 - TE(GRFFRM, BEFORE, NONE), // Netscape 3 TE(GRFFRM, BEFORE, NONE), // SW TE(GRFFRM, BEFORE, NONE) // Netscape 4 } @@ -292,31 +266,15 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle -#if 0 - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(TBLNODE, BEFORE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 - TE(TBLNODE, BEFORE, NONE), // SW - TE(TBLNODE, BEFORE, NONE) // Netscape 4 -#endif TE(TBLNODE, INSIDE, NONE), // HTML 3.2 TE(TBLNODE, INSIDE, NONE), // IE 4 - TE(TBLNODE, INSIDE, NONE), // Netscape 3 TE(TBLNODE, INSIDE, NONE), // SW TE(TBLNODE, INSIDE, NONE) // Netscape 4 }, { // Textrahmen mit Tabelle und Ueberschrift -#if 0 - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(DIV, BEFORE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 - TE(DIV, BEFORE, NONE), // SW - TE(DIV, BEFORE, NONE) // Netscape 4 -#endif TE(TBLNODE, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(TBLNODE, INSIDE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -324,7 +282,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(MULTICOL,INSIDE, NONE), // Netscape 3 TE(MULTICOL,INSIDE, NONE), // SW TE(MULTICOL,INSIDE, SPAN) // Netscape 4 }, @@ -332,7 +289,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(SPACER, INSIDE, NONE), // Netscape 3 TE(SPACER, INSIDE, NONE), // SW TE(SPACER, INSIDE, NONE) // Netscape 4 }, @@ -340,7 +296,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -348,7 +303,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, INSIDE, NONE), // HTML 3.2 TE(GRFNODE, INSIDE, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // Netscape 3 TE(GRFNODE, INSIDE, NONE), // SW TE(GRFNODE, INSIDE, NONE) // Netscape 4 }, @@ -356,7 +310,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, NONE) // Netscape 4 }, @@ -364,7 +317,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, NONE) // Netscape 4 }, @@ -372,7 +324,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, @@ -380,7 +331,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLEGRF, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLEGRF, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, @@ -388,7 +338,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Laufschrift TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(AMARQUEE,INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(AMARQUEE,INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, @@ -396,7 +345,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, INSIDE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, INSIDE, NONE), // SW // hier koennte man einen Container draus machen (Import fehlt) TE(CONTROL, INSIDE, NONE) // Netscape 4 @@ -405,7 +353,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 } @@ -417,7 +364,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -425,7 +371,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle und Ueberschrift TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -433,7 +378,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(MULTICOL,BEFORE, NONE), // Netscape 3 TE(MULTICOL,INSIDE, NONE), // SW TE(MULTICOL,INSIDE, SPAN) // Netscape 4 }, @@ -441,7 +385,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -449,7 +392,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -457,7 +399,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, INSIDE, NONE), // HTML 3.2 TE(GRFNODE, INSIDE, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // Netscape 3 TE(GRFNODE, INSIDE, NONE), // SW TE(GRFNODE, INSIDE, SPAN) // Netscape 4 }, @@ -465,7 +406,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, SPAN) // Netscape 4 }, @@ -473,7 +413,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, SPAN) // Netscape 4 }, @@ -481,7 +420,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, SPAN) // Netscape 4 }, @@ -489,7 +427,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLEGRF, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLEGRF, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, SPAN) // Netscape 4 }, @@ -497,7 +434,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Laufschrift TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(AMARQUEE,INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(AMARQUEE,INSIDE, NONE), // SW TE(GRFFRM, INSIDE, SPAN) // Netscape 4 }, @@ -505,7 +441,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, INSIDE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, INSIDE, NONE), // SW // Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus. TE(CONTROL, INSIDE, NONE) // Netscape 4 @@ -514,7 +449,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, SPAN) // Netscape 4 } @@ -526,7 +460,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, @@ -534,7 +467,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle und Ueberschrift TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, @@ -542,7 +474,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(MULTICOL,INSIDE, NONE), // Netscape 3 TE(MULTICOL,INSIDE, NONE), // SW TE(MULTICOL,INSIDE, NONE) // Netscape 4 }, @@ -550,7 +481,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(SPACER, INSIDE, NONE), // Netscape 3 TE(SPACER, INSIDE, NONE), // SW TE(SPACER, INSIDE, NONE) // Netscape 4 }, @@ -558,7 +488,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, @@ -566,7 +495,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, INSIDE, NONE), // HTML 3.2 TE(GRFNODE, INSIDE, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // Netscape 3 TE(GRFNODE, INSIDE, NONE), // SW TE(GRFNODE, INSIDE, NONE) // Netscape 4 }, @@ -574,7 +502,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, NONE) // Netscape 4 }, @@ -582,7 +509,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, NONE) // Netscape 4 }, @@ -590,7 +516,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, @@ -598,7 +523,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLEGRF, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLEGRF, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, @@ -607,7 +531,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // der Inhalt an der richtigen Stelle erscheint TE(MARQUEE, INSIDE, NONE), // HTML 3.2 TE(MARQUEE, INSIDE, NONE), // IE 4 - TE(MARQUEE, INSIDE, NONE), // Netscape 3 TE(MARQUEE, INSIDE, NONE), // SW TE(MARQUEE, INSIDE, NONE) // Netscape 4 }, @@ -615,7 +538,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, INSIDE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, INSIDE, NONE), // SW TE(CONTROL, INSIDE, NONE) // Netscape 4 }, @@ -623,7 +545,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 } diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 7de0965b7120..1cede3a4decb 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlform.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: od $ $Date: 2002-09-03 15:02:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -741,7 +741,7 @@ void SwHTMLImageWatcher::complete( sal_Int32 Status, } } -void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) +void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) throw ( ::com::sun::star::uno::RuntimeException) { Reference< awt::XImageConsumer > xTmp; diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 9ba9284928ae..bf6111ee131b 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlgrin.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mib $ $Date: 2002-11-21 13:11:48 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,9 @@ #ifndef _SFXSTRITEM_HXX #include <svtools/stritem.hxx> #endif +#ifndef _SVX_FHGTITEM_HXX //autogen +#include <svx/fhgtitem.hxx> +#endif #ifndef _SVX_LRSPITEM_HXX //autogen #include <svx/lrspitem.hxx> #endif @@ -703,7 +706,6 @@ IMAGE_SETEVENT: Size aGrfSz( 0, 0 ); BOOL bSetTwipSize = TRUE; // Twip-Size am Node setzen? BOOL bChangeFrmSize = FALSE; // Frame-Format nachtraeglich anpassen? - BOOL bGrfSzValid = FALSE; // aGrfSz enthaelt die Grafik-Groesse BOOL bRequestGrfNow = FALSE; BOOL bSetScaleImageMap = FALSE; BYTE nPrcWidth = 0, nPrcHeight = 0; @@ -711,104 +713,46 @@ IMAGE_SETEVENT: if( !nWidth || !nHeight ) { // Es fehlt die Breite oder die Hoehe - - // JP 28.05.96: dann suche doch mal in unserem QuickDraw-Cache, ob - // die Groesse dieser Grafik schon vorhanden ist. - bGrfSzValid = -#ifdef NEW_GRFOBJ - FindGrfSizeFromCache( sGrfNm, aGrfSz ) -#else - FALSE; -#endif - ; - // Wenn die Grfik in einer Tabelle steht, wird sie gleich // angefordert, damit sie eventuell schon da ist, bevor die // Tabelle layoutet wird. - if( !bGrfSzValid && pTable!=0 && !nWidth ) + if( pTable!=0 && !nWidth ) { bRequestGrfNow = TRUE; IncGrfsThatResizeTable(); } - if( bGrfSzValid && aGrfSz.Width() && aGrfSz.Height() ) + // Die Groesse des Rahmens wird nachtraeglich gesetzt + bChangeFrmSize = TRUE; + aGrfSz = aTwipSz; + if( !nWidth && !nHeight ) { - // wir haben eine Groesse und koenen sie setzen - if( !nWidth && !nHeight ) - { - // Hoehe und Breite fehlen - aTwipSz = aGrfSz; - } - else if( nWidth ) + aTwipSz.Width() = HTML_DFLT_IMG_WIDTH; + aTwipSz.Height() = HTML_DFLT_IMG_HEIGHT; + } + else if( nWidth ) + { + // eine %-Angabe + if( bPrcWidth ) { - // nur die Breite fehlt - if( bPrcWidth ) - { - // %-Breite uebernehmen und Hoehe skalieren - nPrcWidth = (BYTE)nWidth; - nPrcHeight = 255; - } - else - { - // Breite uebernehmen und Hoehe berechnen - aTwipSz.Height() = (aGrfSz.Height() * aTwipSz.Width()) - / aGrfSz.Width(); - } + nPrcWidth = (BYTE)nWidth; + nPrcHeight = 255; } - else if( nHeight ) + else { - // nur die Hoehe fehlt - if( bPrcHeight ) - { - // %-Hoehe lassen und Breite skalieren - nPrcHeight = (BYTE)nHeight; - nPrcWidth = 255; - } - else - { - // Hoehe uebernehmen und Breite berechnen - aTwipSz.Width() = (aGrfSz.Width() * aTwipSz.Height()) - / aGrfSz.Height(); - } + aTwipSz.Height() = HTML_DFLT_IMG_HEIGHT; } } - else + else if( nHeight ) { - // wir haben keine Groesse gefunden (und sind in keiner - // Tabelle oder haben zumindest die Breite der Grafik) - - // Die Groesse des Rahmens wird nachtraeglich gesetzt - bChangeFrmSize = TRUE; - aGrfSz = aTwipSz; - if( !nWidth && !nHeight ) + if( bPrcHeight ) { - aTwipSz.Width() = HTML_DFLT_IMG_WIDTH; - aTwipSz.Height() = HTML_DFLT_IMG_HEIGHT; + nPrcHeight = (BYTE)nHeight; + nPrcWidth = 255; } - else if( nWidth ) - { - // eine %-Angabe - if( bPrcWidth ) - { - nPrcWidth = (BYTE)nWidth; - nPrcHeight = 255; - } - else - { - aTwipSz.Height() = HTML_DFLT_IMG_HEIGHT; - } - } - else if( nHeight ) + else { - if( bPrcHeight ) - { - nPrcHeight = (BYTE)nHeight; - nPrcWidth = 255; - } - else - { - aTwipSz.Width() = HTML_DFLT_IMG_WIDTH; - } + aTwipSz.Width() = HTML_DFLT_IMG_WIDTH; } } } @@ -816,14 +760,6 @@ IMAGE_SETEVENT: { // Breite und Hoehe wurden angegeben und brauchen nicht gesetzt // zu werden - bGrfSzValid = -#ifdef NEW_GRFOBJ - FindGrfSizeFromCache( sGrfNm, aGrfSz ) -#else - FALSE; -#endif - ; - bSetTwipSize = FALSE; if( bPrcWidth ) @@ -850,31 +786,8 @@ IMAGE_SETEVENT: if( pImgMap ) { SwFmtURL aURL; aURL.SetMap( pImgMap );//wird kopieiert - if( bGrfSzValid ) - { - BOOL bScale = FALSE; - - Fraction aScaleX( 1, 1 ), aScaleY( 1, 1); - if( !nPrcWidth && aGrfSz.Width() && aTwipSz.Width() && - aGrfSz.Width() != aTwipSz.Width() ) - { - aScaleX = Fraction( aGrfSz.Width(), aTwipSz.Width() ); - bScale = TRUE; - } - - if( !nPrcHeight && aGrfSz.Height() && aTwipSz.Height() && - aGrfSz.Height() != aTwipSz.Height() ) - { - aScaleY = Fraction( aGrfSz.Height(), aTwipSz.Height() ); - bScale = TRUE; - } - - if( bScale ) - aURL.GetMap()->Scale( aScaleX, aScaleY ); - } - else - bSetScaleImageMap = !nPrcWidth || !nPrcHeight; + bSetScaleImageMap = !nPrcWidth || !nPrcHeight; aFrmSet.Put( aURL ); } else @@ -887,8 +800,7 @@ IMAGE_SETEVENT: // die Grafik muss beim SetTwipSize skaliert werden, wenn // wir keine Groesse am Node gesetzt haben oder die Groesse // nicht der Grafikgroesse entsprach. - bSetScaleImageMap = !bSetTwipSize || !bGrfSzValid || - !nPrcWidth || !nPrcHeight; + bSetScaleImageMap = sal_True; } } @@ -950,7 +862,7 @@ IMAGE_SETEVENT: if( bSetTwipSize ) pGrfNd->SetTwipSize( aGrfSz ); - pGrfNd->SetChgTwipSize( bChangeFrmSize ); + pGrfNd->SetChgTwipSize( bChangeFrmSize, bChangeFrmSize ); if( bSetScaleImageMap ) pGrfNd->SetScaleImageMap( TRUE ); @@ -1175,13 +1087,31 @@ void SwHTMLParser::InsertBodyOptions() SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() ); SvxCSS1PropertyInfo aPropInfo; String aDummy; - ParseStyleOptions( aDummy, aDummy, aStyle, aItemSet, aPropInfo, 0, &aDir ); + ParseStyleOptions( aStyle, aDummy, aDummy, aItemSet, aPropInfo, 0, &aDir ); // Ein par Attribute muessen an der Seitenvorlage gesetzt werden, // und zwar die, die nicht vererbit werden pCSS1Parser->SetPageDescAttrs( bSetBrush ? &aBrushItem : 0, &aItemSet ); + const SfxPoolItem *pItem; + static USHORT aWhichIds[3] = { RES_CHRATR_FONTSIZE, + RES_CHRATR_CJK_FONTSIZE, + RES_CHRATR_CTL_FONTSIZE }; + for( USHORT i=0; i<3; i++ ) + { + if( SFX_ITEM_SET == aItemSet.GetItemState( aWhichIds[i], FALSE, + &pItem ) && + static_cast <const SvxFontHeightItem * >(pItem)->GetProp() != 100) + { + sal_uInt32 nHeight = + ( aFontHeights[2] * + static_cast <const SvxFontHeightItem * >(pItem)->GetProp() ) / 100; + SvxFontHeightItem aNewItem( nHeight, 100, aWhichIds[i] ); + aItemSet.Put( aNewItem ); + } + } + // alle noch uebrigen Optionen koennen an der Standard-Vorlage // gesetzt werden und gelten dann automatisch als defaults pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 489d0cbe2859..fd489fb2a8a4 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmltab.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mib $ $Date: 2002-11-21 13:11:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -968,9 +968,24 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells ) { ASSERT( nCells < pCells->Count(), "Anzahl Zellen falsch" ); -#ifdef DEBUG + // The colspan of empty cells at the end has to be fixed to the new + // number of cells. + sal_uInt16 i=nCells; sal_uInt16 nEnd = pCells->Count(); - for( sal_uInt16 i=nCells; i<nEnd; i++ ) + while( i ) + { + HTMLTableCell *pCell = (*pCells)[--i]; + if( !pCell->GetContents() ) + { + ASSERT( pCell->GetColSpan() == nEnd - i, + "invalid col span for empty cell at row end" ); + pCell->SetColSpan( nCells-i); + } + else + break; + } +#ifdef DEBUG + for( i=nCells; i<nEnd; i++ ) { HTMLTableCell *pCell = (*pCells)[i]; ASSERT( pCell->GetRowSpan() == 1, diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 38ff3d31614e..1b429f91e8f8 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmltabw.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mib $ $Date: 2002-11-21 13:11:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -757,7 +757,8 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, SwHoriOrient eAlign, sOut += sHTML_table; sal_uInt16 nOldDirection = rWrt.nDirection; - rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() ); + if( pFrmFmt ) + rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() ); if( rWrt.bOutFlyFrame || nOldDirection != rWrt.nDirection ) { rWrt.Strm() << sOut.GetBuffer(); diff --git a/sw/source/filter/html/makefile.mk b/sw/source/filter/html/makefile.mk index c616410904d0..7a24784c0a9c 100644 --- a/sw/source/filter/html/makefile.mk +++ b/sw/source/filter/html/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: obo $ $Date: 2002-10-10 14:04:54 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:41:50 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 4003b42f4186..1b2f9ac4e255 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrthtml.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 15:33:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1096,7 +1096,9 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs() const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) { ByteString sOut( sHTML_doctype ); - (sOut += ' ') += sHTML_doctype32; + (sOut += ' ') += + (HTML_CFG_HTML32==nExportMode ? sHTML_doctype32 + : sHTML_doctype40); HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.GetBuffer() ); // baue den Vorspann diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index d20bfd9517de..0e028d7172d3 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fltshell.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: cmc $ $Date: 2002-11-18 13:47:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -671,5 +671,6 @@ public: BOOL GetCaseVersalien(); }; +void UpdatePageDescs(SwDoc &rDoc, sal_uInt16 nInPageDescOffset); #endif diff --git a/sw/source/filter/rtf/rtfatr.cxx b/sw/source/filter/rtf/rtfatr.cxx index a3a89530bcfa..f9993dc43688 100644 --- a/sw/source/filter/rtf/rtfatr.cxx +++ b/sw/source/filter/rtf/rtfatr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtfatr.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: cmc $ $Date: 2002-12-04 12:07:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + /* * Dieses File enthaelt alle Ausgabe-Funktionen des RTF-Writers; * fuer alle Nodes, Attribute, Formate und Chars. @@ -941,6 +943,9 @@ RTFEndPosLst::~RTFEndPosLst() int RTFEndPosLst::Insert( const SfxPoolItem& rAttr, xub_StrLen nStt, xub_StrLen nEnd ) { + if (rAttr.Which() == RES_TXTATR_INETFMT) + return false; + if( nStt == nEnd ) return FALSE; @@ -1082,12 +1087,14 @@ void RTFEndPosLst::EndAttrs( xub_StrLen nStrPos ) for( USHORT nAttr = rAttrs.Count(); nAttr; ) switch( rAttrs[ --nAttr ]->Which() ) { +#if 0 case RES_TXTATR_INETFMT: // Hyperlinks werden als Felder geschrieben, aber der // "FieldResult" steht als Text im TextNode. Also muss // bei diesen Attributen am Ende 2 Klammern stehen! rWrt.Strm() << "}}"; break; +#endif case RES_TXTATR_CJK_RUBY: rWrt.Strm() << ")}{" << sRTF_FLDRSLT << " }}"; @@ -1294,6 +1301,82 @@ void OutRTF_SwRTL(SwRTFWriter& rWrt, const SwTxtNode *pNd) OutSvxFrmDir(rWrt, SvxFrameDirectionItem(eDir)); } +static Writer& OutRTF_SwTxtINetFmt( Writer& rWrt, const SfxPoolItem& rHt ) +{ + const SwFmtINetFmt& rURL = (const SwFmtINetFmt&)rHt; + SwRTFWriter& rRTFWrt = (SwRTFWriter&)rWrt; + if( rURL.GetValue().Len() ) + { + rWrt.Strm() << '{' << sRTF_FIELD << '{' << sRTF_IGNORE + << sRTF_FLDINST << " HYPERLINK "; + + String sURL( rURL.GetValue() ); + if( INET_MARK_TOKEN != sURL.GetChar(0) ) + { + INetURLObject aTmp( INetURLObject::AbsToRel( sURL ) ); + sURL = aTmp.GetURLNoMark( INetURLObject::DECODE_UNAMBIGUOUS); +/* if( INET_PROT_FILE == aTmp.GetProtocol() ) + { + // WW97 wollen keine FILE-URL haben, sondern einen normalen + // Dateinamen. Aber ab WW2000 kennen sie FileURLs. + sURL = aTmp.GetFull(); + } +*/ rWrt.Strm() << '\"'; + RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING, + rRTFWrt.bWriteHelpFmt ) << "\" "; + sURL = aTmp.GetMark(); + } + + if( sURL.Len() ) + { + rWrt.Strm() << "\\\\l \""; + sURL.Erase( 0, 1 ); + RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING, + rRTFWrt.bWriteHelpFmt ) << "\" "; + } + + if( rURL.GetTargetFrame().Len() ) + { + rWrt.Strm() << "\\\\t \""; + RTFOutFuncs::Out_String( rWrt.Strm(), rURL.GetTargetFrame(), + DEF_ENCODING, rRTFWrt.bWriteHelpFmt ) << "\" "; + } + + rWrt.Strm() << "}{" << sRTF_FLDRSLT << ' '; + rRTFWrt.bOutFmtAttr = FALSE; + + // und dann noch die Attributierung ausgeben + const SwCharFmt* pFmt; + const SwTxtINetFmt* pTxtAtr = rURL.GetTxtINetFmt(); + if( pTxtAtr && 0 != ( pFmt = pTxtAtr->GetCharFmt() )) + OutRTF_SwFmt( rWrt, *pFmt ); + } + return rWrt; +} + +void HandleHyperlinks(Writer& rWrt, const SwpHints* pTxtAttrs, xub_StrLen nPos) +{ + USHORT nCount = pTxtAttrs ? pTxtAttrs->Count() : 0; + for(USHORT i = 0; i < nCount; ++i ) + { + const SwTxtAttr* pHt = (*pTxtAttrs)[i]; + const SfxPoolItem &rItem = pHt->GetAttr(); + if (rItem.Which() == RES_TXTATR_INETFMT) + { + const xub_StrLen* pEnd; + if (nPos == *pHt->GetStart()) + OutRTF_SwTxtINetFmt(rWrt, rItem); + if (0 != ( pEnd = pHt->GetEnd() ) && nPos == *pEnd) + { + // Hyperlinks werden als Felder geschrieben, aber der + // "FieldResult" // steht als Text im TextNode. Also muss bei + // diesen Attributen am // Ende 2 Klammern stehen! + rWrt.Strm() << "}}"; + } + } + } +} + static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) { SwTxtNode * pNd = &((SwTxtNode&)rNode); @@ -1488,6 +1571,8 @@ static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) rRTFWrt.bTxtAttr = TRUE; rRTFWrt.bOutFmtAttr = FALSE; + HandleHyperlinks(rWrt, pNd->GetpSwpHints(), nStrPos); + if( nAttrPos < nCntAttr && *pHt->GetStart() == nStrPos && nStrPos != nEnde ) { @@ -2764,59 +2849,6 @@ static Writer& OutRTF_SwNoLinebreakHere( Writer& rWrt, const SfxPoolItem& ) } #endif -static Writer& OutRTF_SwTxtINetFmt( Writer& rWrt, const SfxPoolItem& rHt ) -{ - const SwFmtINetFmt& rURL = (const SwFmtINetFmt&)rHt; - SwRTFWriter& rRTFWrt = (SwRTFWriter&)rWrt; - if( rURL.GetValue().Len() ) - { - rWrt.Strm() << '{' << sRTF_FIELD << '{' << sRTF_IGNORE - << sRTF_FLDINST << " HYPERLINK "; - - String sURL( rURL.GetValue() ); - if( INET_MARK_TOKEN != sURL.GetChar(0) ) - { - INetURLObject aTmp( INetURLObject::AbsToRel( sURL ) ); - sURL = aTmp.GetURLNoMark( INetURLObject::DECODE_UNAMBIGUOUS); -/* if( INET_PROT_FILE == aTmp.GetProtocol() ) - { - // WW97 wollen keine FILE-URL haben, sondern einen normalen - // Dateinamen. Aber ab WW2000 kennen sie FileURLs. - sURL = aTmp.GetFull(); - } -*/ rWrt.Strm() << '\"'; - RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING, - rRTFWrt.bWriteHelpFmt ) << "\" "; - sURL = aTmp.GetMark(); - } - - if( sURL.Len() ) - { - rWrt.Strm() << "\\\\l \""; - sURL.Erase( 0, 1 ); - RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING, - rRTFWrt.bWriteHelpFmt ) << "\" "; - } - - if( rURL.GetTargetFrame().Len() ) - { - rWrt.Strm() << "\\\\t \""; - RTFOutFuncs::Out_String( rWrt.Strm(), rURL.GetTargetFrame(), - DEF_ENCODING, rRTFWrt.bWriteHelpFmt ) << "\" "; - } - - rWrt.Strm() << "}{" << sRTF_FLDRSLT << ' '; - rRTFWrt.bOutFmtAttr = FALSE; - - // und dann noch die Attributierung ausgeben - const SwCharFmt* pFmt; - const SwTxtINetFmt* pTxtAtr = rURL.GetTxtINetFmt(); - if( pTxtAtr && 0 != ( pFmt = pTxtAtr->GetCharFmt() )) - OutRTF_SwFmt( rWrt, *pFmt ); - } - return rWrt; -} - static Writer& OutRTF_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt ) { const SwFmtCharFmt& rChrFmt = (const SwFmtCharFmt&)rHt; @@ -3017,6 +3049,9 @@ static Writer& OutRTF_SwFmtLRSpace( Writer& rWrt, const SfxPoolItem& rHt ) rWrt.Strm() << sRTF_LI; rWrt.OutLong( rLR.GetTxtLeft() ) << sRTF_RI; rWrt.OutLong( rLR.GetRight() ); + rWrt.Strm() << sRTF_LIN; + rWrt.OutLong( rLR.GetTxtLeft() ) << sRTF_RIN; + rWrt.OutLong( rLR.GetRight() ); rWrt.Strm() << sRTF_FI; rWrt.OutLong( rLR.GetTxtFirstLineOfst() ); } @@ -4123,4 +4158,4 @@ SwNodeFnTab aRTFNodeFnTab = { /* RES_OLENODE */ OutRTF_SwOLENode }; - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx index 11f3236f673f..c6c43c2e09a2 100644 --- a/sw/source/filter/rtf/rtffld.cxx +++ b/sw/source/filter/rtf/rtffld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtffld.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: mmaher $ $Date: 2002-12-02 17:26:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PRECOMPILED #include "filt_pch.hxx" #endif @@ -176,19 +178,19 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext ) { // Strings sind PascalStrings; Laenge steht an 1. Stellen, dadurch wird // sich der Aufruf von strlen erspart!!! - sal_Char __READONLY_DATA sTOC[]= "\3toc"; - sal_Char __READONLY_DATA sIMPORT[]= "\6import"; - sal_Char __READONLY_DATA sINDEX[]= "\5index"; - sal_Char __READONLY_DATA sSYMBOL[]= "\6symbol"; - sal_Char __READONLY_DATA sPAGE[]= "\4page"; - sal_Char __READONLY_DATA sNUMPAGES[]= "\x8numpages"; - sal_Char __READONLY_DATA sDATE[]= "\4date"; - sal_Char __READONLY_DATA sTIME[]= "\4time"; - sal_Char __READONLY_DATA sDATA[]= "\4data"; - sal_Char __READONLY_DATA sMERGEFLD[]= "\10mergefield"; - sal_Char __READONLY_DATA sIMPORT2[]= "\16includepicture"; - sal_Char __READONLY_DATA sHYPERLINK[]= "\x9hyperlink"; - sal_Char __READONLY_DATA sEQ[]= "\2eq"; + sal_Char __READONLY_DATA sTOC[]= "\x03""toc"; + sal_Char __READONLY_DATA sIMPORT[]= "\x06""import"; + sal_Char __READONLY_DATA sINDEX[]= "\x05""index"; + sal_Char __READONLY_DATA sSYMBOL[]= "\x06""symbol"; + sal_Char __READONLY_DATA sPAGE[]= "\x04""page"; + sal_Char __READONLY_DATA sNUMPAGES[]= "\x08""numpages"; + sal_Char __READONLY_DATA sDATE[]= "\x04""date"; + sal_Char __READONLY_DATA sTIME[]= "\x04""time"; + sal_Char __READONLY_DATA sDATA[]= "\x04""data"; + sal_Char __READONLY_DATA sMERGEFLD[]= "\x0A""mergefield"; + sal_Char __READONLY_DATA sIMPORT2[]= "\x0E""includepicture"; + sal_Char __READONLY_DATA sHYPERLINK[]= "\x09""hyperlink"; + sal_Char __READONLY_DATA sEQ[]= "\x02""eq"; struct _Dummy_RTF_FLD_TYPES { @@ -247,27 +249,24 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext ) static USHORT CheckNumberFmtStr( const String& rNStr ) { - // zur Kontrolle, falls jemand meint, neue Werte zufuegen zu muessen -#define NUMBERTAB_SZ 8 - sal_Char __READONLY_DATA - sNType0[] = "\10ALPHABETIC", /* CHARS_UPPER_LETTER*/ - sNType1[] = "\10alphabetic", /* CHARS_LOWER_LETTER*/ - sNType2[] = "\5ROMAN", /* ROMAN_UPPER */ - sNType3[] = "\5roman", /* ROMAN_LOWER */ - sNType4[] = "\6ARABIC", /* ARABIC */ - sNType5[] = "\4NONE", /* NUMBER_NONE */ - sNType6[] = "\4CHAR", /* CHAR_SPECIAL */ - sNType7[] = "\4PAGE"; /* PAGEDESC */ - static const sal_Char* __READONLY_DATA aNumberTypeTab[ NUMBERTAB_SZ ] = + const static sal_Char* aNumberTypeTab[] = { - sNType0, sNType1, sNType2, sNType3, sNType4, - sNType5, sNType6, sNType7 + "\x0A""ALPHABETIC", /* CHARS_UPPER_LETTER*/ + "\x0A""alphabetic", /* CHARS_LOWER_LETTER*/ + "\x05""ROMAN", /* ROMAN_UPPER */ + "\x05""roman", /* ROMAN_LOWER */ + "\x06""ARABIC", /* ARABIC */ + "\x04""NONE", /* NUMBER_NONE */ + "\x04""CHAR", /* CHAR_SPECIAL */ + "\x04""PAGE" /* PAGEDESC */ }; + ASSERT(sizeof(aNumberTypeTab) / sizeof(sal_Char *) + >= SVX_NUM_PAGEDESC - SVX_NUM_CHARS_UPPER_LETTER, "impossible"); - for( USHORT n = SVX_NUM_CHARS_UPPER_LETTER; n <= SVX_NUM_PAGEDESC; n++ ) + for (USHORT n = SVX_NUM_CHARS_UPPER_LETTER; n <= SVX_NUM_PAGEDESC; ++n) { - const sal_Char* pCmp = aNumberTypeTab[ n ]; + const sal_Char* pCmp = aNumberTypeTab[n - SVX_NUM_CHARS_UPPER_LETTER]; int nLen = *pCmp++; if( rNStr.EqualsAscii( pCmp, 0, nLen )) return 2 <= n ? n : (n + SVX_NUM_CHARS_UPPER_LETTER_N); @@ -365,7 +364,7 @@ xub_StrLen lcl_FindEndBracket( const String& rStr ) void lcl_ScanEquationField( const String& rStr, RTF_EquationData& rData, sal_Unicode nSttKey ) { - int nSubSupFlag; + int nSubSupFlag(0); RtfFieldSwitch aRFS( rStr ); while( !aRFS.IsAtEnd() ) { @@ -936,8 +935,10 @@ void SwRTFParser::ReadField() String sFieldStr, sFieldNm; BYTE cCh; - while( nOpenBrakets && IsParserWorking() ) - switch( GetNextToken() ) + int nToken; + while (nOpenBrakets && IsParserWorking()) + { + switch (nToken = GetNextToken()) { case '}': { @@ -965,13 +966,9 @@ void SwRTFParser::ReadField() } sFieldStr.Erase(); } - else if( RTFFLD_UNKNOWN == nRet ) // FieldResult wurde eingelesen + else if (RTFFLD_UNKNOWN == nRet) { - // der String ist der Wert vom Feld -// sFieldStr.Insert( '"', 0 ); -// sFieldStr.Insert( '"' ); - - // besorge mal das Feld: + // FieldResult wurde eingelesen SwTxtNode* pTxtNd = pPam->GetPoint()->nNode.GetNode().GetTxtNode(); SwTxtAttr* pFldAttr = pTxtNd->GetTxtAttr( pPam->GetPoint()->nContent.GetIndex()-1 ); @@ -1109,14 +1106,17 @@ INSINGLECHAR: sFieldStr.Insert( sTmp, 3 ); } break; + default: + SvxRTFParser::NextToken( nToken ); + break; + } } - if( RTFFLD_IMPORT == nRet && sFieldNm.Len() ) - { - // Grafik einfuegen + // Grafik einfuegen + if (RTFFLD_IMPORT == nRet && sFieldNm.Len()) InsPicture( sFieldNm ); - } SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx index e25ec129fccd..b6f76a26f51c 100644 --- a/sw/source/filter/rtf/rtffly.cxx +++ b/sw/source/filter/rtf/rtffly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtffly.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: cmc $ $Date: 2002-07-18 09:41:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -176,6 +176,9 @@ #ifndef _FLTINI_HXX #include <fltini.hxx> #endif +#ifndef __SGI_STL_VECTOR +#include <vector> +#endif #define ANCHOR(p) ((SwFmtAnchor*)p) @@ -333,7 +336,7 @@ void SwRTFParser::SetFlysInDoc() { // !! von Oben abarbeiten, CntntPos ist kein Index ! SwNodes & rNds = pDoc->GetNodes(); - SvPtrarr aPrevFmts( 255 < aFlyArr.Count() ? aFlyArr.Count() : 255 ); + ::std::vector <SwFlyFrmFmt*> aPrevFmts; SwFrmFmt* pParent = pDoc->GetFrmFmtFromPool( RES_POOLFRM_FRAME ); for( USHORT n = 0; n < aFlyArr.Count(); ++n ) { @@ -564,8 +567,8 @@ void SwRTFParser::SetFlysInDoc() // the prev position { ULONG nSttNd = pSttNd->GetIndex(), - nEndNd = pSttNd->EndOfSectionIndex(); - for( USHORT nPrevFmts = aPrevFmts.Count(); nPrevFmts; ) + nEndNd = pSttNd->EndOfSectionIndex(); + for( USHORT nPrevFmts = aPrevFmts.size(); nPrevFmts; ) { SwFmt* pTmpFmt = (SwFmt*)aPrevFmts[ --nPrevFmts ]; const SwFmtAnchor& rAn = pTmpFmt->GetAnchor(); @@ -577,12 +580,11 @@ void SwRTFParser::SetFlysInDoc() pTmpFmt->SetAttr( aAnchor ); } else - // then forget it - aPrevFmts.Remove( nPrevFmts, 1 ); + // then forget it + aPrevFmts.erase( aPrevFmts.begin()+nPrevFmts, aPrevFmts.begin()+nPrevFmts+1); } - void* p = (void*)pFmt; - aPrevFmts.Insert( p, aPrevFmts.Count() ); + aPrevFmts.push_back(pFmt); } } delete pFlySave; @@ -1062,6 +1064,13 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) pFlySave->nDropAnchor = nDropCapAnchor; pFlySave->nDropLines = nDropCapLines; } + if (nFlyArrCnt >0){ + SwFlySave* pFlySavePrev = aFlyArr[nFlyArrCnt-1]; + if (pFlySave->nSttNd.GetIndex() < pFlySavePrev->nEndNd.GetIndex()) + { + pFlySavePrev->nEndNd=pFlySave->nSttNd; + } + } aFlyArr.Insert( pFlySave, nFlyArrCnt++ ); } } @@ -1465,20 +1474,18 @@ void SwRTFParser::_SetPictureSize( const SwNoTxtNode& rNd, void SwRTFParser::GetPageSize( Size& rSize ) { - const SwFrmFmt& rPgFmt = pDoc->GetPageDesc(nAktPageDesc).GetMaster(); + ASSERT(!maSegments.empty(), "not possible"); - const SwFmtFrmSize& rSz = rPgFmt.GetFrmSize(); - const SvxLRSpaceItem& rLR = rPgFmt.GetLRSpace(); - const SvxULSpaceItem& rUL = rPgFmt.GetULSpace(); - const SwFmtCol& rCol = rPgFmt.GetCol(); + const rtfSection &rSect = maSegments.back(); - rSize.Width() = rSz.GetWidth() - rLR.GetLeft() - rLR.GetRight(); - rSize.Height() = rSz.GetHeight() - rUL.GetUpper() - rUL.GetLower(); + rSize.Width() = rSect.maPageInfo.mnPgwsxn - rSect.maPageInfo.mnMarglsxn - rSect.maPageInfo.mnMargrsxn; + rSize.Height() = rSect.maPageInfo.mnPghsxn - rSect.maPageInfo.mnMargtsxn - rSect.maPageInfo.mnMargbsxn; - if( 1 < rCol.GetNumCols() ) + long nCols = rSect.NoCols(); + if (1 < nCols) { - rSize.Width() /= rCol.GetNumCols(); - rSize.Height() /= rCol.GetNumCols(); + rSize.Width() /= nCols; + rSize.Height() /= nCols; } } diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx index 6375a26fdaf5..177de0b38ed6 100644 --- a/sw/source/filter/rtf/rtfnum.cxx +++ b/sw/source/filter/rtf/rtfnum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtfnum.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2001-05-28 10:55:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -802,7 +802,7 @@ const Font* SwRTFParser::FindFontOfItem( const SvxFontItem& rItem ) const } -void SwRTFParser::ReadNumSecLevel( int nToken ) +SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken ) { // lese die \pnseclvl - Gruppe // nTokenValue gibt schon den richtigen Level vor 1 - 9! @@ -835,7 +835,7 @@ void SwRTFParser::ReadNumSecLevel( int nToken ) default: SkipGroup(); - return ; + return 0; } } @@ -1102,6 +1102,7 @@ NUMATTR_SETUNDERLINE: } SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + return pCurRule; } diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx index e1ccd06a21de..bd40ed97443f 100644 --- a/sw/source/filter/rtf/rtftbl.cxx +++ b/sw/source/filter/rtf/rtftbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtftbl.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:30:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,6 +58,9 @@ * * ************************************************************************/ + +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PRECOMPILED #include "filt_pch.hxx" #endif @@ -138,6 +141,67 @@ class SwShareBoxFmts; extern void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* = 0, BOOL = TRUE, const BOOL = TRUE, SwShareBoxFmts* = 0 ); +struct Row +{ + bool mbUseLeftRowPad, mbUseRightRowPad, mbUseTopRowPad, mbUseBottomRowPad; + long mnLeftRowPad, mnRightRowPad, mnTopRowPad, mnBottomRowPad; + USHORT mnBrdDist; + Row() : + mbUseLeftRowPad(false), mbUseRightRowPad(false), + mbUseTopRowPad(false), mbUseBottomRowPad(false), + mnLeftRowPad(0), mnRightRowPad(0), mnTopRowPad(0), mnBottomRowPad(0), + mnBrdDist(MIN_BORDER_DIST) + {} +}; + +static void SetRowBorder(SfxItemSet& rSet, const Row &rRow) +{ +#if 1 + SvxBoxItem aBox((const SvxBoxItem&)rSet.Get(RES_BOX, false)); + aBox.SetDistance(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist, + BOX_LINE_LEFT); + + aBox.SetDistance(rRow.mbUseRightRowPad ? rRow.mnRightRowPad : rRow.mnBrdDist, + BOX_LINE_RIGHT); + + aBox.SetDistance(rRow.mbUseTopRowPad ? rRow.mnTopRowPad : 0, + BOX_LINE_TOP); + + aBox.SetDistance(rRow.mbUseBottomRowPad ? rRow.mnBottomRowPad : 0, + BOX_LINE_BOTTOM); + + rSet.Put(aBox); +#else + const SfxPoolItem* pItem; + if (SFX_ITEM_SET == rSet.GetItemState(RES_BOX, FALSE, &pItem)) + { + SvxBoxItem aBox( *(SvxBoxItem*)pItem ); + aBox.SetDistance(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist, + BOX_LINE_LEFT); + + aBox.SetDistance(rRow.mbUseRightRowPad ? rRow.mnRightRowPad : rRow.mnBrdDist, + BOX_LINE_RIGHT); + + aBox.SetDistance(rRow.mbUseTopRowPad ? rRow.mnTopRowPad : 0, + BOX_LINE_TOP); + + aBox.SetDistance(rRow.mbUseBottomRowPad ? rRow.mnBottomRowPad : 0, + BOX_LINE_BOTTOM); + + rSet.Put(aBox); + } +#endif +} + +void rtfSections::PrependedInlineNode(const SwPosition &rPos, + const SwNode &rNode) +{ + ASSERT(!maSegments.empty(), + "should not be possible, must be at least one segment"); + if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode)) + maSegments.back().maStart = SwNodeIndex(rNode); +} + void SwRTFParser::ReadTable( int nToken ) { nInsTblRow = USHRT_MAX; @@ -191,10 +255,7 @@ void SwRTFParser::ReadTable( int nToken ) SwHoriOrient eAdjust = HORI_LEFT; // default fuer Tabellen SwTwips nLSpace = 0; - USHORT nBrdDist = MIN_BORDER_DIST; - bool bUseLeftRowPad = false, bUseRightRowPad = false, - bUseTopRowPad = false, bUseBottomRowPad = false; - long nLeftRowPad = 0, nRightRowPad = 0, nTopRowPad = 0, nBottomRowPad = 0; + Row aRow; bool bUseLeftCellPad = false, bUseRightCellPad = false, bUseTopCellPad = false, bUseBottomCellPad = false; @@ -209,37 +270,33 @@ void SwRTFParser::ReadTable( int nToken ) BOOL bHeadlineRepeat = FALSE; SvxFrameDirection eDir = FRMDIR_HORI_LEFT_TOP; -#ifdef SET_TRGAPH - SvxLRSpaceItem aLR; -#endif - int bWeiter = TRUE; do { switch( nToken ) { case RTF_TRPADDFL: - bUseLeftRowPad = (nTokenValue == 3) ? true : false; + aRow.mbUseLeftRowPad = (nTokenValue == 3) ? true : false; break; case RTF_TRPADDFT: - bUseTopRowPad = (nTokenValue == 3) ? true : false; + aRow.mbUseTopRowPad = (nTokenValue == 3) ? true : false; break; case RTF_TRPADDFR: - bUseRightRowPad = (nTokenValue == 3) ? true : false; + aRow.mbUseRightRowPad = (nTokenValue == 3) ? true : false; break; case RTF_TRPADDFB: - bUseBottomRowPad = (nTokenValue == 3) ? true : false; + aRow.mbUseBottomRowPad = (nTokenValue == 3) ? true : false; break; case RTF_TRPADDL: - nLeftRowPad = nTokenValue; + aRow.mnLeftRowPad = nTokenValue; break; case RTF_TRPADDT: - nTopRowPad = nTokenValue; + aRow.mnTopRowPad = nTokenValue; break; case RTF_TRPADDR: - nRightRowPad = nTokenValue; + aRow.mnRightRowPad = nTokenValue; break; case RTF_TRPADDB: - nBottomRowPad = nTokenValue; + aRow.mnBottomRowPad = nTokenValue; break; case RTF_CLPADFL: @@ -298,13 +355,7 @@ void SwRTFParser::ReadTable( int nToken ) } else { - // Platz zwischen den Spalten angeben und ist - // diese auch kleiner als die Breite der Box -#ifdef SET_TRGAPH - if( aLR.GetLeft() && 2L * aLR.GetLeft() < nSize ) - pBoxFmt->SetAttr( aLR ); - aLR.SetLeft( 0 ); aLR.SetRight( 0 ); -#endif + SetRowBorder((SfxItemSet&)pBoxFmt->GetAttrSet(), aRow); aBoxFmts.Insert( pBoxFmt, aBoxFmts.Count() ); pBoxFmt = pDoc->MakeTableBoxFmt(); } @@ -327,6 +378,65 @@ void SwRTFParser::ReadTable( int nToken ) if (bUseTopCellPad) aBox.SetDistance(nTopCellPad, BOX_LINE_LEFT); + + /*#106415# The Cell Borders are now balanced on import to + improve the layout of tables. + */ + + if ( aBoxFmts.Count()>1) + { + + SwTableBoxFmt* prevpFmt = aBoxFmts[ aBoxFmts.Count()-2 ]; + SvxBoxItem prevaBox(prevpFmt->GetBox()); + USHORT prevWidthRight=0; + USHORT currWidthLeft=0; + const SvxBorderLine* brdrline ; + if(prevaBox.GetRight()) + { + brdrline=prevaBox.GetRight(); + prevWidthRight = brdrline->GetOutWidth(); + } + if(aBox.GetLeft()) + { + brdrline=aBox.GetLeft(); + currWidthLeft = brdrline->GetOutWidth(); + + } + if(currWidthLeft >0 || prevWidthRight >0 ) + { + USHORT newBorderWidth=(currWidthLeft+prevWidthRight)/2 ; + if(newBorderWidth /2 ==DEF_LINE_WIDTH_0 ) + { + newBorderWidth =DEF_LINE_WIDTH_0; + } + else if(newBorderWidth /2 >=(DEF_LINE_WIDTH_4-DEF_LINE_WIDTH_3)) + { + newBorderWidth =DEF_LINE_WIDTH_4; + } + else if(newBorderWidth /2 >=(DEF_LINE_WIDTH_3-DEF_LINE_WIDTH_2)) + { + newBorderWidth =DEF_LINE_WIDTH_3; + } + else if(newBorderWidth /2>=(DEF_LINE_WIDTH_2-DEF_LINE_WIDTH_1)) + { + newBorderWidth =DEF_LINE_WIDTH_2; + } + else if(newBorderWidth /2>=(DEF_LINE_WIDTH_1 - DEF_LINE_WIDTH_0) ) + { + newBorderWidth =DEF_LINE_WIDTH_1; + } + else + { + newBorderWidth =DEF_LINE_WIDTH_0; + } + const SvxBorderLine newbrdrline(0, newBorderWidth,0,0); + aBox.SetLine(&newbrdrline,BOX_LINE_LEFT); + prevaBox.SetLine(&newbrdrline,BOX_LINE_RIGHT); + prevpFmt->SetAttr(prevaBox); + } + + } + pFmt->SetAttr(aBox); bUseLeftCellPad = false; @@ -337,13 +447,7 @@ void SwRTFParser::ReadTable( int nToken ) break; case RTF_TRGAPH: - { - nBrdDist = (USHORT)nTokenValue; -#ifdef SET_TRGAPH - aLR.SetLeft( USHORT( nTokenValue )); - aLR.SetRight( USHORT( nTokenValue )); -#endif - } + aRow.mnBrdDist = (USHORT)nTokenValue; break; case RTF_TRQL: eAdjust = HORI_LEFT; break; @@ -403,40 +507,11 @@ void SwRTFParser::ReadTable( int nToken ) if( aMergeBoxes[ nBoxCnt ] ) break; - const SfxPoolItem* pItem; SfxItemSet& rSet = (SfxItemSet&)pBoxFmt->GetAttrSet(); ReadBorderAttr( nToken, rSet, TRUE ); - if (SFX_ITEM_SET == rSet.GetItemState(RES_BOX, FALSE, &pItem)) - { - SvxBoxItem aBox( *(SvxBoxItem*)pItem ); -#if 1 - aBox.SetDistance(bUseLeftRowPad ? nLeftRowPad : nBrdDist, - BOX_LINE_LEFT); - - aBox.SetDistance(bUseRightRowPad ? nRightRowPad : nBrdDist, - BOX_LINE_RIGHT); - - aBox.SetDistance(bUseTopRowPad ? nTopRowPad : 0, - BOX_LINE_TOP); - - aBox.SetDistance(bUseBottomRowPad ? nBottomRowPad : 0, - BOX_LINE_BOTTOM); - - rSet.Put(aBox); -#else - BOOL bChg = FALSE; - for (int nLn = 0; nLn < 4; ++nLn) - { - if( aBox.GetLine( nLn ) && !aBox.GetDistance( nLn ) ) - { - aBox.SetDistance( 2 > nLn ? 18 : nBrdDist, nLn ); - bChg = TRUE; - } - } - if (bChg) - rSet.Put( aBox ); +#if 0 + SetRowBorder(aRow); #endif - } } else if( RTF_TABLEDEF != (nToken & ~(0xff | RTF_SWGDEFS)) ) { @@ -638,6 +713,12 @@ void SwRTFParser::ReadTable( int nToken ) GetIndex() - 5 ]->GetTableNode(); ASSERT( pTableNode, "Wo ist mein TabellenNode?" ); + if (pTableNode) + { + maSegments.PrependedInlineNode(*pPam->GetPoint(), + *pTableNode); + } + SwTableLines& rLns = pTableNode->GetTable().GetTabLines(); pNewLine = rLns[ rLns.Count()-1 ]; @@ -882,5 +963,4 @@ void SwRTFParser::CheckInsNewTblLine() } } - - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index feda53718702..7b3a904bcb79 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swparrtf.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: cmc $ $Date: 2002-12-06 16:21:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PRECOMPILED @@ -115,6 +114,9 @@ #ifndef _SVX_FRMDIRITEM_HXX #include <svx/frmdiritem.hxx> #endif +#ifndef _SVX_HYZNITEM_HXX +#include <svx/hyznitem.hxx> +#endif #ifndef _FMTPDSC_HXX //autogen #include <fmtpdsc.hxx> @@ -227,6 +229,13 @@ #ifndef _SHELLRES_HXX // for the pagedescname from the ShellRes #include <shellres.hxx> #endif +#ifndef _SW_HF_EAT_SPACINGITEM_HXX +#include <hfspacingitem.hxx> +#endif + +#ifndef _FLTSHELL_HXX +#include <fltshell.hxx> +#endif #ifndef _SWSWERROR_H #include <swerror.h> @@ -287,8 +296,9 @@ ULONG RtfReader::Read( SwDoc &rDoc,SwPaM &rPam, const String &) } SwRTFParser::SwRTFParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, - int bReadNewDoc ) + int bReadNewDoc ) : SvxRTFParser( pD->GetAttrPool(), rIn, bReadNewDoc ), + maSegments(*this), pDoc( pD ), pTableNode( 0 ), pOldTblNd( 0 ), nAktBox( 0 ), nNewNumSectDef( USHRT_MAX ), nAktPageDesc( 0 ), nAktFirstPageDesc( 0 ), @@ -302,7 +312,7 @@ SwRTFParser::SwRTFParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, { mbIsFootnote = mbReadNoTbl = bReadSwFly = bSwPageDesc = bStyleTabValid = bInPgDscTbl = bNewNumList = false; - bFirstContinue = bFirstDocControl = true; + bFirstContinue = true; pPam = new SwPaM( *rCrsr.GetPoint() ); SetInsPos( SwxPosition( pPam ) ); @@ -331,6 +341,18 @@ SvParserState SwRTFParser::CallParser() return SvxRTFParser::CallParser(); } +bool lcl_UsedPara(SwPaM &rPam) +{ + const SwCntntNode* pCNd; + const SwAttrSet* pSet; + if( rPam.GetPoint()->nContent.GetIndex() || + ( 0 != ( pCNd = rPam.GetCntntNode()) && + 0 != ( pSet = pCNd->GetpSwAttrSet()) && + ( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, FALSE ) || + SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, FALSE )))) + return true; + return false; +} void SwRTFParser::Continue( int nToken ) { @@ -381,17 +403,11 @@ void SwRTFParser::Continue( int nToken ) if( SVPAR_PENDING == GetStatus() ) return ; // weiter gehts beim naechsten mal - // Laufbalken bei asynchronen Call nicht einschalten !!! - ::EndProgress( pDoc->GetDocShell() ); - + // JP 13.08.98: TabellenUmrandungen optimieren - Bug 53525 + for( USHORT n = aTblFmts.Count(); n; ) { - // JP 13.08.98: TabellenUmrandungen optimieren - Bug 53525 - for( USHORT n = aTblFmts.Count(); n; ) - { - SwTable* pTbl = SwTable::FindTable( (SwFrmFmt*)aTblFmts[ --n ] ); - if( pTbl ) - pTbl->GCBorderLines(); - } + if (SwTable* pTbl = SwTable::FindTable( (SwFrmFmt*)aTblFmts[ --n ] )) + pTbl->GCBorderLines(); } pRelNumRule->SetNumRelSpaces( *pDoc ); @@ -472,6 +488,10 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) delete pRegionEndIdx, pRegionEndIdx = 0; } + sal_uInt16 nPageDescOffset = pDoc->GetPageDescCnt(); + maSegments.InsertSegments(IsNewDoc()); + UpdatePageDescs(*pDoc, nPageDescOffset); + if( aFlyArr.Count() ) SetFlysInDoc(); @@ -487,7 +507,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) if( pTmp->IsCntntNode() && !pTmp->FindTableNode() ) DelLastNode(); } - else if( 0 != ( pAktNd = pDoc->GetNodes()[ nNodeIdx ]->GetTxtNode()) ) + else if (0 != (pAktNd = pDoc->GetNodes()[nNodeIdx]->GetTxtNode())) { if( pAktNd->CanJoinNext( &pPos->nNode )) { @@ -507,7 +527,6 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) } } } - // nun noch das SplitNode vom Ende aufheben else if( !IsNewDoc() ) { @@ -547,6 +566,479 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) delete pSttNdIdx, pSttNdIdx = 0; delete pRegionEndIdx, pRegionEndIdx = 0; RemoveUnusedNumRules(); + + // Laufbalken bei asynchronen Call nicht einschalten !!! + ::EndProgress( pDoc->GetDocShell() ); +} + +bool rtfSections::SetCols(SwFrmFmt &rFmt, const rtfSection &rSection, + USHORT nNettoWidth) +{ + //sprmSCcolumns - Anzahl der Spalten - 1 + USHORT nCols = rSection.NoCols(); + + if (nCols < 2) + return false; // keine oder bloedsinnige Spalten + + SwFmtCol aCol; // Erzeuge SwFmtCol + + //sprmSDxaColumns - Default-Abstand 1.25 cm + USHORT nColSpace = rSection.StandardColSeperation(); + +#if 0 + // sprmSLBetween + if (rSection.maSep.fLBetween) + { + aCol.SetLineAdj( COLADJ_TOP ); // Line + aCol.SetLineHeight( 100 ); + aCol.SetLineColor( Color( COL_BLACK )); + aCol.SetLineWidth( 1 ); + } +#endif + aCol.Init( nCols, nColSpace, nNettoWidth ); + + // not SFEvenlySpaced + if (rSection.maPageInfo.maColumns.size()) + { + aCol._SetOrtho(false); + USHORT nWishWidth = 0, nHalfPrev = 0; + for (USHORT n = 0, i = 0; n < rSection.maPageInfo.maColumns.size(); n += 2, ++i ) + { + SwColumn* pCol = aCol.GetColumns()[ i ]; + pCol->SetLeft( nHalfPrev ); + USHORT nSp = rSection.maPageInfo.maColumns[ n+1 ]; + nHalfPrev = nSp / 2; + pCol->SetRight( nSp - nHalfPrev ); + pCol->SetWishWidth(rSection.maPageInfo.maColumns[ n ] + + pCol->GetLeft() + pCol->GetRight()); + nWishWidth += pCol->GetWishWidth(); + } + aCol.SetWishWidth( nWishWidth ); + } + + rFmt.SetAttr(aCol); + return true; +} + +void rtfSections::SetPage(SwPageDesc &rInPageDesc, SwFrmFmt &rFmt, + const rtfSection &rSection, bool bIgnoreCols) +{ + // 1. Orientierung + rInPageDesc.SetLandscape(rSection.IsLandScape()); + + // 2. Papiergroesse + SwFmtFrmSize aSz(rFmt.GetFrmSize()); + aSz.SetWidth(rSection.GetPageWidth()); + aSz.SetHeight(rSection.GetPageHeight()); + rFmt.SetAttr(aSz); + + rFmt.SetAttr( + SvxLRSpaceItem(rSection.GetPageLeft(), rSection.GetPageRight())); + + if (!bIgnoreCols) + { + SetCols(rFmt, rSection, rSection.GetPageWidth() - + rSection.GetPageLeft() - rSection.GetPageRight()); + } +} + +void rtfSections::GetPageULData(const rtfSection &rSection, bool bFirst, + rtfSections::wwULSpaceData& rData) +{ + short nWWUp = rSection.maPageInfo.mnMargtsxn; + short nWWLo = rSection.maPageInfo.mnMargbsxn; + short nWWHTop = rSection.maPageInfo.mnHeadery; + short nWWFBot = rSection.maPageInfo.mnFootery; + +#if 0 + /* + If there is gutter in 97+ and the dop says put it on top then get the + gutter distance and set it to the top margin. When we are "two pages + in one" the gutter is put at the top of odd pages, and bottom of + even pages, something we cannot do. So we will put it on top of all + pages, that way the pages are at least the right size. + */ + if ( mrReader.pWDop->doptypography.f2on1 || + (!mrReader.bVer67 && mrReader.pWDop->iGutterPos && + rSection.maSep.fRTLGutter) + ) + { + nWWUp += rSection.maSep.dzaGutter; + } +#endif + + if (bFirst) + { + if ( + rSection.mpTitlePage && + SFX_ITEM_SET == rSection.mpTitlePage->GetMaster().GetItemState(RES_HEADER) + ) + { + rData.bHasHeader = true; + } + } + else + { + if (rSection.mpPage && + ( + SFX_ITEM_SET == rSection.mpPage->GetMaster().GetItemState(RES_HEADER) + || rSection.mpPage->GetLeft().GetItemState(RES_HEADER) + ) + ) + { + rData.bHasHeader = true; + } + } + + if( rData.bHasHeader ) + { + rData.nSwUp = nWWHTop; // Header -> umrechnen + rData.nSwHLo = nWWUp - nWWHTop; + + if (rData.nSwHLo < MM50) + rData.nSwHLo = MM50; + } + else // kein Header -> Up einfach uebernehmen + rData.nSwUp = nWWUp; + + if (bFirst) + { + if ( + rSection.mpTitlePage && + SFX_ITEM_SET == rSection.mpTitlePage->GetMaster().GetItemState(RES_FOOTER) + ) + { + rData.bHasFooter = true; + } + } + else + { + if (rSection.mpPage && + ( + SFX_ITEM_SET == rSection.mpPage->GetMaster().GetItemState(RES_FOOTER) + || rSection.mpPage->GetLeft().GetItemState(RES_FOOTER) + ) + ) + { + rData.bHasFooter = true; + } + } + + if( rData.bHasFooter ) + { + rData.nSwLo = nWWFBot; // Footer -> Umrechnen + rData.nSwFUp = nWWLo - nWWFBot; + + if (rData.nSwFUp < MM50) + rData.nSwFUp = MM50; + } + else // kein Footer -> Lo einfach uebernehmen + rData.nSwLo = nWWLo; +} + +void rtfSections::SetPageULSpaceItems(SwFrmFmt &rFmt, + rtfSections::wwULSpaceData& rData) +{ + if (rData.bHasHeader) // ... und Header-Lower setzen + { + //Kopfzeilenhoehe minimal sezten + if (SwFrmFmt* pHdFmt = (SwFrmFmt*)rFmt.GetHeader().GetHeaderFmt()) + { + pHdFmt->SetAttr(SwFmtFrmSize(ATT_MIN_SIZE, 0, rData.nSwHLo)); + SvxULSpaceItem aHdUL(pHdFmt->GetULSpace()); + aHdUL.SetLower(rData.nSwHLo - MM50); + pHdFmt->SetAttr(aHdUL); + pHdFmt->SetAttr(SwHeaderAndFooterEatSpacingItem( + RES_HEADER_FOOTER_EAT_SPACING, true)); + } + } + + if (rData.bHasFooter) // ... und Footer-Upper setzen + { + if (SwFrmFmt* pFtFmt = (SwFrmFmt*)rFmt.GetFooter().GetFooterFmt()) + { + pFtFmt->SetAttr(SwFmtFrmSize(ATT_MIN_SIZE, 0, rData.nSwFUp)); + SvxULSpaceItem aFtUL(pFtFmt->GetULSpace()); + aFtUL.SetUpper(rData.nSwFUp - MM50); + pFtFmt->SetAttr(aFtUL); + pFtFmt->SetAttr(SwHeaderAndFooterEatSpacingItem( + RES_HEADER_FOOTER_EAT_SPACING, true)); + } + } + + SvxULSpaceItem aUL(rData.nSwUp, rData.nSwLo); // Page-UL setzen + rFmt.SetAttr(aUL); +} + +void rtfSections::SetSegmentToPageDesc(const rtfSection &rSection, + bool bTitlePage, bool bIgnoreCols) +{ + SwPageDesc &rPage = bTitlePage ? *rSection.mpTitlePage : *rSection.mpPage; + +// SetNumberingType(rSection, rPage); + + SwFrmFmt &rFmt = rPage.GetMaster(); +// mrReader.SetDocumentGrid(rFmt, rSection); + + wwULSpaceData aULData; + GetPageULData(rSection, bTitlePage, aULData); + SetPageULSpaceItems(rFmt, aULData); + + SetPage(rPage, rFmt, rSection, bIgnoreCols); +} + +void rtfSections::CopyFrom(const SwPageDesc &rFrom, SwPageDesc &rDest) +{ + UseOnPage ePage = rFrom.ReadUseOn(); + rDest.WriteUseOn(ePage); + mrReader.pDoc->CopyHeader(rFrom.GetMaster(), rDest.GetMaster()); + mrReader.pDoc->CopyHeader(rFrom.GetLeft(), rDest.GetLeft()); + mrReader.pDoc->CopyFooter(rFrom.GetMaster(), rDest.GetMaster()); + mrReader.pDoc->CopyFooter(rFrom.GetLeft(), rDest.GetLeft()); +} + +void rtfSections::SetHdFt(rtfSection &rSection) +{ + ASSERT(rSection.mpPage, "makes no sense to call without a main page"); + if (rSection.mpPage && rSection.maPageInfo.mpPageHdFt) + CopyFrom(*rSection.maPageInfo.mpPageHdFt, *rSection.mpPage); + + if (rSection.mpTitlePage && rSection.maPageInfo.mpTitlePageHdFt) + CopyFrom(*rSection.maPageInfo.mpTitlePageHdFt, *rSection.mpTitlePage); +} + +SwSectionFmt *rtfSections::InsertSection(SwPaM& rMyPaM, rtfSection &rSection) +{ + SwSection aSection(CONTENT_SECTION, mrReader.pDoc->GetUniqueSectionName()); + + SfxItemSet aSet( mrReader.pDoc->GetAttrPool(), aFrmFmtSetRange ); + + sal_uInt8 nRTLPgn = maSegments.empty() ? 0 : maSegments.back().IsBiDi(); + aSet.Put(SvxFrameDirectionItem( + nRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP)); + +#if 0 + if (2 == mrReader.pWDop->fpc) + aSet.Put( SwFmtFtnAtTxtEnd(FTNEND_ATTXTEND)); + if (0 == mrReader.pWDop->epc) + aSet.Put( SwFmtEndAtTxtEnd(FTNEND_ATTXTEND)); +#endif + + rSection.mpSection = mrReader.pDoc->Insert( rMyPaM, aSection, &aSet ); + ASSERT(rSection.mpSection, "section not inserted!"); + if (!rSection.mpSection) + return 0; + + SwPageDesc *pPage = 0; + mySegrIter aEnd = maSegments.rend(); + for (mySegrIter aIter = maSegments.rbegin(); aIter != aEnd; ++aIter) + { + if (pPage = aIter->mpPage) + break; + } + + ASSERT(pPage, "no page outside this section!"); + + if (!pPage) + pPage = &mrReader.pDoc->_GetPageDesc(0); + + if (!pPage) + return 0; + + SwFrmFmt& rFmt = pPage->GetMaster(); + const SwFmtFrmSize& rSz = rFmt.GetFrmSize(); + const SvxLRSpaceItem& rLR = rFmt.GetLRSpace(); + SwTwips nWidth = rSz.GetWidth(); + long nLeft = rLR.GetTxtLeft(); + long nRight = rLR.GetRight(); + + SwSectionFmt *pFmt = rSection.mpSection->GetFmt(); + ASSERT(pFmt, "impossible"); + if (!pFmt) + return 0; + SetCols(*pFmt, rSection, (USHORT)(nWidth - nLeft - nRight) ); + +#if 0 + //Set the columns to be UnBalanced if compatability option is set + if (mrReader.pWDop->fNoColumnBalance ) + { + SwSectionFmt *pFmt = rSection.mpSection->GetFmt(); + pFmt->SetAttr(SwFmtNoBalancedColumns(true)); + } +#endif + + return pFmt; +} + +void rtfSections::InsertSegments(bool bNewDoc) +{ + sal_uInt16 nDesc(0); + mySegIter aEnd = maSegments.end(); + mySegIter aStart = maSegments.begin(); + for (mySegIter aIter = aStart; aIter != aEnd; ++aIter) + { + mySegIter aNext = aIter+1; + + bool bInsertSection = aIter != aStart ? aIter->IsContinous() : false; + + if (!bInsertSection) + { + /* + If a cont section follow this section then we won't be + creating a page desc with 2+ cols as we cannot host a one + col section in a 2+ col pagedesc and make it look like + word. But if the current section actually has columns then + we are forced to insert a section here as well as a page + descriptor. + */ + + /* + Note for the future: + If we want to import "protected sections" the here is + where we would also test for that and force a section + insertion if that was true. + */ + bool bIgnoreCols = false; + if (aNext != aEnd && aNext->IsContinous()) + { + bIgnoreCols = true; + if (aIter->NoCols() > 1) + bInsertSection = true; + } + + if (aIter->HasTitlePage()) + { + if (bNewDoc && aIter == aStart) + { + aIter->mpTitlePage = + mrReader.pDoc->GetPageDescFromPool(RES_POOLPAGE_FIRST); + } + else + { + USHORT nPos = mrReader.pDoc->MakePageDesc( + ViewShell::GetShellRes()->GetPageDescName(nDesc) + , 0, false); + aIter->mpTitlePage = &mrReader.pDoc->_GetPageDesc(nPos); + } + ASSERT(aIter->mpTitlePage, "no page!"); + if (!aIter->mpTitlePage) + continue; + + SetSegmentToPageDesc(*aIter, true, bIgnoreCols); + } + + if (bNewDoc && aIter == aStart) + { + aIter->mpPage = + mrReader.pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD); + } + else + { + USHORT nPos = mrReader.pDoc->MakePageDesc( + ViewShell::GetShellRes()->GetPageDescName(nDesc, + false, aIter->HasTitlePage()), + aIter->mpTitlePage, false); + aIter->mpPage = &mrReader.pDoc->_GetPageDesc(nPos); + } + ASSERT(aIter->mpPage, "no page!"); + if (!aIter->mpPage) + continue; + + SetHdFt(*aIter); + + if (aIter->mpTitlePage) + SetSegmentToPageDesc(*aIter, true, bIgnoreCols); + SetSegmentToPageDesc(*aIter, false, bIgnoreCols); + + SwFmtPageDesc aPgDesc(aIter->HasTitlePage() ? + aIter->mpTitlePage : aIter->mpPage); + + if (aIter->mpTitlePage) + aIter->mpTitlePage->SetFollow(aIter->mpPage); + + if (aIter->PageRestartNo()) + aPgDesc.SetNumOffset(aIter->PageStartAt()); + + /* + If its a table here, apply the pagebreak to the table + properties, otherwise we add it to the para at this + position + */ + if (aIter->maStart.GetNode().IsTableNode()) + { + SwTable& rTable = + aIter->maStart.GetNode().GetTableNode()->GetTable(); + SwFrmFmt* pApply = rTable.GetFrmFmt(); + ASSERT(pApply, "impossible"); + if (pApply) + pApply->SetAttr(aPgDesc); + } + else + { + SwPosition aPamStart(aIter->maStart); + aPamStart.nContent.Assign( + aIter->maStart.GetNode().GetCntntNode(), 0); + SwPaM aPage(aPamStart); + + mrReader.pDoc->Insert(aPage, aPgDesc); + } + ++nDesc; + } + + SwTxtNode* pTxtNd = 0; + if (bInsertSection) + { + SwPaM aSectPaM(*mrReader.pPam); + SwNodeIndex aAnchor(aSectPaM.GetPoint()->nNode); + if (aNext != aEnd) + { + aAnchor = aNext->maStart; + aSectPaM.GetPoint()->nNode = aAnchor; + aSectPaM.GetPoint()->nContent.Assign( + aNext->maStart.GetNode().GetCntntNode(), 0); + aSectPaM.Move(fnMoveBackward); + } + + const SwPosition* pPos = aSectPaM.GetPoint(); + const SwTxtNode* pSttNd = + mrReader.pDoc->GetNodes()[ pPos->nNode ]->GetTxtNode(); + const SwTableNode* pTableNd = pSttNd ? pSttNd->FindTableNode() : 0; + if (pTableNd) + { + pTxtNd = + mrReader.pDoc->GetNodes().MakeTxtNode(aAnchor, + mrReader.pDoc->GetTxtCollFromPool( RES_POOLCOLL_TEXT )); + + aSectPaM.GetPoint()->nNode = SwNodeIndex(*pTxtNd); + aSectPaM.GetPoint()->nContent.Assign( + aSectPaM.GetCntntNode(), 0); + } + + aSectPaM.SetMark(); + + aSectPaM.GetPoint()->nNode = aIter->maStart; + aSectPaM.GetPoint()->nContent.Assign( + aSectPaM.GetCntntNode(), 0); + + SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter); + //The last section if continous is always unbalanced + if (aNext == aEnd && pRet) + pRet->SetAttr(SwFmtNoBalancedColumns(true)); + } + + if (pTxtNd) + { + SwNodeIndex aIdx(*pTxtNd); + SwPosition aPos(aIdx); + SwPaM aTest(aPos); + mrReader.pDoc->DelFullPara(aTest); + pTxtNd = 0; + } + } + + myDummyIter aDEnd = maDummyPageNos.end(); + for (myDummyIter aDummy = maDummyPageNos.begin(); aDummy != aDEnd; ++aDummy) + mrReader.pDoc->DelPageDesc(*aDummy); } SwRTFParser::~SwRTFParser() @@ -605,6 +1097,21 @@ void SwRTFParser::NextToken( int nToken ) break; case RTF_PN: + if( bNewNumList ) + SkipGroup(); + else + { + bStyleTabValid = TRUE; + if (SwNumRule* pRule = ReadNumSecLevel( nToken )) + { + GetAttrSet().Put( SwNumRuleItem( pRule->GetName() )); + + if( SFX_ITEM_SET != GetAttrSet().GetItemState( FN_PARAM_NUM_LEVEL, FALSE )) + GetAttrSet().Put( SfxUInt16Item( FN_PARAM_NUM_LEVEL, 0 )); + } + } + break; + case RTF_PNSECLVL: if( bNewNumList ) SkipGroup(); @@ -634,18 +1141,10 @@ void SwRTFParser::NextToken( int nToken ) break; case RTF_PAGE: - { - const SwCntntNode* pCNd; - const SwAttrSet* pSet; - if( pPam->GetPoint()->nContent.GetIndex() || - ( 0 != ( pCNd = pPam->GetCntntNode()) && - 0 != ( pSet = pCNd->GetpSwAttrSet()) && - ( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, FALSE ) || - SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, FALSE )))) - InsertPara(); - CheckInsNewTblLine(); - pDoc->Insert( *pPam, SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE ) ); - } + if (lcl_UsedPara(*pPam)) + InsertPara(); + CheckInsNewTblLine(); + pDoc->Insert(*pPam, SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE)); break; case RTF_SECT: @@ -982,29 +1481,6 @@ void SwRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) // dann setze ueber diesen Bereich die Attrbiute SetSwgValues( rSet.GetAttrSet() ); - -#if 0 -///!!!!!!!!!!!!!!!!!!!!! - if( !rSet.GetAttrSet().GetParent() ) - { - const SfxItemPool& rPool = pDoc->GetAttrPool(); - SfxItemSet &rAttrSet = rSet.GetAttrSet(); - SfxItemIter aIter( rAttrSet ); - USHORT nWhich = aIter.GetCurItem()->Which(); - while( TRUE ) - { - if( SFX_WHICH_MAX < nWhich || - rPool.GetDefaultItem( nWhich ) == *aIter.GetCurItem() ) - rAttrSet.ClearItem( nWhich ); // loeschen - - if( aIter.IsAtEnd() ) - break; - nWhich = aIter.NextItem()->Which(); - } - } - if( rSet.GetAttrSet().Count() ) -#endif - pDoc->Insert( aPam, rSet.GetAttrSet(), SETATTR_DONTCHGNUMRULE ); } @@ -1050,48 +1526,112 @@ void SwRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) } } +DocPageInformation::DocPageInformation() + : mnPaperw(12240), mnPaperh(15840), mnMargl(1800), mnMargr(1800), + mnMargt(1440), mnMargb(1440), mnGutter(0), mnPgnStart(1), mbFacingp(false), + mbLandscape(false), mbRTLdoc(false) +{ +} -// lese alle Dokument-Controls ein -void SwRTFParser::ReadDocControls( int nToken ) +SectPageInformation::SectPageInformation(const DocPageInformation &rDoc) + : + mpTitlePageHdFt(0), mpPageHdFt(0), + mnPgwsxn(rDoc.mnPaperw), mnPghsxn(rDoc.mnPaperh), + mnMarglsxn(rDoc.mnMargl), mnMargrsxn(rDoc.mnMargr), + mnMargtsxn(rDoc.mnMargt), mnMargbsxn(rDoc.mnMargb), + mnGutterxsn(rDoc.mnGutter), mnHeadery(720), mnFootery(720), mnPgnStarts(1), + mnCols(1), mnColsx(720), mnStextflow(rDoc.mbRTLdoc ? 3 : 0), mnBkc(2), + mbLndscpsxn(rDoc.mbLandscape), mbTitlepg(false), mbFacpgsxn(rDoc.mbFacingp), + mbRTLsection(rDoc.mbRTLdoc), mbPgnrestart(false) { - int bWeiter = TRUE; +}; + +SectPageInformation::SectPageInformation(const SectPageInformation &rSect) + : maColumns(rSect.maColumns), maNumType(rSect.maNumType), + mpTitlePageHdFt(rSect.mpTitlePageHdFt), mpPageHdFt(rSect.mpPageHdFt), + mnPgwsxn(rSect.mnPgwsxn), mnPghsxn(rSect.mnPghsxn), + mnMarglsxn(rSect.mnMarglsxn), mnMargrsxn(rSect.mnMargrsxn), + mnMargtsxn(rSect.mnMargtsxn), mnMargbsxn(rSect.mnMargbsxn), + mnGutterxsn(rSect.mnGutterxsn), mnHeadery(rSect.mnHeadery), + mnFootery(rSect.mnFootery), mnPgnStarts(rSect.mnPgnStarts), + mnCols(rSect.mnCols), mnColsx(rSect.mnColsx), + mnStextflow(rSect.mnStextflow), mnBkc(rSect.mnBkc), + mbLndscpsxn(rSect.mbLndscpsxn), mbTitlepg(rSect.mbTitlepg), + mbFacpgsxn(rSect.mbFacpgsxn), mbRTLsection(rSect.mbRTLsection), + mbPgnrestart(rSect.mbPgnrestart) +{ +}; - SwFmtFrmSize aFrmSize(ATT_FIX_SIZE, 12240, 15840 ); - SvxULSpaceItem aUL; - SvxLRSpaceItem aLR; - SwFtnInfo aFtnInfo; - SwEndNoteInfo aEndInfo; - UseOnPage eUseOn; - USHORT nPgStart = USHRT_MAX; +rtfSection::rtfSection(const SwPosition &rPos, + const SectPageInformation &rPageInfo) + : maStart(rPos.nNode), maPageInfo(rPageInfo), mpSection(0), mpTitlePage(0), + mpPage(0) +{ +} - SvxFrameDirectionItem aFrmDir; - if( bFirstDocControl ) - { - // RTF-Defaults setzen - SwFmtFrmSize aFrmSize(ATT_FIX_SIZE, 12240, 15840 ); +void rtfSections::push_back(const rtfSection &rSect) +{ + if (!maSegments.empty() && (maSegments.back().maStart == rSect.maStart)) + maSegments.pop_back(); + maSegments.push_back(rSect); +} - aUL.SetUpper( 1440 ); aUL.SetLower( 1440 ); - aLR.SetRight( 1800 ); aLR.SetLeft( 1800 ); - eUseOn = UseOnPage(PD_ALL | PD_HEADERSHARE | PD_FOOTERSHARE); - aFtnInfo.ePos = FTNPOS_CHAPTER; aFtnInfo.eNum = FTNNUM_DOC; - bFirstDocControl = FALSE; +// lese alle Dokument-Controls ein +void SwRTFParser::SetPageInformationAsDefault(const DocPageInformation &rInfo) +{ + maSegments.push_back(rtfSection(*pPam->GetPoint(), + SectPageInformation(rInfo))); - aFrmDir.SetValue(FRMDIR_HORI_LEFT_TOP); - } - else + if (!bSwPageDesc && IsNewDoc()) { - const SwPageDesc& rStdPgDsc = pDoc->GetPageDesc( 0 ); - aFrmSize = rStdPgDsc.GetMaster().GetFrmSize(); - aUL = rStdPgDsc.GetMaster().GetULSpace(); - aLR = rStdPgDsc.GetMaster().GetLRSpace(); + SwFmtFrmSize aFrmSize(ATT_FIX_SIZE, rInfo.mnPaperw, rInfo.mnPaperh); - eUseOn = rStdPgDsc.ReadUseOn(); + SvxLRSpaceItem aLR(rInfo.mnMargl, rInfo.mnMargr); + SvxULSpaceItem aUL(rInfo.mnMargt, rInfo.mnMargb); + + UseOnPage eUseOn; + if (rInfo.mbFacingp) + eUseOn = UseOnPage(PD_MIRROR | PD_HEADERSHARE | PD_FOOTERSHARE); + else + eUseOn = UseOnPage(PD_ALL | PD_HEADERSHARE | PD_FOOTERSHARE); - aEndInfo = pDoc->GetEndNoteInfo(); - aFtnInfo = pDoc->GetFtnInfo(); + USHORT nPgStart(rInfo.mnPgnStart); - aFrmDir = rStdPgDsc.GetMaster().GetFrmDir(); + SvxFrameDirectionItem aFrmDir(rInfo.mbRTLdoc ? + FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP); + + // direkt an der Standartseite drehen + SwPageDesc& rPg = pDoc->_GetPageDesc( 0 ); + rPg.WriteUseOn( eUseOn ); + + if (rInfo.mbLandscape) + rPg.SetLandscape(true); + + SwFrmFmt &rFmt1 = rPg.GetMaster(), &rFmt2 = rPg.GetLeft(); + + rFmt1.SetAttr( aFrmSize ); rFmt2.SetAttr( aFrmSize ); + rFmt1.SetAttr( aLR ); rFmt2.SetAttr( aLR ); + rFmt1.SetAttr( aUL ); rFmt2.SetAttr( aUL ); + rFmt1.SetAttr( aFrmDir ); rFmt2.SetAttr( aFrmDir ); + + // StartNummer der Seiten setzen + if (nPgStart != 1) + { + SwFmtPageDesc aPgDsc( &rPg ); + aPgDsc.SetNumOffset( nPgStart ); + pDoc->Insert( *pPam, aPgDsc ); + } } +} + +// lese alle Dokument-Controls ein +void SwRTFParser::ReadDocControls( int nToken ) +{ + int bWeiter = true; + + SwFtnInfo aFtnInfo; + SwEndNoteInfo aEndInfo; + bool bSetHyph = false; BOOL bEndInfoChgd = FALSE, bFtnInfoChgd = FALSE; @@ -1099,46 +1639,45 @@ void SwRTFParser::ReadDocControls( int nToken ) USHORT nValue = USHORT( nTokenValue ); switch( nToken ) { -/* case '}': --nOpenBrakets; nToken = RTF_DOCFMT; break; - case '{': ++nOpenBrakets; nToken = RTF_DOCFMT; break; - case RTF_IGNOREFLAG: nToken = RTF_DOCFMT; break; -*/ - case RTF_RTLDOC: - aFrmDir.SetValue(FRMDIR_HORI_RIGHT_TOP); + maPageDefaults.mbRTLdoc = true; break; case RTF_LTRDOC: - aFrmDir.SetValue(FRMDIR_HORI_LEFT_TOP); + maPageDefaults.mbRTLdoc = false; + break; + case RTF_LANDSCAPE: + maPageDefaults.mbLandscape = true; break; case RTF_PAPERW: if( 0 < nTokenValue ) - aFrmSize.SetWidth( nTokenValue ); + maPageDefaults.mnPaperw = nTokenValue; break; case RTF_PAPERH: if( 0 < nTokenValue ) - aFrmSize.SetHeight( nTokenValue ); + maPageDefaults.mnPaperh = nTokenValue; break; case RTF_MARGL: if( 0 <= nTokenValue ) - aLR.SetLeft( nValue ); + maPageDefaults.mnMargl = nTokenValue; break; case RTF_MARGR: if( 0 <= nTokenValue ) - aLR.SetRight( nValue ); + maPageDefaults.mnMargr = nTokenValue; break; case RTF_MARGT: if( 0 <= nTokenValue ) - aUL.SetUpper( nValue ); + maPageDefaults.mnMargt = nTokenValue; break; case RTF_MARGB: if( 0 <= nTokenValue ) - aUL.SetLower( nValue ); + maPageDefaults.mnMargb = nTokenValue; + break; + case RTF_FACINGP: + maPageDefaults.mbFacingp = true; + break; + case RTF_PGNSTART: + maPageDefaults.mnPgnStart = nTokenValue; break; - - case RTF_FACINGP: eUseOn = UseOnPage(PD_MIRROR | PD_HEADERSHARE | PD_FOOTERSHARE); - break; - case RTF_PGNSTART: nPgStart = nValue; break; - case RTF_ENDDOC: case RTF_ENDNOTES: aFtnInfo.ePos = FTNPOS_CHAPTER; bFtnInfoChgd = TRUE; @@ -1196,16 +1735,30 @@ void SwRTFParser::ReadDocControls( int nToken ) case RTF_AFTNNAR: aEndInfo.aFmt.SetNumberingType(SVX_NUM_ARABIC); bEndInfoChgd = TRUE; break; case RTF_AFTNNALC: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); bEndInfoChgd = TRUE; break; + aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); + bEndInfoChgd = TRUE; + break; case RTF_AFTNNAUC: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); bEndInfoChgd = TRUE; break; + aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); + bEndInfoChgd = TRUE; + break; case RTF_AFTNNRLC: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER); bEndInfoChgd = TRUE; break; + aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER); + bEndInfoChgd = TRUE; + break; case RTF_AFTNNRUC: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER); bEndInfoChgd = TRUE; break; + aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER); + bEndInfoChgd = TRUE; + break; case RTF_AFTNNCHI: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); bEndInfoChgd = TRUE; break; - + aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); + bEndInfoChgd = TRUE; + break; + case RTF_HYPHAUTO: + if (nTokenValue) + bSetHyph = true; + //FOO// + break; case '{': { short nSkip = 0; @@ -1240,7 +1793,7 @@ void SwRTFParser::ReadDocControls( int nToken ) nToken = GetNextToken(); } while( bWeiter && IsParserWorking() ); - if( IsNewDoc() ) + if (IsNewDoc()) { if( bEndInfoChgd ) pDoc->SetEndNoteInfo( aEndInfo ); @@ -1248,45 +1801,32 @@ void SwRTFParser::ReadDocControls( int nToken ) pDoc->SetFtnInfo( aFtnInfo ); } - if( !bSwPageDesc ) + if (!bSwPageDesc) { - if( IsNewDoc() ) + SetPageInformationAsDefault(maPageDefaults); + + MakeStyleTab(); + + SwTxtFmtColl* pColl = aTxtCollTbl.Get(0); + if (!pColl) { - // direkt an der Standartseite drehen - SwPageDesc& rPg = pDoc->_GetPageDesc( 0 ); - rPg.WriteUseOn( eUseOn ); - SwFrmFmt &rFmt1 = rPg.GetMaster(), &rFmt2 = rPg.GetLeft(); + pColl = pDoc->GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD, + FALSE ); + } - rFmt1.SetAttr( aFrmSize ); rFmt2.SetAttr( aFrmSize ); - rFmt1.SetAttr( aLR ); rFmt2.SetAttr( aLR ); - rFmt1.SetAttr( aUL ); rFmt2.SetAttr( aUL ); - rFmt1.SetAttr( aFrmDir ); rFmt2.SetAttr( aFrmDir ); + ASSERT(pColl, "impossible to have no standard style"); - // StartNummer der Seiten setzen - if( USHRT_MAX != nPgStart ) + if (pColl) + { + if ( + IsNewDoc() && bSetHyph && + SFX_ITEM_SET != pColl->GetItemState(RES_PARATR_HYPHENZONE, + false) + ) { - SwFmtPageDesc* pCurPgDsc = GetCurrentPageDesc(pPam); - if(pCurPgDsc) - { - pCurPgDsc->SetNumOffset( nPgStart ); - } - else - { - SwFmtPageDesc aPgDsc( &rPg ); - aPgDsc.SetNumOffset( nPgStart ); - pDoc->Insert( *pPam, aPgDsc ); - } + pColl->SetAttr(SvxHyphenZoneItem(true)); } - } - MakeStyleTab(); - // das default-Style schon gleich am ersten Node setzen -// if( IsNewDoc() ) - { - SwTxtFmtColl* pColl = aTxtCollTbl.Get( 0 ); - if( !pColl ) - pColl = pDoc->GetTxtCollFromPoolSimple( RES_POOLCOLL_STANDARD, - FALSE ); pDoc->SetTxtFmtColl( *pPam, pColl ); } } @@ -1450,892 +1990,301 @@ SwFmtPageDesc* SwRTFParser::GetCurrentPageDesc(SwPaM *pPam) return aFmtPageDsc; } -// lese alle Section-Controls ein -void SwRTFParser::ReadSectControls( int nToken ) +void SwRTFParser::DoHairyWriterPageDesc(int nToken) { int bWeiter = TRUE; - - // werden die eigenen PageDesc - Informationen gelesen, dann alles - // ueberlesen - // Wird in ein bestehendes Doc eingelesen oder wurden eigene PageDesc - // gelesen, dann sind nur die Bereiche von interresse - BOOL bInsPageDesc = IsNewDoc() && !bSwPageDesc; - - if( bInPgDscTbl ) - { - do { - if( '{' == nToken ) + do { + if( '{' == nToken ) + { + switch( nToken = GetNextToken() ) { - switch( nToken = GetNextToken() ) + case RTF_IGNOREFLAG: + if( RTF_SECTFMT != (( nToken = GetNextToken() ) + & ~(0xff | RTF_SWGDEFS)) ) { - case RTF_IGNOREFLAG: - if( RTF_SECTFMT != (( nToken = GetNextToken() ) - & ~(0xff | RTF_SWGDEFS)) ) - { - SkipToken( -2 ); // Ignore und Token wieder zurueck - bWeiter = FALSE; - break; - } - // kein break, Gruppe ueberspringen - - case RTF_FOOTER: - case RTF_HEADER: - case RTF_FOOTERR: - case RTF_HEADERR: - case RTF_FOOTERL: - case RTF_HEADERL: - case RTF_FOOTERF: - case RTF_HEADERF: - SkipGroup(); // erstmal komplett ueberlesen - // ueberlese noch die schliessende Klammer - GetNextToken(); - break; - - default: - SkipToken( -1 ); // Ignore wieder zurueck + SkipToken( -2 ); // Ignore und Token wieder zurueck bWeiter = FALSE; break; } - } - else if( RTF_SECTFMT == (nToken & ~(0xff | RTF_SWGDEFS)) || - RTF_UNKNOWNCONTROL == nToken ) - SvxRTFParser::NextToken( nToken ); - else - bWeiter = FALSE; - if( bWeiter ) - nToken = GetNextToken(); - } while( bWeiter && IsParserWorking() ); - SkipToken( -1 ); // letztes Token wieder zurueck - return; - } - - // RTF-Defaults setzen - BOOL bFirstCall = 1 == pDoc->GetPageDescCnt(); - BOOL bHeaderUL = FALSE, bHeaderLR = FALSE, - bFooterUL = FALSE, bFooterLR = FALSE; - bool bIsRTL=false; - - USHORT nLastPageDesc = nAktPageDesc, - nLastFirstPageDesc = nAktFirstPageDesc; + // kein break, Gruppe ueberspringen + + case RTF_FOOTER: + case RTF_HEADER: + case RTF_FOOTERR: + case RTF_HEADERR: + case RTF_FOOTERL: + case RTF_HEADERL: + case RTF_FOOTERF: + case RTF_HEADERF: + SkipGroup(); // erstmal komplett ueberlesen + // ueberlese noch die schliessende Klammer + GetNextToken(); + break; - BOOL bMakeNewPageDesc = RTF_SECT == nToken; - BOOL bInsNewPageDesc = bMakeNewPageDesc || bFirstCall || bSwPageDesc; - SwPageDesc* pAkt, *pFirst = 0; - if( bInsNewPageDesc ) - { - pAkt = _MakeNewPageDesc( FALSE ); - if( bMakeNewPageDesc ) - { - nToken = GetNextToken(); - // some export filter write the RTF_SECT in brakets -> skip over - while( '}' == nToken ) - { - NextToken( nToken ); - nToken = GetNextToken(); + default: + SkipToken( -1 ); // Ignore wieder zurueck + bWeiter = FALSE; + break; } } - } - else - { - pAkt = &pDoc->_GetPageDesc( nAktPageDesc ); - if( nAktFirstPageDesc ) - pFirst = &pDoc->_GetPageDesc( nAktFirstPageDesc ); - } - - SwFmtFrmSize aSz( pAkt->GetMaster().GetFrmSize() ), aHSz( ATT_MIN_SIZE ); - SvxULSpaceItem aUL( pAkt->GetMaster().GetULSpace() ), aHUL, aFUL; - SvxLRSpaceItem aLR( pAkt->GetMaster().GetLRSpace() ), aHLR, aFLR; - BOOL bPgWiChgd = FALSE, bPgHeChgd = FALSE, - bPgUpChgd = FALSE, bPgLoChgd = FALSE, - bPgLeChgd = FALSE, bPgRiChgd = FALSE, - bPgFcChgd = FALSE, - bNoBalancedCols = FALSE; + else if( RTF_SECTFMT == (nToken & ~(0xff | RTF_SWGDEFS)) || + RTF_UNKNOWNCONTROL == nToken ) + SvxRTFParser::NextToken( nToken ); + else + bWeiter = FALSE; + if( bWeiter ) + nToken = GetNextToken(); + } while( bWeiter && IsParserWorking() ); + SkipToken( -1 ); // letztes Token wieder zurueck + return; +} +void SwRTFParser::ReadSectControls( int nToken ) +{ + AttrGroupEnd(); //#106493# - USHORT nRestoreUpper = USHRT_MAX, nRestoreLower = USHRT_MAX; - SwFrmFmt* pFmt = (SwFrmFmt*)pAkt->GetMaster().GetHeader().GetHeaderFmt(); - if( pFmt ) + //this is some hairy stuff to try and retain writer style page descriptors + //in rtf, almost certainy a bad idea, but we've inherited it, so here it + //stays + if (bInPgDscTbl) { - aHUL = pFmt->GetULSpace(); - aHLR = pFmt->GetLRSpace(); - aHSz = pFmt->GetFrmSize(); - if( aHSz.GetHeight() ) - { - nRestoreUpper = (USHORT)aHSz.GetHeight(); - aUL.SetUpper( aUL.GetUpper() + nRestoreUpper ); - aHSz.SetHeight( 0 ); - } + DoHairyWriterPageDesc(nToken); + return; } - if( 0 != (pFmt = (SwFrmFmt*)pAkt->GetMaster().GetFooter().GetFooterFmt()) ) + ASSERT(!maSegments.empty(), "suspicious to have a section with no " + "page info, though probably legal"); + if (maSegments.empty()) { - aFUL = pFmt->GetULSpace(); - aFLR = pFmt->GetLRSpace(); - if( aFUL.GetUpper() ) - { - nRestoreLower = aFUL.GetUpper(); - aUL.SetLower( aUL.GetLower() + nRestoreLower ); - aFUL.SetUpper( 0 ); - } + maSegments.push_back(rtfSection(*pPam->GetPoint(), + SectPageInformation(maPageDefaults))); } - BOOL bCheckEqualPgDesc = TRUE, bPgDescChgd = FALSE; - SvxBreak eBreak = SVX_BREAK_PAGE_BEFORE; - - USHORT nCols = USHRT_MAX, nColSpace = USHRT_MAX, nAktCol = 0; - SvUShorts aColumns; - - USHORT nPgStart = USHRT_MAX; - SvxNumberType aNumType; - - SvxFrameDirectionItem aFrmDir(FRMDIR_HORI_LEFT_TOP); + SectPageInformation aNewSection(maSegments.back().maPageInfo); + int bWeiter = true; do { - BOOL bIsSectToken = FALSE; + bool bIsSectToken = false; USHORT nValue = USHORT( nTokenValue ); switch( nToken ) { - case RTF_SECT: - bWeiter = FALSE; - break; - - case RTF_SECTD: - { - // Wert von der StandardPage holen ! - const SwFrmFmt& rFmt = pDoc->GetPageDesc(0).GetMaster(); - aSz = rFmt.GetFrmSize(); - aUL = rFmt.GetULSpace(); - aLR = rFmt.GetLRSpace(); - - nRestoreUpper = USHRT_MAX, nRestoreLower = USHRT_MAX; - aHUL.SetUpper( 720 ); aHUL.SetLower( 0 ); - aFUL.SetUpper( 0 ); aFUL.SetLower( 720 ); - aHLR.SetLeft( 0 ); aHLR.SetRight( 0 ); - aFLR.SetLeft( 0 ); aFLR.SetRight( 0 ); - pAkt->WriteUseOn( UseOnPage(PD_ALL | PD_HEADERSHARE | PD_FOOTERSHARE) ); - pAkt->SetLandscape( FALSE ); - aFrmDir.SetValue( FRMDIR_HORI_LEFT_TOP ); - - // remove Columns/Header/Footer - pAkt->GetMaster().ResetAttr( RES_COL ); - if( pFirst ) - pFirst->GetMaster().ResetAttr( RES_COL ); - - nPgStart = USHRT_MAX; - - SwFmtPageDesc* pCurPgDsc = GetCurrentPageDesc(pPam); - if(pCurPgDsc) + case RTF_SECT: +// bWeiter = false; + break; + case RTF_SECTD: + //Reset to page defaults + aNewSection = SectPageInformation(maPageDefaults); + break; + case RTF_PGWSXN: + if (0 < nTokenValue) + aNewSection.mnPgwsxn = nTokenValue; + break; + case RTF_PGHSXN: + if (0 < nTokenValue) + aNewSection.mnPghsxn = nTokenValue; + break; + case RTF_MARGLSXN: + if (0 <= nTokenValue) + aNewSection.mnMarglsxn = nTokenValue; + break; + case RTF_MARGRSXN: + if (0 <= nTokenValue) + aNewSection.mnMargrsxn = nTokenValue; + break; + case RTF_MARGTSXN: + if (0 <= nTokenValue) + aNewSection.mnMargtsxn = nTokenValue; + break; + case RTF_MARGBSXN: + if (0 <= nTokenValue) + aNewSection.mnMargbsxn = nTokenValue; + break; + case RTF_FACPGSXN: + aNewSection.mbFacpgsxn = true; + break; + case RTF_HEADERY: + aNewSection.mnHeadery = nTokenValue; + break; + case RTF_FOOTERY: + aNewSection.mnFootery = nTokenValue; + break; + case RTF_LNDSCPSXN: + aNewSection.mbLndscpsxn = true; + break; + case RTF_PGNSTARTS: + aNewSection.mnPgnStarts = nTokenValue; + break; + case RTF_PGNDEC: + aNewSection.maNumType.SetNumberingType(SVX_NUM_ARABIC); + break; + case RTF_PGNUCRM: + aNewSection.maNumType.SetNumberingType(SVX_NUM_ROMAN_UPPER); + break; + case RTF_PGNLCRM: + aNewSection.maNumType.SetNumberingType(SVX_NUM_ROMAN_LOWER); + break; + case RTF_PGNUCLTR: + aNewSection.maNumType.SetNumberingType( + SVX_NUM_CHARS_UPPER_LETTER_N); + break; + case RTF_PGNLCLTR: + aNewSection.maNumType.SetNumberingType( + SVX_NUM_CHARS_LOWER_LETTER_N); + break; + case RTF_SBKNONE: + aNewSection.mnBkc = 0; + break; + case RTF_SBKCOL: + aNewSection.mnBkc = 1; + break; + case RTF_ENDNHERE: + case RTF_BINFSXN: + case RTF_BINSXN: + case RTF_SBKPAGE: + case RTF_SBKEVEN: + case RTF_SBKODD: + case RTF_LINEBETCOL: + case RTF_LINEMOD: + case RTF_LINEX: + case RTF_LINESTARTS: + case RTF_LINERESTART: + case RTF_LINEPAGE: + case RTF_LINECONT: + case RTF_GUTTERSXN: + case RTF_PGNCONT: + case RTF_PGNRESTART: + case RTF_PGNX: + case RTF_PGNY: + case RTF_VERTALT: + case RTF_VERTALB: + case RTF_VERTALC: + case RTF_VERTALJ: + break; + case RTF_TITLEPG: + aNewSection.mbTitlepg = true; + break; + case RTF_HEADER: + case RTF_HEADERL: + case RTF_HEADERR: + case RTF_FOOTER: + case RTF_FOOTERL: + case RTF_FOOTERR: + if (!aNewSection.mpPageHdFt) { - nPgStart = pCurPgDsc->GetNumOffset(); + String aName(RTL_CONSTASCII_STRINGPARAM("rtfHdFt")); + aName += String::CreateFromInt32(maSegments.size()); + sal_uInt16 nPageNo = pDoc->MakePageDesc(aName); + aNewSection.mpPageHdFt = &pDoc->_GetPageDesc(nPageNo); + maSegments.maDummyPageNos.push_back(nPageNo); } - - nCols = USHRT_MAX; - nColSpace = USHRT_MAX; - aNumType.SetNumberingType(SVX_NUM_ARABIC); - bHeaderUL = bHeaderLR = bFooterUL = bFooterLR = TRUE; - eBreak = SVX_BREAK_PAGE_BEFORE; - nNewNumSectDef = USHRT_MAX; - - bPgWiChgd = bPgHeChgd = bPgUpChgd = bPgLoChgd = bPgLeChgd = - bPgRiChgd = bPgFcChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_PGWSXN: - if( 0 < nTokenValue ) - { - aSz.SetWidth( nTokenValue ); - bPgWiChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_PGHSXN: - if( 0 < nTokenValue ) - { - aSz.SetHeight( nTokenValue ); - bPgHeChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - case RTF_MARGLSXN: - if( 0 <= nTokenValue ) - { - aLR.SetLeft( nValue ); - bPgLeChgd =TRUE; - bPgDescChgd = TRUE; - } - break; - case RTF_MARGRSXN: - if( 0 <= nTokenValue ) - { - aLR.SetRight( nValue ); - bPgRiChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_MARGTSXN: - if( 0 <= nTokenValue ) - { - nRestoreUpper = USHRT_MAX; - aUL.SetUpper( nValue ); - bPgUpChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_MARGBSXN: - if( 0 <= nTokenValue ) - { - nRestoreLower = USHRT_MAX; - aUL.SetLower( nValue ); - bPgLoChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_FACPGSXN: - pAkt->SetUseOn( UseOnPage(PD_MIRROR | ( pAkt->GetUseOn() & - ~(PD_HEADERSHARE | PD_FOOTERSHARE) ))); - bPgDescChgd = TRUE; - break; - - case RTF_HEADERY: - aHUL.SetUpper( nValue ); - bHeaderUL = TRUE; - bPgDescChgd = TRUE; - break; - - case RTF_FOOTERY: - aFUL.SetLower( nValue ); - bFooterUL = TRUE; - bPgDescChgd = TRUE; - break; - - case RTF_LNDSCPSXN: - pAkt->SetLandscape( TRUE ); - bPgFcChgd = TRUE; - bPgDescChgd = TRUE; - break; - - case RTF_PGNSTARTS: - nPgStart = nValue; - bPgDescChgd = TRUE; - break; - - case RTF_PGNDEC: - aNumType.SetNumberingType(SVX_NUM_ARABIC); - bPgDescChgd = TRUE; - break; - case RTF_PGNUCRM: - aNumType.SetNumberingType(SVX_NUM_ROMAN_UPPER); - bPgDescChgd = TRUE; - break; - case RTF_PGNLCRM: - aNumType.SetNumberingType(SVX_NUM_ROMAN_LOWER); - bPgDescChgd = TRUE; - break; - case RTF_PGNUCLTR: - aNumType.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); - bPgDescChgd = TRUE; - break; - case RTF_PGNLCLTR: - aNumType.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); - bPgDescChgd = TRUE; - break; - - case RTF_SBKNONE: - bIsSectToken = TRUE; - eBreak = SVX_BREAK_NONE; - bPgDescChgd = !bFirstCall; - break; - - case RTF_SBKCOL: - eBreak = SVX_BREAK_COLUMN_BEFORE; - bPgDescChgd = TRUE; - break; - - case RTF_ENDNHERE: - case RTF_BINFSXN: - case RTF_BINSXN: - case RTF_SBKPAGE: - case RTF_SBKEVEN: - case RTF_SBKODD: - case RTF_LINEBETCOL: - case RTF_LINEMOD: - case RTF_LINEX: - case RTF_LINESTARTS: - case RTF_LINERESTART: - case RTF_LINEPAGE: - case RTF_LINECONT: - case RTF_GUTTERSXN: - case RTF_PGNCONT: - case RTF_PGNRESTART: - case RTF_PGNX: - case RTF_PGNY: - case RTF_VERTALT: - case RTF_VERTALB: - case RTF_VERTALC: - case RTF_VERTALJ: - break; - - case RTF_TITLEPG: - if( bInsPageDesc && !pFirst ) - pFirst = _MakeNewPageDesc( TRUE ); - bCheckEqualPgDesc = FALSE; - bPgDescChgd = TRUE; - break; - - case RTF_HEADER: - case RTF_HEADERL: - case RTF_HEADERR: - case RTF_FOOTER: - case RTF_FOOTERL: - case RTF_FOOTERR: - if( bInsPageDesc ) - ReadHeaderFooter( nToken, pAkt ); - else - SkipGroup(), GetNextToken(); //Gruppe mit schl. Klammer lesen - bCheckEqualPgDesc = FALSE; - bPgDescChgd = TRUE; - break; - - case RTF_FOOTERF: - case RTF_HEADERF: - if( bInsPageDesc ) - { - if( !pFirst ) - pFirst = _MakeNewPageDesc( TRUE ); - ReadHeaderFooter( nToken, pFirst ); - } - else - SkipGroup(), GetNextToken(); //Gruppe mit schl. Klammer lesen - bCheckEqualPgDesc = FALSE; - bPgDescChgd = TRUE; - break; - - case RTF_COLS: - bIsSectToken = TRUE; - nCols = nValue; - bPgDescChgd = TRUE; - break; - - case RTF_COLSX: - bIsSectToken = TRUE; - nColSpace = nValue; - bPgDescChgd = TRUE; - break; - - case RTF_COLNO: - bIsSectToken = TRUE; - nAktCol = nValue; - if( RTF_COLW == GetNextToken() ) - { - USHORT nWidth = USHORT( nTokenValue ), nSpace = 0; - if( RTF_COLSR == GetNextToken() ) - nSpace = USHORT( nTokenValue ); - else - SkipToken( -1 ); // wieder zurueck - - if( --nAktCol == ( aColumns.Count() / 2 ) ) + ReadHeaderFooter(nToken, aNewSection.mpPageHdFt); + break; + case RTF_FOOTERF: + case RTF_HEADERF: + if (!aNewSection.mpTitlePageHdFt) { - aColumns.Insert( nWidth, aColumns.Count() ); - aColumns.Insert( nSpace, aColumns.Count() ); + String aTitle(RTL_CONSTASCII_STRINGPARAM("rtfTitleHdFt")); + aTitle += String::CreateFromInt32(maSegments.size()); + sal_uInt16 nPageNo = pDoc->MakePageDesc(aTitle); + aNewSection.mpTitlePageHdFt = &pDoc->_GetPageDesc(nPageNo); + maSegments.maDummyPageNos.push_back(nPageNo); } - } - bPgDescChgd = TRUE; - break; - - case RTF_STEXTFLOW: - switch( nValue ) - { - case 0: // Text flows left to right and top to bottom - aFrmDir.SetValue( FRMDIR_HORI_LEFT_TOP ); - bPgDescChgd = TRUE; + ReadHeaderFooter(nToken, aNewSection.mpTitlePageHdFt); break; - case 1: // Text flows top to bottom and right to left, vertical - case 5: // Text flows vertically, non-vertical font - aFrmDir.SetValue( FRMDIR_VERT_TOP_RIGHT ); - bPgDescChgd = TRUE; + case RTF_COLS: + aNewSection.mnCols = nTokenValue; break; -// case 2: // Text flows left to right and bottom to top -// aFrmDir.SetValue( ?? ); break; - case 3: // Text flows right to left and top to bottom - aFrmDir.SetValue( FRMDIR_HORI_RIGHT_TOP ); - bPgDescChgd = TRUE; + case RTF_COLSX: + aNewSection.mnColsx = nTokenValue; break; - case 4: // Text flows left to right and top to bottom, vertical - aFrmDir.SetValue( FRMDIR_VERT_TOP_LEFT ); - bPgDescChgd = TRUE; - break; - } - break; - - case RTF_RTLSECT: - bIsRTL=true; - bPgDescChgd = TRUE; - break; - - case RTF_LTRSECT: - bIsRTL=false; - bPgDescChgd = TRUE; - break; - - case '{': - { - short nSkip = 0; - if( RTF_IGNOREFLAG != ( nToken = GetNextToken() )) - nSkip = -1; - else if( RTF_SECTFMT != (( nToken = GetNextToken() ) - & ~(0xff | RTF_SWGDEFS)) && - ( RTF_DOCFMT != ( nToken & ~(0xff | RTF_SWGDEFS))) ) - nSkip = -2; - else + case RTF_COLNO: { - bPgDescChgd = TRUE; - switch( nToken ) + long nAktCol = nValue; + if (RTF_COLW == GetNextToken()) { - case RTF_HEADER_YB: - aHUL.SetLower( USHORT(nTokenValue) ); - bHeaderUL = TRUE; - if( RTF_HEADER_XL == GetNextToken() && - RTF_HEADER_XR == GetNextToken() ) - { - bHeaderLR = TRUE; - aHLR.SetLeft( USHORT(GetStackPtr( -1 )->nTokenValue) ); - aHLR.SetRight( USHORT(nTokenValue)); - } + long nWidth = nTokenValue, nSpace = 0; + if( RTF_COLSR == GetNextToken() ) + nSpace = nTokenValue; else - SkipGroup(); - break; - - case RTF_FOOTER_YT: - aFUL.SetUpper( USHORT(nTokenValue)); - bFooterUL = TRUE; - if( RTF_FOOTER_XL == GetNextToken() && - RTF_FOOTER_XR == GetNextToken() ) + SkipToken( -1 ); // wieder zurueck + + if (--nAktCol == (aNewSection.maColumns.size() / 2 )) { - bFooterLR = TRUE; - aFLR.SetLeft( USHORT(GetStackPtr( -1 )->nTokenValue) ); - aFLR.SetRight( USHORT(nTokenValue)); + aNewSection.maColumns.push_back(nWidth); + aNewSection.maColumns.push_back(nSpace); } - else - SkipGroup(); - break; - - case RTF_BALANCED_COLUMN: - bIsSectToken = TRUE; - bPgDescChgd = TRUE; - bNoBalancedCols = TRUE; - break; - - default: - SkipGroup(); // erstmal komplett ueberlesen - break; } - - // ueberlese noch die schliessende Klammer - GetNextToken(); } - if( nSkip ) + break; + case RTF_STEXTFLOW: + aNewSection.mnStextflow = nTokenValue; + break; + case RTF_RTLSECT: + aNewSection.mbRTLsection = true; + break; + case RTF_LTRSECT: + aNewSection.mbRTLsection = false; + break; + case '{': { - bWeiter = -1 == nSkip && ( - RTF_FOOTER == nToken || RTF_HEADER == nToken || - RTF_FOOTERR == nToken || RTF_HEADERR == nToken || - RTF_FOOTERL == nToken || RTF_HEADERL == nToken || - RTF_FOOTERF == nToken || RTF_HEADERF == nToken ); - SkipToken( nSkip ); // Ignore wieder zurueck + short nSkip = 0; + if( RTF_IGNOREFLAG != ( nToken = GetNextToken() )) + nSkip = -1; + else if( RTF_SECTFMT != (( nToken = GetNextToken() ) + & ~(0xff | RTF_SWGDEFS)) && + ( RTF_DOCFMT != ( nToken & ~(0xff | RTF_SWGDEFS))) ) + nSkip = -2; + else + { + // erstmal komplett ueberlesen + SkipGroup(); + // ueberlese noch die schliessende Klammer + GetNextToken(); + } + if (nSkip) + { + bWeiter = ((-1 == nSkip) && + ( + RTF_FOOTER == nToken || RTF_HEADER == nToken || + RTF_FOOTERR == nToken || RTF_HEADERR == nToken || + RTF_FOOTERL == nToken || RTF_HEADERL == nToken || + RTF_FOOTERF == nToken || RTF_HEADERF == nToken + )); + SkipToken (nSkip); // Ignore wieder zurueck + } } - } - break; - - case RTF_PAPERW: - case RTF_PAPERH: - case RTF_MARGL: - case RTF_MARGR: - case RTF_MARGT: - case RTF_MARGB: - case RTF_FACINGP: - { - ReadDocControls( nToken ); - - // set the new Values - const SwPageDesc& rStdPgDsc = pDoc->GetPageDesc( 0 ); - const SwFmtFrmSize& rSz = rStdPgDsc.GetMaster().GetFrmSize(); - const SvxULSpaceItem rUL = rStdPgDsc.GetMaster().GetULSpace(); - const SvxLRSpaceItem rLR = rStdPgDsc.GetMaster().GetLRSpace(); - - if( !bPgWiChgd ) aSz.SetWidth( rSz.GetWidth() ); - if( !bPgHeChgd ) aSz.SetHeight( rSz.GetHeight() ); - if( !bPgUpChgd ) aUL.SetUpper( rUL.GetUpper() ); - if( !bPgLoChgd ) aUL.SetLower( rUL.GetLower() ); - if( !bPgLeChgd ) aLR.SetLeft( rLR.GetLeft() ); - if( !bPgRiChgd ) aLR.SetRight( rLR.GetRight() ); - if( !bPgFcChgd ) pAkt->SetLandscape( rStdPgDsc.GetLandscape() ); - } - break; - default: - if( RTF_DOCFMT == (nToken & ~(0xff | RTF_SWGDEFS)) ) + break; + case RTF_PAPERW: + case RTF_PAPERH: + case RTF_MARGL: + case RTF_MARGR: + case RTF_MARGT: + case RTF_MARGB: + case RTF_FACINGP: + ASSERT(!this, "why are these tokens found in this section?"); ReadDocControls( nToken ); - else if( RTF_SECTFMT == (nToken & ~(0xff | RTF_SWGDEFS)) || - RTF_UNKNOWNCONTROL == nToken ) - SvxRTFParser::NextToken( nToken ); - else - bWeiter = FALSE; - break; - } - - - if( bWeiter ) - { - // kein eigener Bereich und kein Section Attribut? - if( !bInsPageDesc && !bIsSectToken ) - bCheckEqualPgDesc = FALSE; - nToken = GetNextToken(); - } - } while( bWeiter && IsParserWorking() ); - - - if( !bPgDescChgd ) - { - // der aktuelle muss wieder entnfernt werden - if( bInsNewPageDesc ) - { - pDoc->DelPageDesc( nAktPageDesc ); - if( pFirst ) - pDoc->DelPageDesc( nAktFirstPageDesc ); - nAktPageDesc = nLastPageDesc; - nAktFirstPageDesc = nLastFirstPageDesc; - } - SkipToken( -1 ); - return ; - } - - - // den letzen Bereich wieder zumachen - if( pRegionEndIdx ) - { - DelLastNode(); - pPam->GetPoint()->nNode = *pRegionEndIdx; - pPam->Move( fnMoveForward, fnGoNode ); - delete pRegionEndIdx, pRegionEndIdx = 0; - } - - - pFmt = &pAkt->GetMaster(); - - if (bInsPageDesc) - { - if( bHeaderUL ) - { - if( aUL.GetUpper() > aHUL.GetUpper() ) - { - aHSz.SetHeight( aUL.GetUpper() - aHUL.GetUpper() ); - aHUL.SetUpper( 0 ); - aUL.SetUpper( USHORT(aUL.GetUpper() - aHSz.GetHeight()) ); - - if( !pFmt->GetHeader().GetHeaderFmt() ) - pFmt->SetAttr( SwFmtHeader( (BOOL)TRUE )); - if( pFirst && !pFirst->GetMaster().GetHeader().GetHeaderFmt() ) - pFirst->GetMaster().SetAttr( SwFmtHeader( (BOOL)TRUE )); - } - } - else if( USHRT_MAX != nRestoreUpper ) - aUL.SetUpper( aUL.GetUpper() - nRestoreUpper ); - - if( bFooterUL ) - { - if( aUL.GetLower() > aFUL.GetLower() ) - { - aFUL.SetUpper( aUL.GetLower() - aFUL.GetLower() ); - aUL.SetLower( aFUL.GetLower() ); - aFUL.SetLower( 0 ); - if( !pFmt->GetFooter().GetFooterFmt() ) - pFmt->SetAttr( SwFmtFooter( (BOOL)TRUE )); - if( pFirst && !pFirst->GetMaster().GetFooter().GetFooterFmt() ) - pFirst->GetMaster().SetAttr( SwFmtFooter( (BOOL)TRUE )); - } - else - { - aUL.SetLower( aFUL.GetLower() ); - aFUL.SetLower( 0 ); - } - } - else if( USHRT_MAX != nRestoreLower ) - aUL.SetLower( aUL.GetLower() - nRestoreLower ); - - pFmt->SetAttr( aSz ); - pFmt->SetAttr( aLR ); - pFmt->SetAttr( aUL ); - - if (bIsRTL && aFrmDir.GetValue() == FRMDIR_HORI_LEFT_TOP) - aFrmDir.SetValue(FRMDIR_HORI_RIGHT_TOP); - - pFmt->SetAttr( aFrmDir ); - - pAkt->SetNumType( aNumType ); - if( pFirst ) - pFirst->SetNumType( aNumType ); - - if( ( bHeaderUL || bHeaderLR ) && - 0 != (pFmt = (SwFrmFmt*)pAkt->GetMaster().GetHeader().GetHeaderFmt()) ) - { - if( bHeaderUL && aHSz.GetHeight() ) pFmt->SetAttr( aHSz ); - if( bHeaderLR ) pFmt->SetAttr( aHLR ); - } - - if( ( bFooterUL || bFooterLR ) && - 0 != ( pFmt = (SwFrmFmt*)pAkt->GetMaster().GetFooter().GetFooterFmt()) ) - { - if( bFooterUL ) pFmt->SetAttr( aFUL ); - if( bFooterLR ) pFmt->SetAttr( aFLR ); - } - } - - - if( nCols && USHRT_MAX != nCols ) - { - if( ::lcl_SetFmtCol( pAkt->GetMaster(), nCols, nColSpace, aColumns ) - && pFirst ) - pFirst->GetMaster().SetAttr( pAkt->GetMaster().GetAttr( RES_COL )); - - //JP 19.03.99 - Spaltigkeit NIE an der Seite setzen - dieses - // ist immer ein Kennzeichen fuer einen Bereich, weil - // die Seitenspalten NIE vom Layout aufgebrochen werden. - //JP 24.02.00 - but dont insert column section into a column page - // Bug 73480 - if( bSwPageDesc ) - { - const SwPageDesc& rOld = pDoc->GetPageDesc( nLastPageDesc ); - if( rOld.GetMaster().GetAttr( RES_COL ) != - pAkt->GetMaster().GetAttr( RES_COL ) ) - { - bCheckEqualPgDesc = TRUE; - bInsPageDesc = FALSE; - eBreak = SVX_BREAK_NONE; - -// !! ???? muss das hier passieren ?? - // fuer den Absatz dahinter sorgen - pDoc->AppendTxtNode(*pPam->GetPoint()); - pPam->Move( fnMoveBackward ); - pPam->SetMark(); - } - } - } - else if( bInsNewPageDesc ) - { - pAkt->GetMaster().ResetAttr( RES_COL ); - if( pFirst ) - pFirst->GetMaster().ResetAttr( RES_COL ); - } - - if( pFirst ) - { - // setze am ersten den richtigen Follow - pFirst->SetFollow( pAkt ); - - // und setze noch die die Werte aus PageDesc: - pFirst->SetLandscape( pAkt->GetLandscape() ); - - pFmt = &pFirst->GetMaster(); - - pFmt->SetAttr( aSz ); - pFmt->SetAttr( aLR ); - pFmt->SetAttr( aUL ); - if( !( aFrmDir == pFmt->GetAttr( RES_FRAMEDIR )) ) - pFmt->SetAttr( aFrmDir ); - - if( ( bHeaderUL || bHeaderLR ) && - 0 != (pFmt = (SwFrmFmt*)pFirst->GetMaster().GetHeader().GetHeaderFmt()) ) - { - if( bHeaderUL && aHSz.GetHeight() ) pFmt->SetAttr( aHSz ); - if( bHeaderLR ) pFmt->SetAttr( aHLR ); - } - - if( ( bFooterUL || bFooterLR ) && - 0 != ( pFmt = (SwFrmFmt*)pFirst->GetMaster().GetFooter().GetFooterFmt()) ) - { - if( bFooterUL ) pFmt->SetAttr( aFUL ); - if( bFooterLR ) pFmt->SetAttr( aFLR ); - } - } - - const SwPageDesc& rOld = pDoc->GetPageDesc( nLastPageDesc ); - if( bInsNewPageDesc && pFirst && - pDoc->GetPageDesc( nLastFirstPageDesc ).GetFollow() != &rOld ) - { - bCheckEqualPgDesc = FALSE; - } - - if( bInsPageDesc && ( !bCheckEqualPgDesc || !bInsNewPageDesc || - // dann pruefe ob die Attribute beider PageDesc gleich sind - !::lcl_CompareRTFPageDesc(pDoc->GetPageDesc( nLastPageDesc ), *pAkt )) - || ( bMakeNewPageDesc && SVX_BREAK_NONE != eBreak ) ) - { - // Pagedescriptoren am Dokument updaten (nur so werden auch die - // linken Seiten usw. eingestellt). - - // Spaltigkeit in den Set uebernehmen - SfxItemSet* pSet = 0; - const SfxPoolItem* pItem; - SfxItemSet aSet( pDoc->GetAttrPool(), RES_COL, RES_FRAMEDIR ); - if( SFX_ITEM_SET == pAkt->GetMaster().GetItemState( - RES_COL, FALSE, &pItem ) - && 1 < ((SwFmtCol*)pItem)->GetColumns().Count() ) - { - aSet.Put( *pItem ); - pSet = &aSet; - pAkt->GetMaster().ResetAttr( RES_COL ); - if( pFirst ) - pFirst->GetMaster().ResetAttr( RES_COL ); - } - - if (bIsRTL && aFrmDir.GetValue() == FRMDIR_HORI_LEFT_TOP) - aFrmDir.SetValue(FRMDIR_HORI_RIGHT_TOP); - aSet.Put(aFrmDir); - - pDoc->ChgPageDesc( nAktPageDesc, *pAkt ); - - if( pSet ) - { - SwSection aSect( CONTENT_SECTION, pDoc->GetUniqueSectionName() ); - SwSection* pSect = pDoc->Insert( *pPam, aSect, &aSet); - pPam->DeleteMark(); - - SwSectionNode* pSectNd = pSect->GetFmt()->GetSectionNode( TRUE ); - if( pRegionEndIdx ) - *pRegionEndIdx = *pSectNd->EndOfSectionNode(); - else - pRegionEndIdx = new SwNodeIndex( *pSectNd->EndOfSectionNode()); - - pPam->GetPoint()->nNode = *pSectNd; - pPam->Move( fnMoveForward, fnGoNode ); - - // Attribut Enden ggfs. anpassen!!!! - if( GetAttrStack().Count() ) - { - // Attribut Stack-Eintraege, muessen ans Ende des vorherigen - // Nodes verschoben werden. - for( USHORT n = GetAttrStack().Count(); n; ) + break; + default: + if (RTF_DOCFMT == (nToken & ~(0xff | RTF_SWGDEFS))) + ReadDocControls( nToken ); + else if (RTF_SECTFMT == (nToken & ~(0xff | RTF_SWGDEFS)) || + RTF_UNKNOWNCONTROL == nToken) { - SvxRTFItemStackType* pStkEntry = (SvxRTFItemStackType*) - GetAttrStack()[ --n ]; - if( pRegionEndIdx->GetIndex() == pStkEntry->GetSttNode().GetIdx() ) - pStkEntry->SetStartPos( SwxPosition( pPam ) ); + SvxRTFParser::NextToken(nToken); } - } - } - - if( bInsNewPageDesc ) - { - SwFmtPageDesc aPgDsc( pAkt ); - - if( pFirst ) - { - // Pagedescriptoren am Dokument updaten (nur so werden auch die - // linken Seiten usw. eingestellt). - pDoc->ChgPageDesc( nAktFirstPageDesc, *pFirst ); - pFirst->Add( &aPgDsc ); - } - - if( USHRT_MAX != nPgStart ) - aPgDsc.SetNumOffset( nPgStart ); - pDoc->Insert( *pPam, aPgDsc ); - } - } - else - { - // sollte es ein BereichsWechsel sein? - if( bCheckEqualPgDesc && SVX_BREAK_NONE == eBreak - /*&& (!bInsPageDesc || neuen Bereich aufsetzen - rOld.GetMaster().GetCol() != pAkt->GetMaster().GetCol() )*/ ) - { - // Spaltigkeit in den Set uebernehmen - SfxItemSet* pSet = 0; - const SfxPoolItem* pItem; - SfxItemSet aSet( pDoc->GetAttrPool(), RES_COL, RES_FRAMEDIR); - if( SFX_ITEM_SET == pAkt->GetMaster().GetItemState( - RES_COL, FALSE, &pItem ) - && 1 < ((SwFmtCol*)pItem)->GetColumns().Count() ) - { - aSet.Put( *pItem ); - pSet = &aSet; - } - - if( bNoBalancedCols ) - { - aSet.Put( SwFmtNoBalancedColumns( TRUE ) ); - pSet = &aSet; - } - - if (bIsRTL && aFrmDir.GetValue() == FRMDIR_HORI_LEFT_TOP) - aFrmDir.SetValue(FRMDIR_HORI_RIGHT_TOP); - aSet.Put(aFrmDir); - - if( !bFirstCall || pSet ) - { - SwSection aSect( CONTENT_SECTION, pDoc->GetUniqueSectionName() ); - SwSection* pSect = pDoc->Insert( *pPam, aSect, &aSet ); - pPam->DeleteMark(); - - SwSectionNode* pSectNd = pSect->GetFmt()->GetSectionNode( TRUE ); - if( pRegionEndIdx ) - *pRegionEndIdx = *pSectNd->EndOfSectionNode(); else - pRegionEndIdx = new SwNodeIndex( *pSectNd->EndOfSectionNode()); - - pPam->GetPoint()->nNode = *pSectNd; - pPam->Move( fnMoveForward, fnGoNode ); - - // Attribut Enden ggfs. anpassen!!!! - if( GetAttrStack().Count() ) - { - // Attribut Stack-Eintraege, muessen ans Ende des vorherigen - // Nodes verschoben werden. - for( USHORT n = GetAttrStack().Count(); n; ) - { - SvxRTFItemStackType* pStkEntry = (SvxRTFItemStackType*) - GetAttrStack()[ --n ]; - if( pRegionEndIdx->GetIndex() == pStkEntry->GetSttNode().GetIdx() ) - pStkEntry->SetStartPos( SwxPosition( pPam ) ); - } - } - } - } - else if( bInsPageDesc ) - { - if(SVX_BREAK_COLUMN_BEFORE == eBreak ) - pDoc->Insert( *pPam, SvxFmtBreakItem( eBreak )); - else if( SVX_BREAK_NONE != eBreak ) - { - SwFmtPageDesc aPgDsc( ( pFirst && &rOld == - pDoc->GetPageDesc( nLastFirstPageDesc ).GetFollow() ) - ? &pDoc->_GetPageDesc( nLastFirstPageDesc ) - : &rOld ); - - if( USHRT_MAX != nPgStart ) - aPgDsc.SetNumOffset( nPgStart ); - pDoc->Insert( *pPam, aPgDsc ); - } - } - - // der aktuelle muss wieder entnfernt werden - if( bInsNewPageDesc ) - { - pDoc->DelPageDesc( nAktPageDesc ); - if( pFirst ) - pDoc->DelPageDesc( nAktFirstPageDesc ); - nAktPageDesc = nLastPageDesc; - nAktFirstPageDesc = nLastFirstPageDesc; + bWeiter = false; + break; } - } - SkipToken( -1 ); -} + if (bWeiter) + nToken = GetNextToken(); + } while (bWeiter && IsParserWorking()); + maSegments.push_back(rtfSection(*pPam->GetPoint(), aNewSection)); + SkipToken(-1); +} void SwRTFParser::ReadPageDescTbl() { @@ -2359,7 +2308,7 @@ void SwRTFParser::ReadPageDescTbl() SetChkStyleAttr(FALSE); // Attribute nicht gegen die Styles checken - bInPgDscTbl = TRUE; + bInPgDscTbl = true; USHORT nPos = 0; SwPageDesc* pPg; SwFrmFmt* pPgFmt; @@ -2410,11 +2359,14 @@ void SwRTFParser::ReadPageDescTbl() break; case RTF_PGDSC: - if( nPos) // kein && wg MAC - if (nPos != pDoc->MakePageDesc( - String::CreateFromInt32( nTokenValue ), - FALSE ) ) - ASSERT( FALSE, "PageDesc an falscher Position" ); + if (nPos) // kein && wg MAC + { + if (nPos != pDoc->MakePageDesc( + String::CreateFromInt32(nTokenValue))) + { + ASSERT( FALSE, "PageDesc an falscher Position" ); + } + } pPg = &pDoc->_GetPageDesc( nPos ); pPg->SetLandscape( FALSE ); @@ -2630,10 +2582,10 @@ void SwRTFParser::ReadPageDescTbl() SetChkStyleAttr( bSaveChkStyleAttr ); - bInPgDscTbl = FALSE; + bInPgDscTbl = false; nAktPageDesc = 0; nAktFirstPageDesc = 0; - bSwPageDesc = TRUE; + bSwPageDesc = true; SkipToken( -1 ); } @@ -2863,6 +2815,11 @@ void SwRTFParser::ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc ) pPam->GetPoint()->nNode = *pNode->EndOfSectionNode(); pPam->Move( fnMoveBackward ); + SwTxtFmtColl* pColl = aTxtCollTbl.Get( 0 ); + if( !pColl ) + pColl = pDoc->GetTxtCollFromPoolSimple( RES_POOLCOLL_STANDARD, FALSE ); + pDoc->SetTxtFmtColl( *pPam, pColl ); + SetNewGroup( TRUE ); while( !( nOpenBrakets == GetOpenBrakets() && !GetStackPos()) && IsParserWorking() ) @@ -3560,3 +3517,5 @@ xub_StrLen SwxPosition::GetCntIdx() const { return pPam->GetPoint()->nContent.GetIndex(); } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx index 7c6214928039..ef2ad13664d9 100644 --- a/sw/source/filter/rtf/swparrtf.hxx +++ b/sw/source/filter/rtf/swparrtf.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swparrtf.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:30:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,12 +58,21 @@ * * ************************************************************************/ + +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifndef _SWPARRTF_HXX #define _SWPARRTF_HXX #ifndef __SGI_STL_MAP #include <map> #endif +#ifndef __SGI_STL_DEQUE +#include <deque> +#endif +#ifndef __SGI_STL_VECTOR +#include <vector> +#endif #ifndef _SVSTDARR_HXX #define _SVSTDARR_BOOLS @@ -72,6 +81,9 @@ #ifndef _SVXRTF_HXX //autogen #include <svx/svxrtf.hxx> #endif +#ifndef _SVX_NUMITEM_HXX +#include <svx/numitem.hxx> +#endif #ifndef _NDINDEX_HXX #include <ndindex.hxx> @@ -162,10 +174,124 @@ typedef SwFlySave* SwFlySavePtr; SV_DECL_PTRARR_DEL( SwFlySaveArr, SwFlySavePtr, 0, 20 ) SV_DECL_VARARR( SwListArr, SwListEntry, 0, 20 ) +struct DocPageInformation +{ + long mnPaperw; + long mnPaperh; + long mnMargl; + long mnMargr; + long mnMargt; + long mnMargb; + long mnGutter; + long mnPgnStart; + bool mbFacingp; + bool mbLandscape; + bool mbRTLdoc; + DocPageInformation(); +}; + +struct SectPageInformation +{ + std::vector<long> maColumns; + SvxNumberType maNumType; + SwPageDesc *mpTitlePageHdFt; + SwPageDesc *mpPageHdFt; + long mnPgwsxn; + long mnPghsxn; + long mnMarglsxn; + long mnMargrsxn; + long mnMargtsxn; + long mnMargbsxn; + long mnGutterxsn; + long mnHeadery; + long mnFootery; + long mnPgnStarts; + long mnCols; + long mnColsx; + long mnStextflow; + int mnBkc; + bool mbLndscpsxn; + bool mbTitlepg; + bool mbFacpgsxn; + bool mbRTLsection; + bool mbPgnrestart; + SectPageInformation(const DocPageInformation &rDoc); + SectPageInformation(const SectPageInformation &rSect); +}; + +class rtfSection +{ +public: + rtfSection(const SwPosition &rPos, + const SectPageInformation &rPageInfo); + SwNodeIndex maStart; + SectPageInformation maPageInfo; + SwSection *mpSection; + SwPageDesc *mpTitlePage; + SwPageDesc *mpPage; + + bool IsContinous() const { return maPageInfo.mnBkc == 0; } + long NoCols() const { return maPageInfo.mnCols; } + long StandardColSeperation() const { return maPageInfo.mnColsx; } + bool HasTitlePage() const { return maPageInfo.mbTitlepg; } + long PageStartAt() const { return maPageInfo.mnPgnStarts; } + bool PageRestartNo() const { return maPageInfo.mbPgnrestart; } + bool IsBiDi() const { return maPageInfo.mbRTLsection; } + sal_uInt16 GetPageWidth() const { return maPageInfo.mnPgwsxn; } + sal_uInt16 GetPageHeight() const { return maPageInfo.mnPghsxn; } + sal_uInt16 GetPageLeft() const { return maPageInfo.mnMarglsxn; } + sal_uInt16 GetPageRight() const { return maPageInfo.mnMargrsxn; } + bool IsLandScape() const { return maPageInfo.mbLndscpsxn; } +}; + +class rtfSections +{ +private: + SwRTFParser &mrReader; + std::deque<rtfSection> maSegments; + typedef std::deque<rtfSection>::iterator mySegIter; + typedef std::deque<rtfSection>::reverse_iterator mySegrIter; + + struct wwULSpaceData + { + bool bHasHeader, bHasFooter; + short nSwHLo, nHdUL, nSwFUp, nFtUL, nSwUp, nSwLo; + wwULSpaceData() : bHasHeader(false), bHasFooter(false) {} + }; + + void SetSegmentToPageDesc(const rtfSection &rSection, bool bTitlePage, + bool bIgnoreCols); + SwSectionFmt *InsertSection(SwPaM& rMyPaM, rtfSection &rSection); + void SetPage(SwPageDesc &rInPageDesc, SwFrmFmt &rFmt, + const rtfSection &rSection, bool bIgnoreCols); + void GetPageULData(const rtfSection &rSection, bool bFirst, + wwULSpaceData& rData); + void SetPageULSpaceItems(SwFrmFmt &rFmt, wwULSpaceData& rData); + bool SetCols(SwFrmFmt &rFmt, const rtfSection &rSection, + USHORT nNettoWidth); + void SetHdFt(rtfSection &rSection); + void CopyFrom(const SwPageDesc &rFrom, SwPageDesc &rDest); +public: + bool empty() const { return maSegments.empty(); } + int size() const { return maSegments.size(); } + void push_back(const rtfSection &rSect); + rtfSection& back() { return maSegments.back(); } + const rtfSection& back() const { return maSegments.back(); } + void InsertSegments(bool bIsNewDoc); + rtfSections(SwRTFParser &rReader) : mrReader(rReader) {} + std::vector<sal_uInt16> maDummyPageNos; + typedef std::vector<sal_uInt16>::iterator myDummyIter; + void PrependedInlineNode(const SwPosition &rPos, + const SwNode &rNode); +}; class SwRTFParser : public SvxRTFParser { - ::std::map<SwTableNode *, SwNodeIndex *> maTables; + friend class rtfSections; + DocPageInformation maPageDefaults; + rtfSections maSegments; + + std::map<SwTableNode *, SwNodeIndex *> maTables; SwRTFStyleTbl aTxtCollTbl; SwRTFCharStyleTbl aCharFmtTbl; SwFlySaveArr aFlyArr; // Flys als Letzes im Doc setzen @@ -196,7 +322,6 @@ class SwRTFParser : public SvxRTFParser bool bInPgDscTbl; // beim PageDescTbl lesen bool bNewNumList; // Word 7.0 NumList gelesen, 6.0 ueberspringen bool bFirstContinue; // 1.Call ins Continue - bool bFirstDocControl; // 1.Call of ReadDocControl /* #i9243# @@ -220,7 +345,7 @@ class SwRTFParser : public SvxRTFParser void ReadListLevel( SwNumRule& rRule, BYTE nLvl ); void ReadListTable(); void ReadListOverrideTable(); - void ReadNumSecLevel( int nToken ); + SwNumRule *ReadNumSecLevel( int nToken ); SwNumRule* GetNumRuleOfListNo( long nListNo, BOOL bRemoveFromList = FALSE ); void RemoveUnusedNumRule( SwNumRule* ); @@ -281,7 +406,9 @@ protected: void ReadField(); void ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc = 0 ); void ReadDocControls( int nToken ); + void SetPageInformationAsDefault(const DocPageInformation &rInfo); void ReadSectControls( int nToken ); + void DoHairyWriterPageDesc(int nToken); void ReadFly( int nToken, SfxItemSet* pFillSet = 0 ); void ReadTable( int nToken ); void ReadPageDescTbl(); @@ -303,5 +430,5 @@ public: #endif - //_SWPARRTF_HXX +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 5beba34636cd..2bd0e368bc17 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: writer.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: cmc $ $Date: 2002-04-08 12:47:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -561,7 +561,7 @@ void Writer::_AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ) else pItem = (SvxFontItem*)&rPool.Put( rFont ); - if( 1 < pItem->GetRef() ) + if( 1 < pItem->GetRefCount() ) rPool.Remove( *pItem ); else { @@ -588,7 +588,6 @@ void Writer::CreateBookmarkTbl() // search alle Bookmarks in the range and return it in the Array -// this is exclusive of bookmarks on the end point of the range USHORT Writer::GetBookmarks( const SwCntntNode& rNd, xub_StrLen nStt, xub_StrLen nEnd, SvPtrarr& rArr ) { @@ -598,23 +597,31 @@ USHORT Writer::GetBookmarks( const SwCntntNode& rNd, xub_StrLen nStt, SvPtrarr* pArr = pImpl->pBkmkNodePos ? pImpl->pBkmkNodePos->Get( nNd ) : 0; if( pArr ) { - for( USHORT n = 0; n < pArr->Count(); ++n ) + // there exist some bookmarks, search now all which is in the range + if( !nStt && nEnd == rNd.Len() ) + // all + rArr.Insert( pArr, 0 ); + else { + USHORT n; xub_StrLen nCntnt; - void* p = (*pArr)[ n ]; - const SwBookmark& rBkmk = *(SwBookmark*)p; - if( rBkmk.GetPos().nNode == nNd && - (nCntnt = rBkmk.GetPos().nContent.GetIndex() ) >= nStt && - nCntnt < nEnd ) + for( n = 0; n < pArr->Count(); ++n ) { - rArr.Insert( p, rArr.Count() ); - } - else if( rBkmk.GetOtherPos() && nNd == - rBkmk.GetOtherPos()->nNode.GetIndex() && (nCntnt = - rBkmk.GetOtherPos()->nContent.GetIndex() ) >= nStt && + void* p = (*pArr)[ n ]; + const SwBookmark& rBkmk = *(SwBookmark*)p; + if( rBkmk.GetPos().nNode == nNd && + (nCntnt = rBkmk.GetPos().nContent.GetIndex() ) >= nStt && nCntnt < nEnd ) - { - rArr.Insert( p, rArr.Count() ); + { + rArr.Insert( p, rArr.Count() ); + } + else if( rBkmk.GetOtherPos() && nNd == + rBkmk.GetOtherPos()->nNode.GetIndex() && (nCntnt = + rBkmk.GetOtherPos()->nContent.GetIndex() ) >= nStt && + nCntnt < nEnd ) + { + rArr.Insert( p, rArr.Count() ); + } } } } diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 1d0dd51d60f2..dae105bab0bb 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fltshell.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: cmc $ $Date: 2002-12-06 16:36:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2193,3 +2193,17 @@ void SwFltShell::NextStyle(USHORT nWhich, USHORT nNext) *pColls[nNext]->GetColl() ); } +// UpdatePageDescs muss am Ende des Einlesevorganges aufgerufen werden, damit +// der Writer den Inhalt der Pagedescs wirklich akzeptiert +void UpdatePageDescs(SwDoc &rDoc, sal_uInt16 nInPageDescOffset) +{ + // Pagedescriptoren am Dokument updaten (nur so werden auch die + // linken Seiten usw. eingestellt). + + // PageDesc "Standard" + rDoc.ChgPageDesc(0, rDoc.GetPageDesc(0)); + + // PageDescs "Konvert..." + for (sal_uInt16 i = nInPageDescOffset; i < rDoc.GetPageDescCnt(); ++i) + rDoc.ChgPageDesc(i, rDoc.GetPageDesc(i)); +} diff --git a/sw/source/filter/ww8/dump/dump8a.cxx b/sw/source/filter/ww8/dump/dump8a.cxx index fa4cb5d3cdb7..8f600b156cbe 100644 --- a/sw/source/filter/ww8/dump/dump8a.cxx +++ b/sw/source/filter/ww8/dump/dump8a.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dump8a.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: cmc $ $Date: 2002-12-06 16:39:31 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index de208f41c6b7..69540d71c497 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -2,9 +2,9 @@ * * $RCSfile: escher.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _ESCHER_HXX @@ -95,6 +94,8 @@ protected: virtual INT32 WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType, EscherPropertyContainer& rPropOpt); + void WritePicture(EscherPropertyContainer &rPropOpt, + const Graphic &rGraphic, const SdrObject &rObj, sal_uInt32 nShapeId); void WriteGrfAttr(const SwNoTxtNode& rNd,EscherPropertyContainer& rPropOpt); INT32 DrawModelToEmu(INT32 nVal) const @@ -160,3 +161,5 @@ private: }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/makefile.mk b/sw/source/filter/ww8/makefile.mk index 871fb0e1905b..bb764bcf8090 100644 --- a/sw/source/filter/ww8/makefile.mk +++ b/sw/source/filter/ww8/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: vg $ $Date: 2002-08-27 15:35:22 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:42:06 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -121,6 +121,7 @@ SLOFILES = \ $(SLO)$/ww8scan.obj EXCEPTIONSFILES = \ + $(SLO)$/ww8par5.obj \ $(SLO)$/ww8graf2.obj diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 5e79c975b557..3df30b6a441f 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtw8esh.cxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PCH #include "filt_pch.hxx" #endif @@ -160,6 +162,9 @@ #ifndef _SVX_UNOAPI_HXX_ #include <svx/unoapi.hxx> #endif +#ifndef _SVDXCGV_HXX +#include <svx/svdxcgv.hxx> +#endif #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include <com/sun/star/uno/Reference.h> #endif @@ -1377,29 +1382,9 @@ INT32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId) #endif OpenContainer(ESCHER_SpContainer); - AddShape(ESCHER_ShpInst_PictureFrame, 0xa10, nShapeId); EscherPropertyContainer aPropOpt; + WritePicture(aPropOpt, aGraphic, *pSdrObj, nShapeId); - GraphicObject aGraphicObject(aGraphic); - ByteString aId = aGraphicObject.GetUniqueID(); - if (aId.Len()) - { - Size aSz(rOLENd.GetTwipSize()); - aSz.Width() = DrawModelToEmu(aSz.Width()); - aSz.Height() = DrawModelToEmu(aSz.Height()); - Rectangle aRect(Point(0,0), aSz); - - sal_uInt32 nBlibId = GetBlibID(*QueryPicStream(), aId, aRect, 0); - if (nBlibId) - { - aPropOpt.AddOpt(ESCHER_Prop_fillType, ESCHER_FillPicture); - aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, sal_True); - } - } - - SetPicId(*pSdrObj, nShapeId, aPropOpt); - - aPropOpt.AddOpt(ESCHER_Prop_pictureActive, 0x10000); nBorderThick = WriteFlyFrameAttr(rFmt, mso_sptPictureFrame, aPropOpt); WriteGrfAttr(rOLENd, aPropOpt); aPropOpt.Commit(GetStream()); @@ -1768,21 +1753,6 @@ void SwEscherEx::FinishEscher() pEscherStrm->Seek(0); *rWrt.pTableStrm << *pEscherStrm; delete pEscherStrm, pEscherStrm = 0; - - /*#82587# Everytime MS 2000 creates an escher stream there is always an - ObjectPool dir (even if empty). It turns out that if a copy of MS 2000 is - used to open a document that contains escher graphics exported from - StarOffice without this empty dir then *if* that copy of MS Office has - never been used to open a MSOffice document that has escher graphics (and - an ObjectPool dir of course) and that copy of office has not been used to - draw escher graphics then our exported graphics do not appear. Once you - do open a ms document with escher graphics or draw an escher graphic with - that copy of word, then all documents from staroffice that contain escher - work from then on. Tricky to track down, some sort of late binding - trickery in MS where solely for first time initialization the existence - of an ObjectPool dir is necessary for triggering some magic. cmc*/ - rWrt.GetStorage().OpenStorage(CREATE_CONST_ASC(SL::aObjectPool), - STREAM_READWRITE | STREAM_SHARE_DENYALL); } extern "C" @@ -2402,22 +2372,47 @@ INT32 SwEscherEx::WriteTxtFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId, return nBorderThick; } +void SwBasicEscherEx::WritePicture(EscherPropertyContainer &rPropOpt, + const Graphic &rGraphic, const SdrObject &rObj, sal_uInt32 nShapeId) +{ + AddShape( ESCHER_ShpInst_PictureFrame, 0xa10, nShapeId ); + + GraphicObject aGraphicObject(rGraphic); + ByteString aId = aGraphicObject.GetUniqueID(); + if (aId.Len()) + { + Rectangle aRect = rObj.GetLogicRect(); + aRect.SetPos(Point(0,0)); + aRect.Right() = DrawModelToEmu(aRect.Right()); + aRect.Bottom() = DrawModelToEmu(aRect.Bottom()); + sal_uInt32 nBlibId = GetBlibID(*QueryPicStream(), aId, aRect, 0); + if (nBlibId) + { + rPropOpt.AddOpt(ESCHER_Prop_fillType, ESCHER_FillPicture); + rPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, sal_True); + } + } + + SetPicId(rObj, nShapeId, rPropOpt); + rPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0x10000 ); +} + void SwEscherEx::WriteOCXControl( const SwFrmFmt& rFmt, UINT32 nShapeId ) { if (const SdrObject* pSdrObj = rFmt.FindRealSdrObject()) { OpenContainer( ESCHER_SpContainer ); - AddShape( ESCHER_ShpInst_PictureFrame, 0xa10, nShapeId ); + SdrModel *pModel = rWrt.pDoc->GetDrawModel(); + OutputDevice *pDevice = Application::GetDefaultDevice(); + ASSERT(pModel && pDevice, "no model or device"); + SdrExchangeView aExchange(pModel, pDevice); + Graphic aGraphic(aExchange.GetObjGraphic(pModel, + const_cast<SdrObject*>(pSdrObj))); EscherPropertyContainer aPropOpt; - Size aSz( pSdrObj->GetLogicRect().GetSize() ); - aSz.Width() = DrawModelToEmu( aSz.Width() ); - aSz.Height() = DrawModelToEmu( aSz.Height() ); + WritePicture(aPropOpt, aGraphic, *pSdrObj, nShapeId); - SetPicId(*pSdrObj, nShapeId, aPropOpt); - - aPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0x10000 ); WriteFlyFrameAttr( rFmt, mso_sptPictureFrame , aPropOpt ); aPropOpt.Commit( GetStream() ); @@ -2554,10 +2549,11 @@ bool SwMSConvertControls::ExportControl(Writer &rWrt, const SdrObject *pObj) //I think I painted myself into a little bit of a //corner by trying to use the uno interface for //controls export - Size aTempSize=pFormObj->GetLogicRect().GetSize(); + Rectangle aRect = pFormObj->GetLogicRect(); + aRect.SetPos(Point(0,0)); awt::Size aSize; - aSize.Width = TWIPS_TO_MM(aTempSize.A()); - aSize.Height = TWIPS_TO_MM(aTempSize.B()); + aSize.Width = TWIPS_TO_MM(aRect.Right()); + aSize.Height = TWIPS_TO_MM(aRect.Bottom()); //Open the ObjectPool SvStorageRef xObjPool = rWW8Wrt.GetStorage().OpenStorage( @@ -2600,3 +2596,5 @@ bool SwMSConvertControls::ExportControl(Writer &rWrt, const SdrObject *pObj) rWW8Wrt.OutField( 0, 87, aEmptyStr, WRITEFIELD_END | WRITEFIELD_CLOSE ); return true; } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 6892c7b64b3e..52d61a085d48 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtw8nds.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: cmc $ $Date: 2002-12-05 17:53:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -447,7 +446,7 @@ WW8_SwAttrIter::WW8_SwAttrIter(SwWW8Writer& rWr, const SwTxtNode& rTxtNd) } } - ::std::sort(maFlyFrms.begin(), maFlyFrms.end(), sortswflys()); + std::sort(maFlyFrms.begin(), maFlyFrms.end(), sortswflys()); maFlyIter = maFlyFrms.begin(); @@ -1095,7 +1094,7 @@ void WW8_SwAttrIter::FieldVanish( const String& rTxt ) void WW8_SwAttrIter::OutSwTOXMark(const SwTOXMark& rAttr, bool bStart) { // its a field; so get the Text form the Node and build the field - ASSERT( !bStart, "calls only with the endposition!" ); + ASSERT( bStart, "calls only with the startposition!" ); String sTxt; const SwTxtTOXMark& rTxtTOXMark = *rAttr.GetTxtTOXMark(); @@ -1162,7 +1161,7 @@ bool WW8_SwAttrIter::OutAttrWithRange( xub_StrLen nPos ) OutSwFmtINetFmt((SwFmtINetFmt&)*pItem, true); bRet = true; } - else if (nPos == *pHt->GetEnd()) + if( 0 != ( pEnd = pHt->GetEnd() ) && nPos == *pEnd ) OutSwFmtINetFmt((SwFmtINetFmt&)*pItem, false); } break; @@ -1176,10 +1175,11 @@ bool WW8_SwAttrIter::OutAttrWithRange( xub_StrLen nPos ) OutSwFmtRefMark((SwFmtRefMark&)*pItem, false); break; case RES_TXTATR_TOXMARK: - if( nPos == *pHt->GetStart() ) + if (nPos == *pHt->GetStart()) + { + OutSwTOXMark((SwTOXMark&)*pItem, true); bRet = true; - if( 0 != ( pEnd = pHt->GetEnd() ) && nPos == *pEnd ) - OutSwTOXMark((SwTOXMark&)*pItem, false); + } break; case RES_TXTATR_CJK_RUBY: if( nPos == *pHt->GetStart() ) @@ -1454,10 +1454,10 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) if( nNextAttr > nEnd ) nNextAttr = nEnd; - //Append bookmarks in this range, exclusive of final position - //of this range - rWW8Wrt.AppendBookmarks( *pNd, nAktPos, nNextAttr - nAktPos ); aAttrIter.OutFlys(nAktPos); + //Append bookmarks in this range after flys, exclusive of final + //position of this range + rWW8Wrt.AppendBookmarks( *pNd, nAktPos, nNextAttr - nAktPos ); bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos ); bool bAttrWithRange = aAttrIter.OutAttrWithRange( nAktPos ); @@ -1475,10 +1475,10 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) bRedlineAtEnd = true; else { - //insert final bookmarks if any before CR - rWW8Wrt.AppendBookmarks( *pNd, nEnd, 1 ); //insert final graphic anchors if any before CR aAttrIter.OutFlys(nEnd); + //insert final bookmarks if any before CR and after flys + rWW8Wrt.AppendBookmarks( *pNd, nEnd, 1 ); if( pTOXSect ) rWW8Wrt.EndTOX( *pTOXSect ); rWW8Wrt.WriteCR(); // CR danach @@ -1494,7 +1494,8 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) // Ausnahme: Fussnoten am Zeilenende if( nNextAttr == nEnd ) { - aAttrIter.OutAttrWithRange( nEnd ); + if (nAktPos != nEnd) + aAttrIter.OutAttrWithRange(nEnd); if( pO->Count() ) { rWW8Wrt.pChpPlc->AppendFkpEntry( rWrt.Strm().Tell(), @@ -1504,10 +1505,10 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) if( bTxtAtr || bAttrWithRange || bRedlineAtEnd ) { - //insert final bookmarks if any before CR - rWW8Wrt.AppendBookmarks( *pNd, nEnd, 1 ); //insert final graphic anchors if any before CR aAttrIter.OutFlys(nEnd); + //insert final bookmarks if any before CR and after flys + rWW8Wrt.AppendBookmarks( *pNd, nEnd, 1 ); if( pTOXSect ) rWW8Wrt.EndTOX( *pTOXSect ); @@ -2498,4 +2499,4 @@ SwNodeFnTab aWW8NodeFnTab = { /* RES_OLENODE */ OutWW8_SwOleNode, }; - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index e026691b6e7a..d141e30bfd8d 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtw8num.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -759,4 +758,4 @@ bool SwWW8Writer::Out_SwNum(const SwTxtNode* pNd) return bRet; } - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index ef300ddcd85a..b70026858c55 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtw8sty.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: cmc $ $Date: 2002-11-07 16:54:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PCH #include "filt_pch.hxx" #endif @@ -1284,7 +1286,8 @@ bool WW8_WrPlcSepx::WriteKFTxt(SwWW8Writer& rWrt) rWrt.pISet = pOldI; - bOutPgDscSet = false; + if (nBreakCode == 0) + bOutPgDscSet = false; } } @@ -1448,36 +1451,39 @@ bool WW8_WrPlcSepx::WriteKFTxt(SwWW8Writer& rWrt) ? &pPd->GetFollow()->GetMaster() : &pPd->GetLeft(); - SetHeaderFlag( nHeadFootFlags, *pPdFmt, WW8_HEADER_ODD ); - SetFooterFlag( nHeadFootFlags, *pPdFmt, WW8_FOOTER_ODD ); - if( !pPd->IsHeaderShared() || bLeftRightPgChain ) - SetHeaderFlag( nHeadFootFlags, *pPdLeftFmt, WW8_HEADER_EVEN ); - if( !pPd->IsFooterShared() || bLeftRightPgChain ) - SetFooterFlag( nHeadFootFlags, *pPdLeftFmt, WW8_FOOTER_EVEN ); - if( pPdFmt != pPdFirstPgFmt ) + if (nBreakCode != 0) { - // es gibt eine ErsteSeite: - SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_HEADER_FIRST ); - SetFooterFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_FOOTER_FIRST ); - } + SetHeaderFlag( nHeadFootFlags, *pPdFmt, WW8_HEADER_ODD ); + SetFooterFlag( nHeadFootFlags, *pPdFmt, WW8_FOOTER_ODD ); + if( !pPd->IsHeaderShared() || bLeftRightPgChain ) + SetHeaderFlag( nHeadFootFlags, *pPdLeftFmt, WW8_HEADER_EVEN ); + if( !pPd->IsFooterShared() || bLeftRightPgChain ) + SetFooterFlag( nHeadFootFlags, *pPdLeftFmt, WW8_FOOTER_EVEN ); + if( pPdFmt != pPdFirstPgFmt ) + { + // es gibt eine ErsteSeite: + SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_HEADER_FIRST ); + SetFooterFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_FOOTER_FIRST ); + } - if( nHeadFootFlags && !rWrt.bWrtWW8 ) - { - BYTE nTmpFlags = nHeadFootFlags; - if( rWrt.pDop->fFacingPages ) + if( nHeadFootFlags && !rWrt.bWrtWW8 ) { - if( !(nTmpFlags & WW8_FOOTER_EVEN) && - (nTmpFlags & WW8_FOOTER_ODD ) ) - nTmpFlags |= WW8_FOOTER_EVEN; + BYTE nTmpFlags = nHeadFootFlags; + if( rWrt.pDop->fFacingPages ) + { + if( !(nTmpFlags & WW8_FOOTER_EVEN) && + (nTmpFlags & WW8_FOOTER_ODD ) ) + nTmpFlags |= WW8_FOOTER_EVEN; - if( !(nTmpFlags & WW8_HEADER_EVEN) && - (nTmpFlags & WW8_HEADER_ODD ) ) - nTmpFlags |= WW8_HEADER_EVEN; - } + if( !(nTmpFlags & WW8_HEADER_EVEN) && + (nTmpFlags & WW8_HEADER_ODD ) ) + nTmpFlags |= WW8_HEADER_EVEN; + } - // sprmSGprfIhdt, wird nur noch im WW95 benoetigt - pO->Insert( 153, pO->Count() ); - pO->Insert( nTmpFlags, pO->Count() ); + // sprmSGprfIhdt, wird nur noch im WW95 benoetigt + pO->Insert( 153, pO->Count() ); + pO->Insert( nTmpFlags, pO->Count() ); + } } if( pO->Count() ) @@ -1976,3 +1982,4 @@ const SvULongs* WW8_WrPlcSubDoc::GetShapeIdArr() const return 0; } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index d9c6c19fd2ba..d63167058d06 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtww8.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PCH #include "filt_pch.hxx" #pragma hdrstop @@ -280,7 +282,8 @@ class WW8_WrtBookmarks private: SvULongs aSttCps, aEndCps; // Array of Start- and End CPs SvBools aFieldBookmarks; // If the bookmark is in a field result - ::std::vector<String> maSwBkmkNms; // Array of Sw - Bookmarknames + std::vector<String> maSwBkmkNms; // Array of Sw - Bookmarknames + typedef std::vector<String>::iterator myIter; USHORT GetPos( const String& rNm ); @@ -301,7 +304,7 @@ public: class WW8_WrtRedlineAuthor { private: - ::std::vector<String> maAuthors; // Array of Sw - Bookmarknames + std::vector<String> maAuthors; // Array of Sw - Bookmarknames USHORT GetPos( const String& rNm ); @@ -1323,15 +1326,19 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const String& rNm ) { // new -> insert as start position nPos = aSttCps.Count(); + myIter aIter = maSwBkmkNms.end(); // sort by startposition // theory: write continuous -> then the new position is at end while( nPos && aSttCps[ nPos - 1 ] > ULONG( nStartCp )) + { --nPos; + --aIter; + } aSttCps.Insert(nStartCp, nPos); aEndCps.Insert(nStartCp, nPos); aFieldBookmarks.Insert(BOOL(false), nPos); - maSwBkmkNms.push_back(rNm); + maSwBkmkNms.insert(aIter, rNm); } else { @@ -1375,7 +1382,7 @@ void WW8_WrtBookmarks::Write( SwWW8Writer& rWrt ) rWrt.pFib->fcPlcfbkf = rStrm.Tell(); for( i = 0; i < nCount; ++i ) SwWW8Writer::WriteLong( rStrm, aSttCps[ i ] ); - SwWW8Writer::WriteLong( rStrm, rWrt.pFib->ccpText ); + SwWW8Writer::WriteLong(rStrm, rWrt.pFib->ccpText + rWrt.pFib->ccpTxbx); for( i = 0; i < nCount; ++i ) { ULONG nEndCP = aEndCps[ i ]; @@ -1397,7 +1404,7 @@ void WW8_WrtBookmarks::Write( SwWW8Writer& rWrt ) rWrt.pFib->fcPlcfbkl = rStrm.Tell(); for( i = 0; i < nCount; ++i ) SwWW8Writer::WriteLong( rStrm, aEndSortTab[ i ] ); - SwWW8Writer::WriteLong( rStrm, rWrt.pFib->ccpText ); + SwWW8Writer::WriteLong(rStrm, rWrt.pFib->ccpText + rWrt.pFib->ccpTxbx); rWrt.pFib->lcbPlcfbkl = rStrm.Tell() - rWrt.pFib->fcPlcfbkl; } } @@ -1487,8 +1494,8 @@ void SwWW8Writer::AppendBookmark( const String& rName, USHORT nOffset ) USHORT WW8_WrtRedlineAuthor::AddName( const String& rNm ) { USHORT nRet; - typedef ::std::vector<String>::iterator myiter; - myiter aIter = ::std::find(maAuthors.begin(), maAuthors.end(), rNm); + typedef std::vector<String>::iterator myiter; + myiter aIter = std::find(maAuthors.begin(), maAuthors.end(), rNm); if (aIter != maAuthors.end()) nRet = aIter - maAuthors.begin(); else @@ -1518,7 +1525,7 @@ USHORT SwWW8Writer::AddRedlineAuthor( USHORT nId ) //-------------------------------------------------------------------------- /* */ -void SwWW8Writer::WriteAsStringTable(const ::std::vector<String>& rStrings, +void SwWW8Writer::WriteAsStringTable(const std::vector<String>& rStrings, INT32& rfcSttbf, INT32& rlcbSttbf, USHORT nExtraLen) { USHORT n, nCount = rStrings.size(); @@ -1997,6 +2004,32 @@ void SwWW8Writer::WriteFkpPlcUsw() pFldTxtBxs->Write( *this ); // Fields ( Textboxes ) pFldHFTxtBxs->Write( *this ); // Fields ( Head/Foot-Textboxes ) + if (pEscher || pDoc->ContainsMSVBasic()) + { + /* + #82587# Everytime MS 2000 creates an escher stream there is always + an ObjectPool dir (even if empty). It turns out that if a copy of + MS 2000 is used to open a document that contains escher graphics + exported from StarOffice without this empty dir then *if* that + copy of MS Office has never been used to open a MSOffice document + that has escher graphics (and an ObjectPool dir of course) and + that copy of office has not been used to draw escher graphics then + our exported graphics do not appear. Once you do open a ms + document with escher graphics or draw an escher graphic with that + copy of word, then all documents from staroffice that contain + escher work from then on. Tricky to track down, some sort of late + binding trickery in MS where solely for first time initialization + the existence of an ObjectPool dir is necessary for triggering + some magic. cmc + */ + /* + #10570# Similiarly having msvbasic storage seems to also trigger + creating this stream + */ + GetStorage().OpenStorage(CREATE_CONST_ASC(SL::aObjectPool), + STREAM_READWRITE | STREAM_SHARE_DENYALL); + } + // dggInfo - escher stream WriteEscher(); @@ -2011,6 +2044,9 @@ void SwWW8Writer::WriteFkpPlcUsw() OutListTab(); // listformats - LSTF OutOverrideListTab(); // - "" - - LFO OutListNamesTab(); // - "" - - ListNames + + RestoreMacroCmds(); + pMagicTable->Write( *this ); pPiece->WritePc( *this ); // Piece-Table @@ -2500,3 +2536,32 @@ void WW8_WrPlcTxtBoxes::WritePlc( SwWW8Writer& rWrt ) const rWrt.pFib->lcbPlcfHdrtxbxTxt ); } } + +void SwWW8Writer::RestoreMacroCmds() +{ + pFib->fcCmds = pTableStrm->Tell(); + + SvStorageRef xSrcRoot(pDoc->GetDocShell()->GetStorage()); + SvStorageStreamRef xSrcStream = + xSrcRoot->OpenStream(CREATE_CONST_ASC(SL::aMSMacroCmds), + STREAM_STD_READ | STREAM_NOCREATE ); + + if (xSrcStream.Is() && SVSTREAM_OK == xSrcStream->GetError()) + { + xSrcStream->Seek(STREAM_SEEK_TO_END); + pFib->lcbCmds = xSrcStream->Tell(); + xSrcStream->Seek(0); + + sal_uInt8 *pBuffer = new sal_uInt8[pFib->lcbCmds]; + xSrcStream->Read(pBuffer, pFib->lcbCmds); + pTableStrm->Write(pBuffer, pFib->lcbCmds); + delete[] pBuffer; + + } + + // set len to FIB + pFib->lcbCmds = pTableStrm->Tell() - pFib->fcCmds; +} + + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 17e293158737..693ae2a09550 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtww8.hxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WRTWW8_HXX @@ -449,6 +448,9 @@ friend Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ); void OutListTab(); void OutOverrideListTab(); void OutListNamesTab(); + + void RestoreMacroCmds(); + void InitFontTable(); public: SwPosFlyFrms maFlyPos; // Pointer auf die aktuelle "FlyFrmTabelle" @@ -958,3 +960,5 @@ Writer& OutWW8_SwFmtVertOrient( Writer& rWrt, const SfxPoolItem& rHt ); #endif // _WRTWW8_HXX + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 1f910c57884d..7b7dd1a8d67d 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtww8gr.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: cmc $ $Date: 2002-12-02 10:29:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PRECOMPILED @@ -68,8 +67,8 @@ #pragma hdrstop -#ifndef _TOOLS_SOLMATH_H -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _FILTER_HXX //autogen @@ -436,7 +435,10 @@ void SwWW8Writer::OutGrf( const SwNoTxtNode* pNd ) GetItem(RES_CHRATR_FONTSIZE)).GetHeight(); nHeight-=nFontHeight/20; - Set_UInt16( pArr, 0x4845 ); + if (bWrtWW8) + Set_UInt16( pArr, 0x4845 ); + else + Set_UInt8( pArr, 101 ); Set_UInt16( pArr, -((INT16)nHeight)); } } @@ -651,7 +653,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const SwNoTxtNode* pNd, if( aGrTwipSz.Width() + nXSizeAdd ) // set mx { double fVal = nWidth * 1000.0 / (aGrTwipSz.Width() + nXSizeAdd); - Set_UInt16( pArr, (USHORT)SolarMath::Round(fVal) ); + Set_UInt16( pArr, (USHORT)::rtl::math::round(fVal) ); } else pArr += 2; @@ -659,7 +661,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const SwNoTxtNode* pNd, if( aGrTwipSz.Height() + nYSizeAdd ) // set my { double fVal = nHeight * 1000.0 / (aGrTwipSz.Height() + nYSizeAdd); - Set_UInt16( pArr, (USHORT)SolarMath::Round(fVal) ); + Set_UInt16( pArr, (USHORT)::rtl::math::round(fVal) ); } else pArr += 2; @@ -854,3 +856,5 @@ void SwWW8WrGrf::Write() } } } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 254e096b02b9..7aa202240167 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8atr.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ /* @@ -2921,6 +2920,8 @@ ULONG SwWW8Writer::ReplaceCr( BYTE nChar ) { // then write as normal char WriteChar(nChar); + pPiece->SetParaBreak(); + pPapPlc->AppendFkpEntry(rStrm.Tell()); nRetPos = rStrm.Tell(); } #ifdef PRODUCT @@ -4451,5 +4452,4 @@ SwAttrFnTab aWW8AttrFnTab = { /* RES_UNKNOWNATR_CONTAINER */ 0 }; - - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 718879b9c7a8..3e3a482373a2 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8glsy.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PRECOMPILED @@ -150,8 +149,8 @@ bool WW8Glossary::HasBareGraphicEnd(SwDoc *pDoc,SwNodeIndex &rIdx) } bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, - bool bSaveRelFile, const ::std::vector<String>& rStrings, - const ::std::vector<String>& rExtra) + bool bSaveRelFile, const std::vector<String>& rStrings, + const std::vector<String>& rExtra) { // this code will be called after reading all text into the // empty sections @@ -254,8 +253,8 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) if( pGlossary->IsGlossaryFib() && rBlocks.StartPutMuchBlockEntries() ) { //read the names of the autotext entries - ::std::vector<String> aStrings; - ::std::vector<String> aExtra; + std::vector<String> aStrings; + std::vector<String> aExtra; rtl_TextEncoding eStructCharSet = WW8Fib::GetFIBCharset(pGlossary->chseTables); @@ -388,3 +387,4 @@ UINT32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream &rTableStrm, return nEndLastPage; } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index 446b3bb98ac1..3780e79c33da 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8glsy.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8GLSY_HXX @@ -130,3 +129,5 @@ private: WW8Glossary& operator=(const WW8Glossary&); }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index e95418262017..af0a29d65524 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8graf.cxx,v $ * - * $Revision: 1.91 $ + * $Revision: 1.92 $ * - * last change: $Author: cmc $ $Date: 2002-12-12 13:50:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #pragma hdrstop @@ -311,9 +310,8 @@ void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const String &rFixed) { if (mbIsDisabled || !rFixed.Len()) return; - mnImportedGraphicsCount++; String aName(msSeed); - aName += String::CreateFromInt32(mnImportedGraphicsCount); + aName += String::CreateFromInt32(++mnImportedGraphicsCount); aName.APPEND_CONST_ASC( ": " ); aName += rFixed; pFrmFmt->SetName( aName ); @@ -346,7 +344,7 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz, if( eAnchor == FLY_AT_CNTNT ) { if( SVBT8ToByte( pDo->bx ) == 1 ) // Pos: echt links - nDrawXOfs2 -= nPgLeft; + nDrawXOfs2 -= maSectionManager.GetPageLeft(); if( nInTable ) // Obj in Table nDrawXOfs2 -= GetTableLeft(); // -> siehe Kommentar // bei GetTableLeft() @@ -354,9 +352,11 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz, else { if( SVBT8ToByte( pDo->bx ) != 1 ) - nDrawXOfs2 += nPgLeft; + nDrawXOfs2 += maSectionManager.GetPageLeft(); +#if 0 if( SVBT8ToByte( pDo->by ) == 0 ) - nDrawYOfs2 += nPgTop; + nDrawYOfs2 += maSectionManager.GetPageTop(); +#endif } return true; @@ -2168,9 +2168,9 @@ void SwWW8ImplReader::SetAttributesAtGrfNode( SvxMSDffImportRec* pRecord, //gamma if (WW8ITEMVALUE(rOldSet, SDRATTR_GRAFGAMMA, SdrGrafGamma100Item)) { - SwGammaGrf aGamma(WW8ITEMVALUE(rOldSet, SDRATTR_GRAFGAMMA, - SdrGrafGamma100Item)); - pGrfNd->SetAttr( aGamma ); + double fVal = WW8ITEMVALUE(rOldSet, SDRATTR_GRAFGAMMA, + SdrGrafGamma100Item); + pGrfNd->SetAttr(SwGammaGrf(fVal/100.)); } //drawmode @@ -2380,8 +2380,8 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord, if (rParentHori.GetRelationOrient() == REL_PG_FRAME) { - pFSPA->nXaLeft -= nPgLeft; - pFSPA->nXaRight -= nPgLeft; + pFSPA->nXaLeft -= maSectionManager.GetPageLeft(); + pFSPA->nXaRight -= maSectionManager.GetPageLeft(); } } } @@ -2686,7 +2686,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) pRecord = aData.GetRecord(nTxbx); if (pRecord && pRecord->pObj && pRecord->aTextId.nTxBxS) { - MungeTextIntoDrawBox(pRecord->pObj, pRecord, + pRetFrmFmt = MungeTextIntoDrawBox(pRecord->pObj, pRecord, nGrafAnchorCp, pRetFrmFmt); } } @@ -2718,14 +2718,13 @@ void SwWW8ImplReader::RemoveAutoAnchor(const SwFrmFmt *pFmt) pAnchorStck->RemoveAnchor(pFmt); } -void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, +SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrmFmt* pRetFrmFmt) { SdrTextObj* pSdrTextObj; // Pruefen, ob Gruppenobjekt (z.B. zwei Klammern) vorliegt - SdrObjGroup* pThisGroup = PTR_CAST(SdrObjGroup, pRecord->pObj); - if( pThisGroup ) + if (SdrObjGroup* pThisGroup = PTR_CAST(SdrObjGroup, pRecord->pObj)) { // Gruppenobjekte haben keinen Text. Fuege ein Textobjekt in die // Gruppe ein, um den Text zu halten. @@ -2751,23 +2750,7 @@ void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, pThisGroup->GetSubList()->NbcInsertObject(pSdrTextObj); } else - { pSdrTextObj = PTR_CAST(SdrTextObj, pRecord->pObj); - /* - Die Frage: was tun, wenn hier false hereuskommt, z.B. bei - 3D-Objekten (nicht von SdrTextObj abgeleitet) - - Wunsch: neues SdrTextObj hinzufuegen, das mit dem alten in einer - neu zu schaffenden Gruppe geklammert wird. - - Implementierung: nicht zur 5.1 (jp und khz am 11.02.1999) - - if( !pSdrTextObj ) - { - ... - } - */ - } if( pSdrTextObj ) { @@ -2785,7 +2768,7 @@ void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, bEraseThisObject, 0, 0, 0, 0, pRecord); // wurde dieses Objekt ersetzt ?? - if( bEraseThisObject ) + if (bEraseThisObject) { if( pGroupObject || (pSdrTextObj != pTrueObject) ) { @@ -2814,6 +2797,7 @@ void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, // und FrameFormat entfernen, da durch Grafik ersetzt (dies // loescht auch das Objekt) rDoc.DelFrmFmt( pRetFrmFmt ); + pRetFrmFmt = 0; // auch den Objektmerker loeschen pRecord->pObj = 0; } @@ -2830,6 +2814,7 @@ void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, pSdrTextObj->SetItemSetAndBroadcast(aItemSet); } } + return pRetFrmFmt; } SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, @@ -2903,10 +2888,9 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, contact object, while a raw rpOutNewObject stored here becomes deleted and useless. */ - pMSDffManager->StoreShapeOrder( pF->nSpId, + pMSDffManager->StoreShapeOrder(pF->nSpId, (((ULONG)pRecord->aTextId.nTxBxS) << 16) + - pRecord->aTextId.nSequence, 0, pRetFrmFmt, - nActSectionNo + bIsHeader ? 1 : 0 + bIsFooter ? 2 : 0 ); + pRecord->aTextId.nSequence, 0, pRetFrmFmt); // Das Kontakt-Objekt MUSS in die Draw-Page gesetzt werden, damit // in SwWW8ImplReader::LoadDoc1() die Z-Order festgelegt werden @@ -3015,7 +2999,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject, SetAttributesAtGrfNode( pRecord, pRetFrmFmt, pF ); } // mehrfaches Auftreten gleicher Grafik-Namen vermeiden - aGrfNameGenerator.SetUniqueGraphName(pRetFrmFmt, aObjectName); + maGrfNameGenerator.SetUniqueGraphName(pRetFrmFmt, aObjectName); } //falls alles Ok, Zeiger auf neues Objekt ermitteln und Z-Order-Liste //entsprechend korrigieren (oder Eintrag loeschen) @@ -3135,3 +3119,5 @@ void SwWW8FltAnchorStack::Flush() --nCnt; } } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index d39a060a3fd4..c0e09d1efc95 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8graf.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: cmc $ $Date: 2002-12-12 10:16:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8GRAF_HXX @@ -121,3 +120,5 @@ public: void WW8FSPAShadowToReal( WW8_FSPA_SHADOW* pFSPAS, WW8_FSPA* pPic ); #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 8bfb65e9a2da..e839f69147f3 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8graf2.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: cmc $ $Date: 2002-12-12 10:16:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -269,6 +268,7 @@ void wwZOrderer::InsertDrawingObject(SdrObject* pObj, short nWwHeight) void wwZOrderer::InsertTextLayerObject(SdrObject* pObject) { + pObject->SetLayer(mnHeaven); if (maIndexes.empty()) { InsertObject(pObject, mnNoInitialObjects + mnInlines); @@ -319,7 +319,7 @@ ULONG wwZOrderer::GetDrawingObjectPos(short nWwHeight) bool wwZOrderer::InsertObject(SdrObject* pObject, ULONG nPos) { - if (!mpDrawPg->IsInserted()) + if (!pObject->IsInserted()) { mpDrawPg->InsertObject(pObject, nPos); return true; @@ -876,9 +876,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, pRet = InsertOle(*((SdrOle2Obj*)pObject),aAttrSet); else { - SdrGrafObj* pGraphObject = 0; - pGraphObject = PTR_CAST(SdrGrafObj, pObject); - if( pGraphObject ) + if (SdrGrafObj* pGraphObject = PTR_CAST(SdrGrafObj, pObject)) { // Nun den Link bzw. die Grafik ins Doc stopfen const Graphic& rGraph = pGraphObject->GetGraphic(); @@ -925,6 +923,8 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, } } } + else + pRet = rDoc.Insert(*pPaM, *pObject, &aAttrSet); } // also nur, wenn wir ein *Insert* gemacht haben if (pRet) @@ -935,21 +935,23 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, if (pObject->HasSetName()) pRet->SetName(pObject->GetName()); else - aGrfNameGenerator.SetUniqueGraphName(pRet,aObjectName); + maGrfNameGenerator.SetUniqueGraphName(pRet,aObjectName); // Zeiger auf neues Objekt ermitteln und Z-Order-Liste // entsprechend korrigieren (oder Eintrag loeschen) - SdrObject* pOurNewObject = CreateContactObject(pRet); - if (pOurNewObject) + if (SdrObject* pOurNewObject = CreateContactObject(pRet)) { - pMSDffManager->ExchangeInShapeOrder( pObject, 0, 0, - pOurNewObject ); - - // altes SdrGrafObj aus der Page loeschen und - // zerstoeren - if (pObject->GetPage()) - pDrawPg->RemoveObject(pObject->GetOrdNum()); - delete pObject; + if (pOurNewObject != pObject) + { + pMSDffManager->ExchangeInShapeOrder( pObject, 0, 0, + pOurNewObject ); + + // altes SdrGrafObj aus der Page loeschen und + // zerstoeren + if (pObject->GetPage()) + pDrawPg->RemoveObject(pObject->GetOrdNum()); + delete pObject; + } } else pMSDffManager->RemoveFromShapeOrder( pObject ); @@ -961,7 +963,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, if (pTextObj && !bTextObjWasGrouped && pTextObj->GetPage()) pDrawPg->RemoveObject( pTextObj->GetOrdNum() ); } - pMSDffManager->EnableFallbackStream(); + pMSDffManager->EnableFallbackStream(); } else if (aPic.lcb >= 58) pRet = ImportGraf1(aPic, pDataStream, nPicLocFc); @@ -1041,3 +1043,5 @@ void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS, WW8_FSPA * pFSPA ) pFSPA->nTxbx = SVBT32ToLong( pFSPAS->nTxbx ); } #endif // defined __WW8_NEEDS_COPY + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index bfe106dcfc40..cd6912e468c8 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par.cxx,v $ * - * $Revision: 1.102 $ + * $Revision: 1.103 $ * - * last change: $Author: aidan $ $Date: 2002-12-10 15:51:51 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -228,6 +227,9 @@ #ifndef _UNODRAW_HXX #include <unodraw.hxx> #endif +#ifndef _SWTABLE_HXX +#include <swtable.hxx> // class SwTableLines, ... +#endif #ifndef _COM_SUN_STAR_I18N_FORBIDDENCHARACTERS_HPP_ #include <com/sun/star/i18n/ForbiddenCharacters.hpp> @@ -265,23 +267,19 @@ SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr ) UINT32 SwMSDffManager::GetFilterFlags() { - UINT32 nFlags = 0; - const OfaFilterOptions* pOpt = OFF_APP()->GetFilterOptions(); - if( pOpt->IsMathType2Math() ) - nFlags |= OLE_MATHTYPE_2_STARMATH; -/* - // !! don't convert the OLE-Object into the own format - if( pOpt->IsWinWord2Writer() ) - nFlags |= OLE_WINWORD_2_STARWRITER; -*/ - if( pOpt->IsExcel2Calc() ) - nFlags |= OLE_EXCEL_2_STARCALC; - if( pOpt->IsPowerPoint2Impress() ) - nFlags |= OLE_POWERPOINT_2_STARIMPRESS; + UINT32 nFlags(0); + if (const OfaFilterOptions* pOpt = OFF_APP()->GetFilterOptions()) + { + if (pOpt->IsMathType2Math()) + nFlags |= OLE_MATHTYPE_2_STARMATH; + if (pOpt->IsExcel2Calc()) + nFlags |= OLE_EXCEL_2_STARCALC; + if (pOpt->IsPowerPoint2Impress()) + nFlags |= OLE_POWERPOINT_2_STARIMPRESS; + } return nFlags; } - /* * I would like to override the default OLE importing to add a test * and conversion of OCX controls from their native OLE type into our @@ -771,8 +769,8 @@ void SwWW8ImplReader::ImportDop() { DateTime aLastPrinted( WW8ScannerBase::WW8DTTM2DateTime(pWDop->dttmLastPrint)); - SfxDocumentInfo* pNeuDocInf = new SfxDocumentInfo(*rDoc.GetpInfo()); - SfxStamp aPrinted(pNeuDocInf->GetPrinted()); + SfxDocumentInfo aNeuDocInf(*rDoc.GetpInfo()); + SfxStamp aPrinted(aNeuDocInf.GetPrinted()); if (aPrinted.GetTime() != aLastPrinted) { // check if WW8 date was set @@ -785,9 +783,8 @@ void SwWW8ImplReader::ImportDop() else aPrinted.SetTime( aLastPrinted ); - pNeuDocInf->SetPrinted( aPrinted ); - rDoc.SetInfo( *pNeuDocInf ); - delete pNeuDocInf; + aNeuDocInf.SetPrinted( aPrinted ); + rDoc.SetInfo(aNeuDocInf); } } @@ -879,12 +876,9 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) mpSFlyPara(pRdr->pSFlyPara), mpTableDesc(pRdr->pTableDesc), mnInTable(pRdr->nInTable), mnAktColl(pRdr->nAktColl), mcSymbol(pRdr->cSymbol), mbIgnoreText(pRdr->bIgnoreText), - mbDontCreateSep(pRdr->bDontCreateSep), mbSymbol(pRdr->bSymbol), - mbHdFtFtnEdn(pRdr->bHdFtFtnEdn), mbTxbxFlySection(pRdr->bTxbxFlySection), - mbAnl(pRdr->bAnl), mbInHyperlink(pRdr->bInHyperlink), - mbPgSecBreak(pRdr->bPgSecBreak), - //Honestly should inherit this from parent environment so don't reset this - mbVerticalEnviron(pRdr->bVerticalEnviron), + mbSymbol(pRdr->bSymbol), mbHdFtFtnEdn(pRdr->bHdFtFtnEdn), + mbTxbxFlySection(pRdr->bTxbxFlySection), mbAnl(pRdr->bAnl), + mbInHyperlink(pRdr->bInHyperlink), mbPgSecBreak(pRdr->bPgSecBreak), mbWasParaEnd(pRdr->bWasParaEnd), mbHasBorder(pRdr->bHasBorder) { pRdr->bHdFtFtnEdn = true; @@ -906,13 +900,17 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) // rette die Attributverwaltung: dies ist noetig, da der neu anzulegende // PLCFx Manager natuerlich auf die gleichen FKPs zugreift, wie der alte // und deren Start-End-Positionen veraendert... - pRdr->pPlcxMan->SaveAllPLCFx(maPLCFxSave); + if (pRdr->pPlcxMan) + pRdr->pPlcxMan->SaveAllPLCFx(maPLCFxSave); if (nStartCp != -1) { pRdr->pPlcxMan = new WW8PLCFMan(pRdr->pSBase, mpOldPlcxMan->GetManType(), nStartCp); } + + maOldApos.push_back(false); + maOldApos.swap(pRdr->maApos); } void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) @@ -923,13 +921,11 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) pRdr->cSymbol = mcSymbol; pRdr->bSymbol = mbSymbol; pRdr->bIgnoreText = mbIgnoreText; - pRdr->bDontCreateSep = mbDontCreateSep; pRdr->bHdFtFtnEdn = mbHdFtFtnEdn; pRdr->bTxbxFlySection = mbTxbxFlySection; pRdr->nInTable = mnInTable; pRdr->bAnl = mbAnl; pRdr->bInHyperlink = mbInHyperlink; - pRdr->bVerticalEnviron = mbVerticalEnviron; pRdr->bWasParaEnd = mbWasParaEnd; pRdr->bPgSecBreak = mbPgSecBreak; pRdr->nAktColl = mnAktColl; @@ -954,7 +950,9 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) delete pRdr->pPlcxMan; pRdr->pPlcxMan = mpOldPlcxMan; } - pRdr->pPlcxMan->RestoreAllPLCFx(maPLCFxSave); + if (pRdr->pPlcxMan) + pRdr->pPlcxMan->RestoreAllPLCFx(maPLCFxSave); + pRdr->maApos.swap(maOldApos); } void SwWW8ImplReader::Read_HdFtFtnText( const SwNodeIndex* pSttIdx, @@ -1044,38 +1042,17 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) return 0; } -//----------------------------------------- -// Header und Footer -//----------------------------------------- - -void SwWW8ImplReader::Read_HdFtText(long nStartCp, long nLen, SwPageDesc* pPD, - bool bUseLeft, bool bFooter) +void SwWW8ImplReader::Read_HdFtText(long nStart, long nLen, SwFrmFmt* pHdFtFmt) { - SwFrmFmt* pFmt = ( bUseLeft ) ? &pPD->GetLeft() : &pPD->GetMaster(); - SwFrmFmt* pHdFtFmt; - - if( bFooter ) - { - bIsFooter = true; - pFmt->SetAttr(SwFmtFooter(true)); - pHdFtFmt = (SwFrmFmt*)pFmt->GetFooter().GetFooterFmt(); - }else - { - bIsHeader = true; - pFmt->SetAttr(SwFmtHeader(true)); - pHdFtFmt = (SwFrmFmt*)pFmt->GetHeader().GetHeaderFmt(); - } - const SwNodeIndex* pSttIdx = pHdFtFmt->GetCntnt().GetCntntIdx(); if (!pSttIdx) return; SwPosition aTmpPos( *pPaM->GetPoint() ); // merke alte Cursorposition - Read_HdFtFtnText( pSttIdx, nStartCp, nLen - 1, MAN_HDFT ); + Read_HdFtFtnText(pSttIdx, nStart, nLen - 1, MAN_HDFT); *pPaM->GetPoint() = aTmpPos; - bIsHeader = bIsFooter = false; } BYTE SwWW8ImplReader::HdFtCorrectPara( BYTE nPara ) @@ -1084,7 +1061,8 @@ BYTE SwWW8ImplReader::HdFtCorrectPara( BYTE nPara ) long nLen; BYTE nNewPara = nPara; - for( BYTE nI = 0x20; nI; nI >>= 1 ) + for (BYTE nI = 0x20; nI; nI >>= 1) + { if( ( nI & nPara ) && pHdFt && ( !pHdFt->GetTextPos( nPara, nI, start, nLen ) || nLen <= 2 ) ) @@ -1092,13 +1070,15 @@ BYTE SwWW8ImplReader::HdFtCorrectPara( BYTE nPara ) { nNewPara &= ~nI; // leere KF-Texte nicht anlegen } + } // Wenn im Doc keine Facing Pages vorhanden sind, sollen // die geraden Header/Footer ignoriert werden. // Die Facing Pages lassen sich nur Doc-weit, // nicht aber abschnittsweise umschalten ! if( pWDop->fFacingPages ) - { // Wenn pDoc->FacingPages + { + // Wenn pDoc->FacingPages // if( nNewPara & WW8_HEADER_ODD ) // und ungerader Header vorhanden // nNewPara |= WW8_HEADER_EVEN; // ... dann muss auch ein gerader // Header erzeugt werden @@ -1112,7 +1092,8 @@ BYTE SwWW8ImplReader::HdFtCorrectPara( BYTE nPara ) return nNewPara; } -void SwWW8ImplReader::Read_HdFt1( BYTE nPara, BYTE nWhichItems, SwPageDesc* pPD ) +void SwWW8ImplReader::Read_HdFt(BYTE nWhichItems, int nSect, SwPageDesc* pPD, + const SwPageDesc *pPrev) { if( pHdFt ) { @@ -1121,83 +1102,73 @@ void SwWW8ImplReader::Read_HdFt1( BYTE nPara, BYTE nWhichItems, SwPageDesc* pPD BYTE nNumber = 5; for( BYTE nI = 0x20; nI; nI >>= 1, nNumber-- ) - if( nI & nWhichItems ) + { + if (nI & nWhichItems) { bool bOk = true; if( bVer67 ) - bOk = ( pHdFt->GetTextPos( nPara, nI, start, nLen ) && nLen >= 2 ); + bOk = ( pHdFt->GetTextPos( nWhichItems, nI, start, nLen ) && nLen >= 2 ); else { - pHdFt->GetTextPosExact(nNumber+ (nActSectionNo+1)*6, start, nLen); + pHdFt->GetTextPosExact(nNumber + (nSect+1)*6, start, nLen); bOk = ( 2 <= nLen ); } - if( bOk ) + + bool bUseLeft + = (nI & ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true: false; + bool bFooter + = (nI & ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD | WW8_FOOTER_FIRST )) ? true: false; + + SwFrmFmt* pFmt = bUseLeft ? &pPD->GetLeft() : &pPD->GetMaster(); + SwFrmFmt* pHdFtFmt; + if (bFooter) + { + bIsFooter = true; + pFmt->SetAttr(SwFmtFooter(true)); + pHdFtFmt = (SwFrmFmt*)pFmt->GetFooter().GetFooterFmt(); + } + else { - bool bUseLeft - = (nI & ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true: false; - bool bFooter - = (nI & ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD | WW8_FOOTER_FIRST )) ? true: false; - Read_HdFtText( start, nLen, pPD, bUseLeft, bFooter ); + bIsHeader = true; + pFmt->SetAttr(SwFmtHeader(true)); + pHdFtFmt = (SwFrmFmt*)pFmt->GetHeader().GetHeaderFmt(); } + + if (bOk) + Read_HdFtText(start, nLen, pHdFtFmt); + else if (!bOk && pPrev) + CopyPageDescHdFt(pPrev, pPD, nI); + + bIsHeader = bIsFooter = false; } + } } } -void SwWW8ImplReader::SetHdFt( SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, - BYTE nIPara ) +void wwSectionManager::SetHdFt(wwSection &rSection, int nSect, + const wwSection *pPrevious) { - - // Header / Footer nicht da oder StyleDef - if( !nCorrIhdt || ( pAktColl != 0 ) ) + // Header / Footer nicht da + if (!rSection.maSep.grpfIhdt) return; - long nOldDoc = pStrm->Tell( ); // WW-Scanner: alles retten - long nOldTbl = pTableStream->Tell(); // WW-Scanner: alles retten - WW8PLCFxSaveAll aSave; - pPlcxMan->SaveAllPLCFx( aSave ); // Attributverwaltung sichern - WW8PLCFMan* pOldPlcxMan = pPlcxMan; - - if( !pPageDesc1 ){ // 1 Pagedesc reicht - - Read_HdFt1( nIPara, - nCorrIhdt & ~( WW8_HEADER_FIRST | WW8_FOOTER_FIRST ), - pPageDesc0 ); - - }else{ // 2 Pagedescs noetig: 1.Seite und folgende - - - // 1. Seite einlesen - Read_HdFt1( nIPara, - nCorrIhdt & ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST ), - pPageDesc0 ); + ASSERT(rSection.mpPage, "makes no sense to call with a main page"); + if (rSection.mpPage) + { + // 1 Pagedesc reicht + mrReader.Read_HdFt( + rSection.maSep.grpfIhdt & ~(WW8_HEADER_FIRST | WW8_FOOTER_FIRST), + nSect, rSection.mpPage, pPrevious ? pPrevious->mpPage : 0); - // Folgeseiten einlesen - Read_HdFt1( nIPara, - nCorrIhdt & ~( WW8_HEADER_FIRST | WW8_FOOTER_FIRST ), - pPageDesc1 ); } - // dann WW-Scanner-Kram restoren - pPlcxMan = pOldPlcxMan; // Attributverwaltung restoren - pPlcxMan->RestoreAllPLCFx( aSave ); - pStrm->Seek( nOldDoc ); // FilePos dito (Sprms) - pTableStream->Seek( nOldTbl ); // FilePos dito (Sprms) -} - -//----------------------------------------- -// PageDescs -//----------------------------------------- - -void SwWW8ImplReader::SetLastPgDeskIdx() -{ - if( 0 == pWDop->epc // store NodeIndex for adding section when FT-/End-Note - || 2 == pWDop->fpc ) // found that shall be on end of section. + if (rSection.mpTitlePage) { - if( pLastPgDeskIdx ) - *pLastPgDeskIdx = pPaM->GetPoint()->nNode; - else - pLastPgDeskIdx = new SwNodeIndex( pPaM->GetPoint()->nNode ); - (*pLastPgDeskIdx)--; + // 2 Pagedescs noetig: 1.Seite und folgende + // 1. Seite einlesen + mrReader.Read_HdFt( + rSection.maSep.grpfIhdt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST), + nSect, rSection.mpTitlePage, pPrevious ? pPrevious->mpTitlePage : 0); } } @@ -1263,7 +1234,9 @@ void SwWW8ImplReader::AppendTxtNode(SwPosition& rPos) { //Give ourselves a leeway of 1 twip. if ((*pTabStop)[nI].GetTabPos() + pLR->GetTxtLeft() + 1 - >= nPgWidth-nPgRight-nPgLeft) + >= maSectionManager.GetPageWidth() + - maSectionManager.GetPageRight() + - maSectionManager.GetPageLeft()) { pPaM->SetMark(); pPaM->GetMark()->nContent-=nDiff; @@ -1281,131 +1254,41 @@ void SwWW8ImplReader::AppendTxtNode(SwPosition& rPos) pAnchorStck->Flush(); } -SwPageDesc* SwWW8ImplReader::CreatePageDesc(SwPageDesc* pFirstPageDesc, - SwPaM** ppPaMWanted) +USHORT SwWW8ImplReader::TabRowSprm(int nLevel) const { - ASSERT(pFirstPageDesc || ppPaMWanted, "!pFirstPageDesc but NO ppPaMWanted"); - - bool bFollow = ( pFirstPageDesc != 0 ); - SwPageDesc* pNewPD; - USHORT nPos; - - if( bFollow - && pFirstPageDesc->GetFollow() != pFirstPageDesc ) - return pFirstPageDesc; // Fehler: hat schon Follow - - // compose name of PageDescriptor - USHORT nPageDescCount = rDoc.GetPageDescCnt(); - nPos = rDoc.MakePageDesc( - ViewShell::GetShellRes()->GetPageDescName(nPageDescCount,false,bFollow), - bFollow ? pFirstPageDesc : 0, false); - - pNewPD = &rDoc._GetPageDesc( nPos ); - - if (bFollow) - { - // Dieser ist der folgende von pPageDesc - pFirstPageDesc->SetFollow( pNewPD ); - pNewPD->SetFollow( pNewPD ); - } - else - { - // setze PgDesc-Attr ins Doc - if (InAnyApo() || bTxbxFlySection) - { - // PageDesc *muss* ausserhalb des Apo stehen - if( pSFlyPara && pSFlyPara->pMainTextPos ) - { - SwPaM aMyPaM( *pSFlyPara->GetMainTextPos() ); - if( 1 < nPageDescCount ) - AppendTxtNode( *aMyPaM.GetPoint() ); - SwFmtCol* pCol; - RemoveCols( *pNewPD, pCol ); - rDoc.Insert( aMyPaM, SwFmtPageDesc( pNewPD ) ); - if( ppPaMWanted ) - *ppPaMWanted = new SwPaM( aMyPaM ); - if( pCol ) - { - InsertSectionWithWithoutCols( aMyPaM, pCol ); - delete pCol; - } - else - SetLastPgDeskIdx(); - } - } - else - { - if( 0 < pPaM->GetPoint()->nContent.GetIndex() ) - AppendTxtNode( *pPaM->GetPoint() ); - SwFmtCol* pCol; - RemoveCols( *pNewPD, pCol ); - if( ppPaMWanted ) - *ppPaMWanted = new SwPaM( *pPaM ); - - rDoc.Insert( *pPaM, SwFmtPageDesc( pNewPD ) ); - if( pCol ) - { - InsertSectionWithWithoutCols( *pPaM, pCol ); - delete pCol; - } - else - SetLastPgDeskIdx(); - } - } - return pNewPD; + if (bVer67) + return 25; + return nLevel ? 0x244C : 0x2417; } -// UpdatePageDescs muss am Ende des Einlesevorganges aufgerufen werden, damit -// der Writer den Inhalt der Pagedescs wirklich akzeptiert -void SwWW8ImplReader::UpdatePageDescs(USHORT nInPageDescOffset) +void SwWW8ImplReader::EndSpecial() { - USHORT i; - - // Pagedescriptoren am Dokument updaten (nur so werden auch die - // linken Seiten usw. eingestellt). - - // PageDesc "Standard" - rDoc.ChgPageDesc( 0, rDoc.GetPageDesc( 0 )); + // Frame / Table / Anl + if (bAnl) + StopAnl(); // -> bAnl = false - // PageDescs "Konvert..." - for ( i=nInPageDescOffset; i < rDoc.GetPageDescCnt(); i++ ) + while(maApos.size() > 1) { - const SwPageDesc* pPD = &rDoc.GetPageDesc( i ); - rDoc.ChgPageDesc( i, *pPD ); + StopTable(); + maApos.pop_back(); + --nInTable; + if (maApos[nInTable] == true) + StopApo(); } -} -USHORT SwWW8ImplReader::TabRowSprm(int nLevel) const -{ - if (bVer67) - return 25; - return nLevel ? 0x244C : 0x2417; + if (maApos[0] == true) + StopApo(); + + ASSERT(!nInTable, "unclosed table!"); } -bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync, - WW8_CP nStartCp) // Frame / Table / Anl +bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp) { + // Frame / Table / Anl if (bInHyperlink) return false; - *pbReSync = false; - if (bAllEnd) - { - if( bAnl ) - StopAnl(); // -> bAnl = false -#if 1 //revisit - ASSERT(!nInTable, "unclosed table!"); - ASSERT(maApos.size() == 1, "unclosed apo environments!"); -#else - if( nInTable && !bFtnEdn ) // Tabelle in FtnEdn nicht erlaubt - StopTable(); - if( bApo ) - StopApo(); - --nInTable; - bApo = false; -#endif - return false; - } + rbReSync = false; ASSERT(nInTable >= 0,"nInTable < 0!"); @@ -1455,7 +1338,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync, { WW8PLCFxSave1 aSave; pPlcxMan->GetPap()->Save( aSave ); - *pbReSync = true; + rbReSync = true; WW8PLCFx_Cp_FKP* pPap = pPlcxMan->GetPapPLCF(); WW8_CP nMyStartCp=nStartCp; @@ -1533,7 +1416,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync, maApos[nInTable] = StartApo(pSprm29, pNowStyleApo, pTabPos); // nach StartApo ist ein ReSync noetig ( eigentlich nur, falls die Apo // ueber eine FKP-Grenze geht - *pbReSync = true; + rbReSync = true; } if (bStartTab) { @@ -1547,7 +1430,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync, } // nach StartTable ist ein ReSync noetig ( eigentlich nur, falls die // Tabelle ueber eine FKP-Grenze geht - *pbReSync = true; + rbReSync = true; } return bTableRowEnd; } @@ -1750,7 +1633,11 @@ bool SwWW8ImplReader::ReadChars(long& rPos, long nNextAttr, long nTextEnd, while (true) { if (ReadPlainChars(rPos, nEnd, nCpOfs)) - return false; // Fertig, kein CR + { + if (!maApos.back()) //a para end in apo doesn't count + bWasParaEnd = false; //kein CR + return false; // Fertig + } bool bStartLine = ReadChar(rPos, nCpOfs); rPos++; @@ -1761,6 +1648,7 @@ bool SwWW8ImplReader::ReadChars(long& rPos, long nNextAttr, long nTextEnd, bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) { + bool bNewParaEnd = false; // Unicode-Flag neu setzen und notfalls File-Pos korrigieren // merke: Seek kostet nicht viel, da inline geprueft wird, // ob die korrekte FilePos nicht schon erreicht ist. @@ -1821,6 +1709,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) } break; case 0x7: + bNewParaEnd = true; TabCellEnd(); // table cell end (Flags abfragen!) break; case 0xf: @@ -1921,7 +1810,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) } break; case 0xd: - bRet = true; + bNewParaEnd = bRet = true; if (nInTable > 1) { WW8PLCFspecial* pTest = pPlcxMan->GetMagicTables(); @@ -1955,6 +1844,8 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) RTL_TEXTENCODING_MS_1252 ); AddTextToParagraph(sInsert); } + if (!maApos.back()) //a para end in apo doesn't count + bWasParaEnd = bNewParaEnd; return bRet; } @@ -1982,8 +1873,7 @@ void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes, { bool bReSync; // Frame / Table / Autonumbering List Level - bTabRowEnd = ProcessSpecial(false, &bReSync, - rRes.nAktCp + pPlcxMan->GetCpOfs() ); + bTabRowEnd = ProcessSpecial(bReSync, rRes.nAktCp+pPlcxMan->GetCpOfs()); if( bReSync ) *pStartAttr = pPlcxMan->Get( &rRes ); // hole Attribut-Pos neu } @@ -2009,7 +1899,8 @@ long SwWW8ImplReader::ReadTextAttr(long& rTxtPos, bool& rbStartLine) if (aRes.nFlags & MAN_MASK_NEW_SEP) // neue Section { ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode"); - CreateSep( rTxtPos, bPgSecBreak ); // PageDesc erzeugen und fuellen + // PageDesc erzeugen und fuellen + maSectionManager.CreateSep(rTxtPos, bPgSecBreak); // -> 0xc war ein Sectionbreak, aber // kein Pagebreak; bPgSecBreak = false; // PageDesc erzeugen und fuellen @@ -2027,7 +1918,6 @@ long SwWW8ImplReader::ReadTextAttr(long& rTxtPos, bool& rbStartLine) // position of last CP that's to be ignored long nSkipPos = -1; - bool bOldDontCreateSep = bDontCreateSep; if( 0 < aRes.nSprmId ) // leere Attrs ignorieren { @@ -2064,7 +1954,7 @@ long SwWW8ImplReader::ReadTextAttr(long& rTxtPos, bool& rbStartLine) pStrm->Seek(pSBase->WW8Cp2Fc( pPlcxMan->GetCpOfs() + rTxtPos, &bIsUnicode)); // Find next Attr position (and Skip attributes of field contents if needed) - if( nSkipChars && !bIgnoreText ) + if (nSkipChars && !bIgnoreText) pCtrlStck->MarkAllAttrsOld(); bool bOldIgnoreText = bIgnoreText; bIgnoreText = true; @@ -2085,7 +1975,6 @@ long SwWW8ImplReader::ReadTextAttr(long& rTxtPos, bool& rbStartLine) } while( nSkipPos >= nNext ); bIgnoreText = bOldIgnoreText; - bDontCreateSep = bOldDontCreateSep; if( nSkipChars ) { pCtrlStck->KillUnlockedAttrs( *pPaM->GetPoint() ); @@ -2139,8 +2028,7 @@ void SwWW8ImplReader::CloseAttrEnds() aStack.pop(); } - bool bDummyReSync; - ProcessSpecial(true, &bDummyReSync, -1); + EndSpecial(); } bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) @@ -2166,28 +2054,6 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) pStrm->Seek( pSBase->WW8Cp2Fc( nStartCp + nCpOfs, &bIsUnicode ) ); - if ( (0 == nStartCp+nCpOfs) && SetCols(0, pPlcxMan->GetSepPLCF(), 0, true) ) - { - // Start of text: - // - // look for cols and insert a section at the very beginning... - if( !pPageDesc ) - pPageDesc = &rDoc._GetPageDesc( 0 ); - SwFrmFmt &rFmt = pPageDesc->GetMaster(); - USHORT nLIdx = ( ( pWwFib->lid & 0xff ) == 0x9 ) ? 1 : 0; - SetPage1( pPageDesc, rFmt, pPlcxMan->GetSepPLCF(), nLIdx, false); - const SwFmtCol& rCol = rFmt.GetCol(); - // if PageDesc has been inserted and has cols - // insert a *section* with cols instead - if( rCol.GetNumCols() ) - { - InsertSectionWithWithoutCols( *pPaM, &rCol ); - // remove columns from PageDesc - SwFmtCol aCol; - rFmt.SetAttr( aCol ); - } - } - WW8_CP l = nStartCp; while ( l<nStartCp+nTextLen ) { @@ -2198,7 +2064,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) if( l>= nStartCp + nTextLen ) break; - bStartLine = bWasParaEnd = ReadChars(l, nNext, nStartCp+nTextLen, nCpOfs); + bStartLine = ReadChars(l, nNext, nStartCp+nTextLen, nCpOfs); if (bStartLine) // Zeilenende AppendTxtNode(*pPaM->GetPoint()); @@ -2217,7 +2083,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) // pagebreak then look it up to see if it is a section break, and // if it is not then insert a page break. If it is a section break // it will be handled as such in the ReadAttrs of the next loop - if( bPgSecBreak) + if (bPgSecBreak) { // We need only to see if a section is ending at this cp, // the plcf will already be sitting on the correct location @@ -2228,29 +2094,8 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) pPlcxMan->GetSepPLCF()->GetSprms(&aTemp); if ((aTemp.nStartPos != l) && (aTemp.nEndPos != l)) { - /* - #74468#, ##515## - Insert additional node only WHEN the Pagebreak is contained in - a NODE that is NOT EMPTY. Word can have empty paragraphs with - numbering information before a section break that are not - closed before the section break. In this case they are ignored - and not numbered, this is 74468's problem. But word can have - open paragraphs that only contain a node that in word can be - anchored, i.e. a single character indicating that a graphic or - an ole node or a text box is anchored here. In this case then - we should close the paragraph to ensure that it is is anchored - to the current page, and not pushed to the next page, this is - 515's problem. nLastFlyNode is set on insertion of 0x01 and - 0x08 graphics as well as on insertion of old ww6 textboxes. - */ - SwPosition& rPt = *pPaM->GetPoint(); - if ( (nLastFlyNode == rPt.nNode.GetIndex()) - || (0 < rPt.nContent.GetIndex()) ) - { - AppendTxtNode( rPt ); - } - - rDoc.Insert( *pPaM, SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE ) ); +// AppendTxtNode(*pPaM->GetPoint()); + rDoc.Insert(*pPaM, SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE)); bPgSecBreak = false; } } @@ -2262,10 +2107,8 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) CloseAttrEnds(); if (!bInHyperlink) bJoined = JoinNode(*pPaM); - if( nType == MAN_MAINTEXT ) - UpdatePageDescs( nPageDescOffset ); // muss passieren, solange es den // PlcxMan noch gibt - DELETEZ( pPlcxMan ); + delete pPlcxMan, pPlcxMan = 0; return bJoined; } @@ -2276,9 +2119,9 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) SwWW8ImplReader::SwWW8ImplReader(BYTE nVersionPara, SvStorage* pStorage, SvStream* pSt, SwDoc& rD, bool bNewDoc) : pStg(pStorage), pStrm(pSt), pTableStream(0), pDataStream(0), rDoc(rD), - aGrfNameGenerator(bNewDoc,String('G')), pMSDffManager(0), mpAtnNames(0), - pAuthorInfos(0), pOleMap(0), pTabNode(0), pLastPgDeskIdx(0), - mbNewDoc(bNewDoc) + maSectionManager(*this), maSectionNameGenerator(rD,CREATE_CONST_ASC("WW")), + maGrfNameGenerator(bNewDoc,String('G')), pMSDffManager(0), mpAtnNames(0), + pAuthorInfos(0), pOleMap(0), pTabNode(0), mbNewDoc(bNewDoc) { pStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); nWantedVersion = nVersionPara; @@ -2303,29 +2146,22 @@ SwWW8ImplReader::SwWW8ImplReader(BYTE nVersionPara, SvStorage* pStorage, nObjLocFc = nPicLocFc = 0; nInTable=0; bReadNoTbl = bPgSecBreak = bSpec = bObj = bTxbxFlySection - = bHasBorder = bSymbol = bIgnoreText = bDontCreateSep + = bHasBorder = bSymbol = bIgnoreText = bWasTabRowEnd = false; bShdTxtCol = bCharShdTxtCol = bAnl = bHdFtFtnEdn = bFtnEdn - = bIsHeader = bIsFooter = bSectionHasATitlePage - = bIsUnicode = bCpxStyle = bStyNormal = bWWBugNormal = false; + = bIsHeader = bIsFooter = bIsUnicode = bCpxStyle = bStyNormal = + bWWBugNormal = false; bNoAttrImport = bPgChpLevel = bEmbeddObj = false; bAktAND_fNumberAcross = false; bNoLnNumYet = true; - bRestartLnNumPerSection = false; bInHyperlink = false; - bVerticalEnviron = false; bWasParaEnd = false; nProgress = 0; - nPgWidth = lA4Width; - nPgLeft = nPgRight = nPgTop = MM_250; - nCorrIhdt = 0; nSwNumLevel = nWwNumType = 0xff; pTableDesc = 0; pNumRule = 0; pNumOlst = 0; - pAfterSection = 0; - pLastInsertedSection = 0; pNode_FLY_AT_CNTNT = 0; pDrawModel = 0; pDrawPg = 0; @@ -2342,11 +2178,9 @@ SwWW8ImplReader::SwWW8ImplReader(BYTE nVersionPara, SvStorage* pStorage, nLFOPosition = USHRT_MAX; nListLevel = WW8ListManager::nMaxLevel; - mbRTLPgn = false; eHardCharSet = RTL_TEXTENCODING_DONTKNOW; - pPageDesc = 0; - nNfcPgn = nPgChpDelim = nPgChpLevel = 0; + nPgChpDelim = nPgChpLevel = 0; maApos.push_back(false); } @@ -2365,6 +2199,231 @@ void SwWW8ImplReader::DeleteStk(SwFltControlStack* pStck) } } +void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection, + bool bTitlePage, bool bIgnoreCols) +{ + SwPageDesc &rPage = bTitlePage ? *rSection.mpTitlePage : *rSection.mpPage; + + SetNumberingType(rSection, rPage); + + SwFrmFmt &rFmt = rPage.GetMaster(); + mrReader.SetDocumentGrid(rFmt, rSection); + + wwULSpaceData aULData; + GetPageULData(rSection, bTitlePage, aULData); + SetPageULSpaceItems(rFmt, aULData); + + SetPage(rPage, rFmt, rSection, bIgnoreCols); +} + +void wwSectionManager::SetUseOn(wwSection &rSection) +{ + bool bEven = (rSection.maSep.grpfIhdt & (WW8_HEADER_EVEN|WW8_FOOTER_EVEN)) ? + true : false; + + UseOnPage eUseBase = mrReader.pWDop->fMirrorMargins ? PD_MIRROR : PD_ALL; + UseOnPage eUse = eUseBase; + if (!bEven) + eUse = (UseOnPage)(eUse | PD_HEADERSHARE | PD_FOOTERSHARE); + + ASSERT(rSection.mpPage, "Makes no sense to call me with no pages to set"); + if (rSection.mpPage) + rSection.mpPage->WriteUseOn(eUse); + if (rSection.mpTitlePage) + { + rSection.mpTitlePage->WriteUseOn( + (UseOnPage) (eUseBase | PD_HEADERSHARE | PD_FOOTERSHARE)); + } +} + +void wwSectionManager::InsertSegments(bool bIsNewDoc) +{ + sal_uInt16 nDesc(0); + mySegIter aEnd = maSegments.end(); + mySegIter aStart = maSegments.begin(); + for (mySegIter aIter = aStart; aIter != aEnd; ++aIter) + { + mySegIter aNext = aIter+1; + + bool bInsertSection = aIter != aStart ? aIter->IsContinous() : false; + + if (!bInsertSection) + { + /* + If a cont section follow this section then we won't be + creating a page desc with 2+ cols as we cannot host a one + col section in a 2+ col pagedesc and make it look like + word. But if the current section actually has columns then + we are forced to insert a section here as well as a page + descriptor. + */ + + /* + Note for the future: + If we want to import "protected sections" the here is + where we would also test for that and force a section + insertion if that was true. + */ + bool bIgnoreCols = false; + if (aNext != aEnd && aNext->IsContinous()) + { + bIgnoreCols = true; + if (aIter->NoCols() > 1) + bInsertSection = true; + } + + if (aIter->maSep.fTitlePage) + { + if (bIsNewDoc && aIter == aStart) + { + aIter->mpTitlePage = + mrReader.rDoc.GetPageDescFromPool(RES_POOLPAGE_FIRST); + } + else + { + USHORT nPos = mrReader.rDoc.MakePageDesc( + ViewShell::GetShellRes()->GetPageDescName(nDesc) + , 0, false); + aIter->mpTitlePage = &mrReader.rDoc._GetPageDesc(nPos); + } + ASSERT(aIter->mpTitlePage, "no page!"); + if (!aIter->mpTitlePage) + continue; + + SetSegmentToPageDesc(*aIter, true, bIgnoreCols); + } + + if (bIsNewDoc && aIter == aStart) + { + aIter->mpPage = + mrReader.rDoc.GetPageDescFromPool(RES_POOLPAGE_STANDARD); + } + else + { + USHORT nPos = mrReader.rDoc.MakePageDesc( + ViewShell::GetShellRes()->GetPageDescName(nDesc, + false, aIter->maSep.fTitlePage), + aIter->mpTitlePage, false); + aIter->mpPage = &mrReader.rDoc._GetPageDesc(nPos); + } + ASSERT(aIter->mpPage, "no page!"); + if (!aIter->mpPage) + continue; + + const wwSection *pPrevious = 0; + if (aIter != aStart) + pPrevious = &(*(aIter-1)); + SetHdFt(*aIter, std::distance(aStart, aIter), pPrevious); + SetUseOn(*aIter); + + if (aIter->mpTitlePage) + SetSegmentToPageDesc(*aIter, true, bIgnoreCols); + SetSegmentToPageDesc(*aIter, false, bIgnoreCols); + + SwFmtPageDesc aPgDesc(aIter->maSep.fTitlePage ? + aIter->mpTitlePage : aIter->mpPage); + + if (aIter->mpTitlePage) + aIter->mpTitlePage->SetFollow(aIter->mpPage); + + if (aIter->PageRestartNo()) + aPgDesc.SetNumOffset(aIter->PageStartAt()); + + /* + If its a table here, apply the pagebreak to the table + properties, otherwise we add it to the para at this + position + */ + if (aIter->maStart.GetNode().IsTableNode()) + { + SwTable& rTable = + aIter->maStart.GetNode().GetTableNode()->GetTable(); + SwFrmFmt* pApply = rTable.GetFrmFmt(); + ASSERT(pApply, "impossible"); + if (pApply) + pApply->SetAttr(aPgDesc); + } + else + { + SwPosition aPamStart(aIter->maStart); + aPamStart.nContent.Assign( + aIter->maStart.GetNode().GetCntntNode(), 0); + SwPaM aPage(aPamStart); + + mrReader.rDoc.Insert(aPage, aPgDesc); + } + ++nDesc; + } + + SwTxtNode* pTxtNd = 0; + if (bInsertSection) + { + SwPaM aSectPaM(*mrReader.pPaM); + SwNodeIndex aAnchor(aSectPaM.GetPoint()->nNode); + if (aNext != aEnd) + { + aAnchor = aNext->maStart; + aSectPaM.GetPoint()->nNode = aAnchor; + aSectPaM.GetPoint()->nContent.Assign( + aNext->maStart.GetNode().GetCntntNode(), 0); + aSectPaM.Move(fnMoveBackward); + } + + const SwPosition* pPos = aSectPaM.GetPoint(); + const SwTxtNode* pSttNd = + mrReader.rDoc.GetNodes()[ pPos->nNode ]->GetTxtNode(); + const SwTableNode* pTableNd = pSttNd ? pSttNd->FindTableNode() : 0; + if (pTableNd) + { + pTxtNd = + mrReader.rDoc.GetNodes().MakeTxtNode(aAnchor, + mrReader.rDoc.GetTxtCollFromPool( RES_POOLCOLL_TEXT )); + + aSectPaM.GetPoint()->nNode = SwNodeIndex(*pTxtNd); + aSectPaM.GetPoint()->nContent.Assign( + aSectPaM.GetCntntNode(), 0); + } + + aSectPaM.SetMark(); + + aSectPaM.GetPoint()->nNode = aIter->maStart; + aSectPaM.GetPoint()->nContent.Assign( + aSectPaM.GetCntntNode(), 0); + + SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter); + //The last section if continous is always unbalanced + if (aNext == aEnd && pRet) + pRet->SetAttr(SwFmtNoBalancedColumns(true)); + } + + if (pTxtNd) + { + SwNodeIndex aIdx(*pTxtNd); + SwPosition aPos(aIdx); + SwPaM aTest(aPos); + mrReader.rDoc.DelFullPara(aTest); + pTxtNd = 0; + } + } +} + +void SwWW8ImplReader::StoreMacroCmds() +{ + if (pWwFib->lcbCmds) + { + pTableStream->Seek(pWwFib->fcCmds); + + SvStorageRef xDestRoot(rDoc.GetDocShell()->GetStorage()); + SvStorageStreamRef xDestStream = + xDestRoot->OpenStream(CREATE_CONST_ASC(SL::aMSMacroCmds)); + + sal_uInt8 *pBuffer = new sal_uInt8[pWwFib->lcbCmds]; + pTableStream->Read(pBuffer, pWwFib->lcbCmds); + xDestStream->Write(pBuffer, pWwFib->lcbCmds); + delete[] pBuffer; + } +} + ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) { ULONG nErrRet = 0; @@ -2386,7 +2445,7 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) pAnchorStck = new SwWW8FltAnchorStack(&rDoc, nFieldFlags); - nPageDescOffset = rDoc.GetPageDescCnt(); + sal_uInt16 nPageDescOffset = rDoc.GetPageDescCnt(); SwNodeIndex aSttNdIdx( rDoc.GetNodes() ); SwRelNumRuleSpaces aRelNumRule(rDoc, mbNewDoc); @@ -2425,6 +2484,7 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) // praktische Hilfsvariablen besetzen: bVer67 = ( (6 == pWwFib->nVersion) || (7 == pWwFib->nVersion) ); // z.B.: altes Sprm-Id-Format! + bVer6 = (6 == pWwFib->nVersion); bVer7 = (7 == pWwFib->nVersion); bVer8 = (8 == pWwFib->nVersion); @@ -2665,12 +2725,6 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) ::SetProgressState( nProgress, rDoc.GetDocShell() ); // Update - if (pCollA) - { - SetOutLineStyles(); - delete[] pCollA; - } - if (pDrawPg && pMSDffManager && pMSDffManager->GetShapeOrders()) { // Hilfsarray zum Verketten der (statt SdrTxtObj) eingefuegten @@ -2707,10 +2761,8 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) { SvxMSDffShapeOrder *pNextOrder = aTxBxSort.GetObject(nTxBxNum+1); - if( (0xFFFF0000 & pOrder->nTxBxComp) - == (0xFFFF0000 & pNextOrder->nTxBxComp) - && pOrder->nHdFtSection - == pNextOrder->nHdFtSection ) + if ((0xFFFF0000 & pOrder->nTxBxComp) + == (0xFFFF0000 & pNextOrder->nTxBxComp)) pNextFlyFmt = pNextOrder->pFly; } // ggfs. Vorgaenger ermitteln @@ -2718,15 +2770,13 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) { SvxMSDffShapeOrder *pPrevOrder = aTxBxSort.GetObject(nTxBxNum-1); - if( (0xFFFF0000 & pOrder->nTxBxComp) - == (0xFFFF0000 & pPrevOrder->nTxBxComp) - && pOrder->nHdFtSection - == pPrevOrder->nHdFtSection ) + if ((0xFFFF0000 & pOrder->nTxBxComp) + == (0xFFFF0000 & pPrevOrder->nTxBxComp)) pPrevFlyFmt = pPrevOrder->pFly; } // Falls Nachfolger oder Vorgaenger vorhanden, // die Verkettung am Fly-Frame-Format eintragen - if( pNextFlyFmt || pPrevFlyFmt ) + if (pNextFlyFmt || pPrevFlyFmt) { aChain.SetNext( pNextFlyFmt ); aChain.SetPrev( pPrevFlyFmt ); @@ -2744,7 +2794,7 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) eMode |= REDLINE_ON; if( pWDop->fRMView ) eMode |= REDLINE_SHOW_DELETE; - if(pStg && !pGloss) /*meaningless for a glossary, cmc*/ + if (pStg && !pGloss) /*meaningless for a glossary, cmc*/ { const OfaFilterOptions* pVBAFlags = OFF_APP()->GetFilterOptions(); @@ -2756,9 +2806,19 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) int nRet = aVBasic.Import( s1, s2 ); if( 2 & nRet ) rDoc.SetContainsMSVBasic(true); + + StoreMacroCmds(); } } + maSectionManager.InsertSegments(mbNewDoc); + + if (pCollA) + { + SetOutLineStyles(); + delete[] pCollA; + } + DELETEZ( pStyles ); if( pFormImpl ) @@ -2768,13 +2828,12 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) DELETEZ( pHdFt ); DELETEZ( pLstManager ); DELETEZ( pSBase ); - DELETEZ( pWDop ); + delete pWDop; DELETEZ( pFonts ); delete mpAtnNames; DELETEZ( pAuthorInfos ); DELETEZ( pOleMap ); DELETEZ( pTabNode ); - DELETEZ( pLastPgDeskIdx ); delete mpSprmParser; ::EndProgress( rDoc.GetDocShell() ); } @@ -2783,15 +2842,15 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) } if (!pGloss) - DELETEZ( pWwFib ); + DELETEZ(pWwFib); DeleteCtrlStk(); mpRedlineStack->closeall(*pPaM->GetPoint()); delete mpRedlineStack; DeleteAnchorStk(); DeleteRefStk(); - aRelNumRule.SetNumRelSpaces( rDoc ); - if( !mbNewDoc && !nErrRet && aSttNdIdx.GetIndex() ) + aRelNumRule.SetNumRelSpaces(rDoc); + if (!mbNewDoc && !nErrRet && aSttNdIdx.GetIndex()) { aSttNdIdx++; aRelNumRule.SetOultineRelSpaces( aSttNdIdx, @@ -2804,36 +2863,9 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) if (mbNewDoc) rDoc.SetRedlineMode( eMode ); - //If there is no content after the end of the final section, we want to delete - //the final node and turn the column balancing off. All sections but the last - //one, have column balancing turned on unless NoColumnBalancing is set in - //MS Office's compatibility options. - if (pAfterSection) - { - // set NoBallanced flag on last inserted section and remove the trailing - // para that inserting the section pushed after the PaM - if(pLastInsertedSection || pPageDesc) - { - SwSectionFmt *pFmt = pLastInsertedSection->GetFmt(); - pFmt->SetAttr(SwFmtNoBalancedColumns(true)); - } - if (mbNewDoc) - { - //Needed to unlock last node so that we can delete it without - //giving writer a fit. Necessary for deleting the para after a - //section. - rPaM.GetBound(true).nContent.Assign( 0, 0 ); - rPaM.GetBound(false).nContent.Assign( 0, 0 ); - - pPaM->SetMark(); - pPaM->GetPoint()->nNode = *pAfterSection; - pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0); + UpdatePageDescs(rDoc, nPageDescOffset); - rDoc.DeleteAndJoin(*pPaM); - } - delete pAfterSection; - } - DELETEZ(pPaM); + delete pPaM, pPaM = 0; return nErrRet; } @@ -3308,3 +3340,4 @@ bool SwWW8ImplReader::InEqualApo(int nLvl) const return maApos[nLvl]; } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index f0e37ffd8ebf..e742126bac42 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par.hxx,v $ * - * $Revision: 1.106 $ + * $Revision: 1.107 $ * - * last change: $Author: aidan $ $Date: 2002-12-10 15:51:51 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8PAR_HXX @@ -75,6 +74,9 @@ #ifndef _MSOCXIMEX_HXX #include <svx/msocximex.hxx> #endif +#ifndef _SVX_FRMDIR_HXX +#include <svx/frmdir.hxx> +#endif #ifndef _FLTSHELL_HXX #include <fltshell.hxx> // fuer den Attribut Stack @@ -163,12 +165,9 @@ class GDIMetaFile; struct ESelection; class SfxItemSet; struct WW8PLCFxDesc; - -class SdrAttrObj; -struct WW8ULSpaceData; class _ReadFieldParams; +class SdrAttrObj; class wwZOrderer; - namespace com{namespace sun {namespace star{ namespace beans{ class XPropertySet;} namespace form { class XFormComponent;} @@ -421,6 +420,7 @@ class WW8ReaderSave private: WW8PLCFxSaveAll maPLCFxSave; SwPosition maTmpPos; + std::deque<bool> maOldApos; SwWW8FltControlStack* mpOldStck; SwWW8FltAnchorStack* mpOldAnchorStck; wwRedlineStack *mpOldRedlines; @@ -432,14 +432,12 @@ private: USHORT mnAktColl; sal_Unicode mcSymbol; bool mbIgnoreText; - bool mbDontCreateSep; bool mbSymbol; bool mbHdFtFtnEdn; bool mbTxbxFlySection; bool mbAnl; bool mbInHyperlink; bool mbPgSecBreak; - bool mbVerticalEnviron; bool mbWasParaEnd; bool mbHasBorder; public: @@ -583,6 +581,97 @@ public: void EnableFallbackStream(); }; +class wwSection +{ +public: + wwSection(const SwPosition &rPos); + SEPr maSep; + WW8_BRC brc[4]; + SwNodeIndex maStart; + SwSection *mpSection; + SwPageDesc *mpTitlePage; + SwPageDesc *mpPage; + SvxFrameDirection meDir; + + short nPgWidth; + short nPgLeft; + short nPgRight; + + BYTE mnBorders; + bool mbHasFootnote; + void SetDirection(); + bool DoesContainFootnote() const { return mbHasFootnote; } + bool IsContinous() const { return maSep.bkc == 0; } + bool IsVertical() const; + long NoCols() const { return maSep.ccolM1 + 1; } + long StandardColSeperation() const { return maSep.dxaColumns; } + bool HasTitlePage() const { return maSep.fTitlePage ? true : false; } + long PageStartAt() const { return maSep.pgnStart; } + bool PageRestartNo() const { return maSep.fPgnRestart ? true : false; } + bool IsBiDi() const { return maSep.fBiDi ? true : false; } + sal_uInt16 GetPageWidth() const { return nPgWidth; } + sal_uInt16 GetPageHeight() const { return maSep.yaPage; } + sal_uInt16 GetPageLeft() const { return nPgLeft; } + sal_uInt16 GetPageRight() const { return nPgRight; } + bool IsLandScape() const { return maSep.dmOrientPage ? true : false; } +}; + +class wwSectionManager +{ +private: + /* + A queue of the ms sections in the document + */ + SwWW8ImplReader& mrReader; + std::deque<wwSection> maSegments; + typedef ::std::deque<wwSection>::iterator mySegIter; + typedef ::std::deque<wwSection>::reverse_iterator mySegrIter; + + struct wwULSpaceData + { + bool bHasHeader, bHasFooter; + short nSwHLo, nHdUL, nSwFUp, nFtUL, nSwUp, nSwLo; + wwULSpaceData() : bHasHeader(false), bHasFooter(false) {} + }; + + void SetSegmentToPageDesc(const wwSection &rSection, bool bTitlePage, + bool bIgnoreCols); + + void GetPageULData(const wwSection &rNewSection, bool bFirst, + wwULSpaceData& rData); + void SetPageULSpaceItems(SwFrmFmt &rFmt, wwULSpaceData& rData); + + void SetPage(SwPageDesc &rPageDesc, SwFrmFmt &rFmt, + const wwSection &rSection, bool bIgnoreCols); + + void SetNumberingType(const wwSection &rNewSection, SwPageDesc &rPageDesc); + + void SetUseOn(wwSection &rSection); + void SetHdFt(wwSection &rSection, int nSect, const wwSection *pPrevious); + + SwSectionFmt *InsertSection(SwPaM& rMyPaM, wwSection &rSection); + bool SetCols(SwFrmFmt &rFmt, const wwSection &rSection, USHORT nNettoWidth); + void SetLeftRight(wwSection &rSection); + + //No copying + wwSectionManager(const wwSectionManager&); + wwSectionManager& operator=(const wwSectionManager&); +public: + wwSectionManager(SwWW8ImplReader &rReader) : mrReader(rReader) + {}; + void SetCurrentSectionHasFootnote(); + bool CurrentSectionIsVertical() const; + void PrependedInlineNode(const SwPosition &rPos, const SwNode &rNode); + USHORT CurrentSectionColCount() const; + bool WillHavePageDescHere(SwNodeIndex aIdx) const; + void CreateSep(const long nTxtPos, bool bMustHaveBreak); + void InsertSegments(bool bIsNewDoc); + void JoinNode(const SwPosition &rPos, const SwNode &rNode); + short GetPageLeft() const; + short GetPageRight() const; + short GetPageWidth() const; +}; + class wwFrameNamer { private: @@ -599,6 +688,22 @@ public: { } }; +class wwSectionNamer +{ +private: + const SwDoc &mrDoc; + String msFileLinkSeed; + int mnFileSectionNo; + //No copying + wwSectionNamer(const wwSectionNamer&); + wwSectionNamer& operator=(const wwSectionNamer&); +public: + String UniqueName(); + wwSectionNamer(const SwDoc &rDoc, const String &rSeed) + : mrDoc(rDoc), msFileLinkSeed(rSeed), mnFileSectionNo(0) + { } +}; + //----------------------------------------- // Storage-Reader //----------------------------------------- @@ -614,6 +719,7 @@ friend class WW8FlySet; friend class SwMSDffManager; friend class SwWW8FltControlStack; friend class WW8FormulaControl; +friend class wwSectionManager; SvStorage* pStg; // Input-Storage SvStream* pStrm; // Input-(Storage)Stream @@ -661,6 +767,16 @@ friend class WW8FormulaControl; typedef std::deque<USHORT>::const_iterator mycFieldIter; /* + A queue of the ms sections in the document + */ + wwSectionManager maSectionManager; + + /* + Creates unique names to give to (file link) sections (WW1/WW2/...) + */ + wwSectionNamer maSectionNameGenerator; + + /* Knows how to split a series of bytes into sprms and their arguments */ wwSprmParser *mpSprmParser; @@ -668,7 +784,7 @@ friend class WW8FormulaControl; /* Creates unique names to give to graphics */ - wwFrameNamer aGrfNameGenerator; + wwFrameNamer maGrfNameGenerator; /* Stack of textencoding being used as we progress through the document text @@ -705,7 +821,6 @@ friend class WW8FormulaControl; const SwTxtFmtColl* pDfltTxtFmtColl; // Default SwFmt* pStandardFmtColl;// "Standard" - SwPageDesc* pPageDesc; // fuer uebernommene KF-Zeilen WW8PLCF_HdFt* pHdFt; // Pointer auf Header / Footer - Scannerklasse WW8FlyPara* pWFlyPara; // WW-Parameter @@ -717,8 +832,6 @@ friend class WW8FormulaControl; SwNumRule* pNumRule; // fuer Nummerierung / Aufzaehlungen im Text WW8_OLST* pNumOlst; // Gliederung im Text - SwNodeIndex* pAfterSection; - SwSection* pLastInsertedSection; // last Section that was inserted into the doc SwNode* pNode_FLY_AT_CNTNT; // set: WW8SwFlyPara() read: CreateSwTable() @@ -745,9 +858,6 @@ friend class WW8FormulaControl; SwNodeIndex *pTabNode; xub_StrLen nTabCntnt; - SwNodeIndex* pLastPgDeskIdx;// for inserting a section when Ft-/End-Note - // with flag 'on end of section' set - // Ini-Flags: ULONG nIniFlags; // Flags aus der writer.ini ULONG nIniFlags1; // dito ( zusaetzliche Flags ) @@ -772,18 +882,12 @@ friend class WW8FormulaControl; USHORT nProgress; // %-Angabe fuer Progressbar USHORT nColls; // Groesse des Arrays USHORT nAktColl; // gemaess WW-Zaehlung - USHORT nPageDescOffset; // fuer UpdatePageDescs USHORT nDrawTxbx; // Nummer der Textbox ( noetig ?? ) USHORT nFldNum; // laufende Nummer dafuer USHORT nLFOPosition; - short nActSectionNo; // aktuelle Abschnitts-Nummer (in CreateSep() gesetzt) short nCharFmt; // gemaess WW-Zaehlung, <0 fuer keine short nAlign2; - short nPgWidth; - short nPgTop; // fuer APOs - short nPgLeft; // Seitenraender, z.B. fuer APOs, Tabellen - short nPgRight; // dito short nLeftParaMgn; // Absatz L-Space short nTxtFirstLineOfst; // Absatz 1st line ofset @@ -803,14 +907,9 @@ friend class WW8FormulaControl; sal_Int8 nDrawHeaven, nDrawHell; BYTE nListLevel; - BYTE nNfcPgn; // Formatting of PageNum - bool mbRTLPgn; // Direction of page BYTE nPgChpDelim; // ChapterDelim from PageNum BYTE nPgChpLevel; // ChapterLevel of Heading from PageNum - BYTE nCorrIhdt; // used in CreateSep() - bool bSectionHasATitlePage; // used in CreateSep() - bool mbNewDoc; // Neues Dokument ? bool bReadNoTbl; // Keine Tabellen bool bPgSecBreak; // Page- oder Sectionbreak ist noch einzufuegen @@ -820,7 +919,6 @@ friend class WW8FormulaControl; bool bHasBorder; // fuer Buendelung der Border bool bSymbol; // z.B. Symbol statt Times bool bIgnoreText; // z.B. fuer FieldVanish - bool bDontCreateSep; // e.g. when skipping result of multi-column index-field int nInTable; // wird gerade eine Tabelle eingelesen bool bWasTabRowEnd; // Tabelle : Row End Mark @@ -843,7 +941,6 @@ friend class WW8FormulaControl; bool bNoAttrImport; // Attribute ignorieren zum Ignorieren v. Styles bool bInHyperlink; // Sonderfall zum einlesen eines 0x01 // siehe: SwWW8ImplReader::Read_F_Hyperlink() - bool bVerticalEnviron; bool bWasParaEnd; // praktische Hilfsvariablen: @@ -859,8 +956,6 @@ friend class WW8FormulaControl; bool bNoLnNumYet; // no Line Numbering has been activated yet (we import // the very 1st Line Numbering and ignore the rest) - bool bRestartLnNumPerSection; - @@ -869,33 +964,18 @@ friend class WW8FormulaControl; void AppendTxtNode(SwPosition& rPos); void GetNoninlineNodeAttribs(const SwTxtNode *pNode, std::vector<const xub_StrLen*> &rPositions); - void SetLastPgDeskIdx(); - - SwPageDesc* CreatePageDesc( SwPageDesc* pFirstPageDesc, - SwPaM** ppPaMWanted = 0 ); - void RemoveCols( SwPageDesc& rPageDesc, SwFmtCol*& rpCol ); - bool SetCols(SwFrmFmt* pFmt, const WW8PLCFx_SEPX* pSep, USHORT nNettoWidth, - bool bTestOnly = false); - void SetPage1(SwPageDesc* pPageDesc, SwFrmFmt &rFmt, - const WW8PLCFx_SEPX* pSep, USHORT nLIdx, bool bIgnoreCols); - void SetHdFt(SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, BYTE nIPara); - void GetPageULData(const WW8PLCFx_SEPX* pSep, USHORT nLIdx, bool bFirst, - WW8ULSpaceData& rData); - void SetPageULSpaceItems(SwFrmFmt &rFmt, WW8ULSpaceData& rData); - void SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep); - - void SetPageBorder( SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, - const WW8PLCFx_SEPX* pSep, USHORT nLIdx ); - void SetUseOn(SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, BYTE nHdFt); - void InsertSectionWithWithoutCols( SwPaM& rMyPaM, const SwFmtCol* pCol ); - void CreateSep(const long nTxtPos, bool bMustHaveBreak); + + void Read_HdFt(BYTE nWhichItems, int nSect, SwPageDesc* pPD, + const SwPageDesc *pPrev); + void Read_HdFtText(long nStartCp, long nLen, SwFrmFmt* pHdFtFmt); + + void HandleLineNumbering(const wwSection &rSection); + bool MustCloseSection(long nTxtPos); void CopyPageDescHdFt( const SwPageDesc* pOrgPageDesc, SwPageDesc* pNewPageDesc, BYTE nCode ); - void UpdatePageDescs( USHORT nPageDescOffset ); - void DeleteStk(SwFltControlStack* prStck); void DeleteCtrlStk() { DeleteStk( pCtrlStck ); pCtrlStck = 0; } void DeleteRefStk() { DeleteStk( pRefStck ); pRefStck = 0; } @@ -905,6 +985,7 @@ friend class WW8FormulaControl; bool ReadPlainChars(long& rPos, long nEnd, long nCpOfs); bool ReadChars(long& rPos, long nNextAttr, long nTextEnd, long nCpOfs); + void SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection); void ReadPlainText( long nStartCp, long nTextLen ); void ProcessAktCollChange(WW8PLCFManResult& rRes, bool* pStartAttr, @@ -919,9 +1000,6 @@ friend class WW8FormulaControl; void Read_HdFtFtnText( const SwNodeIndex* pSttIdx, long nStartCp, long nLen, short nType ); - void Read_HdFt1( BYTE nPara, BYTE nWhichItems, SwPageDesc* pPD ); - void Read_HdFtText(long nStartCp, long nLen, SwPageDesc* pPD, - bool bUseLeft, bool bFooter); BYTE* ReadUntilToken( USHORT& rStrLen, USHORT nMaxLen, BYTE nToken ); void ImportTox( int nFldId, String aStr ); @@ -948,7 +1026,7 @@ friend class WW8FormulaControl; bool SetBorder(SvxBoxItem& rBox, const WW8_BRC* pbrc, short *pSizeArray=0, BYTE nSetBorders=0xFF, bool bChkBtwn = false); - void GetBorderDistance( WW8_BRC* pbrc, Rectangle& rInnerDist ); + void GetBorderDistance(const WW8_BRC* pbrc, Rectangle& rInnerDist); bool SetShadow(SvxShadowItem& rShadow, const SvxBoxItem& rBox, const WW8_BRC pbrc[4]); @@ -981,7 +1059,8 @@ friend class WW8FormulaControl; WW8FlyPara* &pbNowStyleApo, int nCellLevel, bool bTableRowEnd, WW8_TablePos *pTabPos); - bool ProcessSpecial(bool bAllEnd, bool* pbReSync, WW8_CP nStartCp ); + void EndSpecial(); + bool ProcessSpecial(bool &rbReSync, WW8_CP nStartCp); USHORT TabRowSprm(int nLevel) const; ULONG ReadWmfHeader( WmfFileHd* pHd, long nPos ); @@ -1099,7 +1178,7 @@ friend class WW8FormulaControl; SwFlyFrmFmt *ConvertDrawTextToFly( SdrObject* &rpObject, SdrObject* &rpOurNewObject, SvxMSDffImportRec* pRecord, RndStdIds eAnchor, WW8_FSPA *pF, SfxItemSet &rFlySet ); - void MungeTextIntoDrawBox(SdrObject* pTrueObject, + SwFrmFmt* MungeTextIntoDrawBox(SdrObject* pTrueObject, SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrmFmt *pRetFrmFmt); void GrafikCtor(); @@ -1159,6 +1238,8 @@ friend class WW8FormulaControl; void SetOutLineStyles(); + void StoreMacroCmds(); + //No copying SwWW8ImplReader(const SwWW8ImplReader &); SwWW8ImplReader& operator=(const SwWW8ImplReader&); @@ -1302,6 +1383,7 @@ public: // eigentlich private, geht aber leider nur public void Read_SubF_Ruby( _ReadFieldParams& rReadParam); void Read_SubF_Combined( _ReadFieldParams& rReadParam); eF_ResT Read_F_IncludePicture( WW8FieldDesc*, String& rStr ); + String CreateNextFileLinkName(); eF_ResT Read_F_IncludeText( WW8FieldDesc*, String& rStr ); eF_ResT Read_F_Seq( WW8FieldDesc*, String& rStr ); @@ -1341,3 +1423,5 @@ public: // eigentlich private, geht aber leider nur public }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index b17099d6b693..e5e9f881f95c 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par2.cxx,v $ * - * $Revision: 1.78 $ + * $Revision: 1.79 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PRECOMPILED @@ -345,13 +344,42 @@ public: void SetNumRuleName( const String& rName ); }; +void wwSectionManager::SetCurrentSectionHasFootnote() +{ + ASSERT(!maSegments.empty(), + "should not be possible, must be at least one segment"); + if (!maSegments.empty()) + maSegments.back().mbHasFootnote = true; +} + +bool wwSectionManager::CurrentSectionIsVertical() const +{ + ASSERT(!maSegments.empty(), + "should not be possible, must be at least one segment"); + if (!maSegments.empty()) + return maSegments.back().IsVertical(); + return false; +} + +short wwSectionManager::GetPageLeft() const +{ + return !maSegments.empty() ? maSegments.back().nPgLeft : 0; +} + +short wwSectionManager::GetPageRight() const +{ + return !maSegments.empty() ? maSegments.back().nPgRight : 0; +} + +short wwSectionManager::GetPageWidth() const +{ + return !maSegments.empty() ? maSegments.back().nPgWidth : 0; +} + long SwWW8ImplReader::Read_Ftn(WW8PLCFManResult* pRes) { bool bFtEdOk = false; - if( nIniFlags & WW8FL_NO_FTN ) - return 0; - /* #84095# Ignoring Footnote outside of the normal Text. People will put footnotes @@ -438,30 +466,8 @@ long SwWW8ImplReader::Read_Ftn(WW8PLCFManResult* pRes) bSymbol = false; } - // insert Section to get this Ft-/End-Note at the end of the section, - // when there is no open section at the moment - if( bFtEdOk && pLastPgDeskIdx && !pAfterSection) - { - const SwNodeIndex aOrgLastPgDeskIdx( *pLastPgDeskIdx ); - - (*pLastPgDeskIdx)++; - SwPosition aSectStart(*pLastPgDeskIdx); - aSectStart.nContent.Assign(pLastPgDeskIdx->GetNode().GetCntntNode(), 0); - - SwPosition *pTemp = pPaM->GetPoint(); - if (pTableDesc) - pTemp = pTableDesc->GetPos(); - - SwPaM aSectPaM(aSectStart, *pTemp); - InsertSectionWithWithoutCols( aSectPaM, 0 ); - - if (pTableDesc) - (*pAfterSection)--; - pPaM->Move( fnMoveBackward ); - DELETEZ( pLastPgDeskIdx ); - // set attributes to correct position - pCtrlStck->MoveAttrsToNextNode( aOrgLastPgDeskIdx ); - } + if (bFtEdOk) + maSectionManager.SetCurrentSectionHasFootnote(); return 1; // das Fussnotenzeichen ueberlesen! } @@ -2052,6 +2058,15 @@ void WW8TabDesc::SetSizePosition(SwFrmFmt* pFrmFmt) } } +void wwSectionManager::PrependedInlineNode(const SwPosition &rPos, + const SwNode &rNode) +{ + ASSERT(!maSegments.empty(), + "should not be possible, must be at least one segment"); + if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode)) + maSegments.back().maStart = SwNodeIndex(rNode); +} + void WW8TabDesc::CreateSwTable() { ::SetProgressState( pIo->nProgress, pIo->rDoc.GetDocShell() ); // Update @@ -2108,6 +2123,18 @@ void WW8TabDesc::CreateSwTable() // da sich die (identischen) Zeilen eines Bandes prima duplizieren lassen pTable = pIo->rDoc.InsertTable( *pTmpPos, nBands, nDefaultSwCols, eOri ); + ASSERT(pTable, "insert table failed"); + if (!pTable) + return; + + SwTableNode* pTableNode = pTable->GetTableNode(); + ASSERT(pTableNode, "no table node!"); + if (pTableNode) + { + pIo->maSectionManager.PrependedInlineNode(*pIo->pPaM->GetPoint(), + *pTableNode); + } + // Abfrage, ob im Node, in dem die Tabelle eingefuegt werden soll, bereits // ein Pagedesc steht. Dann wuerde der PageDesc in die naechste Zeile // hinter der Tabelle rutschen, wo er nichts zu suchen hat. -> loeschen @@ -2118,16 +2145,8 @@ void WW8TabDesc::CreateSwTable() { SfxPoolItem *pSetAttr = 0; const SfxPoolItem* pItem; - if (SFX_ITEM_SET == pSet->GetItemState(RES_PAGEDESC, false, &pItem)) - { - pSetAttr = new SwFmtPageDesc( *(SwFmtPageDesc*)pItem ); - pNd->ResetAttr( RES_PAGEDESC ); - pSet = pNd->GetpSwAttrSet(); - } - if (pSet && - SFX_ITEM_SET == pSet->GetItemState(RES_BREAK, false, &pItem)) + if (SFX_ITEM_SET == pSet->GetItemState(RES_BREAK, false, &pItem)) { - delete pSetAttr; pSetAttr = new SvxFmtBreakItem( *(SvxFmtBreakItem*)pItem ); pNd->ResetAttr( RES_BREAK ); } @@ -3869,5 +3888,4 @@ void SwWW8ImplReader::ReadDocInfo() } } - - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index c6d22f29f699..45973fd97d0c 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par2.hxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: cmc $ $Date: 2002-12-03 15:57:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8PAR2_HXX @@ -116,6 +115,7 @@ struct WW8FlyPara bool bGrafApo; // true: Dieser Rahmen dient allein dazu, die // enthaltene Grafik anders als zeichengebunden // zu positionieren + bool mbVertSet; // true if vertical positioning has been set WW8FlyPara(bool bIsVer67, const WW8FlyPara* pSrc = 0); bool operator==(const WW8FlyPara& rSrc) const; @@ -306,3 +306,5 @@ enum WW8LvlType {WW8_None, WW8_Outline, WW8_Numbering, WW8_Sequence, WW8_Pause}; WW8LvlType GetNumType(BYTE nWwLevelNo); #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 4cd148313dac..3271567fe72d 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par3.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -2134,3 +2133,4 @@ sal_Bool SwMSConvertControls::InsertControl( return sal_True; } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index aee64aacea56..1f23609be2cd 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par4.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -594,7 +593,10 @@ private: void SetInDocAndDelete::operator()(SwFltStackEntry *pEntry) { SwPaM aRegion(pEntry->nMkNode); - if (pEntry->MakeRegion(&mrDoc, aRegion, true)) + if ( + pEntry->MakeRegion(&mrDoc, aRegion, true) && + (*aRegion.GetPoint() != *aRegion.GetMark()) + ) { mrDoc.SetRedlineMode(REDLINE_ON | REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE); @@ -681,7 +683,7 @@ void SwWW8ImplReader::Read_CRevisionMark(SwRedlineType eType, { // there *must* be a SprmCIbstRMark[Del] and a SprmCDttmRMark[Del] // pointing to the very same char position as our SprmCFRMark[Del] - if (!pPlcxMan) + if (!pPlcxMan || bIgnoreText) return; const BYTE* pSprmCIbstRMark; const BYTE* pSprmCDttmRMark; @@ -716,8 +718,10 @@ void SwWW8ImplReader::Read_CRevisionMark(SwRedlineType eType, } } +#if 0 ASSERT(nLen < 0 || (pSprmCIbstRMark || pSprmCDttmRMark), "The wheels have fallen off revision mark import"); +#endif if (nLen < 0) mpRedlineStack->close(*pPaM->GetPoint(), eType); @@ -732,7 +736,9 @@ void SwWW8ImplReader::Read_CRevisionMark(SwRedlineType eType, if (const WW8AuthorInfo* pAuthor = pAuthorInfos->GetObject(nPos)) { UINT32 nWWDate = pSprmCDttmRMark ? SVBT32ToLong(pSprmCDttmRMark): 0; +#if 0 ASSERT(nWWDate, "Date is 0, this will cause trouble!"); +#endif DateTime aStamp(WW8ScannerBase::WW8DTTM2DateTime(nWWDate)); USHORT nAutorNo = pAuthor->nOurId; @@ -765,3 +771,5 @@ void SwWW8ImplReader::Read_CPropRMark(USHORT , const BYTE* pData, short nLen) // 4 bytes - chp.dttmPropRMark; Read_CRevisionMark( REDLINE_FORMAT, pData, nLen ); } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 63b02ccb0f87..8666efd4405f 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par5.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.63 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -89,6 +88,16 @@ #include <so3/linkmgr.hxx> #endif +#ifndef _UCBHELPER_CONTENT_HXX_ +#include <ucbhelper/content.hxx> +#endif +#ifndef _UCBHELPER_CONTENTBROKER_HXX_ +#include <ucbhelper/contentbroker.hxx> +#endif +#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX +#include <ucbhelper/commandenvironment.hxx> +#endif + #ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> #endif @@ -632,21 +641,42 @@ static ULONG MSDateTimeFormatToSwFormat(String& rParams, rParams.EraseAllChars('\''); - rbForceJapanese = false; - static const char aJapanese[] = + //#102782# & #102815# have to work at the same time :-) + bool bForceNatNum(false); + static const char aJapaneseNatNum[] = { - 'E', 'O', 'A', 'e', 'a', 'o', 'g', 'G' + 'O', 'A', 'o' }; - for (size_t i = 0; i < sizeof(aJapanese); ++i) + for (size_t i = 0; i < sizeof(aJapaneseNatNum); ++i) { - if (STRING_NOTFOUND != rParams.Search(aJapanese[i])) + if (STRING_NOTFOUND != rParams.Search(aJapaneseNatNum[i])) { - rbForceJapanese = true; + bForceNatNum = true; break; } } + if (bForceNatNum) + rbForceJapanese = true; + else + { + rbForceJapanese = false; + static const char aJapaneseLang[] = + { + 'E', 'e', 'g', 'G', 'a' + }; + + for (size_t i = 0; i < sizeof(aJapaneseLang); ++i) + { + if (STRING_NOTFOUND != rParams.Search(aJapaneseLang[i])) + { + rbForceJapanese = true; + break; + } + } + } + rParams.SearchAndReplaceAll(CREATE_CONST_ASC("EE"), CREATE_CONST_ASC("YYYY")); rParams.SearchAndReplaceAll('O', 'M'); @@ -655,11 +685,8 @@ static ULONG MSDateTimeFormatToSwFormat(String& rParams, CREATE_CONST_ASC("yyyy")); rParams.SearchAndReplaceAll('o', 'm'); - if (rbForceJapanese) - { + if (bForceNatNum) rParams.Insert(CREATE_CONST_ASC("[NatNum1][$-411]"),0); -// rParams.Insert(CREATE_CONST_ASC("[~gengou]"),0); - } pFormatter->PutEntry(rParams, nCheckPos, nType, nKey, nLang); @@ -1407,8 +1434,10 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, String& rStr ) SwSetExpFieldType( &rDoc, aSequenceName, GSE_SEQ ) ); SwSetExpField aFld( pFT, aEmptyStr, eNumFormat ); - if( sStart.Len() ) + if (sStart.Len()) aFld.SetFormula( ( aSequenceName += '=' ) += sStart ); + else if (!bCountOn) + aFld.SetFormula(aSequenceName); if( sLevel.Len() ) { @@ -2131,7 +2160,27 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, String& rStr ) } } - if( !bEmbedded ) + if (!bEmbedded) + { + try + { + ::ucb::Content aCnt(aGrfName, + ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XCommandEnvironment >() ); + rtl::OUString aTitle; + + aCnt.getPropertyValue(rtl::OUString::createFromAscii("Title" )) + >>= aTitle; + bEmbedded = (aTitle.getLength() <= 0); + } + catch( ... ) + { + // this file did not exist, so we will not set this as graphiclink + bEmbedded = true; + } + } + + if (!bEmbedded) { /* Besonderheit: @@ -2153,12 +2202,20 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, String& rStr ) 0, // Graphic* &aFlySet, 0); // SwFrmFmt* - aGrfNameGenerator.SetUniqueGraphName(pFlyFmtOfJustInsertedGraphic, + maGrfNameGenerator.SetUniqueGraphName(pFlyFmtOfJustInsertedGraphic, INetURLObject(aGrfName).GetBase()); } return FLD_READ_FSPA; } + +String wwSectionNamer::UniqueName() +{ + String aName(msFileLinkSeed); + aName += String::CreateFromInt32(++mnFileSectionNo); + return mrDoc.GetUniqueSectionName(&aName); +} + // "EINFUEGENTEXT" eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* pF, String& rStr ) { @@ -2192,7 +2249,6 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* pF, String& rStr ) aPara += so3::cTokenSeperator; aPara += aBook; } - String aStr(CREATE_CONST_ASC( "WW" )); /* ##509## @@ -2202,27 +2258,33 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* pF, String& rStr ) */ WW8ReaderSave aSave( this ); - SwSection aSection( FILE_LINK_SECTION, rDoc.GetUniqueSectionName( &aStr ) ); + SwSection aSection(FILE_LINK_SECTION, maSectionNameGenerator.UniqueName()); aSection.SetLinkFileName( aPara ); aSection.SetProtect(true); - pLastInsertedSection = rDoc.Insert(*pPaM, aSection, 0 ,false); - - const SwSectionNode* pSectionNode = pLastInsertedSection->GetFmt()->GetSectionNode(); - ASSERT(!pAfterSection, "recursive sections!"); - pAfterSection = new SwNodeIndex( *pSectionNode->EndOfSectionNode(), 1 ); + SwSection* pSection = rDoc.Insert(*pPaM, aSection, 0 ,false); + ASSERT(pSection, "no section inserted"); + if (!pSection) + return FLD_OK; + const SwSectionNode* pSectionNode = pSection->GetFmt()->GetSectionNode(); + ASSERT(pSectionNode, "no section node!"); + if (!pSectionNode) + return FLD_OK; pPaM->GetPoint()->nNode = pSectionNode->GetIndex()+1; pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0 ); + //we have inserted a section before this point, so adjust pos + //for future page/section segment insertion + maSectionManager.PrependedInlineNode(aSave.GetStartPos(), *pPaM->GetNode()); + bTxbxFlySection = true; ReadText(pF->nSRes, pF->nLRes, pPlcxMan->GetManType()); - //SwWW8ImplReader::MustCloseSection(long nTxtPos) ?? - delete pAfterSection, pAfterSection=0; - aSave.Restore( this ); + if (!maApos.back()) //a para end in apo doesn't count + bWasParaEnd = true; return FLD_OK; } @@ -2587,6 +2649,30 @@ void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase, } } +USHORT wwSectionManager::CurrentSectionColCount() const +{ + USHORT nIndexCols = 1; + if (!maSegments.empty()) + nIndexCols = maSegments.back().maSep.ccolM1 + 1; + return nIndexCols; +} + +//Will there be a new pagebreak at this position (don't know what type +//until later) +bool wwSectionManager::WillHavePageDescHere(SwNodeIndex aIdx) const +{ + bool bRet = false; + if (!maSegments.empty()) + { + if (!maSegments.back().IsContinous() && + maSegments.back().maStart == aIdx) + { + bRet = true; + } + } + return bRet; +} + eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) { if( nIniFlags & WW8FL_NO_TOX ) @@ -2610,16 +2696,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) USHORT nCreateOf = (eTox == TOX_CONTENT) ? TOX_OUTLINELEVEL : TOX_MARK; - USHORT nIndexCols = 0; - SwSection *pTest = rDoc.GetCurrSection(*pPaM->GetPoint()); - if (pTest) //section is open, set to its no of section cols - { - const SwSectionFmt *pFmt = pTest->GetFmt(); - if (pFmt) - nIndexCols = pFmt->GetCol().GetNumCols(); - } - else if (pPageDesc) //set to current number of page cols - nIndexCols = pPageDesc->GetMaster().GetCol().GetNumCols(); + USHORT nIndexCols = maSectionManager.CurrentSectionColCount(); const SwTOXType* pType = rDoc.GetTOXType( eTox, 0 ); SwForm aOrigForm(eTox); @@ -3001,13 +3078,17 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) // Update fuer TOX anstossen rDoc.SetUpdateTOX(true); + //#i10028# inserting a toc implicltly acts like a parabreak + //in word and writer + if (pPaM->GetPoint()->nContent.GetIndex()) + AppendTxtNode(*pPaM->GetPoint()); + const SwPosition* pPos = pPaM->GetPoint(); SwFltTOX aFltTOX( pBase, nIndexCols ); // test if there is already a break item on this node - SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode(); - if( pNd ) + if(SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode()) { const SfxItemSet* pSet = pNd->GetpSwAttrSet(); if( pSet ) @@ -3019,16 +3100,32 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) } } + //Will there be a new pagebreak at this position (don't know what type + //until later) + if (maSectionManager.WillHavePageDescHere(pPos->nNode)) + aFltTOX.SetHadPageDescItem(true); + // Setze Anfang in Stack pRefStck->NewAttr( *pPos, aFltTOX ); - if( 1 < nIndexCols ) - bDontCreateSep = true; rDoc.InsertTableOf(*pPaM->GetPoint(), *aFltTOX.GetBase()); + //inserting a toc inserts a section before this point, so adjust pos + //for future page/section segment insertion + SwPaM aRegion(*pPaM); + aRegion.Move(fnMoveBackward); + ASSERT(rDoc.GetCurTOX(*aRegion.GetPoint()), "Misunderstood how toc works"); + if(rDoc.GetCurTOX(*aRegion.GetPoint())) + { + maSectionManager.PrependedInlineNode(*pPaM->GetPoint(), + *aRegion.GetNode()); + } + // Setze Ende in Stack pRefStck->SetAttr( *pPos, RES_FLTR_TOX ); + if (!maApos.back()) //a para end in apo doesn't count + bWasParaEnd = true; return FLD_OK; } @@ -3299,3 +3396,5 @@ void SwWW8ImplReader::Read_Invisible( USHORT, const BYTE*, short nLen ) InsertTagField( n, aTag ); } } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 83c256961f06..68420245131c 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par6.cxx,v $ * - * $Revision: 1.128 $ + * $Revision: 1.129 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #include <stdlib.h> @@ -401,67 +400,55 @@ static SwTwips AdjustSize( USHORT nPara ) return nSi; } -void SwWW8ImplReader::RemoveCols( SwPageDesc& rPageDesc, SwFmtCol*& rpCol ) +void wwSection::SetDirection() { - SwFrmFmt &rFmt0 = rPageDesc.GetMaster(); - const SwFmtCol rCol = rFmt0.GetCol(); - if( rCol.GetNumCols() ) + //sprmSTextFlow + switch (maSep.wTextFlow) { - rpCol = new SwFmtCol( rCol ); - SwFmtCol aCol; - rFmt0.SetAttr( aCol ); - rPageDesc.GetLeft().SetAttr( aCol ); + default: + ASSERT(!this, "Unknown layout type"); + case 0: + meDir=FRMDIR_HORI_LEFT_TOP; + break; + case 1: + meDir=FRMDIR_VERT_TOP_RIGHT; + break; + case 2: + //asian letters are not rotated, western are. We can't import + //bottom to top going left to right, we can't do this in + //pages, (in drawboxes we could partly hack it with a rotated + //drawing box, though not frame) + meDir=FRMDIR_VERT_TOP_RIGHT; + break; + case 3: + //asian letters are not rotated, western are. We can't import + meDir=FRMDIR_VERT_TOP_RIGHT; + break; + case 4: + //asian letters are rotated, western not. We can't import + meDir=FRMDIR_HORI_LEFT_TOP; + break; } - else - rpCol = 0; + + sal_uInt8 nRTLPgn = maSep.fBiDi; + if ((meDir == FRMDIR_HORI_LEFT_TOP) && nRTLPgn) + meDir = FRMDIR_HORI_RIGHT_TOP; } -void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep) +bool wwSection::IsVertical() const +{ + if (meDir == FRMDIR_VERT_TOP_RIGHT || meDir == FRMDIR_VERT_TOP_LEFT) + return true; + return false; +} + +void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, + const wwSection &rSection) { if (bVer67) return; - SvxFrameDirection eDir=FRMDIR_HORI_LEFT_TOP; - - //sprmSTextFlow - if (short nGridType = ReadULSprm(pSep, 0x5033, 0)) - { - switch(nGridType) - { - default: - ASSERT(!this, "Unknown layout type"); - case 0: - eDir=FRMDIR_HORI_LEFT_TOP; - break; - case 1: - eDir=FRMDIR_VERT_TOP_RIGHT; - break; - case 2: - //asian letters are not rotated, western are. We can't import - //bottom to top going left to right, we can't do this in - //pages, (in drawboxes we could partly hack it with a rotated - //drawing box, though not frame) - eDir=FRMDIR_VERT_TOP_RIGHT; - break; - case 3: - //asian letters are not rotated, western are. We can't import - eDir=FRMDIR_VERT_TOP_RIGHT; - break; - case 4: - //asian letters are rotated, western not. We can't import - eDir=FRMDIR_HORI_LEFT_TOP; - break; - } - } - if ((eDir == FRMDIR_HORI_LEFT_TOP) && mbRTLPgn) - eDir = FRMDIR_HORI_RIGHT_TOP; - - rFmt.SetAttr(SvxFrameDirectionItem(eDir)); - - if (eDir == FRMDIR_VERT_TOP_RIGHT || eDir == FRMDIR_VERT_TOP_LEFT) - bVerticalEnviron = true; - else - bVerticalEnviron = false; + rFmt.SetAttr(SvxFrameDirectionItem(rSection.meDir)); SwTwips nTextareaHeight = rFmt.GetFrmSize().GetHeight(); const SvxULSpaceItem &rUL = (const SvxULSpaceItem&) @@ -475,7 +462,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep) nTextareaWidth -= rLR.GetLeft(); nTextareaWidth -= rLR.GetRight(); - if (bVerticalEnviron) + if (rSection.IsVertical()) { SwTwips nSwap = nTextareaHeight; nTextareaHeight = nTextareaWidth; @@ -486,32 +473,31 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep) aGrid.SetDisplayGrid(false); aGrid.SetPrintGrid(false); SwTextGrid eType=GRID_NONE; - if (short nGridType = ReadULSprm( pSep, 0x5032, 0 )) + + switch (rSection.maSep.clm) { - switch (nGridType) - { - case 0: - eType = GRID_NONE; - break; - default: - ASSERT(!this, "Unknown grid type"); - case 3: - //Text snaps to char grid, this doesn't make a lot of sense to - //me. This is closer than LINES_CHARS - eType = GRID_LINES_ONLY; - break; - case 1: - eType = GRID_LINES_CHARS; - break; - case 2: - eType = GRID_LINES_ONLY; - break; - } + case 0: + eType = GRID_NONE; + break; + default: + ASSERT(!this, "Unknown grid type"); + case 3: + //Text snaps to char grid, this doesn't make a lot of sense to + //me. This is closer than LINES_CHARS + eType = GRID_LINES_ONLY; + break; + case 1: + eType = GRID_LINES_CHARS; + break; + case 2: + eType = GRID_LINES_ONLY; + break; } + aGrid.SetGridType(eType); //sep.dyaLinePitch - short nLinePitch = ReadULSprm(pSep, 0x9031, 360); + short nLinePitch = rSection.maSep.dyaLinePitch; aGrid.SetLines(nTextareaHeight/nLinePitch); @@ -541,9 +527,9 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep) } //dxtCharSpace - if (const BYTE* pS = pSep->HasSprm(0x7030)) + if (rSection.maSep.dxtCharSpace) { - UINT32 nCharSpace = SVBT32ToLong(pS); + UINT32 nCharSpace = rSection.maSep.dxtCharSpace; //main lives in top 20 bits, and is signed. INT32 nMain = (nCharSpace & 0xFFFFF000); nMain/=0x1000; @@ -572,35 +558,22 @@ void SwWW8ImplReader::Read_ParaBiDi(USHORT, const BYTE* pData, short nLen) } } -bool SwWW8ImplReader::SetCols(SwFrmFmt* pFmt, const WW8PLCFx_SEPX* pSep, - USHORT nNettoWidth, bool bTestOnly) +bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection, + USHORT nNettoWidth) { - if( nIniFlags & WW8FL_NO_COLS ) // ausgeschaltet - return false; - //sprmSCcolumns - Anzahl der Spalten - 1 - USHORT nCols = ReadSprm( pSep, (bVer67 ? 144 : 0x500B), 0 ); + USHORT nCols = rSection.NoCols(); - nCols ++; // Zahl der SW-Spalten - if( nCols < 2 ) + if (nCols < 2) return false; // keine oder bloedsinnige Spalten - if( bTestOnly ) - return true; - - if( !pFmt ) - { - ASSERT( !this, "code error: pFmt hat Zero value!" ); - return false; - } - SwFmtCol aCol; // Erzeuge SwFmtCol //sprmSDxaColumns - Default-Abstand 1.25 cm - USHORT nColSpace = ReadUSprm( pSep, (bVer67 ? 145 : 0x900C), 708 ); + USHORT nColSpace = rSection.StandardColSeperation(); // sprmSLBetween - if( ReadBSprm( pSep, (bVer67 ? 158 : 0x3019), 0 ) ) + if (rSection.maSep.fLBetween) { aCol.SetLineAdj( COLADJ_TOP ); // Line aCol.SetLineHeight( 100 ); @@ -608,145 +581,54 @@ bool SwWW8ImplReader::SetCols(SwFrmFmt* pFmt, const WW8PLCFx_SEPX* pSep, aCol.SetLineWidth( 1 ); } + aCol.Init( nCols, nColSpace, nNettoWidth ); // sprmSFEvenlySpaced - bool bEven = ReadBSprm(pSep, (bVer67 ? 138 : 0x3005), 1) ? true : false; - - if( bEven ) // alle Spalten sind gleich - aCol.Init( nCols, nColSpace, nNettoWidth ); - else + if (!rSection.maSep.fEvenlySpaced) { - aCol.Init( nCols, nColSpace, USHRT_MAX ); - // Spalten unterschiedlich breit: fein, das kann der Writer inzwischen! - USHORT nWishWidth = 0, nLeftDist = 0, nRightDist = 0; - USHORT i; - for( i = 0; i < nCols; i++ ) - { - SwColumn* pCol = aCol.GetColumns()[ i ]; - pCol->SetLeft( nLeftDist ); - - if( i < nCols-1 ) - { - //sprmSDxaColSpacing - const BYTE* pSD = - pSep->HasSprm( (bVer67 ? 137 : 0xF204), BYTE( i ) ); - - ASSERT( pSD, "+Sprm 137 (bzw. 0xF204) (Colspacing) fehlt" ); - if( pSD ) - { - USHORT nSp = SVBT16ToShort( pSD + 1 ); - nRightDist = nSp / 2; - - pCol->SetRight( nSp - nRightDist ); - } - } - else - nRightDist = 0; // letzte Spalte hat keinen Zwischenraum mehr - - //sprmSDxaColWidth - const BYTE* pSW = - pSep->HasSprm( (bVer67 ? 136 : 0xF203), BYTE( i ) ); - - ASSERT( pSW, "+Sprm 136 (bzw. 0xF203) (ColWidth) fehlt" ); - if( pSW ) - pCol->SetWishWidth( SVBT16ToShort( pSW + 1 ) - + nLeftDist - + pCol->GetRight() ); - // aufsummierte Spaltenbreiten ergeben Gesamtbreite - nWishWidth += pCol->GetWishWidth(); - // Halber Abstand ist an naechster Spalte noch zu setzen - nLeftDist = nRightDist; - } - aCol.SetWishWidth( nWishWidth ); - -#ifdef niemalsdef - // beim RTF-Import: aCol._SetOrtho(false); - USHORT nWishWidth = 0, nHalfPrev = 0; - for( USHORT n = 0, i = 0; n < aColumns.Count(); n += 2, ++i ) + int nIdx = 1; + for (USHORT i = 0; i < nCols; i++ ) { SwColumn* pCol = aCol.GetColumns()[ i ]; - pCol->SetLeft( nHalfPrev ); - USHORT nSp = aColumns[ n+1 ]; - nHalfPrev = nSp / 2; - pCol->SetRight( nSp - nHalfPrev ); - pCol->SetWishWidth( aColumns[ n ] + - pCol->GetLeft() + pCol->GetRight() ); - nWishWidth += pCol->GetWishWidth(); + USHORT nLeft = rSection.maSep.rgdxaColumnWidthSpacing[nIdx - 1]/2; + USHORT nRight = rSection.maSep.rgdxaColumnWidthSpacing[nIdx + 1]/2; + USHORT nWishWidth = rSection.maSep.rgdxaColumnWidthSpacing[nIdx] + + nLeft + nRight; + pCol->SetWishWidth(nWishWidth); + pCol->SetLeft(nLeft); + pCol->SetRight(nRight); + nIdx += 2; } - aCol.SetWishWidth( nWishWidth ); -#endif + aCol.SetWishWidth(nNettoWidth); } - pFmt->SetAttr( aCol ); + rFmt.SetAttr(aCol); return true; } -// SetPage1() setzt Orientierung, Papiergroesse, LRRaender, Spalten -void SwWW8ImplReader::SetPage1(SwPageDesc* pInPageDesc, SwFrmFmt &rFmt, - const WW8PLCFx_SEPX* pSep, USHORT nLIdx, bool bIgnoreCols) +void wwSectionManager::SetLeftRight(wwSection &rSection) { - if( nIniFlags & WW8FL_NO_LRUL ) // Abgeschaltet - return; - - static const USHORT aVer67Ids[] = - { - /*sprmSBOrientation*/ 162, - /*sprmSXaPage*/ 164, - /*sprmSYaPage*/ 165, - /*sprmSDxaLeft*/ 166, - /*sprmSDxaRight*/ 167, - /*sprmSDzaGutter*/ 170 - }; - - static const USHORT aVer8Ids[] = - { - /*sprmSBOrientation*/ 0x301d, - /*sprmSXaPage*/ 0xB01F, - /*sprmSYaPage*/ 0xB020, - /*sprmSDxaLeft*/ 0xB021, - /*sprmSDxaRight*/ 0xB022, - /*sprmSDzaGutter*/ 0xB025 - }; - - const USHORT* pIds = bVer67 ? aVer67Ids : aVer8Ids; - - // 1. Orientierung - pInPageDesc->SetLandscape( 0 != ReadBSprm( pSep, pIds[0], 0 ) ); - - // 2. Papiergroesse - SwFmtFrmSize aSz( rFmt.GetFrmSize() ); - aSz.SetWidth(AdjustSize(ReadUSprm(pSep, pIds[1], (USHORT)lLetterWidth))); - - nPgWidth = (short)aSz.GetWidth(); // Merken fuer Tabellen u. ae. - aSz.SetHeight(AdjustSize(ReadUSprm(pSep, pIds[2], (USHORT)lLetterHeight))); - - rFmt.SetAttr( aSz ); - // 3. LR-Raender - // Default-Raender fuer verschiedene nationale Versionen - static const USHORT nLef[] = { MM_250, 1800 }; - static const USHORT nRig[] = { MM_250, 1800 }; - - short nWWLe = MSRoundTweak(ReadULSprm( pSep, pIds[3], nLef[nLIdx])); - short nWWRi = MSRoundTweak(ReadULSprm( pSep, pIds[4], nRig[nLIdx])); - short nWWGu = ReadULSprm( pSep, pIds[5], 0); + short nWWLe = MSRoundTweak(rSection.maSep.dxaLeft); + short nWWRi = MSRoundTweak(rSection.maSep.dxaRight); + short nWWGu = rSection.maSep.dzaGutter; /* - 0x322A is set if the gutter is on the right, the gutter is otherwise - placed on the left unless the global dop options are to put it on top, - that case is handled in GetPageULData, unfortunately when we are "2 pages - in 1" then the gutter is alternated between the top of odd pages and bottom - of even pages, which we can't do, so ignore it in that case + fRTLGutter is set if the gutter is on the right, the gutter is otherwise + placed on the left unless the global dop options are to put it on top, that + case is handled in GetPageULData, unfortunately when we are "2 pages in 1" + then the gutter is alternated between the top of odd pages and bottom of + even pages, which we can't do, so ignore it in that case */ - if (!pWDop->doptypography.f2on1) + if (!mrReader.pWDop->doptypography.f2on1) { - if ((!bVer67) && ReadULSprm( pSep, 0x322A, 0 )) + if (rSection.maSep.fRTLGutter) nWWRi += nWWGu; - else if (!pWDop->iGutterPos) + else if (!mrReader.pWDop->iGutterPos) nWWLe += nWWGu; } // Left / Right - if ((aSz.GetWidth() - nWWLe - nWWRi) < MINLAY) + if ((rSection.nPgWidth - nWWLe - nWWRi) < MINLAY) { /* There are some label templates which are "broken", they specify @@ -761,62 +643,42 @@ void SwWW8ImplReader::SetPage1(SwPageDesc* pInPageDesc, SwFrmFmt &rFmt, it will add up the values to give a wider page than is actually being used. */ - nWWRi = aSz.GetWidth()-nWWLe-MINLAY; + nWWRi = rSection.nPgWidth - nWWLe - MINLAY; } - SvxLRSpaceItem aTemp( nWWLe, nWWRi ); - rFmt.SetAttr( aTemp ); - - nPgLeft = nWWLe; - nPgRight = nWWRi; - - if( !bIgnoreCols ) - { - // 4. Spalten - SetCols( &rFmt, pSep, (USHORT)(aSz.GetWidth() - nWWLe - nWWRi) ); - } + rSection.nPgLeft = nWWLe; + rSection.nPgRight = nWWRi; } -struct WW8ULSpaceData +void wwSectionManager::SetPage(SwPageDesc &rInPageDesc, SwFrmFmt &rFmt, + const wwSection &rSection, bool bIgnoreCols) { - bool bHasHeader, bHasFooter; - short nSwHLo, nHdUL, nSwFUp, nFtUL, nSwUp, nSwLo; - WW8ULSpaceData() : bHasHeader(false), bHasFooter(false) {} -}; - -void SwWW8ImplReader::GetPageULData( const WW8PLCFx_SEPX* pSep, USHORT nLIdx, - bool bFirst, WW8ULSpaceData& rData ) -{ - if( nIniFlags & WW8FL_NO_LRUL ) // abgeschaltet - return; + // 1. Orientierung + rInPageDesc.SetLandscape(rSection.IsLandScape()); - // Default-Raender fuer verschiedene nationale Versionen - static const USHORT nTop[] = { MM_250, 1440 }; - static const USHORT nBot[] = { MM_200, 1440 }; + // 2. Papiergroesse + SwFmtFrmSize aSz( rFmt.GetFrmSize() ); + aSz.SetWidth(rSection.GetPageWidth()); + aSz.SetHeight(AdjustSize(rSection.GetPageHeight())); + rFmt.SetAttr(aSz); - // Einlesen der WW-Einstellungen + rFmt.SetAttr( + SvxLRSpaceItem(rSection.GetPageLeft(), rSection.GetPageRight())); - static const USHORT aVer67Ids[] = + if (!bIgnoreCols) { - /*sprmSDyaTop*/ 168, - /*sprmSDyaBottom*/ 169, - /*sprmSDyaHdrTop*/ 156, - /*sprmSDyaHdrBottom*/ 157 - }; - static const USHORT aVer8Ids[] = - { - /*sprmSDyaTop*/ 0x9023, - /*sprmSDyaBottom*/ 0x9024, - /*sprmSDyaHdrTop*/ 0xB017, - /*sprmSDyaHdrBottom*/ 0xB018 - }; - - const USHORT* pIds = bVer67 ? aVer67Ids : aVer8Ids; + SetCols(rFmt, rSection, rSection.GetPageWidth() - + rSection.GetPageLeft() - rSection.GetPageRight()); + } +} - short nWWUp = ReadULSprm( pSep, pIds[0], nTop[nLIdx] ); - short nWWLo = ReadULSprm( pSep, pIds[1], nBot[nLIdx] ); - short nWWHTop = ReadULSprm( pSep, pIds[2], MM_125 ); - short nWWFBot = ReadULSprm( pSep, pIds[3], MM_125 ); +void wwSectionManager::GetPageULData(const wwSection &rSection, bool bFirst, + wwSectionManager::wwULSpaceData& rData) +{ + short nWWUp = rSection.maSep.dyaTop; + short nWWLo = rSection.maSep.dyaBottom; + short nWWHTop = rSection.maSep.dyaHdrTop; + short nWWFBot = rSection.maSep.dyaHdrBottom; /* If there is gutter in 97+ and the dop says put it on top then get the @@ -825,16 +687,21 @@ void SwWW8ImplReader::GetPageULData( const WW8PLCFx_SEPX* pSep, USHORT nLIdx, even pages, something we cannot do. So we will put it on top of all pages, that way the pages are at least the right size. */ - if ( pWDop->doptypography.f2on1 || - (!bVer67 && pWDop->iGutterPos && !ReadULSprm( pSep, 0x322A, 0 ))) + if ( mrReader.pWDop->doptypography.f2on1 || + (!mrReader.bVer67 && mrReader.pWDop->iGutterPos && + rSection.maSep.fRTLGutter) + ) { - nWWUp += ReadULSprm( pSep, 0xB025, 0 ); + nWWUp += rSection.maSep.dzaGutter; } if( bFirst ) - rData.bHasHeader = (nCorrIhdt & WW8_HEADER_FIRST )!=0; + rData.bHasHeader = (rSection.maSep.grpfIhdt & WW8_HEADER_FIRST) !=0; else - rData.bHasHeader = (nCorrIhdt & (WW8_HEADER_EVEN | WW8_HEADER_ODD))!=0; + { + rData.bHasHeader = (rSection.maSep.grpfIhdt & + (WW8_HEADER_EVEN | WW8_HEADER_ODD)) != 0; + } if( rData.bHasHeader ) { @@ -848,9 +715,12 @@ void SwWW8ImplReader::GetPageULData( const WW8PLCFx_SEPX* pSep, USHORT nLIdx, rData.nSwUp = nWWUp; if( bFirst ) - rData.bHasFooter = (nCorrIhdt & WW8_FOOTER_FIRST )!=0; + rData.bHasFooter = (rSection.maSep.grpfIhdt & WW8_FOOTER_FIRST) !=0; else - rData.bHasFooter = (nCorrIhdt & (WW8_FOOTER_EVEN | WW8_FOOTER_ODD))!=0; + { + rData.bHasFooter = (rSection.maSep.grpfIhdt & + (WW8_FOOTER_EVEN | WW8_FOOTER_ODD)) != 0; + } if( rData.bHasFooter ) { @@ -862,16 +732,12 @@ void SwWW8ImplReader::GetPageULData( const WW8PLCFx_SEPX* pSep, USHORT nLIdx, } else // kein Footer -> Lo einfach uebernehmen rData.nSwLo = nWWLo; - - nPgTop = rData.nSwUp; } -void SwWW8ImplReader::SetPageULSpaceItems(SwFrmFmt &rFmt, WW8ULSpaceData& rData) +void wwSectionManager::SetPageULSpaceItems(SwFrmFmt &rFmt, + wwSectionManager::wwULSpaceData& rData) { - if( nIniFlags & WW8FL_NO_LRUL ) // deactivated ? - return; - - if( rData.bHasHeader ) // ... und Header-Lower setzen + if (rData.bHasHeader) // ... und Header-Lower setzen { //Kopfzeilenhoehe minimal sezten if (SwFrmFmt* pHdFmt = (SwFrmFmt*)rFmt.GetHeader().GetHeaderFmt()) @@ -885,7 +751,7 @@ void SwWW8ImplReader::SetPageULSpaceItems(SwFrmFmt &rFmt, WW8ULSpaceData& rData) } } - if( rData.bHasFooter ) // ... und Footer-Upper setzen + if (rData.bHasFooter) // ... und Footer-Upper setzen { if (SwFrmFmt* pFtFmt = (SwFrmFmt*)rFmt.GetFooter().GetFooterFmt()) { @@ -898,346 +764,91 @@ void SwWW8ImplReader::SetPageULSpaceItems(SwFrmFmt &rFmt, WW8ULSpaceData& rData) } } - SvxULSpaceItem aUL( rData.nSwUp, rData.nSwLo ); // Page-UL setzen - rFmt.SetAttr( aUL ); + SvxULSpaceItem aUL(rData.nSwUp, rData.nSwLo); // Page-UL setzen + rFmt.SetAttr(aUL); } -void SwWW8ImplReader::SetPageBorder(SwPageDesc *pPageDesc0, - SwPageDesc *pPageDesc1, const WW8PLCFx_SEPX* pSep, USHORT nLIdx ) +SwSectionFmt *wwSectionManager::InsertSection( + SwPaM& rMyPaM, wwSection &rSection) { - WW8_BRC brc[4]; - if( !bVer67 && ::lcl_ReadBorders( bVer67, brc, 0, 0, pSep ) && - IsBorder( brc )) - { - short nPgbProp = ReadSprm( pSep, 0x522F, 0 ); //sprmSPgbProp - - // ogbProp - pgbApplyTo - // 0 all Pages in this Section - // 1 first Page in this Section - // 2 all Pages in this Section but first - // 3 whole document (all Sections) - if( !pPageDesc0 && pPageDesc1 && - ( 2 == (nPgbProp & 0x7 ) || 1 == (nPgbProp & 0x7 )) ) - { - // dann muss aber einer angelegt werden - SwPaM* pPageDeskPaM = 0; - pPageDesc0 = CreatePageDesc( 0, &pPageDeskPaM ); - - // if PageDesc was inserted check for cols - // and insert section instead - if( pPageDeskPaM ) - { - SwFrmFmt &rFmt = pPageDesc0->GetMaster(); - SetPage1(pPageDesc0, rFmt, pSep, nLIdx, false); - const SwFmtCol& rCol = rFmt.GetCol(); - // if PageDesc has been inserted and has cols - // insert a *section* with cols instead - if( rCol.GetNumCols() ) - { - InsertSectionWithWithoutCols( *pPaM, &rCol ); - // remove columns from PageDesc - SwFmtCol aCol; - rFmt.SetAttr( aCol ); - } - delete pPageDeskPaM; - } - - rDoc.CopyPageDesc(*pPageDesc1, *pPageDesc0, false); - pPageDesc0->SetFollow( pPageDesc1 ); - pPageDesc1->SetFollow( pPageDesc1 ); - } - - SwFrmFmt* pFmt0 = 0, *pFmt1 = 0; - if( 2 != (nPgbProp & 0x7 ) && pPageDesc0 ) - pFmt0 = &pPageDesc0->GetMaster(); - - if( 1 != (nPgbProp & 0x7 ) && pPageDesc1 ) - pFmt1 = &pPageDesc1->GetMaster(); - - SvxBoxItem aBox; - SetBorder( aBox, brc ); + SwSection aSection( CONTENT_SECTION, mrReader.rDoc.GetUniqueSectionName() ); - Rectangle aInnerDist; - GetBorderDistance( brc, aInnerDist ); + SfxItemSet aSet( mrReader.rDoc.GetAttrPool(), aFrmFmtSetRange ); - if( aInnerDist.Left() || aInnerDist.Top() - || aInnerDist.Right() || aInnerDist.Bottom() ) - { - // das muss natuerlich von den Raendern abgezogen werden! - SwFrmFmt* pFmt = pFmt0; - for( int i = 0; i < 2; ++i, pFmt = pFmt1 ) - if( pFmt ) - { - SvxLRSpaceItem aLR( pFmt->GetLRSpace() ); - SvxULSpaceItem aUL( pFmt->GetULSpace() ); - - if( 0x20 == ( nPgbProp & 0xe0 )) // distance from pageborder - { - // Left - if( aInnerDist.Left() < aLR.GetLeft() ) - { - aLR.SetLeft(aLR.GetLeft() - aInnerDist.Left()); - aBox.SetDistance( (USHORT)aInnerDist.Left(), - BOX_LINE_LEFT ); - } - else - { - aBox.SetDistance( (USHORT)aLR.GetLeft(), - BOX_LINE_LEFT ); - aLR.SetLeft( 0 ); - } - // Right - if( aInnerDist.Right() < aLR.GetRight() ) - { - aLR.SetRight(aLR.GetRight() - aInnerDist.Right()); - aBox.SetDistance( (USHORT)aInnerDist.Right(), - BOX_LINE_RIGHT ); - } - else - { - aBox.SetDistance( (USHORT)aLR.GetRight(), - BOX_LINE_RIGHT ); - aLR.SetRight( 0 ); - } - // Top - if( aInnerDist.Top() < aUL.GetUpper() ) - { - aUL.SetUpper( (USHORT)(aUL.GetUpper() - - aInnerDist.Top() ) ); - aBox.SetDistance( (USHORT)aInnerDist.Top(), - BOX_LINE_TOP ); - } - else - { - aBox.SetDistance( aUL.GetUpper(), BOX_LINE_TOP ); - aUL.SetUpper( 0 ); - } - // Bottom - if( aInnerDist.Bottom() < aUL.GetLower() ) - { - aUL.SetLower( (USHORT)(aUL.GetLower() - - aInnerDist.Bottom() ) ); - aBox.SetDistance( (USHORT)aInnerDist.Bottom(), - BOX_LINE_BOTTOM ); - } - else - { - aBox.SetDistance( aUL.GetLower(), BOX_LINE_BOTTOM ); - aUL.SetLower( 0 ); - } - - pFmt->SetAttr( aLR ); - pFmt->SetAttr( aUL ); - pFmt->SetAttr( aBox ); - } - else // distance from text - { - // Left - aBox.SetDistance( (USHORT)aInnerDist.Left(), - BOX_LINE_LEFT ); - aLR.SetLeft( Max((long)0, aLR.GetLeft() - - aInnerDist.Left() )); - // Right - aBox.SetDistance( (USHORT)aInnerDist.Right(), - BOX_LINE_RIGHT ); - aLR.SetRight(Max((long)0, aLR.GetRight() - - aInnerDist.Right() )); - // Top - aBox.SetDistance( (USHORT)aInnerDist.Top(), - BOX_LINE_TOP ); - aUL.SetUpper(Max(0, aUL.GetUpper() - - (USHORT)aInnerDist.Top() )); - // Bottom - aBox.SetDistance( (USHORT)aInnerDist.Bottom(), - BOX_LINE_BOTTOM ); - aUL.SetLower(Max(0, aUL.GetLower() - - (USHORT)aInnerDist.Bottom() )); - - pFmt->SetAttr( aLR ); - pFmt->SetAttr( aUL ); - pFmt->SetAttr( aBox ); - } - } - - } - else - { - if( pFmt0 ) pFmt0->SetAttr( aBox ); - if( pFmt1 ) pFmt1->SetAttr( aBox ); - } - - - SvxShadowItem aS; - if( SetShadow( aS, aBox, brc)) - { - if( pFmt0 ) pFmt0->SetAttr( aS ); - if( pFmt1 ) pFmt1->SetAttr( aS ); - } - } -} + sal_uInt8 nRTLPgn = maSegments.empty() ? 0 : maSegments.back().IsBiDi(); + aSet.Put(SvxFrameDirectionItem( + nRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP)); -void SwWW8ImplReader::SetUseOn( SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, - BYTE nIhdt ) -{ - bool bEven = (nIhdt & ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true : false; + if (2 == mrReader.pWDop->fpc) + aSet.Put( SwFmtFtnAtTxtEnd(FTNEND_ATTXTEND)); + if (0 == mrReader.pWDop->epc) + aSet.Put( SwFmtEndAtTxtEnd(FTNEND_ATTXTEND)); - UseOnPage eUseBase = pWDop->fMirrorMargins ? PD_MIRROR : PD_ALL; - UseOnPage eUse = eUseBase; - if( !bEven ) - eUse = (UseOnPage)( eUse | PD_HEADERSHARE | PD_FOOTERSHARE ); + rSection.mpSection = mrReader.rDoc.Insert( rMyPaM, aSection, &aSet ); + ASSERT(rSection.mpSection, "section not inserted!"); + if (!rSection.mpSection) + return 0; - if( !pPageDesc1 ) // 1 Pagedesc reicht - pPageDesc0->WriteUseOn(eUse); // alle Seiten - else // 2 Pagedescs noetig + SwPageDesc *pPage = 0; + mySegrIter aEnd = maSegments.rend(); + for (mySegrIter aIter = maSegments.rbegin(); aIter != aEnd; ++aIter) { - // 1. Seite - pPageDesc0->WriteUseOn( (UseOnPage) - ( eUseBase | PD_HEADERSHARE | PD_FOOTERSHARE ) ); - pPageDesc1->WriteUseOn( eUse ); // Folgeseiten + if (pPage = aIter->mpPage) + break; } -} -void SwWW8ImplReader::InsertSectionWithWithoutCols(SwPaM& rMyPaM, - const SwFmtCol* pCol) -{ - // if this Node is not empty create a new Node befor inserting the Section - const SwPosition* pPos = rMyPaM.GetPoint(); - const SwTxtNode* pSttNd = pPos->nNode.GetNode().GetTxtNode(); - USHORT nCntPos = pPos->nContent.GetIndex(); - if( nCntPos && pSttNd->GetTxt().Len() ) - { - if( rMyPaM.HasMark() ) // do we have a SELECTION ? - { - SwNodeIndex aMarkNd( rMyPaM.GetMark()->nNode, -1 ); - xub_StrLen nMarkCnt = rMyPaM.GetMark()->nContent.GetIndex(); - rDoc.SplitNode( *pPos ); - - rMyPaM.Move( fnMoveBackward ); - aMarkNd++; - rMyPaM.GetMark()->nNode = aMarkNd; - rMyPaM.GetMark()->nContent.Assign(aMarkNd.GetNode().GetCntntNode(), - nMarkCnt ); - } - else - rDoc.SplitNode( *pPos ); - } + ASSERT(pPage, "no page outside this section!"); - SwSection aSection( CONTENT_SECTION, rDoc.GetUniqueSectionName() ); + if (!pPage) + pPage = &mrReader.rDoc._GetPageDesc(0); - SfxItemSet aSet( rDoc.GetAttrPool(), aFrmFmtSetRange ); + if (!pPage) + return 0; - if( pCol ) - aSet.Put( *pCol ); + SwFrmFmt& rFmt = pPage->GetMaster(); + const SwFmtFrmSize& rSz = rFmt.GetFrmSize(); + const SvxLRSpaceItem& rLR = rFmt.GetLRSpace(); + SwTwips nWidth = rSz.GetWidth(); + long nLeft = rLR.GetTxtLeft(); + long nRight = rLR.GetRight(); - aSet.Put(SvxFrameDirectionItem( - mbRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP)); + SwSectionFmt *pFmt = rSection.mpSection->GetFmt(); + ASSERT(pFmt, "impossible"); + if (!pFmt) + return 0; - if( 2 == pWDop->fpc ) - aSet.Put( SwFmtFtnAtTxtEnd( FTNEND_ATTXTEND )); - if( 0 == pWDop->epc ) - aSet.Put( SwFmtEndAtTxtEnd( FTNEND_ATTXTEND )); + SetCols(*pFmt, rSection, (USHORT)(nWidth - nLeft - nRight) ); - pLastInsertedSection = rDoc.Insert( rMyPaM, aSection, &aSet ); //Set the columns to be UnBalanced if compatability option is set - if (pWDop->fNoColumnBalance ) + if (mrReader.pWDop->fNoColumnBalance ) { - SwSectionFmt *pFmt = pLastInsertedSection->GetFmt(); + SwSectionFmt *pFmt = rSection.mpSection->GetFmt(); pFmt->SetAttr(SwFmtNoBalancedColumns(true)); } - // set PaM into first Node of the new Section - const SwSectionNode* pSectionNode = pLastInsertedSection->GetFmt()->GetSectionNode(); - ASSERT( pSectionNode, "Kein Inhalt vorbereitet." ); - - ASSERT( !pAfterSection, "pAfterSection not Null! why Recursion?"); - pAfterSection = new SwNodeIndex( *pSectionNode->EndOfSectionNode(), 1 ); - rMyPaM.GetPoint()->nNode = pSectionNode->GetIndex()+1; - rMyPaM.GetPoint()->nContent.Assign(rMyPaM.GetCntntNode(), 0); + return pFmt; } -bool SwWW8ImplReader::MustCloseSection(long nTxtPos) +void SwWW8ImplReader::HandleLineNumbering(const wwSection &rSection) { - // Might we have to close a section first? - bool bSectionWasJustClosed = pAfterSection && nTxtPos; - if( bSectionWasJustClosed ) - { - /* - #96598# - When a section is created it is created with an empty para inside it. - We should never want this para. - */ - rDoc.DelFullPara(*pPaM); - - // set PaM behind section - pPaM->GetPoint()->nNode = *pAfterSection; - pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0); - - ASSERT(!pPaM->GetNode()->IsEndNode(), - "WW8: I want to see an example of this to ease my mind"); - if (pPaM->GetNode()->IsEndNode()) - rDoc.AppendTxtNode(*pPaM->GetPoint()); - - delete pAfterSection, pAfterSection=0; - delete pLastPgDeskIdx, pLastPgDeskIdx=0; - } - return bSectionWasJustClosed; -} - - -// Bei jedem Abschnittswechsel ( auch am Anfang eines Dokuments ) wird -// CreateSep gerufen, dass dann den / die Pagedesc(s) erzeugt und -// mit Attributen un KF-Texten fuellt. -// Dieses Vorgehen ist noetig geworden, da die UEbersetzung der verschiedenen -// Seiten-Attribute zu stark verflochten ist. -void SwWW8ImplReader::CreateSep(const long nTxtPos, bool bMustHaveBreak) -{ - /* - #i1909# #100688# section/page breaks should not occur in tables, word - itself ignores them in this case. The bug is truly that this filter - created such documents in the past! - */ - if (nInTable) - return; - - if (bTxbxFlySection || bDontCreateSep) - return; - - BYTE nLastSectionCorrIhdt = nCorrIhdt; - bool bLastSectionHadATitlePage = bSectionHasATitlePage; - - bool bSectionWasJustClosed = MustCloseSection(nTxtPos); - - SwPageDesc* pOldPageDesc = pPageDesc; - SwPageDesc* pPageDesc1 = 0; - WW8PLCFx_SEPX* pSep = pPlcxMan->GetSepPLCF(); - - // check if Line Numbering must be activated or resetted - const BYTE* pSprmSNLnnMod = mbNewDoc ? - pSep->HasSprm( bVer67 ? 154 : 0x5015 ) : 0; - if( pSprmSNLnnMod && *pSprmSNLnnMod ) + if (mbNewDoc && rSection.maSep.nLnnMod) { // restart-numbering-mode: 0 per page, 1 per section, 2 never restart - const BYTE* pSprmSLnc = pSep->HasSprm( bVer67 ? 152 : 0x3013 ); - bRestartLnNumPerSection = pSprmSLnc && 1 == *pSprmSLnc; + bool bRestartLnNumPerSection = (1 == rSection.maSep.lnc); - if( bNoLnNumYet ) + if (bNoLnNumYet) { SwLineNumberInfo aInfo( rDoc.GetLineNumberInfo() ); aInfo.SetPaintLineNumbers(true); - aInfo.SetRestartEachPage( !pSprmSLnc || 0 == *pSprmSLnc ); + aInfo.SetRestartEachPage(!bRestartLnNumPerSection); - const BYTE* pSprmSDxaLnn = pSep->HasSprm( bVer67 ? 155:0x9016 ); - if( pSprmSDxaLnn ) - { - INT16 nSDxaLnn = SVBT16ToShort( pSprmSDxaLnn ); - aInfo.SetPosFromLeft( nSDxaLnn ); - } - - aInfo.SetCountBy( *pSprmSNLnnMod ); //Paint only for every n line + aInfo.SetPosFromLeft( rSection.maSep.dxaLnn); + //Paint only for every n line + aInfo.SetCountBy(rSection.maSep.nLnnMod); // to be defaulted features ( HARDCODED in MS Word 6,7,8,9 ) aInfo.SetCountBlankLines(true); @@ -1250,547 +861,327 @@ void SwWW8ImplReader::CreateSep(const long nTxtPos, bool bMustHaveBreak) bNoLnNumYet = false; } - const BYTE* pSprmSLnnMin = pSep->HasSprm( bVer67 ? 160:0x501B ); - if( ( pSprmSLnnMin - && 0 < *pSprmSLnnMin ) - || ( bRestartLnNumPerSection - && !bNoLnNumYet ) ) + if ( + (0 < rSection.maSep.lnnMin) || + (bRestartLnNumPerSection && !bNoLnNumYet) + ) { SwFmtLineNumber aLN; - if( pSprmSLnnMin ) - aLN.SetStartValue( 1 + *pSprmSLnnMin ); - else - aLN.SetStartValue( 1 ); - - NewAttr( aLN ); - pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_LINENUMBER ); + aLN.SetStartValue(1 + rSection.maSep.lnnMin); + NewAttr(aLN); + pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_LINENUMBER); } bNoLnNumYet = false; } +} +wwSection::wwSection(const SwPosition &rPos) : maStart(rPos.nNode), + mpSection(0), mpTitlePage(0), mpPage(0), meDir(FRMDIR_HORI_LEFT_TOP), + nPgWidth(lA4Width), nPgLeft(MM_250), nPgRight(MM_250), mnBorders(0), + mbHasFootnote(false) +{ +} - // pruefen, ob und wie umzubrechen ist break code: 0 No break - // 1 New column - const BYTE* pSprmBkc = pSep->HasSprm( bVer67 ? 142 : 0x3009 );// 2 New page - BYTE nBreakCode = pSprmBkc ? *pSprmBkc : 2; // 3 Even page - bool bContinuousBreak=(0 == nBreakCode); // 4 Odd page +void wwSectionManager::SetNumberingType(const wwSection &rNewSection, + SwPageDesc &rPageDesc) +{ + // Seitennummernformat speichern + static const SvxExtNumType aNumTyp[5] = + { + SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER, + SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N + }; - // im wievielten Abschnitt stehen wir denn eigentlich? - nActSectionNo = (short)( pSep->GetIdx() & 0x00007fff ); + SvxNumberType aType; + aType.SetNumberingType(aNumTyp[rNewSection.maSep.nfcPgn]); + rPageDesc.SetNumType(aType); +} +// Bei jedem Abschnittswechsel ( auch am Anfang eines Dokuments ) wird +// CreateSep gerufen, dass dann den / die Pagedesc(s) erzeugt und +// mit Attributen un KF-Texten fuellt. +// Dieses Vorgehen ist noetig geworden, da die UEbersetzung der verschiedenen +// Seiten-Attribute zu stark verflochten ist. +void wwSectionManager::CreateSep(const long nTxtPos, bool bMustHaveBreak) +{ + /* + #i1909# #100688# section/page breaks should not occur in tables or subpage + elements like frames. Word itself ignores them in this case. The bug is + more likely that this filter created such documents in the past! + */ + if (mrReader.nInTable || mrReader.bTxbxFlySection) + return; + WW8PLCFx_SEPX* pSep = mrReader.pPlcxMan->GetSepPLCF(); + ASSERT(pSep, "impossible!"); + if (!pSep) + return; - /* - Welche Kopf-/Fuss-Bereiche sind - identisch mit dem Vorgaenger-Abschnitt? - */ // sprmSFTitlePage - bSectionHasATitlePage = (0 != ReadBSprm( pSep, bVer67 ? 143 : 0x300A, 0 )); + bool bVer67(mrReader.bVer67); - BYTE nIPara; + wwSection aLastSection(*mrReader.pPaM->GetPoint()); + if (!maSegments.empty()) + aLastSection = maSegments.back(); - BYTE nJustCopyHdFt = 0; // HdFt that are stored in previous WW section prop - // and were NOT USED but may be copied now - BYTE nSameHdFt = 0; // HdFt that WERE the same in previous WW section + //Here + USHORT nLIdx = ( ( mrReader.pWwFib->lid & 0xff ) == 0x9 ) ? 1 : 0; - short aOldSectionNo[ 6 ]; - memset( &aOldSectionNo, 0, sizeof( aOldSectionNo ) ); + //BEGIN read section values + wwSection aNewSection(*mrReader.pPaM->GetPoint()); - if( bVer67 ) + if (!maSegments.empty()) { - // sprmSGprfIhdt - bool bSameHdFt = ( !ReadBSprmRet( nIPara, pSep, 153, 0 ) ); - - // Leere Hd/Ft will ich nicht - nCorrIhdt = pHdFt ? HdFtCorrectPara( nIPara ) : 0; - if( bSameHdFt ) - { - nSameHdFt = 0xff; - nJustCopyHdFt = nSameHdFt; - } + // Type of break: break codes are: + // 0 No break + // 1 New column + // 2 New page + // 3 Even page + // 4 Odd page + if (const BYTE* pSprmBkc = pSep->HasSprm(bVer67 ? 142 : 0x3009)) + aNewSection.maSep.bkc = *pSprmBkc; } - else - { - if( !pHdFt ) - nCorrIhdt = 0; - else - { - // nCorrIhdt ermitteln: WELCHE Hd/Ft sind ueberhaupt zu aktivieren? - // - nCorrIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD; - - if( bSectionHasATitlePage ) - nCorrIhdt |= WW8_HEADER_FIRST | WW8_FOOTER_FIRST; - - if( pWDop->fFacingPages ) - nCorrIhdt |= WW8_HEADER_EVEN | WW8_FOOTER_EVEN; - - // den PLCF analysieren: - // - // Hd/Ft ist gleich, wenn die Laenge des Eintrags NULL ist - // oder die Ziel-Offsets identisch sind. - // - WW8_CP nStart; - WW8_CP nOldStart=0; - long nLen; - long nOldLen=0; - BYTE nHdFtInfosStored=0; - - for( BYTE nI = 0, nMask = 1; nI < 6; nI++, nMask <<= 1 ) - { - // 1st find ALL Hd/Ft infos that are stored in this WW section - // -- or in the sections before this one -- - // regardless whether they are used in this section or not - pHdFt->GetTextPosExact( nI+ (nActSectionNo+1)*6, nStart, nLen ); - if( nLen <=2 && nActSectionNo ) - { - short nOldSectionNo = nActSectionNo; - do - { - --nOldSectionNo; - pHdFt->GetTextPosExact( nI + (nOldSectionNo+1)*6, - nOldStart, nOldLen); - if( nOldLen ) - aOldSectionNo[ nI ] = nOldSectionNo; - } - while( nOldSectionNo && !nOldLen ); - } - if( nLen >= 2 || nOldLen ) - nHdFtInfosStored |= nMask; + // Has a table page + aNewSection.maSep.fTitlePage = + (0 != ReadBSprm( pSep, bVer67 ? 143 : 0x300A, 0 )); + // sprmSNfcPgn + aNewSection.maSep.nfcPgn = ReadBSprm( pSep, (bVer67 ? 147 : 0x300E), 0 ); + if (aNewSection.maSep.nfcPgn > 4) + aNewSection.maSep.nfcPgn = 0; - if( nCorrIhdt & nMask ) - { - if( nActSectionNo ) - { - if( nLen < 2 || - ((nOldStart == nStart) && (nOldLen == nLen)) ) - { - // same Hd/Ft as in previous Section or NO Hd/Ft - if( nHdFtInfosStored & nMask ) - { - // prev. sect. really DID have and USE the Hd/Ft - if( nLastSectionCorrIhdt & nMask ) - nJustCopyHdFt |= nMask; - // Hd/Ft may be found in one of prev. sections - nSameHdFt |= nMask; - } - else - nCorrIhdt &= ~nMask;// NO prev. Hd/Ft at all - } - } - else if (nLen < 2) - nCorrIhdt &= ~nMask;// 0 in 1.Sect.: Hd/Ft undefined - } - } - } - // Einlese-Flag auf Use-On-Flag setzen - nIPara = nCorrIhdt; - } + // sprmSFBiDi + if (!bVer67) + aNewSection.maSep.fBiDi = ReadBSprm(pSep, 0x3228, 0); + aNewSection.maSep.ccolM1 = ReadSprm(pSep, (bVer67 ? 144 : 0x500B), 0 ); - USHORT nLIdx = ( ( pWwFib->lid & 0xff ) == 0x9 ) ? 1 : 0; + //sprmSDxaColumns - Default-Abstand 1.25 cm + aNewSection.maSep.dxaColumns = + ReadUSprm( pSep, (bVer67 ? 145 : 0x900C), 708 ); - // sprmSNfcPgn - BYTE nLastNfcPgn = nNfcPgn; - nNfcPgn = ReadBSprm( pSep, (bVer67 ? 147 : 0x300E), 0 ); - if (nNfcPgn > 4) - nNfcPgn = 0; + // sprmSLBetween + aNewSection.maSep.fLBetween = ReadBSprm(pSep, (bVer67 ? 158 : 0x3019), 0 ); - // sprmSFBiDi - bool bLastRTLPgn = mbRTLPgn; - if (!bVer67) - mbRTLPgn = ReadBSprm(pSep, 0x3228, 0) ? true : false; + // sprmSFEvenlySpaced + aNewSection.maSep.fEvenlySpaced = + ReadBSprm(pSep, (bVer67 ? 138 : 0x3005), 1) ? true : false; - /* - Pruefen, ob wir uns den neuen Abschnitt schenken koennen, da kein - Umbruch erforderlich ist. - */ - if( pSep->GetIMax() > 1 ) + if (aNewSection.maSep.ccolM1 > 0 && !aNewSection.maSep.fEvenlySpaced) { - if( nActSectionNo ) + aNewSection.maSep.rgdxaColumnWidthSpacing[0] = 0; + USHORT nWidth; + int nCols = aNewSection.maSep.ccolM1 + 1; + int nIdx = 0; + for (int i = 0; i < nCols; ++i) { - // Index eins zurueck setzen - pSep->SetIdx( nActSectionNo-1 ); - // Attribute von vorigem Abschnitt einlesen - WW8PLCFxDesc aOther; - pSep->GetSprms( &aOther ); - long nOtherSprmsLen = aOther.nSprmsLen; - // Kopie der vorigen Attr. anlegen, da sie gleich ueberschrieben werden - BYTE* pOtherMem = new BYTE[ nOtherSprmsLen ]; - memcpy( pOtherMem, aOther.pMemPos, nOtherSprmsLen ); - // Index wieder richtig setzen - pSep->SetIdx( nActSectionNo ); - // aktuelle Attribute einlesen - WW8PLCFxDesc aCur; - pSep->GetSprms( &aCur ); - - // zu ignorierende Attribute sammeln - bool bEqual = false; - if (bContinuousBreak) - bEqual = true; - else - { - bEqual = (bSectionHasATitlePage == bLastSectionHadATitlePage) - && (nCorrIhdt == nLastSectionCorrIhdt) - && (nCorrIhdt == (nCorrIhdt & nJustCopyHdFt)) - && (nNfcPgn == nLastNfcPgn) && (mbRTLPgn == bLastRTLPgn); - } + //sprmSDxaColWidth + const BYTE* pSW = + pSep->HasSprm( (bVer67 ? 136 : 0xF203), BYTE( i ) ); - if (bEqual) //Give continious breaks leniency. - { - /* - #95903# - If we are a continious section, word will report the same - headers and footers as the current (pOldPageDesc) page - descriptor, but we would really like to use the next style, - because thats what the user will probably expect on what to - them is the next page, so we'll pretend that our current style - is the follow style, and we'll disable any flags that claim we - want to use special first page headers/footers. None of this - dancing around widdershins to the sun would be required if our - sections could have margins independant of the host page, like - tables or graphics. - */ - pOldPageDesc = pOldPageDesc ? pOldPageDesc->GetFollow() : 0; - if (bSectionHasATitlePage) - { - bSectionHasATitlePage = 0; - nSameHdFt ^= (WW8_HEADER_FIRST | WW8_FOOTER_FIRST); - } - /* - If we are a continous section then are we equal to the host - (previous) section. Relevent because margins cannot be - different in a section than from its host page in writer but - they can in word, if that is the case then we must make a new - page anyway :-( - */ - bEqual = pSep->SprmsAreEquivalent(pOtherMem,nOtherSprmsLen); - } + ASSERT( pSW, "+Sprm 136 (bzw. 0xF203) (ColWidth) fehlt" ); + if (pSW) + nWidth = SVBT16ToShort(pSW + 1); - // Copy of vorigen Attr. here freed. - delete[] pOtherMem; + aNewSection.maSep.rgdxaColumnWidthSpacing[++nIdx] = nWidth; - if( bEqual ) + if (i < nCols-1) { - switch( nBreakCode ) - { - case 0: - InsertSectionWithWithoutCols( *pPaM, 0 ); - if( pPageDesc ) - { - SwFrmFmt& rFmt = pPageDesc->GetMaster(); - const SwFmtFrmSize& rSz = rFmt.GetFrmSize(); - const SvxLRSpaceItem& rLR = rFmt.GetLRSpace(); - SwTwips nWidth = rSz.GetWidth(); - long nLeft = rLR.GetTxtLeft(); - long nRight = rLR.GetRight(); - SetCols( pLastInsertedSection->GetFmt(), pSep, - (USHORT)(nWidth - nLeft - nRight) ); - } - break; - case 1: - if (mbNewDoc) - { - rDoc.Insert(*pPaM, SvxFmtBreakItem( - SVX_BREAK_COLUMN_BEFORE )); - } - break; - //case 2: - //case 3: // alle drei Faelle -> PgDesc-Format-Einfuegung - //case 4: - default: - /* - Wir koennen den aktuellen PgDesk einsetzen, da dies - immer der 1st-Page Deskriptor ist, nie der Follow! - - So geht es, auch wenn der Break auf Seite 7 kommt, - wieder mit einer ERSTEN Seite weiter. - */ - if (mbNewDoc) - { - if( pPageDesc ) - rDoc.Insert(*pPaM, SwFmtPageDesc( pPageDesc )); - else - // kein voriger PgDesc vorhanden? - rDoc.Insert(*pPaM, - SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE )); - SetLastPgDeskIdx(); - } - break; - } - return; - // ======== Das war's Freunde, jetzt nichts wie weg hier! - } - } - if (mbNewDoc && - ( bSectionWasJustClosed || (pPageDesc != &rDoc._GetPageDesc(0)) )) - { - if ((nBreakCode > 1) && bMustHaveBreak) - { - if( pPageDesc ) - rDoc.Insert(*pPaM, SwFmtPageDesc( pPageDesc )); - } - // Create and *insert* PageDesc - SwPaM* pPageDeskPaM = 0; - pPageDesc = CreatePageDesc( 0, &pPageDeskPaM ); - SwFrmFmt &rFmt = pPageDesc->GetMaster(); - SetPage1(pPageDesc, rFmt, pSep, nLIdx, false); - // if PageDesc has been inserted and has cols - // insert a *section* with cols instead - if( pPageDeskPaM ) - { - const SwFmtCol& rCol = rFmt.GetCol(); - if( rCol.GetNumCols() ) + //sprmSDxaColSpacing + const BYTE* pSD = + pSep->HasSprm( (bVer67 ? 137 : 0xF204), BYTE( i ) ); + + ASSERT( pSD, "+Sprm 137 (bzw. 0xF204) (Colspacing) fehlt" ); + if( pSD ) { - InsertSectionWithWithoutCols( *pPaM, &rCol ); - // remove columns from PageDesc - SwFmtCol aCol; - rFmt.SetAttr( aCol ); + nWidth = SVBT16ToShort(pSD + 1); + aNewSection.maSep.rgdxaColumnWidthSpacing[++nIdx] = nWidth; } - delete pPageDeskPaM; } } } - else if (mbNewDoc) - pPageDesc = &rDoc._GetPageDesc( 0 ); // Standard - if (!mbNewDoc) - return; + static const USHORT aVer67Ids[] = + { + /*sprmSBOrientation*/ 162, + /*sprmSXaPage*/ 164, + /*sprmSYaPage*/ 165, + /*sprmSDxaLeft*/ 166, + /*sprmSDxaRight*/ 167, + /*sprmSDzaGutter*/ 170 + }; - // Seitennummernformat speichern + static const USHORT aVer8Ids[] = { - static const SvxExtNumType aNumTyp[5] = - { - SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER, - SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N - }; + /*sprmSBOrientation*/ 0x301d, + /*sprmSXaPage*/ 0xB01F, + /*sprmSYaPage*/ 0xB020, + /*sprmSDxaLeft*/ 0xB021, + /*sprmSDxaRight*/ 0xB022, + /*sprmSDzaGutter*/ 0xB025 + }; - SvxNumberType aType; aType.SetNumberingType(aNumTyp[ nNfcPgn ]); - pPageDesc->SetNumType( aType ); - } + const USHORT* pIds = bVer67 ? aVer67Ids : aVer8Ids; + + // 1. Orientierung + aNewSection.maSep.dmOrientPage = ReadBSprm(pSep, pIds[0], 0); + + // 2. Papiergroesse + aNewSection.maSep.xaPage = ReadUSprm(pSep, pIds[1], (USHORT)lLetterWidth); + + aNewSection.nPgWidth = AdjustSize(aNewSection.maSep.xaPage); + + aNewSection.maSep.yaPage = ReadUSprm(pSep, pIds[2], (USHORT)lLetterHeight); + + // 3. LR-Raender + static const USHORT nLef[] = { MM_250, 1800 }; + static const USHORT nRig[] = { MM_250, 1800 }; + + aNewSection.maSep.dxaLeft = ReadULSprm( pSep, pIds[3], nLef[nLIdx]); + aNewSection.maSep.dxaRight = ReadULSprm( pSep, pIds[4], nRig[nLIdx]); + aNewSection.maSep.dzaGutter = ReadULSprm( pSep, pIds[5], 0); + + aNewSection.maSep.fRTLGutter = !bVer67 ? ReadULSprm( pSep, 0x322A, 0 ) : 0; // Page Number Restarts - sprmSFPgnRestart - BYTE nfPgnRestart = ReadBSprm( pSep, (bVer67 ? 150 : 0x3011), 0 ); + aNewSection.maSep.fPgnRestart = ReadBSprm(pSep, (bVer67 ? 150 : 0x3011), 0); - if( nfPgnRestart ) - { - const SfxPoolItem* pItem; - const SfxItemSet* pSet; - if( ( 0 != (pSet = pPaM->GetCntntNode()->GetpSwAttrSet()) ) - && ( SFX_ITEM_SET == - pSet->GetItemState(RES_PAGEDESC, false, &pItem) ) ) - { - // read Pagination Start attribute - sprmSPgnStart - BYTE nPgnStart = ReadBSprm( pSep, (bVer67 ? 161 : 0x501C), 0 ); - ((SwFmtPageDesc*)pItem)->SetNumOffset( nPgnStart ); - } - else if( pPageDesc == &rDoc.GetPageDesc( 0 ) ) - { - // read Pagination Start attribute - sprmSPgnStart - BYTE nPgnStart = ReadBSprm( pSep, (bVer67 ? 161 : 0x501C), 0 ); - SwFmtPageDesc aPgDesc( pPageDesc ); - aPgDesc.SetNumOffset( nPgnStart ); - rDoc.Insert( *pPaM, aPgDesc ); - SetLastPgDeskIdx(); - } + aNewSection.maSep.pgnStart = ReadBSprm( pSep, (bVer67 ? 161 : 0x501C), 0 ); - // Chapterlevel und Chapterdelimiter ? (sprmScnsPgn & sprmSiHeadingPgn) - const BYTE* p = pSep->HasSprm( bVer67 ? 132 : 0x3001 ); - if( p && *p ) - { - bPgChpLevel = true; - nPgChpLevel = *p - 1; - if( MAXLEVEL <= nPgChpLevel ) - nPgChpLevel = MAXLEVEL - 1; + if (const BYTE* p = pSep->HasSprm( bVer67 ? 132 : 0x3001 )) + aNewSection.maSep.iHeadingPgn = *p; - if( 0 != (p = pSep->HasSprm( bVer67 ? 131 : 0x3000 )) ) - nPgChpDelim = *p; - else - nPgChpDelim = 0; - } - else - bPgChpLevel = false; - } + if (const BYTE* p = pSep->HasSprm( bVer67 ? 131 : 0x3000 )) + aNewSection.maSep.cnsPgn = *p; - // Vorsicht: gibt es ueberhaupt einen vorigen Page Descriptor? - if (!pOldPageDesc) - { - nSameHdFt = 0; - SetLastPgDeskIdx(); - } + static const BYTE aPaperBinIds[17] = {5,2,4,0,3,0,0,0,0,0,0,0,0,0,0,0,1}; + // WW SW + // ------------------------------ + // 0 == default 5 + // 1 == Upper paper tray 2 + // 2 == Lower paper tray 4 + // 4 == Manual paper feed 3 + // 15 == Automatically select 0 + // 16 == First tray available 1 + + if(const BYTE* pSprmSDmBinFirst = pSep->HasSprm( bVer67 ? 140 : 0x5007 )) + aNewSection.maSep.dmBinFirst = *pSprmSDmBinFirst; - SwFrmFmt &rFmt0 = pPageDesc->GetMaster(); + if (const BYTE* pSprmSDmBinOther = pSep->HasSprm( bVer67 ? 141 : 0x5008)) + aNewSection.maSep.dmBinOther = *pSprmSDmBinOther; + + static const USHORT nTop[] = { MM_250, 1440 }; + static const USHORT nBot[] = { MM_200, 1440 }; - if( !bSectionHasATitlePage ) + static const USHORT aVer67Ids2[] = { - // Gegebenenfalls Einstellungen des vorigen PgDesc uebernehmen - // und das Einlese-Flag entsprechend korrigieren, - // damit nur noch die Eintraege gelesen werden, die NICHT - // vom vorigen PgDesc zu uebernehmen sind. - // - if( 0 < nSameHdFt ) - { - CopyPageDescHdFt( pOldPageDesc, pPageDesc, nSameHdFt ); - if( bVer67 ) - nIPara = 0; - else - nIPara &= ~nSameHdFt; - } + /*sprmSDyaTop*/ 168, + /*sprmSDyaBottom*/ 169, + /*sprmSDyaHdrTop*/ 156, + /*sprmSDyaHdrBottom*/ 157 + }; + static const USHORT aVer8Ids2[] = + { + /*sprmSDyaTop*/ 0x9023, + /*sprmSDyaBottom*/ 0x9024, + /*sprmSDyaHdrTop*/ 0xB017, + /*sprmSDyaHdrBottom*/ 0xB018 + }; - WW8ULSpaceData aULData; - GetPageULData(pSep, nLIdx, false, aULData); + pIds = bVer67 ? aVer67Ids2 : aVer8Ids2; - // und uebrige Einstellungen updaten - // Orientierung, Hoehe, Breite, Vertikale Formatierung - SetPage1(pPageDesc, rFmt0, pSep, nLIdx, true); + aNewSection.maSep.dyaTop = ReadULSprm( pSep, pIds[0], nTop[nLIdx] ); + aNewSection.maSep.dyaBottom = ReadULSprm( pSep, pIds[1], nBot[nLIdx] ); + aNewSection.maSep.dyaHdrTop = ReadULSprm( pSep, pIds[2], 720 ); + aNewSection.maSep.dyaHdrBottom = ReadULSprm( pSep, pIds[3], 720 ); - // dann Header / Footer lesen, falls noch noetig - if( nIPara ) - SetHdFt( pPageDesc, 0, nIPara ); + if (!bVer67) + { + aNewSection.maSep.wTextFlow = ReadULSprm(pSep, 0x5033, 0); + aNewSection.maSep.clm = ReadULSprm( pSep, 0x5032, 0 ); + aNewSection.maSep.dyaLinePitch = ReadULSprm(pSep, 0x9031, 360); + if (const BYTE* pS = pSep->HasSprm(0x7030)) + aNewSection.maSep.dxtCharSpace = SVBT32ToLong(pS); - SetPageULSpaceItems( rFmt0, aULData ); - SetDocumentGrid(rFmt0, pSep); - SetPageBorder( 0, pPageDesc, pSep, nLIdx ); + //sprmSPgbProp + sal_uInt16 pgbProp = ReadSprm( pSep, 0x522F, 0 ); + aNewSection.maSep.pgbApplyTo = pgbProp & 0x0007; + aNewSection.maSep.pgbPageDepth = (pgbProp & 0x0018) >> 3; + aNewSection.maSep.pgbOffsetFrom = (pgbProp & 0x00E0) >> 5; + + aNewSection.mnBorders = + ::lcl_ReadBorders(bVer67, aNewSection.brc, 0, 0, pSep); } - else - { - // Hier beachten: - // ============== - // - // pPageDesc = erste Seite - // pPageDesc1 = Folge-Seiten - // + // check if Line Numbering must be activated or resetted + if (const BYTE* pSprmSNLnnMod = pSep->HasSprm( bVer67 ? 154 : 0x5015 )) + aNewSection.maSep.nLnnMod = *pSprmSNLnnMod; + + if (const BYTE* pSprmSLnc = pSep->HasSprm( bVer67 ? 152 : 0x3013 )) + aNewSection.maSep.lnc = *pSprmSLnc; - // erst folgende PageDesc-Werte einstellen: - // - // Orientierung, Hoehe, Breite, Vertikale Formatierung - SetPage1(pPageDesc, rFmt0, pSep, nLIdx, true); + if (const BYTE* pSprmSDxaLnn = pSep->HasSprm( bVer67 ? 155:0x9016 )) + aNewSection.maSep.dxaLnn = SVBT16ToShort( pSprmSDxaLnn ); - // dann den PageDesc1 anlegen fuer Folge-Seiten - // - pPageDesc1 = CreatePageDesc( pPageDesc ); + if (const BYTE* pSprmSLnnMin = pSep->HasSprm( bVer67 ? 160:0x501B )) + aNewSection.maSep.lnnMin = *pSprmSLnnMin; - // Gegebenenfalls Einstellungen des/der vorigen PgDesc uebernehmen - // - if( 0 < nSameHdFt ) + if (bVer67) + aNewSection.maSep.grpfIhdt = ReadBSprm(pSep, 153, 0); + else if (mrReader.pHdFt) + { + aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD; + + if (aNewSection.maSep.fTitlePage) + aNewSection.maSep.grpfIhdt |= WW8_HEADER_FIRST | WW8_FOOTER_FIRST; + + if (mrReader.pWDop->fFacingPages) + aNewSection.maSep.grpfIhdt |= WW8_HEADER_EVEN | WW8_FOOTER_EVEN; + + //See if we have a header or footer for each enabled possibility + //if we do not then we inherit the previous sections header/footer, + for (int nI = 0, nMask = 1; nI < 6; ++nI, nMask <<= 1) { - // ggfs. erst den alten 1st-Seite-PgDesc suchen und dessen - // Einstellungen uebernehmen - // - if( nSameHdFt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST) ) + if (aNewSection.maSep.grpfIhdt & nMask) { - if( pOldPageDesc == pOldPageDesc->GetFollow() ) + WW8_CP nStart; + long nLen; + mrReader.pHdFt->GetTextPosExact(nI + ( maSegments.size() + 1) * 6, nStart, nLen); + //No header or footer, inherit pervious one, or set to zero + //if no previous one + if (!nLen) { - // hoppla, die vorige Section hatte keine 1st Page? - // - // also: auslesen der in WW8 fuer die nicht vorhandene - // 1st Page gespeicherten Hd/Ft-Einstellungen... - // - // Beachte: pPageDesc1 MUSS hier mit uebergeben werden, - // obwohl wir dessen Werte ja eigentlich hier - // gar nicht einlesen wollen! - // Das macht aber nichts, denn wir stellen den - // "SetHdFt( nIPara )"-Parameter so ein, dass - // nur der 1.-Seite-PgDesc eingelesen wird. - // - short nSaveSectionNo = nActSectionNo; - if( bVer67 ) - --nActSectionNo; - else - nActSectionNo = aOldSectionNo[ 4 ] - ? aOldSectionNo[ 4 ] // Hd 1st - : aOldSectionNo[ 5 ]; // Ft 1st - SetHdFt(pPageDesc, pPageDesc1, - nSameHdFt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST)); - nActSectionNo = nSaveSectionNo; + if ( + maSegments.empty() || + !(maSegments.back().maSep.grpfIhdt & nMask) + ) + { + aNewSection.maSep.grpfIhdt &= ~nMask; + } } - else - CopyPageDescHdFt( pOldPageDesc, pPageDesc, - nSameHdFt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST) ); } - - // ggfs. Werte des vorigen PgDesc fuer Folge-Seiten uebernehmen - // - if( nSameHdFt & ( WW8_HEADER_EVEN | WW8_HEADER_ODD - | WW8_FOOTER_EVEN | WW8_FOOTER_ODD ) ) - { - CopyPageDescHdFt( pOldPageDesc, pPageDesc1, - nSameHdFt & ( WW8_HEADER_EVEN | WW8_HEADER_ODD - | WW8_FOOTER_EVEN | WW8_FOOTER_ODD ) ); - } - // das Einlese-Flag entsprechend korrigieren, - // damit nur noch die Eintraege gelesen werden, die NICHT - // von vorigem/n PgDesc(s) zu uebernehmen sind. - // - if( bVer67 ) - nIPara = 0; - else - nIPara &= ~nSameHdFt; } - - SwFrmFmt &rFmt1 = pPageDesc1->GetMaster(); - - WW8ULSpaceData aULData0, aULData1; - // Vertikale Formatierung - GetPageULData(pSep, nLIdx, true, aULData0); - // einzeln, da KF evtl. verschieden - GetPageULData(pSep, nLIdx, false, aULData1); - - // dann Header / Footer lesen, falls noch noetig - if( nIPara ) - SetHdFt( pPageDesc, pPageDesc1, nIPara ); - - // und uebrige Einstellungen updaten - // Vertikale Formatierung - SetPageULSpaceItems( rFmt0, aULData0 ); - SetDocumentGrid(rFmt0, pSep); - // einzeln, da KF evtl. verschieden - SetPageULSpaceItems( rFmt1, aULData1 ); - SetDocumentGrid(rFmt1, pSep); - SetPageBorder( pPageDesc, pPageDesc1, pSep, nLIdx ); } - SetUseOn(pPageDesc, pPageDesc1, nCorrIhdt); + SetLeftRight(aNewSection); + //END read section values - static const BYTE aPaperBinIds[17] = {5,2,4,0,3,0,0,0,0,0,0,0,0,0,0,0,1}; - // WW SW - // ------------------------------ - // 0 == default 5 - // 1 == Upper paper tray 2 - // 2 == Lower paper tray 4 - // 4 == Manual paper feed 3 - // 15 == Automatically select 0 - // 16 == First tray available 1 + if (!bVer67) + aNewSection.SetDirection(); - const BYTE* pSprmSDmBinFirst = pSep->HasSprm( bVer67 ? 140 : 0x5007 ); - const BYTE* pSprmSDmBinOther = pSep->HasSprm( bVer67 ? 141 : 0x5008 ); - if( pSprmSDmBinFirst && (17 > *pSprmSDmBinFirst) ) - { - SvxPaperBinItem aItem(ITEMID_PAPERBIN, aPaperBinIds[*pSprmSDmBinFirst]); - pPageDesc->GetMaster().SetAttr( aItem ); - } - if( pSprmSDmBinOther && (17 > *pSprmSDmBinOther) ) - { - SvxPaperBinItem aItem(ITEMID_PAPERBIN, aPaperBinIds[*pSprmSDmBinOther]); - SwFrmFmt &rFmtOther = pPageDesc1 ? pPageDesc1->GetMaster() : - pPageDesc->GetLeft(); - rFmtOther.SetAttr( aItem ); - } + maSegments.push_back(aNewSection); // Kopf / Fuss - Index Updaten // Damit der Index auch spaeter noch stimmt - if( pHdFt ) - pHdFt->UpdateIndex( nCorrIhdt ); + if (mrReader.pHdFt) + mrReader.pHdFt->UpdateIndex(aNewSection.maSep.grpfIhdt); } - -void SwWW8ImplReader::CopyPageDescHdFt( const SwPageDesc* pOrgPageDesc, - SwPageDesc* pNewPageDesc, BYTE nCode ) +void SwWW8ImplReader::CopyPageDescHdFt(const SwPageDesc* pOrgPageDesc, + SwPageDesc* pNewPageDesc, BYTE nCode ) { // copy first header content section - if( nCode & WW8_HEADER_FIRST ) + if (nCode & WW8_HEADER_FIRST) rDoc.CopyHeader(pOrgPageDesc->GetMaster(), pNewPageDesc->GetMaster()); // copy first footer content section @@ -1800,30 +1191,28 @@ void SwWW8ImplReader::CopyPageDescHdFt( const SwPageDesc* pOrgPageDesc, if( nCode & ( WW8_HEADER_ODD | WW8_FOOTER_ODD | WW8_HEADER_EVEN | WW8_FOOTER_EVEN ) ) { - // determine PageDesc of follow pages - const SwPageDesc* pOrgFollowPageDesc = pOrgPageDesc->GetFollow(); // copy odd header content section if( nCode & WW8_HEADER_ODD ) { - rDoc.CopyHeader(pOrgFollowPageDesc->GetMaster(), + rDoc.CopyHeader(pOrgPageDesc->GetMaster(), pNewPageDesc->GetMaster() ); } // copy odd footer content section if( nCode & WW8_FOOTER_ODD ) { - rDoc.CopyFooter(pOrgFollowPageDesc->GetMaster(), + rDoc.CopyFooter(pOrgPageDesc->GetMaster(), pNewPageDesc->GetMaster()); } // copy even header content section if( nCode & WW8_HEADER_EVEN ) { - rDoc.CopyHeader(pOrgFollowPageDesc->GetLeft(), + rDoc.CopyHeader(pOrgPageDesc->GetLeft(), pNewPageDesc->GetLeft()); } // copy even footer content section if( nCode & WW8_FOOTER_EVEN ) { - rDoc.CopyFooter(pOrgFollowPageDesc->GetLeft(), + rDoc.CopyFooter(pOrgPageDesc->GetLeft(), pNewPageDesc->GetLeft()); } } @@ -2197,19 +1586,24 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const SvxBoxItem& rBox, return bRet; } -void SwWW8ImplReader::GetBorderDistance( WW8_BRC* pbrc, Rectangle& rInnerDist ) +void SwWW8ImplReader::GetBorderDistance(const WW8_BRC* pbrc, + Rectangle& rInnerDist) { // 'dptSpace' is stored in 3 bits of 'Border Code (BRC)' - if( bVer67 ) + if (bVer67) + { rInnerDist = Rectangle(((pbrc[ 1 ].aBits1[1] >> 3) & 0x1f) * 20, ((pbrc[ 0 ].aBits1[1] >> 3) & 0x1f) * 20, ((pbrc[ 3 ].aBits1[1] >> 3) & 0x1f) * 20, ((pbrc[ 2 ].aBits1[1] >> 3) & 0x1f) * 20 ); + } else + { rInnerDist = Rectangle( (pbrc[ 1 ].aBits2[1] & 0x1f) * 20, (pbrc[ 0 ].aBits2[1] & 0x1f) * 20, (pbrc[ 3 ].aBits2[1] & 0x1f) * 20, (pbrc[ 2 ].aBits2[1] & 0x1f) * 20 ); + } } @@ -2298,37 +1692,37 @@ WW8FlyPara::WW8FlyPara(bool bIsVer67, const WW8FlyPara* pSrc /* = 0 */) bVer67 = bIsVer67; } - -// WW8FlyPara::operator == vergleicht alles, was in der Definition vor -// den Borders steht! -// dieses wird u.a. fuer TestSameApo benoetigt. bool WW8FlyPara::operator==(const WW8FlyPara& rSrc) const { - ASSERT( ( (BYTE*)rSrc.brc - (BYTE*)&rSrc < sizeof( WW8FlyPara ) ), - "WW8FlyPara::operator == geht schief" ); - return memcmp(this, &rSrc, (BYTE*)rSrc.brc - (BYTE*)&rSrc) ? false : true; - // memcmp ist moeglich, da die gesamte Struktur beim Initialisieren - // incl. Luecken mit 0 gefuellt wird und sich damit durch die - // Luecken keine falschen Unterschiede ergeben koennen. - // Ausserdem sind alle Elemente aligned, so dass keine Luecken - // existieren + //Compare the parts that word seems to compare for equivalence + return + ( + (nSp26 == rSrc.nSp26) && + (nSp27 == rSrc.nSp27) && + (nSp45 == rSrc.nSp45) && + (nSp28 == rSrc.nSp28) && + (nLeMgn == rSrc.nLeMgn) && + (nRiMgn == rSrc.nRiMgn) && + (nUpMgn == rSrc.nUpMgn) && + (nLoMgn == rSrc.nLoMgn) && + (nSp29 == rSrc.nSp29) && + (nSp37 == rSrc.nSp37) + ); } - // Read fuer normalen Text - void WW8FlyPara::Read(const BYTE* pSprm29, WW8PLCFx_Cp_FKP* pPap) { sal_uInt8 nOrigSp29 = nSp29; if (pSprm29) nOrigSp29 = *pSprm29; // PPC ( Bindung ) - bool bVertSet=false; const BYTE* pS = 0; if( bVer67 ) { SetValSprm( &nSp26, pPap, 26 ); // X-Position //sprmPDxaAbs - bVertSet = SetValSprm( &nSp27, pPap, 27 ); // Y-Position //sprmPDyaAbs + //set in me or in parent style + mbVertSet |= SetValSprm( &nSp27, pPap, 27 ); // Y-Position //sprmPDyaAbs SetValSprm( &nSp45, pPap, 45 ); // Hoehe //sprmPWHeightAbs SetValSprm( &nSp28, pPap, 28 ); // Breite //sprmPDxaWidth SetValSprm( &nLeMgn, pPap, 49 ); // L-Raender //sprmPDxaFromText @@ -2343,7 +1737,8 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8PLCFx_Cp_FKP* pPap) else { SetValSprm( &nSp26, pPap, 0x8418 ); // X-Position - bVertSet = SetValSprm( &nSp27, pPap, 0x8419 ); // Y-Position + //set in me or in parent style + mbVertSet |= SetValSprm( &nSp27, pPap, 0x8419 ); // Y-Position SetValSprm( &nSp45, pPap, 0x442B ); // Hoehe SetValSprm( &nSp28, pPap, 0x841A ); // Breite SetValSprm( &nLeMgn, pPap, 0x842F ); // L-Raender @@ -2366,7 +1761,7 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8PLCFx_Cp_FKP* pPap) from para anchor, so we update the frame to have explicitly this type of anchoring */ - if (!bVertSet) + if (!mbVertSet) nSp29 = (nOrigSp29 & 0xCF) | 0x20; else nSp29 = nOrigSp29; @@ -2440,12 +1835,12 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8RStyle* pStyle) if (pSprm29) nOrigSp29 = *pSprm29; // PPC ( Bindung ) - bool bVertSet=false; const BYTE* pS = 0; if (bVer67) { SetValSprm( &nSp26, pStyle, 26 ); // X-Position - bVertSet = SetValSprm(&nSp27, pStyle, 27); // Y-Position + //set in me or in parent style + mbVertSet |= SetValSprm(&nSp27, pStyle, 27); // Y-Position SetValSprm( &nSp45, pStyle, 45 ); // Hoehe SetValSprm( &nSp28, pStyle, 28 ); // Breite SetValSprm( &nLeMgn, pStyle, 49 ); // L-Raender @@ -2460,7 +1855,8 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8RStyle* pStyle) else { SetValSprm( &nSp26, pStyle, 0x8418 ); // X-Position - bVertSet = SetValSprm(&nSp27, pStyle, 0x8419); // Y-Position + //set in me or in parent style + mbVertSet |= SetValSprm(&nSp27, pStyle, 0x8419); // Y-Position SetValSprm( &nSp45, pStyle, 0x442B ); // Hoehe SetValSprm( &nSp28, pStyle, 0x841A ); // Breite SetValSprm( &nLeMgn, pStyle, 0x842F ); // L-Raender @@ -2483,7 +1879,7 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8RStyle* pStyle) from para anchor, so we update the frame to have explicitly this type of anchoring */ - if (!bVertSet) + if (!mbVertSet) nSp29 = (nOrigSp29 & 0xCF) | 0x20; else nSp29 = nOrigSp29; @@ -2492,6 +1888,14 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8RStyle* pStyle) bool WW8FlyPara::IsEmpty() const { WW8FlyPara aEmpty(bVer67); + /* + wr of 0 like 2 appears to me to be equivalent for checking here. See + #107103# if wrong, so given that the empty is 2, if we are 0 then set + empty to 0 to make 0 equiv to 2 for empty checking + */ + ASSERT(aEmpty.nSp37 == 2, "this is not what we expect for nSp37"); + if (this->nSp37 == 0) + aEmpty.nSp37 = 0; if (aEmpty == *this) return true; return false; @@ -2775,7 +2179,7 @@ WW8FlySet::WW8FlySet( SwWW8ImplReader& rReader, const SwPaM* pPaM, //The horizontal default is on the baseline, the vertical is centered //around the character center it appears - if (rReader.bVerticalEnviron) + if (rReader.maSectionManager.CurrentSectionIsVertical()) Put(SwFmtVertOrient(0, VERT_CHAR_CENTER,REL_CHAR)); else Put(SwFmtVertOrient(0, VERT_TOP, FRAME)); @@ -2935,8 +2339,10 @@ bool SwWW8ImplReader::StartApo(const BYTE* pSprm29, return false; } - pSFlyPara = new WW8SwFlyPara( *pPaM, *this, *pWFlyPara, nPgLeft, - (nPgWidth - nPgRight - nPgLeft), nIniFlyDx, nIniFlyDy ); + pSFlyPara = new WW8SwFlyPara( *pPaM, *this, *pWFlyPara, + maSectionManager.GetPageLeft(), + (maSectionManager.GetPageWidth() - maSectionManager.GetPageRight() - + maSectionManager.GetPageLeft()), nIniFlyDx, nIniFlyDy ); if( !pWFlyPara->bGrafApo ) { @@ -2992,6 +2398,12 @@ bool SwWW8ImplReader::StartApo(const BYTE* pSprm29, return true; } +void wwSectionManager::JoinNode(const SwPosition &rPos, const SwNode &rNode) +{ + if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode)) + maSegments.back().maStart = SwNodeIndex(rNode); +} + bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr) { bool bRet = false; @@ -2999,9 +2411,9 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr) SwNodeIndex aPref(rPam.GetPoint()->nNode, -1); - SwTxtNode* pNode = aPref.GetNode().GetTxtNode(); - if (pNode) + if (SwTxtNode* pNode = aPref.GetNode().GetTxtNode()) { + maSectionManager.JoinNode(*rPam.GetPoint(), aPref.GetNode()); rPam.GetPoint()->nNode = aPref; rPam.GetPoint()->nContent.Assign(pNode, pNode->GetTxt().Len()); if (bStealAttr) @@ -4491,7 +3903,7 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen ) NewAttr( aLSpc ); if( pSFlyPara ) pSFlyPara->nLineSpace = nSpaceTw; // LineSpace fuer Graf-Apos - +#if 0 if( ( nWwPre > nSwPre || nWwPost > nSwPost ) && !( nIniFlags & WW8FL_NO_IMPLPASP ) ) { @@ -4507,6 +3919,7 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen ) aUL.SetLower( nDL ); NewAttr( aUL ); } +#endif } void SwWW8ImplReader::Read_ParaAutoBefore(USHORT, const BYTE *pData, short nLen) @@ -6238,3 +5651,5 @@ short SwWW8ImplReader::ImportSprm(const BYTE* pPos,USHORT nId) return nL; } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 293cd02b7a1e..e65418c7ee7d 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8scan.cxx,v $ * - * $Revision: 1.93 $ + * $Revision: 1.94 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -123,6 +122,7 @@ namespace SL IMPLCONSTSTRINGARRAY(CheckBox); IMPLCONSTSTRINGARRAY(TextBox); IMPLCONSTSTRINGARRAY(TextField); + IMPLCONSTSTRINGARRAY(MSMacroCmds); } template<class C> bool wwString<C>::TestBeltAndBraces(const SvStream& rStrm) @@ -3425,125 +3425,7 @@ const BYTE* WW8PLCFx_SEPX::HasSprm( USHORT nId, BYTE n2nd ) const return 0; // Sprm nicht gefunden } -const wwSprmSequence* WW8PLCFx_SEPX::GetWW6IgnoredSprms() -{ - static sal_uInt16 aSprmIds[] = - { - 136, 137, 138, 139, 142, 144, 145, 147, 152, 154, 155, - 158, 160 - }; - - static wwSprmSequence aWWSprmIds(aSprmIds, - sizeof(aSprmIds) / sizeof(aSprmIds[0])); - return &aWWSprmIds; -} - -const wwSprmSequence* WW8PLCFx_SEPX::GetWW8IgnoredSprms() -{ - //0x3014 -> #i4813# - static sal_uInt16 aSprmIds[] = - { - 0x3005, 0x3006, 0x3009, 0x300E, 0x3013, 0x3014, 0x3019, - 0x301A, 0x3228, 0x3229, 0x500B, 0x5015, 0x501B, 0x5026, - 0x703A, 0x900C, 0x9016, 0x9023, 0x9024, 0xB017, 0xB018, - 0xF203, 0xF204 - }; - - static wwSprmSequence aWWSprmIds(aSprmIds, - sizeof(aSprmIds) / sizeof(aSprmIds[0])); - return &aWWSprmIds; -} - -bool WW8PLCFx_SEPX::SprmsAreEquivalent(const BYTE* pOtherSprms, - long nOtherSprmSiz) const -{ - bool bRes = false; - const BYTE* pSp = pSprms; - - /* - zu 'sprmSBkc': - Wir sehen zwei WW-Abschnitte auch dann als gleich an, - wenn sie sich lediglich im break code unterscheiden. - Natuerlich muessen die Kopf/Fuss-Bereiche identisch sein. - - Ignoriert werden auch die folgenden, - spaltenbezogene Flags: - SCcolumns, SDxaColumns, SDxaColWidth, - SDxaColSpacing, SFEvenlySpaced, SLBetween - und: SFFacingCol (nur bei Ver8) - - We will also ignore a different formatting of the page - number here. - - We will also ignore different line numbering settings here - since only the very 1st line numbering settings are taken - into account anyway, see: bNoLnNum - */ - const wwSprmSequence *pIgnore; - if (GetVersion() < 8) - pIgnore = GetWW6IgnoredSprms(); - else - pIgnore = GetWW8IgnoredSprms(); - - ASSERT(pIgnore, "Impossible"); - - if ( maSprmParser.CountSprms(pSp, nSprmSiz, pIgnore) == - maSprmParser.CountSprms(pOtherSprms, nOtherSprmSiz, pIgnore) ) - { - bRes = true; - USHORT i=0; - while (i + maSprmParser.MinSprmLen() <= nSprmSiz) - { - USHORT nSpId = maSprmParser.GetSprmId(pSp); - - if( !nSpId ) - break; - - USHORT nSpLen = maSprmParser.GetSprmSize(nSpId, pSp); - - if (!pIgnore->search(nSpId)) - { - const BYTE* pOtherSp = - HasSprm( nSpId, pOtherSprms, nOtherSprmSiz ); - - if (!pOtherSp) - bRes = false; - else - { - const BYTE *pTst = pSp + maSprmParser.DistanceToData(nSpId); - //Allow a one twip fuzziness for the margins, word is - //doing something very small but intriguing with its - //rounding of these margins - if (nSpId == 0xB021 || nSpId == 0xB022 || - nSpId == 0x9023 || nSpId == 0x9024 || - nSpId == 0xB017 || nSpId == 0xB018 ) - { - short nOne = SVBT16ToShort(pTst); - short nTwo = SVBT16ToShort(pOtherSp); - if (abs(nOne-nTwo) > 1) //(perhaps ww8par2#nToleranz) - bRes = false; - } - else if (memcmp(pTst, pOtherSp, - maSprmParser.GetSprmTailLen(nSpId, pSp))) - { - bRes = false; - } - } - - if (!bRes) - break; - } - // increase pointers, so it points to next sprm - i += nSpLen; - pSp += nSpLen; - } - } - return bRes; // different Sprms -} - -//----------------------------------------- //----------------------------------------- - WW8PLCFx_SubDoc::WW8PLCFx_SubDoc(SvStream* pSt, BYTE nVersion, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruct) @@ -4200,7 +4082,7 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc ) } } -void WW8PLCFxDesc::ReduceByOffset(void) +void WW8PLCFxDesc::ReduceByOffset() { ASSERT((LONG_MAX == nStartPos) || (nStartPos <= nEndPos), "Attr-Anfang und -Ende ueber Kreuz" ); @@ -6817,3 +6699,91 @@ USHORT wwSprmParser::DistanceToData(USHORT nId) const { return 1 + mnDelta + SprmDataOfs(nId); } + +#if 0 +ALNV::ANLV() + : nfc(0), cbTextBefore(0), cbTextAfter(0), jc(0), fPrev(0), fHang(0), + fSetBold(0), fSetItalic(0), fSetSmallCaps(0), fSetCaps(0), fSetStrike(0), + fSetKul(0), fPrevSpace(0), fBold(0), fItalic(0), fSmallCaps(0), fCaps(0), + fStrike(0), kul(0), ico(0), ftc(0), hps(0), iStartAt(0), dxaIndent(0), + dxaSpace(0) +{} + +void ANLV::ReadFromMem(const sal_uInt8 *&pData) +{ + nfc = Get_Byte(pData); + cbTextBefore = Get_Byte(pData); + cbTextAfter = Get_Byte(pData); + sal_uInt8 nTemp = Get_Byte(pData); + jc = nTemp & 0x03; + fPrev = (nTemp & 0x04) >> 2; + fHang = (nTemp & 0x08) >> 3; + fSetBold = (nTemp & 0x10) >> 4; + fSetItalic = (nTemp & 0x20) >> 5; + fSetSmallCaps = (nTemp & 0x40) >> 6; + fSetCaps = (nTemp & 0x80) >> 7; + nTemp = Get_Byte(pData); + fSetStrike = nTemp & 0x01; + fSetKul = (nTemp & 0x02) >> 1; + fPrevSpace = (nTemp & 0x04) >> 2; + fBold = (nTemp & 0x08) >> 3; + fItalic = (nTemp & 0x10) >> 4; + fSmallCaps = (nTemp & 0x20) >> 5; + fCaps = (nTemp & 0x40) >> 6; + fStrike = (nTemp & 0x80) >> 7; + nTemp = Get_Byte(pData); + kul = nTemp & 0x07; + ico = (nTemp & 0xF1) >> 3; + ftc = Get_Short(pData); + hps = Get_Short(pData); + iStartAt = Get_Short(pData); + dxaIndent = Get_Short(pData); + dxaSpace = Get_Short(pData); +} + +OLST::OLST() : + fRestartHdr(0), fSpareOlst2(0), fSpareOlst3(0), fSpareOlst4(0), +{ + memset(rgxch, 0, sizeof(rgxch)); +} + +void OLST::ReadFromMem(const sal_uInt8 *&pData, bool bVer67) +{ + for (int i = 0;i < 9; ++i) + rganlv[i].ReadFromMem(pData); + fRestartHdr = Get_Byte(pData); + fSpareOlst2 = Get_Byte(pData); + fSpareOlst3 = Get_Byte(pData); + fSpareOlst4 = Get_Byte(pData); + if (bVer67) + { + for (int j = 0; j < 64; ++j) + rgxch[j] = Get_Byte(pData); + } + else + { + for (int j = 0; j < 32; ++j) + rgxch[j] = Get_Short(pData); + } +} +#endif + +SEPr::SEPr() : + bkc(2), fTitlePage(0), fAutoPgn(0), nfcPgn(0), fUnlocked(0), cnsPgn(0), + fPgnRestart(0), fEndNote(1), lnc(0), grpfIhdt(0), nLnnMod(0), dxaLnn(0), + dxaPgn(720), dyaPgn(720), fLBetween(0), vjc(0), dmBinFirst(0), + dmBinOther(0), dmPaperReq(0), fPropRMark(0), ibstPropRMark(0), + dttmPropRMark(0), dxtCharSpace(0), dyaLinePitch(0), clm(0), reserved1(0), + dmOrientPage(0), iHeadingPgn(0), pgnStart(1), lnnMin(0), wTextFlow(0), + reserved2(0), pgbApplyTo(0), pgbPageDepth(0), pgbOffsetFrom(0), + xaPage(12240), yaPage(15840), xaPageNUp(12240), yaPageNUp(15840), + dxaLeft(1800), dxaRight(1800), dyaTop(1440), dyaBottom(1440), dzaGutter(0), + dyaHdrTop(720), dyaHdrBottom(720), ccolM1(0), fEvenlySpaced(1), + reserved3(0), fBiDi(0), fFacingCol(0), fRTLGutter(0), fRTLAlignment(0), + dxaColumns(720), dxaColumnWidth(0), dmOrientFirst(0), fLayout(0), + reserved4(0) +{ + memset(rgdxaColumnWidthSpacing, 0, sizeof(rgdxaColumnWidthSpacing)); +} + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 445b4a45fa7d..cc0ca0868b2a 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8scan.hxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8SCAN_HXX @@ -113,6 +112,7 @@ namespace SL DEFCONSTSTRINGARRAY(CheckBox); DEFCONSTSTRINGARRAY(TextBox); DEFCONSTSTRINGARRAY(TextField); + DEFCONSTSTRINGARRAY(MSMacroCmds); } /* @@ -668,9 +668,6 @@ private: USHORT nArrMax; UINT16 nSprmSiz; - static const wwSprmSequence* GetWW8IgnoredSprms(); - static const wwSprmSequence* GetWW6IgnoredSprms(); - //no copying WW8PLCFx_SEPX(const WW8PLCFx_SEPX&); WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&); @@ -691,7 +688,6 @@ public: long nOtherSprmSiz ) const; bool Find4Sprms(USHORT nId1, USHORT nId2, USHORT nId3, USHORT nId4, BYTE*& p1, BYTE*& p2, BYTE*& p3, BYTE*& p4 ) const; - bool SprmsAreEquivalent(const BYTE* pOtherSprms, long nOtherSprmSiz) const; }; // Iterator fuer Fuss-/Endnoten und Anmerkungen @@ -1682,3 +1678,5 @@ public: }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 827c1e3f3f27..f173dca7ab5f 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8struc.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8STRUC_HXX @@ -543,7 +542,6 @@ struct WW8_ANLD BYTE rgchAnld[32]; // 0x14 characters displayed before/after autonumber }; - struct WW8_OLST { WW8_ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels) @@ -555,6 +553,55 @@ struct WW8_OLST }; // cbOLST is 212(decimal), D4(hex). +#if 0 +struct ANLV +{ + ALNV(); + void ReadFromMem(const sal_uInt8 *&pData); + sal_uInt8 nfc; + sal_uInt8 cbTextBefore; + sal_uInt8 cbTextAfter; + sal_uInt8 jc : 2; + sal_uInt8 fPrev : 1; + sal_uInt8 fHang : 1; + sal_uInt8 fSetBold : 1; + sal_uInt8 fSetItalic : 1; + sal_uInt8 fSetSmallCaps : 1; + sal_uInt8 fSetCaps : 1; + sal_uInt8 fSetStrike : 1; + sal_uInt8 fSetKul : 1; + sal_uInt8 fPrevSpace : 1; + sal_uInt8 fBold : 1; + sal_uInt8 fItalic : 1; + sal_uInt8 fSmallCaps : 1; + sal_uInt8 fCaps : 1; + sal_uInt8 fStrike : 1; + sal_uInt8 kul : 3; + sal_uInt8 ico : 5; + sal_uInt16 ftc; + sal_uInt16 hps; + sal_uInt16 iStartAt; + sal_uInt16 dxaIndent; + sal_uInt16 dxaSpace; +}; + +struct OLST +{ + OLST(); + void ReadFromMem(const sal_uInt8 *&pData, bool bVer67) + ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels) + sal_uInt8 fRestartHdr; // when ==1, restart heading on section break + sal_uInt8 fSpareOlst2; // reserved + sal_uInt8 fSpareOlst3; // reserved + sal_uInt8 fSpareOlst4; // reserved + sal_uInt16 rgxch[64]; // array of 64 chars text before/after number +#if 0 + sal_uInt16 rgxch[32]; // array of 32 chars text before/after number + sal_uInt8 rgch[64]; // array of 64 chars text before/after number +#endif +}; +#endif + struct WW8_FDOA { SVBT32 fc; // 0 FC pointing to drawing object data @@ -853,6 +900,83 @@ struct WW8_TXBXS # pragma pack() #endif +struct SEPr +{ + SEPr(); + sal_uInt8 bkc; + sal_uInt8 fTitlePage; + sal_Int8 fAutoPgn; + sal_uInt8 nfcPgn; + sal_uInt8 fUnlocked; + sal_uInt8 cnsPgn; + sal_uInt8 fPgnRestart; + sal_uInt8 fEndNote; + sal_Int8 lnc; + sal_Int8 grpfIhdt; + sal_uInt16 nLnnMod; + sal_Int32 dxaLnn; + sal_Int16 dxaPgn; + sal_Int16 dyaPgn; + sal_Int8 fLBetween; + sal_Int8 vjc; + sal_uInt16 dmBinFirst; + sal_uInt16 dmBinOther; + sal_uInt16 dmPaperReq; +#if 0 + 28 1C brcTop BRC top page border + + 32 20 brcLeft BRC left page border + + 36 24 brcBottom BRC bottom page border + + 40 28 brcRight BRC right page border +#endif + sal_Int16 fPropRMark; + sal_Int16 ibstPropRMark; + sal_Int32 dttmPropRMark; //DTTM + sal_Int32 dxtCharSpace; + sal_Int32 dyaLinePitch; + sal_uInt16 clm; + sal_Int16 reserved1; + sal_uInt8 dmOrientPage; + sal_uInt8 iHeadingPgn; + sal_uInt16 pgnStart; + sal_Int16 lnnMin; + sal_uInt16 wTextFlow; + sal_Int16 reserved2; + sal_uInt16 pgbApplyTo:3; + sal_uInt16 pgbPageDepth:2; + sal_Int16 pgbOffsetFrom:3; + sal_Int16 :8; + sal_uInt32 xaPage; + sal_uInt32 yaPage; + sal_uInt32 xaPageNUp; + sal_uInt32 yaPageNUp; + sal_uInt32 dxaLeft; + sal_uInt32 dxaRight; + sal_Int32 dyaTop; + sal_Int32 dyaBottom; + sal_uInt32 dzaGutter; + sal_uInt32 dyaHdrTop; + sal_uInt32 dyaHdrBottom; + sal_Int16 ccolM1; + sal_Int8 fEvenlySpaced; + sal_Int8 reserved3; + sal_uInt8 fBiDi; + sal_uInt8 fFacingCol; + sal_uInt8 fRTLGutter; + sal_uInt8 fRTLAlignment; + sal_Int32 dxaColumns; + sal_Int32 rgdxaColumnWidthSpacing[89]; + sal_Int32 dxaColumnWidth; + sal_uInt8 dmOrientFirst; + sal_uInt8 fLayout; + sal_Int16 reserved4; +#if 0 + OLST olstAnm; //currently unused +#endif +}; + namespace wwUtility { sal_uInt32 BGRToRGB(sal_uInt32 nColour); @@ -860,3 +984,5 @@ namespace wwUtility }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index eb3508b20d22..271cdeabfedf 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swxml.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: tl $ $Date: 2002-11-20 14:33:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,6 +100,9 @@ #ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include <com/sun/star/io/XActiveDataSource.hpp> #endif +#ifndef _COM_SUN_STAR_PACKAGES_ZIP_ZIPIOEXCEPTION_HPP_ +#include <com/sun/star/packages/zip/ZipIOException.hpp> +#endif #include <svtools/svstdarr.hxx> #ifndef _SFXDOCFILE_HXX //autogen wg. SfxMedium @@ -346,6 +349,15 @@ sal_Int32 ReadThroughComponent( #endif return ERR_SWG_READ_ERROR; } + catch( packages::zip::ZipIOException& r ) + { +#ifdef DEBUG + ByteString aError( "Zip exception catched while importing:\n" ); + aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); + DBG_ERROR( aError.GetBuffer() ); +#endif + return ERRCODE_IO_BROKENPACKAGE; + } catch( io::IOException& r ) { #ifdef DEBUG diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 863377ff9a86..b7f25f9497ee 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlexpit.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dvo $ $Date: 2002-06-19 13:07:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -243,8 +243,6 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, sal_uInt16 nFlags, const SfxItemSet *pSet ) const { - OUString sCDATA( GetXMLToken(XML_CDATA) ); - if( 0 != (rEntry.nMemberId & MID_FLAG_SPECIAL_ITEM_EXPORT) ) { if( rItem.ISA( SvXMLAttrContainerItem ) ) @@ -281,7 +279,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, sName.append( GetXMLToken(XML_XMLNS) ); sName.append( sal_Unicode(':') ); sName.append( sPrefix ); - rAttrList.AddAttribute( sName.makeStringAndClear(), sCDATA, + rAttrList.AddAttribute( sName.makeStringAndClear(), sNamespace ); } @@ -290,7 +288,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, } sName.append( pUnknown->GetAttrLName( i ) ); - rAttrList.AddAttribute( sName.makeStringAndClear(), sCDATA, + rAttrList.AddAttribute( sName.makeStringAndClear(), pUnknown->GetAttrValue(i) ); } @@ -311,7 +309,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, OUString sName( rNamespaceMap.GetQNameByKey( rEntry.nNameSpace, GetXMLToken(rEntry.eLocalName))); - rAttrList.AddAttribute( sName, sCDATA, aValue ); + rAttrList.AddAttribute( sName, aValue ); } } } diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index f3853a9c3a6d..cf806225419e 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmliteme.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dvo $ $Date: 2001-10-26 12:02:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,7 +146,6 @@ extern SvXMLItemMapEntry aXMLTableCellItemMap[]; class SwXMLTableItemMapper_Impl: public SvXMLExportItemMapper { - const OUString sCDATA; SwXMLBrushItemExport aBrushItemExport; protected: @@ -188,7 +187,6 @@ SwXMLTableItemMapper_Impl::SwXMLTableItemMapper_Impl( SvXMLItemMapEntriesRef rMapEntries, SwXMLExport& rExp ) : SvXMLExportItemMapper( rMapEntries ), - sCDATA( GetXMLToken( XML_CDATA ) ), aBrushItemExport( rExp ), nAbsWidth( USHRT_MAX ) { @@ -206,7 +204,7 @@ void SwXMLTableItemMapper_Impl::AddAttribute( sal_uInt16 nPrefix, { OUString sName( rNamespaceMap.GetQNameByKey( nPrefix, GetXMLToken(eLName) ) ); - rAttrList.AddAttribute( sName, sCDATA, rValue ); + rAttrList.AddAttribute( sName, rValue ); } void SwXMLTableItemMapper_Impl::handleSpecialItem( diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 50df41ee5d32..51a98522f711 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltbli.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 16:24:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,6 +170,10 @@ #include <vos/mutex.hxx> #endif +#ifndef _NDTXT_HXX +#include "ndtxt.hxx" +#endif + using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1738,7 +1742,8 @@ void SwXMLTableContext::InsertRepRows( sal_uInt32 nCount ) { const SwXMLTableCell_Impl *pSrcCell = GetCell( nCurRow-1, nCurCol ); - InsertCell( pSrcCell->GetStyleName(), 1U, pSrcCell->GetColSpan(), + InsertCell( pSrcCell->GetStyleName(), 1U, + pSrcCell->GetColSpan(), InsertTableSection(), 0, pSrcCell->IsProtected(), &pSrcCell->GetFormula(), pSrcCell->HasValue(), pSrcCell->GetValue() ); @@ -2067,19 +2072,76 @@ SwTableBox *SwXMLTableContext::MakeTableBox( if( pCell->GetStartNode() ) { - const OUString& rFormula = pCell->GetFormula(); - if (rFormula.getLength() > 0) + + // #104801# try to rescue broken documents with a certain pattern + // if: 1) the cell has a default number format (number 0) + // 2) the call has no formula + // 3) the value is 0.0 + // 4) the text doesn't look anything like 0.0 + // [read: length > 10, or length smaller 10 and no 0 in it] + // then make it a text cell! + bool bSuppressNumericContent = false; + if( pCell->HasValue() && (pCell->GetValue() == 0.0) && + (pCell->GetFormula().getLength() == 0) && + (sStyleName.getLength() != 0) ) { - // formula cell: insert formula if valid - SwTblBoxFormula aFormulaItem( rFormula ); - pBoxFmt->SetAttr( aFormulaItem ); + // default num format? + const SfxPoolItem* pItem = NULL; + if( pBoxFmt->GetItemState( RES_BOXATR_FORMAT, FALSE, &pItem ) + == SFX_ITEM_SET ) + { + const SwTblBoxNumFormat* pNumFormat = + static_cast<const SwTblBoxNumFormat*>( pItem ); + if( ( pNumFormat != NULL ) && ( pNumFormat->GetValue() == 0 ) ) + { + // only one text node? + SwNodeIndex aNodeIndex( *(pCell->GetStartNode()), 1 ); + if( ( aNodeIndex.GetNode().EndOfSectionIndex() - + aNodeIndex.GetNode().StartOfSectionIndex() ) == 2 ) + { + SwTxtNode* pTxtNode= aNodeIndex.GetNode().GetTxtNode(); + if( pTxtNode != NULL ) + { + // check text: does it look like some form of 0.0? + const String& rText = pTxtNode->GetTxt(); + if( ( rText.Len() > 10 ) || + ( rText.Search( '0' ) == STRING_NOTFOUND ) ) + { + bSuppressNumericContent = true; + } + } + } + else + bSuppressNumericContent = true; // several nodes + } + } } - // always insert value, even if default - if( pCell->HasValue() ) + if( bSuppressNumericContent ) { - SwTblBoxValue aValueItem( pCell->GetValue() ); - pBoxFmt->SetAttr( aValueItem ); + // suppress numeric content? Then reset number format! + pBoxFmt->ResetAttr( RES_BOXATR_FORMULA ); + pBoxFmt->ResetAttr( RES_BOXATR_FORMAT ); + pBoxFmt->ResetAttr( RES_BOXATR_VALUE ); + } + else + { + // the normal case: set formula and value (if available) + + const OUString& rFormula = pCell->GetFormula(); + if (rFormula.getLength() > 0) + { + // formula cell: insert formula if valid + SwTblBoxFormula aFormulaItem( rFormula ); + pBoxFmt->SetAttr( aFormulaItem ); + } + + // always insert value, even if default + if( pCell->HasValue() ) + { + SwTblBoxValue aValueItem( pCell->GetValue() ); + pBoxFmt->SetAttr( aValueItem ); + } } // update cell content depend on the default language @@ -2759,11 +2821,16 @@ const SwStartNode *SwXMLTableContext::InsertTableSection( if( !pPrevSttNd ) { pBox1->pSttNd = pStNd; - SwTable& rTable = pTableNode->GetTable(); - SwFrmFmt *pTblFmt = rTable.GetFrmFmt(); - Reference < XCell > xCell( SwXCell::CreateXCell( pTblFmt, pBox1, 0, &rTable ) ); - Reference < XText > xText( xCell, UNO_QUERY ); - Reference < XTextCursor > xTextCursor = xText->createTextCursor(); + SwCntntNode *pCNd = pDoc->GetNodes()[ pStNd->GetIndex() + 1 ] + ->GetCntntNode(); + SwPosition aPos( *pCNd ); + aPos.nContent.Assign( pCNd, 0U ); + + Reference < XTextRange > xTextRange = + SwXTextRange::CreateTextRangeFromPosition( pDoc, aPos, 0 ); + Reference < XText > xText = xTextRange->getText(); + Reference < XTextCursor > xTextCursor = + xText->createTextCursorByRange( xTextRange ); GetImport().GetTextImport()->SetCursor( xTextCursor ); } } diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index edea7b16d1f2..426c5abf43c5 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltexte.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: mib $ $Date: 2001-11-26 11:37:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -288,26 +288,6 @@ SwXMLTextParagraphExport::~SwXMLTextParagraphExport() { } -void SwXMLTextParagraphExport::getTextEmbeddedObjectProperties( - const Reference < XPropertySet >& rPropSet, - OUString& rURL, - sal_Bool& rExtern ) const -{ - SwOLENode *pOLENd = GetNoTxtNode( rPropSet )->GetOLENode(); - SwOLEObj& rOLEObj = pOLENd->GetOLEObj(); - - rURL = sEmbeddedObjectProtocol; - rURL += rOLEObj.GetName(); - SvInfoObject *pInfo = - pOLENd->GetDoc()->GetPersist()->Find( rOLEObj.GetName() ); - DBG_ASSERT( pInfo, "no info object for OLE object found" ); - if( pInfo ) - { - SvGlobalName aClassName( pInfo->GetClassName() ); - rExtern = aOutplaceClassId == aClassName; - } -} - void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL( const Reference < XPropertySet >& rPropSet, OUString& rURL) const @@ -360,29 +340,32 @@ void lcl_addOutplaceProperties( if( pEmbed ) { const Rectangle& rVisArea = pEmbed->GetVisArea(); - Any aAny; + if( !rVisArea.IsEmpty() ) + { + Any aAny; - aAny <<= (sal_Int32)rVisArea.Left(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), aAny ); - pStates++; + aAny <<= (sal_Int32)rVisArea.Left(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), aAny ); + pStates++; - aAny <<= (sal_Int32)rVisArea.Top(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), aAny ); - pStates++; + aAny <<= (sal_Int32)rVisArea.Top(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), aAny ); + pStates++; - aAny <<= (sal_Int32)rVisArea.GetWidth(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), aAny ); - pStates++; + aAny <<= (sal_Int32)rVisArea.GetWidth(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), aAny ); + pStates++; - aAny <<= (sal_Int32)rVisArea.GetHeight(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), aAny ); - pStates++; + aAny <<= (sal_Int32)rVisArea.GetHeight(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), aAny ); + pStates++; - aAny <<= (sal_Int32)pEmbed->GetViewAspect(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_DRAW_ASPECT ), aAny ); - pStates++; + aAny <<= (sal_Int32)pEmbed->GetViewAspect(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_DRAW_ASPECT ), aAny ); + pStates++; - // TODO: aspect + // TODO: aspect + } } } @@ -551,7 +534,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( if( (rExport.getExportFlags() & EXPORT_EMBEDDED) == 0 ) { OUString sURL( sEmbeddedObjectProtocol ); - sURL += rOLEObj.GetName(); + sURL += pInfo->GetStorageName(); sURL = GetExport().AddEmbeddedObject( sURL ); lcl_addURL( rExport, sURL, sal_False ); } diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index a71cf928efc6..0673a237d9cf 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltexte.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mib $ $Date: 2001-03-21 10:19:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,11 +115,6 @@ public: SvXMLAutoStylePoolP& rAutoStylePool ); ~SwXMLTextParagraphExport(); - virtual void getTextEmbeddedObjectProperties( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet, - ::rtl::OUString& rStreamName, - sal_Bool& rExtern ) const; virtual void setTextEmbeddedGraphicURL( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet, diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index 4cc6b9618294..13e212f666ea 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -2,9 +2,9 @@ * * $RCSfile: app.src,v $ * - * $Revision: 1.79 $ + * $Revision: 1.80 $ * - * last change: $Author: os $ $Date: 2002-12-11 15:06:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ String STR_PRINT_MERGE_MACRO Text [ english_us ] = "Print form letters" ; Text [ italian ] = "Stampa in serie" ; Text [ spanish ] = "Imprimir cartas en serie" ; - Text [ french ] = "Imprimer un mailing" ; + Text [ french ] = "Imprimer les lettres type" ; Text [ dutch ] = "Standaardbrieven afdrukken" ; Text [ swedish ] = "Skriv ut standardbrev" ; Text [ danish ] = "Udskriv flettede breve" ; @@ -103,7 +103,7 @@ String STR_PRINT_MERGE_MACRO Text[ dutch ] = "Standaardbrieven afdrukken"; Text[ chinese_simplified ] = "打印邮件合并"; Text[ greek ] = " "; - Text[ korean ] = "편지지 양식 인쇄"; + Text[ korean ] = "편지 양식 인쇄"; Text[ turkish ] = "Standart mektup yazdr"; Text[ catalan ] = "Imprimeix les cartes de formulari"; Text[ finnish ] = "Tulosta joukkokirjeet"; @@ -580,11 +580,11 @@ SfxStyleFamilies DLG_STYLE_DESIGNER < "Automtico" ; SFXSTYLEBIT_AUTO ; > ; < "Estilos de texto" ; SWSTYLEBIT_TEXT ; > ; < "Estilos de captulos" ; SWSTYLEBIT_CHAPTER ; > ; - < "Estilos de listas" ; SWSTYLEBIT_LIST ; > ; - < "Estilos de ndices" ; SWSTYLEBIT_IDX ; > ; + < "Estilos de lista" ; SWSTYLEBIT_LIST ; > ; + < "Estilos de ndice" ; SWSTYLEBIT_IDX ; > ; < "Estilos de reas especiales" ; SWSTYLEBIT_EXTRA ; > ; < "Estilos HTML" ; SWSTYLEBIT_HTML ; > ; - < "Estilos condicionados" ; SWSTYLEBIT_CONDCOLL ; > ; + < "Estilos condicionales" ; SWSTYLEBIT_CONDCOLL ; > ; }; FilterList [ finnish ] = { @@ -686,17 +686,17 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; FilterList [ korean ] = { - < "자동" ; SFXSTYLEBIT_ALL ; > ; - < "사용된 스타일" ; SFXSTYLEBIT_USED ; > ; + < "모든 스타일" ; SFXSTYLEBIT_ALL ; > ; + < "적용된 스타일" ; SFXSTYLEBIT_USED ; > ; < "사용자 정의 스타일" ; SFXSTYLEBIT_USERDEF ; > ; < "자동" ; SFXSTYLEBIT_AUTO ; > ; - < "텍스트 템플릿" ; SWSTYLEBIT_TEXT ; > ; - < "장 템플릿" ; SWSTYLEBIT_CHAPTER ; > ; - < "목록 템플릿" ; SWSTYLEBIT_LIST ; > ; - < "색인 템플릿" ; SWSTYLEBIT_IDX ; > ; - < "특수영역 템플릿" ; SWSTYLEBIT_EXTRA ; > ; - < "HTML 템플릿" ; SWSTYLEBIT_HTML ; > ; - < "조건적 템플릿" ; SWSTYLEBIT_CONDCOLL ; > ; + < "문서용 스타일" ; SWSTYLEBIT_TEXT ; > ; + < "장 스타일" ; SWSTYLEBIT_CHAPTER ; > ; + < "목록 스타일" ; SWSTYLEBIT_LIST ; > ; + < "색인 스타일" ; SWSTYLEBIT_IDX ; > ; + < "특수한 스타일" ; SWSTYLEBIT_EXTRA ; > ; + < "HTML 스타일" ; SWSTYLEBIT_HTML ; > ; + < "조건부 스타일" ; SWSTYLEBIT_CONDCOLL ; > ; }; FilterList [ chinese_simplified ] = { @@ -959,8 +959,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; FilterList [ korean ] = { - < "전부" ; SFXSTYLEBIT_ALL ; > ; - < "사용된 스타일" ; SFXSTYLEBIT_USED ; > ; + < "모두" ; SFXSTYLEBIT_ALL ; > ; + < "적용된 스타일" ; SFXSTYLEBIT_USED ; > ; < "사용자 정의 스타일" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ turkish ] = "Karakter biimi"; @@ -1004,7 +1004,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER Text [ french ] = "Styles de cadre" ; Text [ swedish ] = "Ramformatmallar" ; Text [ dutch ] = "Kaderopmaakprofielen" ; - Text [ spanish ] = "Estilos de marcos" ; + Text [ spanish ] = "Estilos de marco" ; Text [ english_us ] = "Frame Styles" ; StyleFamily = SFX_STYLE_FAMILY_FRAME ; FilterList = @@ -1143,7 +1143,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER < "自定样式" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ greek ] = " "; - Text[ korean ] = "프레임 템플릿"; + Text[ korean ] = "프레임 스타일"; FilterList [ greek ] = { < "" ; SFXSTYLEBIT_ALL ; > ; @@ -1152,8 +1152,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; FilterList [ korean ] = { - < "전부" ; SFXSTYLEBIT_ALL ; > ; - < "사용된 스타일" ; SFXSTYLEBIT_USED ; > ; + < "모두" ; SFXSTYLEBIT_ALL ; > ; + < "적용된 스타일" ; SFXSTYLEBIT_USED ; > ; < "사용자 정의 스타일" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ turkish ] = "ereve biimi"; @@ -1345,7 +1345,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER FilterList [ korean ] = { < "모두" ; SFXSTYLEBIT_ALL ; > ; - < "사용된 스타일" ; SFXSTYLEBIT_USED ; > ; + < "적용된 스타일" ; SFXSTYLEBIT_USED ; > ; < "사용자 정의 스타일" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ turkish ] = "Sayfa biimi"; @@ -1527,7 +1527,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER < "自定样式" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ greek ] = " "; - Text[ korean ] = "번호 매기기 템플릿"; + Text[ korean ] = "번호 매기기 스타일"; FilterList [ greek ] = { < "" ; SFXSTYLEBIT_ALL ; > ; @@ -1536,8 +1536,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; FilterList [ korean ] = { - < "전체" ; SFXSTYLEBIT_ALL ; > ; - < "사용된 스타일" ; SFXSTYLEBIT_USED ; > ; + < "모두" ; SFXSTYLEBIT_ALL ; > ; + < "적용된 스타일" ; SFXSTYLEBIT_USED ; > ; < "사용자 정의 스타일" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ turkish ] = "Numaralama biimi"; @@ -1615,7 +1615,7 @@ String STR_ENV_TITLE Text[ dutch ] = "Envelop"; Text[ chinese_simplified ] = "信封"; Text[ greek ] = ""; - Text[ korean ] = "봉투"; + Text[ korean ] = "편지봉투"; Text[ turkish ] = "Zarf"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sobre"; @@ -1694,7 +1694,7 @@ String STR_WRITER_DOCUMENT_FULLTYPE_31 Text [ swedish ] = "%PRODUCTNAME 3.0 text" ; Text [ danish ] = "%PRODUCTNAME 3.0 tekst" ; Text [ italian ] = "Test %PRODUCTNAME 3.0" ; - Text [ spanish ] = "%PRODUCTNAME 3.0 Texto" ; + Text [ spanish ] = "%PRODUCTNAME 3.0 - Texto" ; Text [ french ] = "%PRODUCTNAME 3.0 Texte" ; Text [ dutch ] = "%PRODUCTNAME 3.0 Tekst" ; Text [ portuguese ] = "%PRODUCTNAME 3.0 Text" ; @@ -1724,7 +1724,7 @@ String STR_WRITER_DOCUMENT_FULLTYPE_40 Text [ swedish ] = "%PRODUCTNAME 4.0 text" ; Text [ danish ] = "%PRODUCTNAME 4.0 tekst" ; Text [ italian ] = "Testo %PRODUCTNAME 4.0" ; - Text [ spanish ] = "%PRODUCTNAME 4.0 texto" ; + Text [ spanish ] = "%PRODUCTNAME 4.0 - Texto" ; Text [ french ] = "%PRODUCTNAME 4.0 Texte" ; Text [ dutch ] = "%PRODUCTNAME 4.0 Tekst" ; Text [ portuguese ] = "Texto (%PRODUCTNAME 4.0)" ; @@ -1754,7 +1754,7 @@ String STR_WRITER_DOCUMENT_FULLTYPE_50 Text [ swedish ] = "%PRODUCTNAME 5.0 text" ; Text [ danish ] = "%PRODUCTNAME 5.0 Tekst" ; Text [ italian ] = "Testo %PRODUCTNAME 5.0" ; - Text [ spanish ] = "%PRODUCTNAME 5.0 Texto" ; + Text [ spanish ] = "%PRODUCTNAME 5.0 - Texto" ; Text [ french ] = "%PRODUCTNAME 5.0 Texte" ; Text [ dutch ] = "%PRODUCTNAME 5.0 Tekst" ; Text [ portuguese ] = "%PRODUCTNAME 5.0 Texto" ; @@ -1784,7 +1784,7 @@ String STR_WRITER_DOCUMENT_FULLTYPE Text[ greek ] = " %PRODUCTNAME 6.0"; Text[ dutch ] = "%PRODUCTNAME 6.0 Tekstdocument"; Text[ french ] = "%PRODUCTNAME 6.0 Texte"; - Text[ spanish ] = "%PRODUCTNAME 6.0 Documento de texto"; + Text[ spanish ] = "%PRODUCTNAME 6.0 - Documento de texto"; Text[ italian ] = "Documento di testo %PRODUCTNAME 6.0"; Text[ danish ] = "%PRODUCTNAME 6.0 Tekstdokument"; Text[ swedish ] = "Textdokument %PRODUCTNAME 6.0"; @@ -1971,7 +1971,7 @@ String STR_LOAD_HTML_DOC Text [ dutch ] = "Naam en pad van het HTML-document" ; Text [ portuguese ] = "Nome e atalho do documento HTML" ; Text[ chinese_simplified ] = "HTML 文档名称和路径"; - Text[ russian ] = " HTML-."; + Text[ russian ] = " -"; Text[ polish ] = "Nazwa i cieka dokumentu HTML"; Text[ japanese ] = "HTML 形式ドキュメントの名前とパス"; Text[ chinese_traditional ] = "HTML 文件名稱和路徑"; @@ -2014,7 +2014,7 @@ InfoBox MSG_ERROR_SEND_MAIL MESSAGE[ dutch ] = "Fout bij verzenden van bericht."; MESSAGE[ chinese_simplified ] = "在寄发电子邮件时发生错误。"; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "메일 보내기 오류."; + MESSAGE[ korean ] = "메일 보내는 중 오류"; MESSAGE[ turkish ] = "leti gnderilirken hata olutu."; MESSAGE[ catalan ] = "S'ha produt un error en enviar el missatge."; MESSAGE[ thai ] = "ส่งเมล์ผิดพลาด"; @@ -2045,7 +2045,7 @@ InfoBox MSG_ERROR_PASSWD MESSAGE[ dutch ] = "Wachtwoord niet juist."; MESSAGE[ chinese_simplified ] = "密码无效。"; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "암호가 옳지 않습니다."; + MESSAGE[ korean ] = "암호가 잘못되었습니다."; MESSAGE[ turkish ] = "Yanl ifre."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "Contrasenya incorrecta."; @@ -2178,7 +2178,7 @@ String STR_DOC_STAT TEXT [ portuguese ] = "Estatstica" ; TEXT [ finnish ] = "Tilastotiedot" ; TEXT [ danish ] = "Statistik" ; - TEXT [ french ] = "Statistique" ; + TEXT [ french ] = "Statistiques" ; TEXT [ swedish ] = "Statistik" ; TEXT [ dutch ] = "Statistiek" ; TEXT [ spanish ] = "Estadstica" ; @@ -2213,7 +2213,7 @@ String STR_STATSTR_W4WREAD Text [ portuguese ] = "A importar documento..." ; Text [ finnish ] = "Tuodaan asiakirjaa..." ; Text [ danish ] = "Importerer dokument..." ; - Text [ french ] = "Import du document en cours..." ; + Text [ french ] = "Import du document..." ; Text [ swedish ] = "Dokument importeras..." ; Text [ dutch ] = "Document wordt gemporteerd..." ; Text [ spanish ] = "Importando el documento..." ; @@ -2244,7 +2244,7 @@ String STR_STATSTR_W4WWRITE Text [ portuguese ] = "A exportar documento..." ; Text [ finnish ] = "Viedn asiakirjaa..." ; Text [ danish ] = "Eksporterer dokument" ; - Text [ french ] = "Export du document en cours..." ; + Text [ french ] = "Export du document..." ; Text [ swedish ] = "Dokument exporteras..." ; Text [ dutch ] = "Document wordt gexporteerd..." ; Text [ spanish ] = "Exportando el documento..." ; @@ -2290,7 +2290,7 @@ String STR_STATSTR_SWGREAD Text[ dutch ] = "Document wordt gemaakt..."; Text[ chinese_simplified ] = "装入文档..."; Text[ greek ] = " ..."; - Text[ korean ] = "문서 로드 중..."; + Text[ korean ] = "문서를 로드하는 중..."; Text[ turkish ] = "Belge ykleniyor..."; Text[ catalan ] = "S'est carregant el document..."; Text[ thai ] = "กำลังโหลดเอกสาร..."; @@ -2321,7 +2321,7 @@ String STR_STATSTR_SWGWRITE 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..."; @@ -2369,10 +2369,10 @@ String STR_STATSTR_AUTOFORMAT TEXT [ portuguese ] = "A formatar documento automaticamente..." ; TEXT [ finnish ] = "Muotoillaan asiakirjaa automaattisesti..." ; TEXT [ danish ] = "Autoformatering af dokumentet..." ; - TEXT [ french ] = "Mise en forme automatique du document..." ; + TEXT [ french ] = "Formatage automatique du document..." ; TEXT [ swedish ] = "Autoformatering av dokumentet..." ; TEXT [ dutch ] = "Bezig met automatisch opmaken..." ; - TEXT [ spanish ] = "AutoFormato del documento..." ; + TEXT [ spanish ] = "Formateado automtico del documento..." ; TEXT [ english_us ] = "Formatting document automatically..." ; TEXT[ chinese_simplified ] = "文档自动格式化..."; TEXT[ language_user1 ] = " "; @@ -2384,7 +2384,7 @@ String STR_STATSTR_AUTOFORMAT TEXT[ dutch ] = "Bezig met automatisch opmaken..."; TEXT[ chinese_simplified ] = "文档自动格式化..."; TEXT[ greek ] = " ..."; - TEXT[ korean ] = "문서 자동 서식 지정..."; + TEXT[ korean ] = "문서 자동 서식 설정..."; TEXT[ turkish ] = "Otomatik belge formatlama..."; TEXT[ catalan ] = "S'est autoformatant el document..."; TEXT[ thai ] = "กำลังจัดรูปแบบเอกสารอัตโนมัติ..."; @@ -2400,7 +2400,7 @@ String STR_STATSTR_IMPGRF Text [ portuguese ] = "A importar imagem..." ; Text [ finnish ] = "Tuodaan grafiikkoja..." ; Text [ danish ] = "Importerer grafik..." ; - Text [ french ] = "Import de l'image en cours..." ; + Text [ french ] = "Import de l'image..." ; Text [ swedish ] = "Grafik importeras..." ; Text [ dutch ] = "Afbeelding wordt gemporteerd..." ; Text [ spanish ] = "Importando imagen..." ; @@ -2414,7 +2414,7 @@ String STR_STATSTR_IMPGRF Text[ dutch ] = "Afbeelding wordt gemporteerd..."; Text[ chinese_simplified ] = "输入图形..."; Text[ greek ] = " ..."; - Text[ korean ] = "그래픽 가져오기..."; + Text[ korean ] = "그림 가져오기..."; Text[ turkish ] = "Grafik ie aktarlyor..."; Text[ language_user1 ] = " "; Text[ catalan ] = "S'est important imatge..."; @@ -2477,7 +2477,7 @@ String STR_STATSTR_FORMAT Text[ dutch ] = "Bezig met opmaken..."; Text[ chinese_simplified ] = "格式化..."; Text[ greek ] = "..."; - Text[ korean ] = "서식 지정..."; + Text[ korean ] = "서식 설정..."; Text[ turkish ] = "Formatlanyor..."; Text[ catalan ] = "S'est formatant..."; Text[ thai ] = "กำลังจัดรูปแบบ..."; @@ -2627,7 +2627,7 @@ String STR_STATSTR_HYPHEN Text[ dutch ] = "Woordafbreking..."; Text[ chinese_simplified ] = "连字符..."; Text[ greek ] = "..."; - Text[ korean ] = "하이픈 ..."; + Text[ korean ] = "하이픈..."; Text[ turkish ] = "Heceleme..."; Text[ language_user1 ] = " "; Text[ catalan ] = "S'est separant en sl.labes..."; @@ -2642,7 +2642,7 @@ String STR_STATSTR_TOX_INSERT Text [ english_us ] = "Inserting Index..." ; Text [ italian ] = "L'indice viene inserito..." ; Text [ spanish ] = "Insertando directorio..." ; - Text [ french ] = "Index en cours d'insertion..." ; + Text [ french ] = "Insertion de l'index..." ; Text [ dutch ] = "Index wordt ingevoegd..." ; Text [ swedish ] = "Frteckning infogas..." ; Text [ danish ] = "Indstter indeks..." ; @@ -2672,7 +2672,7 @@ String STR_STATSTR_TOX_UPDATE Text [ english_us ] = "Updating Index..." ; Text [ italian ] = "L'indice viene aggiornato..." ; Text [ spanish ] = "Actualizando directorio..." ; - Text [ french ] = "Index en cours d'actualisation..." ; + Text [ french ] = "Actualisation de l'index..." ; Text [ dutch ] = "Index wordt bijgewerkt..." ; Text [ swedish ] = "Frteckning uppdateras..." ; Text [ danish ] = "Opdaterer indeks..." ; @@ -2704,7 +2704,7 @@ String STR_STATSTR_SUMMARY Text [ swedish ] = "Utdrag skapas..." ; Text [ danish ] = "Opretter abstract..." ; Text [ italian ] = "Il sunto viene creato..." ; - Text [ spanish ] = "Creando el extracto..." ; + Text [ spanish ] = "Creacin del resumen..." ; Text [ french ] = "Cration de la synthse..." ; Text [ dutch ] = "Overzicht wordt gemaakt..." ; Text [ portuguese ] = "A criar Sumrio..." ; @@ -2718,7 +2718,7 @@ String STR_STATSTR_SUMMARY Text[ dutch ] = "Overzicht wordt gemaakt..."; Text[ chinese_simplified ] = "制作摘要..."; Text[ greek ] = " abstract..."; - Text[ korean ] = "요약 만들기..."; + Text[ korean ] = "요약 만드는 중..."; Text[ turkish ] = "zet oluturuluyor..."; Text[ catalan ] = "S'est creant l'extracte..."; Text[ finnish ] = "Luodaan tiivistelm..."; @@ -2763,26 +2763,26 @@ QueryBox MSG_COMCORE_ASKSEARCH Message = "Zum Fortsetzen des Vorgangs, muss die Rckgngig-Funktion abgeschaltet werden. Wollen Sie die Rckgngig-Funktion abschalten?"; Message [ English ] = "This action needs for undo many memory.\nWould you disable undo?" ; Message [ norwegian ] = "Hvis du vil angre denne handlingen trenger du mye minne.\nVil du sperre angrefunksjonen?" ; - Message [ italian ] = "L'annullamento di questa azione occorre molta memoria.\nVolete disattivare la possibilit di annullare?" ; + Message [ italian ] = "Per procedre con questa operazione dovete disattivare prima la funzione \"Annulla\".\nVolete disattivare la possibilit di annullare?" ; Message [ portuguese_brazilian ] = "Esta a??o requer muita mem?ia para desfazer.\nDeseja desativar a fun??o desfazer?" ; Message [ portuguese ] = "Para poder anular esta aco necessria muita memria.\nDeseja cancelar esta funo?" ; Message [ finnish ] = "Tmn toiminnon kumoamiseen tarvitaan suuri mr muistia.\nHaluatko peruuttaa kumoamisen?" ; Message [ danish ] = "Denne handling krver megen hukommelse til fortryd-funktionen\nVil du sl fortryd-funktionen fra?" ; - Message [ french ] = "Cette action ncessite beaucoup de mmoire pour l'annulation (Undo).\nVoulez-vous dsactiver l'annulation ?" ; - Message [ swedish ] = "Den hr tgrden krver mycket minne fr ngra-funktionen.\nVill du stnga av ngra-funktionen?" ; + Message [ french ] = "La fonction d'annulation doit tre dsactive, ce sans quoi il sera impossible d'excuter cette opration. Voulez-vous dsactiver la fonction d'annulation ?" ; + Message [ swedish ] = "Fr att kunna fortstta med den hr tgrden mste du stnga av ngrafunktionen frst. Vill du stnga av ngrafunktionen?" ; Message [ dutch ] = "Het ongedaan maken van deze bewerking beslaat veel geheugen.\nWilt U 'Ongedaan maken' opheffen?" ; - Message [ spanish ] = "Esta accin necesita mucha memoria para la operacin de Deshacer.\nDesea desactivar la opcin de deshacer?" ; + Message [ spanish ] = "Para proceder con esta operacin deber anular primero la funcin de \"deshacer\".\nDesea desactivar la funcin de \"deshacer\"?" ; Message [ english_us ] = "To proceed with this action, you must first turn off the \"undo\" function. Do you want to turn off the \"undo\" function?" ; - Message[ chinese_simplified ] = "撤消命令功能需要很多的内存。\n要取消撤消命令功能？"; + Message[ chinese_simplified ] = "撤消命令功能需要很多的内存。\n要停用撤消命令功能？"; Message[ russian ] = " .\n ?"; Message[ polish ] = "Cofnicie tej akcji wymaga duej iloci pamici.\nCzy chcesz przerwa cofnicie?"; - Message[ japanese ] = "このアクションを元に戻すには非常にたくさんのディスク容量が必要です。\n元に戻すのをキャンセルしますか。"; - Message[ chinese_traditional ] = "復原功能需要很多的記憶體。\n要關閉復原功能？"; + Message[ japanese ] = "この操作を続行するには、まず \"元に戻す\" 機能をオフにします。\n\"元に戻す\" 機能をオフにしますか。"; + Message[ chinese_traditional ] = "如果要繼續這個動作，您必須先關閉「復原」功能。要關閉復原功能？"; Message[ arabic ] = " .\n ڿ"; Message[ dutch ] = "Het ongedaan maken van deze bewerking beslaat veel geheugen.\nWilt U 'Ongedaan maken' opheffen?"; - Message[ chinese_simplified ] = "撤消命令功能需要很多的内存。\n要取消撤消命令功能？"; + Message[ chinese_simplified ] = "撤消命令功能需要很多的内存。\n要停用撤消命令功能？"; Message[ greek ] = " .\n ;"; - Message[ korean ] = "이 작동을 계속 진행하기 위해서는 입력 실행 취소 기능이 해제되어야 합니다. 입력 실행 취소 기능을 해제하시겠습니까?"; + Message[ korean ] = "이 작동을 계속 진행하기 위해서는 실행 취소 기능이 해제되어야 합니다. 실행 취소 기능을 해제하시겠습니까?"; Message[ turkish ] = "Bu ilemde geri alma iin byk miktarda bellek gerekiyor.\nGeri alma ilevini kapatmak istiyor musunuz?"; Message[ language_user1 ] = " "; Message[ catalan ] = "Aquesta operaci necessita molta memria per poder-la desfer.\nVoleu desactivar l'opci de Desfs?"; @@ -2823,7 +2823,7 @@ String STR_TABLE_DEFNAME Text[ dutch ] = "Tabel"; Text[ chinese_simplified ] = "表格"; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -2854,7 +2854,7 @@ String STR_GRAPHIC_DEFNAME TEXT[ dutch ] = "Afbeelding"; TEXT[ chinese_simplified ] = "图形"; TEXT[ greek ] = ""; - TEXT[ korean ] = "그래픽"; + TEXT[ korean ] = "그림"; TEXT[ turkish ] = "Grafik"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Imatge"; @@ -2935,7 +2935,7 @@ String STR_REGION_DEFNAME Text [ french ] = "Section" ; Text [ swedish ] = "Omrde" ; Text [ dutch ] = "Bereik" ; - Text [ spanish ] = "rea" ; + Text [ spanish ] = "Seccin" ; Text [ english_us ] = "Section" ; Text[ chinese_simplified ] = "区域"; Text[ russian ] = ""; @@ -2946,7 +2946,7 @@ String STR_REGION_DEFNAME Text[ dutch ] = "Bereik"; Text[ chinese_simplified ] = "区域"; Text[ greek ] = ""; - Text[ korean ] = "영역"; + Text[ korean ] = "구역"; Text[ turkish ] = "Blm"; Text[ language_user1 ] = " "; Text[ catalan ] = "Area"; @@ -3026,12 +3026,12 @@ QueryBox MSG_CLPBRD_CLEAR MESSAGE [ finnish ] = "Olet tallentanut leikepydlle suuren mrn tietoja.\nHaluatko niden tietojen olevan kytettviss muissa sovelluksissa?" ; MESSAGE [ danish ] = "Du har placeret en stor mngde data i udklipsholderen.\nSkal udklipholderens indhold vre tilgngeligt for andre applikationer?" ; MESSAGE [ french ] = "Vous avez dpos un grand nombre de donnes dans le presse-papiers. \nSouhaitez-vous en conserver le contenu pour une utilisation ultrieure sous une autre application ?" ; - MESSAGE [ swedish ] = "Du har stora datamngder i urklippet.\nSkall innehllet i urklippet gras tillgngligt fr andra applikationer?" ; + MESSAGE [ swedish ] = "Du har stora datamngder i urklippet.\nSkall innehllet i urklippet gras tillgngligt fr andra tillmpningar?" ; MESSAGE [ dutch ] = "U hebt een groot aantal gegevens op het Klembord geplaatst.\nWilt u dat de inhoud van het Klembord beschikbaar blijft voor andere toepassingen?" ; MESSAGE [ spanish ] = "Usted tiene muchos datos en el portapapeles.\nDesea mantener disponible el contenido del portapapeles para otras aplicaciones?" ; MESSAGE[ chinese_simplified ] = "您将一个较大的数据复制到剪贴板。\n您想要让其他的应用程序也能够使用这个数据吗？"; MESSAGE[ language_user1 ] = " "; - MESSAGE[ russian ] = " .\n ?"; + MESSAGE[ russian ] = " .\n , ?"; MESSAGE[ polish ] = "W schowku zostay umieszczone wiksze iloci danych.\nCzy tre tych danych ma zosta udostpniona innym aplikacjom?"; MESSAGE[ japanese ] = "クリップボードにはたくさんのデータが保存されています。\nクリップボードの内容を他のアプリケーションにも使用しますか。"; MESSAGE[ chinese_traditional ] = "您已經將一個較大的資料複製到剪貼簿。\n您想要讓其他的應用程序也能夠使用這個資料？"; @@ -3070,7 +3070,7 @@ QueryBox MSG_SAVE_HTML_QUERY Message[ dutch ] = "De conversie naar de HTML-indeling \nkan verlies van gegevens veroorzaken. \nWilt u het document opslaan?"; Message[ chinese_simplified ] = "文件转换成 HTML 格式\n可能会引起资料损失。\n您要存盘这个文件吗?"; Message[ greek ] = " HTML \n . \n ;"; - Message[ korean ] = "HTML 서식으로 변환은 \n정보 손실의 원인이 됩니다. \n문서를 저장하겠습니까?"; + Message[ korean ] = "HTML 서식으로 변환하면 \n정보를 손실할 수 있습니다.\n문서를 저장하시겠습니까?"; Message[ turkish ] = "HTML formatna \ndnm sonucunda veri kayb olabilir. \nBelgeyi kaydetmek istiyor musunuz?"; Message[ language_user1 ] = " "; Message[ catalan ] = "La transformaci en el format HTML \npot causar prdues d'informaci. \nVoleu desar el document?"; @@ -3085,7 +3085,7 @@ QueryBox MSG_SAVEAS_HTML_QUERY MESSAGE [ English ] = "The HTML source can only be shown if the document is saved in HTML format.\nWould you like to save the document as HTML?" ; MESSAGE[ english_us ] = "The source code can only be displayed if the document is saved in HTML format.\nWould you like to save the document as HTML?"; MESSAGE[ portuguese ] = "S possvel ver o texto-fonte se o documento for guardado em formato HTML.\nGuardar o documento em formato HTML?"; - MESSAGE[ russian ] = " , HTML.\n HTML?"; + MESSAGE[ russian ] = " , HTML.\n HTML?"; MESSAGE[ greek ] = "The HTML source can only be shown if the document is saved in HTML format.\nWould you like to save the document as HTML?"; MESSAGE[ dutch ] = "De brontekst kan alleen worden weergegeven als het document in de HTML-indeling is opgeslagen.\nWilt u het document nu in de HTML-indeling opslaan?"; MESSAGE[ french ] = "Le texte source ne peut tre affich que si le document a t enregistr au format HTML.\nVoulez-vous enregistrer le document au format HTML ?"; @@ -3097,7 +3097,7 @@ QueryBox MSG_SAVEAS_HTML_QUERY MESSAGE[ polish ] = "Widok tekstu rdowego wywietlony zostanie dopiero po zapisaniu dokumentu w formacie HTML.\nZapisa dokument w formacie HTML?"; MESSAGE[ portuguese_brazilian ] = "The HTML source can only be shown if the document is saved in HTML format.\nWould you like to save the document as HTML?"; MESSAGE[ japanese ] = "HTML ソースはドキュメントが HTML 形式で保存されているときしか表示されません。\nドキュメントを HTML 形式で保存しますか。"; - MESSAGE[ korean ] = "소스 텍스트 보기는 문서가 HTML-형식으로 저장되었을 경우에만 표시될 수 있습니다.\n문서를 지금 HTML-형식으로 저장하겠습니까?"; + MESSAGE[ korean ] = "원본 텍스트 보기는 문서가 HTML 서식으로 저장되었을 경우에만 표시됩니다.\n문서를 HTML 서식으로 저장하시겠습니까?"; MESSAGE[ chinese_simplified ] = "只有当文档存盘成 HTML 格式时，才能够查看 HTML 的源文件。\n文档要存盘成 HTML 格式?"; MESSAGE[ chinese_traditional ] = "只有當檔案儲存HTML格式時，才能檢視HTML原始檔。\n要儲存成HTML格式?"; MESSAGE[ turkish ] = "The HTML source can only be shown if the document is saved in HTML format.\nWould you like to save the document as HTML?"; @@ -3115,7 +3115,7 @@ String STR_ABSTRACT_TITLE Text [ swedish ] = "Utdrag: " ; Text [ danish ] = "Abstract : " ; Text [ italian ] = "Sunto: " ; - Text [ spanish ] = "Extracto: " ; + Text [ spanish ] = "Resumen: " ; Text [ french ] = "Synthse : " ; Text [ dutch ] = "Overzicht:" ; Text[ chinese_simplified ] = "摘要： "; @@ -3128,7 +3128,7 @@ String STR_ABSTRACT_TITLE Text[ dutch ] = "Overzicht:"; Text[ chinese_simplified ] = "摘要： "; Text[ greek ] = "Abstract: "; - Text[ korean ] = "추상: "; + Text[ korean ] = "요약: "; Text[ turkish ] = "zet: "; Text[ catalan ] = "Resum:"; Text[ finnish ] = "Tiivistelm: "; @@ -3144,7 +3144,7 @@ String STR_FDLG_TEMPLATE_BUTTON Text [ swedish ] = "Formatmall" ; Text [ danish ] = "Skabelon" ; Text [ italian ] = "Modello" ; - Text [ spanish ] = "Plantilla" ; + Text [ spanish ] = "Estilo" ; Text [ french ] = "Style" ; Text [ dutch ] = "Sjabloon" ; Text [ portuguese ] = "Estilo" ; @@ -3157,7 +3157,7 @@ String STR_FDLG_TEMPLATE_BUTTON Text[ dutch ] = "Sjabloon"; Text[ chinese_simplified ] = "样式"; Text[ greek ] = ""; - Text[ korean ] = "템플릿"; + Text[ korean ] = "스타일"; Text[ turkish ] = "Biim"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estil"; @@ -3271,7 +3271,7 @@ String STR_WESTERN_FONT Text[ polish ] = "Tekst zachodni:"; Text[ portuguese_brazilian ] = "Western text:"; Text[ japanese ] = "英数字: "; - Text[ korean ] = "서양 텍스트:"; + Text[ korean ] = "영어:"; Text[ chinese_simplified ] = "西文："; Text[ chinese_traditional ] = "西文："; Text[ turkish ] = "Western text:"; @@ -3297,7 +3297,7 @@ String STR_CJK_FONT Text[ polish ] = "Tekst azjatycki:"; Text[ portuguese_brazilian ] = "Asian text:"; Text[ japanese ] = "日本語: "; - Text[ korean ] = "아시아 텍스트:"; + Text[ korean ] = "한글:"; Text[ chinese_simplified ] = "中日韩文字："; Text[ chinese_traditional ] = "中日韓文字："; Text[ turkish ] = "Asian text:"; @@ -3322,7 +3322,7 @@ String STR_REDLINE_UNKNOWN_AUTHOR Text[ polish ] = "nieznany"; Text[ portuguese_brazilian ] = "unknown"; Text[ japanese ] = "不明"; - Text[ korean ] = "알려져 있지 않음"; + Text[ korean ] = "알 수 없음"; Text[ chinese_simplified ] = "不明的"; Text[ chinese_traditional ] = "不明"; Text[ turkish ] = "unknown"; @@ -3344,7 +3344,7 @@ WarningBox MSG_DISABLE_UNDO_QUESTION Message[ greek ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ dutch ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ french ] = "Cette action supprime la liste des oprations pouvant tre annules. Ceci n'affecte pas les modifications apportes au document, mais empche de les annuler. Poursuivre le formatage ?"; - Message[ spanish ] = "Esta accin elimina la lista de las acciones que se pueden deshacer. Las modificaciones realizadas hasta ahora en el documento seguirn siendo vlidas, sin embargo no se podrn deshacer. Desea continuar con el formateado?"; + Message[ spanish ] = "Esta accin borra la lista de las acciones que se pueden deshacer. Las modificaciones realizadas hasta ahora en el documento seguirn siendo vlidas, sin embargo no se podrn deshacer. Desea continuar con el formateado?"; Message[ finnish ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ italian ] = "Questa azione elimina l'elenco delle azioni da annullare. I cambiamenti effettuati al documento sono ancora validi ma non possono essere annullati. Volete proseguire la formattazione?"; Message[ danish ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; @@ -3352,7 +3352,7 @@ WarningBox MSG_DISABLE_UNDO_QUESTION Message[ polish ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ portuguese_brazilian ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ japanese ] = "このアクションで、元に戻すのが可能なアクションのリストが削除されます。これまでにドキュメントで行った変更はそのまま残りますが、アクションを元に戻すことはできません。書式設定を続行しますか。"; - Message[ korean ] = "이 명령을 실행하면 되돌릴 수 있는 모든 작업 단계의 입력 목록이 삭제됩니다. 현재까지 문서에서 변경된 내용은 유효하나 더 이상 입력 실행 취소를 할 수는 없습니다. 서식 설정을 계속하시겠습니까?"; + Message[ korean ] = "이 작동을 실행하면 실행 취소할 수 있는 모든 작업 단계의 입력 목록이 삭제됩니다. 현재까지 문서에서 변경된 내용은 유효하나 더 이상 원래대로 되돌릴 수는 없습니다. 서식을 계속하시겠습니까?"; Message[ chinese_simplified ] = "这项操作会删除用于撤消命令的每一步骤的记录列单。至目前为止文档所有的更改将会保存，但是您无法再撤消这些更改。您要继续执行格式化？"; Message[ chinese_traditional ] = "這個動作會刪除復原清單的項目。已經變更的內容將會保留不變，但是不可以再復原所有的變更內容。\n要繼續執行這個格式化？"; Message[ turkish ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; @@ -3360,7 +3360,7 @@ WarningBox MSG_DISABLE_UNDO_QUESTION Message[ catalan ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ thai ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; }; -QueryBox MSG_INS_MERGE_FIELDS +/*QueryBox MSG_INS_MERGE_FIELDS { HelpId = HID_MAIL_MERGE_INSERT_FIELDS; Buttons = WB_OK_CANCEL ; @@ -3369,25 +3369,26 @@ QueryBox MSG_INS_MERGE_FIELDS Message[english_us] = "Do you want to use names and addresses from a database?"; Message[ portuguese ] = "Do you want to use names and addresses from a database?"; Message[ russian ] = "Do you want to use names and addresses from a database?"; - Message[ spanish ] = "Do you want to use names and addresses from a database?"; - Message[ italian ] = "Do you want to use names and addresses from a database?"; - Message[ swedish ] = "Do you want to use names and addresses from a database?"; + Message[ spanish ] = "Desea utilizar nombres y direcciones de una base de datos?"; + Message[ italian ] = "Volete utilizzare nomi e indirizzi da un database?"; + Message[ swedish ] = "Vill du anvnda namn och adresser frn en databas?"; Message[ polish ] = "Do you want to use names and addresses from a database?"; Message[ portuguese_brazilian ] = "Do you want to use names and addresses from a database?"; - Message[ japanese ] = "Do you want to use names and addresses from a database?"; - Message[ korean ] = "Do you want to use names and addresses from a database?"; + Message[ japanese ] = "データベースに登録されているユーザー名とアドレスを使用しますか。"; + Message[ korean ] = "데이터베이스에 있는 이름과 주소를 사용하시겠습니까?"; Message[ turkish ] = "Do you want to use names and addresses from a database?"; Message[ thai ] = "Do you want to use names and addresses from a database?"; Message[ greek ] = "Do you want to use names and addresses from a database?"; Message[ dutch ] = "Do you want to use names and addresses from a database?"; - Message[ french ] = "Do you want to use names and addresses from a database?"; + Message[ french ] = "Voulez-vous utiliser des noms et adresses provenant d'une base de donnes ?"; Message[ finnish ] = "Do you want to use names and addresses from a database?"; Message[ danish ] = "Do you want to use names and addresses from a database?"; - Message[ chinese_simplified ] = "Do you want to use names and addresses from a database?"; - Message[ chinese_traditional ] = "Do you want to use names and addresses from a database?"; + Message[ chinese_simplified ] = "您要使用一个数据源的姓名和地址？"; + Message[ chinese_traditional ] = "要使用資料庫中的姓名和地址？"; Message[ arabic ] = "Do you want to use names and addresses from a database?"; Message[ catalan ] = "Do you want to use names and addresses from a database?"; }; +*/ QueryBox MSG_PRINT_AS_MERGE { HelpId = HID_PRINT_AS_MERGE; @@ -3397,22 +3398,22 @@ QueryBox MSG_PRINT_AS_MERGE Message[english_us] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ portuguese ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ russian ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ spanish ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ italian ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ swedish ] = "Your document contains address database fields. Do you want to print a form letter?"; + Message[ spanish ] = "El documento contiene campos de bases de datos con direcciones. Desea imprimir una carta en serie?"; + Message[ italian ] = "Il vostro documento contiene un database Rubrica. Volete eseguire una stampa in serie?"; + Message[ swedish ] = "Ditt dokument innehller adressdatabasflt. Vill du skriva ut ett standardbrev (kopplad utskrift)?"; Message[ polish ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ portuguese_brazilian ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ japanese ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ korean ] = "Your document contains address database fields. Do you want to print a form letter?"; + Message[ japanese ] = "ドキュメントにアドレスデータベースのフィールドが含まれています。差し込み印刷を実行しますか。"; + Message[ korean ] = "문서에 데이터베이스 주소 필드가 있습니다. 편지 양식을 인쇄하시겠습니까?"; Message[ turkish ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ thai ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ greek ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ dutch ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ french ] = "Your document contains address database fields. Do you want to print a form letter?"; + Message[ french ] = "Le document contient des champs de base de donnes d'adresses. Voulez-vous imprimer une lettre type ?"; Message[ finnish ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ danish ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ chinese_simplified ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ chinese_traditional ] = "Your document contains address database fields. Do you want to print a form letter?"; + Message[ chinese_simplified ] = "您的文档含有一个通讯簿数据字段。要采用邮件合并方式打印？"; + Message[ chinese_traditional ] = "您的文件包含地址資料欄位。要合併列印？"; Message[ arabic ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ catalan ] = "Your document contains address database fields. Do you want to print a form letter?"; }; @@ -3422,35 +3423,35 @@ WarningBox MSG_MERGE_SOURCE_UNAVAILABLE Buttons = WB_OK ; DefButton = WB_DEF_YES ; Message = "Die Datenquelle \'%1\' konnte nicht gefunden werden.\nberprfen Sie die Einstellungen in \'Extras - Datenquellen...\'"; - Message[english_us] = "The data source \"%1\" was not found.\nCheck the settings in 'Tools - Data Sources...'"; + Message[english_us] = "The data source \'%1\' was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ portuguese ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ russian ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ spanish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ italian ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ swedish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; + Message[ spanish ] = "La fuente de datos \"%1\" no se encontr.\nCompruebe la configuracin en \'Herramientas - Fuentes de datos...\'"; + Message[ italian ] = "Impossibile trovare la sorgente dati \"%1\".\nControllate le impostazioni in \'Strumenti - Sorgente dati...\'"; + Message[ swedish ] = "Det gick inte att hitta datakllan \\%1\\.\nKontrollera instllningarna under \'Verktyg - Datakllor...\'"; Message[ polish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ portuguese_brazilian ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ japanese ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ korean ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; + Message[ japanese ] = "データソース「%1」が見つかりませんでした。\nツール - データソース...で設定をチェックしてください。"; + Message[ korean ] = "\'%1\' 데이터 원본을 찾을 수 없습니다.\n[도구] - [데이터 원본...] 메뉴에서 설정을 점검해 보십시오."; Message[ turkish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ thai ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ greek ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ dutch ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ french ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; + Message[ french ] = "Impossible de dtecter la source de donnes \"%1\" !\nVrifiez les paramtres sous \'Outils - Sources de donnes...\'"; Message[ finnish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ danish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ chinese_simplified ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ chinese_traditional ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; + Message[ chinese_simplified ] = "没有找到数据源 \"%1\" 。\n请检查在\'工具 - 数据源...\' 之下的设定。"; + Message[ chinese_traditional ] = "找不到資料源 \"%1\"。\n檢查 \'工具 - 資料源...\' 中的設定"; Message[ arabic ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ catalan ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; }; -QueryBox MSG_DATA_SOURCES_UNAVAILABLE +WarningBox MSG_DATA_SOURCES_UNAVAILABLE { HelpId = HID_DATA_SOURCES_UNAVAILABLE; - Buttons = WB_OK_CANCEL; + Buttons = WB_OK; DefButton = WB_DEF_YES ; - Message = "Es steht keine Datenquelle zur Verfgung. Mchten Sie die Verbindung zu einer Datenquelle herstellen?"; - Message[english_us] = "There is no data source available. Do you want to establish a data source connnection?"; + Message = "Es wurde noch keine Datenquelle eingerichtet. Sie bentigen eine Datenquelle, um Daten (z.B. Namen und Adressen aus einer Datenbenk) an die Felder zu liefern?"; + Message[english_us] = "No data source has been set up yet. You need a data source, such as a database, to supply data (for example, names and addresses) for the fields?"; Message[ portuguese ] = "There is no data source available.\nDo you want to establish a data source connnection?"; Message[ russian ] = "There is no data source available.\nDo you want to establish a data source connnection?"; Message[ spanish ] = "There is no data source available.\nDo you want to establish a data source connnection?"; @@ -3473,3 +3474,115 @@ QueryBox MSG_DATA_SOURCES_UNAVAILABLE Message[ catalan ] = "There is no data source available.\nDo you want to establish a data source connnection?"; }; +String RID_MODULE_TOOLBOX +{ + TEXT = "Funktionsleiste" ; + TEXT [ english ] = "Function bar" ; + Text [ dutch ] = "Werkbalk" ; + Text [ english_us ] = "Function Bar" ; + Text [ italian ] = "Barra delle funzioni" ; + Text [ spanish ] = "Barra de funciones" ; + Text [ french ] = "Barre de fonctions" ; + Text [ swedish ] = "Funktionslist" ; + Text [ danish ] = "Funktionslinje" ; + Text [ portuguese_brazilian ] = "Funktionsleiste" ; + Text [ portuguese ] = "Barra de funes" ; + Text[ chinese_simplified ] = "功能栏"; + Text[ russian ] = " "; + Text[ polish ] = "Pasek funkcji"; + Text[ japanese ] = "ファンクションバー"; + Text[ chinese_traditional ] = "工具列"; + Text[ arabic ] = " "; + Text[ dutch ] = "Werkbalk"; + Text[ chinese_simplified ] = "功能栏"; + Text[ greek ] = " "; + Text[ korean ] = "기능 모음"; + Text[ turkish ] = "lev ubuu"; + Text[ language_user1 ] = " "; + Text[ catalan ] = "Barra de funcions"; + Text[ finnish ] = "Toimintorivi"; + Text[ thai ] = "แถบฟังก์ชั่น"; +}; + +ToolBox RID_MODULE_TOOLBOX +{ + HelpID = HID_MODULE_TOOLBOX ; + Border = TRUE ; + SVLook = TRUE ; + Dockable = TRUE ; + Moveable = TRUE ; + Sizeable = TRUE ; + Closeable = TRUE ; + Zoomable = TRUE ; + HideWhenDeactivate = TRUE ; + LineSpacing = TRUE ; + Customize = TRUE ; + MenuStrings = TRUE ; + Hide = TRUE ; + ItemList = + { + ToolBoxItem + { + Identifier = SID_SAVEASDOC ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_EDITDOC ; + }; + ToolBoxItem + { + Identifier = SID_MAIL_SENDDOC ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_DIRECTEXPORTDOCASPDF ; + }; + ToolBoxItem + { + Identifier = SID_PRINTDOCDIRECT ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_COPY ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_SEARCH_DLG ; + }; + ToolBoxItem + { + Identifier = SID_NAVIGATOR ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_ZOOM ; + }; + }; + Scroll = TRUE ; +}; + + + + + + diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 14183123b250..bbf1b6e5125b 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appenv.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mba $ $Date: 2002-07-08 08:13:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -327,6 +327,7 @@ static USHORT nTitleNo = 0; aSet.Put(aEnvCfg.GetItem()); SfxPrinter* pTempPrinter = pSh->GetPrt( TRUE ); + USHORT nPaperBin = pTempPrinter->GetPaperBin(); if(pOldSh ) { const SwPageDesc& rCurPageDesc = pOldSh->GetPageDesc(pOldSh->GetCurPageDesc()); @@ -339,7 +340,7 @@ static USHORT nTitleNo = 0; //#69563# if it isn't the same printer then the pointer has been invalidated! pTempPrinter = pSh->GetPrt( TRUE ); } - pTempPrinter->SetPaperBin(rCurPageDesc.GetMaster().GetPaperBin().GetValue()); + pTempPrinter->SetPaperBin((nPaperBin = rCurPageDesc.GetMaster().GetPaperBin().GetValue())); } @@ -373,13 +374,13 @@ static USHORT nTitleNo = 0; //dem Dialog. Die Informationen muessen hier vor dem evtl. zerstoeren //der neuen Shell gesetzt werden, weil deren Drucker an den Dialog //gereicht wurde. - if ( nMode != ENV_NEWDOC ) - { ASSERT(pOldSh, "Kein Dokument - war 'Einfuegen' nicht disabled???"); SvxPaperBinItem aItem; aItem.SetValue((BYTE)pSh->GetPrt()->GetPaperBin()); + if ( nMode != ENV_NEWDOC ) pOldSh->GetPageDescFromPool(RES_POOLPAGE_JAKET)->GetMaster().SetAttr(aItem); - } + else + pSh->GetPageDescFromPool(RES_POOLPAGE_JAKET)->GetMaster().SetAttr(aItem); SwWrtShell *pTmp = nMode == ENV_INSERT ? pOldSh : pSh; const SwPageDesc* pFollow = 0; @@ -396,7 +397,9 @@ static USHORT nTitleNo = 0; //Neues Dok wieder loeschen xDocSh->DoClose(); pSh = pOldSh; - + //#i4251# selected text or objects in the document should + //not be deleted on inserting envelopes + pSh->EnterStdMode(); // Los geht's (Einfuegen) pSh->StartUndo(UIUNDO_INSERT_ENVELOPE); pSh->StartAllAction(); @@ -469,10 +472,9 @@ static USHORT nTitleNo = 0; SwPageDesc* pDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_JAKET); SwFrmFmt& rFmt = pDesc->GetMaster(); - Printer *pPrt = pSh->GetPrt( TRUE ); - // Raender (setzen sich zusammen aus Shift-Offset und // Ausrichtung) + Printer *pPrt = pSh->GetPrt( TRUE ); Size aPaperSize = pPrt->PixelToLogic( pPrt->GetPaperSizePixel(), MAP_TWIP); if ( !aPaperSize.Width() && !aPaperSize.Height() ) @@ -489,19 +491,19 @@ static USHORT nTitleNo = 0; USHORT nPageW = (USHORT) Max(rItem.lWidth, rItem.lHeight), nPageH = (USHORT) Min(rItem.lWidth, rItem.lHeight); - switch (rItem.eAlign) - { - case ENV_HOR_LEFT: break; - case ENV_HOR_CNTR: lLeft += Max(0L, long(aPaperSize.Width() - nPageW)) / 2; - break; - case ENV_HOR_RGHT: lLeft += Max(0L, long(aPaperSize.Width() - nPageW)); - break; - case ENV_VER_LEFT: lUpper += Max(0L, long(aPaperSize.Width() - nPageH)); - break; - case ENV_VER_CNTR: lUpper += Max(0L, long(aPaperSize.Width() - nPageH)) / 2; - break; - case ENV_VER_RGHT: break; - } +// switch (rItem.eAlign) +// { +// case ENV_HOR_LEFT: break; +// case ENV_HOR_CNTR: lLeft += Max(0L, long(aPaperSize.Width() - nPageW)) / 2; +// break; +// case ENV_HOR_RGHT: lLeft += Max(0L, long(aPaperSize.Width() - nPageW)); +// break; +// case ENV_VER_LEFT: lUpper += Max(0L, long(aPaperSize.Width() - nPageH)); +// break; +// case ENV_VER_CNTR: lUpper += Max(0L, long(aPaperSize.Width() - nPageH)) / 2; +// break; +// case ENV_VER_RGHT: break; +// } SvxLRSpaceItem aLRMargin; SvxULSpaceItem aULMargin; aLRMargin.SetLeft ((USHORT) lLeft ); @@ -534,8 +536,9 @@ static USHORT nTitleNo = 0; pDesc->SetFollow(pFollow); // Landscape - pDesc->SetLandscape( rItem.eAlign >= ENV_VER_LEFT && - rItem.eAlign <= ENV_VER_RGHT); +// pDesc->SetLandscape( rItem.eAlign >= ENV_VER_LEFT && +// rItem.eAlign <= ENV_VER_RGHT); + pDesc->SetLandscape( rItem.lWidth > rItem.lHeight ); // Page-Desc anwenden diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 2be620af448c..94a154320624 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: apphdl.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:09:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,8 +97,8 @@ #ifndef _SVX_SRCHITEM_HXX #include <svx/srchitem.hxx> #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef _SFXENUMITEM_HXX //autogen #include <svtools/eitem.hxx> @@ -318,10 +318,15 @@ using namespace ::com::sun::star; #include <cfgid.h> #endif +#include <shells.hrc> + SFX_IMPL_INTERFACE( SwModule, SfxModule, SW_RES(RID_SW_NAME) ) { SFX_CHILDWINDOW_REGISTRATION(SvxHyperlinkDlgWrapper::GetChildWindowId()); SFX_STATUSBAR_REGISTRATION(SW_RES(CFG_STATUSBAR)); + SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | + SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, + SW_RES(RID_MODULE_TOOLBOX) ); } /*------------------------------------------------------------------------ @@ -795,7 +800,13 @@ void SwModule::ExecViewOptions(SfxRequest &rReq) nDest = VIEWOPT_DEST_TEXT; ApplyUsrPref( *pOpt, pApplyView, nDest ); if ( pApplyView ) + { + SwWrtShell &rSh = pApplyView->GetWrtShell(); + const BOOL bLockedView = rSh.IsViewLocked(); + rSh.LockView( TRUE ); //lock visible section pApplyView->GetWrtShell().EndAction(); + rSh.LockView( bLockedView ); + } delete pOpt; Invalidate(rReq.GetSlot()); @@ -1131,11 +1142,11 @@ SwDBConfig* SwModule::GetDBConfig() /* -----------------------------11.04.2002 15:27------------------------------ ---------------------------------------------------------------------------*/ -svx::ColorConfig& SwModule::GetColorConfig() +svtools::ColorConfig& SwModule::GetColorConfig() { if(!pColorConfig) { - pColorConfig = new svx::ColorConfig; + pColorConfig = new svtools::ColorConfig; SwViewOption::ApplyColorConfigValues(*pColorConfig); StartListening(*pColorConfig); } diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index f255d6b62ca9..7d4ae6ee3ac0 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: applab.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2001-11-21 12:35:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -287,7 +287,7 @@ const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem, String sDBName; if( (!rItem.bSynchron || !(nCol|nRow)) && (sDBName = InsertLabEnvText( rSh, rFldMgr, rItem.aWriting )).Len() && !bLast ) { - sDBName.SetToken( 2, DB_DELIM, String::CreateFromAscii("True")); + sDBName.SetToken( 3, DB_DELIM, String::CreateFromAscii("True")); SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyStr, 0, &rSh ); rFldMgr.InsertFld( aData ); } diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 706cc77c0156..0b6fb0d9254c 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: os $ $Date: 2002-06-21 14:24:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,6 +99,10 @@ #ifndef _SFXSTRITEM_HXX #include <svtools/stritem.hxx> #endif +#ifndef _SVX_ADJITEM_HXX //autogen +#include <svx/adjitem.hxx> +#endif + #ifndef _SBXCLASS_HXX //autogen #include <svtools/sbx.hxx> #endif @@ -184,13 +188,18 @@ #ifndef _SWWAIT_HXX #include <swwait.hxx> #endif - +#ifndef _SWPRTOPT_HXX +#include <swprtopt.hxx> +#endif #ifndef _FRMATR_HXX #include <frmatr.hxx> #endif #ifndef _VIEW_HXX #include <view.hxx> // fuer die aktuelle Sicht #endif +#ifndef _EDTWIN_HXX +#include <edtwin.hxx> +#endif #ifndef _WRTSH_HXX #include <wrtsh.hxx> // Verbindung zur Core #endif @@ -216,7 +225,10 @@ #include <usrpref.hxx> #endif #ifndef _SHELLIO_HXX -#include <shellio.hxx> +#include <shellio.hxx> // I/O +#endif +#ifndef _SW3IO_HXX +#include <sw3io.hxx> // I/O, Hausformat #endif #ifndef _DOCSTYLE_HXX #include <docstyle.hxx> @@ -245,9 +257,6 @@ #ifndef _NDOLE_HXX #include <ndole.hxx> #endif -#ifndef _NDGRF_HXX -#include <ndgrf.hxx> -#endif #ifndef _SWSWERROR_H #include <swerror.h> // Fehlermeldungen @@ -418,6 +427,9 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, if( (pRead == ReadSw3 || pRead == ReadXML) && pFlt->GetVersion() ) aStor->SetVersion( (long)pFlt->GetVersion() ); } + // beim Sw3-Reader noch den pIo-Pointer setzen + if( pRead == ReadSw3 ) + ((Sw3Reader*)pRead)->SetSw3Io( pIo ); if( pFlt->GetDefaultTemplate().Len() ) pRead->SetTemplateName( pFlt->GetDefaultTemplate() ); @@ -467,6 +479,9 @@ BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium ) RemoveLink(); pDoc = pRdr->GetDoc(); + /* #106748# Restore the pool default if reading a saved document. */ + pDoc->GetAttrPool().ResetPoolDefaultItem(RES_PARATR_ADJUST); + // die DocInfo vom Doc am DocShell-Medium setzen if( GetMedium()->GetFilter() && GetMedium()->GetFilter()->UsesStorage() ) @@ -507,8 +522,10 @@ BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium ) BOOL SwDocShell::Save() { RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::Save" ); - sal_Bool bXML = GetStorage()->GetVersion() >= SOFFICE_FILEFORMAT_60; - + sal_Bool bXML = pIo->GetStorage()->GetVersion() >= SOFFICE_FILEFORMAT_60; + //#i3370# remove quick help to prevent saving of autocorrection suggestions + if(pView) + pView->GetEditWin().StopQuickHelp(); SwWait aWait( *this, TRUE ); ULONG nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE; if( SfxInPlaceObject::Save() ) @@ -520,17 +537,17 @@ BOOL SwDocShell::Save() break; case SFX_CREATE_MODE_ORGANIZER: + if( bXML ) { WriterRef xWrt; - if( bXML ) - ::GetXMLWriter( aEmptyStr, xWrt ); - else - ::GetSw3Writer( aEmptyStr, xWrt ); + ::GetXMLWriter( aEmptyStr, xWrt ); xWrt->SetOrganizerMode( TRUE ); - SwWriter aWrt( *GetStorage(), *pDoc ); + SwWriter aWrt( *pIo->GetStorage(), *pDoc ); nErr = aWrt.Write( xWrt ); xWrt->SetOrganizerMode( FALSE ); } + else + nErr = pIo->SaveStyles(); break; case SFX_CREATE_MODE_EMBEDDED: @@ -544,7 +561,7 @@ BOOL SwDocShell::Save() { if( pDoc->ContainsMSVBasic() ) { - SvxImportMSVBasic aTmp( *this, *GetStorage() ); + SvxImportMSVBasic aTmp( *this, *pIo->GetStorage() ); aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr ); if( OFF_APP()->GetFilterOptions()->IsLoadWordBasicStorage() ) nVBWarning = SvxImportMSVBasic:: @@ -555,7 +572,7 @@ BOOL SwDocShell::Save() if( !bXML && !ISA( SwGlobalDocShell ) && !ISA( SwWebDocShell ) && SFX_CREATE_MODE_EMBEDDED != GetCreateMode() ) - AddXMLAsZipToTheStorage( *GetStorage() ); + AddXMLAsZipToTheStorage( *pIo->GetStorage() ); // TabellenBox Edit beenden! if( pWrtShell ) @@ -563,12 +580,27 @@ BOOL SwDocShell::Save() WriterRef xWrt; if( bXML ) + { ::GetXMLWriter( aEmptyStr, xWrt ); + } else + { ::GetSw3Writer( aEmptyStr, xWrt ); + ((Sw3Writer*)&xWrt)->SetSw3Io( pIo, FALSE ); + } - SwWriter aWrt( *GetStorage(), *pDoc ); + BOOL bLockedView; + if ( pWrtShell ) + { + bLockedView = pWrtShell->IsViewLocked(); + pWrtShell->LockView( TRUE ); //lock visible section + } + + SwWriter aWrt( *pIo->GetStorage(), *pDoc ); nErr = aWrt.Write( xWrt ); + + if ( pWrtShell ) + pWrtShell->LockView( bLockedView ); } break; } @@ -595,6 +627,9 @@ BOOL SwDocShell::SaveAs( SvStorage * pStor ) sal_Bool bXML = pStor->GetVersion() >= SOFFICE_FILEFORMAT_60; SwWait aWait( *this, TRUE ); + //#i3370# remove quick help to prevent saving of autocorrection suggestions + if(pView) + pView->GetEditWin().StopQuickHelp(); if( pDoc->IsGlobalDoc() && !pDoc->IsGlblDocSaveLinks() ) RemoveOLEObjects(); @@ -644,7 +679,7 @@ BOOL SwDocShell::SaveAs( SvStorage * pStor ) if( pDoc->ContainsMSVBasic() ) { - SvxImportMSVBasic aTmp( *this, *GetStorage() ); + SvxImportMSVBasic aTmp( *this, *pIo->GetStorage() ); aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr ); if( OFF_APP()->GetFilterOptions()->IsLoadWordBasicStorage() ) nVBWarning = SvxImportMSVBasic:: @@ -672,13 +707,28 @@ BOOL SwDocShell::SaveAs( SvStorage * pStor ) WriterRef xWrt; if( bXML ) + { ::GetXMLWriter( aEmptyStr, xWrt ); + } else + { ::GetSw3Writer( aEmptyStr, xWrt ); + ((Sw3Writer*)&xWrt)->SetSw3Io( pIo, TRUE ); + } + + BOOL bLockedView; + if ( pWrtShell ) + { + bLockedView = pWrtShell->IsViewLocked(); + pWrtShell->LockView( TRUE ); //lock visible section + } SwWriter aWrt( *pStor, *pDoc ); nErr = aWrt.Write( xWrt ); + if ( pWrtShell ) + pWrtShell->LockView( bLockedView ); + if( bIsModified ) pDoc->SetModified(); pDoc->SetOle2Link( aOldOLELnk ); @@ -716,14 +766,20 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) SW_RESSTR(STR_DLLNOTFOUND) ).Execute(); return FALSE; } - + //#i3370# remove quick help to prevent saving of autocorrection suggestions + if(pView) + pView->GetEditWin().StopQuickHelp(); ULONG nVBWarning = 0; - if( pDoc->ContainsMSVBasic() && xWriter->IsStgWriter() ) + if( pDoc->ContainsMSVBasic() ) { BOOL bSave = pFlt->GetUserData().EqualsAscii( "CWW8" ) && OFF_APP()->GetFilterOptions()->IsLoadWordBasicStorage(); - SvStorage* pStg = rMedium.GetStorage(); + SvStorage* pStg; + if( xWriter->IsStgWriter() ) + pStg = rMedium.GetStorage(); + else + pStg = pIo->GetStorage(); SvxImportMSVBasic aTmp( *this, *pStg ); nVBWarning = aTmp.SaveOrDelMSVBAStorage( bSave, String::CreateFromAscii("Macros") ); @@ -907,13 +963,24 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) } /*-------------------------------------------------------------------- + Beschreibung: Haende weg + --------------------------------------------------------------------*/ + + +void SwDocShell::HandsOff() +{ + pIo->HandsOff(); + SfxInPlaceObject::HandsOff(); +} + +/*-------------------------------------------------------------------- Beschreibung: ??? noch nicht zu aktivieren, muss TRUE liefern --------------------------------------------------------------------*/ + BOOL SwDocShell::SaveCompleted( SvStorage * pStor ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SaveCompleted" ); - BOOL bClearNm = !pStor || !IsHandsOff(); BOOL bRet = SfxInPlaceObject::SaveCompleted( pStor ); if( bRet ) { @@ -923,18 +990,7 @@ BOOL SwDocShell::SaveCompleted( SvStorage * pStor ) else pDoc->ResetModified(); - - // Hier muss noch ueber die Grafiknodes iteriert werden, um - // ihnen zu sagen, wie ihr neuer Streamname lautet! - // Da Grafiken Flys sind, liegen die Nodes im Autotext-Bereich - SwNodes& rNds = pDoc->GetNodes(); - ULONG nEnd = rNds.GetEndOfAutotext().GetIndex(); - for( ULONG nIdx = rNds.GetEndOfInserts().GetIndex() + 1; nIdx < nEnd; ++nIdx) - { - SwGrfNode* pNd = rNds[ nIdx ]->GetGrfNode(); - if( pNd ) - pNd->SaveCompleted( bClearNm ); - } + bRet = pIo->SaveCompleted( pStor ); } if( xOLEChildList.Is() ) @@ -992,7 +1048,8 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, pDev->SetLineColor(); pDev->SetBackground(); BOOL bWeb = 0 != PTR_CAST(SwWebDocShell, this); - ViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), pDev, aRect ); + SwPrtOptions aOpts( aEmptyStr ); + ViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect ); pDev->Pop(); if( pOrig ) diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 328a645e115d..0af0d18066dd 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh2.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: gt $ $Date: 2002-11-18 15:29:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1252,11 +1252,14 @@ void SwDocShell::Execute(SfxRequest& rReq) case SID_MAIL_PREPAREEXPORT: { - pWrtShell->StartAllAction(); + //pWrtShell is not set in page preview + if(pWrtShell) + pWrtShell->StartAllAction(); pDoc->UpdateFlds( 0 ); pDoc->EmbedAllLinks(); pDoc->RemoveInvisibleContent(); - pWrtShell->EndAllAction(); + if(pWrtShell) + pWrtShell->EndAllAction(); } break; @@ -1358,6 +1361,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } if(!sStartTemplate.getLength() && pAny) sStartTemplate = pAny->GetName(); + aListBoxEntries.realloc(nIdx); try @@ -1664,7 +1668,8 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView } sal_Bool bWasBrowseMode = pDoc->IsBrowseMode(); RemoveLink(); - + delete pIo; + pIo = 0; //jetzt muss auch das UNO-Model ueber das neue Doc informiert werden #51535# uno::Reference<text::XTextDocument> xDoc(GetBaseModel(), uno::UNO_QUERY); text::XTextDocument* pxDoc = xDoc.get(); diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 84e288d05d0b..3ea2e6eec980 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docshini.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: os $ $Date: 2002-09-26 13:38:35 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,6 +118,9 @@ #ifndef _SFXINTITEM_HXX #include <svtools/intitem.hxx> #endif +#ifndef _SVX_ADJITEM_HXX //autogen +#include <svx/adjitem.hxx> +#endif #ifndef _LINGUISTIC_LNGPROPS_HHX_ #include <linguistic/lngprops.hxx> @@ -204,6 +207,12 @@ #ifndef _TOX_HXX #include <tox.hxx> #endif +#ifndef _SW3IO_HXX +#include <sw3io.hxx> // I/O, Hausformat +#endif +#ifndef _SHELLIO_HXX +#include <shellio.hxx> +#endif #ifndef _SWDTFLVR_HXX #include <swdtflvr.hxx> #endif @@ -277,7 +286,7 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor ) sal_Bool bHTMLTemplSet = sal_False; if( bRet ) { - AddLink(); // pDoc ggf. anlegen + AddLink(); // pDoc / pIo ggf. anlegen sal_Bool bWeb = ISA( SwWebDocShell ); if ( bWeb ) @@ -342,6 +351,12 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor ) DEFAULTFONT_CJK_TEXT, DEFAULTFONT_CTL_TEXT }; + USHORT aLangTypes[] = + { + RES_CHRATR_LANGUAGE, + RES_CHRATR_CJK_LANGUAGE, + RES_CHRATR_CTL_LANGUAGE + }; for(USHORT i = 0; i < 3; i++) { @@ -369,7 +384,7 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor ) } else { - const SvxLanguageItem& rLang = (const SvxLanguageItem&)pDoc->GetDefault( nFontWhich ); + const SvxLanguageItem& rLang = (const SvxLanguageItem&)pDoc->GetDefault( aLangTypes[i] ); Font aLangDefFont = OutputDevice::GetDefaultFont( nFontTypes[i], @@ -445,6 +460,7 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor ) SwDocShell::SwDocShell(SfxObjectCreateMode eMode) : pDoc(0), + pIo(0), pBasePool(0), pFontList(0), SfxObjectShell ( eMode ), @@ -463,6 +479,7 @@ SwDocShell::SwDocShell(SfxObjectCreateMode eMode) : SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ): pDoc(pD), + pIo(0), pBasePool(0), pFontList(0), SfxObjectShell ( eMode ), @@ -482,6 +499,7 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ): SwDocShell::~SwDocShell() { RemoveLink(); + delete pIo; delete pFontList; // wir als BroadCaster werden auch unser eigener Listener @@ -513,7 +531,6 @@ void SwDocShell::Init_Impl() // set map unit to twip SetMapUnit( MAP_TWIP ); - } /*-------------------------------------------------------------------- Beschreibung: AddLink @@ -535,6 +552,11 @@ void SwDocShell::AddLink() uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY); ((SwXTextDocument*)xDoc.get())->Reactivate(this); + if( !pIo ) + pIo = new Sw3Io( *pDoc ); + else + pIo->SetDoc( *pDoc ); + SetPool(&pDoc->GetAttrPool()); // am besten erst wenn eine sdbcx::View erzeugt wird !!! @@ -641,16 +663,18 @@ sal_Bool SwDocShell::Load(SvStorage* pStor) // break; case SFX_CREATE_MODE_ORGANIZER: + if( bXML ) { - Reader *pReader = bXML ? ReadXML : ReadSw3; - if( pReader ) + if( ReadXML ) { - pReader->SetOrganizerMode( TRUE ); + ReadXML->SetOrganizerMode( TRUE ); SwReader aRdr( *pStor, aEmptyStr, pDoc ); - nErr = aRdr.Read( *pReader ); - pReader->SetOrganizerMode( FALSE ); + nErr = aRdr.Read( *ReadXML ); + ReadXML->SetOrganizerMode( FALSE ); } } + else + nErr = pIo->LoadStyles( pStor ); break; case SFX_CREATE_MODE_INTERNAL: @@ -808,21 +832,22 @@ sal_Bool SwDocShell::LoadFrom(SvStorage* pStor) if( pStor->IsStream( aStreamName ) ) { // Das Laden - Reader *pReader = bXML ? ReadXML : ReadSw3; - if( pReader ) + SwWait aWait( *this, sal_True ); + if( bXML ) { - SwWait aWait( *this, sal_True ); - if( bXML ) + ASSERT( !pBasePool, "wer hat seinen Pool nicht zerstoert?" ); + pBasePool = new SwDocStyleSheetPool( *pDoc, + SFX_CREATE_MODE_ORGANIZER == GetCreateMode() ); + if( ReadXML ) { - ASSERT( !pBasePool, "wer hat seinen Pool nicht zerstoert?" ); - pBasePool = new SwDocStyleSheetPool( *pDoc, - SFX_CREATE_MODE_ORGANIZER == GetCreateMode() ); + ReadXML->SetOrganizerMode( TRUE ); + SwReader aRdr( *pStor, aEmptyStr, pDoc ); + nErr = aRdr.Read( *ReadXML ); + ReadXML->SetOrganizerMode( FALSE ); } - pReader->SetOrganizerMode( TRUE ); - SwReader aRdr( *pStor, aEmptyStr, pDoc ); - nErr = aRdr.Read( *pReader ); - pReader->SetOrganizerMode( FALSE ); } + else + nErr = pIo->LoadStyles( pStor ); } else { @@ -875,11 +900,12 @@ void SwDocShell::SubInitNew() sal_Bool bWeb = ISA(SwWebDocShell); sal_uInt16 nRange[] = { - RES_CHRATR_COLOR, RES_CHRATR_COLOR, - RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, - RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, - RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE, - 0, 0, 0 }; + RES_PARATR_ADJUST, RES_PARATR_ADJUST, + RES_CHRATR_COLOR, RES_CHRATR_COLOR, + RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, + RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, + RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE, + 0, 0, 0 }; if(!bWeb) { nRange[ (sizeof(nRange)/sizeof(nRange[0])) - 3 ] = RES_PARATR_TABSTOP; @@ -910,9 +936,15 @@ void SwDocShell::SubInitNew() sal_uInt16 nNewPos = SW_MOD()->GetUsrPref(FALSE)->GetDefTab(); if( nNewPos ) aDfltSet.Put( SvxTabStopItem( 1, nNewPos, - SVX_TAB_ADJUST_DEFAULT ) ); + SVX_TAB_ADJUST_DEFAULT ) ); } aDfltSet.Put( SvxColorItem( Color( COL_AUTO ), RES_CHRATR_COLOR ) ); + + /* #106748# If the default frame direction of a document is RTL + the default adjusment is to the right. */ + if (FRMDIR_HORI_RIGHT_TOP == GetDefaultFrameDirection(GetAppLanguage())) + aDfltSet.Put(SvxAdjustItem(SVX_ADJUST_RIGHT)); + pDoc->SetDefault( aDfltSet ); pDoc->ResetModified(); } diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 79166413f3f1..411f9cae8b8a 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docst.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: os $ $Date: 2002-11-15 10:50:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -546,6 +546,12 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam if(rParent.Len()) { SwTxtFmtColl* pColl = pWrtShell->FindTxtFmtCollByName( rParent ); + if(!pColl) + { + USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rParent, GET_POOLID_TXTCOLL); + if(USHRT_MAX != nId) + pColl = pWrtShell->GetTxtCollFromPool( nId ); + } pDStyle->GetCollection()->SetDerivedFrom( pColl ); pDStyle->PresetParent( rParent ); } @@ -563,6 +569,12 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam if(rParent.Len()) { SwCharFmt* pCFmt = pWrtShell->FindCharFmtByName( rParent ); + if(!pCFmt) + { + USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rParent, GET_POOLID_CHRFMT); + if(USHRT_MAX != nId) + pCFmt = pWrtShell->GetCharFmtFromPool( nId ); + } pDStyle->GetCharFmt()->SetDerivedFrom( pCFmt ); pDStyle->PresetParent( rParent ); @@ -581,6 +593,12 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam if(rParent.Len()) { SwFrmFmt* pFFmt = pWrtShell->GetDoc()->FindFrmFmtByName( rParent ); + if(!pFFmt) + { + USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rParent, GET_POOLID_FRMFMT); + if(USHRT_MAX != nId) + pFFmt = pWrtShell->GetFrmFmtFromPool( nId ); + } pDStyle->GetFrmFmt()->SetDerivedFrom( pFFmt ); pDStyle->PresetParent( rParent ); } diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src index 56c405135d6f..217b936235c4 100644 --- a/sw/source/ui/app/error.src +++ b/sw/source/ui/app/error.src @@ -2,9 +2,9 @@ * * $RCSfile: error.src,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: os $ $Date: 2002-10-10 06:06:35 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ String STR_COMCORE_READERROR TEXT [ spanish ] = "Error de lectura" ; TEXT [ english_us ] = "Read-Error" ; TEXT[ chinese_simplified ] = "读文件时发生错误"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Bd odczytu"; TEXT[ japanese ] = "読み取りエラー"; TEXT[ chinese_traditional ] = "讀檔案時發生錯誤"; @@ -116,7 +116,7 @@ String STR_COMCORE_CANT_SHOW TEXT [ finnish ] = "Kuvaa ei voida nytt." ; TEXT [ english_us ] = "Graphic cannot be displayed." ; TEXT[ chinese_simplified ] = "无法显示图形"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " ."; TEXT[ polish ] = "Grafiki nie mona wywietli."; TEXT[ japanese ] = "図を表示できません。"; TEXT[ chinese_traditional ] = "無法顯示圖形"; @@ -147,13 +147,13 @@ InfoBox ERR_CLPBRD_WRITE MESSAGE [ spanish ] = "Error al copiar al portapapeles." ; MESSAGE [ english_us ] = "Error while copying to the clipboard." ; MESSAGE[ chinese_simplified ] = "在复制数据到剪贴板时发生错误。"; - MESSAGE[ russian ] = " ."; + MESSAGE[ russian ] = " ."; MESSAGE[ polish ] = "Bd podczas kopiowania do schowka."; MESSAGE[ japanese ] = "クリップボードにコピーする際のエラー。"; MESSAGE[ chinese_traditional ] = "複製資料到剪貼簿時發生錯誤。"; MESSAGE[ arabic ] = " ."; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "클립보드에 복사 중 오류."; + MESSAGE[ korean ] = "클립보드에 복사 중 오류"; MESSAGE[ turkish ] = "Panoya kopyalama hatas."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "S'ha produt un error en copiar al porta-retalls."; @@ -175,14 +175,14 @@ InfoBox ERR_CLPBRD_READ MESSAGE [ spanish ] = "Error al leer del portapapeles." ; MESSAGE [ english_us ] = "Error reading from the clipboard." ; MESSAGE[ chinese_simplified ] = "在读取剪贴板时发生错误。"; - MESSAGE[ russian ] = " ."; + MESSAGE[ russian ] = " ."; MESSAGE[ polish ] = "Bd odczytu ze schowka."; MESSAGE[ japanese ] = "クリップボードから読み取る際のエラー。"; MESSAGE[ chinese_traditional ] = "在讀取剪貼簿時發生錯誤。"; MESSAGE[ arabic ] = " ."; MESSAGE[ language_user1 ] = " "; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "클립보드로부터 읽기 오류."; + MESSAGE[ korean ] = "클립보드로부터 읽기 오류"; MESSAGE[ turkish ] = "Panodan okuma hatas."; MESSAGE[ catalan ] = "S'ha produt un error en llegir el porta-retalls."; MESSAGE[ thai ] = "อ่านผิดพลาดจากคลิปบอร์ด"; @@ -203,15 +203,15 @@ Resource RID_SW_ERRHDL TEXT [ italian ] = "Errore nel formato del file" ; TEXT [ portuguese_brazilian ] = "Erro no formato do arquivo" ; TEXT [ portuguese ] = "Encontrado erro de formato no ficheiro" ; - TEXT [ finnish ] = "Tiedostomuotovirhe ilmeni" ; + TEXT [ finnish ] = "Tiedostomuotovirhe ilmeni." ; TEXT [ danish ] = "Opdaget formatfejl i filen" ; TEXT [ french ] = "Erreur de format de fichier" ; TEXT [ swedish ] = "Formatfel upptckt i filen" ; - TEXT [ dutch ] = "Formaatfout ontdekt in het bestand" ; + TEXT [ dutch ] = "Indelingsfout ontdekt in het bestand" ; TEXT [ spanish ] = "Se ha descubierto un error de formato en el archivo" ; TEXT [ english_us ] = "File format error found" ; TEXT[ chinese_simplified ] = "发现了文件格式错误"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Znaleziono bd formatu w pliku"; TEXT[ japanese ] = "ファイルに書式エラーが見つかりました。"; TEXT[ chinese_traditional ] = "發現了檔案格式錯誤"; @@ -235,11 +235,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under lsning af filen " ; TEXT [ french ] = "Erreur de lecture du fichier " ; TEXT [ swedish ] = "Fel vid lsning av fil " ; - TEXT [ dutch ] = "Fout bij lezen van het bestand " ; + TEXT [ dutch ] = "Fout bij lezen van het bestand" ; TEXT [ spanish ] = "Error al leer el archivo " ; TEXT [ english_us ] = "Error reading file " ; TEXT[ chinese_simplified ] = "在读文件时发生错误 "; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Bd w odczytywaniu pliku "; TEXT[ japanese ] = "ファイルの読み取りエラー "; TEXT[ chinese_traditional ] = "讀檔案時發生錯誤 "; @@ -267,7 +267,7 @@ Resource RID_SW_ERRHDL TEXT [ spanish ] = "Error en el archivo de entrada" ; TEXT [ english_us ] = "Input file error" ; TEXT[ chinese_simplified ] = "输入的文件含有错误"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Bd w pliku wejciowym"; TEXT[ japanese ] = "入力ファイルの中にエラー"; TEXT[ chinese_traditional ] = "輸入的檔案含有錯誤"; @@ -287,7 +287,7 @@ Resource RID_SW_ERRHDL TEXT [ italian ] = "Questo non un file di %PRODUCTNAME Writer" ; TEXT [ portuguese_brazilian ] = "Este n?o ? um arquivo do %PRODUCTNAME Writer" ; TEXT [ portuguese ] = "Este no um ficheiro do %PRODUCTNAME Writer." ; - TEXT [ finnish ] = "Tm ei ole %PRODUCTNAME Writer -tiedosto" ; + TEXT [ finnish ] = "Tm ei ole %PRODUCTNAME Writer -tiedosto." ; TEXT [ danish ] = "Filen er ikke en %PRODUCTNAME Writer-fil" ; TEXT [ french ] = "Ceci n'est pas un fichier %PRODUCTNAME Writer" ; TEXT [ swedish ] = "Detta r inte en %PRODUCTNAME Writer-fil" ; @@ -319,7 +319,7 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Uventet filafslutning" ; TEXT [ french ] = "Fin de fichier imprvue" ; TEXT [ swedish ] = "Ovntat filslut" ; - TEXT [ dutch ] = "Onverwacht bestandeinde" ; + TEXT [ dutch ] = "Onverwacht bestandseinde" ; TEXT [ spanish ] = "Fin inesperado de archivo" ; TEXT [ english_us ] = "Unexpected end of file" ; TEXT[ chinese_simplified ] = "意外的文件结尾"; @@ -340,24 +340,24 @@ Resource RID_SW_ERRHDL TEXT = "Dateien, die mit Kennwort geschtzt sind, knnen nicht geffnet werden." ; TEXT [ English ] = "Files with passwords are not supported" ; TEXT [ norwegian ] = "Passordbeskyttet filer er ikke tilgjengelige" ; - TEXT [ italian ] = "Le password non sono supportate" ; + TEXT [ italian ] = "Impossibile aprire i file protetti da password." ; TEXT [ portuguese_brazilian ] = "Arquivos com senhas n?o s o comportados" ; TEXT [ portuguese ] = "As senhas no tm suporte" ; - TEXT [ finnish ] = "Salasanoilla suojattuja tiedostoja ei tueta" ; + TEXT [ finnish ] = "Salasanoilla suojattuja tiedostoja ei tueta." ; TEXT [ danish ] = "Adgangskoder understttes ikke" ; - TEXT [ french ] = "Les mots de passe ne sont pas supports." ; - TEXT [ swedish ] = "Lsenord stds ej" ; + TEXT [ french ] = "Impossible d'ouvrir les fichiers protgs par des mots de passe !" ; + TEXT [ swedish ] = "Det gr inte att ppna filer som r skyddade med lsenord" ; TEXT [ dutch ] = "Wachtwoorden worden niet ondersteund" ; - TEXT [ spanish ] = "Las contraseas no se apoyan" ; - TEXT [ english_us ] = "Passwords are not supported." ; - TEXT[ chinese_simplified ] = "不支持密码"; - TEXT[ russian ] = " "; + TEXT [ spanish ] = "Los archivos protegidos por contraseas no se pueden abrir." ; + TEXT [ english_us ] = "Password-protected files cannot be opened." ; + TEXT[ chinese_simplified ] = "无法打开用密码保护的文件。"; + TEXT[ russian ] = " , "; TEXT[ polish ] = "Hasa nie bd obsugiwane"; TEXT[ japanese ] = "パスワードは支援されていません。"; - TEXT[ chinese_traditional ] = "不支援密碼"; + TEXT[ chinese_traditional ] = "無法開啟受到密碼保護的檔案。"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "암호가 지원되지 않습니다."; + TEXT[ korean ] = "암호로 보안된 파일은 열 수 없습니다."; TEXT[ turkish ] = "ifre kullanm desteklenmiyor"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "No estan permesos els fitxers protegits amb contrasenyes"; @@ -379,7 +379,7 @@ Resource RID_SW_ERRHDL TEXT [ spanish ] = "El archivo no es uno de WinWord6" ; TEXT [ english_us ] = "This is not a WinWord6 file" ; TEXT[ chinese_simplified ] = "这不是一个 WinWord6 文件"; - TEXT[ russian ] = " WinWord6"; + TEXT[ russian ] = " WinWor"; TEXT[ polish ] = "Ten plik nie jest plikiem WinWord6"; TEXT[ japanese ] = "これは WinWord6 のファイルではありません。"; TEXT[ chinese_traditional ] = "這不是一個 WinWord6 檔案"; @@ -407,11 +407,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Denne fil er blevet gemt med WinWord-indstillingen 'Gem hurtigt'. Deaktiver venligst indstillingen 'Gem hutigt' og gem filen igen med WinWord." ; TEXT [ french ] = "Ce fichier a t enregistr l'aide de l'option 'Enregistrement rapide' de WinWord. Veuillez dsactiver cette option et utiliser WinWord pour enregistrer nouveau le fichier." ; TEXT [ swedish ] = "Denna fil r sparad med WinWord-alternativet 'snabbspara'. Stng av WinWord-alternativet 'Tillt snabbspara' och spara filen med WinWord igen" ; - TEXT [ dutch ] = "Dit bestand werd met de WinWord- optie \"Snel opslaan\" opgeslagen. Schakel a.u.b in WinWord de optie \"Snel opslaan toestaan\" uit en sla het bestand opnieuw op met WinWord." ; + TEXT [ dutch ] = "Dit bestand is met de WinWord-optie \"Snel opslaan\" opgeslagen. Schakel a.u.b. in WinWord de optie \"Snel opslaan toestaan\" uit en sla het bestand opnieuw op met WinWord." ; TEXT [ spanish ] = "Este archivo ha sido guardado con la opcin de WinWord 'guardar rpidamente' . Por favor desactive en WinWord la opcin 'permitir guardar rpidamente' y guarde el archivo de nuevo en WinWord." ; - TEXT [ english_us ] = "This file was saved with WinWord in 'Fast Save' mode. Please uncheck the option 'Allow Fast Saves' and save the file again." ; + TEXT [ english_us ] = "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; TEXT[ chinese_simplified ] = "这个文件存盘采用的是 WinWord 选项 '快速保存'方式。请关闭这个选项，然后再重新存盘这个文件。"; - TEXT[ russian ] = " WinWord ' '. , ' ' WinWord."; + TEXT[ russian ] = " WinWord ' '. , ' ' WinWord."; TEXT[ polish ] = "Ten plik zosta zapisany za pomoc opcji WinWord 'Szybkie zapisywanie'. Prosz wcz w WinWord opcj 'Dopu szybkie zapisywanie' i zapisz plik ponownie w WinWord"; TEXT[ japanese ] = "このファイルは WinWord オプションの「高速保存」で保存されています。WinWord のオプション「高速保存する」をオフにして WinWord でファイルを保存しなおしてください。"; TEXT[ chinese_traditional ] = "儲存檔案採用的是 WinWord 選項<快速儲存>方式。請關閉這個選項﹐然後再重新儲存這個文件。"; @@ -435,11 +435,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under skrivning af midlertidig fil" ; TEXT [ french ] = "Erreur d'criture du fichier temporaire" ; TEXT [ swedish ] = "Fel vid skrivning av temporr fil" ; - TEXT [ dutch ] = "Fout bij het schrijven van tijdelijk bestand" ; + TEXT [ dutch ] = "Fout bij schrijven van tijdelijk bestand" ; TEXT [ spanish ] = "Error al escribir el archivo temporal" ; TEXT [ english_us ] = "Error writing temporary file" ; TEXT[ chinese_simplified ] = "在写入暂时文件时发生错误"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Bd zapisu pliku tymczasowego"; TEXT[ japanese ] = "テンポラリファイルの書き込み中のエラー"; TEXT[ chinese_traditional ] = "在寫入暫時檔案時發生錯誤"; @@ -461,19 +461,19 @@ Resource RID_SW_ERRHDL TEXT [ portuguese ] = "A rea de insero do ficheiro Ini demasiado extensa" ; TEXT [ french ] = "Zone d'insertion dans le fichier Ini trop grande" ; TEXT [ dutch ] = "Invoegbereik in INI-bestand is te groot" ; - TEXT [ spanish ] = "El rea de insercin en el archivo Ini es demasiado grande" ; + TEXT [ spanish ] = "La seccin insertada en el archivo Ini es demasiado grande" ; TEXT [ danish ] = "Importomrdet i ini-filen er for stort" ; TEXT [ swedish ] = "Importomrdet i ini-filen r fr stort" ; - TEXT [ finnish ] = "Ini-tiedostoon listty osio on liian suuri" ; + TEXT [ finnish ] = "Ini-tiedostoon listty osa on liian suuri." ; TEXT [ english_us ] = "Inserted section in ini file too large" ; TEXT[ chinese_simplified ] = "Ini 文件插入区域太大"; - TEXT[ russian ] = " Ini "; + TEXT[ russian ] = " ini "; TEXT[ polish ] = "Obszar wstawiania do pliku Ini jest za duy"; TEXT[ japanese ] = "Ini ファイルの挿入範囲が大きすぎます。"; TEXT[ chinese_traditional ] = "Ini 檔案插入區域太大"; TEXT[ arabic ] = " Ini "; TEXT[ greek ] = " ini "; - TEXT[ korean ] = "ini 파일에 삽입된 영역이 너무 큽니다."; + TEXT[ korean ] = "ini 파일에 삽입된 구역이 너무 큽니다."; TEXT[ turkish ] = "Ini dosyas ekleme blm ok byk"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "L'rea d'inserci del fitxer ini s massa gran"; @@ -486,14 +486,14 @@ Resource RID_SW_ERRHDL Text [ english_us ] = "File format error found at $(ARG1)(row,col)" ; Text [ italian ] = " stato trovato un errore di formato nel file alla posizione $(ARG1)(riga, colonna)" ; Text [ spanish ] = "Se ha descubierto un error de formato en el archivo en la posicin $(ARG1)(fila,columna)" ; - Text [ french ] = "Erreur de format la position $(ARG1)(ligne,colonne) du fichier" ; - Text [ dutch ] = "Formaatfout ontdekt op positie $(ARG1)(cel,kolom) in het bestand" ; + Text [ french ] = "Erreur de format dans le fichier, position $(ARG1)(ligne, colonne)." ; + Text [ dutch ] = "Indelingsfout ontdekt op positie $(ARG1)(cel,kolom) in het bestand" ; Text [ swedish ] = "Formatfel vid position $(ARG1)(rad,kolumn) upptckt i filen" ; Text [ danish ] = "Der blev opdaget en formatfejl i filen p position $(ARG1)(rkke,spalte)" ; Text [ portuguese ] = "Descoberto erro de formato na posio $(ARG1)(linha, coluna) do ficheiro" ; Text [ portuguese_brazilian ] = "Formatfehler an Position $(ARG1)(Zeile,Spalte) in der Datei entdeckt" ; Text[ chinese_simplified ] = "文件格式错误 $(ARG1)(行，列)"; - Text[ russian ] = " $(ARG1)(,) "; + Text[ russian ] = " $(ARG1)(,)"; Text[ polish ] = "Znaleziono w pliku bd formatu przy pozycji $(ARG1)(Wiersz, kolumna)"; Text[ japanese ] = "ファイルの $(ARG1)(行、列)に書式エラーが見つかりました。"; Text[ chinese_traditional ] = "檔案格式錯誤 $(ARG1)(行，列)"; @@ -503,7 +503,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "Dosya format hatas $(ARG1)(satr, stun) bulundu"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha trobat un error en el format de l'arxiu a $(ARG1)(fila, col.)"; - Text[ finnish ] = "Tiedostomuotovirhe ilmeni kohteessa $(ARG1)(rivi,sarake)"; + Text[ finnish ] = "Tiedostomuotovirhe ilmeni kohteessa $(ARG1)(rivi,sarake)."; Text[ thai ] = "พบรูปแบบแฟ้มผิดพลาดที่ $(ARG1)(แถว,คอลัมน์)"; }; String ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_NEW_VERSION ) @@ -514,13 +514,13 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Il file stato creato da una versione pi recente" ; Text [ spanish ] = "El archivo se escribi en una versin ms nueva" ; Text [ french ] = "Ce fichier a t cr l'aide d'une version plus rcente" ; - Text [ dutch ] = "Bestand werd onder een nieuwere versie opgeslagen" ; + Text [ dutch ] = "Bestand is onder een nieuwere versie opgeslagen" ; Text [ swedish ] = "Filen har skrivits i en nyare version" ; Text [ danish ] = "Filen er blevet skrevet af en nyere version" ; Text [ portuguese ] = "O ficheiro foi escrito numa verso mais moderna" ; Text [ portuguese_brazilian ] = "Datei wurde von einer neueren Version geschrieben" ; Text[ chinese_simplified ] = "文件已经由一个新版本更新"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Plik zosta zapisany w nowszej wersji"; Text[ japanese ] = "ファイルは新しいバージョンで書かれています"; Text[ chinese_traditional ] = "檔案已經被一個新版本更新"; @@ -539,9 +539,9 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "This isn't a WinWord97 file" ; TEXT[ english_us ] = "This is not a WinWord97 file"; TEXT[ portuguese ] = "No um ficheiro WinWord97"; - TEXT[ russian ] = " WinWord97"; + TEXT[ russian ] = " WinWor"; TEXT[ greek ] = " WinWord97"; - TEXT[ dutch ] = "Dit is geen WinWord97 bestand"; + TEXT[ dutch ] = "Dit is geen WinWord97-bestand"; TEXT[ french ] = "Il ne s'agit pas d'un fichier WinWord97 !"; TEXT[ spanish ] = "El archivo no es de WinWord97"; TEXT[ italian ] = "Il file non nel formato WinWord97"; @@ -550,7 +550,7 @@ Resource RID_SW_ERRHDL TEXT[ polish ] = "To nie jest plik WinWord97"; TEXT[ portuguese_brazilian ] = "This isn't a WinWord97 file"; TEXT[ japanese ] = "これは WinWord97 ファイルではありません"; - TEXT[ korean ] = "이 파일은 WinWord97파일이 아닙니다"; + TEXT[ korean ] = "이 파일은 WinWord97 파일이 아닙니다"; TEXT[ chinese_simplified ] = "这个文件不是一个 WinWord97 文件"; TEXT[ chinese_traditional ] = "這不是 WinWord97 檔案"; TEXT[ turkish ] = "This isn't a WinWord97 file"; @@ -565,9 +565,9 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)" ; TEXT[ english_us ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ portuguese ] = "Erro de formato no sub-documento $(ARG1) do ficheiro, na posio $(ARG2)(linha,coluna)"; - TEXT[ russian ] = " $(ARG1) $(ARG2)(, ) ."; + TEXT[ russian ] = " $(ARG1) $(ARG2)(, )."; TEXT[ greek ] = " $(ARG1) $(ARG2)(, )"; - TEXT[ dutch ] = "Fout in formaat in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; + TEXT[ dutch ] = "Indelingsfout in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; TEXT[ french ] = "Erreur de format dans le sous-document $(ARG1), position $(ARG2)(ligne,colonne), du fichier."; TEXT[ spanish ] = "En el documento parcial $(ARG1) del archivo existe un error de formato en la posicin $(ARG2)(fila,columna)"; TEXT[ italian ] = "Errore di formato nel sottodocumento $(ARG1) del file nel punto $(ARG2)(riga,colonna)"; @@ -576,13 +576,13 @@ Resource RID_SW_ERRHDL TEXT[ polish ] = "Wykryto bd w formacie dokumentu podrzdnego $(ARG1) na pozycji $(ARG2)(wiersz, kolumna)"; TEXT[ portuguese_brazilian ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ japanese ] = "ファイルの $(ARG2)(行、列)にある部分ドキュメント $(ARG1) に書式エラーが見つかりました。"; - TEXT[ korean ] = "파일의 $(ARG2)(행, 열)위치에 있는 부분 문서 $(ARG1)의 형식 오류 발견"; + TEXT[ korean ] = "파일의 $(ARG2)(행, 열)위치에 있는 부분 문서 $(ARG1)의 서식 오류를 발견했습니다."; TEXT[ chinese_simplified ] = "发现文件的子文档$(ARG1)内含错误，位置在 $(ARG2)(行,列)"; TEXT[ chinese_traditional ] = "發現檔案的子文件$(ARG1)內含錯誤，位置在 $(ARG2)(行,欄)"; TEXT[ turkish ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ arabic ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ catalan ] = "S'ha descobert un error de format en el fitxer en el subdocument $(ARG1) fins al $(ARG2)(fila, col.)"; - TEXT[ finnish ] = "Tiedoston aliasiakirjan $(ARG1) kohdassa $(ARG2)(rivi,sarake) havaittiin muotoiluvirhe"; + TEXT[ finnish ] = "Tiedoston aliasiakirjan $(ARG1) kohdassa $(ARG2)(rivi,sarake) havaittiin muotoiluvirhe."; TEXT[ thai ] = "ค้นพบรูปแบบผิดพลาดในแฟ้มในเอกสารย่อย $(ARG1) ที่ $(ARG2)(แถว,คอลัมน์)"; }; // Export-Errors @@ -598,7 +598,7 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under skrivning af filen " ; TEXT [ french ] = "Erreur d'criture du fichier " ; TEXT [ swedish ] = "Fel vid skrivning av fil " ; - TEXT [ dutch ] = "Fout bij het schrijven van het bestand " ; + TEXT [ dutch ] = "Fout bij schrijven van bestand" ; TEXT [ spanish ] = "Error al escribir el archivo " ; TEXT [ english_us ] = "Error writing file " ; TEXT[ chinese_simplified ] = "写入文件时发生错误 "; @@ -621,7 +621,7 @@ Resource RID_SW_ERRHDL Text [ dutch ] = "Het AutoTekst-document heeft de verkeerde versie" ; Text [ english_us ] = "Wrong AutoText document version" ; Text [ italian ] = "Il documento di testo automatico presenta una versione errata" ; - Text [ spanish ] = "Versin errnea del documento de AutoTexto" ; + Text [ spanish ] = "Versin del documento de texto automtico errnea" ; Text [ french ] = "La version de l' AutoTexte utilise est incorrecte" ; Text [ swedish ] = "AutoTextdokumentet har fel version" ; Text [ danish ] = "Forkert AutoTekst dokumentversion" ; @@ -634,7 +634,7 @@ Resource RID_SW_ERRHDL Text[ chinese_traditional ] = "這個自動圖文集文件版本無效"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "틀린 자동텍스트 문서 버전"; + Text[ korean ] = "잘못된 자동 텍스트 문서 버전"; Text[ turkish ] = "Otomatik metin belgesi srm yanl"; Text[ language_user1 ] = " "; Text[ catalan ] = "Versi incorrecta del document d'Autotext"; @@ -655,7 +655,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = " impossvel criar o documento" ; Text [ portuguese_brazilian ] = "Das Dokument kann nicht angelegt werden" ; Text[ chinese_simplified ] = "无法生成这个文档。"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Dokumentu nie mona utworzy"; Text[ japanese ] = "このドキュメントは作成できません。"; Text[ chinese_traditional ] = "無法建立這個文件"; @@ -680,11 +680,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under lsning af midlertidig fil" ; TEXT [ french ] = "Erreur de lecture du fichier temporaire" ; TEXT [ swedish ] = "Fel vid lsning av temporr fil" ; - TEXT [ dutch ] = "Fout bij het lezen van tijdelijke bestanden" ; + TEXT [ dutch ] = "Fout bij lezen tijdelijke bestanden" ; TEXT [ spanish ] = "Error al leer el archivo temporal" ; TEXT [ english_us ] = "Error reading temporary file" ; TEXT[ chinese_simplified ] = "在读取暂时文件时发生错误"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Bd w odczytywaniu pliku tymczasowego"; TEXT[ japanese ] = "テンポラリファイル読み取りの際のエラー"; TEXT[ chinese_traditional ] = "讀取暫時檔案時發生錯誤"; @@ -729,7 +729,7 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "Error in writing sub-document $(ARG1)" ; TEXT[ english_us ] = "Error in writing sub-document $(ARG1)"; TEXT[ portuguese ] = "Erro ao escrever o sub-documento $(ARG1)"; - TEXT[ russian ] = " $(ARG1)"; + TEXT[ russian ] = " $(ARG1)"; TEXT[ greek ] = " $(ARG1)"; TEXT[ dutch ] = "Fout bij schrijven van subdocument $(ARG1)"; TEXT[ french ] = "Erreur d'criture dans le sous-document $(ARG1)"; @@ -746,7 +746,7 @@ Resource RID_SW_ERRHDL TEXT[ turkish ] = "Error in writing sub-document $(ARG1)"; TEXT[ arabic ] = "Error in writing sub-document $(ARG1)"; TEXT[ catalan ] = "S'ha produt un error en escriure el subdocument $(ARG1)"; - TEXT[ finnish ] = "Aliasiakirjaan $(ARG1) kirjoitettaessa on ilmennyt virhe"; + TEXT[ finnish ] = "Aliasiakirjaan $(ARG1) kirjoitettaessa on ilmennyt virhe."; TEXT[ thai ] = "ข้อผิดพลาดในการเขียนเอกสารย่อย $(ARG1)"; }; // Import-/Export-Errors @@ -762,17 +762,17 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Intern fejl i %PRODUCTNAME Writer-filformatet" ; TEXT [ french ] = "Erreur interne dans le format de fichier %PRODUCTNAME Writer" ; TEXT [ swedish ] = "Internt fel i %PRODUCTNAME Writer-filformatet" ; - TEXT [ dutch ] = "Interne fout in %PRODUCTNAME Writer bestandsformaat" ; + TEXT [ dutch ] = "Interne fout in %PRODUCTNAME Writer-bestandsindeling" ; TEXT [ spanish ] = "Error interno en el formato de archivo de %PRODUCTNAME Writer" ; TEXT [ english_us ] = "Internal error in %PRODUCTNAME Writer file format" ; TEXT[ chinese_simplified ] = "%PRODUCTNAME Writer 文件格式含有内部错误"; - TEXT[ russian ] = " %PRODUCTNAME Writer"; + TEXT[ russian ] = " %PRODUCTNAME Writer"; TEXT[ polish ] = "Wewntrzny bd w formacie pliku %PRODUCTNAME Writer"; TEXT[ japanese ] = "%PRODUCTNAME Writer ファイル書式の内部エラー"; TEXT[ chinese_traditional ] = "%PRODUCTNAME Writer 檔案格式含有內部錯誤"; TEXT[ arabic ] = " %PRODUCTNAME Writer"; TEXT[ greek ] = " %PRODUCTNAME Writer"; - TEXT[ korean ] = "%PRODUCTNAME Writer 파일서식의 내부 오류"; + TEXT[ korean ] = "%PRODUCTNAME Writer 파일 서식의 내부 오류"; TEXT[ turkish ] = "Dahili %PRODUCTNAME Writer dosyas format hatas"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "S'ha produt un error intern en el format del %PRODUCTNAME Writer"; @@ -790,17 +790,17 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Intern fejl i %PRODUCTNAME Writer-filformatet" ; TEXT [ french ] = "Erreur interne dans le format de fichier %PRODUCTNAME Writer" ; TEXT [ swedish ] = "Internt fel i %PRODUCTNAME Writer-filformatet" ; - TEXT [ dutch ] = "Interne fout in %PRODUCTNAME Writer bestandsformaat" ; + TEXT [ dutch ] = "Interne fout in %PRODUCTNAME Writer-bestandsindeling" ; TEXT [ spanish ] = "Error interno en el formato de archivo de %PRODUCTNAME Writer" ; TEXT [ english_us ] = "Internal error in %PRODUCTNAME Writer file format" ; TEXT[ chinese_simplified ] = "%PRODUCTNAME Writer 文件格式含有内部错误"; - TEXT[ russian ] = " %PRODUCTNAME Writer"; + TEXT[ russian ] = " %PRODUCTNAME Writer"; TEXT[ polish ] = "Wewntrzny bd w formacie pliku %PRODUCTNAME Writer"; TEXT[ japanese ] = "%PRODUCTNAME Writer ファイル書式の内部エラー"; TEXT[ chinese_traditional ] = "%PRODUCTNAME Writer 檔案格式含有內部錯誤"; TEXT[ arabic ] = " %PRODUCTNAME Writer"; TEXT[ greek ] = " %PRODUCTNAME Writer"; - TEXT[ korean ] = "%PRODUCTNAME Writer 파일서식의 내부 오류"; + TEXT[ korean ] = "%PRODUCTNAME Writer 파일 서식의 내부 오류"; TEXT[ turkish ] = "Dahili %PRODUCTNAME Writer dosyas format hatas"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "S'ha produt un error intern en el format del fitxer %PRODUCTNAME Writer"; @@ -898,7 +898,7 @@ Resource RID_SW_ERRHDL TEXT [ italian ] = "Spazio su disco insufficiente" ; TEXT [ portuguese_brazilian ] = "N?o h? espa?o suficiente em disco" ; TEXT [ portuguese ] = "Espao do disco insuficiente" ; - TEXT [ finnish ] = "Levytila ei riit" ; + TEXT [ finnish ] = "Levytila ei riit." ; TEXT [ danish ] = "Ikke tilstrkkelig diskplads" ; TEXT [ french ] = "Espace insuffisant sur le disque" ; TEXT [ swedish ] = "Inte tillrckligt med diskutrymme" ; @@ -940,7 +940,7 @@ Resource RID_SW_ERRHDL TEXT[ chinese_traditional ] = "W4W 轉換器發生不明錯誤。"; TEXT[ arabic ] = " W4W"; TEXT[ greek ] = " W4W"; - TEXT[ korean ] = "W4W 필터에 알려져 있지 않은 오류"; + TEXT[ korean ] = "W4W 필터에 알 수 없는 오류"; TEXT[ turkish ] = "W4W filtresinde bilinmeyen hata"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Error desconegut al filtre W4W"; @@ -968,7 +968,7 @@ Resource RID_SW_ERRHDL TEXT[ chinese_traditional ] = "W4W 轉換器發生不明錯誤。"; TEXT[ arabic ] = " W4W"; TEXT[ greek ] = " W4W"; - TEXT[ korean ] = "W4W 필터에 알려져 있지 않은 오류"; + TEXT[ korean ] = "W4W 필터에 알 수 없는 오류"; TEXT[ turkish ] = "W4W filtresinde bilinmeyen hata"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Error desconegut al filtre W4W"; @@ -986,11 +986,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under indlsning af konverteren" ; TEXT [ french ] = "Erreur de chargement du convertisseur" ; TEXT [ swedish ] = "Fel vid laddning av konverteraren" ; - TEXT [ dutch ] = "Fout bij het laden van de converter" ; + TEXT [ dutch ] = "Fout bij laden van converter" ; TEXT [ spanish ] = "Error al cargar el convertidor" ; TEXT [ english_us ] = "Error loading converter" ; TEXT[ chinese_simplified ] = "在转换时发生错误"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Bd podczas adowania konwertera"; TEXT[ japanese ] = "コンバータ読み込み中のエラー"; TEXT[ chinese_traditional ] = "載入轉換器時發生錯誤"; @@ -1014,11 +1014,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under indlsning af konverteren" ; TEXT [ french ] = "Erreur de chargement du convertisseur" ; TEXT [ swedish ] = "Fel vid laddning av konverteraren" ; - TEXT [ dutch ] = "Fout bij het laden van de converter" ; + TEXT [ dutch ] = "Fout bij laden van converter" ; TEXT [ spanish ] = "Error al cargar el convertidor" ; TEXT [ english_us ] = "Error loading converter" ; TEXT[ chinese_simplified ] = "转换时发生错误"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Bd podczas adowania konwertera"; TEXT[ japanese ] = "コンバータ読み込み中のエラー"; TEXT[ chinese_traditional ] = "載入轉換器時發生錯誤"; @@ -1034,7 +1034,7 @@ Resource RID_SW_ERRHDL { TEXT = "$(ARG1) hat sich gendert" ; TEXT [ English ] = "$(ARG1) has changed" ; - Text [ dutch ] = "$(ARG1) is veranderd" ; + Text [ dutch ] = "$(ARG1) is gewijzigd" ; Text [ english_us ] = "$(ARG1) has changed" ; Text [ italian ] = "$(ARG1) cambiato" ; Text [ spanish ] = "$(ARG1) se ha modificado" ; @@ -1054,7 +1054,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "$(ARG1) deiti"; Text[ language_user1 ] = " "; Text[ catalan ] = "$(ARG1) ha canviat"; - Text[ finnish ] = "Kohde $(ARG1) on muuttunut"; + Text[ finnish ] = "Kohde $(ARG1) on muuttunut."; Text[ thai ] = "เปลี่ยน $(ARG1) "; }; String ERR_CODE ( ERRCODE_CLASS_PATH , ERR_AUTOPATH_ERROR ) @@ -1077,11 +1077,11 @@ Resource RID_SW_ERRHDL Text[ chinese_traditional ] = "$(ARG1) 不存在"; Text[ arabic ] = "$(ARG1) "; Text[ greek ] = "$(ARG1) "; - Text[ korean ] = "$(ARG1)이(가) 없습니다."; + Text[ korean ] = "$(ARG1)이(가) 없습니다"; Text[ turkish ] = "$(ARG1) mevcut deil"; Text[ language_user1 ] = " "; Text[ catalan ] = "$(ARG1) no existeix"; - Text[ finnish ] = "Kohdetta $(ARG1) ei ole"; + Text[ finnish ] = "Kohdetta $(ARG1) ei ole olemassa."; Text[ thai ] = "ไม่มี $(ARG1) อยู่"; }; String ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLSPLIT_ERROR ) @@ -1099,7 +1099,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = " impossvel dividir mais as clulas" ; Text [ portuguese_brazilian ] = "Zellen k?nen nicht mehr geteilt werden" ; Text[ chinese_simplified ] = "无法分隔单元格"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Komrek nie mona podzieli"; Text[ japanese ] = "これ以上セルを分割できません"; Text[ chinese_traditional ] = "無法分開儲存格"; @@ -1109,7 +1109,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "Hcreler daha fazla blnemiyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "Les cel.les no es poden dividir ms"; - Text[ finnish ] = "Soluja ei voi jakaa enemp"; + Text[ finnish ] = "Soluja ei voi jakaa enemp."; Text[ thai ] = "ไม่สามารถแยกเซลล์เพิ่มเติมได้"; }; String ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLINSCOL_ERROR ) @@ -1127,7 +1127,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = "Impossvel inserir colunas adicionais" ; Text [ portuguese_brazilian ] = "weitere Spalten k?nen nicht eingef?t werden" ; Text[ chinese_simplified ] = "无法插入其它的列"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "dodatkowych kolumn nie mona wstawi"; Text[ japanese ] = "追加の列を挿入できません"; Text[ chinese_traditional ] = "無法插入其它欄"; @@ -1137,7 +1137,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "Daha fazla stun eklenemiyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es poden inserir columnes addicionals"; - Text[ finnish ] = "Sarakkeita ei voi list enemp"; + Text[ finnish ] = "Sarakkeita ei voi list enemp."; Text[ thai ] = "ไม่สามารถแทรกคอลัมน์เพิ่มเติมได้"; }; String ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLDDECHG_ERROR ) @@ -1152,9 +1152,9 @@ Resource RID_SW_ERRHDL Text [ italian ] = "In una tabella collegata non sono ammesse modifiche alla struttura." ; Text [ spanish ] = "No se puede modificar la estructura de una tabla vinculada" ; Text [ french ] = "La structure d'un tableau ne peut pas tre modifie s'il a fait l'objet d'un lien" ; - Text [ dutch ] = "Bij een gekoppelde tabel mag de structuur niet worden veranderd." ; + Text [ dutch ] = "Bij een gekoppelde tabel mag de structuur niet worden gewijzigd." ; Text[ chinese_simplified ] = "不能更改一个链接的表格结构"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Przy poczonej tabeli nie wolno zmienia jej struktury"; Text[ japanese ] = "リンクされた表の構造は変更できません"; Text[ chinese_traditional ] = "不能變更一個連結的表格結構"; @@ -1164,7 +1164,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "Balantl bir tablonun yaps deitirilmez"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot modificar l'estructura d'una taula enllaada"; - Text[ finnish ] = "Linkitetyn taulukon rakennetta ei voi muokata"; + Text[ finnish ] = "Linkitetyn taulukon rakennetta ei voi muokata."; Text[ thai ] = "ไม่สามารถดัดแปลงแก้ไขโครงสร้างของตารางที่เชื่อมโยงได้"; }; // -------------------- Warnings ----------------------------------- @@ -1176,23 +1176,23 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Non stato possibile caricare alcun disegno" ; Text [ spanish ] = "No se pudo cargar ningn dibujo" ; Text [ french ] = "Impossible de charger des dessins" ; - Text [ dutch ] = "Er konden geen tekeningen worden geladen" ; + Text [ dutch ] = "Er kunnen geen tekeningen worden geladen" ; Text [ swedish ] = "Det gick inte att ladda ngra teckningar" ; Text [ danish ] = "Det var ikke muligt at indlse nogen tegninger" ; Text [ portuguese ] = "Foi impossvel carregar desenhos" ; Text [ portuguese_brazilian ] = "Es konnten keine Zeichnungen geladen werden" ; Text[ chinese_simplified ] = "无法装入图像"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "adne rysunki nie mogy zosta zaadowane"; Text[ japanese ] = "図形描画は読み込みできませんでした"; Text[ chinese_traditional ] = "無法載入影像"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "그림을 로드하지 못했습니다."; + Text[ korean ] = "그리기를 로드하지 못했습니다."; Text[ turkish ] = "izim yklenemedi"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es poden llegir els dibuixos "; - Text[ finnish ] = "Piirustuksia ei voitu lukea"; + Text[ finnish ] = "Piiroksia ei voitu lukea"; Text[ thai ] = "ไม่สามารถอ่านการวาดรูปได้"; }; String WARN_CODE ( ERRCODE_CLASS_READ , WARN_WW6_FASTSAVE_ERR ) @@ -1211,11 +1211,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Denne fil er blevet gemt med WinWord-indstillingen 'Gem hurtigt'. Deaktiver venligst indstillingen 'Gem hutigt' og gem filen igen med WinWord." ; TEXT [ french ] = "Ce fichier a t enregistr l'aide de l'option 'Enregistrement rapide' de WinWord. Veuillez dsactiver cette option et utiliser WinWord pour enregistrer nouveau le fichier." ; TEXT [ swedish ] = "Denna fil r sparad med WinWord-alternativet 'snabbspara'. Stng av WinWord-alternativet 'Tillt snabbspara' och spara filen med WinWord igen" ; - TEXT [ dutch ] = "Dit bestand werd met de WinWord optie \"Snel opslaan\" opgeslagen. Schakel a.u.b in WinWord de optie \"Snel opslaan toestaan\" uit en sla het bestand opnieuw op met WinWord." ; + TEXT [ dutch ] = "Dit bestand is met de WinWord optie \"Snel opslaan\" opgeslagen. Schakel a.u.b. in WinWord de optie \"Snel opslaan toestaan\" uit en sla het bestand opnieuw op met WinWord." ; TEXT [ spanish ] = "Este archivo ha sido guardado con la opcin de WinWord 'guardar rpidamente' . Por favor desactive en WinWord la opcin 'permitir guardar rpidamente' y guarde nuevamente el archivo con WinWord" ; - TEXT [ english_us ] = "This file was saved with WinWord in 'Fast Save' mode. Please uncheck the option 'Allow Fast Saves' and save the file again." ; + TEXT [ english_us ] = "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; TEXT[ chinese_simplified ] = "这个文件存盘采用的是 WinWord 选项 '快速保存'方式。请设定不使用这个选项，然后再重新存盘这个文件。"; - TEXT[ russian ] = " WinWord ' '. , ' ' WinWord."; + TEXT[ russian ] = " WinWord ' '. , ' ' WinWord."; TEXT[ polish ] = "Ten plik zosta zapisany za pomoc opcji WinWord 'Szybkie zapisywanie'. Prosz wycz w WinWord opcj 'Dopu szybkie zapisywanie' i zapisz plik ponownie w WinWord."; TEXT[ japanese ] = "このファイルは、WinWord オプション「高速保存」で保存されています。WinWord オプション「高速保存」をオフにしてから、ファイルを WinWord で保存しなおしてください。"; TEXT[ chinese_traditional ] = "儲存檔案採用的是 WinWord 選項<快速儲存>方式。請關閉這個選項，然後再重新儲存這個檔案。"; @@ -1231,7 +1231,7 @@ Resource RID_SW_ERRHDL { TEXT = "Es konnten nicht alle Attribute gelesen werden" ; TEXT [ English ] = "Not all attributes could be read" ; - Text [ dutch ] = "Niet alle attributen konden worden ingelezen" ; + Text [ dutch ] = "Niet alle attributen kunnen worden ingelezen" ; Text [ english_us ] = "Not all attributes could be read" ; Text [ italian ] = "Non stato possibile leggere tutti gli attributi" ; Text [ spanish ] = "No se pudieron leer todos los atributos" ; @@ -1241,7 +1241,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = "Foi impossvel ler todos os atributos" ; Text [ portuguese_brazilian ] = "Es konnten nicht alle Attribute gelesen werden" ; Text[ chinese_simplified ] = "无法读取所有的属性"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nie wszystkie atrybuty mogy zosta odczytane"; Text[ japanese ] = "すべての属性を読み取ることはできませんでした"; Text[ chinese_traditional ] = "無法讀取所有的屬性"; @@ -1262,13 +1262,13 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Non stato possibile scrivere tutti gli attributi" ; Text [ spanish ] = "No se pudieron grabar todos los atributos" ; Text [ french ] = "Impossible d'crire tous les attributs" ; - Text [ dutch ] = "Niet alle attributen konden worden geschreven" ; + Text [ dutch ] = "Niet alle attributen kunnen worden geschreven" ; Text [ swedish ] = "Det gick inte att skriva alla attribut" ; Text [ danish ] = "Det var ikke muligt at skrive alle attributter" ; Text [ portuguese ] = "Foi impossvel gravar todos os atributos" ; Text [ portuguese_brazilian ] = "Es konnten nicht alle Attribute geschrieben werden" ; Text[ chinese_simplified ] = "不能写入所有的属性"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nie wszystkie atrybuty mogy zosta zapisane"; Text[ japanese ] = "すべての属性を記録することはできませんでした"; Text[ chinese_traditional ] = "不能寫入所有的屬性"; @@ -1286,7 +1286,7 @@ Resource RID_SW_ERRHDL /* ### ACHTUNG: Neuer Text in Resource? Einige OLE-Objekte konnten nur als Grafiken bernommen werden : Einige OLE-Objekte konnten nur als Grafiken bernommen werden */ TEXT = "Einige OLE-Objekte konnten nur als Grafiken bernommen werden" ; TEXT [ English ] = "Some OLE Objects could only be loaded as graphics" ; - Text [ dutch ] = "Enkele OLE-objecten konden alleen als grafische objecten worden overgenomen" ; + Text [ dutch ] = "Enkele OLE-objecten kunnen alleen als grafische objecten worden overgenomen" ; Text [ english_us ] = "Some OLE objects could only be loaded as graphics" ; Text [ italian ] = "Alcuni oggetti OLE sono stati prelevati solo come immagini" ; Text [ spanish ] = "Algunos objetos OLE se pudieron incluir slo como imgenes" ; @@ -1296,13 +1296,13 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = "Alguns dos objectos OLE puderam ser apenas carregados como imagens" ; Text [ portuguese_brazilian ] = "Einige OLE-Objekte konnten nur als Grafiken ?ernommen werden" ; Text[ chinese_simplified ] = "一些 OLE 对象只能以图像方式装入"; - Text[ russian ] = " OLE "; + Text[ russian ] = " OLE "; Text[ polish ] = "Niektre obiekty OLE mog zosta zaadowane tylko jako grafiki"; Text[ japanese ] = "OLE オブジェクトのいくつかは図としてしか読み込めません。"; Text[ chinese_traditional ] = "一些 OLE 物件只能以圖形方式裝載"; Text[ arabic ] = " OLE "; Text[ greek ] = " OLE "; - Text[ korean ] = "일부 OLE 개체들은 그래픽으로서만 적용될 수 있습니다."; + Text[ korean ] = "일부 OLE 개체들은 그림으로서만 적용될 수 있습니다."; Text[ turkish ] = "Baz OLE nesneleri yalnzca grafik olarak yklenebildi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alguns objectes OLE noms s'han pogut incloure com a imatges"; @@ -1318,19 +1318,19 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Alcuni oggetti OLE sono stati prelevati solo come immagini" ; Text [ spanish ] = "Algunos objetos OLE se pudieron incluir slo como imgenes" ; Text [ french ] = "Certains objets OLE ont pu tre chargs uniquement sous forme d'images" ; - Text [ dutch ] = "Enkele OLE-objecten konden alleen als grafische objecten worden overgenomen" ; + Text [ dutch ] = "Enkele OLE-objecten kunnen alleen als grafische objecten worden overgenomen" ; Text [ swedish ] = "Ngra OLE-objekt kunde bara vertas som grafik" ; Text [ danish ] = "Nogle OLE-objekter kunne kun overtages som grafik" ; Text [ portuguese ] = "Alguns dos objectos OLE foram carregados apenas como imagens" ; Text [ portuguese_brazilian ] = "Einige OLE-Objekte konnten nur als Grafiken ?ernommen werden" ; Text[ chinese_simplified ] = "一些 OLE 对象无法被存盘为图形"; - Text[ russian ] = " OLE "; + Text[ russian ] = " OLE "; Text[ polish ] = "Niektre obiekty OLE mogy zosta zaadowane tylko jako grafiki"; Text[ japanese ] = "OLE オブジェクトのいくつかは、図としてしか保存できませんでした"; Text[ chinese_traditional ] = "一些 OLE 物件無法儲存為圖形"; Text[ arabic ] = " OLE "; Text[ greek ] = " OLE "; - Text[ korean ] = "일부 OLE 개체들은 그래픽으로서만 적용될 수 있습니다."; + Text[ korean ] = "일부 OLE 개체들은 그림으로서만 적용될 수 있습니다."; Text[ turkish ] = "Baz OLE nesneleri yalnzca grafik olarak yklenebildi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alguns objectes OLE noms s'han pogut incloure com a imatges"; @@ -1342,7 +1342,7 @@ Resource RID_SW_ERRHDL /* ### ACHTUNG: Neuer Text in Resource? Dokument konnte nicht vollstndig geladen werden : Dokument konnte nicht vollstndig geladen werden */ TEXT = "Dokument konnte nicht vollstndig geladen werden" ; TEXT [ English ] = "Document could not be loaded completely" ; - Text [ dutch ] = "Document kon niet volledig worden geladen" ; + Text [ dutch ] = "Document kan niet volledig worden geladen" ; Text [ english_us ] = "Document could not be completely loaded" ; Text [ italian ] = "Non stato possibile caricare il file completamente" ; Text [ spanish ] = "No se pudo cargar completamente el documento" ; @@ -1352,7 +1352,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = "Foi impossvel carregar o documento completamente" ; Text [ portuguese_brazilian ] = "Dokument konnte nicht vollst?ndig geladen werden" ; Text[ chinese_simplified ] = "无法完全装入文档"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Dokument nie mg zosta cakowicie zaadowany"; Text[ japanese ] = "ドキュメントを完全に読み込みできませんでした"; Text[ chinese_traditional ] = "無法完全載入文件"; @@ -1374,13 +1374,13 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Non stato possibile salvare il file completamente" ; Text [ spanish ] = "No se pudo guardar completamente el documento" ; Text [ french ] = "Le document n'a pas pu tre enregistr dans son intgralit" ; - Text [ dutch ] = "Document kon niet volledig worden opgeslagen" ; + Text [ dutch ] = "Document kan niet volledig worden opgeslagen" ; Text [ swedish ] = "Det gick inte att spara dokumentet fullstndigt" ; Text [ danish ] = "Det var ikke muligt at gemme dokumentet helt" ; Text [ portuguese ] = "Foi impossvel guardar o documento completamente" ; Text [ portuguese_brazilian ] = "Dokument konnte nicht vollst?ndig gespeichert werden" ; Text[ chinese_simplified ] = "无法完整地存盘文档"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Dokument nie mg zosta cakowicie zapisany"; Text[ japanese ] = "ドキュメントを完全に保存できませんでした"; Text[ chinese_traditional ] = "無法完整儲存文件"; @@ -1399,9 +1399,9 @@ Resource RID_SW_ERRHDL Text [ English ] = "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved because of the current export options." ; Text[ english_us ] = "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved with the current export settings."; Text[ portuguese ] = "O documento HTML contm macros %PRODUCTNAME Basic.\nEstas no foram guardadas com as definies de exportao activas."; - Text[ russian ] = " HTML %PRODUCTNAME Basic.\n ."; + Text[ russian ] = " - %PRODUCTNAME Basic.\n - ."; Text[ greek ] = " HTML %PRODUCTNAME Basic.\n ."; - Text[ dutch ] = "Dit HTML document bevat %PRODUCTNAME Basic-macro's.\nDeze konden niet worden opgeslagen met de actuele exportinstellingen."; + Text[ dutch ] = "Dit HTML-document bevat %PRODUCTNAME Basic-macro's.\nDeze kunnen niet worden opgeslagen met de huidige exportinstellingen."; Text[ french ] = "Le document HTML contient des macros %PRODUCTNAME Basic.\nCelles-ci n'ont pas t enregistres avec les paramtres d'export actifs."; Text[ spanish ] = "El documento HTML contiene macros %PRODUCTNAME Basic.\nNo se guardaron con la configuracin actual de exportacin."; Text[ italian ] = "Il documento HTML contiene macro %PRODUCTNAME Basic che\nnon sono state salvate con le impostazioni attuali di esportazione."; @@ -1426,7 +1426,7 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "Error in writing sub-document $(ARG1)" ; TEXT[ english_us ] = "Error in writing sub-document $(ARG1)"; TEXT[ portuguese ] = "Erro ao escrever o sub-documento $(ARG1)"; - TEXT[ russian ] = " $(ARG1)"; + TEXT[ russian ] = " $(ARG1)"; TEXT[ greek ] = " $(ARG1)"; TEXT[ dutch ] = "Fout bij schrijven van subdocument $(ARG1)"; TEXT[ french ] = "Erreur d'criture dans le sous-document $(ARG1)"; @@ -1443,7 +1443,7 @@ Resource RID_SW_ERRHDL TEXT[ turkish ] = "Error in writing sub-document $(ARG1)"; TEXT[ arabic ] = "Error in writing sub-document $(ARG1)"; TEXT[ catalan ] = "S'ha produt un error en escriure el subdocument $(ARG1)"; - TEXT[ finnish ] = "Aliasiakirjaan $(ARG1) kirjoitettaessa on ilmennyt virhe"; + TEXT[ finnish ] = "Aliasiakirjaan $(ARG1) kirjoitettaessa on ilmennyt virhe."; TEXT[ thai ] = "ข้อผิดพลาดในการเขียนเอกสารย่อย $(ARG1)"; }; String ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_FORMAT_FILE_ROWCOL ) @@ -1452,9 +1452,9 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)" ; TEXT[ english_us ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ portuguese ] = "Erro de formato no sub-documento $(ARG1) do ficheiro, na posio(ARG2)(linha,coluna)"; - TEXT[ russian ] = " $(ARG1) $(ARG2)(,) ."; + TEXT[ russian ] = " $(ARG1) $(ARG2)(,)."; TEXT[ greek ] = " $(ARG1) $(ARG2)(,)"; - TEXT[ dutch ] = "Fout in formaat in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; + TEXT[ dutch ] = "Indelingsfout in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; TEXT[ french ] = "Erreur de format dans le sous-document $(ARG1), position $(ARG2)(ligne,colonne), du fichier."; TEXT[ spanish ] = "En el documento parcial $(ARG1) del archivo existe un error de formato en la posicin $(ARG2)(fila,columna)"; TEXT[ italian ] = "Errore di formato nel sottodocumento $(ARG1) del file nel punto $(ARG2)(riga,colonna)"; @@ -1463,13 +1463,13 @@ Resource RID_SW_ERRHDL TEXT[ polish ] = "Wykryto bd w formacie dokumentu podrzdnego $(ARG1) na pozycji $(ARG2)(wiersz, kolumna)"; TEXT[ portuguese_brazilian ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ japanese ] = "ファイルの $(ARG2)(行、列) にある部分ドキュメント $(ARG1) に書式エラーが見つかりました。"; - TEXT[ korean ] = "파일의 $(ARG2)(행,열) 위치에 있는 부분 문서 $(ARG1)의 형식 오류 발견"; + TEXT[ korean ] = "파일의 $(ARG2)(행,열) 위치에 있는 부분 문서 $(ARG1)의 서식 오류를 발견했습니다."; TEXT[ chinese_simplified ] = "发现文件的子文档$(ARG1)内含错误，位置在 $(ARG2)(行,列)"; TEXT[ chinese_traditional ] = "發現檔案的子文件$(ARG1)內含錯誤，位置在 $(ARG2)(行,欄)"; TEXT[ turkish ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ arabic ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ catalan ] = "S'ha descobert un error de format en el arxiu en el subdocument $(ARG1) fins al $(ARG2)(fila,col.)"; - TEXT[ finnish ] = "Tiedoston aliasiakirjan $(ARG1) kohdassa $(ARG2)(rivi,sarake) havaittiin muotoiluvirhe"; + TEXT[ finnish ] = "Tiedoston aliasiakirjan $(ARG1) kohdassa $(ARG2)(rivi,sarake) havaittiin muotoiluvirhe."; TEXT[ thai ] = "ค้นพบรูปแบบผิดพลาดในแฟ้มในเอกสารย่อย $(ARG1) ที่ $(ARG2)(แถว,คอลัมน์)"; }; String ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_UNCONVERTABLE_CHARS ) @@ -1478,12 +1478,12 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "These characters could not be exported using the chosen character encoding: $(ARG1)" ; TEXT[ english_us ] = "The following characters could not be displayed in the selected character set: $(ARG1)"; TEXT[ portuguese ] = "Foi impossvel representar os seguintes caracteres no conjunto seleccionado: $(ARG1)"; - TEXT[ russian ] = " : $(ARG1)"; + TEXT[ russian ] = " : $(ARG1)"; TEXT[ greek ] = "These characters could not be exported using the chosen character encoding: $(ARG1)"; - TEXT[ dutch ] = "De volgende tekens konden niet in de gekozen tekenset worden weergegeven: $(ARG1)"; + TEXT[ dutch ] = "De volgende tekens kunnen niet in de gekozen tekenset worden weergegeven: $(ARG1)"; TEXT[ french ] = "Impossible de reprsenter les caractres suivants dans le jeu de caractres slectionn : $(ARG1)"; TEXT[ spanish ] = "Los siguientes caracteres no se pudieron representar en el juego de caracteres seleccionado: $(ARG1)"; - TEXT[ finnish ] = "These characters could not be exported using the chosen character encoding: $(ARG1)"; + TEXT[ finnish ] = "Seuraavia merkkej ei voida nytt valitussa merkistss: $(ARG1)"; TEXT[ italian ] = "Impossibile rappresentare i caratteri seguenti con il set di caratteri selezionato: $(ARG1)"; TEXT[ danish ] = "Flgende tegn kunne ikke vises i det valgte tegnst: ($Arg1)"; TEXT[ swedish ] = "Fljande tecken gick inte att visa i den valda teckenuppsttningen: $(ARG1)"; @@ -1502,3 +1502,27 @@ Resource RID_SW_ERRHDL + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/app/makefile.mk b/sw/source/ui/app/makefile.mk index b419dcfdd9b0..acee75194580 100644 --- a/sw/source/ui/app/makefile.mk +++ b/sw/source/ui/app/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: hjs $ $Date: 2002-06-17 10:43:50 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:42:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -152,7 +152,7 @@ $(SLO)$/swmodule.obj : $(INCCOM)$/swdll0.hxx .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" $(INCCOM)$/swdll0.hxx: makefile.mk - echo #define DLL_NAME \"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ + echo \#define DLL_NAME \"$(DLLPRE)sw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ .ELSE # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" $(INCCOM)$/swdll0.hxx: makefile.mk echo #define DLL_NAME "sw$(UPD)$(DLLPOSTFIX).DLL" >$@ diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index a789017b4eb5..ab6528df5291 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -2,9 +2,9 @@ * * $RCSfile: mn.src,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:28:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,7 +121,7 @@ String MN_TAB_POPUPMENU Text[ chinese_traditional ] = "表格"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ catalan ] = "Taula"; Text[ thai ] = "ตาราง"; @@ -185,7 +185,7 @@ Menu MN_TAB_POPUPMENU HelpID = FN_SET_MODOPT_TBLNUMFMT ; Text = "Zahlen~erkennung" ; Text [ ENGLISH ] = "Number recognition" ; - Text[ english_us ] = "~Number recognition"; + Text[ english_us ] = "~Number Recognition"; Text[ portuguese ] = "~Reconhecer nmeros"; Text[ russian ] = " "; Text[ greek ] = "~ "; @@ -599,7 +599,7 @@ Menu MN_PPREVIEW_POPUPMENU Text[ arabic ] = " "; Text[ language_user1 ] = "; ????\\ ??"; Text[ greek ] = " "; - Text[ korean ] = "페이지미리보기 인쇄"; + Text[ korean ] = "인쇄"; Text[ turkish ] = "Yazdr"; Text[ catalan ] = "Imprimeix"; Text[ finnish ] = "Tulosta"; @@ -644,18 +644,18 @@ Menu MN_PPREVIEW_POPUPMENU Text[ russian ] = "Close Preview"; Text[ greek ] = "Close Preview"; Text[ dutch ] = "Close Preview"; - Text[ french ] = "Close Preview"; - Text[ spanish ] = "Close Preview"; + Text[ french ] = "Fermer l'aperu"; + Text[ spanish ] = "Cerrar Vista preliminar"; Text[ finnish ] = "Close Preview"; - Text[ italian ] = "Close Preview"; + Text[ italian ] = "Chiudi anteprima"; Text[ danish ] = "Close Preview"; - Text[ swedish ] = "Close Preview"; + Text[ swedish ] = "Stng frhandsgranskning"; Text[ polish ] = "Close Preview"; Text[ portuguese_brazilian ] = "Close Preview"; - Text[ japanese ] = "Close Preview"; + Text[ japanese ] = "プレビューを閉じる"; Text[ korean ] = "미리 보기 닫기"; - Text[ chinese_simplified ] = "Close Preview"; - Text[ chinese_traditional ] = "Close Preview"; + Text[ chinese_simplified ] = "关闭页面预览"; + Text[ chinese_traditional ] = "關閉預覽"; Text[ turkish ] = "Close Preview"; Text[ arabic ] = "Close Preview"; Text[ catalan ] = "Close Preview"; @@ -665,3 +665,5 @@ Menu MN_PPREVIEW_POPUPMENU }; + + diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 04071991b0b0..92640ed7fed7 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swmodul1.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: os $ $Date: 2002-12-04 12:20:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,9 +78,6 @@ #ifndef _SFXDISPATCH_HXX #include <sfx2/dispatch.hxx> #endif -#ifndef _SFX_HELP_HXX -#include <sfx2/sfxhelp.hxx> -#endif #ifndef _SFX_CHILDWIN_HXX #include <sfx2/childwin.hxx> #endif @@ -115,15 +112,6 @@ #ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ #include <svx/dataaccessdescriptor.hxx> #endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ -#include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ -#include <comphelper/processfactory.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #ifndef _SBASLTID_HRC //autogen #include <offmgr/sbasltid.hrc> @@ -155,9 +143,6 @@ #ifndef _SVX_BRSHITEM_HXX //autogen #include <svx/brshitem.hxx> #endif -#ifndef _SVTOOLS_TEMPLDLG_HXX -#include <svtools/templdlg.hxx> -#endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> #endif @@ -204,21 +189,12 @@ #ifndef _DOC_HXX #include <doc.hxx> #endif -#ifndef _MAILMRGE_HXX -#include "mailmrge.hxx" -#endif #ifndef _CMDID_H #include <cmdid.h> #endif #ifndef _APP_HRC #include <app.hrc> #endif -#ifndef _FLDTDLG_HXX -#include <fldtdlg.hxx> -#endif -#ifndef _DBCONFIG_HXX -#include <dbconfig.hxx> -#endif #include "helpid.h" using namespace ::rtl; @@ -228,7 +204,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::view; -using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; #define C2U(char) rtl::OUString::createFromAscii(char) @@ -579,42 +554,6 @@ SwChapterNumRules* SwModule::GetChapterNumRules() return pChapterNumRules; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -void SwModule::ExecDB(SfxRequest &rReq) -{ - const SfxItemSet *pArgs = rReq.GetArgs(); - - sal_uInt16 nSlot(rReq.GetSlot()); - - switch (nSlot) - { - case FN_QRY_MERGE: - { - SwView* pView = GetView(); - BOOL bUseCurrentDocument = 0!= pView; - BOOL bQuery = !pArgs||SFX_ITEM_SET != pArgs->GetItemState(nSlot); - if(pView && bQuery) - { - SfxViewFrame* pFrame = pView->GetViewFrame(); - SfxHelp::OpenHelpAgent( pFrame->GetFrame(), HID_MAIL_MERGE_SELECT ); - SwMailMergeCreateFromDlg* pDlg = new SwMailMergeCreateFromDlg( - &pFrame->GetWindow()); - if(RET_OK == pDlg->Execute()) - bUseCurrentDocument = pDlg->IsThisDocument(); - else - break; - } - GenerateFormLetter(bUseCurrentDocument); - } - break; - default: - ASSERT(!this, falscher Dispatcher); - return; - } -} /*-------------------------------------------------------------------- Beschreibung: Schaut nach ob's min eine View gibt @@ -966,132 +905,4 @@ void SwModule::CheckSpellChanges( sal_Bool bOnlineSpelling, // pSpell->SetSpellAllAgain( sal_False ); } } -/* -----------------27.11.2002 12:12----------------- - * - * --------------------------------------------------*/ -void SwModule::GenerateFormLetter(BOOL bUseCurrentDocument) -{ - if(bUseCurrentDocument) - { - SwView* pView = GetView(); - if(!pView) - { - DBG_ERROR("no SwView available?") - return; - } - if(!pView->GetWrtShell().IsAnyDatabaseFieldInDoc()) - { - //check availability of data sources (except biblio source) - Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); - Reference<XNameAccess> xDBContext; - if( xMgr.is() ) - { - Reference<XInterface> xInstance = xMgr->createInstance( - OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" )); - xDBContext = Reference<XNameAccess>(xInstance, UNO_QUERY) ; - } - if(!xDBContext.is()) - return ; - Sequence < OUString > aNames = xDBContext->getElementNames(); - if(!aNames.getLength() || - (1 == aNames.getLength() && - aNames.getConstArray()[0] == GetDBConfig()->GetBibliographySource().sDataSource)) - { - QueryBox aQuery( - &pView->GetViewFrame()->GetWindow(), - SW_RES(MSG_DATA_SOURCES_UNAVAILABLE)); - if(RET_OK == aQuery.Execute()) - { - pView->GetViewFrame()->GetDispatcher()->Execute( - SID_ADDRESS_DATA_SOURCE, SFX_CALLMODE_SYNCHRON); - } - else - return; - } - - - QueryBox aQuery( - &pView->GetViewFrame()->GetWindow(), - SW_RES(MSG_INS_MERGE_FIELDS)); - if(RET_OK == aQuery.Execute()) - { - //call insert fields with active database field page - SfxViewFrame* pVFrame = pView->GetViewFrame(); - if(!pVFrame->GetChildWindow( FN_INSERT_FIELD )) - pVFrame->ToggleChildWindow(FN_INSERT_FIELD); - SfxChildWindow* pChild = pVFrame->GetChildWindow( FN_INSERT_FIELD ); - SwFldDlg* pFldDlg = (SwFldDlg*)pChild->GetWindow(); - pFldDlg->ActivateDatabasePage(); - } - return; - } - else - { - // check whether the - String sSource; - if(!pView->GetWrtShell().IsFieldDataSourceAvailable(sSource)) - { - WarningBox aWarning( &pView->GetViewFrame()->GetWindow(), - SW_RES(MSG_MERGE_SOURCE_UNAVAILABLE)); - String sTmp(aWarning.GetMessText()); - sTmp.SearchAndReplaceAscii("%1", sSource); - aWarning.SetMessText(sTmp); - aWarning.Execute(); - return ; - } - } - SwNewDBMgr* pNewDBMgr = NULL; - pNewDBMgr = pView->GetWrtShell().GetNewDBMgr(); - - SwDBData aData; - SwWrtShell &rSh = pView->GetWrtShell(); - aData = rSh.GetDBData(); - rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer - // das Mischen von DB-Feldern notwendig. - GetView()->AttrChangedNotify( &rSh ); - pNewDBMgr->SetMergeType( DBMGR_MERGE ); - - if (pNewDBMgr) - { - Sequence<PropertyValue> aProperties(3); - PropertyValue* pValues = aProperties.getArray(); - pValues[0].Name = C2U("DataSourceName"); - pValues[1].Name = C2U("Command"); - pValues[2].Name = C2U("CommandType"); - pValues[0].Value <<= aData.sDataSource; - pValues[1].Value <<= aData.sCommand; - pValues[2].Value <<= aData.nCommandType; - pNewDBMgr->ExecuteFormLetter(GetView()->GetWrtShell(), - aProperties, TRUE); - } - } - else - { - //call documents and template dialog - SfxApplication* pSfxApp = SFX_APP(); - Window* pTopWin = pSfxApp->GetTopWindow(); - SvtDocumentTemplateDialog* pDocTemplDlg = new SvtDocumentTemplateDialog( pTopWin ); - pDocTemplDlg->SelectTemplateFolder(); - - int nRet = pDocTemplDlg->Execute(); - sal_Bool bNewWin = sal_False; - if ( nRet == RET_OK ) - { - if ( pTopWin != pSfxApp->GetTopWindow() ) - { - // the dialogue opens a document -> a new TopWindow appears - pTopWin = pSfxApp->GetTopWindow(); - bNewWin = sal_True; - } - } - - delete pDocTemplDlg; - if ( bNewWin ) - // after the destruction of the dialogue its parent comes to top, - // but we want that the new document is on top - pTopWin->ToTop(); - -// return; - } -} diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 35a84ee47a4b..ab505097079e 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swmodule.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2002-12-06 13:59:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -344,6 +344,10 @@ #ifndef _SVX_RUBYDLG_HXX_ #include <svx/rubydialog.hxx> #endif +// OD 14.02.2003 #107424# +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> +#endif #include <svtools/moduleoptions.hxx> @@ -444,6 +448,11 @@ SwModule::SwModule( SvFactory* pFact, // OWeakObject* ( new ScannerEventListener( this ) ), UNO_QUERY ); // } } + + // OD 14.02.2003 #107424# - init color configuration + // member <pColorConfig> is created and the color configuration is applied + // at the view options. + GetColorConfig(); } //************************************************************************ @@ -586,6 +595,7 @@ void SwDLL::RegisterControls() SvxHyperlinkDlgWrapper::RegisterChildWindow( sal_False, pMod ); SvxFontWorkChildWindow::RegisterChildWindow( sal_False, pMod ); SwFldDlgWrapper::RegisterChildWindow( sal_False, pMod ); + SwFldDataOnlyDlgWrapper::RegisterChildWindow( sal_False, pMod ); SvxContourDlgChildWindow::RegisterChildWindow( sal_False, pMod ); SwInsertChartChild::RegisterChildWindow( sal_False, pMod ); SwNavigationChild::RegisterChildWindowContext( pMod ); diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src index 24033763a2bc..c9729d49e496 100644 --- a/sw/source/ui/chrdlg/ccoll.src +++ b/sw/source/ui/chrdlg/ccoll.src @@ -2,9 +2,9 @@ * * $RCSfile: ccoll.src,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: os $ $Date: 2002-01-10 14:17:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,18 +85,19 @@ TabPage TP_CONDCOLL Text[ french ] = "Options"; Text[ spanish ] = "Opciones"; Text[ italian ] = "Opzioni"; - Text[ danish ] = "Settings"; + Text[ danish ] = "Indstillinger"; Text[ swedish ] = "Alternativ"; Text[ polish ] = "Opcje"; Text[ portuguese_brazilian ] = "Settings"; - Text[ japanese ] = "ｵﾌﾟｼｮﾝ"; + Text[ japanese ] = "オプション"; Text[ korean ] = "옵션"; Text[ chinese_simplified ] = "选项"; Text[ chinese_traditional ] = "選項"; Text[ turkish ] = "Settings"; Text[ arabic ] = ""; - Text[ catalan ] = "Opciones"; - Text[ finnish ] = "Mukauta"; + Text[ catalan ] = "Opcions"; + Text[ finnish ] = "Asetukset"; + Text[ thai ] = "ตัวเลือก"; }; CheckBox CB_CONDITION { @@ -108,7 +109,7 @@ TabPage TP_CONDCOLL Disable = TRUE ; Text [ english_us ] = "~Conditional Style" ; Text [ italian ] = "Come modello condizionato" ; - Text [ spanish ] = "C~omo estilo condicional" ; + Text [ spanish ] = "~Estilo condicional" ; Text [ french ] = "Co~mme style conditionnel" ; Text [ dutch ] = "~Als conditioneel opmaakprofiel" ; Text [ swedish ] = "som villkorlig m~all" ; @@ -116,17 +117,18 @@ TabPage TP_CONDCOLL Text [ portuguese_brazilian ] = "~Als bedingte Vorlage" ; Text [ portuguese ] = "~Estilo condicional" ; Text[ chinese_simplified ] = "当作有条件的样式(~C)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Jako warunkowy szablon"; - Text[ japanese ] = "条件付きｽﾀｲﾙとして(~C)"; + Text[ japanese ] = "条件付きスタイルとして(~C)"; Text[ chinese_traditional ] = "當作有條件的樣式(~C)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "조건적 유형(~C)"; + Text[ korean ] = "조건부 스타일(~C)"; Text[ turkish ] = "~Koullu biim olarak"; - Text[ language_user1 ] = "\"Vorlagen\" Styles are capitalized. EM15.5.00"; - Text[ catalan ] = "C~omo estilo condicional"; + Text[ language_user1 ] = "\"Vor; \"Vorlagen\" Styles are capitalized. EM15.5.00"; + Text[ catalan ] = "~Estil condicional"; Text[ finnish ] = "~Ehdollinen Tyyli"; + Text[ thai ] = "ลักษณะเ~งื่อนไข"; }; FixedText FT_CONTEXT { @@ -147,15 +149,16 @@ TabPage TP_CONDCOLL Text[ chinese_simplified ] = "上下文(~X)"; Text[ russian ] = "~"; Text[ polish ] = "Kontekst"; - Text[ japanese ] = "ｺﾝﾃｷｽﾄ(~X)"; + Text[ japanese ] = "コンテキスト(~X)"; Text[ chinese_traditional ] = "上下文(~X)"; Text[ arabic ] = ""; Text[ greek ] = ""; Text[ korean ] = "내용(~X)"; Text[ turkish ] = "Balam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Contexto"; + Text[ catalan ] = "Conte~xt"; Text[ finnish ] = "~Konteksti"; + Text[ thai ] = "บริบ~ท"; }; FixedText FT_USED { @@ -174,17 +177,18 @@ TabPage TP_CONDCOLL Text [ portuguese ] = "Estilos em uso" ; Text [ portuguese_brazilian ] = "Verwendete Vorlage" ; Text[ chinese_simplified ] = "使用的样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Uyte style"; - Text[ japanese ] = "使用するｽﾀｲﾙ"; + Text[ japanese ] = "使用するスタイル"; Text[ chinese_traditional ] = "使用的樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "유형이 적용되었습니다."; + Text[ korean ] = "사용된 스타일"; Text[ turkish ] = "Uygulanan biim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos utilizados"; - Text[ finnish ] = "K?ytetyt tyylit"; + Text[ catalan ] = "Estils aplicats"; + Text[ finnish ] = "Kytetyt tyylit"; + Text[ thai ] = "ลักษณะประยุกต์"; }; Control TB_CONDCOLLS { @@ -203,27 +207,28 @@ TabPage TP_CONDCOLL Text = "A~bsatzvorlagen" ; Text [ English ] = "Styles" ; Disable = TRUE ; - Text [ dutch ] = "~Alineaprofielen" ; + Text [ dutch ] = "~Alinea-opmaakprofielen" ; Text [ english_us ] = "~Paragraph Styles" ; Text [ italian ] = "Modelli di paragrafo" ; Text [ spanish ] = "Es~tilos de prrafo" ; - Text [ french ] = "Styles de ~paragraphe" ; + Text [ french ] = "Styles de paragraphe" ; Text [ swedish ] = "St~yckeformatmallar" ; - Text [ danish ] = "Afsnitstypografier" ; + Text [ danish ] = "A~fsnitstypografier" ; Text [ portuguese ] = "E~stilos de pargrafo" ; Text [ portuguese_brazilian ] = "Absatzvorlagen" ; Text[ chinese_simplified ] = "段落样式(~P)"; Text[ russian ] = " "; Text[ polish ] = "Style akapitu"; - Text[ japanese ] = "段落ｽﾀｲﾙ(~P)"; + Text[ japanese ] = "段落スタイル(~P)"; Text[ chinese_traditional ] = "段落樣式(~P)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "단락 서식(~P)"; + Text[ korean ] = "단락 스타일(~P)"; Text[ turkish ] = "Paragraf biimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Es~tilos de prrafo"; - Text[ finnish ] = "Paragraph Styles"; + Text[ catalan ] = "Es~tils de pargraf"; + Text[ finnish ] = "Kappale~tyylit"; + Text[ thai ] = "ลักษณะ~ย่อหน้า"; }; ListBox LB_STYLE { @@ -255,9 +260,9 @@ TabPage TP_CONDCOLL Disable = TRUE ; Text [ dutch ] = "~Verwijderen" ; Text [ english_us ] = "Re~move" ; - Text [ italian ] = "~Rimuovi" ; - Text [ spanish ] = "~Eliminar" ; - Text [ french ] = "~Supprimer" ; + Text [ italian ] = "Ri~muovi" ; + Text [ spanish ] = "~Borrar" ; + Text [ french ] = "Supprimer" ; Text [ swedish ] = "Ta ~bort" ; Text [ danish ] = "Fjern" ; Text [ portuguese ] = "~Remover" ; @@ -272,8 +277,9 @@ TabPage TP_CONDCOLL Text[ korean ] = "제거(~M)"; Text[ turkish ] = "~Kaldr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "Ex~treu"; Text[ finnish ] = "~Poista"; + Text[ thai ] = "เอาออ~ก"; }; PushButton PB_ASSIGN { @@ -286,24 +292,25 @@ TabPage TP_CONDCOLL Text [ dutch ] = "~Toewijzen" ; Text [ english_us ] = "~Apply" ; Text [ italian ] = "~Assegna" ; - Text [ spanish ] = "~Asignar" ; + Text [ spanish ] = "~Aplicar" ; Text [ french ] = "~Assigner" ; Text [ swedish ] = "Till~dela" ; Text [ danish ] = "Tildel" ; Text [ portuguese ] = "~Atribuir" ; Text [ portuguese_brazilian ] = "~Zuweisen" ; Text[ chinese_simplified ] = "指定(~A)"; - Text[ russian ] = "~"; + Text[ russian ] = "~"; Text[ polish ] = "P~rzypisz"; Text[ japanese ] = "割り当て(~A)"; Text[ chinese_traditional ] = "指定(~A)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "지정(~A)"; + Text[ korean ] = "적용(~A)"; Text[ turkish ] = "~Ata"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Asignar"; - Text[ finnish ] = "~K?yt?"; + Text[ catalan ] = "~Aplica"; + Text[ finnish ] = "K~yt"; + Text[ thai ] = "ใ~ช้"; }; StringArray STR_REGIONS { @@ -561,9 +568,9 @@ TabPage TP_CONDCOLL < "Encabezamiento de la hoja" ; > ; < "Tabla" ; > ; < "Marco" ; > ; - < "rea" ; > ; + < "Seccin" ; > ; < "Nota al pie" ; > ; - < "Nota al final" ; > ; + < "Nota final" ; > ; < "Encabezamiento" ; > ; < "Pie de pgina" ; > ; < "1 nivel del esquema" ; > ; @@ -576,16 +583,16 @@ TabPage TP_CONDCOLL < "8 nivel del esquema" ; > ; < "9 nivel del esquema" ; > ; < "10 nivel del esquema" ; > ; - < "1 nivel de la numeracin" ; > ; + < "1er nivel de la numeracin" ; > ; < "2 nivel de la numeracin" ; > ; - < "3 nivel de la numeracin" ; > ; + < "3er nivel de la numeracin" ; > ; < "4 nivel de la numeracin" ; > ; < "5 nivel de la numeracin" ; > ; < "6 nivel de la numeracin" ; > ; < "7 nivel de la numeracin" ; > ; < "8 nivel de la numeracin" ; > ; - < "9 nivel de la numeracin" ; > ; - < "10 nivel de numeracin" ; > ; + < "9 nivel de numeracin" ; > ; + < "10 nivel de la numeracin" ; > ; }; itemlist [ french ] = { @@ -628,26 +635,26 @@ TabPage TP_CONDCOLL < "Eindnoot" ; > ; < "Koptekst" ; > ; < "Voettekst" ; > ; - < "1. niveau overzicht" ; > ; - < "2. niveau overzicht" ; > ; - < "3. niveau overzicht" ; > ; - < "4. niveau overzicht" ; > ; - < "5. niveau nummering" ; > ; - < "6. niveau overzicht" ; > ; - < "7. niveau overzicht" ; > ; - < "8. niveau overzicht" ; > ; - < "9. niveau overzicht" ; > ; - < "10. niveau overzicht" ; > ; - < "1. niveau nummering" ; > ; - < "2.niveau nummering" ; > ; - < "3.niveau nummering" ; > ; - < "4. niveau nummering" ; > ; - < "5. niveau nummering" ; > ; - < "6. niveau nummering" ; > ; - < "7. niveau nummering" ; > ; - < "8. niveau nummering" ; > ; - < "9. niveau nummering" ; > ; - < "10. niveau nummering" ; > ; + < "1e niveau overzicht" ; > ; + < "2e niveau overzicht" ; > ; + < "3e niveau overzicht" ; > ; + < "4e niveau overzicht" ; > ; + < "5e niveau nummering" ; > ; + < "6e niveau overzicht" ; > ; + < "7e niveau overzicht" ; > ; + < "8e niveau overzicht" ; > ; + < "9e niveau overzicht" ; > ; + < "10e niveau overzicht" ; > ; + < "1e niveau nummering" ; > ; + < "2e niveau nummering" ; > ; + < "3e niveau nummering" ; > ; + < "4e niveau nummering" ; > ; + < "5e niveau nummering" ; > ; + < "6e niveau nummering" ; > ; + < "7e niveau nummering" ; > ; + < "8e niveau nummering" ; > ; + < "9e niveau nummering" ; > ; + < "10e niveau nummering" ; > ; }; ItemList [ chinese_simplified ] = { @@ -685,31 +692,31 @@ TabPage TP_CONDCOLL < " " ; > ; < "" ; > ; < "" ; > ; - < "" ; > ; + < "" ; > ; < "" ; > ; < " " ; > ; < " " ; > ; < " " ; > ; - < "1- " ; > ; - < "2- " ; > ; - < "3- " ; > ; - < "4- " ; > ; - < "5- " ; > ; - < "6- " ; > ; - < "7- " ; > ; - < "8- " ; > ; - < "9- " ; > ; - < "10- " ; > ; - < "1- " ; > ; - < "2- " ; > ; - < "3- " ; > ; - < "4- " ; > ; - < "5- " ; > ; - < "6- " ; > ; - < "7- " ; > ; - < "8- " ; > ; - < "9- " ; > ; - < "10- " ; > ; + < "1- " ; > ; + < "2- " ; > ; + < "3- " ; > ; + < "4- " ; > ; + < "5- " ; > ; + < "6- " ; > ; + < "7- " ; > ; + < "8- " ; > ; + < "9- " ; > ; + < "10- " ; > ; + < "1- " ; > ; + < "2- " ; > ; + < "3- " ; > ; + < "4- " ; > ; + < "5- " ; > ; + < "6- " ; > ; + < "7- " ; > ; + < "8- " ; > ; + < "9- " ; > ; + < "10- " ; > ; }; ItemList [ polish ] = { @@ -744,34 +751,34 @@ TabPage TP_CONDCOLL }; ItemList [ japanese ] = { - < "表のﾍｯﾀﾞ" ; > ; + < "表のヘッダ" ; > ; < "表" ; > ; < "枠" ; > ; < "範囲" ; > ; < "脚注" ; > ; < "文末脚注" ; > ; - < "ﾍｯﾀﾞ" ; > ; - < "ﾌｯﾀ" ; > ; - < "1ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "2ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "3ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "4ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "5ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "6ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "7ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "8ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "9ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "10ﾚﾍﾞﾙ目のｱｳﾄﾗｲﾝ" ; > ; - < "1ﾚﾍﾞﾙ目の番号付け" ; > ; - < "2ﾚﾍﾞﾙ目の番号付け" ; > ; - < "3ﾚﾍﾞﾙ目の番号付け" ; > ; - < "4ﾚﾍﾞﾙ目の番号付け" ; > ; - < "5ﾚﾍﾞﾙ目の番号付け" ; > ; - < "6ﾚﾍﾞﾙ目の番号付け" ; > ; - < "7ﾚﾍﾞﾙ目の番号付け" ; > ; - < "8ﾚﾍﾞﾙ目の番号付け" ; > ; - < "9ﾚﾍﾞﾙ目の番号付け" ; > ; - < "10ﾚﾍﾞﾙ目の番号付け" ; > ; + < "ヘッダ" ; > ; + < "フッタ" ; > ; + < "1レベル目のアウトライン" ; > ; + < "2レベル目のアウトライン" ; > ; + < "3レベル目のアウトライン" ; > ; + < "4レベル目のアウトライン" ; > ; + < "5レベル目のアウトライン" ; > ; + < "6レベル目のアウトライン" ; > ; + < "7レベル目のアウトライン" ; > ; + < "8レベル目のアウトライン" ; > ; + < "9レベル目のアウトライン" ; > ; + < "10レベル目のアウトライン" ; > ; + < "1レベル目の番号付け" ; > ; + < "2レベル目の番号付け" ; > ; + < "3レベル目の番号付け" ; > ; + < "4レベル目の番号付け" ; > ; + < "5レベル目の番号付け" ; > ; + < "6レベル目の番号付け" ; > ; + < "7レベル目の番号付け" ; > ; + < "8レベル目の番号付け" ; > ; + < "9レベル目の番号付け" ; > ; + < "10レベル目の番号付け" ; > ; }; ItemList [ chinese_traditional ] = { @@ -868,34 +875,34 @@ TabPage TP_CONDCOLL }; ItemList [ korean ] = { - < "시트 머리말" ; > ; + < "표 머리말" ; > ; < "표" ; > ; - < "테두리" ; > ; + < "프레임" ; > ; < "구역" ; > ; - < "바닥글" ; > ; + < "각주" ; > ; < "미주" ; > ; < "머리글" ; > ; < "바닥글" ; > ; - < " 1번째 다단계" ; > ; - < " 2번째 다단계" ; > ; - < " 3번째 다단계" ; > ; - < " 4번째 다단계" ; > ; - < " 5번째 다단계" ; > ; - < " 6번째 다단계" ; > ; - < " 7번째 다단계" ; > ; - < " 8번째 다단계" ; > ; - < " 9번째 다단계" ; > ; - < "10번째 다단계" ; > ; - < " 1번째 단계 번호 매기기" ; > ; - < " 2번째 단계 번호 매기기" ; > ; - < " 3번째 단계 번호 매기기" ; > ; - < " 4번째 단계 번호 매기기" ; > ; - < " 5번째 단계 번호 매기기" ; > ; - < " 6번째 단계 번호 매기기" ; > ; - < " 7번째 단계 번호 매기기" ; > ; - < " 8번째 단계 번호 매기기" ; > ; - < " 9번째 단계 번호 매기기" ; > ; - < "10번째 단계 번호 매기기" ; > ; + < "1. 개요 수준" ; > ; + < "2. 개요 수준" ; > ; + < "3. 개요 수준" ; > ; + < "4. 개요 수준" ; > ; + < "5. 개요 수준" ; > ; + < "6. 개요 수준" ; > ; + < "7. 개요 수준" ; > ; + < "8. 개요 수준" ; > ; + < "9. 개요 수준" ; > ; + < "10. 개요 수준" ; > ; + < "1번째 번호 매기기 수준" ; > ; + < "2번째 번호 매기기 수준" ; > ; + < "3번째 번호 매기기 수준" ; > ; + < "4번째 번호 매기기 수준" ; > ; + < "5번째 번호 매기기 수준" ; > ; + < "6번째 번호 매기기 수준" ; > ; + < "7번째 번호 매기기 수준" ; > ; + < "8번째 번호 매기기 수준" ; > ; + < "9번째 번호 매기기 수준" ; > ; + < "10번째 번호 매기기 수준" ; > ; }; ItemList [ turkish ] = { @@ -961,66 +968,97 @@ TabPage TP_CONDCOLL }; ItemList [ catalan ] = { - < "Encabezamiento de la hoja" ; > ; - < "Tabla" ; > ; - < "Marco" ; > ; - < "Area" ; > ; - < "Nota al pie" ; > ; - < "Nota al final" ; > ; - < "Encabezamiento" ; > ; - < "Pie de pgina" ; > ; - < "1 nivel del esquema" ; > ; - < "2 nivel del esquema" ; > ; - < "3 nivel del esquema" ; > ; - < "4 nivel del esquema" ; > ; - < "5 nivel del esquema" ; > ; - < "6 nivel del esquema" ; > ; - < "7 nivel del esquema" ; > ; - < "8 nivel del esquema" ; > ; - < "9 nivel del esquema" ; > ; - < "10 nivel del esquema" ; > ; - < "1 nivel de la numeracin" ; > ; - < "2 nivel de la numeracin" ; > ; - < "3 nivel de la numeracin" ; > ; - < "4 nivel de la numeracin" ; > ; - < "5 nivel de la numeracin" ; > ; - < "6 nivel de la numeracin" ; > ; - < "7 nivel de la numeracin" ; > ; - < "8 nivel de la numeracin" ; > ; - < "9 nivel de la numeracin" ; > ; - < "10 nivel de numeracin" ; > ; + < "Encapalament de la fulla" ; > ; + < "Taula" ; > ; + < "Marc" ; > ; + < "rea" ; > ; + < "Nota al peu" ; > ; + < "Nota final" ; > ; + < "Encapalament" ; > ; + < "Peu de pgina" ; > ; + < "1r nivell de contorn" ; > ; + < "2n nivell de contorn" ; > ; + < "3r nivell de contorn" ; > ; + < "4t nivell de contorn" ; > ; + < "5 nivell de contorn" ; > ; + < "6 nivell de contorn" ; > ; + < "7 nivell de contorn" ; > ; + < "8 nivell de contorn" ; > ; + < "9 nivell de contorn" ; > ; + < "10 nivel del esquema" ; > ; + < "1r nivell de la numeraci" ; > ; + < "2n nivell de la numeraci" ; > ; + < "3r nivell de la numeraci" ; > ; + < "4t nivell de la numeraci" ; > ; + < "5 nivell de la numeraci" ; > ; + < "6 nivell de la numeraci" ; > ; + < "7 nivell de la numeraci" ; > ; + < "8 nivell de la numeraci" ; > ; + < "9 nivell de la numeraci" ; > ; + < "10 nivell de la numeraci" ; > ; }; ItemList [ finnish ] = { - < "Taulukon yl?otsikko" ; > ; + < "Taulukon yltunniste" ; > ; < "Taulukko" ; > ; < "Kehys" ; > ; - < "Osio" ; > ; + < "Osa" ; > ; < "Alaviite" ; > ; - < "Loppuhuomautus" ; > ; - < "Yl?otsikko" ; > ; - < "Alaselite" ; > ; - < " 1. j?sennystaso" ; > ; - < " 2. j?sennystaso" ; > ; - < " 3. j?sennystaso" ; > ; - < " 4. j?sennystaso" ; > ; - < " 5. j?sennystaso" ; > ; - < " 6. j?sennystaso" ; > ; - < " 7. j?sennystaso" ; > ; - < " 8. j?sennystaso" ; > ; - < " 9. j?sennystaso" ; > ; - < "10. j?sennystaso" ; > ; + < "Loppuviite" ; > ; + < "Yltunniste" ; > ; + < "Alatunniste" ; > ; + < " 1. jsennystaso" ; > ; + < " 2. jsennystaso" ; > ; + < " 3. jsennystaso" ; > ; + < " 4. jsennystaso" ; > ; + < " 5. jsennystaso" ; > ; + < " 6. jsennystaso" ; > ; + < " 7. jsennystaso" ; > ; + < " 8. jsennystaso" ; > ; + < " 9. jsennystaso" ; > ; + < "10. jsennystaso" ; > ; < " 1. numerointitaso" ; > ; < " 2. numerointitaso" ; > ; < " 3. numerointitaso" ; > ; < " 4. numerointitaso" ; > ; < " 5. numerointitaso" ; > ; < " 6. numerointitaso" ; > ; - < " 7. j?sennystaso" ; > ; - < " 8. j?sennystaso" ; > ; - < " 9. j?sennystaso" ; > ; + < " 7. numerointitaso" ; > ; + < " 8. numerointitaso" ; > ; + < " 9. numerointitaso" ; > ; < "10. numerointitaso" ; > ; }; + ItemList [ thai ] = + { + < "ส่วนหัวตาราง" ; > ; + < "ตาราง" ; > ; + < "กรอบ" ; > ; + < "ส่วน" ; > ; + < "เชิงอรรถ" ; > ; + < "อ้างอิงท้ายเรื่อง" ; > ; + < "ส่วนหัว" ; > ; + < "ส่วนท้าย" ; > ; + < "ระดับเค้าร่างที่ 1" ; > ; + < "ระดับเค้าร่างที่ 2" ; > ; + < "ระดับเค้าร่างที่ 3" ; > ; + < "ระดับเค้าร่างที่ 4" ; > ; + < "ระดับเค้าร่างที่ 5" ; > ; + < "ระดับเค้าร่างที่ 6" ; > ; + < "ระดับเค้าร่างที่ 7" ; > ; + < "ระดับเค้าร่างที่ 8" ; > ; + < "ระดับเค้าร่างที่ 9" ; > ; + < "ระดับเค้าร่างที่ 10" ; > ; + < "ระดับลำดับตัวเลขที่ 1" ; > ; + < "ระดับลำดับตัวเลขที่ 2" ; > ; + < "ระดับลำดับตัวเลขที่ 3" ; > ; + < "ระดับลำดับตัวเลขที่ 4" ; > ; + < "ระดับลำดับตัวเลขที่ 5" ; > ; + < "ระดับลำดับตัวเลขที่ 6" ; > ; + < "ระดับลำดับตัวเลขที่ 7" ; > ; + < "ระดับลำดับตัวเลขที่ 8" ; > ; + < "ระดับลำดับตัวเลขที่ 9" ; > ; + < "ระดับลำดับตัวเลขที่ 10" ; > ; + }; }; String STR_NOTEMPL { @@ -1045,8 +1083,9 @@ TabPage TP_CONDCOLL Text[ greek ] = "<>"; Text[ korean ] = "<없음>"; Text[ turkish ] = "<yok>"; - Text[ catalan ] = "<ninguno>"; - Text[ finnish ] = "<ei mit??n>"; + Text[ catalan ] = "<cap>"; + Text[ finnish ] = "<ei mitn>"; + Text[ thai ] = "<ไม่มี>"; }; }; // ********************************************************************** EOF @@ -1065,3 +1104,12 @@ TabPage TP_CONDCOLL + + + + + + + + + diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src index be197f38ed4c..ff2de6f97762 100644 --- a/sw/source/ui/chrdlg/chardlg.src +++ b/sw/source/ui/chrdlg/chardlg.src @@ -2,9 +2,9 @@ * * $RCSfile: chardlg.src,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: os $ $Date: 2001-12-18 14:03:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,9 +74,9 @@ TabDialog DLG_CHAR Text [ italian ] = "Carattere" ; Text [ portuguese_brazilian ] = "Caractere" ; Text [ portuguese ] = "Caracteres" ; - Text [ finnish ] = "Merkki" ; + Text [ finnish ] = "Fontti" ; Text [ danish ] = "Tegn" ; - Text [ french ] = "Caractre" ; + Text [ french ] = "Caractres" ; Text [ swedish ] = "Tecken" ; Text [ dutch ] = "Teken" ; Text [ spanish ] = "Caracteres" ; @@ -115,7 +115,8 @@ TabDialog DLG_CHAR Text[ greek ] = ""; Text[ korean ] = "글꼴"; Text[ turkish ] = "Yaztipi"; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "ตัวอักษร"; }; PageItem { @@ -145,7 +146,8 @@ TabDialog DLG_CHAR Text[ greek ] = " "; Text[ korean ] = "글꼴 효과"; Text[ turkish ] = "Yaztipi efektleri"; - Text[ catalan ] = "Efectos de fuente"; + Text[ catalan ] = "Efectes de lletra"; + Text[ thai ] = "ลักษณะพิเศษของตัวอักษร"; }; PageItem { @@ -155,13 +157,13 @@ TabDialog DLG_CHAR Text [ ENGLISH ] = "Position" ; Text[ english_us ] = "Position"; Text[ portuguese ] = "Posio"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Positie"; Text[ french ] = "Position"; Text[ spanish ] = "Posicin"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Start_ved"; + Text[ danish ] = "Position"; Text[ swedish ] = "Position"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; @@ -171,8 +173,9 @@ TabDialog DLG_CHAR Text[ chinese_traditional ] = "位置"; Text[ turkish ] = "Pozisyon"; Text[ arabic ] = ""; - Text[ catalan ] = "Posicin"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; PageItem { @@ -188,18 +191,19 @@ TabDialog DLG_CHAR Text[ french ] = "Mise en page asiatique"; Text[ spanish ] = "Diseo asitico"; Text[ italian ] = "Layout asiatico"; - Text[ danish ] = "Asian layout"; + Text[ danish ] = "Asiatisk layout"; Text[ swedish ] = "Asiatisk layout"; Text[ polish ] = "Ukad azjatycki"; Text[ portuguese_brazilian ] = "Asian layout"; Text[ japanese ] = "日本語レイアウト"; - Text[ korean ] = "아시아 레이아웃"; + Text[ korean ] = "한글 글자꼴"; Text[ chinese_simplified ] = "中日韩版式"; Text[ chinese_traditional ] = "中日韓版式"; Text[ turkish ] = "Asian layout"; Text[ arabic ] = " "; - Text[ catalan ] = "Diseo asitico"; + Text[ catalan ] = "Disseny asitic"; Text[ finnish ] = "Aasialainen asettelu"; + Text[ thai ] = "เค้าโครงแบบเอเชีย"; }; PageItem { @@ -226,8 +230,9 @@ TabDialog DLG_CHAR Text[ greek ] = "-"; Text[ korean ] = "하이퍼링크"; Text[ turkish ] = "Hyperlink"; - Text[ catalan ] = "Hiperenlace"; + Text[ catalan ] = "Hiperenlla"; Text[ finnish ] = "Hyperlinkki"; + Text[ thai ] = "เชื่อมโยงหลายมิติ"; }; PageItem { @@ -257,12 +262,13 @@ TabDialog DLG_CHAR Text[ greek ] = ""; Text[ korean ] = "배경"; Text[ turkish ] = "Artalan"; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "พื้นหลัง"; }; }; }; Text[ chinese_simplified ] = "字符"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Znak"; Text[ japanese ] = "文字"; Text[ language_user1 ] = ": - -"; @@ -273,7 +279,8 @@ TabDialog DLG_CHAR Text[ greek ] = ""; Text[ korean ] = "문자"; Text[ turkish ] = "Karakter"; - Text[ catalan ] = "Caracteres"; + Text[ catalan ] = "Carcters"; + Text[ thai ] = "ตัวอักขระ"; }; TabDialog DLG_DRAWCHAR { @@ -327,7 +334,8 @@ TabDialog DLG_DRAWCHAR Text[ greek ] = ""; Text[ korean ] = "글꼴"; Text[ turkish ] = "Yaztipi"; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "ตัวอักษร"; }; }; }; @@ -342,7 +350,8 @@ TabDialog DLG_DRAWCHAR Text[ greek ] = ""; Text[ korean ] = "글꼴"; Text[ turkish ] = "Yaztipi"; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "ตัวอักษร"; }; TabPage TP_CHAR_URL { @@ -376,8 +385,9 @@ TabPage TP_CHAR_URL Text[ greek ] = "-"; Text[ korean ] = "하이퍼링크"; Text[ turkish ] = "Hyperlink"; - Text[ catalan ] = "Hiperenlace"; + Text[ catalan ] = "Hiperenlla"; Text[ finnish ] = "Hyperlinkki"; + Text[ thai ] = "เชื่อมโยงหลายมิติ"; }; FixedText FT_URL { @@ -386,9 +396,9 @@ TabPage TP_CHAR_URL Text = "U~RL" ; Text [ English ] = "U~RL" ; Text [ english_us ] = "~URL" ; - Text [ italian ] = "U~RL" ; + Text [ italian ] = "URL" ; Text [ spanish ] = "~URL" ; - Text [ french ] = "U~RL" ; + Text [ french ] = "URL" ; Text [ dutch ] = "U~RL" ; Text [ swedish ] = "U~RL" ; Text [ danish ] = "URL" ; @@ -407,6 +417,7 @@ TabPage TP_CHAR_URL Text[ turkish ] = "U~RL"; Text[ catalan ] = "~URL"; Text[ finnish ] = "~URL-osoite"; + Text[ thai ] = "~URL"; }; Edit ED_URL { @@ -427,12 +438,12 @@ TabPage TP_CHAR_URL Text [ swedish ] = "~Vlj ut..." ; Text [ danish ] = "Gennemse..." ; Text [ italian ] = "~Sfoglia..." ; - Text [ spanish ] = "~Seleccionar..." ; + Text [ spanish ] = "~Buscar..." ; Text [ french ] = "~Slectionner..." ; Text [ dutch ] = "~Selecteren..." ; Text [ portuguese ] = "~Pesquisar..." ; Text[ chinese_simplified ] = "选择(~B)..."; - Text[ russian ] = "~..."; + Text[ russian ] = "~..."; Text[ polish ] = "Przegldaj..."; Text[ japanese ] = "選択(~B)..."; Text[ chinese_traditional ] = "選擇(~B)..."; @@ -442,8 +453,9 @@ TabPage TP_CHAR_URL Text[ greek ] = "~..."; Text[ korean ] = "선택(~B)..."; Text[ turkish ] = "A~ratr..."; - Text[ catalan ] = "~Seleccionar..."; - Text[ finnish ] = "~Selaa"; + Text[ catalan ] = "~Selecciona..."; + Text[ finnish ] = "~Selaa..."; + Text[ thai ] = "เ~รียกดู..."; }; FixedText FT_TEXT { @@ -456,10 +468,10 @@ TabPage TP_CHAR_URL Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "~Tekst"; - Text[ french ] = "~Texte"; + Text[ french ] = "Texte"; Text[ spanish ] = "Texto"; Text[ italian ] = "Testo"; - Text[ danish ] = "Tekst"; + Text[ danish ] = "Te~kst"; Text[ swedish ] = "Te~xt"; Text[ polish ] = "Tekst"; Text[ portuguese_brazilian ] = "H~inweis"; @@ -469,8 +481,9 @@ TabPage TP_CHAR_URL Text[ chinese_traditional ] = "文字(~X)"; Text[ turkish ] = "B~ilgi"; Text[ arabic ] = ""; - Text[ catalan ] = "Texto"; + Text[ catalan ] = "Te~xt"; Text[ finnish ] = "Teks~ti"; + Text[ thai ] = "ข้อ~ความ"; }; Edit ED_TEXT { @@ -489,7 +502,7 @@ TabPage TP_CHAR_URL Text [ english_us ] = "~Name" ; Text [ italian ] = "~Nome" ; Text [ spanish ] = "~Nombre" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ dutch ] = "~Naam" ; Text [ swedish ] = "~Namn" ; Text [ danish ] = "Navn" ; @@ -506,8 +519,9 @@ TabPage TP_CHAR_URL Text[ greek ] = ""; Text[ korean ] = "이름(~N)"; Text[ turkish ] = "~Ad"; - Text[ catalan ] = "~Nombre"; + Text[ catalan ] = "~Nom"; Text[ finnish ] = "~Nimi"; + Text[ thai ] = "~ชื่อ"; }; Edit ED_NAME { @@ -528,12 +542,12 @@ TabPage TP_CHAR_URL Text [ swedish ] = "Ra~m" ; Text [ danish ] = "Frame" ; Text [ italian ] = "~Frame" ; - Text [ spanish ] = "~Frame" ; + Text [ spanish ] = "~Marco destino" ; Text [ french ] = "~Frame" ; Text [ dutch ] = "~Frame" ; Text [ portuguese ] = "~Frame" ; Text[ chinese_simplified ] = "框对象(~T)"; - Text[ russian ] = "~"; + Text[ russian ] = "~"; Text[ polish ] = "Frame"; Text[ japanese ] = "フレーム(~T)"; Text[ chinese_traditional ] = "訊框(~T)"; @@ -543,8 +557,9 @@ TabPage TP_CHAR_URL Text[ greek ] = ""; Text[ korean ] = "프레임(~T)"; Text[ turkish ] = "~Frame"; - Text[ catalan ] = "~Frame"; + Text[ catalan ] = "~Marc"; Text[ finnish ] = "~Kohdekehys"; + Text[ thai ] = "กรอบเ~ป้าหมาย"; }; ComboBox LB_TARGET { @@ -582,8 +597,9 @@ TabPage TP_CHAR_URL Text[ greek ] = "..."; Text[ korean ] = "이벤트(~E)..."; Text[ turkish ] = "Olaylar..."; - Text[ catalan ] = "~Acontecimientos..."; - Text[ finnish ] = "~Tapahtumat"; + Text[ catalan ] = "~Esdeveniments..."; + Text[ finnish ] = "Tapa~htumat..."; + Text[ thai ] = "เ~หตุการณ์..."; }; FixedLine FL_STYLE { @@ -601,7 +617,7 @@ TabPage TP_CHAR_URL Text [ portuguese_brazilian ] = "Zeichenvorlagen" ; Text [ portuguese ] = "Estilos de caracteres" ; Text[ chinese_simplified ] = "字符样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Style znaku"; Text[ japanese ] = "文字スタイル"; Text[ chinese_traditional ] = "字元樣式"; @@ -609,10 +625,11 @@ TabPage TP_CHAR_URL Text[ dutch ] = "Tekenopmaakprofielen"; Text[ chinese_simplified ] = "字符样式"; Text[ greek ] = " "; - Text[ korean ] = "문자 템플릿"; + Text[ korean ] = "문자 스타일"; Text[ turkish ] = "Karakter biimi"; - Text[ catalan ] = "Estilos de caracteres"; + Text[ catalan ] = "Estils de carcters"; Text[ finnish ] = "Merkkityylit"; + Text[ thai ] = "ลักษณะตัวอักขระ"; }; FixedText FT_VISITED { @@ -620,28 +637,29 @@ TabPage TP_CHAR_URL Size = MAP_APPFONT ( 73 , 8 ) ; Text = "~Besuchter Link" ; Text [ English ] = "Visited link" ; - Text [ dutch ] = "B~ezochte Link" ; + Text [ dutch ] = "B~ezochte koppeling" ; Text [ english_us ] = "~Visited links" ; - Text [ italian ] = "Per il ~sito visitato" ; - Text [ spanish ] = "Vnculos ~visitados" ; + Text [ italian ] = "Per il sito visitato" ; + Text [ spanish ] = "Enlaces ~visitados" ; Text [ french ] = "Lien ~visit" ; Text [ swedish ] = "~Anvnd lnk" ; - Text [ danish ] = "Besgt hyperlink" ; + Text [ danish ] = "B~esgt hyperlink" ; Text [ portuguese_brazilian ] = "~Besuchte Links" ; Text [ portuguese ] = "Ligao ~visitada" ; Text[ chinese_simplified ] = "已经访问过的链接(~V)"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Odwiedzone cze"; - Text[ japanese ] = "開いたことのあるリンク(~V)"; + Text[ japanese ] = "訪れたリンク(~V)"; Text[ chinese_traditional ] = "訪問過的捷徑(~V)"; Text[ arabic ] = " "; - Text[ dutch ] = "B~ezochte Link"; + Text[ dutch ] = "B~ezochte koppeling"; Text[ chinese_simplified ] = "已经访问过的链接(~V)"; Text[ greek ] = " "; Text[ korean ] = "방문한 링크(~V)"; Text[ turkish ] = "~Kullanlm hyperlink"; - Text[ catalan ] = "Vnculos ~visitados"; - Text[ finnish ] = "~K?ydyt linkit"; + Text[ catalan ] = "Enllaos ~visitats"; + Text[ finnish ] = "A~vatut linkit"; + Text[ thai ] = "ตัวเชื่อมโยงที่มาสู่"; }; ListBox LB_VISITED { @@ -661,26 +679,27 @@ TabPage TP_CHAR_URL Text [ English ] = "Unvisited link" ; Text [ english_us ] = "Unvisited ~links" ; Text [ italian ] = "Per il sito non ~visitato" ; - Text [ spanish ] = "Vnculos no v~isitados" ; - Text [ french ] = "Lien ~non visit" ; - Text [ dutch ] = "N~iet-bezochte Link" ; + Text [ spanish ] = "Enlaces no v~isitados" ; + Text [ french ] = "Lien non visit" ; + Text [ dutch ] = "N~iet-bezochte koppeling" ; Text [ swedish ] = "~Oanvnd lnk" ; - Text [ danish ] = "Ubesgt hyperlink" ; + Text [ danish ] = "Ube~sgt hyperlink" ; Text [ portuguese_brazilian ] = "~Unbesuchte Links" ; Text [ portuguese ] = "~Ligao no visitada" ; Text[ chinese_simplified ] = "尚未访问过的链接(~L)"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Nieodwiedzone cze"; - Text[ japanese ] = "開いたことのないリンク(~L)"; + Text[ japanese ] = "訪れていないリンク(~L)"; Text[ chinese_traditional ] = "未訪問過的捷徑(~L)"; Text[ arabic ] = " "; - Text[ dutch ] = "N~iet-bezochte Link"; + Text[ dutch ] = "N~iet-bezochte koppeling"; Text[ chinese_simplified ] = "尚未访问过的链接(~L)"; Text[ greek ] = " "; Text[ korean ] = "방문하지 않은 링크(~L)"; Text[ turkish ] = "Kullanl~mam hyperlink"; - Text[ catalan ] = "Vnculos no v~isitados"; - Text[ finnish ] = "~K?ym?tt??t linkit"; + Text[ catalan ] = "Enllaos no v~isitats"; + Text[ finnish ] = "Avaamattomat ~linkit"; + Text[ thai ] = "~ตัวเชื่อมโยงที่ไม่มาสู่"; }; ListBox LB_NOT_VISITED { @@ -695,3 +714,20 @@ TabPage TP_CHAR_URL }; + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src index 601d5259d401..9e7683d260a1 100644 --- a/sw/source/ui/chrdlg/chrdlg.src +++ b/sw/source/ui/chrdlg/chrdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: chrdlg.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2001-08-14 15:58:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,20 +72,21 @@ String STR_TEXTCOLL_HEADER TEXT [ danish ] = "(Afsnitstypografi: " ; TEXT [ french ] = " (Style de paragraphe : " ; TEXT [ swedish ] = "(Styckeformatmall: " ; - TEXT [ dutch ] = "(Alinea-opmaakprofiel: " ; + TEXT [ dutch ] = "(Alinea-opmaakprofiel:" ; TEXT [ spanish ] = "(Estilo de prrafo: " ; TEXT [ english_us ] = "(Paragraph Style: " ; TEXT[ chinese_simplified ] = "(段落样式： "; TEXT[ russian ] = "( : "; TEXT[ polish ] = "(Styl akapitu: "; - TEXT[ japanese ] = " (段落ｽﾀｲﾙ： "; + TEXT[ japanese ] = " (段落スタイル： "; TEXT[ chinese_traditional ] = "(段落樣式： "; TEXT[ arabic ] = "( : "; TEXT[ greek ] = "( : "; - TEXT[ korean ] = "(단락 유형: "; + TEXT[ korean ] = " (단락 스타일: "; TEXT[ turkish ] = "(Paragraf biimi: "; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(Estilo de prrafo: "; + TEXT[ catalan ] = "(Estil de pargraf: "; + TEXT[ thai ] = "(ลักษณะย่อหน้า: "; }; String STR_PAGEFMT_HEADER { @@ -99,20 +100,21 @@ String STR_PAGEFMT_HEADER TEXT [ danish ] = "(Sidetypografi: " ; TEXT [ french ] = "(Style de page : " ; TEXT [ swedish ] = "(Sidformatmall: " ; - TEXT [ dutch ] = "(Pagina-opmaakprofiel: " ; + TEXT [ dutch ] = "(Pagina-opmaakprofiel:" ; TEXT [ spanish ] = "(Estilo de pgina: " ; TEXT [ english_us ] = "(Page Style: " ; TEXT[ chinese_simplified ] = "(页面样式： "; TEXT[ russian ] = "( : "; TEXT[ polish ] = "(Styl strony: "; - TEXT[ japanese ] = " (ﾍﾟｰｼﾞｽﾀｲﾙ： "; + TEXT[ japanese ] = " (ページスタイル： "; TEXT[ chinese_traditional ] = "(頁面樣式： "; TEXT[ arabic ] = "( : "; TEXT[ greek ] = "( : "; - TEXT[ korean ] = " (쪽 유형: "; + TEXT[ korean ] = " (페이지 스타일: "; TEXT[ turkish ] = "(Sayfa biimi: "; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(Estilo de pgina: "; + TEXT[ catalan ] = "(Estil de pgina: "; + TEXT[ thai ] = "(ลักษณะหน้า: "; }; String SW_STR_NONE { @@ -130,7 +132,7 @@ String SW_STR_NONE Text [ spanish ] = "[Ninguno]" ; Text [ english_us ] = "[None]" ; Text[ chinese_simplified ] = "[无]"; - Text[ russian ] = "[]"; + Text[ russian ] = "[]"; Text[ polish ] = "[brak]"; Text[ japanese ] = "[なし]"; Text[ language_user1 ] = "? "; @@ -139,7 +141,8 @@ String SW_STR_NONE Text[ greek ] = "[]"; Text[ korean ] = "[없음]"; Text[ turkish ] = "[yok]"; - Text[ catalan ] = "[Ninguno]"; + Text[ catalan ] = "[Cap]"; + Text[ thai ] = "[ไม่มี]"; }; InfoBox MSG_ILLEGAL_PAGENUM { @@ -152,24 +155,25 @@ InfoBox MSG_ILLEGAL_PAGENUM MESSAGE [ italian ] = "Impossibile usare il numero pagina alla pagina corrente. I numeri pari possono essere usati sulle pagine sinistre, i numeri dispari sulle pagine destre." ; MESSAGE [ portuguese_brazilian ] = "N?ero de p?gina n?o pode ser aplicado ? p?gina atual. N?eros pares podem ser utilizados em p?ginas esquerdas, n?eros ?mpares em p?ginas direitas." ; MESSAGE [ portuguese ] = "Nmero de pgina no pode ser atribudo pgina actual. Nas pginas da esquerda podem apenas ser usados nmeros pares e nas pginas da direita nmeros mpares." ; - MESSAGE [ finnish ] = "Ksiteltvlle sivulle ei voi list sivunumeroita. Parillisia numeroita voi kytt vasemmanpuoleisilla sivuilla, parittomia numeroita oikeanpuoleisilla." ; + MESSAGE [ finnish ] = "Ksiteltvlle sivulle ei voi list sivunumeroa. Parillisia numeroita voi kytt vasemmanpuoleisilla sivuilla, parittomia numeroita oikeanpuoleisilla." ; MESSAGE [ danish ] = "Sidetallet kan ikke indsttes. Der m kun bruges lige sidetal p venstre side og ulige sidetal p hjre sider." ; MESSAGE [ french ] = "Le numro de page ne peut tre assign cette page. Les nombres pairs ne peuvent tre utiliss que sur des pages de gauche, les nombres impairs que sur celles de droite." ; MESSAGE [ swedish ] = "Sidnumret kan inte sttas in p den hr sidan. P vnstersidor fr bara jmna nummer anvndas, p hgersidor bara udda nummer." ; - MESSAGE [ dutch ] = "Dit paginanummer kan niet aan de actiuele pagina worden toegewezen. Linkerpagina's krijgen even nummers, rechterpagina's oneven nummers." ; + MESSAGE [ dutch ] = "Dit paginanummer kan niet aan de huidige pagina worden toegewezen. Linkerpagina's krijgen even nummers, rechterpagina's oneven nummers." ; MESSAGE [ spanish ] = "El nmero de la pgina no se puede colocar. En pginas izquierdas se pueden utilizar solo nmeros pares, en las derechas solo impares." ; MESSAGE [ english_us ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ; MESSAGE[ chinese_simplified ] = "无法设定页码。在左页上只允许采用偶数页码，在右页上只允许采用奇数页码。"; - MESSAGE[ russian ] = " . , - ."; + MESSAGE[ russian ] = " . , - ."; MESSAGE[ polish ] = "Nie mona nanie numeru stron. Na lewych stronach mona nanie tylko parzyste numery stron, na prawych tylko nieparzyste numery stron."; - MESSAGE[ japanese ] = "ﾍﾟｰｼﾞ番号は適用できません。左ﾍﾟｰｼﾞには偶数、右ﾍﾟｰｼﾞには奇数を使用します。"; + MESSAGE[ japanese ] = "ページ番号は適用できません。左ページには偶数、右ページには奇数を使用します。"; MESSAGE[ chinese_traditional ] = "無法設定頁碼。在左頁只能夠設定偶數，在右頁只能設定奇數。"; MESSAGE[ arabic ] = " . ء ."; MESSAGE[ greek ] = " . , ? "; - MESSAGE[ korean ] = "쪽 번호는 설정할 수 없습니다. 짝수 쪽 번호는 왼쪽 쪽에만 사용되고, 홀수 쪽 번호는 오른쪽 쪽에만 사용됩니다."; + MESSAGE[ korean ] = "페이지 번호는 설정할 수 없습니다. 짝수 페이지 번호는 왼쪽 페이지에만 사용되고, 홀수 페이지 번호는 오른쪽 페이지에만 사용됩니다."; MESSAGE[ turkish ] = "Sayfa numaras verilemiyor. Sol sayfalarda yalnzca ift sayfa numaralar, sa sayfalarda ise yalnzca tek sayfa numaralar kullanlabilir."; MESSAGE[ language_user1 ] = " "; - MESSAGE[ catalan ] = "El nmero de la pgina no se puede colocar. En pginas izquierdas se pueden utilizar solo nmeros pares, en las derechas solo impares."; + MESSAGE[ catalan ] = "El nmero de la pgina no es pot colocar. A les pgines esquerres noms es poden utilitzar nmeros parells, a la dreta imparells."; + MESSAGE[ thai ] = "ไม่สามารถใช้เลขหน้าไปยังหน้าปัจจุบันได้ สามารถใช้เลขคู่ในหน้าซ้ายได้, เลขคี่ในหน้าขวา"; }; @@ -178,3 +182,11 @@ InfoBox MSG_ILLEGAL_PAGENUM + + + + + + + + diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src index 37f9e1254ba1..5b0e5ee7d589 100644 --- a/sw/source/ui/chrdlg/drpcps.src +++ b/sw/source/ui/chrdlg/drpcps.src @@ -2,9 +2,9 @@ * * $RCSfile: drpcps.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2001-12-18 14:19:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,7 +115,8 @@ TabDialog DLG_DROPCAPS Text[ korean ] = "단락 첫문자 장식"; Text[ turkish ] = "Baharfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; + Text[ thai ] = "ตัวอักษรขึ้นต้นที่มีขนาดใหญ่"; }; }; }; @@ -129,7 +130,8 @@ TabDialog DLG_DROPCAPS Text[ korean ] = "단락 첫문자 장식"; Text[ turkish ] = "Baharfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; + Text[ thai ] = "ตัวอักษรขึ้นต้นที่มีขนาดใหญ่"; }; // TabPage ****************************************************************** TabPage TP_DROPCAPS @@ -162,8 +164,9 @@ TabPage TP_DROPCAPS Text[ korean ] = "단락 첫문자 장식 표시"; Text[ turkish ] = "Ba harfleri vurgula"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mostrar iniciales"; + Text[ catalan ] = "Visualitza les caplletres"; Text[ finnish ] = "Nyt anfangit"; + Text[ thai ] = "แสดงผลตัวอักษรขึ้นต้นที่มีขนาดใหญ่"; }; CheckBox CB_WORD { @@ -175,7 +178,7 @@ TabPage TP_DROPCAPS Text [ portuguese_brazilian ] = "Ganzes ~Wort" ; Text [ swedish ] = "Helt ~ord" ; Text [ danish ] = "Helt ord" ; - Text [ italian ] = "~Parola intera" ; + Text [ italian ] = "Parola intera" ; Text [ spanish ] = "Toda la pala~bra" ; Text [ french ] = "~Mot entier" ; Text [ dutch ] = "Heel ~woord" ; @@ -187,11 +190,12 @@ TabPage TP_DROPCAPS Text[ chinese_traditional ] = "整個字(~W)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "전체 단어(~W)"; + Text[ korean ] = "단어(~W)"; Text[ turkish ] = "Tam szck"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Toda la pala~bra"; + Text[ catalan ] = "~Tota la paraula"; Text[ finnish ] = "~Koko sana"; + Text[ thai ] = "คำ~ทั้งหมด"; }; FixedText FT_DROPCAPS { @@ -209,7 +213,7 @@ TabPage TP_DROPCAPS Text [ portuguese_brazilian ] = "Anzahl der Ze~ichen" ; Text [ portuguese ] = "Nmero de ~caracteres" ; Text[ chinese_simplified ] = "字符数目(~C)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Liczba znakw"; Text[ japanese ] = "文字数(~C)"; Text[ chinese_traditional ] = "字元數目(~C)"; @@ -218,8 +222,9 @@ TabPage TP_DROPCAPS Text[ korean ] = "문자 수(~C):"; Text[ turkish ] = "Karakter says"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nmero de caracteres"; - Text[ finnish ] = "~Merkkien m??r?"; + Text[ catalan ] = "~Nombre carcters"; + Text[ finnish ] = "~Merkkien mr"; + Text[ thai ] = "จำนวน~ตัวอักขระ:"; }; NumericField FLD_DROPCAPS { @@ -246,7 +251,7 @@ TabPage TP_DROPCAPS Text [ italian ] = "Righe" ; Text [ portuguese_brazilian ] = "~Linhas" ; Text [ portuguese ] = "~Linhas" ; - Text [ finnish ] = "~Viivat" ; + Text [ finnish ] = "~Rivit" ; Text [ danish ] = "Rkker" ; Text [ french ] = "~Hauteur (en lignes)" ; Text [ swedish ] = "~Rader" ; @@ -254,7 +259,7 @@ TabPage TP_DROPCAPS Text [ spanish ] = "~Lneas" ; Text [ english_us ] = "~Lines" ; Text[ chinese_simplified ] = "行(~L)"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ polish ] = "Wiersze"; Text[ japanese ] = "行(~L)"; Text[ chinese_traditional ] = "行(~L)"; @@ -263,7 +268,8 @@ TabPage TP_DROPCAPS Text[ korean ] = "선(~L)"; Text[ turkish ] = "Satr adedi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Lneas"; + Text[ catalan ] = "~Lnies"; + Text[ thai ] = "~บรรทัด"; }; NumericField FLD_LINES { @@ -290,7 +296,7 @@ TabPage TP_DROPCAPS Text [ italian ] = "D~istanza dal testo" ; Text [ portuguese_brazilian ] = "D~ist?ncia" ; Text [ portuguese ] = "~Distncia do texto" ; - Text [ finnish ] = "Et?isyys tekstiin" ; + Text [ finnish ] = "Etisyys tekstist" ; Text [ danish ] = "Afstand til tekst" ; Text [ french ] = "~cart du texte" ; Text [ swedish ] = "A~vstnd till text" ; @@ -298,16 +304,17 @@ TabPage TP_DROPCAPS Text [ spanish ] = "~Distancia hasta el texto" ; Text [ english_us ] = "Space to text" ; Text[ chinese_simplified ] = "至文字的距离"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Odstp od tekstu"; Text[ japanese ] = "テキストまでの間隔"; Text[ chinese_traditional ] = "至文字的距离"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "텍스트에 대한 간격"; + Text[ korean ] = "텍스트와의 간격"; Text[ turkish ] = "Metne uzaklk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Distancia hasta el texto"; + Text[ catalan ] = "Espai per al text"; + Text[ thai ] = "ระยะห่างข้อความ"; }; MetricField FLD_DISTANCE { @@ -353,7 +360,8 @@ TabPage TP_DROPCAPS Text[ korean ] = "설정"; Text[ turkish ] = "Ayarlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Configuracin"; + Text[ catalan ] = "Configuraci"; + Text[ thai ] = "กำหนด"; }; Control CNT_PICT { @@ -374,7 +382,7 @@ TabPage TP_DROPCAPS Text [ portuguese ] = "~Texto" ; Text [ finnish ] = "~Teksti" ; Text [ danish ] = "Initialtekst" ; - Text [ french ] = "~Autre caractre" ; + Text [ french ] = "~Texte" ; Text [ swedish ] = "Anfangs~text" ; Text [ dutch ] = "~Initialentekst" ; Text [ spanish ] = "Te~xto" ; @@ -386,10 +394,11 @@ TabPage TP_DROPCAPS Text[ chinese_traditional ] = "大寫字(~T)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "텍스트(~T)"; + Text[ korean ] = "단락 첫 문자 장식의 텍스트(~T)"; Text[ turkish ] = "Baharf metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Te~xto"; + Text[ catalan ] = "~Text"; + Text[ thai ] = "~ข้อความ"; }; Edit EDT_TEXT { @@ -411,24 +420,25 @@ TabPage TP_DROPCAPS Text [ italian ] = "Modello di carattere" ; Text [ portuguese_brazilian ] = "Es~tilo" ; Text [ portuguese ] = "Es~tilo de caracteres" ; - Text [ finnish ] = "~Merkist? tyyli" ; + Text [ finnish ] = "~Merkkityyli" ; Text [ danish ] = "Tegntypografi" ; - Text [ french ] = "~Style de caractres" ; + Text [ french ] = "Style de caractres" ; Text [ swedish ] = "Tecken~formatmall" ; Text [ dutch ] = "~Tekenopmaakprofiel" ; Text [ spanish ] = "E~stilo de carcter" ; Text [ english_us ] = "Character St~yle" ; Text[ chinese_simplified ] = "字符样式(~Y)"; - Text[ russian ] = "~ "; + Text[ russian ] = "~ "; Text[ polish ] = "Styl znaku"; Text[ japanese ] = "文字スタイル(~Y)"; Text[ chinese_traditional ] = "字元樣式(~Y)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "문자 템플릿(~Y)"; + Text[ korean ] = "문자 스타일(~Y)"; Text[ turkish ] = "Karakter ~biimi"; - Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; - Text[ catalan ] = "E~stilo de carcter"; + Text[ language_user1 ] = "All ; All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; + Text[ catalan ] = "E~stil de carcter"; + Text[ thai ] = "ลัก~ษณะตัวอักขระ"; }; ListBox BOX_TEMPLATE { @@ -463,10 +473,30 @@ TabPage TP_DROPCAPS Text[ korean ] = "내용"; Text[ turkish ] = "erik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido"; + Text[ catalan ] = "Contingut"; Text[ finnish ] = "Sislt"; + Text[ thai ] = "เนื้อหา"; }; }; // ********************************************************************** EOF + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src index 186725e6f29c..fb824e583ce5 100644 --- a/sw/source/ui/chrdlg/numpara.src +++ b/sw/source/ui/chrdlg/numpara.src @@ -2,9 +2,9 @@ * * $RCSfile: numpara.src,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: os $ $Date: 2002-11-06 10:14:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ TabPage TP_NUMPARA Text[ chinese_traditional ] = "編號樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "번호 매기기 템플릿"; + Text[ korean ] = "번호 매기기 스타일"; Text[ turkish ] = "Numaralama biimi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estil de numeraci"; @@ -196,7 +196,7 @@ TabPage TP_NUMPARA }; StringList [ finnish ] = { - < "Ei mit??n" ; > ; + < "Ei mitn" ; > ; }; StringList [ thai ] = { @@ -261,7 +261,7 @@ TabPage TP_NUMPARA Text[ turkish ] = "Bu paragraf ile yeniden bala"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Torna a comenar en aquest pargraf"; - Text[ finnish ] = "~Aloita alusta tmn kappaleen kohdalla"; + Text[ finnish ] = "A~loita alusta tmn kappaleen kohdalla"; Text[ thai ] = "เริ่~มที่ย่อหน้านี้ใหม่"; }; TriStateBox CB_NUMBER_NEW_START @@ -276,8 +276,8 @@ TabPage TP_NUMPARA Text [ portuguese_brazilian ] = "~Beginnen mit:" ; Text [ swedish ] = "~Brja med" ; Text [ danish ] = "~Begynd med" ; - Text [ italian ] = "Inizia con..." ; - Text [ spanish ] = "Empezar con" ; + Text [ italian ] = "Ini~zia con" ; + Text [ spanish ] = "~Empezar con" ; Text [ french ] = "Commencer avec" ; Text [ dutch ] = "~Beginnen met" ; Text[ chinese_simplified ] = "开始从(~S)"; @@ -333,7 +333,7 @@ TabPage TP_NUMPARA Text[ chinese_traditional ] = "行編號"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "행 번호 매기기"; + Text[ korean ] = "줄 번호 매기기"; Text[ turkish ] = "Satr numaralama"; Text[ language_user1 ] = " "; Text[ catalan ] = "Numeraci de lnies"; @@ -357,7 +357,7 @@ TabPage TP_NUMPARA Text [ dutch ] = "~De regels van deze alinea meetellen." ; Text [ portuguese ] = "~Incluir as linhas deste pargrafo" ; Text[ chinese_simplified ] = "包括这个段落的行(~I)"; - Text[ russian ] = ", "; + Text[ russian ] = " "; Text[ polish ] = "cznie z wierszami tego akapitu"; Text[ japanese ] = "この段落の行数を含める(~I)"; Text[ chinese_traditional ] = "包括這個段落的行(~I)"; @@ -387,7 +387,7 @@ TabPage TP_NUMPARA Text [ french ] = "Recommencer avec ce paragraphe" ; Text [ dutch ] = "~Bij deze alinea opnieuw beginnen" ; Text[ chinese_simplified ] = "在这个段落处重新开始(~A)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zacznij p~onownie od tego akapitu"; Text[ japanese ] = "この段落で新しく開始(~A)"; Text[ chinese_traditional ] = "從這個段落重新開始(~A)"; @@ -397,7 +397,7 @@ TabPage TP_NUMPARA Text[ turkish ] = "Bu paragraf ile yeniden bala"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna a comenar en ~aquest pargraf"; - Text[ finnish ] = "~Aloita tss kappaleessa uudestaan"; + Text[ finnish ] = "Aloi~ta alusta tmn kappaleen kohdalla"; Text[ thai ] = "เริ่~มที่ย่อหน้านี้"; }; FixedText FT_RESTART_NO @@ -427,7 +427,7 @@ TabPage TP_NUMPARA Text[ turkish ] = "~Balang deeri:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Comena ~amb:"; - Text[ finnish ] = "~Aloitus:"; + Text[ finnish ] = "Alo~itus:"; Text[ thai ] = "เ~ริ่มด้วย"; }; NumericField NF_RESTART_PARA @@ -451,3 +451,19 @@ TabPage TP_NUMPARA + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/chrdlg/paradlg.src b/sw/source/ui/chrdlg/paradlg.src index e6d9157d6646..ef21c8e36830 100644 --- a/sw/source/ui/chrdlg/paradlg.src +++ b/sw/source/ui/chrdlg/paradlg.src @@ -2,9 +2,9 @@ * * $RCSfile: paradlg.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: obo $ $Date: 2001-11-16 23:10:24 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,25 +97,26 @@ TabDialog DLG_PARA Text [ italian ] = "Paragrafo" ; Text [ portuguese_brazilian ] = "Par?grafo" ; Text [ portuguese ] = "Avanos e espaamento" ; - Text [ finnish ] = "Sisennykset ja v?lit" ; + Text [ finnish ] = "Sisennykset ja vlit" ; Text [ danish ] = "Indrykning og mellemrum" ; Text [ french ] = "Retraits et carts" ; Text [ swedish ] = "Indrag och avstnd" ; - Text [ dutch ] = "Inspringen en afstanden" ; + Text [ dutch ] = "Inspringing en afstanden" ; Text [ spanish ] = "Sangras y espacios" ; Text [ english_us ] = "Indents & Spacing" ; PageResID = TP_PARA_STD ; Text[ chinese_simplified ] = "缩进和间隔"; Text[ russian ] = " "; Text[ polish ] = "Wcicia i odstpy"; - Text[ japanese ] = "ｲﾝﾃﾞﾝﾄと行間隔"; + Text[ japanese ] = "インデントと行間隔"; Text[ chinese_traditional ] = "縮排和間隔"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "들여쓰기와 간격"; + Text[ korean ] = "들여쓰기 및 간격"; Text[ turkish ] = "Girinti ve aralklar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sangras y espacios"; + Text[ catalan ] = "Sagnats & Espaiat"; + Text[ thai ] = "ระยะเยื้องและระยะห่าง"; }; PageItem { @@ -139,11 +140,12 @@ TabDialog DLG_PARA Text[ chinese_traditional ] = "對齊"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "정렬"; + Text[ korean ] = "맞춤"; Text[ turkish ] = "Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineacin"; + Text[ catalan ] = "Alineament"; Text[ finnish ] = "Tasaus"; + Text[ thai ] = "จัดตำแหน่ง"; }; PageItem { @@ -164,7 +166,7 @@ TabDialog DLG_PARA Text [ english_us ] = "Text Flow" ; PageResID = TP_PARA_EXT ; Text[ chinese_simplified ] = "换行和分页"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Tekst"; Text[ japanese ] = "体裁"; Text[ chinese_traditional ] = "換行和分頁"; @@ -173,7 +175,8 @@ TabDialog DLG_PARA Text[ greek ] = " "; Text[ korean ] = "텍스트 흐름"; Text[ turkish ] = "Metin ak"; - Text[ catalan ] = "Flujo del texto"; + Text[ catalan ] = "Flux del text"; + Text[ thai ] = "การไหลของข้อความ"; }; PageItem { @@ -182,24 +185,25 @@ TabDialog DLG_PARA Text [ ENGLISH ] = "Asian typography" ; Text[ english_us ] = "Asian Typography"; Text[ portuguese ] = "Tipografia asitica"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Aziatische typografie"; Text[ french ] = "Typographie asiatique"; Text[ spanish ] = "Tipografa asitica"; Text[ italian ] = "Tipografia asiatica"; - Text[ danish ] = "Asian typography"; + Text[ danish ] = "Asiatisk typografi"; Text[ swedish ] = "Asiatisk typografi"; Text[ polish ] = "Typografia azjatycka"; Text[ portuguese_brazilian ] = "Asian typography"; Text[ japanese ] = "日本語文の体裁"; - Text[ korean ] = "아시아 타이포그래피"; + Text[ korean ] = "한글 입력 체계"; Text[ chinese_simplified ] = "中日韩文字"; Text[ chinese_traditional ] = "中日韓文字"; Text[ turkish ] = "Asian typography"; Text[ arabic ] = " "; - Text[ catalan ] = "Tipografa asitica"; + Text[ catalan ] = "Tipografia asitica"; Text[ finnish ] = "Aasialaiset merkit"; + Text[ thai ] = "การพิมพ์แบบเอเชีย"; }; PageItem { @@ -222,11 +226,12 @@ TabDialog DLG_PARA Text[ chinese_traditional ] = "編號"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "번호매기기"; + Text[ korean ] = "번호 매기기"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin"; + Text[ catalan ] = "Numeraci"; Text[ finnish ] = "Numerointi"; + Text[ thai ] = "ลำดับตัวเลข"; }; PageItem { @@ -248,14 +253,15 @@ TabDialog DLG_PARA Text[ chinese_simplified ] = "制表符"; Text[ russian ] = ""; Text[ polish ] = "Tabulator"; - Text[ japanese ] = "ﾀﾌﾞ"; - Text[ chinese_traditional ] = "製表符"; + Text[ japanese ] = "タブ"; + Text[ chinese_traditional ] = "定位鍵"; Text[ arabic ] = " "; Text[ greek ] = ""; Text[ korean ] = "탭"; Text[ turkish ] = "Sekmeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabulaciones"; + Text[ catalan ] = "Pestanyes"; + Text[ thai ] = "ระยะกั้น"; }; PageItem { @@ -277,14 +283,15 @@ TabDialog DLG_PARA Text[ chinese_simplified ] = "字首大写"; Text[ russian ] = ""; Text[ polish ] = "Inicjay"; - Text[ japanese ] = "ﾄﾞﾛｯﾌﾟｷｬｯﾌﾟ"; + Text[ japanese ] = "ドロップキャップ"; Text[ chinese_traditional ] = "字首大寫"; Text[ arabic ] = " "; Text[ greek ] = ""; Text[ korean ] = "단락 첫문자 장식"; Text[ turkish ] = "Baharfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; + Text[ thai ] = "ตัวอักษรขึ้นต้นที่มีขนาดใหญ่"; }; PageItem { @@ -300,7 +307,7 @@ TabDialog DLG_PARA Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; PageResID = TP_BORDER ; Text[ chinese_simplified ] = "边框"; @@ -313,7 +320,8 @@ TabDialog DLG_PARA Text[ korean ] = "테두리"; Text[ turkish ] = "Kenarlk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "เส้นขอบ"; }; PageItem { @@ -342,7 +350,8 @@ TabDialog DLG_PARA Text[ korean ] = "배경"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "พื้นหลัง"; }; }; }; @@ -356,7 +365,8 @@ TabDialog DLG_PARA Text[ korean ] = "단락"; Text[ turkish ] = "Paragraf"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Prrafo"; + Text[ catalan ] = "Pargraf"; + Text[ thai ] = "ย่อหน้า"; }; TabDialog DLG_DRAWPARA { @@ -391,7 +401,7 @@ TabDialog DLG_DRAWPARA Text [ italian ] = "Rientri e spaziature" ; Text [ portuguese_brazilian ] = "Par?grafo" ; Text [ portuguese ] = "Avanos e espaamento" ; - Text [ finnish ] = "Sisennykset ja v?lit" ; + Text [ finnish ] = "Sisennykset ja vlit" ; Text [ danish ] = "Indrykning og mellemrum" ; Text [ french ] = "Retraits et carts" ; Text [ swedish ] = "Indrag och avstnd" ; @@ -402,14 +412,15 @@ TabDialog DLG_DRAWPARA Text[ chinese_simplified ] = "缩进和间隔"; Text[ russian ] = " "; Text[ polish ] = "Wcicia i odstpy"; - Text[ japanese ] = "ｲﾝﾃﾞﾝﾄと行間隔"; + Text[ japanese ] = "インデントと行間隔"; Text[ chinese_traditional ] = "縮排和間隔"; Text[ arabic ] = " "; Text[ language_user1 ] = " "; Text[ greek ] = " "; - Text[ korean ] = "들여쓰기와 간격"; + Text[ korean ] = "들여쓰기 및 간격"; Text[ turkish ] = "Girinti ve aralklar"; - Text[ catalan ] = "Sangras y espacios"; + Text[ catalan ] = "Sagnats & Espaiat"; + Text[ thai ] = "ระยะเยื้องและระยะห่าง"; }; #if SUPD>352 PageItem @@ -437,8 +448,9 @@ TabDialog DLG_DRAWPARA Text[ korean ] = "맞춤"; Text[ turkish ] = "Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineacin"; + Text[ catalan ] = "Alineament"; Text[ finnish ] = "Tasaus"; + Text[ thai ] = "จัดตำแหน่ง"; }; #endif PageItem @@ -448,24 +460,25 @@ TabDialog DLG_DRAWPARA Text [ ENGLISH ] = "Asian typography" ; Text[ english_us ] = "Asian Typography"; Text[ portuguese ] = "Tipografia asitica"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Aziatische typografie"; Text[ french ] = "Typographie asiatique"; Text[ spanish ] = "Tipografa asitica"; Text[ italian ] = "Tipografia asiatica"; - Text[ danish ] = "Asian typography"; + Text[ danish ] = "Asiatisk typografi"; Text[ swedish ] = "Asiatisk typografi"; Text[ polish ] = "Typografia azjatycka"; Text[ portuguese_brazilian ] = "Asian typography"; Text[ japanese ] = "日本語文の体裁"; - Text[ korean ] = "아시아 타이포그래피"; + Text[ korean ] = "한글 입력 체계"; Text[ chinese_simplified ] = "中日韩文字"; Text[ chinese_traditional ] = "中日韓文字"; Text[ turkish ] = "Asian typography"; Text[ arabic ] = " "; - Text[ catalan ] = "Tipografa asitica"; + Text[ catalan ] = "Tipografia asitica"; Text[ finnish ] = "Aasialaiset merkit"; + Text[ thai ] = "การพิมพ์แบบเอเชีย"; }; PageItem { @@ -487,14 +500,15 @@ TabDialog DLG_DRAWPARA Text[ chinese_simplified ] = "制表符"; Text[ russian ] = ""; Text[ polish ] = "Tabulator"; - Text[ japanese ] = "ﾀﾌﾞ"; - Text[ chinese_traditional ] = "製表符"; + Text[ japanese ] = "タブ"; + Text[ chinese_traditional ] = "定位鍵"; Text[ arabic ] = " "; Text[ greek ] = ""; Text[ korean ] = "탭"; Text[ turkish ] = "Sekmeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabulaciones"; + Text[ catalan ] = "Pestanyes"; + Text[ thai ] = "ระยะกั้น"; }; }; }; @@ -508,7 +522,8 @@ TabDialog DLG_DRAWPARA Text[ korean ] = "단락"; Text[ turkish ] = "Paragraf"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Prrafo"; + Text[ catalan ] = "Pargraf"; + Text[ thai ] = "ย่อหน้า"; }; @@ -519,3 +534,6 @@ TabDialog DLG_DRAWPARA + + + diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src index 00d07da2453f..324600f22a6e 100644 --- a/sw/source/ui/chrdlg/swbreak.src +++ b/sw/source/ui/chrdlg/swbreak.src @@ -2,9 +2,9 @@ * * $RCSfile: swbreak.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2001-08-14 16:05:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,7 +119,7 @@ ModalDialog DLG_BREAK Text [ portuguese ] = "~Quebra de linha" ; Text [ finnish ] = "~Rivinvaihto" ; Text [ danish ] = "Linjeskift" ; - Text [ french ] = "R~envoi la ligne" ; + Text [ french ] = "Renvoi la ligne" ; Text [ swedish ] = "~Radbrytning" ; Text [ dutch ] = "~Regeleinde" ; Text [ spanish ] = "Salto de ~lnea" ; @@ -127,16 +127,17 @@ ModalDialog DLG_BREAK TabStop = TRUE ; Group = TRUE ; Text[ chinese_simplified ] = "换行(~L)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Podzia ~wierszy"; Text[ japanese ] = "改行(~L)"; Text[ chinese_traditional ] = "換行(~L)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "개행(~L)"; + Text[ korean ] = "줄 바꿈(~L)"; Text[ turkish ] = "Satr sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salto de ~lnea"; + Text[ catalan ] = "Salt de ~lnia"; + Text[ thai ] = "แบ่ง~บรรทัด"; }; RadioButton RB_PAGE { @@ -145,7 +146,7 @@ ModalDialog DLG_BREAK Text = "~Seitenumbruch" ; Text [ ENGLISH ] = "~Page break" ; Text [ norwegian ] = "~Sideskift" ; - Text [ italian ] = "In~terruzione pagina" ; + Text [ italian ] = "Interruzione pagina" ; Text [ portuguese_brazilian ] = "~Quebra de p?gina" ; Text [ portuguese ] = "~Quebra de pgina" ; Text [ finnish ] = "~Sivunvaihto" ; @@ -160,14 +161,15 @@ ModalDialog DLG_BREAK Text[ chinese_simplified ] = "换页(~P)"; Text[ russian ] = " "; Text[ polish ] = "Podzia stron"; - Text[ japanese ] = "改ﾍﾟｰｼﾞ(~P)"; + Text[ japanese ] = "改ページ(~P)"; Text[ chinese_traditional ] = "換頁(~P)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "쪽 나누기(~P)"; + Text[ korean ] = "페이지 나누기(~P)"; Text[ turkish ] = "~Sayfa sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salto de ~pgina"; + Text[ catalan ] = "Salt de ~pgina"; + Text[ thai ] = "แบ่ง~หน้า"; }; RadioButton RB_COL { @@ -179,7 +181,7 @@ ModalDialog DLG_BREAK Text [ italian ] = "Interr~uzione colonna" ; Text [ portuguese_brazilian ] = "~Quebra de coluna" ; Text [ portuguese ] = "~Quebra de coluna" ; - Text [ finnish ] = "~Sarakkeen vaihto" ; + Text [ finnish ] = "Palstan ~vaihto" ; Text [ danish ] = "Spalteskift" ; Text [ french ] = "Saut de ~colonne" ; Text [ swedish ] = "Kolumnbrytning" ; @@ -188,7 +190,7 @@ ModalDialog DLG_BREAK Text [ english_us ] = "~Column break" ; TabStop = TRUE ; Text[ chinese_simplified ] = "换栏(~C)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Podzia kolumny"; Text[ japanese ] = "改段(~C)"; Text[ chinese_traditional ] = "換欄(~C)"; @@ -197,7 +199,8 @@ ModalDialog DLG_BREAK Text[ korean ] = "열 나누기(~C)"; Text[ turkish ] = "Stun sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salto de colu~mna"; + Text[ catalan ] = "~Salt de columna"; + Text[ thai ] = "แบ่ง~คอลัมน์"; }; FixedLine FL_BREAK { @@ -223,10 +226,11 @@ ModalDialog DLG_BREAK Text[ chinese_traditional ] = "類型"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "형태"; + Text[ korean ] = "형식"; Text[ turkish ] = "Tr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo"; + Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; FixedText FT_COLL { @@ -238,9 +242,9 @@ ModalDialog DLG_BREAK Text [ italian ] = "Modello" ; Text [ portuguese_brazilian ] = "~Estilo" ; Text [ portuguese ] = "~Estilo" ; - Text [ finnish ] = "~Tyyli" ; + Text [ finnish ] = "T~yyli" ; Text [ danish ] = "Typografi" ; - Text [ french ] = "~Style" ; + Text [ french ] = "Style" ; Text [ swedish ] = "~Formatmall" ; Text [ dutch ] = "~Profiel" ; Text [ spanish ] = "~Estilo" ; @@ -248,16 +252,17 @@ ModalDialog DLG_BREAK Group = TRUE ; Left = TRUE ; Text[ chinese_simplified ] = "样式(~S)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Szablon"; - Text[ japanese ] = "ｽﾀｲﾙ(~S)"; + Text[ japanese ] = "スタイル(~S)"; Text[ chinese_traditional ] = "樣式(~S)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "유형(~S)"; + Text[ korean ] = "스타일(~S)"; Text[ turkish ] = "~Biim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Estilo"; + Text[ catalan ] = "~Estil"; + Text[ thai ] = "~ลักษณะ"; }; ListBox LB_COLL { @@ -324,7 +329,7 @@ ModalDialog DLG_BREAK }; StringList [ russian ] = { - < "[]" ; > ; + < "[]" ; > ; }; StringList [ polish ] = { @@ -360,7 +365,11 @@ ModalDialog DLG_BREAK }; StringList [ catalan ] = { - < "[Sin]" ; > ; + < "[Cap]" ; > ; + }; + StringList [ thai ] = + { + < "[ไม่มี]" ; > ; }; }; CheckBox CB_PAGENUM @@ -385,14 +394,15 @@ ModalDialog DLG_BREAK Text[ chinese_simplified ] = "更改页码(~N)"; Text[ russian ] = " "; Text[ polish ] = "Zmie numer strony"; - Text[ japanese ] = "ﾍﾟｰｼﾞ番号の変更(~N)"; + Text[ japanese ] = "ページ番号の変更(~N)"; Text[ chinese_traditional ] = "變更頁碼(~N)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "쪽 번호 변경(~N)"; + Text[ korean ] = "페이지 번호 변경(~N)"; Text[ turkish ] = "Sayfa numarasn deitir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cam~biar nmero de pgina"; + Text[ catalan ] = "Can~via nmero de pgina"; + Text[ thai ] = "เปลี่ยนเ~ลขหน้า"; }; NumericField ED_PAGENUM { @@ -419,7 +429,8 @@ ModalDialog DLG_BREAK Text[ korean ] = "나누기 삽입"; Text[ turkish ] = "Kesme ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar salto"; + Text[ catalan ] = "Insereix un salt"; + Text[ thai ] = "แทรกตัวแบ่ง"; }; @@ -428,3 +439,14 @@ ModalDialog DLG_BREAK + + + + + + + + + + + diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src index 5369c5a0a3c0..5b6ce0faf8b5 100644 --- a/sw/source/ui/config/optdlg.src +++ b/sw/source/ui/config/optdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: optdlg.src,v $ * - * $Revision: 1.87 $ + * $Revision: 1.88 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:28:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,7 +119,7 @@ TabPage TP_CONTENT_OPT Text [ ENGLISH ] = "Guides while moving" ; Text[ english_us ] = "Guides ~while moving"; Text[ portuguese ] = "G~uias ao mover"; - Text[ russian ] = " "; + Text[ russian ] = " ~ "; Text[ greek ] = " ~"; Text[ dutch ] = "Hulpli~jnen bij verplaatsen"; Text[ french ] = "Repres lors du dplacement"; @@ -158,7 +158,7 @@ TabPage TP_CONTENT_OPT Text[ polish ] = "Proste uchwyty"; Text[ portuguese_brazilian ] = "Simple control points"; Text[ japanese ] = "シンプルなハンドル(~P)"; - Text[ korean ] = "단일 핸들(~P)"; + Text[ korean ] = "단순 핸들(~P)"; Text[ chinese_simplified ] = "标准控点(~P)"; Text[ chinese_traditional ] = "標準控點(~P)"; Text[ turkish ] = "Simple control points"; @@ -246,7 +246,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "水平向捲軸(~O)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "수평 스크롤(~O)"; + Text[ korean ] = "수평 스크롤 막대(~O)"; Text[ turkish ] = "Yatay kaydrma ~ubuu"; Text[ language_user1 ] = " "; Text[ finnish ] = "Vaakavierityspalkki"; @@ -275,7 +275,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "垂直式捲軸(~V)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "수직 스크롤(~V)"; + Text[ korean ] = "수직 스크롤 막대(~V)"; Text[ turkish ] = "Di~key kaydrma ubuu"; Text[ language_user1 ] = " "; Text[ finnish ] = "Pystyvierityspalkki"; @@ -292,17 +292,17 @@ TabPage TP_CONTENT_OPT Text[ russian ] = "R~uler"; Text[ greek ] = "R~uler"; Text[ dutch ] = "R~uler"; - Text[ french ] = "R~uler"; - Text[ spanish ] = "R~uler"; + Text[ french ] = "Rgle"; + Text[ spanish ] = "R~egla"; Text[ finnish ] = "R~uler"; - Text[ italian ] = "R~uler"; + Text[ italian ] = "Rig~hello"; Text[ danish ] = "R~uler"; - Text[ swedish ] = "R~uler"; + Text[ swedish ] = "Linjal"; Text[ polish ] = "R~uler"; Text[ portuguese_brazilian ] = "R~uler"; - Text[ japanese ] = "R~uler"; + Text[ japanese ] = "ルーラ(~U)"; Text[ korean ] = "눈금자"; - Text[ chinese_simplified ] = "R~uler"; + Text[ chinese_simplified ] = "标尺(~U)"; Text[ chinese_traditional ] = "標尺"; Text[ turkish ] = "R~uler"; Text[ arabic ] = "R~uler"; @@ -431,7 +431,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "平滑捲動(~M)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "소프트 스크롤(~M)"; + Text[ korean ] = "스크롤바를 유연하게 조정(~M)"; Text[ turkish ] = "Yava kaydrma"; Text[ language_user1 ] = " "; Text[ finnish ] = "Tasainen vieritys"; @@ -463,7 +463,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "顯示"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "표시"; + Text[ korean ] = "표시할 내용"; Text[ turkish ] = "Grntle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Mostra"; @@ -495,7 +495,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "圖形和物件(~G)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "그래픽과 개체(~G)"; + Text[ korean ] = "그림 및 개체(~G)"; Text[ turkish ] = "Grafik ve nesneler"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Imatges i objectes"; @@ -571,7 +571,7 @@ TabPage TP_CONTENT_OPT Text [ swedish ] = "F~ltnamn" ; Text [ danish ] = "Feltnavne" ; Text [ italian ] = "Nome di campo" ; - Text [ spanish ] = "Nombres del campo" ; + Text [ spanish ] = "~Cdigos de campo" ; Text [ french ] = "Noms des champs" ; Text [ dutch ] = "Veldnaa~m" ; Text [ portuguese_brazilian ] = "F~eldnamen" ; @@ -583,7 +583,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "欄位名稱(~F)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "필드 코드(~F)"; + Text[ korean ] = "필드 이름(~F)"; Text[ turkish ] = "Alan adlar"; Text[ language_user1 ] = " "; Text[ finnish ] = "Kenttkoodit"; @@ -723,7 +723,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "內容"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "내용"; + Text[ korean ] = "인쇄 내용"; Text[ turkish ] = "erik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Contingut"; @@ -755,7 +755,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "圖形(~G)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽(~G)"; + Text[ korean ] = "그림(~G)"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Imatges"; @@ -809,7 +809,7 @@ TabPage TP_OPTPRINT_PAGE Text [ spanish ] = "~Dibujos" ; Text [ english_us ] = "Dra~wings" ; Text[ chinese_simplified ] = "绘图(~W)"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ polish ] = "Rysunki"; Text[ japanese ] = "図形描画(~W)"; Text[ chinese_traditional ] = "繪圖(~W)"; @@ -972,7 +972,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "左頁(~L)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "왼쪽(~L)"; + Text[ korean ] = "왼쪽 페이지(~L)"; Text[ turkish ] = "Sol sayfalar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Pgines ~esquerra"; @@ -1002,7 +1002,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "右頁(~R)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "오른쪽(~R)"; + Text[ korean ] = "오른쪽 페이지(~R)"; Text[ turkish ] = "Sa sayfalar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Pgines dre~ta"; @@ -1032,7 +1032,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "反向(~V)"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "역으로(~V)"; + Text[ korean ] = "마지막 페이지부터(~V)"; Text[ turkish ] = "Ters sra"; Text[ language_user1 ] = " "; Text[ catalan ] = "In~vertit"; @@ -1060,7 +1060,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "小手冊(~U)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "팜플렛(~U)"; + Text[ korean ] = "브로슈어(~U)"; Text[ turkish ] = "Bror"; Text[ language_user1 ] = " "; Text[ finnish ] = "Esite"; @@ -1087,7 +1087,7 @@ TabPage TP_OPTPRINT_PAGE TabStop = TRUE ; Group = TRUE ; Text[ chinese_simplified ] = "无(~N)"; - Text[ russian ] = "~"; + Text[ russian ] = "~"; Text[ polish ] = "Brak"; Text[ japanese ] = "なし(~N)"; Text[ chinese_traditional ] = "無(~N)"; @@ -1153,7 +1153,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "文件的結束位置(~M)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "문서의 끝(~M)"; + Text[ korean ] = "문서 끝(~M)"; Text[ turkish ] = "Belge ~sonu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Final del docu~ment"; @@ -1278,7 +1278,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "產生單項列印作業(~I)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "각각의 인쇄 작업만들기(~I)"; + Text[ korean ] = "개별 인쇄 작업 만들기(~I)"; Text[ turkish ] = "Bi~reysel yazdrma ileri olutur"; Text[ finnish ] = "Luo ~yksittiset tulostustyt"; Text[ catalan ] = "Crea ~tasques individuals d'impressi"; @@ -1305,7 +1305,7 @@ TabPage TP_OPTPRINT_PAGE Text[ polish ] = "Zasobnik papieru z ustaw~ie drukarki"; Text[ portuguese_brazilian ] = "da impressora ~setup"; Text[ japanese ] = "プリンタ設定の用紙トレイを使用する(~P)"; - Text[ korean ] = "프린터 설정에 따른 용지 공급(~P)"; + Text[ korean ] = "프린터 설정의 용지함을 사용(~P)"; Text[ chinese_simplified ] = "采用打印机设定的纸张来源(~P)"; Text[ chinese_traditional ] = "採用印表機設定的紙張來源(~P)"; Text[ turkish ] = "Yazc ayarlarn kullan"; @@ -1402,7 +1402,7 @@ TabPage TP_STD_FONT Text[ greek ] = " "; Text[ dutch ] = "Standaardlettertypen (%1)"; Text[ french ] = "Polices standard (%1)"; - Text[ spanish ] = "Fuentes predeterminadas (%1)"; + Text[ spanish ] = "Fuentes bsicas (%1)"; Text[ finnish ] = "Perusfontit (%1)"; Text[ italian ] = "Caratteri standard (%1)"; Text[ danish ] = "Standardskrifttyper (%1)"; @@ -1410,7 +1410,7 @@ TabPage TP_STD_FONT Text[ polish ] = "Czcionki podstawowe (%1)"; Text[ portuguese_brazilian ] = "Fontes padrao"; Text[ japanese ] = "既定のフォント(%1)"; - Text[ korean ] = "기본 글꼴"; + Text[ korean ] = "기본 글꼴 (%1)"; Text[ chinese_simplified ] = "标准字体 (%1)"; Text[ chinese_traditional ] = "標準字型 (%1)"; Text[ turkish ] = "Standart yaztipi"; @@ -1441,7 +1441,7 @@ TabPage TP_STD_FONT Text[ chinese_traditional ] = "標準(~F)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "표준(~F)"; + Text[ korean ] = "기본값(~F)"; Text[ turkish ] = "~Standart"; Text[ language_user1 ] = " "; Text[ finnish ] = "Oletus"; @@ -1473,7 +1473,7 @@ TabPage TP_STD_FONT Text[ chinese_traditional ] = "標題(~G)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "머리글(~G)"; + Text[ korean ] = "제목(~G)"; Text[ turkish ] = "~Balk"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Encapalament"; @@ -1535,7 +1535,7 @@ TabPage TP_STD_FONT Text[ chinese_traditional ] = "標籤(~A)"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "라벨(~A)"; + Text[ korean ] = "캡션(~A)"; Text[ turkish ] = "~Resim yazs"; Text[ language_user1 ] = " "; Text[ catalan ] = "L~legenda"; @@ -1688,9 +1688,9 @@ TabPage TP_STD_FONT Text[ polish ] = "Azjatyckie"; Text[ portuguese_brazilian ] = "Asian"; Text[ japanese ] = "アジア諸国語"; - Text[ korean ] = "아시아권 언어"; + Text[ korean ] = "동양권 언어"; Text[ chinese_simplified ] = "中日韩"; - Text[ chinese_traditional ] = "中日韓"; + Text[ chinese_traditional ] = "中日韓語言"; Text[ turkish ] = "Asian"; Text[ arabic ] = "Asian"; Text[ catalan ] = "Asitic"; @@ -1713,9 +1713,9 @@ TabPage TP_STD_FONT Text[ swedish ] = "CTL"; Text[ polish ] = "CTL"; Text[ japanese ] = "複合文字言語"; - Text[ korean ] = "CTL"; - Text[ chinese_simplified ] = "复杂的文字"; - Text[ chinese_traditional ] = "複雜的文字"; + Text[ korean ] = "복합 문자 언어(CTL)"; + Text[ chinese_simplified ] = "复杂的文字版式"; + Text[ chinese_traditional ] = "複雜的文字版式"; Text[ turkish ] = "CTL"; Text[ arabic ] = "CTL"; Text[ portuguese_brazilian ] = "Complexidade de scripts"; @@ -1738,7 +1738,7 @@ TabPage TP_STD_FONT Text[ polish ] = "Zachodnie"; Text[ portuguese_brazilian ] = "Western"; Text[ japanese ] = "西洋諸国語"; - Text[ korean ] = "서양어권 언어"; + Text[ korean ] = "서양권 언어"; Text[ chinese_simplified ] = "西文"; Text[ chinese_traditional ] = "西文"; Text[ turkish ] = "Western"; @@ -1765,7 +1765,7 @@ TabPage TP_OPTTABLE_PAGE Text [ English ] = "Defaults" ; Text[ english_us ] = "Default"; Text[ portuguese ] = "Padro"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ greek ] = ""; Text[ dutch ] = "Standaard"; Text[ french ] = "Par dfaut"; @@ -1776,7 +1776,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Domylnie"; Text[ portuguese_brazilian ] = "Defaults"; Text[ japanese ] = "標準"; - Text[ korean ] = "기본"; + Text[ korean ] = "기본값"; Text[ chinese_simplified ] = "标准"; Text[ chinese_traditional ] = "標準"; Text[ turkish ] = "Defaults"; @@ -1808,7 +1808,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "標題(~E)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "표제(~E)"; + Text[ korean ] = "제목(~E)"; Text[ language_user1 ] = " "; Text[ turkish ] = "Balk"; Text[ finnish ] = "O~tsikko"; @@ -1862,13 +1862,13 @@ TabPage TP_OPTTABLE_PAGE Text[ spanish ] = "No ~dividir"; Text[ english_us ] = "Do not split"; Text[ chinese_simplified ] = "不分隔"; - Text[ russian ] = " "; + Text[ russian ] = " ~"; Text[ polish ] = "Nie dziel"; Text[ japanese ] = "分割しない"; Text[ chinese_traditional ] = "不分開"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "분리하지 않음"; + Text[ korean ] = "나누지 않음"; Text[ language_user1 ] = " "; Text[ turkish ] = "Blme"; Text[ finnish ] = "l jaa"; @@ -1949,7 +1949,7 @@ TabPage TP_OPTTABLE_PAGE TabStop = TRUE ; Text[ english_us ] = "Number recognition"; Text[ portuguese ] = "R~econhecimento de nmeros"; - Text[ russian ] = " "; + Text[ russian ] = "~ "; Text[ dutch ] = "G~etalherkening"; Text[ french ] = "R~econnaissance des nombres"; Text[ spanish ] = "Reconocimiento de nmeros"; @@ -1979,7 +1979,7 @@ TabPage TP_OPTTABLE_PAGE TabStop = TRUE ; Text[ english_us ] = "Number format recognition"; Text[ portuguese ] = "Reconhecimento do ~formato numrico"; - Text[ russian ] = " "; + Text[ russian ] = " ~"; Text[ dutch ] = "Herkenning ~getalnotatie"; Text[ french ] = "Reconnaissance du format numrique"; Text[ spanish ] = "Reconocimiento del formato ~numrico"; @@ -1993,7 +1993,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "識別數字格式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "숫자 형식 인식"; + Text[ korean ] = "숫자 표기 형식 인식"; Text[ language_user1 ] = " "; Text[ turkish ] = "Say format tanma"; Text[ finnish ] = "Lukumuodon tunnistus"; @@ -2049,7 +2049,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Obsuga klawiatury"; Text[ portuguese_brazilian ] = "Keyboard handling"; Text[ japanese ] = "キーボード操作"; - Text[ korean ] = "키보드 조작"; + Text[ korean ] = "키보드 사용"; Text[ chinese_simplified ] = "键盘操作"; Text[ chinese_traditional ] = "使用鍵盤"; Text[ turkish ] = "Keyboard handling"; @@ -2078,7 +2078,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Przesu komrki"; Text[ portuguese_brazilian ] = "Shift and arrow key pressed"; Text[ japanese ] = "セルの移動"; - Text[ korean ] = "행 이동"; + Text[ korean ] = "셀 이동"; Text[ chinese_simplified ] = "移动单元格"; Text[ chinese_traditional ] = "移動儲存格"; Text[ turkish ] = "Shift and arrow key pressed"; @@ -2153,7 +2153,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "欄(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "단(~C)"; + Text[ korean ] = "열(~C)"; Text[ turkish ] = "S~tun"; Text[ language_user1 ] = " "; Text[ finnish ] = "Sarake"; @@ -2196,7 +2196,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Wstaw wiersz"; Text[ portuguese_brazilian ] = "Insert"; Text[ japanese ] = "セルの挿入"; - Text[ korean ] = "삽입"; + Text[ korean ] = "셀 삽입"; Text[ chinese_simplified ] = "插入单元格"; Text[ chinese_traditional ] = "插入儲存格"; Text[ turkish ] = "Insert"; @@ -2226,7 +2226,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "列(~W)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "줄(~W)"; + Text[ korean ] = "행(~W)"; Text[ turkish ] = "S~atr"; Text[ language_user1 ] = " "; Text[ finnish ] = "Ri~vi"; @@ -2313,7 +2313,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Efekt przesuwania"; Text[ portuguese_brazilian ] = "Behaviour while moving"; Text[ japanese ] = "サイズ変更時の作用"; - Text[ korean ] = "이동시에 움직임"; + Text[ korean ] = "크기 변경 시 작동"; Text[ chinese_simplified ] = "移动时执行的操作"; Text[ chinese_traditional ] = "移動時執行的動作"; Text[ turkish ] = "Behaviour while moving"; @@ -2373,7 +2373,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Zmiany maj wpyw tylko na obszary przylege."; Text[ portuguese_brazilian ] = "Ver?nderungen einer Zeile bzw. Spalte wirken sich nur auf den direkten Nachbarn aus"; Text[ japanese ] = "変更は隣接範囲だけに作用する"; - Text[ korean ] = "변경 사항은 직접적으로 인접한 영역에만 영향을 미칩니다."; + Text[ korean ] = "변경 사항은 인접 영역에만 작용"; Text[ chinese_simplified ] = "行列的更改只会影响到直接连接的区域。"; Text[ chinese_traditional ] = "欄列的變更僅僅會影響到直接連結的區域。"; Text[ turkish ] = "Satr ya da stunlar zerinde yaplan deiiklikler yalnzca bitiik birimleri etkiler"; @@ -2403,7 +2403,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "固定成比例(~X)"; Text[ arabic ] = "ʡ "; Text[ greek ] = ", ~"; - Text[ korean ] = "고정됨,비례(~X)"; + Text[ korean ] = "고정 비례(~X)"; Text[ turkish ] = "Sabi~t orantl"; Text[ language_user1 ] = " "; Text[ finnish ] = "Kiinte, su~hteellinen"; @@ -2432,7 +2432,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Zmiany maj wpyw na ca tabel."; Text[ portuguese_brazilian ] = "Ver?nderungen einer Zeile bzw. Spalte wirken sich auf die gesamte Tabelle aus"; Text[ japanese ] = "変更は表全体に作用する"; - Text[ korean ] = "변경 사항이 전체 시트에 적용됩니다."; + Text[ korean ] = "변경 사항이 모든 표에 적용됩니다"; Text[ chinese_simplified ] = "行列的更改会影响到整个表格。"; Text[ chinese_traditional ] = "欄列的變更會影響到整個表格"; Text[ turkish ] = "Satr ya da stunlar zerinde yaplan deiiklikler tablonun tmn etkiler"; @@ -2491,7 +2491,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Zmiany maj wpyw na rozmiar tabeli."; Text[ portuguese_brazilian ] = "Ver?nderungen einer Zeile bzw. Spalte wirken sich auf die Tabellengr?e aus"; Text[ japanese ] = "変更は表のサイズに作用する"; - Text[ korean ] = "변경 사항이 시트 크기에 적용됩니다."; + Text[ korean ] = "변경 사항이 표 크기에 적용됩니다"; Text[ chinese_simplified ] = "一行和列的更改会影响表格的大小。"; Text[ chinese_traditional ] = "一個欄列的變更會影響表格的大小"; Text[ turkish ] = "Satr ya da stunlar zerinde yaplan deiiklikler tablo boyutunu etkiler"; @@ -2533,7 +2533,7 @@ TabPage TP_OPTSHDWCRSR Text[ polish ] = "Wywietl"; Text[ portuguese_brazilian ] = "Unprintable Characters"; Text[ japanese ] = "印刷されない文字や記号の表示・非表示"; - Text[ korean ] = "단락 기호 표시"; + Text[ korean ] = "표시할 내용"; Text[ chinese_simplified ] = "显示内容"; Text[ chinese_traditional ] = "顯示內容"; Text[ turkish ] = "Yazdrlmayan karakterler"; @@ -2567,7 +2567,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "段落的結束位置(~R)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "단락 마지막(~R)"; + Text[ korean ] = "단락 끝(~R)"; Text[ turkish ] = "Paragraf sonu"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Fi de pargraf"; @@ -2651,13 +2651,13 @@ TabPage TP_OPTSHDWCRSR Text [ spanish ] = "Espacios proteg~idos" ; Text [ english_us ] = "Non-breaking s~paces" ; Text[ chinese_simplified ] = "受保护的空格字符(~P)"; - Text[ russian ] = " "; + Text[ russian ] = "~ "; Text[ polish ] = "Spacje bez podziau"; Text[ japanese ] = "保護されたスペース(~P)"; Text[ chinese_traditional ] = "受保護的空格字元(~P)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "공백 보호"; + Text[ korean ] = "줄 바꿈하지 않는 공백"; Text[ turkish ] = "Blnemez boluklar"; Text[ language_user1 ] = " "; Text[ catalan ] = "E~spais que no es poden separar"; @@ -2711,7 +2711,7 @@ TabPage TP_OPTSHDWCRSR Text [ spanish ] = "~Saltos" ; Text [ english_us ] = "Brea~ks" ; Text[ chinese_simplified ] = "换行符(~K)"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ polish ] = "Podzia~y"; Text[ japanese ] = "改行(~K)"; Text[ chinese_traditional ] = "換行符(~K)"; @@ -2810,7 +2810,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "直接定位游標"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "직접－커서"; + Text[ korean ] = "직접 조정 커서"; Text[ turkish ] = "Serbest imle"; Text[ language_user1 ] = " "; Text[ finnish ] = "Suora kohdistin"; @@ -2841,7 +2841,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "直接定位游標(~D)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "커서 위치 직접 조정(~D)"; + Text[ korean ] = "직접 조정 커서 활성(~D)"; Text[ turkish ] = "Serbest imle"; Text[ language_user1 ] = " "; Text[ finnish ] = "Suora ko~hdistin"; @@ -2931,7 +2931,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "段落左間隔(~L)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "좌측 단락여백(~L)"; + Text[ korean ] = "왼쪽 단락 여백(~L)"; Text[ turkish ] = "Sol ~paragraf kenar"; Text[ language_user1 ] = " "; Text[ finnish ] = "Kappalee~n vasen reunus "; @@ -2989,7 +2989,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "定位鍵和空格(~N)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "탭과 간격(~N)"; + Text[ korean ] = "탭 및 공백(~N)"; Text[ turkish ] = "Sekmeler ve ~boluklar"; Text[ language_user1 ] = " "; Text[ finnish ] = "Sarkaimet ~ja vlit"; @@ -3015,7 +3015,7 @@ TabPage TP_OPTSHDWCRSR Text[ polish ] = "Kursor w chronionych obszarach"; Text[ portuguese_brazilian ] = "Cursor in protected areas"; Text[ japanese ] = "保護範囲へのカーソル進入"; - Text[ korean ] = "보호된 영역의 커서"; + Text[ korean ] = "보호 영역에서 커서 설정"; Text[ chinese_simplified ] = "光标定位在保护区域"; Text[ chinese_traditional ] = "游標在保護區域之中"; Text[ turkish ] = "Cursor in protected areas"; @@ -3045,7 +3045,7 @@ TabPage TP_OPTSHDWCRSR Text[ polish ] = "Dopu"; Text[ portuguese_brazilian ] = "~Allow cursor in protected areas"; Text[ japanese ] = "許可する"; - Text[ korean ] = "허가"; + Text[ korean ] = "허용"; Text[ chinese_simplified ] = "允许"; Text[ chinese_traditional ] = "允許"; Text[ turkish ] = "mlecin korumal blmlere girmesine izin ver"; @@ -3080,3 +3080,8 @@ TabPage TP_OPTSHDWCRSR + + + + + diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src index e63c8182a410..a0342b0ecc42 100644 --- a/sw/source/ui/config/optload.src +++ b/sw/source/ui/config/optload.src @@ -2,9 +2,9 @@ * * $RCSfile: optload.src,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: kz $ $Date: 2002-09-05 19:39:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ TabPage TP_OPTLOAD_PAGE Text[ portuguese ] = "Actualizar"; Text[ russian ] = ""; Text[ greek ] = ""; - Text[ dutch ] = "Actualiseren"; + Text[ dutch ] = "Bijwerken"; Text[ french ] = "Actualisation"; Text[ spanish ] = "Actualizacin"; Text[ italian ] = "Aggiorna"; @@ -94,13 +94,14 @@ TabPage TP_OPTLOAD_PAGE Text[ polish ] = "Aktualizacja"; Text[ portuguese_brazilian ] = "Updating"; Text[ japanese ] = "更新"; - Text[ korean ] = "업데이트"; + Text[ korean ] = "업데이트 설정"; Text[ chinese_simplified ] = "更新"; Text[ chinese_traditional ] = "更新"; Text[ turkish ] = "Updating"; Text[ arabic ] = ""; Text[ finnish ] = "Pivit"; - Text[ catalan ] = "S'est actualitzant"; + Text[ catalan ] = "Actualitza"; + Text[ thai ] = "ปรับปรุง"; }; FixedText FT_LINK { @@ -112,8 +113,8 @@ TabPage TP_OPTLOAD_PAGE Text[ portuguese ] = "Actualizar ligaes ao carregar"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Koppelingen bij het laden actualiseren"; - Text[ french ] = "Actualiser les liens lors du chargement"; + Text[ dutch ] = "Koppelingen bij het laden bijwerken"; + Text[ french ] = "Actualiser les liens au chargement"; Text[ spanish ] = "Actualizar vnculos al cargar"; Text[ italian ] = "Aggiorna collegamenti durante il caricamento"; Text[ danish ] = "Opdater kder ved indlsning"; @@ -121,13 +122,14 @@ TabPage TP_OPTLOAD_PAGE Text[ polish ] = "Aktualizuj cza podczas adowania"; Text[ portuguese_brazilian ] = "Update links when loading"; Text[ japanese ] = "ドキュメント読み込み時にリンクの更新"; - Text[ korean ] = "로드시에 링크 업데이트"; + Text[ korean ] = "로드 시에 링크 업데이트"; Text[ chinese_simplified ] = "在装入时更新链接"; Text[ chinese_traditional ] = "載入時更新捷徑"; Text[ turkish ] = "Update links when loading"; Text[ arabic ] = " "; Text[ finnish ] = "Pivit linkit ladattaessa"; Text[ catalan ] = "Actualitza els enllaos en carregar"; + Text[ thai ] = "ปรับปรุงการเชื่อมโยงขณะโหลด"; }; RadioButton RB_ALWAYS { @@ -157,6 +159,7 @@ TabPage TP_OPTLOAD_PAGE Text[ language_user1 ] = " "; Text[ finnish ] = "~Aina"; Text[ catalan ] = "~Sempre"; + Text[ thai ] = "เ~สมอ"; }; RadioButton RB_REQUEST { @@ -171,7 +174,7 @@ TabPage TP_OPTLOAD_PAGE Text[ danish ] = "~P foresprgsel"; Text[ french ] = "Sur de~mande"; Text[ swedish ] = "~P begran"; - Text[ dutch ] = "Op aan~vraag"; + Text[ dutch ] = "Op aanvraa~g"; Text[ spanish ] = "A ~peticin"; Text[ english_us ] = "~On request"; Text[ chinese_simplified ] = "在询问后更新(~O)"; @@ -181,11 +184,12 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "僅在詢問後更新(~O)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "요청시에(~O)"; + Text[ korean ] = "요청하면(~O)"; Text[ turkish ] = "stek zerine"; Text[ language_user1 ] = " "; Text[ finnish ] = "~Pyynnst"; - Text[ catalan ] = "S~ota petici"; + Text[ catalan ] = "A ~petici"; + Text[ thai ] = "เ~มื่อร้องขอ"; }; RadioButton RB_NEVER { @@ -204,7 +208,7 @@ TabPage TP_OPTLOAD_PAGE Text[ spanish ] = "~Nunca"; Text[ english_us ] = "~Never"; Text[ chinese_simplified ] = "永不更新(~N)"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ polish ] = "Nigdy"; Text[ japanese ] = "しない(~N)"; Text[ chinese_traditional ] = "永不更新(~N)"; @@ -213,8 +217,9 @@ TabPage TP_OPTLOAD_PAGE Text[ korean ] = "안함(~N)"; Text[ turkish ] = "Hibir zaman"; Text[ language_user1 ] = " "; - Text[ finnish ] = "~Ei koskaan"; + Text[ finnish ] = "Ei koskaa~n"; Text[ catalan ] = "~Mai"; + Text[ thai ] = "ไ~ม่เคย"; }; FixedText FT_FIELD { @@ -226,23 +231,24 @@ TabPage TP_OPTLOAD_PAGE Text[ portuguese ] = "Automaticamente"; Text[ russian ] = ""; Text[ greek ] = " "; - Text[ dutch ] = "Velden en diagrammen actualiseren"; + Text[ dutch ] = "Velden en diagrammen bijwerken"; Text[ french ] = "Automatique"; - Text[ spanish ] = "Automtico"; - Text[ finnish ] = "Pivit automaattisesti"; + Text[ spanish ] = "Automticamente"; + Text[ finnish ] = "Automaattisesti"; Text[ italian ] = "In modo automatico"; Text[ danish ] = "Automatisk"; Text[ swedish ] = "Automatiskt"; Text[ polish ] = "Automatycznie"; Text[ portuguese_brazilian ] = "Refresh links"; Text[ japanese ] = "自動"; - Text[ korean ] = "자동으로"; + Text[ korean ] = "자동"; Text[ chinese_simplified ] = "自动"; Text[ chinese_traditional ] = "自動"; Text[ turkish ] = "Alan ve emalar"; Text[ arabic ] = " "; - Text[ catalan ] = "Automtic"; + Text[ catalan ] = "Camps i diagrames"; Text[ language_user1 ] = " "; + Text[ thai ] = "ปรับปรุงอัตโนมัติ"; }; CheckBox CB_AUTO_UPDATE_FIELDS { @@ -257,20 +263,21 @@ TabPage TP_OPTLOAD_PAGE Text[ dutch ] = "V~eldopdrachten"; Text[ french ] = "Champs"; Text[ spanish ] = "~Campos"; - Text[ finnish ] = "~Kentt"; + Text[ finnish ] = "Kent~t"; Text[ italian ] = "~Comandi di campo"; Text[ danish ] = "Fe~lter"; Text[ swedish ] = "Flt~kommandon"; Text[ polish ] = "Pola"; Text[ portuguese_brazilian ] = "Update fields automatically"; Text[ japanese ] = "フィールド(~F)"; - Text[ korean ] = "필드 명령어(~F)"; + Text[ korean ] = "필드(~F)"; Text[ chinese_simplified ] = "字段指令(~F)"; Text[ chinese_traditional ] = "欄位指令(~F)"; Text[ turkish ] = "Alan elerini otomatik olarak gncelle"; Text[ arabic ] = " "; - Text[ catalan ] = "Actualizar ~campos automticamente"; + Text[ catalan ] = "Actualitza ~camps automticament"; Text[ language_user1 ] = " "; + Text[ thai ] = "เ~ขตข้อมูล"; }; CheckBox CB_AUTO_UPDATE_CHARTS { @@ -297,8 +304,9 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "圖表(~C)"; Text[ turkish ] = "emalar otomatik olarak gncelle"; Text[ arabic ] = " "; - Text[ catalan ] = "Actualizar ~diagramas automticamente"; + Text[ catalan ] = "Actualitza ~diagrames automticament"; Text[ language_user1 ] = " "; + Text[ thai ] = "แ~ผนภูมิ"; }; FixedLine FL_CAPTION { @@ -316,7 +324,7 @@ TabPage TP_OPTLOAD_PAGE Text[ spanish ] = "Etiqueta"; Text[ english_us ] = "Caption"; Text[ chinese_simplified ] = "标签"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Etykieta"; Text[ japanese ] = "図表番号"; Text[ chinese_traditional ] = "標籤"; @@ -325,8 +333,9 @@ TabPage TP_OPTLOAD_PAGE Text[ korean ] = "캡션"; Text[ language_user1 ] = " "; Text[ turkish ] = "Resim yazs"; - Text[ finnish ] = "Kuva~otsikko"; + Text[ finnish ] = "Kuvaotsikko"; Text[ catalan ] = "Etiqueta"; + Text[ thai ] = "คำบรรยายภาพ"; }; CheckBox CB_CAPTION { @@ -341,7 +350,7 @@ TabPage TP_OPTLOAD_PAGE Text[ danish ] = "~Automatisk"; Text[ french ] = "Automatique"; Text[ swedish ] = "~Automatiskt"; - Text[ dutch ] = "~Automatisch"; + Text[ dutch ] = "A~utomatisch"; Text[ spanish ] = "~Automtico"; Text[ english_us ] = "Automatic"; Text[ chinese_simplified ] = "自动"; @@ -356,6 +365,7 @@ TabPage TP_OPTLOAD_PAGE Text[ turkish ] = "~Otomatik"; Text[ finnish ] = "Automaattinen"; Text[ catalan ] = "~Automtic"; + Text[ thai ] = "อัตโนมัติ"; }; FixedText TXT_OPTIONS { @@ -380,11 +390,12 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "選擇物件："; Text[ arabic ] = " :"; Text[ greek ] = "~ :"; - Text[ korean ] = "개체 선택"; + Text[ korean ] = "개체 선택:"; Text[ language_user1 ] = " "; Text[ turkish ] = "~Nesne seimi:"; Text[ finnish ] = "Objektin valinta:"; - Text[ catalan ] = "~Seleccin objeto:"; + Text[ catalan ] = "~Selecci objecte:"; + Text[ thai ] = "เลือกวัตถุ:"; }; PushButton PB_OPTIONS { @@ -418,6 +429,7 @@ TabPage TP_OPTLOAD_PAGE Text[ arabic ] = ""; Text[ finnish ] = "Asetukset"; Text[ catalan ] = "Parmetres"; + Text[ thai ] = "กำหนด"; }; FixedText FT_METRIC { @@ -443,10 +455,11 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "定量單位"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "수치 단위"; + Text[ korean ] = "치수 단위"; Text[ turkish ] = "l birimi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Unitat de mesura"; + Text[ thai ] = "หน่วยมาตรวัด"; }; ListBox LB_METRIC { @@ -468,22 +481,23 @@ TabPage TP_OPTLOAD_PAGE Text [ french ] = "Espace entre les tabulations"; Text [ swedish ] = "Tabulatorav~stnd"; Text [ dutch ] = "~Tabstop"; - Text [ spanish ] = "Distancia entre tabuladores"; + Text [ spanish ] = "~Espacio entre tabuladores"; Text [ english_us ] = "Tab stops"; Text[ chinese_simplified ] = "制表符间隔"; Text[ russian ] = " "; Text[ polish ] = "Tabulatory"; Text[ japanese ] = "タブ間隔"; Text [ norwegian ] = "Standard tabulatoravstand" ; - Text [ finnish ] = "Sarkainkeskeytykset" ; + Text [ finnish ] = "Sarkaimet" ; Group = TRUE ; Text[ chinese_traditional ] = "定位鍵間隔"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "탭 거리"; + Text[ korean ] = "탭 간격"; Text[ turkish ] = "Sekme dura"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia entre tabuladores"; + Text[ catalan ] = "Distncia entre tabuladors"; + Text[ thai ] = "ตัวหยุดระยะกั้น"; }; MetricField MF_TAB { @@ -523,11 +537,12 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "相容"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "호환"; + Text[ korean ] = "호환성"; Text[ turkish ] = "Uyumluluk"; Text[ language_user1 ] = " "; Text[ finnish ] = "Yhteensopivuus"; Text[ catalan ] = "Compatibilitat"; + Text[ thai ] = "ความเข้ากันได้"; }; CheckBox CB_MERGE_PARA_DIST { @@ -537,8 +552,8 @@ TabPage TP_OPTLOAD_PAGE Text [ English ] = "Add ~distances between paragraphs and tables" ; Text[ english_us ] = "Add spacing between paragraphs and tables in the current document"; Text[ portuguese ] = "Somar ~espaamento entre pargrafos e tabelas no documento activo"; - Text[ russian ] = " "; - Text[ dutch ] = "In het actuele document alle ~afstanden tussen alinea's en tabellen optellen"; + Text[ russian ] = " "; + Text[ dutch ] = "~In het huidige document alle afstanden tussen alinea's en tabellen optellen"; Text[ french ] = "Additionner les espaces entre paragraphes et tableaux dans le document actif"; Text[ spanish ] = "Sumar ~espacios de prrafos y tablas en el documento actual"; Text[ italian ] = "Aggiungi distanze tra i paragrafi e le tabelle nel documento attuale"; @@ -551,11 +566,12 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "已開啓文件的所有段落間隔及表格間隔相加"; Text[ arabic ] = " "; Text[ greek ] = " ~ "; - Text[ korean ] = "현재 문서에 있는 모든 단락의 간격과 표 간격 합산"; + Text[ korean ] = "현재 문서에서 단락과 표 사이에 있는 모든 간격을 추가"; Text[ turkish ] = "Ak belgedeki tm paragraf ve tablo aralklarn topla"; Text[ language_user1 ] = " "; Text[ finnish ] = "Lis vlit kytss olevan asiakirjan kappaleiden ja taulukoiden vliin"; - Text[ catalan ] = "Sumar ~espacios de prrafos y tablas en el documento actual"; + Text[ catalan ] = "Suma ~espais de pargrafs i taules en el document actual"; + Text[ thai ] = "เพิ่มระยะห่างระหว่างย่อหน้ากับตารางในเอกสารปัจจุบัน"; }; CheckBox CB_MERGE_PARA_DIST_PAGESTART { @@ -565,9 +581,9 @@ TabPage TP_OPTLOAD_PAGE Text [ English ] = "Add distances at the beginning of pages" ; Text[ english_us ] = "Add paragraph and table spacing at tops of pages"; Text[ portuguese ] = "A~dicionar espaos de pargrafos e tabelas no incio das pginas"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "~Alinea- en tabellenafstanden invoegen aan paginabegin."; + Text[ dutch ] = "A~linea- en tabellenafstanden invoegen aan paginabegin."; Text[ french ] = "Additionner les ~espaces entre paragraphes et tableaux en dbut de page"; Text[ spanish ] = "Su~mar espacios de tablas y prrafos en los comienzos de pginas"; Text[ italian ] = "Aggiungi distanze paragrafi e tabelle a inizio pagina."; @@ -576,14 +592,15 @@ TabPage TP_OPTLOAD_PAGE Text[ polish ] = "Dodaj odstpy od a~kapitw i tabel na pocztku stron"; Text[ portuguese_brazilian ] = "Add distances at the beginning of pages"; Text[ japanese ] = "ページの始めに段落間隔と表間隔を付ける"; - Text[ korean ] = "페이지 시작부분의 단락 간격과 표 간격 합산"; + Text[ korean ] = "페이지 시작 부분으로 단락과 표의 간격을 추가"; Text[ chinese_simplified ] = "在页首位置加入段落和表格的间隔"; Text[ chinese_traditional ] = "在頁首位置加入段落與表格之間的間隔"; Text[ arabic ] = " "; Text[ turkish ] = "Paragraf ve tablo aralklarn sayfa balarna ekle"; Text[ language_user1 ] = " "; Text[ finnish ] = "Lis kappaleiden ja taulukoiden vlit sivujen alkuun"; - Text[ catalan ] = "Su~mar espacios de tablas y prrafos a los comienzos de pginas"; + Text[ catalan ] = "Su~ma espais de taules i pargrafs a l'inici de pgines"; + Text[ thai ] = "เพิ่มระยะห่างย่อหน้าและตารางที่ส่วนบนของหน้า"; }; CheckBox CB_TAB_ALIGNMENT { @@ -595,7 +612,7 @@ TabPage TP_OPTLOAD_PAGE Text[ portuguese ] = "Alinhar posio de tabulao"; Text[ russian ] = " "; Text[ greek ] = "~ "; - Text[ dutch ] = "~Tabpositie definiren"; + Text[ dutch ] = "Ta~bpositie definiren"; Text[ french ] = "Aligner la position de tabulation"; Text[ spanish ] = "Ajustar posicin de tabulador"; Text[ italian ] = "Allinea posizione tabulazione"; @@ -604,13 +621,14 @@ TabPage TP_OPTLOAD_PAGE Text[ polish ] = "Wyrwnaj pozycj tabulatora"; Text[ portuguese_brazilian ] = "Align tab stop position"; Text[ japanese ] = "タブの位置を揃える"; - Text[ korean ] = "탭 정지 위치에 맞추기"; + Text[ korean ] = "탭 위치를 맞춤"; Text[ chinese_simplified ] = "调整制表键位置"; Text[ chinese_traditional ] = "調整定位鍵位置"; Text[ turkish ] = "Align tab stop position"; Text[ arabic ] = "Align tab stop position"; - Text[ catalan ] = "Align tab stop position"; - Text[ finnish ] = "Tasaa sarkainkeskeytyksen sijainti"; + Text[ catalan ] = "Alinia la posici d'aturada dels tabuladors"; + Text[ finnish ] = "Tasaa sarkainkohdan sijainti"; + Text[ thai ] = "จัดตำแหน่งหยุดระยะกั้น"; }; }; /**************************************************************************/ @@ -654,7 +672,7 @@ TabPage TP_OPTCAPTION_PAGE Text[ french ] = "Tableau %PRODUCTNAME Writer"; Text[ swedish ] = "Tabell %PRODUCTNAME Writer"; Text[ dutch ] = "%PRODUCTNAME Writer tabel"; - Text[ spanish ] = "%PRODUCTNAME Writer Tabla"; + Text[ spanish ] = "%PRODUCTNAME Writer - Tabla"; Text[ english_us ] = "%PRODUCTNAME Writer Table"; Text[ chinese_simplified ] = "%PRODUCTNAME Writer 表格"; Text[ russian ] = "%PRODUCTNAME Writer - "; @@ -663,11 +681,12 @@ TabPage TP_OPTCAPTION_PAGE Text[ chinese_traditional ] = "%PRODUCTNAME Writer 表格"; Text[ arabic ] = " %PRODUCTNAME Writer"; Text[ greek ] = " %PRODUCTNAME Writer"; - Text[ korean ] = "%PRODUCTNAME Writer 스프레드시트"; + Text[ korean ] = "%PRODUCTNAME Writer 표"; Text[ language_user1 ] = " "; Text[ turkish ] = "%PRODUCTNAME Writer Tablosu"; Text[ finnish ] = "%PRODUCTNAME Writer -taulukko"; - Text[ catalan ] = "%PRODUCTNAME Writer Tabla"; + Text[ catalan ] = "%PRODUCTNAME Writer Taula"; + Text[ thai ] = "ตาราง Writer %PRODUCTNAME "; }; String STR_FRAME { @@ -680,10 +699,10 @@ TabPage TP_OPTCAPTION_PAGE Text[ french ] = "Cadre %PRODUCTNAME Writer"; Text[ swedish ] = "Ram %PRODUCTNAME Writer"; Text[ dutch ] = "%PRODUCTNAME Writer kader"; - Text[ spanish ] = "%PRODUCTNAME Writer Marco"; + Text[ spanish ] = "%PRODUCTNAME Writer - Marco"; Text[ english_us ] = "%PRODUCTNAME Writer Frame"; Text[ chinese_simplified ] = "%PRODUCTNAME Writer 框"; - Text[ russian ] = "%PRODUCTNAME Writer - "; + Text[ russian ] = "%PRODUCTNAME Writer - "; Text[ polish ] = "%PRODUCTNAME Writer - Ramka"; Text[ japanese ] = "%PRODUCTNAME Writer 枠"; Text[ chinese_traditional ] = "%PRODUCTNAME Writer 訊框"; @@ -693,7 +712,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ language_user1 ] = " "; Text[ turkish ] = "%PRODUCTNAME Writer erevesi"; Text[ finnish ] = "%PRODUCTNAME Writer -kehys"; - Text[ catalan ] = "%PRODUCTNAME Writer Marco"; + Text[ catalan ] = "%PRODUCTNAME Writer Marc"; + Text[ thai ] = "กรอบ Writer %PRODUCTNAME "; }; String STR_GRAPHIC { @@ -706,20 +726,21 @@ TabPage TP_OPTCAPTION_PAGE Text[ french ] = "Image %PRODUCTNAME Writer"; Text[ swedish ] = "Grafik %PRODUCTNAME Writer"; Text[ dutch ] = "%PRODUCTNAME Writer afbeelding"; - Text[ spanish ] = "%PRODUCTNAME Writer Imagen"; + Text[ spanish ] = "%PRODUCTNAME Writer - Imagen"; Text[ english_us ] = "%PRODUCTNAME Writer Graphics"; Text[ chinese_simplified ] = "%PRODUCTNAME Writer 图形"; - Text[ russian ] = "%PRODUCTNAME Writer - "; + Text[ russian ] = "%PRODUCTNAME Writer - "; Text[ polish ] = "%PRODUCTNAME Writer - Grafika"; Text[ japanese ] = "%PRODUCTNAME Writer 図"; Text[ chinese_traditional ] = "%PRODUCTNAME Writer 圖形"; Text[ arabic ] = " %PRODUCTNAME Writer"; Text[ greek ] = " %PRODUCTNAME Writer"; - Text[ korean ] = "%PRODUCTNAME Writer 그래픽"; + Text[ korean ] = "%PRODUCTNAME Writer 그림"; Text[ language_user1 ] = " "; Text[ turkish ] = "%PRODUCTNAME Writer Grafii"; Text[ finnish ] = "%PRODUCTNAME Writer -grafiikka"; - Text[ catalan ] = "%PRODUCTNAME Writer Imagen "; + Text[ catalan ] = "%PRODUCTNAME Writer Imatge "; + Text[ thai ] = "กราฟิค Writer %PRODUCTNAME "; }; String STR_OLE { @@ -731,11 +752,11 @@ TabPage TP_OPTCAPTION_PAGE Text[ danish ] = "Yderligere OLE-objekter"; Text[ french ] = "Autres objets OLE"; Text[ swedish ] = "Andra OLE-objekt"; - Text[ dutch ] = "Meer OLE objecten"; + Text[ dutch ] = "Meer OLE-objecten"; Text[ spanish ] = "Otros objetos OLE"; Text[ english_us ] = "Further OLE objects"; Text[ chinese_simplified ] = "其它 OLE 对象"; - Text[ russian ] = " OLE"; + Text[ russian ] = " OLE "; Text[ polish ] = "Pozostae obiekty OLE"; Text[ japanese ] = "その他の OLE オブジェクト"; Text[ chinese_traditional ] = "其它 OLE 物件"; @@ -745,7 +766,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ language_user1 ] = " "; Text[ turkish ] = "Dier OLE nesneleri"; Text[ finnish ] = "Muut OLE-objektit"; - Text[ catalan ] = "Otros objetos OLE"; + Text[ catalan ] = "Objectes OLE addicionals"; + Text[ thai ] = "วัตถุ OLE เพิ่มเติม"; }; FixedText TXT_CATEGORY @@ -776,7 +798,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "범주"; Text[ language_user1 ] = " "; Text[ turkish ] = "Kategori"; - Text[ catalan ] = "~Categoria"; + Text[ catalan ] = "Categoria"; + Text[ thai ] = "ประเภท"; }; ComboBox BOX_CATEGORY { @@ -814,7 +837,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "번호 매기기(~N)"; Text[ language_user1 ] = " "; Text[ turkish ] = "Numaralama"; - Text[ catalan ] = "Nu~meracin"; + Text[ catalan ] = "Nu~meraci"; + Text[ thai ] = "~ลำดับตัวเลข"; }; ListBox BOX_FORMAT { @@ -843,16 +867,17 @@ TabPage TP_OPTCAPTION_PAGE Text [ english_us ] = "Caption" ; Left = TRUE ; Text[ chinese_simplified ] = "标签"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Etykieta"; Text[ japanese ] = "テキスト"; Text[ chinese_traditional ] = "標籤"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "라벨"; + Text[ korean ] = "캡션"; Text[ language_user1 ] = " "; Text[ turkish ] = "Resim yazs"; - Text[ catalan ] = "~Etiqueta"; + Text[ catalan ] = "Llegenda"; + Text[ thai ] = "คำบรรยายภาพ"; }; Edit EDT_TEXT { @@ -890,7 +915,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "위치"; Text[ language_user1 ] = " "; Text[ turkish ] = "Konum"; - Text[ catalan ] = "~Posicin"; + Text[ catalan ] = "~Posici"; + Text[ thai ] = "ตำแหน่ง"; }; ListBox BOX_POS { @@ -925,8 +951,9 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "수준"; Text[ language_user1 ] = " "; Text[ turkish ] = "Dzey"; - Text[ finnish ] = "Taso "; - Text[ catalan ] = "~Nivel"; + Text[ finnish ] = "Taso"; + Text[ catalan ] = "Nivell"; + Text[ thai ] = "ระดับ"; }; ListBox LB_LEVEL { @@ -989,7 +1016,7 @@ TabPage TP_OPTCAPTION_PAGE }; StringList [ russian ] = { - < "" ; > ; + < "" ; > ; }; StringList [ polish ] = { @@ -1027,6 +1054,10 @@ TabPage TP_OPTCAPTION_PAGE { < "Cap" ; > ; }; + StringList [ thai ] = + { + < "ไม่มี" ; > ; + }; }; FixedText FT_SEPARATOR { @@ -1054,7 +1085,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ language_user1 ] = " "; Text[ turkish ] = "Ayrma irt."; Text[ finnish ] = "Erotin"; - Text[ catalan ] = "~Separador"; + Text[ catalan ] = "Separador"; + Text[ thai ] = "ตัวแยก"; }; Edit ED_SEPARATOR { @@ -1098,7 +1130,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ greek ] = ""; Text[ korean ] = "설정"; Text[ turkish ] = "Ayarlar"; - Text[ catalan ] = "Parmetres"; + Text[ catalan ] = "Configuraci"; + Text[ thai ] = "กำหนด"; }; String STR_BEGINNING { @@ -1122,10 +1155,11 @@ TabPage TP_OPTCAPTION_PAGE Text[ chinese_traditional ] = "在起始位置"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "시작에"; + Text[ korean ] = "시작에서"; Text[ language_user1 ] = " "; Text[ turkish ] = "Balangta"; - Text[ catalan ] = "Al principio"; + Text[ catalan ] = "A l'inici"; + Text[ thai ] = "ที่จุดเริ่มต้น"; }; String STR_END { @@ -1139,7 +1173,7 @@ TabPage TP_OPTCAPTION_PAGE Text [ danish ] = "Ved slutningen" ; Text [ french ] = " la fin" ; Text [ swedish ] = "I slutet" ; - Text [ dutch ] = "Aan het einde" ; + Text [ dutch ] = "Aan einde" ; Text [ spanish ] = "Al final" ; Text [ english_us ] = "At the end" ; Text[ chinese_simplified ] = "在结束位置"; @@ -1149,10 +1183,11 @@ TabPage TP_OPTCAPTION_PAGE Text[ chinese_traditional ] = "在結束位置"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "마지막에"; + Text[ korean ] = "끝에서"; Text[ language_user1 ] = " "; Text[ turkish ] = "Sonda"; Text[ catalan ] = "Al final"; + Text[ thai ] = "ที่จุดสุดท้าย"; }; String STR_ABOVE { @@ -1179,7 +1214,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "위"; Text[ language_user1 ] = " "; Text[ turkish ] = "Yukarda"; - Text[ catalan ] = "Encima"; + Text[ catalan ] = "A sobre"; + Text[ thai ] = "ข้างบน"; }; String STR_CP_BELOW { @@ -1206,19 +1242,21 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "아래"; Text[ language_user1 ] = " "; Text[ turkish ] = "Aada"; - Text[ catalan ] = "Debajo"; + Text[ catalan ] = "Sota"; + Text[ thai ] = "ข้างล่าง"; }; Text[ chinese_simplified ] = "标签"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Etykieta"; Text[ japanese ] = "図表番号"; Text[ chinese_traditional ] = "標籤"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "라벨"; + Text[ korean ] = "캡션"; Text[ language_user1 ] = " "; Text[ turkish ] = "Resim yazs"; - Text[ catalan ] = "Etiqueta"; + Text[ catalan ] = "Llegenda"; + Text[ thai ] = "คำบรรยายภาพ"; }; StringArray STR_ARR_METRIC @@ -1400,7 +1438,7 @@ StringArray STR_ARR_METRIC < "" ; FUNIT_INCH ; > ; < "" ; FUNIT_FOOT ; > ; < "" ; FUNIT_MILE ; > ; - < "" ; FUNIT_PICA ; > ; + < "" ; FUNIT_PICA ; > ; < "" ; FUNIT_POINT ; > ; }; ItemList [ polish ] = @@ -1472,7 +1510,7 @@ StringArray STR_ARR_METRIC < "inch" ; FUNIT_INCH ; > ; < "feet" ; FUNIT_FOOT ; > ; < "mile" ; FUNIT_MILE ; > ; - < "표준 규격 활자" ; FUNIT_PICA ; > ; + < "파이카" ; FUNIT_PICA ; > ; < "점" ; FUNIT_POINT ; > ; }; ItemList [ turkish ] = @@ -1501,16 +1539,28 @@ StringArray STR_ARR_METRIC }; ItemList [ catalan ] = { - < "Mil?l?metre" ; FUNIT_MM ; > ; - < "Centmetre" ; FUNIT_CM ; > ; - < "Metre" ; FUNIT_M ; > ; - < "Quilmetre" ; FUNIT_KM ; > ; - < "Polzada" ; FUNIT_INCH ; > ; - < "Peu" ; FUNIT_FOOT ; > ; + < "Milmetres" ; FUNIT_MM ; > ; + < "Centmetres" ; FUNIT_CM ; > ; + < "Metres" ; FUNIT_M ; > ; + < "Kilmetres" ; FUNIT_KM ; > ; + < "Polzades" ; FUNIT_INCH ; > ; + < "Peus" ; FUNIT_FOOT ; > ; < "Milles" ; FUNIT_MILE ; > ; - < "Pica" ; FUNIT_PICA ; > ; + < "Piques" ; FUNIT_PICA ; > ; < "Punt" ; FUNIT_POINT ; > ; }; + ItemList [ thai ] = + { + < "มิลลิเมตร" ; FUNIT_MM ; > ; + < "เซ็นติเมตร" ; FUNIT_CM ; > ; + < "เมตร" ; FUNIT_M ; > ; + < "กิโลเมตร" ; FUNIT_KM ; > ; + < "นิ้ว" ; FUNIT_INCH ; > ; + < "ฟุต" ; FUNIT_FOOT ; > ; + < "ไมล์" ; FUNIT_MILE ; > ; + < "พิคา" ; FUNIT_PICA ; > ; + < "พ้อยท์" ; FUNIT_POINT ; > ; + }; }; @@ -1537,3 +1587,6 @@ ItemList [ catalan ] = + + + diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 855599f0b73e..f9d49a712205 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: optpage.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: fme $ $Date: 2002-12-10 09:42:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1080,14 +1080,15 @@ BOOL SwTableOptionsTabPage::FillItemSet( SfxItemSet& rSet ) if(pWrtShell && SwWrtShell::SEL_TBL & pWrtShell->GetSelectionType()) { pWrtShell->SetTblChgMode(eMode); + static USHORT __READONLY_DATA aInva[] = + { FN_TABLE_MODE_FIX, + FN_TABLE_MODE_FIX_PROP, + FN_TABLE_MODE_VARIABLE, + 0 + }; + pWrtShell->GetView().GetViewFrame()->GetBindings().Invalidate( aInva ); } - static USHORT __READONLY_DATA aInva[] = - { FN_TABLE_MODE_FIX, - FN_TABLE_MODE_FIX_PROP, - FN_TABLE_MODE_VARIABLE, - 0 - }; - pWrtShell->GetView().GetViewFrame()->GetBindings().Invalidate( aInva ); + bRet = TRUE; } diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src index 2fcf10dd5f9d..a66d5c2be17c 100644 --- a/sw/source/ui/config/redlopt.src +++ b/sw/source/ui/config/redlopt.src @@ -2,9 +2,9 @@ * * $RCSfile: redlopt.src,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: rt $ $Date: 2001-11-16 22:58:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,7 +92,7 @@ TabPage TP_REDLINE_OPT Text [ danish ] = "Tekstvisning" ; Text [ italian ] = "Rappresentazione testo" ; Text [ spanish ] = "Ver texto" ; - Text [ french ] = "Reprsentation du texte" ; + Text [ french ] = "Affichage du texte" ; Text [ dutch ] = "Tekstweergave" ; Text[ chinese_simplified ] = "文字显示"; Text[ russian ] = " "; @@ -104,8 +104,9 @@ TabPage TP_REDLINE_OPT Text[ korean ] = "텍스트 표시"; Text[ turkish ] = "Metin grnm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ver texto"; + Text[ catalan ] = "Visualitzaci del text"; Text[ finnish ] = "Tekstin nytt"; + Text[ thai ] = "แสดงผลข้อความ"; }; FixedText FT_CHG_INSERT { @@ -115,14 +116,14 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Insert" ; Text[ english_us ] = "Insertions"; Text[ portuguese ] = "Inserir"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; - Text[ dutch ] = "Insert"; + Text[ dutch ] = "Invoegen"; Text[ french ] = "Insrer"; Text[ spanish ] = "Insertar"; - Text[ finnish ] = "Insert"; + Text[ finnish ] = "Lisykset"; Text[ italian ] = "Inserisci"; - Text[ danish ] = "Insert"; + Text[ danish ] = "St ind"; Text[ swedish ] = "Infoga"; Text[ polish ] = "Wstaw"; Text[ portuguese_brazilian ] = "Insert"; @@ -132,7 +133,8 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "插入"; Text[ turkish ] = "Insert"; Text[ arabic ] = "Insert"; - Text[ catalan ] = "Insert"; + Text[ catalan ] = "Insereix"; + Text[ thai ] = "แทรก"; }; FixedText FT_INS_ATTR { @@ -142,14 +144,14 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Attributes" ; Text[ english_us ] = "Attributes"; Text[ portuguese ] = "A~tributos"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ greek ] = "~"; - Text[ dutch ] = "~Attributen"; + Text[ dutch ] = "Attri~buten"; Text[ french ] = "A~ttributs"; - Text[ spanish ] = "~Atributos"; + Text[ spanish ] = "Atributos"; Text[ italian ] = "Attributi"; - Text[ danish ] = "Attributes"; - Text[ swedish ] = "A~ttribut"; + Text[ danish ] = "Attri~butter"; + Text[ swedish ] = "~Attribut"; Text[ polish ] = "Atrybuty"; Text[ portuguese_brazilian ] = "Attributes"; Text[ japanese ] = "属性"; @@ -158,8 +160,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "屬性"; Text[ turkish ] = "Attributes"; Text[ arabic ] = ""; - Text[ catalan ] = "Attributes"; + Text[ catalan ] = "Atributs"; Text[ finnish ] = "Mritteet"; + Text[ thai ] = "คุณลักษณะ"; }; ListBox LB_INS_ATTR { @@ -211,17 +214,17 @@ TabPage TP_REDLINE_OPT }; StringList [ language_user1 ] = { - < "[Keine]" ; > ; + < "[Kei; [Keine]" ; > ; < "Fett" ; > ; - < "Kursiv" ; > ; - < "Unterstrichen" ; > ; - < "Doppelt unterstrichen" ; > ; - < "Durchstreichen" ; > ; - < "Versalien" ; > ; - < "Gemeine" ; > ; - < "Kapitlchen" ; > ; - < "Titelschrift" ; > ; - < "Hintergrundfarbe" ; > ; + < "Kurs; Kursiv" ; > ; + < "Unte; Unterstrichen" ; > ; + < "Dopp; Doppelt unterstrichen" ; > ; + < "Durc; Durchstreichen" ; > ; + < "Vers; Versalien" ; > ; + < "Geme; Gemeine" ; > ; + < "Kapi; Kapitlchen" ; > ; + < "Tite; Titelschrift" ; > ; + < "Hint; Hintergrundfarbe" ; > ; }; StringList [ portuguese ] = { @@ -239,12 +242,12 @@ TabPage TP_REDLINE_OPT }; StringList [ russian ] = { - < "[]" ; > ; + < "[]" ; > ; < "" ; > ; < "" ; > ; < "" ; > ; < " " ; > ; - < "" ; > ; + < "" ; > ; < "" ; > ; < "" ; > ; < "" ; > ; @@ -276,7 +279,7 @@ TabPage TP_REDLINE_OPT < "Hoofdletters" ; > ; < "Kleine letters" ; > ; < "Klein-kapitaal" ; > ; - < "Letterype titel" ; > ; + < "Lettertype titel" ; > ; < "Achtergrondkleur" ; > ; }; StringList [ french ] = @@ -304,7 +307,7 @@ TabPage TP_REDLINE_OPT < "Maysculas" ; > ; < "Minsculas" ; > ; < "Versalitas" ; > ; - < "Caracteres de ttulo" ; > ; + < "Ttulo" ; > ; < "Color de fondo" ; > ; }; StringList [ italian ] = @@ -325,15 +328,15 @@ TabPage TP_REDLINE_OPT { < "[Ingen]" ; > ; < "Fed" ; > ; - < ", Kursiv" ; > ; + < "Kursiv" ; > ; < "Understreget" ; > ; < "Dobbelt understreget" ; > ; + < "Gennemstreget" ; > ; < "Store bogstaver" ; > ; < "Sm bogstaver" ; > ; < "Kapitler" ; > ; < "Titelskrift" ; > ; < "Baggrundsfarve" ; > ; - < "Baggrundsfarve" ; > ; }; StringList [ swedish ] = { @@ -388,7 +391,7 @@ TabPage TP_REDLINE_OPT < "大文字" ; > ; < "小文字" ; > ; < "小型大文字" ; > ; - < "ﾀｲﾄﾙ文字" ; > ; + < "タイトル文字" ; > ; < "背景色" ; > ; }; StringList [ korean ] = @@ -398,12 +401,12 @@ TabPage TP_REDLINE_OPT < "이탤릭체" ; > ; < "밑줄" ; > ; < "이중 밑줄" ; > ; - < "말소" ; > ; + < "취소선" ; > ; < "대문자" ; > ; < "소문자" ; > ; < "스몰캡" ; > ; < "제목 글꼴" ; > ; - < "배경 컬러" ; > ; + < "배경 색상" ; > ; }; StringList [ chinese_simplified ] = { @@ -431,7 +434,7 @@ TabPage TP_REDLINE_OPT < "小寫字母" ; > ; < "小型大寫字母" ; > ; < "標題文字" ; > ; - < "背景顔色" ; > ; + < "背景顏色" ; > ; }; StringList [ turkish ] = { @@ -463,32 +466,46 @@ TabPage TP_REDLINE_OPT }; StringList [ catalan ] = { - < "[Ninguno]" ; > ; - < "Negrita" ; > ; + < "[Cap]" ; > ; + < "Negreta" ; > ; < "Cursiva" ; > ; - < "Subrayado" ; > ; - < "Subrayado doble" ; > ; - < "Maysculas" ; > ; - < "Minsculas" ; > ; - < "Versalitas" ; > ; - < "Caracteres del ttulo" ; > ; - < "Color de fondo" ; > ; - < "Hintergrundfarbe" ; > ; + < "Subratllat" ; > ; + < "Subratllat: doble" ; > ; + < "Barrat" ; > ; + < "Majscules" ; > ; + < "Minscules" ; > ; + < "Versaletes" ; > ; + < "Tipus de lletra del ttol" ; > ; + < "Color de fons" ; > ; }; StringList [ finnish ] = { - < "[Tuntematon]" ; > ; - < "Lihavointi" ; > ; - < "Kursivointi" ; > ; - < "Alleviivaa" ; > ; + < "[Ei mitn]" ; > ; + < "Lihavoitu" ; > ; + < "Kursivoitu" ; > ; + < "Alleviivaus" ; > ; < "Alleviivaus: kaksinkertainen" ; > ; < "Yliviivaus" ; > ; - < "Kirjaimet" ; > ; + < "Isot kirjaimet" ; > ; + < "Pienet kirjaimet" ; > ; < "Pienet kirjaimet" ; > ; - < "Pienet alkukirjaimet" ; > ; < "Otsikon fontti" ; > ; < "Taustavri" ; > ; }; + StringList [ thai ] = + { + < "[ไม่มี]" ; > ; + < "หนา" ; > ; + < "เอียง" ; > ; + < "ขีดเส้นใต้" ; > ; + < "ขีดเส้นใต้: คู่" ; > ; + < "ขีดทับ" ; > ; + < "ตัวพิมพ์ใหญ่" ; > ; + < "ตัวพิมพ์เล็ก" ; > ; + < "ตัวพิมพ์ใหญ่ขนาดเล็ก" ; > ; + < "ตัวอักษรชื่อเรื่อง" ; > ; + < "สีพื้นหลัง" ; > ; + }; }; FixedText FT_INS_COL { @@ -500,23 +517,24 @@ TabPage TP_REDLINE_OPT Text [ english_us ] = "Color" ; Text [ portuguese_brazilian ] = "Farbe" ; Text [ swedish ] = "~Frg" ; - Text [ danish ] = "Farve" ; - Text [ italian ] = "~Colore" ; - Text [ spanish ] = "~Color" ; - Text [ french ] = "~Couleur" ; - Text [ dutch ] = "~Kleur" ; + Text [ danish ] = "Far~ve" ; + Text [ italian ] = "Colore" ; + Text [ spanish ] = "Color" ; + Text [ french ] = "Couleur" ; + Text [ dutch ] = "Kl~eur" ; Text[ chinese_simplified ] = "颜色"; Text[ russian ] = ""; Text[ polish ] = "Kolor"; Text[ japanese ] = "色"; - Text[ chinese_traditional ] = "顔色"; + Text[ chinese_traditional ] = "顏色"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "색"; + Text[ korean ] = "색상"; Text[ turkish ] = "~Renk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Color"; - Text[ finnish ] = "~Svy"; + Text[ catalan ] = "Color"; + Text[ finnish ] = "Vri"; + Text[ thai ] = "สี"; }; ListBox LB_INS_COL { @@ -540,7 +558,7 @@ TabPage TP_REDLINE_OPT Text[ french ] = "Insrer"; Text[ spanish ] = "Insertar"; Text[ italian ] = "Inserisci"; - Text[ danish ] = "Insert"; + Text[ danish ] = "St ind"; Text[ swedish ] = "Infoga"; Text[ polish ] = "Wstaw"; Text[ portuguese_brazilian ] = "Insert"; @@ -550,8 +568,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "插入"; Text[ turkish ] = "Insert"; Text[ arabic ] = ""; - Text[ catalan ] = "Insert"; + Text[ catalan ] = "Insereix"; Text[ finnish ] = "Lis"; + Text[ thai ] = "แทรก"; }; FixedText FT_CHG_DELETE { @@ -561,14 +580,14 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Delete" ; Text[ english_us ] = "Deletions"; Text[ portuguese ] = "Eliminar"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; - Text[ dutch ] = "Delete"; + Text[ dutch ] = "Wissen"; Text[ french ] = "Supprimer"; - Text[ spanish ] = "Eliminar"; - Text[ finnish ] = "Delete"; + Text[ spanish ] = "Borrar"; + Text[ finnish ] = "Poistot"; Text[ italian ] = "Elimina"; - Text[ danish ] = "Delete"; + Text[ danish ] = "Slet"; Text[ swedish ] = "Radera"; Text[ polish ] = "Usu"; Text[ portuguese_brazilian ] = "Delete"; @@ -578,7 +597,8 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "刪除"; Text[ turkish ] = "Delete"; Text[ arabic ] = "Delete"; - Text[ catalan ] = "Delete"; + Text[ catalan ] = "Supressions"; + Text[ thai ] = "ลบ"; }; FixedText FT_DEL_ATTR { @@ -588,24 +608,25 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Attributes" ; Text[ english_us ] = "Attributes"; Text[ portuguese ] = "A~tributos"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ greek ] = ""; - Text[ dutch ] = "~Attributen"; + Text[ dutch ] = "Attr~ibuten"; Text[ french ] = "Attributs"; - Text[ spanish ] = "~Atributos"; + Text[ spanish ] = "Atributos"; Text[ italian ] = "Attributi"; - Text[ danish ] = "Attributes"; + Text[ danish ] = "Attrib~utter"; Text[ swedish ] = "Attrib~ut"; Text[ polish ] = "Atrybuty"; Text[ portuguese_brazilian ] = "Attributes"; Text[ japanese ] = "属性"; - Text[ korean ] = "어트리뷰트!"; + Text[ korean ] = "속성"; Text[ chinese_simplified ] = "属性"; Text[ chinese_traditional ] = "屬性"; Text[ turkish ] = "Attributes"; Text[ arabic ] = ""; - Text[ catalan ] = "Attributes"; + Text[ catalan ] = "Atributs"; Text[ finnish ] = "Mritteet"; + Text[ thai ] = "คุณลักษณะ"; }; ListBox LB_DEL_ATTR { @@ -624,22 +645,23 @@ TabPage TP_REDLINE_OPT Text[ portuguese ] = "~Cor"; Text[ russian ] = ""; Text[ greek ] = "~"; - Text[ dutch ] = "~Kleur"; + Text[ dutch ] = "K~leur"; Text[ french ] = "Couleur"; - Text[ spanish ] = "~Color"; - Text[ italian ] = "~Colore"; - Text[ danish ] = "Color"; + Text[ spanish ] = "Color"; + Text[ italian ] = "Colore"; + Text[ danish ] = "F~arve"; Text[ swedish ] = "F~rg"; Text[ polish ] = "Kolor"; Text[ portuguese_brazilian ] = "Color"; Text[ japanese ] = "色"; - Text[ korean ] = "컬러"; + Text[ korean ] = "색상"; Text[ chinese_simplified ] = "彩色"; Text[ chinese_traditional ] = "彩色"; Text[ turkish ] = "Color"; Text[ arabic ] = ""; Text[ catalan ] = "Color"; - Text[ finnish ] = "Vri"; + Text[ finnish ] = "V~ri"; + Text[ thai ] = "สี"; }; ListBox LB_DEL_COL { @@ -661,9 +683,9 @@ TabPage TP_REDLINE_OPT Text[ greek ] = ""; Text[ dutch ] = "Wissen"; Text[ french ] = "Supprimer"; - Text[ spanish ] = "Eliminar"; + Text[ spanish ] = "Borrar"; Text[ italian ] = "Elimina"; - Text[ danish ] = "Delete"; + Text[ danish ] = "Slet"; Text[ swedish ] = "Radera"; Text[ polish ] = "Usu"; Text[ portuguese_brazilian ] = "Delete"; @@ -673,8 +695,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "刪除"; Text[ turkish ] = "Delete"; Text[ arabic ] = ""; - Text[ catalan ] = "Delete"; + Text[ catalan ] = "Suprimeix"; Text[ finnish ] = "Poista"; + Text[ thai ] = "ลบ"; }; FixedText FT_CHG_CHANGE { @@ -686,22 +709,23 @@ TabPage TP_REDLINE_OPT Text[ portuguese ] = "Modificar atributos"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Attributes changed"; + Text[ dutch ] = "Attributenwijziging"; Text[ french ] = "Modification des attributs"; Text[ spanish ] = "Modificacin de atributos"; - Text[ finnish ] = "Attributes changed"; + Text[ finnish ] = "Muutetut mritteet"; Text[ italian ] = "Cambia attributi"; - Text[ danish ] = "Attributes changed"; + Text[ danish ] = "Attributndring"; Text[ swedish ] = "Attributndring"; Text[ polish ] = "Modyfikacja atrybutw"; Text[ portuguese_brazilian ] = "Attributes changed"; Text[ japanese ] = "属性の変更"; - Text[ korean ] = "속성이 변경되었습니다"; + Text[ korean ] = "속성 변경"; Text[ chinese_simplified ] = "属性更改"; Text[ chinese_traditional ] = "屬性變更"; Text[ turkish ] = "Attributes changed"; Text[ arabic ] = "Attributes changed"; - Text[ catalan ] = "Attributes changed"; + Text[ catalan ] = "Atributs canviats"; + Text[ thai ] = "เปลี่ยนคุณลักษณะ"; }; FixedText FT_CHG_ATTR { @@ -711,24 +735,25 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Attributes" ; Text[ english_us ] = "Attributes"; Text[ portuguese ] = "A~tributos"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ greek ] = "~"; Text[ dutch ] = "~Attributen"; Text[ french ] = "Attributs"; - Text[ spanish ] = "~Atributos"; + Text[ spanish ] = "Atributos"; Text[ italian ] = "Attributi"; - Text[ danish ] = "Attributes"; + Text[ danish ] = "Attributt~er"; Text[ swedish ] = "Attri~but"; Text[ polish ] = "Atrybuty"; Text[ portuguese_brazilian ] = "Attributes"; Text[ japanese ] = "属性"; - Text[ korean ] = "어트리뷰트"; + Text[ korean ] = "속성"; Text[ chinese_simplified ] = "属性"; Text[ chinese_traditional ] = "屬性"; Text[ turkish ] = "Attributes"; Text[ arabic ] = ""; - Text[ catalan ] = "Attributes"; + Text[ catalan ] = "Atributs"; Text[ finnish ] = "Mritteet"; + Text[ thai ] = "คุณลักษณะ"; }; ListBox LB_CHG_ATTR { @@ -749,20 +774,21 @@ TabPage TP_REDLINE_OPT Text[ greek ] = "~"; Text[ dutch ] = "~Kleur"; Text[ french ] = "Couleur"; - Text[ spanish ] = "~Color"; - Text[ italian ] = "~Colore"; - Text[ danish ] = "Color"; + Text[ spanish ] = "Color"; + Text[ italian ] = "Colore"; + Text[ danish ] = "Fa~rve"; Text[ swedish ] = "F~rg"; Text[ polish ] = "Kolor"; Text[ portuguese_brazilian ] = "Color"; Text[ japanese ] = "色"; - Text[ korean ] = "컬러"; + Text[ korean ] = "색상"; Text[ chinese_simplified ] = "彩色"; Text[ chinese_traditional ] = "彩色"; Text[ turkish ] = "Color"; Text[ arabic ] = ""; Text[ catalan ] = "Color"; - Text[ finnish ] = "~Svy"; + Text[ finnish ] = "Vr~i"; + Text[ thai ] = "สี"; }; ListBox LB_CHG_COL { @@ -786,7 +812,7 @@ TabPage TP_REDLINE_OPT Text[ french ] = "Attributs"; Text[ spanish ] = "Atributos"; Text[ italian ] = "Attributi"; - Text[ danish ] = "Attributes"; + Text[ danish ] = "Attributter"; Text[ swedish ] = "Attribut"; Text[ polish ] = "Atrybuty"; Text[ portuguese_brazilian ] = "Attributes"; @@ -796,8 +822,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "屬性"; Text[ turkish ] = "Attributes"; Text[ arabic ] = ""; - Text[ catalan ] = "Attributes"; + Text[ catalan ] = "Atributs"; Text[ finnish ] = "Mritteet"; + Text[ thai ] = "คุณลักษณะ"; }; FixedLine FL_LC { @@ -809,7 +836,7 @@ TabPage TP_REDLINE_OPT Text [ english_us ] = "Lines changed" ; Text [ portuguese_brazilian ] = "Ge?nderte Zeilen" ; Text [ swedish ] = "ndrade rader" ; - Text [ danish ] = "ndrede rkker" ; + Text [ danish ] = "ndrede linjer" ; Text [ italian ] = "Righe modificate" ; Text [ spanish ] = "Lneas modificadas" ; Text [ french ] = "Lignes modifies" ; @@ -821,11 +848,12 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "已經變更的行"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "변경된 행."; + Text[ korean ] = "변경된 줄"; Text[ turkish ] = "Deitirilen satrlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lneas modificadas"; - Text[ finnish ] = "Muutetut viivat "; + Text[ catalan ] = "Lnies modificades"; + Text[ finnish ] = "Muutetut rivit"; + Text[ thai ] = "เปลี่ยนบรรทัด"; }; FixedText FT_MARKPOS { @@ -837,7 +865,7 @@ TabPage TP_REDLINE_OPT Text [ english_us ] = "Mar~k" ; Text [ portuguese_brazilian ] = "Markierung" ; Text [ swedish ] = "Markeri~ng" ; - Text [ danish ] = "Markering" ; + Text [ danish ] = "Markeri~ng" ; Text [ italian ] = "Contrassegno" ; Text [ spanish ] = "~Marca" ; Text [ french ] = "Marque" ; @@ -849,11 +877,12 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "標記(~K)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "마크 표시(~K)"; + Text[ korean ] = "선택 표시(~K)"; Text[ turkish ] = "aret"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Marca"; - Text[ finnish ] = "Mark"; + Text[ catalan ] = "Mar~ca"; + Text[ finnish ] = "~Merkint"; + Text[ thai ] = "ทำเครื่องห~มาย"; }; ListBox LB_MARKPOS { @@ -944,8 +973,8 @@ TabPage TP_REDLINE_OPT stringlist [ dutch ] = { < "[Geen]" ; > ; - < "Linker rand" ; > ; - < "Rechter rand" ; > ; + < "Linkerrand" ; > ; + < "Rechterrand" ; > ; < "Buitenste rand" ; > ; < "Binnenste rand" ; > ; }; @@ -959,7 +988,7 @@ TabPage TP_REDLINE_OPT }; StringList [ russian ] = { - < "[]" ; > ; + < "[]" ; > ; < " " ; > ; < " " ; > ; < " " ; > ; @@ -1031,19 +1060,27 @@ TabPage TP_REDLINE_OPT }; StringList [ catalan ] = { - < "[Ninguno]" ; > ; - < "Margen izquierdo" ; > ; - < "Margen derecho" ; > ; - < "Margen exterior" ; > ; - < "Margen interior" ; > ; + < "[Cap]" ; > ; + < "Marge esquerre" ; > ; + < "Marge dret" ; > ; + < "Marge exterior" ; > ; + < "Marge interior" ; > ; }; StringList [ finnish ] = { - < "[Ei mit??n]" ; > ; - < "Vasen marginaali" ; > ; - < "Oikea marginaali" ; > ; - < "Ulkomarginaali" ; > ; - < "Sisempi marginaali" ; > ; + < "[Ei mitn]" ; > ; + < "Vasen reunus" ; > ; + < "Oikea reunus" ; > ; + < "Ulompi reunus" ; > ; + < "Sisempi reunus" ; > ; + }; + StringList [ thai ] = + { + < "[ไม่มี]" ; > ; + < "ระยะขอบซ้าย" ; > ; + < "ระยะขอบขวา" ; > ; + < "ระยะขอบนอก" ; > ; + < "ระยะขอบใน" ; > ; }; }; FixedText FT_LC_COL @@ -1055,24 +1092,25 @@ TabPage TP_REDLINE_OPT Text [ english_us ] = "~Color" ; Text [ portuguese_brazilian ] = "Farbe" ; Text [ swedish ] = "Fr~g" ; - Text [ danish ] = "Farve" ; + Text [ danish ] = "~Farve" ; Text [ italian ] = "Colore" ; - Text [ spanish ] = "~Color" ; - Text [ french ] = "~Couleur" ; - Text [ dutch ] = "~Kleur" ; + Text [ spanish ] = "Color" ; + Text [ french ] = "Couleur" ; + Text [ dutch ] = "Kle~ur" ; Text [ portuguese ] = "Co~r" ; Text[ chinese_simplified ] = "颜色(~C)"; Text[ russian ] = ""; Text[ polish ] = "Kolor"; Text[ japanese ] = "色(~C)"; - Text[ chinese_traditional ] = "顔色(~C)"; + Text[ chinese_traditional ] = "顏色(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; Text[ korean ] = "색상(~C)"; Text[ turkish ] = "Renk"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Color"; - Text[ finnish ] = "Color"; + Text[ finnish ] = "~Vri"; + Text[ thai ] = "~สี"; }; ListBox LB_LC_COL { @@ -1102,15 +1140,16 @@ TabPage TP_REDLINE_OPT Text[ chinese_simplified ] = "依作者设定"; Text[ russian ] = " "; Text[ polish ] = "Wedug autora"; - Text[ japanese ] = "作成者べつ"; + Text[ japanese ] = "作成者別"; Text[ chinese_traditional ] = "依作者設定"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "작성자에 따라"; + Text[ korean ] = "작성자가 설정"; Text[ turkish ] = "Yazana gre"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Segn autor"; - Text[ finnish ] = "Laatija"; + Text[ catalan ] = "Per l'autor"; + Text[ finnish ] = "Tekij"; + Text[ thai ] = "โดยผู้เขียน"; }; String STR_NOTHING { @@ -1126,7 +1165,7 @@ TabPage TP_REDLINE_OPT Text [ french ] = "[Aucun(e)]" ; Text [ dutch ] = "[Geen]" ; Text[ chinese_simplified ] = "[无]"; - Text[ russian ] = "[]"; + Text[ russian ] = "[]"; Text[ polish ] = "[Brak]"; Text[ japanese ] = "[なし]"; Text[ greek ] = "[]"; @@ -1134,8 +1173,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "[無]"; Text[ arabic ] = "[]"; Text[ turkish ] = "[Yok]"; - Text[ catalan ] = "[Ningn]"; + Text[ catalan ] = "[Cap]"; Text[ finnish ] = "[Ei mitn]"; + Text[ thai ] = "[ไม่มี]"; }; }; @@ -1154,3 +1194,10 @@ TabPage TP_REDLINE_OPT + + + + + + + diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index fd44e2e5427e..46fb59e346eb 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -2,9 +2,9 @@ * * $RCSfile: usrpref.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: os $ $Date: 2002-09-20 12:09:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,9 @@ #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> #endif +#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX +#include <unotools/localedatawrapper.hxx> +#endif using namespace utl; using namespace rtl; @@ -116,11 +119,14 @@ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) : pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0), nFldUpdateFlags(0), nLinkUpdateMode(0), - eHScrollMetric(FUNIT_CM), - eVScrollMetric(FUNIT_CM), bIsHScrollMetricSet(sal_False), bIsVScrollMetricSet(sal_False) { + MeasurementSystem eSystem = GetAppLocaleData().getMeasurementSystemEnum(); + eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH; + eHScrollMetric = eUserMetric; + eVScrollMetric = eUserMetric; + aContentConfig.Load(); aLayoutConfig.Load(); aGridConfig.Load(); @@ -411,7 +417,7 @@ void SwLayoutViewConfig::Load() case 11: { sal_Int32 nVal; pValues[nProp] >>= nVal; - rParent.SetZoom(nVal); + rParent.SetZoom((USHORT)nVal); } break;// "Zoom/Value", case 12: @@ -534,8 +540,8 @@ void SwGridConfig::Load() case 2: rParent.SetSynchronize(bSet); break;// "Option/Synchronize", case 3: aSnap.Width() = MM100_TO_TWIP(nSet); break;// "Resolution/XAxis", case 4: aSnap.Height() = MM100_TO_TWIP(nSet); break;// "Resolution/YAxis", - case 5: rParent.SetDivisionX(nSet); break;// "Subdivision/XAxis", - case 6: rParent.SetDivisionY(nSet); break;// "Subdivision/YAxis" + case 5: rParent.SetDivisionX((short)nSet); break;// "Subdivision/XAxis", + case 6: rParent.SetDivisionY((short)nSet); break;// "Subdivision/YAxis" } } } diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 9238f58585e9..11bf6102e040 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewopt.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: fme $ $Date: 2002-12-05 10:06:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,8 +113,8 @@ #ifndef _CRSTATE_HXX #include <crstate.hxx> #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef INCLUDED_SVTOOLS_ACCESSIBILITYOPTIONS_HXX #include <svtools/accessibilityoptions.hxx> @@ -776,66 +776,66 @@ Color& SwViewOption::GetScriptIndicatorColor() /* -----------------------------23.04.2002 17:41------------------------------ ---------------------------------------------------------------------------*/ -void SwViewOption::ApplyColorConfigValues(const svx::ColorConfig& rConfig ) +void SwViewOption::ApplyColorConfigValues(const svtools::ColorConfig& rConfig ) { - aDocColor.SetColor(rConfig.GetColorValue(svx::DOCCOLOR).nColor); + aDocColor.SetColor(rConfig.GetColorValue(svtools::DOCCOLOR).nColor); - svx::ColorConfigValue aValue = rConfig.GetColorValue(svx::DOCBOUNDARIES); + svtools::ColorConfigValue aValue = rConfig.GetColorValue(svtools::DOCBOUNDARIES); aDocBoundColor.SetColor(aValue.nColor); nAppearanceFlags = 0; if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_DOC_BOUNDARIES; - aAppBackgroundColor.SetColor(rConfig.GetColorValue(svx::APPBACKGROUND).nColor); + aAppBackgroundColor.SetColor(rConfig.GetColorValue(svtools::APPBACKGROUND).nColor); - aValue = rConfig.GetColorValue(svx::OBJECTBOUNDARIES); + aValue = rConfig.GetColorValue(svtools::OBJECTBOUNDARIES); aObjectBoundColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_OBJECT_BOUNDARIES; - aValue = rConfig.GetColorValue(svx::TABLEBOUNDARIES); + aValue = rConfig.GetColorValue(svtools::TABLEBOUNDARIES); aTableBoundColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_TABLE_BOUNDARIES; - aValue = rConfig.GetColorValue(svx::WRITERIDXSHADINGS); + aValue = rConfig.GetColorValue(svtools::WRITERIDXSHADINGS); aIndexShadingsColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_INDEX_SHADINGS; - aValue = rConfig.GetColorValue(svx::LINKS); + aValue = rConfig.GetColorValue(svtools::LINKS); aLinksColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_LINKS; - aValue = rConfig.GetColorValue(svx::LINKSVISITED); + aValue = rConfig.GetColorValue(svtools::LINKSVISITED); aVisitedLinksColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_VISITED_LINKS; - aDirectCursorColor.SetColor(rConfig.GetColorValue(svx::WRITERDIRECTCURSOR).nColor); + aDirectCursorColor.SetColor(rConfig.GetColorValue(svtools::WRITERDIRECTCURSOR).nColor); - aTextGridColor.SetColor(rConfig.GetColorValue(svx::WRITERTEXTGRID).nColor); + aTextGridColor.SetColor(rConfig.GetColorValue(svtools::WRITERTEXTGRID).nColor); - aSpellColor.SetColor(rConfig.GetColorValue(svx::SPELL).nColor); + aSpellColor.SetColor(rConfig.GetColorValue(svtools::SPELL).nColor); - aFontColor.SetColor(rConfig.GetColorValue(svx::FONTCOLOR).nColor); + aFontColor.SetColor(rConfig.GetColorValue(svtools::FONTCOLOR).nColor); - aValue = rConfig.GetColorValue(svx::WRITERFIELDSHADINGS); + aValue = rConfig.GetColorValue(svtools::WRITERFIELDSHADINGS); aFieldShadingsColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_FIELD_SHADINGS; - aValue = rConfig.GetColorValue(svx::WRITERSECTIONBOUNDARIES); + aValue = rConfig.GetColorValue(svtools::WRITERSECTIONBOUNDARIES); aSectionBoundColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_SECTION_BOUNDARIES; - aValue = rConfig.GetColorValue(svx::WRITERPAGEBREAKS); + aValue = rConfig.GetColorValue(svtools::WRITERPAGEBREAKS); aPageBreakColor.SetColor(aValue.nColor); - aNotesIndicatorColor.SetColor(rConfig.GetColorValue(svx::WRITERNOTESINDICATOR).nColor); - aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svx::WRITERSCRIPTINDICATOR).nColor); + aNotesIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERNOTESINDICATOR).nColor); + aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor); } /* -----------------------------23.04.2002 17:48------------------------------ @@ -848,31 +848,31 @@ void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, BOOL bSet, BOOL bSaveInCon nAppearanceFlags &= ~nFlag; if(bSaveInConfig) { - //create an editable svx::ColorConfig and store the change - svx::EditableColorConfig aEditableConfig; + //create an editable svtools::ColorConfig and store the change + svtools::EditableColorConfig aEditableConfig; struct FlagToConfig_Impl { sal_Int32 nFlag; - svx::ColorConfigEntry eEntry; + svtools::ColorConfigEntry eEntry; }; static const FlagToConfig_Impl aFlags[] = { - VIEWOPT_DOC_BOUNDARIES , svx::DOCBOUNDARIES , - VIEWOPT_OBJECT_BOUNDARIES , svx::OBJECTBOUNDARIES , - VIEWOPT_TABLE_BOUNDARIES , svx::TABLEBOUNDARIES , - VIEWOPT_INDEX_SHADINGS , svx::WRITERIDXSHADINGS , - VIEWOPT_LINKS , svx::LINKS , - VIEWOPT_VISITED_LINKS , svx::LINKSVISITED , - VIEWOPT_FIELD_SHADINGS , svx::WRITERFIELDSHADINGS , - VIEWOPT_SECTION_BOUNDARIES , svx::WRITERSECTIONBOUNDARIES , - 0 , svx::ColorConfigEntryCount + VIEWOPT_DOC_BOUNDARIES , svtools::DOCBOUNDARIES , + VIEWOPT_OBJECT_BOUNDARIES , svtools::OBJECTBOUNDARIES , + VIEWOPT_TABLE_BOUNDARIES , svtools::TABLEBOUNDARIES , + VIEWOPT_INDEX_SHADINGS , svtools::WRITERIDXSHADINGS , + VIEWOPT_LINKS , svtools::LINKS , + VIEWOPT_VISITED_LINKS , svtools::LINKSVISITED , + VIEWOPT_FIELD_SHADINGS , svtools::WRITERFIELDSHADINGS , + VIEWOPT_SECTION_BOUNDARIES , svtools::WRITERSECTIONBOUNDARIES , + 0 , svtools::ColorConfigEntryCount }; sal_uInt16 nPos = 0; while(aFlags[nPos].nFlag) { if(0 != (nFlag&aFlags[nPos].nFlag)) { - svx::ColorConfigValue aValue = aEditableConfig.GetColorValue(aFlags[nPos].eEntry); + svtools::ColorConfigValue aValue = aEditableConfig.GetColorValue(aFlags[nPos].eEntry); aValue.bIsVisible = bSet; aEditableConfig.SetColorValue(aFlags[nPos].eEntry, aValue); } diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src index acc390014853..6168c335acd2 100644 --- a/sw/source/ui/dbui/dbinsdlg.src +++ b/sw/source/ui/dbui/dbinsdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: dbinsdlg.src,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:27:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text[ dutch ] = "Gegevens invoegen als"; Text[ chinese_simplified ] = "插入数据的方式："; Text[ greek ] = " :"; - Text[ korean ] = "로 데이터 삽입:"; + Text[ korean ] = "데이터 삽입:"; Text[ turkish ] = "Eklenecek verilerin tr:"; Text[ catalan ] = "Insereix la data com:"; Text[ finnish ] = "Lis tiedot muodossa:"; @@ -130,7 +130,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text[ dutch ] = "T~abel"; Text[ chinese_simplified ] = "表格(~A)"; Text[ greek ] = ""; - Text[ korean ] = "시트(~A)"; + Text[ korean ] = "표(~A)"; Text[ turkish ] = "T~ablo"; Text[ catalan ] = "T~aula"; Text[ finnish ] = "~Taulukko"; @@ -482,21 +482,21 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text [ ENGLISH ] = "Tab~le column(s)" ; Text [ english_us ] = "Tab~le column(s)" ; Text [ portuguese_brazilian ] = "Tabe~lle" ; - Text [ swedish ] = "Tabe~ll" ; + Text [ swedish ] = "Tabe~llkolumn(er)" ; Text [ danish ] = "Tabel" ; - Text [ italian ] = "Tabe~lla" ; - Text [ spanish ] = "Tab~la" ; - Text [ french ] = "Tab~le" ; + Text [ italian ] = "Colonna/e tabe~lla" ; + Text [ spanish ] = "Columnas de tab~la" ; + Text [ french ] = "Colonnes de table" ; Text [ dutch ] = "Tabe~l" ; Text [ portuguese ] = "Ta~bela" ; - Text[ chinese_simplified ] = "表格(~L)"; + Text[ chinese_simplified ] = "表格列(~L)"; Text[ russian ] = ""; Text[ polish ] = "Tabela"; - Text[ japanese ] = "表(~L)"; - Text[ chinese_traditional ] = "表格(~L)"; + Text[ japanese ] = "テーブルの列(~L)"; + Text[ chinese_traditional ] = "表格欄(~L)"; Text[ arabic ] = ""; Text[ dutch ] = "Tabe~l"; - Text[ chinese_simplified ] = "表格(~L)"; + Text[ chinese_simplified ] = "表格列(~L)"; Text[ greek ] = ""; Text[ korean ] = "표의 열(~L)"; Text[ turkish ] = "~Tablo"; @@ -631,7 +631,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text[ dutch ] = "~Eigenschappen..."; Text[ chinese_simplified ] = "属性(~O)..."; Text[ greek ] = "..."; - Text[ korean ] = "등록정보(~O)..."; + Text[ korean ] = "등록 정보(~O)..."; Text[ turkish ] = "~zelikler..."; Text[ catalan ] = "Pr~opietats..."; Text[ finnish ] = "~Ominaisuudet..."; @@ -650,7 +650,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text [ swedish ] = "Aut~oFormat..." ; Text [ danish ] = "AutoFormat..." ; Text [ italian ] = "Formatt. auto..." ; - Text [ spanish ] = "~Autoformato..." ; + Text [ spanish ] = "~Formateado automtico..." ; Text [ french ] = "Aut~oFormat..." ; Text [ dutch ] = "Aut~oOpmaak..." ; Text[ chinese_simplified ] = "自动格式(~O)..."; @@ -733,3 +733,5 @@ ModalDialog DLG_AP_INSERT_DB_SEL + + diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 354dc9354280..6da197207297 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbmgr.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: os $ $Date: 2002-12-09 13:58:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,6 +90,9 @@ #ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> #endif +#ifndef _COM_SUN_STAR_TEXT_MAILMERGEEVENT_ +#include <com/sun/star/text/MailMergeEvent.hpp> +#endif #ifndef _SFXVIEWFRM_HXX #include <sfx2/viewfrm.hxx> #endif @@ -223,9 +226,6 @@ #ifndef _HINTIDS_HXX #include <hintids.hxx> #endif -#ifndef _DBHELPER_DBCONVERSION_HXX_ -#include <connectivity/dbconversion.hxx> -#endif #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif @@ -280,8 +280,9 @@ #ifndef _NUMUNO_HXX #include <svtools/numuno.hxx> #endif -#include "mailmrge.hxx" +#include "mailmrge.hxx" +#include <unomailmerge.hxx> #ifndef _SFXEVENT_HXX #include <sfx2/event.hxx> @@ -301,6 +302,7 @@ using namespace svx; using namespace ::com::sun::star; +using namespace com::sun::star::text; using namespace com::sun::star::uno; using namespace com::sun::star::container; using namespace com::sun::star::frame; @@ -417,6 +419,7 @@ BOOL lcl_GetColumnCnt(SwDSParam* pParam, BOOL SwNewDBMgr::MergeNew(USHORT nOpt, SwWrtShell& rSh, const ODataAccessDescriptor& _rDescriptor) { + SetMergeType( nOpt ); DBG_ASSERT(!bInMerge && !pImpl->pMergeData, "merge already activated!") @@ -432,10 +435,10 @@ BOOL SwNewDBMgr::MergeNew(USHORT nOpt, SwWrtShell& rSh, if ( _rDescriptor.has(daCursor) ) _rDescriptor[daCursor] >>= xResSet; - if ( _rDescriptor.has(daSelection) ) + if ( _rDescriptor.has(daSelection) ) _rDescriptor[daSelection] >>= aSelection; - if ( _rDescriptor.has(daConnection) ) - _rDescriptor[daConnection] >>= xConnection; + if ( _rDescriptor.has(daConnection) ) + _rDescriptor[daConnection] >>= xConnection; if(!aData.sDataSource.getLength() || !aData.sCommand.getLength() || !xResSet.is()) { @@ -554,8 +557,16 @@ BOOL SwNewDBMgr::MergeNew(USHORT nOpt, SwWrtShell& rSh, { SfxDispatcher *pDis = rSh.GetView().GetViewFrame()->GetDispatcher(); SfxBoolItem aMerge(FN_QRY_MERGE, TRUE); + + // !! Currently (Jan-2003) silent is defined by supplying *any* + // !! item!! (Thus according to OS it would be silent even when + // !! other items then SID_SILENT would be supplied!) + // !! Therefore it has to be the 0 pointer when not silent. + SfxBoolItem aMergeSilent(SID_SILENT, TRUE); + SfxBoolItem *pMergeSilent = IsMergeSilent() ? &aMergeSilent : 0; + pDis->Execute(SID_PRINTDOC, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aMerge, 0L); + SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aMerge, pMergeSilent, 0L); } break; @@ -859,7 +870,9 @@ BOOL SwNewDBMgr::GetColumnNames(ListBox* pListBox, SwNewDBMgr::SwNewDBMgr() : pImpl(new SwNewDBMgr_Impl(*this)), + pMergeEvtSrc(NULL), bInMerge(FALSE), + bMergeSilent(FALSE), nMergeType(DBMGR_INSERT), bInitDBFields(FALSE) { @@ -918,6 +931,16 @@ BOOL SwNewDBMgr::MergePrint( SwView& rView, { pSh->ViewShell::UpdateFlds(); ++rOpt.nMergeAct; + + // launch MailMergeEvent if required + const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc(); + if (pEvtSrc) + { + Reference< XInterface > xRef( (XMailMergeBroadcaster *) pEvtSrc ); + text::MailMergeEvent aEvt( xRef, rView.GetDocShell()->GetModel() ); + pEvtSrc->LaunchMailMergeEvent( aEvt ); + } + rView.SfxViewShell::Print( rProgress ); // ggf Basic-Macro ausfuehren if( rOpt.IsPrintSingleJobs() && bRet ) @@ -1035,7 +1058,8 @@ BOOL SwNewDBMgr::MergeMailing(SwWrtShell* pSh) PrintMonitor aPrtMonDlg(&pSh->GetView().GetEditWin(), TRUE); aPrtMonDlg.aDocName.SetText(pSh->GetView().GetDocShell()->GetTitle(22)); aPrtMonDlg.aCancel.SetClickHdl(LINK(this, SwNewDBMgr, PrtCancelHdl)); - aPrtMonDlg.Show(); + if (!IsMergeSilent()) + aPrtMonDlg.Show(); OfficeApplication* pOffApp = OFF_APP(); SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, pOffApp->GetPool() ); @@ -1161,7 +1185,8 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSh) aPrtMonDlg.aDocName.SetText(pSh->GetView().GetDocShell()->GetTitle(22)); aPrtMonDlg.aCancel.SetClickHdl(LINK(this, SwNewDBMgr, PrtCancelHdl)); - aPrtMonDlg.Show(); + if (!IsMergeSilent()) + aPrtMonDlg.Show(); SwDocShell *pDocSh = pSh->GetView().GetDocShell(); // Progress, um KeyInputs zu unterbinden @@ -1233,6 +1258,15 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSh) // alle versteckten Felder/Bereiche entfernen pDoc->RemoveInvisibleContent(); + // launch MailMergeEvent if required + const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc(); + if (pEvtSrc) + { + Reference< XInterface > xRef( (XMailMergeBroadcaster *) pEvtSrc ); + text::MailMergeEvent aEvt( xRef, xDocSh->GetModel() ); + pEvtSrc->LaunchMailMergeEvent( aEvt ); + } + SfxMedium* pDstMed = new SfxMedium( aTempFile.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE, TRUE ); @@ -2153,7 +2187,6 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, if(pImpl->pMergeDialog->Execute() == RET_OK) { - SetMergeType( pImpl->pMergeDialog->GetMergeType() ); aDescriptor[daSelection] <<= pImpl->pMergeDialog->GetSelection(); Reference<XResultSet> xResSet = pImpl->pMergeDialog->GetResultSet(); @@ -2161,7 +2194,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, aDescriptor[daCursor] <<= xResSet; OFF_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, rSh.GetView().GetViewFrame()->GetObjectShell())); - MergeNew(GetMergeType(), + MergeNew(pImpl->pMergeDialog->GetMergeType() , rSh, aDescriptor); // reset the cursor inside diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src index fa2f39587a19..443462cfa927 100644 --- a/sw/source/ui/dbui/dbui.src +++ b/sw/source/ui/dbui/dbui.src @@ -2,9 +2,9 @@ * * $RCSfile: dbui.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:00:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,15 +108,16 @@ ModalDialog DLG_DBSELECTION Text[ chinese_simplified ] = "选择数据库"; Text[ russian ] = " "; Text[ polish ] = "Wybr bazy danych"; - Text[ japanese ] = "ﾃﾞｰﾀﾍﾞｰｽの選択"; + Text[ japanese ] = "データベースの選択"; Text[ chinese_traditional ] = "選擇資料庫"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "데이터베이스 선택"; Text[ turkish ] = "Veritaban seimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Seleccionar base de datos"; + Text[ catalan ] = "Selecciona base de dades"; Text[ finnish ] = "Tietokantavalinta"; + Text[ thai ] = "เลือกฐานข้อมูล"; }; // DLG_PRINTMONITOR ------------------------------------------------------ ModelessDialog DLG_PRINTMONITOR @@ -176,11 +177,12 @@ ModelessDialog DLG_PRINTMONITOR Text[ chinese_traditional ] = "傳送到"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "출력 형식"; + Text[ korean ] = "인쇄 중"; Text[ turkish ] = "kt tr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "se est imprimiendo en"; + Text[ catalan ] = "s'est imprimint en"; Text[ finnish ] = "tulostuu tulostimessa"; + Text[ thai ] = "กำลังพิมพ์บน"; }; FixedText FT_SENDING { @@ -200,7 +202,7 @@ ModelessDialog DLG_PRINTMONITOR TEXT[ portuguese_brazilian ] = "is being send at"; TEXT[ portuguese ] = "est a ser enviado para"; TEXT[ danish ] = "bliver sendt til"; - TEXT[ french ] = "est en cours d'envoi "; + TEXT[ french ] = "va tre envoy "; TEXT[ swedish ] = "skickas till"; TEXT[ dutch ] = "wordt verzonden aan"; TEXT[ spanish ] = "se enva a"; @@ -212,11 +214,12 @@ ModelessDialog DLG_PRINTMONITOR TEXT[ chinese_traditional ] = "寄發給"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "．．에 전송"; + TEXT[ korean ] = "보내는 중"; TEXT[ turkish ] = "Alc"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "se enva a"; - TEXT[ finnish ] = "l?hetet??n kohteelle"; + TEXT[ catalan ] = "s'est enviant a"; + TEXT[ finnish ] = "lhetetn kohteelle"; + TEXT[ thai ] = "กำลังถูกส่งไปยัง"; }; FixedText FT_PRINTER { @@ -267,21 +270,22 @@ ModelessDialog DLG_PRINTMONITOR Text[ danish ] = "Send-monitor"; Text[ french ] = "Moniteur d'envoi"; Text[ swedish ] = "Skicka monitor"; - Text[ dutch ] = "Monitor verzenden"; - Text[ spanish ] = "Enviar-Monitor"; + Text[ dutch ] = "Monitor \"Verzenden\""; + Text[ spanish ] = "Monitor de envo"; Text[ english_us ] = "Send-Monitor"; Text[ chinese_simplified ] = "寄发-监视器"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Pokaz stanu przesyania"; - Text[ japanese ] = "送信ﾓﾆﾀｰ"; + Text[ japanese ] = "送信モニター"; Text[ chinese_traditional ] = "寄發-監視器"; Text[ arabic ] = " "; Text[ greek ] = "-"; Text[ korean ] = "전송 모니터"; Text[ turkish ] = "Gnderme ekran"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enviar-Monitor"; - Text[ finnish ] = "L?hetysvalvonta"; + Text[ catalan ] = "Monitor d'enviament"; + Text[ finnish ] = "Lhetysvalvonta"; + Text[ thai ] = "จอภาพการส่ง"; }; Text [ portuguese ] = "Monitor de impresso" ; Text [ english_us ] = "Print monitor" ; @@ -291,19 +295,20 @@ ModelessDialog DLG_PRINTMONITOR Text [ italian ] = "Controllo stampa" ; Text [ spanish ] = "Monitor de impresin" ; Text [ french ] = "Moniteur d'impression" ; - Text [ dutch ] = "Opslaan-monitor" ; + Text [ dutch ] = "Monitor \"Opslaan\"" ; Text[ chinese_simplified ] = "打印监视"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Pokaz stanu zapisu"; - Text[ japanese ] = "ﾒﾓﾘﾓﾆﾀｰ"; + Text[ japanese ] = "メモリモニター"; Text[ chinese_traditional ] = "列印監視"; Text[ arabic ] = " "; Text[ language_user1 ] = " "; Text[ greek ] = "-"; Text[ korean ] = "저장 모니터"; Text[ turkish ] = "Yazdrma ekran"; - Text[ catalan ] = "Monitor de impresin"; + Text[ catalan ] = "Monitor d'impressi"; Text[ finnish ] = "Tulostuksenvalvonta"; + Text[ thai ] = "จอภาพการพิมพ์"; }; String STR_DB_EMAIL @@ -318,7 +323,7 @@ String STR_DB_EMAIL Text[ french ] = "E-mail"; Text[ swedish ] = "E-post"; Text[ dutch ] = "E-mail"; - Text[ spanish ] = "E-mail"; + Text[ spanish ] = "Correo-e"; Text[ chinese_simplified ] = "电子邮件"; Text[ russian ] = " "; Text[ polish ] = "e-mail"; @@ -326,11 +331,12 @@ String STR_DB_EMAIL Text[ chinese_traditional ] = "電子郵件"; Text[ arabic ] = " "; Text[ greek ] = "E-mail"; - Text[ korean ] = "Ｅ-Ｍail"; + Text[ korean ] = "전자 메일"; Text[ turkish ] = "E-posta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "E-mail"; - Text[ finnish ] = "S?hk?osti"; + Text[ catalan ] = "correu electrnic"; + Text[ finnish ] = "Shkposti"; + Text[ thai ] = "อีเมล์"; }; @@ -341,3 +347,11 @@ String STR_DB_EMAIL + + + + + + + + diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src index 42750bce2796..7f4283547aac 100644 --- a/sw/source/ui/dialog/abstract.src +++ b/sw/source/ui/dialog/abstract.src @@ -2,9 +2,9 @@ * * $RCSfile: abstract.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2001-08-07 15:33:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,10 +99,11 @@ ModalDialog DLG_INSERT_ABSTRACT Text[ dutch ] = "Eigenschappen"; Text[ chinese_simplified ] = "属性"; Text[ greek ] = ""; - Text[ korean ] = "등록정보"; + Text[ korean ] = "등록 정보"; Text[ turkish ] = "zellikler"; - Text[ catalan ] = "Propiedades"; + Text[ catalan ] = "Propietats"; Text[ finnish ] = "Ominaisuudet"; + Text[ thai ] = "คุณสมบัติ"; }; FixedText FT_LEVEL { @@ -117,21 +118,22 @@ ModalDialog DLG_INSERT_ABSTRACT Text [ italian ] = "Livelli di capitolo inclusi" ; Text [ spanish ] = "Niveles del captulo incluidos" ; Text [ french ] = "Niveaux de plan inclure" ; - Text [ dutch ] = "Aantal overzichtsniveau's" ; + Text [ dutch ] = "Aantal overzichtsniveaus" ; Text [ portuguese ] = "Nveis de captulo includos" ; Text[ chinese_simplified ] = "包含的章节大纲级"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "cznie z poziomami rozdziau"; - Text[ japanese ] = "抽出する章ﾚﾍﾞﾙ数"; + Text[ japanese ] = "抽出する章レベル数"; Text[ chinese_traditional ] = "包含的章節大綱"; Text[ arabic ] = " "; - Text[ dutch ] = "Aantal overzichtsniveau's"; + Text[ dutch ] = "Aantal overzichtsniveaus"; Text[ chinese_simplified ] = "包含的章节大纲级"; Text[ greek ] = " "; - Text[ korean ] = "관련된 장수준."; + Text[ korean ] = "포함된 장의 개요 수준 수"; Text[ turkish ] = "Dahil edilen blm dzeyleri"; - Text[ catalan ] = "Niveles del captulo incluidos"; - Text[ finnish ] = "Sisllytetyt rajaustasot"; + Text[ catalan ] = "Nivells del captol inclosos"; + Text[ finnish ] = "Sisllytetyt jsennystasot"; + Text[ thai ] = "รวมระดับเค้าร่าง"; }; NumericField NF_LEVEL { @@ -165,7 +167,7 @@ ModalDialog DLG_INSERT_ABSTRACT Text [ dutch ] = "Alinea's per kop" ; Text [ portuguese ] = "Pargrafos por captulo" ; Text[ chinese_simplified ] = "每章节包含的段落"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Akapity w rozdziale"; Text[ japanese ] = "章あたりの段落数"; Text[ chinese_traditional ] = "每章節包含的段落"; @@ -173,10 +175,11 @@ ModalDialog DLG_INSERT_ABSTRACT Text[ dutch ] = "Alinea's per kop"; Text[ chinese_simplified ] = "每章节包含的段落"; Text[ greek ] = " "; - Text[ korean ] = "장당 단락"; + Text[ korean ] = "한 장 당 하위 수준 수"; Text[ turkish ] = "Beher blm paragraf says"; - Text[ catalan ] = "Prrafos por captulo"; + Text[ catalan ] = "Subpunts per nivell"; Text[ finnish ] = "Alipisteit tasolla"; + Text[ thai ] = "จุดย่อยต่อระดับ"; }; NumericField NF_PARA { @@ -206,23 +209,24 @@ ModalDialog DLG_INSERT_ABSTRACT Text [ swedish ] = "Utdraget innehller det utvalda antalet stycken frn de inkluderade kapitelniverna." ; Text [ danish ] = "Abstractet indeholder det valgte antal afsnit fra de inkluderede kapitelniveauer." ; Text [ italian ] = "Il sunto contiene il numero di paragrafi scelto dai livelli di capitolo inclusi." ; - Text [ spanish ] = "En el extracto aparece la cantidad deseada de prrafos de los niveles de los captulos incluidos." ; + Text [ spanish ] = "En el resumen aparece el nmero de los prrafos seleccionados de los niveles de los captulos incluidos." ; Text [ french ] = "La synthse reprendra, pour chaque niveau de plan inclus, le nombre de paragraphes indiqu." ; - Text [ dutch ] = "In het extract verschijnt het geselecteerde aantal alineas van de erbij betrokken overzichtsniveaus." ; + Text [ dutch ] = "In het overzicht verschijnt het geselecteerde aantal alinea's van de erbij betrokken overzichtsniveaus." ; Text [ portuguese ] = "O Abstracto contm a quantidade de pargrafos seleccionada dos nveis de captulos includos." ; Text[ chinese_simplified ] = "从包括的章节级中选出的一定数目的段落显示在摘要中。"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Abstrakt zawiera wybran ilo akapitw z awierajcych wczone poziomy akapitu."; - Text[ japanese ] = "要約には、指定数の段落が各章ﾚﾍﾞﾙから抽出されます。"; + Text[ japanese ] = "要約には、指定数の段落が各章レベルから抽出されます。"; Text[ chinese_traditional ] = "摘要模式顯示相關章節中選取的一定數目的段落"; Text[ arabic ] = " ."; - Text[ dutch ] = "In het extract verschijnt het geselecteerde aantal alineas van de erbij betrokken overzichtsniveaus."; + Text[ dutch ] = "In het overzicht verschijnt het geselecteerde aantal alinea's van de erbij betrokken overzichtsniveaus."; Text[ chinese_simplified ] = "从包括的章节级中选出的一定数目的段落显示在摘要中。"; Text[ greek ] = " Abstract ."; - Text[ korean ] = "요약에서는 관련된 장 수준에서 선택한 단락의 수가 나타납니다."; + Text[ korean ] = "요약에서는 포함된 개요 수준으로부터 선택한 단락의 수가 나타납니다."; Text[ turkish ] = "zet iinde, dahil edilen blm dzeylerinden seilen paragraflar bulunuyor."; - Text[ catalan ] = "En el extracto aparece la cantidad deseada de prrafos de los niveles de los captulos incluidos."; + Text[ catalan ] = "En l'estracte apareix la quantitat desitjada de pargrafs dels nivells dels captols inclosos."; Text[ finnish ] = "Tiivistelmss on valittu mr kappaleita sisllytetyist jsennystasoista."; + Text[ thai ] = "บทคัดย่อมีตัวเลขที่เลือกของย่อหน้าจากระดับเค้าร่างที่รวมไว้"; }; OKButton PB_OK { @@ -248,12 +252,12 @@ ModalDialog DLG_INSERT_ABSTRACT Text [ swedish ] = "Skapa AutoUtdrag" ; Text [ danish ] = "Opret AutoAbstract" ; Text [ italian ] = "Crea un sommario automatico" ; - Text [ spanish ] = "Crear AutoAbstracto" ; + Text [ spanish ] = "Crear Resumen automtico" ; Text [ french ] = "Cration d'une AutoSynthse" ; Text [ dutch ] = "AutoExtract maken" ; Text [ portuguese ] = "Criar AutoAbstracto" ; Text[ chinese_simplified ] = "生成自动摘要"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Utwrz Autokonspekt"; Text[ japanese ] = "自動抽出の作成"; Text[ chinese_traditional ] = "產生自動摘要"; @@ -261,13 +265,28 @@ ModalDialog DLG_INSERT_ABSTRACT Text[ dutch ] = "AutoExtract maken"; Text[ chinese_simplified ] = "生成自动摘要"; Text[ greek ] = " AutoAbstract"; - Text[ korean ] = "자동추상 만들기"; + Text[ korean ] = "자동 요약 만들기"; Text[ turkish ] = "Otomatik zet olutur"; - Text[ catalan ] = "Crear AutoAbstracto"; + Text[ catalan ] = "Crea AutoAbstracte"; Text[ finnish ] = "Luo automaattinen tiivistelm"; + Text[ thai ] = "สร้างบทคัดย่ออัตโนมัติ"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/dialog/ascfldlg.src b/sw/source/ui/dialog/ascfldlg.src index 428697e0feae..21b8be15cda2 100644 --- a/sw/source/ui/dialog/ascfldlg.src +++ b/sw/source/ui/dialog/ascfldlg.src @@ -2,9 +2,9 @@ * * $RCSfile: ascfldlg.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: jp $ $Date: 2002-01-21 14:14:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,8 @@ ModalDialog DLG_ASCII_FILTER OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 239 , 80 ) ; - Text = "Encoded Text Filter Optionen" ; - Text [ English ] = "Encoded text filter options" ; + Text = "ASCII Filter Optionen" ; + Text [ English ] = "ASCII filter options" ; Moveable = TRUE ; FixedLine FL_1 { @@ -90,14 +90,15 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "Egenskaper"; Text[ polish ] = "Waciwoci"; Text[ portuguese_brazilian ] = "Properties"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "ݩ"; + Text[ japanese ] = "属性"; + Text[ korean ] = "등록 정보"; + Text[ chinese_simplified ] = "属性"; + Text[ chinese_traditional ] = "屬性"; Text[ arabic ] = ""; Text[ turkish ] = "zellikler"; - Text[ catalan ] = "Propiedades"; + Text[ catalan ] = "Propietats"; Text[ finnish ] = "Ominaisuudet"; + Text[ thai ] = "คุณสมบัติ"; }; FixedText FT_CHARSET { @@ -105,9 +106,9 @@ ModalDialog DLG_ASCII_FILTER Size = MAP_APPFONT ( 53 , 10 ) ; Text = "Z~eichensatz" ; Text [ English ] = "Character Set" ; - Text[ english_us ] = "~Font"; + Text[ english_us ] = "~Character set"; Text[ portuguese ] = "~Conjunto de caracteres"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ greek ] = "~ "; Text[ dutch ] = "~Tekenset"; Text[ french ] = "~Jeu de caractres"; @@ -117,14 +118,15 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "Teckenuppsttning"; Text[ polish ] = "Zbir znakw"; Text[ portuguese_brazilian ] = "Charset"; - Text[ japanese ] = "(~F)"; - Text[ korean ] = "(~F)"; - Text[ chinese_simplified ] = "ַ(~F)"; - Text[ chinese_traditional ] = "r(~F)"; + Text[ japanese ] = "文字列(~F)"; + Text[ korean ] = "문자집합(~F)"; + Text[ chinese_simplified ] = "字符集(~F)"; + Text[ chinese_traditional ] = "字型(~F)"; Text[ turkish ] = "Karakter kmesi"; Text[ arabic ] = " "; - Text[ catalan ] = "~Caracteres"; - Text[ finnish ] = "~Fontti"; + Text[ catalan ] = "~Lletra"; + Text[ finnish ] = "~Merkist"; + Text[ thai ] = "~ตัวอักษร"; }; ListBox LB_CHARSET { @@ -146,20 +148,21 @@ ModalDialog DLG_ASCII_FILTER Text[ greek ] = " "; Text[ dutch ] = "~Standaardlettertype"; Text[ french ] = "Police de base"; - Text[ spanish ] = "~Fuente estndar"; + Text[ spanish ] = "~Fuente predeterminada"; Text[ italian ] = "Carattere standard"; Text[ danish ] = "Standardskrifttyper"; Text[ swedish ] = "Standardteckensnitt"; Text[ polish ] = "Czcionka podstawowa"; Text[ portuguese_brazilian ] = "Standard fonts"; - Text[ japanese ] = "̫"; - Text[ korean ] = "⺻ ۲"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "зǦr"; + Text[ japanese ] = "既定フォント"; + Text[ korean ] = "기본 글꼴"; + Text[ chinese_simplified ] = "标准字体"; + Text[ chinese_traditional ] = "標準字型"; Text[ turkish ] = "Standart yaztipi"; Text[ arabic ] = " "; - Text[ catalan ] = "~Fuente estndar"; + Text[ catalan ] = "Tipus de lletra per defecte"; Text[ finnish ] = "Oletusfontit"; + Text[ thai ] = "ค่าเริ่มต้นตัวอักษร"; }; ListBox LB_FONT { @@ -187,15 +190,16 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "Sprk"; Text[ polish ] = "Jzyk"; Text[ portuguese_brazilian ] = "Language"; - Text[ japanese ] = "(~G)"; - Text[ korean ] = "(~G)"; - Text[ chinese_simplified ] = "(~G)"; - Text[ chinese_traditional ] = "y(~G)"; + Text[ japanese ] = "言語(~G)"; + Text[ korean ] = "언어(~G)"; + Text[ chinese_simplified ] = "语言(~G)"; + Text[ chinese_traditional ] = "語言(~G)"; Text[ arabic ] = ""; Text[ turkish ] = "~Dil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Idio~ma"; + Text[ catalan ] = "Llen~guatge"; Text[ finnish ] = "K~ieli"; + Text[ thai ] = "ภา~ษา"; }; ListBox LB_LANGUAGE { @@ -218,20 +222,21 @@ ModalDialog DLG_ASCII_FILTER Text[ dutch ] = "~Alinea-einde"; Text[ french ] = "Saut de ~paragraphe"; Text[ spanish ] = "Salt~o de prrafo"; - Text[ italian ] = "~Interruzione di paragrafo"; + Text[ italian ] = "~Interruzione paragrafo"; Text[ danish ] = "Afsnitsskift"; Text[ swedish ] = "Styckebrytning"; Text[ polish ] = "Podzia akapitu"; Text[ portuguese_brazilian ] = "Paragraphbreak"; - Text[ japanese ] = "i(~P)"; - Text[ korean ] = "ܶ (~P)"; - Text[ chinese_simplified ] = "(~P)"; - Text[ chinese_traditional ] = "q(~P)"; + Text[ japanese ] = "段落区切り(~P)"; + Text[ korean ] = "단락 나누기(~P)"; + Text[ chinese_simplified ] = "换段落(~P)"; + Text[ chinese_traditional ] = "換段落(~P)"; Text[ arabic ] = " "; Text[ turkish ] = "Paragraf sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salt~o de prrafo"; + Text[ catalan ] = "~Salt de pargaf"; Text[ finnish ] = "~Kappalevaihto"; + Text[ thai ] = "แบ่ง~ย่อหน้า"; }; RadioButton RB_CRLF { @@ -255,13 +260,14 @@ ModalDialog DLG_ASCII_FILTER Text[ portuguese_brazilian ] = "CR & LF"; Text[ japanese ] = "~CR & LF"; Text[ korean ] = "~CR & LF"; - Text[ chinese_simplified ] = "س(~C)"; + Text[ chinese_simplified ] = "回车并换行(~C)"; Text[ chinese_traditional ] = "~CR & LF"; Text[ arabic ] = "CR & LF"; Text[ turkish ] = "~CR & LF"; Text[ language_user1 ] = " "; - Text[ catalan ] = "CR & LF"; + Text[ catalan ] = "~CR i LF"; Text[ finnish ] = "~CR & LF"; + Text[ thai ] = "~CR & LF"; }; RadioButton RB_CR { @@ -284,13 +290,14 @@ ModalDialog DLG_ASCII_FILTER Text[ portuguese_brazilian ] = "CR"; Text[ japanese ] = "C~R"; Text[ korean ] = "C~R"; - Text[ chinese_simplified ] = "س(~R)"; + Text[ chinese_simplified ] = "回车(~R)"; Text[ chinese_traditional ] = "C~R"; Text[ arabic ] = "CR"; Text[ turkish ] = "C~R"; Text[ language_user1 ] = " "; Text[ catalan ] = "C~R"; Text[ finnish ] = "C~R"; + Text[ thai ] = "C~R"; }; RadioButton RB_LF { @@ -313,13 +320,14 @@ ModalDialog DLG_ASCII_FILTER Text[ portuguese_brazilian ] = "LF"; Text[ japanese ] = "~LF"; Text[ korean ] = "~LF"; - Text[ chinese_simplified ] = "(~L)"; + Text[ chinese_simplified ] = "新行(~L)"; Text[ chinese_traditional ] = "~LF"; Text[ arabic ] = "LF"; Text[ turkish ] = "~LF"; Text[ language_user1 ] = " "; Text[ catalan ] = "~LF"; Text[ finnish ] = "~LF"; + Text[ thai ] = "~LF"; }; OKButton PB_OK @@ -357,15 +365,16 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "System"; Text[ polish ] = "System"; Text[ portuguese_brazilian ] = "System"; - Text[ japanese ] = ""; - Text[ korean ] = "ý"; - Text[ chinese_simplified ] = "ϵͳ"; - Text[ chinese_traditional ] = "t"; + Text[ japanese ] = "システム"; + Text[ korean ] = "시스템"; + Text[ chinese_simplified ] = "系统"; + Text[ chinese_traditional ] = "系統"; Text[ arabic ] = ""; Text[ turkish ] = "Sistem"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sistema"; Text[ finnish ] = "Jrjestelm"; + Text[ thai ] = "ระบบ"; }; Text[ english_us ] = "ASCII Filter Options"; Text[ portuguese ] = "Opes de filtro ASCII"; @@ -379,15 +388,16 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "ASCII filteralternativ"; Text[ polish ] = "Opcje filtra ASCII"; Text[ portuguese_brazilian ] = "ASCII filter options"; - Text[ japanese ] = "ASCIĮ"; - Text[ korean ] = "ƽŰ ɼ"; - Text[ chinese_simplified ] = "ASCII ѡ"; - Text[ chinese_traditional ] = "ASCII ഫﶵ"; + Text[ japanese ] = "ASCIIフィルタオプション"; + Text[ korean ] = "아스키 필터 옵션"; + Text[ chinese_simplified ] = "ASCII 转换器选项"; + Text[ chinese_traditional ] = "ASCII 轉換器選項"; Text[ arabic ] = " ASCII"; Text[ turkish ] = "ASCII filtre seenekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de filtro ASCII"; + Text[ catalan ] = "Opcions del filtre ASCII"; Text[ finnish ] = "ASCII-suodatusasetukset"; + Text[ thai ] = "ตัวเลือกตัวกรอง ASCII "; }; @@ -399,3 +409,15 @@ ModalDialog DLG_ASCII_FILTER + + + + + + + + + + + + diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src index 15f2a13390d6..6eb861344a52 100644 --- a/sw/source/ui/dialog/dialog.src +++ b/sw/source/ui/dialog/dialog.src @@ -2,9 +2,9 @@ * * $RCSfile: dialog.src,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:02:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,14 +79,15 @@ CheckBox CB_USE_PASSWD Text[ chinese_simplified ] = "密码(~P)"; Text[ russian ] = ""; Text[ polish ] = "Haso"; - Text[ japanese ] = "ﾊﾟｽﾜｰﾄﾞ(~P)"; + Text[ japanese ] = "パスワード(~P)"; Text[ chinese_traditional ] = "密碼(~P)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "패스워드(~P)"; + Text[ korean ] = "암호(~P)"; Text[ turkish ] = "ifre"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Contrasea"; + Text[ catalan ] = "~Contrasenya"; + Text[ thai ] = "~รหัสผ่าน"; }; CheckBox CB_READ_ONLY { @@ -96,11 +97,11 @@ CheckBox CB_READ_ONLY Text [ italian ] = "~Sola lettura" ; Text [ portuguese_brazilian ] = "~S?leitura" ; Text [ portuguese ] = "~S leitura" ; - Text [ finnish ] = "~Vain luku" ; + Text [ finnish ] = "Vain ~luku" ; Text [ danish ] = "Skrivebeskyttet" ; Text [ french ] = "En ~lecture seule" ; Text [ swedish ] = "Sk~rivskyddad" ; - Text [ dutch ] = "~Alleen lezen" ; + Text [ dutch ] = "~Alleen-lezen" ; Text [ spanish ] = "~Slo lectura" ; Text [ english_us ] = "~Read-only" ; Text[ chinese_simplified ] = "只读(~R)"; @@ -113,7 +114,8 @@ CheckBox CB_READ_ONLY Text[ korean ] = "읽기 전용(~R)"; Text[ turkish ] = "~Salt okunur"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Solo lectura"; + Text[ catalan ] = "~Noms lectura"; + Text[ thai ] = "~อ่านอย่างเดียว"; }; String STR_LINKEDIT_TEXT { @@ -124,7 +126,7 @@ String STR_LINKEDIT_TEXT Text [ italian ] = "Modifica collegamenti" ; Text [ portuguese_brazilian ] = "Editar liga??s" ; Text [ portuguese ] = "Editar ligaes" ; - Text [ finnish ] = "Muokkaa linkkej?" ; + Text [ finnish ] = "Muokkaa linkkej" ; Text [ danish ] = "Rediger kder" ; Text [ french ] = "dition de liens" ; Text [ swedish ] = "Redigera lnkar" ; @@ -134,14 +136,15 @@ String STR_LINKEDIT_TEXT Text[ chinese_simplified ] = "编辑链接"; Text[ russian ] = " "; Text[ polish ] = "Edytuj cza"; - Text[ japanese ] = "ﾘﾝｸの編集"; + Text[ japanese ] = "リンクの編集"; Text[ chinese_traditional ] = "編輯捷徑"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "연결 편집"; + Text[ korean ] = "링크 편집"; Text[ turkish ] = "Balantlar dzenle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar vnculos"; + Text[ catalan ] = "Modifica els enllaos"; + Text[ thai ] = "แก้ไขการเชื่อมโยง"; }; String STR_PATH_NOT_FOUND1 { @@ -152,7 +155,7 @@ String STR_PATH_NOT_FOUND1 Text [ italian ] = "La cartella" ; Text [ portuguese_brazilian ] = "O diret?io" ; Text [ portuguese ] = "O directrio '" ; - Text [ finnish ] = "Hakemistoa " ; + Text [ finnish ] = "Hakemistoa" ; Text [ danish ] = "Biblioteket '" ; Text [ french ] = "Le rpertoire'" ; Text [ swedish ] = "Katalogen '" ; @@ -160,16 +163,17 @@ String STR_PATH_NOT_FOUND1 Text [ spanish ] = "El directorio '" ; Text [ english_us ] = "The directory '" ; Text[ chinese_simplified ] = "这个目录 '"; - Text[ russian ] = " '"; + Text[ russian ] = " '"; Text[ polish ] = "Katalog"; - Text[ japanese ] = "ﾃﾞｨﾚｸﾄﾘ「"; + Text[ japanese ] = "ディレクトリ「"; Text[ language_user1 ] = " "; Text[ chinese_traditional ] = "這個目錄<"; Text[ arabic ] = " '"; Text[ greek ] = " '"; Text[ korean ] = "디렉토리'"; Text[ turkish ] = "Dizin '"; - Text[ catalan ] = "El directorio '"; + Text[ catalan ] = "El directori '"; + Text[ thai ] = "ไดเร็กทอรี่ '"; }; String STR_PATH_NOT_FOUND2 { @@ -181,7 +185,7 @@ String STR_PATH_NOT_FOUND2 Text [ italian ] = "' non esiste." ; Text [ portuguese_brazilian ] = "' n?o existe." ; Text [ portuguese ] = "' no existe." ; - Text [ finnish ] = " ei ole" ; + Text [ finnish ] = "ei ole olemassa." ; Text [ danish ] = "' eksisterer ikke." ; Text [ french ] = "' n'existe pas." ; Text [ swedish ] = "' finns inte." ; @@ -191,14 +195,15 @@ String STR_PATH_NOT_FOUND2 Text[ chinese_simplified ] = "' 不存在。"; Text[ russian ] = "' ."; Text[ polish ] = "nie istnieje."; - Text[ japanese ] = "」は存在していません。"; + Text[ japanese ] = "」はありません。"; Text[ chinese_traditional ] = ">不存在。"; Text[ arabic ] = "' ."; Text[ greek ] = "' ."; - Text[ korean ] = "' 이/가 존재하지 않음"; + Text[ korean ] = "' 이(가) 없습니다."; Text[ turkish ] = "' mevcut deil."; Text[ language_user1 ] = " "; - Text[ catalan ] = "' no existe."; + Text[ catalan ] = "' no existeix."; + Text[ thai ] = "' ไม่มีอยู่"; }; String STR_FLT_SGV { @@ -211,3 +216,8 @@ String STR_FLT_SGV + + + + + diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src index b1cb48cc0ca5..33da30b9956b 100644 --- a/sw/source/ui/dialog/docstdlg.src +++ b/sw/source/ui/dialog/docstdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: docstdlg.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: fme $ $Date: 2002-08-13 07:15:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di pagine:" ; Text [ portuguese_brazilian ] = "N?ero de p?ginas:" ; Text [ portuguese ] = "Nmero de pginas:" ; - Text [ finnish ] = "Sivujen m??r?:" ; + Text [ finnish ] = "Sivujen mr:" ; Text [ danish ] = "Antal sider:" ; Text [ french ] = "Nombre de pages :" ; Text [ swedish ] = "Antal sidor:" ; @@ -89,14 +89,15 @@ TabPage TP_DOC_STAT Text[ chinese_simplified ] = "页数："; Text[ russian ] = " :"; Text[ polish ] = "Liczba stron:"; - Text[ japanese ] = "ﾍﾟｰｼﾞ総数:"; + Text[ japanese ] = "ページ総数:"; Text[ chinese_traditional ] = "頁數："; Text[ arabic ] = " :"; Text[ greek ] = " :"; - Text[ korean ] = "쪽 수:"; + Text[ korean ] = "페이지 수:"; Text[ turkish ] = "Sayfa:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero de pginas:"; + Text[ catalan ] = "Nombre de pgines:"; + Text[ thai ] = "จำนวนหน้า:"; }; FixedText FT_TABLE { @@ -108,7 +109,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di tabelle:" ; Text [ portuguese_brazilian ] = "N?ero de tabelas:" ; Text [ portuguese ] = "Nmero de tabelas:" ; - Text [ finnish ] = "Taulukoiden m??r?:" ; + Text [ finnish ] = "Taulukoiden mr:" ; Text [ danish ] = "Antal tabeller:" ; Text [ french ] = "Nombre de tableaux :" ; Text [ swedish ] = "Antal tabeller:" ; @@ -123,10 +124,11 @@ TabPage TP_DOC_STAT Text[ chinese_traditional ] = "表格數目："; Text[ arabic ] = " :"; Text[ greek ] = " :"; - Text[ korean ] = "표 개수:"; + Text[ korean ] = "표 수:"; Text[ turkish ] = "Tablo:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero de tablas:"; + Text[ catalan ] = "Nombre de taules:"; + Text[ thai ] = "จำนวนตาราง:"; }; FixedText FT_GRF { @@ -138,7 +140,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di immagini:" ; Text [ portuguese_brazilian ] = "N?ero de gr?ficos:" ; Text [ portuguese ] = "Nmero de imagens:" ; - Text [ finnish ] = "Kuvien m??r?:" ; + Text [ finnish ] = "Kuvien mr:" ; Text [ danish ] = "Antal billeder:" ; Text [ french ] = "Nombre d'images :" ; Text [ swedish ] = "Antal grafikobjekt:" ; @@ -147,16 +149,17 @@ TabPage TP_DOC_STAT Text [ english_us ] = "Number of Graphics:" ; Left = TRUE ; Text[ chinese_simplified ] = "图形数目："; - Text[ russian ] = " :"; + Text[ russian ] = " :"; Text[ polish ] = "Liczba grafik:"; Text[ japanese ] = "図の数:"; Text[ chinese_traditional ] = "數目 圖形："; Text[ arabic ] = " :"; Text[ greek ] = " :"; - Text[ korean ] = "그래픽 개수:"; + Text[ korean ] = "그림 수:"; Text[ turkish ] = "Grafik:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero de imgenes:"; + Text[ catalan ] = "Nombre d'imatges:"; + Text[ thai ] = "จำนวนกราฟิค:"; }; FixedText FT_OLE { @@ -168,7 +171,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di oggetti OLE:" ; Text [ portuguese_brazilian ] = "N?ero de objetos OLE:" ; Text [ portuguese ] = "Nmero de objectos OLE:" ; - Text [ finnish ] = "OLE-objektien m??r?:" ; + Text [ finnish ] = "OLE-objektien mr:" ; Text [ danish ] = "Antal OLE-objekter:" ; Text [ french ] = "Nombre d'objets OLE :" ; Text [ swedish ] = "Antal OLE-objekt:" ; @@ -179,14 +182,15 @@ TabPage TP_DOC_STAT Text[ chinese_simplified ] = "OLE 对象数目："; Text[ russian ] = " OL:"; Text[ polish ] = "Liczba obiektw OLE:"; - Text[ japanese ] = "OLE ｵﾌﾞｼﾞｪｸﾄの数:"; + Text[ japanese ] = "OLE オブジェクトの数:"; Text[ chinese_traditional ] = "數目 OLE-物件："; Text[ arabic ] = " OLE:"; Text[ greek ] = " OLE:"; - Text[ korean ] = "OLE 개체 개수:"; + Text[ korean ] = "OLE 개체 수:"; Text[ turkish ] = "OLE nesneleri:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero de objetos OLE:"; + Text[ catalan ] = "Nombre d'objectes OLE:"; + Text[ thai ] = "จำนวนวัตถุ OLE :"; }; FixedText FT_PARA { @@ -198,7 +202,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di paragrafi:" ; Text [ portuguese_brazilian ] = "N?ero de par?grafos:" ; Text [ portuguese ] = "Nmero de pargrafos:" ; - Text [ finnish ] = "Kappaleiden m??r?:" ; + Text [ finnish ] = "Kappaleiden mr:" ; Text [ danish ] = "Antal afsnit:" ; Text [ french ] = "Nombre de paragraphes :" ; Text [ swedish ] = "Antal stycken:" ; @@ -213,10 +217,11 @@ TabPage TP_DOC_STAT Text[ chinese_traditional ] = "數目 段落："; Text[ arabic ] = " :"; Text[ greek ] = " :"; - Text[ korean ] = "단락 개수:"; + Text[ korean ] = "단락 수:"; Text[ turkish ] = "Paragraf:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero de prrafos:"; + Text[ catalan ] = "Nombre de pargrafs:"; + Text[ thai ] = "จำนวนย่อหน้า:"; }; FixedText FT_WORD { @@ -228,7 +233,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di parole:" ; Text [ portuguese_brazilian ] = "N?ero de palavras:" ; Text [ portuguese ] = "Nmero de palavras:" ; - Text [ finnish ] = "Sanam??r?:" ; + Text [ finnish ] = "Sanamr:" ; Text [ danish ] = "Antal ord:" ; Text [ french ] = "Nombre de mots :" ; Text [ swedish ] = "Antal ord:" ; @@ -246,7 +251,8 @@ TabPage TP_DOC_STAT Text[ korean ] = "단어 수:"; Text[ turkish ] = "Szck:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero de palabras:"; + Text[ catalan ] = "Nombre de paraules:"; + Text[ thai ] = "จำนวนคำ:"; }; FixedText FT_CHAR { @@ -258,7 +264,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di caratteri:" ; Text [ portuguese_brazilian ] = "N?ero de caracteres:" ; Text [ portuguese ] = "Nmero de caracteres:" ; - Text [ finnish ] = "Merkkien m??r?:" ; + Text [ finnish ] = "Merkkien mr:" ; Text [ danish ] = "Antal tegn:" ; Text [ french ] = "Nombre de caractres :" ; Text [ swedish ] = "Antal tecken:" ; @@ -267,7 +273,7 @@ TabPage TP_DOC_STAT Text [ english_us ] = "Number of Characters:" ; Left = TRUE ; Text[ chinese_simplified ] = "字符数目："; - Text[ russian ] = " :"; + Text[ russian ] = " :"; Text[ polish ] = "Liczba znakw:"; Text[ japanese ] = "文字数:"; Text[ chinese_traditional ] = "數目 字元："; @@ -276,7 +282,8 @@ TabPage TP_DOC_STAT Text[ korean ] = "문자 수:"; Text[ turkish ] = "Karakter:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero de caracteres:"; + Text[ catalan ] = "Nombre de carcters:"; + Text[ thai ] = "จำนวนตัวอักขระ:"; }; FixedText FT_LINE { @@ -300,11 +307,12 @@ TabPage TP_DOC_STAT Text[ chinese_traditional ] = "數目 行："; Text[ arabic ] = " :"; Text[ greek ] = " :"; - Text[ korean ] = "행 개수:"; + Text[ korean ] = "줄 수:"; Text[ turkish ] = "Satr:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero de lneas:"; - Text[ finnish ] = "Rivien m??r?:"; + Text[ catalan ] = "Nombre de lnies:"; + Text[ finnish ] = "Rivien mr:"; + Text[ thai ] = "จำนวนบรรทัด:"; }; FixedText FT_PAGE_COUNT { @@ -367,9 +375,9 @@ TabPage TP_DOC_STAT Text [ swedish ] = "Uppd~atera" ; Text [ danish ] = "Opdater" ; Text [ italian ] = "Aggiorna" ; - Text [ spanish ] = "~Actualizar" ; + Text [ spanish ] = "Actualizar" ; Text [ french ] = "~Actualiser" ; - Text [ dutch ] = "~Actualiseren" ; + Text [ dutch ] = "~Bijwerken" ; Text[ chinese_simplified ] = "更新(~U)"; Text[ russian ] = ""; Text[ polish ] = "Aktualizuj"; @@ -380,8 +388,9 @@ TabPage TP_DOC_STAT Text[ korean ] = "업데이트(~U)"; Text[ turkish ] = "~Gncelle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Actualizar"; - Text[ finnish ] = "~P?ivit?"; + Text[ catalan ] = "~Actualitza"; + Text[ finnish ] = "~Pivit"; + Text[ thai ] = "~ปรับปรุง"; }; }; @@ -395,3 +404,10 @@ TabPage TP_DOC_STAT + + + + + + + diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index 0825708f0c74..73881e89dcc9 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: regionsw.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: os $ $Date: 2002-08-07 13:20:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1605,7 +1605,13 @@ void lcl_ReadSections( SwWrtShell& rSh, SfxMedium& rMedium, ComboBox& rBox ) case SOT_FORMATSTR_ID_STARWRITER_30: case SOT_FORMATSTR_ID_STARWRITERGLOB_50: case SOT_FORMATSTR_ID_STARWRITERGLOB_40: - ReadSw3->GetSectionList( rMedium, (SvStrings&) aArr ); + { + Sw3Reader* pRdr = (Sw3Reader*)ReadSw3; + Sw3Io* pOldIo = pRdr->GetSw3Io(); + pRdr->SetSw3Io( rSh.GetView().GetDocShell()->GetIoSystem() ); + pRdr->GetSectionList( rMedium, (SvStrings&) aArr ); + pRdr->SetSw3Io( pOldIo ); + } break; case SOT_FORMATSTR_ID_STARWRITER_60: case SOT_FORMATSTR_ID_STARWRITERGLOB_60: @@ -1710,7 +1716,6 @@ short SwInsertSectionTabDialog::Ok() aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.GetToken( 2, so3::cTokenSeperator ))); aRequest.Done(); } - return nRet; } diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src index 4dda833d5d9b..def52c0971a9 100644 --- a/sw/source/ui/dialog/regionsw.src +++ b/sw/source/ui/dialog/regionsw.src @@ -2,9 +2,9 @@ * * $RCSfile: regionsw.src,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: os $ $Date: 2002-09-10 14:22:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,23 +74,23 @@ Text [ dutch ] = "~Bereik" ; \ Text [ english_us ] = "~Section" ; \ Text [ italian ] = "~Sezione" ; \ - Text [ spanish ] = "r~ea" ; \ + Text [ spanish ] = "~Seccin" ; \ Text [ french ] = "~Section" ; \ Text [ swedish ] = "~Omrde" ; \ Text [ danish ] = "Omrde" ; \ Text [ portuguese_brazilian ] = "Berei~ch" ; \ Text [ portuguese ] = "Seco" ; \ Text[ chinese_simplified ] = "区域(~S)"; \ - Text[ russian ] = ""; \ + Text[ russian ] = ""; \ Text[ polish ] = "Sekcja"; \ Text[ japanese ] = "範囲(~S)"; \ - Text[ language_user1 ] = ": - -"; \ + Text[ language_user1 ] = "; : - -"; \ Text[ chinese_traditional ] = "區域(~S)"; \ Text[ arabic ] = ""; \ Text[ greek ] = "~"; \ - Text[ korean ] = "영역(~S)"; \ + Text[ korean ] = "구역(~S)"; \ Text[ turkish ] = "Blm"; \ - Text[ finnish ] = "~Osio"; \ + Text[ finnish ] = "Osa"; \ Text[ catalan ] = "~Secci"; \ Text[ thai ] = "~ส่วน"; @@ -101,7 +101,7 @@ Text [ italian ] = "Nascondi" ; \ Text [ portuguese_brazilian ] = "~Oculto" ; \ Text [ portuguese ] = "~Ocultar" ; \ - Text [ finnish ] = "~Piilotettu" ; \ + Text [ finnish ] = "Piilotettu" ; \ Text [ danish ] = "Skjul" ; \ Text [ french ] = "~Masquer" ; \ Text [ swedish ] = "~Dlj" ; \ @@ -134,10 +134,10 @@ Text [ dutch ] = "Verbergen" ; \ Text [ spanish ] = "Ocultar" ; \ Text [ english_us ] = "Hide" ; \ - Text[ chinese_simplified ] = "隐入"; \ + Text[ chinese_simplified ] = "隐藏"; \ Text[ russian ] = ""; \ Text[ polish ] = "Ukryj"; \ - Text[ japanese ] = "非表示"; \ + Text[ japanese ] = "表示しない"; \ Text[ chinese_traditional ] = "隱入"; \ Text[ arabic ] = ""; \ Text[ greek ] = ""; \ @@ -149,8 +149,8 @@ #define CB_CONDITION_TEXT \ Text = "Mi~t Bedingung" ; \ Text [ English ] = "~With condition" ; \ - Text [ english_us ] = "~With condition" ; \ - Text [ italian ] = "Con condizione" ; \ + Text [ english_us ] = "~With Condition" ; \ + Text [ italian ] = "Con condi~zione" ; \ Text [ spanish ] = "Con condicin" ; \ Text [ french ] = "Sous ~condition" ; \ Text [ dutch ] = "~Met conditie" ; \ @@ -158,16 +158,16 @@ Text [ danish ] = "Med betingelse" ; \ Text [ portuguese ] = "~Com condio" ; \ Text [ portuguese_brazilian ] = "M~it Bedingung" ; \ - Text[ chinese_simplified ] = "带条件(~W)"; \ + Text[ chinese_simplified ] = "附加条件(~W)"; \ Text[ russian ] = " "; \ Text[ polish ] = "Uwzgldniajc warunek"; \ Text[ japanese ] = "条件付き(~W)"; \ - Text[ chinese_traditional ] = "有條件(~W)"; \ + Text[ chinese_traditional ] = "附加條件(~W)"; \ Text[ arabic ] = ""; \ Text[ greek ] = " ~"; \ - Text[ korean ] = "조건과 함께(~W)"; \ + Text[ korean ] = "다음의 조건을 포함(~W)"; \ Text[ turkish ] = "Koul"; \ - Text[ finnish ] = "~Ehdolla"; \ + Text[ finnish ] = "Ehdolla"; \ Text[ catalan ] = "Amb ~condici"; \ Text[ thai ] = "~ด้วยเงื่อนไข"; @@ -206,7 +206,7 @@ Text[ dutch ] = "~Koppelen"; \ Text[ french ] = "~Lier"; \ Text[ spanish ] = "~Vnculo"; \ - Text[ finnish ] = "~Linkki"; \ + Text[ finnish ] = "Linkit"; \ Text[ italian ] = "~Collegamento"; \ Text[ danish ] = "~Kd"; \ Text[ swedish ] = "~Lnka"; \ @@ -218,7 +218,7 @@ Text[ turkish ] = "Balant"; \ Text[ arabic ] = ""; \ Text[ catalan ] = "En~lla"; \ - Text[ korean ] = "링크(~L)"; \ + Text[ korean ] = "연결(~L)"; \ Text[ thai ] = "เ~ชื่อมโยง"; #define CB_DDE_TEXT \ @@ -242,7 +242,7 @@ Text[ greek ] = "~DDE"; \ Text[ korean ] = "DD~E"; \ Text[ turkish ] = "DDE"; \ - Text[ finnish ] = "DD~E"; \ + Text[ finnish ] = "DDE"; \ Text[ catalan ] = "DD~E"; \ Text[ thai ] = "DD~E"; @@ -251,7 +251,7 @@ Text [ English ] = "DDE command" ; \ Text [ english_us ] = "DDE ~command" ; \ Text [ italian ] = "Comando DDE" ; \ - Text [ spanish ] = "~Comando DDE" ; \ + Text [ spanish ] = "~Orden DDE" ; \ Text [ french ] = "Commande ~DDE" ; \ Text [ dutch ] = "~DDE-opdracht" ; \ Text [ swedish ] = "DDE-~kommando" ; \ @@ -265,9 +265,9 @@ Text[ chinese_traditional ] = "DDE - 指令(~C)"; \ Text[ arabic ] = " DDE"; \ Text[ greek ] = "~ DDE"; \ - Text[ korean ] = "DDE－명령(~C)"; \ + Text[ korean ] = "DDE 명령(~C)"; \ Text[ turkish ] = "DDE komutu"; \ - Text[ finnish ] = "~DDE-komento"; \ + Text[ finnish ] = "DDE-komento"; \ Text[ catalan ] = "~Ordre DDE"; \ Text[ thai ] = "~คำสั่ง DDE "; @@ -292,7 +292,7 @@ Text[ greek ] = "~ "; \ Text[ korean ] = "파일 이름(~F)"; \ Text[ turkish ] = "D~osya ad"; \ - Text[ finnish ] = "~Tiedoston nimi"; \ + Text[ finnish ] = "Tiedoston nimi"; \ Text[ catalan ] = "Nom del ~fitxer"; \ Text[ thai ] = "ชื่อแ~ฟ้ม"; @@ -381,16 +381,16 @@ Text[ russian ] = ""; \ Text[ greek ] = "With password"; \ Text[ dutch ] = "~Met wachtwoord"; \ - Text[ french ] = "Avec mot de passe"; \ - Text[ spanish ] = "Con contrasea"; \ - Text[ finnish ] = "~Mys salasana"; \ + Text[ french ] = "Avec mot de ~passe"; \ + Text[ spanish ] = "Con c~ontrasea"; \ + Text[ finnish ] = "Mys salasana"; \ Text[ italian ] = "Con pass~word"; \ Text[ danish ] = "~Med adgangskode"; \ Text[ swedish ] = "~Med lsenord"; \ Text[ polish ] = "~Za pomoc hasa"; \ Text[ portuguese_brazilian ] = "With password"; \ Text[ japanese ] = "パスワードを使用(~H)"; \ - Text[ korean ] = "패스워드 사용(~H)"; \ + Text[ korean ] = "암호 사용(~H)"; \ Text[ chinese_simplified ] = "使用密码(~H)"; \ Text[ chinese_traditional ] = "採用密碼(~H)"; \ Text[ turkish ] = "With password"; \ @@ -415,12 +415,12 @@ ModalDialog MD_EDIT_REGION Text [ italian ] = "Modifica sezioni" ; Text [ portuguese_brazilian ] = "Editar Se??s" ; Text [ portuguese ] = "Editar seces" ; - Text [ finnish ] = "Muokkaa osioita" ; + Text [ finnish ] = "Muokkaa osia" ; Text [ danish ] = "Rediger omrder" ; Text [ french ] = "dition des sections" ; Text [ swedish ] = "Redigera omrden" ; Text [ dutch ] = "Bereiken bewerken" ; - Text [ spanish ] = "Modificar reas" ; + Text [ spanish ] = "Editar secciones" ; Text [ english_us ] = "Edit Sections" ; Moveable = TRUE ; FixedLine FL_NAME @@ -434,22 +434,22 @@ ModalDialog MD_EDIT_REGION Text [ italian ] = "Sezione" ; Text [ portuguese_brazilian ] = "se??o" ; Text [ portuguese ] = "Seco" ; - Text [ finnish ] = "Osio" ; + Text [ finnish ] = "Osa" ; Text [ danish ] = "Omrde" ; Text [ french ] = "Section" ; Text [ swedish ] = "Omrde" ; Text [ dutch ] = "Bereik" ; - Text [ spanish ] = "rea" ; + Text [ spanish ] = "Seccin" ; Text [ english_us ] = "Section" ; Text[ chinese_simplified ] = "区域"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Obszar"; Text[ japanese ] = "範囲"; - Text[ language_user1 ] = "? ?- -"; + Text[ language_user1 ] = "; ? ?- -"; Text[ chinese_traditional ] = "區域"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "범위"; + Text[ korean ] = "구역"; Text[ turkish ] = "Blm"; Text[ catalan ] = "Secci"; Text[ thai ] = "ส่วน"; @@ -659,7 +659,7 @@ ModalDialog MD_EDIT_REGION Text[ chinese_traditional ] = "選項(~O)"; Text[ arabic ] = "..."; Text[ turkish ] = "Seenekler..."; - Text[ finnish ] = "~Asetukset"; + Text[ finnish ] = "~Asetukset..."; Text[ catalan ] = "~Opcions..."; Text[ thai ] = "~ตัวเลือก..."; }; @@ -675,21 +675,21 @@ ModalDialog MD_EDIT_REGION Text [ italian ] = "Ri~muovi" ; Text [ portuguese_brazilian ] = "~Dispensar" ; Text [ portuguese ] = "~Remover" ; - Text [ finnish ] = "~Peruuta" ; + Text [ finnish ] = "~Kumoa" ; Text [ danish ] = "Ophv" ; Text [ french ] = "~liminer" ; Text [ swedish ] = "Upphv" ; Text [ dutch ] = "~Opheffen" ; - Text [ spanish ] = "An~ular" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "Remove" ; Text[ chinese_simplified ] = "移除(~U)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Usu"; Text[ japanese ] = "解除(~U)"; Text[ chinese_traditional ] = "移除(~U)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "실행 취소(~U)"; + Text[ korean ] = "제거(~U)"; Text[ turkish ] = "Kaldr"; Text[ catalan ] = "~Desfs"; Text[ thai ] = "เ~ลิกทำ"; @@ -701,13 +701,13 @@ ModalDialog MD_EDIT_REGION TabStop = TRUE ; }; Text[ chinese_simplified ] = "编辑区域"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Edytuj sekcje"; Text[ japanese ] = "範囲の編集"; Text[ chinese_traditional ] = "編輯區域"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "영역 편집"; + Text[ korean ] = "구역 편집"; Text[ turkish ] = "Blmleri dzenle"; Text[ catalan ] = "Edita les seccions"; Text[ thai ] = "แก้ไขส่วน"; @@ -743,12 +743,12 @@ String STR_REG_DUPLICATE Text [ italian ] = "Nome sezione modificato:" ; Text [ portuguese_brazilian ] = "Nome da se??o alterado:" ; Text [ portuguese ] = "Nome da seco mudou:" ; - Text [ finnish ] = "Osion nimi muutettu:" ; + Text [ finnish ] = "Osan nimi muutettu:" ; Text [ danish ] = "Omrdenavn ndret:" ; Text [ french ] = "Nom de section modifi :" ; Text [ swedish ] = "Omrdesnamn ndrat:" ; Text [ dutch ] = "Bereiknaam gewijzigd:" ; - Text [ spanish ] = "Nombre de rea modificado:" ; + Text [ spanish ] = "Nombre de la seccin modificada:" ; Text [ english_us ] = "Section name changed:" ; Text[ chinese_simplified ] = "区域名称已经改变："; Text[ russian ] = " :"; @@ -757,7 +757,7 @@ String STR_REG_DUPLICATE Text[ chinese_traditional ] = "區域名稱已經變更："; Text[ arabic ] = " :"; Text[ greek ] = " :"; - Text[ korean ] = "영역 이름이 변경되었습니다:"; + Text[ korean ] = "구역 이름이 변경되었습니다:"; Text[ turkish ] = "Blm ad deitirildi:"; Text[ catalan ] = "El nom de la secci ha canviat:"; Text[ thai ] = "เปลี่ยนชื่อส่วน:"; @@ -770,21 +770,21 @@ String STR_INFO_DUPLICATE Text [ italian ] = "Nome area doppio" ; Text [ portuguese_brazilian ] = "Nome da se??o duplo" ; Text [ portuguese ] = "Nome de seco duplo" ; - Text [ finnish ] = "Kopioi osion nimi" ; + Text [ finnish ] = "Kopioi osan nimi" ; Text [ danish ] = "Dobbelt omrdenavn" ; Text [ french ] = "Dupliquer nom de la section" ; Text [ swedish ] = "Dubbelt omrdesnamn" ; Text [ dutch ] = "Dubbele bereiknaam" ; - Text [ spanish ] = "Nombre doble de rea" ; + Text [ spanish ] = "Nombre doble de la seccin" ; Text [ english_us ] = "Duplicate section name" ; Text[ chinese_simplified ] = "双区域名称"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zduplikowane nazwy sekcji"; Text[ japanese ] = "重複した範囲名"; Text[ chinese_traditional ] = "雙區域名稱"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "중복된 영역이름"; + Text[ korean ] = "구역 이름 복제"; Text[ turkish ] = "Blm ad daha nce kullanld"; Text[ catalan ] = "Nom de secci duplicat"; Text[ thai ] = "ทำชื่อส่วนซ้ำ"; @@ -795,25 +795,25 @@ QueryBox QB_CONNECT DefButton = WB_DEF_NO ; Message = "Eine Dateiverbindung lscht den aktuellen Inhalt des Bereichs. Trotzdem verbinden ?" ; Message [ English ] = "A file connection will delete the content of the current section. Continue ?" ; - Message [ dutch ] = "Door een bestandsverbinding wordt de inhoud van het actuele bereik verwijderd. Toch verbinden?" ; + Message [ dutch ] = "Door een bestandsverbinding is de inhoud van het huidige bereik verwijderd. Toch verbinden?" ; Message [ english_us ] = "A file connection will delete the contents of the current section. Connect anyway?" ; Message [ italian ] = "Un collegamento di file cancella il contenuto dell'area. Volete collegare lo stesso?" ; - Message [ spanish ] = "Un enlace de archivos borra el contenido actual del rea. Enlazar de todos modos?" ; + Message [ spanish ] = "Una conexin de archivos borrar el contenido de la seccin actual. Conectar de todos modos?" ; Message [ french ] = "Une connexion supprime le contenu de la section courante. Connecter quand mme?" ; Message [ swedish ] = "En filfrbindelse raderar det aktuella innehllet i omrdet. Frbinda nd?" ; Message [ danish ] = "En filforbindelse sletter omrdets aktuelle indhold. Vil du forbinde alligevel?" ; Message [ portuguese ] = "Uma ligao de ficheiros elimina o contedo da actual seco. Mesmo assim, ligar?" ; Message [ portuguese_brazilian ] = "Eine Dateiverbindung l?cht den aktuellen Inhalt des Bereichs. Trotzdem verbinden ?" ; Message[ chinese_simplified ] = "使用文件连接会删除当前区域内的内容。您还是要执行连接命令？"; - Message[ russian ] = " . ?"; + Message[ russian ] = " . , ?"; Message[ polish ] = "Poczenie pliku usunie aktualn zawarto obszaru. Mimo to poczy?"; Message[ japanese ] = "ファイルの接続は現在の範囲内容を削除します。接続してもかまいませんか。"; Message[ chinese_traditional ] = "使用檔案連結會刪除區域內目前的內容。您還是要執行連結？"; Message[ arabic ] = " . ߿"; Message[ greek ] = " . ;"; - Message[ korean ] = "파일 연결은 현재 영역 내용을 삭제하게 됩니다 . 그래도 연결하겠습니까?"; + Message[ korean ] = "파일을 연결하면 현재 구역 내용이 삭제됩니다. 그래도 연결하시겠습니까?"; Message[ turkish ] = "Bir dosya balants, u anki blm ieriini silecek? Balant yine de yaplsn m?"; - Message[ finnish ] = "Tiedostojen yhdistminen tuhoaa nykyisen valinnan sislln. Yhdistetnk kuitenkin?"; + Message[ finnish ] = "Tiedostojen yhdistminen tuhoaa nykyisen osan sislln. Kytketnk kuitenkin?"; Message[ catalan ] = "Una connexi de fitxers suprimir el contingut de la secci actual. Voleu realitzar la connexi igualment?"; Message[ thai ] = "การเชื่อมต่อแฟ้มจะลบเนื้อหาของส่วนปัจจุบัน เชื่อมต่อหรือไม่?"; }; @@ -823,7 +823,7 @@ InfoBox REG_WRONG_PASSWORD DEFBUTTON = WB_DEF_OK ; Message = "Es wurde ein falsches Kennwort eingegeben." ; Message [ English ] = "A wrong password was specified." ; - Message [ dutch ] = "Er werd een verkeerd wachtwoord aangegeven" ; + Message [ dutch ] = "Er is een verkeerd wachtwoord opgegeven" ; Message [ english_us ] = "The password entered is invalid." ; Message [ italian ] = " stata impostata una password errata" ; Message [ spanish ] = "Se emple una contrasea falsa." ; @@ -839,7 +839,7 @@ InfoBox REG_WRONG_PASSWORD Message[ chinese_traditional ] = "輸入的密碼無效。"; Message[ arabic ] = " ."; Message[ greek ] = " ."; - Message[ korean ] = "틀린 코드 워드가 입력되었습니다."; + Message[ korean ] = "입력한 암호는 잘못되었습니다."; Message[ turkish ] = "Girilen ifre yanl."; Message[ finnish ] = "Annettu salasana on virheellinen."; Message[ catalan ] = "S'ha introdut una contrasenya incorrecta."; @@ -859,7 +859,7 @@ InfoBox REG_WRONG_PASSWD_REPEAT Message [ italian ] = "La password non stata impostata." ; Message [ spanish ] = "No se ha definido la contrasea." ; Message [ french ] = "Vous n'avez pas saisi de mot de passe !" ; - Message [ dutch ] = "Er werd geen wachtwoord gedefinieerd." ; + Message [ dutch ] = "Er is geen wachtwoord gedefinieerd." ; Message[ chinese_simplified ] = "还未设定密码。"; Message[ russian ] = " ."; Message[ polish ] = "Brak hasa."; @@ -867,7 +867,7 @@ InfoBox REG_WRONG_PASSWD_REPEAT Message[ chinese_traditional ] = "還未設定一個密碼。"; Message[ arabic ] = " ."; Message[ greek ] = " ."; - Message[ korean ] = "패스워드가 지정되지 않았습니다."; + Message[ korean ] = "암호가 설정되지 않았습니다."; Message[ turkish ] = "ifre belirlenmedi."; Message[ finnish ] = "Salasanaa ei ole mritetty."; Message[ catalan ] = "No s'ha definit la contrasenya."; @@ -883,12 +883,12 @@ TabDialog DLG_INSERT_SECTION Text [ italian ] = "Inserisci sezioni" ; Text [ portuguese_brazilian ] = "Inserir Se??s" ; Text [ portuguese ] = "Inserir seco" ; - Text [ finnish ] = "Lis osio" ; + Text [ finnish ] = "Lis osa" ; Text [ danish ] = "Indst omrde" ; Text [ french ] = "Insertion d'une section" ; Text [ swedish ] = "Infoga omrde" ; Text [ dutch ] = "Bereik invoegen" ; - Text [ spanish ] = "Insertar rea" ; + Text [ spanish ] = "Insertar una seccin" ; Text [ english_us ] = "Insert Section" ; OutputSize = TRUE ; SVLook = TRUE ; @@ -906,23 +906,23 @@ TabDialog DLG_INSERT_SECTION Text [ ENGLISH ] = "Section" ; Text[ english_us ] = "Section"; Text[ portuguese ] = "Seco"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Bereik"; Text[ french ] = "Section"; - Text[ spanish ] = "rea"; + Text[ spanish ] = "Seccin"; Text[ italian ] = "Sezione"; Text[ danish ] = "Omrde"; Text[ swedish ] = "Omrde"; Text[ polish ] = "Obszar"; Text[ portuguese_brazilian ] = "Section"; Text[ japanese ] = "範囲"; - Text[ korean ] = "영역"; + Text[ korean ] = "구역"; Text[ chinese_simplified ] = "区域"; Text[ chinese_traditional ] = "區域"; Text[ arabic ] = ""; Text[ turkish ] = "Blm"; - Text[ finnish ] = "Osio"; + Text[ finnish ] = "Osa"; Text[ catalan ] = "Secci"; Text[ thai ] = "ส่วน"; }; @@ -936,7 +936,7 @@ TabDialog DLG_INSERT_SECTION Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -944,7 +944,7 @@ TabDialog DLG_INSERT_SECTION Text [ spanish ] = "Columnas" ; Text [ english_us ] = "Columns" ; Text[ chinese_simplified ] = "栏"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Kolumny"; Text[ japanese ] = "段組み"; Text[ chinese_traditional ] = "欄"; @@ -992,11 +992,11 @@ TabDialog DLG_INSERT_SECTION Text [ ENGLISH ] = "Foot-/Endnotes" ; Text[ english_us ] = "Footnotes/Endnotes"; Text[ portuguese ] = "Notas de rodap/finais"; - Text[ russian ] = "/ "; + Text[ russian ] = "/ "; Text[ greek ] = "/ "; Text[ dutch ] = "Voet-/eindnoten"; Text[ french ] = "Notes de bas de page / de fin"; - Text[ spanish ] = "Notas al pie/finales"; + Text[ spanish ] = "Notas al pie / notas finales"; Text[ italian ] = "Note a pi di pagina/di chiusura"; Text[ danish ] = "Fod-/slutnoter"; Text[ swedish ] = "Fot-/slutnoter"; @@ -1008,7 +1008,7 @@ TabDialog DLG_INSERT_SECTION Text[ chinese_traditional ] = "註腳和尾註"; Text[ arabic ] = " / "; Text[ turkish ] = "Dipnot/Sonnot"; - Text[ finnish ] = "Ala-/loppuviitteet"; + Text[ finnish ] = "Ala- ja loppuviitteet"; Text[ catalan ] = "Notes al peu/Notes finals"; Text[ thai ] = "เชิงอรรถ/อ้างอิงท้ายเรื่อง"; }; @@ -1041,11 +1041,11 @@ TabDialog DLG_INSERT_SECTION Text[ catalan ] = "Insereix"; Text[ thai ] = "แทรก"; }; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ polish ] = "Wstaw obszar"; Text[ japanese ] = "範囲の挿入"; - Text[ korean ] = "영역 삽입"; + Text[ korean ] = "구역 삽입"; Text[ chinese_simplified ] = "插入区域"; Text[ chinese_traditional ] = "插入區域"; Text[ arabic ] = " "; @@ -1070,7 +1070,7 @@ TabPage TP_INSERT_SECTION Text [ English ] = "New section" ; Text [ english_us ] = "New section" ; Text [ italian ] = "Nuova sezione" ; - Text [ spanish ] = "Nueva rea" ; + Text [ spanish ] = "Seccin nueva" ; Text [ french ] = "Nouvelle section" ; Text [ dutch ] = "Nieuw bereik" ; Text [ swedish ] = "Nytt omrde" ; @@ -1078,15 +1078,15 @@ TabPage TP_INSERT_SECTION Text [ portuguese_brazilian ] = "Neuer Bereich" ; Text [ portuguese ] = "Nova seco" ; Text[ chinese_simplified ] = "新区域"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nowy obszar"; Text[ japanese ] = "新しい範囲"; Text[ chinese_traditional ] = "新區域"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "새 범위"; + Text[ korean ] = "새 구역"; Text[ turkish ] = "Yeni blm"; - Text[ finnish ] = "Uusi osio"; + Text[ finnish ] = "Uusi osa"; Text[ catalan ] = "Nova secci"; Text[ thai ] = "ส่วนใหม่"; }; @@ -1179,10 +1179,10 @@ TabPage TP_INSERT_SECTION TabStop = TRUE ; Text = "~Schtzen" ; Text [ English ] = "Protect" ; - Text[ language_user1 ] = "() EN; - - - -"; + Text[ language_user1 ] = "(?; () EN; - - - -"; Text[ english_us ] = "~Protect"; Text[ portuguese ] = "Pro~teger"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "~Beveiligen"; Text[ french ] = "Protger"; @@ -1269,7 +1269,7 @@ TabDialog DLG_SECTION_PROPERTIES Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -1277,7 +1277,7 @@ TabDialog DLG_SECTION_PROPERTIES Text [ spanish ] = "Columnas" ; Text [ english_us ] = "Columns" ; Text[ chinese_simplified ] = "栏"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Kolumny"; Text[ japanese ] = "段組み"; Text[ chinese_traditional ] = "欄"; @@ -1325,11 +1325,11 @@ TabDialog DLG_SECTION_PROPERTIES Text [ ENGLISH ] = "Foot-/Endnotes" ; Text[ english_us ] = "Footnotes/Endnotes"; Text[ portuguese ] = "Notas de rodap/finais"; - Text[ russian ] = "/ "; + Text[ russian ] = "/ "; Text[ greek ] = "/ "; Text[ dutch ] = "Voet-/eindnoten"; Text[ french ] = "Notes de bas de page / de fin"; - Text[ spanish ] = "Notas al pie/finales"; + Text[ spanish ] = "Notas al pie / notas finales"; Text[ italian ] = "Note a pi di pagina/di chiusura"; Text[ danish ] = "Fod-/slutnoter"; Text[ swedish ] = "Fot-/slutnoter"; @@ -1341,7 +1341,7 @@ TabDialog DLG_SECTION_PROPERTIES Text[ chinese_traditional ] = "註腳和尾註"; Text[ arabic ] = " / "; Text[ turkish ] = "Dipnot/Sonnot"; - Text[ finnish ] = "Ala-/loppuviitteet"; + Text[ finnish ] = "Ala- ja loppuviitteet"; Text[ catalan ] = "Notes al peu/Notes finals"; Text[ thai ] = "เชิงอรรถ/อ้างอิงท้ายเรื่อง"; }; @@ -1398,7 +1398,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "Przypisy dolne"; Text[ portuguese_brazilian ] = "Footnotes"; Text[ japanese ] = "脚注"; - Text[ korean ] = "바닥글"; + Text[ korean ] = "각주"; Text[ chinese_simplified ] = "注脚"; Text[ chinese_traditional ] = "註腳"; Text[ arabic ] = " "; @@ -1427,13 +1427,13 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "zbierz na kocu tekstu"; Text[ portuguese_brazilian ] = "Collect at end of text"; Text[ japanese ] = "文書末に挿入(~T)"; - Text[ korean ] = "텍스트 끝에 수집(~T)"; + Text[ korean ] = "문서 끝으로 모으기(~T)"; Text[ chinese_simplified ] = "在正文的结束位置收集(~T)"; Text[ chinese_traditional ] = "在內文的結束位置收集(~T)"; Text[ arabic ] = " "; Text[ turkish ] = "Metin sonunda topla"; - Text[ finnish ] = "Ke~r tekstin lopussa"; + Text[ finnish ] = "Ke~r tekstin loppuun"; Text[ catalan ] = "Recull al final del ~text"; Text[ thai ] = "เก็บรวบรว~มที่ท้ายข้อความ"; }; @@ -1446,7 +1446,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ English ] = "Restart number" ; Text[ english_us ] = "~Restart numbering"; Text[ portuguese ] = "~Reiniciar numerao"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = "~ "; Text[ dutch ] = "~Nieuwe nummering"; Text[ french ] = "Nouvelle numrotation"; @@ -1457,12 +1457,12 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "Uruchom ponownie numer"; Text[ portuguese_brazilian ] = "own number sequence"; Text[ japanese ] = "番号を新しく始める(~R)"; - Text[ korean ] = "번호 매기기 다시 시작(~R)"; + Text[ korean ] = "다시 번호 매기기(~R)"; Text[ chinese_simplified ] = "重新开始编号(~R)"; Text[ chinese_traditional ] = "重新編號(~R)"; Text[ arabic ] = " "; Text[ turkish ] = "Num. yeniden balat"; - Text[ finnish ] = "~Aloita numerointi uudestaan"; + Text[ finnish ] = "Aloita numerointi ~uudestaan"; Text[ catalan ] = "~Reinicia la numeraci"; Text[ thai ] = "เ~ริ่มลำดับตัวเลขใหม่"; }; @@ -1489,7 +1489,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "開始從(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "시작(~S)"; + Text[ korean ] = "시작 번호(~S)"; Text[ turkish ] = "Balang~"; Text[ finnish ] = "~Aloitus"; Text[ catalan ] = "~Inicia a"; @@ -1516,9 +1516,9 @@ TabPage TP_SECTION_FTNENDNOTES Text [ English ] = "Own format" ; Text[ english_us ] = "Custom ~format"; Text[ portuguese ] = "~Formato personalizado"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " ~"; - Text[ dutch ] = "Eigen ~formaat"; + Text[ dutch ] = "Eigen ~indeling"; Text[ french ] = "Format personnalis"; Text[ spanish ] = "formato propio"; Text[ italian ] = "Formato proprio"; @@ -1527,7 +1527,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "Format wasny"; Text[ portuguese_brazilian ] = "Own format"; Text[ japanese ] = "任意の書式(~F)"; - Text[ korean ] = "고유 서식(~F)"; + Text[ korean ] = "사용자 정의 서식(~F)"; Text[ chinese_simplified ] = "自定的格式(~F)"; Text[ chinese_traditional ] = "自訂格式(~F)"; Text[ arabic ] = " "; @@ -1561,7 +1561,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "之前(~F)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "전에(~F)"; + Text[ korean ] = "번호 앞(~F)"; Text[ turkish ] = "nnde"; Text[ catalan ] = "Ab~ans"; Text[ thai ] = "ก่อ~น"; @@ -1595,7 +1595,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ portuguese_brazilian ] = "Atr?s" ; Text [ portuguese ] = "A~trs" ; Text [ finnish ] = "Jl~keen" ; - Text [ danish ] = "Efter" ; + Text [ danish ] = "E~fter" ; Text [ french ] = "Aprs" ; Text [ swedish ] = "Ef~ter" ; Text [ dutch ] = "E~rachter" ; @@ -1609,7 +1609,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "之後(~E)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "후에(~E)"; + Text[ korean ] = "번호 뒤(~E)"; Text[ turkish ] = "nnde"; Text[ catalan ] = "D~esprs"; Text[ thai ] = "หลัง~จาก"; @@ -1663,23 +1663,23 @@ TabPage TP_SECTION_FTNENDNOTES Text[ english ] = "Collect at end of section"; Text[ english_us ] = "C~ollect at end of section"; Text[ portuguese ] = "Agrupar no ~final da seco"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " ~"; - Text[ dutch ] = "aan ~bereikseinde verzamelen"; + Text[ dutch ] = "aan einde van ~bereik verzamelen"; Text[ french ] = "Regrouper en fin de ~section"; - Text[ spanish ] = "recoger al final del rea"; + Text[ spanish ] = "~Reunir al final de la seccin"; Text[ italian ] = "Raccogli a fine sezione"; Text[ danish ] = "saml ved omrdets slutning"; Text[ swedish ] = "s~amla vid omrdets slut"; Text[ polish ] = "zbierz na kocu obszaru"; Text[ portuguese_brazilian ] = "Collect at end of section"; Text[ japanese ] = "範囲末に挿入(~O)"; - Text[ korean ] = "영역 끝에 수집(~O)"; + Text[ korean ] = "구역 끝으로 모음(~O)"; Text[ chinese_simplified ] = "在区域的结束位置收集(~O)"; Text[ chinese_traditional ] = "在區域的結束位置收集(~O)"; Text[ arabic ] = " "; Text[ turkish ] = "Blm sonunda topla"; - Text[ finnish ] = "Ke~r osion lopussa"; + Text[ finnish ] = "Ke~r osan loppuun"; Text[ catalan ] = "Recull al final de la secci"; Text[ thai ] = "เก็บร~วบรวมที่ท้ายส่วน"; }; @@ -1692,7 +1692,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ English ] = "Restart number" ; Text[ english_us ] = "~Restart numbering"; Text[ portuguese ] = "~Reiniciar numerao"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = "~ "; Text[ dutch ] = "Nieuwe n~ummering"; Text[ french ] = "Nouvelle numrotation"; @@ -1703,12 +1703,12 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "Uruchom ponownie numer"; Text[ portuguese_brazilian ] = "own number sequence"; Text[ japanese ] = "番号を新しく始める(~R)"; - Text[ korean ] = "번호 매기기 다시 시작(~R)"; + Text[ korean ] = "다시 번호 매기기(~R)"; Text[ chinese_simplified ] = "重新开始编号(~R)"; Text[ chinese_traditional ] = "重新編號(~R)"; Text[ arabic ] = " "; Text[ turkish ] = "Num. yeniden balat"; - Text[ finnish ] = "~Aloita numerointi uudestaan"; + Text[ finnish ] = "Aloita numerointi ~uudestaan"; Text[ catalan ] = "Rei~nicia la numeraci"; Text[ thai ] = "เ~ริ่มลำดับตัวเลขใหม่"; }; @@ -1735,7 +1735,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "開始從(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "시작(~S)"; + Text[ korean ] = "시작 번호(~S)"; Text[ turkish ] = "Balang~"; Text[ finnish ] = "~Aloitus"; Text[ catalan ] = "~Inicia a"; @@ -1762,18 +1762,18 @@ TabPage TP_SECTION_FTNENDNOTES Text [ English ] = "Own format" ; Text[ english_us ] = "Custom format"; Text[ portuguese ] = "Formato ~personalizado"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "~Eigen formaat"; + Text[ dutch ] = "~Eigen indeling"; Text[ french ] = "Format personnalis"; Text[ spanish ] = "formato propio"; Text[ italian ] = "Formato proprio"; - Text[ danish ] = "eget format"; + Text[ danish ] = "e~get format"; Text[ swedish ] = "~eget format"; Text[ polish ] = "Format wasny"; Text[ portuguese_brazilian ] = "Own format"; Text[ japanese ] = "任意の書式"; - Text[ korean ] = "사용자 서식"; + Text[ korean ] = "사용자 정의 서식"; Text[ chinese_simplified ] = "自定的格式"; Text[ chinese_traditional ] = "自訂格式"; Text[ arabic ] = " "; @@ -1794,7 +1794,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ portuguese_brazilian ] = "Antes" ; Text [ portuguese ] = "An~tes" ; Text [ finnish ] = "En~nen" ; - Text [ danish ] = "Fr" ; + Text [ danish ] = "F~r" ; Text [ french ] = "Avant" ; Text [ swedish ] = "~Fre" ; Text [ dutch ] = "~Ervoor" ; @@ -1808,7 +1808,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "之前(~F)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "앞에(~F)"; + Text[ korean ] = "번호 앞(~F)"; Text[ turkish ] = "nnde"; Text[ catalan ] = "Ab~ans"; Text[ thai ] = "ก่อ~น"; @@ -1853,7 +1853,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ portuguese_brazilian ] = "Atr?s" ; Text [ portuguese ] = "A~trs" ; Text [ finnish ] = "Jl~keen" ; - Text [ danish ] = "Efter" ; + Text [ danish ] = "~Efter" ; Text [ french ] = "Aprs" ; Text [ swedish ] = "Efte~r" ; Text [ dutch ] = "E~rachter" ; @@ -1867,7 +1867,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "之後(~E)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "후에(~E)"; + Text[ korean ] = "번호 뒤(~E)"; Text[ turkish ] = "Arkasnda"; Text[ catalan ] = "D~esprs"; Text[ thai ] = "หลัง~จาก"; @@ -1884,3 +1884,25 @@ TabPage TP_SECTION_FTNENDNOTES }; + + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src index 70a36d81f2ef..089a173f87c8 100644 --- a/sw/source/ui/dochdl/dochdl.src +++ b/sw/source/ui/dochdl/dochdl.src @@ -2,9 +2,9 @@ * * $RCSfile: dochdl.src,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: os $ $Date: 2002-11-11 10:56:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,12 +75,12 @@ String STR_NOGLOS1 TEXT [ italian ] = "Testo automatico per la sigla '" ; TEXT [ portuguese_brazilian ] = "Texto Autom?tico para Abrevia??o" ; TEXT [ portuguese ] = "AutoTexto para abreviatura '" ; - TEXT [ finnish ] = "Automaattinen teksti pikavalinnalle '" ; + TEXT [ finnish ] = "Automaattista teksti pikavalinnalle" ; TEXT [ danish ] = "AutoTekst til genvej '" ; TEXT [ french ] = "AutoTexte pour raccourci '" ; TEXT [ swedish ] = "AutoText till genvgen '" ; TEXT [ dutch ] = "AutoTekst voor afkortingen'" ; - TEXT [ spanish ] = "AutoTexto para la abreviatura '" ; + TEXT [ spanish ] = "Texto automtico para la abreviatura '" ; TEXT [ english_us ] = "AutoText for Shortcut '" ; TEXT[ chinese_simplified ] = "自动图文集的缩写 '"; TEXT[ russian ] = " '"; @@ -91,7 +91,7 @@ String STR_NOGLOS1 TEXT[ dutch ] = "AutoTekst voor afkortingen'"; TEXT[ chinese_simplified ] = "自动图文集的缩写 '"; TEXT[ greek ] = " '"; - TEXT[ korean ] = "자동텍 스트 바로가기 '"; + TEXT[ korean ] = "자동 텍스트 바로 가기 '"; TEXT[ turkish ] = "Otomatik metin ksaltmas '"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "AutoText per al nom curt '"; @@ -109,7 +109,7 @@ String STR_NOGLOS2 TEXT [ italian ] = "' non trovato." ; TEXT [ portuguese_brazilian ] = "' n?o encontrado." ; TEXT [ portuguese ] = "' no localizado." ; - TEXT [ finnish ] = "Kohdetta ' ei lydy." ; + TEXT [ finnish ] = "ei lydy." ; TEXT [ danish ] = "' blev ikke fundet." ; TEXT [ french ] = "' introuvable." ; TEXT [ swedish ] = "' hittades inte." ; @@ -137,25 +137,25 @@ String STR_NO_TABLE Text = "Eine Tabelle kann nicht in eine andere Tabelle eingefgt werden. Sie knnen die Daten jedoch einfgen, wenn sich der Cursor nicht in einer Tabelle befindet." ; Text [ english_us ] = "A table cannot be inserted into another table. However, you can paste the data into the document when the cursor is not in a table."; Text [ norwegian ] = "Inserting a table is impossible now." ; - Text [ italian ] = "Adesso impossibile inserire una tabella." ; + Text [ italian ] = "Impossibile inserire una tabella in un'altra tabella. Tuttavia potete inserire i dati nel documento quando il cursore non posizionato in una tabella." ; Text [ portuguese_brazilian ] = "Inserir a tabela ? agora imposs?vel." ; Text [ portuguese ] = "De momento no possvel inserir a tabela." ; Text [ finnish ] = "Tll hetkell taulukkoa ei voi list" ; Text [ danish ] = "Det er for tiden ikke muligt at indstte en tabel" ; - Text [ french ] = "Impossible d'insrer un tableau maintenant." ; - Text [ swedish ] = "En tabell kan inte infogas vid denna tidpunkt." ; + Text [ french ] = "Impossible d'insrer un tableau dans un autre tableau ! Vous pouvez toutefois insrer les donnes tant que le curseur ne se trouve pas dans un tableau." ; + Text [ swedish ] = "En tabell kan inte infogas i en annan tabell. Men du kan klistra in data i dokumentet om markren inte r placerad i en tabell." ; Text [ dutch ] = "Tabel kan op dit ogenblik niet worden ingevoegd." ; - Text [ spanish ] = "Actualmente no se puede insertar ninguna tabla." ; - Text[ chinese_simplified ] = "当前无法插入任何表格。"; - Text[ russian ] = " ."; + Text [ spanish ] = "No se puede insertar una tabla dentro de otra. Sin embargo, puede pegar los datos en el documento cuando el cursor no est en la tabla." ; + Text[ chinese_simplified ] = "在一个表格之内无法插入表格。如果鼠标不是位于一个表格之内，您也还是能够插入数据。"; + Text[ russian ] = " "; Text[ polish ] = "W tym momencie nie moe by wstawiona tabela."; - Text[ japanese ] = "現在、表の挿入はできません。"; - Text[ chinese_traditional ] = "目前無法插入任何表格。"; + Text[ japanese ] = "表を別の表に挿入することはできません。ただし、表以外の場所にカーソルを置けば、ドキュメントに表のデータを貼り付けることができます。"; + Text[ chinese_traditional ] = "表格無法插入其他表格中。但是當游標不在表格中時，您可以將資料貼到文件中。"; Text[ arabic ] = " ."; Text[ dutch ] = "Tabel kan op dit ogenblik niet worden ingevoegd."; - Text[ chinese_simplified ] = "当前无法插入任何表格。"; + Text[ chinese_simplified ] = "在一个表格之内无法插入表格。如果鼠标不是位于一个表格之内，您也还是能够插入数据。"; Text[ greek ] = " ."; - Text[ korean ] = "표를 삽입하는것이 현재 불가능합니다."; + Text[ korean ] = "표 안에 또 다른 표를 삽입할 수는 없으나 커서가 표 안에 놓여있지 않은 한 데이터는 표문서 안으로 삽입할 수 있습니다."; Text[ turkish ] = "u an tablo eklenemiyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "Ara no es pot inserir cap taula."; @@ -175,19 +175,19 @@ InfoBox MSG_ERR_INSERT_GLOS MESSAGE [ danish ] = "Det var ikke muligt at oprette AutoTeksten." ; MESSAGE [ french ] = "Impossible de crer l'AutoTexte." ; MESSAGE [ swedish ] = "AutoText kunde inte skapas." ; - MESSAGE [ dutch ] = "AutoTekst kon niet worden gemaakt" ; - MESSAGE [ spanish ] = "No se pudo crear el AutoTexto." ; + MESSAGE [ dutch ] = "AutoTekst kan niet worden gemaakt" ; + MESSAGE [ spanish ] = "No se pudo crear el Texto automtico." ; MESSAGE [ english_us ] = "AutoText could not be created." ; MESSAGE[ chinese_simplified ] = "无法建立自动图文集。"; - MESSAGE[ russian ] = " ."; + MESSAGE[ russian ] = " ."; MESSAGE[ polish ] = "Autotekst nie mg zosta utworzony."; MESSAGE[ japanese ] = "入力支援できません"; MESSAGE[ chinese_traditional ] = "無法建立自動圖文集。"; MESSAGE[ arabic ] = " ."; - MESSAGE[ dutch ] = "AutoTekst kon niet worden gemaakt"; + MESSAGE[ dutch ] = "AutoTekst kan niet worden gemaakt"; MESSAGE[ chinese_simplified ] = "无法建立自动图文集。"; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "자동 텍스트를 만들수 없습니다."; + MESSAGE[ korean ] = "자동 텍스트를 만들지 못했습니다."; MESSAGE[ turkish ] = "Otomatik metin oluturulamad."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "No s'ha pogut crear l'autotext."; @@ -199,26 +199,26 @@ InfoBox MSG_CLPBRD_FORMAT_ERROR MESSAGE = "Gewnschtes Zwischenablagen-Format steht nicht zur Verfgung." ; MESSAGE [ English ] = "Requested clipboard format is not available." ; MESSAGE [ norwegian ] = "Requested clipboard format is not available." ; - MESSAGE [ italian ] = "Il formato appunti richiesto non disponibile." ; + MESSAGE [ italian ] = "Il formato Appunti richiesto non disponibile." ; MESSAGE [ portuguese_brazilian ] = "Formato solicitado de clipboard n?o est? dispon?vel." ; MESSAGE [ portuguese ] = "Formato da rea de transferncia solicitado no se encontra disponvel." ; MESSAGE [ finnish ] = "Pyydetty leikepydn muoto ei ole kytettviss." ; MESSAGE [ danish ] = "Det anmodede udskriftsholderformat er ikke tilgngeligt." ; MESSAGE [ french ] = "Le format de presse-papiers souhait n'est pas disponible." ; MESSAGE [ swedish ] = "nskat urklippsformat r inte tillgngligt." ; - MESSAGE [ dutch ] = "Gevraagd clipboardformaat is niet beschikbaar." ; - MESSAGE [ spanish ] = "El formato deseado del portapapeles no est disponible." ; + MESSAGE [ dutch ] = "Gevraagde clipboardindeling is niet beschikbaar." ; + MESSAGE [ spanish ] = "El formato requerido, del portapapeles, no est disponible." ; MESSAGE [ english_us ] = "Requested clipboard format is not available." ; MESSAGE[ chinese_simplified ] = "所需要的裁剪板格式不存在。"; - MESSAGE[ russian ] = " ."; + MESSAGE[ russian ] = " ."; MESSAGE[ polish ] = "Szukany format schowka jest niedostpny."; MESSAGE[ japanese ] = "指定のクリップボード書式は使用できません。"; - MESSAGE[ chinese_traditional ] = "所需要的裁剪簿格式不存在。"; + MESSAGE[ chinese_traditional ] = "請求的剪貼簿格式不存在。"; MESSAGE[ arabic ] = " ."; - MESSAGE[ dutch ] = "Gevraagd clipboardformaat is niet beschikbaar."; + MESSAGE[ dutch ] = "Gevraagde clipboardindeling is niet beschikbaar."; MESSAGE[ chinese_simplified ] = "所需要的裁剪板格式不存在。"; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "요청된 클립보드 서식은 가능하지 않습니다."; + MESSAGE[ korean ] = "요청한 클립보드 서식을 사용할 수 없습니다."; MESSAGE[ turkish ] = "stenen pano format mevcut deil."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "El format desitjat del porta-retalls no est disponible."; @@ -235,25 +235,25 @@ QueryBox MSG_UPDATE_NEW_GLOS_FMT MESSAGE [ italian ] = "Il formato dell'area vecchio.\n necessario convertirlo per poter\nsalvare le modifiche apportate\nVolete convertirlo?" ; MESSAGE [ portuguese_brazilian ] = "O formato de arquivo da regiao est? desatualizado.\nDeve ser convertido para que se possa gravar modifica??s.\nDeseja convert?-lo?" ; MESSAGE [ portuguese ] = "O formato do ficheiro est desactualizado.\nDeve ser convertido para que se possam\n guardar as respectivas alteraes.\nDeseja convert-lo?" ; - MESSAGE [ finnish ] = "Osion muoto on vanhentunut.\nSe on muunnettava, jotta\nsit voisi muuttaa.\nMuunnetaanko osio nyt?" ; + MESSAGE [ finnish ] = "Osan muoto on vanhentunut.\nOsa on muunnettava, jotta\nmuutokset voisi tallentaa.\nMuunnetaanko osa nyt?" ; MESSAGE [ danish ] = "Omrdets filformat er forldet.\nDet skal konverteres, for at ndringerne kan gemmes.\nVil du konvertere det?" ; MESSAGE [ french ] = "La section se trouve dans un format prim.\nVous ne pourrrez enregistrer aucune modification \n moins de le convertir.\nVoulez-vous procder la conversion sans plus attendre ?" ; MESSAGE [ swedish ] = "Omrdet har ett gammalt format.\nDet mste konverteras fr att\nndringar skall kunna sparas.\nVill du konvertera det?" ; - MESSAGE [ dutch ] = "Het bereik heeft een verouderd formaat.\nHet moet worden geconverteerd om de wijzigingen\nte kunnen opslaan.\nWilt u de conversie nu uitvoeren?" ; - MESSAGE [ spanish ] = "El formato del rea no es actual.\nHay que convertirlo\npara poder guardar las modificaciones.\nDesea usted convertirlo?" ; + MESSAGE [ dutch ] = "Het bereik heeft een verouderde indeling.\nHet moet worden geconverteerd om de wijzigingen\nte kunnen opslaan.\nWilt u de conversie nu uitvoeren?" ; + MESSAGE [ spanish ] = "El formato de la seccin no est actualizado.\nHay que convertirlo\npara poder guardar las modificaciones.\nDesea convertirlo?" ; MESSAGE [ english_us ] = "The section format is outdated.\nIt needs to be converted so that changes\ncan be saved.\nShould it be converted now?" ; /* ### ACHTUNG: Neuer Text in Resource? Der Bereich liegt in einem alten Format vor.\nEr mu konvertiert werden, um nderungen\nspeichern zu knnen.\nSoll er konvertiert werden? : Der Bereich liegt in einem alten Format vor.\nEr mu konvertiert werden, um nderungen\nspeichern zu knnen.\nSoll er konvertiert werden? */ Message = "Der Bereich liegt in einem alten Format vor.\nEr muss konvertiert werden, um nderungen\nspeichern zu knnen.\nSoll er konvertiert werden?" ; Message[ chinese_simplified ] = "这个区域具有的格式是旧的。\n要存盘更改就必须进行格式转换。\n要转换格式吗？"; - Message[ russian ] = " .\n , \n \n.?"; + Message[ russian ] = " .\n , \n \n.?"; Message[ polish ] = "Format obszaru nie jest aktualny.\nObszar musi by skonwertowany, by mona byo zapisa zmiany\n. Skonwertowa go?"; Message[ japanese ] = "この範囲は旧書式にあります。\n変更を保存するには\n書式を変換する必要があります。\n書式変換しますか?"; Message[ chinese_traditional ] = "這個區域的格式是舊的。\n要儲存變更就必須轉換它格式。\n您要轉換它的格式？"; Message[ arabic ] = " .\n \n .\n "; - Message[ dutch ] = "Het bereik heeft een verouderd formaat.\nHet moet worden geconverteerd om de wijzigingen\nte kunnen opslaan.\nWilt u de conversie nu uitvoeren?"; + Message[ dutch ] = "Het bereik heeft een verouderde indeling.\nHet moet worden geconverteerd om de wijzigingen\nte kunnen opslaan.\nWilt u de conversie nu uitvoeren?"; Message[ chinese_simplified ] = "这个区域具有的格式是旧的。\n要存盘更改就必须进行格式转换。\n要转换格式吗？"; Message[ greek ] = " .\n \n .\n "; - Message[ korean ] = "영역 서식은 오래된 것입니다.\n 이것을 변환하여야 변경 사항을\n저장할 수 있습니다.\n 지금 변환 하겠습니까?"; + Message[ korean ] = "구역의 서식이 오래되었습니다.\n 이것을 변환하여야 변경 사항을 저장할 수 있습니다.\n 지금 변환하시겠습니까?"; Message[ turkish ] = "Blmn format eski.\nDeiikliklerin kaydedilebilmesi n\niin deitirilmesi gerekiyor.\nFormat deitirilsin mi?"; Message[ language_user1 ] = " "; Message[ catalan ] = "El format de l'rea no s actual.\nS'ha de convertir\nper poder desar les modificacions.\nVoleu convertir-lo?"; @@ -303,11 +303,11 @@ String STR_PRIVATEGRAPHIC Text [ spanish ] = "Imagen [%PRODUCTNAME Writer]" ; Text [ english_us ] = "Graphics [%PRODUCTNAME Writer]" ; Text[ chinese_simplified ] = "图形 [%PRODUCTNAME Writer]"; - Text[ russian ] = " [%PRODUCTNAME Writer]"; + Text[ russian ] = " [%PRODUCTNAME Writer]"; Text[ polish ] = "Grafika [%PRODUCTNAME Writer]"; Text[ japanese ] = "図 [%PRODUCTNAME Writer]"; Text[ greek ] = " [%PRODUCTNAME Writer]"; - Text[ korean ] = "그래픽 [%PRODUCTNAME Writer]"; + Text[ korean ] = "그림 [%PRODUCTNAME Writer]"; Text[ chinese_traditional ] = "圖形 [%PRODUCTNAME Writer]"; Text[ arabic ] = "[%PRODUCTNAME Writer] "; Text[ turkish ] = "Grafik [%PRODUCTNAME Writer]"; @@ -357,7 +357,7 @@ String STR_DDEFORMAT Text [ spanish ] = "Vnculo DDE" ; Text [ english_us ] = "DDE link" ; Text[ chinese_simplified ] = "DDE 链接"; - Text[ russian ] = " DDE"; + Text[ russian ] = " DDE"; Text[ polish ] = "cza DDE "; Text[ japanese ] = "DDE リンク"; Text[ chinese_traditional ] = "DDE 捷徑"; @@ -384,3 +384,7 @@ String STR_SW_TEAM_NAMES + + + + diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index 4ba383d3bc1e..4ae43b65146f 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gloshdl.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: jp $ $Date: 2002-02-01 12:44:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -941,7 +941,8 @@ SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrm, SwWrtShell *pSh) pWrtShell( pSh ), pCurGrp( 0 ), aCurGrp( rStatGlossaries.GetDefName() ) -{} +{ +} SwGlossaryHdl::~SwGlossaryHdl() @@ -988,13 +989,17 @@ BOOL SwGlossaryHdl::Rename(const String& rOldShort, const String& rNewShortName, BOOL SwGlossaryHdl::IsReadOnly( const String* pGrpNm ) const { - SwTextBlocks *pGlossary = pGrpNm ? rStatGlossaries.GetGroupDoc( *pGrpNm ) - : pCurGrp - ? pCurGrp - : rStatGlossaries.GetGroupDoc(aCurGrp); + SwTextBlocks *pGlossary = 0; + + if (pGrpNm) + pGlossary = rStatGlossaries.GetGroupDoc( *pGrpNm ); + else if (pCurGrp) + pGlossary = pCurGrp; + else + pGlossary = rStatGlossaries.GetGroupDoc(aCurGrp); BOOL bRet = pGlossary ? pGlossary->IsReadOnly() : TRUE; - if( !pCurGrp ) + if( pGrpNm || !pCurGrp ) delete pGlossary; return bRet; } diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src index 5e45f1005731..9574782e2b0e 100644 --- a/sw/source/ui/dochdl/selglos.src +++ b/sw/source/ui/dochdl/selglos.src @@ -2,9 +2,9 @@ * * $RCSfile: selglos.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2001-08-29 09:24:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,12 +78,12 @@ ModalDialog DLG_SEL_GLOS Text [ italian ] = "Inserisci testo automatico" ; Text [ portuguese_brazilian ] = "Inserir Texto Autom?tico" ; Text [ portuguese ] = "Inserir AutoTexto" ; - Text [ finnish ] = "Lis?? automaattinen teksti" ; + Text [ finnish ] = "Lis automaattinen teksti" ; Text [ danish ] = "Indst AutoTekst" ; - Text [ french ] = "Insrer AutoTexte" ; + Text [ french ] = "Insrer un AutoTexte" ; Text [ swedish ] = "Infoga AutoText" ; Text [ dutch ] = "AutoTekst invoegen" ; - Text [ spanish ] = "Insertar AutoTexto" ; + Text [ spanish ] = "Insertar Texto automtico" ; Text [ english_us ] = "Insert AutoText" ; Moveable = TRUE ; OKButton BT_OK @@ -116,24 +116,25 @@ ModalDialog DLG_SEL_GLOS Text [ italian ] = "Testo automatico per la sigla " ; Text [ portuguese_brazilian ] = "Entadas para Abrevia??s " ; Text [ portuguese ] = "AutoTexto para abreviatura" ; - Text [ finnish ] = "Automaattiset tekstit pikavalinnalle " ; - Text [ danish ] = "AutoTekst til genvej " ; + Text [ finnish ] = "Pikavalikoiden automaattiset tekstit " ; + Text [ danish ] = "AutoTekst til forkortelse " ; Text [ french ] = "AutoTextes pour raccourci " ; Text [ swedish ] = "AutoText till genvgen " ; - Text [ dutch ] = "AutoTekst voor afkortingen " ; - Text [ spanish ] = "AutoTexto para abreviatura " ; + Text [ dutch ] = "AutoTekst voor afkortingen" ; + Text [ spanish ] = "Texto automtico para la abreviatura " ; Text [ english_us ] = "AutoTexts for shortcut " ; Text[ chinese_simplified ] = "自动图文集的缩写 "; Text[ russian ] = " "; Text[ polish ] = "Autotekst skrtu"; - Text[ japanese ] = "ｼｮｰﾄｶｯﾄ入力支援 "; + Text[ japanese ] = "ショートカット入力支援 "; Text[ chinese_traditional ] = "自動圖文集的縮寫 "; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "자동텍스트 바로가기 "; + Text[ korean ] = "자동 텍스트 바로 가기 "; Text[ turkish ] = "Otomatik metin ksaltmas "; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoTexto para abreviatura "; + Text[ catalan ] = "AutoText per nom curt "; + Text[ thai ] = "ข้อความอัตโนมัติสำหรับเป็นทางลัด "; }; ListBox LB_GLOS { @@ -144,16 +145,17 @@ ModalDialog DLG_SEL_GLOS AutoHScroll = TRUE ; }; Text[ chinese_simplified ] = "插入自动图文集"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Wstaw autotekst"; Text[ japanese ] = "入力支援の挿入"; Text[ chinese_traditional ] = "插入自動圖文集"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "자동텍스트 삽입"; + Text[ korean ] = "자동 텍스트 삽입"; Text[ turkish ] = "Otomatik metin ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar AutoTexto"; + Text[ catalan ] = "Insereix AutoText"; + Text[ thai ] = "แทรกข้อความอัตโนมัติ"; }; @@ -164,3 +166,13 @@ ModalDialog DLG_SEL_GLOS + + + + + + + + + + diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 5b07df8f3c26..900e1b5c7840 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swdtflvr.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: dvo $ $Date: 2002-12-02 11:42:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -364,6 +364,7 @@ public: SwTransferable::SwTransferable( SwWrtShell& rSh ) : pWrtShell( &rSh ), + pCreatorView( 0 ), eBufferType( TRNSFR_NONE ), pClpDocFac( 0 ), pClpGraphic( 0 ), @@ -847,7 +848,9 @@ int SwTransferable::Copy( BOOL bIsCut ) pClpDocFac = new SwDocFac; pWrtShell->Copy( pClpDocFac->GetDoc() ); - AddFormat( SOT_FORMATSTR_ID_SVXB ); + if (! pOrigGrf->GetBitmap().IsEmpty()) + AddFormat( SOT_FORMATSTR_ID_SVXB ); + AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); const Graphic &rGrf = pWrtShell->GetGraphic(); if( rGrf.IsSupportedGraphic() ) @@ -1098,18 +1101,28 @@ static inline Reference < XTransferable > * lcl_getTransferPointer ( Reference < BOOL SwTransferable::IsPaste( const SwWrtShell& rSh, const TransferableDataHelper& rData ) { - ULONG nFormat; - Reference<XTransferable> xTransferable( rData.GetXTransferable() ); - USHORT nEventAction, - nDestination = SwTransferable::GetSotDestination( rSh ), - nSourceOptions = + // Check the common case first: We can always paste our own data! + // #106503#: If _only_ the internal format can be pasted, this check will + // yield 'true', while the one below would give a (wrong) result 'false'. + bool bIsPaste = ( SW_MOD()->pClipboard != NULL ); + + // if it's not our own data, we need to have a closer look: + if( ! bIsPaste ) + { + // determine the proper paste action, and return true if we find one + Reference<XTransferable> xTransferable( rData.GetXTransferable() ); + USHORT nDestination = SwTransferable::GetSotDestination( rSh ); + USHORT nSourceOptions = (( EXCHG_DEST_DOC_TEXTFRAME == nDestination || EXCHG_DEST_SWDOC_FREE_AREA == nDestination || EXCHG_DEST_DOC_TEXTFRAME_WEB == nDestination || EXCHG_DEST_SWDOC_FREE_AREA_WEB == nDestination ) ? EXCHG_IN_ACTION_COPY - : EXCHG_IN_ACTION_MOVE), - nAction = SotExchange::GetExchangeAction( + : EXCHG_IN_ACTION_MOVE); + + ULONG nFormat; // output param for GetExchangeAction + USHORT nEventAction; // output param for GetExchangeAction + USHORT nAction = SotExchange::GetExchangeAction( rData.GetDataFlavorExVector(), nDestination, nSourceOptions, /* ?? */ @@ -1117,7 +1130,11 @@ BOOL SwTransferable::IsPaste( const SwWrtShell& rSh, nFormat, nEventAction, 0, lcl_getTransferPointer ( xTransferable ) ); - return EXCHG_INOUT_ACTION_NONE != nAction; + // if we find a suitable action, we can paste! + bIsPaste = (EXCHG_INOUT_ACTION_NONE != nAction); + } + + return bIsPaste; } // ----------------------------------------------------------------------- @@ -2648,14 +2665,13 @@ ASSERT( !&rFileName, "how do we read today .URL - Files?" ); // ----------------------------------------------------------------------- -/* */ - BOOL SwTransferable::IsPasteSpecial( const SwWrtShell& rWrtShell, const TransferableDataHelper& rData ) { - return rData.GetXTransferable().is() && - 1 < rData.GetTransferable()->getTransferDataFlavors().getLength() && - IsPaste( rWrtShell, rData ); + // we can paste-special if there's an entry in the paste-special-format list + SvxClipboardFmtItem aClipboardFmtItem(0); + FillClipFmtItem( rWrtShell, rData, aClipboardFmtItem); + return aClipboardFmtItem.Count() > 0; } // ----------------------------------------------------------------------- @@ -2820,7 +2836,7 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData } -void SwTransferable::FillClipFmtItem( SwWrtShell& rSh, +void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh, const TransferableDataHelper& rData, SvxClipboardFmtItem & rToFill ) { @@ -3373,20 +3389,28 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, } // Interfaces for Selection -void SwTransferable::CreateSelection( SwWrtShell& rSh ) +void SwTransferable::CreateSelection( SwWrtShell& rSh, + const ViewShell * _pCreatorView ) { SwModule *pMod = SW_MOD(); SwTransferable* pNew = new SwTransferable( rSh ); + + /* #96392#*/ + pNew->pCreatorView = _pCreatorView; + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pNew ); pMod->pXSelection = pNew; pNew->CopyToSelection( rSh.GetWin() ); } -void SwTransferable::ClearSelection( SwWrtShell& rSh ) +void SwTransferable::ClearSelection( SwWrtShell& rSh, + const ViewShell * _pCreatorView) { SwModule *pMod = SW_MOD(); - if( pMod->pXSelection && pMod->pXSelection->pWrtShell == &rSh ) + if( pMod->pXSelection && pMod->pXSelection->pWrtShell == &rSh && + /* #96392# */ + pMod->pXSelection->pCreatorView == _pCreatorView ) { TransferableHelper::ClearSelection( rSh.GetWin() ); } diff --git a/sw/source/ui/docvw/access.src b/sw/source/ui/docvw/access.src index e0848a87baaa..3d4f9f56f3a8 100644 --- a/sw/source/ui/docvw/access.src +++ b/sw/source/ui/docvw/access.src @@ -2,9 +2,9 @@ * * $RCSfile: access.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2002-09-19 08:44:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -183,7 +183,7 @@ String STR_ACCESS_HEADING_NAME Text[ polish ] = "Heading $(ARG1)"; Text[ portuguese_brazilian ] = "Heading $(ARG1)"; Text[ japanese ] = "見出し $(ARG1)"; - Text[ korean ] = "표제 $(ARG1)"; + Text[ korean ] = "제목 $(ARG1)"; Text[ chinese_simplified ] = "大标题 $(ARG1)"; Text[ chinese_traditional ] = "大標題 $(ARG1)"; Text[ turkish ] = "Heading $(ARG1)"; @@ -209,7 +209,7 @@ String STR_ACCESS_HEADING_DESC Text[ polish ] = "Heading: $(ARG1)"; Text[ portuguese_brazilian ] = "Heading: $(ARG1)"; Text[ japanese ] = "見出し: $(ARG1)"; - Text[ korean ] = "표제: $(ARG1)"; + Text[ korean ] = "제목: $(ARG1)"; Text[ chinese_simplified ] = "大标题：$(ARG1)"; Text[ chinese_traditional ] = "大標題：$(ARG1)"; Text[ turkish ] = "Heading: $(ARG1)"; @@ -235,7 +235,7 @@ String STR_ACCESS_HEADING_WITH_NUM_DESC Text[ polish ] = "Heading number $(ARG2): $(ARG1)"; Text[ portuguese_brazilian ] = "Heading number $(ARG2): $(ARG1)"; Text[ japanese ] = "見出し番号 $(ARG2): $(ARG1)"; - Text[ korean ] = "표제 번호 $(ARG2): $(ARG1)"; + Text[ korean ] = "제목 번호 $(ARG2): $(ARG1)"; Text[ chinese_simplified ] = "大标题的编号 $(ARG2): $(ARG1)"; Text[ chinese_traditional ] = "大標題編號 $(ARG2): $(ARG1)"; Text[ turkish ] = "Heading number $(ARG2): $(ARG1)"; @@ -409,7 +409,7 @@ String STR_ACCESS_ENDNOTE_NAME Text[ greek ] = "Endnote $(ARG1)"; Text[ dutch ] = "Endnote $(ARG1)"; Text[ french ] = "Note de fin $(ARG1)"; - Text[ spanish ] = "Nota al final $(ARG1)"; + Text[ spanish ] = "Nota final $(ARG1)"; Text[ finnish ] = "Endnote $(ARG1)"; Text[ italian ] = "Nota di chiusura $(ARG1)"; Text[ danish ] = "Endnote $(ARG1)"; @@ -435,7 +435,7 @@ String STR_ACCESS_ENDNOTE_DESC Text[ greek ] = "Endnote $(ARG1)"; Text[ dutch ] = "Endnote $(ARG1)"; Text[ french ] = "Note de fin $(ARG1)"; - Text[ spanish ] = "Nota al final $(ARG1)"; + Text[ spanish ] = "Nota final $(ARG1)"; Text[ finnish ] = "Endnote $(ARG1)"; Text[ italian ] = "Nota di chiusura $(ARG1)"; Text[ danish ] = "Endnote $(ARG1)"; @@ -451,84 +451,6 @@ String STR_ACCESS_ENDNOTE_DESC Text[ catalan ] = "Endnote $(ARG1)"; Text[ thai ] = "Endnote $(ARG1)"; }; -String STR_ACCESS_REPLACEMENT_POSTIT -{ - Text = "[Notiz: $(ARG1)]" ; - Text [ english ] = "[Note: $(ARG1)]" ; - Text[ english_us ] = "[Note: $(ARG1)]"; - Text[ portuguese ] = "[Annotation]"; - Text[ russian ] = "[Annotation]"; - Text[ greek ] = "[Annotation]"; - Text[ dutch ] = "[Annotation]"; - Text[ french ] = "[Note : $(ARG1)]"; - Text[ spanish ] = "[Nota: $(ARG1)]"; - Text[ finnish ] = "[Annotation]"; - Text[ italian ] = "[Nota: $(ARG1)]"; - Text[ danish ] = "[Annotation]"; - Text[ swedish ] = "[Anteckning: $(ARG1)]"; - Text[ polish ] = "[Annotation]"; - Text[ portuguese_brazilian ] = "[Annotation]"; - Text[ japanese ] = "[コメント: $(ARG1)]"; - Text[ korean ] = "[주석: $(ARG1)]"; - Text[ chinese_simplified ] = "[备注：$(ARG1)]"; - Text[ chinese_traditional ] = "[備註：$(ARG1)]"; - Text[ turkish ] = "[Annotation]"; - Text[ arabic ] = "[Annotation]"; - Text[ catalan ] = "[Annotation]"; - Text[ thai ] = "[Annotation]"; -}; -String STR_ACCESS_REPLACEMENT_FRAME -{ - Text = "[Rahmen: $(ARG1)]" ; - Text [ english ] = "[Frame: $(ARG1)]" ; - Text[ english_us ] = "[Frame: $(ARG1)]"; - Text[ portuguese ] = "[Rahmen: $(ARG1)]"; - Text[ russian ] = "[Rahmen: $(ARG1)]"; - Text[ greek ] = "[Rahmen: $(ARG1)]"; - Text[ dutch ] = "[Rahmen: $(ARG1)]"; - Text[ french ] = "[Cadre : $(ARG1)]"; - Text[ spanish ] = "[Marcos: $(ARG1)]"; - Text[ finnish ] = "[Rahmen: $(ARG1)]"; - Text[ italian ] = "[Cornici: $(ARG1)]"; - Text[ danish ] = "[Rahmen: $(ARG1)]"; - Text[ swedish ] = "[Ram: $(ARG1)]"; - Text[ polish ] = "[Rahmen: $(ARG1)]"; - Text[ portuguese_brazilian ] = "[Rahmen: $(ARG1)]"; - Text[ japanese ] = "[枠: $(ARG1)]"; - Text[ korean ] = "[프레임: $(ARG1)]"; - Text[ chinese_simplified ] = "[讯框：$(ARG1)]"; - Text[ chinese_traditional ] = "[訊框：$(ARG1)]"; - Text[ turkish ] = "[Rahmen: $(ARG1)]"; - Text[ arabic ] = "[Rahmen: $(ARG1)]"; - Text[ catalan ] = "[Rahmen: $(ARG1)]"; - Text[ thai ] = "[Frame]"; -}; -String STR_ACCESS_REPLACEMENT_BULLET_GRAPHICS -{ - Text = "[Aufzhlungszeichen]" ; - Text [ english ] = "[Bullet]" ; - Text[ english_us ] = "[Bullets]"; - Text[ portuguese ] = "[Aufzhlungszeichen]"; - Text[ russian ] = "[Aufz?hlungszeichen]"; - Text[ greek ] = "[Aufz?hlungszeichen]"; - Text[ dutch ] = "[Aufzhlungszeichen]"; - Text[ french ] = "[Puces]"; - Text[ spanish ] = "[Caracteres de las numeraciones]"; - Text[ finnish ] = "[Aufzhlungszeichen]"; - Text[ italian ] = "[Carattere per elenchi puntati]"; - Text[ danish ] = "[Aufzhlungszeichen]"; - Text[ swedish ] = "[Punktuppstllningstecken]"; - Text[ polish ] = "[Aufzhlungszeichen]"; - Text[ portuguese_brazilian ] = "[Aufzhlungszeichen]"; - Text[ japanese ] = "[箇条書きシンボル]"; - Text[ korean ] = "[글머리기호]"; - Text[ chinese_simplified ] = "[项目符号]"; - Text[ chinese_traditional ] = "[項目符號]"; - Text[ turkish ] = "[Aufzhlungszeichen]"; - Text[ arabic ] = "[Aufz?hlungszeichen]"; - Text[ catalan ] = "[Aufzhlungszeichen]"; - Text[ thai ] = "[Aufzählungszeichen]"; -}; String STR_ACCESS_TABLE_DESC { Text = "$(ARG1) auf Seite $(ARG2)" ; @@ -547,7 +469,7 @@ String STR_ACCESS_TABLE_DESC Text[ polish ] = "$(ARG1) on page $(ARG2)"; Text[ portuguese_brazilian ] = "$(ARG1) on page $(ARG2)"; Text[ japanese ] = "$(ARG2) ページ目の $(ARG1)"; - Text[ korean ] = "$(ARG1) 페이지 상에서 $(ARG2)"; + Text[ korean ] = "$(ARG2) 페이지의 $(ARG1)"; Text[ chinese_simplified ] = "$(ARG1) 在页 $(ARG2) 上"; Text[ chinese_traditional ] = "$(ARG1) 在頁 $(ARG2) 上"; Text[ turkish ] = "$(ARG1) on page $(ARG2)"; @@ -571,15 +493,12 @@ String STR_ACCESS_PAGE_NAME Text[ danish ] = "Page $(ARG1)"; Text[ swedish ] = "Sida $(ARG1)"; Text[ polish ] = "Page $(ARG1)"; - Text[ portuguese_brazilian ] = "Page $(ARG1)"; Text[ japanese ] = "$(ARG1) ページ"; - Text[ korean ] = "페이지 $(ARG1)"; + Text[ korean ] = "$(ARG1) 페이지"; Text[ chinese_simplified ] = "页 $(ARG1)"; Text[ chinese_traditional ] = "頁 $(ARG1)"; Text[ turkish ] = "Page $(ARG1)"; Text[ arabic ] = "Page $(ARG1)"; - Text[ catalan ] = "Page $(ARG1)"; - Text[ thai ] = "Page $(ARG1)"; }; String STR_ACCESS_PAGE_DESC { @@ -597,13 +516,12 @@ String STR_ACCESS_PAGE_DESC Text[ danish ] = "Page: $(ARG1)"; Text[ swedish ] = "Sida: $(ARG1)"; Text[ polish ] = "Page: $(ARG1)"; - Text[ portuguese_brazilian ] = "Page: $(ARG1)"; Text[ japanese ] = "ページ: $(ARG1)"; Text[ korean ] = "페이지: $(ARG1)"; Text[ chinese_simplified ] = "页：$(ARG1)"; Text[ chinese_traditional ] = "頁：$(ARG1)"; Text[ turkish ] = "Page: $(ARG1)"; Text[ arabic ] = "Page: $(ARG1)"; - Text[ catalan ] = "Page: $(ARG1)"; - Text[ thai ] = "Page: $(ARG1)"; }; + + diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/ui/docvw/docvw.src index 18a284328352..af20ca144edf 100644 --- a/sw/source/ui/docvw/docvw.src +++ b/sw/source/ui/docvw/docvw.src @@ -2,9 +2,9 @@ * * $RCSfile: docvw.src,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:28:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -212,7 +212,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "~Opnieuw laden"; Text[ chinese_simplified ] = "重新装入(~L)"; Text[ greek ] = "~"; - Text[ korean ] = "다시 로드!(~L)"; + Text[ korean ] = "다시 로드(~L)"; Text[ turkish ] = "Yeniden ykle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna a ~carregar"; @@ -232,10 +232,10 @@ Menu MN_READONLY_POPUP Text[ french ] = "~Recharger le frame"; Text[ swedish ] = "~Ladda ram p nytt"; Text[ dutch ] = "~Frame opnieuw laden"; - Text[ spanish ] = "~Recargar frame"; + Text[ spanish ] = "~Recargar marco"; Text[ english_us ] = "Reload Frame"; Text[ chinese_simplified ] = "重新装入框对象"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "~Zaaduj ponownie ramk"; Text[ japanese ] = "フレームの再読み込み"; Text[ chinese_traditional ] = "重新載入訊框"; @@ -274,7 +274,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "~HTML-brontekst"; Text[ chinese_simplified ] = "HT~ML 源文本"; Text[ greek ] = " HTM~L"; - Text[ korean ] = "HT~ML 소스텍스트"; + Text[ korean ] = "HT~ML 원본"; Text[ turkish ] = "HTM~L kaynak kodu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Font HT~ML"; @@ -400,7 +400,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Afbeelding ops~laan..."; Text[ chinese_simplified ] = "存盘图形..."; Text[ greek ] = " ~..."; - Text[ korean ] = "그래픽 저장..."; + Text[ korean ] = "그림 저장..."; Text[ turkish ] = "Grafii kaydet..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desa ~imatge..."; @@ -442,7 +442,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Als koppeling"; Text[ chinese_simplified ] = "当作链接"; Text[ greek ] = " "; - Text[ korean ] = "링크로서"; + Text[ korean ] = "링크로"; Text[ turkish ] = "Balant olarak"; Text[ catalan ] = "Com enlla"; Text[ finnish ] = "Linkkin"; @@ -500,7 +500,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Afbeelding t~oevoegen"; Text[ chinese_simplified ] = "新增图形"; Text[ greek ] = "~ "; - Text[ korean ] = "그래픽 추가"; + Text[ korean ] = "그림 추가"; Text[ turkish ] = "Grafik ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Afegeix imatge"; @@ -572,7 +572,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Als koppeling"; Text[ chinese_simplified ] = "当作链接"; Text[ greek ] = " "; - Text[ korean ] = "링크로서"; + Text[ korean ] = "링크로"; Text[ turkish ] = "Balant olarak"; Text[ language_user1 ] = " "; Text[ catalan ] = "Com enlla"; @@ -697,7 +697,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Afbeelding ko~piren"; Text[ chinese_simplified ] = "复制图形(~G)"; Text[ greek ] = " ~"; - Text[ korean ] = "그래픽 복사(~G)"; + Text[ korean ] = "그림 복사(~G)"; Text[ turkish ] = "Grafii kopyala"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Copia imatge"; @@ -729,7 +729,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "A~fbeeldingen laden"; Text[ chinese_simplified ] = "装入图形"; Text[ greek ] = "~ "; - Text[ korean ] = "그래픽 로드"; + Text[ korean ] = "그림 로드"; Text[ turkish ] = "Grafikleri ykle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Carrega ~imatges"; @@ -760,7 +760,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "~Afbeeldingen uitschakelen"; Text[ chinese_simplified ] = "隐入图形"; Text[ greek ] = "~ "; - Text[ korean ] = "그래픽 적용 해제"; + Text[ korean ] = "그림 해제"; Text[ turkish ] = "Grafikleri kapat"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desactiva ~imatges"; @@ -811,18 +811,18 @@ Menu MN_READONLY_POPUP Text[ russian ] = "Leave Full-Screen Mode"; Text[ greek ] = "Leave Full-Screen Mode"; Text[ dutch ] = "Leave Full-Screen Mode"; - Text[ french ] = "Leave Full-Screen Mode"; - Text[ spanish ] = "Leave Full-Screen Mode"; + Text[ french ] = "Quitter le mode Plein cran"; + Text[ spanish ] = "Abandonar el modo Pantalla completa"; Text[ finnish ] = "Leave Full-Screen Mode"; - Text[ italian ] = "Leave Full-Screen Mode"; + Text[ italian ] = "Ripristina vista schermo standard"; Text[ danish ] = "Leave Full-Screen Mode"; - Text[ swedish ] = "Leave Full-Screen Mode"; + Text[ swedish ] = "Lmna helskrmslge"; Text[ polish ] = "Leave Full-Screen Mode"; Text[ portuguese_brazilian ] = "Leave Full-Screen Mode"; - Text[ japanese ] = "Leave Full-Screen Mode"; + Text[ japanese ] = "全画面モードを保持"; Text[ korean ] = "전체 화면 모드 마침"; - Text[ chinese_simplified ] = "Leave Full-Screen Mode"; - Text[ chinese_traditional ] = "Leave Full-Screen Mode"; + Text[ chinese_simplified ] = "离开全屏幕模式"; + Text[ chinese_traditional ] = "離開全螢幕模式"; Text[ turkish ] = "Leave Full-Screen Mode"; Text[ arabic ] = "Leave Full-Screen Mode"; Text[ catalan ] = "Leave Full-Screen Mode"; @@ -852,7 +852,7 @@ String STR_EXPORT_GRAFIK_TITLE Text[ dutch ] = "Afbeelding exporteren"; Text[ chinese_simplified ] = "输出图形"; Text[ greek ] = " "; - Text[ korean ] = "그래픽 내보내기"; + Text[ korean ] = "그림 내보내기"; Text[ turkish ] = "Grafik ver"; Text[ language_user1 ] = " "; Text[ catalan ] = "Exporta imatge"; @@ -902,7 +902,7 @@ String STR_CHAIN_NOT_EMPTY Text [ french ] = "Le cadre cible n'est pas vide." ; Text [ dutch ] = "Het doelkader is niet leeg." ; Text[ chinese_simplified ] = "目标框不是空的。"; - Text[ russian ] = " ."; + Text[ russian ] = " ."; Text[ polish ] = "Ramka docelowa nie jest pusta."; Text[ japanese ] = "目標のテキスト枠が空ではありません。"; Text[ chinese_traditional ] = "目標方塊不是空的。"; @@ -910,7 +910,7 @@ String STR_CHAIN_NOT_EMPTY Text[ dutch ] = "Het doelkader is niet leeg."; Text[ chinese_simplified ] = "目标框不是空的。"; Text[ greek ] = " ."; - Text[ korean ] = "목표 프레임이 비어있지 않습니다."; + Text[ korean ] = "대상 프레임이 비어있지 않습니다."; Text[ turkish ] = "Hedef ereve bo deil."; Text[ language_user1 ] = " "; Text[ catalan ] = "El marc de dest est buit."; @@ -931,7 +931,7 @@ String STR_CHAIN_IS_IN_CHAIN Text [ french ] = "Le cadre cible est dj li." ; Text [ dutch ] = "Het doelkader is reeds gekoppeld." ; Text[ chinese_simplified ] = "已经链接目标框。"; - Text[ russian ] = " ."; + Text[ russian ] = " ."; Text[ polish ] = "Ramka docelowa jest ju poczona."; Text[ japanese ] = "目標のテキスト枠はすでに連結されています。"; Text[ chinese_traditional ] = "已經連結目標方塊。"; @@ -939,7 +939,7 @@ String STR_CHAIN_IS_IN_CHAIN Text[ dutch ] = "Het doelkader is reeds gekoppeld."; Text[ chinese_simplified ] = "已经链接目标框。"; Text[ greek ] = " ."; - Text[ korean ] = "목표 프레임은 이미 연결되어 있습니다."; + Text[ korean ] = "대상 프레임은 이미 연결되어 있습니다."; Text[ turkish ] = "Hedef ereve balants oluturulmu durumda."; Text[ language_user1 ] = " "; Text[ catalan ] = "El marc de dest ja est enllaat."; @@ -960,7 +960,7 @@ String STR_CHAIN_WRONG_AREA Text [ french ] = "Le cadre-cible se trouve dans une section ne pouvant pas faire l'objet d'un lien." ; Text [ dutch ] = "Het bronkader staat in een bereik waarin geen koppeling mogelijk is." ; Text[ chinese_simplified ] = "目标框处于一个无法链接的区域。"; - Text[ russian ] = " , ."; + Text[ russian ] = " , ."; Text[ polish ] = "Ramka docelowa znajduje si w obszarze, w ktrym niemoliwe jest poczenie."; Text[ japanese ] = "目標のテキスト枠は連結できない範囲にあります。"; Text[ chinese_traditional ] = "目標訊框處於一個無法訊框的區域。"; @@ -968,7 +968,7 @@ String STR_CHAIN_WRONG_AREA Text[ dutch ] = "Het bronkader staat in een bereik waarin geen koppeling mogelijk is."; Text[ chinese_simplified ] = "目标框处于一个无法链接的区域。"; Text[ greek ] = " ."; - Text[ korean ] = "목표 프레임은 연결이 불가능한 영역에 있습니다."; + Text[ korean ] = "대상 프레임은 연결이 불가능한 영역에 있습니다."; Text[ turkish ] = "Hedef ereve balant oluturulamayacak bir alanda bulunuyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "El marc dest es troba en una rea on els enllaos no sn possibles."; @@ -997,7 +997,7 @@ String STR_CHAIN_NOT_FOUND Text[ dutch ] = "Op de huidige positie kan geen doelkader worden gevonden."; Text[ chinese_simplified ] = "在当前的位置没有找到目标框。"; Text[ greek ] = " ."; - Text[ korean ] = "현재의 위치에서 목표 프레임을 찾을수 없습니다."; + Text[ korean ] = "현재의 위치에서 대상 프레임을 찾을 수 없습니다."; Text[ turkish ] = "Yrrlkteki konumda hedef ereve bulunamyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "A la posici actual no es pot trobar cap marc dest."; @@ -1026,7 +1026,7 @@ String STR_CHAIN_SOURCE_CHAINED Text[ dutch ] = "Het bronkader is reeds basis van een koppeling."; Text[ chinese_simplified ] = "这个来源框已经是一个链接的来源框。"; Text[ greek ] = " ."; - Text[ korean ] = "소스 프레임은 이미 연결의 소스입니다."; + Text[ korean ] = "이 원본 프레임은 이미 링크의 원본입니다."; Text[ turkish ] = "Kaynak ereve zaten bir balant zincirinin kayna."; Text[ language_user1 ] = " "; Text[ catalan ] = "El marc d'origen ja s la font d'un enlla."; @@ -1044,10 +1044,10 @@ String STR_CHAIN_SELF Text [ danish ] = "En lukket kde er ikke mulig." ; Text [ italian ] = "Un collegamento chiuso non possibile." ; Text [ spanish ] = "No es posible una secuencia cerrada." ; - Text [ french ] = "Une chaine ferme n'est pas possible." ; + Text [ french ] = "Une chane ferme n'est pas possible." ; Text [ dutch ] = "Een gesloten koppeling is niet mogelijk." ; Text[ chinese_simplified ] = "一个封闭式的链接是不可能的。"; - Text[ russian ] = " ."; + Text[ russian ] = " "; Text[ polish ] = "Zamknite cze nie jest moliwe."; Text[ japanese ] = "循環する連結はできません。"; Text[ chinese_traditional ] = "一個封閉式的連結是不可能的。"; @@ -1055,7 +1055,7 @@ String STR_CHAIN_SELF Text[ dutch ] = "Een gesloten koppeling is niet mogelijk."; Text[ chinese_simplified ] = "一个封闭式的链接是不可能的。"; Text[ greek ] = " ."; - Text[ korean ] = "닫힌 연결은 불가능합니다."; + Text[ korean ] = "닫힌 링크는 불가능 합니다."; Text[ turkish ] = "Kapal bir zincir oluturulamaz."; Text[ language_user1 ] = " "; Text[ catalan ] = "No s possible una seqncia tancada."; @@ -1101,7 +1101,7 @@ String STR_REDLINE_DELETE Text [ swedish ] = "Raderat" ; Text [ danish ] = "Slettet" ; Text [ italian ] = "Cancellato" ; - Text [ spanish ] = "Eliminado" ; + Text [ spanish ] = "Borrado" ; Text [ french ] = "Supprim" ; Text [ dutch ] = "Gewist" ; Text[ chinese_simplified ] = "已经删除"; @@ -1131,7 +1131,7 @@ String STR_REDLINE_FORMAT Text [ danish ] = "Formateret" ; Text [ italian ] = "Fomattato" ; Text [ spanish ] = "Formateado" ; - Text [ french ] = "Mis en forme" ; + Text [ french ] = "Format" ; Text [ dutch ] = "Opgemaakt" ; Text[ chinese_simplified ] = "已经格式化"; Text[ russian ] = ""; @@ -1143,7 +1143,7 @@ String STR_REDLINE_FORMAT Text[ dutch ] = "Opgemaakt"; Text[ chinese_simplified ] = "已经格式化"; Text[ greek ] = ""; - Text[ korean ] = "서식 적용"; + Text[ korean ] = "속성"; Text[ turkish ] = "Faormatland"; Text[ catalan ] = "Formatat"; Text[ finnish ] = "Muotoiltu"; @@ -1171,7 +1171,7 @@ String STR_REDLINE_TABLE Text[ dutch ] = "Tabel gewijzigd"; Text[ chinese_simplified ] = "表格已被更改"; Text[ greek ] = " "; - Text[ korean ] = "표가 바뀌었습니다."; + Text[ korean ] = "표가 변경되었습니다"; Text[ turkish ] = "Tablo deitirildi"; Text[ language_user1 ] = " "; Text[ catalan ] = "La taula ha canviat"; @@ -1288,7 +1288,7 @@ InfoBox MSG_READONLY_CONTENT MESSAGE[ dutch ] = "De cursor of de selectie bevindt zich op een schrijfbeveiligde positie.\nDe inhoud kan daarom niet worden gewijzigd."; MESSAGE[ chinese_simplified ] = "输入光标或选中的内容是受保护的。\n因此无法改写内容。"; MESSAGE[ greek ] = " .\n ? "; - MESSAGE[ korean ] = "쓰기 마크 또는 선택은 보호된 위치에 있습니다.\n수정은 허용되지 않습니다."; + MESSAGE[ korean ] = "쓰기 전용 또는 선택은 보호 위치에 있으므로 \n변경은 허용되지 않습니다."; MESSAGE[ turkish ] = "Salt okunur bir ierik deitirilemez.\nYaplan deiiklikler nu nedenle kabul edilmeyecek."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "La marca o selecci es troba en una posici protegida.\nPer aix no es pot acceptar una modificaci."; @@ -1299,3 +1299,8 @@ InfoBox MSG_READONLY_CONTENT + + + + + diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index ae28dff08d56..e666dd4f3cb1 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edtwin.cxx,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: os $ $Date: 2002-11-27 09:12:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -561,6 +561,9 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier ) } else { + // dvo: IsObjSelectable() eventually calls SdrView::PickObj, so + // apparently this is used to determine whether this is a + // drawling layer object or not. if ( rSh.IsObjSelectable( rLPt ) ) { if (pSdrView->IsTextEdit()) @@ -580,16 +583,16 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier ) } else { - eStyle = POINTER_MOVE; - - if (!bNotInSelObj) - { - if (rSh.IsObjSelected() || rSh.IsFrmSelected()) - { - if (rSh.IsSelObjProtected(FLYPROTECT_POS)) - eStyle = POINTER_NOTALLOWED; - } - } + // if we're over a selected object, we show an + // ARROW by default. We only show a MOVE if 1) the + // object is selected, and 2) it may be moved + // (i.e., position is not protected). + bool bMovable = + (!bNotInSelObj) && + (rSh.IsObjSelected() || rSh.IsFrmSelected()) && + (!rSh.IsSelObjProtected(FLYPROTECT_POS)); + + eStyle = bMovable ? POINTER_MOVE : POINTER_ARROW; aActHitType = SDRHIT_OBJECT; } } @@ -598,6 +601,14 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier ) { if ( rSh.IsFrmSelected() && !bNotInSelObj ) { + // dvo: this branch appears to be dead and should be + // removed in a future version. Reason: The condition + // !bNotInSelObj means that this branch will only be + // executed in the cursor points inside a selected + // object. However, if this is the case, the previous + // if( rSh.IsObjSelectable(rLPt) ) must always be true: + // rLPt is inside a selected object, then obviously + // rLPt is over a selectable object. if (rSh.IsSelObjProtected(FLYPROTECT_SIZE)) eStyle = POINTER_NOTALLOWED; else @@ -1030,6 +1041,7 @@ void SwEditWin::ChangeDrawing( BYTE nDir ) SdrView *pSdrView = rSh.GetDrawView(); const SdrHdlList& rHdlList = pSdrView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); + rSh.StartAllAction(); if(0L == pHdl) { // now move the selected draw objects @@ -1087,6 +1099,7 @@ void SwEditWin::ChangeDrawing( BYTE nDir ) } } } + rSh.EndAllAction(); } } @@ -1158,7 +1171,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) else if( KEY_LEFT == nKey ) nKey = KEY_DOWN; else if( KEY_RIGHT == nKey ) nKey = KEY_UP; } - else if ( rSh.IsInRightToLeftText() ) + if ( rSh.IsInRightToLeftText() ) { if( KEY_LEFT == nKey ) nKey = KEY_RIGHT; else if( KEY_RIGHT == nKey ) nKey = KEY_LEFT; @@ -1287,7 +1300,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) KS_TblColCellInsDel, KS_Fly_Change, KS_Draw_Change, - KS_AppendNodeInSection, + KS_SpecialInsert, KS_EnterCharCell, KS_Ende }; @@ -1575,8 +1588,8 @@ KEYINPUT_CHECKTABLE_INSDEL: case KEY_RETURN | KEY_MOD2: // ALT-Return if( !rSh.HasReadonlySel() && rSh.GetCurNumRule() ) eKeyState = KS_NoNum; - else if( rSh.CanInsertNodeAtEndOfSection() ) - eKeyState = KS_AppendNodeInSection; + else if( rSh.CanSpecialInsert() ) + eKeyState = KS_SpecialInsert; break; case KEY_BACKSPACE: @@ -1842,7 +1855,7 @@ KEYINPUT_CHECKTABLE_INSDEL: // Statusupdate enabled wurden, muss copy ggf. von uns // 'gewaltsam' gerufen werden. if( rKeyCode.GetFunction() == KEYFUNC_COPY ) - GetView().GetViewFrame()->GetDispatcher()->Execute(SID_COPY); + GetView().GetViewFrame()->GetBindings().Execute(SID_COPY); if( !bIsDocReadOnly && bNormalChar ) @@ -1984,8 +1997,8 @@ KEYINPUT_CHECKTABLE_INSDEL: //??? FlushInBuffer( &rSh ); switch( eKeyState ) { - case KS_AppendNodeInSection: - rSh.AppendNodeInSection(); + case KS_SpecialInsert: + rSh.DoSpecialInsert(); break; case KS_NoNum: @@ -2399,44 +2412,51 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) !SFX_APP()->IsDispatcherLocked() && !bExecDrawTextLink) { - rView.NoRotate(); - rSh.HideCrsr(); - - BOOL bUnLockView = !rSh.IsViewLocked(); - rSh.LockView( TRUE ); - BOOL bSelObj = rSh.SelectObj( aDocPos, - rMEvt.IsMod1() ? SW_ENTER_GROUP : 0); - if( bUnLockView ) - rSh.LockView( FALSE ); + // #107513# + // Test if there is a draw object at that position and if it should be selected. + sal_Bool bShould = rSh.ShouldObjectBeSelected(aDocPos); - if( bSelObj ) + if(bShould) { - // falls im Macro der Rahmen deselektiert - // wurde, muss nur noch der Cursor - // wieder angezeigt werden. - if( FRMTYPE_NONE == rSh.GetSelFrmType() ) - rSh.ShowCrsr(); - else + rView.NoRotate(); + rSh.HideCrsr(); + + BOOL bUnLockView = !rSh.IsViewLocked(); + rSh.LockView( TRUE ); + BOOL bSelObj = rSh.SelectObj( aDocPos, + rMEvt.IsMod1() ? SW_ENTER_GROUP : 0); + if( bUnLockView ) + rSh.LockView( FALSE ); + + if( bSelObj ) { - if (rSh.IsFrmSelected() && rView.GetDrawFuncPtr()) + // falls im Macro der Rahmen deselektiert + // wurde, muss nur noch der Cursor + // wieder angezeigt werden. + if( FRMTYPE_NONE == rSh.GetSelFrmType() ) + rSh.ShowCrsr(); + else { - rView.GetDrawFuncPtr()->Deactivate(); - rView.SetDrawFuncPtr(NULL); - rView.LeaveDrawCreate(); - rView.AttrChangedNotify( &rSh ); - } + if (rSh.IsFrmSelected() && rView.GetDrawFuncPtr()) + { + rView.GetDrawFuncPtr()->Deactivate(); + rView.SetDrawFuncPtr(NULL); + rView.LeaveDrawCreate(); + rView.AttrChangedNotify( &rSh ); + } - rSh.EnterSelFrmMode( &aDocPos ); - bFrmDrag = TRUE; - UpdatePointer( aDocPos, rMEvt.GetModifier() ); + rSh.EnterSelFrmMode( &aDocPos ); + bFrmDrag = TRUE; + UpdatePointer( aDocPos, rMEvt.GetModifier() ); + } + return; } - return; - } - else - bOnlyText = rSh.IsObjSelectable( aDocPos ); + else + bOnlyText = rSh.IsObjSelectable( aDocPos ); - if (!rView.GetDrawFuncPtr()) - rSh.ShowCrsr(); + if (!rView.GetDrawFuncPtr()) + rSh.ShowCrsr(); + } } else if ( rSh.IsSelFrmMode() && (aActHitType == SDRHIT_NONE || @@ -2460,6 +2480,14 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) BYTE nFlag = rMEvt.IsShift() ? SW_ADD_SELECT :0; if( rMEvt.IsMod1() ) nFlag = nFlag | SW_ENTER_GROUP; + + if ( rSh.IsSelFrmMode() ) + { + rSh.UnSelectFrm(); + rSh.LeaveSelFrmMode(); + rView.AttrChangedNotify(&rSh); + } + BOOL bSelObj = rSh.SelectObj( aDocPos, nFlag ); if( bUnLockView ) rSh.LockView( FALSE ); @@ -2505,8 +2533,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) { case SwWrtShell::SEL_GRF: RstMBDownFlags(); - GetView().GetViewFrame()->GetDispatcher()->Execute( - FN_FORMAT_GRAFIC_DLG, SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); + GetView().GetViewFrame()->GetBindings().Execute( + FN_FORMAT_GRAFIC_DLG, 0, 0, + SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); return; // Doppelklick auf OLE-Objekt --> OLE-InPlace @@ -2520,8 +2549,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) case SwWrtShell::SEL_FRM: RstMBDownFlags(); - GetView().GetViewFrame()->GetDispatcher()->Execute( - FN_FORMAT_FRAME_DLG, SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); + GetView().GetViewFrame()->GetBindings().Execute( + FN_FORMAT_FRAME_DLG, 0, 0, SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); return; case SwWrtShell::SEL_DRW: @@ -2548,7 +2577,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) { RstMBDownFlags(); if( bFtn ) - GetView().GetViewFrame()->GetDispatcher()->Execute( FN_EDIT_FOOTNOTE ); + GetView().GetViewFrame()->GetBindings().Execute( FN_EDIT_FOOTNOTE ); else { USHORT nTypeId = pFld->GetTypeId(); @@ -2563,11 +2592,11 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) USHORT nSlot = TYP_POSTITFLD == nTypeId ? FN_POSTIT : FN_JAVAEDIT; SfxBoolItem aItem(nSlot, TRUE); pVFrame->GetBindings().SetState(aItem); - pVFrame->GetDispatcher()->Execute(nSlot); + pVFrame->GetBindings().Execute(nSlot); break; } case TYP_AUTHORITY : - pVFrame->GetDispatcher()->Execute(FN_EDIT_AUTH_ENTRY_DLG); + pVFrame->GetBindings().Execute(FN_EDIT_AUTH_ENTRY_DLG); break; default: pVFrame->GetBindings().Execute(FN_EDIT_FIELD); @@ -4095,12 +4124,15 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) bCallBase = FALSE; if ( pItem ) { - //Eigentumsuebergang des Items - GetView().GetViewFrame()->GetDispatcher()->Execute( nSlotId, SFX_CALLMODE_STANDARD, - pItem, 0 ); + const SfxPoolItem* aArgs[2]; + aArgs[0] = pItem; + aArgs[1] = 0; + GetView().GetViewFrame()->GetBindings().Execute( + nSlotId, aArgs, 0, SFX_CALLMODE_STANDARD ); + delete pItem; } else - GetView().GetViewFrame()->GetDispatcher()->Execute( nSlotId ); + GetView().GetViewFrame()->GetBindings().Execute( nSlotId ); } } break; @@ -4292,6 +4324,15 @@ void SwEditWin::_FinitStaticData() { delete pQuickHlpData; } +/* -----------------23.01.2003 12:15----------------- + * #i3370# remove quick help to prevent saving + * of autocorrection suggestions + * --------------------------------------------------*/ +void SwEditWin::StopQuickHelp() +{ + if( HasFocus() && pQuickHlpData && pQuickHlpData->bClear ) + pQuickHlpData->Stop( rView.GetWrtShell() ); +} /*-----------------23.02.97 18:39------------------- diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index ad901676b6f2..9e71ee86587c 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edtwin2.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: os $ $Date: 2001-09-21 08:45:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -273,10 +273,10 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) #ifndef PRODUCT case SwContentAtPos::SW_TABLEBOXVALUE: { - ByteString sTmp; - sprintf( sTmp.AllocBuffer( 30 ), "%E", - ((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue() ); - sTxt = UniString(sTmp.GetBuffer(), gsl_getSystemTextEncoding()); + sTxt = UniString( + ByteString::CreateFromDouble( + ((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue() ) + , gsl_getSystemTextEncoding()); } break; case SwContentAtPos::SW_CURR_ATTRS: diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index b3884beb5dc7..d91c9488ef3a 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srcedtw.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: os $ $Date: 2002-11-08 14:54:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,8 +100,8 @@ #ifndef _SVTOOLS_SOURCEVIEWCONFIG_HXX #include <svtools/sourceviewconfig.hxx> #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef _SVX_FLSTITEM_HXX #include <svx/flstitem.hxx> @@ -131,10 +131,10 @@ enum SwHtmlTextType { - TT_SGML = svx::HTMLSGML , - TT_COMMENT = svx::HTMLCOMMENT, - TT_KEYWORD = svx::HTMLKEYWORD, - TT_UNKNOWN = svx::HTMLUNKNOWN + TT_SGML = svtools::HTMLSGML , + TT_COMMENT = svtools::HTMLCOMMENT, + TT_KEYWORD = svtools::HTMLKEYWORD, + TT_UNKNOWN = svtools::HTMLUNKNOWN }; @@ -579,10 +579,12 @@ void SwSrcEditWindow::CreateTextEngine() //Scrollbars anlegen pHScrollbar = new ScrollBar(this, WB_3DLOOK |WB_HSCROLL|WB_DRAG); + pHScrollbar->EnableRTL( false ); // #107300# --- RTL --- no mirroring for scrollbars pHScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl)); pHScrollbar->Show(); pVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG); + pVScrollbar->EnableRTL( false ); // #107300# --- RTL --- no mirroring for scrollbars pVScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl)); pHScrollbar->EnableDrag(); pVScrollbar->Show(); @@ -860,12 +862,12 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben continue; USHORT nCol = r.eType; - if(r.eType != svx::HTMLSGML && - r.eType != svx::HTMLCOMMENT && - r.eType != svx::HTMLKEYWORD && - r.eType != svx::HTMLUNKNOWN) - r.eType = (SwHtmlTextType)svx::HTMLUNKNOWN; - Color aColor((ColorData)SW_MOD()->GetColorConfig().GetColorValue((svx::ColorConfigEntry)r.eType).nColor); + if(r.eType != svtools::HTMLSGML && + r.eType != svtools::HTMLCOMMENT && + r.eType != svtools::HTMLKEYWORD && + r.eType != svtools::HTMLUNKNOWN) + r.eType = (SwHtmlTextType)svtools::HTMLUNKNOWN; + Color aColor((ColorData)SW_MOD()->GetColorConfig().GetColorValue((svtools::ColorConfigEntry)r.eType).nColor); USHORT nLine = nLineOff+r.nLine; // pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1 ); } @@ -1061,7 +1063,10 @@ BOOL lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages aLanguages[0] = LANGUAGE_RUSSIAN; break; - case RTL_TEXTENCODING_APPLE_UKRAINIAN :aLanguages[0] = LANGUAGE_UKRAINIAN; break; + case RTL_TEXTENCODING_APPLE_UKRAINIAN: + case RTL_TEXTENCODING_KOI8_U: + aLanguages[0] = LANGUAGE_UKRAINIAN; + break; case RTL_TEXTENCODING_IBM_864 : case RTL_TEXTENCODING_MS_1256 : diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src index e110bea07d88..2053fed7131c 100644 --- a/sw/source/ui/envelp/envelp.src +++ b/sw/source/ui/envelp/envelp.src @@ -2,9 +2,9 @@ * * $RCSfile: envelp.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:04:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,22 +76,23 @@ String STR_DATABASE_NOT_OPENED Text [ danish ] = "Det var ikke muligt at bne databasen." ; Text [ french ] = "Impossible d'ouvrir la base de donnes." ; Text [ swedish ] = "Databas gick inte att ppna." ; - Text [ dutch ] = "Database kon niet worden geopend." ; + Text [ dutch ] = "Database kan niet worden geopend." ; Text [ spanish ] = "No se pudo abrir la base de datos." ; Text [ english_us ] = "Database could not be opened." ; Text[ chinese_simplified ] = "无法打开数据库。"; - Text[ russian ] = " ."; + Text[ russian ] = " ."; Text[ polish ] = "Baza danych nie moga by otworzona."; - Text[ japanese ] = "ﾃﾞｰﾀﾍﾞｰｽを開くことができませんでした"; + Text[ japanese ] = "データベースを開くことができませんでした"; Text[ chinese_traditional ] = "無法開啟資料庫。"; Text[ arabic ] = " ."; - Text[ dutch ] = "Database kon niet worden geopend."; + Text[ dutch ] = "Database kan niet worden geopend."; Text[ chinese_simplified ] = "无法打开数据库。"; Text[ greek ] = " ."; Text[ korean ] = "데이터베이스를 열지 못했습니다."; Text[ turkish ] = "Veritaban alamad."; Text[ language_user1 ] = " "; - Text[ catalan ] = "No se pudo abrir la base de datos."; + Text[ catalan ] = "No es pot obrir la base de dades."; + Text[ thai ] = "ไม่สามารถเปิดฐานข้อมูลได้"; }; String STR_NO_DRIVERS { @@ -101,26 +102,27 @@ String STR_NO_DRIVERS Text [ italian ] = "Non sono installati driver di controllo database." ; Text [ portuguese_brazilian ] = "Nenhum driver de base de dados instalado." ; Text [ portuguese ] = "Controlador da base de dados no instalado." ; - Text [ finnish ] = "Tietokanta-ajureita ei ole asennettu." ; + Text [ finnish ] = "Tietokanta-ohjaimia ei ole asennettu." ; Text [ danish ] = "Ingen databasedriverere installeret." ; Text [ french ] = "Aucun gestionnaire de base de donnes install." ; Text [ swedish ] = "Inga databasdrivrutiner r installerade." ; - Text [ dutch ] = "Geen database-drivers genstalleerd." ; + Text [ dutch ] = "Geen databasedrivers genstalleerd." ; Text [ spanish ] = "No se han instalado controladores de bases de datos." ; Text [ english_us ] = "No database drivers installed." ; Text[ chinese_simplified ] = "没有安装数据库驱动程序。"; - Text[ russian ] = " ."; + Text[ russian ] = " ."; Text[ polish ] = "Nie zainstalowany sterownik bazy danych."; - Text[ japanese ] = "ﾃﾞｰﾀﾍﾞｰｽﾄﾞﾗﾊﾞがｲﾝｽﾄｰﾙされていません。"; + Text[ japanese ] = "データベースドラバがインストールされていません。"; Text[ chinese_traditional ] = "沒有安裝資料庫驅動程式。"; Text[ arabic ] = " ."; - Text[ dutch ] = "Geen database-drivers genstalleerd."; + Text[ dutch ] = "Geen databasedrivers genstalleerd."; Text[ chinese_simplified ] = "没有安装数据库驱动程序。"; Text[ greek ] = " ."; Text[ korean ] = "데이터베이스 드라이버가 설치되지 않았습니다."; Text[ turkish ] = "Kurulmu veritaban srcs mevcut deil."; Text[ language_user1 ] = " "; - Text[ catalan ] = "No se han instalado controladores de bases de datos."; + Text[ catalan ] = "No s'han instal.lat els controladors de la base de dades."; + Text[ thai ] = "ไม่ได้ติดตั้งไดร้ฟ์เวอร์ฐานข้อมูล"; }; String STR_BTN_NEW_DOC { @@ -130,26 +132,27 @@ String STR_BTN_NEW_DOC Text [ italian ] = "Nuovo documento" ; Text [ portuguese_brazilian ] = "~Novo doc." ; Text [ portuguese ] = "~Novo documento" ; - Text [ finnish ] = "~Uusi asiakirja" ; + Text [ finnish ] = "Uusi asiakirja" ; Text [ danish ] = "Nyt dokument" ; Text [ french ] = "~Nouveau document" ; Text [ swedish ] = "~Nytt dokument" ; Text [ dutch ] = "~Nieuw document" ; - Text [ spanish ] = "~Nuevo documento" ; + Text [ spanish ] = "~Documento nuevo" ; Text [ english_us ] = "~New Document" ; Text[ chinese_simplified ] = "新建文档(~N)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nowy dok."; - Text[ japanese ] = "新ﾄﾞｷｭﾒﾝﾄ(~N)"; + Text[ japanese ] = "新ドキュメント(~N)"; Text[ chinese_traditional ] = "開啟新檔(~N)"; Text[ arabic ] = " "; Text[ dutch ] = "~Nieuw document"; Text[ chinese_simplified ] = "新建文档(~N)"; Text[ greek ] = " "; - Text[ korean ] = "새로운 문서(~N)"; + Text[ korean ] = "새 문서(~N)"; Text[ turkish ] = "~Yeni belge"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo documento"; + Text[ catalan ] = "Document ~nou"; + Text[ thai ] = "เอกสารใ~หม่"; }; String STR_BTN_NEWDOC @@ -158,27 +161,28 @@ String STR_BTN_NEWDOC Text [ English ] = "~New doc." ; Text[ english_us ] = "~New Doc."; Text[ portuguese ] = "~Novo doc."; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ dutch ] = "~Nieuw doc."; - Text[ french ] = "~Nouveau doc."; + Text[ french ] = "Nouveau doc."; Text[ spanish ] = "~Nuevo doc."; Text[ italian ] = "Nuovo doc."; Text[ danish ] = "Nyt dok."; Text[ swedish ] = "~Nytt dok."; Text[ polish ] = "Nowy dok."; Text[ portuguese_brazilian ] = "~New doc."; - Text[ japanese ] = "新ﾄﾞｷｭﾒﾝﾄ(~N)"; + Text[ japanese ] = "新ドキュメント(~N)"; Text[ chinese_simplified ] = "新建文档(~N)"; Text[ chinese_traditional ] = "開啟新檔(~N)"; Text[ arabic ] = " "; Text[ dutch ] = "~Nieuw doc."; Text[ chinese_simplified ] = "新建文档(~N)"; Text[ greek ] = " "; - Text[ korean ] = "새로운 문서(~N)"; + Text[ korean ] = "새 문서(~N)"; Text[ turkish ] = "~Yeni blg."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo doc."; - Text[ finnish ] = "~Uusi as."; + Text[ catalan ] = "Doc. ~nou"; + Text[ finnish ] = "Uusi as."; + Text[ thai ] = "เอกสารใ~หม่"; }; String STR_SENDER_TOKENS @@ -194,7 +198,7 @@ String STR_SENDER_TOKENS Text[ spanish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR;"; Text[ italian ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR;"; Text[ danish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; :CITY;CR;"; - Text[ swedish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR; "; + Text[ swedish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR;"; Text[ polish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ portuguese_brazilian ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ japanese ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; @@ -203,8 +207,9 @@ String STR_SENDER_TOKENS Text[ chinese_traditional ] = "COMPANY;CR;FIRSTNAME;;LASTNAME;CR;ADDRESS;CR;CITY;;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ turkish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ arabic ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; - Text[ catalan ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR;"; + Text[ catalan ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ finnish ] = "YRITYS;CR;ETUNIMI; ;SUKUNIMI;CR;OSOITE;CR;POSTITOIMIPAIKKA; ;OSAVALTIO; ;POSTINUMERO;CR;MAA;CR;"; + Text[ thai ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; }; @@ -220,3 +225,7 @@ String STR_SENDER_TOKENS + + + + diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src index 7e20052910b1..58a7521151af 100644 --- a/sw/source/ui/envelp/envfmt.src +++ b/sw/source/ui/envelp/envfmt.src @@ -2,9 +2,9 @@ * * $RCSfile: envfmt.src,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2001-07-13 21:58:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,20 +83,21 @@ TabPage TP_ENV_FMT Text [ danish ] = "Modtager" ; Text [ french ] = "Destinataire" ; Text [ swedish ] = "Mottagare" ; - Text [ dutch ] = "Ontvanger" ; + Text [ dutch ] = "Geadresseerde" ; Text [ spanish ] = "Destinatario" ; Text [ english_us ] = "Addressee" ; - Text[ chinese_simplified ] = "ռ"; + Text[ chinese_simplified ] = "收件人"; Text[ russian ] = ""; Text[ polish ] = "Odbiorca"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "宛先"; + Text[ chinese_traditional ] = "收件者"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "»"; + Text[ korean ] = "받는 사람"; Text[ turkish ] = "Alc"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Destinatario"; + Text[ catalan ] = "Destinatari"; + Text[ thai ] = "ผู้รับจดหมาย"; }; FixedText TXT_ADDR_POS { @@ -113,18 +114,19 @@ TabPage TP_ENV_FMT Text[ french ] = "Position"; Text[ spanish ] = "Posicin"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Start_ved"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Placering"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; - Text[ japanese ] = "ʒu"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "λ"; - Text[ chinese_traditional ] = "m"; + Text[ japanese ] = "位置"; + Text[ korean ] = "위치"; + Text[ chinese_simplified ] = "位置"; + Text[ chinese_traditional ] = "位置"; Text[ turkish ] = "Pozisyon"; Text[ arabic ] = ""; - Text[ catalan ] = "Posicin"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; FixedText TXT_ADDR_LEFT { @@ -139,22 +141,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "a partir da esquerda" ; Text [ finnish ] = "vasemmalta" ; Text [ danish ] = "fra venstre" ; - Text [ french ] = " ~gauche" ; + Text [ french ] = " gauche" ; Text [ swedish ] = "~frn vnster" ; Text [ dutch ] = "~vanaf links" ; Text [ spanish ] = "de izquierda" ; Text [ english_us ] = "from left" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "从左"; Text[ russian ] = ""; Text[ polish ] = "z lewej"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "q"; + Text[ japanese ] = "左から"; + Text[ chinese_traditional ] = "從左"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ʿ"; + Text[ korean ] = "왼쪽에서"; Text[ turkish ] = "Soldan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "de izquierda"; + Text[ catalan ] = "de l'esquerra"; + Text[ thai ] = "จากซ้าย"; }; MetricField FLD_ADDR_LEFT { @@ -186,22 +189,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "a partir do topo" ; Text [ finnish ] = "ylhlt" ; Text [ danish ] = "fra oven" ; - Text [ french ] = "en ~haut" ; + Text [ french ] = "En haut" ; Text [ swedish ] = "~uppifrn" ; Text [ dutch ] = "v~anaf boven" ; Text [ spanish ] = "desde arriba" ; Text [ english_us ] = "from top" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "从上"; Text[ russian ] = ""; Text[ polish ] = "z gry"; - Text[ japanese ] = "ォ"; - Text[ chinese_traditional ] = "qW"; + Text[ japanese ] = "上から"; + Text[ chinese_traditional ] = "從上"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "위에서"; Text[ turkish ] = "Yukardan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "desde arriba"; + Text[ catalan ] = "des de d'alt"; + Text[ thai ] = "จากด้านบน"; }; MetricField FLD_ADDR_TOP { @@ -231,7 +235,7 @@ TabPage TP_ENV_FMT Text[ portuguese ] = "Formato"; Text[ russian ] = ""; Text[ greek ] = ""; - Text[ dutch ] = "Format"; + Text[ dutch ] = "Formaat"; Text[ french ] = "Format"; Text[ spanish ] = "Formato"; Text[ italian ] = "Formato"; @@ -239,14 +243,15 @@ TabPage TP_ENV_FMT Text[ swedish ] = "Format"; Text[ polish ] = "Format"; Text[ portuguese_brazilian ] = "Format"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "ʽ"; - Text[ chinese_traditional ] = "榡"; + Text[ japanese ] = "書式"; + Text[ korean ] = "서식"; + Text[ chinese_simplified ] = "格式"; + Text[ chinese_traditional ] = "格式"; Text[ turkish ] = "Renk format"; Text[ arabic ] = ""; - Text[ catalan ] = "Formato"; - Text[ finnish ] = "Muotoile"; + Text[ catalan ] = "Formata"; + Text[ finnish ] = "Muotoilu"; + Text[ thai ] = "จัดรูปแบบ"; }; MenuButton BTN_ADDR_EDIT { @@ -261,22 +266,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "Editar" ; Text [ finnish ] = "Muokkaa" ; Text [ danish ] = "Rediger" ; - Text [ french ] = "Modifier" ; + Text [ french ] = "diter" ; Text [ swedish ] = "Redigera" ; Text [ dutch ] = "Bewerk." ; Text [ spanish ] = "Editar" ; Text [ english_us ] = "Edit" ; - Text[ chinese_simplified ] = "༭"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "编辑"; + Text[ russian ] = ""; Text[ polish ] = "E~dytuj"; - Text[ japanese ] = "ҏW"; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "編集"; + Text[ chinese_traditional ] = "編輯"; Text[ arabic ] = ""; Text[ language_user1 ] = " "; Text[ greek ] = "."; - Text[ korean ] = ""; + Text[ korean ] = "편집"; Text[ turkish ] = "Dzenle"; - Text[ catalan ] = "Editar"; + Text[ catalan ] = "Edita"; + Text[ thai ] = "แก้ไข"; }; FixedLine FL_SENDER { @@ -295,17 +301,18 @@ TabPage TP_ENV_FMT Text [ dutch ] = "Afzender" ; Text [ spanish ] = "Remitente" ; Text [ english_us ] = "Sender" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "发件人"; Text[ russian ] = ""; Text[ polish ] = "Nadawca"; - Text[ japanese ] = "olZ"; - Text[ chinese_traditional ] = "H"; + Text[ japanese ] = "差出人住所"; + Text[ chinese_traditional ] = "寄件者"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = " "; + Text[ korean ] = "보낸 사람"; Text[ turkish ] = "Gnderen"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Remitente"; + Text[ catalan ] = "Remitent"; + Text[ thai ] = "ผู้ส่ง"; }; FixedText TXT_SEND_POS { @@ -322,18 +329,19 @@ TabPage TP_ENV_FMT Text[ french ] = "Position"; Text[ spanish ] = "Posicin"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Stilling"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Placering"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; - Text[ japanese ] = "ʒu"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "λ"; - Text[ chinese_traditional ] = "m"; + Text[ japanese ] = "位置"; + Text[ korean ] = "위치"; + Text[ chinese_simplified ] = "位置"; + Text[ chinese_traditional ] = "位置"; Text[ turkish ] = " unvan"; Text[ arabic ] = ""; - Text[ catalan ] = "Posicin"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; FixedText TXT_SEND_LEFT { @@ -348,22 +356,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "a partir da esquerda" ; Text [ finnish ] = "vasemmalta" ; Text [ danish ] = "fra venstre" ; - Text [ french ] = " g~auche" ; + Text [ french ] = " gauche" ; Text [ swedish ] = "frn ~vnster" ; Text [ dutch ] = "vanaf ~links" ; Text [ spanish ] = "de izquierda" ; Text [ english_us ] = "from left" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "从左"; Text[ russian ] = ""; Text[ polish ] = "z lewej"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "q"; + Text[ japanese ] = "左から"; + Text[ chinese_traditional ] = "從左"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ʿ"; + Text[ korean ] = "왼쪽에서"; Text[ turkish ] = "Soldan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "de izquierda"; + Text[ catalan ] = "de l'esquerra"; + Text[ thai ] = "จากด้านซ้าย"; }; MetricField FLD_SEND_LEFT { @@ -395,22 +404,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "a partir do topo" ; Text [ finnish ] = "ylhlt" ; Text [ danish ] = "fra oven" ; - Text [ french ] = "en ha~ut" ; + Text [ french ] = "En haut" ; Text [ swedish ] = "u~ppifrn" ; Text [ dutch ] = "vanaf ~boven" ; Text [ spanish ] = "desde arriba" ; Text [ english_us ] = "from top" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "从上"; Text[ russian ] = ""; Text[ polish ] = "z gry"; - Text[ japanese ] = "ォ"; - Text[ chinese_traditional ] = "qW"; + Text[ japanese ] = "上から"; + Text[ chinese_traditional ] = "從上"; Text[ arabic ] = " "; Text[ greek ] = " ~"; - Text[ korean ] = ""; + Text[ korean ] = "위에서"; Text[ turkish ] = "Yukardan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "desde arriba"; + Text[ catalan ] = "des de d'alt"; + Text[ thai ] = "จาด้านบน"; }; MetricField FLD_SEND_TOP { @@ -448,14 +458,15 @@ TabPage TP_ENV_FMT Text[ swedish ] = "Format"; Text[ polish ] = "Format"; Text[ portuguese_brazilian ] = "Format"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "ʽ"; - Text[ chinese_traditional ] = "榡"; + Text[ japanese ] = "書式"; + Text[ korean ] = "서식"; + Text[ chinese_simplified ] = "格式"; + Text[ chinese_traditional ] = "格式"; Text[ turkish ] = "Renk format"; Text[ arabic ] = ""; - Text[ catalan ] = "Formato"; - Text[ finnish ] = "Muotoile"; + Text[ catalan ] = "Formata"; + Text[ finnish ] = "Muotoilu"; + Text[ thai ] = "จัดรูปแบบ"; }; MenuButton BTN_SEND_EDIT { @@ -469,23 +480,24 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "Editar" ; Text [ finnish ] = "Muokkaa" ; Text [ danish ] = "Rediger" ; - Text [ french ] = "Modifier" ; + Text [ french ] = "diter" ; Text [ swedish ] = "Redigera" ; Text [ dutch ] = "Bewerk." ; Text [ spanish ] = "Editar" ; Text [ english_us ] = "Edit" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "༭"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "编辑"; + Text[ russian ] = ""; Text[ polish ] = "Edyt~uj"; - Text[ japanese ] = "ҏW"; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "編集"; + Text[ chinese_traditional ] = "編輯"; Text[ arabic ] = ""; Text[ language_user1 ] = " "; Text[ greek ] = "."; - Text[ korean ] = ""; + Text[ korean ] = "편집"; Text[ turkish ] = "Dzenle"; - Text[ catalan ] = "Editar"; + Text[ catalan ] = "Edita"; + Text[ thai ] = "แก้ไข"; }; FixedLine FL_SIZE { @@ -501,20 +513,21 @@ TabPage TP_ENV_FMT Text [ danish ] = "Strrelse" ; Text [ french ] = "Taille" ; Text [ swedish ] = "Storlek" ; - Text [ dutch ] = "Grootte" ; + Text [ dutch ] = "Formaat" ; Text [ spanish ] = "Tamao" ; Text [ english_us ] = "Size" ; - Text[ chinese_simplified ] = "С"; + Text[ chinese_simplified ] = "大小"; Text[ russian ] = ""; Text[ polish ] = "Rozmiar"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "jp"; + Text[ japanese ] = "サイズ"; + Text[ chinese_traditional ] = "大小"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ũ"; + Text[ korean ] = "크기"; Text[ turkish ] = "Boyut"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tamao"; + Text[ catalan ] = "Mida"; + Text[ thai ] = "ขนาด"; }; FixedText TXT_SIZE_FORMAT { @@ -526,25 +539,26 @@ TabPage TP_ENV_FMT Text [ italian ] = "Formato" ; Text [ portuguese_brazilian ] = "Formato" ; Text [ portuguese ] = "Fo~rmato" ; - Text [ finnish ] = "~Muotoile" ; - Text [ danish ] = "Forma~ter" ; + Text [ finnish ] = "M~uotoilu" ; + Text [ danish ] = "~Format" ; Text [ french ] = "Forma~t" ; Text [ swedish ] = "~Format" ; Text [ dutch ] = "~Formaat" ; Text [ spanish ] = "~Formato" ; Text [ english_us ] = "F~ormat" ; Left = TRUE ; - Text[ chinese_simplified ] = "ʽ(~O)"; + Text[ chinese_simplified ] = "格式(~O)"; Text[ russian ] = "~"; Text[ polish ] = "Format"; - Text[ japanese ] = "(~O)"; - Text[ chinese_traditional ] = "榡(~O)"; + Text[ japanese ] = "封筒サイズ(~O)"; + Text[ chinese_traditional ] = "格式(~O)"; Text[ arabic ] = ""; Text[ language_user1 ] = " "; Text[ greek ] = ""; - Text[ korean ] = "(~O)"; + Text[ korean ] = "용지 크기(~O)"; Text[ turkish ] = "Format"; - Text[ catalan ] = "~Formato"; + Text[ catalan ] = "F~ormata"; + Text[ thai ] = "จัดรู~ปแบบ"; }; ListBox BOX_SIZE_FORMAT { @@ -561,28 +575,29 @@ TabPage TP_ENV_FMT Text = "~Breite" ; Text [ ENGLISH ] = "Width" ; Text [ norwegian ] = "Bredde " ; - Text [ italian ] = "~Largh." ; + Text [ italian ] = "Larghezza" ; Text [ portuguese_brazilian ] = "Largura" ; Text [ portuguese ] = "~Largura" ; - Text [ finnish ] = "Leveys" ; - Text [ danish ] = "Bredde" ; - Text [ french ] = "~Largeur" ; + Text [ finnish ] = "~Leveys" ; + Text [ danish ] = "~Bredde" ; + Text [ french ] = "Largeur" ; Text [ swedish ] = "~Bredd" ; Text [ dutch ] = "B~reedte" ; - Text [ spanish ] = "A~ncho" ; + Text [ spanish ] = "Ancho" ; Text [ english_us ] = "~Width" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~W)"; + Text[ chinese_simplified ] = "宽度(~W)"; Text[ russian ] = ""; Text[ polish ] = "Szer."; - Text[ japanese ] = "(~W)"; - Text[ chinese_traditional ] = "e(~W)"; + Text[ japanese ] = "幅(~W)"; + Text[ chinese_traditional ] = "寬度(~W)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~W)"; + Text[ korean ] = "너비(~W)"; Text[ turkish ] = "Genilik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ncho"; + Text[ catalan ] = "~Amplada"; + Text[ thai ] = "ความ~กว้าง"; }; MetricField FLD_SIZE_WIDTH { @@ -609,27 +624,28 @@ TabPage TP_ENV_FMT Text = "~Hhe" ; Text [ ENGLISH ] = "Height" ; Text [ norwegian ] = "Hyde " ; - Text [ italian ] = "~Altezza" ; + Text [ italian ] = "Altezza" ; Text [ portuguese_brazilian ] = "Altura" ; Text [ portuguese ] = "~Altura" ; - Text [ finnish ] = "K~orkeus" ; - Text [ danish ] = "Hjde" ; - Text [ french ] = "~Hauteur" ; + Text [ finnish ] = "~Korkeus" ; + Text [ danish ] = "H~jde" ; + Text [ french ] = "Hauteur" ; Text [ swedish ] = "~Hjd" ; Text [ dutch ] = "~Hoogte" ; Text [ spanish ] = "A~ltura" ; Text [ english_us ] = "~Height" ; - Text[ chinese_simplified ] = "(~H)"; + Text[ chinese_simplified ] = "高度(~H)"; Text[ russian ] = ""; Text[ polish ] = "Wys."; - Text[ japanese ] = "(~H)"; - Text[ chinese_traditional ] = "(~H)"; + Text[ japanese ] = "高さ(~H)"; + Text[ chinese_traditional ] = "高度(~H)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~H)"; + Text[ korean ] = "높이(~H)"; Text[ turkish ] = "Ykseklik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ltura"; + Text[ catalan ] = "A~lada"; + Text[ thai ] = "ความ~สูง"; }; MetricField FLD_SIZE_HEIGHT { @@ -669,24 +685,25 @@ Menu MNU_EDIT TEXT [ italian ] = "~Carattere..." ; TEXT [ portuguese_brazilian ] = "~Caracter..." ; TEXT [ portuguese ] = "~Caracteres..." ; - TEXT [ finnish ] = "~Merkki" ; + TEXT [ finnish ] = "Fo~ntti..." ; TEXT [ danish ] = "Tegn..." ; - TEXT [ french ] = "~Caractre..." ; + TEXT [ french ] = "~Caractres..." ; TEXT [ swedish ] = "~Tecken..." ; TEXT [ dutch ] = "~Teken..." ; TEXT [ spanish ] = "~Caracteres..." ; TEXT [ english_us ] = "C~haracter..." ; - TEXT[ chinese_simplified ] = "ַ(~H)..."; - TEXT[ russian ] = "..."; + TEXT[ chinese_simplified ] = "字符(~H)..."; + TEXT[ russian ] = "..."; TEXT[ polish ] = "Znak..."; - TEXT[ japanese ] = "(~H)..."; + TEXT[ japanese ] = "文字(~H)..."; TEXT[ language_user1 ] = " "; - TEXT[ chinese_traditional ] = "r(~H)..."; + TEXT[ chinese_traditional ] = "字元(~H)..."; TEXT[ arabic ] = "..."; TEXT[ greek ] = "~..."; - TEXT[ korean ] = "ȣ(~H)..."; + TEXT[ korean ] = "글꼴(~H)..."; TEXT[ turkish ] = "Karakter..."; - TEXT[ catalan ] = "~Caracteres..."; + TEXT[ catalan ] = "~Carcters..."; + TEXT[ thai ] = "ตัวอัก~ขระ..."; }; MenuItem { @@ -697,26 +714,42 @@ Menu MNU_EDIT TEXT [ italian ] = "~Paragrafo..." ; TEXT [ portuguese_brazilian ] = "~Par?grafo..." ; TEXT [ portuguese ] = "~Pargrafo..." ; - TEXT [ finnish ] = "~Kappale" ; + TEXT [ finnish ] = "Ka~ppale..." ; TEXT [ danish ] = "Afsnit..." ; TEXT [ french ] = "~Paragraphe..." ; TEXT [ swedish ] = "~Stycke..." ; TEXT [ dutch ] = "~Alinea..." ; TEXT [ spanish ] = "Prrafo..." ; TEXT [ english_us ] = "P~aragraph..." ; - TEXT[ chinese_simplified ] = "(~A)..."; + TEXT[ chinese_simplified ] = "段落(~A)..."; TEXT[ russian ] = "..."; TEXT[ polish ] = "Akapit..."; - TEXT[ japanese ] = "i(~A)..."; - TEXT[ chinese_traditional ] = "q(~A)..."; + TEXT[ japanese ] = "段落(~A)..."; + TEXT[ chinese_traditional ] = "段落(~A)..."; TEXT[ arabic ] = "..."; TEXT[ greek ] = "~..."; - TEXT[ korean ] = "ܶ(~A)..."; + TEXT[ korean ] = "단락(~A)..."; TEXT[ turkish ] = "Paragraf..."; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Prrafo..."; + TEXT[ catalan ] = "Pargraf..."; + TEXT[ thai ] = "ย่~อหน้า..."; }; }; }; + + + + + + + + + + + + + + + diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src index 40db3024a27c..3c25295825b4 100644 --- a/sw/source/ui/envelp/envlop.src +++ b/sw/source/ui/envelp/envlop.src @@ -2,9 +2,9 @@ * * $RCSfile: envlop.src,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:50:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -231,7 +231,7 @@ TabDialog DLG_ENV Text[ dutch ] = "~Wijzigen"; Text[ chinese_simplified ] = "更改(~M)"; Text[ greek ] = ""; - Text[ korean ] = "수정(~M)"; + Text[ korean ] = "변경(~M)"; Text[ turkish ] = "D~eitir"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Modifica"; @@ -244,7 +244,7 @@ TabDialog DLG_ENV Text[ chinese_traditional ] = "信封"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "봉투"; + Text[ korean ] = "편지봉투"; Text[ turkish ] = "Zarf"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sobre"; @@ -282,7 +282,7 @@ TabPage TP_ENV_ENV Text[ chinese_traditional ] = "收件者(~E)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "받는 사람(~E)"; + Text[ korean ] = "수신인(~E)"; Text[ turkish ] = "Alc"; Text[ language_user1 ] = " "; Text[ catalan ] = "Destinat~ari"; @@ -359,7 +359,7 @@ TabPage TP_ENV_ENV Text[ chinese_traditional ] = "表格"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "테이블"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -444,7 +444,7 @@ TabPage TP_ENV_ENV Text[ chinese_traditional ] = "寄件者(~S)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "보낸 사람(~S)"; + Text[ korean ] = "발신인(~S)"; Text[ turkish ] = "Gnderen"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Remitent"; @@ -491,7 +491,7 @@ String STR_DOC_TITLE Text[ chinese_traditional ] = "信封"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "봉투"; + Text[ korean ] = "편지봉투"; Text[ turkish ] = "Zarf"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sobre"; @@ -504,3 +504,8 @@ String STR_DOC_TITLE + + + + + diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src index db1c526d8480..23b47f461957 100644 --- a/sw/source/ui/envelp/envprt.src +++ b/sw/source/ui/envelp/envprt.src @@ -2,9 +2,9 @@ * * $RCSfile: envprt.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:44:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,7 +155,7 @@ TabPage TP_ENV_PRT Group = TRUE ; Check = TRUE ; Text[ chinese_simplified ] = "从上方开始打印(~P)"; - Text[ russian ] = " "; + Text[ russian ] = "~ "; Text[ polish ] = "Drukuj od gry"; Text[ japanese ] = "封筒の表を上にする(~P)"; Text[ chinese_traditional ] = "從上方開始列印(~P)"; @@ -217,7 +217,7 @@ TabPage TP_ENV_PRT Text [ PORTUGUESE ] = " direita" ; Left = TRUE ; Text[ chinese_simplified ] = "向右(~S)"; - Text[ russian ] = " "; + Text[ russian ] = "~ "; Text[ polish ] = "Na prawo"; Text[ japanese ] = "右に(~S)"; Text[ chinese_traditional ] = "向右(~S)"; @@ -265,13 +265,13 @@ TabPage TP_ENV_PRT Text [ PORTUGUESE ] = "Para baixo" ; Left = TRUE ; Text[ chinese_simplified ] = "向下(~D)"; - Text[ russian ] = " "; + Text[ russian ] = " ~"; Text[ polish ] = "W d"; Text[ japanese ] = "下に(~D)"; Text[ chinese_traditional ] = "向下(~D)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "아래로 이동(~D)"; + Text[ korean ] = "아래로(~D)"; Text[ turkish ] = "~Aa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cap a a~vall"; @@ -487,3 +487,8 @@ Bitmap BMP_VER_RGHT_UPPER_H + + + + + diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src index 9c26b0ec3d0a..f31948df7f40 100644 --- a/sw/source/ui/envelp/label.src +++ b/sw/source/ui/envelp/label.src @@ -2,9 +2,9 @@ * * $RCSfile: label.src,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: kz $ $Date: 2002-09-05 19:46:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,7 +72,7 @@ Text [ italian ] = "Etichette" ; \ Text [ portuguese_brazilian ] = "Etiquetas" ; \ Text [ portuguese ] = "Etiquetas" ; \ - Text [ finnish ] = "Nimit" ; \ + Text [ finnish ] = "Osoitetarrat" ; \ Text [ danish ] = "Etiketter" ; \ Text [ french ] = "tiquettes" ; \ Text [ swedish ] = "Etiketter" ; \ @@ -80,15 +80,16 @@ Text [ spanish ] = "Etiquetas" ; \ Text [ english_us ] = "Labels" ; \ Text[ chinese_simplified ] = "标签"; \ - Text[ russian ] = ""; \ + Text[ russian ] = ""; \ Text[ polish ] = "Etykiety"; \ Text[ japanese ] = "ラベル書き"; \ Text[ chinese_traditional ] = "貼標"; \ Text[ arabic ] = " "; \ Text[ greek ] = ""; \ - Text[ korean ] = "라벨"; \ + Text[ korean ] = "레이블"; \ Text[ turkish ] = "Etiket"; \ - Text[ catalan ] = "Etiquetes"; + Text[ catalan ] = "Etiquetes"; \ + Text[ thai ] = "ป้ายชื่อ"; #define BUSINESS_CARD_STRING \ Text = "Visitenkarten" ; \ @@ -106,13 +107,14 @@ Text[ polish ] = "Wizytwki"; \ Text[ portuguese_brazilian ] = "Visiting cards"; \ Text[ japanese ] = "名刺"; \ - Text[ korean ] = "초대장"; \ + Text[ korean ] = "명함"; \ Text[ chinese_simplified ] = "名片"; \ Text[ chinese_traditional ] = "名片"; \ Text[ arabic ] = " "; \ - Text[ finnish ] = "Business cards"; \ + Text[ finnish ] = "Kyntikortit"; \ Text[ turkish ] = "Business cards"; \ - Text[ catalan ] = "Targetes de visita"; + Text[ catalan ] = "Targetes de visita"; \ + Text[ thai ] = "นามบัตร"; // DLG_LAB ------------------------------------------------------------------ TabDialog DLG_LAB @@ -157,8 +159,9 @@ TabDialog DLG_LAB Text[ arabic ] = ""; Text[ turkish ] = "zel"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Privado"; + Text[ catalan ] = "Privat"; Text[ finnish ] = "Henkilkohtainen"; + Text[ thai ] = "ส่วนตัว"; }; PageItem { @@ -168,7 +171,7 @@ TabDialog DLG_LAB Text [ ENGLISH ] = "Business" ; Text[ english_us ] = "Business"; Text[ portuguese ] = "Emprego"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Zaak"; Text[ french ] = "Bureau"; @@ -185,8 +188,9 @@ TabDialog DLG_LAB Text[ arabic ] = ""; Text[ turkish ] = ""; Text[ language_user1 ] = " "; - Text[ catalan ] = "Trabajo"; + Text[ catalan ] = "Negocis"; Text[ finnish ] = "Liiketoiminta"; + Text[ thai ] = "ธุรกิจ"; }; PageItem { @@ -214,7 +218,8 @@ TabDialog DLG_LAB Text[ turkish ] = "Format"; Text[ language_user1 ] = " "; Text[ catalan ] = "Formata"; - Text[ finnish ] = "Muoto"; + Text[ finnish ] = "Muotoilu"; + Text[ thai ] = "รูปแบบ"; }; PageItem { @@ -243,6 +248,7 @@ TabDialog DLG_LAB Text[ turkish ] = "Seenekler"; Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "ตัวเลือก"; }; }; }; @@ -277,8 +283,9 @@ TabDialog DLG_LAB Text[ arabic ] = ""; Text[ language_user1 ] = " "; Text[ turkish ] = "Kat"; - Text[ catalan ] = "Mitj"; + Text[ catalan ] = "Tipus"; Text[ finnish ] = "Normaali"; + Text[ thai ] = "ปานกลาง"; }; }; // TP_LAB_LAB --------------------------------------------------------------- @@ -299,7 +306,7 @@ TabPage TP_LAB_LAB Text [ italian ] = "~Testo etichetta" ; Text [ portuguese_brazilian ] = "Gravar" ; Text [ portuguese ] = "~Inscrio" ; - Text [ finnish ] = "Nimiteksti" ; + Text [ finnish ] = "Tarran teksti" ; Text [ danish ] = "Etikettekst" ; Text [ french ] = "Inscription" ; Text [ swedish ] = "~Pskrift" ; @@ -307,16 +314,17 @@ TabPage TP_LAB_LAB Text [ spanish ] = "Te~xto de la etiqueta" ; Text [ english_us ] = "Label text" ; Text[ chinese_simplified ] = "标签"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Napis"; Text[ japanese ] = "宛先"; Text[ chinese_traditional ] = "標籤"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "라벨"; + Text[ korean ] = "레이블 텍스트"; Text[ turkish ] = "Etiket metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Te~xto"; + Text[ catalan ] = "Text de l'etiqueta"; + Text[ thai ] = "ป้ายชื่อข้อความ"; }; CheckBox BOX_ADDR { @@ -346,7 +354,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "주소"; Text[ turkish ] = "Adres"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Direccin"; + Text[ catalan ] = "~Direcci"; + Text[ thai ] = "ที่อยู่"; }; MultiLineEdit EDT_WRITING { @@ -386,7 +395,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "데이터베이스"; Text[ turkish ] = "Veritaban"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Base de dades"; + Text[ catalan ] = "Base de dades"; + Text[ thai ] = "ฐานข้อมูล"; }; ListBox LB_DATABASE { @@ -418,11 +428,12 @@ TabPage TP_LAB_LAB Text[ chinese_traditional ] = "表格"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "테이블"; Text[ language_user1 ] = " "; Text[ turkish ] = "Tablo"; - Text[ catalan ] = "Tabla"; + Text[ catalan ] = "Taula"; Text[ finnish ] = "Taulukko"; + Text[ thai ] = "ตาราง"; }; ListBox LB_TABLE { @@ -449,7 +460,7 @@ TabPage TP_LAB_LAB Text [ italian ] = "Campo database" ; Text [ portuguese_brazilian ] = "Campo base de dados" ; Text [ portuguese ] = "Campo base de dados" ; - Text [ finnish ] = "Tietokantakentt" ; + Text [ finnish ] = "Tietokannan kentt" ; Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ de BD" ; Text [ swedish ] = "Databas~flt" ; @@ -466,7 +477,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "데이터베이스 필드"; Text[ turkish ] = "Veritaban alan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Campo base de datos"; + Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "เขตข้อมูลของฐานข้อมูล"; }; ListBox LB_DBFIELD { @@ -502,9 +514,10 @@ TabPage TP_LAB_LAB Text[ chinese_traditional ] = "標籤"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "라벨"; + Text[ korean ] = "레이블 텍스트"; Text[ turkish ] = "Etiket metni"; Text[ catalan ] = "Etiqueta"; + Text[ thai ] = "จารึก"; }; RadioButton BTN_CONT { @@ -535,7 +548,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "계속(~C)"; Text[ turkish ] = "Sonsuz form"; Text[ language_user1 ] = " "; - Text[ catalan ] = "S~ense fi"; + Text[ catalan ] = "~Continu"; + Text[ thai ] = "~ต่อเนื่อง"; }; RadioButton BTN_SHEET { @@ -547,7 +561,7 @@ TabPage TP_LAB_LAB Text [ italian ] = "Foglio" ; Text [ portuguese_brazilian ] = "Folha" ; Text [ portuguese ] = "~Folha" ; - Text [ finnish ] = "~Lomake" ; + Text [ finnish ] = "Taulukko" ; Text [ danish ] = "Ark" ; Text [ french ] = "~Feuille" ; Text [ swedish ] = "~Ark" ; @@ -555,7 +569,7 @@ TabPage TP_LAB_LAB Text [ spanish ] = "~Hoja" ; Text [ english_us ] = "~Sheet" ; Text[ chinese_simplified ] = "纸张(~S)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Arkusz"; Text[ japanese ] = "シート(~S)"; Text[ chinese_traditional ] = "紙張(~S)"; @@ -564,7 +578,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "시트(~S)"; Text[ turkish ] = "Fy"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Hoja"; + Text[ catalan ] = "~Full"; + Text[ thai ] = "แ~ผ่นงาน"; }; FixedText TXT_MAKE { @@ -594,7 +609,8 @@ TabPage TP_LAB_LAB Text[ greek ] = "~"; Text[ korean ] = "상표"; Text[ turkish ] = "Markas"; - Text[ catalan ] = "~Marca"; + Text[ catalan ] = "Marca"; + Text[ thai ] = "ยี่ห้อ"; }; ListBox BOX_MAKE { @@ -633,6 +649,7 @@ TabPage TP_LAB_LAB Text[ turkish ] = "Tipi"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~ชนิด"; }; ListBox BOX_TYPE { @@ -659,7 +676,7 @@ TabPage TP_LAB_LAB Text [ italian ] = "Formato" ; Text [ portuguese_brazilian ] = "Formato" ; Text [ portuguese ] = "Formato" ; - Text [ finnish ] = "Muoto" ; + Text [ finnish ] = "Muotoilu" ; Text [ danish ] = "Format" ; Text [ french ] = "Format" ; Text [ swedish ] = "Format" ; @@ -676,7 +693,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "서식"; Text[ turkish ] = "Format"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formata"; + Text[ catalan ] = "Format"; + Text[ thai ] = "รูปแบบ"; }; }; #define WIDTH 100 @@ -708,17 +726,18 @@ FloatingWindow DLG_SYNC_BTN Text [ dutch ] = "Etiketten synchroniseren" ; Text [ portuguese ] = "Sincronizar etiquetas" ; Text[ chinese_simplified ] = "标签同步化"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Synchronizacja etykiet"; Text[ japanese ] = "ラベル書きを同期させる"; Text[ chinese_traditional ] = "貼標同步化"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "라벨 동기화"; + Text[ korean ] = "레이블 동기화"; Text[ turkish ] = "Etiket ieriini oalt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sincronizar etiquetas"; - Text[ finnish ] = "Synkronoi nimit"; + Text[ catalan ] = "Sincronitza les etiquetes"; + Text[ finnish ] = "Synkronoi osoitetarrat"; + Text[ thai ] = "ป้ายชื่อที่ตรงกัน"; }; }; // String ******************************************************************* @@ -730,7 +749,7 @@ String STR_DOC_TITLE Text [ italian ] = "Busta" ; Text [ portuguese_brazilian ] = "Etiquetas" ; Text [ portuguese ] = "Etiquetas" ; - Text [ finnish ] = "Nimit" ; + Text [ finnish ] = "Osoitetarrat" ; Text [ danish ] = "Etiketter" ; Text [ french ] = "tiquettes" ; Text [ swedish ] = "Etiketter" ; @@ -738,16 +757,17 @@ String STR_DOC_TITLE Text [ spanish ] = "Etiquetas" ; Text [ english_us ] = "Labels" ; Text[ chinese_simplified ] = "标签"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Etykiety"; Text[ japanese ] = "ラベル書き"; Text[ chinese_traditional ] = "貼標"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "라벨"; + Text[ korean ] = "레이블"; Text[ turkish ] = "Etiket"; Text[ language_user1 ] = " "; Text[ catalan ] = "Etiquetes"; + Text[ thai ] = "ป้ายชื่อ"; }; String STR_CUSTOM { @@ -757,7 +777,7 @@ String STR_CUSTOM Text[ portuguese ] = "[Utilizador]"; Text[ russian ] = "[]"; Text[ greek ] = "[]"; - Text[ dutch ] = "[Gebruiker] "; + Text[ dutch ] = "[Aangepast]"; Text[ french ] = "[Utilisateur]"; Text[ spanish ] = "[Usuario]"; Text[ finnish ] = "[Kyttjn mrittm]"; @@ -772,7 +792,8 @@ String STR_CUSTOM Text[ chinese_traditional ] = "[使用者]"; Text[ turkish ] = "[Kullanc tanml]"; Text[ arabic ] = "[]"; - Text[ catalan ] = "[Usuario]"; + Text[ catalan ] = "[Usuari-definit]"; + Text[ thai ] = "[ระบุผู้ใช้]"; }; /********************************************************************/ TabPage TP_VISITING_CARDS @@ -796,25 +817,26 @@ TabPage TP_VISITING_CARDS Text [ English ] = "AutoText group" ; Text[ english_us ] = "AutoText - Section"; Text[ portuguese ] = "AutoTexto - ~seco"; - Text[ russian ] = " "; + Text[ russian ] = " - "; Text[ greek ] = " "; Text[ dutch ] = "AutoTekst - ~bereik"; Text[ french ] = "AutoTexte - ~Section"; - Text[ spanish ] = "rea AutoT~exto"; + Text[ spanish ] = "Texto automtico - ~Seccin"; Text[ italian ] = "Testo automatico - Sezione"; Text[ danish ] = "AutoTekst - omrde"; Text[ swedish ] = "AutoText - omrde"; Text[ polish ] = "Obszar Autotekstu"; Text[ portuguese_brazilian ] = "AutoText group"; Text[ japanese ] = "入力支援グループ"; - Text[ korean ] = "자동 텍스트- 영역"; + Text[ korean ] = "자동 텍스트 구역"; Text[ chinese_simplified ] = "自动图文集分类"; Text[ chinese_traditional ] = "自動圖文集分類"; Text[ arabic ] = " "; Text[ turkish ] = "Otomatik metin - alan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "rea AutoT~exto"; - Text[ finnish ] = "Automaattinen teksti - osio"; + Text[ catalan ] = "rea AutoT~ext"; + Text[ finnish ] = "Automaattinen teksti - osa"; + Text[ thai ] = "ข้อความอัตโนมัติ - ส่วน"; }; ListBox LB_AUTO_TEXT_GROUP { @@ -851,6 +873,7 @@ TabPage TP_VISITING_CARDS Text[ language_user1 ] = " "; Text[ catalan ] = "Contingut"; Text[ finnish ] = "Sislt"; + Text[ thai ] = "เนื้อหา"; }; Window WIN_EXAMPLE { @@ -877,7 +900,7 @@ TabPage TP_PRIVATE_DATA Text[ portuguese ] = "Dados pessoais"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Privgegevens"; + Text[ dutch ] = "Persoonlijke gegevens"; Text[ french ] = "Coordonnes prives"; Text[ spanish ] = "Datos privados"; Text[ italian ] = "Dati privati"; @@ -886,14 +909,15 @@ TabPage TP_PRIVATE_DATA Text[ polish ] = "Dane prywatne"; Text[ portuguese_brazilian ] = "Private data"; Text[ japanese ] = "個人データ"; - Text[ korean ] = "개인 데이터"; + Text[ korean ] = "개인 정보"; Text[ chinese_simplified ] = "私人资料"; Text[ chinese_traditional ] = "私人資料"; Text[ arabic ] = " "; Text[ turkish ] = "zel bilgiler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Datos privados"; + Text[ catalan ] = "Dades privades"; Text[ finnish ] = "Omat tiedot"; + Text[ thai ] = "ข้อมูลส่วนตัว"; }; FixedText FT_NAME { @@ -903,7 +927,7 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "First/Last ~name" ; Text[ english_us ] = "First/Last ~name/Initials"; Text[ portuguese ] = "~Nome prprio/Apelido/Iniciais"; - Text[ russian ] = "//"; + Text[ russian ] = "//"; Text[ greek ] = "//~"; Text[ dutch ] = "~Voor-/achternaam/Initialen"; Text[ french ] = "Prnom/Nom/Initiales"; @@ -914,14 +938,15 @@ TabPage TP_PRIVATE_DATA Text[ polish ] = "Imi/Nazwisko/Inicjay"; Text[ portuguese_brazilian ] = "First/Last ~name"; Text[ japanese ] = "名/姓/イニシャル(~N)"; - Text[ korean ] = "성/이름/머리글자(~N)"; + Text[ korean ] = "성/이름/이니셜(~N)"; Text[ chinese_simplified ] = "名字/姓氏/缩写(~N)"; Text[ chinese_traditional ] = "名字/姓氏/縮寫(~N)"; Text[ arabic ] = "/ /"; Text[ turkish ] = "Ad/Soyad/Baharfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No~mbre/Apellidos/Iniciales"; + Text[ catalan ] = "~Nom/Cog~noms/Inicials"; Text[ finnish ] = "Etu-/suku~nimi/nimikirjaimet"; + Text[ thai ] = "~ชื่อ/นามสกุล/ชื่อย่อ"; }; Edit ED_FIRSTNAME { @@ -949,9 +974,9 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "First/Last ~name 2" ; Text[ english_us ] = "First / Last ~Name / Initials 2"; Text[ portuguese ] = "~Nome prprio/Apelido/Iniciais 2"; - Text[ russian ] = "// 2"; + Text[ russian ] = " / / 2"; Text[ greek ] = "//~ 2"; - Text[ dutch ] = "Voor/achter ~naam 2"; + Text[ dutch ] = "Voor-/Achternaam/Initialen 2"; Text[ french ] = "Prnom/Nom/Initiales 2"; Text[ spanish ] = "Nombre/Apellidos/Iniciales 2"; Text[ italian ] = "Nome/Cognome/Iniziali 2"; @@ -960,13 +985,14 @@ TabPage TP_PRIVATE_DATA Text[ polish ] = "Imi/Nazwisko/Inicjay"; Text[ portuguese_brazilian ] = "First/Last ~name 2"; Text[ japanese ] = "姓/名/イニシャル 2 (~N)"; - Text[ korean ] = "성/이름/머리글자 2(~N)"; + Text[ korean ] = "성/이름/이니셜 2(~N)"; Text[ chinese_simplified ] = "名字/姓氏/缩写 2(~N)"; Text[ chinese_traditional ] = "名字/姓氏/縮寫 2(~N)"; Text[ arabic ] = "/ / 2"; Text[ turkish ] = "Ad/Soyad/Baharfler 2"; - Text[ catalan ] = "Nombre/Apellidos/Iniciales 2"; + Text[ catalan ] = "~Nom / Cog~noms / Inicials 2"; Text[ finnish ] = "Etu-/suku~nimi/nimikirjaimet 2"; + Text[ thai ] = "~ชื่อ/นามสกุล/ชื่อย่อ 2"; }; Edit ED_FIRSTNAME_2 { @@ -1011,8 +1037,9 @@ TabPage TP_PRIVATE_DATA Text[ arabic ] = ""; Text[ turkish ] = "Sokak"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Calle"; + Text[ catalan ] = "C~arrer"; Text[ finnish ] = "Ka~tuosoite"; + Text[ thai ] = "ถ~นน"; }; Edit ED_STREET { @@ -1028,25 +1055,26 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "Zip/City" ; Text[ english_us ] = "Zip/Cit~y"; Text[ portuguese ] = "CP/~Localidade"; - Text[ russian ] = "./"; + Text[ russian ] = " /"; Text[ greek ] = "../"; Text[ dutch ] = "~Postcode/Plaats"; Text[ french ] = "C.P./~Ville"; - Text[ spanish ] = "CP/Ciuda~d"; + Text[ spanish ] = "C.P./Ciuda~d"; Text[ italian ] = "C.A.P./Localit"; Text[ danish ] = "Postnr./By"; Text[ swedish ] = "~Postnr/Ort"; Text[ polish ] = "Kod pocztowy/Miejscowo"; Text[ portuguese_brazilian ] = "Zip/City"; Text[ japanese ] = "郵便番号/都道府県名(~Y)"; - Text[ korean ] = "우편번호/도시(~Y)"; + Text[ korean ] = "우편번호/구/군/시(~Y)"; Text[ chinese_simplified ] = "邮编/城市(~Y)"; Text[ chinese_traditional ] = "郵遞區號/城市(~Y)"; Text[ arabic ] = " /"; Text[ turkish ] = "Posta kodu/ehir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "CP/Ciuda~d"; + Text[ catalan ] = "Codi postal/Ciuta~t"; Text[ finnish ] = "Postinumero/Posti~toimipaikka"; + Text[ thai ] = "รหัสไปรษณีย์/เมือ~ง"; }; Edit ED_ZIP { @@ -1068,7 +1096,7 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "Country/State" ; Text[ english_us ] = "Co~untry/State"; Text[ portuguese ] = "~Pas"; - Text[ russian ] = "/"; + Text[ russian ] = "/"; Text[ greek ] = ""; Text[ dutch ] = "~Land"; Text[ french ] = "~Pays/tat"; @@ -1086,7 +1114,8 @@ TabPage TP_PRIVATE_DATA Text[ turkish ] = "lke/l"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Pas/Provincia"; - Text[ finnish ] = "Val~tio/osavaltio"; + Text[ finnish ] = "Maa/osaval~tio"; + Text[ thai ] = "ประเ~ทศ/รัฐ"; }; Edit ED_COUNTRY { @@ -1108,7 +1137,7 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "Title/Profession" ; Text[ english_us ] = "Title/~Profession"; Text[ portuguese ] = "~Ttulo/Profisso"; - Text[ russian ] = "/"; + Text[ russian ] = "/"; Text[ greek ] = "~/"; Text[ dutch ] = "Titel/Beroep"; Text[ french ] = "~Titre/Profession"; @@ -1125,8 +1154,9 @@ TabPage TP_PRIVATE_DATA Text[ arabic ] = " /"; Text[ turkish ] = "Unvan/Meslek"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ttulo/Pro~fesin"; - Text[ finnish ] = "Asema/~ammatti"; + Text[ catalan ] = "Ttol/Pro~fessi"; + Text[ finnish ] = "Tehtv/~ammatti"; + Text[ thai ] = "ตำแหน่ง/~อาชีพ"; }; Edit ED_TITLE { @@ -1150,7 +1180,7 @@ TabPage TP_PRIVATE_DATA Text[ portuguese ] = "Telefone/Telemvel"; Text[ russian ] = "/"; Text[ greek ] = "/"; - Text[ dutch ] = "Telefoon/mobile"; + Text[ dutch ] = "Telefoon/mobiele tel."; Text[ french ] = "Tlphone/Portable"; Text[ spanish ] = "Telfono/Mvil"; Text[ italian ] = "Tel./Cell."; @@ -1159,13 +1189,14 @@ TabPage TP_PRIVATE_DATA Text[ polish ] = "Telefon/Komrka"; Text[ portuguese_brazilian ] = "Phone/Mobile"; Text[ japanese ] = "自宅電話/携帯電話"; - Text[ korean ] = "전화/핸드폰"; + Text[ korean ] = "전화/휴대폰"; Text[ chinese_simplified ] = "电话/手机"; Text[ chinese_traditional ] = "電話/移動電話"; Text[ turkish ] = "Phone/Mobile"; Text[ arabic ] = "/"; - Text[ catalan ] = "Telfono/Mvil"; + Text[ catalan ] = "Telfono/Mbil"; Text[ finnish ] = "Puhelin/Matkapuhelin"; + Text[ thai ] = "โทรศัพท์/มือถือ"; }; Edit ED_PHONE { @@ -1206,6 +1237,7 @@ TabPage TP_PRIVATE_DATA Text[ language_user1 ] = " "; Text[ catalan ] = "Fa~x"; Text[ finnish ] = "Fak~si"; + Text[ thai ] = "โทร~สาร"; }; Edit ED_FAX { @@ -1221,25 +1253,26 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "Homepage / eMail" ; Text[ english_us ] = "Homepage / e-mail"; Text[ portuguese ] = "Homepage / e-mail"; - Text[ russian ] = ". / ."; + Text[ russian ] = " / . "; Text[ greek ] = " / E-Mail"; Text[ dutch ] = "Homepage / e-mail"; Text[ french ] = "Homepage / E-mail"; - Text[ spanish ] = "Pgina principal / e-mail"; + Text[ spanish ] = "Pgina principal / Correo-e"; Text[ italian ] = "Homepage/eMail"; Text[ danish ] = "Hjemmeside/E-mail"; Text[ swedish ] = "Hemsida / e-post"; Text[ polish ] = "Strona macierzysta/e-mail"; Text[ portuguese_brazilian ] = "Homepage / eMail"; Text[ japanese ] = "ホームページ/E-mail"; - Text[ korean ] = "홈페이지/전자 메일"; + Text[ korean ] = "홈페이지/전자메일"; Text[ chinese_simplified ] = "主页/电子邮件"; Text[ chinese_traditional ] = "首頁/電子郵件"; Text[ arabic ] = " / "; Text[ turkish ] = "Web sayfas / E-posta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pgina principal / e-mail"; + Text[ catalan ] = "Pgina principal / e-mail"; Text[ finnish ] = "Kotisivu/shkposti"; + Text[ thai ] = "โฮมเพจ / อีเมล์"; }; Edit ED_WWW { @@ -1284,8 +1317,9 @@ TabPage TP_BUSINESS_DATA Text[ arabic ] = " "; Text[ turkish ] = " Bilgileri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Datos del trabajo"; + Text[ catalan ] = "Dades professionals"; Text[ finnish ] = "Liiketiedot"; + Text[ thai ] = "ข้อมูลทางธุรกิจ"; }; FixedText FT_COMP { @@ -1295,9 +1329,9 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "Company" ; Text[ english_us ] = "Company"; Text[ portuguese ] = "~Firma"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = "~"; - Text[ dutch ] = "~Firma"; + Text[ dutch ] = "~Bedrijf"; Text[ french ] = "~Socit"; Text[ spanish ] = "E~mpresa"; Text[ italian ] = "Azienda"; @@ -1312,8 +1346,9 @@ TabPage TP_BUSINESS_DATA Text[ arabic ] = ""; Text[ turkish ] = "~irket ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "E~mpresa"; + Text[ catalan ] = "Empresa"; Text[ finnish ] = "Yritys"; + Text[ thai ] = "บริษัท"; }; Edit ED_COMP { @@ -1329,9 +1364,9 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "Company 2nd line" ; Text[ english_us ] = "Company 2nd line"; Text[ portuguese ] = "Firma: ~2 linha"; - Text[ russian ] = " 2- "; + Text[ russian ] = " 2- "; Text[ greek ] = " 2 "; - Text[ dutch ] = "Firma ~2e regel"; + Text[ dutch ] = "Bedrijf ~2e regel"; Text[ french ] = "Socit : ~2e ligne"; Text[ spanish ] = "Empresa (~2 lnea)"; Text[ italian ] = "Azienda (2 riga)"; @@ -1340,14 +1375,15 @@ TabPage TP_BUSINESS_DATA Text[ polish ] = "Firma 2 wiersz"; Text[ portuguese_brazilian ] = "Company 2nd line"; Text[ japanese ] = "会社名 2行目"; - Text[ korean ] = "회사 2번째 줄"; + Text[ korean ] = "회사 줄2"; Text[ chinese_simplified ] = "公司(第二行)"; Text[ chinese_traditional ] = "公司(第二行)"; Text[ arabic ] = " "; Text[ turkish ] = "irket ad ( 2'nci satr)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Empresa ~2da lnea"; + Text[ catalan ] = "Empresa ~2a lnia"; Text[ finnish ] = "Yritys2"; + Text[ thai ] = "บริษัทบรรทัดที่สอง"; }; Edit ED_COMP_EXT { @@ -1382,6 +1418,7 @@ TabPage TP_BUSINESS_DATA Text[ language_user1 ] = " "; Text[ catalan ] = "Esl~ogan"; Text[ finnish ] = "Iskulause"; + Text[ thai ] = "สโลแกน"; }; Edit ED_SLOGAN { @@ -1408,14 +1445,15 @@ TabPage TP_BUSINESS_DATA Text[ polish ] = "Ulica"; Text[ portuguese_brazilian ] = "Street"; Text[ japanese ] = "市町村名番地"; - Text[ korean ] = "거리번지"; + Text[ korean ] = "주소"; Text[ chinese_simplified ] = "街道"; Text[ chinese_traditional ] = "街道"; Text[ arabic ] = ""; Text[ turkish ] = "Sokak"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Calle"; + Text[ catalan ] = "Carrer"; Text[ finnish ] = "Katuosoite"; + Text[ thai ] = "ถนน"; }; Edit ED_STREET { @@ -1431,25 +1469,26 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "ZIP/City" ; Text[ english_us ] = "ZIP/City"; Text[ portuguese ] = "CP/~Localidade"; - Text[ russian ] = "./"; + Text[ russian ] = " /"; Text[ greek ] = "../"; Text[ dutch ] = "Pos~tcode/Plaats"; Text[ french ] = "C.P/~Ville"; - Text[ spanish ] = "CP/Ciu~dad"; + Text[ spanish ] = "C.P./Ciuda~d"; Text[ italian ] = "C.A.P./Localit"; Text[ danish ] = "Postnr./By"; Text[ swedish ] = "Postnr/Or~t"; Text[ polish ] = "Kod pocztowy/Miejscowo"; Text[ portuguese_brazilian ] = "ZIP/City"; Text[ japanese ] = "郵便番号/都道府県名"; - Text[ korean ] = "우편번호/도시"; + Text[ korean ] = "우편번호/구/군/시"; Text[ chinese_simplified ] = "邮编/城市"; Text[ chinese_traditional ] = "郵遞區號/城市"; Text[ arabic ] = " /"; Text[ turkish ] = "Posta kodu/ehir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "CP/Ciu~dad"; + Text[ catalan ] = "Codi postal/Ciutat"; Text[ finnish ] = "Postinumero/postitoimipaikka"; + Text[ thai ] = "รหัสไปรษณีย์/เมือง"; }; Edit ED_ZIP { @@ -1471,7 +1510,7 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "Country/State" ; Text[ english_us ] = "Country/State"; Text[ portuguese ] = "~Pas"; - Text[ russian ] = "/"; + Text[ russian ] = "/"; Text[ greek ] = ""; Text[ dutch ] = "~Land"; Text[ french ] = "~Pays/tat"; @@ -1489,7 +1528,8 @@ TabPage TP_BUSINESS_DATA Text[ turkish ] = "lke/l"; Text[ language_user1 ] = " "; Text[ catalan ] = "Pas/Pro~vincia"; - Text[ finnish ] = "Valtio/osavaltio"; + Text[ finnish ] = "Maa/osavaltio"; + Text[ thai ] = "ประเทศ/รัฐ"; }; Edit ED_COUNTRY { @@ -1522,14 +1562,15 @@ TabPage TP_BUSINESS_DATA Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; Text[ japanese ] = "部署"; - Text[ korean ] = "직위"; + Text[ korean ] = "부서"; Text[ chinese_simplified ] = "位置"; Text[ chinese_traditional ] = "位置"; Text[ arabic ] = " "; Text[ turkish ] = "Pozisyon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Posicin"; + Text[ catalan ] = "~Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; Edit ED_POSITION { @@ -1547,7 +1588,7 @@ TabPage TP_BUSINESS_DATA Text[ portuguese ] = "Telefone/Telemvel"; Text[ russian ] = "/"; Text[ greek ] = "/"; - Text[ dutch ] = "Telefoon/mobile"; + Text[ dutch ] = "Telefoon/mobiel"; Text[ french ] = "Tlphone/Portable"; Text[ spanish ] = "Telfono/Mvil"; Text[ italian ] = "Tel./Cell."; @@ -1556,13 +1597,14 @@ TabPage TP_BUSINESS_DATA Text[ polish ] = "Telefon/Komrka"; Text[ portuguese_brazilian ] = "Phone/Mobile"; Text[ japanese ] = "会社電話/携帯電話"; - Text[ korean ] = "전화/핸드폰"; + Text[ korean ] = "전화/휴대폰"; Text[ chinese_simplified ] = "电话/手机"; Text[ chinese_traditional ] = "電話/移動電話"; Text[ turkish ] = "Phone/Mobile"; Text[ arabic ] = "/"; - Text[ catalan ] = "Telfono/Mvil"; + Text[ catalan ] = "Telfono/Mbil"; Text[ finnish ] = "Puhelin/Matkapuhelin"; + Text[ thai ] = "โทรศัพท์/มือถือ"; }; Edit ED_PHONE { @@ -1602,6 +1644,7 @@ TabPage TP_BUSINESS_DATA Text[ arabic ] = ""; Text[ catalan ] = "Fax"; Text[ finnish ] = "Faksi"; + Text[ thai ] = "โทรสาร"; }; Edit ED_FAX { @@ -1617,25 +1660,26 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "Homepage / eMail" ; Text[ english_us ] = "Ho~mepage / e-mail"; Text[ portuguese ] = "Ho~mepage / e-mail"; - Text[ russian ] = ". /."; + Text[ russian ] = "C~ /. "; Text[ greek ] = " / E-Mail"; Text[ dutch ] = "Ho~mepage / e-mail"; Text[ french ] = "~Homepage / E-mail"; - Text[ spanish ] = "Pgina principal / ~e-mail"; + Text[ spanish ] = "Pgina principal / ~Correo-e"; Text[ italian ] = "Ho~mepage/eMail"; Text[ danish ] = "Hjemmeside/E-mail"; Text[ swedish ] = "He~msida / e-post"; Text[ polish ] = "Strona macierzysta/e-mail"; Text[ portuguese_brazilian ] = "Homepage / eMail"; Text[ japanese ] = "ホームページ/E-~mail"; - Text[ korean ] = "홈페이지/전자 메일(~M)"; + Text[ korean ] = "홈페이지/전자메일(~M)"; Text[ chinese_simplified ] = "主页/电子邮件(~M)"; Text[ chinese_traditional ] = "首頁/電子郵件(~M)"; Text[ arabic ] = " / "; Text[ turkish ] = "Web sayfas / E-posta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pgina principal / ~e-mail"; + Text[ catalan ] = "Pgina principal / ~e-mail"; Text[ finnish ] = "Ko~tisivu/shkposti"; + Text[ thai ] = "โฮมเ~พจ / อีเมล์"; }; Edit ED_WWW { @@ -1665,3 +1709,8 @@ TabPage TP_BUSINESS_DATA + + + + + diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src index 9d2c711b279d..8e9415a47544 100644 --- a/sw/source/ui/envelp/labfmt.src +++ b/sw/source/ui/envelp/labfmt.src @@ -2,9 +2,9 @@ * * $RCSfile: labfmt.src,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:20:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,24 +97,25 @@ TabPage TP_LAB_FMT Text [ portuguese ] = "Espaamento ~horiz." ; Text [ finnish ] = "~Vaakaetisyys" ; Text [ danish ] = "Vandret afstand" ; - Text [ french ] = "cart ~horizontal" ; + Text [ french ] = "cart horizontal" ; Text [ swedish ] = "~Horis. avstnd" ; Text [ dutch ] = "~Horiz. afstand" ; Text [ spanish ] = "Distancia ~horiz." ; Text [ english_us ] = "Hori~zontal pitch" ; Group = TRUE ; Left = TRUE ; - Text[ chinese_simplified ] = "ˮƽ(~Z)"; + Text[ chinese_simplified ] = "水平间隔(~Z)"; Text[ russian ] = " ."; Text[ polish ] = "Odstp poziomy"; - Text[ japanese ] = "̊Ԋu(~Z)"; - Text[ chinese_traditional ] = "j(~Z)"; + Text[ japanese ] = "横の間隔(~Z)"; + Text[ chinese_traditional ] = "水平間隔(~Z)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~Z)"; + Text[ korean ] = "수평 간격(~Z)"; Text[ turkish ] = "~Yatay boluk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia ~horiz."; + Text[ catalan ] = "Distncia ~horit."; + Text[ thai ] = "ระยะห่างแนวน~อน"; }; MetricField FLD_HDIST { @@ -144,20 +145,21 @@ TabPage TP_LAB_FMT Text [ french ] = "cart ~vertical" ; Text [ swedish ] = "~Vert. avstnd" ; Text [ dutch ] = "V~ert. afstand" ; - Text [ spanish ] = "Distancia ~vert." ; + Text [ spanish ] = "Distancia ~vertical" ; Text [ english_us ] = "~Vertical pitch" ; Left = TRUE ; - Text[ chinese_simplified ] = "ֱ(~V)"; + Text[ chinese_simplified ] = "垂直间隔(~V)"; Text[ russian ] = " ."; Text[ polish ] = "Odstp pionowy"; - Text[ japanese ] = "c̊Ԋu(~V)"; - Text[ chinese_traditional ] = "j(~V)"; + Text[ japanese ] = "縦の間隔(~V)"; + Text[ chinese_traditional ] = "垂直間隔(~V)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~V)"; + Text[ korean ] = "수직 간격(~V)"; Text[ turkish ] = "Dikey boluk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia ~vert."; + Text[ catalan ] = "Distncia ~vert."; + Text[ thai ] = "ระยะห่างแนว~ตั้ง"; }; MetricField FLD_VDIST { @@ -179,28 +181,29 @@ TabPage TP_LAB_FMT Text = "~Breite" ; Text [ English ] = "Width" ; Text [ norwegian ] = "Bredde " ; - Text [ italian ] = "~Largh." ; + Text [ italian ] = "Larghezza" ; Text [ portuguese_brazilian ] = "Largura" ; Text [ portuguese ] = "~Largura" ; Text [ finnish ] = "~Leveys" ; Text [ danish ] = "Bredde" ; - Text [ french ] = "~Largeur" ; + Text [ french ] = "Largeur" ; Text [ swedish ] = "~Bredd" ; Text [ dutch ] = "B~reedte" ; - Text [ spanish ] = "A~ncho" ; + Text [ spanish ] = "Ancho" ; Text [ english_us ] = "~Width" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~W)"; + Text[ chinese_simplified ] = "宽度(~W)"; Text[ russian ] = ""; Text[ polish ] = "Szer."; - Text[ japanese ] = "(~W)"; - Text[ chinese_traditional ] = "e(~W)"; + Text[ japanese ] = "幅(~W)"; + Text[ chinese_traditional ] = "寬度(~W)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ʺ(~W)"; + Text[ korean ] = "너비(~W)"; Text[ turkish ] = "Ge~nilik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ncho"; + Text[ catalan ] = "~Amplada"; + Text[ thai ] = "ความ~กว้าง"; }; MetricField FLD_WIDTH { @@ -227,23 +230,24 @@ TabPage TP_LAB_FMT Text [ portuguese ] = "Altura" ; Text [ finnish ] = "~Korkeus" ; Text [ danish ] = "Hjde" ; - Text [ french ] = "~Hauteur" ; + Text [ french ] = "Hauteur" ; Text [ swedish ] = "Hj~d" ; Text [ dutch ] = "H~oogte" ; Text [ spanish ] = "A~ltura" ; Text [ english_us ] = "~Height" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~H)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "高度(~H)"; + Text[ russian ] = "~"; Text[ polish ] = "Wys."; - Text[ japanese ] = "(~H)"; - Text[ chinese_traditional ] = "(~H)"; + Text[ japanese ] = "高さ(~H)"; + Text[ chinese_traditional ] = "高度(~H)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~H)"; + Text[ korean ] = "높이(~H)"; Text[ turkish ] = "~Ykseklik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ltura"; + Text[ catalan ] = "A~lada"; + Text[ thai ] = "ความ~สูง"; }; MetricField FLD_HEIGHT { @@ -268,25 +272,26 @@ TabPage TP_LAB_FMT Text [ italian ] = "Margine sinistro" ; Text [ portuguese_brazilian ] = "Margem esquerda" ; Text [ portuguese ] = "Margem esquerda" ; - Text [ finnish ] = "~Vasen marginaali" ; + Text [ finnish ] = "~Vasen reunus" ; Text [ danish ] = "Margen venstre" ; - Text [ french ] = "~Marge gauche" ; + Text [ french ] = "Marge gauche" ; Text [ swedish ] = "Vnster margina~l" ; - Text [ dutch ] = "~Marge links" ; + Text [ dutch ] = "Linker~marge" ; Text [ spanish ] = "Margen i~zquierdo" ; Text [ english_us ] = "~Left margin" ; Left = TRUE ; - Text[ chinese_simplified ] = "ҳ߾(~L)"; + Text[ chinese_simplified ] = "左方页边距(~L)"; Text[ russian ] = " "; Text[ polish ] = "Lewy margines"; - Text[ japanese ] = "](~L)"; - Text[ chinese_traditional ] = "(~L)"; + Text[ japanese ] = "左余白(~L)"; + Text[ chinese_traditional ] = "左邊框(~L)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~L)"; + Text[ korean ] = "왼쪽 여백(~L)"; Text[ turkish ] = "S~ol kenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Margen i~zquierdo"; + Text[ catalan ] = "~Marge esquerre"; + Text[ thai ] = "ระยะขอบ~ซ้าย"; }; MetricField FLD_LEFT { @@ -318,20 +323,21 @@ TabPage TP_LAB_FMT Text [ french ] = "Marge ~suprieure" ; Text [ swedish ] = "~vre marginal" ; Text [ dutch ] = "~Bovenmarge" ; - Text [ spanish ] = "M~argen superior" ; + Text [ spanish ] = "Margen superior" ; Text [ english_us ] = "~Top margin" ; Left = TRUE ; - Text[ chinese_simplified ] = "Ϸҳ߾(~T)"; + Text[ chinese_simplified ] = "上方页边距(~T)"; Text[ russian ] = " "; Text[ polish ] = "Margines grny"; - Text[ japanese ] = "](~T)"; - Text[ chinese_traditional ] = "W(~T)"; + Text[ japanese ] = "上余白(~T)"; + Text[ chinese_traditional ] = "上邊框(~T)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~T)"; + Text[ korean ] = "위 여백(~T)"; Text[ turkish ] = "st kenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "M~argen superior"; + Text[ catalan ] = "~Marge superior"; + Text[ thai ] = "ระยะขอบ~บน"; }; MetricField FLD_UPPER { @@ -358,7 +364,7 @@ TabPage TP_LAB_FMT Text [ italian ] = "~Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "~Colunas" ; - Text [ finnish ] = "~Sarakkeet" ; + Text [ finnish ] = "Pal~stat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "~Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -366,17 +372,18 @@ TabPage TP_LAB_FMT Text [ spanish ] = "Column~as" ; Text [ english_us ] = "~Columns" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~C)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "列(~C)"; + Text[ russian ] = ""; Text[ polish ] = "Kolumny"; - Text[ japanese ] = "(~C)"; - Text[ chinese_traditional ] = "(~C)"; + Text[ japanese ] = "列(~C)"; + Text[ chinese_traditional ] = "欄(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~C)"; + Text[ korean ] = "열(~C)"; Text[ turkish ] = "~Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Column~as"; + Text[ catalan ] = "~Columnes"; + Text[ thai ] = "~คอลัมน์"; }; NumericField FLD_COLUMNS { @@ -402,23 +409,24 @@ TabPage TP_LAB_FMT Text [ portuguese ] = "Linhas" ; Text [ finnish ] = "~Rivit" ; Text [ danish ] = "Rkker" ; - Text [ french ] = "~Lignes" ; + Text [ french ] = "Lignes" ; Text [ swedish ] = "~Rader" ; Text [ dutch ] = "~Rijen" ; Text [ spanish ] = "~Filas" ; Text [ english_us ] = "R~ows" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~O)"; + Text[ chinese_simplified ] = "行(~O)"; Text[ russian ] = ""; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "s(~O)"; - Text[ chinese_traditional ] = "(~O)"; + Text[ japanese ] = "行(~O)"; + Text[ chinese_traditional ] = "行(~O)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~O)"; + Text[ korean ] = "행(~O)"; Text[ turkish ] = "~Satr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Filas"; + Text[ catalan ] = "F~iles"; + Text[ thai ] = "แถ~ว"; }; NumericField FLD_ROWS { @@ -446,18 +454,19 @@ TabPage TP_LAB_FMT Text[ french ] = "~Enregistrer..."; Text[ spanish ] = "~Guardar..."; Text[ italian ] = "~Salva..."; - Text[ danish ] = "Save..."; + Text[ danish ] = "~Gem..."; Text[ swedish ] = "~Spara..."; Text[ polish ] = "Zapisz..."; Text[ portuguese_brazilian ] = "Save..."; - Text[ japanese ] = "ۑ(~S)..."; - Text[ korean ] = "(~S)..."; - Text[ chinese_simplified ] = "(~S)..."; - Text[ chinese_traditional ] = "xs(~S)..."; + Text[ japanese ] = "保存(~S)..."; + Text[ korean ] = "저장(~S)..."; + Text[ chinese_simplified ] = "存盘(~S)..."; + Text[ chinese_traditional ] = "儲存(~S)..."; Text[ turkish ] = "Save..."; Text[ arabic ] = "..."; - Text[ catalan ] = "~Guardar..."; - Text[ finnish ] = "~Tallenna"; + Text[ catalan ] = "~Desa..."; + Text[ finnish ] = "~Tallenna..."; + Text[ thai ] = "~บันทึก..."; }; }; // String ******************************************************************* @@ -476,17 +485,18 @@ String STR_HDIST Text [ dutch ] = "H. afstand" ; Text [ spanish ] = "Distancia h." ; Text [ english_us ] = "H. Pitch" ; - Text[ chinese_simplified ] = "ˮƽ"; + Text[ chinese_simplified ] = "水平间隔"; Text[ russian ] = " ."; Text[ polish ] = "Odstp poziomy"; - Text[ japanese ] = "̊Ԋu"; - Text[ chinese_traditional ] = "j"; + Text[ japanese ] = "横の間隔"; + Text[ chinese_traditional ] = "水平間隔"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "수평 간격"; Text[ turkish ] = "Y. boluk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia h."; + Text[ catalan ] = "Distncia h."; + Text[ thai ] = "ระยะห่างแนวนอน"; }; String STR_VDIST { @@ -503,17 +513,18 @@ String STR_VDIST Text [ dutch ] = "V. afstand" ; Text [ spanish ] = "Distancia v." ; Text [ english_us ] = "V. Pitch" ; - Text[ chinese_simplified ] = "ֱ"; + Text[ chinese_simplified ] = "垂直间隔"; Text[ russian ] = " ."; Text[ polish ] = "Odstp pionowy"; - Text[ japanese ] = "c̊Ԋu"; - Text[ chinese_traditional ] = "j"; + Text[ japanese ] = "縦の間隔"; + Text[ chinese_traditional ] = "垂直間隔"; Text[ arabic ] = " "; Text[ greek ] = ". "; - Text[ korean ] = " "; + Text[ korean ] = "수직 간격"; Text[ turkish ] = "D. boluk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia v."; + Text[ catalan ] = "Distncia v."; + Text[ thai ] = "ระยะห่างแนวตั้ง"; }; String STR_WIDTH { @@ -530,17 +541,18 @@ String STR_WIDTH Text [ dutch ] = "Breedte" ; Text [ spanish ] = "Ancho" ; Text [ english_us ] = "Width" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "宽度"; Text[ russian ] = ""; Text[ polish ] = "Szeroko"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "e"; + Text[ japanese ] = "幅"; + Text[ chinese_traditional ] = "寬度"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ʺ"; + Text[ korean ] = "너비"; Text[ turkish ] = "Genilik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho"; + Text[ catalan ] = "Amplada"; + Text[ thai ] = "ความกว้าง"; }; String STR_HEIGHT { @@ -551,23 +563,24 @@ String STR_HEIGHT Text [ portuguese_brazilian ] = "Altura" ; Text [ portuguese ] = "Altura" ; Text [ finnish ] = "Korkeus" ; - Text [ danish ] = "Hjde" ; + Text [ danish ] = "H~jde" ; Text [ french ] = "Hauteur" ; Text [ swedish ] = "Hjd" ; Text [ dutch ] = "Hoogte" ; Text [ spanish ] = "Altura" ; Text [ english_us ] = "Height" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "高度"; Text[ russian ] = ""; Text[ polish ] = "Wysoko"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "高さ"; + Text[ chinese_traditional ] = "高度"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "높이"; Text[ turkish ] = "Ykseklik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura"; + Text[ catalan ] = "Alada"; + Text[ thai ] = "ความสูง"; }; String STR_LEFT { @@ -577,24 +590,25 @@ String STR_LEFT Text [ italian ] = "Margine sinistro" ; Text [ portuguese_brazilian ] = "Margem esquerda" ; Text [ portuguese ] = "Margem esquerda" ; - Text [ finnish ] = "Vasen marginaali" ; + Text [ finnish ] = "Vasen reunus" ; Text [ danish ] = "Margen venstre" ; Text [ french ] = "Marge gauche" ; Text [ swedish ] = "Vnster marginal" ; - Text [ dutch ] = "Linker marge" ; + Text [ dutch ] = "Linkermarge" ; Text [ spanish ] = "Margen izquierdo" ; Text [ english_us ] = "Left margin" ; - Text[ chinese_simplified ] = "ҳ߾"; + Text[ chinese_simplified ] = "左方页边距"; Text[ russian ] = " "; Text[ polish ] = "Lewy margines"; - Text[ japanese ] = "]"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "左余白"; + Text[ chinese_traditional ] = "左邊框"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "왼쪽 여백"; Text[ turkish ] = "Sol kenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Margen izquierdo"; + Text[ catalan ] = "Marge esquerre"; + Text[ thai ] = "ระยะขอบซ้าย"; }; String STR_UPPER { @@ -604,24 +618,25 @@ String STR_UPPER Text [ italian ] = "Margine superiore" ; Text [ portuguese_brazilian ] = "Margem superior" ; Text [ portuguese ] = "Margem superior" ; - Text [ finnish ] = "Ylmarginaali" ; + Text [ finnish ] = "Ylreunus" ; Text [ danish ] = "Margen foroven" ; Text [ french ] = "Marge suprieure" ; Text [ swedish ] = "vre marginal" ; Text [ dutch ] = "Bovenmarge" ; Text [ spanish ] = "Margen superior" ; Text [ english_us ] = "Top margin" ; - Text[ chinese_simplified ] = "Ϸҳ߾"; + Text[ chinese_simplified ] = "上方页边距"; Text[ russian ] = " "; Text[ polish ] = "Grny margines"; - Text[ japanese ] = "]"; - Text[ chinese_traditional ] = "W"; + Text[ japanese ] = "上余白"; + Text[ chinese_traditional ] = "上邊框"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "위 여백"; Text[ turkish ] = "st kenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Margen superior"; + Text[ catalan ] = "Marge superior"; + Text[ thai ] = "ระยะขอบบน"; }; String STR_COLS { @@ -631,24 +646,25 @@ String STR_COLS Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; Text [ dutch ] = "Kolommen" ; Text [ spanish ] = "Columnas" ; Text [ english_us ] = "Columns" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "栏"; + Text[ russian ] = ""; Text[ polish ] = "Kolumny"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "列"; + Text[ chinese_traditional ] = "欄"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "단"; Text[ turkish ] = "Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = "Columnes"; + Text[ thai ] = "คอลัมน์"; }; String STR_ROWS { @@ -665,17 +681,18 @@ String STR_ROWS Text [ dutch ] = "Rijen" ; Text [ spanish ] = "Filas" ; Text [ english_us ] = "Rows" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "行"; Text[ russian ] = ""; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "s"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "行"; + Text[ chinese_traditional ] = "行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "행"; Text[ turkish ] = "Satr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Filas"; + Text[ catalan ] = "Files"; + Text[ thai ] = "แถว"; }; ModalDialog DLG_SAVE_LABEL { @@ -695,24 +712,25 @@ ModalDialog DLG_SAVE_LABEL Text [ portuguese_brazilian ] = "Fazer" ; Text [ portuguese ] = "~Marca" ; Text [ finnish ] = "Tuotemerkki" ; - Text [ danish ] = "Mrke" ; + Text [ danish ] = "~Mrke" ; Text [ french ] = "~Marque" ; Text [ swedish ] = "~Mrke" ; Text [ dutch ] = "~Merk" ; Text [ spanish ] = "~Marca" ; Text [ english_us ] = "Brand" ; Left = TRUE ; - Text[ chinese_simplified ] = "̱"; + Text[ chinese_simplified ] = "商标"; Text[ russian ] = ""; Text[ polish ] = "Marka"; - Text[ japanese ] = ""; + Text[ japanese ] = "製造元"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "Ӽ"; + Text[ chinese_traditional ] = "商標"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "ǥ"; + Text[ korean ] = "상표"; Text[ turkish ] = "Markas"; - Text[ catalan ] = "~Marca"; + Text[ catalan ] = "Marca"; + Text[ thai ] = "ยี่ห้อ"; }; ComboBox CB_MAKE { @@ -732,24 +750,25 @@ ModalDialog DLG_SAVE_LABEL Text [ portuguese_brazilian ] = "Tipo" ; Text [ portuguese ] = "~Tipo" ; Text [ finnish ] = "~Tyyppi" ; - Text [ danish ] = "Type" ; - Text [ french ] = "~Type" ; + Text [ danish ] = "Typ~e" ; + Text [ french ] = "Type" ; Text [ swedish ] = "~Typ" ; Text [ dutch ] = "~Type" ; Text [ spanish ] = "~Tipo" ; Text [ english_us ] = "T~ype" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~Y)"; + Text[ chinese_simplified ] = "类型(~Y)"; Text[ russian ] = ""; Text[ polish ] = "Typ"; - Text[ japanese ] = "(~Y)"; - Text[ chinese_traditional ] = "(~Y)"; + Text[ japanese ] = "種類(~Y)"; + Text[ chinese_traditional ] = "類型(~Y)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~Y)"; + Text[ korean ] = "유형(~Y)"; Text[ turkish ] = "Tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo"; + Text[ catalan ] = "T~ipus"; + Text[ thai ] = "ช~นิด"; }; Edit ED_TYPE { @@ -771,18 +790,19 @@ ModalDialog DLG_SAVE_LABEL Text[ french ] = "Options"; Text[ spanish ] = "Opciones"; Text[ italian ] = "Opzioni"; - Text[ danish ] = "Options"; + Text[ danish ] = "Indstillinger"; Text[ swedish ] = "Alternativ"; Text[ polish ] = "Opcje"; Text[ portuguese_brazilian ] = "Options"; - Text[ japanese ] = ""; - Text[ korean ] = "ɼ"; - Text[ chinese_simplified ] = "ѡ"; - Text[ chinese_traditional ] = "ﶵ"; + Text[ japanese ] = "オプション"; + Text[ korean ] = "옵션"; + Text[ chinese_simplified ] = "选项"; + Text[ chinese_traditional ] = "選項"; Text[ turkish ] = "Options"; Text[ arabic ] = ""; - Text[ catalan ] = "Opciones"; - Text[ finnish ] = "Mukauta"; + Text[ catalan ] = "Opcions"; + Text[ finnish ] = "Asetukset"; + Text[ thai ] = "ตัวเลือก"; }; OKButton PB_OK { @@ -814,47 +834,63 @@ ModalDialog DLG_SAVE_LABEL Message [ English ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?" ; Message[ english_us ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?"; Message[ portuguese ] = "A etiqueta \"%1 / %2\" j existe.\nSubstitui-la?"; - Message[ russian ] = " \"%1 / %2\" .\n ?"; + Message[ russian ] = " \"%1 / %2\" .\n?"; Message[ greek ] = " \"%1 / %2\" .\n ;"; Message[ dutch ] = "Etiket \"%1 / %2\" bestaat reeds.\nOverschrijven?"; Message[ french ] = "L'tiquette \"%1 / %2\" existe dj.\nVoulez-vous craser les donnes ?"; Message[ spanish ] = "La etiqueta \"%1 / %2\" existe ya.\nDesea sobrescribila?"; Message[ italian ] = "L'etichetta \"%1 / %2\" esiste gi.\nVolete sovrascriverla?"; - Message[ danish ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?"; + Message[ danish ] = "Etiketten \"%1 / %2\" findes allerede.\nVil du overskrive dataene?"; Message[ swedish ] = "Etiketten \"%1 / %2\" finns redan.\nVill du skriva ver den?"; Message[ polish ] = "Etykieta \"%1 / %2\" ju istnieje.\nSkasowa dane przez zapisanie?"; Message[ portuguese_brazilian ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?"; - Message[ japanese ] = "فu%1 / %2v͂łɂ܂B\n㏑܂B"; - Message[ korean ] = "\"%1 / %2\" ̹ մϴ.\n ðڽϱ?"; - Message[ chinese_simplified ] = " \"%1 / %2\" Ѿڡ\nҪд"; - Message[ chinese_traditional ] = "oӶKСu%1 / %2vwgsbC\nnмgH"; + Message[ japanese ] = "ラベル書き「%1 / %2」はすでにあります。\n上書きしますか。"; + Message[ korean ] = "\"%1 / %2\" 레이블은 이미 있습니다.\n데이터를 덮어쓰시겠습니까?"; + Message[ chinese_simplified ] = "这个贴标 \"%1 / %2\" 已经存在。\n要改写？"; + Message[ chinese_traditional ] = "這個貼標<%1 / %2>已經存在。\n要覆寫？"; Message[ turkish ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?"; Message[ arabic ] = " \"%1 / %2\" .\n ʿ"; - Message[ catalan ] = "La etiqueta \"%1 / %2\" existe ya.\nDesea sobrescribila?"; - Message[ finnish ] = "Das Etikett \"%1 / %2\" ist bereits vorhanden.\nMchten Sie die Daten berschreiben?"; + Message[ catalan ] = "L'etiqueta \"%1 / %2\" ja existeix.\nLa voleu sobreescriure?"; + Message[ finnish ] = "Selite \"%1 / %2\" on jo kytss.\nHaluatko korvata sen?"; + Message[ thai ] = "ป้ายชื่อ \"%1 / %2\" มีอยู่แล้ว\nคุณต้องการเขียนทับมันหรือไม่?"; }; Text[ english_us ] = "Save Label Format"; Text[ portuguese ] = "Guardar formato de etiqueta"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Etiketformaat opslaan"; - Text[ french ] = "Enregistrer le format d'tiquette"; + Text[ french ] = "Enregistrement du format d'tiquette"; Text[ spanish ] = "Guardar formato de etiqueta"; Text[ italian ] = "Salva il formato etichetta"; - Text[ danish ] = "Save label format"; + Text[ danish ] = "Gem etiketformat"; Text[ swedish ] = "Spara etikettformat"; Text[ polish ] = "Zapisz format etykiety"; Text[ portuguese_brazilian ] = "Save label format"; - Text[ japanese ] = "ق̏ۑ"; - Text[ korean ] = " "; - Text[ chinese_simplified ] = "ʽ"; - Text[ chinese_traditional ] = "xsKЮ榡"; + Text[ japanese ] = "ラベル書きの書式を保存"; + Text[ korean ] = "레이블 서식 저장"; + Text[ chinese_simplified ] = "存盘贴标格式"; + Text[ chinese_traditional ] = "儲存貼標格式"; Text[ turkish ] = "Save label format"; Text[ arabic ] = " "; - Text[ catalan ] = "Guardar formato de etiqueta"; - Text[ finnish ] = "Etikettenformat speichern"; + Text[ catalan ] = "Desa el format de l'etiqueta"; + Text[ finnish ] = "Tallenna tarramuoto"; + Text[ thai ] = "บันทึกรูปแบบป้ายชื่อ"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src index f5579ad698aa..3a6688d1d643 100644 --- a/sw/source/ui/envelp/labprt.src +++ b/sw/source/ui/envelp/labprt.src @@ -2,9 +2,9 @@ * * $RCSfile: labprt.src,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:48:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,7 +89,7 @@ TabPage TP_LAB_PRT Text [ SWEDISH ] = "H~ela sidan" ; Text [ PORTUGUESE ] = "Pgina ~inteira" ; Text[ chinese_simplified ] = "整页(~E)"; - Text[ russian ] = " "; + Text[ russian ] = "~ "; Text[ polish ] = "Caa strona"; Text[ japanese ] = "ページ全体(~E)"; Text[ chinese_traditional ] = "整頁(~E)"; @@ -124,7 +124,7 @@ TabPage TP_LAB_PRT Text[ chinese_traditional ] = "單個貼標(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "각 라벨(~S)"; + Text[ korean ] = "개별 레이블(~S)"; Text[ turkish ] = "Tek Eti~ket"; Text[ catalan ] = "~Una etiqueta"; Text[ thai ] = "ป้ายชื่อเ~ดียว"; @@ -262,7 +262,7 @@ TabPage TP_LAB_PRT Text[ polish ] = "Dystrybuj"; Text[ portuguese_brazilian ] = "Divide"; Text[ japanese ] = "割り当て"; - Text[ korean ] = "분할"; + Text[ korean ] = "분배"; Text[ chinese_simplified ] = "分布"; Text[ chinese_traditional ] = "分布"; Text[ turkish ] = "Divide"; @@ -365,3 +365,8 @@ TabPage TP_LAB_PRT + + + + + diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index ea362b42c4af..e95c6cd512e0 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:32:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -804,3 +804,26 @@ SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(Window* pParent) : SwMailMergeCreateFromDlg::~SwMailMergeCreateFromDlg() { } +/* -----------------04.02.2003 13:45----------------- + * + * --------------------------------------------------*/ +SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(Window* pParent) : + ModalDialog(pParent, SW_RES(DLG_MERGE_FIELD_CONNECTIONS)), + aConnectionsFL( this, ResId( FL_CONNECTIONS )), + aUseExistingRB( this, ResId( RB_USEEXISTING )), + aCreateNewRB( this, ResId( RB_CREATENEW )), + aInfoFI( this, ResId( FT_INFO )), + aOK( this, ResId( BT_OK )), + aCancel( this, ResId( BT_CANCEL )), + aHelp( this, ResId( BT_HELP )) +{ + FreeResource(); +} +/* -----------------04.02.2003 13:45----------------- + * + * --------------------------------------------------*/ +SwMailMergeFieldConnectionsDlg::~SwMailMergeFieldConnectionsDlg() +{ +} + + diff --git a/sw/source/ui/envelp/mailmrge.hrc b/sw/source/ui/envelp/mailmrge.hrc index 483be9e5e4d3..9eb6f0b83a40 100644 --- a/sw/source/ui/envelp/mailmrge.hrc +++ b/sw/source/ui/envelp/mailmrge.hrc @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.hrc,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:14:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,8 +111,10 @@ #define BT_OK 4 #define BT_CANCEL 5 #define BT_HELP 6 - - +#define FL_CONNECTIONS 7 +#define RB_USEEXISTING 8 +#define RB_CREATENEW 9 +#define FT_INFO 10 #endif diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src index 4845888e2b2f..422be1b92a0d 100644 --- a/sw/source/ui/envelp/mailmrge.src +++ b/sw/source/ui/envelp/mailmrge.src @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.src,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: os $ $Date: 2002-09-18 14:48:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,24 +63,38 @@ // #include ***************************************************************** #include "mailmrge.hrc" #include "cmdid.h" +#include "helpid.h" + +#define _MAIL_MERGE_STRING_ \ + Text = "Seriendruck" ;\ + Text [ english_us ] = "Mail Merge" ; \ + Text[ portuguese ] = "Mail Merge"; \ + Text[ russian ] = "Mail Merge"; \ + Text[ spanish ] = "Impresin en serie"; \ + Text[ italian ] = "Stampa in serie"; \ + Text[ swedish ] = "Kopplad utskrift"; \ + Text[ polish ] = "Mail Merge"; \ + Text[ portuguese_brazilian ] = "Mail Merge"; \ + Text[ japanese ] = "差し込み印刷"; \ + Text[ korean ] = "편지 병합"; \ + Text[ turkish ] = "Mail Merge"; \ + Text[ thai ] = "Mail Merge"; \ + Text[ greek ] = "Mail Merge"; \ + Text[ dutch ] = "Mail Merge"; \ + Text[ french ] = "Mailing"; \ + Text[ finnish ] = "Mail Merge"; \ + Text[ danish ] = "Mail Merge"; \ + Text[ chinese_simplified ] = "邮件合并"; \ + Text[ chinese_traditional ] = "合併列印"; \ + Text[ arabic ] = "Mail Merge"; \ + Text[ catalan ] = "Mail Merge"; + ModalDialog DLG_MAILMERGE { OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 374 , 185 ) ; - Text = "Serienbrief" ; - Text [ ENGLISH ] = "Print merge" ; - Text [ norwegian ] = "Print merge" ; - Text [ italian ] = "Stampa in serie" ; - Text [ portuguese_brazilian ] = "Imprimir Intercala??o" ; - Text [ portuguese ] = "Carta em srie" ; - Text [ finnish ] = "Lomakekirje" ; - Text [ danish ] = "Brevfletning" ; - Text [ french ] = "Mailing" ; - Text [ swedish ] = "Kopplad utskrift" ; - Text [ dutch ] = "Standaardbrief" ; - Text [ spanish ] = "Carta en serie" ; - Text [ english_us ] = "Form Letter" ; + _MAIL_MERGE_STRING_ Moveable = TRUE ; HelpID = FN_QRY_MERGE ; Window WIN_BEAMER @@ -113,7 +127,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "全部(~A)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "전체(~A)"; + Text[ korean ] = "모두(~A)"; Text[ turkish ] = "Tm"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Tot"; @@ -144,7 +158,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "選取的資料條目(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "선택 표시된 데이터 레코드(~S)"; + Text[ korean ] = "선택된 레코드(~S)"; Text[ turkish ] = "Seili veri kmeleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Registres seleccionats"; @@ -160,7 +174,7 @@ ModalDialog DLG_MAILMERGE Text [ italian ] = "Da:" ; Text [ portuguese_brazilian ] = "~De:" ; Text [ portuguese ] = "~De:" ; - Text [ finnish ] = "~Kohde:" ; + Text [ finnish ] = "~Lhde:" ; Text [ danish ] = "Fra:" ; Text [ french ] = "~De :" ; Text [ swedish ] = "~Frn:" ; @@ -175,7 +189,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "從(~F)："; Text[ arabic ] = ":"; Text[ greek ] = ":"; - Text[ korean ] = "로 부터(~F):"; + Text[ korean ] = "시작(~F):"; Text[ turkish ] = "lk:"; Text[ language_user1 ] = " "; Text[ catalan ] = "~De:"; @@ -218,7 +232,7 @@ ModalDialog DLG_MAILMERGE Text[ greek ] = ":"; Text[ korean ] = "끝(~T):"; Text[ turkish ] = "Son:"; - Text[ language_user1 ] = "RB: SW Datei - Serienbrief"; + Text[ language_user1 ] = "RB: ; RB: SW Datei - Serienbrief"; Text[ catalan ] = "~A:"; Text[ thai ] = "~ถึง:"; }; @@ -250,13 +264,13 @@ ModalDialog DLG_MAILMERGE Text [ spanish ] = "Registros" ; Text [ english_us ] = "Records" ; Text[ chinese_simplified ] = "数据条目"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Rekordy"; Text[ japanese ] = "レコード"; Text[ chinese_traditional ] = "資料條目"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "데이터 레코드"; + Text[ korean ] = "레코드"; Text[ turkish ] = "Veri kmeleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Registres"; @@ -271,7 +285,7 @@ ModalDialog DLG_MAILMERGE Check = TRUE ; TabStop = TRUE ; Text [ dutch ] = "~Printer" ; - Text [ english_us ] = "P~rinter" ; + Text [ english_us ] = "~Printer" ; Text [ italian ] = "Stampante" ; Text [ spanish ] = "Impresora" ; Text [ french ] = "Imprimante" ; @@ -280,7 +294,7 @@ ModalDialog DLG_MAILMERGE Text [ portuguese ] = "~Impressora" ; Text [ portuguese_brazilian ] = "~Drucker" ; Text[ chinese_simplified ] = "打印机(~P)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Drukarka"; Text[ japanese ] = "プリンタへ(~P)"; Text[ chinese_traditional ] = "印表機(~P)"; @@ -310,7 +324,7 @@ ModalDialog DLG_MAILMERGE Text [ portuguese ] = "~Correio-e" ; Text [ portuguese_brazilian ] = "~Mailing" ; Text[ chinese_simplified ] = "电子邮件(~E)"; - Text[ russian ] = ""; + Text[ russian ] = ". "; Text[ polish ] = "Po~czta"; Text[ japanese ] = "メールとして(~E)"; Text[ chinese_traditional ] = "電子郵件(~E)"; @@ -318,7 +332,7 @@ ModalDialog DLG_MAILMERGE Text[ greek ] = ""; Text[ korean ] = "메일(~E)"; Text[ turkish ] = "E-posta"; - Text[ language_user1 ] = "ENG:the anglicism \"Mailing\" as used in German cannot be used in Eng. because the real meaning has nothing to do with e-mail.EM17.5.00"; + Text[ language_user1 ] = "ENG:; ENG:the anglicism \"Mailing\" as used in German cannot be used in Eng. because the real meaning has nothing to do with e-mail.EM17.5.00"; Text[ catalan ] = "~Envia correu"; Text[ finnish ] = "~Shkinen"; Text[ thai ] = "~อิเล็คโทรนิก"; @@ -410,7 +424,7 @@ ModalDialog DLG_MAILMERGE Text [ italian ] = "Nome di file generato da " ; Text [ spanish ] = "Nombre de archivo a partir de" ; Text [ french ] = "Gnration du nom de fichier :" ; - Text [ dutch ] = "Bestandsnaam ontnemen aan" ; + Text [ dutch ] = "Bestandsnaam op basis van" ; Text [ portuguese ] = "Gerar nome do ficheiro a partir de" ; Text[ chinese_simplified ] = "文件名的生成方式"; Text[ russian ] = " :"; @@ -419,7 +433,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "檔案名產生從"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "로부터 파일 이름 생성"; + Text[ korean ] = "파일 이름 생성"; Text[ turkish ] = "Dosya ad kayna"; Text[ language_user1 ] = " "; Text[ catalan ] = "Genera el nom del arxiu des de"; @@ -441,7 +455,7 @@ ModalDialog DLG_MAILMERGE Text [ italian ] = "Campo database" ; Text [ spanish ] = "Campo de base de datos" ; Text [ french ] = "Champ de BD" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text[ chinese_simplified ] = "数据库字段"; Text[ russian ] = " "; Text[ polish ] = "Pole bazy danych"; @@ -449,7 +463,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "資料庫欄位"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "테이터베이스 필드"; + Text[ korean ] = "데이터베이스 필드"; Text[ turkish ] = "Veritaban alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; @@ -470,11 +484,11 @@ ModalDialog DLG_MAILMERGE Text [ swedish ] = "Manuell instllning" ; Text [ danish ] = "Manuel forudindstilling" ; Text [ italian ] = "Preimpostazione manuale" ; - Text [ spanish ] = "Manualmente" ; + Text [ spanish ] = "Configuracin manual" ; Text [ french ] = "Saisie manuelle" ; - Text [ dutch ] = "Handmatige voorgift" ; + Text [ dutch ] = "Handmatige standaardinstelling" ; Text[ chinese_simplified ] = "手工预置"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Ustawienie rczne"; Text[ japanese ] = "任意設定"; Text[ chinese_traditional ] = "手動預設"; @@ -509,14 +523,14 @@ ModalDialog DLG_MAILMERGE Text = "~Einzelne Druckjobs erzeugen" ; Text [ ENGLISH ] = "Si~ngle print jobs" ; TabStop = TRUE ; - Text [ english_us ] = "Single print ~jobs" ; + Text [ english_us ] = "~Single print jobs" ; Text [ portuguese_brazilian ] = "Einzelne Druckjobs erzeugen" ; Text [ swedish ] = "Skapa ~enstaka utskriftsjobb" ; Text [ danish ] = "Opret enkelte printerjob" ; Text [ italian ] = "Crea singoli ordini di stampa" ; Text [ spanish ] = "Crear tareas individuales de impresin" ; Text [ french ] = "Travaux d'impression individuels" ; - Text [ dutch ] = "Af~zonderlijke afdrukjobs" ; + Text [ dutch ] = "Af~zonderlijke afdruktaken" ; Text [ portuguese ] = "C~riar tarefas de impresso individuais" ; Text[ chinese_simplified ] = "生成单个打印任务(~S)"; Text[ russian ] = " "; @@ -525,11 +539,11 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "產生單項列印作業(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "각 인쇄 작업 만들기(~S)"; + Text[ korean ] = "개별 인쇄 작업 만들기(~S)"; Text[ turkish ] = "Bireysel yazdrma ileri olutur"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Crea tasques individuals d'impressi"; - Text[ finnish ] = "~Yksittiset tulostustyt"; + Text[ finnish ] = "Yksittiset tulostusty~t"; Text[ thai ] = "งานพิมพ์เ~ดียว"; }; FixedText FT_ADDRESS @@ -550,7 +564,7 @@ ModalDialog DLG_MAILMERGE Text [ portuguese_brazilian ] = "Adressfeld" ; Text [ portuguese ] = "~Campo de endereo" ; Text[ chinese_simplified ] = "地址栏(~F)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Pole adresowe"; Text[ japanese ] = "住所フィールド(~F)"; Text[ chinese_traditional ] = "地址欄(~F)"; @@ -600,7 +614,7 @@ ModalDialog DLG_MAILMERGE Text[ turkish ] = "Konu"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Assumpte"; - Text[ finnish ] = "~Aihe"; + Text[ finnish ] = "A~ihe"; Text[ thai ] = "~ชื่อเรื่อง"; }; Edit ED_SUBJECT @@ -623,12 +637,12 @@ ModalDialog DLG_MAILMERGE Text [ swedish ] = "Bilagor" ; Text [ danish ] = "Vedhftede filer" ; Text [ italian ] = "Allegati" ; - Text [ spanish ] = "Anexos" ; + Text [ spanish ] = "Documentos adjuntos" ; Text [ french ] = "Fichiers joints" ; - Text [ dutch ] = "Aanhangsels" ; + Text [ dutch ] = "Bijlagen" ; Text [ portuguese ] = "Anexos" ; Text[ chinese_simplified ] = "附加文件"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Zaczniki"; Text[ japanese ] = "添付ファイル"; Text[ chinese_traditional ] = "附加檔案"; @@ -673,16 +687,16 @@ ModalDialog DLG_MAILMERGE Text [ italian ] = "Formato mail" ; Text [ spanish ] = "Formato de correo" ; Text [ french ] = "Format de courrier" ; - Text [ dutch ] = "Mail-formaat" ; + Text [ dutch ] = "Mail-indeling" ; Text [ portuguese ] = "Formato da mensagem" ; Text[ chinese_simplified ] = "电子邮件格式"; - Text[ russian ] = " Mail"; + Text[ russian ] = " "; Text[ polish ] = "Format wiadomoci"; Text[ japanese ] = "メール書式"; Text[ chinese_traditional ] = "郵件格式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "우편 서식"; + Text[ korean ] = "메일 서식"; Text[ turkish ] = "E-posta format"; Text[ language_user1 ] = " "; Text[ catalan ] = "Format de correu"; @@ -700,7 +714,7 @@ ModalDialog DLG_MAILMERGE Text [ english_us ] = "HTM~L" ; Text [ portuguese_brazilian ] = "HTML" ; Text [ swedish ] = "HTM~L" ; - Text [ danish ] = "HTML" ; + Text [ danish ] = "HTM~L" ; Text [ italian ] = "HTML" ; Text [ spanish ] = "HTM~L" ; Text [ french ] = "HTM~L" ; @@ -832,18 +846,236 @@ ModalDialog DLG_MAILMERGE Size = MAP_APPFONT ( 50 , 14 ) ; }; Text[ chinese_simplified ] = "邮件合并"; - Text[ russian ] = " "; + Text[ russian ] = " ..."; Text[ polish ] = "List seryjny"; Text[ japanese ] = "差し込み印刷"; Text[ chinese_traditional ] = "合併列印"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "편지지 양식"; + Text[ korean ] = "편지 양식"; Text[ turkish ] = "Standart mektup"; Text[ language_user1 ] = " "; Text[ catalan ] = "Carta formulari"; Text[ thai ] = "แบบจดหมาย"; + Text[ english_us ] = "Form Letter"; + Text[ portuguese ] = "Carta em srie"; + Text[ dutch ] = "Standaardbrief"; + Text[ french ] = "Lettre type"; + Text[ spanish ] = "Carta en serie"; + Text[ finnish ] = "Joukkokirje"; + Text[ italian ] = "Stampa in serie"; + Text[ danish ] = "Brevfletning"; + Text[ swedish ] = "Kopplad utskrift"; }; +ModalDialog DLG_MERGE_CREATE +{ + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 145 , 63 ) ; + Moveable = TRUE ; + HelpID = HID_MAIL_MERGE_CREATE_FROM; + _MAIL_MERGE_STRING_ + FixedLine FL_CREATEFROM + { + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 80 , 8 ) ; + Text = "Erstellen aus" ; + Text [ english_us ] = "Create" ; + Text[ portuguese ] = "Create from"; + Text[ russian ] = "Create from"; + Text[ spanish ] = "Crear "; + Text[ italian ] = "Crea da"; + Text[ swedish ] = "Skapa av"; + Text[ polish ] = "Create from"; + Text[ portuguese_brazilian ] = "Create from"; + Text[ japanese ] = "作成"; + Text[ korean ] = "만들기"; + Text[ turkish ] = "Create from"; + Text[ thai ] = "Create from"; + Text[ greek ] = "Create from"; + Text[ dutch ] = "Create from"; + Text[ french ] = "Crer"; + Text[ finnish ] = "Create from"; + Text[ danish ] = "Create from"; + Text[ chinese_simplified ] = "建立"; + Text[ chinese_traditional ] = "製作來源"; + Text[ arabic ] = "Create from"; + Text[ catalan ] = "Create from"; + }; + RadioButton RB_THISDOC + { + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; + Check = TRUE; + TabStop = TRUE ; + Text = "~Diesem Dokument" ; + Text [ english_us ] = "From this ~document" ; + Text[ portuguese ] = "~This document"; + Text[ russian ] = "~This document"; + Text[ spanish ] = "~De este documento"; + Text[ italian ] = "Da questo documento"; + Text[ swedish ] = "Frn det hr ~dokumentet"; + Text[ polish ] = "~This document"; + Text[ portuguese_brazilian ] = "~This document"; + Text[ japanese ] = "このドキュメントから(~D)"; + Text[ korean ] = "이 문서로부터"; + Text[ turkish ] = "~This document"; + Text[ thai ] = "~This document"; + Text[ greek ] = "~This document"; + Text[ dutch ] = "~This document"; + Text[ french ] = " partir de ce document"; + Text[ finnish ] = "~This document"; + Text[ danish ] = "~This document"; + Text[ chinese_simplified ] = "从这个文档(~D)"; + Text[ chinese_traditional ] = "此文件(~T)"; + Text[ arabic ] = "~This document"; + Text[ catalan ] = "~This document"; + }; + RadioButton RB_TEMPLATE + { + Pos = MAP_APPFONT ( 12 , 27 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; + TabStop = TRUE ; + Text = "~Vorlage" ; + Text [ english_us ] = "From a ~template" ; + Text[ language_user1 ] = "chg German to \"aus einer ~Dokumentvorlage\""; + Text[ portuguese ] = "~Use template"; + Text[ russian ] = "~Use template"; + Text[ spanish ] = "~De esta plantilla"; + Text[ italian ] = "Da ~modello"; + Text[ swedish ] = "Frn en ~mall"; + Text[ polish ] = "~Use template"; + Text[ portuguese_brazilian ] = "~Use template"; + Text[ japanese ] = "テンプレートから(~T)"; + Text[ korean ] = "서식 파일로부터"; + Text[ turkish ] = "~Use template"; + Text[ thai ] = "~Use template"; + Text[ greek ] = "~Use template"; + Text[ dutch ] = "~Use template"; + Text[ french ] = " partir d'un modle"; + Text[ finnish ] = "~Use template"; + Text[ danish ] = "~Use template"; + Text[ chinese_simplified ] = "样式(~S)"; + Text[ chinese_traditional ] = "採用樣式(~T)"; + Text[ arabic ] = "~Use template"; + Text[ catalan ] = "~Use template"; + }; + OKButton BT_OK + { + Pos = MAP_APPFONT ( 89 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + DefButton = TRUE ; + }; + CancelButton BT_CANCEL + { + Pos = MAP_APPFONT ( 89 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + HelpButton BT_HELP + { + Pos = MAP_APPFONT ( 89 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; +}; +ModalDialog DLG_MERGE_FIELD_CONNECTIONS +{ + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 205 , 97 ) ; + Moveable = TRUE ; + HelpID = HID_MAIL_MERGE_CREATE_FROM; + Text = "Datenquellen-Verbindung" ; + Text [ english_us ] = "Data Source Connection" ; + FixedLine FL_CONNECTIONS + { + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 140 , 8 ) ; + Text = "Verbinden" ; + Text [ english_us ] = "Connect" ; + Text[ french ] = "Connect"; + Text[ spanish ] = "Connect"; + Text[ italian ] = "Connect"; + Text[ swedish ] = "Connect"; + Text[ japanese ] = "Connect"; + Text[ korean ] = "Connect"; + Text[ chinese_simplified ] = "Connect"; + Text[ chinese_traditional ] = "Connect"; + }; + RadioButton RB_USEEXISTING + { + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 130 , 10 ) ; + Check = TRUE; + TabStop = TRUE ; + Text = "~Mit vorhandener Datenquelle" ; + Text [ english_us ] = "~Use existing" ; + Text[ french ] = "~Use existing"; + Text[ spanish ] = "~Use existing"; + Text[ italian ] = "~Use existing"; + Text[ swedish ] = "~Use existing"; + Text[ japanese ] = "~Use existing"; + Text[ korean ] = "~Use existing"; + Text[ chinese_simplified ] = "~Use existing"; + Text[ chinese_traditional ] = "~Use existing"; + }; + RadioButton RB_CREATENEW + { + Pos = MAP_APPFONT ( 12 , 27 ) ; + Size = MAP_APPFONT ( 130 , 10 ) ; + TabStop = TRUE ; + Text = "Mit ~anderer Datenquelle" ; + Text [ english_us ] = "~Create new connection" ; + Text[ french ] = "~Create new connection"; + Text[ spanish ] = "~Create new connection"; + Text[ italian ] = "~Create new connection"; + Text[ swedish ] = "~Create new connection"; + Text[ japanese ] = "~Create new connection"; + Text[ korean ] = "~Create new connection"; + Text[ chinese_simplified ] = "~Create new connection"; + Text[ chinese_traditional ] = "~Create new connection"; + }; + FixedText FT_INFO + { + Pos = MAP_APPFONT ( 6 , 41 ) ; + Size = MAP_APPFONT ( 141 , 50 ) ; + WordBreak = TRUE; + Text = "Serienbriefe bentigen fr eine Personalisierung Felder. Felder sind in diesem Falle Platzhalter fr Daten, die aus einer Datenquelle stammen, z.B. aus einer Datenbank. Die Felder in dem Serienbrief mssen mit der Datenquelle verbunden sein. " ; + Text [ english_us ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source." ; + Text[ french ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ spanish ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ italian ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ swedish ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ japanese ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ korean ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ chinese_simplified ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ chinese_traditional ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + }; + OKButton BT_OK + { + Pos = MAP_APPFONT ( 149 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + DefButton = TRUE ; + }; + CancelButton BT_CANCEL + { + Pos = MAP_APPFONT ( 149 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + HelpButton BT_HELP + { + Pos = MAP_APPFONT ( 149 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + + Text[ french ] = "Data Source Connection"; + Text[ spanish ] = "Data Source Connection"; + Text[ italian ] = "Data Source Connection"; + Text[ swedish ] = "Data Source Connection"; + Text[ japanese ] = "Data Source Connection"; + Text[ korean ] = "Data Source Connection"; + Text[ chinese_simplified ] = "Data Source Connection"; + Text[ chinese_traditional ] = "Data Source Connection"; +}; diff --git a/sw/source/ui/fldui/changedb.src b/sw/source/ui/fldui/changedb.src index e2f597ca2386..f30fce5f7305 100644 --- a/sw/source/ui/fldui/changedb.src +++ b/sw/source/ui/fldui/changedb.src @@ -2,9 +2,9 @@ * * $RCSfile: changedb.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: os $ $Date: 2002-08-29 07:06:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese_brazilian ] = "Datenbank austauschen" ; Text [ portuguese ] = "Substituir base de dados" ; Text[ chinese_simplified ] = "更换数据库"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Wymie baz danych"; Text[ japanese ] = "データベースの交換"; Text[ chinese_traditional ] = "替換資料庫"; @@ -130,7 +130,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese_brazilian ] = "Verwendete Datenbanken" ; Text [ portuguese ] = "Bases de dados utilizadas" ; Text[ chinese_simplified ] = "使用的数据库"; - Text[ russian ] = " "; + Text[ russian ] = " . "; Text[ polish ] = "Uyte bazy danych"; Text[ japanese ] = "使用されているデータベース"; Text[ chinese_traditional ] = "所使用的資料庫"; @@ -138,7 +138,7 @@ ModalDialog DLG_CHANGE_DB Text[ dutch ] = "Gebruikte databases"; Text[ chinese_simplified ] = "使用的数据库"; Text[ greek ] = " "; - Text[ korean ] = "데이터베이스가 사용중 입니다."; + Text[ korean ] = "데이터베이스가 사용 중입니다."; Text[ turkish ] = "Kullanlan veritabanlar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Bases de dades utilitzades"; @@ -163,7 +163,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese_brazilian ] = "Verf?bare Datenbanken" ; Text [ portuguese ] = "Bases de dados disponveis" ; Text[ chinese_simplified ] = "可使用的数据库"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Dostpne bazy danych"; Text[ japanese ] = "使用できるデータベース"; Text[ chinese_traditional ] = "現存的資料庫"; @@ -205,21 +205,21 @@ ModalDialog DLG_CHANGE_DB Text [ italian ] = "In questo dialogo si possono scambiare database ai quali si accede tramite campi di database. Si pu effettuare una modifica per volta. Nell'elenco di sinistra possibile una selezione multipla." ; Text [ spanish ] = "En este dilogo puede intercambiar por otras las bases de datos a las que acceda a travs de los campos. Se puede realizar solo un cambio por fase de trabajo. En la lista izquierda es posible hacer una seleccin mltiple." ; Text [ french ] = "Utilisez cette bote de dialogue pour changer les bases de donnes auxquelles vous accdez dans vos documents via des champs de formulaire. Vous ne pouvez excuter qu'une seule modification la fois. La liste de gauche permet une slection multiple." ; - Text [ dutch ] = "In deze dialoog kunt u een database waarop de databasevelden in uw document betrekking hebben vervangen door een andere database. U kunt slechts n wijziging tegelijk aanbrengen. In de linker lijst is ook een meervoudige keuze mogelijk." ; + Text [ dutch ] = "In dit dialoogvenster kunt u een database waarop de databasevelden in uw document betrekking hebben, vervangen door een andere database. U kunt slechts n wijziging tegelijk aanbrengen. In de linkerlijst is ook een meervoudige keuze mogelijk." ; Text [ swedish ] = "I den hr dialogrutan kan du byta ut databaser, som du kan n via databasflt i ditt dokument, mot andra databaser. Du kan bara gra en ndring t gngen. I den vnstra listan gr det att gra multimarkering." ; Text [ danish ] = "I denne dialog kan du udskifte databaser, som du har adgang til i et dokument via databasefelter, med andre databaser. Du kan kun foretage n ndring pr. arbejdsdag. P venstre liste er det muligt at foretage multimarkeringer." ; Text [ portuguese_brazilian ] = "In diesem Dialog k?nen Sie Datenbanken, auf die Sie in Ihrem Dokument ?er Datenbankfelder zugreifen, durch andere Datenbanken austauschen. Sie k?nen nur eine ?nderung pro Arbeitsgang durchf?ren. In der linken Liste ist Mehrfachselektion m?lich." ; Text [ portuguese ] = "Nesta caixa de dilogo poder substituir bases de dados por outras, tendo acesso a elas no seu documento atravs dos campos da base de dados. apenas possvel uma alterao por cada operao. Na lista da esquerda poder seleccionar vrias opes." ; Text[ chinese_simplified ] = "在这个对话框内您能够使用另一个数据库来代替当前编辑的文档读取的数据库。每次编辑文档时只能一次替换数据库。在左方的列单内可以执行多重选择的功能。"; - Text[ russian ] = " , , . . ."; + Text[ russian ] = " , . . ."; Text[ polish ] = "Tutaj mona zamieni bazy danych, dostpne w dokumencie poprzez pola baz danych, na inne. Zmieni mona tylko jedn baz danych na raz. Wielokrotnej selekcji dokona mona na licie po lewej."; Text[ japanese ] = "このダイアログでは、ドキュメントのデータベースフィールドからアクセスするデータベースが交換できます。一度の操作でひとつの変更のみが実行されます。左のリストでは複数選択が可能です。"; Text[ chinese_traditional ] = "在這個對話方塊內您可以使用另一個資料庫來代替已經開啓的文件所使用的資料庫。每次編輯文件時只能做一次變更。在左欄內可以執行多重選取的功能。"; Text[ arabic ] = " ǡ ʡ ʡ . "; - Text[ dutch ] = "In deze dialoog kunt u een database waarop de databasevelden in uw document betrekking hebben vervangen door een andere database. U kunt slechts n wijziging tegelijk aanbrengen. In de linker lijst is ook een meervoudige keuze mogelijk."; + Text[ dutch ] = "In dit dialoogvenster kunt u een database waarop de databasevelden in uw document betrekking hebben, vervangen door een andere database. U kunt slechts n wijziging tegelijk aanbrengen. In de linkerlijst is ook een meervoudige keuze mogelijk."; Text[ chinese_simplified ] = "在这个对话框内您能够使用另一个数据库来代替当前编辑的文档读取的数据库。每次编辑文档时只能一次替换数据库。在左方的列单内可以执行多重选择的功能。"; Text[ greek ] = " , . . ."; - Text[ korean ] = "이 대화상자에서는 문서에서 데이터베이스 필드를 통해 데이터베이스를 액세스하거나 교환하는 데이터베이스 필드를 사용할 수 있습니다.하나의 작업 과정에서 변경 작업이 한 번 수행됩니다. 왼쪽의 목록에서는 여러 항목을 선택할 수 있습니다."; + Text[ korean ] = "이 대화상자에서는 문서에서 데이터베이스 필드를 통해 데이터베이스를 액세스하거나 바꾸는 데이터베이스 필드를 사용할 수 있습니다.하나의 작업 과정에서 변경 작업이 한 번 수행됩니다. 왼쪽의 목록에서는 여러 항목을 선택할 수 있습니다."; Text[ turkish ] = "Bu pencerede, belgenizdeki veritaban alanlar yoluyla eritiiniz veritabanlarn bakalar ile deitirebilirsiniz. Her ilemde yalnzca tek bir deiiklik yaplabilir. Soldaki listede birden fazla seim yaplabilir."; Text[ language_user1 ] = " "; Text[ catalan ] = "En aquest quadre de dileg podeu intercanviar per altres bases de dades a les que accediu a travs de camps. Es pot realitzar noms un canvi per fase de treball. A la llista de l'esquerra s possible fer una selecci mltiple."; @@ -258,7 +258,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese_brazilian ] = "Am Dokument gesetzte Datenbank:" ; Text [ portuguese ] = "Base de dados aplicada ao documento:" ; Text[ chinese_simplified ] = "文档使用的数据库："; - Text[ russian ] = " , :"; + Text[ russian ] = " :"; Text[ polish ] = "Baza danych ustawiona przy dok.:"; Text[ japanese ] = "ドキュメントに適用されたデータベース:"; Text[ chinese_traditional ] = "文件使用的資料庫："; @@ -352,7 +352,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese ] = "Definir" ; Text [ portuguese_brazilian ] = "Festlegen" ; Text[ chinese_simplified ] = "定义"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Zdefiniuj"; Text[ japanese ] = "指定"; Text[ chinese_traditional ] = "定義"; @@ -360,7 +360,7 @@ ModalDialog DLG_CHANGE_DB Text[ dutch ] = "Definiren"; Text[ chinese_simplified ] = "定义"; Text[ greek ] = ""; - Text[ korean ] = "정의"; + Text[ korean ] = "지정"; Text[ turkish ] = "Tanmla"; Text[ catalan ] = "Defineix"; Text[ finnish ] = "Mrit"; @@ -403,7 +403,7 @@ ModalDialog DLG_CHANGE_DB TabStop = TRUE ; }; Text[ chinese_simplified ] = "更换数据库"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Wymie baz danych"; Text[ japanese ] = "データベースの交換"; Text[ chinese_traditional ] = "替換資料庫"; @@ -419,3 +419,20 @@ ModalDialog DLG_CHANGE_DB Text[ thai ] = "แลกเปลี่ยนฐานข้อมูล"; }; + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src index fc356742c308..aab79feda895 100644 --- a/sw/source/ui/fldui/flddb.src +++ b/sw/source/ui/fldui/flddb.src @@ -2,9 +2,9 @@ * * $RCSfile: flddb.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: iha $ $Date: 2002-08-09 10:05:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,7 @@ TabPage TP_FLD_DB Text[ chinese_traditional ] = "欄位類型(~T)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "필드유형(~T)"; + Text[ korean ] = "유형(~T)"; Text[ turkish ] = "Alan tipi"; Text[ catalan ] = "~Tipus"; Text[ thai ] = "~ชนิด"; @@ -169,7 +169,7 @@ TabPage TP_FLD_DB TEXT [ danish ] = "Datapostnummer" ; TEXT [ french ] = "~Numro de l'enregistrement" ; TEXT [ swedish ] = "~Datapostnummer" ; - TEXT [ dutch ] = "~Record-nummer" ; + TEXT [ dutch ] = "~Recordnummer" ; TEXT [ spanish ] = "Nmero de registro" ; TEXT [ english_us ] = "Record number" ; Left = TRUE ; @@ -180,7 +180,7 @@ TabPage TP_FLD_DB TEXT[ chinese_traditional ] = "條目號碼"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "데이터 레코드 번호"; + TEXT[ korean ] = "레코드 번호"; TEXT[ turkish ] = "Veri kmesi numaras"; TEXT[ catalan ] = "Nmero de registre"; TEXT[ thai ] = "เลขระเบียน"; @@ -267,14 +267,14 @@ TabPage TP_FLD_DB Text [ english_us ] = "User-defined" ; Text [ portuguese_brazilian ] = "Selbstdefiniert" ; Text [ swedish ] = "An~vndardefinierat" ; - Text [ danish ] = "Brugerdefineret" ; + Text [ danish ] = "~Brugerdefineret" ; Text [ italian ] = "Personalizzato" ; Text [ spanish ] = "Definido por el usuario" ; Text [ french ] = "Dfini par l'utilisateur" ; Text [ dutch ] = "~Zelf gedefinieerd" ; Text [ portuguese ] = "D~efinido pelo utilizador" ; Text[ chinese_simplified ] = "使用者自定"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Zdefiniowane przez uytkownika"; Text[ japanese ] = "ユーザー定義"; Text[ chinese_traditional ] = "自訂"; @@ -331,7 +331,7 @@ TabPage TP_FLD_DB Text[ korean ] = "서식"; Text[ turkish ] = "Format"; Text[ catalan ] = "Format"; - Text[ finnish ] = "Muoto"; + Text[ finnish ] = "Muotoilu"; Text[ thai ] = "รูปแบบ"; }; FixedLine FL_DBFORMAT_VERT @@ -375,3 +375,5 @@ TabPage TP_FLD_DB + + diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src index f36393b2c009..d98269192d4e 100644 --- a/sw/source/ui/fldui/flddinf.src +++ b/sw/source/ui/fldui/flddinf.src @@ -2,9 +2,9 @@ * * $RCSfile: flddinf.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:18:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,17 +88,18 @@ TabPage TP_FLD_DOKINF Text [ spanish ] = "~Tipo de campo" ; Text [ english_us ] = "~Type" ; Left = TRUE ; - Text[ chinese_simplified ] = "ֶ(~T)"; + Text[ chinese_simplified ] = "字段类型(~T)"; Text[ russian ] = " "; Text[ polish ] = "Typ pola"; - Text[ japanese ] = "̨(~T)"; - Text[ chinese_traditional ] = "(~T)"; + Text[ japanese ] = "フィールドタイプ(~T)"; + Text[ chinese_traditional ] = "欄位類型(~T)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "ʵ(~T)"; + Text[ korean ] = "유형(~T)"; Text[ turkish ] = "A~lan tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo de campo"; + Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~ชนิด"; }; Control TLB_DOKINFTYPE { @@ -125,17 +126,18 @@ TabPage TP_FLD_DOKINF Text [ spanish ] = "Se~leccin" ; Text [ english_us ] = "S~elect" ; Left = TRUE ; - Text[ chinese_simplified ] = "ѡ(~E)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "选择(~E)"; + Text[ russian ] = ""; Text[ polish ] = "Wybr"; - Text[ japanese ] = "I(~E)"; - Text[ chinese_traditional ] = "(~E)"; + Text[ japanese ] = "選択(~E)"; + Text[ chinese_traditional ] = "選擇(~E)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~E)"; + Text[ korean ] = "선택(~E)"; Text[ turkish ] = "S~eim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se~leccin"; + Text[ catalan ] = "S~elecciona"; + Text[ thai ] = "เลื~อก"; }; ListBox LB_DOKINFSELECTION { @@ -190,7 +192,7 @@ TabPage TP_FLD_DOKINF < "Autor" ; > ; < "Hora" ; > ; < "Fecha" ; > ; - < "Fecha Hora Autor" ; > ; + < "Hora Fecha Autor" ; > ; }; stringlist [ french ] = { @@ -215,10 +217,10 @@ TabPage TP_FLD_DOKINF }; StringList [ chinese_simplified ] = { - < "" ; > ; - < "ʱ" ; > ; - < "" ; > ; - < " ʱ " ; > ; + < "作者" ; > ; + < "时间" ; > ; + < "日期" ; > ; + < "日期 时间 作者" ; > ; }; StringList [ russian ] = { @@ -236,17 +238,17 @@ TabPage TP_FLD_DOKINF }; StringList [ japanese ] = { - < "쐬" ; > ; - < "" ; > ; - < "t" ; > ; - < "t@@쐬" ; > ; + < "作成者" ; > ; + < "時刻" ; > ; + < "日付" ; > ; + < "日付 時刻 作成者" ; > ; }; StringList [ chinese_traditional ] = { - < "@" ; > ; - < "ɶ" ; > ; - < "" ; > ; - < " ɶ @" ; > ; + < "作者" ; > ; + < "時間" ; > ; + < "日期" ; > ; + < "日期 時間 作者" ; > ; }; StringList [ arabic ] = { @@ -264,10 +266,10 @@ TabPage TP_FLD_DOKINF }; StringList [ korean ] = { - < "ۼ" ; > ; - < "ð" ; > ; - < "" ; > ; - < ", ð, ۼ" ; > ; + < "작성자" ; > ; + < "시간" ; > ; + < "날짜" ; > ; + < "날짜 시간 작성자" ; > ; }; StringList [ turkish ] = { @@ -287,15 +289,22 @@ TabPage TP_FLD_DOKINF { < "Autor" ; > ; < "Hora" ; > ; - < "Fecha" ; > ; - < "Fecha Hora Autor" ; > ; + < "Data" ; > ; + < "Data hora autor" ; > ; }; StringList [ finnish ] = { - < "Laatija" ; > ; + < "Tekij" ; > ; < "Aika" ; > ; < "Pivmr" ; > ; - < "Pivmr Aika Laatija" ; > ; + < "Pivmr Aika Tekij" ; > ; + }; + StringList [ thai ] = + { + < "ผู้เขียน" ; > ; + < "เวลา" ; > ; + < "วัน" ; > ; + < "วัน เวลา และผู้เขียน" ; > ; }; }; FixedText FT_DOKINFFORMAT @@ -314,18 +323,19 @@ TabPage TP_FLD_DOKINF Text [ french ] = "F~ormat" ; Text [ dutch ] = "F~ormaat" ; Text [ portuguese ] = "F~ormato" ; - Text[ chinese_simplified ] = "ʽ(~O)"; + Text[ chinese_simplified ] = "格式(~O)"; Text[ russian ] = ""; Text[ polish ] = "Format"; - Text[ japanese ] = "(~O)"; - Text[ chinese_traditional ] = "榡(~O)"; + Text[ japanese ] = "書式(~O)"; + Text[ chinese_traditional ] = "格式(~O)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~O)"; + Text[ korean ] = "서식(~O)"; Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~ormato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormata"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "รู~ปแบบ"; }; ListBox LB_DOKINFFORMAT { @@ -344,25 +354,26 @@ TabPage TP_FLD_DOKINF TabStop = TRUE ; Text [ english_us ] = "~Fixed content" ; Text [ portuguese_brazilian ] = "~Inhalt fixieren" ; - Text [ swedish ] = "Fixera ~innehll" ; - Text [ danish ] = "Fast indhold" ; + Text [ swedish ] = "Fi~xera innehll" ; + Text [ danish ] = "Fast in~dhold" ; Text [ italian ] = "~Fissa il contenuto" ; - Text [ spanish ] = "~Fijar contenido" ; - Text [ french ] = "Contenu f~ixe" ; + Text [ spanish ] = "~Contenido fijo" ; + Text [ french ] = "Contenu fixe" ; Text [ dutch ] = "~Inhoud fixeren" ; Text [ portuguese ] = "~Contudo fixo" ; - Text[ chinese_simplified ] = "̶(~F)"; + Text[ chinese_simplified ] = "固定内容(~F)"; Text[ russian ] = ". "; Text[ polish ] = "Staa tre"; - Text[ japanese ] = "ěŒ(~F)"; - Text[ chinese_traditional ] = "Twe(~F)"; + Text[ japanese ] = "内容の固定(~F)"; + Text[ chinese_traditional ] = "固定內容(~F)"; Text[ arabic ] = " "; Text[ greek ] = " ~"; - Text[ korean ] = " (~F)"; + Text[ korean ] = "내용 고정(~F)"; Text[ turkish ] = "erii sabitle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Fijar contenido"; + Text[ catalan ] = "Contingut fi~x"; Text[ finnish ] = "~Kiinte sislt"; + Text[ thai ] = "เนื้อหา~คงที่"; }; Bitmap BMP_DOKINFROOT_OPENED { @@ -385,18 +396,19 @@ TabPage TP_FLD_DOKINF Text [ french ] = "Info" ; Text [ dutch ] = "Info" ; Text [ portuguese ] = "Info" ; - Text[ chinese_simplified ] = "й"; + Text[ chinese_simplified ] = "有关"; Text[ russian ] = ""; Text[ polish ] = "Informacja"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "T"; + Text[ japanese ] = "情報"; + Text[ chinese_traditional ] = "資訊"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "정보"; Text[ turkish ] = "Bilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informacin"; + Text[ catalan ] = "Informaci"; Text[ finnish ] = "Tietoja"; + Text[ thai ] = "ข้อมูล"; }; Text [ english_us ] = "DocInformation" ; Text [ portuguese_brazilian ] = "Dokumentinfo" ; @@ -407,20 +419,33 @@ TabPage TP_FLD_DOKINF Text [ french ] = "Info document" ; Text [ dutch ] = "Documentinfo" ; Text [ portuguese ] = "Info. sobre documento" ; - Text[ chinese_simplified ] = "ĵϢ"; + Text[ chinese_simplified ] = "文档信息"; Text[ russian ] = " "; Text[ polish ] = "Informacje o dokumencie"; - Text[ japanese ] = "ď"; - Text[ chinese_traditional ] = "T"; + Text[ japanese ] = "ドキュメント情報"; + Text[ chinese_traditional ] = "文件資訊"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "문서 정보"; Text[ turkish ] = "Belge bilgileri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informacin del documento"; + Text[ catalan ] = "Informaci del document"; Text[ finnish ] = "Asiakirjatiedot"; + Text[ thai ] = "ข้อมูลเอกสาร"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src index 0adc4e530a2b..38fd0e0528ec 100644 --- a/sw/source/ui/fldui/flddok.src +++ b/sw/source/ui/fldui/flddok.src @@ -2,9 +2,9 @@ * * $RCSfile: flddok.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:19:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,17 +88,18 @@ TabPage TP_FLD_DOK Text [ spanish ] = "~Tipo de campo" ; Text [ english_us ] = "~Type" ; Left = TRUE ; - Text[ chinese_simplified ] = "ֶ(~T)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "字段类型(~T)"; + Text[ russian ] = ""; Text[ polish ] = "Typ pola"; - Text[ japanese ] = "̨(~T)"; - Text[ chinese_traditional ] = "(~T)"; + Text[ japanese ] = "フィールドタイプ(~T)"; + Text[ chinese_traditional ] = "欄位類型(~T)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "ʵ(~T)"; + Text[ korean ] = "유형(~T)"; Text[ turkish ] = "~Alan tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo de campo"; + Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~ชนิด"; }; ListBox LB_DOKTYPE { @@ -127,17 +128,18 @@ TabPage TP_FLD_DOK Text [ spanish ] = "Se~leccin" ; Text [ english_us ] = "S~elect" ; Left = TRUE ; - Text[ chinese_simplified ] = "ѡ(~E)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "选择(~E)"; + Text[ russian ] = ""; Text[ polish ] = "Wybr"; - Text[ japanese ] = "I(~E)"; - Text[ chinese_traditional ] = "(~E)"; + Text[ japanese ] = "選択(~E)"; + Text[ chinese_traditional ] = "選取(~E)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~E)"; + Text[ korean ] = "선택(~E)"; Text[ turkish ] = "~Seim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se~leccin"; + Text[ catalan ] = "S~elecciona"; + Text[ thai ] = "เลื~อก"; }; ListBox LB_DOKSELECTION { @@ -162,18 +164,19 @@ TabPage TP_FLD_DOK Text [ french ] = "F~ormat" ; Text [ dutch ] = "~Notatie" ; Text [ portuguese ] = "F~ormato" ; - Text[ chinese_simplified ] = "ʽ(~O)"; + Text[ chinese_simplified ] = "格式(~O)"; Text[ russian ] = ""; Text[ polish ] = "Format"; - Text[ japanese ] = "(~O)"; - Text[ chinese_traditional ] = "榡(~O)"; + Text[ japanese ] = "書式(~O)"; + Text[ chinese_traditional ] = "格式(~O)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~O)"; + Text[ korean ] = "서식(~O)"; Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~ormato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormata"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "รู~ปแบบ"; }; ListBox LB_DOKFORMAT { @@ -206,24 +209,25 @@ TabPage TP_FLD_DOK TEXT [ portuguese ] = "~Correco" ; TEXT [ finnish ] = "~Siirtym" ; TEXT [ danish ] = "Korrektion" ; - TEXT [ french ] = "C~orrecture" ; + TEXT [ french ] = "C~orrection" ; TEXT [ swedish ] = "Ko~rrigering" ; TEXT [ dutch ] = "~Correctie" ; TEXT [ spanish ] = "~Correccin" ; TEXT [ english_us ] = "O~ffset" ; Left = TRUE ; Hide = TRUE ; - TEXT[ chinese_simplified ] = "(~F)"; - TEXT[ russian ] = ""; + TEXT[ chinese_simplified ] = "修改(~F)"; + TEXT[ russian ] = ""; TEXT[ polish ] = "Korekta"; - TEXT[ japanese ] = "C(~F)"; - TEXT[ chinese_traditional ] = "ק(~F)"; + TEXT[ japanese ] = "修正(~F)"; + TEXT[ chinese_traditional ] = "修改(~F)"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "(~F)"; + TEXT[ korean ] = "수정(~F)"; TEXT[ turkish ] = "Dzeltme"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "~Correccin"; + TEXT[ catalan ] = "~Correcci"; + TEXT[ thai ] = "ออ~ฟเซต"; }; Edit ED_DOKVALUE { @@ -272,25 +276,26 @@ TabPage TP_FLD_DOK TabStop = TRUE ; Text [ english_us ] = "~Fixed content" ; Text [ portuguese_brazilian ] = "~Inhalt fixieren" ; - Text [ swedish ] = "Fixera ~innehll" ; - Text [ danish ] = "Fast indhold" ; + Text [ swedish ] = "Fi~xera innehll" ; + Text [ danish ] = "Fast in~dhold" ; Text [ italian ] = "~Fissa il contenuto" ; - Text [ spanish ] = "~Fijar contenido" ; - Text [ french ] = "Contenu f~ixe" ; + Text [ spanish ] = "~Contenido fijo" ; + Text [ french ] = "Contenu fixe" ; Text [ dutch ] = "~Inhoud fixeren" ; Text [ portuguese ] = "Contedo ~fixo" ; - Text[ chinese_simplified ] = "̶(~F)"; + Text[ chinese_simplified ] = "固定内容(~F)"; Text[ russian ] = ". "; Text[ polish ] = "Staa tre"; - Text[ japanese ] = "ěŒ(~F)"; - Text[ chinese_traditional ] = "Twe(~F)"; + Text[ japanese ] = "内容の固定(~F)"; + Text[ chinese_traditional ] = "固定內容(~F)"; Text[ arabic ] = " "; Text[ greek ] = " ~"; - Text[ korean ] = " (~F)"; + Text[ korean ] = "내용 고정(~F)"; Text[ turkish ] = "erii sabitle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Fijar contenido"; + Text[ catalan ] = "Contingut ~fix"; Text[ finnish ] = "~Kiinte sislt"; + Text[ thai ] = "เนื้อหา~คงที่"; }; Bitmap BMP_DOKROOT_OPENED { @@ -313,18 +318,19 @@ TabPage TP_FLD_DOK Text [ french ] = "Co~rrection en jours" ; Text [ dutch ] = "Co~rrectie in dagen" ; Text [ portuguese ] = "Co~rreco em dias" ; - Text[ chinese_simplified ] = "(~E)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "修改天数(~E)"; + Text[ russian ] = " "; Text[ polish ] = "Korekta dni"; - Text[ japanese ] = "̏C(~E)"; - Text[ chinese_traditional ] = "קѼ(~E)"; + Text[ japanese ] = "日の修正(~E)"; + Text[ chinese_traditional ] = "修改日期的天數(~E)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ĥ ȿ (~E)"; + Text[ korean ] = "날짜 수정(~E)"; Text[ turkish ] = "Dzeltme (gn)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Correccin en das"; + Text[ catalan ] = "~Correcci en dies"; Text[ finnish ] = "~Siirtym pivin"; + Text[ thai ] = "ออฟเ~ซตในวัน"; }; String STR_DOKTIMEOFF { @@ -339,18 +345,19 @@ TabPage TP_FLD_DOK Text [ french ] = "Co~rrection en minutes" ; Text [ dutch ] = "Co~rrectie in minuten" ; Text [ portuguese ] = "Co~rreco em minutos" ; - Text[ chinese_simplified ] = "ķ趨(~E)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "修改分钟设定(~E)"; + Text[ russian ] = " "; Text[ polish ] = "Korekta minut"; - Text[ japanese ] = "̏C(~E)"; - Text[ chinese_traditional ] = "ק]w(~E)"; + Text[ japanese ] = "分の修正(~E)"; + Text[ chinese_traditional ] = "修改分鐘設定(~E)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ȿ (~E)"; + Text[ korean ] = "분 수정(~E)"; Text[ turkish ] = "Dzeltme (dakika)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Correccin en minutos"; + Text[ catalan ] = "~Correcci en minuts"; Text[ finnish ] = "~Siirtym minuutteina"; + Text[ thai ] = "ออฟเ~ซตในนาที"; }; Text [ english_us ] = "Document" ; Text [ portuguese_brazilian ] = "Dokument" ; @@ -361,20 +368,34 @@ TabPage TP_FLD_DOK Text [ french ] = "Document" ; Text [ dutch ] = "Document" ; Text [ portuguese ] = "Documento" ; - Text[ chinese_simplified ] = "ĵ"; + Text[ chinese_simplified ] = "文档"; Text[ russian ] = ""; Text[ polish ] = "Dokument"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "ドキュメント"; + Text[ chinese_traditional ] = "文件"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "문서"; Text[ turkish ] = "Belge"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Documento"; + Text[ catalan ] = "Document"; Text[ finnish ] = "Asiakirja"; + Text[ thai ] = "เอกสาร"; }; + + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src index b92ce9bfe42f..4d9ea2fef358 100644 --- a/sw/source/ui/fldui/fldfunc.src +++ b/sw/source/ui/fldui/fldfunc.src @@ -2,9 +2,9 @@ * * $RCSfile: fldfunc.src,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:20:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,17 +88,18 @@ TabPage TP_FLD_FUNC Text [ spanish ] = "~Tipo de campo" ; Text [ english_us ] = "~Type" ; Left = TRUE ; - Text[ chinese_simplified ] = "ֶ(~T)"; + Text[ chinese_simplified ] = "字段类型(~T)"; Text[ russian ] = " "; Text[ polish ] = "Typ pola"; - Text[ japanese ] = "̨(~T)"; - Text[ chinese_traditional ] = "(~T)"; + Text[ japanese ] = "フィールドタイプ(~T)"; + Text[ chinese_traditional ] = "欄位類型(~T)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "(~T)"; + Text[ korean ] = "유형(~T)"; Text[ turkish ] = "~Alan tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo de campo"; + Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~ชนิด"; }; ListBox LB_FUNCTYPE { @@ -128,17 +129,18 @@ TabPage TP_FLD_FUNC Text [ english_us ] = "S~elect" ; Hide = TRUE ; Left = TRUE ; - Text[ chinese_simplified ] = "ѡ(~E)"; + Text[ chinese_simplified ] = "选择(~E)"; Text[ russian ] = ""; Text[ polish ] = "Wybr"; - Text[ japanese ] = "I(~E)"; - Text[ chinese_traditional ] = "(~E)"; + Text[ japanese ] = "選択(~E)"; + Text[ chinese_traditional ] = "選擇(~E)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~E)"; + Text[ korean ] = "선택(~E)"; Text[ turkish ] = "~Seim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se~leccin"; + Text[ catalan ] = "S~elecciona"; + Text[ thai ] = "เลื~อก"; }; ListBox LB_FUNCSELECTION { @@ -166,18 +168,19 @@ TabPage TP_FLD_FUNC Text [ french ] = "F~ormat" ; Text [ dutch ] = "F~ormaat" ; Text [ portuguese ] = "F~ormato" ; - Text[ chinese_simplified ] = "ʽ(~O)"; + Text[ chinese_simplified ] = "格式(~O)"; Text[ russian ] = ""; Text[ polish ] = "Format"; - Text[ japanese ] = "(~O)"; - Text[ chinese_traditional ] = "榡(~O)"; + Text[ japanese ] = "書式(~O)"; + Text[ chinese_traditional ] = "格式(~O)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~O)"; + Text[ korean ] = "서식(~O)"; Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~ormato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormata"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "รู~ปแบบ"; }; ListBox LB_FUNCFORMAT { @@ -199,21 +202,22 @@ TabPage TP_FLD_FUNC Text [ danish ] = "Navn" ; Text [ italian ] = "No~me" ; Text [ spanish ] = "No~mbre" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ dutch ] = "Naa~m" ; Text [ portuguese ] = "No~me" ; - Text[ chinese_simplified ] = "(~M)"; + Text[ chinese_simplified ] = "名称(~M)"; Text[ russian ] = ""; Text[ polish ] = "Nazwa"; - Text[ japanese ] = "O(~M)"; - Text[ chinese_traditional ] = "W(~M)"; + Text[ japanese ] = "名前(~M)"; + Text[ chinese_traditional ] = "名稱(~M)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "̸(~M)"; + Text[ korean ] = "이름(~M)"; Text[ turkish ] = "~Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No~mbre"; + Text[ catalan ] = "No~m"; Text[ finnish ] = "~Nimi"; + Text[ thai ] = "ชื่~อ"; }; Edit ED_FUNCNAME { @@ -241,17 +245,18 @@ TabPage TP_FLD_FUNC Text [ spanish ] = "~Valor" ; Text [ english_us ] = "~Value" ; Left = TRUE ; - Text[ chinese_simplified ] = "ֵ(~V)"; + Text[ chinese_simplified ] = "数值(~V)"; Text[ russian ] = ""; Text[ polish ] = "Warto"; - Text[ japanese ] = "l(~V)"; - Text[ chinese_traditional ] = "ƭ(~V)"; + Text[ japanese ] = "値(~V)"; + Text[ chinese_traditional ] = "數值(~V)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~V)"; + Text[ korean ] = "값(~V)"; Text[ turkish ] = "D~eer"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Valor"; + Text[ thai ] = "~ค่า"; }; Edit ED_FUNCVALUE { @@ -278,18 +283,19 @@ TabPage TP_FLD_FUNC Text [ french ] = "~Alors" ; Text [ dutch ] = "~Dan" ; Text [ portuguese ] = "~Ento" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "就"; Text[ russian ] = ""; Text[ polish ] = "Wtedy"; - Text[ japanese ] = "Ƃ"; - Text[ chinese_traditional ] = "N"; + Text[ japanese ] = "条件を満たすとき"; + Text[ chinese_traditional ] = "就"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = " "; + Text[ korean ] = "조건을 충족할 경우"; Text[ turkish ] = "O halde"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Entonces"; + Text[ catalan ] = "Aleshores"; Text[ finnish ] = "Sitten"; + Text[ thai ] = "จากนั้น"; }; Edit ED_FUNCCOND1 { @@ -317,18 +323,19 @@ TabPage TP_FLD_FUNC Text [ french ] = "~Sinon" ; Text [ dutch ] = "~Anders" ; Text [ portuguese ] = "~Seno" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "其它"; Text[ russian ] = ""; Text[ polish ] = "W przeciwnym wypadku"; - Text[ japanese ] = "ȂƂ"; - Text[ chinese_traditional ] = "_h"; + Text[ japanese ] = "条件を満たさないとき"; + Text[ chinese_traditional ] = "否則"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "Ÿ"; + Text[ korean ] = "기타"; Text[ turkish ] = "Yoksa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Si no"; + Text[ catalan ] = "Sin"; Text[ finnish ] = "Muutoin"; + Text[ thai ] = "อย่างอื่น"; }; Edit ED_FUNCCOND2 { @@ -354,21 +361,22 @@ TabPage TP_FLD_FUNC Text [ spanish ] = "M~acro..." ; Text [ danish ] = "Makro..." ; Text [ swedish ] = "M~akro..." ; - Text [ finnish ] = "~Makro" ; + Text [ finnish ] = "~Makro..." ; Text [ english_us ] = "~Macro..." ; Disable = TRUE ; TabStop = TRUE ; - Text[ chinese_simplified ] = "(~M)..."; + Text[ chinese_simplified ] = "宏(~M)..."; Text[ russian ] = "..."; Text[ polish ] = "Makro..."; - Text[ japanese ] = "ϸ(~M)..."; - Text[ chinese_traditional ] = "(~M)..."; + Text[ japanese ] = "マクロ(~M)..."; + Text[ chinese_traditional ] = "巨集(~M)..."; Text[ arabic ] = "..."; Text[ greek ] = "..."; - Text[ korean ] = "ũ(~M)..."; + Text[ korean ] = "매크로(~M)..."; Text[ turkish ] = "M~akro..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "M~acro..."; + Text[ catalan ] = "~Macro..."; + Text[ thai ] = "~มาโคร..."; }; Text [ english_us ] = "Functions" ; Text [ portuguese_brazilian ] = "Funktionen" ; @@ -379,17 +387,30 @@ TabPage TP_FLD_FUNC Text [ french ] = "Fonctions" ; Text [ dutch ] = "Functies" ; Text [ portuguese ] = "Funes" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "功能"; Text[ russian ] = ""; Text[ polish ] = "Funkcje"; - Text[ japanese ] = "@\\"; - Text[ chinese_traditional ] = "\\"; + Text[ japanese ] = "機能"; + Text[ chinese_traditional ] = "功能"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "Լ"; + Text[ korean ] = "기능"; Text[ turkish ] = "Fonksiyon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Funciones"; + Text[ catalan ] = "Funcions"; Text[ finnish ] = "Toiminnot"; + Text[ thai ] = "ฟังก์ชั่น"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index b7fdebbaf3fc..84579412fd6a 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldpage.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: os $ $Date: 2002-11-15 11:12:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -288,22 +288,12 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, case TYP_DBNUMSETFLD: case TYP_DBSETNUMBERFLD: { - USHORT nPos, nTablePos, nExpPos; + xub_StrLen nPos = 0; SwDBData aData; - // DBName aus rPar1 extrahieren. Format: DBName.TableName.ExpStrg - if ((nTablePos = rPar1.Search(DB_DELIM)) != STRING_NOTFOUND) - aData.sDataSource = rPar1.Copy(0, nTablePos++); - if ((nExpPos = rPar1.Search(DB_DELIM, nTablePos)) != STRING_NOTFOUND) - { - aData.sCommand = rPar1.Copy(nTablePos, nExpPos++ - nTablePos); - } - if (nExpPos != STRING_NOTFOUND) - nPos = nExpPos; - else if (nTablePos != STRING_NOTFOUND) - nPos = nTablePos; - else - nPos = 0; + aData.sDataSource = rPar1.GetToken(0, DB_DELIM, nPos); + aData.sCommand = rPar1.GetToken(0, DB_DELIM, nPos); + aData.nCommandType = rPar1.GetToken(0, DB_DELIM, nPos).ToInt32(); sPar1 = rPar1.Copy(nPos); ((SwDBNameInfField*)pCurFld)->SetDBData(aData); diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src index 755220681610..bb441aeb35e4 100644 --- a/sw/source/ui/fldui/fldref.src +++ b/sw/source/ui/fldui/fldref.src @@ -2,9 +2,9 @@ * * $RCSfile: fldref.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2001-07-14 03:06:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,17 +88,18 @@ TabPage TP_FLD_REF Text [ spanish ] = "~Tipo de campo" ; Text [ english_us ] = "~Type" ; Left = TRUE ; - Text[ chinese_simplified ] = "ֶ(~T)"; + Text[ chinese_simplified ] = "字段类型(~T)"; Text[ russian ] = " "; Text[ polish ] = "Typ pola"; - Text[ japanese ] = "̨(~T)"; - Text[ chinese_traditional ] = "(~T)"; + Text[ japanese ] = "フィールドタイプ(~T)"; + Text[ chinese_traditional ] = "欄位類型(~T)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "(~T)"; + Text[ korean ] = "유형(~T)"; Text[ turkish ] = "~Alan tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo de campo"; + Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~ชนิด"; }; ListBox LB_REFTYPE { @@ -126,17 +127,18 @@ TabPage TP_FLD_REF Text [ spanish ] = "Se~leccin" ; Text [ english_us ] = "S~election" ; Left = TRUE ; - Text[ chinese_simplified ] = "ѡ(~E)"; + Text[ chinese_simplified ] = "选择(~E)"; Text[ russian ] = ""; Text[ polish ] = "Wybr"; - Text[ japanese ] = "I(~E)"; - Text[ chinese_traditional ] = "(~E)"; + Text[ japanese ] = "選択(~E)"; + Text[ chinese_traditional ] = "選取(~E)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~E)"; + Text[ korean ] = "선택(~E)"; Text[ turkish ] = "S~eim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se~leccin"; + Text[ catalan ] = "Se~lecci"; + Text[ thai ] = "เลื~อก"; }; ListBox LB_REFSELECTION { @@ -162,18 +164,19 @@ TabPage TP_FLD_REF Text [ french ] = "F~ormat" ; Text [ dutch ] = "F~ormaat" ; Text [ portuguese ] = "F~ormato" ; - Text[ chinese_simplified ] = "ʽ(~O)"; + Text[ chinese_simplified ] = "格式(~O)"; Text[ russian ] = ""; Text[ polish ] = "Format"; - Text[ japanese ] = "(~O)"; - Text[ chinese_traditional ] = "榡(~O)"; + Text[ japanese ] = "書式(~O)"; + Text[ chinese_traditional ] = "格式(~O)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~O)"; + Text[ korean ] = "서식(~O)"; Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~ormato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormata"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "รู~ปแบบ"; }; ListBox LB_REFFORMAT { @@ -197,21 +200,22 @@ TabPage TP_FLD_REF Text [ danish ] = "Navn" ; Text [ italian ] = "No~me" ; Text [ spanish ] = "No~mbre" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ dutch ] = "Naa~m" ; Text [ portuguese ] = "No~me" ; - Text[ chinese_simplified ] = "(~M)"; + Text[ chinese_simplified ] = "名称(~M)"; Text[ russian ] = ""; Text[ polish ] = "Nazwa"; - Text[ japanese ] = "O(~M)"; - Text[ chinese_traditional ] = "W(~M)"; + Text[ japanese ] = "名前(~M)"; + Text[ chinese_traditional ] = "名稱(~M)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "̸(~M)"; + Text[ korean ] = "이름(~M)"; Text[ turkish ] = "~Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No~mbre"; + Text[ catalan ] = "No~m"; Text[ finnish ] = "~Nimi"; + Text[ thai ] = "ชื่~อ"; }; Edit ED_REFNAME { @@ -240,17 +244,18 @@ TabPage TP_FLD_REF Text [ english_us ] = "~Value" ; Disable = TRUE ; Left = TRUE ; - Text[ chinese_simplified ] = "ֵ(~V)"; + Text[ chinese_simplified ] = "数值(~V)"; Text[ russian ] = ""; Text[ polish ] = "Warto"; - Text[ japanese ] = "l(~V)"; - Text[ chinese_traditional ] = "ƭ(~V)"; + Text[ japanese ] = "値(~V)"; + Text[ chinese_traditional ] = "數值(~V)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(V)(~V)"; + Text[ korean ] = "값(~V)"; Text[ turkish ] = "~Deer"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Valor"; + Text[ thai ] = "~ค่า"; }; Edit ED_REFVALUE { @@ -274,18 +279,19 @@ TabPage TP_FLD_REF Text [ danish ] = "Tekstmarkeringer" ; Text [ portuguese ] = "Marcadores de texto" ; Text [ portuguese_brazilian ] = "Textmarken" ; - Text[ chinese_simplified ] = "ǩ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "书签"; + Text[ russian ] = ""; Text[ polish ] = "Zakadki"; - Text[ japanese ] = "÷ϰ"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "テキストマーク"; + Text[ chinese_traditional ] = "內文標籤"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "å"; + Text[ korean ] = "책갈피"; Text[ turkish ] = "Metin iareti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Marcas de texto"; + Text[ catalan ] = "Marques de text"; Text[ finnish ] = "Kirjanmerkit"; + Text[ thai ] = "ที่คั่น"; }; String STR_REFFOOTNOTE { @@ -302,17 +308,18 @@ TabPage TP_FLD_REF Text [ dutch ] = "Voetnoten" ; Text [ spanish ] = "Notas al pie" ; Text [ english_us ] = "Footnotes" ; - Text[ chinese_simplified ] = "ע"; + Text[ chinese_simplified ] = "注脚"; Text[ russian ] = ""; Text[ polish ] = "Przypisy dolne"; - Text[ japanese ] = "r"; - Text[ chinese_traditional ] = "}"; + Text[ japanese ] = "脚注"; + Text[ chinese_traditional ] = "註腳"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "각주"; Text[ turkish ] = "Dipnotlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Notas al pie"; + Text[ catalan ] = "Notes al peu"; + Text[ thai ] = "เชิงอรรถ"; }; String STR_REFENDNOTE { @@ -327,18 +334,19 @@ TabPage TP_FLD_REF Text [ french ] = "Notes de fin" ; Text [ dutch ] = "Eindnoten" ; Text [ portuguese ] = "Notas finais" ; - Text[ chinese_simplified ] = "βע"; + Text[ chinese_simplified ] = "尾注"; Text[ russian ] = " "; Text[ polish ] = "Przypisy kocowe"; - Text[ japanese ] = "r"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "文末脚注"; + Text[ chinese_traditional ] = "尾註"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "미주"; Text[ turkish ] = "Son notlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Notas finales"; - Text[ finnish ] = "Loppuhuomautukset"; + Text[ catalan ] = "Notes finals"; + Text[ finnish ] = "Loppuviitteet"; + Text[ thai ] = "อ้างอิงท้ายเรื่อง"; }; Text [ english_us ] = "References" ; Text [ portuguese_brazilian ] = "Referenzen" ; @@ -349,20 +357,30 @@ TabPage TP_FLD_REF Text [ french ] = "Rfrences" ; Text [ dutch ] = "Verwijzingen" ; Text [ portuguese ] = "Referncias" ; - Text[ chinese_simplified ] = "˵"; + Text[ chinese_simplified ] = "说明文"; Text[ russian ] = ""; Text[ polish ] = "Odwoania"; - Text[ japanese ] = "Q"; - Text[ chinese_traditional ] = "ѷ"; + Text[ japanese ] = "参照"; + Text[ chinese_traditional ] = "參照"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "참조"; Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referencias"; + Text[ catalan ] = "Referncies"; Text[ finnish ] = "Viitteet"; + Text[ thai ] = "อ้างอิง"; }; + + + + + + + + + diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index fdae7950a210..10f501963fe8 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldtdlg.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-12-12 16:10:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -233,6 +233,46 @@ void SwFldDlgWrapper::ShowPage(USHORT nPage) ((SwFldDlg*)GetWindow())->ShowPage(nPage ? nPage : TP_FLD_REF); } +SFX_IMPL_CHILDWINDOW(SwFldDataOnlyDlgWrapper, FN_INSERT_FIELD_DATA_ONLY) + +/* -----------------04.02.2003 14:17----------------- + * + * --------------------------------------------------*/ +SfxChildWinInfo SwFldDataOnlyDlgWrapper::GetInfo() const +{ + SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); +// prevent instatiation of dialog other than by calling +// the mail merge dialog + aInfo.bVisible = FALSE; + return aInfo; +} +/* -----------------04.02.2003 14:17----------------- + * + * --------------------------------------------------*/ +SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* pParent, USHORT nId, + SfxBindings* pB, + SfxChildWinInfo* pInfo ) + : SwChildWinWrapper( pParent, nId ) +{ + SwFldDlg *pDlg = new SwFldDlg( pB, this, pParent ); + pWindow = pDlg; + pDlg->ActivateDatabasePage(); + pDlg->Start(); + pDlg->Initialize( pInfo ); + eChildAlignment = SFX_ALIGN_NOALIGNMENT; +} +/* -----------------04.02.2003 14:17----------------- + * re-init after doc activation + * --------------------------------------------------*/ +BOOL SwFldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh) +{ + BOOL bRet; + if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel + ((SwFldDlg*)GetWindow())->ReInitDlg(); + + return bRet; +} + /*-------------------------------------------------------------------- Beschreibung: Der Traeger des Dialoges --------------------------------------------------------------------*/ @@ -240,7 +280,8 @@ void SwFldDlgWrapper::ShowPage(USHORT nPage) SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) : SfxTabDialog( pParent, SW_RES( DLG_FLD_INSERT )), - pChildWin(pCW) + pChildWin(pCW), + bDataBaseMode(FALSE) { SetStyle(GetStyle()|WB_STDMODELESS); bHtmlMode = (::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()) & HTMLMODE_ON) != 0; @@ -292,7 +333,8 @@ SwFldDlg::~SwFldDlg() BOOL SwFldDlg::Close() { SfxViewFrame::Current()->GetDispatcher()-> - Execute(FN_INSERT_FIELD, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); + Execute(bDataBaseMode ? FN_INSERT_FIELD_DATA_ONLY : FN_INSERT_FIELD, + SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); return TRUE; } @@ -473,10 +515,17 @@ void SwFldDlg::InsertHdl() * --------------------------------------------------*/ void SwFldDlg::ActivateDatabasePage() { + bDataBaseMode = TRUE; ShowPage( TP_FLD_DB ); SfxTabPage* pDBPage = GetTabPage( TP_FLD_DB ); if( pDBPage ) { ((SwFldDBPage*)pDBPage)->ActivateMailMergeAddress(); } + //remove all other pages + RemoveTabPage(TP_FLD_DOK); + RemoveTabPage(TP_FLD_VAR); + RemoveTabPage(TP_FLD_DOKINF); + RemoveTabPage(TP_FLD_REF); + RemoveTabPage(TP_FLD_FUNC); } diff --git a/sw/source/ui/fldui/fldtdlg.src b/sw/source/ui/fldui/fldtdlg.src index 0b3d5dd9f1a7..a2dd4add6e74 100644 --- a/sw/source/ui/fldui/fldtdlg.src +++ b/sw/source/ui/fldui/fldtdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: fldtdlg.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:23:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,18 +91,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Document" ; Text [ dutch ] = "Document" ; Text [ portuguese ] = "Documento" ; - Text[ chinese_simplified ] = "ĵ"; + Text[ chinese_simplified ] = "文档"; Text[ russian ] = ""; Text[ polish ] = "Dokument"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "ドキュメント"; + Text[ chinese_traditional ] = "文件"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "문서"; Text[ turkish ] = "Belge"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Documento"; + Text[ catalan ] = "Document"; Text[ finnish ] = "Asiakirja"; + Text[ thai ] = "เอกสาร"; }; PageItem { @@ -119,18 +120,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Rfrences" ; Text [ dutch ] = "Verwijzingen" ; Text [ portuguese ] = "Referncias" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "引用"; Text[ russian ] = ""; Text[ polish ] = "Odwoania"; - Text[ japanese ] = "Q"; - Text[ chinese_traditional ] = "ѷ"; + Text[ japanese ] = "参照"; + Text[ chinese_traditional ] = "參照"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "참조"; Text[ turkish ] = "Referanslar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referencias"; + Text[ catalan ] = "Referncies"; Text[ finnish ] = "Viitteet"; + Text[ thai ] = "อ้างอิง"; }; PageItem { @@ -147,18 +149,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Fonctions" ; Text [ dutch ] = "Functies" ; Text [ portuguese ] = "Funes" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "功能"; Text[ russian ] = ""; Text[ polish ] = "Funkcje"; - Text[ japanese ] = "@\\"; - Text[ chinese_traditional ] = "\\"; + Text[ japanese ] = "機能"; + Text[ chinese_traditional ] = "功能"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "기능"; Text[ turkish ] = "levler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Funciones"; + Text[ catalan ] = "Funcions"; Text[ finnish ] = "Toiminnot"; + Text[ thai ] = "ฟังก์ชั่น"; }; PageItem { @@ -175,18 +178,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Info document" ; Text [ dutch ] = "Documentinfo" ; Text [ portuguese ] = "Info. sobre documento" ; - Text[ chinese_simplified ] = "ĵϢ"; + Text[ chinese_simplified ] = "文档信息"; Text[ russian ] = " "; Text[ polish ] = "Informacje o dokumencie"; - Text[ japanese ] = "ď"; - Text[ chinese_traditional ] = "T"; + Text[ japanese ] = "ドキュメント情報"; + Text[ chinese_traditional ] = "文件資訊"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "문서 정보"; Text[ turkish ] = "Belge bilgileri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informacin del documento"; + Text[ catalan ] = "Informaci del document"; Text[ finnish ] = "Asiakirjatiedot"; + Text[ thai ] = "ข้อมูลเอกสาร"; }; PageItem { @@ -203,18 +207,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Variables" ; Text [ dutch ] = "Variabelen" ; Text [ portuguese ] = "Variveis" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "变量"; Text[ russian ] = ""; Text[ polish ] = "Zmienne"; - Text[ japanese ] = "ϐ"; - Text[ chinese_traditional ] = "ܶq"; + Text[ japanese ] = "変数"; + Text[ chinese_traditional ] = "變量"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "변수"; Text[ turkish ] = "Deikenler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Variables"; Text[ finnish ] = "Muuttujat"; + Text[ thai ] = "ตัวแปร"; }; PageItem { @@ -231,18 +236,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Base de donnes" ; Text [ dutch ] = "Database" ; Text [ portuguese ] = "Base de dados" ; - Text[ chinese_simplified ] = "ݿ"; + Text[ chinese_simplified ] = "数据库"; Text[ russian ] = " "; Text[ polish ] = "Baza danych"; - Text[ japanese ] = "ްް"; - Text[ chinese_traditional ] = "Ʈw"; + Text[ japanese ] = "データベース"; + Text[ chinese_traditional ] = "資料庫"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ͺ̽"; + Text[ korean ] = "데이터베이스"; Text[ turkish ] = "Veritaban"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Base de datos"; + Text[ catalan ] = "Base de dades"; Text[ finnish ] = "Tietokanta"; + Text[ thai ] = "ฐานข้อมูล"; }; }; }; @@ -251,27 +257,28 @@ TabDialog DLG_FLD_INSERT Text = "~Einfgen" ; Text [ ENGLISH ] = "~Insert" ; Text [ norwegian ] = "~Insert" ; - Text [ italian ] = "~Inserisci" ; + Text [ italian ] = "Inserisci" ; Text [ portuguese_brazilian ] = "~Inserir" ; Text [ portuguese ] = "~Inserir" ; Text [ finnish ] = "~Lis" ; Text [ danish ] = "~Indst" ; - Text [ french ] = "~Insrer" ; + Text [ french ] = "Insrer" ; Text [ swedish ] = "~Infoga" ; Text [ dutch ] = "~Invoegen" ; Text [ spanish ] = "~Insertar" ; Text [ english_us ] = "~Insert" ; - Text[ chinese_simplified ] = "(~I)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "插入(~I)"; + Text[ russian ] = ""; Text[ polish ] = "Wstaw"; - Text[ japanese ] = "}(~I)"; - Text[ chinese_traditional ] = "J(~I)"; + Text[ japanese ] = "挿入(~I)"; + Text[ chinese_traditional ] = "插入(~I)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~I)"; + Text[ korean ] = "삽입(~I)"; Text[ turkish ] = "~Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Insertar"; + Text[ catalan ] = "~Insereix"; + Text[ thai ] = "แ~ทรก"; }; String STR_FLD_CLOSE { @@ -280,24 +287,25 @@ TabDialog DLG_FLD_INSERT Text [ english_us ] = "~Close" ; Text [ italian ] = "~Chiudi" ; Text [ spanish ] = "~Cerrar" ; - Text [ french ] = "~Fermer" ; + Text [ french ] = "Fermer" ; Text [ dutch ] = "~Sluiten" ; Text [ swedish ] = "~Stng" ; Text [ danish ] = "Luk" ; Text [ portuguese_brazilian ] = "~Schlie?en" ; Text [ portuguese ] = "~Fechar" ; - Text[ chinese_simplified ] = "ر(~C)"; + Text[ chinese_simplified ] = "关闭(~C)"; Text[ russian ] = ""; Text[ polish ] = "Zamknij"; - Text[ japanese ] = "(~C)"; - Text[ chinese_traditional ] = "(~C)"; + Text[ japanese ] = "閉じる(~C)"; + Text[ chinese_traditional ] = "關閉(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ݱ(~C)"; + Text[ korean ] = "닫기(~C)"; Text[ turkish ] = "~k"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cerrar"; + Text[ catalan ] = "~Tanca"; Text[ finnish ] = "~Sulje"; + Text[ thai ] = "~ปิด"; }; Text [ english_us ] = "Fields" ; Text [ portuguese_brazilian ] = "Feldbefehle" ; @@ -308,20 +316,30 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Champs" ; Text [ dutch ] = "Veldopdracht" ; Text [ portuguese ] = "Campos" ; - Text[ chinese_simplified ] = "ֶָ"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "字段指令"; + Text[ russian ] = ""; Text[ polish ] = "Pola"; - Text[ japanese ] = "̨"; - Text[ chinese_traditional ] = "O"; + Text[ japanese ] = "フィールド"; + Text[ chinese_traditional ] = "欄位指令"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "ʵ"; + Text[ korean ] = "필드"; Text[ turkish ] = "Alan eleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campos"; - Text[ finnish ] = "Kentt"; + Text[ catalan ] = "Camps"; + Text[ finnish ] = "Kentt"; + Text[ thai ] = "เขตข้อมูล"; }; + + + + + + + + + diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src index 13925b9c9803..19780a5ab43d 100644 --- a/sw/source/ui/fldui/fldui.src +++ b/sw/source/ui/fldui/fldui.src @@ -2,9 +2,9 @@ * * $RCSfile: fldui.src,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: kz $ $Date: 2002-12-09 09:57:58 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ String STR_FLD_EDIT_DLG Text[ chinese_traditional ] = "編輯欄位指令"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "파일 편집"; + Text[ korean ] = "필드 편집"; Text[ turkish ] = "Alan esi dzenle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Edita els camps"; @@ -277,7 +277,7 @@ String STR_DOCSTATFLD TEXT [ portuguese ] = "Estatstica" ; TEXT [ finnish ] = "Tilastotiedot" ; TEXT [ danish ] = "Statistik" ; - TEXT [ french ] = "Statistique" ; + TEXT [ french ] = "Statistiques" ; TEXT [ swedish ] = "Statistik" ; TEXT [ dutch ] = "Statistiek" ; TEXT [ spanish ] = "Estadstica" ; @@ -305,7 +305,7 @@ String STR_AUTHORFLD Text [ swedish ] = "Anvndare" ; Text [ danish ] = "Bruger" ; Text [ italian ] = "Autore" ; - Text [ spanish ] = "Usuario" ; + Text [ spanish ] = "Autor" ; Text [ french ] = "Utilisateur" ; Text [ dutch ] = "Gebruiker" ; Text[ chinese_simplified ] = "使用者"; @@ -335,7 +335,7 @@ String STR_TEMPLNAMEFLD TEXT [ french ] = "Modle de document" ; TEXT [ swedish ] = "Dokumentmall" ; TEXT [ dutch ] = "Sjabloon" ; - TEXT [ spanish ] = "Plantilla" ; + TEXT [ spanish ] = "Plantillas" ; TEXT [ english_us ] = "Templates" ; TEXT[ chinese_simplified ] = "文档样式"; TEXT[ russian ] = ""; @@ -344,7 +344,7 @@ String STR_TEMPLNAMEFLD TEXT[ chinese_traditional ] = "文件樣式"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "문서 서식 파일"; + TEXT[ korean ] = "서식 파일"; TEXT[ turkish ] = "Belge ablonu"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Plantilles"; @@ -539,13 +539,13 @@ String STR_USRINPUTFLD Text [ portuguese ] = "Campo de entrada (utilizador)" ; Text [ portuguese_brazilian ] = "Eingabefeld (Benutzer)" ; Text[ chinese_simplified ] = "输入字段(使用者)"; - Text[ russian ] = " ()"; + Text[ russian ] = " ()"; Text[ polish ] = "Pole wprowadzania (Uytkownik)"; Text[ japanese ] = "入力フィールド (ユーザー)"; Text[ chinese_traditional ] = "輸入欄位(使用者)"; Text[ arabic ] = " ()"; Text[ greek ] = " ()"; - Text[ korean ] = "입력 필드 (사용자)"; + Text[ korean ] = "입력 필드(사용자)"; Text[ turkish ] = "Giri alan (Kullanc)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp d'entrada (usuari)"; @@ -565,7 +565,7 @@ String STR_CONDTXTFLD TEXT [ french ] = "Texte conditionnel" ; TEXT [ swedish ] = "Villkorlig text" ; TEXT [ dutch ] = "Conditionele tekst" ; - TEXT [ spanish ] = "Texto condicionado" ; + TEXT [ spanish ] = "Texto condicional" ; TEXT [ english_us ] = "Conditional text" ; TEXT[ chinese_simplified ] = "有条件的文字"; TEXT[ russian ] = " "; @@ -574,7 +574,7 @@ String STR_CONDTXTFLD TEXT[ chinese_traditional ] = "有條件的文字"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "조건적 텍스트"; + TEXT[ korean ] = "조건부 텍스트"; TEXT[ turkish ] = "Koullu metin"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Text condicional"; @@ -658,7 +658,7 @@ String STR_SEQFLD TEXT[ chinese_traditional ] = "編號順序"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "숫자 범위"; + TEXT[ korean ] = "번호 범위"; TEXT[ turkish ] = "Numara aral"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Seqncia"; @@ -870,10 +870,10 @@ String STR_DBFLD TEXT [ portuguese ] = "Campo para cartas em srie" ; TEXT [ finnish ] = "Joukkokirjeen kentt" ; TEXT [ danish ] = "Brevfletningsfelt" ; - TEXT [ french ] = "Champ de mailing" ; + TEXT [ french ] = "Champs de mailing" ; TEXT [ swedish ] = "Standardbrevflt" ; TEXT [ dutch ] = "Standaardbriefveld" ; - TEXT [ spanish ] = "Campo de carta en serie" ; + TEXT [ spanish ] = "Campos de la impresin en serie" ; TEXT [ english_us ] = "Mail merge fields" ; TEXT[ chinese_simplified ] = "邮件合并字段"; TEXT[ russian ] = " "; @@ -882,7 +882,7 @@ String STR_DBFLD TEXT[ chinese_traditional ] = "合併列印欄位"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "편지지 양식 필드"; + TEXT[ korean ] = "편지 병합 필드"; TEXT[ turkish ] = "Standart mektup"; TEXT[ language_user1 ] = "German should be Seriendruck-Felder"; TEXT[ catalan ] = "Camp de carta formulari"; @@ -1280,7 +1280,7 @@ String FLD_DATE_FIX TEXT[ chinese_traditional ] = "日期(固定)"; TEXT[ arabic ] = " ()"; TEXT[ greek ] = " ()"; - TEXT[ korean ] = "날짜(고정됨)"; + TEXT[ korean ] = "날짜(고정적)"; TEXT[ turkish ] = "Tarih (sabit)"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Data (fixa)"; @@ -1478,7 +1478,7 @@ String FLD_STAT_GRF TEXT[ chinese_traditional ] = "圖形"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "그래픽"; + TEXT[ korean ] = "그림"; TEXT[ turkish ] = "Grafik"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Imatges"; @@ -1681,7 +1681,7 @@ String FLD_EU_NAME Text[ chinese_traditional ] = "姓氏"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "이름"; + Text[ korean ] = "성"; Text[ turkish ] = "Soyad"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cognom"; @@ -1710,7 +1710,7 @@ String FLD_EU_ABK TEXT[ chinese_traditional ] = "縮寫"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "머리글자"; + TEXT[ korean ] = "이니셜"; TEXT[ turkish ] = "Baharfler"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Inicials"; @@ -1738,7 +1738,7 @@ String FLD_EU_STRASSE TEXT[ chinese_traditional ] = "街道"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "주소번지"; + TEXT[ korean ] = "주소"; TEXT[ turkish ] = "Sokak"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Carrer"; @@ -1766,7 +1766,7 @@ String FLD_EU_LAND TEXT[ chinese_traditional ] = "國家"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "국가"; + TEXT[ korean ] = "국명"; TEXT[ turkish ] = "lke"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Pas"; @@ -1785,7 +1785,7 @@ String FLD_EU_PLZ TEXT [ french ] = "C.P." ; TEXT [ swedish ] = "Postnummer" ; TEXT [ dutch ] = "Postcode" ; - TEXT [ spanish ] = "CP" ; + TEXT [ spanish ] = "C.P." ; TEXT [ english_us ] = "Zip code" ; TEXT[ chinese_simplified ] = "邮编"; TEXT[ russian ] = " "; @@ -1822,7 +1822,7 @@ String FLD_EU_ORT TEXT[ chinese_traditional ] = "位置"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "시"; + TEXT[ korean ] = "구/군/시"; TEXT[ turkish ] = "ehir"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Ciutat"; @@ -1850,7 +1850,7 @@ String FLD_EU_TITEL TEXT[ chinese_traditional ] = "頭銜"; TEXT[ arabic ] = " "; TEXT[ greek ] = ""; - TEXT[ korean ] = "직함"; + TEXT[ korean ] = "부서"; TEXT[ turkish ] = "Unvan"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Ttol"; @@ -1878,7 +1878,7 @@ String FLD_EU_POS TEXT[ chinese_traditional ] = "位置"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "직위"; + TEXT[ korean ] = "부서"; TEXT[ turkish ] = "Pozisyon"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Posici"; @@ -1897,10 +1897,10 @@ String FLD_EU_TELPRIV TEXT [ french ] = "Tl. (domicile)" ; TEXT [ swedish ] = "Tfn (privat)" ; TEXT [ dutch ] = "Tel. (priv)" ; - TEXT [ spanish ] = "Tel. (Priv.)" ; + TEXT [ spanish ] = "Tfno. (particular)" ; TEXT [ english_us ] = "Tel. (Home)" ; TEXT[ chinese_simplified ] = "电话(私人)"; - TEXT[ russian ] = ". ()"; + TEXT[ russian ] = ". "; TEXT[ polish ] = "Tel. (prywatny)"; TEXT[ japanese ] = "Tel.(自宅)"; TEXT[ chinese_traditional ] = "電話(私人)"; @@ -1925,10 +1925,10 @@ String FLD_EU_TELFIRMA TEXT [ french ] = "Tl. (bureau)" ; TEXT [ swedish ] = "Tfn (arbete)" ; TEXT [ dutch ] = "Tel. (Bedrijf)" ; - TEXT [ spanish ] = "Tel. (Emp.)" ; + TEXT [ spanish ] = "Tfno. (trabajo)" ; TEXT [ english_us ] = "Tel. (Work)" ; TEXT[ chinese_simplified ] = "电话(办公室)"; - TEXT[ russian ] = ". ()"; + TEXT[ russian ] = ". "; TEXT[ polish ] = "Tel. (firmowy)"; TEXT[ japanese ] = "Tel.(勤務先)"; TEXT[ chinese_traditional ] = "電話(辦公室)"; @@ -1954,17 +1954,17 @@ String FLD_EU_EMAIL Text [ swedish ] = "E-post" ; Text [ danish ] = "E-mail" ; Text [ italian ] = "eMail" ; - Text [ spanish ] = "E-mail" ; + Text [ spanish ] = "Correo-e" ; Text [ french ] = "E-Mail" ; Text [ dutch ] = "E-mail" ; Text[ chinese_simplified ] = "电子邮件"; - Text[ russian ] = ". "; + Text[ russian ] = ". "; Text[ polish ] = "e-mail"; Text[ japanese ] = "E-mail"; Text[ chinese_traditional ] = "電子郵件"; Text[ arabic ] = " "; Text[ greek ] = "E-mail"; - Text[ korean ] = "e-mail"; + Text[ korean ] = "전자 메일"; Text[ turkish ] = "E-posta"; Text[ language_user1 ] = " "; Text[ catalan ] = "correu electrnic"; @@ -1977,7 +1977,7 @@ String FLD_EU_STATE Text [ English ] = "State" ; Text [ english_us ] = "State" ; Text [ italian ] = "Stato" ; - Text [ spanish ] = "Estado" ; + Text [ spanish ] = "Provincia" ; Text [ french ] = "Rgion" ; Text [ dutch ] = "Land" ; Text [ danish ] = "Stat" ; @@ -1991,7 +1991,7 @@ String FLD_EU_STATE Text[ chinese_traditional ] = "省市"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "주"; + Text[ korean ] = "주/도명"; Text[ turkish ] = "l"; Text[ language_user1 ] = " "; Text[ catalan ] = "Comarca"; @@ -2045,7 +2045,7 @@ String FLD_PAGEREF_ON Text[ chinese_traditional ] = "收件者"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "작동"; + Text[ korean ] = "적용"; Text[ turkish ] = "Ak"; Text[ language_user1 ] = " "; Text[ catalan ] = "on"; @@ -2176,7 +2176,7 @@ String FMT_FF_UI_NAME Text [ swedish ] = "Mall" ; Text [ danish ] = "Skabelon" ; Text [ italian ] = "Modello" ; - Text [ spanish ] = "Plantilla" ; + Text [ spanish ] = "Estilo" ; Text [ french ] = "Modle" ; Text [ dutch ] = "Sjabloon" ; Text[ chinese_simplified ] = "样式"; @@ -2186,7 +2186,7 @@ String FMT_FF_UI_NAME Text[ chinese_traditional ] = "樣式"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "서식"; + Text[ korean ] = "스타일"; Text[ turkish ] = "ablon"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estil"; @@ -2203,7 +2203,7 @@ String FMT_FF_UI_RANGE Text [ swedish ] = "Omrde" ; Text [ danish ] = "Omrde" ; Text [ italian ] = "Sezione" ; - Text [ spanish ] = "rea" ; + Text [ spanish ] = "Categora" ; Text [ french ] = "Catgorie" ; Text [ dutch ] = "Bereik" ; Text[ chinese_simplified ] = "区域"; @@ -2261,7 +2261,7 @@ String FMT_CHAPTER_NO Text [ swedish ] = "Kapitelnummer" ; Text [ danish ] = "Kapitelnummer" ; Text [ italian ] = "Numero capitolo" ; - Text [ spanish ] = "Nmero del captulo" ; + Text [ spanish ] = "Nmero de captulo" ; Text [ french ] = "Numro de chapitre" ; Text [ dutch ] = "Hoofdstuknummer" ; Text[ chinese_simplified ] = "章节编号"; @@ -2298,7 +2298,7 @@ String FMT_CHAPTER_NO_NOSEPARATOR Text[ chinese_traditional ] = "章節編號不帶分隔符"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "구분 기호 없는 장 번호"; + Text[ korean ] = "구분 기호없는 장 번호"; Text[ turkish ] = "Ayrma iareti iermeyen blm numaras"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nmero de captol sense separador"; @@ -2326,7 +2326,7 @@ String FMT_CHAPTER_NAMENO Text[ chinese_traditional ] = "章節編號和名稱"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "장 번호와 이름"; + Text[ korean ] = "장 번호 및 이름"; Text[ turkish ] = "Blm numaras ve ad"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nmero i nom"; @@ -2458,7 +2458,7 @@ String FMT_NUM_PAGEDESC TEXT[ chinese_traditional ] = "和頁面樣式相同"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "페이지 스타일로 설정"; + TEXT[ korean ] = "페이지 스타일 설정"; TEXT[ turkish ] = "Sayfa biimi gibi"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Com estil de pgina"; @@ -2544,7 +2544,7 @@ String FMT_AUTHOR_SCUT TEXT[ chinese_traditional ] = "縮寫"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "머리글자"; + TEXT[ korean ] = "이니셜"; TEXT[ turkish ] = "Baharfler"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Inicials"; @@ -2850,7 +2850,7 @@ String FMT_REG_DATE TEXT[ chinese_traditional ] = "日期"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "일자"; + TEXT[ korean ] = "날짜"; TEXT[ turkish ] = "Tarih"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Data"; @@ -2992,7 +2992,7 @@ String FMT_REF_PAGE_PGDSC TEXT[ chinese_traditional ] = "和頁面樣式相同"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "페이지 스타일로 설정"; + TEXT[ korean ] = "페이지 스타일 설정"; TEXT[ turkish ] = "Sayfa biimi gibi"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Com estil de pgina"; @@ -3131,7 +3131,7 @@ String FMT_MARK_TABLE Text[ chinese_traditional ] = "表格"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -3159,7 +3159,7 @@ String FMT_MARK_FRAME Text[ chinese_traditional ] = "文字方塊"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "텍스트 상자"; + Text[ korean ] = "프레임"; Text[ turkish ] = "ereve"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marc"; @@ -3187,7 +3187,7 @@ String FMT_MARK_GRAFIC Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Imatge"; @@ -3253,7 +3253,7 @@ String STR_ALL Text[ chinese_traditional ] = "全部"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "전체"; + Text[ korean ] = "모두"; Text[ turkish ] = "Tm"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tot"; @@ -3340,7 +3340,7 @@ String STR_TEXT TEXT[ chinese_traditional ] = "那麼就，否則"; TEXT[ arabic ] = " "; TEXT[ greek ] = ", "; - TEXT[ korean ] = "다음, 기타"; + TEXT[ korean ] = "조건을 충족할 경우, 그렇지 않을 경우"; TEXT[ turkish ] = "O halde, Yoksa"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Aleshores, si no"; @@ -3362,7 +3362,7 @@ String STR_DDE_CMD TEXT [ spanish ] = "Instruccin DDE" ; TEXT [ english_us ] = "DDE Statement" ; TEXT[ chinese_simplified ] = "DDE 指令"; - TEXT[ russian ] = " DDE"; + TEXT[ russian ] = " DDE"; TEXT[ polish ] = "Instrukcja DDE"; TEXT[ japanese ] = "DDE指示"; TEXT[ chinese_traditional ] = "DDE 指令"; @@ -3444,7 +3444,7 @@ String STR_PROMPT TEXT [ spanish ] = "I~ndicacin" ; TEXT [ english_us ] = "~Reference" ; TEXT[ chinese_simplified ] = "提示(~R)"; - TEXT[ russian ] = ""; + TEXT[ russian ] = ""; TEXT[ polish ] = "Wskazwka"; TEXT[ japanese ] = "ヒント(~R)"; TEXT[ chinese_traditional ] = "提示(~R)"; @@ -3615,7 +3615,7 @@ String STR_LEVEL TEXT[ chinese_traditional ] = "級"; TEXT[ arabic ] = " "; TEXT[ greek ] = ""; - TEXT[ korean ] = "계층"; + TEXT[ korean ] = "계층 "; TEXT[ turkish ] = "Dzey"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Capa"; @@ -3726,3 +3726,8 @@ PushButton PB_FLDEDT_ADDRESS + + + + + diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src index d4ae2d606390..7c7970c56824 100644 --- a/sw/source/ui/fldui/fldvar.src +++ b/sw/source/ui/fldui/fldvar.src @@ -2,9 +2,9 @@ * * $RCSfile: fldvar.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: os $ $Date: 2002-09-06 13:59:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,7 @@ TabPage TP_FLD_VAR Text[ chinese_traditional ] = "欄位類型(~T)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "필드 유형(~T)"; + Text[ korean ] = "유형(~T)"; Text[ turkish ] = "A~lan tipi"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Tipus"; @@ -176,7 +176,7 @@ TabPage TP_FLD_VAR Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; Text[ catalan ] = "Formata"; - Text[ finnish ] = "Muoto"; + Text[ finnish ] = "Muotoilu"; Text[ thai ] = "รูปแบบ"; }; ListBox LB_VARFORMAT @@ -220,7 +220,7 @@ TabPage TP_FLD_VAR TEXT[ chinese_traditional ] = "隱入的(~B)"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "안보임(~B)"; + TEXT[ korean ] = "숨김(~B)"; TEXT[ turkish ] = "Grnmez"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "invisi~ble"; @@ -238,7 +238,7 @@ TabPage TP_FLD_VAR Text [ swedish ] = "Numrering kapitelvis" ; Text [ danish ] = "Kapitelvis nummerering" ; Text [ italian ] = "Numerazione a capitoli" ; - Text [ spanish ] = "Numeracin de captulos" ; + Text [ spanish ] = "Numeracin por captulos" ; Text [ french ] = "Numrotation par chapitre" ; Text [ dutch ] = "Hoofdstuksgewijs nummeren" ; Text [ portuguese ] = "Numerao por captulos" ; @@ -344,7 +344,7 @@ TabPage TP_FLD_VAR }; StringList [ russian ] = { - < "" ; > ; + < "" ; > ; }; StringList [ polish ] = { @@ -408,7 +408,7 @@ TabPage TP_FLD_VAR Text [ dutch ] = "~Scheidingsteken" ; Text [ portuguese ] = "~Separador" ; Text[ chinese_simplified ] = "分隔符(~S)"; - Text[ russian ] = ""; + Text[ russian ] = "."; Text[ polish ] = "Separator"; Text[ japanese ] = "区切り記号(~S)"; Text[ chinese_traditional ] = "連接符(~S)"; @@ -457,7 +457,7 @@ TabPage TP_FLD_VAR Text[ turkish ] = "~Ad"; Text[ language_user1 ] = " "; Text[ catalan ] = "No~m"; - Text[ finnish ] = "Ni~mi"; + Text[ finnish ] = "~Nimi"; Text[ thai ] = "ชื่~อ"; }; Edit ED_VARNAME @@ -569,7 +569,7 @@ TabPage TP_FLD_VAR Text [ french ] = "Supprimer" ; Text [ swedish ] = "Radera" ; Text [ dutch ] = "Wissen" ; - Text [ spanish ] = "Eliminar" ; + Text [ spanish ] = "Borrar" ; Text [ english_us ] = "Delete" ; Text[ chinese_simplified ] = "删除"; Text[ russian ] = ""; @@ -591,7 +591,7 @@ TabPage TP_FLD_VAR Text [ swedish ] = "Variabler" ; Text [ danish ] = "Variabler" ; Text [ italian ] = "Variabili" ; - Text [ spanish ] = "Predeterminaciones" ; + Text [ spanish ] = "Variables" ; Text [ french ] = "Variables" ; Text [ dutch ] = "Variabelen" ; Text [ portuguese ] = "Variveis" ; @@ -609,3 +609,20 @@ TabPage TP_FLD_VAR Text[ finnish ] = "Muuttujat"; Text[ thai ] = "ตัวแปร"; }; + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src index 36607f304c23..63a1f4861937 100644 --- a/sw/source/ui/fldui/inpdlg.src +++ b/sw/source/ui/fldui/inpdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: inpdlg.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:27:00 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,17 +113,18 @@ ModalDialog DLG_FLD_INPUT Text [ spanish ] = "Entrada" ; Text [ english_us ] = "Input" ; Readonly = TRUE ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "输入"; Text[ russian ] = ""; Text[ polish ] = "Wejcie"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "J"; + Text[ japanese ] = "入力"; + Text[ chinese_traditional ] = "輸入"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "Է"; + Text[ korean ] = "입력"; Text[ turkish ] = "Giri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Entrada"; + Text[ thai ] = "ป้อนเข้า"; }; MultiLineEdit ED_EDIT { @@ -147,20 +148,21 @@ ModalDialog DLG_FLD_INPUT Text [ danish ] = "Rediger" ; Text [ french ] = "diter" ; Text [ swedish ] = "Redigera" ; - Text [ dutch ] = "Be~werken" ; + Text [ dutch ] = "Bewerken" ; Text [ spanish ] = "Editar" ; Text [ english_us ] = "Edit" ; - Text[ chinese_simplified ] = "༭"; + Text[ chinese_simplified ] = "编辑"; Text[ russian ] = ""; Text[ polish ] = "Edytuj"; - Text[ japanese ] = "ҏW"; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "編集"; + Text[ chinese_traditional ] = "編輯"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "편집"; Text[ turkish ] = "Dzenle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Editar"; + Text[ catalan ] = "Edita"; + Text[ thai ] = "แก้ไข"; }; OKButton BT_OK { @@ -186,24 +188,25 @@ ModalDialog DLG_FLD_INPUT Text [ dutch ] = "~Volgende" ; Text [ english_us ] = "~Next" ; Text [ italian ] = "~Avanti" ; - Text [ spanish ] = "~Avanzar" ; - Text [ french ] = "~Suivant" ; + Text [ spanish ] = "Continuar" ; + Text [ french ] = "Suivant" ; Text [ swedish ] = "~Nsta" ; Text [ danish ] = "Nste" ; Text [ portuguese ] = "~Seguinte" ; Text [ portuguese_brazilian ] = "~Weiter" ; - Text[ chinese_simplified ] = "(~N)"; + Text[ chinese_simplified ] = "继续(~N)"; Text[ russian ] = ""; Text[ polish ] = "~Dalej"; - Text[ japanese ] = "(~N)"; - Text[ chinese_traditional ] = "~(~N)"; + Text[ japanese ] = "次へ(~N)"; + Text[ chinese_traditional ] = "繼續(~N)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~N)"; + Text[ korean ] = "다음(~N)"; Text[ turkish ] = "~leri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Siguiente"; + Text[ catalan ] = "~Segent"; Text[ finnish ] = "~Seuraava"; + Text[ thai ] = "~ถัดไป"; }; HelpButton PB_HELP { @@ -219,20 +222,35 @@ ModalDialog DLG_FLD_INPUT Text [ french ] = "Champ de saisie" ; Text [ dutch ] = "Invoerveld" ; Text [ portuguese ] = "Campo de entrada" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "输入字段"; Text[ russian ] = " "; Text[ polish ] = "Pole wprowadzania"; - Text[ japanese ] = "̨"; - Text[ chinese_traditional ] = "J"; + Text[ japanese ] = "入力フィールド"; + Text[ chinese_traditional ] = "輸入欄位"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "Էʵ"; + Text[ korean ] = "입력 필드"; Text[ turkish ] = "Giri alan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de entrada"; + Text[ catalan ] = "Camp d'entrada"; Text[ finnish ] = "Syttkentt"; + Text[ thai ] = "ใส่เขตข้อมูล"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src index 18327c48433a..2e20683fda4e 100644 --- a/sw/source/ui/fldui/javaedit.src +++ b/sw/source/ui/fldui/javaedit.src @@ -2,9 +2,9 @@ * * $RCSfile: javaedit.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2001-12-18 11:05:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,8 +98,9 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "스크립트 유형"; Text[ turkish ] = "Script tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo de script"; + Text[ catalan ] = "Tipus d'script"; Text[ finnish ] = "Komentosarjatyyppi"; + Text[ thai ] = "ชนิดสคริปต์"; }; Edit ED_TYPE { @@ -124,7 +125,7 @@ ModalDialog DLG_JAVAEDIT Text [ danish ] = "URL" ; Text [ italian ] = "URL" ; Text [ spanish ] = "URL" ; - Text [ french ] = "~URL" ; + Text [ french ] = "URL" ; Text [ dutch ] = "~URL" ; Text[ chinese_simplified ] = "URL"; Text[ russian ] = "URL"; @@ -138,6 +139,7 @@ ModalDialog DLG_JAVAEDIT Text[ language_user1 ] = " "; Text[ catalan ] = "URL"; Text[ finnish ] = "URL-osoite"; + Text[ thai ] = "URL"; }; Edit ED_URL { @@ -165,7 +167,7 @@ ModalDialog DLG_JAVAEDIT Text [ portuguese ] = "~Texto" ; Text [ finnish ] = "~Teksti" ; Text [ danish ] = "Tekst" ; - Text [ french ] = "~Texte" ; + Text [ french ] = "Texte" ; Text [ swedish ] = "~Text" ; Text [ dutch ] = "~Tekst" ; Text [ spanish ] = "~Texto" ; @@ -182,7 +184,8 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "텍스트(~T)"; Text[ turkish ] = "~Metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Texto"; + Text[ catalan ] = "~Text"; + Text[ thai ] = "~ข้อความ"; }; MultiLineEdit ED_EDIT { @@ -222,7 +225,8 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "내용"; Text[ turkish ] = "erik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido"; + Text[ catalan ] = "Contingut"; + Text[ thai ] = "เนื้อหา"; }; OKButton BTN_POST_OK { @@ -276,8 +280,9 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "스크립트 편집"; Text[ turkish ] = "Script bearbeiten"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Editar script"; + Text[ catalan ] = "Edita script"; Text[ finnish ] = "Muokkaa komentosarjaa"; + Text[ thai ] = "แก้ไขสคริปต์"; }; String STR_JAVA_INSERT { @@ -303,8 +308,9 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "스크립트 삽입"; Text[ turkish ] = "Script einfgen"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar script"; + Text[ catalan ] = "Insereix script"; Text[ finnish ] = "Lis komentosarja"; + Text[ thai ] = "แทรกสคริปต์"; }; Text [ english_us ] = "Edit Script" ; Text [ portuguese_brazilian ] = "Script bearbeiten" ; @@ -325,7 +331,24 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "스크립트 편집"; Text[ turkish ] = "Script'i dzenle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Editar script"; + Text[ catalan ] = "Edita script"; Text[ finnish ] = "Muokkaa komentosarjaa"; + Text[ thai ] = "แก้ไขสคริปต์"; }; // ********************************************************************** EOF + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/fmtui/fmtui.src b/sw/source/ui/fmtui/fmtui.src index 88c1b6c47265..a10521793a12 100644 --- a/sw/source/ui/fmtui/fmtui.src +++ b/sw/source/ui/fmtui/fmtui.src @@ -2,9 +2,9 @@ * * $RCSfile: fmtui.src,v $ * - * $Revision: 1.1.1.6 $ + * $Revision: 1.2 $ * - * last change: $Author: kz $ $Date: 2001-07-26 22:36:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,26 +69,27 @@ String STR_FMT_STD TEXT [ italian ] = "(senza)" ; TEXT [ portuguese_brazilian ] = "(nenhum)" ; TEXT [ portuguese ] = "(nenhum)" ; - TEXT [ finnish ] = "(Ei mitn)" ; + TEXT [ finnish ] = "(ei mitn)" ; TEXT [ danish ] = "(ingen)" ; TEXT [ french ] = "(aucun(e))" ; TEXT [ swedish ] = "(ingen)" ; TEXT [ dutch ] = "(geen)" ; TEXT [ spanish ] = "(ninguna)" ; TEXT [ english_us ] = "(none)" ; - TEXT[ chinese_simplified ] = "()"; - TEXT[ russian ] = "()"; + TEXT[ chinese_simplified ] = "(无)"; + TEXT[ russian ] = "()"; TEXT[ polish ] = "(brak)"; - TEXT[ japanese ] = "(Ȃ)"; - TEXT[ chinese_traditional ] = "(L)"; + TEXT[ japanese ] = "(なし)"; + TEXT[ chinese_traditional ] = "(無)"; TEXT[ arabic ] = "()"; TEXT[ dutch ] = "(geen)"; - TEXT[ chinese_simplified ] = "()"; + TEXT[ chinese_simplified ] = "(无)"; TEXT[ greek ] = "()"; - TEXT[ korean ] = "()"; + TEXT[ korean ] = "(없음)"; TEXT[ turkish ] = "(yok)"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(ninguna)"; + TEXT[ catalan ] = "(cap)"; + TEXT[ thai ] = "(ไม่มี)"; }; String STR_TEMPLATE_WILDCARD { @@ -119,27 +120,40 @@ String STR_OVERWRITE TEXT [ italian ] = "\nSovrascrivere il modello?" ; TEXT [ portuguese_brazilian ] = "Deseja realmente gravar sobre o modelo?" ; TEXT [ portuguese ] = "Deseja realmente eliminar este modelo?" ; - TEXT [ finnish ] = "\nHaluatko varmasti poistaa tmn mallipohjan?" ; + TEXT [ finnish ] = "\nHaluatko varmasti poistaa tmn mallin?" ; TEXT [ danish ] = "Er du sikker p, at du vil overskrive denne skabelon?" ; TEXT [ french ] = "Voulez-vous vraiment craser le modle ?" ; - TEXT [ swedish ] = "Vill Du verkligen skriva ver den hr mallen?" ; + TEXT [ swedish ] = "Vill du verkligen skriva ver den hr mallen?" ; TEXT [ dutch ] = "\nWilt u deze sjabloon werkelijk overschrijven?" ; TEXT [ spanish ] = "Desea realmente sobrescribir la plantilla?" ; TEXT [ english_us ] = "\nAre you sure you want to delete this template?" ; - TEXT[ chinese_simplified ] = "Ҫдʽ"; + TEXT[ chinese_simplified ] = "真的要改写这个样式吗？"; TEXT[ russian ] = " ?"; TEXT[ polish ] = "Chcesz na pewno skasowa ten szablon przez zapisanie?"; - TEXT[ japanese ] = "ڰĂ{ɍ폜܂H"; - TEXT[ chinese_traditional ] = "zunмgoӼ˦H"; + TEXT[ japanese ] = "テンプレートを本当に削除しますか。"; + TEXT[ chinese_traditional ] = "您真要覆寫這個樣式？"; TEXT[ arabic ] = " ȿ"; TEXT[ dutch ] = "\nWilt u deze sjabloon werkelijk overschrijven?"; - TEXT[ chinese_simplified ] = "Ҫдʽ"; + TEXT[ chinese_simplified ] = "真的要改写这个样式吗？"; TEXT[ greek ] = " ;"; - TEXT[ korean ] = "\n Ͻðڽϱ?"; + TEXT[ korean ] = "이 서식 파일을 덮어쓰시겠습니까?"; TEXT[ turkish ] = "Bu ablonu silmek istediinizden emin misiniz?"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Desea realmente sobrescribir la plantilla?"; + TEXT[ catalan ] = "\nEsteu segur de voler suprimir aquesta plantilla?"; + TEXT[ thai ] = "\nคุณแน่ใจหรือไม่ที่ต้องการลบแม่แบบนี้?"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/fmtui/tmpdlg.src b/sw/source/ui/fmtui/tmpdlg.src index 5d06c18a4d3b..5f143b02c507 100644 --- a/sw/source/ui/fmtui/tmpdlg.src +++ b/sw/source/ui/fmtui/tmpdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: tmpdlg.src,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: rt $ $Date: 2002-05-06 07:54:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ TabDialog DLG_TEMPLATE_1 Text [ italian ] = "Modello di carattere" ; Text [ portuguese_brazilian ] = "Estilo de caracter" ; Text [ portuguese ] = "Estilos de caracteres" ; - Text [ finnish ] = "Merkistn tyyli" ; + Text [ finnish ] = "Merkkityyli" ; Text [ danish ] = "Tegntypografi" ; Text [ french ] = "Style de caractres" ; Text [ swedish ] = "Teckenformatmall" ; @@ -115,7 +115,8 @@ TabDialog DLG_TEMPLATE_1 Text[ korean ] = "글꼴"; Text[ turkish ] = "Yaztipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "ตัวอักษร"; }; PageItem { @@ -144,7 +145,8 @@ TabDialog DLG_TEMPLATE_1 Text[ korean ] = "글꼴 효과"; Text[ turkish ] = "Yaztipi efekti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Efectos de fuente"; + Text[ catalan ] = "Efectes de lletra"; + Text[ thai ] = "ลักษณะตัวอักษร"; }; PageItem { @@ -154,13 +156,13 @@ TabDialog DLG_TEMPLATE_1 Text [ ENGLISH ] = "Position" ; Text[ english_us ] = "Position"; Text[ portuguese ] = "Posio"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Positie"; Text[ french ] = "Position"; Text[ spanish ] = "Posicin"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Start_ved"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Position"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; @@ -170,8 +172,9 @@ TabDialog DLG_TEMPLATE_1 Text[ chinese_traditional ] = "位置"; Text[ turkish ] = "Konum"; Text[ arabic ] = ""; - Text[ catalan ] = "Posicin"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; PageItem { @@ -187,18 +190,19 @@ TabDialog DLG_TEMPLATE_1 Text[ french ] = "Mise en page asiatique"; Text[ spanish ] = "Diseo asitico"; Text[ italian ] = "Layout asiatico"; - Text[ danish ] = "Asian layout"; + Text[ danish ] = "Asiatisk layout"; Text[ swedish ] = "Asiatisk layout"; Text[ polish ] = "Ukad azjatycki"; Text[ portuguese_brazilian ] = "Asian layout"; Text[ japanese ] = "日本語レイアウト"; - Text[ korean ] = "아시아 레이아웃"; + Text[ korean ] = "한글 글자꼴"; Text[ chinese_simplified ] = "中日韩版式"; Text[ chinese_traditional ] = "中日韓版式"; Text[ turkish ] = "Asian layout"; Text[ arabic ] = " "; - Text[ catalan ] = "Diseo asitico"; + Text[ catalan ] = "Format asitic"; Text[ finnish ] = "Aasialainen asettelu"; + Text[ thai ] = "เค้าโครงแบบเอเชีย"; }; PageItem { @@ -227,21 +231,23 @@ TabDialog DLG_TEMPLATE_1 Text[ korean ] = "배경"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "พื้นหลัง"; }; }; }; Text[ chinese_simplified ] = "字符样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Styl znaku"; Text[ japanese ] = "文字スタイル"; Text[ chinese_traditional ] = "字元樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "문자 템플릿"; + Text[ korean ] = "문자 스타일"; Text[ turkish ] = "Karakter biimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de carcter"; + Text[ catalan ] = "Estil de carcter"; + Text[ thai ] = "ลักษณะตัวอักขระ"; }; TabDialog DLG_TEMPLATE_2 { @@ -280,7 +286,7 @@ TabDialog DLG_TEMPLATE_2 Text [ danish ] = "Indrykning og mellemrum" ; Text [ french ] = "Retraits et carts" ; Text [ swedish ] = "Indrag och avstnd" ; - Text [ dutch ] = "Inspringen en afstanden" ; + Text [ dutch ] = "Inspringing en afstanden" ; Text [ spanish ] = "Sangras y espacios" ; Text [ english_us ] = "Indents & Spacing" ; PageResID = TP_PARA_STD ; @@ -291,10 +297,11 @@ TabDialog DLG_TEMPLATE_2 Text[ chinese_traditional ] = "縮排和間隔"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "들여쓰기와 간격"; + Text[ korean ] = "들여쓰기 및 간격"; Text[ turkish ] = "Girinti ve aralklar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sangras y espacios"; + Text[ catalan ] = "Sagnies i espaiat"; + Text[ thai ] = "ระยะเยื้องและระยะห่าง"; }; PageItem { @@ -321,8 +328,9 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "맞춤"; Text[ turkish ] = "Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineacin"; + Text[ catalan ] = "Alineament"; Text[ finnish ] = "Tasaus"; + Text[ thai ] = "จัดตำแหน่ง"; }; PageItem { @@ -343,7 +351,7 @@ TabDialog DLG_TEMPLATE_2 Text [ english_us ] = "Text Flow" ; PageResID = TP_PARA_EXT ; Text[ chinese_simplified ] = "换行和分页"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Tekst"; Text[ japanese ] = "体裁"; Text[ chinese_traditional ] = "換行和分頁"; @@ -352,7 +360,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "텍스트 흐름"; Text[ turkish ] = "Metin ak"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Flujo del texto"; + Text[ catalan ] = "Flux del text"; + Text[ thai ] = "การไหลของข้อความ"; }; PageItem { @@ -361,13 +370,13 @@ TabDialog DLG_TEMPLATE_2 Text [ ENGLISH ] = "Asian typography" ; Text[ english_us ] = "Asian Typography"; Text[ portuguese ] = "Tipografia asitica"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Aziatische typografie"; Text[ french ] = "Typographie asiatique"; Text[ spanish ] = "Tipografa asitica"; Text[ italian ] = "Tipografia asiatica"; - Text[ danish ] = "Asian typography"; + Text[ danish ] = "Asiatisk typografi"; Text[ swedish ] = "Asiatisk typografi"; Text[ polish ] = "Typografia azjatycka"; Text[ portuguese_brazilian ] = "Asian typography"; @@ -377,8 +386,9 @@ TabDialog DLG_TEMPLATE_2 Text[ chinese_traditional ] = "中日韓文字"; Text[ turkish ] = "Asian typography"; Text[ arabic ] = " "; - Text[ catalan ] = "Tipografa asitica"; + Text[ catalan ] = "Tipografia asitica"; Text[ finnish ] = "Aasialaiset merkit"; + Text[ thai ] = "การพิมพ์แบบเอเชีย"; }; PageItem { @@ -407,7 +417,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "글꼴"; Text[ turkish ] = "Yaztipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "ตัวอักษร"; }; PageItem { @@ -436,7 +447,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "글꼴 효과"; Text[ turkish ] = "Yaz tipi efektleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Efectos de fuente"; + Text[ catalan ] = "Efectes de lletra"; + Text[ thai ] = "ลักษณะตัวอักษร"; }; PageItem { @@ -446,13 +458,13 @@ TabDialog DLG_TEMPLATE_2 Text [ ENGLISH ] = "Position" ; Text[ english_us ] = "Position"; Text[ portuguese ] = "Posio"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Positie"; Text[ french ] = "Position"; Text[ spanish ] = "Posicin"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Start_ved"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Position"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; @@ -462,8 +474,9 @@ TabDialog DLG_TEMPLATE_2 Text[ chinese_traditional ] = "位置"; Text[ turkish ] = " unvan"; Text[ arabic ] = ""; - Text[ catalan ] = "Posicin"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; PageItem { @@ -479,18 +492,19 @@ TabDialog DLG_TEMPLATE_2 Text[ french ] = "Mise en page asiatique"; Text[ spanish ] = "Diseo asitico"; Text[ italian ] = "Layout asiatico"; - Text[ danish ] = "Asian layout"; + Text[ danish ] = "Asiatisk layout"; Text[ swedish ] = "Asiatisk layout"; Text[ polish ] = "Ukad azjatycki"; Text[ portuguese_brazilian ] = "Asian layout"; Text[ japanese ] = "日本語レイアウト"; - Text[ korean ] = "아시아 레이아웃"; + Text[ korean ] = "한글 글자꼴"; Text[ chinese_simplified ] = "中日韩版式"; Text[ chinese_traditional ] = "中日韓版式"; Text[ turkish ] = "Asian layout"; Text[ arabic ] = " "; - Text[ catalan ] = "Diseo asitico"; + Text[ catalan ] = "Format asitic"; Text[ finnish ] = "Aasialainen asettelu"; + Text[ thai ] = "เค้าโครงแบบเอเชีย"; }; PageItem { @@ -516,8 +530,9 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "번호 매기기"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin"; + Text[ catalan ] = "Numeraci"; Text[ finnish ] = "Numerointi"; + Text[ thai ] = "ลำดับตัวเลข"; }; PageItem { @@ -537,7 +552,7 @@ TabDialog DLG_TEMPLATE_2 Text [ english_us ] = "Tabs" ; PageResID = TP_TABULATOR ; Text[ chinese_simplified ] = "制表符"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Tabulatory"; Text[ japanese ] = "タブ"; Text[ chinese_traditional ] = "定位鍵"; @@ -546,7 +561,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "탭"; Text[ turkish ] = "Sekmeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabulaciones"; + Text[ catalan ] = "Pestanyes"; + Text[ thai ] = "ระยะกั้น"; }; PageItem { @@ -575,7 +591,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "단락 첫문자 장식"; Text[ turkish ] = "Baharfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; + Text[ thai ] = "ตัวอักษรขึ้นต้นที่มีขนาดใหญ่"; }; PageItem { @@ -604,7 +621,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "배경"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "พื้นหลัง"; }; PageItem { @@ -620,7 +638,7 @@ TabDialog DLG_TEMPLATE_2 Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; PageResID = TP_BORDER ; Text[ chinese_simplified ] = "边框"; @@ -633,7 +651,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "테두리"; Text[ turkish ] = "Kenarlk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "เส้นขอบ"; }; PageItem { @@ -660,8 +679,9 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "조건"; Text[ turkish ] = "Koul"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Condicin"; + Text[ catalan ] = "Condici"; Text[ finnish ] = "Ehto"; + Text[ thai ] = "เงื่อนไข"; }; }; }; @@ -672,10 +692,11 @@ TabDialog DLG_TEMPLATE_2 Text[ chinese_traditional ] = "段落樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "단락 템플릿"; + Text[ korean ] = "단락 스타일"; Text[ turkish ] = "Paragraf biimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de prrafo"; + Text[ catalan ] = "Estil de pargraf"; + Text[ thai ] = "ลักษณะย่อหน้า"; }; TabDialog DLG_TEMPLATE_4 { @@ -745,7 +766,8 @@ TabDialog DLG_TEMPLATE_4 Text[ korean ] = "배경"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "พื้นหลัง"; }; /* PageItem { @@ -857,8 +879,9 @@ TabDialog DLG_TEMPLATE_4 Text[ korean ] = "페이지 스타일"; Text[ turkish ] = "Sayfa biimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de pgina"; + Text[ catalan ] = "Estil de pgina"; Text[ finnish ] = "Sivun tyyli"; + Text[ thai ] = "ลักษณะหน้า"; }; String STR_PAGE_STD { @@ -868,7 +891,7 @@ String STR_PAGE_STD Text [ italian ] = "Pagina" ; Text [ portuguese_brazilian ] = "P?gina" ; Text [ portuguese ] = "Pgina" ; - Text [ finnish ] = "Sivu " ; + Text [ finnish ] = "Sivu" ; Text [ danish ] = "Side" ; Text [ french ] = "Page" ; Text [ swedish ] = "Sida" ; @@ -885,7 +908,8 @@ String STR_PAGE_STD Text[ korean ] = "페이지"; Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pgina"; + Text[ catalan ] = "Pgina"; + Text[ thai ] = "หน้า"; }; String STR_PAGE_BORDER { @@ -900,7 +924,7 @@ String STR_PAGE_BORDER Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; Text[ chinese_simplified ] = "边框"; Text[ russian ] = ""; @@ -912,7 +936,8 @@ String STR_PAGE_BORDER Text[ korean ] = "테두리"; Text[ turkish ] = "Kenarlk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "เส้นขอบ"; }; String STR_PAGE_HEADER { @@ -922,7 +947,7 @@ String STR_PAGE_HEADER Text [ italian ] = "Riga d'intestazione" ; Text [ portuguese_brazilian ] = "Cabe?alho" ; Text [ portuguese ] = "Cabealho" ; - Text [ finnish ] = "Ylotsikko" ; + Text [ finnish ] = "Yltunniste" ; Text [ danish ] = "Sidehoved" ; Text [ french ] = "En-tte" ; Text [ swedish ] = "Sidhuvud" ; @@ -939,7 +964,8 @@ String STR_PAGE_HEADER Text[ korean ] = "머리글"; Text[ turkish ] = "stbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento"; + Text[ catalan ] = "Capalera"; + Text[ thai ] = "ส่วนหัว"; }; String STR_PAGE_FOOTER { @@ -950,7 +976,7 @@ String STR_PAGE_FOOTER Text [ italian ] = "Pi di pagina" ; Text [ portuguese_brazilian ] = "Rodap?" ; Text [ portuguese ] = "Rodap" ; - Text [ finnish ] = "Alaselite" ; + Text [ finnish ] = "Alatunniste" ; Text [ danish ] = "Sidefod" ; Text [ french ] = "Pied de page" ; Text [ swedish ] = "Sidfot" ; @@ -967,7 +993,8 @@ String STR_PAGE_FOOTER Text[ korean ] = "바닥글"; Text[ turkish ] = "Altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de pgina"; + Text[ catalan ] = "Peu de pgina"; + Text[ thai ] = "ส่วนท้าย"; }; String STR_PAGE_TEXTGRID { @@ -986,13 +1013,14 @@ String STR_PAGE_TEXTGRID Text[ swedish ] = "Textraster"; Text[ polish ] = "Text Grid"; Text[ portuguese_brazilian ] = "Text Grid"; - Text[ japanese ] = "文字グリッド線"; - Text[ korean ] = "문자 수/열 수"; + Text[ japanese ] = "行数と文字数"; + Text[ korean ] = "텍스트 그리드"; Text[ chinese_simplified ] = "文字格子线"; Text[ chinese_traditional ] = "文字格子線"; Text[ turkish ] = "Text Grid"; Text[ arabic ] = "Text Grid"; Text[ catalan ] = "Text Grid"; + Text[ thai ] = "Text Grid"; }; String STR_PAGE_COLUMN { @@ -1002,7 +1030,7 @@ String STR_PAGE_COLUMN Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -1010,7 +1038,7 @@ String STR_PAGE_COLUMN Text [ spanish ] = "Columnas" ; Text [ english_us ] = "Columns" ; Text[ chinese_simplified ] = "栏"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Kolumny"; Text[ japanese ] = "段組み"; Text[ chinese_traditional ] = "欄"; @@ -1019,7 +1047,8 @@ String STR_PAGE_COLUMN Text[ korean ] = "단"; Text[ turkish ] = "Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = "Columnes"; + Text[ thai ] = "คอลัมน์"; }; String STR_PAGE_FOOTNOTE { @@ -1047,7 +1076,8 @@ String STR_PAGE_FOOTNOTE Text[ korean ] = "각주"; Text[ turkish ] = "Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al pie"; + Text[ catalan ] = "Nota al peu"; + Text[ thai ] = "เชิงอรรถ"; }; TabDialog DLG_TEMPLATE_3 { @@ -1099,7 +1129,8 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "유형"; Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo"; + Text[ catalan ] = "Tipus"; + Text[ thai ] = "ชนิด"; }; PageItem { @@ -1127,8 +1158,9 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "옵션"; Text[ turkish ] = "Seenekler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones"; + Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "ตัวเลือก"; }; PageItem { @@ -1154,10 +1186,11 @@ TabDialog DLG_TEMPLATE_3 Text[ chinese_traditional ] = "換行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "순환"; + Text[ korean ] = "문장 배치"; Text[ turkish ] = "Metin dalm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste"; + Text[ catalan ] = "Ajusta"; + Text[ thai ] = "ตัด"; }; PageItem { @@ -1186,7 +1219,8 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "배경"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "พื้นหลัง"; }; PageItem { @@ -1202,7 +1236,7 @@ TabDialog DLG_TEMPLATE_3 Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; PageResID = TP_BORDER ; Text[ chinese_simplified ] = "边框"; @@ -1215,7 +1249,8 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "테두리"; Text[ turkish ] = "Kenarlk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "เส้นขอบ"; }; PageItem { @@ -1226,7 +1261,7 @@ TabDialog DLG_TEMPLATE_3 Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -1235,7 +1270,7 @@ TabDialog DLG_TEMPLATE_3 Text [ english_us ] = "Columns" ; PageResID = TP_COLUMN ; Text[ chinese_simplified ] = "栏"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Kolumny"; Text[ japanese ] = "段組み"; Text[ chinese_traditional ] = "欄"; @@ -1244,7 +1279,8 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "단"; Text[ turkish ] = "Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = "Columnes"; + Text[ thai ] = "คอลัมน์"; }; PageItem { @@ -1272,11 +1308,12 @@ TabDialog DLG_TEMPLATE_3 Text[ language_user1 ] = " "; Text[ catalan ] = "Macro"; Text[ finnish ] = "Makro"; + Text[ thai ] = "มาโคร"; }; }; }; Text [ italian ] = "Modello di cornice" ; - Text [ spanish ] = "Estilo de marcos" ; + Text [ spanish ] = "Estilo de marco" ; Text [ french ] = "Style de cadre" ; Text [ dutch ] = "Kaderopmaakprofiel" ; Text [ swedish ] = "Ramformatmall" ; @@ -1290,11 +1327,12 @@ TabDialog DLG_TEMPLATE_3 Text[ chinese_traditional ] = "框樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "프레임 템플릿"; + Text[ korean ] = "프레임 스타일"; Text[ turkish ] = "ereve biimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de marcos"; + Text[ catalan ] = "Estil del marc"; Text[ finnish ] = "Kehyksen tyyli"; + Text[ thai ] = "ลักษณะกรอบ"; }; TabDialog DLG_TEMPLATE_5 { @@ -1331,8 +1369,9 @@ TabDialog DLG_TEMPLATE_5 Text[ korean ] = "글머리 기호"; Text[ turkish ] = "Madde iareti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Vietas"; + Text[ catalan ] = "Pics"; Text[ finnish ] = "Luettelomerkit"; + Text[ thai ] = "สัญลักษณ์แสดงหัวข้อย่อย"; }; PageItem { @@ -1346,7 +1385,7 @@ TabDialog DLG_TEMPLATE_5 Text [ italian ] = "Tipo numerazione" ; Text [ spanish ] = "Tipo de numeracin" ; Text [ french ] = "Type de numrotation" ; - Text [ dutch ] = "Nummeringstijl" ; + Text [ dutch ] = "Nummeringsstijl" ; Text [ portuguese ] = "Tipo de numerao" ; Text[ chinese_simplified ] = "编号类型"; Text[ russian ] = " "; @@ -1354,12 +1393,13 @@ TabDialog DLG_TEMPLATE_5 Text[ japanese ] = "番号付けの種類"; Text[ chinese_traditional ] = "編號類型"; Text[ arabic ] = " "; - Text[ language_user1 ] = "MS Word, KeyID23136"; + Text[ language_user1 ] = "MS W; MS Word, KeyID23136"; Text[ greek ] = " "; - Text[ korean ] = "번호 매기기 유형"; + Text[ korean ] = "번호 매기기 스타일"; Text[ turkish ] = "Numaralama tr"; - Text[ catalan ] = "Tipo de numeracin"; + Text[ catalan ] = "Estil de numeraci"; Text[ finnish ] = "Numerointityyli"; + Text[ thai ] = "ลักษณะลำดับตัวเลข"; }; PageItem { @@ -1382,11 +1422,12 @@ TabDialog DLG_TEMPLATE_5 Text[ chinese_traditional ] = "大綱"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "아웃트라인"; + Text[ korean ] = "개요"; Text[ turkish ] = "Anahat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Esquema"; + Text[ catalan ] = "Contorn"; Text[ finnish ] = "Jsennys"; + Text[ thai ] = "เค้าร่าง"; }; PageItem { @@ -1403,17 +1444,18 @@ TabDialog DLG_TEMPLATE_5 Text [ dutch ] = "Afbeeldingen" ; Text [ portuguese ] = "Imagens" ; Text[ chinese_simplified ] = "图形"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Grafiki"; Text[ japanese ] = "図"; Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Imgenes"; - Text[ finnish ] = "Kuvat"; + Text[ catalan ] = "Grfics"; + Text[ finnish ] = "Grafiikka"; + Text[ thai ] = "กราฟิค"; }; PageItem { @@ -1430,7 +1472,7 @@ TabDialog DLG_TEMPLATE_5 Text [ dutch ] = "Positie" ; Text [ portuguese ] = "Posio" ; Text[ chinese_simplified ] = "位置"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Pozycja"; Text[ japanese ] = "位置"; Text[ chinese_traditional ] = "位置"; @@ -1439,8 +1481,9 @@ TabDialog DLG_TEMPLATE_5 Text[ korean ] = "위치"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Posicin"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; PageItem { @@ -1460,14 +1503,15 @@ TabDialog DLG_TEMPLATE_5 Text[ russian ] = ""; Text[ polish ] = "Opcje"; Text[ japanese ] = "オプション"; - Text[ language_user1 ] = "KW:Tilde entfernen falls noch vorhanden"; + Text[ language_user1 ] = "KW:T; KW:Tilde entfernen falls noch vorhanden"; Text[ chinese_traditional ] = "選項"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "사용자 환경 설정"; + Text[ korean ] = "옵션"; Text[ turkish ] = "Seenekler"; - Text[ catalan ] = "~Opciones"; + Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "ตัวเลือก"; }; }; }; @@ -1487,11 +1531,12 @@ TabDialog DLG_TEMPLATE_5 Text[ chinese_traditional ] = "編號樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "번호 매기기 템플릿"; + Text[ korean ] = "번호 매기기 스타일"; Text[ turkish ] = "Numaralama biimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de numeracin"; + Text[ catalan ] = "Estil de numeraci"; Text[ finnish ] = "Numerointityyli"; + Text[ thai ] = "ลักษณะลำดับตัวเลข"; }; @@ -1507,3 +1552,8 @@ TabDialog DLG_TEMPLATE_5 + + + + + diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 0c85570b0d7a..8bd1b2a88716 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -2,9 +2,9 @@ * * $RCSfile: column.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: fme $ $Date: 2002-12-10 09:44:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -187,6 +187,9 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) : USHORT nFullSectCnt = rWrtShell.GetFullSelectedSectionCount(); if( pCurrSection && ( !rWrtShell.HasSelection() || 0 != nFullSectCnt )) { + nSelectionWidth = rSh.GetSectionWidth(*pCurrSection->GetFmt()); + if ( !nSelectionWidth ) + nSelectionWidth = USHRT_MAX; pSectionSet = new SfxItemSet( rWrtShell.GetAttrPool(), aSectIds ); pSectionSet->Put( pCurrSection->GetFmt()->GetAttrSet() ); pColPgSet = pSectionSet; @@ -796,8 +799,7 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, pField ) //Maximalwerte setzen aCLNrEdt.SetMax(Max(1L, - Min(long(nMaxCols), long( pColMgr->GetActualSize() / - ((nGutterWidth + MINLAY)) )))); + Min(long(nMaxCols), long( pColMgr->GetActualSize() / (nGutterWidth + MINLAY)) ))); aCLNrEdt.SetLast(aCLNrEdt.GetMax()); aCLNrEdt.Reformat(); @@ -877,8 +879,7 @@ void SwColumnPage::Init() // Maximale Spaltenzahl setzen // Werte kleiner als 1 sind nicht erlaubt aCLNrEdt.SetMax(Max(1L, - Min(long(nMaxCols), long(pColMgr->GetActualSize() / nMinWidth)))); - + Min(long(nMaxCols), long( pColMgr->GetActualSize() / nMinWidth) ))); } /*------------------------------------------------------------------------ diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src index f162b04204de..df3afe773b17 100644 --- a/sw/source/ui/frmdlg/column.src +++ b/sw/source/ui/frmdlg/column.src @@ -2,9 +2,9 @@ * * $RCSfile: column.src,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: os $ $Date: 2002-09-10 14:20:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,7 @@ TabPage TP_COLUMN Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -93,12 +93,12 @@ TabPage TP_COLUMN Text[ language_user1 ] = " "; Text[ english_us ] = "Columns"; Text[ portuguese ] = "~Colunas"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = "~"; Text[ dutch ] = "~Kolommen"; Text[ french ] = "Colonnes"; Text[ spanish ] = "~Columnas"; - Text[ finnish ] = "Sarakkeet"; + Text[ finnish ] = "Palstat"; Text[ italian ] = "~Colonne"; Text[ danish ] = "~Kolonner"; Text[ swedish ] = "~Kolumner"; @@ -142,20 +142,20 @@ TabPage TP_COLUMN Text = "~Inhalt ber alle Spalten gleichmig verteilen" ; Text [ ENGLISH ] = "Balance columns" ; Hide = TRUE; - Text[ english_us ] = "Evenly distribute contents to all columns"; + Text[ english_us ] = "Evenly distribute contents ~to all columns"; Text[ portuguese ] = "~Distribuir contedo em todas as colunas por igual"; - Text[ russian ] = " "; + Text[ russian ] = " ~ "; Text[ greek ] = " "; Text[ dutch ] = "Inhoud gelijkmatig verdelen over ~kolommen"; - Text[ french ] = "Rpartition rgulire du contenu sur toutes les ~colonnes"; - Text[ spanish ] = "Distribucin uniforme del contenido sobre todas las columnas"; + Text[ french ] = "Rpartition rgulire du contenu sur toutes les colonnes"; + Text[ spanish ] = "D~istribucin uniforme del contenido sobre todas las columnas"; Text[ italian ] = "Distribuisci in modo uniforme il contenuto di tutte le colonne."; Text[ danish ] = "Fordel indholdet jvnt over alle k~olonner"; Text[ swedish ] = "Frdela innehll jmnt ver ~alla kolumner"; Text[ polish ] = "Roz zawarto rwnomiernie we wszystkich kolumnach"; Text[ portuguese_brazilian ] = "Balance columns"; Text[ japanese ] = "内容を各段に均等配分する"; - Text[ korean ] = "내용을 모든 열에 걸쳐 일정하게 분배"; + Text[ korean ] = "내용을 각 단에 균등하게 배치"; Text[ chinese_simplified ] = "对称调整栏宽"; Text[ chinese_traditional ] = "對稱調整欄寬"; Text[ arabic ] = " "; @@ -173,7 +173,7 @@ TabPage TP_COLUMN Text[ language_user1 ] = " "; Text[ english_us ] = "Settings"; Text[ portuguese ] = "Predefinies"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Instellingen"; Text[ french ] = "Dfinitions"; @@ -185,7 +185,7 @@ TabPage TP_COLUMN Text[ polish ] = "Ustawienia domylne"; Text[ portuguese_brazilian ] = "Colunas"; Text[ japanese ] = "プリセット"; - Text[ korean ] = "기본 값"; + Text[ korean ] = "설정"; Text[ chinese_simplified ] = "预置"; Text[ chinese_traditional ] = "預設"; Text[ turkish ] = "Stun"; @@ -202,19 +202,19 @@ TabPage TP_COLUMN Left = TRUE ; Text[ english_us ] = "Column"; Text[ portuguese ] = "Coluna"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Kolom"; Text[ french ] = "Colonne"; Text[ spanish ] = "Columna"; - Text[ finnish ] = "Sarake"; + Text[ finnish ] = "Palsta"; Text[ italian ] = "Colonna"; Text[ danish ] = "Kolonne"; Text[ swedish ] = "Kolumn"; Text[ polish ] = "Kolumna"; Text[ portuguese_brazilian ] = "Column"; Text[ japanese ] = "段番号"; - Text[ korean ] = "단"; + Text[ korean ] = "단 번호"; Text[ chinese_simplified ] = "列"; Text[ chinese_traditional ] = "欄"; Text[ turkish ] = "Column"; @@ -379,7 +379,7 @@ TabPage TP_COLUMN Text[ language_user1 ] = " "; Text[ turkish ] = "Aralk"; Text[ catalan ] = "Espaiat"; - Text[ finnish ] = "Objektivlit"; + Text[ finnish ] = "Vlit"; Text[ thai ] = "ระยะห่าง"; }; MetricField ED_DIST1 @@ -428,7 +428,7 @@ TabPage TP_COLUMN Text [ italian ] = "~Larghezza autom." ; Text [ portuguese_brazilian ] = "Autom?tica ~largura" ; Text [ portuguese ] = "~Largura automtica" ; - Text [ finnish ] = "~Automaattinen leveys" ; + Text [ finnish ] = "Automaattinen ~leveys" ; Text [ danish ] = "Automatisk bredde" ; Text [ french ] = "~Largeur automatique" ; Text [ swedish ] = "A~utomatisk bredd" ; @@ -437,7 +437,7 @@ TabPage TP_COLUMN Text [ english_us ] = "Auto~Width" ; TabStop = TRUE ; Text[ chinese_simplified ] = "自动调整宽度(~W)"; - Text[ russian ] = ". "; + Text[ russian ] = ""; Text[ polish ] = "Automatyczna szeroko"; Text[ japanese ] = "幅自動調整(~W)"; Text[ chinese_traditional ] = "自動調整寬度(~W)"; @@ -445,7 +445,7 @@ TabPage TP_COLUMN Text[ dutch ] = "A~utomatische breedte"; Text[ chinese_simplified ] = "自动调整宽度(~W)"; Text[ greek ] = " "; - Text[ korean ] = "자동 너비(~W)"; + Text[ korean ] = "자동으로 너비 조정(~W)"; Text[ language_user1 ] = " "; Text[ turkish ] = "O~tomatik genilik"; Text[ catalan ] = "Llargada ~automtica"; @@ -460,7 +460,7 @@ TabPage TP_COLUMN Text[ language_user1 ] = " "; Text[ english_us ] = "Width and spacing"; Text[ portuguese ] = "Largura e espaamento"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Breedte en afstand"; Text[ french ] = "Largeur et cart"; @@ -472,7 +472,7 @@ TabPage TP_COLUMN Text[ polish ] = "Szeroko i odstp"; Text[ portuguese_brazilian ] = "Largura da coluna"; Text[ japanese ] = "幅と間隔"; - Text[ korean ] = "너비와 간격"; + Text[ korean ] = "너비 및 간격"; Text[ chinese_simplified ] = "栏宽和间隔"; Text[ chinese_traditional ] = "欄寬及間隔"; Text[ turkish ] = "Stun genilii"; @@ -492,7 +492,7 @@ TabPage TP_COLUMN Text [ portuguese_brazilian ] = "~Estilo" ; Text [ portuguese ] = "~Estilo" ; Text [ finnish ] = "~Viiva" ; - Text [ danish ] = "Type" ; + Text [ danish ] = "T~ype" ; Text [ french ] = "Type" ; Text [ swedish ] = "~Typ" ; Text [ dutch ] = "~Type" ; @@ -500,7 +500,7 @@ TabPage TP_COLUMN Text [ english_us ] = "~Line" ; Left = TRUE ; Text[ chinese_simplified ] = "类型(~L)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Typ"; Text[ japanese ] = "種類(~L)"; Text[ chinese_traditional ] = "類型(~L)"; @@ -546,7 +546,7 @@ TabPage TP_COLUMN }; StringList [ finnish ] = { - < "Ei mit??n" ; Default ; > ; + < "Ei mitn" ; Default ; > ; }; StringList [ danish ] = { @@ -578,7 +578,7 @@ TabPage TP_COLUMN }; StringList [ russian ] = { - < "" ; Default ; > ; + < "" ; Default ; > ; }; StringList [ polish ] = { @@ -639,11 +639,11 @@ TabPage TP_COLUMN Text [ italian ] = "Altezza" ; Text [ portuguese_brazilian ] = "Altu~ra" ; Text [ portuguese ] = "Altu~ra" ; - Text [ finnish ] = "K~orkeus" ; - Text [ danish ] = "Hjde" ; + Text [ finnish ] = "Korkeus" ; + Text [ danish ] = "H~jde" ; Text [ french ] = "Hauteur" ; Text [ swedish ] = "H~jd" ; - Text [ dutch ] = "~Hoogte" ; + Text [ dutch ] = "Hoo~gte" ; Text [ spanish ] = "A~ltura" ; Text [ english_us ] = "H~eight" ; Left = TRUE ; @@ -653,7 +653,7 @@ TabPage TP_COLUMN Text[ japanese ] = "高さ(~E)"; Text[ chinese_traditional ] = "高度(~E)"; Text[ arabic ] = ""; - Text[ dutch ] = "~Hoogte"; + Text[ dutch ] = "Hoo~gte"; Text[ chinese_simplified ] = "高度(~E)"; Text[ greek ] = ""; Text[ korean ] = "높이(~E)"; @@ -696,7 +696,7 @@ TabPage TP_COLUMN Text [ french ] = "Position" ; Text [ dutch ] = "~Positie" ; Text[ chinese_simplified ] = "位置(~P)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Pozycja"; Text[ japanese ] = "位置(~P)"; Text[ chinese_traditional ] = "位置(~P)"; @@ -755,9 +755,9 @@ TabPage TP_COLUMN }; StringList [ finnish ] = { - < "Yl?osa" ; Default ; > ; + < "Ylreuna" ; Default ; > ; < "Keskitetty" ; Default ; > ; - < "Alaosa" ; Default ; > ; + < "Alareuna" ; Default ; > ; }; StringList [ danish ] = { @@ -946,6 +946,7 @@ TabPage TP_COLUMN Text[ arabic ] = "Properties"; Text[ catalan ] = "Opcions"; Text[ thai ] = "คุณสมบัติ"; + Text[ portuguese_brazilian ] = "Propriedades"; }; FixedText FT_TEXTDIRECTION { @@ -959,8 +960,8 @@ TabPage TP_COLUMN Text[ russian ] = "Text ~direction"; Text[ greek ] = "Text ~direction"; Text[ dutch ] = "Text ~direction"; - Text[ french ] = "Enchanements"; - Text[ spanish ] = "~Direccin del texto"; + Text[ french ] = "Orientation du texte"; + Text[ spanish ] = "~Direccin de escritura"; Text[ finnish ] = "Text ~direction"; Text[ italian ] = "Testo"; Text[ danish ] = "Text ~direction"; @@ -1006,15 +1007,15 @@ TabPage TP_COLUMN }; StringList [ language_user1 ] = { - < "Links nach rechts" ; 0; > ; - < "Rechts nach links" ; 1; > ; - < "Einstellungen des bergeordneten Objektes verwenden" ; 4; > ; + < "Link; Links nach rechts" ; 0; > ; + < "Rech; Rechts nach links" ; 1; > ; + < "Eins; Einstellungen des bergeordneten Objektes verwenden" ; 4; > ; }; StringList [ korean ] = { < "왼쪽에서 오른쪽으로" ; 0; > ; < "오른쪽에서 왼쪽으로" ; 1; > ; - < "상위 개체의 설정 적용" ; 4; > ; + < "상위 개체의 설정을 텍스트의 문자 방향에 적용" ; 4; > ; }; StringList [ chinese_traditional ] = { @@ -1046,9 +1047,15 @@ TabPage TP_COLUMN < "从右向左" ; 1; > ; < "沿用现有的文字方向的设定" ; 4; > ; }; + StringList [ spanish ] = + { + < "De izquierda a derecha" ; 0; > ; + < "De derecha a izquierda" ; 1; > ; + < "Utilizar la configuracin del objeto superior. " ; 4; > ; + }; }; Text[ chinese_simplified ] = "栏"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Kolumny"; Text[ japanese ] = "段組み"; Text[ chinese_traditional ] = "欄"; @@ -1110,7 +1117,7 @@ ModalDialog DLG_COLUMN Text[ polish ] = "Zastosuj w"; Text[ portuguese_brazilian ] = "~Apply to:"; Text[ japanese ] = "設定対象(~A):"; - Text[ korean ] = "적용(~A)"; + Text[ korean ] = "적용 대상(~A)"; Text[ chinese_simplified ] = "采用到(~A)"; Text[ chinese_traditional ] = "套用到(~A)"; Text[ arabic ] = " :"; @@ -1144,11 +1151,11 @@ ModalDialog DLG_COLUMN }; StringList [ language_user1 ] = { - < "Selektion" ; LISTBOX_SELECTION; > ; + < "Sele; Selektion" ; LISTBOX_SELECTION; > ; < " " ; LISTBOX_SECTION ; > ; - < "Selektierte Bereiche" ; LISTBOX_SECTIONS ; > ; - < "Rahmen" ; LISTBOX_FRAME ; > ; - < "Seitenvorlage:" ; LISTBOX_PAGE ; > ; + < "Sele; Selektierte Bereiche" ; LISTBOX_SECTIONS ; > ; + < "Rahm; Rahmen" ; LISTBOX_FRAME ; > ; + < "Seit; Seitenvorlage:" ; LISTBOX_PAGE ; > ; }; StringList [ english_us ] = { @@ -1177,10 +1184,10 @@ ModalDialog DLG_COLUMN StringList [ dutch ] = { < "Selectie" ; LISTBOX_SELECTION; > ; - < "Actueel bereik" ; LISTBOX_SECTION ; > ; + < "Huidig bereik" ; LISTBOX_SECTION ; > ; < "Geselecteerd bereik" ; LISTBOX_SECTIONS ; > ; < "Kader" ; LISTBOX_FRAME ; > ; - < "Pagina-opmaakprofiel: " ; LISTBOX_PAGE ; > ; + < "Pagina-opmaakprofiel:" ; LISTBOX_PAGE ; > ; }; StringList [ french ] = { @@ -1193,8 +1200,8 @@ ModalDialog DLG_COLUMN StringList [ spanish ] = { < "Seleccin" ; LISTBOX_SELECTION; > ; - < "rea actual" ; LISTBOX_SECTION ; > ; - < "reas seleccionadas" ; LISTBOX_SECTIONS ; > ; + < "Seccin actual" ; LISTBOX_SECTION ; > ; + < "Secciones seleccionadas" ; LISTBOX_SECTIONS ; > ; < "Marco" ; LISTBOX_FRAME ; > ; < "Estilo de pgina: " ; LISTBOX_PAGE ; > ; }; @@ -1209,9 +1216,9 @@ ModalDialog DLG_COLUMN StringList [ russian ] = { < "" ; LISTBOX_SELECTION; > ; - < " " ; LISTBOX_SECTION ; > ; - < " " ; LISTBOX_SECTIONS ; > ; - < "" ; LISTBOX_FRAME ; > ; + < " " ; LISTBOX_SECTION ; > ; + < " " ; LISTBOX_SECTIONS ; > ; + < "..." ; LISTBOX_FRAME ; > ; < " : " ; LISTBOX_PAGE ; > ; }; StringList [ italian ] = @@ -1257,8 +1264,8 @@ ModalDialog DLG_COLUMN StringList [ korean ] = { < "선택" ; LISTBOX_SELECTION; > ; - < "현재 영역" ; LISTBOX_SECTION ; > ; - < "선택된 영역" ; LISTBOX_SECTIONS ; > ; + < "현재 구역" ; LISTBOX_SECTION ; > ; + < "선택된 구역" ; LISTBOX_SECTIONS ; > ; < "프레임" ; LISTBOX_FRAME ; > ; < "페이지 스타일: " ; LISTBOX_PAGE ; > ; }; @@ -1305,8 +1312,8 @@ ModalDialog DLG_COLUMN StringList [ finnish ] = { < "Valinta" ; LISTBOX_SELECTION; > ; - < "Nykyinen osio" ; LISTBOX_SECTION ; > ; - < "Valittu osio" ; LISTBOX_SECTIONS ; > ; + < "Nykyinen osa" ; LISTBOX_SECTION ; > ; + < "Valittu osa" ; LISTBOX_SECTIONS ; > ; < "Kehys" ; LISTBOX_FRAME ; > ; < "Sivun tyyli: " ; LISTBOX_PAGE ; > ; }; @@ -1326,7 +1333,7 @@ ModalDialog DLG_COLUMN Text[ french ] = "Colonnes"; Text[ spanish ] = "Columnas"; Text[ swedish ] = "Kolumner"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ italian ] = "Colonne"; Text[ danish ] = "Kolonner"; Text[ polish ] = "Kolumny"; @@ -1339,8 +1346,27 @@ ModalDialog DLG_COLUMN Text[ language_user1 ] = " "; Text[ turkish ] = "Stun"; Text[ catalan ] = "Columnes"; - Text[ finnish ] = "Sarakkeet"; + Text[ finnish ] = "Palstat"; Text[ thai ] = "คอลัมน์"; }; + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src index a9acb5431349..0a085af62e00 100644 --- a/sw/source/ui/frmdlg/cption.src +++ b/sw/source/ui/frmdlg/cption.src @@ -2,9 +2,9 @@ * * $RCSfile: cption.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2001-12-18 10:37:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,12 +116,12 @@ ModalDialog DLG_CAPTION Text [ italian ] = "~Opzioni" ; Text [ portuguese_brazilian ] = "~Op??s" ; Text [ portuguese ] = "~Opes" ; - Text [ finnish ] = "~Asetukset" ; + Text [ finnish ] = "A~setukset" ; Text [ danish ] = "Indstillinger" ; Text [ french ] = "~Options" ; Text [ swedish ] = "~Alternativ" ; Text [ dutch ] = "~Opties" ; - Text [ spanish ] = "~Opciones" ; + Text [ spanish ] = "Opciones" ; Text [ english_us ] = "~Options" ; Text[ chinese_simplified ] = "选项(~O)"; Text[ russian ] = ""; @@ -133,7 +133,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "옵션(~O)"; Text[ turkish ] = "~Seenekler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Opciones"; + Text[ catalan ] = "~Opcions"; + Text[ thai ] = "~ตัวเลือก"; }; FixedText TXT_SAMPLE { @@ -169,7 +170,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "범주(~T)"; Text[ turkish ] = "~Kategori"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Categora"; + Text[ catalan ] = "Ca~tegoria"; + Text[ thai ] = "ประเ~ภท"; }; ComboBox BOX_CATEGORY { @@ -186,12 +188,12 @@ ModalDialog DLG_CAPTION Text = "~Nummerierung" ; Text [ English ] = "~Numbering" ; Text [ norwegian ] = "~Numbering" ; - Text [ italian ] = "~Numerazione" ; + Text [ italian ] = "Numerazione" ; Text [ portuguese_brazilian ] = "~Numera??o" ; Text [ portuguese ] = "~Numerao" ; Text [ finnish ] = "~Numerointi" ; Text [ danish ] = "Nummerering" ; - Text [ french ] = "~Numrotation" ; + Text [ french ] = "Numrotation" ; Text [ swedish ] = "~Numrering" ; Text [ dutch ] = "~Nummering" ; Text [ spanish ] = "Nu~meracin" ; @@ -207,7 +209,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "번호 매기기(~N)"; Text[ turkish ] = "~Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nu~meracin"; + Text[ catalan ] = "Nu~meraci"; + Text[ thai ] = "~ลำดับตัวเลข"; }; ListBox BOX_FORMAT { @@ -227,16 +230,16 @@ ModalDialog DLG_CAPTION Text [ italian ] = "~Dicitura" ; Text [ portuguese_brazilian ] = "~Legenda" ; Text [ portuguese ] = "~Texto para etiqueta" ; - Text [ finnish ] = "Kuva~otsikko" ; + Text [ finnish ] = "Kuvaotsikko" ; Text [ danish ] = "Billedtekst" ; Text [ french ] = "~Texte de lgende" ; Text [ swedish ] = "~Bildtext" ; Text [ dutch ] = "~Opschrift" ; - Text [ spanish ] = "~Texto de etiqueta" ; + Text [ spanish ] = "~Texto de la etiqueta" ; Text [ english_us ] = "~Caption" ; Left = TRUE ; Text[ chinese_simplified ] = "标签文(~C)"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Tekst etykiety"; Text[ japanese ] = "図表番号テキスト(~C)"; Text[ chinese_traditional ] = "標籤文(~C)"; @@ -245,7 +248,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "캡션(~C)"; Text[ turkish ] = "R~esim yazs metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Texto de etiqueta"; + Text[ catalan ] = "~Llegenda"; + Text[ thai ] = "~คำบรรยายภาพ"; }; Edit EDT_TEXT { @@ -263,12 +267,12 @@ ModalDialog DLG_CAPTION Text = "~Position" ; Text [ English ] = "~Position" ; Text [ norwegian ] = "~Posisjon" ; - Text [ italian ] = "~Posizione" ; + Text [ italian ] = "Posizione" ; Text [ portuguese_brazilian ] = "~Posi??o" ; Text [ portuguese ] = "~Posio" ; - Text [ finnish ] = "~Sijainti" ; + Text [ finnish ] = "Sijainti" ; Text [ danish ] = "Placering" ; - Text [ french ] = "~Position" ; + Text [ french ] = "Position" ; Text [ swedish ] = "~Position" ; Text [ dutch ] = "~Positie" ; Text [ spanish ] = "~Posicin" ; @@ -283,7 +287,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "위치(~P)"; Text[ turkish ] = "K~onum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Posicin"; + Text[ catalan ] = "~Posici"; + Text[ thai ] = "~ตำแหน่ง"; }; ListBox BOX_POS { @@ -305,23 +310,24 @@ ModalDialog DLG_CAPTION Text[ portuguese ] = "~Aplicar contornos e sombreado"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "~Omranding en schadow overnemen"; + Text[ dutch ] = "~Omranding en schaduw overnemen"; Text[ french ] = "~Appliquer bordure et ombre"; - Text[ spanish ] = "Aceptar ~borde y sombra"; + Text[ spanish ] = "~Aplicar borde y sombra"; Text[ italian ] = "~Applica bordo e ombra"; Text[ danish ] = "Overtag ramme og skygge"; Text[ swedish ] = "~verta inramning och skugga"; Text[ polish ] = "Przejmij obramowanie i cie"; Text[ portuguese_brazilian ] = "~Copy border and shadow"; Text[ japanese ] = "外枠と影の適用(~A)"; - Text[ korean ] = "외곽선과 그림자 적용(~A)"; + Text[ korean ] = "테두리 및 그림자 적용(~A)"; Text[ chinese_simplified ] = "采用边框和阴影(~A)"; Text[ chinese_traditional ] = "採用邊框和陰影(~A)"; Text[ arabic ] = " "; Text[ turkish ] = "~Kenarlk ve glgeyi kullan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aceptar ~borde y sombra"; + Text[ catalan ] = "~Aplica la vora i l'ombra"; Text[ finnish ] = "~Lis reuna ja varjostus"; + Text[ thai ] = "ใ~ช้เส้นขอบและเงา"; }; FixedText FT_OBJECT_NAME { @@ -334,9 +340,9 @@ ModalDialog DLG_CAPTION Text[ russian ] = "~ "; Text[ greek ] = " "; Text[ dutch ] = "~Objectnaam"; - Text[ french ] = "~Nom de l'objet"; + Text[ french ] = "Nom de l'objet"; Text[ spanish ] = "~Nombre del objeto"; - Text[ italian ] = "~Nome oggetto"; + Text[ italian ] = "Nome oggetto"; Text[ danish ] = "Objektnavn"; Text[ swedish ] = "~Objektnamn"; Text[ polish ] = "Nazwa obiektu"; @@ -348,8 +354,9 @@ ModalDialog DLG_CAPTION Text[ arabic ] = " "; Text[ turkish ] = "N~esne ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nombre del objeto"; + Text[ catalan ] = "Nom de l'o~bjecte"; Text[ finnish ] = "O~bjektin nimi"; + Text[ thai ] = "ชื่อวั~ตถุ"; }; Edit ED_OBJECT_NAME { @@ -374,17 +381,18 @@ ModalDialog DLG_CAPTION Text[ spanish ] = "Propiedades"; Text[ finnish ] = "Ominaisuudet"; Text[ italian ] = "Propriet"; - Text[ danish ] = "Settings"; + Text[ danish ] = "Egenskaber"; Text[ swedish ] = "Egenskaper"; Text[ polish ] = "Waciwoci"; Text[ portuguese_brazilian ] = "Settings"; Text[ japanese ] = "属性"; - Text[ korean ] = "설정"; + Text[ korean ] = "등록 정보"; Text[ chinese_simplified ] = "属性"; Text[ chinese_traditional ] = "屬性"; Text[ turkish ] = "Settings"; Text[ arabic ] = "Settings"; - Text[ catalan ] = "Settings"; + Text[ catalan ] = "Propietats"; + Text[ thai ] = "คุณสมบัติ"; }; String STR_BEGINNING { @@ -394,24 +402,25 @@ ModalDialog DLG_CAPTION Text [ italian ] = "All'inizio" ; Text [ portuguese_brazilian ] = "No in?cio" ; Text [ portuguese ] = "No incio" ; - Text [ finnish ] = "Ylhll" ; + Text [ finnish ] = "Ylpuolella" ; Text [ danish ] = "Ved begyndelsen" ; Text [ french ] = "Au dbut" ; Text [ swedish ] = "I brjan" ; - Text [ dutch ] = "Aan het begin" ; + Text [ dutch ] = "Aan begin" ; Text [ spanish ] = "Al principio" ; Text [ english_us ] = "Above" ; Text[ chinese_simplified ] = "在起始位置"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Na pocztku"; Text[ japanese ] = "最初に"; Text[ chinese_traditional ] = "在起始位置"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "시작"; + Text[ korean ] = "시작에서"; Text[ turkish ] = "Bata"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Al principio"; + Text[ catalan ] = "A sobre"; + Text[ thai ] = "ข้างบน"; }; String STR_END { @@ -421,15 +430,15 @@ ModalDialog DLG_CAPTION Text [ italian ] = "Alla fine" ; Text [ portuguese_brazilian ] = "Ao final" ; Text [ portuguese ] = "No fim" ; - Text [ finnish ] = "Alhaalla" ; + Text [ finnish ] = "Alapuolella" ; Text [ danish ] = "Ved slutningen" ; Text [ french ] = " la fin" ; Text [ swedish ] = "I slutet" ; - Text [ dutch ] = "Aan het einde" ; + Text [ dutch ] = "Aan einde" ; Text [ spanish ] = "Al final" ; Text [ english_us ] = "Below" ; Text[ chinese_simplified ] = "在结束位置"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Na kocu"; Text[ japanese ] = "最後に"; Text[ chinese_traditional ] = "在結束位置"; @@ -438,7 +447,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "끝"; Text[ turkish ] = "Sonda"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Al final"; + Text[ catalan ] = "Sota"; + Text[ thai ] = "ข้างล่าง"; }; String STR_ABOVE { @@ -448,7 +458,7 @@ ModalDialog DLG_CAPTION Text [ italian ] = "Al di sopra" ; Text [ portuguese_brazilian ] = "Acima" ; Text [ portuguese ] = "Acima" ; - Text [ finnish ] = "Ylhll" ; + Text [ finnish ] = "Ylpuolella" ; Text [ danish ] = "Over" ; Text [ french ] = "Supra" ; Text [ swedish ] = "Ovanfr" ; @@ -465,7 +475,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "위"; Text[ turkish ] = "stte"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encima"; + Text[ catalan ] = "A sobre"; + Text[ thai ] = "ข้างบน"; }; String STR_CP_BELOW { @@ -475,7 +486,7 @@ ModalDialog DLG_CAPTION Text [ italian ] = "Al di sotto" ; Text [ portuguese_brazilian ] = "Abaixo" ; Text [ portuguese ] = "Abaixo" ; - Text [ finnish ] = "Alhaalla" ; + Text [ finnish ] = "Alapuolella" ; Text [ danish ] = "Under" ; Text [ french ] = "Infra" ; Text [ swedish ] = "Nedanfr" ; @@ -492,10 +503,11 @@ ModalDialog DLG_CAPTION Text[ korean ] = "아래"; Text[ turkish ] = "Altta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Debajo"; + Text[ catalan ] = "Sota"; + Text[ thai ] = "ข้างล่าง"; }; Text[ chinese_simplified ] = "标签"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Etykieta"; Text[ japanese ] = "図表番号"; Text[ chinese_traditional ] = "標籤"; @@ -504,7 +516,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "캡션"; Text[ turkish ] = "Resim yazs"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Etiqueta"; + Text[ catalan ] = "Llegenda"; + Text[ thai ] = "คำบรรยายภาพ"; }; ModalDialog DLG_SEQUENCE_OPTION { @@ -545,7 +558,7 @@ ModalDialog DLG_SEQUENCE_OPTION Text [ swedish ] = "Numrering kapitelvis" ; Text [ danish ] = "Kapitelvis nummerering" ; Text [ italian ] = "Numerazione a capitoli" ; - Text [ spanish ] = "Numeracin de captulos" ; + Text [ spanish ] = "Numeracin por captulos" ; Text [ french ] = "Numrotation par chapitre" ; Text [ dutch ] = "Hoofdstuksgewijs nummeren" ; Text [ portuguese ] = "Numerao por captulos" ; @@ -559,8 +572,9 @@ ModalDialog DLG_SEQUENCE_OPTION Text[ korean ] = "장별로 번호 매기기"; Text[ turkish ] = "Blme gre numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin de captulos"; + Text[ catalan ] = "Numeraci de captols"; Text[ finnish ] = "Numerointi luvuittain"; + Text[ thai ] = "ลำดับตัวเลขโดยบท"; }; FixedText FT_LEVEL { @@ -587,8 +601,9 @@ ModalDialog DLG_SEQUENCE_OPTION Text[ korean ] = "수준(~L)"; Text[ turkish ] = "D~zey"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nivel"; + Text[ catalan ] = "~Nivell"; Text[ finnish ] = "~Taso"; + Text[ thai ] = "~ระดับ"; }; ListBox LB_LEVEL { @@ -647,7 +662,7 @@ ModalDialog DLG_SEQUENCE_OPTION }; StringList [ russian ] = { - < "" ; > ; + < "" ; > ; }; StringList [ polish ] = { @@ -683,12 +698,16 @@ ModalDialog DLG_SEQUENCE_OPTION }; StringList [ catalan ] = { - < "Ninguna" ; > ; + < "Cap" ; > ; }; StringList [ finnish ] = { < "Ei mitn" ; > ; }; + StringList [ thai ] = + { + < "ไม่มี" ; > ; + }; }; FixedText FT_SEPARATOR { @@ -717,6 +736,7 @@ ModalDialog DLG_SEQUENCE_OPTION Text[ language_user1 ] = " "; Text[ catalan ] = "~Separador"; Text[ finnish ] = "~Erotin"; + Text[ thai ] = "~ตัวแยก"; }; Edit ED_SEPARATOR { @@ -733,20 +753,42 @@ ModalDialog DLG_SEQUENCE_OPTION Text [ italian ] = "Opzioni sequenza" ; Text [ spanish ] = "Opciones de secuencias" ; Text [ french ] = "Options de squence" ; - Text [ dutch ] = "Nummerreeks-opties" ; + Text [ dutch ] = "Nummerreeksopties" ; Text [ portuguese ] = "Opes de sequncias" ; Text[ chinese_simplified ] = "号码序列选项"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Opcje sekwencji"; Text[ japanese ] = "連番オプション"; Text[ chinese_traditional ] = "編號序列選項"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "숫자 범위 옵션"; + Text[ korean ] = "번호 범위 옵션"; Text[ turkish ] = "Numara aral seenekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de secuencias"; + Text[ catalan ] = "Opcions de seqncies"; Text[ finnish ] = "Numeroalueen asetukset"; + Text[ thai ] = "ตัวเลือกช่วงตัวเลข"; }; // ********************************************************************** EOF + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index c2917c493995..3d078123ccb9 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:14:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -224,7 +224,8 @@ struct ResIdPair_Impl USHORT nVert; }; -#define MAX_PERCENT_WIDTH 254L +#define MAX_PERCENT_WIDTH 254L +#define MAX_PERCENT_HEIGHT 254L #define LB_FRAME 0x00000001L // Textbereich des Absatzes #define LB_PRTAREA 0x00000002L // Textbereich des Absatzes + Einzuege @@ -551,14 +552,14 @@ void lcl_InsertVectors(ListBox& rBox, const ::std::vector< String >& rNext, const ::std::vector< String >& rRemain) { ::std::vector< const String >::iterator aIt; + USHORT nEntry = 0; for(aIt = rPrev.begin(); aIt != rPrev.end(); aIt++) - rBox.InsertEntry(*aIt); + nEntry = rBox.InsertEntry(*aIt); for(aIt = rThis.begin(); aIt != rThis.end(); aIt++) - rBox.InsertEntry(*aIt); + nEntry = rBox.InsertEntry(*aIt); for(aIt = rNext.begin(); aIt != rNext.end(); aIt++) - rBox.InsertEntry(*aIt); - rBox.SetEntryData( - rBox.InsertEntry(String::CreateFromAscii("-------------")), (void*)(ULONG)1); + nEntry = rBox.InsertEntry(*aIt); + rBox.SetSeparatorPos(nEntry); //now insert all strings sorted USHORT nStartPos = rBox.GetEntryCount(); @@ -1042,7 +1043,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet) else aSz.SetWidthPercent(0); if (aRelHeightCB.IsChecked()) - aSz.SetHeightPercent((BYTE)Min(100L, aHeightED.Convert(aHeightED.Normalize(nNewHeight), FUNIT_TWIP, FUNIT_CUSTOM))); + aSz.SetHeightPercent((BYTE)Min(MAX_PERCENT_HEIGHT, aHeightED.Convert(aHeightED.Normalize(nNewHeight), FUNIT_TWIP, FUNIT_CUSTOM))); else aSz.SetHeightPercent(0); @@ -1562,15 +1563,18 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn ) aWidthED.ShowPercent(pBtn->IsChecked()); aWidthED.MetricField::SetMax(MAX_PERCENT_WIDTH); } - else + else // pBtn == &aRelHeightCB + { aHeightED.ShowPercent(pBtn->IsChecked()); + aHeightED.MetricField::SetMax(MAX_PERCENT_HEIGHT); + } if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde RangeModifyHdl(&aWidthED); // Werte wieder korrigieren if (pBtn == &aRelWidthCB) ModifyHdl(&aWidthED); - else + else // pBtn == &aRelHeightCB ModifyHdl(&aHeightED); return 0; @@ -2075,6 +2079,9 @@ void SwFrmPage::Init(const SfxItemSet& rSet, BOOL bReset) break; } } + //disable "original size" button if necessary + if(0 != (pSh->GetOLEObj()->GetMiscStatus() & SVOBJ_MISCSTATUS_SERVERRESIZE)) + aRealSizeBT.Disable(); } } @@ -3132,41 +3139,34 @@ void SwFrmAddPage::SetFormatUsed(BOOL bFmt) ---------------------------------------------------------------------------*/ IMPL_LINK(SwFrmAddPage, ChainModifyHdl, ListBox*, pBox) { - //prevent the selection of the separator - if(pBox->GetEntryData(pBox->GetSelectEntryPos())) - pBox->SelectEntryPos(0); - else - { - String sCurrentPrevChain, sCurrentNextChain; - if(aPrevLB.GetSelectEntryPos()) - sCurrentPrevChain = aPrevLB.GetSelectEntry(); - if(aNextLB.GetSelectEntryPos()) - sCurrentNextChain = aNextLB.GetSelectEntry(); - SwFrmFmt* pFmt = pWrtSh->GetFlyFrmFmt(); - if (pFmt) - { - BOOL bNextBox = &aNextLB == pBox; - ListBox& rChangeLB = bNextBox ? aPrevLB : aNextLB; - for(USHORT nEntry = rChangeLB.GetEntryCount(); nEntry > 1; nEntry--) - rChangeLB.RemoveEntry(nEntry - 1); - //determine chainable frames - ::std::vector< String > aPrevPageFrames; - ::std::vector< String > aThisPageFrames; - ::std::vector< String > aNextPageFrames; - ::std::vector< String > aRemainFrames; - pWrtSh->GetConnectableFrmFmts(*pFmt, bNextBox ? sCurrentNextChain : sCurrentPrevChain, !bNextBox, - aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); - lcl_InsertVectors(rChangeLB, - aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames); - String sToSelect = bNextBox ? sCurrentPrevChain : sCurrentNextChain; - if(rChangeLB.GetEntryPos(sToSelect) != LISTBOX_ENTRY_NOTFOUND) - rChangeLB.SelectEntry(sToSelect); - else - rChangeLB.SelectEntryPos(0); + String sCurrentPrevChain, sCurrentNextChain; + if(aPrevLB.GetSelectEntryPos()) + sCurrentPrevChain = aPrevLB.GetSelectEntry(); + if(aNextLB.GetSelectEntryPos()) + sCurrentNextChain = aNextLB.GetSelectEntry(); + SwFrmFmt* pFmt = pWrtSh->GetFlyFrmFmt(); + if (pFmt) + { + BOOL bNextBox = &aNextLB == pBox; + ListBox& rChangeLB = bNextBox ? aPrevLB : aNextLB; + for(USHORT nEntry = rChangeLB.GetEntryCount(); nEntry > 1; nEntry--) + rChangeLB.RemoveEntry(nEntry - 1); + //determine chainable frames + ::std::vector< String > aPrevPageFrames; + ::std::vector< String > aThisPageFrames; + ::std::vector< String > aNextPageFrames; + ::std::vector< String > aRemainFrames; + pWrtSh->GetConnectableFrmFmts(*pFmt, bNextBox ? sCurrentNextChain : sCurrentPrevChain, !bNextBox, + aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); + lcl_InsertVectors(rChangeLB, + aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames); + String sToSelect = bNextBox ? sCurrentPrevChain : sCurrentNextChain; + if(rChangeLB.GetEntryPos(sToSelect) != LISTBOX_ENTRY_NOTFOUND) + rChangeLB.SelectEntry(sToSelect); + else + rChangeLB.SelectEntryPos(0); - } } - return 0; } diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src index d5bb777708a2..a3a3ab3bd049 100644 --- a/sw/source/ui/frmdlg/frmpage.src +++ b/sw/source/ui/frmdlg/frmpage.src @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.src,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: os $ $Date: 2002-12-04 08:16:51 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,7 +169,7 @@ TabDialog DLG_FRM_STD Text[ chinese_traditional ] = "換行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "순환"; + Text[ korean ] = "문장 배치"; Text[ turkish ] = "Metin dalm"; Text[ catalan ] = "Ajusta"; Text[ thai ] = "ตัด"; @@ -212,7 +212,7 @@ TabDialog DLG_FRM_STD Text [ italian ] = "Bordo" ; Text [ portuguese_brazilian ] = "Borda" ; Text [ portuguese ] = "Contornos" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ finnish ] = "Reunat" ; Text [ danish ] = "Ramme" ; Text [ french ] = "Bordure" ; @@ -433,7 +433,7 @@ TabDialog DLG_FRM_GRF Text[ chinese_traditional ] = "換行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "순환"; + Text[ korean ] = "문장 배치"; Text[ turkish ] = "Metin dalm"; Text[ catalan ] = "Ajusta"; Text[ thai ] = "ตัด"; @@ -490,7 +490,7 @@ TabDialog DLG_FRM_GRF Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ catalan ] = "Imatge"; Text[ thai ] = "กราฟิค"; @@ -533,7 +533,7 @@ TabDialog DLG_FRM_GRF Text [ italian ] = "Bordo" ; Text [ portuguese_brazilian ] = "Borda" ; Text [ portuguese ] = "Contornos" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ finnish ] = "Reunat" ; Text [ danish ] = "Ramme" ; Text [ french ] = "Bordure" ; @@ -617,7 +617,7 @@ TabDialog DLG_FRM_GRF Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ catalan ] = "Imatge"; Text[ thai ] = "กราฟิค"; @@ -736,7 +736,7 @@ TabDialog DLG_FRM_OLE Text[ chinese_traditional ] = "換行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "순환"; + Text[ korean ] = "문장 배치"; Text[ turkish ] = "Metin dalm"; Text[ catalan ] = "Ajusta"; Text[ thai ] = "ตัด"; @@ -779,7 +779,7 @@ TabDialog DLG_FRM_OLE Text [ italian ] = "Bordo" ; Text [ portuguese_brazilian ] = "Borda" ; Text [ portuguese ] = "Contornos" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ finnish ] = "Reunat" ; Text [ danish ] = "Ramme" ; Text [ french ] = "Bordure" ; @@ -955,7 +955,7 @@ TabPage TP_FRM_STD Text[ chinese_traditional ] = "相對的(~I)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "상대(~I)"; + Text[ korean ] = "비례하여(~I)"; Text[ turkish ] = "~Greceli"; Text[ catalan ] = "Relat~iu"; Text[ finnish ] = "Suhteellinen"; @@ -980,7 +980,7 @@ TabPage TP_FRM_STD Text [ spanish ] = "A~ltura" ; Text [ english_us ] = "H~eight" ; Text[ chinese_simplified ] = "高度(~E)"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ polish ] = "Wys."; Text[ japanese ] = "高さ(~E)"; Text[ chinese_traditional ] = "高度(~E)"; @@ -1031,7 +1031,7 @@ TabPage TP_FRM_STD Text[ chinese_traditional ] = "相對的(~L)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "상대(~L)"; + Text[ korean ] = "비례하여(~L)"; Text[ turkish ] = "G~receli"; Text[ catalan ] = "Re~latiu"; Text[ finnish ] = "Suhteellinen"; @@ -1044,12 +1044,12 @@ TabPage TP_FRM_STD TabStop = TRUE ; Text = "~Abgleich" ; Text [ ENGLISH ] = "~Match" ; - Text [ english_us ] = "~Keep proportional" ; + Text [ english_us ] = "~Keep ratio" ; Text [ italian ] = "Proporzionale" ; - Text [ spanish ] = "Igualar proporciones" ; + Text [ spanish ] = "Proporcional" ; Text [ french ] = "Proportionnel" ; Text [ dutch ] = "~Proporties synchroniseren" ; - Text [ swedish ] = "Anpassa ~proportioner" ; + Text [ swedish ] = "Anpassa ~proportionellt" ; Text [ danish ] = "Bevar ~proportioner" ; Text [ portuguese_brazilian ] = "Abgle~ich" ; Text [ portuguese ] = "Pr~oporcional" ; @@ -1057,10 +1057,10 @@ TabPage TP_FRM_STD Text[ russian ] = ""; Text[ polish ] = "Prporcjonalnie"; Text[ japanese ] = "比率を保つ(~K)"; - Text[ chinese_traditional ] = "保持比列(~K)"; + Text[ chinese_traditional ] = "同步化(~K)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "비율 조정(~K)"; + Text[ korean ] = "비율을 균등하게 조정(~K)"; Text[ turkish ] = "Orant~"; Text[ language_user1 ] = " "; Text[ catalan ] = "Prop~orcional"; @@ -1076,15 +1076,15 @@ TabPage TP_FRM_STD Text[ english_us ] = "AutoSize"; Text[ swedish ] = "Au~tomatisk storlek"; Text[ japanese ] = "サイズ自動調整"; - Text[ korean ] = "자동 크기 조절"; + Text[ korean ] = "크기 자동 조절"; Text[ chinese_simplified ] = "自动调整大小(~G)"; Text[ chinese_traditional ] = "自動調整大小"; Text[ portuguese ] = "Alt~ura automtica"; - Text[ russian ] = ". "; + Text[ russian ] = ""; Text[ greek ] = " "; Text[ dutch ] = "Automatische h~oogte"; Text[ french ] = "Hauteur automatique"; - Text[ spanish ] = "Altura automtica"; + Text[ spanish ] = "~Tamao automtico"; Text[ finnish ] = "Automaattinen korkeus"; Text[ italian ] = "Altezza. ~auto"; Text[ danish ] = "Automatisk h~jde"; @@ -1317,7 +1317,7 @@ TabPage TP_FRM_STD Text [ french ] = "Ancrage" ; Text [ swedish ] = "Frankring" ; Text [ dutch ] = "Verankering" ; - Text [ spanish ] = "Anclaje" ; + Text [ spanish ] = "Ancla" ; Text [ english_us ] = "Anchor" ; Text[ chinese_simplified ] = "锁定"; Text[ russian ] = ""; @@ -1326,7 +1326,7 @@ TabPage TP_FRM_STD Text[ chinese_traditional ] = "鎖定"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "고정"; + Text[ korean ] = "기준 위치"; Text[ turkish ] = "Sabitleme"; Text[ catalan ] = "Ancoratge"; Text[ thai ] = "สมอ"; @@ -1355,7 +1355,7 @@ TabPage TP_FRM_STD Text [ spanish ] = "Hori~zontal" ; Text [ english_us ] = "Hori~zontal" ; Text[ chinese_simplified ] = "水平方向(~Z)"; - Text[ russian ] = " ."; + Text[ russian ] = ""; Text[ polish ] = "W poziomie"; Text[ japanese ] = "横(~Z)"; Text[ chinese_traditional ] = "水平方向(~Z)"; @@ -1505,7 +1505,7 @@ TabPage TP_FRM_STD Text [ spanish ] = "~Vertical" ; Text [ english_us ] = "~Vertical" ; Text[ chinese_simplified ] = "垂直方向(~V)"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "W pionie"; Text[ japanese ] = "縦(~V)"; Text[ chinese_traditional ] = "垂直方向(~V)"; @@ -1672,7 +1672,7 @@ TabPage TP_GRF_EXT Text[ chinese_traditional ] = "捷徑"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "연결"; + Text[ korean ] = "링크"; Text[ turkish ] = "Balant"; Text[ catalan ] = "Enlla"; Text[ thai ] = "เชื่อมโยง"; @@ -1785,7 +1785,7 @@ TabPage TP_GRF_EXT Text [ french ] = " la verticale" ; Text [ swedish ] = "~vertikalt" ; Text [ dutch ] = "verti~caal" ; - Text [ spanish ] = "~Vertical" ; + Text [ spanish ] = "~Verticalmente" ; Text [ english_us ] = "~Vertically" ; Text[ chinese_simplified ] = "垂直方向(~V)"; Text[ russian ] = ""; @@ -1812,7 +1812,7 @@ TabPage TP_GRF_EXT Text[ greek ] = "~"; Text[ dutch ] = "~horizontaal"; Text[ french ] = " l'horizontale"; - Text[ spanish ] = "~Horizontal"; + Text[ spanish ] = "~Horizontalmente"; Text[ italian ] = "~In orizzontale su"; Text[ danish ] = "vandret"; Text[ swedish ] = "h~orisontalt"; @@ -1848,7 +1848,7 @@ TabPage TP_GRF_EXT Text[ polish ] = "na wszystkich stronach"; Text[ portuguese_brazilian ] = "on all pages"; Text[ japanese ] = "すべてのページ"; - Text[ korean ] = "모든 페이제에"; + Text[ korean ] = "모든 페이지에"; Text[ chinese_simplified ] = "全部页面"; Text[ chinese_traditional ] = "在所有頁面上"; Text[ turkish ] = "on all pages"; @@ -1877,7 +1877,7 @@ TabPage TP_GRF_EXT Text[ polish ] = "na parzystych stronach"; Text[ portuguese_brazilian ] = "on even pages"; Text[ japanese ] = "左ページ"; - Text[ korean ] = "왼쪽에"; + Text[ korean ] = "왼쪽 페이지"; Text[ chinese_simplified ] = "在左方页面"; Text[ chinese_traditional ] = "在左頁上"; Text[ turkish ] = "on even pages"; @@ -1906,7 +1906,7 @@ TabPage TP_GRF_EXT Text[ polish ] = "na prawych stronach"; Text[ portuguese_brazilian ] = "on odd pages"; Text[ japanese ] = "右ページ"; - Text[ korean ] = "오른쪽에"; + Text[ korean ] = "오른쪽 페이지"; Text[ chinese_simplified ] = "在右方页面"; Text[ chinese_traditional ] = "在右頁上"; Text[ turkish ] = "on odd pages"; @@ -2066,14 +2066,14 @@ TabPage TP_FRM_URL Text [ dutch ] = "~Frame" ; Text [ english_us ] = "Frame" ; Text [ italian ] = "~Frame" ; - Text [ spanish ] = "Frame" ; + Text [ spanish ] = "~Marco" ; Text [ french ] = "~Frame" ; Text [ swedish ] = "R~am" ; Text [ danish ] = "Frame" ; Text [ portuguese_brazilian ] = "~Frame" ; Text [ portuguese ] = "~Frame" ; Text[ chinese_simplified ] = "框对象"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Frame"; Text[ japanese ] = "フレーム"; Text[ chinese_traditional ] = "訊框"; @@ -2105,7 +2105,7 @@ TabPage TP_FRM_URL Text [ swedish ] = "~Vlj ut..." ; Text [ danish ] = "~Gennemse..." ; Text [ italian ] = "~Sfoglia..." ; - Text [ spanish ] = "Selecc~ionar..." ; + Text [ spanish ] = "~Buscar..." ; Text [ french ] = "Slectionner..." ; Text [ dutch ] = "Selec~teren..." ; Text [ portuguese ] = "~Seleccionar..." ; @@ -2170,7 +2170,7 @@ TabPage TP_FRM_URL Text[ polish ] = "~Server Site Image Map"; Text[ portuguese_brazilian ] = "~Server"; Text[ japanese ] = "サーバーサイト イメージマップ(~S)"; - Text[ korean ] = "서버 싸이트 이미지맵(~S)"; + Text[ korean ] = "서버 사이드 이미지맵(~S)"; Text[ chinese_simplified ] = "服务器端页面图像映射(~S)"; Text[ chinese_traditional ] = "伺服器頁面影像映射(~S)"; Text[ turkish ] = "~Sunucu"; @@ -2334,7 +2334,7 @@ TabPage TP_FRM_ADD Text[ chinese_traditional ] = "上一個捷徑(~P)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "선례(~P)"; + Text[ korean ] = "이전 연결(~P)"; Text[ turkish ] = "~nceki"; Text[ catalan ] = "~Anterior"; Text[ finnish ] = "~Edellinen linkki"; @@ -2462,7 +2462,7 @@ TabPage TP_FRM_ADD Text[ chinese_traditional ] = "下一個捷徑(~N)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "후임(~N)"; + Text[ korean ] = "다음 링크(~N)"; Text[ turkish ] = "S~onraki"; Text[ catalan ] = "~Enlla segent"; Text[ finnish ] = "Seuraava linkki"; @@ -2671,7 +2671,7 @@ TabPage TP_FRM_ADD Text [ dutch ] = "~Grootte" ; Text [ portuguese ] = "~Tamanho" ; Text[ chinese_simplified ] = "大小(~S)"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ polish ] = "Rozmiar"; Text[ japanese ] = "サイズ(~S)"; Text[ chinese_traditional ] = "大小(~S)"; @@ -2734,7 +2734,7 @@ TabPage TP_FRM_ADD Text[ chinese_traditional ] = "可編輯唯讀文件(~E)"; Text[ arabic ] = " "; Text[ greek ] = " ~ \" \""; - Text[ korean ] = "읽기 전용 문서에서 편집가능(~E)"; + Text[ korean ] = "읽기 전용 문서에서 편집 가능(~E)"; Text[ turkish ] = "Salt okunur belge iinde dzenlenebilir"; Text[ catalan ] = "Es pot editar en documents de noms lectura"; Text[ finnish ] = "~Muokattavissa vain luku -asiakirjassa"; @@ -2790,7 +2790,7 @@ TabPage TP_FRM_ADD Text[ polish ] = "Waciwoci"; Text[ portuguese_brazilian ] = "Additional Setting"; Text[ japanese ] = "属性"; - Text[ korean ] = "추가 설정"; + Text[ korean ] = "등록 정보"; Text[ chinese_simplified ] = "属性"; Text[ chinese_traditional ] = "屬性"; Text[ turkish ] = "Additional Setting"; @@ -2812,8 +2812,8 @@ TabPage TP_FRM_ADD Text[ russian ] = "~Text flow"; Text[ greek ] = "~Text flow"; Text[ dutch ] = "~Text flow"; - Text[ french ] = "Enchanements"; - Text[ spanish ] = "Flujo del texto"; + Text[ french ] = "Orientation du texte"; + Text[ spanish ] = "~Direccin de escritura"; Text[ finnish ] = "~Text flow"; Text[ italian ] = "Testo"; Text[ danish ] = "~Text flow"; @@ -2892,12 +2892,12 @@ TabPage TP_FRM_ADD < "Vnster-till-hger (horisontellt)" ; 0; > ; < "Hger-till-vnster (horisontellt)" ; 1; > ; < "Hger-till-vnster (vertikalt)" ; 2; > ; - < "Anvnd det verordnade objektets instllning" ; 4; > ; + < "Anvnd det verordnade objektets instllningar" ; 4; > ; }; StringList [ japanese ] = { < "左から右へ (横書き)" ; 0; > ; - < "右から左へ (縦書き)" ; 1; > ; + < "右から左へ (横書き)" ; 1; > ; < "右から左へ (縦書き)" ; 2; > ; < "周りのテキストの文字方向に合わせる" ; 4; > ; }; @@ -2906,7 +2906,7 @@ TabPage TP_FRM_ADD < "왼쪽에서 오른쪽으로(가로)" ; 0; > ; < "오른쪽에서 왼쪽으로 (가로)" ; 1; > ; < "오른쪽에서 왼쪽으로 (세로)" ; 2; > ; - < "상위 개체의 설정 적용" ; 4; > ; + < "현재 문자 방향의 설정을 적용" ; 4; > ; }; StringList [ chinese_simplified ] = { @@ -2932,3 +2932,18 @@ TabPage TP_FRM_ADD }; }; + + + + + + + + + + + + + + + diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src index 75dd1b1121fa..d6cb9a9f6adf 100644 --- a/sw/source/ui/frmdlg/frmui.src +++ b/sw/source/ui/frmdlg/frmui.src @@ -2,9 +2,9 @@ * * $RCSfile: frmui.src,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: gt $ $Date: 2002-12-06 15:12:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ String STR_TOP TEXT [ italian ] = "Alto" ; TEXT [ portuguese_brazilian ] = "Topo" ; TEXT [ portuguese ] = "Em cima" ; - TEXT [ finnish ] = "~Ylosa" ; + TEXT [ finnish ] = "~Ylreuna" ; TEXT [ danish ] = "Foroven" ; TEXT [ french ] = "En haut" ; TEXT [ swedish ] = "~verst" ; @@ -99,7 +99,7 @@ String STR_BOTTOM TEXT [ italian ] = "Basso" ; TEXT [ portuguese_brazilian ] = "Base" ; TEXT [ portuguese ] = "~Base" ; - TEXT [ finnish ] = "~Alaosa" ; + TEXT [ finnish ] = "~Alareuna" ; TEXT [ danish ] = "Forneden" ; TEXT [ french ] = "En bas" ; TEXT [ swedish ] = "Nederst" ; @@ -124,15 +124,15 @@ String STR_CENTER_HORI TEXT = "M~itte" ; TEXT [ English ] = "Center" ; TEXT [ norwegian ] = "Centered" ; - TEXT [ italian ] = "Centrato" ; + TEXT [ italian ] = "Al centro" ; TEXT [ portuguese_brazilian ] = "Centralizado" ; TEXT [ portuguese ] = "Centrado" ; TEXT [ finnish ] = "~Keskitetty" ; TEXT [ danish ] = "Centreret" ; - TEXT [ french ] = "Centr" ; - TEXT [ swedish ] = "~Centrerad" ; + TEXT [ french ] = "Centre" ; + TEXT [ swedish ] = "~Centrerat" ; TEXT [ dutch ] = "~Gecentreerd" ; - TEXT [ spanish ] = "~Centrado" ; + TEXT [ spanish ] = "~Centro" ; TEXT [ english_us ] = "~Center" ; TEXT[ chinese_simplified ] = "居中(~C)"; TEXT[ russian ] = " "; @@ -226,7 +226,7 @@ String STR_BELOW Text[ turkish ] = "Altta"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sota"; - Text[ finnish ] = "Alhaalla"; + Text[ finnish ] = "Alapuolella"; Text[ thai ] = "ข้างล่าง"; }; /*----------------------------------------------------------------------- @@ -273,11 +273,11 @@ String STR_MIR_LEFT Text [ spanish ] = "Interior" ; Text [ french ] = "Intrieur" ; Text [ dutch ] = "Binnenin" ; - Text[ chinese_simplified ] = "内"; + Text[ chinese_simplified ] = "内侧"; Text[ russian ] = ""; Text[ polish ] = "Wewntrz"; Text[ japanese ] = "内側"; - Text[ chinese_traditional ] = "內"; + Text[ chinese_traditional ] = "内側"; Text[ arabic ] = ""; Text[ greek ] = ""; Text[ korean ] = "내부"; @@ -350,14 +350,14 @@ String STR_CENTER_VERT Text [ portuguese ] = "~Centro" ; Text [ english_us ] = "C~enter" ; Text [ portuguese_brazilian ] = "~Mitte" ; - Text [ swedish ] = "~Mitten" ; + Text [ swedish ] = "C~entrerat" ; Text [ danish ] = "Centreret" ; Text [ italian ] = "Centro" ; Text [ spanish ] = "~Centrado" ; - Text [ french ] = "~Milieu" ; + Text [ french ] = "Centre" ; Text [ dutch ] = "~Midden" ; Text[ chinese_simplified ] = "中(~E)"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Porodku"; Text[ japanese ] = "中央(~E)"; Text[ chinese_traditional ] = "中(~E)"; @@ -367,7 +367,7 @@ String STR_CENTER_VERT Text[ turkish ] = "O~rta"; Text[ language_user1 ] = " "; Text[ catalan ] = "C~entrat"; - Text[ finnish ] = "~Keskit"; + Text[ finnish ] = "K~eskit"; Text[ thai ] = "ต~รงกลาง"; }; String STR_FROMLEFT @@ -411,11 +411,11 @@ String STR_MIR_FROMLEFT Text [ spanish ] = "Desde el interior" ; Text [ french ] = "De l'intrieur" ; Text [ dutch ] = "Van binnen" ; - Text[ chinese_simplified ] = "从内"; + Text[ chinese_simplified ] = "从内侧"; Text[ russian ] = ""; Text[ polish ] = "Od rodka"; Text[ japanese ] = "内側から"; - Text[ chinese_traditional ] = "從內"; + Text[ chinese_traditional ] = "從内側"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "안에서 부터"; @@ -441,7 +441,7 @@ String STR_REL_BORDER Text [ spanish ] = "Margen" ; Text [ french ] = "Marge" ; Text [ dutch ] = "Marge" ; - Text[ chinese_simplified ] = "页边距"; + Text[ chinese_simplified ] = "边距"; Text[ russian ] = ""; Text[ polish ] = "Margines"; Text[ japanese ] = "余白"; @@ -462,20 +462,20 @@ String STR_REL_PRTAREA Text [ portuguese ] = "rea de texto" ; Text [ english_us ] = "Paragraph text area" ; Text [ portuguese_brazilian ] = "Textbereich" ; - Text [ swedish ] = "Textomrde" ; + Text [ swedish ] = "Textomrde i stycke" ; Text [ danish ] = "Tekstomrde" ; - Text [ italian ] = "Area del testo" ; - Text [ spanish ] = "rea de texto " ; - Text [ french ] = "Zone de texte" ; + Text [ italian ] = "Area del testo del paragrafo" ; + Text [ spanish ] = "rea de texto del prrafo" ; + Text [ french ] = "Zone de texte de paragraphe" ; Text [ dutch ] = "Tekstbereik" ; - Text[ chinese_simplified ] = "文字区域"; + Text[ chinese_simplified ] = "段落文字区域"; Text[ russian ] = " "; Text[ polish ] = "Obszar tekstu"; - Text[ japanese ] = "文書範囲"; - Text[ chinese_traditional ] = "文字區域"; + Text[ japanese ] = "段落範囲"; + Text[ chinese_traditional ] = "段落文字區域"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "텍스트 영역"; + Text[ korean ] = "단락의 텍스트 영역"; Text[ turkish ] = "Metin alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "rea de text "; @@ -497,11 +497,11 @@ String STR_TOPPRT TEXT [ dutch ] = "Bovenrand" ; TEXT [ spanish ] = "Margen superior" ; TEXT [ english_us ] = "Upper Margin" ; - TEXT[ chinese_simplified ] = "上方页边距"; + TEXT[ chinese_simplified ] = "页面边距 上方"; TEXT[ russian ] = " "; TEXT[ polish ] = "Grny margines"; TEXT[ japanese ] = "上余白"; - TEXT[ chinese_traditional ] = "上邊框"; + TEXT[ chinese_traditional ] = "上方邊框"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; TEXT[ korean ] = "위쪽 여백"; @@ -526,14 +526,14 @@ String STR_FLY_REL_PG_LEFT Text [ spanish ] = "Borde izquierdo del marco" ; Text [ french ] = "Bordure de cadre gauche" ; Text [ dutch ] = "Kaderrand links" ; - Text[ chinese_simplified ] = "左框边"; + Text[ chinese_simplified ] = "框边 左方"; Text[ russian ] = " "; Text[ polish ] = "Lewa krawd ramki"; Text[ japanese ] = "左余白"; - Text[ chinese_traditional ] = "左框邊"; + Text[ chinese_traditional ] = "框邊 左方"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "왼쪽 프레임 외곽선"; + Text[ korean ] = "왼쪽 프레임 여백"; Text[ turkish ] = "Sol ereve kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vora esquerra del marc"; @@ -553,14 +553,14 @@ String STR_FLY_MIR_REL_PG_LEFT Text [ spanish ] = "Borde interior del marco" ; Text [ french ] = "Bordure de cadre intrieure" ; Text [ dutch ] = "Binnenste kaderrand" ; - Text[ chinese_simplified ] = "框边内则"; + Text[ chinese_simplified ] = "框边 内侧"; Text[ russian ] = " "; Text[ polish ] = "Wewntrzna krawd ramki"; Text[ japanese ] = "余白 内側"; - Text[ chinese_traditional ] = "框邊內則"; + Text[ chinese_traditional ] = "框邊 内側"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "내부 프레임 외곽선"; + Text[ korean ] = "내부 프레임 여백"; Text[ turkish ] = " ereve kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vora interior del marc"; @@ -580,14 +580,14 @@ String STR_FLY_REL_PG_RIGHT Text [ spanish ] = "Borde derecho del marco" ; Text [ french ] = "Bordure de cadre droite" ; Text [ dutch ] = "Kaderrand rechts" ; - Text[ chinese_simplified ] = "右框边"; + Text[ chinese_simplified ] = "框边 右方"; Text[ russian ] = " "; Text[ polish ] = "Prawa krawd ramki"; Text[ japanese ] = "右余白"; - Text[ chinese_traditional ] = "右框邊"; + Text[ chinese_traditional ] = "框邊 右方"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "오른쪽 프레임 외곽선"; + Text[ korean ] = "오른쪽 프레임 여백"; Text[ turkish ] = "Sa ereve kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vora dreta del marc"; @@ -614,7 +614,7 @@ String STR_FLY_MIR_REL_PG_RIGHT Text[ chinese_traditional ] = "框邊外側"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "외부 프레임 외곽선"; + Text[ korean ] = "외부 프레임 여백"; Text[ turkish ] = "D ereve kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vora exterior del marc"; @@ -633,7 +633,7 @@ String STR_FLY_REL_PG_FRAME Text [ italian ] = "Intera cornice" ; Text [ spanish ] = "Marco entero" ; Text [ french ] = "Cadre entier" ; - Text [ dutch ] = "Compleet kader" ; + Text [ dutch ] = "Volledig kader" ; Text[ chinese_simplified ] = "整个框"; Text[ russian ] = " "; Text[ polish ] = "Caa ramka"; @@ -665,7 +665,7 @@ String STR_FLY_REL_PG_PRTAREA Text[ russian ] = " "; Text[ polish ] = "Obszar tekstu ramki"; Text[ japanese ] = "枠付け範囲"; - Text[ chinese_traditional ] = "框內文字區"; + Text[ chinese_traditional ] = "框内文字區"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "프레임 텍스트 영역"; @@ -722,7 +722,7 @@ String STR_PRTAREA Text[ chinese_traditional ] = "段落文字區域"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "단락 텍스트 영역"; + Text[ korean ] = "단락의 텍스트 영역"; Text[ turkish ] = "Paragraf metin alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "rea de text del pargraf"; @@ -742,14 +742,14 @@ String STR_REL_PG_LEFT Text [ spanish ] = "Margen izquierdo de la pgina" ; Text [ french ] = "Marge gauche" ; Text [ dutch ] = "Paginarand links" ; - Text[ chinese_simplified ] = "左方页边距"; + Text[ chinese_simplified ] = "页面边距 左方"; Text[ russian ] = " "; Text[ polish ] = "Lewy margines strony"; Text[ japanese ] = "ページ余白 左"; - Text[ chinese_traditional ] = "左邊框"; + Text[ chinese_traditional ] = "頁面邊框 左方"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "페이지 여백，왼쪽"; + Text[ korean ] = "페이지 여백 왼쪽"; Text[ turkish ] = "Sol sayfa kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge esquerre de la pgina"; @@ -768,15 +768,15 @@ String STR_MIR_REL_PG_LEFT Text [ italian ] = "Margine pagina interno" ; Text [ spanish ] = "Margen interior de la pgina" ; Text [ french ] = "Marge intrieure" ; - Text [ dutch ] = "Binnenste zijrand" ; - Text[ chinese_simplified ] = "内侧页边距"; + Text [ dutch ] = "Binnenste paginarand" ; + Text[ chinese_simplified ] = "页面边距 内侧"; Text[ russian ] = " "; Text[ polish ] = "Wewnrzny margines strony"; Text[ japanese ] = "ページ余白 内側"; - Text[ chinese_traditional ] = "邊框內側"; + Text[ chinese_traditional ] = "頁面邊框 內側"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "페이지 여백，안페이지"; + Text[ korean ] = "페이지 여백 안쪽"; Text[ turkish ] = "Sayfa kenar (i)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge interior de la pgina"; @@ -793,17 +793,17 @@ String STR_REL_PG_RIGHT Text [ swedish ] = "Hger sidmarginal" ; Text [ danish ] = "Hjre siderand" ; Text [ italian ] = "Margine pagina destro" ; - Text [ spanish ] = "Margen derecho de la pgina" ; + Text [ spanish ] = "Borde derecho de la pgina" ; Text [ french ] = "Marge droite" ; Text [ dutch ] = "Paginarand rechts" ; - Text[ chinese_simplified ] = "右页面空白"; + Text[ chinese_simplified ] = "页面边距 右方"; Text[ russian ] = " "; Text[ polish ] = "Prawy margines strony"; Text[ japanese ] = "ページ余白 右"; - Text[ chinese_traditional ] = "右頁面空白"; + Text[ chinese_traditional ] = "頁面邊框 右方"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "페이지 여백，오른쪽"; + Text[ korean ] = "페이지 여백 오른쪽"; Text[ turkish ] = "Sa sayfa kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge dret de la pgina"; @@ -822,15 +822,15 @@ String STR_MIR_REL_PG_RIGHT Text [ italian ] = "Margine pagina esterno" ; Text [ spanish ] = "Margen exterior de la pgina" ; Text [ french ] = "Marge extrieure" ; - Text [ dutch ] = "Buitenste zijrand" ; - Text[ chinese_simplified ] = "外侧页边距"; + Text [ dutch ] = "Buitenste paginarand" ; + Text[ chinese_simplified ] = "页面边距 外侧"; Text[ russian ] = " "; Text[ polish ] = "Zewntrzny margines strony"; Text[ japanese ] = "ページ余白 外側"; - Text[ chinese_traditional ] = "邊框外側"; + Text[ chinese_traditional ] = "頁面邊框 外側"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "페이지 여백，바깥쪽"; + Text[ korean ] = "페이지 여백 바깥쪽"; Text[ turkish ] = "Sayfa kenar (d)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge exterior de la pgina"; @@ -850,14 +850,14 @@ String STR_REL_FRM_LEFT Text [ spanish ] = "Margen izquierdo del prrafo" ; Text [ french ] = "Marge de paragraphe gauche" ; Text [ dutch ] = "Alinearand links" ; - Text[ chinese_simplified ] = "左段落页边"; + Text[ chinese_simplified ] = "段落边距 左方"; Text[ russian ] = " "; Text[ polish ] = "Lewy margines akapitu"; Text[ japanese ] = "段落余白 左"; - Text[ chinese_traditional ] = "左段落頁邊"; + Text[ chinese_traditional ] = "段落頁邊 左方"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "단락 여백，왼쪽"; + Text[ korean ] = "단락 여백 왼쪽"; Text[ turkish ] = "Paragraf kenar (sol)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge esquerre del pargraf"; @@ -877,14 +877,14 @@ String STR_MIR_REL_FRM_LEFT Text [ spanish ] = "Margen interior del prrafo" ; Text [ french ] = "Marge de paragraphe intrieure" ; Text [ dutch ] = "Binnenste alinearand" ; - Text[ chinese_simplified ] = "间隔内边"; + Text[ chinese_simplified ] = "段落边距 内则"; Text[ russian ] = " "; Text[ polish ] = "Wewntrzny margines akapitu"; Text[ japanese ] = "段落余白 内側"; - Text[ chinese_traditional ] = "間隔內邊"; + Text[ chinese_traditional ] = "段落頁邊 内側"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "단락 여백，안쪽"; + Text[ korean ] = "안쪽의 단락 여백 "; Text[ turkish ] = "Paragraf kenar (i)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge interior del pargraf"; @@ -901,17 +901,17 @@ String STR_REL_FRM_RIGHT Text [ swedish ] = "Hger styckemarginal" ; Text [ danish ] = "Hjre afsnitsrand" ; Text [ italian ] = "Margine paragrafo destro" ; - Text [ spanish ] = "Margen derecho del prrafo" ; + Text [ spanish ] = "Borde derecho del prrafo" ; Text [ french ] = "Marge de paragraphe droite" ; Text [ dutch ] = "Alinearand rechts" ; - Text[ chinese_simplified ] = "右段落页边"; + Text[ chinese_simplified ] = "段落边距 右方"; Text[ russian ] = " "; Text[ polish ] = "Prawy margines akapitu"; Text[ japanese ] = "段落余白 右"; - Text[ chinese_traditional ] = "右段落頁邊"; + Text[ chinese_traditional ] = "段落頁邊 右方"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "단락 여백，오른쪽"; + Text[ korean ] = "단락 여백 오른쪽"; Text[ turkish ] = "Paragraf kenar (sa)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge dret del pargraf"; @@ -931,14 +931,14 @@ String STR_MIR_REL_FRM_RIGHT Text [ spanish ] = "Margen exterior del prrafo" ; Text [ french ] = "Marge de paragraphe extrieure " ; Text [ dutch ] = "Buitenste alinearand" ; - Text[ chinese_simplified ] = "段落间隔外侧"; + Text[ chinese_simplified ] = "段落边距 外侧"; Text[ russian ] = " "; Text[ polish ] = "Zewntrzny margines akapitu"; Text[ japanese ] = "段落余白 外側"; - Text[ chinese_traditional ] = "段落間隔外側"; + Text[ chinese_traditional ] = "段落頁邊 外側"; Text[ arabic ] = " "; Text[ greek ] = " - "; - Text[ korean ] = "단락 여백，바깥쪽"; + Text[ korean ] = "단락 여백 외부"; Text[ turkish ] = "Paragraf kenar (d)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge exterior del pargraf"; @@ -957,7 +957,7 @@ String STR_REL_PG_FRAME Text [ italian ] = "Intera pagina" ; Text [ spanish ] = "Pgina entera" ; Text [ french ] = "Page entire" ; - Text [ dutch ] = "Gehele pagina" ; + Text [ dutch ] = "Hele pagina" ; Text[ chinese_simplified ] = "整页"; Text[ russian ] = " "; Text[ polish ] = "Caa strona"; @@ -992,7 +992,7 @@ String STR_REL_PG_PRTAREA Text[ chinese_traditional ] = "頁面文字區域"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "페이지 텍스트 영역"; + Text[ korean ] = "페이지의 텍스트 영역"; Text[ turkish ] = "Sayfa metin alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "rea de text de la pgina"; @@ -1043,7 +1043,7 @@ String STR_REL_CHAR Text [ french ] = "Caractres" ; Text [ dutch ] = "Teken" ; Text[ chinese_simplified ] = "字符"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Znak"; Text[ japanese ] = "文字"; Text[ chinese_traditional ] = "字元"; @@ -1096,7 +1096,7 @@ String STR_TOP_BASE Text [ swedish ] = "Baslinje ~verst" ; Text [ danish ] = "Basislinje verst" ; Text [ italian ] = "Linea di base in ~alto" ; - Text [ spanish ] = "Lnea de base ~encima" ; + Text [ spanish ] = "Lnea de base ~arriba" ; Text [ french ] = "Ligne de base en ~haut" ; Text [ dutch ] = "Basis ~boven" ; Text[ chinese_simplified ] = "基线上方(~T)"; @@ -1110,7 +1110,7 @@ String STR_TOP_BASE Text[ turkish ] = "Taban izgisi ~st"; Text[ language_user1 ] = " "; Text[ catalan ] = "Lnia de base ~amunt"; - Text[ finnish ] = "~Perusviiva ylhll"; + Text[ finnish ] = "Perusviiva ~ylhll"; Text[ thai ] = "บรรทัดฐานที่ด้าน~บน"; }; String STR_BOTTOM_BASE @@ -1123,7 +1123,7 @@ String STR_BOTTOM_BASE Text [ swedish ] = "Baslinje ~nederst" ; Text [ danish ] = "Basislinje nederst" ; Text [ italian ] = "Base in ~basso" ; - Text [ spanish ] = "Base a~bajo" ; + Text [ spanish ] = "Lnea de base a~bajo" ; Text [ french ] = "Ligne de base en ~bas" ; Text [ dutch ] = "Basis ~beneden" ; Text[ chinese_simplified ] = "基线下方(~B)"; @@ -1150,7 +1150,7 @@ String STR_CENTER_BASE Text [ swedish ] = "Baslinje ~centrerad" ; Text [ danish ] = "Basislinje centreret" ; Text [ italian ] = "Linea di base ~centrata" ; - Text [ spanish ] = "Base ~centro" ; + Text [ spanish ] = "Lnea de base ~centrada" ; Text [ french ] = "Ligne de base ~centre" ; Text [ dutch ] = "Basis ge~centreerd" ; Text[ chinese_simplified ] = "基线居中(~C)"; @@ -1174,7 +1174,7 @@ String STR_LINE_TOP Text [ dutch ] = "Bovenste regel" ; Text [ english_us ] = "Top of line" ; Text [ italian ] = "Riga in alto" ; - Text [ spanish ] = "Lnea superior" ; + Text [ spanish ] = "Lnea arriba" ; Text [ french ] = "Ligne en haut" ; Text [ swedish ] = "versta raden" ; Text [ danish ] = "Rkke verst" ; @@ -1191,7 +1191,7 @@ String STR_LINE_TOP Text[ turkish ] = "Satr st"; Text[ language_user1 ] = " "; Text[ catalan ] = "Lnia superior"; - Text[ finnish ] = "Viivan ylosa"; + Text[ finnish ] = "Viivan ylreuna"; Text[ thai ] = "ด้านบนของบรรทัด"; }; String STR_LINE_BOTTOM @@ -1201,7 +1201,7 @@ String STR_LINE_BOTTOM Text [ dutch ] = "Onderste regel" ; Text [ english_us ] = "Bottom of line" ; Text [ italian ] = "Riga in basso" ; - Text [ spanish ] = "Lnea inferior" ; + Text [ spanish ] = "Lnea abajo" ; Text [ french ] = "Ligne en bas" ; Text [ swedish ] = "Nedersta raden" ; Text [ danish ] = "Rkke nederst" ; @@ -1218,7 +1218,7 @@ String STR_LINE_BOTTOM Text[ turkish ] = "Satr alt"; Text[ language_user1 ] = " "; Text[ catalan ] = "Lnia inferior"; - Text[ finnish ] = "Viivan alaosa"; + Text[ finnish ] = "Viivan alareuna"; Text[ thai ] = "ด้านล่างของบรรทัด"; }; String STR_LINE_CENTER @@ -1245,7 +1245,7 @@ String STR_LINE_CENTER Text[ turkish ] = "Satr ortala"; Text[ language_user1 ] = " "; Text[ catalan ] = "Lnia centrada"; - Text[ finnish ] = "Viivan keskiosa"; + Text[ finnish ] = "Viivan keskikohta"; Text[ thai ] = "ตรงกลางของบรรทัด"; }; String STR_CHAR_TOP @@ -1262,7 +1262,7 @@ String STR_CHAR_TOP Text [ portuguese ] = "Carcter em cima" ; Text [ portuguese_brazilian ] = "Zeichen oben" ; Text[ chinese_simplified ] = "字符上方"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Znaki w grze"; Text[ japanese ] = "文字の上"; Text[ chinese_traditional ] = "字元上方"; @@ -1272,7 +1272,7 @@ String STR_CHAR_TOP Text[ turkish ] = "Karakter st"; Text[ language_user1 ] = " "; Text[ catalan ] = "Carcter amunt"; - Text[ finnish ] = "Merkin ylosa"; + Text[ finnish ] = "Merkin ylreuna"; Text[ thai ] = "ด้านบนของตัวอักขระ"; }; String STR_CHAR_BOTTOM @@ -1289,7 +1289,7 @@ String STR_CHAR_BOTTOM Text [ portuguese ] = "Carcter em baixo" ; Text [ portuguese_brazilian ] = "Zeichen unten" ; Text[ chinese_simplified ] = "字符下方"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Znaki na dole"; Text[ japanese ] = "文字の下"; Text[ chinese_traditional ] = "字元下方"; @@ -1299,7 +1299,7 @@ String STR_CHAR_BOTTOM Text[ turkish ] = "Karakter alt"; Text[ language_user1 ] = " "; Text[ catalan ] = "Carcter avall"; - Text[ finnish ] = "Merkin alaosa"; + Text[ finnish ] = "Merkin alareuna"; Text[ thai ] = "ด้านล่างของตัวอักขระ"; }; String STR_CHAR_CENTER @@ -1316,7 +1316,7 @@ String STR_CHAR_CENTER Text [ portuguese ] = "Carcter centrado" ; Text [ portuguese_brazilian ] = "Zeichen zentriert" ; Text[ chinese_simplified ] = "字符居中"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Znaki wyrodkowane"; Text[ japanese ] = "文字の中央"; Text[ chinese_traditional ] = "字元置中"; @@ -1326,7 +1326,7 @@ String STR_CHAR_CENTER Text[ turkish ] = "Karakteri ortala"; Text[ language_user1 ] = " "; Text[ catalan ] = "Carcter centrat"; - Text[ finnish ] = "Merkin keskiosa"; + Text[ finnish ] = "Merkin keskikohta"; Text[ thai ] = "ตรงกลางของตัวอักขระ"; }; String STR_OLE_INSERT @@ -1370,11 +1370,11 @@ String STR_OLE_EDIT TEXT [ danish ] = "Rediger objekt" ; TEXT [ french ] = "diter l'objet" ; TEXT [ swedish ] = "Redigera objekt" ; - TEXT [ dutch ] = "Een object bewerken" ; + TEXT [ dutch ] = "Object bewerken" ; TEXT [ spanish ] = "Editar objeto" ; TEXT [ english_us ] = "Edit object" ; TEXT[ chinese_simplified ] = "编辑对象"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Edytuj obiekt"; TEXT[ japanese ] = "オプジェクトの編集"; TEXT[ chinese_traditional ] = "編輯物件"; @@ -1394,21 +1394,21 @@ String STR_COLL_HEADER TEXT [ italian ] = "(Modello: " ; TEXT [ portuguese_brazilian ] = "(Modelo: " ; TEXT [ portuguese ] = "(Modelo: " ; - TEXT [ finnish ] = " (Mallipohja: " ; + TEXT [ finnish ] = " (Malli: " ; TEXT [ danish ] = "(Skabelon: " ; TEXT [ french ] = "(modle : " ; - TEXT [ swedish ] = "(Mall: " ; + TEXT [ swedish ] = " (Mall: " ; TEXT [ dutch ] = "(Sjabloon: " ; TEXT [ spanish ] = "(Plantilla: " ; TEXT [ english_us ] = " (Template: " ; TEXT[ chinese_simplified ] = "(样式： "; - TEXT[ russian ] = "(: "; + TEXT[ russian ] = " (: "; TEXT[ polish ] = "(Szablon: "; TEXT[ japanese ] = " (テンプレート： "; TEXT[ chinese_traditional ] = "(樣式： "; TEXT[ arabic ] = "(: "; TEXT[ greek ] = "(: "; - TEXT[ korean ] = " ( 서식 파일: "; + TEXT[ korean ] = "(서식 파일: "; TEXT[ turkish ] = "(ablon: "; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = " (Plantilla: "; @@ -1427,7 +1427,7 @@ String STR_FRMUI_BORDER Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; Text[ chinese_simplified ] = "边框"; Text[ russian ] = ""; @@ -1492,7 +1492,7 @@ String STR_FRMUI_WRAP Text[ chinese_traditional ] = "換行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "문자열 배치"; + Text[ korean ] = "문장 배치"; Text[ turkish ] = "Metin dalm"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ajusta"; @@ -1509,7 +1509,7 @@ InfoBox MSG_COLUMN_ERR_BOUNDWIDTH MESSAGE [ italian ] = "La distanza tra le colonne supera la larghezza delle colonne" ; MESSAGE [ portuguese_brazilian ] = "Largura do guter excede largura da coluna." ; MESSAGE [ portuguese ] = "O espao entre as colunas grande demais para a largura das colunas." ; - MESSAGE [ finnish ] = "Sarakkeiden vlit ovat suurempia kuin sarakkeen leveys." ; + MESSAGE [ finnish ] = "Palstojen vlit ovat suurempia kuin palstan leveys." ; MESSAGE [ danish ] = "Kolonneafstanden er for stor til kolonnebredden." ; MESSAGE [ french ] = "cart entre les colonnes excde largeur de colonne." ; MESSAGE [ swedish ] = "Fstmarginalens bredd r fr stor fr kolumnbredden." ; @@ -1517,7 +1517,7 @@ InfoBox MSG_COLUMN_ERR_BOUNDWIDTH MESSAGE [ spanish ] = "La distancia entre columnas es demasiado grande para el ancho de las columnas." ; MESSAGE [ english_us ] = "Column spacing exceeds the column width." ; MESSAGE[ chinese_simplified ] = "列间隔太大，超过列区域。"; - MESSAGE[ russian ] = " ."; + MESSAGE[ russian ] = " ."; MESSAGE[ polish ] = "Odstp midzy kolumnami jest za duy dla ich szerokoci."; MESSAGE[ japanese ] = "列の間隔が列幅に対して広すぎます"; MESSAGE[ chinese_traditional ] = "欄間隔太大，超過欄區域。"; @@ -1533,25 +1533,137 @@ String STR_REL_PG_TOP { TEXT = "Seitenrand oben" ; Text [ english_us ] = "Top page border" ; + Text[ portuguese ] = "Top page border"; + Text[ russian ] = "Top page border"; + Text[ greek ] = "Top page border"; + Text[ dutch ] = "Top page border"; + Text[ french ] = "Marge suprieure"; + Text[ spanish ] = "Borde superior de la pgina"; + Text[ finnish ] = "Top page border"; + Text[ italian ] = "Margine superiore"; + Text[ danish ] = "Top page border"; + Text[ swedish ] = "Sidmarginal verst"; + Text[ polish ] = "Top page border"; + Text[ portuguese_brazilian ] = "Top page border"; + Text[ japanese ] = "ページ余白、上"; + Text[ korean ] = "페이지 여백 위쪽"; + Text[ chinese_simplified ] = "页面边距 上方"; + Text[ chinese_traditional ] = "頁面邊框 上方"; + Text[ turkish ] = "Top page border"; + Text[ arabic ] = "Top page border"; + Text[ catalan ] = "Top page border"; + Text[ thai ] = "Top page border"; }; String STR_REL_PG_BOTTOM { TEXT = "Seitenrand unten" ; Text [ english_us ] = "Bottom page border" ; + Text[ portuguese ] = "Bottom page border"; + Text[ russian ] = "Bottom page border"; + Text[ greek ] = "Bottom page border"; + Text[ dutch ] = "Bottom page border"; + Text[ french ] = "Marge infrieure"; + Text[ spanish ] = "Borde inferior de la pgina"; + Text[ finnish ] = "Bottom page border"; + Text[ italian ] = "Margine inferiore"; + Text[ danish ] = "Bottom page border"; + Text[ swedish ] = "Sidmarginal nederst"; + Text[ polish ] = "Bottom page border"; + Text[ portuguese_brazilian ] = "Bottom page border"; + Text[ japanese ] = "ページ余白、下"; + Text[ korean ] = "페이지 여백 아래쪽"; + Text[ chinese_simplified ] = "页面边距 下方"; + Text[ chinese_traditional ] = "頁面邊框 下方"; + Text[ turkish ] = "Bottom page border"; + Text[ arabic ] = "Bottom page border"; + Text[ catalan ] = "Bottom page border"; + Text[ thai ] = "Bottom page border"; }; String STR_REL_FRM_TOP { TEXT = "Absatzrand oben" ; Text [ english_us ] = "Top paragraph border" ; + Text[ portuguese ] = "Top paragraph border"; + Text[ russian ] = "Top paragraph border"; + Text[ greek ] = "Top paragraph border"; + Text[ dutch ] = "Top paragraph border"; + Text[ french ] = "Marge de paragraphe suprieure"; + Text[ spanish ] = "Borde superior del prrafo"; + Text[ finnish ] = "Top paragraph border"; + Text[ italian ] = "Margine superiore paragrafo"; + Text[ danish ] = "Top paragraph border"; + Text[ swedish ] = "Styckemarginal verst"; + Text[ polish ] = "Top paragraph border"; + Text[ portuguese_brazilian ] = "Top paragraph border"; + Text[ japanese ] = "段落の上余白"; + Text[ korean ] = "단락 여백 위쪽"; + Text[ chinese_simplified ] = "段落边框 上方"; + Text[ chinese_traditional ] = "段落邊框 上方"; + Text[ turkish ] = "Top paragraph border"; + Text[ arabic ] = "Top paragraph border"; + Text[ catalan ] = "Top paragraph border"; + Text[ thai ] = "Top paragraph border"; }; String STR_REL_FRM_BOTTOM { TEXT = "Absatzrand unten" ; Text [ english_us ] = "Bottom paragraph border" ; + Text[ portuguese ] = "Bottom paragraph border"; + Text[ russian ] = "Bottom paragraph border"; + Text[ greek ] = "Bottom paragraph border"; + Text[ dutch ] = "Bottom paragraph border"; + Text[ french ] = "Marge de paragraphe infrieure"; + Text[ spanish ] = "Borde inferior del prrafo"; + Text[ finnish ] = "Bottom paragraph border"; + Text[ italian ] = "Margine inferiore paragrafo"; + Text[ danish ] = "Bottom paragraph border"; + Text[ swedish ] = "Styckemarginal nederst"; + Text[ polish ] = "Bottom paragraph border"; + Text[ portuguese_brazilian ] = "Bottom paragraph border"; + Text[ japanese ] = "段落の下余白"; + Text[ korean ] = "단락 여백 아래쪽"; + Text[ chinese_simplified ] = "段落边框 下方"; + Text[ chinese_traditional ] = "段落邊框 下方"; + Text[ turkish ] = "Bottom paragraph border"; + Text[ arabic ] = "Bottom paragraph border"; + Text[ catalan ] = "Bottom paragraph border"; + Text[ thai ] = "Bottom paragraph border"; }; String STR_FROMRIGHT { TEXT = "Von rechts" ; TEXT [ english_us ] = "From right" ; + TEXT[ portuguese ] = "From right"; + TEXT[ russian ] = "From right"; + TEXT[ greek ] = "From right"; + TEXT[ dutch ] = "From right"; + TEXT[ french ] = "De droite"; + TEXT[ spanish ] = "De la derecha"; + TEXT[ finnish ] = "From right"; + TEXT[ italian ] = "Da destra"; + TEXT[ danish ] = "From right"; + TEXT[ swedish ] = "Frn hger"; + TEXT[ polish ] = "From right"; + TEXT[ portuguese_brazilian ] = "From right"; + TEXT[ japanese ] = "右から"; + TEXT[ korean ] = "오른쪽으로부터"; + TEXT[ chinese_simplified ] = "从右"; + TEXT[ chinese_traditional ] = "從右"; + TEXT[ turkish ] = "From right"; + TEXT[ arabic ] = "From right"; + TEXT[ catalan ] = "From right"; + TEXT[ thai ] = "From right"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/frmdlg/makefile.mk b/sw/source/ui/frmdlg/makefile.mk index 3027e131d121..af46f368ea76 100644 --- a/sw/source/ui/frmdlg/makefile.mk +++ b/sw/source/ui/frmdlg/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: os $ $Date: 2001-02-09 07:41:30 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:43:35 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -117,6 +117,11 @@ SLOFILES = \ $(SLO)$/uiborder.obj \ $(SLO)$/wrap.obj +.IF "$(OS)"=="SOLARIS" +NOOPTFILES = \ + $(SLO)$/frmex.obj +.ENDIF # "$(OS)"=="SOLARIS" + # --- Tagets ------------------------------------------------------- .INCLUDE : target.mk diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src index d35aced4878c..2bd500fdf379 100644 --- a/sw/source/ui/frmdlg/wrap.src +++ b/sw/source/ui/frmdlg/wrap.src @@ -2,9 +2,9 @@ * * $RCSfile: wrap.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: os $ $Date: 2002-09-06 13:48:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,12 +78,12 @@ TabPage TP_FRM_WRAP Text[ ENGLISH ] = "Presets"; Text[ english_us ] = "Settings"; Text[ portuguese ] = "Predefinies"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ greek ] = "Presets"; Text[ dutch ] = "Standaard"; Text[ french ] = "Dfinitions"; Text[ spanish ] = "Predeterminaciones"; - Text[ finnish ] = "Presets"; + Text[ finnish ] = "Asetukset"; Text[ italian ] = "Predefiniti"; Text[ danish ] = "Forudindstillinger"; Text[ swedish ] = "Frinstllningar"; @@ -116,7 +116,7 @@ TabPage TP_FRM_WRAP Text [ portuguese ] = "~Nenhum" ; Text [ portuguese_brazilian ] = "~Kein" ; Text[ chinese_simplified ] = "无(~N)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Brak"; Text[ japanese ] = "上下(~N)"; Text[ language_user1 ] = ""; @@ -126,7 +126,7 @@ TabPage TP_FRM_WRAP Text[ korean ] = "없음(~N)"; Text[ turkish ] = "~Yok"; Text[ catalan ] = "C~ap"; - Text[ finnish ] = "~Ei mitn"; + Text[ finnish ] = "Ei mitn"; Text[ thai ] = "ไ~ม่มี"; }; ImageRadioButton RB_WRAP_LEFT @@ -143,7 +143,7 @@ TabPage TP_FRM_WRAP Text[ dutch ] = "~Links"; Text[ french ] = "Avant"; Text[ spanish ] = "Antes"; - Text[ finnish ] = "~Vasen:"; + Text[ finnish ] = "Vasen"; Text[ italian ] = "Prima"; Text[ danish ] = "Venstre"; Text[ swedish ] = "Fre"; @@ -172,9 +172,9 @@ TabPage TP_FRM_WRAP Text[ dutch ] = "~Rechts"; Text[ french ] = "Aprs"; Text[ spanish ] = "Despus"; - Text[ finnish ] = "~Oikea"; + Text[ finnish ] = "Oikea"; Text[ italian ] = "Dopo"; - Text[ danish ] = "Hjre"; + Text[ danish ] = "Hj~re"; Text[ swedish ] = "Efter"; Text[ polish ] = "Z prawej"; Text[ portuguese_brazilian ] = "~Rechts"; @@ -205,7 +205,7 @@ TabPage TP_FRM_WRAP Text [ portuguese ] = "~Paralelo" ; Text [ portuguese_brazilian ] = "~Parallel" ; Text[ chinese_simplified ] = "平行(~P)"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Rwn~olegle"; Text[ japanese ] = "両側(~P)"; Text[ chinese_traditional ] = "平行(~P)"; @@ -214,7 +214,7 @@ TabPage TP_FRM_WRAP Text[ korean ] = "평행(~P)"; Text[ turkish ] = "~Paralel"; Text[ catalan ] = "~Paral.lel"; - Text[ finnish ] = "~Samansuuntainen"; + Text[ finnish ] = "Ymprill"; Text[ thai ] = "~ขนาน"; }; ImageRadioButton RB_WRAP_THROUGH @@ -228,7 +228,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "Attraverso" ; Text [ portuguese_brazilian ] = "Circundarmento ~atrav?s" ; Text [ portuguese ] = "~Atravs do objecto" ; - Text [ finnish ] = "~Kautta" ; + Text [ finnish ] = "Lpi" ; Text [ danish ] = "Gennem" ; Text [ french ] = "Continu" ; Text [ swedish ] = "Genomfl~de" ; @@ -243,7 +243,7 @@ TabPage TP_FRM_WRAP Text[ chinese_traditional ] = "不環繞(~U)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "문장 흐르기(~U)"; + Text[ korean ] = "배치 없음(~U)"; Text[ turkish ] = "~Metin arkasna gnder"; Text[ catalan ] = "~Continu"; Text[ thai ] = "~ผ่าน"; @@ -272,10 +272,10 @@ TabPage TP_FRM_WRAP Text[ chinese_traditional ] = "最適(~O)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "최적의(~O)"; + Text[ korean ] = "최적(~O)"; Text[ turkish ] = "D~inamik"; Text[ catalan ] = "Din~mic"; - Text[ finnish ] = "~Optimaalinen"; + Text[ finnish ] = "Optimaalinen"; Text[ thai ] = "เ~หมาะที่สุด"; }; @@ -301,10 +301,10 @@ TabPage TP_FRM_WRAP Text[ chinese_traditional ] = "第一段落(~F)"; Text[ arabic ] = " "; Text[ greek ] = " ~"; - Text[ korean ] = "첫 단락(~F)"; + Text[ korean ] = "첫번째 단락(~F)"; Text[ turkish ] = "lk paragraf"; Text[ catalan ] = "Primer pargra~f"; - Text[ finnish ] = "~Ensimminen kappale"; + Text[ finnish ] = "Ensimminen kappale"; Text[ thai ] = "ย่อหน้าแ~รก"; }; CheckBox CB_TRANSPARENT @@ -332,7 +332,7 @@ TabPage TP_FRM_WRAP Text[ korean ] = "배경에(~K)"; Text[ turkish ] = "Arta~landa"; Text[ catalan ] = "En el ~fons"; - Text[ finnish ] = "~Taustalla"; + Text[ finnish ] = "Taustalla"; Text[ thai ] = "ในพื้น~หลัง"; }; CheckBox CB_OUTLINE @@ -361,7 +361,7 @@ TabPage TP_FRM_WRAP Text[ korean ] = "윤곽(~C)"; Text[ turkish ] = "Kontu~r"; Text[ catalan ] = "~Contorn"; - Text[ finnish ] = "~riviiva"; + Text[ finnish ] = "riviiva"; Text[ thai ] = "เ~ส้นแสดงรูปร่าง"; }; CheckBox CB_ONLYOUTSIDE @@ -437,7 +437,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "Sinistra" ; Text [ portuguese_brazilian ] = "~Esquerda" ; Text [ portuguese ] = "~Esquerda" ; - Text [ finnish ] = "~Vasen" ; + Text [ finnish ] = "Vasen" ; Text [ danish ] = "Venstre" ; Text [ french ] = " gauche" ; Text [ swedish ] = "~Vnster" ; @@ -482,7 +482,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "Destra" ; Text [ portuguese_brazilian ] = "~Direita" ; Text [ portuguese ] = "~Direita" ; - Text [ finnish ] = "~Oikea" ; + Text [ finnish ] = "Oikea" ; Text [ danish ] = "Hjre" ; Text [ french ] = " droite" ; Text [ swedish ] = "H~ger" ; @@ -527,7 +527,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "In alto" ; Text [ portuguese_brazilian ] = "~Topo" ; Text [ portuguese ] = "~Topo" ; - Text [ finnish ] = "~Ylosa" ; + Text [ finnish ] = "Ylreuna" ; Text [ danish ] = "~verst" ; Text [ french ] = "En haut" ; Text [ swedish ] = "~Uppe" ; @@ -572,7 +572,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "~Basso" ; Text [ portuguese_brazilian ] = "~Base" ; Text [ portuguese ] = "Em ~baixo" ; - Text [ finnish ] = "~Alaosa" ; + Text [ finnish ] = "Alareuna" ; Text [ danish ] = "Nederst" ; Text [ french ] = "En bas" ; Text [ swedish ] = "N~ere" ; @@ -617,7 +617,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "Distanze" ; Text [ portuguese_brazilian ] = "Margens" ; Text [ portuguese ] = "Espaamento" ; - Text [ finnish ] = "Objektivlit" ; + Text [ finnish ] = "Vlit" ; Text [ danish ] = "Afstand" ; Text [ french ] = "carts" ; Text [ swedish ] = "Avstnd" ; @@ -664,5 +664,25 @@ TabPage TP_FRM_WRAP MaskColor = IMAGE_MASK_COLOR ; WRAP_IDLIST }; + }; + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/globdoc/globdoc.src b/sw/source/ui/globdoc/globdoc.src index d3b29ce14eac..20b04b29918d 100644 --- a/sw/source/ui/globdoc/globdoc.src +++ b/sw/source/ui/globdoc/globdoc.src @@ -2,9 +2,9 @@ * * $RCSfile: globdoc.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: os $ $Date: 2002-04-19 09:51:12 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,22 +71,23 @@ String STR_HUMAN_SWGLOBDOC_NAME Text [ italian ] = "Documento master" ; Text [ spanish ] = "Documento maestro" ; Text [ french ] = "Document matre" ; - Text [ dutch ] = "Master-document" ; + Text [ dutch ] = "Masterdocument" ; Text [ portuguese ] = "Documento-mestre" ; - Text[ chinese_simplified ] = "ĵ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "主控文档"; + Text[ russian ] = " "; Text[ polish ] = "Dokument gwny"; - Text[ japanese ] = "Ͻ"; - Text[ chinese_traditional ] = "D"; + Text[ japanese ] = "マスタードキュメント"; + Text[ chinese_traditional ] = "主控文件"; Text[ arabic ] = " "; - Text[ dutch ] = "Master-document"; - Text[ chinese_simplified ] = "ĵ"; + Text[ dutch ] = "Masterdocument"; + Text[ chinese_simplified ] = "主控文档"; Text[ greek ] = "K "; - Text[ korean ] = " "; + Text[ korean ] = "마스터 문서"; Text[ turkish ] = "Ana belge"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Documento maestro"; - Text[ finnish ] = "Pasiakirja"; + Text[ catalan ] = "Document mestre"; + Text[ finnish ] = "Perusasiakirja"; + Text[ thai ] = "เอกสารต้นฉบับ"; }; String STR_WRITER_GLOBALDOC_FULLTYPE_40 { @@ -102,24 +103,25 @@ String STR_WRITER_GLOBALDOC_FULLTYPE TEXT [ English ] = "%PRODUCTNAME 6.0 Master Document" ; TEXT[ english_us ] = "%PRODUCTNAME 6.0 Master Document"; TEXT[ portuguese ] = "%PRODUCTNAME 6.0 Documento-mestre"; - TEXT[ russian ] = " (%PRODUCTNAME 6.0)"; + TEXT[ russian ] = " (%PRODUCTNAME 6.0)"; TEXT[ greek ] = "%PRODUCTNAME 6.0 - "; - TEXT[ dutch ] = "%PRODUCTNAME 6.0 Master Document"; + TEXT[ dutch ] = "%PRODUCTNAME 6.0 Masterdocument"; TEXT[ french ] = "%PRODUCTNAME 6.0 Document matre"; - TEXT[ spanish ] = "%PRODUCTNAME 6.0 Documento maestro"; + TEXT[ spanish ] = "%PRODUCTNAME 6.0 - Documento maestro"; TEXT[ italian ] = "Documento master %PRODUCTNAME 6.0"; - TEXT[ danish ] = "%PRODUCTNAME 6.0 Master Document"; + TEXT[ danish ] = "%PRODUCTNAME 6.0 Hoveddokument"; TEXT[ swedish ] = "Samlingsdokument %PRODUCTNAME 6.0"; TEXT[ polish ] = "%PRODUCTNAME 6.0 - Dokument gwny"; TEXT[ portuguese_brazilian ] = "%PRODUCTNAME 6.0 Master Document"; - TEXT[ japanese ] = "%PRODUCTNAME 6.0 Ͻ"; - TEXT[ korean ] = "%PRODUCTNAME 6.0 "; - TEXT[ chinese_simplified ] = "%PRODUCTNAME 6.0 ĵ"; - TEXT[ chinese_traditional ] = "%PRODUCTNAME 6.0 D"; + TEXT[ japanese ] = "%PRODUCTNAME 6.0 マスタードキュメント"; + TEXT[ korean ] = "%PRODUCTNAME 6.0 마스터 문서"; + TEXT[ chinese_simplified ] = "%PRODUCTNAME 6.0 主控文档"; + TEXT[ chinese_traditional ] = "%PRODUCTNAME 6.0 主控文件"; TEXT[ turkish ] = "%PRODUCTNAME 6.0 Master Document"; TEXT[ arabic ] = "%PRODUCTNAME 6.0 Master Document"; - TEXT[ catalan ] = "%PRODUCTNAME 6.0 Master Document"; - TEXT[ finnish ] = "%PRODUCTNAME 6.0 Global Dokument"; + TEXT[ catalan ] = "%PRODUCTNAME 6.0 Document mestre"; + TEXT[ finnish ] = "%PRODUCTNAME 6.0 -perusasiakirja"; + TEXT[ thai ] = "เอกสารต้นฉบับ %PRODUCTNAME 6.0 "; }; #define MN_SW_GLOBAL @@ -128,3 +130,8 @@ String STR_WRITER_GLOBALDOC_FULLTYPE #include "swmn.hrc" + + + + + diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index 68c8c15230be..e67dbaf985bf 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.hrc @@ -2,9 +2,9 @@ * * $RCSfile: app.hrc,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:14:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,7 +118,7 @@ #define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) #define STR_WESTERN_FONT (RC_APP_BEGIN + 77) #define STR_CJK_FONT (RC_APP_BEGIN + 78) -#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79) +//#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79) #define MSG_PRINT_AS_MERGE (RC_APP_BEGIN + 80) #define MSG_MERGE_SOURCE_UNAVAILABLE (RC_APP_BEGIN + 81) #define MSG_DATA_SOURCES_UNAVAILABLE (RC_APP_BEGIN + 82) diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx index 119ff72d9e5b..8142ecb3d415 100644 --- a/sw/source/ui/inc/chartins.hxx +++ b/sw/source/ui/inc/chartins.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chartins.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:27:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,8 @@ #include <sfx2/basedlgs.hxx> #endif -#ifndef _FIXED_HXX //autogen -#include <vcl/fixed.hxx> +#ifndef _STDCTRL_HXX +#include <svtools/stdctrl.hxx> #endif #ifndef _BUTTON_HXX //autogen @@ -99,7 +99,7 @@ class SwInsertChartDlg : public SfxModelessDialog FixedText aRangeFt; AutoEdit aRangeEd; - FixedText aTextFt; + FixedInfo aTextFt; HelpButton aHelp; CancelButton aCancel; @@ -117,6 +117,7 @@ class SwInsertChartDlg : public SfxModelessDialog String aAktTableName; BOOL bUpdateChartData; BOOL bChartInserted; + BOOL bChildOpen; void UpdateData(); virtual BOOL Close(); @@ -132,6 +133,8 @@ public: DECL_LINK( FinishHdl, Button* ); DECL_LINK( CloseHdl, Button* ); DECL_LINK( ClickHdl, CheckBox* ); + + virtual void Activate(); }; #endif diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index c3476542c14f..ed6e057b4855 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -2,9 +2,9 @@ * * $RCSfile: edtwin.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2002-11-06 12:47:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -302,6 +302,9 @@ public: static void _InitStaticData(); static void _FinitStaticData(); + //#i3370# remove quick help to prevent saving of autocorrection suggestions + void StopQuickHelp(); + SwEditWin(Window *pParent, SwView &); virtual ~SwEditWin(); }; diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/ui/inc/fldtdlg.hxx index d7eaa7a41a3e..ccb1a7d22a1c 100644 --- a/sw/source/ui/inc/fldtdlg.hxx +++ b/sw/source/ui/inc/fldtdlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fldtdlg.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:11:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,6 +79,7 @@ class SwFldDlg: public SfxTabDialog { SwChildWinWrapper* pChildWin; BOOL bHtmlMode; + BOOL bDataBaseMode; virtual BOOL Close(); virtual SfxItemSet* CreateInputItemSet( USHORT nId ); diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/ui/inc/fldwrap.hxx index 4784d04265cf..50b5df670af9 100644 --- a/sw/source/ui/inc/fldwrap.hxx +++ b/sw/source/ui/inc/fldwrap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fldwrap.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,20 @@ public: virtual BOOL ReInitDlg(SwDocShell *pDocSh); void ShowPage(USHORT nPage = 0); }; +/* -----------------04.02.2003 14:14----------------- + * field dialog only showing database page to support + * mail merge + * --------------------------------------------------*/ +class SwFldDataOnlyDlgWrapper : public SwChildWinWrapper +{ +public: + SwFldDataOnlyDlgWrapper( Window* pParent, USHORT nId, + SfxBindings* pBindings, SfxChildWinInfo* pInfo ); + + SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper); + + virtual BOOL ReInitDlg(SwDocShell *pDocSh); +}; #endif diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index b187a375dece..6fa5d7dde817 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:14:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,10 @@ #include <vcl/edit.hxx> #endif +#ifndef _STDCTRL_HXX +#include <svtools/stdctrl.hxx> +#endif + #ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> #endif @@ -206,5 +210,26 @@ public: BOOL IsThisDocument() const {return aThisDocRB.IsChecked();} }; +/* -----------------04.02.2003 13:41----------------- + * + * --------------------------------------------------*/ +class SwMailMergeFieldConnectionsDlg : public ModalDialog +{ + FixedLine aConnectionsFL; + RadioButton aUseExistingRB; + RadioButton aCreateNewRB; + + FixedInfo aInfoFI; + + OKButton aOK; + CancelButton aCancel; + HelpButton aHelp; +public: + SwMailMergeFieldConnectionsDlg(Window* pParent); + ~SwMailMergeFieldConnectionsDlg(); + + BOOL IsUseExistingConnections() const {return aUseExistingRB.IsChecked();} +}; + #endif diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index c94ecffd5b25..ef488977fbc3 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pview.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: od $ $Date: 2002-12-06 16:16:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,20 +92,22 @@ class SwRect; class DataChangedEvent; class CommandEvent; class SvtAccessibilityOptions; +// OD 12.12.2002 #103492# +class SwPagePreviewLayout; class SwPagePreViewWin : public Window { ViewShell* mpViewShell; - USHORT mnSttPage, mnVirtPage, mnSelectedPage; + USHORT mnSttPage, mnVirtPage; BYTE mnRow, mnCol; - Size maPxWinSize, maPgSize; - // OD 02.12.2002 #103492 - Size maPreviewDocSize; + Size maPxWinSize; Fraction maScale; SwPagePreView& mrView; // OD 02.12.2002 #103492# bool mbCalcScaleForPreviewLayout; Rectangle maPaintedPreviewDocRect; + // OD 12.12.2002 #103492# + SwPagePreviewLayout* mpPgPrevwLayout; void SetPagePreview( BYTE nRow, BYTE nCol ); @@ -120,7 +122,8 @@ public: virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void DataChanged( const DataChangedEvent& ); - void SetViewShell( ViewShell* pShell ) { mpViewShell = pShell; } + void SetViewShell( ViewShell* pShell ); + ViewShell* GetViewShell() const { return mpViewShell; } BYTE GetRow() const { return mnRow; } @@ -134,7 +137,27 @@ public: void SetSttPage( USHORT n ) { mnSttPage = mnVirtPage = n; if( !n ) ++mnVirtPage; } - USHORT& GetSelectedPage() {return mnSelectedPage;} + /** get selected page number of document preview + + OD 13.12.2002 #103492# + + @author OD + + @return selected page number + */ + sal_uInt16 SelectedPage() const; + + /** set selected page number in document preview + + OD 13.12.2002 #103492# + + @author OD + + @param _nSelectedPageNum + input parameter - physical page number of page that will be the selected one. + */ + void SetSelectedPage( sal_uInt16 _nSelectedPageNum ); + //JP 19.08.98: bei Einspaltigkeit gibt es keine 0. Seite! USHORT GetDefSttPage() const { return 1 == mnCol ? 1 : 0; } @@ -143,27 +166,25 @@ public: const Size& GetWinSize() const { return maPxWinSize; } void SetWinSize( const Size& rNewSize ); - enum MoveMode{ MV_CALC, MV_PAGE_UP, MV_PAGE_DOWN, MV_DOC_STT, MV_DOC_END }; + // OD 18.12.2002 #103492# - add <MV_SELPAGE>, <MV_SCROLL> + enum MoveMode{ MV_CALC, MV_PAGE_UP, MV_PAGE_DOWN, MV_DOC_STT, MV_DOC_END, + MV_SELPAGE, MV_SCROLL, MV_NEWWINSIZE }; int MovePage( int eMoveMode ); // erzeuge den String fuer die StatusLeiste void GetStatusStr( String& rStr, USHORT nPageCount ) const; - void GetOptimalSize( Size& rSize ) const; void RepaintCoreRect( const SwRect& rRect ); /** method to adjust preview to a new zoom factor OD 02.12.2002 #103492# - paint of preview is prepare and performed for a new zoom factor + paint of preview is prepared for a new zoom factor @author OD */ void AdjustPreviewToNewZoom( const sal_uInt16 nZoomFactor ); - const Size& GetPreviewDocSize() const - { return maPreviewDocSize;} - const Rectangle& GetPaintedPreviewDocRect() const { return maPaintedPreviewDocRect;} void Scroll(long nXMove, long nYMove); @@ -208,6 +229,12 @@ class SwPagePreView: public SfxViewShell USHORT mnPageCount; BOOL bNormalPrint; + // OD 09.01.2003 #106334# + // new members to reset design mode at draw view for form shell on switching + // back from writer page preview to normal view. + sal_Bool mbResetFormDesignMode:1; + sal_Bool mbFormDesignModeToReset:1; + void Init(const SwViewOption* = 0); Point AlignToPixel(const Point& rPt) const; @@ -228,6 +255,21 @@ class SwPagePreView: public SfxViewShell void CalcAndSetBorderPixel( SvBorder &rToFill, FASTBOOL bInner ); + /** help method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN + + OD 04.03.2003 #107369# + + @param _bPgUp + input parameter - boolean that indicates, if FN_PAGE_UP or FN_PAGE_DOWN + has to be executed. + + @param _pReq + optional input parameter - pointer to the <SfxRequest> instance, if existing. + + @author OD + */ + void _ExecPgUpAndPgDown( const bool _bPgUp, + SfxRequest* _pReq = 0 ); protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); @@ -284,6 +326,32 @@ public: //apply Accessiblity options void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); + // OD 09.01.2003 #106334# - inline method to request values of new members + // <mbResetFormDesignMode> and <mbFormDesignModeToReset> + inline sal_Bool ResetFormDesignMode() const + { + return mbResetFormDesignMode; + } + + inline sal_Bool FormDesignModeToReset() const + { + return mbFormDesignModeToReset; + } + + /** adjust position of vertical scrollbar + + OD 19.02.2003 #107369 + Currently used, if the complete preview layout rows fit into to the given + window, if a new page is selected and this page is visible. + + @author OD + + @param _nNewThumbPos + input parameter - new position, which will be assigned to the vertical + scrollbar. + */ + void SetVScrollbarThumbPos( const sal_uInt16 _nNewThumbPos ); + SwPagePreView( SfxViewFrame* pFrame, SfxViewShell* ); ~SwPagePreView(); }; diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc index a21b7873bed3..458bce22870f 100644 --- a/sw/source/ui/inc/shells.hrc +++ b/sw/source/ui/inc/shells.hrc @@ -2,9 +2,9 @@ * * $RCSfile: shells.hrc,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: os $ $Date: 2002-08-30 10:33:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,9 @@ #define STR_NAME_GROUP_LABEL (RC_SHELLS_BEGIN + 58) #define STR_NAME_GROUP_DIALOG (RC_SHELLS_BEGIN + 59) -#define SHELLS_ACT_END STR_NAME_GROUP_DIALOG +#define RID_MODULE_TOOLBOX (RC_SHELLS_BEGIN + 60) + +#define SHELLS_ACT_END RID_MODULE_TOOLBOX #if SHELLS_ACT_END > RC_SHELLS_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index c08ee612ec9d..91a2d8197be6 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swdtflvr.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: mba $ $Date: 2002-07-01 13:03:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,6 +86,7 @@ class SwTextBlocks; class SwWrtShell; class Reader; class SvxClipboardFmtItem; +class ViewShell; enum TransferBufferType { @@ -110,6 +111,9 @@ class SwTransferable : public TransferableHelper ::so3::SvBaseLinkRef refDdeLink; SwWrtShell *pWrtShell; + /* #96392# Added pCreatorView to distinguish SwFrameShell from + SwWrtShell. */ + const ViewShell *pCreatorView; SwDocFac *pClpDocFac; Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf; INetBookmark *pBkmk; // URL und Beschreibung! @@ -224,7 +228,7 @@ public: static int PasteFormat( SwWrtShell& rSh, TransferableDataHelper& rData, ULONG nFormat ); - static void FillClipFmtItem( SwWrtShell& rSh, + static void FillClipFmtItem( const SwWrtShell& rSh, const TransferableDataHelper& rData, SvxClipboardFmtItem & rToFill ); @@ -234,8 +238,11 @@ public: void SetCleanUp( BOOL bFlag ) { bCleanUp = bFlag; } // Interfaces for Selection - static void CreateSelection( SwWrtShell& rSh ); - static void ClearSelection( SwWrtShell& rSh ); + /* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */ + static void CreateSelection( SwWrtShell & rSh, + const ViewShell * pCreator = NULL ); + static void ClearSelection( SwWrtShell& rSh, + const ViewShell * pCreator = NULL ); }; diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 7ce4fcd5bb07..e1c5c67498d1 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -2,9 +2,9 @@ * * $RCSfile: view.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: tl $ $Date: 2002-11-13 14:29:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -292,7 +292,9 @@ class SwView: public SfxViewShell bInInnerResizePixel : 1, bIsApi : 1, bPasteState : 1, - bPasteSpecialState : 1 + bPasteSpecialState : 1, + bInMailMerge : 1, + bInDtor : 1 //detect destructor to prevent creating of sub shells while closing ; // Methoden fuers Suchen @@ -405,6 +407,9 @@ protected: const SwFrmFmt* GetLastTblFrmFmt() const {return pLastTableFormat;} void SetLastTblFrmFmt(const SwFrmFmt* pSet) {pLastTableFormat = pSet;} + // form letter execution + void GenerateFormLetter(BOOL bUseCurrentDocument); + public: SFX_DECL_VIEWFACTORY(SwView); @@ -600,6 +605,8 @@ public: BOOL IsPasteAllowed(); BOOL IsPasteSpecialAllowed(); + // Enable mail merge - mail merge field dialog enabled + void EnableMailMerge(BOOL bEnable = TRUE); //apply Accessiblity options void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 896e001aa46f..a040cb8ad3b7 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cntex.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2002-10-22 07:16:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -387,7 +387,8 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_USE_DASH, 0 != (nIdxOptions&TOI_DASH )); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_USE_UPPER_CASE, 0 != (nIdxOptions&TOI_INITIAL_CAPS )); - lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LABEL_CATEGORY, rDesc.GetSequenceName()); + String aTmpName( SwStyleNameMapper::GetSpecialExtraProgName( rDesc.GetSequenceName() ) ); + lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LABEL_CATEGORY, aTmpName ); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_LABELS, !rDesc.IsCreateFromObjectNames()); sal_Int16 nSet = text::ChapterFormat::NAME_NUMBER; diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 1ba409e00b80..d8f2ba49558b 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cnttab.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: os $ $Date: 2002-10-30 10:41:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -724,7 +724,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox ) Window *pTopmostParent = this; while(pTopmostParent->GetParent()) pTopmostParent = pTopmostParent->GetParent(); - ::Rectangle aRect(GetWindowExtentsRelative(pTopmostParent)); + ::Rectangle aRect(GetClientWindowExtentsRelative(pTopmostParent)); ::Point aPos = aRect.TopLeft(); Size aSize = GetSizePixel(); if(pBox) diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src index 9e634b870c8e..96df04c34276 100644 --- a/sw/source/ui/index/cnttab.src +++ b/sw/source/ui/index/cnttab.src @@ -2,9 +2,9 @@ * * $RCSfile: cnttab.src,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: rt $ $Date: 2002-12-09 09:58:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,7 +141,7 @@ String STR_LEVEL Text[ polish ] = "Poziom "; Text[ japanese ] = "レベル "; Text[ greek ] = " "; - Text[ korean ] = "계층 "; + Text[ korean ] = "수준"; Text[ chinese_traditional ] = "級 "; Text[ arabic ] = " "; Text[ turkish ] = "Dzey "; @@ -212,7 +212,7 @@ TabDialog DLG_MULTI_TOX Text[ polish ] = "Indeks"; Text[ portuguese_brazilian ] = "Index"; Text[ japanese ] = "目次と索引"; - Text[ korean ] = "색인"; + Text[ korean ] = "색인/목차"; Text[ chinese_simplified ] = "目录"; Text[ chinese_traditional ] = "目錄"; Text[ arabic ] = ""; @@ -272,7 +272,7 @@ TabDialog DLG_MULTI_TOX Text[ chinese_traditional ] = "樣式"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "템플릿"; + Text[ korean ] = "스타일"; Text[ turkish ] = "ablonlar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estils"; @@ -412,7 +412,7 @@ TabDialog DLG_MULTI_TOX Text[ polish ] = "Wstaw indeks"; Text[ portuguese_brazilian ] = "Insert index"; Text[ japanese ] = "目次と索引の挿入"; - Text[ korean ] = "색인 삽입"; + Text[ korean ] = "색인 및 목차 삽입"; Text[ chinese_simplified ] = "插入目录"; Text[ chinese_traditional ] = "插入目錄"; Text[ arabic ] = " "; @@ -429,7 +429,7 @@ TabDialog DLG_MULTI_TOX Text[ polish ] = "Wstaw indeks"; Text[ portuguese_brazilian ] = "Insert index"; Text[ japanese ] = "目次と索引の挿入"; - Text[ korean ] = "색인 삽입"; + Text[ korean ] = "색인 및 목차 삽입"; Text[ chinese_simplified ] = "插入目录"; Text[ chinese_traditional ] = "插入目錄"; Text[ arabic ] = " "; @@ -465,7 +465,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Typ i tytu"; Text[ portuguese_brazilian ] = "Type and title"; Text[ japanese ] = "種類とタイトル"; - Text[ korean ] = "유형과 제목"; + Text[ korean ] = "유형 및 제목"; Text[ chinese_simplified ] = "类型和标题"; Text[ chinese_traditional ] = "類型和標題"; Text[ arabic ] = " "; @@ -708,7 +708,7 @@ TabPage TP_TOX_SELECT StringList [ korean ] = { < "목차" ; TO_CONTENT ;> ; - < "키워드 색인" ; TO_INDEX ;> ; + < "색인" ; TO_INDEX ;> ; < "삽화 색인" ; TO_ILLUSTRATION ;> ; < "표 색인" ; TO_TABLE ;> ; < "사용자 정의" ; TO_USER ;> ; @@ -806,7 +806,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Chroniony przed rcznymi zmianami"; Text[ portuguese_brazilian ] = "Protected against manual changes"; Text[ japanese ] = "任意変更から保護"; - Text[ korean ] = "수동 변경으로 부터 보호"; + Text[ korean ] = "임의 변경으로부터 보호"; Text[ chinese_simplified ] = "防止手动更改"; Text[ chinese_traditional ] = "不允許手動變更"; Text[ arabic ] = " "; @@ -836,7 +836,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Utwrz indeks"; Text[ portuguese_brazilian ] = "Create index of"; Text[ japanese ] = "目次と索引の作成"; - Text[ korean ] = "인덱스 만들기"; + Text[ korean ] = "색인 및 목차 만들기"; Text[ chinese_simplified ] = "新增目录"; Text[ chinese_traditional ] = "新增目錄"; Text[ turkish ] = "Create index of"; @@ -852,7 +852,7 @@ TabPage TP_TOX_SELECT Text [ ENGLISH ] = "Type" ; Text[ english_us ] = "for"; Text[ portuguese ] = "Tipo"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "voor"; Text[ french ] = "Pour"; @@ -864,7 +864,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Dotyczy"; Text[ portuguese_brazilian ] = "Type"; Text[ japanese ] = "対象"; - Text[ korean ] = "유형"; + Text[ korean ] = "대상"; Text[ chinese_simplified ] = "用于"; Text[ chinese_traditional ] = "用於"; Text[ turkish ] = "Type"; @@ -1019,7 +1019,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Ewaluuj do poziomu"; Text[ portuguese_brazilian ] = "Evaluation level"; Text[ japanese ] = "次のレベルまで適用"; - Text[ korean ] = "평가 단계"; + Text[ korean ] = "다음 수준까지 적용"; Text[ chinese_simplified ] = "包括级别"; Text[ chinese_traditional ] = "包括級別"; Text[ turkish ] = "u dzeye kadar:"; @@ -1127,7 +1127,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Inne style"; Text[ portuguese_brazilian ] = "additional styles"; Text[ japanese ] = "その他のスタイル(~A)"; - Text[ korean ] = "기타 템플릿(~A)"; + Text[ korean ] = "스타일 옵션(~A)"; Text[ chinese_simplified ] = "其它样式(~A)"; Text[ chinese_traditional ] = "其他樣式(~A)"; Text[ arabic ] = " "; @@ -1399,7 +1399,7 @@ TabPage TP_TOX_SELECT StringList [ korean ] = { < "참조" ; > ; - < "범주와 번호" ; > ; + < "범주 및 번호" ; > ; < "캡션 텍스트" ; > ; }; StringList [ chinese_simplified ] = @@ -1542,7 +1542,7 @@ TabPage TP_TOX_SELECT Text[ greek ] = " ~"; Text[ dutch ] = "Samenvatten ~met -"; Text[ french ] = "A~vec -"; - Text[ spanish ] = "U~nir con -"; + Text[ spanish ] = "~Combinar con -"; Text[ italian ] = "Riunisci ~con -"; Text[ danish ] = "Kombiner med -"; Text[ swedish ] = "Kombinera ~med -"; @@ -1595,7 +1595,7 @@ TabPage TP_TOX_SELECT Text [ ENGLISH ] = "Capitalize entries"; Text[ english_us ] = "AutoCapitalize entries"; Text[ portuguese ] = "~Escrever entradas em maisculas autom."; - Text[ russian ] = " (.)"; + Text[ russian ] = " ()"; Text[ greek ] = " "; Text[ dutch ] = "Items automatisch met ~hoofdletter"; Text[ french ] = "Entres en majuscules (autom.)"; @@ -1606,7 +1606,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Zaczynaj wpisy autom. od wielkiej litery"; Text[ portuguese_brazilian ] = "Capitalize entries"; Text[ japanese ] = "語頭を自動的に大文字にする"; - Text[ korean ] = "입력 자동으로 대문자"; + Text[ korean ] = "어두를 자동으로 대문자로 바꿈"; Text[ chinese_simplified ] = "自动转换成大写条目"; Text[ chinese_traditional ] = "轉動轉換成大寫字母"; Text[ arabic ] = " "; @@ -1656,7 +1656,7 @@ TabPage TP_TOX_SELECT Text[ greek ] = "~ "; Text[ dutch ] = "~Concordantiebestand"; Text[ french ] = "Fichier ~concordance"; - Text[ spanish ] = "~Archivo concordancia"; + Text[ spanish ] = "~Archivo de concordancia"; Text[ italian ] = "File di conco~rdanza"; Text[ danish ] = "Konkordansfil"; Text[ swedish ] = "Konkordansfil"; @@ -1865,7 +1865,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Grafiki"; Text[ portuguese_brazilian ] = "Graphics"; Text[ japanese ] = "図"; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ chinese_simplified ] = "图形"; Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; @@ -1923,7 +1923,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Poziom ze rda"; Text[ portuguese_brazilian ] = "Use level from source"; Text[ japanese ] = "もとの章のレベル"; - Text[ korean ] = "원래 장에서의 수준 사용"; + Text[ korean ] = "원래 장으로부터 수준 사용"; Text[ chinese_simplified ] = "使用源章节的级"; Text[ chinese_traditional ] = "級從源章節"; Text[ arabic ] = " "; @@ -2276,18 +2276,18 @@ TabPage TP_TOX_SELECT Text[ russian ] = "[none]"; Text[ greek ] = "[none]"; Text[ dutch ] = "[none]"; - Text[ french ] = "[none]"; - Text[ spanish ] = "[none]"; + Text[ french ] = "[aucun(e)]"; + Text[ spanish ] = "[Ninguno]"; Text[ finnish ] = "[none]"; - Text[ italian ] = "[none]"; + Text[ italian ] = "[nessuno]"; Text[ danish ] = "[none]"; - Text[ swedish ] = "[none]"; + Text[ swedish ] = "[ingen]"; Text[ polish ] = "[none]"; Text[ portuguese_brazilian ] = "[none]"; - Text[ japanese ] = "[none]"; - Text[ korean ] = "[none]"; - Text[ chinese_simplified ] = "[none]"; - Text[ chinese_traditional ] = "[none]"; + Text[ japanese ] = "[なし]"; + Text[ korean ] = "[없음]"; + Text[ chinese_simplified ] = "[无]"; + Text[ chinese_traditional ] = "[無]"; Text[ turkish ] = "[none]"; Text[ arabic ] = "[none]"; Text[ catalan ] = "[none]"; @@ -2312,7 +2312,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Formatowanie wpisw"; Text[ portuguese_brazilian ] = "Formatting of the marks"; Text[ japanese ] = "項目の書式"; - Text[ korean ] = "입력 서식 지정"; + Text[ korean ] = "항목 서식"; Text[ chinese_simplified ] = "条目的格式化"; Text[ chinese_traditional ] = "項目的格式化"; Text[ arabic ] = " "; @@ -2339,7 +2339,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Plik selekcyjny, przeznaczony dla skorowidza (*.sdi)"; Text[ portuguese_brazilian ] = "Mark up file for index"; Text[ japanese ] = "索引用の選択ファイル (*.sdi)"; - Text[ korean ] = "키워드 색인을 위한 선택 표시 파일 (*.sdi)"; + Text[ korean ] = "색인용 선택 파일 (*.sdi)"; Text[ chinese_simplified ] = "用于索引目录的标记文件(*.sdi)"; Text[ chinese_traditional ] = "用於索引目錄的標記檔案(*.sdi)"; Text[ arabic ] = " (*.sdi)"; @@ -2848,7 +2848,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Tabulator"; Text[ portuguese_brazilian ] = "Tab stop"; Text[ japanese ] = "タブ"; - Text[ korean ] = "탭 위치"; + Text[ korean ] = "탭 설정 위치"; Text[ chinese_simplified ] = "制表符"; Text[ chinese_traditional ] = "定位鍵"; Text[ arabic ] = " "; @@ -3036,7 +3036,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Styl znakw: "; Text[ portuguese_brazilian ] = "Character style: "; Text[ japanese ] = "文字スタイル: "; - Text[ korean ] = "문자 유형: "; + Text[ korean ] = "문자 스타일: "; Text[ chinese_simplified ] = "字符样式： "; Text[ chinese_traditional ] = "字元樣式： "; Text[ arabic ] = " : "; @@ -3055,7 +3055,7 @@ TabPage TP_TOX_ENTRY Text [ ENGLISH ] = "All" ; Text[ english_us ] = "~All"; Text[ portuguese ] = "~Nveis todos"; - Text[ russian ] = " "; + Text[ russian ] = " ~"; Text[ greek ] = "~ "; Text[ dutch ] = "~Alle niveaus"; Text[ french ] = "Tous"; @@ -3094,7 +3094,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Rozdzia nr."; Text[ portuguese_brazilian ] = "Chapter no."; Text[ japanese ] = "章番号"; - Text[ korean ] = "장 번호."; + Text[ korean ] = "장 번호"; Text[ chinese_simplified ] = "章节编号"; Text[ chinese_traditional ] = "章節編號"; Text[ arabic ] = " "; @@ -3116,7 +3116,7 @@ TabPage TP_TOX_ENTRY Text[ greek ] = " "; Text[ dutch ] = "Tekst~item"; Text[ french ] = "Texte"; - Text[ spanish ] = "Te~xto entrada"; + Text[ spanish ] = "Te~xto de entrada"; Text[ italian ] = "Testo voce"; Text[ danish ] = "Ele~menttekst"; Text[ swedish ] = "~Posttext"; @@ -3181,7 +3181,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Numer str."; Text[ portuguese_brazilian ] = "Page no."; Text[ japanese ] = "ページ番号"; - Text[ korean ] = "페이지 번호."; + Text[ korean ] = "페이지 번호"; Text[ chinese_simplified ] = "页码"; Text[ chinese_traditional ] = "頁碼"; Text[ arabic ] = " "; @@ -3298,7 +3298,7 @@ TabPage TP_TOX_ENTRY Text[ greek ] = ""; Text[ dutch ] = "~Verwijderen"; Text[ french ] = "Supprimer"; - Text[ spanish ] = "~Eliminar"; + Text[ spanish ] = "~Borrar"; Text[ italian ] = "Ri~muovi"; Text[ danish ] = "Fjern"; Text[ swedish ] = "~Ta bort"; @@ -3334,7 +3334,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Styl znaku"; Text[ portuguese_brazilian ] = "Character style"; Text[ japanese ] = "文字スタイル"; - Text[ korean ] = "문자 유형"; + Text[ korean ] = "문자 스타일"; Text[ chinese_simplified ] = "字符样式"; Text[ chinese_traditional ] = "字元樣式"; Text[ arabic ] = " "; @@ -3549,9 +3549,9 @@ TabPage TP_TOX_ENTRY }; StringList [ korean ] = { - < "숫자 범위만" ; > ; + < "번호 범위만" ; > ; < "설명만" ; > ; - < "숫자 범위와 설명" ; > ; + < "번호 범위 및 설명" ; > ; }; StringList [ chinese_simplified ] = { @@ -3615,7 +3615,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Pozycja tabulatora"; Text[ portuguese_brazilian ] = "Tab stop position"; Text[ japanese ] = "タブ位置"; - Text[ korean ] = "탭 위치"; + Text[ korean ] = "탭 설정 위치"; Text[ chinese_simplified ] = "制表符位置"; Text[ chinese_traditional ] = "定位鍵位置"; Text[ arabic ] = " "; @@ -3654,7 +3654,7 @@ TabPage TP_TOX_ENTRY Text[ russian ] = ""; Text[ greek ] = " "; Text[ dutch ] = "Rechtslijnend"; - Text[ french ] = "Align droite"; + Text[ french ] = "Aligner droite"; Text[ spanish ] = "Alinear a la derecha"; Text[ finnish ] = "Tasaa oikealle"; Text[ italian ] = "Bordo dest~ro"; @@ -3713,14 +3713,14 @@ TabPage TP_TOX_ENTRY Text[ greek ] = " "; Text[ dutch ] = "~Positie in verhouding tot de inspringing uit het alinea-opmaakprofiel."; Text[ french ] = "P~osition en fonction du style de paragraphe (retrait)"; - Text[ spanish ] = "Posicin relativa a sangra de estilo de prrafo"; + Text[ spanish ] = "P~osicin relativa a la sangra del estilo de prrafo"; Text[ italian ] = "P~osizione relativa al rientro del modello di paragrafo"; Text[ danish ] = "Ta~bulatorernes position relativ til indrykningen fra afsnitstypografien"; Text[ swedish ] = "Tabbarnas p~osition relativ till indraget frn styckeformatmallen"; Text[ polish ] = "Pozycja relatywna do wcicia ze stylu akapitu"; Text[ portuguese_brazilian ] = "Position relativ to the paragraph style indent"; Text[ japanese ] = "タブ位置は段落スタイルのインデントから(~V)"; - Text[ korean ] = "단락 스타일의 첫 문장 들여쓰기에 관련된 탭 위치(~V)"; + Text[ korean ] = "탭의 위치는 단락 스타일의 들여쓰기에 기준하여 지정(~V)"; Text[ chinese_simplified ] = "调整制表符和段落样式缩进的位置(~V)"; Text[ chinese_traditional ] = "定位鍵位置和段落樣式的縮排保持相對位置(~V)"; Text[ arabic ] = " "; @@ -3749,7 +3749,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Styl znaku wpisw gwnych"; Text[ portuguese_brazilian ] = "Character style of main entries"; Text[ japanese ] = "主項目の文字スタイル"; - Text[ korean ] = "주 항목의 문자 유형"; + Text[ korean ] = "주 항목의 문자 스타일"; Text[ chinese_simplified ] = "主条目的字符样式"; Text[ chinese_traditional ] = "主項目的字元樣式"; Text[ arabic ] = " "; @@ -3845,7 +3845,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Format"; Text[ portuguese_brazilian ] = "Format"; Text[ japanese ] = "書式"; - Text[ korean ] = "서식 지정"; + Text[ korean ] = "서식"; Text[ chinese_simplified ] = "格式化"; Text[ chinese_traditional ] = "格式化"; Text[ arabic ] = ""; @@ -3931,7 +3931,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Sortuj wedug"; Text[ portuguese_brazilian ] = "Sort by ..."; Text[ japanese ] = "表示順序"; - Text[ korean ] = "에 의한 정렬 ..."; + Text[ korean ] = "정렬 기준"; Text[ chinese_simplified ] = "排序按照"; Text[ chinese_traditional ] = "編排按照"; Text[ arabic ] = " "; @@ -4427,7 +4427,7 @@ TabPage TP_TOX_STYLES Text[ chinese_traditional ] = "標準(~D)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "기본 값(~D)"; + Text[ korean ] = "기본값(~D)"; Text[ turkish ] = "Standart"; Text[ catalan ] = "~Per defecte"; Text[ finnish ] = "~Oletus"; @@ -4627,7 +4627,7 @@ ModalDialog DLG_ADD_IDX_STYLES Text[ polish ] = "Nie przypisany"; Text[ portuguese_brazilian ] = "Not applied"; Text[ japanese ] = "適用なし"; - Text[ korean ] = "적용되지 않았습니다."; + Text[ korean ] = "적용 안됨"; Text[ chinese_simplified ] = "不要指定"; Text[ chinese_traditional ] = "不指定"; Text[ arabic ] = " "; @@ -4650,7 +4650,7 @@ ModalDialog DLG_ADD_IDX_STYLES Text[ polish ] = "Przypisz styl"; Text[ portuguese_brazilian ] = "Assign styles"; Text[ japanese ] = "スタイルの適用"; - Text[ korean ] = "템플릿 할당"; + Text[ korean ] = "스타일 적용"; Text[ chinese_simplified ] = "指定样式"; Text[ chinese_traditional ] = "指定樣式"; Text[ arabic ] = " "; @@ -4759,14 +4759,14 @@ ModalDialog DLG_CREATE_AUTOMARK Text[ greek ] = "1. "; Text[ dutch ] = "1e sleutel"; Text[ french ] = "Cl 1"; - Text[ spanish ] = "1era clave"; + Text[ spanish ] = "1ra clave"; Text[ italian ] = "1 criterio"; Text[ danish ] = "1. ngle"; Text[ swedish ] = "1 nyckel"; Text[ polish ] = "1 klucz"; Text[ portuguese_brazilian ] = "1. Key"; Text[ japanese ] = "分類タイトル1"; - Text[ korean ] = "1번째 키"; + Text[ korean ] = "1. 키"; Text[ chinese_simplified ] = "第一个关键字"; Text[ chinese_traditional ] = "第一個關鍵字"; Text[ arabic ] = " "; @@ -4785,14 +4785,14 @@ ModalDialog DLG_CREATE_AUTOMARK Text[ greek ] = "2. "; Text[ dutch ] = "2e sleutel"; Text[ french ] = "Cl 2"; - Text[ spanish ] = "2da llave"; + Text[ spanish ] = "2a clave"; Text[ italian ] = "2 criterio"; Text[ danish ] = "2. ngle"; Text[ swedish ] = "2 nyckel"; Text[ polish ] = "2 klucz"; Text[ portuguese_brazilian ] = "2. Key"; Text[ japanese ] = "分類タイトル2"; - Text[ korean ] = "2번째 키"; + Text[ korean ] = "2. 키"; Text[ chinese_simplified ] = "第二个关键字"; Text[ chinese_traditional ] = "第二個關鍵字"; Text[ arabic ] = " "; @@ -4818,7 +4818,7 @@ ModalDialog DLG_CREATE_AUTOMARK Text[ polish ] = "Komentarz"; Text[ portuguese_brazilian ] = "Comment"; Text[ japanese ] = "コメント"; - Text[ korean ] = "주석"; + Text[ korean ] = "설명"; Text[ chinese_simplified ] = "注解"; Text[ chinese_traditional ] = "註解"; Text[ arabic ] = ""; @@ -4844,7 +4844,7 @@ ModalDialog DLG_CREATE_AUTOMARK Text[ polish ] = "Dokadnie"; Text[ portuguese_brazilian ] = "Match case"; Text[ japanese ] = "文字区別"; - Text[ korean ] = "자세히 구분"; + Text[ korean ] = "대문자 및 소문자를 구분"; Text[ chinese_simplified ] = "精确"; Text[ chinese_traditional ] = "精確"; Text[ arabic ] = " "; @@ -4987,3 +4987,8 @@ ModalDialog DLG_CREATE_AUTOMARK + + + + + diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src index c897264d8d3e..45481143bb4f 100644 --- a/sw/source/ui/index/idxmrk.src +++ b/sw/source/ui/index/idxmrk.src @@ -2,9 +2,9 @@ * * $RCSfile: idxmrk.src,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: iha $ $Date: 2002-08-08 14:10:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,27 @@ #define IDX_PHONETIC_LISTBOX_DESCRIPTION \ Text = "Phonetische Lesart"; \ Text[English] = "Phonetic reading"; \ -Text[ english_us ] = "Phonetic reading"; +Text[ english_us ] = "Phonetic reading"; \ + Text[ portuguese ] = "Phonetic reading"; \ + Text[ russian ] = "Phonetic reading"; \ + Text[ greek ] = "Phonetic reading"; \ + Text[ dutch ] = "Phonetic reading"; \ + Text[ french ] = "Lecture phontique"; \ + Text[ spanish ] = "Lectura fontica"; \ + Text[ finnish ] = "Phonetic reading"; \ + Text[ italian ] = "Lettura fonetica"; \ + Text[ danish ] = "Phonetic reading"; \ + Text[ swedish ] = "Fonetisk lsning"; \ + Text[ polish ] = "Phonetic reading"; \ + Text[ portuguese_brazilian ] = "Phonetic reading"; \ + Text[ japanese ] = "読み"; \ + Text[ korean ] = "발음 표기"; \ + Text[ chinese_simplified ] = "语音描述"; \ + Text[ chinese_traditional ] = "語音描述"; \ + Text[ turkish ] = "Phonetic reading"; \ + Text[ arabic ] = "Phonetic reading"; \ + Text[ catalan ] = "Phonetic reading"; \ + Text[ thai ] = "Phonetic reading"; #define IDX_DIALOG_WINDOW \ Window WIN_DLG \ @@ -155,7 +175,7 @@ Text[ english_us ] = "Phonetic reading"; Text [ french ] = "Supprimer" ; \ Text [ swedish ] = "~Radera" ; \ Text [ dutch ] = "~Wissen" ; \ - Text [ spanish ] = "~Eliminar" ; \ + Text [ spanish ] = "~Borrar" ; \ Text [ english_us ] = "~Delete" ; \ TabStop = TRUE ; \ Text[ chinese_simplified ] = "删除(~D)"; \ @@ -197,7 +217,7 @@ Text[ english_us ] = "Phonetic reading"; QuickHelpText[ polish ] = "Nowy indeks uytkownika";\ QuickHelpText[ portuguese_brazilian ] = "New user defined index";\ QuickHelpText[ japanese ] = "新しいユーザー定義の索引";\ - QuickHelpText[ korean ] = "새 사용자정의 색인";\ + QuickHelpText[ korean ] = "새 사용자 정의 색인";\ QuickHelpText[ chinese_simplified ] = "新建使用者自定目录";\ QuickHelpText[ chinese_traditional ] = "新增使用者自訂目錄";\ QuickHelpText[ arabic ] = " ";\ @@ -262,7 +282,7 @@ Text[ english_us ] = "Phonetic reading"; Text[ chinese_traditional ] = "標記"; \ Text[ arabic ] = ""; \ Text[ greek ] = "";\ - Text[ korean ] = "선택 표시";\ + Text[ korean ] = "선택";\ Text[ turkish ] = "Seim";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Marca";\ @@ -349,7 +369,7 @@ Text[ english_us ] = "Phonetic reading"; Text [ italian ] = "Chiave ~1" ; \ Text [ portuguese_brazilian ] = "~1. Tecla" ; \ Text [ portuguese ] = "~1 chave" ; \ - Text [ finnish ] = "Ensimminen avain" ; \ + Text [ finnish ] = "~1. avain" ; \ Text [ danish ] = "~1. ngle" ; \ Text [ french ] = "Cl 1" ; \ Text [ swedish ] = "Sorteringskod ~1" ; \ @@ -364,7 +384,7 @@ Text[ english_us ] = "Phonetic reading"; Text[ chinese_traditional ] = "第一個關鍵字"; \ Text[ arabic ] = " "; \ Text[ greek ] = "~1 ";\ - Text[ korean ] = "1번째 키";\ + Text[ korean ] = "1. 키";\ Text[ turkish ] = "~1. Anahtar";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Clau ~1a";\ @@ -389,12 +409,12 @@ Text[ english_us ] = "Phonetic reading"; Text [ italian ] = "Chiave ~2" ; \ Text [ portuguese_brazilian ] = "~2. Tecla" ; \ Text [ portuguese ] = "~2 chave" ; \ - Text [ finnish ] = "~Toinen avain" ; \ + Text [ finnish ] = "~2. avain" ; \ Text [ danish ] = "~2. ngle" ; \ Text [ french ] = "Cl 2" ; \ Text [ swedish ] = "Sorteringskod ~2" ; \ Text [ dutch ] = "~2e sleutel" ; \ - Text [ spanish ] = "~2da clave" ; \ + Text [ spanish ] = "~2a clave" ; \ Text [ english_us ] = "~2nd key" ; \ Left = TRUE ; \ Text[ chinese_simplified ] = "第二个关键字"; \ @@ -404,7 +424,7 @@ Text[ english_us ] = "Phonetic reading"; Text[ chinese_traditional ] = "第二個關鍵字"; \ Text[ arabic ] = " "; \ Text[ greek ] = "~2 ";\ - Text[ korean ] = "2번째 키";\ + Text[ korean ] = "~2. 키";\ Text[ turkish ] = "~2. Anahtar";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Clau ~2a";\ @@ -550,10 +570,10 @@ Text[ english_us ] = "Phonetic reading"; Hide = TRUE; \ Text[ english_us ] = "~Apply to all similar texts."; \ Text[ portuguese ] = "~Aplicar a todos os textos semelhantes."; \ - Text[ russian ] = " "; \ + Text[ russian ] = " "; \ Text[ dutch ] = "~Alle gelijkluidende teksten"; \ Text[ french ] = "~Appliquer tous les textes similaires."; \ - Text[ spanish ] = "~Aplicar a todos los textos iguales."; \ + Text[ spanish ] = "~Aplicar a todos los textos similares"; \ Text[ italian ] = "~Applica a tutti i testi simili"; \ Text[ danish ] = "~Anvend p alle lignende tekster."; \ Text[ swedish ] = "~Anvnd p alla liknande texter."; \ @@ -564,7 +584,7 @@ Text[ english_us ] = "Phonetic reading"; Text[ chinese_traditional ] = "用於所有相同的內文(~A)"; \ Text[ arabic ] = " ."; \ Text[ greek ] = " .";\ - Text[ korean ] = "모든 같은 텍스트에 적용(~A)";\ + Text[ korean ] = "문서 내에서 같은 문자열에 대해 적용(~A)";\ Text[ turkish ] = "~Tm e metinlere uygula.";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "~Aplica-ho a tots els textos semblants.";\ @@ -580,7 +600,7 @@ Text[ english_us ] = "Phonetic reading"; Hide = TRUE;\ Text[ english_us ] = "Ma~tch case";\ Text[ portuguese ] = "Procura e~xacta";\ - Text[ russian ] = " ";\ + Text[ russian ] = " ";\ Text[ greek ] = " ";\ Text[ dutch ] = "~Exact dezelfde tekens";\ Text[ french ] = "Respecter la casse";\ @@ -591,13 +611,13 @@ Text[ english_us ] = "Phonetic reading"; Text[ polish ] = "Dokadne wyszukiwanie";\ Text[ portuguese_brazilian ] = "Match case";\ Text[ japanese ] = "大文字と小文字を区別する(~T)";\ - Text[ korean ] = "대/소문자 구분(~T)";\ + Text[ korean ] = "대문자 및 소문자를 구분(~T)";\ Text[ chinese_simplified ] = "精确搜寻(~T)";\ Text[ chinese_traditional ] = "精確搜尋(~T)";\ Text[ arabic ] = " ";\ Text[ turkish ] = "BYK/kk ~harf duyarl";\ Text[ catalan ] = "Coincidncia e~xacta";\ - Text[ finnish ] = "Sa~ma kirjainkoko";\ + Text[ finnish ] = "Sama kirjainkoko";\ Text[ thai ] = "ตัวพิมพ์ที่ตร~งกัน";\ }; \ CheckBox CB_WORDONLY \ @@ -609,18 +629,18 @@ Text[ english_us ] = "Phonetic reading"; Hide = TRUE;\ Text[ english_us ] = "~Whole words only";\ Text[ portuguese ] = "S ~palavras inteiras";\ - Text[ russian ] = " ";\ + Text[ russian ] = " ";\ Text[ greek ] = " ";\ Text[ dutch ] = "Alleen hele ~woorden";\ Text[ french ] = "Uniquement les mots entiers";\ - Text[ spanish ] = "Solo palabras e~nteras";\ + Text[ spanish ] = "~Slo palabras completas";\ Text[ italian ] = "Solo parole intere";\ Text[ danish ] = "~Kun hele ord";\ Text[ swedish ] = "Bara hela ~ord";\ Text[ polish ] = "Tylko cae wyrazy";\ Text[ portuguese_brazilian ] = "Whole words only";\ Text[ japanese ] = "単語として(~W)";\ - Text[ korean ] = "안벽한 단어만(~W)";\ + Text[ korean ] = "단어 단위로(~W)";\ Text[ chinese_simplified ] = "只允许单词(~W)";\ Text[ chinese_traditional ] = "僅是單詞(~W)";\ Text[ arabic ] = " ";\ @@ -809,7 +829,7 @@ ModalDialog DLG_NEW_USER_IDX }; Text[ english_us ] = "Create New User-defined Index"; Text[ portuguese ] = "Criar novo ndice personalizado"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Nieuwe gebruikersindex definiren"; Text[ french ] = "Cration d'un nouvel index personnalis"; @@ -882,7 +902,7 @@ String STR_IDXMRK_INSERT Text[ chinese_traditional ] = "插入目錄條目"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "색인 항목 삽입"; + Text[ korean ] = "색인 및 목차 항목 삽입"; Text[ turkish ] = "Dizin girii ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix una entrada d'ndex"; @@ -919,7 +939,7 @@ String STR_IDXMRK_INSERT Text[ arabic ] = " ";\ Text[ turkish ] = "Kaynaka veritabanndan";\ Text[ catalan ] = "Des de la base de ~dades de la bibliografia";\ - Text[ finnish ] = "Bibliografia~tietokannasta";\ + Text[ finnish ] = "Lhdeluettelo~tietokannasta";\ Text[ thai ] = "จาก~ฐานข้อมูลบรรณานุกรม";\ }; \ RadioButton RB_FROMDOCCONTENT \ @@ -969,14 +989,14 @@ String STR_IDXMRK_INSERT Text[ polish ] = "Autor";\ Text[ portuguese_brazilian ] = "Author";\ Text[ japanese ] = "著者";\ - Text[ korean ] = "작성자";\ + Text[ korean ] = "저자";\ Text[ chinese_simplified ] = "作者";\ Text[ chinese_traditional ] = "作者";\ Text[ arabic ] = "";\ Text[ turkish ] = "Yazan";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Autor";\ - Text[ finnish ] = "Laatija";\ + Text[ finnish ] = "Tekij";\ Text[ thai ] = "ผู้เขียน";\ }; \ FixedText FI_AUTHOR \ @@ -1039,7 +1059,7 @@ String STR_IDXMRK_INSERT Text[ polish ] = "Skrt";\ Text[ portuguese_brazilian ] = "Short name";\ Text[ japanese ] = "略称(~N)";\ - Text[ korean ] = "짧은 이름(~N)";\ + Text[ korean ] = "약칭(~N)";\ Text[ chinese_simplified ] = "简称(~N)";\ Text[ chinese_traditional ] = "簡短描述文(~N)";\ Text[ arabic ] = " ";\ @@ -1173,7 +1193,7 @@ String STR_IDXMRK_INSERT Text[ french ] = "~Nouveau";\ Text[ spanish ] = "N~uevo";\ Text[ italian ] = "Nuovo";\ - Text[ danish ] = "Ny";\ + Text[ danish ] = "~Ny";\ Text[ swedish ] = "N~y";\ Text[ polish ] = "Nowy";\ Text[ portuguese_brazilian ] = "Create entry";\ @@ -1198,11 +1218,11 @@ String STR_IDXMRK_INSERT Text[ portuguese ] = "~Editar";\ Text[ russian ] = "";\ Text[ greek ] = "";\ - Text[ dutch ] = "~Bewerken";\ + Text[ dutch ] = "B~ewerken";\ Text[ french ] = "diter";\ Text[ spanish ] = "Editar";\ Text[ italian ] = "~Modifica";\ - Text[ danish ] = "Rediger";\ + Text[ danish ] = "~Rediger";\ Text[ swedish ] = "~Redigera";\ Text[ polish ] = "~Edytuj";\ Text[ portuguese_brazilian ] = "Edit";\ @@ -1233,14 +1253,14 @@ String STR_IDXMRK_INSERT Text[ polish ] = "Modyfikuj";\ Text[ portuguese_brazilian ] = "Apply";\ Text[ japanese ] = "変更";\ - Text[ korean ] = "수정";\ + Text[ korean ] = "변경";\ Text[ chinese_simplified ] = "更改";\ Text[ chinese_traditional ] = "變更";\ Text[ arabic ] = "";\ Text[ turkish ] = "Deitir";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Modifica";\ - Text[ finnish ] = "Muokkaa";\ + Text[ finnish ] = "Muuta";\ Text[ thai ] = "ดัดแปลงแก้ไข";\ }; \ }; @@ -1316,7 +1336,7 @@ ModalDialog DLG_CREATE_AUTH_ENTRY Text[ polish ] = "Dane wpisu"; Text[ portuguese_brazilian ] = "Entry data"; Text[ japanese ] = "入力データ"; - Text[ korean ] = "입력 데이터"; + Text[ korean ] = "항목 데이터"; Text[ chinese_simplified ] = "条目数据"; Text[ chinese_traditional ] = "條目資料"; Text[ arabic ] = " "; @@ -1328,7 +1348,7 @@ ModalDialog DLG_CREATE_AUTH_ENTRY }; Text[ english_us ] = "Define Bibliography Entry"; Text[ portuguese ] = "Definir entrada bibliogrfica"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Item voor literatuurlijst definiren"; Text[ french ] = "Dfinir une entre de bibliographie"; @@ -1345,7 +1365,7 @@ ModalDialog DLG_CREATE_AUTH_ENTRY Text[ arabic ] = " "; Text[ turkish ] = "Kaynaka giriini tanmla"; Text[ catalan ] = "Defineix entrada de bibliografia"; - Text[ finnish ] = "Mrit bibliografiamerkint"; + Text[ finnish ] = "Mrit lhdeluettelomerkint"; Text[ thai ] = "ระบุรายการบรรณานุกรม"; }; String STR_AUTHMRK_EDIT @@ -1355,7 +1375,7 @@ String STR_AUTHMRK_EDIT Text[ english_us ] = "Edit Bibliography Entry"; Text[ portuguese ] = "Editar entrada bibliogrfica"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Item voor literatuurlijst bewerken"; Text[ french ] = "diter une entre de bibliographie"; @@ -1371,9 +1391,9 @@ String STR_AUTHMRK_EDIT Text[ chinese_traditional ] = "編輯參考文獻目錄條目"; Text[ arabic ] = " "; Text[ turkish ] = "Kaynaka dizini giriini dzenle"; - Text[ language_user1 ] = "EM28.9.01: MODALDIALOG title"; + Text[ language_user1 ] = "EM28; EM28.9.01: MODALDIALOG title"; Text[ catalan ] = "Edita entrada de bibliografia"; - Text[ finnish ] = "Muokkaa bibliografiamerkint"; + Text[ finnish ] = "Muokkaa lhdeluettelomerkint"; Text[ thai ] = "แก้ไขรายการบรรณานุกรม"; }; String STR_AUTHMRK_INSERT @@ -1383,7 +1403,7 @@ String STR_AUTHMRK_INSERT Text[ english_us ] = "Insert Bibliography Entry"; Text[ portuguese ] = "Inserir entrada bibliogrfica"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Item invoegen in literatuurlijst"; Text[ french ] = "Insertion d'une entre de bibliographie"; @@ -1399,9 +1419,9 @@ String STR_AUTHMRK_INSERT Text[ chinese_traditional ] = "插入參考文獻目錄條目"; Text[ arabic ] = " "; Text[ turkish ] = "Kaynaka dizini girii ekle"; - Text[ language_user1 ] = "EM28.9.01: MODALDIALOG title"; + Text[ language_user1 ] = "EM28; EM28.9.01: MODALDIALOG title"; Text[ catalan ] = "Insereix entrada de bibliografia"; - Text[ finnish ] = "Lis bibliografiamerkint"; + Text[ finnish ] = "Lis lhdeluettelomerkint"; Text[ thai ] = "แทรกรายการบรรณานุกรม"; }; QueryBox DLG_CHANGE_AUTH_ENTRY @@ -1412,7 +1432,7 @@ QueryBox DLG_CHANGE_AUTH_ENTRY MESSAGE [ English ] = "The bibliography entry is already contained in the document with different data. Do you want to adjust the existing bibliography entries?" ; MESSAGE[ english_us ] = "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?"; MESSAGE[ portuguese ] = "A entrada bibliogrfica j existe no documento com dados diferentes. Ajustar as entradas existentes?"; - MESSAGE[ russian ] = " . ?"; + MESSAGE[ russian ] = " , . ?"; MESSAGE[ greek ] = " . ;"; MESSAGE[ dutch ] = "Het bibliografie-item bevindt zich reeds met andere gegevens in het document. Wilt u de bestaande items aanpassen?"; MESSAGE[ french ] = "L'entre de bibliographie existe dj en relation avec des donnes diffrentes dans le document. Voulez-vous ajuster les entres existantes ?"; @@ -1429,6 +1449,29 @@ QueryBox DLG_CHANGE_AUTH_ENTRY MESSAGE[ arabic ] = " . ɿ"; MESSAGE[ turkish ] = "Kaynaka girii, farkl veriler ile belgede mevcut."; MESSAGE[ catalan ] = "L'entrada bibliogrfica ja existeix amb dades diferents en el document. Voleu ajustar les dades ja existents?"; - MESSAGE[ finnish ] = "Asiakirja sislt jo bibliografiamerkinnn, mutta siin on eri tiedot. Haluatko muokata olemassa olevia merkintj?"; + MESSAGE[ finnish ] = "Asiakirja sislt jo lhdeluettelomerkinnn, mutta siin on eri tiedot. Haluatko muokata olemassa olevia merkintj?"; MESSAGE[ thai ] = "เอกสารมีรายการบรรณานุกรมอยู่แล้วแต่มีข้อมูลที่ต่างกัน คุณต้องการปรับรายการที่มีอยู่หรือไม่?"; }; + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/index/multmrk.src b/sw/source/ui/index/multmrk.src index 801be071c948..8a88aad5aee5 100644 --- a/sw/source/ui/index/multmrk.src +++ b/sw/source/ui/index/multmrk.src @@ -2,9 +2,9 @@ * * $RCSfile: multmrk.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:17:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,27 +92,28 @@ ModalDialog DLG_MULTMRK Text [ norwegian ] = "Choice" ; Text [ italian ] = "Selezione" ; Text [ portuguese_brazilian ] = "Escolha" ; - Text [ portuguese ] = "Opes" ; - Text [ finnish ] = "Mritykset" ; - Text [ danish ] = "Udvalg" ; + Text [ portuguese ] = "Seleco" ; + Text [ finnish ] = "Valinta" ; + Text [ danish ] = "Vlg" ; Text [ french ] = "Slection" ; Text [ swedish ] = "Urval" ; Text [ dutch ] = "Selectie" ; Text [ spanish ] = "Seleccin" ; Text [ english_us ] = "Selection" ; - Text[ chinese_simplified ] = "ѡ"; + Text[ chinese_simplified ] = "选择"; Text[ russian ] = ""; Text[ polish ] = "Wybr"; - Text[ japanese ] = "I"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "選択"; + Text[ chinese_traditional ] = "選取"; Text[ arabic ] = ""; Text[ dutch ] = "Selectie"; - Text[ chinese_simplified ] = "ѡ"; + Text[ chinese_simplified ] = "选择"; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "선택"; Text[ turkish ] = "Seim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opcin"; + Text[ catalan ] = "Opci"; + Text[ thai ] = "เลือก"; }; FixedText FT_ENTRY { @@ -132,19 +133,20 @@ ModalDialog DLG_MULTMRK Text [ spanish ] = "ndice" ; Text [ english_us ] = "Index" ; Left = TRUE ; - Text[ chinese_simplified ] = "Ŀ¼"; + Text[ chinese_simplified ] = "目录"; Text[ russian ] = ""; Text[ polish ] = "Indeks"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "ؿ"; + Text[ japanese ] = "索引"; + Text[ chinese_traditional ] = "目錄"; Text[ arabic ] = ""; Text[ dutch ] = "Index"; - Text[ chinese_simplified ] = "Ŀ¼"; + Text[ chinese_simplified ] = "目录"; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "색인"; Text[ turkish ] = "Dizin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice"; + Text[ catalan ] = "ndex"; + Text[ thai ] = "ดัชนี"; }; FixedText FT_TEXT { @@ -170,19 +172,20 @@ ModalDialog DLG_MULTMRK Text [ spanish ] = "Entrada" ; Text [ english_us ] = "Entry" ; Left = TRUE ; - Text[ chinese_simplified ] = "Ŀ"; + Text[ chinese_simplified ] = "条目"; Text[ russian ] = ""; Text[ polish ] = "Wpis"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "項目"; + Text[ chinese_traditional ] = "條目"; Text[ arabic ] = ""; Text[ dutch ] = "Item"; - Text[ chinese_simplified ] = "Ŀ"; + Text[ chinese_simplified ] = "条目"; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "항목"; Text[ turkish ] = "Giri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Entrada"; + Text[ thai ] = "รายการ"; }; ListBox LB_TOX { @@ -205,19 +208,34 @@ ModalDialog DLG_MULTMRK Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - Text[ chinese_simplified ] = "Ŀ¼"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "目录标记"; + Text[ russian ] = " "; Text[ polish ] = "Znaczniki indeksu"; - Text[ japanese ] = "o^"; - Text[ chinese_traditional ] = "ؿаO"; + Text[ japanese ] = "登録項目"; + Text[ chinese_traditional ] = "目錄標記"; Text[ arabic ] = " "; Text[ dutch ] = "Indexmarkeringen"; - Text[ chinese_simplified ] = "Ŀ¼"; + Text[ chinese_simplified ] = "目录标记"; Text[ greek ] = " "; - Text[ korean ] = " ũǥ"; + Text[ korean ] = "색인 표시"; Text[ turkish ] = "Dizin iin iaretlenen giriler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Marcas del ndice"; + Text[ catalan ] = "Marques de l'ndex"; + Text[ thai ] = "ทำเครื่องหมายดัชนี"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index cc297a9fd62b..a2339c91102a 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olmenu.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hbrinkm $ $Date: 2002-11-21 14:06:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -330,8 +330,7 @@ sal_uInt16 SwSpellPopup::Execute( Window* pWin, const Point& rWordPos ) pSh->StartAction(); pSh->DelLeft(); - const Sequence< OUString > aAlts( xSpellAlt->getAlternatives() ); - const OUString *pString = aAlts.getConstArray(); + const OUString *pString = xSpellAlt->getAlternatives().getConstArray(); DBG_ASSERT( 0 <= nAltIdx && nAltIdx <= xSpellAlt->getAlternativesCount(), "index out of range"); String aTmp( pString[ nAltIdx ] ); diff --git a/sw/source/ui/lingu/olmenu.src b/sw/source/ui/lingu/olmenu.src index e056f386f671..558955b4d5cf 100644 --- a/sw/source/ui/lingu/olmenu.src +++ b/sw/source/ui/lingu/olmenu.src @@ -2,9 +2,9 @@ * * $RCSfile: olmenu.src,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: os $ $Date: 2002-12-02 13:45:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,8 +76,8 @@ Menu MN_SPELL_POPUP Text[ language_user1 ] = "triple dots (...) are required now at the end of the text"; Text [ english_us ] = "~Spellcheck..." ; Text [ italian ] = "Controllo ~ortografico..." ; - Text [ spanish ] = "Ortogra~fa..." ; - Text [ french ] = "~Orthographe..." ; + Text [ spanish ] = "~Revisin ortogrfica..." ; + Text [ french ] = "Vrification ~orthographique..." ; Text [ dutch ] = "~Spellingcontrole..." ; Text [ swedish ] = "~Rttstavning..." ; Text [ danish ] = "~Stavekontrol" ; @@ -86,13 +86,13 @@ Menu MN_SPELL_POPUP Text[ chinese_simplified ] = "拼写检查(~S)..."; Text[ russian ] = " ..."; Text[ polish ] = "~Pisownia..."; - Text[ japanese ] = "文章校正(~S)..."; + Text[ japanese ] = "文書校正(~S)..."; Text[ chinese_traditional ] = "拼寫檢查(~S)..."; Text[ arabic ] = "~ "; Text[ dutch ] = "~Spellingcontrole..."; Text[ chinese_simplified ] = "拼写检查(~S)..."; Text[ greek ] = "~"; - Text[ korean ] = "맞춤법(~S)"; + Text[ korean ] = "맞춤법 검사..."; Text[ turkish ] = "~Yazm klavuzu"; Text[ catalan ] = "Ortogra~fia"; Text[ finnish ] = "~Oikeinkirjoituksen tarkistus..."; @@ -180,7 +180,7 @@ Menu MN_SPELL_POPUP Text [ swedish ] = "Auto~Korrigering" ; Text [ danish ] = "AutoKorrektur" ; Text [ italian ] = "Correzione automatica" ; - Text [ spanish ] = "Auto~Correccin" ; + Text [ spanish ] = "~Correccin automtica" ; Text [ french ] = "AutoCo~rrection" ; Text [ dutch ] = "Auto~Correctie" ; Text [ portuguese ] = "Auto~Correco" ; @@ -193,7 +193,7 @@ Menu MN_SPELL_POPUP Text[ dutch ] = "Auto~Correctie"; Text[ chinese_simplified ] = "自动更正"; Text[ greek ] = "~"; - Text[ korean ] = "자동고침"; + Text[ korean ] = "자동 수정"; Text[ turkish ] = "Otomatik dzeltme"; Text[ language_user1 ] = " "; Text[ catalan ] = "Auto~correcci"; @@ -336,3 +336,4 @@ String STR_HYP_OK + diff --git a/sw/source/ui/misc/bookmark.src b/sw/source/ui/misc/bookmark.src index c3b82d69dff4..45ba2594ed6d 100644 --- a/sw/source/ui/misc/bookmark.src +++ b/sw/source/ui/misc/bookmark.src @@ -2,9 +2,9 @@ * * $RCSfile: bookmark.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-07-13 21:58:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,23 +119,24 @@ ModalDialog DLG_INSERT_BOOKMARK TEXT [ portuguese ] = "E~liminar" ; TEXT [ finnish ] = "~Poista" ; TEXT [ danish ] = "Slet" ; - TEXT [ french ] = "~Supprimer" ; + TEXT [ french ] = "Supprimer" ; TEXT [ swedish ] = "~Radera" ; TEXT [ dutch ] = "~Wissen" ; - TEXT [ spanish ] = "~Eliminar" ; + TEXT [ spanish ] = "~Borrar" ; TEXT [ english_us ] = "~Delete" ; TABSTOP = TRUE ; DISABLE = TRUE ; - TEXT[ chinese_simplified ] = "ɾ(~D)"; + TEXT[ chinese_simplified ] = "删除(~D)"; TEXT[ russian ] = ""; TEXT[ polish ] = "~Usu"; - TEXT[ japanese ] = "폜(~D)"; - TEXT[ chinese_traditional ] = "R(~D)"; + TEXT[ japanese ] = "削除(~D)"; + TEXT[ chinese_traditional ] = "刪除(~D)"; TEXT[ greek ] = ""; - TEXT[ korean ] = "(~D)"; + TEXT[ korean ] = "삭제(~D)"; TEXT[ arabic ] = ""; TEXT[ turkish ] = "~Sil"; - TEXT[ catalan ] = "~Eliminar"; + TEXT[ catalan ] = "~Suprimeix"; + TEXT[ thai ] = "~ลบ"; }; FixedLine FL_BOOKMARK { @@ -154,27 +155,29 @@ ModalDialog DLG_INSERT_BOOKMARK TEXT [ dutch ] = "Tekstmarkeringen" ; TEXT [ spanish ] = "Marcas de texto" ; TEXT [ english_us ] = "Bookmarks" ; - TEXT[ chinese_simplified ] = "ǩ"; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "书签"; + TEXT[ russian ] = ""; TEXT[ polish ] = "Zakadki"; - TEXT[ japanese ] = "÷ϰ"; - TEXT[ chinese_traditional ] = ""; + TEXT[ japanese ] = "テキストマーク"; + TEXT[ chinese_traditional ] = "內文標籤"; TEXT[ greek ] = " "; - TEXT[ korean ] = "å"; + TEXT[ korean ] = "책갈피"; TEXT[ arabic ] = " "; TEXT[ turkish ] = "Metin iareti"; - TEXT[ catalan ] = "Marcas de texto"; + TEXT[ catalan ] = "Marques de text"; + TEXT[ thai ] = "ที่คั่น"; }; - TEXT[ chinese_simplified ] = "ǩ"; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "插入书签"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Wstaw zakadk"; - TEXT[ japanese ] = "÷ϰ̑}"; - TEXT[ chinese_traditional ] = "J"; + TEXT[ japanese ] = "テキストマークの挿入"; + TEXT[ chinese_traditional ] = "插入內文標籤"; TEXT[ greek ] = " "; - TEXT[ korean ] = "å "; + TEXT[ korean ] = "책갈피 삽입"; TEXT[ arabic ] = " "; TEXT[ turkish ] = "Metin iareti ekle"; - TEXT[ catalan ] = "Insertar marca"; + TEXT[ catalan ] = "Insereix marca"; + TEXT[ thai ] = "แทรกที่คั่น"; }; String STR_REMOVE_WARNING { @@ -182,27 +185,42 @@ String STR_REMOVE_WARNING Text [English] = "The following characters are not valid and have been removed: "; Text[ english_us ] = "The following characters are not valid and have been removed: "; Text[ portuguese ] = "Os seguintes caracteres foram eliminados porque no so vlidos: "; - Text[ russian ] = " : "; + Text[ russian ] = " : "; Text[ greek ] = " . "; - Text[ dutch ] = "De volgende tekens zijn niet toegestaan en werden daarom verwijderd. "; + Text[ dutch ] = "De volgende tekens zijn niet toegestaan en zijn daarom verwijderd. "; Text[ french ] = "Les caractres suivants ont t supprims car ils ne sont pas permis : "; - Text[ spanish ] = "Los siguientes caracteres han sido eliminados porque no se permiten: "; + Text[ spanish ] = "Los siguientes caracteres se han borrado por no ser vlidos: "; Text[ italian ] = "I caratteri seguenti non sono ammessi e per questo eliminati. "; Text[ danish ] = "De flgende tegn er ikke tilladte og er derfor blevet fjernet: "; Text[ swedish ] = "Fljande tecken r inte tilltna och har drfr tagits bort: "; Text[ polish ] = "Nastpujcy znak jest niedozwolony i zosta dlatego usunity: "; Text[ portuguese_brazilian ] = "The following characters are not valid and have been removed: "; - Text[ japanese ] = "͋̕ĂȂߏ܂B "; - Text[ korean ] = " ڵ ȿ ʾƼ ŵǾϴ: "; - Text[ chinese_simplified ] = "ַЧѾɾ "; - Text[ chinese_traditional ] = "UCrLĦӳQRG "; + Text[ japanese ] = "次の文字は許可されていないため除去されました。 "; + Text[ korean ] = "다음과 같은 문자는 허용되지 않기 때문에 제거되었습니다: "; + Text[ chinese_simplified ] = "下列字符无效且已经被删除： "; + Text[ chinese_traditional ] = "下列的字型無效而被刪除： "; Text[ arabic ] = " ɡ : "; Text[ turkish ] = "Aadaki karakterler geerli deiller ve bu nedenle kartldlar: "; - Text[ catalan ] = "Los siguientes caracteres han sido eliminados porque no se permiten: "; + Text[ catalan ] = "Els segents carcters s'han eliminat perqu no es permeten: "; Text[ finnish ] = "Seuraavat merkit eivt ole kelvollisia ja ne poistettiin: "; + Text[ thai ] = "ตัวอักขระตามนี้ไม่ถูกต้องและถูกเอาออกแล้ว: "; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src index d787d31f799b..20795169d0a4 100644 --- a/sw/source/ui/misc/docfnote.src +++ b/sw/source/ui/misc/docfnote.src @@ -2,9 +2,9 @@ * * $RCSfile: docfnote.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:17:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,7 @@ TabDialog DLG_DOC_FOOTNOTE Text [ portuguese ] = "Opes de notas de rodap" ; Text [ finnish ] = "Alaviitteen asetukset" ; Text [ danish ] = "Fodnoteindstillinger" ; - Text [ french ] = "Paramtres des notes de bas de page" ; + Text [ french ] = "Paramtrage des notes de bas de page" ; Text [ swedish ] = "Fotnotsinstllning" ; Text [ dutch ] = "Voetnootinstelling" ; Text [ spanish ] = "Opciones de notas al pie" ; @@ -102,18 +102,19 @@ TabDialog DLG_DOC_FOOTNOTE Text [ french ] = "Notes de bas de page" ; Text [ dutch ] = "Voetnoten" ; Text [ portuguese ] = "Notas de rodap" ; - Text[ chinese_simplified ] = "ע"; + Text[ chinese_simplified ] = "注脚"; Text[ russian ] = ""; Text[ polish ] = "Przypisy dolne"; - Text[ japanese ] = "r"; - Text[ chinese_traditional ] = "}"; + Text[ japanese ] = "脚注"; + Text[ chinese_traditional ] = "註腳"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "각주"; Text[ turkish ] = "Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Notas al pie"; + Text[ catalan ] = "Notes al peu"; Text[ finnish ] = "Alaviitteet"; + Text[ thai ] = "เชิงอรรถ"; }; PageItem { @@ -130,32 +131,34 @@ TabDialog DLG_DOC_FOOTNOTE Text [ french ] = "Notes de fin" ; Text [ dutch ] = "Eindnoten" ; Text [ portuguese ] = "Notas finais" ; - Text[ chinese_simplified ] = "βע"; + Text[ chinese_simplified ] = "尾注"; Text[ russian ] = " "; Text[ polish ] = "Przypisy koc."; - Text[ japanese ] = "r"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "文末脚注"; + Text[ chinese_traditional ] = "尾註"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "미주"; Text[ turkish ] = "Sonnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Notas finales"; - Text[ finnish ] = "Loppuhuomautukset"; + Text[ catalan ] = "Notes finals"; + Text[ finnish ] = "Loppuviitteet"; + Text[ thai ] = "อ้างอิงท้ายเรื่อง"; }; }; }; - Text[ chinese_simplified ] = "趨ע"; + Text[ chinese_simplified ] = "设定注脚"; Text[ russian ] = " "; Text[ polish ] = "Ustawienie przypisw dolnych"; - Text[ japanese ] = "r̐ݒ"; - Text[ chinese_traditional ] = "]w}"; + Text[ japanese ] = "脚注の設定"; + Text[ chinese_traditional ] = "設定註腳"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "각주 및 미주 설정"; Text[ turkish ] = "Dipnot ayarlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de notas al pie"; + Text[ catalan ] = "Opcions de notes al peu"; + Text[ thai ] = "กำหนดเชิงอรรถ"; }; TabPage TP_FOOTNOTEOPTION { @@ -182,17 +185,18 @@ TabPage TP_FOOTNOTEOPTION Text [ spanish ] = "Numeracin automtica" ; Text [ english_us ] = "AutoNumbering" ; Group = TRUE ; - Text[ chinese_simplified ] = "Զ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "自动编号"; + Text[ russian ] = ""; Text[ polish ] = "Automatyczna numeracja"; - Text[ japanese ] = "ԍt"; - Text[ chinese_traditional ] = "۰ʽs"; + Text[ japanese ] = "自動番号付け"; + Text[ chinese_traditional ] = "自動編號"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ڵ ȣű"; + Text[ korean ] = "자동 번호 매기기"; Text[ turkish ] = "Otomatik numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin automtica"; + Text[ catalan ] = "Numeraci automtica"; + Text[ thai ] = "ลำดับตัวเลขอัตโนมัติ"; }; FixedText FT_NUMTYPE { @@ -205,21 +209,22 @@ TabPage TP_FOOTNOTEOPTION Text[ russian ] = ""; Text[ greek ] = "~"; Text[ dutch ] = "~Nummering"; - Text[ french ] = "Nu~mrotation"; + Text[ french ] = "Numrotation"; Text[ spanish ] = "~Numeracin"; Text[ italian ] = "Numerazione"; - Text[ danish ] = "Numbering"; + Text[ danish ] = "Nu~mmerering"; Text[ swedish ] = "Nu~mrering"; Text[ polish ] = "Numeracja"; Text[ portuguese_brazilian ] = "Numbering"; - Text[ japanese ] = "ԍ̎(~B)"; - Text[ korean ] = "ȣű(~B)"; - Text[ chinese_simplified ] = "(~B)"; - Text[ chinese_traditional ] = "s(~B)"; + Text[ japanese ] = "番号の種類(~B)"; + Text[ korean ] = "번호 매기기(~B)"; + Text[ chinese_simplified ] = "编号(~B)"; + Text[ chinese_traditional ] = "編號(~B)"; Text[ turkish ] = "Numbering"; Text[ arabic ] = ""; - Text[ catalan ] = "~Numeracin"; - Text[ finnish ] = "Nu~mmerierung"; + Text[ catalan ] = "~Numeraci"; + Text[ finnish ] = "Nu~merointi"; + Text[ thai ] = "ลำดับตัวเ~ลข"; }; ListBox LB_NUMVIEW { @@ -239,25 +244,26 @@ TabPage TP_FOOTNOTEOPTION Left = TRUE ; Text [ english_us ] = "~Start at" ; Text [ italian ] = "Ini~zia con" ; - Text [ spanish ] = "Comen~zar en" ; + Text [ spanish ] = "Comenzar en" ; Text [ french ] = "Commencer avec" ; Text [ dutch ] = "~Begin met" ; Text [ swedish ] = "B~rja med" ; Text [ danish ] = "Begynd med" ; Text [ portuguese_brazilian ] = "Be~ginn bei" ; Text [ portuguese ] = "~Iniciar em" ; - Text[ chinese_simplified ] = "ʼ(~S)"; + Text[ chinese_simplified ] = "开始从(~S)"; Text[ russian ] = " "; Text[ polish ] = "Zacznij od"; - Text[ japanese ] = "Jnrԍ(~S)"; - Text[ chinese_traditional ] = "}lq(~S)"; + Text[ japanese ] = "開始番号(~S)"; + Text[ chinese_traditional ] = "開始從(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~S)"; + Text[ korean ] = "시작 번호(~S)"; Text[ turkish ] = "B~alang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comen~zar en"; - Text[ finnish ] = "~Aloita kohdasta"; + Text[ catalan ] = "~S'inicia a"; + Text[ finnish ] = "~Aloitus"; + Text[ thai ] = "เ~ริ่มที่"; }; NumericField FLD_OFFSET { @@ -285,18 +291,19 @@ TabPage TP_FOOTNOTEOPTION Text[ french ] = "~Comptage"; Text[ spanish ] = "Contar"; Text[ italian ] = "Conteggio"; - Text[ danish ] = "Counting"; + Text[ danish ] = "~Punkttegn"; Text[ swedish ] = "Rk~ning"; Text[ polish ] = "Ustawienia numeracji"; Text[ portuguese_brazilian ] = "Counting"; - Text[ japanese ] = "ԍt(~C)"; - Text[ korean ] = "īƮ(~C)"; - Text[ chinese_simplified ] = "(~C)"; - Text[ chinese_traditional ] = "p(~C)"; + Text[ japanese ] = "番号付け(~C)"; + Text[ korean ] = "번호 매기기(~C)"; + Text[ chinese_simplified ] = "计数(~C)"; + Text[ chinese_traditional ] = "計數(~C)"; Text[ turkish ] = "Counting"; Text[ arabic ] = ""; - Text[ catalan ] = "Contar"; - Text[ finnish ] = "~Zhlung"; + Text[ catalan ] = "~Compta"; + Text[ finnish ] = "~Lasketaan"; + Text[ thai ] = "~นับ"; }; ListBox LB_NUMCOUNT { @@ -387,9 +394,9 @@ TabPage TP_FOOTNOTEOPTION }; StringList [ chinese_simplified ] = { - < "ÿҳ" ; > ; - < "ÿ" ; > ; - < "ÿĵ" ; > ; + < "每页" ; > ; + < "每章" ; > ; + < "每文档" ; > ; }; StringList [ russian ] = { @@ -405,15 +412,15 @@ TabPage TP_FOOTNOTEOPTION }; StringList [ japanese ] = { - < "߰ނ" ; > ; - < "͂" ; > ; - < "" ; > ; + < "ページごと" ; > ; + < "章ごと" ; > ; + < "文書ごと" ; > ; }; StringList [ chinese_traditional ] = { - < "C" ; > ; - < "C" ; > ; - < "CӤ" ; > ; + < "每頁" ; > ; + < "每章" ; > ; + < "每個文件" ; > ; }; StringList [ arabic ] = { @@ -429,9 +436,9 @@ TabPage TP_FOOTNOTEOPTION }; StringList [ korean ] = { - < " " ; > ; - < " " ; > ; - < " " ; > ; + < "페이지 당" ; > ; + < "장마다" ; > ; + < "문서당" ; > ; }; StringList [ turkish ] = { @@ -447,9 +454,15 @@ TabPage TP_FOOTNOTEOPTION }; StringList [ catalan ] = { - < "Por pgina" ; > ; - < "Por captulo" ; > ; - < "Por documento" ; > ; + < "Per pgina" ; > ; + < "Per captol" ; > ; + < "Per document" ; > ; + }; + StringList [ thai ] = + { + < "ต่อหน้า" ; > ; + < "ต่อบท" ; > ; + < "ต่อเอกสาร" ; > ; }; }; FixedText FT_PREFIX @@ -459,7 +472,7 @@ TabPage TP_FOOTNOTEOPTION Text = "~Davor" ; Text [ ENGLISH ] = "Before" ; Text [ norwegian ] = "Fr" ; - Text [ italian ] = "~Davanti" ; + Text [ italian ] = "Davanti" ; Text [ portuguese_brazilian ] = "Antes" ; Text [ portuguese ] = "An~tes" ; Text [ finnish ] = "~Ennen" ; @@ -467,20 +480,21 @@ TabPage TP_FOOTNOTEOPTION Text [ french ] = "Avant" ; Text [ swedish ] = "~Framfr" ; Text [ dutch ] = "~Ervoor" ; - Text [ spanish ] = "~Delante" ; + Text [ spanish ] = "Delante" ; Text [ english_us ] = "~Before" ; Left = TRUE ; - Text[ chinese_simplified ] = "֮ǰ(~B)"; + Text[ chinese_simplified ] = "之前(~B)"; Text[ russian ] = ""; Text[ polish ] = "Przed"; - Text[ japanese ] = "ԍO(~B)"; - Text[ chinese_traditional ] = "e(~B)"; + Text[ japanese ] = "番号前(~B)"; + Text[ chinese_traditional ] = "之前(~B)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "(~B)"; + Text[ korean ] = "번호 앞(~B)"; Text[ turkish ] = "n~nde"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Delante"; + Text[ catalan ] = "~Abans"; + Text[ thai ] = "~ก่อน"; }; Edit ED_PREFIX { @@ -506,20 +520,21 @@ TabPage TP_FOOTNOTEOPTION Text [ french ] = "Aprs" ; Text [ swedish ] = "B~akom" ; Text [ dutch ] = "E~rachter" ; - Text [ spanish ] = "D~etrs" ; + Text [ spanish ] = "Detrs" ; Text [ english_us ] = "~After" ; Left = TRUE ; - Text[ chinese_simplified ] = "֮(~A)"; + Text[ chinese_simplified ] = "之后(~A)"; Text[ russian ] = ""; Text[ polish ] = "Za"; - Text[ japanese ] = "ԍ(~A)"; - Text[ chinese_traditional ] = "(~A)"; + Text[ japanese ] = "番号後(~A)"; + Text[ chinese_traditional ] = "之後(~A)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "(~A)"; + Text[ korean ] = "번호 뒤(~A)"; Text[ turkish ] = "A~rkasnda"; Text[ language_user1 ] = " "; - Text[ catalan ] = "D~etrs"; + Text[ catalan ] = "D~esprs"; + Text[ thai ] = "~หลังจาก"; }; Edit ED_SUFFIX { @@ -545,18 +560,19 @@ TabPage TP_FOOTNOTEOPTION Text [ french ] = "Position" ; Text [ dutch ] = "Positie" ; Text [ portuguese ] = "Posio" ; - Text[ chinese_simplified ] = "λ"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "位置"; + Text[ russian ] = ""; Text[ polish ] = "Pozycja"; - Text[ japanese ] = "ʒu"; - Text[ chinese_traditional ] = "m"; + Text[ japanese ] = "位置"; + Text[ chinese_traditional ] = "位置"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ġ"; + Text[ korean ] = "위치"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Posicin"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; RadioButton RB_POS_PAGE { @@ -565,29 +581,30 @@ TabPage TP_FOOTNOTEOPTION Text = "Seiten~ende" ; Text [ ENGLISH ] = "End of ~page" ; Text [ norwegian ] = "End of ~page" ; - Text [ italian ] = "Fine ~pagina" ; + Text [ italian ] = "Fine pagina" ; Text [ portuguese_brazilian ] = "Final de ~p?gina" ; Text [ portuguese ] = "Fim de ~pgina" ; Text [ finnish ] = "~Sivun loppu" ; Text [ danish ] = "Sidens slutning" ; - Text [ french ] = "Fin de ~page" ; + Text [ french ] = "Fin de la page" ; Text [ swedish ] = "S~idslut" ; Text [ dutch ] = "Pag~ina-einde" ; Text [ spanish ] = "Fin de ~pgina" ; Text [ english_us ] = "~End of page" ; TabStop = TRUE ; Group = TRUE ; - Text[ chinese_simplified ] = "ҳβ(~E)"; + Text[ chinese_simplified ] = "页的结束位置(~E)"; Text[ russian ] = " "; Text[ polish ] = "Koniec strony"; - Text[ japanese ] = "߰ޖ(~E)"; - Text[ chinese_traditional ] = "(~E)"; + Text[ japanese ] = "ページ末(~E)"; + Text[ chinese_traditional ] = "頁的結束位置(~E)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~E)"; + Text[ korean ] = "페이지 끝(~E)"; Text[ turkish ] = "Sayfa so~nu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fin de ~pgina"; + Text[ catalan ] = "Fi de ~pgina"; + Text[ thai ] = "~ท้ายหน้า"; }; RadioButton RB_POS_CHAPTER { @@ -596,27 +613,28 @@ TabPage TP_FOOTNOTEOPTION Text = "Do~kumentende" ; Text [ ENGLISH ] = "End of ~doc." ; Text [ norwegian ] = "Slutt p ~dok." ; - Text [ italian ] = "Fine ~documento" ; + Text [ italian ] = "Fine documento" ; Text [ portuguese_brazilian ] = "Final de~doc." ; Text [ portuguese ] = "Fim do ~documento" ; - Text [ finnish ] = "Asiakirjan l~oppu" ; + Text [ finnish ] = "Asiakirjan loppu" ; Text [ danish ] = "Dokumentets slutn." ; - Text [ french ] = "Fin de ~document" ; + Text [ french ] = "Fin du document" ; Text [ swedish ] = "Do~kumentslut" ; Text [ dutch ] = "~Documenteinde" ; Text [ spanish ] = "F~in del documento" ; Text [ english_us ] = "En~d of document" ; - Text[ chinese_simplified ] = "ĵβ(~D)"; + Text[ chinese_simplified ] = "文档的结束位置(~D)"; Text[ russian ] = " "; Text[ polish ] = "Koniec dokumentu"; - Text[ japanese ] = "(~D)"; - Text[ chinese_traditional ] = "(~D)"; + Text[ japanese ] = "文書末(~D)"; + Text[ chinese_traditional ] = "文件的結束位置(~D)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~)"; + Text[ korean ] = "문서 끝(~D)"; Text[ turkish ] = "~Belge sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~in del documento"; + Text[ catalan ] = "Fin~al del document"; + Text[ thai ] = "ท้า~ยเอกสาร"; }; FixedLine FL_TEMPL { @@ -635,17 +653,18 @@ TabPage TP_FOOTNOTEOPTION Text [ dutch ] = "Opmaakprofielen" ; Text [ spanish ] = "Estilos" ; Text [ english_us ] = "Styles" ; - Text[ chinese_simplified ] = "ʽ"; + Text[ chinese_simplified ] = "样式"; Text[ russian ] = ""; Text[ polish ] = "Style"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "˦"; + Text[ japanese ] = "スタイル"; + Text[ chinese_traditional ] = "樣式"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "스타일"; Text[ turkish ] = "Biim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos"; + Text[ catalan ] = "Estils"; + Text[ thai ] = "ลักษณะ"; }; FixedText FT_PARA_TEMPL { @@ -654,28 +673,29 @@ TabPage TP_FOOTNOTEOPTION Text = "~Absatz" ; Text [ ENGLISH ] = "~Paragraph" ; Text [ norwegian ] = "~Paragraf" ; - Text [ italian ] = "~Paragrafo" ; + Text [ italian ] = "Paragrafo" ; Text [ portuguese_brazilian ] = "~Par?grafo" ; Text [ portuguese ] = "~Pargrafo" ; Text [ finnish ] = "~Kappale" ; Text [ danish ] = "Afsnit" ; - Text [ french ] = "~Paragraphe" ; + Text [ french ] = "Paragraphe" ; Text [ swedish ] = "Sty~cke" ; Text [ dutch ] = "~Alinea" ; Text [ spanish ] = "Prra~fo" ; Text [ english_us ] = "Pa~ragraph" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~R)"; + Text[ chinese_simplified ] = "段落(~R)"; Text[ russian ] = ""; Text[ polish ] = "Akapit"; - Text[ japanese ] = "i(~R)"; - Text[ chinese_traditional ] = "q(~R)"; + Text[ japanese ] = "段落(~R)"; + Text[ chinese_traditional ] = "段落(~R)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ܶ(~R)"; + Text[ korean ] = "단락(~R)"; Text[ turkish ] = "~Paragraf"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Prra~fo"; + Text[ catalan ] = "Pargra~f"; + Text[ thai ] = "ย่อ~หน้า"; }; ListBox LB_PARA_TEMPL { @@ -694,7 +714,7 @@ TabPage TP_FOOTNOTEOPTION Text = "~Seite" ; Text [ ENGLISH ] = "~Page" ; Text [ norwegian ] = "~Page" ; - Text [ italian ] = "~Pagina" ; + Text [ italian ] = "Pagina" ; Text [ portuguese_brazilian ] = "~P?gina" ; Text [ portuguese ] = "~Pgina" ; Text [ finnish ] = "~Sivu" ; @@ -705,17 +725,18 @@ TabPage TP_FOOTNOTEOPTION Text [ spanish ] = "P~gina" ; Text [ english_us ] = "~Page" ; Left = TRUE ; - Text[ chinese_simplified ] = "ҳ(~P)"; + Text[ chinese_simplified ] = "页(~P)"; Text[ russian ] = ""; Text[ polish ] = "Strona"; - Text[ japanese ] = "߰(~P)"; - Text[ chinese_traditional ] = "(~P)"; + Text[ japanese ] = "ページ(~P)"; + Text[ chinese_traditional ] = "頁(~P)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~P)"; + Text[ korean ] = "페이지(~P)"; Text[ turkish ] = "~Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P~gina"; + Text[ catalan ] = "P~gina"; + Text[ thai ] = "~หน้า"; }; ListBox LB_PAGE_TEMPL { @@ -734,25 +755,26 @@ TabPage TP_FOOTNOTEOPTION Text[ english_us ] = "Character Styles"; Text[ portuguese ] = "Estilos de caracteres"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Tekenopmaakprofielen"; Text[ french ] = "Styles de caractres"; Text[ spanish ] = "Estilos de carcter"; Text[ italian ] = "Modelli di carattere"; - Text[ danish ] = "Tegntypografi"; + Text[ danish ] = "Tegntypografier"; Text[ swedish ] = "Teckenformatmallar"; Text[ polish ] = "Style znakw"; Text[ portuguese_brazilian ] = "Character styles"; - Text[ japanese ] = ""; - Text[ korean ] = " "; - Text[ chinese_simplified ] = "ַʽ"; - Text[ chinese_traditional ] = "r˦"; + Text[ japanese ] = "文字スタイル"; + Text[ korean ] = "문자 스타일"; + Text[ chinese_simplified ] = "字符样式"; + Text[ chinese_traditional ] = "字元樣式"; Text[ arabic ] = " "; Text[ turkish ] = "Karakter biimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos de carcter"; + Text[ catalan ] = "Estils de carcter"; Text[ finnish ] = "Merkkityylit"; + Text[ thai ] = "ลักษณะตัวอักขระ"; }; FixedText FT_ANCHR_CHARFMT { @@ -770,18 +792,19 @@ TabPage TP_FOOTNOTEOPTION Text [ french ] = "Zone de ~texte" ; Text [ dutch ] = "~Tekstbereik" ; Text [ portuguese ] = "~rea de texto" ; - Text[ chinese_simplified ] = "(~X)"; + Text[ chinese_simplified ] = "文字区域(~X)"; Text[ russian ] = " "; Text[ polish ] = "Obszar tekstu"; - Text[ japanese ] = "͈(~X)"; - Text[ chinese_traditional ] = "rϰ(~X)"; + Text[ japanese ] = "文書範囲(~X)"; + Text[ chinese_traditional ] = "文字區域(~X)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ؽƮ(~X)"; + Text[ korean ] = "문서 영역(~X)"; Text[ turkish ] = "Metin a~lan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "rea de ~texto"; + Text[ catalan ] = "rea de ~text"; Text[ finnish ] = "Teksti~alue"; + Text[ thai ] = "พื้นที่ข้อ~ความ"; }; ListBox LB_ANCHR_CHARFMT { @@ -804,22 +827,23 @@ TabPage TP_FOOTNOTEOPTION Text [ swedish ] = "Fotnotsomrde" ; Text [ danish ] = "Fodnoteomrde" ; Text [ italian ] = "Area note a pi pagina" ; - Text [ spanish ] = "rea de ~nota al pie" ; - Text [ french ] = "Plage de la ~note" ; + Text [ spanish ] = "rea de nota al pie" ; + Text [ french ] = "Section des notes" ; Text [ dutch ] = "Voetnoten~bereik" ; Text [ portuguese ] = "~rea de rodap" ; - Text[ chinese_simplified ] = "ע(~F)"; + Text[ chinese_simplified ] = "注脚区域(~F)"; Text[ russian ] = " "; Text[ polish ] = "Obszar przyp. doln."; - Text[ japanese ] = "r͈(~F)"; - Text[ chinese_traditional ] = "}d(~F)"; + Text[ japanese ] = "脚注範囲(~F)"; + Text[ chinese_traditional ] = "註腳範圍(~F)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~F)"; + Text[ korean ] = "각주 영역(~F)"; Text[ turkish ] = "D~ipnot alan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "rea de ~nota al pie"; - Text[ finnish ] = "~Alaviitealue"; + Text[ catalan ] = "rea de ~nota al peu"; + Text[ finnish ] = "Ala~viitealue"; + Text[ thai ] = "พื้นที่เ~ชิงอรรถ"; }; ListBox LB_TEXT_CHARFMT { @@ -841,23 +865,24 @@ TabPage TP_FOOTNOTEOPTION Text [ portuguese_brazilian ] = "Aviso de continua??o" ; Text [ portuguese ] = "Continuao das notas de rodap" ; Text [ finnish ] = "Jatkoilmoitus" ; - Text [ danish ] = "Henvisningstekst for flersidede fodnoter" ; + Text [ danish ] = "Tekst i flersidede fodnoter" ; Text [ french ] = "Indication de suite" ; Text [ swedish ] = "Hnvisningstext fr flersidiga fotnoter" ; - Text [ dutch ] = "Verwijstekst bij voetnoten verdeeld over meer dan een pagina" ; + Text [ dutch ] = "Verwijstekst bij voetnoten verdeeld over meer dan n pagina" ; Text [ spanish ] = "Indicacin para notas al pie en varias pginas" ; Text [ english_us ] = "Continuation notice" ; - Text[ chinese_simplified ] = "ҳעŵʾ"; + Text[ chinese_simplified ] = "多页注脚的提示文"; Text[ russian ] = " "; Text[ polish ] = "Wskazwka dotyczca kontynuacji przypisw dolnych"; - Text[ japanese ] = "r߰ނɑۂ̒ӏ"; - Text[ chinese_traditional ] = "h}ܤ"; + Text[ japanese ] = "脚注が次ページに続く際の注意書き"; + Text[ chinese_traditional ] = "多頁註腳的提示文"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ֿ "; + Text[ korean ] = "각주 계속 시 주의 표시"; Text[ turkish ] = "Devam eden dipnotu ile ilgili bilgi metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Indicacin para notas al pie en varias pginas"; + Text[ catalan ] = "Indicaci per notes al peu en diverses pgines"; + Text[ thai ] = "แจ้งให้ทราบอย่างต่อเนื่อง"; }; FixedText FT_CONT { @@ -869,25 +894,26 @@ TabPage TP_FOOTNOTEOPTION Text [ italian ] = "Alla fine del pi pagina" ; Text [ portuguese_brazilian ] = "~Continuado" ; Text [ portuguese ] = "~No final da nota" ; - Text [ finnish ] = "Ala~selitteen loppu" ; + Text [ finnish ] = "Alaselitteen loppu" ; Text [ danish ] = "Ved fodnotens slutning" ; Text [ french ] = "En ~fin de note" ; Text [ swedish ] = "Vid slutet av f~otnoten" ; - Text [ dutch ] = "~Voetnooteinde" ; + Text [ dutch ] = "Eind van ~voetnoot" ; Text [ spanish ] = "Final de n~ota al pie" ; Text [ english_us ] = "End ~of footnote" ; Left = TRUE ; - Text[ chinese_simplified ] = "עβ(~O)"; + Text[ chinese_simplified ] = "注脚的结束位置(~O)"; Text[ russian ] = " "; Text[ polish ] = "Na koncu przypisw dolnych"; - Text[ japanese ] = "r(~O)"; - Text[ chinese_traditional ] = "b}(~O)"; + Text[ japanese ] = "脚注末(~O)"; + Text[ chinese_traditional ] = "在註腳結尾(~O)"; Text[ arabic ] = " "; Text[ greek ] = " ~"; - Text[ korean ] = " (~O)"; + Text[ korean ] = "각주 끝에(~O)"; Text[ turkish ] = "~Dipnot altnda"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Final de n~ota al pie"; + Text[ catalan ] = "Final ~de la nota al peu"; + Text[ thai ] = "ท้าย~ของเชิงอรรถ"; }; Edit ED_CONT { @@ -905,10 +931,10 @@ TabPage TP_FOOTNOTEOPTION Text = "A~uf Folgeseite" ; Text [ ENGLISH ] = "~Started" ; Text [ norwegian ] = "~Startet" ; - Text [ italian ] = "Alla pagina succ." ; + Text [ italian ] = "Alla pagina successiva" ; Text [ portuguese_brazilian ] = "~Iniciado" ; Text [ portuguese ] = "~Pgina seguinte" ; - Text [ finnish ] = "~Seuraavan sivun aloitus" ; + Text [ finnish ] = "Seuraavan sivun aloitus" ; Text [ danish ] = "P nste side" ; Text [ french ] = "~Sur la page suivante" ; Text [ swedish ] = "~P fljande sida" ; @@ -916,17 +942,18 @@ TabPage TP_FOOTNOTEOPTION Text [ spanish ] = "En pg. sig~uiente" ; Text [ english_us ] = "Star~t of next page" ; Left = TRUE ; - Text[ chinese_simplified ] = "ҳ_ʼ(~T)"; + Text[ chinese_simplified ] = "從续页開始(~T)"; Text[ russian ] = " "; Text[ polish ] = "Na nastepnej stronie"; - Text[ japanese ] = "߰(~T)"; + Text[ japanese ] = "次のページ(~T)"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "q}l(~T)"; + Text[ chinese_traditional ] = "從續頁開始(~T)"; Text[ arabic ] = " "; Text[ greek ] = " ~ "; - Text[ korean ] = " ʿ(~T)"; + Text[ korean ] = "다음 페이지 시작(~T)"; Text[ turkish ] = "~Sonraki sayfada"; - Text[ catalan ] = "En pg. sig~uiente"; + Text[ catalan ] = "A pg. seg~ent"; + Text[ thai ] = "เริ่~มหน้าถัดไป"; }; Edit ED_CONT_FROM { @@ -963,17 +990,18 @@ TabPage TP_ENDNOTEOPTION Text [ spanish ] = "Numeracin automtica" ; Text [ english_us ] = "AutoNumbering" ; Group = TRUE ; - Text[ chinese_simplified ] = "Զ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "自动编号"; + Text[ russian ] = ""; Text[ polish ] = "Automatyczna numeracja"; - Text[ japanese ] = "ԍt"; - Text[ chinese_traditional ] = "۰ʽs"; + Text[ japanese ] = "自動番号付け"; + Text[ chinese_traditional ] = "自動編號"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ڵ ȣű"; + Text[ korean ] = "자동 번호 매기기"; Text[ turkish ] = "Otomatik numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin automtica"; + Text[ catalan ] = "Numeraci automtica"; + Text[ thai ] = "ลำดับตัวเลขอัตโนมัติ"; }; FixedText FT_NUMTYPE { @@ -986,21 +1014,22 @@ TabPage TP_ENDNOTEOPTION Text[ russian ] = ""; Text[ greek ] = "~"; Text[ dutch ] = "Nu~mmering"; - Text[ french ] = "Nu~mrotation"; + Text[ french ] = "Numrotation"; Text[ spanish ] = "Numeracin"; Text[ italian ] = "Numerazione"; - Text[ danish ] = "Numbering"; + Text[ danish ] = "Nu~mmerering"; Text[ swedish ] = "Nu~mrering"; Text[ polish ] = "Numeracja"; Text[ portuguese_brazilian ] = "Numbering"; - Text[ japanese ] = "ԍ̎(~N)"; - Text[ korean ] = "ȣű(~N)"; - Text[ chinese_simplified ] = "(~N)"; - Text[ chinese_traditional ] = "s(~N)"; + Text[ japanese ] = "番号の種類(~N)"; + Text[ korean ] = "번호 매기기(~N)"; + Text[ chinese_simplified ] = "编号(~N)"; + Text[ chinese_traditional ] = "編號(~N)"; Text[ turkish ] = "Numbering"; Text[ arabic ] = ""; - Text[ catalan ] = "Numeracin"; - Text[ finnish ] = "Nu~mmerierung"; + Text[ catalan ] = "Numeraci"; + Text[ finnish ] = "~Numerointi"; + Text[ thai ] = "~ลำดับตัวเลข"; }; ListBox LB_NUMVIEW { @@ -1031,25 +1060,26 @@ TabPage TP_ENDNOTEOPTION Left = TRUE ; Text [ english_us ] = "~Start at" ; Text [ italian ] = "Ini~zia con" ; - Text [ spanish ] = "Comen~zar en" ; + Text [ spanish ] = "Comenzar en" ; Text [ french ] = "Commencer avec" ; Text [ dutch ] = "~Begin met" ; Text [ swedish ] = "~Brja med" ; Text [ danish ] = "Begynd med" ; Text [ portuguese_brazilian ] = "Be~ginn bei" ; Text [ portuguese ] = "~Iniciar em" ; - Text[ chinese_simplified ] = "ʼ(~S)"; + Text[ chinese_simplified ] = "开始从(~S)"; Text[ russian ] = " "; Text[ polish ] = "Zacznij od"; - Text[ japanese ] = "Jnrԍ(~S)"; - Text[ chinese_traditional ] = "}lq(~S)"; + Text[ japanese ] = "開始番号(~S)"; + Text[ chinese_traditional ] = "開始從(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~S)"; + Text[ korean ] = "시작 번호(~S)"; Text[ turkish ] = "B~alang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comen~zar en"; - Text[ finnish ] = "~Aloita kohdasta"; + Text[ catalan ] = "Comen~a a"; + Text[ finnish ] = "~Aloitus"; + Text[ thai ] = "เ~ริ่มที่"; }; NumericField FLD_OFFSET { @@ -1084,7 +1114,7 @@ TabPage TP_ENDNOTEOPTION Text = "~Davor" ; Text [ ENGLISH ] = "Before" ; Text [ norwegian ] = "Fr" ; - Text [ italian ] = "~Davanti" ; + Text [ italian ] = "Davanti" ; Text [ portuguese_brazilian ] = "Antes" ; Text [ portuguese ] = "An~tes" ; Text [ finnish ] = "~Ennen" ; @@ -1092,20 +1122,21 @@ TabPage TP_ENDNOTEOPTION Text [ french ] = "Avant" ; Text [ swedish ] = "~Framfr" ; Text [ dutch ] = "~Ervoor" ; - Text [ spanish ] = "~Delante" ; + Text [ spanish ] = "Delante" ; Text [ english_us ] = "~Before" ; Left = TRUE ; - Text[ chinese_simplified ] = "֮ǰ(~B)"; + Text[ chinese_simplified ] = "之前(~B)"; Text[ russian ] = ""; Text[ polish ] = "Przed"; - Text[ japanese ] = "ԍO(~B)"; - Text[ chinese_traditional ] = "e(~B)"; + Text[ japanese ] = "番号前(~B)"; + Text[ chinese_traditional ] = "之前(~B)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "(~B)"; + Text[ korean ] = "번호 앞(~B)"; Text[ turkish ] = "nnde"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Delante"; + Text[ catalan ] = "~Abans"; + Text[ thai ] = "~ก่อน"; }; Edit ED_PREFIX { @@ -1131,20 +1162,21 @@ TabPage TP_ENDNOTEOPTION Text [ french ] = "Aprs" ; Text [ swedish ] = "Ba~kom" ; Text [ dutch ] = "E~rachter" ; - Text [ spanish ] = "D~etrs" ; + Text [ spanish ] = "Detrs" ; Text [ english_us ] = "~After" ; Left = TRUE ; - Text[ chinese_simplified ] = "֮(~A)"; + Text[ chinese_simplified ] = "之后(~A)"; Text[ russian ] = ""; Text[ polish ] = "Za"; - Text[ japanese ] = "ԍ(~A)"; - Text[ chinese_traditional ] = "(~A)"; + Text[ japanese ] = "番号後(~A)"; + Text[ chinese_traditional ] = "之後(~A)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "(~A)"; + Text[ korean ] = "번호 뒤(~A)"; Text[ turkish ] = "A~rkasnda"; Text[ language_user1 ] = " "; - Text[ catalan ] = "D~etrs"; + Text[ catalan ] = "D~esprs"; + Text[ thai ] = "~หลังจาก"; }; Edit ED_SUFFIX { @@ -1168,29 +1200,30 @@ TabPage TP_ENDNOTEOPTION Text = "Seiten~ende" ; Text [ ENGLISH ] = "End of ~page" ; Text [ norwegian ] = "End of ~page" ; - Text [ italian ] = "Fine ~pagina" ; + Text [ italian ] = "Fine pagina" ; Text [ portuguese_brazilian ] = "Final de ~p?gina" ; Text [ portuguese ] = "Fim de ~pgina" ; Text [ finnish ] = "~Sivun loppu" ; Text [ danish ] = "Sidens slutning" ; - Text [ french ] = "Fin de ~page" ; + Text [ french ] = "Fin de la page" ; Text [ swedish ] = "S~idslut" ; Text [ dutch ] = "Pag~ina-einde" ; Text [ spanish ] = "Fin de ~pgina" ; Text [ english_us ] = "End ~of page" ; TabStop = TRUE ; Group = TRUE ; - Text[ chinese_simplified ] = "ҳβ(~O)"; + Text[ chinese_simplified ] = "页的结束位置(~O)"; Text[ russian ] = " "; Text[ polish ] = "Koniec strony"; - Text[ japanese ] = "߰ޖ(~O)"; - Text[ chinese_traditional ] = "(~O)"; + Text[ japanese ] = "ページ末(~O)"; + Text[ chinese_traditional ] = "頁的結束位置(~O)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~O)"; + Text[ korean ] = "페이지 끝(~O)"; Text[ turkish ] = "Sayfa so~nu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fin de ~pgina"; + Text[ catalan ] = "Fi de ~pgina"; + Text[ thai ] = "ส่วนท้าย~ของหน้า"; }; RadioButton RB_POS_CHAPTER { @@ -1199,27 +1232,28 @@ TabPage TP_ENDNOTEOPTION Text = "~Dokumentende" ; Text [ ENGLISH ] = "End of ~doc." ; Text [ norwegian ] = "Slutt p ~dok." ; - Text [ italian ] = "Fine ~documento" ; + Text [ italian ] = "Fine documento" ; Text [ portuguese_brazilian ] = "Final de~doc." ; Text [ portuguese ] = "Fim do ~documento" ; Text [ finnish ] = "~Asiakirjan loppu" ; Text [ danish ] = "Dokumentets slutn." ; - Text [ french ] = "Fin de ~document" ; + Text [ french ] = "Fin du document" ; Text [ swedish ] = "~Dokumentslut" ; Text [ dutch ] = "~Documenteinde" ; Text [ spanish ] = "Fin del ~documento" ; Text [ english_us ] = "End of ~document" ; - Text[ chinese_simplified ] = "ĵβ(~D)"; + Text[ chinese_simplified ] = "文档的结束位置(~D)"; Text[ russian ] = " "; Text[ polish ] = "Koniec dokumentu"; - Text[ japanese ] = "(~D)"; - Text[ chinese_traditional ] = "(~D)"; + Text[ japanese ] = "文書末(~D)"; + Text[ chinese_traditional ] = "文件的結束位置(~D)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~D)"; + Text[ korean ] = "문서 끝(~D)"; Text[ turkish ] = "~Belge sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fin del ~documento"; + Text[ catalan ] = "Final del ~document"; + Text[ thai ] = "ส่วนท้ายของเ~อกสาร"; }; FixedLine FL_TEMPL { @@ -1238,17 +1272,18 @@ TabPage TP_ENDNOTEOPTION Text [ dutch ] = "Opmaakprofielen" ; Text [ spanish ] = "Estilos" ; Text [ english_us ] = "Styles" ; - Text[ chinese_simplified ] = "ʽ"; + Text[ chinese_simplified ] = "样式"; Text[ russian ] = ""; Text[ polish ] = "Style"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "˦"; + Text[ japanese ] = "スタイル"; + Text[ chinese_traditional ] = "樣式"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "스타일"; Text[ turkish ] = "Biim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos"; + Text[ catalan ] = "Estils"; + Text[ thai ] = "ลักษณะ"; }; FixedText FT_PARA_TEMPL { @@ -1257,28 +1292,29 @@ TabPage TP_ENDNOTEOPTION Text = "~Absatz" ; Text [ ENGLISH ] = "~Paragraph" ; Text [ norwegian ] = "~Paragraf" ; - Text [ italian ] = "~Paragrafo" ; + Text [ italian ] = "Paragrafo" ; Text [ portuguese_brazilian ] = "~Par?grafo" ; Text [ portuguese ] = "~Pargrafo" ; Text [ finnish ] = "~Kappale" ; Text [ danish ] = "Afsnit" ; - Text [ french ] = "~Paragraphe" ; + Text [ french ] = "Paragraphe" ; Text [ swedish ] = "Sty~cke" ; Text [ dutch ] = "~Alinea" ; Text [ spanish ] = "Prra~fo" ; Text [ english_us ] = "Pa~ragraph" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~R)"; + Text[ chinese_simplified ] = "段落(~R)"; Text[ russian ] = ""; Text[ polish ] = "Akapit"; - Text[ japanese ] = "i(~R)"; - Text[ chinese_traditional ] = "q(~R)"; + Text[ japanese ] = "段落(~R)"; + Text[ chinese_traditional ] = "段落(~R)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ܶ(~R)"; + Text[ korean ] = "단락(~R)"; Text[ turkish ] = "~Paragraf"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Prra~fo"; + Text[ catalan ] = "Pargra~f"; + Text[ thai ] = "ย่อ~หน้า"; }; ListBox LB_PARA_TEMPL { @@ -1297,7 +1333,7 @@ TabPage TP_ENDNOTEOPTION Text = "~Seite" ; Text [ ENGLISH ] = "~Page" ; Text [ norwegian ] = "~Page" ; - Text [ italian ] = "~Pagina" ; + Text [ italian ] = "Pagina" ; Text [ portuguese_brazilian ] = "~P?gina" ; Text [ portuguese ] = "~Pgina" ; Text [ finnish ] = "~Sivu" ; @@ -1308,17 +1344,18 @@ TabPage TP_ENDNOTEOPTION Text [ spanish ] = "P~gina" ; Text [ english_us ] = "~Page" ; Left = TRUE ; - Text[ chinese_simplified ] = "ҳ(~P)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "页(~P)"; + Text[ russian ] = "~"; Text[ polish ] = "Strona"; - Text[ japanese ] = "߰(~P)"; - Text[ chinese_traditional ] = "(~P)"; + Text[ japanese ] = "ページ(~P)"; + Text[ chinese_traditional ] = "頁(~P)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~P)"; + Text[ korean ] = "페이지(~P)"; Text[ turkish ] = "~Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P~gina"; + Text[ catalan ] = "P~gina"; + Text[ thai ] = "~หน้า"; }; ListBox LB_PAGE_TEMPL { @@ -1336,25 +1373,26 @@ TabPage TP_ENDNOTEOPTION Text [ ENGLISH ] = "Character styles" ; Text[ english_us ] = "Character Styles"; Text[ portuguese ] = "Estilos de caracteres"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Tekenopmaakprofielen"; Text[ french ] = "Styles de caractres"; Text[ spanish ] = "Estilos de carcter"; Text[ italian ] = "Modelli di carattere"; - Text[ danish ] = "Tegntypografi"; + Text[ danish ] = "Tegntypografier"; Text[ swedish ] = "Teckenformatmallar"; Text[ polish ] = "Style znakw"; Text[ portuguese_brazilian ] = "Character styles"; - Text[ japanese ] = ""; - Text[ korean ] = " "; - Text[ chinese_simplified ] = "ַʽ"; - Text[ chinese_traditional ] = "r˦"; + Text[ japanese ] = "文字スタイル"; + Text[ korean ] = "문자 스타일"; + Text[ chinese_simplified ] = "字符样式"; + Text[ chinese_traditional ] = "字元樣式"; Text[ arabic ] = " "; Text[ turkish ] = "Karakter biimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos de carcter"; + Text[ catalan ] = "Estils de carcter"; Text[ finnish ] = "Merkkityylit"; + Text[ thai ] = "ลักษณะตัวอักขระ"; }; FixedText FT_ANCHR_CHARFMT { @@ -1370,19 +1408,20 @@ TabPage TP_ENDNOTEOPTION Text [ italian ] = "Area del testo" ; Text [ spanish ] = "rea de ~texto" ; Text [ french ] = "Zone de ~texte" ; - Text [ dutch ] = "~Eindemarkeringsbereik" ; + Text [ dutch ] = "T~ekstbereik" ; Text [ portuguese ] = "rea de te~xto" ; - Text[ chinese_simplified ] = "(~X)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "文字区域(~X)"; + Text[ russian ] = ""; Text[ polish ] = "Obszar tekstu"; - Text[ japanese ] = "͈(~X)"; - Text[ chinese_traditional ] = "rϰ(~X)"; + Text[ japanese ] = "文書範囲(~X)"; + Text[ chinese_traditional ] = "文字區域(~X)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ؽƮ (~X)"; + Text[ korean ] = "문서 영역(~X)"; Text[ turkish ] = "Metin ~alan"; - Text[ catalan ] = "rea de ~texto"; - Text[ finnish ] = "Teksti~alue"; + Text[ catalan ] = "rea de ~text"; + Text[ finnish ] = "Tekstialue"; + Text[ thai ] = "พื้นที่ข้อ~ความ"; }; ListBox LB_ANCHR_CHARFMT { @@ -1405,21 +1444,22 @@ TabPage TP_ENDNOTEOPTION Text [ swedish ] = "Slutnotsomrde" ; Text [ danish ] = "Slutnoteomrde" ; Text [ italian ] = "Area note di chiusura" ; - Text [ spanish ] = "rea de n~ota al final" ; - Text [ french ] = "Plage de la ~note" ; + Text [ spanish ] = "rea de n~otas finales" ; + Text [ french ] = "Section des notes" ; Text [ dutch ] = "~Eindnotenbereik" ; Text [ portuguese ] = "rea de ~nota final" ; - Text[ chinese_simplified ] = "βע(~E)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "尾注区域(~E)"; + Text[ russian ] = " "; Text[ polish ] = "Obszar przyp. koc."; - Text[ japanese ] = "r͈(~E)"; - Text[ chinese_traditional ] = "ϰ(~E)"; + Text[ japanese ] = "文末脚注範囲(~E)"; + Text[ chinese_traditional ] = "尾註區域(~E)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~E)"; + Text[ korean ] = "미주 영역(~E)"; Text[ turkish ] = "S~onnot alan"; - Text[ catalan ] = "rea de n~ota al final"; + Text[ catalan ] = "rea de n~ota al final"; Text[ finnish ] = "~Loppuviitealue"; + Text[ thai ] = "พื้นที่~อ้างอิงท้ายเรื่อง"; }; ListBox LB_TEXT_CHARFMT { @@ -1445,20 +1485,21 @@ TabPage TP_ENDNOTEOPTION Text [ danish ] = "Henvisningstekst for flersidede fodnoter" ; Text [ french ] = "Indication de suite" ; Text [ swedish ] = "Hnvisningstext fr flersidiga fotnoter" ; - Text [ dutch ] = "Verwijstekst bij voetnoten verdeeld over meer dan een pagina" ; + Text [ dutch ] = "Verwijstekst bij voetnoten verdeeld over meer dan n pagina" ; Text [ spanish ] = "Indicacin para notas al pie en varias pginas" ; Text [ english_us ] = "Continuation notice" ; - Text[ chinese_simplified ] = "ҳעŵʾ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "多页注脚的提示文"; + Text[ russian ] = " "; Text[ polish ] = "Wskazwka dotyczca kontynuacji przypisw dolnych"; - Text[ japanese ] = "r߰ނɑۂ̒ӏ"; - Text[ chinese_traditional ] = "h}ܤ"; + Text[ japanese ] = "脚注が次ページに続く際の注意書き"; + Text[ chinese_traditional ] = "多頁註腳的提示文"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ֿ "; + Text[ korean ] = "각주 계속 시 주의 표시"; Text[ turkish ] = "Devam eden dipnotu ile ilgili bilgi metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Indicacin para notas al pie en varias pginas"; + Text[ catalan ] = "Indicaci per notes al peu en diverses pgines"; + Text[ thai ] = "แจ้งให้ทราบอย่างต่อเนื่อง"; }; FixedText FT_CONT { @@ -1478,17 +1519,18 @@ TabPage TP_ENDNOTEOPTION Text [ spanish ] = "Pgina ~siguiente" ; Text [ english_us ] = "~Following page" ; Left = TRUE ; - Text[ chinese_simplified ] = "ҳ(~F)"; + Text[ chinese_simplified ] = "续页(~F)"; Text[ russian ] = " "; Text[ polish ] = "Nastp. str."; - Text[ japanese ] = "߰(~F)"; - Text[ chinese_traditional ] = "(~F)"; + Text[ japanese ] = "次のページ(~F)"; + Text[ chinese_traditional ] = "續頁(~F)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~F)"; + Text[ korean ] = "다음 페이지(~F)"; Text[ turkish ] = "~Sonraki sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pgina ~siguiente"; + Text[ catalan ] = "Pgina ~segent"; + Text[ thai ] = "หน้า~นี้"; }; Edit ED_CONT { @@ -1517,17 +1559,18 @@ TabPage TP_ENDNOTEOPTION Text [ spanish ] = "~Comenzar" ; Text [ english_us ] = "~Start" ; Left = TRUE ; - Text[ chinese_simplified ] = "ʼ(~S)"; + Text[ chinese_simplified ] = "开始(~S)"; Text[ russian ] = ""; Text[ polish ] = "Pocztek"; - Text[ japanese ] = "Jn(~S)"; + Text[ japanese ] = "開始(~S)"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "}l(~S)"; + Text[ chinese_traditional ] = "開始(~S)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~S)"; + Text[ korean ] = "시작(~S)"; Text[ turkish ] = "~Balang"; - Text[ catalan ] = "~Comenzar"; + Text[ catalan ] = "~Inicia"; + Text[ thai ] = "เ~ริ่ม"; }; Edit ED_CONT_FROM { @@ -1542,3 +1585,19 @@ TabPage TP_ENDNOTEOPTION + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/glosbib.src b/sw/source/ui/misc/glosbib.src index cdd9c169ef0d..be80c505deb7 100644 --- a/sw/source/ui/misc/glosbib.src +++ b/sw/source/ui/misc/glosbib.src @@ -2,9 +2,9 @@ * * $RCSfile: glosbib.src,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:18:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ ModalDialog DLG_BIB_BASE Text [ dutch ] = "Bereiken bewerken" ; Text [ english_us ] = "Edit Categories" ; Text [ italian ] = "Modifica categorie" ; - Text [ spanish ] = "Modificar reas" ; + Text [ spanish ] = "Editar categoras" ; Text [ french ] = "dition des catgories" ; Text [ swedish ] = "Redigera omrden" ; Text [ danish ] = "Rediger omrder" ; @@ -99,17 +99,18 @@ ModalDialog DLG_BIB_BASE Text [ spanish ] = "~Nuevo" ; Text [ english_us ] = "~New" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "½(~N)"; - Text[ russian ] = "~"; + Text[ chinese_simplified ] = "新建(~N)"; + Text[ russian ] = ""; Text[ polish ] = "Nowy"; - Text[ japanese ] = "VK쐬(~N)"; - Text[ chinese_traditional ] = "}ҷs(~N)"; + Text[ japanese ] = "新規作成(~N)"; + Text[ chinese_traditional ] = "開啟新檔(~N)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~N)"; + Text[ korean ] = "새로 만들기(~N)"; Text[ turkish ] = "~Yeni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo"; + Text[ catalan ] = "~Nou"; + Text[ thai ] = "ใ~หม่"; }; PushButton PB_DELETE { @@ -124,24 +125,25 @@ ModalDialog DLG_BIB_BASE Text [ portuguese ] = "E~liminar" ; Text [ finnish ] = "~Poista" ; Text [ danish ] = "Slet" ; - Text [ french ] = "~Supprimer" ; + Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; TabStop = TRUE ; Disable = TRUE ; - Text[ chinese_simplified ] = "ɾ(~D)"; + Text[ chinese_simplified ] = "删除(~D)"; Text[ russian ] = ""; Text[ polish ] = "Usu"; - Text[ japanese ] = "폜(~D)"; - Text[ chinese_traditional ] = "R(~D)"; + Text[ japanese ] = "削除(~D)"; + Text[ chinese_traditional ] = "刪除(~D)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~D)"; + Text[ korean ] = "삭제(~D)"; Text[ turkish ] = "~Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; + Text[ thai ] = "~ลบ"; }; PushButton PB_RENAME { @@ -160,18 +162,19 @@ ModalDialog DLG_BIB_BASE Text [ portuguese ] = "~Mudar nome" ; TabStop = TRUE ; Text[ portuguese_brazilian ] = "Ren~ame"; - Text[ chinese_simplified ] = "(~R)"; + Text[ chinese_simplified ] = "重命名(~R)"; Text[ russian ] = ""; Text[ polish ] = "Zmie nazw"; - Text[ japanese ] = "O̕ύX(~R)"; - Text[ chinese_traditional ] = "sRW(~R)"; + Text[ japanese ] = "名前の変更(~R)"; + Text[ chinese_traditional ] = "重新命名(~R)"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "̸ ٲٱ(~R)"; + Text[ korean ] = "이름 바꾸기(~R)"; Text[ turkish ] = "Y~eniden adlandr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cambiar nombre"; + Text[ catalan ] = "~Reanomena"; Text[ finnish ] = "~Nime uudelleen"; + Text[ thai ] = "เ~ปลี่ยนชื่อ"; }; FixedText FT_BIB { @@ -184,23 +187,24 @@ ModalDialog DLG_BIB_BASE Text [ portuguese_brazilian ] = "Grupo" ; Text [ portuguese ] = "Categoria" ; Text [ finnish ] = "Luokka" ; - Text [ danish ] = "Omrde" ; + Text [ danish ] = "Omrdetitel" ; Text [ french ] = "Catgorie" ; Text [ swedish ] = "Omrde" ; Text [ dutch ] = "Bereik" ; - Text [ spanish ] = "rea" ; + Text [ spanish ] = "Categora" ; Text [ english_us ] = "Category" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "分类标题"; Text[ russian ] = ""; Text[ polish ] = "Tytu kategorii"; - Text[ japanese ] = "ٰߖ"; - Text[ chinese_traditional ] = "ϰD"; + Text[ japanese ] = "グループ名"; + Text[ chinese_traditional ] = "分類標題"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "영역 제목"; Text[ turkish ] = "Kategori"; Text[ language_user1 ] = " "; Text[ catalan ] = "Area"; + Text[ thai ] = "ประเภท"; }; OKButton BT_OK { @@ -236,25 +240,26 @@ ModalDialog DLG_BIB_BASE Text = "Pfad" ; Text [ ENGLISH ] = "Path" ; Text[ english_us ] = "Path"; - Text[ portuguese ] = "Path"; + Text[ portuguese ] = "Atalho"; Text[ russian ] = ""; Text[ greek ] = ""; - Text[ dutch ] = "Path"; + Text[ dutch ] = "Pad"; Text[ french ] = "Chemin"; Text[ spanish ] = "Ruta"; - Text[ finnish ] = "Path"; + Text[ finnish ] = "Polku"; Text[ italian ] = "Percoso"; - Text[ danish ] = "Path"; + Text[ danish ] = "Sti"; Text[ swedish ] = "Skvg"; Text[ polish ] = "cieka"; Text[ portuguese_brazilian ] = "Path"; - Text[ japanese ] = "߽"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "·"; - Text[ chinese_traditional ] = "|"; + Text[ japanese ] = "パス"; + Text[ korean ] = "경로"; + Text[ chinese_simplified ] = "路径"; + Text[ chinese_traditional ] = "路徑"; Text[ turkish ] = "Path"; Text[ arabic ] = "Path"; - Text[ catalan ] = "Path"; + Text[ catalan ] = "Cam"; + Text[ thai ] = "เส้นทาง"; }; ListBox LB_PATH { @@ -272,25 +277,26 @@ ModalDialog DLG_BIB_BASE Text = "Auswahlliste" ; Text [ ENGLISH ] = "Group" ; Text[ english_us ] = "Selection list"; - Text[ portuguese ] = "Group"; + Text[ portuguese ] = "Lista de seleco"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Group"; + Text[ dutch ] = "Keuzelijst"; Text[ french ] = "Liste de slection"; Text[ spanish ] = "Lista de seleccin"; - Text[ finnish ] = "Group"; + Text[ finnish ] = "Valintaluettelo"; Text[ italian ] = "Lista di scelta"; - Text[ danish ] = "Group"; + Text[ danish ] = "Udvalgsliste"; Text[ swedish ] = "Urvalslista"; Text[ polish ] = "Lista wyboru"; Text[ portuguese_brazilian ] = "Group"; - Text[ japanese ] = "Iؽ"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "ѡе"; - Text[ chinese_traditional ] = "ܲM"; + Text[ japanese ] = "選択リスト"; + Text[ korean ] = "그룹"; + Text[ chinese_simplified ] = "选择列单"; + Text[ chinese_traditional ] = "選擇清單"; Text[ turkish ] = "Group"; Text[ arabic ] = "Group"; - Text[ catalan ] = "Group"; + Text[ catalan ] = "Grup"; + Text[ thai ] = "เลือกรายการ"; }; Control TLB_GROUPS { @@ -311,18 +317,19 @@ ModalDialog DLG_BIB_BASE #endif Sort = TRUE ; };*/ - Text[ chinese_simplified ] = "༭"; + Text[ chinese_simplified ] = "编辑分类"; Text[ russian ] = " "; Text[ polish ] = "Edytuj obszary"; - Text[ japanese ] = "ٰ߂̕ҏW"; - Text[ chinese_traditional ] = "sϰ"; + Text[ japanese ] = "グループの編集"; + Text[ chinese_traditional ] = "編輯分類"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "영역 편집"; Text[ turkish ] = "Kategorileri dzenle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar reas"; + Text[ catalan ] = "Edita les categories"; Text[ finnish ] = "Muokkaa luokkia"; + Text[ thai ] = "แก้ไขประเภท"; }; /* String STR_GLOSSARY_BIB_DLG @@ -343,3 +350,17 @@ String STR_GLOSSARY_BIB_DLG + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src index bc55856ab900..fa73ceb73772 100644 --- a/sw/source/ui/misc/glossary.src +++ b/sw/source/ui/misc/glossary.src @@ -2,9 +2,9 @@ * * $RCSfile: glossary.src,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: os $ $Date: 2001-12-18 10:05:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ ModalDialog DLG_GLOSSARY Text [ french ] = "AutoTexte" ; Text [ swedish ] = "AutoText" ; Text [ dutch ] = "AutoTekst" ; - Text [ spanish ] = "AutoTexto" ; + Text [ spanish ] = "Texto automtico" ; Text [ english_us ] = "AutoText" ; Moveable = TRUE ; CheckBox CB_INSERT_TIP @@ -101,17 +101,18 @@ ModalDialog DLG_GLOSSARY Text [ portuguese_brazilian ] = "~Rest des Namens bei der Eingabe als Tip anzeigen" ; Text [ portuguese ] = "Mostrar ~resto do nome como sugesto durante a digitao" ; Text[ chinese_simplified ] = "自动显示输入文提示(~D)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Wywietl w trakcie pisania pozosta cz sowa"; Text[ japanese ] = "入力中にテキストブロック名をヒント表示する(~D)"; Text[ chinese_traditional ] = "自動完成顯示(~D)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "입력시 조언으로서 나머지 이름 표시(~D)"; + Text[ korean ] = "입력시 나머지 이름을 제안 이름으로 표시(~D)"; Text[ turkish ] = "Giri srasnda adn tamamn neri olarak grntle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Muestra el resto del nombre como sugerencia durante la entrada"; + Text[ catalan ] = "~Mostra la resta del nom com a suggerncia durant l'entrada"; Text[ finnish ] = "~Ehdota nime kirjoitettaessa"; + Text[ thai ] = "แ~สดงผลชื่อส่วนที่เหลือเป็นคำแนะนำขณะพิมพ์"; }; FixedText FT_NAME { @@ -125,7 +126,7 @@ ModalDialog DLG_GLOSSARY Text [ portuguese ] = "~Nome" ; Text [ finnish ] = "~Nimi" ; Text [ danish ] = "Navn" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ swedish ] = "~Namn" ; Text [ dutch ] = "~Naam" ; Text [ spanish ] = "N~ombre" ; @@ -141,7 +142,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "이름(~N)"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N~ombre"; + Text[ catalan ] = "~Nom"; + Text[ thai ] = "~ชื่อ"; }; Edit ED_NAME { @@ -177,10 +179,11 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "縮寫(~S)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "바로가기(~S)"; + Text[ korean ] = "바로 가기(~S)"; Text[ turkish ] = "Ksaltma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Abrev."; + Text[ catalan ] = "~Drecera"; + Text[ thai ] = "~ทางลัด"; }; Edit ED_SHORTNAME { @@ -207,7 +210,7 @@ ModalDialog DLG_GLOSSARY Text[ portuguese ] = "s leitura"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "schrijfbeveiligd"; + Text[ dutch ] = "Alleen-lezen"; Text[ french ] = "en lecture seule"; Text[ spanish ] = "solo lectura"; Text[ italian ] = "di sola lettura"; @@ -216,13 +219,14 @@ ModalDialog DLG_GLOSSARY Text[ polish ] = "tylko do odczytu"; Text[ portuguese_brazilian ] = "readonly"; Text[ japanese ] = "書き込み保護"; - Text[ korean ] = "읽기전용"; + Text[ korean ] = "읽기 전용"; Text[ chinese_simplified ] = "防改写"; Text[ chinese_traditional ] = "唯讀"; Text[ turkish ] = "readonly"; Text[ arabic ] = " "; - Text[ catalan ] = "solo lectura"; + Text[ catalan ] = "noms lectura"; Text[ finnish ] = "Vain luku"; + Text[ thai ] = "อ่านอย่างเดียว"; }; }; FixedLine FL_RELATIVE @@ -233,7 +237,7 @@ ModalDialog DLG_GLOSSARY Text[ italian ] = "Salvare i collegamenti in modo relativo"; Text[ portuguese_brazilian ] = "Verknpfungen relativ speichern"; Text[ portuguese ] = "Guardar ligaes em modo relativo"; - Text[ danish ] = "Gem kderne relativt"; + Text[ danish ] = "Gem kder relativt"; Text[ french ] = "Enregistrement relatif des liens"; Text[ swedish ] = "Spara lnkar relativt"; Text[ dutch ] = "Koppelingen relatief opslaan"; @@ -242,16 +246,17 @@ ModalDialog DLG_GLOSSARY Text[ chinese_simplified ] = "存盘相对的链接"; Text = "Verknpfungen relativ speichern" ; Text[ chinese_traditional ] = "儲存相對的捷徑"; - Text[ russian ] = " ."; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ polish ] = "Zapisz cza wzgldnie"; Text[ japanese ] = "リンクの相対保存"; - Text[ korean ] = "에 관한 상대적 연결 저장"; + Text[ korean ] = "링크를 다음 기준으로 저장"; Text[ arabic ] = " "; Text[ turkish ] = "Balantlar greceli kaydet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardar vnculos relativamente"; + Text[ catalan ] = "Desa els enllaos relativament"; Text[ finnish ] = "Linkkien tallennussuhde"; + Text[ thai ] = "บันทึกการเชื่อมโยงสัมพัทธ์กับ"; }; CheckBox CB_FILE_REL { @@ -262,7 +267,7 @@ ModalDialog DLG_GLOSSARY TabStop = TRUE ; Text [ english_us ] = "~File system" ; Text [ italian ] = "Al file system" ; - Text [ spanish ] = "En el ~sistema de archivos" ; + Text [ spanish ] = "~Sistema de archivos" ; Text [ french ] = "Dans le systme de ~fichiers" ; Text [ dutch ] = "In b~estandsysteem" ; Text [ swedish ] = "I ~filsystemet" ; @@ -270,7 +275,7 @@ ModalDialog DLG_GLOSSARY Text [ portuguese_brazilian ] = "Im ~Dateisystem" ; Text [ portuguese ] = "~No sistema de ficheiros" ; Text[ chinese_simplified ] = "在文件系统内(~F)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "W systemie plikw"; Text[ japanese ] = "ファイルシステム内(~F)"; Text[ chinese_traditional ] = "檔案系統(~F)"; @@ -279,8 +284,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "파일 시스템(~F)"; Text[ turkish ] = "Dosya sistemi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "En el ~sistema de archivos"; + Text[ catalan ] = "Sistema de ~fitxers"; Text[ finnish ] = "~Tiedostojrjestelm"; + Text[ thai ] = "ระบะแ~ฟ้ม"; }; CheckBox CB_NET_REL { @@ -291,14 +297,14 @@ ModalDialog DLG_GLOSSARY Text [ english_us ] = "Inte~rnet" ; Text [ italian ] = "In ~Internet" ; Text [ spanish ] = "En I~nternet" ; - Text [ french ] = "Sur l'~Internet" ; - Text [ dutch ] = "In Interne~t" ; + Text [ french ] = "Sur ~Internet" ; + Text [ dutch ] = "Op het interne~t" ; Text [ swedish ] = "P ~Internet" ; Text [ danish ] = "p ~Internettet" ; Text [ portuguese_brazilian ] = "Im ~Internet" ; Text [ portuguese ] = "Na ~Internet" ; Text[ chinese_simplified ] = "在国际互联网内(~R)"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "W Int~ernecie"; Text[ japanese ] = "インターネット内(~R)"; Text[ chinese_traditional ] = "Inte~rnet"; @@ -307,8 +313,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "인터넷(~R)"; Text[ turkish ] = "Internet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "En I~nternet"; + Text[ catalan ] = "Inte~rnet"; Text[ finnish ] = "~Internet"; + Text[ thai ] = "อินเทอ~ร์เน็ต"; }; Window WIN_EXAMPLE { @@ -329,12 +336,12 @@ ModalDialog DLG_GLOSSARY Text [ ENGLISH ] = "Show ~preview" ; Text[ english_us ] = "Sho~w preview"; Text[ portuguese ] = "~Mostrar Previsualizar"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "~Voorbeeld weergeven"; - Text[ french ] = "Afficher l'~aperu"; + Text[ french ] = "Afficher l'aperu"; Text[ spanish ] = "Mostrar pre~visualizacin"; - Text[ italian ] = "Mostra ~anteprima"; + Text[ italian ] = "Mostra anteprima"; Text[ danish ] = "Vis eksempel"; Text[ swedish ] = "Visa frhandsvisning"; Text[ polish ] = "Wywietl podgld"; @@ -346,8 +353,9 @@ ModalDialog DLG_GLOSSARY Text[ arabic ] = " "; Text[ turkish ] = "nizlemeyi grntle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mostrar pre~visualizacin"; + Text[ catalan ] = "Mostra pre~visualitzaci"; Text[ finnish ] = "Nyt ~esikatselu"; + Text[ thai ] = "แสด~งตัวอย่าง"; }; OKButton PB_INSERT { @@ -362,7 +370,7 @@ ModalDialog DLG_GLOSSARY Text [ portuguese ] = "~Inserir" ; Text [ finnish ] = "~Lis" ; Text [ danish ] = "~Indst" ; - Text [ french ] = "~Insrer" ; + Text [ french ] = "Insrer" ; Text [ swedish ] = "Infog~a" ; Text [ dutch ] = "~Invoegen" ; Text [ spanish ] = "~Insertar" ; @@ -384,7 +392,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "삽입(~I)"; Text[ turkish ] = "Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Insertar"; + Text[ catalan ] = "~Insereix"; + Text[ thai ] = "แ~ทรก"; }; CancelButton PB_CLOSE { @@ -399,7 +408,7 @@ ModalDialog DLG_GLOSSARY Text [ portuguese ] = "~Fechar" ; Text [ finnish ] = "~Sulje" ; Text [ danish ] = "~Luk" ; - Text [ french ] = "~Fermer" ; + Text [ french ] = "Fermer" ; Text [ swedish ] = "~Stng" ; Text [ dutch ] = "~Sluiten" ; Text [ spanish ] = "~Cerrar" ; @@ -415,7 +424,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "닫기(~C)"; Text[ turkish ] = "Kapat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cerrar"; + Text[ catalan ] = "~Tanca"; + Text[ thai ] = "~ปิด"; }; HelpButton PB_HELP { @@ -432,12 +442,12 @@ ModalDialog DLG_GLOSSARY Text [ italian ] = "Testo auto." ; Text [ portuguese_brazilian ] = "Texto autom?tico" ; Text [ portuguese ] = "AutoTe~xto" ; - Text [ finnish ] = "~Automaattinen teksti" ; + Text [ finnish ] = "Autom. ~teksti" ; Text [ danish ] = "AutoTekst" ; Text [ french ] = "~AutoTexte" ; Text [ swedish ] = "AutoTe~xt" ; Text [ dutch ] = "~AutoTekst" ; - Text [ spanish ] = "AutoTe~xto" ; + Text [ spanish ] = "~Texto automtico" ; Text [ english_us ] = "AutoTe~xt" ; TabStop = TRUE ; Text[ chinese_simplified ] = "自动图文集(~X)"; @@ -447,10 +457,11 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "自動圖文集(~X)"; Text[ arabic ] = " "; Text[ greek ] = "~"; - Text[ korean ] = "자동텍스트(~X)"; + Text[ korean ] = "자동 텍스트(~X)"; Text[ turkish ] = "Otomatik metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoTe~xto"; + Text[ catalan ] = "AutoTe~xt"; + Text[ thai ] = "ข้อ~ความอัตโนมัติ"; }; PushButton PB_BIB { @@ -474,13 +485,14 @@ ModalDialog DLG_GLOSSARY Text[ russian ] = "..."; Text[ polish ] = "Obszary..."; Text[ japanese ] = "グループ(~A)..."; - Text[ chinese_traditional ] = "區域(~A)..."; + Text[ chinese_traditional ] = "分類(~A)..."; Text[ arabic ] = "..."; Text[ greek ] = "..."; - Text[ korean ] = "영역(~A)..."; + Text[ korean ] = "분류(~A)..."; Text[ turkish ] = "Blmler..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Areas..."; + Text[ catalan ] = "C~ategories..."; + Text[ thai ] = "ป~ระเภท..."; }; PushButton PB_PATH { @@ -508,8 +520,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "경로(~P)..."; Text[ turkish ] = "Veri yolu..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Ruta..."; + Text[ catalan ] = "~Cam..."; Text[ finnish ] = "~Polku..."; + Text[ thai ] = "เ~ส้นทาง..."; }; String ST_READONLY_PATH { @@ -517,24 +530,25 @@ ModalDialog DLG_GLOSSARY Text [ ENGLISH ] = "The directories of 'AutoText' don't have write access. Do you want to call the path settings dialog?" ; Text[ english_us ] = "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?"; Text[ portuguese ] = "Os directrios de 'AutoTexto' so s de leitura. Abrir a caixa de dilogo dos atalhos?"; - Text[ russian ] = " 'AutoText' . ?"; + Text[ russian ] = " 'AutoText' . ?"; Text[ greek ] = " ''. ;"; - Text[ dutch ] = "Voor de directory's van 'AutoTekst' bestaan geen schrijfrechten. Wilt u de dialoog voor het definiren van het pad oproepen?"; + Text[ dutch ] = "Voor de directory's van 'AutoTekst' bestaan geen schrijfrechten. Wilt u het dialoogvenster voor het definiren van het pad oproepen?"; Text[ french ] = "Aucun droit d'criture n'existe pour les rpertoires 'AutoText'. Voulez-vous appeler la bote de dialogue des chemins ?"; - Text[ spanish ] = "No existen derechos de escritura para los directorios 'AutoTexto'. Desea abrir el dilogo de rutas?"; + Text[ spanish ] = "No existen derechos de escritura para los directorios de 'Texto automtico'. Desea abrir el dilogo de rutas?"; Text[ italian ] = "La cartella 'AutoText' di sola lettura. Volete richiamare il dialogo del percorso?"; Text[ danish ] = "Der findes ingen skriverettigheder til 'AutoTekst'-bibliotekerne. Vil du bne stidialogen?"; - Text[ swedish ] = "Det saknas skrivrttigheter fr katalogerna fr 'AutoText'. Vill Du ppna skvgsdialogen?"; + Text[ swedish ] = "Det saknas skrivrttigheter fr katalogerna fr 'AutoText'. Vill du ppna skvgsdialogen?"; Text[ polish ] = "Katalogi 'Autotekst' s tylko do odczytu. Czy wywoa dialog cieki?"; Text[ portuguese_brazilian ] = "The directories of 'AutoText' don't have write access. Do you want to call the path settings dialog?"; Text[ japanese ] = "「入力支援」のディレクトリは書き込み保護されていません。パス設定のダイアログボックスを呼び出しますか。"; - Text[ korean ] = "'AutoText' 디렉토리는 읽기 전용입니다. 경로 설정 대화상자를 호출하겠습니까?"; + Text[ korean ] = "'AutoText' 디렉토리는 읽기 전용입니다. 경로 설정 대화상자를 호출하시겠습니까?"; Text[ chinese_simplified ] = "\"自动图文集\"的目录不可以改写。要打开路径对话栏？"; Text[ chinese_traditional ] = "<AutoText>目錄是唯讀的。要打開一個路徑對話方？"; Text[ turkish ] = "The directories of 'AutoText' don't have write access. Do you want to call the path settings dialog?"; Text[ arabic ] = " ' '. ѿ"; - Text[ catalan ] = "No existen derechos de escritura para los directorios 'AutoTexto'. Desea abrir el dilogo de rutas?"; + Text[ catalan ] = "No existeixen drets d'escriptura pels directoris 'AutoText'. Voleu obrir el quadre de camins?"; Text[ finnish ] = "Automaattisen tekstin hakemistot ovat vain luku -hakemistoja. Haluatko avata hakemistopolun mritysvalintaikkunan?"; + Text[ thai ] = "ไดเร็กทอรี่ 'ข้อความอัตโนมัติ' แบบอ่านอย่างเดียว คุณต้องการเรียกการกำหนดเส้นทางไดอะล็อกหรือไม่?"; }; Menu MNU_EDIT { @@ -564,10 +578,11 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "開啟新檔(~N)"; Text[ arabic ] = "~"; Text[ greek ] = "~"; - Text[ korean ] = "새로(~N)"; + Text[ korean ] = "새로 만들기(~N)"; Text[ turkish ] = "~Yeni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo"; + Text[ catalan ] = "~Nou"; + Text[ thai ] = "ใ~หม่"; }; MenuItem { @@ -594,8 +609,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "새로 (텍스트 만)"; Text[ turkish ] = "Yeni (yalnzca metin)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nuevo (solo ~texto)"; + Text[ catalan ] = "Nou (noms ~text)"; Text[ finnish ] = "Uusi (vain teksti)"; + Text[ thai ] = "ใหม่ (ข้อความอย่างเดียว)"; }; MenuItem { @@ -622,8 +638,9 @@ ModalDialog DLG_GLOSSARY Text[ arabic ] = ""; Text[ turkish ] = "Kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Copiar"; - Text[ finnish ] = "~Kopioi"; + Text[ catalan ] = "~Copia"; + Text[ finnish ] = "K~opioi"; + Text[ thai ] = "~คัดลอก"; }; MenuItem { @@ -652,7 +669,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "바꾸기"; Text[ turkish ] = "Deitir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ree~mplazar"; + Text[ catalan ] = "Ree~mplaa"; + Text[ thai ] = "แทนที่"; }; MenuItem { @@ -663,7 +681,7 @@ ModalDialog DLG_GLOSSARY Text [ english_us ] = "Rep~lace (text only)" ; Text [ portuguese_brazilian ] = "Substituir (nur Text)" ; Text [ swedish ] = "E~rstt (bara text)" ; - Text [ danish ] = "Erstat (kun tekst)" ; + Text [ danish ] = "E~rstat (kun tekst)" ; Text [ italian ] = "Sostituisci (solo testo)" ; Text [ spanish ] = "Reemplazar (slo texto)" ; Text [ french ] = "~Remplacer (texte seulement)" ; @@ -676,11 +694,12 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "代替(純文字)(~L)"; Text[ arabic ] = " ( )"; Text[ greek ] = " ( )"; - Text[ korean ] = "ٲٱ (ؽƮ)(~L)"; + Text[ korean ] = "바꾸기 (텍스트만)(~L)"; Text[ turkish ] = "Deitir (yalnzca metin)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reemplazar (slo texto)"; + Text[ catalan ] = "Reemplaa (noms text)"; Text[ finnish ] = "Kor~vaa (vain teksti)"; + Text[ thai ] = "แท~นที่ (ข้อความอย่างเดียว)"; }; MenuItem { @@ -707,8 +726,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "이름 바꾸기..."; Text[ turkish ] = "Yeniden adlandr..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cambiar nombre..."; + Text[ catalan ] = "Reanomena..."; Text[ finnish ] = "Nime uudelleen..."; + Text[ thai ] = "เปลี่ยนชื่อ..."; }; MenuItem { @@ -726,7 +746,7 @@ ModalDialog DLG_GLOSSARY Text [ french ] = "~Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Verwijderen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; Text[ chinese_simplified ] = "删除(~D)"; Text[ russian ] = ""; @@ -738,7 +758,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "삭제(~D)"; Text[ turkish ] = "Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; + Text[ thai ] = "~ลบ"; }; MenuItem { @@ -771,7 +792,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "편집(~E)"; Text[ turkish ] = "Dzenle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Editar"; + Text[ catalan ] = "~Edita"; + Text[ thai ] = "แ~ก้ไข"; }; MenuItem { @@ -805,6 +827,7 @@ ModalDialog DLG_GLOSSARY Text[ turkish ] = "Makro..."; Text[ language_user1 ] = " "; Text[ catalan ] = "~Macro..."; + Text[ thai ] = "~มาโคร..."; }; MenuItem { @@ -823,7 +846,7 @@ ModalDialog DLG_GLOSSARY Text[ dutch ] = "~Importeren..."; Text[ french ] = "~Importer..."; Text[ spanish ] = "~Importar..."; - Text[ italian ] = "~Importa..."; + Text[ italian ] = "Importa..."; Text[ danish ] = "~Importer..."; Text[ swedish ] = "~Importera..."; Text[ polish ] = "~Importuj..."; @@ -834,8 +857,9 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "匯入(~I)..."; Text[ arabic ] = "..."; Text[ turkish ] = "~e aktar..."; - Text[ catalan ] = "~Importar..."; - Text[ finnish ] = "~Tuo"; + Text[ catalan ] = "~Importa..."; + Text[ finnish ] = "~Tuo..."; + Text[ thai ] = "~นำเข้า..."; }; }; }; @@ -849,7 +873,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "자동 텍스트"; Text[ turkish ] = "Otomatik metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoTexto"; + Text[ catalan ] = "AutoText"; + Text[ thai ] = "ข้อความอัตโนมัติ"; }; InfoBox MSG_DOUBLE_SHORTNAME { @@ -868,16 +893,17 @@ InfoBox MSG_DOUBLE_SHORTNAME MESSAGE [ spanish ] = "Esta abreviatura ya est en uso. Elija otro nombre por favor!" ; MESSAGE [ english_us ] = "Shortcut name already exists. Please choose another name." ; MESSAGE[ chinese_simplified ] = "已经存在这个缩写。请输入另外一个缩写名称！"; - MESSAGE[ russian ] = " . , !"; + MESSAGE[ russian ] = " . ."; MESSAGE[ polish ] = "Te inicjay ju zostay uyte. Prosz poda inn nazw!"; MESSAGE[ japanese ] = "このショートカットはすでに使用されています。別の名前を選択してください。"; MESSAGE[ chinese_traditional ] = "已經使用了這個縮寫。請您輸入一個不同的名稱﹗"; MESSAGE[ arabic ] = " . !"; MESSAGE[ greek ] = " . !"; - MESSAGE[ korean ] = "바로가기 이름이 이미 사용중입니다. 다른 이름을 선택하십시오"; + MESSAGE[ korean ] = "바로 가기 이름이 이미 사용중입니다. 다른 이름을 선택하십시오"; MESSAGE[ turkish ] = "Bu ksaltma mevcut durumda. Baka bir ad sein!"; MESSAGE[ language_user1 ] = " "; - MESSAGE[ catalan ] = "Esta abreviatura ya est en uso. Elija otro nombre por favor!"; + MESSAGE[ catalan ] = "La drecera del nom ja existeix. Si us plau, escolliu un altre nom."; + MESSAGE[ thai ] = "ชื่อทางลัดมีอยู่แล้ว กรุณาเลือกชื่ออื่น"; }; QueryBox MSG_QUERY_DELETE { @@ -895,7 +921,7 @@ QueryBox MSG_QUERY_DELETE MESSAGE [ french ] = "Supprimer l'AutoTexte ?" ; MESSAGE [ swedish ] = "Skall AutoText raderas?" ; MESSAGE [ dutch ] = "AutoTekst wissen?" ; - MESSAGE [ spanish ] = "Desea eliminar el AutoTexto?" ; + MESSAGE [ spanish ] = "Desea borrar el Texto automtico?" ; MESSAGE [ english_us ] = "Delete AutoText?" ; MESSAGE[ chinese_simplified ] = "您要删除自动图文集?"; MESSAGE[ russian ] = " ?"; @@ -904,26 +930,27 @@ QueryBox MSG_QUERY_DELETE MESSAGE[ chinese_traditional ] = "要刪除自動圖文集?"; MESSAGE[ arabic ] = " "; MESSAGE[ greek ] = " ;"; - MESSAGE[ korean ] = "자동 텍스트를 삭제하겠습니까?"; + MESSAGE[ korean ] = "자동 텍스트를 삭제하시겠습니까?"; MESSAGE[ turkish ] = "Otomatik metin silinsin mi?"; MESSAGE[ language_user1 ] = " "; - MESSAGE[ catalan ] = "Desea eliminar el AutoTexto?"; + MESSAGE[ catalan ] = "Voleu eliminar l'AutoText?"; + MESSAGE[ thai ] = "ลบข้อความอัตโนมัติหรือไม่?"; }; String STR_QUERY_DELETE_GROUP1 { TEXT = "Soll der Bereich " ; TEXT [ English ] = "Delete Group " ; TEXT [ english_us ] = "Delete the category " ; - Text [ dutch ] = "Wilt u het bereik " ; + Text [ dutch ] = "Wilt u het bereik" ; Text [ italian ] = "Cancellare la categoria " ; - Text [ spanish ] = "Desea usted eliminar " ; + Text [ spanish ] = "Borrar la categora" ; Text [ french ] = "Supprimer la catgorie " ; Text [ swedish ] = "Ska kategorin " ; Text [ danish ] = "Skal omrdet " ; Text [ portuguese ] = "Deseja eliminar " ; Text [ portuguese_brazilian ] = "Soll der Bereich " ; Text[ chinese_simplified ] = "要删除这个区域 "; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Czy ten obszar "; Text[ japanese ] = "グループ "; Text[ chinese_traditional ] = "要刪除這個區域 "; @@ -932,8 +959,9 @@ String STR_QUERY_DELETE_GROUP1 Text[ korean ] = "영역을"; Text[ turkish ] = "Blm "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desea usted eliminar "; + Text[ catalan ] = "Suprimeix la categoria "; Text[ finnish ] = "Poistetaan luokka "; + Text[ thai ] = "ลบประเภท "; }; String STR_QUERY_DELETE_GROUP2 { @@ -943,14 +971,14 @@ String STR_QUERY_DELETE_GROUP2 TEXT [ english_us ] = "?" ; Text [ dutch ] = "wissen?" ; Text [ italian ] = "?" ; - Text [ spanish ] = "la categora?" ; + Text [ spanish ] = "?" ; Text [ french ] = "?" ; Text [ swedish ] = "raderas?" ; Text [ danish ] = "slettes?" ; Text [ portuguese ] = "a seco?" ; Text [ portuguese_brazilian ] = "gel?cht werden?" ; Text[ chinese_simplified ] = "？"; - Text[ russian ] = "?"; + Text[ russian ] = "?"; Text[ polish ] = "ma zosta usunity?"; Text[ japanese ] = " を削除しますか？"; Text[ chinese_traditional ] = "?"; @@ -959,8 +987,9 @@ String STR_QUERY_DELETE_GROUP2 Text[ greek ] = " ;"; Text[ korean ] = " 삭제하겠습니까？"; Text[ turkish ] = "silinsin mi?"; - Text[ catalan ] = "la categora?"; + Text[ catalan ] = "?"; Text[ finnish ] = "?"; + Text[ thai ] = "?"; }; String STR_GLOSSARY { @@ -971,7 +1000,7 @@ String STR_GLOSSARY Text [ portuguese_brazilian ] = "Textblock : " ; Text [ portuguese ] = "Mdulo de texto : " ; Text [ french ] = "Module de texte : " ; - Text [ dutch ] = "Tekstbouwsteen : " ; + Text [ dutch ] = "Tekstbouwsteen:" ; Text [ spanish ] = "Mdulo de texto : " ; Text [ danish ] = "Tekstelement : " ; Text [ swedish ] = "Textblock : " ; @@ -984,10 +1013,11 @@ String STR_GLOSSARY Text[ chinese_traditional ] = "自動圖文集條目："; Text[ arabic ] = " : "; Text[ greek ] = " : "; - Text[ korean ] = "텍스트 블록 : "; + Text[ korean ] = "자동 텍스트 : "; Text[ turkish ] = "Metin esi: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mdulo de texto : "; + Text[ catalan ] = "Mdul de text : "; + Text[ thai ] = "ข้อความอัตโนมัติ : "; }; ModalDialog DLG_RENAME_GLOS { @@ -1022,7 +1052,7 @@ ModalDialog DLG_RENAME_GLOS Text [ english_us ] = "Na~me" ; Text [ italian ] = "Nome" ; Text [ spanish ] = "N~ombre" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ swedish ] = "Na~mn" ; Text [ danish ] = "Navn" ; Text [ portuguese_brazilian ] = "Na~me" ; @@ -1037,8 +1067,9 @@ ModalDialog DLG_RENAME_GLOS Text[ korean ] = "이름(~M)"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N~ombre"; - Text[ finnish ] = "Ni~mi"; + Text[ catalan ] = "No~m"; + Text[ finnish ] = "~Nimi"; + Text[ thai ] = "ชื่~อ"; }; Edit ED_ON { @@ -1070,11 +1101,12 @@ ModalDialog DLG_RENAME_GLOS Text[ chinese_traditional ] = "縮寫(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "바로가기(~C)"; + Text[ korean ] = "바로 가기(~C)"; Text[ turkish ] = "Ksaltma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Abrev."; + Text[ catalan ] = "Dre~cera"; Text[ finnish ] = "~Pikavalinta"; + Text[ thai ] = "ทาง~ลัด"; }; Edit ED_OS { @@ -1095,22 +1127,23 @@ ModalDialog DLG_RENAME_GLOS Text [ italian ] = "~Nuovo" ; Text [ spanish ] = "~Nuevo" ; Text [ french ] = "Nou~veau" ; - Text [ swedish ] = "~Ny" ; + Text [ swedish ] = "~Nytt" ; Text [ danish ] = "Ny" ; Text [ portuguese ] = "~Novo" ; Text [ portuguese_brazilian ] = "~Neu" ; Text[ chinese_simplified ] = "新建(~N)"; - Text[ russian ] = "~"; + Text[ russian ] = ""; Text[ polish ] = "Nowy"; Text[ japanese ] = "新規(~N)"; Text[ chinese_traditional ] = "開啟新檔(~N)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "새로(~N)"; + Text[ korean ] = "새로 만들기(~N)"; Text[ turkish ] = "Yeni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo"; + Text[ catalan ] = "~Nou"; Text[ finnish ] = "~Uusi"; + Text[ thai ] = "ใ~หม่"; }; Edit ED_NN { @@ -1131,7 +1164,7 @@ ModalDialog DLG_RENAME_GLOS Text [ spanish ] = "~Abreviatura" ; Text [ french ] = "~Abr." ; Text [ dutch ] = "~Afkorting" ; - Text [ swedish ] = "~Erstt" ; + Text [ swedish ] = "Fr~kortning" ; Text [ danish ] = "Erstat" ; Text [ portuguese_brazilian ] = "~K?zel" ; Text [ portuguese ] = "S~ubstituir" ; @@ -1142,11 +1175,12 @@ ModalDialog DLG_RENAME_GLOS Text[ chinese_traditional ] = "縮寫(~S)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "바로가기(~S)"; + Text[ korean ] = "바로 가기(~S)"; Text[ turkish ] = "Ksaltma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Abreviatura"; + Text[ catalan ] = "~Drecera"; Text[ finnish ] = "~Pikavalinta"; + Text[ thai ] = "~ทางลัด"; }; Edit ED_NS { @@ -1177,11 +1211,12 @@ ModalDialog DLG_RENAME_GLOS Text[ chinese_traditional ] = "重新命名自動圖文集條目"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "텍스트 블록 이름 바꾸기"; + Text[ korean ] = "자동 텍스트 이름 바꾸기"; Text[ turkish ] = "Metin esini yeniden adlandr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre al mdulo de texto"; + Text[ catalan ] = "Cambia en nom al mdul de text"; Text[ finnish ] = "Nime automaattinen teksti uudelleen"; + Text[ thai ] = "เปลี่ยนชื่อข้อความอัตโนมัติ"; }; String STR_SAVE_GLOSSARY { @@ -1203,11 +1238,12 @@ String STR_SAVE_GLOSSARY Text[ arabic ] = " "; Text [ English ] = "Save textblock" ; Text[ greek ] = " "; - Text[ korean ] = "텍스트 블록 저장"; + Text[ korean ] = "자동 텍스트 저장"; Text[ turkish ] = "Metin esi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardar mdulo de texto"; + Text[ catalan ] = "Desa el mdul de text"; Text[ finnish ] = "Tallenna automaattinen teksti"; + Text[ thai ] = "บันทึกข้อความอัตโนมัติ"; }; InfoBox MSG_NO_GLOSSARIES { @@ -1225,13 +1261,35 @@ InfoBox MSG_NO_GLOSSARIES MESSAGE[ swedish ] = "Den hr filen innehller inga textblock."; MESSAGE[ polish ] = "Plik ten nie zawiera adnych blokw tekstu."; MESSAGE[ portuguese_brazilian ] = "There are no textblocks in this file."; - MESSAGE[ japanese ] = "̧قɂ÷ۯ܂B"; - MESSAGE[ korean ] = " Ͽ ؽƮ ϴ. ."; - MESSAGE[ chinese_simplified ] = "ļڲԶͼļĿ"; - MESSAGE[ chinese_traditional ] = "boɮפsb۰ʹϤ嶰ءC"; + MESSAGE[ japanese ] = "このファイルにはテキストブロックがありません。"; + MESSAGE[ korean ] = "이 파일에는 자동 텍스트가 없습니다."; + MESSAGE[ chinese_simplified ] = "这个文件内不包含自动图文集条目。"; + MESSAGE[ chinese_traditional ] = "在這個檔案內不存在自動圖文集條目。"; MESSAGE[ arabic ] = " ."; MESSAGE[ turkish ] = "Bu dosya metin bileenleri iermiyor"; - MESSAGE[ catalan ] = "Este archivo no contiene mdulos de texto."; + MESSAGE[ catalan ] = "Aquest fitxer no cont mduls de text."; MESSAGE[ finnish ] = "Tiedostossa ei ole automaattista teksti."; + MESSAGE[ thai ] = "ไม่มีข้อความอัตโนมัติในแฟ้มนี้"; }; + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/insfnote.src b/sw/source/ui/misc/insfnote.src index 0f9834e42bc5..2fc81caf126c 100644 --- a/sw/source/ui/misc/insfnote.src +++ b/sw/source/ui/misc/insfnote.src @@ -2,9 +2,9 @@ * * $RCSfile: insfnote.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:21:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ ModalDialog DLG_INS_FOOTNOTE Text [ portuguese ] = "Inserir nota de rodap" ; Text [ finnish ] = "Lis alaviite" ; Text [ danish ] = "Indst fodnote" ; - Text [ french ] = "Insrer une note de bas de page" ; + Text [ french ] = "Insertion d'une note de bas de page" ; Text [ swedish ] = "Infoga fotnot" ; Text [ dutch ] = "Voetnoot invoegen" ; Text [ spanish ] = "Insertar nota al pie" ; @@ -138,12 +138,12 @@ ModalDialog DLG_INS_FOOTNOTE Text = "~Automatisch" ; Text [ ENGLISH ] = "~Auto" ; Text [ norwegian ] = "~Auto" ; - Text [ italian ] = "~Automatico" ; + Text [ italian ] = "Automatico" ; Text [ portuguese_brazilian ] = "~Auto" ; Text [ portuguese ] = "~Automtico" ; Text [ finnish ] = "~Automaattinen" ; Text [ danish ] = "Automatisk" ; - Text [ french ] = "~Automatique" ; + Text [ french ] = "Automatique" ; Text [ swedish ] = "~Automatisk" ; Text [ dutch ] = "~Automatisch" ; Text [ spanish ] = "~Automtico" ; @@ -151,17 +151,18 @@ ModalDialog DLG_INS_FOOTNOTE TabStop = TRUE ; Group = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "Զ(~A)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "自动(~A)"; + Text[ russian ] = ""; Text[ polish ] = "~Automatycznie"; - Text[ japanese ] = "(~A)"; - Text[ chinese_traditional ] = "۰(~A)"; + Text[ japanese ] = "自動(~A)"; + Text[ chinese_traditional ] = "自動(~A)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ڵ(~A)"; + Text[ korean ] = "자동으로(~A)"; Text[ turkish ] = "~Otomatik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Automtico"; + Text[ catalan ] = "~Automtic"; + Text[ thai ] = "~อัตโนมัติ"; }; RadioButton RB_NUMBER_CHAR { @@ -175,22 +176,23 @@ ModalDialog DLG_INS_FOOTNOTE Text [ portuguese ] = "~Caracteres" ; Text [ finnish ] = "~Merkki" ; Text [ danish ] = "Tegn" ; - Text [ french ] = "~Caractre" ; + Text [ french ] = "Caractres" ; Text [ swedish ] = "~Tecken" ; Text [ dutch ] = "~Teken" ; Text [ spanish ] = "~Caracteres" ; Text [ english_us ] = "~Character" ; - Text[ chinese_simplified ] = "ַ(~C)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "字符(~C)"; + Text[ russian ] = "~"; Text[ polish ] = "Znak"; - Text[ japanese ] = "(~C)"; - Text[ chinese_traditional ] = "r(~C)"; + Text[ japanese ] = "文字(~C)"; + Text[ chinese_traditional ] = "字元(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~C)"; + Text[ korean ] = "사용자 정의(~C)"; Text[ turkish ] = "~Karakter"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Caracteres"; + Text[ catalan ] = "~Carcters"; + Text[ thai ] = "~ตัวอักขระ"; }; FixedLine FL_NUMBER { @@ -209,17 +211,18 @@ ModalDialog DLG_INS_FOOTNOTE Text [ dutch ] = "Nummering" ; Text [ spanish ] = "Numeracin" ; Text [ english_us ] = "Numbering" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "编号"; Text[ russian ] = ""; Text[ polish ] = "Numeracja"; - Text[ japanese ] = "ԍt"; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "番号付け"; + Text[ chinese_traditional ] = "編號"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ȣű"; + Text[ korean ] = "번호 매기기"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin"; + Text[ catalan ] = "Numeraci"; + Text[ thai ] = "ลำดับตัวเลข"; }; PushButton BT_NUMBER_CHAR { @@ -241,22 +244,23 @@ ModalDialog DLG_INS_FOOTNOTE Text [ portuguese_brazilian ] = "~Fu?note" ; Text [ swedish ] = "~Fotnot" ; Text [ danish ] = "Fodnote" ; - Text [ italian ] = "~Nota a pi pagina" ; + Text [ italian ] = "Nota a pi pagina" ; Text [ spanish ] = "N~ota al pie" ; - Text [ french ] = "Note de bas de pa~ge..." ; + Text [ french ] = "Note de bas de page" ; Text [ dutch ] = "~Voetnoot" ; - Text[ chinese_simplified ] = "ע(~F)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "注脚(~F)"; + Text[ russian ] = "C"; Text[ polish ] = "Przypis ~dolny"; - Text[ japanese ] = "r(~F)"; - Text[ chinese_traditional ] = "}(~F)"; + Text[ japanese ] = "脚注(~F)"; + Text[ chinese_traditional ] = "註腳(~F)"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "(~F)"; + Text[ korean ] = "각주(~F)"; Text[ turkish ] = "~Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N~ota al pie"; - Text[ finnish ] = "~Alaviite"; + Text[ catalan ] = "~Nota al peu"; + Text[ finnish ] = "Alaviite"; + Text[ thai ] = "เ~ชิงอรรถ"; }; RadioButton RB_TYPE_ENDNOTE { @@ -269,22 +273,23 @@ ModalDialog DLG_INS_FOOTNOTE Text [ portuguese_brazilian ] = "~Endnote" ; Text [ swedish ] = "~Slutnot" ; Text [ danish ] = "Slutnote" ; - Text [ italian ] = "~Nota di chiusura" ; - Text [ spanish ] = "Nota al ~final" ; + Text [ italian ] = "Nota di chiusura" ; + Text [ spanish ] = "Nota ~final" ; Text [ french ] = "~Note de fin" ; Text [ dutch ] = "~Eindnoot" ; - Text[ chinese_simplified ] = "βע(~E)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "尾注(~E)"; + Text[ russian ] = " "; Text[ polish ] = "P~rzypis kocowy"; - Text[ japanese ] = "r(~E)"; - Text[ chinese_traditional ] = "(~E)"; + Text[ japanese ] = "文末脚注(~E)"; + Text[ chinese_traditional ] = "尾註(~E)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "(~E)"; + Text[ korean ] = "미주(~E)"; Text[ turkish ] = "~Sonnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al ~final"; - Text[ finnish ] = "~Loppuhuomautus"; + Text[ catalan ] = "Nota ~final"; + Text[ finnish ] = "~Loppuviite"; + Text[ thai ] = "~อ้างอิงท้ายเรื่อง"; }; FixedLine FL_TYPE { @@ -301,32 +306,47 @@ ModalDialog DLG_INS_FOOTNOTE Text [ french ] = "Type" ; Text [ dutch ] = "Type" ; Text [ portuguese ] = "Tipo" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "类型"; Text[ russian ] = ""; Text[ polish ] = "Typ"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "種類"; + Text[ chinese_traditional ] = "類型"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "종류"; Text[ turkish ] = "Tr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo"; + Text[ catalan ] = "Tipus"; Text[ finnish ] = "Tyyppi"; + Text[ thai ] = "ชนิด"; }; - Text[ chinese_simplified ] = "ע"; + Text[ chinese_simplified ] = "插入注脚"; Text[ russian ] = " "; Text[ polish ] = "Wstaw przypis dolny"; - Text[ japanese ] = "ȓ}"; - Text[ chinese_traditional ] = "J}"; + Text[ japanese ] = "脚注の挿入"; + Text[ chinese_traditional ] = "插入註腳"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "각주 삽입"; Text[ turkish ] = "Dipnot ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar nota al pie"; + Text[ catalan ] = "Insereix una nota al peu"; + Text[ thai ] = "แทรกเชิงอรรถ"; }; + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index b20390d5c468..67771f59ef3e 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -2,9 +2,9 @@ * * $RCSfile: insrule.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2002-09-16 13:15:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -144,9 +144,9 @@ SwInsertGrfRulerDlg::~SwInsertGrfRulerDlg() String SwInsertGrfRulerDlg::GetGraphicName() { String sRet; - nSelPos -=2; //align selection position with ValueSet index - if(nSelPos < aGrfNames.Count()) - sRet = URIHelper::SmartRelToAbs(*(String*) aGrfNames.GetObject(nSelPos)); + USHORT nSel = nSelPos - 2; //align selection position with ValueSet index + if(nSel < aGrfNames.Count()) + sRet = URIHelper::SmartRelToAbs(*(String*) aGrfNames.GetObject(nSel)); return sRet; } diff --git a/sw/source/ui/misc/insrule.src b/sw/source/ui/misc/insrule.src index bf6a621edd66..33408a0fa759 100644 --- a/sw/source/ui/misc/insrule.src +++ b/sw/source/ui/misc/insrule.src @@ -2,9 +2,9 @@ * * $RCSfile: insrule.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:22:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,24 +79,25 @@ ModalDialog DLG_INSERT_RULER Text [ english_us ] = "Selection" ; Text [ portuguese_brazilian ] = "Auswahl" ; Text [ swedish ] = "Urval" ; - Text [ danish ] = "Udvalg" ; + Text [ danish ] = "Vlg" ; Text [ italian ] = "Selezione" ; Text [ spanish ] = "Seleccin" ; Text [ french ] = "Slection" ; Text [ dutch ] = "Selectie" ; Text [ portuguese ] = "Seleco" ; - Text[ chinese_simplified ] = "ѡ"; + Text[ chinese_simplified ] = "选择"; Text[ russian ] = ""; Text[ polish ] = "Wybr"; - Text[ japanese ] = "I"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "選択"; + Text[ chinese_traditional ] = "選取"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "선택"; Text[ turkish ] = "Seim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Seleccin"; + Text[ catalan ] = "Selecci"; Text[ finnish ] = "Valinta"; + Text[ thai ] = "เลือก"; }; Control VS_EXAMPLE { @@ -132,7 +133,7 @@ ModalDialog DLG_INSERT_RULER Text = "Einfach" ; Text [ English ] = "Simple" ; Text [ portuguese ] = "Simples" ; - Text [ english_us ] = "Single" ; + Text [ english_us ] = "Plain" ; Text [ portuguese_brazilian ] = "Einfach" ; Text [ swedish ] = "Enkel" ; Text [ danish ] = "Enkelt" ; @@ -140,42 +141,58 @@ ModalDialog DLG_INSERT_RULER Text [ spanish ] = "Sencilla" ; Text [ french ] = "Simple" ; Text [ dutch ] = "Enkel" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "单线"; Text[ russian ] = ""; Text[ polish ] = "Pojedyncze"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "u"; + Text[ japanese ] = "シンプル"; + Text[ chinese_traditional ] = "單線"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "단순"; Text[ turkish ] = "Tek"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sencilla"; + Text[ catalan ] = "Senzilla"; Text[ finnish ] = "Yksittinen"; + Text[ thai ] = "เดี่ยว"; }; Text [ english_us ] = "Insert Horizontal Ruler" ; Text [ portuguese_brazilian ] = "Horizontale Linie einf?en" ; Text [ swedish ] = "Infoga horisontell linje" ; Text [ danish ] = "Indst vandret linje" ; Text [ italian ] = "Inserisci linea orizzontale" ; - Text [ spanish ] = "Insertar lnea horizontal" ; + Text [ spanish ] = "Insertar regla horizontal" ; Text [ french ] = "Insertion de ligne horizontale" ; Text [ dutch ] = "Horizontale lijn invoegen" ; Text [ portuguese ] = "Inserir linha horizontal" ; - Text[ chinese_simplified ] = "ˮƽ"; + Text[ chinese_simplified ] = "插入水平线"; Text[ russian ] = " "; Text[ polish ] = "Wstaw lini poziom"; - Text[ japanese ] = "̑}"; - Text[ chinese_traditional ] = "Ju"; + Text[ japanese ] = "水平線の挿入"; + Text[ chinese_traditional ] = "插入水平線"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "가로 눈금자 삽입"; Text[ turkish ] = "Yatay izgi ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar lnea horizontal"; - Text[ finnish ] = "Lis vaakakohdistin"; + Text[ catalan ] = "Insereix una lnia horitzontal"; + Text[ finnish ] = "Lis vaakaviivain"; + Text[ thai ] = "แทรกไม้บรรทัดแนวนอน"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src index 38af4c8ce37d..b8c7df4d7338 100644 --- a/sw/source/ui/misc/linenum.src +++ b/sw/source/ui/misc/linenum.src @@ -2,9 +2,9 @@ * * $RCSfile: linenum.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:23:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,20 +95,21 @@ TabPage TP_LINENUMBERING Text [ italian ] = "Att~iva numerazione" ; Text [ spanish ] = "Mostrar ~numeracin" ; Text [ french ] = "Activer la ~numrotation" ; - Text [ dutch ] = "~Nummering inschakelen" ; + Text [ dutch ] = "~Nummering activeren" ; Text [ portuguese ] = "Activar ~numerao" ; - Text[ chinese_simplified ] = "ʾ(~S)"; + Text[ chinese_simplified ] = "显示编号(~S)"; Text[ russian ] = " "; Text[ polish ] = "Wcz numeracj"; - Text[ japanese ] = "ԍt݂ɂ(~S)"; - Text[ chinese_traditional ] = "ܽs(~S)"; + Text[ japanese ] = "番号付けをオンにする(~S)"; + Text[ chinese_traditional ] = "顯示編號(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ȣű (~S)"; + Text[ korean ] = "번호 매기기 표시(~S)"; Text[ turkish ] = "~Numaralamay etkinletir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mostrar ~numeracin"; + Text[ catalan ] = "Mostra ~numeraci"; Text[ finnish ] = "~Nyt numerointi"; + Text[ thai ] = "แ~สดงลำดับตัวเลข"; }; FixedText FT_CHAR_STYLE { @@ -122,21 +123,22 @@ TabPage TP_LINENUMBERING Text [ danish ] = "Tegntypografi" ; Text [ italian ] = "~Modello di carattere" ; Text [ spanish ] = "Est~ilo de caracteres" ; - Text [ french ] = "Style de ~caractres" ; + Text [ french ] = "Style de caractres" ; Text [ dutch ] = "~Tekenopmaakprofiel" ; Text [ portuguese ] = "~Estilos de caracteres" ; - Text[ chinese_simplified ] = "ַʽ(~C)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "字符样式(~C)"; + Text[ russian ] = " "; Text[ polish ] = "Styl znaku"; - Text[ japanese ] = "(~C)"; - Text[ chinese_traditional ] = "r˦(~C)"; + Text[ japanese ] = "文字スタイル(~C)"; + Text[ chinese_traditional ] = "字元樣式(~C)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~C)"; + Text[ korean ] = "문자 스타일(~C)"; Text[ turkish ] = "~Karakter biimi"; Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; - Text[ catalan ] = "Est~ilo de caracteres"; - Text[ finnish ] = "~Merkistn tyyli"; + Text[ catalan ] = "Est~il de carcters"; + Text[ finnish ] = "~Merkkityyli"; + Text[ thai ] = "ลักษณะ~ตัวอักขระ"; }; ListBox LB_CHAR_STYLE { @@ -161,18 +163,19 @@ TabPage TP_LINENUMBERING Text [ french ] = "~Format" ; Text [ dutch ] = "~Opmaak" ; Text [ portuguese ] = "~Formato" ; - Text[ chinese_simplified ] = "ʽ(~O)"; + Text[ chinese_simplified ] = "格式(~O)"; Text[ russian ] = ""; Text[ polish ] = "Format"; - Text[ japanese ] = "(~O)"; - Text[ chinese_traditional ] = "榡(~O)"; + Text[ japanese ] = "書式(~O)"; + Text[ chinese_traditional ] = "格式(~O)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~O)"; + Text[ korean ] = "서식(~O)"; Text[ turkish ] = "~Format"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Formato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormat"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "รู~ปแบบ"; }; ListBox LB_FORMAT { @@ -191,23 +194,24 @@ TabPage TP_LINENUMBERING Text [ portuguese_brazilian ] = "Position" ; Text [ swedish ] = "~Position" ; Text [ danish ] = "Placering" ; - Text [ italian ] = "~Posizione" ; + Text [ italian ] = "Posizione" ; Text [ spanish ] = "~Posicin" ; - Text [ french ] = "~Position" ; + Text [ french ] = "Position" ; Text [ dutch ] = "~Positie" ; Text [ portuguese ] = "~Posio" ; - Text[ chinese_simplified ] = "λ"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "位置"; + Text[ russian ] = ""; Text[ polish ] = "Pozycja"; - Text[ japanese ] = "ʒu"; - Text[ chinese_traditional ] = "m"; + Text[ japanese ] = "位置"; + Text[ chinese_traditional ] = "位置"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ġ"; + Text[ korean ] = "위치"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Posicin"; + Text[ catalan ] = "~Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; ListBox LB_POS { @@ -247,8 +251,8 @@ TabPage TP_LINENUMBERING { < "Till vnster" ; > ; < "Till hger" ; > ; - < "Innanfr" ; > ; - < "Utanfr" ; > ; + < "Inre" ; > ; + < "Yttre" ; > ; }; stringlist [ danish ] = { @@ -275,8 +279,8 @@ TabPage TP_LINENUMBERING { < " gauche" ; > ; < " droite" ; > ; - < "A l'intrieur" ; > ; - < "A l'extrieur" ; > ; + < " l'intrieur" ; > ; + < " l'extrieur" ; > ; }; stringlist [ dutch ] = { @@ -294,10 +298,10 @@ TabPage TP_LINENUMBERING }; StringList [ chinese_simplified ] = { - < "" ; > ; - < "" ; > ; - < "" ; > ; - < "" ; > ; + < "左" ; > ; + < "右" ; > ; + < "内" ; > ; + < "外" ; > ; }; StringList [ russian ] = { @@ -315,17 +319,17 @@ TabPage TP_LINENUMBERING }; StringList [ japanese ] = { - < "" ; > ; - < "E" ; > ; - < "" ; > ; - < "O" ; > ; + < "左" ; > ; + < "右" ; > ; + < "内側" ; > ; + < "外側" ; > ; }; StringList [ chinese_traditional ] = { - < "" ; > ; - < "k" ; > ; - < "" ; > ; - < "~" ; > ; + < "左" ; > ; + < "右" ; > ; + < "內" ; > ; + < "外" ; > ; }; StringList [ arabic ] = { @@ -343,10 +347,10 @@ TabPage TP_LINENUMBERING }; StringList [ korean ] = { - < "" ; > ; - < "" ; > ; - < "" ; > ; - < "ܺ" ; > ; + < "왼쪽" ; > ; + < "오른쪽" ; > ; + < "내부" ; > ; + < "외부" ; > ; }; StringList [ turkish ] = { @@ -364,8 +368,8 @@ TabPage TP_LINENUMBERING }; StringList [ catalan ] = { - < "Izquierda" ; > ; - < "Derecha" ; > ; + < "Esquerra" ; > ; + < "Dreta" ; > ; < "Interior" ; > ; < "Exterior" ; > ; }; @@ -376,6 +380,13 @@ TabPage TP_LINENUMBERING < "Sisempi" ; > ; < "ulompi" ; > ; }; + StringList [ thai ] = + { + < "ซ้าย" ; > ; + < "ขวา" ; > ; + < "ด้านใน" ; > ; + < "ด้านนอก" ; > ; + }; }; FixedText FT_OFFSET { @@ -389,21 +400,22 @@ TabPage TP_LINENUMBERING Text [ danish ] = "Afstand" ; Text [ italian ] = "Distan~za" ; Text [ spanish ] = "E~spacio" ; - Text [ french ] = "~cart" ; + Text [ french ] = "cart" ; Text [ dutch ] = "~Afstand" ; Text [ portuguese ] = "Es~paamento" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "间隔"; + Text[ russian ] = "~"; Text[ polish ] = "Odstp"; - Text[ japanese ] = "Ԋu"; + Text[ japanese ] = "余白"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "j"; + Text[ chinese_traditional ] = "間隔"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = ""; + Text[ korean ] = "간격"; Text[ turkish ] = "~Uzaklk"; - Text[ catalan ] = "E~spacio"; - Text[ finnish ] = "Objektivlit"; + Text[ catalan ] = "Espaiat"; + Text[ finnish ] = "Vlit"; + Text[ thai ] = "ระยะห่าง"; }; MetricField MF_OFFSET { @@ -433,22 +445,23 @@ TabPage TP_LINENUMBERING Text [ swedish ] = "~Intervall" ; Text [ danish ] = "Interval" ; Text [ italian ] = "I~ntervallo" ; - Text [ spanish ] = "~Intervalo" ; + Text [ spanish ] = "Intervalo" ; Text [ french ] = "~Intervalle" ; Text [ dutch ] = "~Interval" ; Text [ portuguese ] = "~Intervalo" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "区间"; Text[ russian ] = ""; Text[ polish ] = "Przedzia"; - Text[ japanese ] = "ԍt̊Ԋu"; - Text[ chinese_traditional ] = "϶"; + Text[ japanese ] = "番号付けの間隔"; + Text[ chinese_traditional ] = "區間"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "번호 매기기 간격"; Text[ turkish ] = "~Aralk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Intervalo"; + Text[ catalan ] = "Interval"; Text[ finnish ] = "Vli"; + Text[ thai ] = "ช่วง"; }; NumericField NF_NUM_INVERVAL { @@ -480,18 +493,19 @@ TabPage TP_LINENUMBERING Text [ french ] = "lignes" ; Text [ dutch ] = "Regels" ; Text [ portuguese ] = "Linhas" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "行"; Text[ russian ] = ""; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "s"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "行"; + Text[ chinese_traditional ] = "行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "행"; Text[ turkish ] = "Satr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lneas"; - Text[ finnish ] = "viivat"; + Text[ catalan ] = "Lnies"; + Text[ finnish ] = "rivit"; + Text[ thai ] = "บรรทัด"; }; FixedLine FL_DISPLAY { @@ -502,24 +516,25 @@ TabPage TP_LINENUMBERING Text [ english_us ] = "View" ; Text [ portuguese_brazilian ] = "Anzeige" ; Text [ swedish ] = "Visa" ; - Text [ danish ] = "Vis" ; + Text [ danish ] = "Visning" ; Text [ italian ] = "Visualizzazione" ; Text [ spanish ] = "Visualizacin" ; Text [ french ] = "Affichage" ; Text [ dutch ] = "Weergave" ; - Text [ portuguese ] = "Vista" ; - Text[ chinese_simplified ] = "ʾ"; + Text [ portuguese ] = "Visualizao" ; + Text[ chinese_simplified ] = "显示"; Text[ russian ] = ""; Text[ polish ] = "Wywietlenie"; - Text[ japanese ] = "\\"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "表示"; + Text[ chinese_traditional ] = "顯示"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "보기"; Text[ turkish ] = "Grnm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Visualizacin"; + Text[ catalan ] = "Visualitzaci"; Text[ finnish ] = "Nyt"; + Text[ thai ] = "มุมมอง"; }; FixedText FT_DIVISOR { @@ -534,20 +549,21 @@ TabPage TP_LINENUMBERING Text [ danish ] = "Tekst" ; Text [ italian ] = "T~esto" ; Text [ spanish ] = "Te~xto" ; - Text [ french ] = "~Texte" ; + Text [ french ] = "Texte" ; Text [ dutch ] = "~Tekst" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "文字"; Text[ russian ] = ""; Text[ polish ] = "Tekst"; - Text[ japanese ] = "÷"; - Text[ chinese_traditional ] = "r"; + Text[ japanese ] = "テキスト"; + Text[ chinese_traditional ] = "文字"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ؽƮ"; + Text[ korean ] = "텍스트"; Text[ turkish ] = "M~etin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Te~xto"; + Text[ catalan ] = "Text"; Text[ finnish ] = "Teksti"; + Text[ thai ] = "ข้อความ"; }; Edit ED_DIVISOR { @@ -569,21 +585,22 @@ TabPage TP_LINENUMBERING Text [ danish ] = "Alle" ; Text [ italian ] = "~Ogni" ; Text [ spanish ] = "Ca~da" ; - Text [ french ] = "~Toutes les" ; + Text [ french ] = "Toutes les" ; Text [ dutch ] = "~Alle" ; Text [ portuguese ] = "Tu~do" ; - Text[ chinese_simplified ] = "ÿ"; + Text[ chinese_simplified ] = "每"; Text[ russian ] = ""; Text[ polish ] = "Co"; - Text[ japanese ] = "Ԋu"; - Text[ chinese_traditional ] = "C"; + Text[ japanese ] = "間隔"; + Text[ chinese_traditional ] = "每"; Text[ arabic ] = ""; Text[ language_user1 ] = " "; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "간격"; Text[ turkish ] = "~Tm"; - Text[ catalan ] = "Ca~da"; + Text[ catalan ] = "Cada"; Text[ finnish ] = "Toistovli"; + Text[ thai ] = "ทุก ๆ"; }; NumericField NF_DIV_INTERVAL { @@ -616,18 +633,19 @@ TabPage TP_LINENUMBERING Text [ french ] = "lignes" ; Text [ dutch ] = "Regels" ; Text [ portuguese ] = "Linhas" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "行"; Text[ russian ] = ""; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "s"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "行"; + Text[ chinese_traditional ] = "行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "행"; Text[ turkish ] = "Satr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lneas"; - Text[ finnish ] = "Viivat"; + Text[ catalan ] = "Lnies"; + Text[ finnish ] = "Rivit"; + Text[ thai ] = "บรรทัด"; }; FixedLine FL_DIVISOR { @@ -642,20 +660,21 @@ TabPage TP_LINENUMBERING Text [ italian ] = "Separatore" ; Text [ spanish ] = "Separador" ; Text [ french ] = "Sparateur" ; - Text [ dutch ] = "Deelteken" ; + Text [ dutch ] = "Scheidingsteken" ; Text [ portuguese ] = "Separador" ; - Text[ chinese_simplified ] = "ָ"; + Text[ chinese_simplified ] = "分隔符"; Text[ russian ] = ""; Text[ polish ] = "Separator"; - Text[ japanese ] = "d"; - Text[ chinese_traditional ] = "j"; + Text[ japanese ] = "区切り"; + Text[ chinese_traditional ] = "分隔符"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "구분 기호"; Text[ turkish ] = "Ayrma iareti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Separador"; Text[ finnish ] = "Erotin"; + Text[ thai ] = "ตัวแยก"; }; CheckBox CB_COUNT_EMPTYLINES { @@ -668,23 +687,24 @@ TabPage TP_LINENUMBERING Text [ portuguese_brazilian ] = "Leerzeilen" ; Text [ swedish ] = "T~omma rader" ; Text [ danish ] = "Tomme rkker" ; - Text [ italian ] = "~Righe vuote" ; + Text [ italian ] = "Righe vuote" ; Text [ spanish ] = "Lneas en ~blanco" ; Text [ french ] = "~Lignes inutilises" ; Text [ dutch ] = "~Tussenregels" ; Text [ portuguese ] = "Linhas em ~branco" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "空行"; Text[ russian ] = " "; Text[ polish ] = "Spacje"; - Text[ japanese ] = "̍s"; - Text[ chinese_traditional ] = "Ŧ"; + Text[ japanese ] = "空白の行"; + Text[ chinese_traditional ] = "空行"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "빈 줄"; Text[ turkish ] = "B~o satrlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lneas en ~blanco"; + Text[ catalan ] = "Lnies en ~blanc"; Text[ finnish ] = "Tyhjt rivit"; + Text[ thai ] = "บรรทัดว่าง"; }; CheckBox CB_COUNT_FRAMELINES { @@ -698,22 +718,23 @@ TabPage TP_LINENUMBERING Text [ swedish ] = "Rader i te~xtram" ; Text [ danish ] = "Rkker i tekstboks" ; Text [ italian ] = "Rig~he nella cornice di testo" ; - Text [ spanish ] = "Lneas en ma~rco de texto" ; + Text [ spanish ] = "Lneas en marco de texto" ; Text [ french ] = "Lignes dans le cadre texte" ; Text [ dutch ] = "~Regels in tekstkaders" ; Text [ portuguese ] = "Linhas na ~moldura do texto" ; - Text[ chinese_simplified ] = "ıڵ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "文本框内的行"; + Text[ russian ] = " "; Text[ polish ] = "Wi~ersze w ramce tekstowej"; - Text[ japanese ] = "÷Ęg̍s"; - Text[ chinese_traditional ] = "r"; + Text[ japanese ] = "テキスト枠内の行"; + Text[ chinese_traditional ] = "文字方塊內的行"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ؽƮ "; + Text[ korean ] = "텍스트 프레임의 줄"; Text[ turkish ] = "Metin kutusu iindeki sa~trlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lneas en ma~rco de texto"; + Text[ catalan ] = "Lnies en ma~rc de text"; Text[ finnish ] = "Tekstikehikko"; + Text[ thai ] = "บรรทัดในกรอบข้อความ"; }; CheckBox CB_RESTART_PAGE { @@ -724,24 +745,25 @@ TabPage TP_LINENUMBERING TabStop = TRUE; Text[ english_us ] = "~Restart every new page"; Text[ portuguese ] = "~Reiniciar no incio de pgina"; - Text[ russian ] = "~ "; + Text[ russian ] = "~ "; Text[ greek ] = "~ "; Text[ dutch ] = "~Opnieuw starten bij paginabegin"; Text[ french ] = "~Reprendre au dbut des pages"; Text[ spanish ] = "~Reiniciar al comienzo de pgina"; - Text[ italian ] = "~Riavvia a inizio pagina"; + Text[ italian ] = "Riavvia a inizio pagina"; Text[ danish ] = "Genstart p hver ny side"; Text[ swedish ] = "~Brja om p varje ny sida"; Text[ polish ] = "Ponowne uruchomienie na pocztku strony"; Text[ portuguese_brazilian ] = "~Restart each new page"; - Text[ japanese ] = "߰ނƂɂP(~R)"; - Text[ korean ] = " ù κп ٽ (~R)"; - Text[ chinese_simplified ] = "ҳ¿ʼ(~R)"; - Text[ chinese_traditional ] = "qs}l(~R)"; + Text[ japanese ] = "ページごとに１から(~R)"; + Text[ korean ] = "페이지 첫 부분에서 다시 시작(~R)"; + Text[ chinese_simplified ] = "在页的起始位置重新开始(~R)"; + Text[ chinese_traditional ] = "從頁的起始位置重新開始(~R)"; Text[ turkish ] = "~Restart each new page"; Text[ arabic ] = " "; - Text[ catalan ] = "~Reiniciar al comienzo de pgina"; + Text[ catalan ] = "~Reinicia a l'inici de pgina"; Text[ finnish ] = "~Aloita jokainen uusi sivu uudelleen"; + Text[ thai ] = "เ~ริ่มทุก ๆ หน้าใหม่อีกครั้ง"; }; FixedLine FL_COUNT { @@ -758,18 +780,19 @@ TabPage TP_LINENUMBERING Text [ french ] = "Compter" ; Text [ dutch ] = "Tellen" ; Text [ portuguese ] = "Contar" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "计数"; + Text[ russian ] = ""; Text[ polish ] = "Policz"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "p"; + Text[ japanese ] = "数える"; + Text[ chinese_traditional ] = "計數"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = " "; + Text[ korean ] = "수를 세기"; Text[ turkish ] = "Say"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contar"; - Text[ finnish ] = "Laske"; + Text[ catalan ] = "Compte"; + Text[ finnish ] = "Lukumr"; + Text[ thai ] = "นับ"; }; Text [ english_us ] = "Line Numbering" ; Text [ portuguese_brazilian ] = "Zeilennumerierung" ; @@ -780,20 +803,36 @@ TabPage TP_LINENUMBERING Text [ french ] = "Numrotation des lignes" ; Text [ dutch ] = "Regelnummering" ; Text [ portuguese ] = "Numerao de linhas" ; - Text[ chinese_simplified ] = "б"; + Text[ chinese_simplified ] = "行编号"; Text[ russian ] = " "; Text[ polish ] = "Numeracja wierszy"; - Text[ japanese ] = "sԍt"; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "行番号付け"; + Text[ chinese_traditional ] = "行編號"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ȣű"; + Text[ korean ] = "줄 번호 매기기"; Text[ turkish ] = "Satr numaralamas"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin de lneas"; + Text[ catalan ] = "Numeraci de lnies"; Text[ finnish ] = "Rivien numerointi"; + Text[ thai ] = "ลำดับตัวเลขบรรทัด"; }; + + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src index ac23a6f4d384..e19bc1788124 100644 --- a/sw/source/ui/misc/num.src +++ b/sw/source/ui/misc/num.src @@ -2,9 +2,9 @@ * * $RCSfile: num.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:59:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,7 +141,7 @@ TabPage TP_NUM_POSITION Text[ chinese_traditional ] = "位置和間隔"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "위치와 간격"; + Text[ korean ] = "위치 및 간격"; Text[ language_user1 ] = " "; Text[ turkish ] = "Konum ve aralk"; Text[ catalan ] = "Posici i espai"; @@ -200,7 +200,7 @@ TabPage TP_NUM_POSITION Text[ arabic ] = ""; Text[ language_user1 ] = " "; Text[ greek ] = ""; - Text[ korean ] = "비례(~V)"; + Text[ korean ] = "비례하여(~V)"; Text[ turkish ] = "Orantl"; Text[ catalan ] = "Relati~u"; Text[ finnish ] = "~Suhteellinen"; @@ -240,7 +240,7 @@ TabPage TP_NUM_POSITION Text [ portuguese_brazilian ] = "Einr~?kung" ; Text [ portuguese ] = "~Distncia do texto" ; Text[ chinese_simplified ] = "至文字的距离(~X)"; - Text[ russian ] = " "; + Text[ russian ] = "~ "; Text[ polish ] = "Odstp od tekstu"; Text[ japanese ] = "テキストまでの間隔(~X)"; Text[ chinese_traditional ] = "至文字的距离(~X)"; @@ -293,7 +293,7 @@ TabPage TP_NUM_POSITION Text[ chinese_traditional ] = "編號和內文之間的最少間隔(~M)"; Text[ arabic ] = " <-> "; Text[ greek ] = " ~ <-> "; - Text[ korean ] = "최소간격 번호 <-> 텍스트(~M)"; + Text[ korean ] = "번호와 텍스트 사이의 최소 간격(~M)"; Text[ turkish ] = "Asgari numara <-> metin aral"; Text[ language_user1 ] = " "; Text[ catalan ] = "Distncia mnima Nmero <-> Text"; @@ -334,7 +334,7 @@ TabPage TP_NUM_POSITION Text [ portuguese_brazilian ] = "Ausri~chtung der Numerierung" ; Text [ portuguese ] = "A~linhamento da numerao" ; Text[ chinese_simplified ] = "编号对齐(~A)"; - Text[ russian ] = " "; + Text[ russian ] = "~ "; Text[ polish ] = "Wyrwnanie numeracji"; Text[ japanese ] = "番号付けの配置(~A)"; Text[ language_user1 ] = " "; @@ -521,7 +521,7 @@ TabPage TP_NUM_POSITION Text[ chinese_traditional ] = "標準(~D)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "기본 값(~D)"; + Text[ korean ] = "기본값(~D)"; Text[ turkish ] = "Standart"; Text[ catalan ] = "~Valor per defecte"; Text[ finnish ] = "~Oletus"; @@ -656,7 +656,7 @@ TabDialog DLG_SVXTEST_NUM_BULLET Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafikler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Imatges"; @@ -748,7 +748,7 @@ TabDialog DLG_SVXTEST_NUM_BULLET Text [ french ] = "Supprimer" ; Text [ swedish ] = "T~a bort" ; Text [ dutch ] = "Ve~rwijderen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Remove" ; Text[ chinese_simplified ] = "删除(~R)"; Text[ russian ] = ""; @@ -757,7 +757,7 @@ TabDialog DLG_SVXTEST_NUM_BULLET Text[ chinese_traditional ] = "刪除(~R)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "삭제(~R)"; + Text[ korean ] = "제거(~R)"; Text[ turkish ] = "Kaldr"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Suprimeix"; @@ -787,3 +787,8 @@ TabDialog DLG_SVXTEST_NUM_BULLET Text[ thai ] = "ลำดับตัวเลข/สัญลักษณ์แสดงหัวข้อย่อย"; }; + + + + + diff --git a/sw/source/ui/misc/numberingtypelistbox.src b/sw/source/ui/misc/numberingtypelistbox.src index 4cb04d228ed4..d3263511f7a7 100644 --- a/sw/source/ui/misc/numberingtypelistbox.src +++ b/sw/source/ui/misc/numberingtypelistbox.src @@ -2,9 +2,9 @@ * * $RCSfile: numberingtypelistbox.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2001-07-14 03:07:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ Resource STRRES_NUMTYPES < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; < "" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; < "" ; 8/*SVX_NUM_BITMAP */; > ; - < "" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ greek ] = { @@ -250,16 +250,16 @@ Resource STRRES_NUMTYPES }; ItemList [ japanese ] = { - < "1A2A3 ..." ; 4/*SVX_NUM_ARABIC */; > ; - < "A B C ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; - < "a b c ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; - < "I II III ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ; - < "i ii iii ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; - < "A .. AA .. AAA ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; - < "a .. aa .. aaa ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; - < "ӏ" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "}" ; 8/*SVX_NUM_BITMAP */; > ; - < "Ȃ" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "1、2、3､ ..." ; 4/*SVX_NUM_ARABIC */; > ; + < "A､ B､ C､ ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; + < "a､ b､ c､ ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; + < "I､ II､ III､ ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ; + < "i､ ii､ iii､ ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; + < "A､ ..､ AA､ ..､ AAA､ ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; + < "a､ ..､ aa､ ..､ aaa､ ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; + < "箇条書き" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "図" ; 8/*SVX_NUM_BITMAP */; > ; + < "なし" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ korean ] = { @@ -270,9 +270,9 @@ Resource STRRES_NUMTYPES < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; - < "۸Ӹ ȣ" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "" ; 8/*SVX_NUM_BITMAP */; > ; - < "" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "글머리 기호" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "그림" ; 8/*SVX_NUM_BITMAP */; > ; + < "없음" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ chinese_simplified ] = { @@ -283,9 +283,9 @@ Resource STRRES_NUMTYPES < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; - < "ͼα" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "ͼ" ; 8/*SVX_NUM_BITMAP */; > ; - < "" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "项目符号" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "图形" ; 8/*SVX_NUM_BITMAP */; > ; + < "无" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ chinese_traditional ] = { @@ -296,9 +296,9 @@ Resource STRRES_NUMTYPES < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; - < "ϧνs" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "ϧ" ; 8/*SVX_NUM_BITMAP */; > ; - < "L" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "項目符號" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "圖形" ; 8/*SVX_NUM_BITMAP */; > ; + < "無" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ arabic ] = { @@ -348,9 +348,9 @@ Resource STRRES_NUMTYPES < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; - < "Vieta" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "Imagen" ; 8/*SVX_NUM_BITMAP */; > ; - < "Ninguna" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "Pic" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "Imatge" ; 8/*SVX_NUM_BITMAP */; > ; + < "Cap" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ finnish ] = { @@ -362,9 +362,22 @@ Resource STRRES_NUMTYPES < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; < "Luettelomerkki" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "Kuva" ; 8/*SVX_NUM_BITMAP */; > ; + < "Grafiikka" ; 8/*SVX_NUM_BITMAP */; > ; < "Ei mitn" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; + ItemList [ thai ] = + { + < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ; + < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; + < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; + < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ; + < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; + < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; + < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; + < "๑, ๒, ๓, ..." ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "ก, ข, ค, ..." ; 8/*SVX_NUM_BITMAP */; > ; + < "ก, .., กก, .., กกก, ..." ; 5/*SVX_NUM_NUMBER_NONE */; > ; + }; }; }; @@ -373,3 +386,15 @@ Resource STRRES_NUMTYPES + + + + + + + + + + + + diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src index 2b8a84fbae62..15c5c87c11f5 100644 --- a/sw/source/ui/misc/outline.src +++ b/sw/source/ui/misc/outline.src @@ -2,9 +2,9 @@ * * $RCSfile: outline.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: os $ $Date: 2002-01-10 15:09:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,11 +80,11 @@ ModalDialog DLG_NUM_NAMES Text[ dutch ] = "Opslaan als"; Text[ spanish ] = "Guardar como"; Text[ english_us ] = "Save As"; - Text[ chinese_simplified ] = "Ϊ"; + Text[ chinese_simplified ] = "另存为"; Text[ russian ] = " "; Text[ polish ] = "Zapisz jako"; - Text[ japanese ] = "Otĕۑ"; - Text[ chinese_traditional ] = "tss"; + Text[ japanese ] = "名前を付けて保存"; + Text[ chinese_traditional ] = "另存新檔"; Text[ arabic ] = " "; Text = "Speichern als" ; Text [ ENGLISH ] = "Save as" ; @@ -123,18 +123,19 @@ ModalDialog DLG_NUM_NAMES Text [ dutch ] = "Vorm" ; Text [ portuguese_brazilian ] = "Form" ; Text [ portuguese ] = "Formato" ; - Text[ chinese_simplified ] = "ʽ"; + Text[ chinese_simplified ] = "格式"; Text[ russian ] = ""; Text[ polish ] = "Format"; - Text[ japanese ] = ""; + Text[ japanese ] = "書式"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "榡"; + Text[ chinese_traditional ] = "格式"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "서식"; Text[ turkish ] = "Format"; Text[ catalan ] = "Forma"; - Text[ finnish ] = "Muotoile"; + Text[ finnish ] = "Muotoilu"; + Text[ thai ] = "รูปแบบ"; }; ListBox LB_FORM { @@ -277,27 +278,27 @@ ModalDialog DLG_NUM_NAMES }; StringList [ chinese_simplified ] = { - < "δ 1" ; > ; - < "δ 2" ; > ; - < "δ 3" ; > ; - < "δ 4" ; > ; - < "δ 5" ; > ; - < "δ 6" ; > ; - < "δ 7" ; > ; - < "δ 8" ; > ; - < "δ 9" ; > ; + < "未命名 1" ; > ; + < "未命名 2" ; > ; + < "未命名 3" ; > ; + < "未命名 4" ; > ; + < "未命名 5" ; > ; + < "未命名 6" ; > ; + < "未命名 7" ; > ; + < "未命名 8" ; > ; + < "未命名 9" ; > ; }; StringList [ russian ] = { - < " 1" ; > ; - < " 2" ; > ; - < " 3" ; > ; - < " 4" ; > ; - < " 5" ; > ; - < " 6" ; > ; - < " 7" ; > ; - < " 8" ; > ; - < " 9" ; > ; + < " 1" ; > ; + < " 2" ; > ; + < " 3" ; > ; + < " 4" ; > ; + < " 5" ; > ; + < " 6" ; > ; + < " 7" ; > ; + < " 8" ; > ; + < " 9" ; > ; }; StringList [ polish ] = { @@ -313,27 +314,27 @@ ModalDialog DLG_NUM_NAMES }; StringList [ japanese ] = { - < " 1" ; > ; - < " 2" ; > ; - < " 3" ; > ; - < " 4" ; > ; - < " 5" ; > ; - < " 6" ; > ; - < " 7" ; > ; - < " 8" ; > ; - < " 9" ; > ; + < "無題 1" ; > ; + < "無題 2" ; > ; + < "無題 3" ; > ; + < "無題 4" ; > ; + < "無題 5" ; > ; + < "無題 6" ; > ; + < "無題 7" ; > ; + < "無題 8" ; > ; + < "無題 9" ; > ; }; StringList [ chinese_traditional ] = { - < "RW 1" ; > ; - < "RW 2" ; > ; - < "RW 3" ; > ; - < "RW 4" ; > ; - < "RW 5" ; > ; - < "RW 6" ; > ; - < "RW 7" ; > ; - < "RW 8" ; > ; - < "RW 9" ; > ; + < "未命名 1" ; > ; + < "未命名 2" ; > ; + < "未命名 3" ; > ; + < "未命名 4" ; > ; + < "未命名 5" ; > ; + < "未命名 6" ; > ; + < "未命名 7" ; > ; + < "未命名 8" ; > ; + < "未命名 9" ; > ; }; StringList [ arabic ] = { @@ -361,15 +362,15 @@ ModalDialog DLG_NUM_NAMES }; StringList [ korean ] = { - < " 1" ; > ; - < "2" ; > ; - < "3" ; > ; - < "4" ; > ; - < "5" ; > ; - < "6" ; > ; - < "7" ; > ; - < "8" ; > ; - < "9" ; > ; + < "제목 없음 1" ; > ; + < "제목 없음2" ; > ; + < "제목 없음3" ; > ; + < "제목 없음4" ; > ; + < "제목 없음5" ; > ; + < "제목 없음6" ; > ; + < "제목 없음7" ; > ; + < "제목 없음8" ; > ; + < "제목 없음9" ; > ; }; StringList [ turkish ] = { @@ -397,15 +398,15 @@ ModalDialog DLG_NUM_NAMES }; StringList [ catalan ] = { - < "Sin nombre 1" ; > ; - < "Sin nombre 2" ; > ; - < "Sin nombre 3" ; > ; - < "Sin nombre 4" ; > ; - < "Sin nombre 5" ; > ; - < "Sin nombre 6" ; > ; - < "Sin nombre 7" ; > ; - < "Sin nombre 8" ; > ; - < "Sin nombre 9" ; > ; + < "Sense nom 1" ; > ; + < "Sense nom 2" ; > ; + < "Sense nom 3" ; > ; + < "Sense nom 4" ; > ; + < "Sense nom 5" ; > ; + < "Sense nom 6" ; > ; + < "Sense nom 7" ; > ; + < "Sense nom 8" ; > ; + < "Sense nom 9" ; > ; }; StringList [ finnish ] = { @@ -419,6 +420,18 @@ ModalDialog DLG_NUM_NAMES < "Nimetn 8" ; > ; < "Nimetn 9" ; > ; }; + StringList [ thai ] = + { + < "ไม่มีชื่อ 1" ; > ; + < "ไม่มีชื่อ 2" ; > ; + < "ไม่มีชื่อ 3" ; > ; + < "ไม่มีชื่อ 4" ; > ; + < "ไม่มีชื่อ 5" ; > ; + < "ไม่มีชื่อ 6" ; > ; + < "ไม่มีชื่อ 7" ; > ; + < "ไม่มีชื่อ 8" ; > ; + < "ไม่มีชื่อ 9" ; > ; + }; }; Edit ED_FORM { @@ -430,11 +443,12 @@ ModalDialog DLG_NUM_NAMES }; Text = "Speichern als" ; Text[ greek ] = " "; - Text[ korean ] = "ٸ ̸ "; + Text[ korean ] = "다른 이름으로 저장"; Text[ turkish ] = "Farkl kaydet..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardar como"; + Text[ catalan ] = "Anomena i desa"; Text[ finnish ] = "Tallenna nimell"; + Text[ thai ] = "บันทึกเป็น"; }; /**************************************************************************/ /* */ @@ -478,18 +492,19 @@ TabDialog DLG_TAB_OUTLINE Text [ french ] = "Numrotation" ; Text [ dutch ] = "Nummering" ; Text [ portuguese ] = "Numerao" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "编号"; Text[ russian ] = ""; Text[ polish ] = "Numeracja"; - Text[ japanese ] = "ԍt"; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "番号付け"; + Text[ chinese_traditional ] = "編號"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ȣű"; + Text[ korean ] = "번호 매기기"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin"; + Text[ catalan ] = "Numeraci"; Text[ finnish ] = "Numerointi"; + Text[ thai ] = "ลำดับตัวเลข"; }; PageItem { @@ -505,18 +520,19 @@ TabDialog DLG_TAB_OUTLINE Text [ french ] = "Position" ; Text [ dutch ] = "Positie" ; Text [ portuguese ] = "Posio" ; - Text[ chinese_simplified ] = "λ"; + Text[ chinese_simplified ] = "位置"; Text[ russian ] = ""; Text[ polish ] = "Pozycja"; - Text[ japanese ] = "ʒu"; - Text[ chinese_traditional ] = "m"; + Text[ japanese ] = "位置"; + Text[ chinese_traditional ] = "位置"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ġ"; + Text[ korean ] = "위치"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Posicin"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "ตำแหน่ง"; }; }; }; @@ -533,18 +549,19 @@ TabDialog DLG_TAB_OUTLINE Text [ danish ] = "Form" ; Text [ portuguese_brazilian ] = "~Form" ; Text [ portuguese ] = "Forma~to" ; - Text[ chinese_simplified ] = "ʽ(~F)"; + Text[ chinese_simplified ] = "格式(~F)"; Text[ russian ] = ""; Text[ polish ] = "Format"; - Text[ japanese ] = "̫(~F)"; + Text[ japanese ] = "フォーム(~F)"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "榡(~F)"; + Text[ chinese_traditional ] = "格式(~F)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~F)"; + Text[ korean ] = "서식(~F)"; Text[ turkish ] = "Format"; - Text[ catalan ] = "~Forma"; + Text[ catalan ] = "~Formata"; Text[ finnish ] = "~Muotoile"; + Text[ thai ] = "~รูปแบบ"; }; Menu MN_FORM { @@ -567,17 +584,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 1" ; Text [ english_us ] = "Untitled 1" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "δ 1"; - Text[ russian ] = " 1"; + Text[ chinese_simplified ] = "未命名 1"; + Text[ russian ] = " 1"; Text[ polish ] = "Bez nazwy 1"; - Text[ japanese ] = " 1"; - Text[ chinese_traditional ] = "RW 1"; + Text[ japanese ] = "無題 1"; + Text[ chinese_traditional ] = "未命名 1"; Text[ arabic ] = " 1"; Text[ greek ] = " 1"; - Text[ korean ] = " 1"; + Text[ korean ] = "제목 없음 1"; Text[ turkish ] = "Adsz 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 1"; + Text[ catalan ] = "Sense nom 1"; + Text[ thai ] = "ไม่มีชื่อ 1"; }; MenuItem { @@ -596,17 +614,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 2" ; Text [ english_us ] = "Untitled 2" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "δ 2"; - Text[ russian ] = " 2"; + Text[ chinese_simplified ] = "未命名 2"; + Text[ russian ] = " 2"; Text[ polish ] = "Bez nazwy 2"; - Text[ japanese ] = " 2"; - Text[ chinese_traditional ] = "RW 2"; + Text[ japanese ] = "無題 2"; + Text[ chinese_traditional ] = "未命名 2"; Text[ arabic ] = " 2"; Text[ greek ] = " 2"; - Text[ korean ] = "2"; + Text[ korean ] = "제목 없음2"; Text[ turkish ] = "Adsz 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 2"; + Text[ catalan ] = "Sense nom 2"; + Text[ thai ] = "ไม่มีชื่อ 2"; }; MenuItem { @@ -625,17 +644,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 3" ; Text [ english_us ] = "Untitled 3" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "δ 3"; - Text[ russian ] = " 3"; + Text[ chinese_simplified ] = "未命名 3"; + Text[ russian ] = " 3"; Text[ polish ] = "Bez nazwy 3"; - Text[ japanese ] = " 3"; - Text[ chinese_traditional ] = "RW 3"; + Text[ japanese ] = "無題 3"; + Text[ chinese_traditional ] = "未命名 3"; Text[ arabic ] = " 3"; Text[ greek ] = " 3"; - Text[ korean ] = "3"; + Text[ korean ] = "제목 없음3"; Text[ turkish ] = "Adsz 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 3"; + Text[ catalan ] = "Sense nom 3"; + Text[ thai ] = "ไม่มีชื่อ 3"; }; MenuItem { @@ -654,17 +674,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 4" ; Text [ english_us ] = "Untitled 4" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "δ 4"; - Text[ russian ] = " 4"; + Text[ chinese_simplified ] = "未命名 4"; + Text[ russian ] = " 4"; Text[ polish ] = "Bez nazwy 4"; - Text[ japanese ] = " 4"; - Text[ chinese_traditional ] = "RW 4"; + Text[ japanese ] = "無題 4"; + Text[ chinese_traditional ] = "未命名 4"; Text[ arabic ] = " 4"; Text[ greek ] = " 4"; - Text[ korean ] = "4"; + Text[ korean ] = "제목 없음4"; Text[ turkish ] = "Adsz 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 4"; + Text[ catalan ] = "Sense nom 4"; + Text[ thai ] = "ไม่มีชื่อ 4"; }; MenuItem { @@ -683,17 +704,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 5" ; Text [ english_us ] = "Untitled 5" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "δ 5"; - Text[ russian ] = " 5"; + Text[ chinese_simplified ] = "未命名 5"; + Text[ russian ] = " 5"; Text[ polish ] = "Bez nazwy 5"; - Text[ japanese ] = " 5"; - Text[ chinese_traditional ] = "RW 5"; + Text[ japanese ] = "無題 5"; + Text[ chinese_traditional ] = "未命名 5"; Text[ arabic ] = " 5"; Text[ greek ] = " 5"; - Text[ korean ] = "5"; + Text[ korean ] = "제목 없음5"; Text[ turkish ] = "Adsz 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 5"; + Text[ catalan ] = "Sense nom 5"; + Text[ thai ] = "ไม่มีชื่อ 5"; }; MenuItem { @@ -712,17 +734,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 6" ; Text [ english_us ] = "Untitled 6" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "δ 6"; - Text[ russian ] = " 6"; + Text[ chinese_simplified ] = "未命名 6"; + Text[ russian ] = " 6"; Text[ polish ] = "Bez nazwy 6"; - Text[ japanese ] = " 6"; - Text[ chinese_traditional ] = "RW 6"; + Text[ japanese ] = "無題 6"; + Text[ chinese_traditional ] = "未命名 6"; Text[ arabic ] = " 6"; Text[ greek ] = " 6"; - Text[ korean ] = "6"; + Text[ korean ] = "제목 없음6"; Text[ turkish ] = "Adsz 6"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 6"; + Text[ catalan ] = "Sense nom 6"; + Text[ thai ] = "ไม่มีชื่อ 6"; }; MenuItem { @@ -741,17 +764,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 7" ; Text [ english_us ] = "Untitled 7" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "δ 7"; - Text[ russian ] = " 7"; + Text[ chinese_simplified ] = "未命名 7"; + Text[ russian ] = " 7"; Text[ polish ] = "Bez nazwy 7"; - Text[ japanese ] = " 7"; - Text[ chinese_traditional ] = "RW 7"; + Text[ japanese ] = "無題 7"; + Text[ chinese_traditional ] = "未命名 7"; Text[ arabic ] = " 7"; Text[ greek ] = " 7"; - Text[ korean ] = "7"; + Text[ korean ] = "제목 없음7"; Text[ turkish ] = "Adsz 7"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 7"; + Text[ catalan ] = "Sense nom 7"; + Text[ thai ] = "ไม่มีชื่อ 7"; }; MenuItem { @@ -770,17 +794,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 8" ; Text [ english_us ] = "Untitled 8" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "δ 8"; - Text[ russian ] = " 8"; + Text[ chinese_simplified ] = "未命名 8"; + Text[ russian ] = " 8"; Text[ polish ] = "Bez nazwy 8"; - Text[ japanese ] = " 8"; - Text[ chinese_traditional ] = "RW 8"; + Text[ japanese ] = "無題 8"; + Text[ chinese_traditional ] = "未命名 8"; Text[ arabic ] = " 8"; Text[ greek ] = " 8"; - Text[ korean ] = "8"; + Text[ korean ] = "제목 없음8"; Text[ turkish ] = "Adsz 8"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 8"; + Text[ catalan ] = "Sense nom 8"; + Text[ thai ] = "ไม่มีชื่อ 8"; }; MenuItem { @@ -799,17 +824,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 9" ; Text [ english_us ] = "Untitled 9" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "δ 9"; - Text[ russian ] = " 9"; + Text[ chinese_simplified ] = "未命名 9"; + Text[ russian ] = " 9"; Text[ polish ] = "Bez nazwy 9"; - Text[ japanese ] = " 9"; - Text[ chinese_traditional ] = "RW 9"; + Text[ japanese ] = "無題 9"; + Text[ chinese_traditional ] = "未命名 9"; Text[ arabic ] = " 9"; Text[ greek ] = " 9"; - Text[ korean ] = "9"; + Text[ korean ] = "제목 없음9"; Text[ turkish ] = "Adsz 9"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 9"; + Text[ catalan ] = "Sense nom 9"; + Text[ thai ] = "ไม่มีชื่อ 9"; }; MenuItem { @@ -822,7 +848,7 @@ TabDialog DLG_TAB_OUTLINE Text[ italian ] = "Salva con nome..."; Text[ portuguese_brazilian ] = "Gravar ~como..."; Text[ portuguese ] = "Guardar ~como..."; - Text[ danish ] = "Gem som..."; + Text[ danish ] = "Gem ~som..."; Text[ french ] = "Enregistrer comme..."; Text[ swedish ] = "Spara so~m..."; Text[ dutch ] = "Ops~laan als..."; @@ -830,32 +856,34 @@ TabDialog DLG_TAB_OUTLINE Text[ english_us ] = "Save ~As..."; Text[ russian ] = " ..."; Text[ polish ] = "Zapisz jako..."; - Text[ japanese ] = "Otĕۑ(~A)..."; - Text[ chinese_simplified ] = "Ϊ(~A)..."; + Text[ japanese ] = "名前を付けて保存(~A)..."; + Text[ chinese_simplified ] = "另存为(~A)..."; Text = "Speichern ~als..." ; Text[ arabic ] = "... "; HelpID = HID_NUM_OUTL_NUM_SAVEAS ; Text[ greek ] = "~ ..."; - Text[ korean ] = "ٸ ̸ (~A)..."; - Text[ chinese_traditional ] = "xss(~A)..."; + Text[ korean ] = "다른 이름으로 저장(~A)..."; + Text[ chinese_traditional ] = "儲存新檔(~A)..."; Text[ turkish ] = "Farkl kaydet..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "G~uardar como..."; - Text[ finnish ] = "~Tallenna nimell"; + Text[ catalan ] = "Anomena i ~desa..."; + Text[ finnish ] = "Tallenna ni~mell..."; + Text[ thai ] = "บันทึกเ~ป็น..."; }; }; }; - Text[ chinese_simplified ] = "±"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "章节编号"; + Text[ russian ] = " "; Text[ polish ] = "Numeracja rozdziaw"; - Text[ japanese ] = "͔ԍt"; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "章番号付け"; + Text[ chinese_traditional ] = "章節編號"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ȣű"; + Text[ korean ] = "장 번호 매기기"; Text[ turkish ] = "Blm numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin de captulos"; + Text[ catalan ] = "Numeraci de captols"; + Text[ thai ] = "ลำดับตัวเลขเค้าร่าง"; }; /**************************************************************************/ /* */ @@ -886,24 +914,25 @@ TabPage TP_OUTLINE_NUM Text [ italian ] = "Livello" ; Text [ portuguese_brazilian ] = "N?vel" ; Text [ portuguese ] = "Nvel" ; - Text [ finnish ] = "Taso " ; + Text [ finnish ] = "Taso" ; Text [ danish ] = "Niveau" ; Text [ french ] = "Niveau" ; Text [ swedish ] = "Niv" ; Text [ dutch ] = "Niveau" ; Text [ spanish ] = "Nivel" ; Text [ english_us ] = "Level" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "级"; Text[ russian ] = ""; Text[ polish ] = "Poziom"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "レベル"; + Text[ chinese_traditional ] = "級"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "수준"; Text[ turkish ] = "Dzey"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nivel"; + Text[ catalan ] = "Nivell"; + Text[ thai ] = "ระดับ"; }; FixedText FT_COLL { @@ -924,17 +953,18 @@ TabPage TP_OUTLINE_NUM Text [ english_us ] = "~Paragraph Style" ; Group = TRUE ; Left = TRUE ; - Text[ chinese_simplified ] = "ʽ(~P)"; + Text[ chinese_simplified ] = "段落样式(~P)"; Text[ russian ] = " "; Text[ polish ] = "Styl akapitu"; - Text[ japanese ] = "iفi~P)"; - Text[ chinese_traditional ] = "q˦(~P)"; + Text[ japanese ] = "段落スタイル（~P)"; + Text[ chinese_traditional ] = "段落樣式(~P)"; Text[ arabic ] = " "; Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; Text[ greek ] = " "; - Text[ korean ] = "ܶ (~P)"; + Text[ korean ] = "단락 스타일(~P)"; Text[ turkish ] = "Paragraf ablonu"; - Text[ catalan ] = "Estilo de ~prrafo"; + Text[ catalan ] = "Estil de ~pargraf"; + Text[ thai ] = "ลักษณะ~ย่อหน้า"; }; ListBox LB_COLL { @@ -959,23 +989,24 @@ TabPage TP_OUTLINE_NUM Text [ portuguese ] = "~Nmero" ; Text [ finnish ] = "~Luku" ; Text [ danish ] = "Nummer" ; - Text [ french ] = "~Numro" ; + Text [ french ] = "Numro" ; Text [ swedish ] = "~Nummer" ; Text [ dutch ] = "~Nummer" ; - Text [ spanish ] = "~Nmero" ; + Text [ spanish ] = "Nmero" ; Text [ english_us ] = "~Number" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~N)"; + Text[ chinese_simplified ] = "编号(~N)"; Text[ russian ] = ""; Text[ polish ] = "Numer"; - Text[ japanese ] = "ԍ(~N)"; - Text[ chinese_traditional ] = "s(~N)"; + Text[ japanese ] = "番号(~N)"; + Text[ chinese_traditional ] = "編號(~N)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ȣ(~N)"; + Text[ korean ] = "번호(~N)"; Text[ turkish ] = "Numara"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Nmero"; + Text[ thai ] = "~ตัวเลข"; }; ListBox LB_NUMBER { @@ -994,25 +1025,26 @@ TabPage TP_OUTLINE_NUM Text [ ENGLISH ] = "Character style" ; Text [ english_us ] = "~Character Style" ; Text [ swedish ] = "Teckenf~ormatmall" ; - Text [ danish ] = "Tegntypografi" ; + Text [ danish ] = "Te~gntypografi" ; Text [ italian ] = "Modello di carattere" ; - Text [ spanish ] = "E~stilo de carcter" ; - Text [ french ] = "St~yle de caractres" ; + Text [ spanish ] = "E~stilo de caracteres" ; + Text [ french ] = "Style de caractres" ; Text [ dutch ] = "~Tekenopmaakprofiel" ; Text [ portuguese_brazilian ] = "Zeichenv~orlage" ; Text [ portuguese ] = "~Estilo de caracteres:" ; - Text[ chinese_simplified ] = "ַʽ(~C)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "字符样式(~C)"; + Text[ russian ] = " "; Text[ polish ] = "Styl znaku"; - Text[ japanese ] = "(~C)"; - Text[ chinese_traditional ] = "r˦(~C)"; + Text[ japanese ] = "文字スタイル(~C)"; + Text[ chinese_traditional ] = "字元樣式(~C)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~C)"; + Text[ korean ] = "문자 스타일(~C)"; Text[ turkish ] = "Karakter ablonu"; Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; - Text[ catalan ] = "E~stilo de carcter"; - Text[ finnish ] = "~Merkistn tyyli"; + Text[ catalan ] = "E~stil de carcter"; + Text[ finnish ] = "~Merkkityyli"; + Text[ thai ] = "ลักษณะ~ตัวอักขระ"; }; ListBox LB_CHARFMT { @@ -1032,23 +1064,24 @@ TabPage TP_OUTLINE_NUM Text [ portuguese_brazilian ] = "~Completar" ; Text [ portuguese ] = "Co~mpleto" ; Text [ finnish ] = "~Nyt alatasot" ; - Text [ danish ] = "Fuldstndig" ; + Text [ danish ] = "F~uldstndig" ; Text [ french ] = "C~omplet" ; - Text [ swedish ] = "~Fullstndig" ; + Text [ swedish ] = "F~ullstndig" ; Text [ dutch ] = "~Volledig" ; Text [ spanish ] = "~Completo" ; Text [ english_us ] = "Sho~w sublevels" ; - Text[ chinese_simplified ] = "(~W)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "完整的(~W)"; + Text[ russian ] = " "; Text[ polish ] = "Poka wszystkie poziomy"; - Text[ japanese ] = "͐(~W)"; - Text[ chinese_traditional ] = "㪺(~W)"; + Text[ japanese ] = "総章数(~W)"; + Text[ chinese_traditional ] = "完整的(~W)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "Ϻϰ(~W)"; + Text[ korean ] = "하위 수준 표시(~W)"; Text[ turkish ] = "Tm dzeyler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Completo"; + Text[ catalan ] = "Mostr~a subnivells"; + Text[ thai ] = "แสด~งระดับย่อย"; }; NumericField NF_ALL_LEVEL { @@ -1083,17 +1116,18 @@ TabPage TP_OUTLINE_NUM Text [ spanish ] = "Separador" ; Text [ english_us ] = "Separator" ; Left = TRUE ; - Text[ chinese_simplified ] = "ָ"; + Text[ chinese_simplified ] = "分隔符"; Text[ russian ] = ""; Text[ polish ] = "Separator"; - Text[ japanese ] = "L"; - Text[ chinese_traditional ] = "j"; + Text[ japanese ] = "区切り記号"; + Text[ chinese_traditional ] = "分隔符"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "구분 기호"; Text[ turkish ] = "Ayrma iareti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Separador"; + Text[ thai ] = "ตัวแยก"; }; FixedText FT_PREFIX { @@ -1102,7 +1136,7 @@ TabPage TP_OUTLINE_NUM Text = "~davor" ; Text [ ENGLISH ] = "before" ; Text [ norwegian ] = "fr" ; - Text [ italian ] = "~Davanti" ; + Text [ italian ] = "Davanti" ; Text [ portuguese_brazilian ] = "antes" ; Text [ portuguese ] = "an~tes" ; Text [ finnish ] = "~Ennen" ; @@ -1113,17 +1147,18 @@ TabPage TP_OUTLINE_NUM Text [ spanish ] = "~delante" ; Text [ english_us ] = "~Before" ; Left = TRUE ; - Text[ chinese_simplified ] = "֮ǰ(~B)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "之前(~B)"; + Text[ russian ] = ""; Text[ polish ] = "przed"; - Text[ japanese ] = "ԍO(~B)"; - Text[ chinese_traditional ] = "e(~B)"; + Text[ japanese ] = "番号前(~B)"; + Text[ chinese_traditional ] = "之前(~B)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "(~B)"; + Text[ korean ] = "번호 앞(~B)"; Text[ turkish ] = "Ba. ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~delante"; + Text[ catalan ] = "~Abans"; + Text[ thai ] = "~ก่อน"; }; Edit ED_PREFIX { @@ -1141,7 +1176,7 @@ TabPage TP_OUTLINE_NUM Text = "dah~inter" ; Text [ ENGLISH ] = "behind" ; Text [ norwegian ] = "bak" ; - Text [ italian ] = "D~ietro" ; + Text [ italian ] = "Dietro" ; Text [ portuguese_brazilian ] = "atr?s" ; Text [ portuguese ] = "~Atrs" ; Text [ finnish ] = "~Jlkeen" ; @@ -1152,17 +1187,18 @@ TabPage TP_OUTLINE_NUM Text [ spanish ] = "d~etrs" ; Text [ english_us ] = "~After" ; Left = TRUE ; - Text[ chinese_simplified ] = "֮(~A)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "之后(~A)"; + Text[ russian ] = ""; Text[ polish ] = "za"; - Text[ japanese ] = "ԍ(~A)"; - Text[ chinese_traditional ] = "(~A)"; + Text[ japanese ] = "番号後(~A)"; + Text[ chinese_traditional ] = "之後(~A)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "Ŀ(~A)"; + Text[ korean ] = "번호 뒤(~A)"; Text[ turkish ] = "Son. ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "d~etrs"; + Text[ catalan ] = "D~esprs"; + Text[ thai ] = "~หลังจาก"; }; Edit ED_SUFFIX { @@ -1180,28 +1216,29 @@ TabPage TP_OUTLINE_NUM Text = "~Beginn bei" ; Text [ English ] = "~Start at" ; Text [ norwegian ] = "~Start p" ; - Text [ italian ] = "~Inizia con" ; + Text [ italian ] = "Inizia con" ; Text [ portuguese_brazilian ] = "~Come?ar em" ; Text [ portuguese ] = "~Comear em" ; - Text [ finnish ] = "~Aloita kohdasta" ; + Text [ finnish ] = "~Aloitus" ; Text [ danish ] = "Begynd med" ; Text [ french ] = "Commencer avec" ; Text [ swedish ] = "~Brja med" ; Text [ dutch ] = "~Begin met" ; - Text [ spanish ] = "Comen~zar en" ; + Text [ spanish ] = "Comenzar en" ; Text [ english_us ] = "~Start at" ; Left = TRUE ; - Text[ chinese_simplified ] = "ʼ(~S)"; + Text[ chinese_simplified ] = "开始从(~S)"; Text[ russian ] = " "; Text[ polish ] = "Zacznij od"; - Text[ japanese ] = "Jn͔ԍ(~S)"; - Text[ chinese_traditional ] = "}lq(~S)"; + Text[ japanese ] = "開始章番号(~S)"; + Text[ chinese_traditional ] = "開始從(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~S)"; + Text[ korean ] = "시작 번호(~S)"; Text[ turkish ] = "Balang:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comen~zar en"; + Text[ catalan ] = "~Inicia a"; + Text[ thai ] = "เ~ริ่มที่"; }; NumericField ED_START { @@ -1236,17 +1273,18 @@ TabPage TP_OUTLINE_NUM Text [ spanish ] = "Numeracin" ; Text [ english_us ] = "Numbering" ; Group = TRUE ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "编号"; Text[ russian ] = ""; Text[ polish ] = "Numeracja"; - Text[ japanese ] = "ԍt"; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "番号付け"; + Text[ chinese_traditional ] = "編號"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ȣű"; + Text[ korean ] = "번호 매기기"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin"; + Text[ catalan ] = "Numeraci"; + Text[ thai ] = "ลำดับตัวเลข"; }; Window WIN_PREVIEW { @@ -1261,24 +1299,25 @@ TabPage TP_OUTLINE_NUM TEXT [ italian ] = "(nessuno)" ; TEXT [ portuguese_brazilian ] = "(nenhum)" ; TEXT [ portuguese ] = "(nenhum)" ; - TEXT [ finnish ] = "(Ei mitn)" ; + TEXT [ finnish ] = "(ei mitn)" ; TEXT [ danish ] = "(ingen)" ; TEXT [ french ] = "(aucun(e))" ; TEXT [ swedish ] = "(ingen)" ; TEXT [ dutch ] = "(geen)" ; TEXT [ spanish ] = "(ninguna)" ; TEXT [ english_us ] = "(none)" ; - TEXT[ chinese_simplified ] = "()"; - TEXT[ russian ] = "()"; + TEXT[ chinese_simplified ] = "(无)"; + TEXT[ russian ] = "()"; TEXT[ polish ] = "(brak)"; - TEXT[ japanese ] = "(Ȃ)"; - TEXT[ chinese_traditional ] = "(L)"; + TEXT[ japanese ] = "(なし)"; + TEXT[ chinese_traditional ] = "(無)"; TEXT[ arabic ] = "()"; TEXT[ greek ] = "()"; - TEXT[ korean ] = "()"; + TEXT[ korean ] = "(없음)"; TEXT[ turkish ] = "(Yok)"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(ninguna)"; + TEXT[ catalan ] = "(cap)"; + TEXT[ thai ] = "(ไม่มี)"; }; }; @@ -1286,3 +1325,20 @@ TabPage TP_OUTLINE_NUM + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/pgfnote.src b/sw/source/ui/misc/pgfnote.src index 88d76fd80c23..71cf0d837cc4 100644 --- a/sw/source/ui/misc/pgfnote.src +++ b/sw/source/ui/misc/pgfnote.src @@ -2,9 +2,9 @@ * * $RCSfile: pgfnote.src,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:29:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "Altezza massima come pagina" ; Text [ portuguese_brazilian ] = "Altura de p?gina no m ximo" ; Text [ portuguese ] = "No superior rea da pgina" ; - Text [ finnish ] = "~Ei sivualuetta suurempi" ; + Text [ finnish ] = "E~i sivualuetta suurempi" ; Text [ danish ] = "Op til maksimal sidehjde" ; Text [ french ] = "Hauteur maximale de la p~age" ; Text [ swedish ] = "Hjd maximalt som ~sida" ; @@ -86,17 +86,18 @@ TabPage TP_FOOTNOTE_PAGE Text [ english_us ] = "~Not larger than page area" ; TabStop = TRUE ; Group = TRUE ; - Text[ chinese_simplified ] = "߲ҳ(~N)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "最高不超过页高(~N)"; + Text[ russian ] = " "; Text[ polish ] = "Nie wyej ni na obszarze strony"; - Text[ japanese ] = "ō߰ނ̍(~N)"; - Text[ chinese_traditional ] = "̰WL(~N)"; + Text[ japanese ] = "最高はページの高さ(~N)"; + Text[ chinese_traditional ] = "最高不超過頁高(~N)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ִ롡̣ʳ̿͡(~N)"; + Text[ korean ] = "페이지 영역 보다 높지 않게(~N)"; Text[ turkish ] = "En fazla sayfa yksekliinde"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura m~xima como pgina"; + Text[ catalan ] = "Alada m~xima de pgina"; + Text[ thai ] = "ไ~ม่ใหญ่กว่าพื้นที่หน้า"; }; RadioButton RB_MAXHEIGHT { @@ -108,24 +109,25 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "Altezza massima nota a pi pagina" ; Text [ portuguese_brazilian ] = "Max. ~Height of Footnote" ; Text [ portuguese ] = "~Altura mxima da nota de rodap" ; - Text [ finnish ] = "~Alaviitteen korkeus enintn" ; + Text [ finnish ] = "Ala~viitteen korkeus enintn" ; Text [ danish ] = "Maks. hjde fodnote" ; - Text [ french ] = "Hauteur max. du ~pied de page" ; + Text [ french ] = "Hauteur maximale de la note" ; Text [ swedish ] = "Fotnotens ma~ximala hjd" ; Text [ dutch ] = "~Maximum hoogte" ; Text [ spanish ] = "Altura mx. de ~nota al pie" ; Text [ english_us ] = "Maximum footnote ~height" ; - Text[ chinese_simplified ] = "עŵ߶(~H)"; + Text[ chinese_simplified ] = "注脚的最高度(~H)"; Text[ russian ] = ". "; Text[ polish ] = "~Maks. wysoko przypisw doln."; - Text[ japanese ] = "r̍ō̍(~H)"; - Text[ chinese_traditional ] = "}̰(~H)"; + Text[ japanese ] = "脚注の最高の高さ(~H)"; + Text[ chinese_traditional ] = "註腳的最高(~H)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ִ (~H)"; + Text[ korean ] = "각주 최대 높이(~H)"; Text[ turkish ] = "Azami dipnot ykseklii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura mx. de ~nota al pie"; + Text[ catalan ] = "Alada mx. de ~nota al peu"; + Text[ thai ] = "ความ~สูงเชิงอรรถที่มากที่สุด"; }; MetricField ED_MAXHEIGHT { @@ -156,7 +158,7 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "~Distanza dal corpo del testo" ; Text [ portuguese_brazilian ] = "~Dist?ncia do Corpo do Texto" ; Text [ portuguese ] = "~Distncia at corpo do texto" ; - Text [ finnish ] = "Etisyys tekstiin" ; + Text [ finnish ] = "Etisyys tekstist" ; Text [ danish ] = "Afstand til brdtekst" ; Text [ french ] = "~cart du corps de texte" ; Text [ swedish ] = "~Avstnd till brdtext" ; @@ -164,17 +166,18 @@ TabPage TP_FOOTNOTE_PAGE Text [ spanish ] = "~Distancia al cuerpo del texto" ; Text [ english_us ] = "Space to text" ; Left = TRUE ; - Text[ chinese_simplified ] = "ĵľ(~D)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "至内文的距离"; + Text[ russian ] = " ~ "; Text[ polish ] = "Odstep do obszaru tekstowego"; - Text[ japanese ] = "{܂ł̊Ԋu(~D)"; - Text[ chinese_traditional ] = "ܤ媺Z(~D)"; + Text[ japanese ] = "本文までの間隔"; + Text[ chinese_traditional ] = "至內文的距离"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = "ѡ"; + Text[ korean ] = "텍스트와의 간격"; Text[ turkish ] = "Metinden uzaklk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Distancia al cuerpo del texto"; + Text[ catalan ] = "Espai per al text"; + Text[ thai ] = "ระยะห่างถึงข้อความ"; }; MetricField ED_DIST { @@ -205,22 +208,23 @@ TabPage TP_FOOTNOTE_PAGE Text [ portuguese ] = "rea da nota de rodap" ; Text [ finnish ] = "Alaviitealue" ; Text [ danish ] = "Fodnoteomrde" ; - Text [ french ] = "Plage note de bas de page" ; + Text [ french ] = "Section notes de bas de page" ; Text [ swedish ] = "Fotnotsomrde" ; Text [ dutch ] = "Voetnotenbereik" ; Text [ spanish ] = "rea de la nota al pie" ; Text [ english_us ] = "Footnote area" ; - Text[ chinese_simplified ] = "ע"; + Text[ chinese_simplified ] = "注脚区域"; Text[ russian ] = " "; Text[ polish ] = "Zakres przypisw dolnych"; - Text[ japanese ] = "r͈"; - Text[ chinese_traditional ] = "}d"; + Text[ japanese ] = "脚注範囲"; + Text[ chinese_traditional ] = "註腳範圍"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "각주 영역"; Text[ turkish ] = "Dipnot blm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "rea de la nota al pie"; + Text[ catalan ] = "rea de la nota al peu"; + Text[ thai ] = "พื้นที่เชิงอรรถ"; }; FixedText FT_LINEPOS { @@ -234,22 +238,23 @@ TabPage TP_FOOTNOTE_PAGE Text [ portuguese_brazilian ] = "~Position" ; Text [ swedish ] = "~Position" ; Text [ danish ] = "Placering" ; - Text [ italian ] = "~Posizione" ; + Text [ italian ] = "Posizione" ; Text [ spanish ] = "~Posicin" ; - Text [ french ] = "~Position" ; + Text [ french ] = "Position" ; Text [ dutch ] = "~Positie" ; - Text[ chinese_simplified ] = "λ(~P)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "位置(~P)"; + Text[ russian ] = ""; Text[ polish ] = "Pozycja"; - Text[ japanese ] = "ʒu(~P)"; - Text[ chinese_traditional ] = "m(~P)"; + Text[ japanese ] = "位置(~P)"; + Text[ chinese_traditional ] = "位置(~P)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ġ(~P)"; + Text[ korean ] = "위치(~P)"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Posicin"; + Text[ catalan ] = "~Posici"; Text[ finnish ] = "~Sijainti"; + Text[ thai ] = "~ตำแหน่ง"; }; ListBox DLB_LINEPOS { @@ -339,9 +344,9 @@ TabPage TP_FOOTNOTE_PAGE }; StringList [ chinese_simplified ] = { - < "" ; Default ; > ; - < "" ; Default ; > ; - < "" ; Default ; > ; + < "左" ; Default ; > ; + < "居中" ; Default ; > ; + < "右" ; Default ; > ; }; StringList [ russian ] = { @@ -357,15 +362,15 @@ TabPage TP_FOOTNOTE_PAGE }; StringList [ japanese ] = { - < "" ; Default ; > ; - < "" ; Default ; > ; - < "E" ; Default ; > ; + < "左" ; Default ; > ; + < "中央" ; Default ; > ; + < "右" ; Default ; > ; }; StringList [ chinese_traditional ] = { - < "" ; Default ; > ; - < "m" ; Default ; > ; - < "k" ; Default ; > ; + < "左" ; Default ; > ; + < "置中" ; Default ; > ; + < "右" ; Default ; > ; }; StringList [ arabic ] = { @@ -381,9 +386,9 @@ TabPage TP_FOOTNOTE_PAGE }; StringList [ korean ] = { - < "" ; Default ; > ; - < "" ; Default ; > ; - < "" ; Default ; > ; + < "왼쪽" ; Default ; > ; + < "가운데" ; Default ; > ; + < "오른쪽" ; Default ; > ; }; StringList [ turkish ] = { @@ -399,10 +404,16 @@ TabPage TP_FOOTNOTE_PAGE }; StringList [ catalan ] = { - < "A la izquierda" ; Default ; > ; - < "Centrado" ; Default ; > ; - < "Derecha" ; Default ; > ; + < "Esquerra" ; Default ; > ; + < "Centrat" ; Default ; > ; + < "Dreta" ; Default ; > ; }; + StringList [ thai ] = + { + < "ซ้าย" ; Default ; > ; + < "ตรงกลาง" ; Default ; > ; + < "ขวา" ; Default ; > ; + }; }; FixedText FT_LINETYPE { @@ -418,21 +429,22 @@ TabPage TP_FOOTNOTE_PAGE Text [ swedish ] = "Styr~ka" ; Text [ danish ] = "Styrke" ; Text [ italian ] = "~Spessore" ; - Text [ spanish ] = "~Grosor" ; + Text [ spanish ] = "~Espesor" ; Text [ french ] = "~paisseur" ; Text [ dutch ] = "~Sterkte" ; - Text[ chinese_simplified ] = "ϸ(~W)"; + Text[ chinese_simplified ] = "线条粗细(~W)"; Text[ russian ] = " "; Text[ polish ] = "Grubo"; - Text[ japanese ] = "̑(~W)"; - Text[ chinese_traditional ] = "uʲ(~W)"; + Text[ japanese ] = "線の太さ(~W)"; + Text[ chinese_traditional ] = "線條粗細(~W)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "β(~W)"; + Text[ korean ] = "굵기(~W)"; Text[ turkish ] = "izgi kal."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Grosor"; - Text[ finnish ] = "~Paino"; + Text[ catalan ] = "~Pes"; + Text[ finnish ] = "Pa~ksuus"; + Text[ thai ] = "~น้ำหนัก"; }; ListBox DLB_LINETYPE { @@ -460,18 +472,19 @@ TabPage TP_FOOTNOTE_PAGE Text [ spanish ] = "~Longitud" ; Text [ french ] = "~Longueur" ; Text [ dutch ] = "L~engte" ; - Text[ chinese_simplified ] = "(~L)"; + Text[ chinese_simplified ] = "长度(~L)"; Text[ russian ] = ""; Text[ polish ] = "Dugo"; - Text[ japanese ] = "(~L)"; - Text[ chinese_traditional ] = "(~L)"; + Text[ japanese ] = "長さ(~L)"; + Text[ chinese_traditional ] = "長度(~L)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~L)"; + Text[ korean ] = "길이(~L)"; Text[ turkish ] = "Uzunluk"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Longitud"; Text[ finnish ] = "~Pituus"; + Text[ thai ] = "ความ~ยาว"; }; MetricField ED_LINEWIDTH { @@ -499,25 +512,26 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "Distanza dal contenuto delle note" ; Text [ portuguese_brazilian ] = "Dist?n~cia" ; Text [ portuguese ] = "E~spaam. entre trao e texto" ; - Text [ finnish ] = "~Etisyys alaviitteiden sisltn" ; - Text [ danish ] = "Afstand til fodnoteindholdet" ; + Text [ finnish ] = "~Etisyys alaviitteiden sisllst" ; + Text [ danish ] = "A~fstand til fodnoteindholdet" ; Text [ french ] = "~cart entre trait et texte" ; Text [ swedish ] = "Avstn~d till fotnotens innehll" ; Text [ dutch ] = "~Afstand tot inhoud voetnoot" ; Text [ spanish ] = "~Espacio al contenido de la nota" ; Text [ english_us ] = "~Spacing to footnote contents" ; Left = TRUE ; - Text[ chinese_simplified ] = "עĵļ(~S)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "至注脚文的间隔(~S)"; + Text[ russian ] = " "; Text[ polish ] = "Odstp od przypisw dolnych"; - Text[ japanese ] = "r܂ł̊Ԋu(~S)"; - Text[ chinese_traditional ] = "ܵ}媺j(~S)"; + Text[ japanese ] = "脚注までの間隔(~S)"; + Text[ chinese_traditional ] = "至註腳文的間隔(~S)"; Text[ arabic ] = " "; Text[ language_user1 ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = " 뿡 ѡ(~S)"; + Text[ korean ] = "각주 내용과의 간격(~S)"; Text[ turkish ] = "Dipnot ieriine uzaklk"; - Text[ catalan ] = "~Espacio al contenido de la nota"; + Text[ catalan ] = "~Espaiat continguts de la nota al peu"; + Text[ thai ] = "~ระยะห่างถึงเนื้อหาเชิงอรรถ"; }; MetricField ED_LINEDIST { @@ -546,27 +560,41 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "Linea di separazione" ; Text [ portuguese_brazilian ] = "Linha" ; Text [ portuguese ] = "Linha de separao" ; - Text [ finnish ] = "Erotin" ; - Text [ danish ] = "Skillelinje" ; + Text [ finnish ] = "Erotinviiva" ; + Text [ danish ] = "Separator" ; Text [ french ] = "Trait de sparation" ; Text [ swedish ] = "Skiljelinje" ; Text [ dutch ] = "Scheidingslijn" ; Text [ spanish ] = "Lnea de separacin" ; Text [ english_us ] = "Separator line" ; - Text[ chinese_simplified ] = "ָ"; + Text[ chinese_simplified ] = "分隔线"; Text[ russian ] = " "; Text[ polish ] = "Separator"; - Text[ japanese ] = "E"; - Text[ chinese_traditional ] = "ju"; + Text[ japanese ] = "境界線"; + Text[ chinese_traditional ] = "分隔線"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "м"; + Text[ korean ] = "구분선"; Text[ turkish ] = "Ayrma izgisi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lnea de separacin"; + Text[ catalan ] = "Lnia de separaci"; + Text[ thai ] = "ตัวแยกบรรทัด"; }; }; + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/pggrid.src b/sw/source/ui/misc/pggrid.src index 3bfd3771a2b5..3385845db4d2 100644 --- a/sw/source/ui/misc/pggrid.src +++ b/sw/source/ui/misc/pggrid.src @@ -2,9 +2,9 @@ * * $RCSfile: pggrid.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2002-06-13 13:31:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,25 +74,25 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster" ; Text [ english_us ] = "Grid" ; Text[ portuguese ] = "Grid"; - Text[ russian ] = "Grid"; + Text[ russian ] = ""; Text[ greek ] = "Grid"; - Text[ dutch ] = "Grid"; + Text[ dutch ] = "Raster"; Text[ french ] = "Grille"; Text[ spanish ] = "Cuadrcula"; - Text[ finnish ] = "Grid"; + Text[ finnish ] = "Ruudukko"; Text[ italian ] = "Griglia"; - Text[ danish ] = "Grid"; + Text[ danish ] = "Gitter"; Text[ swedish ] = "Raster"; Text[ polish ] = "Grid"; Text[ portuguese_brazilian ] = "Grid"; - Text[ japanese ] = "グリッド線"; - Text[ korean ] = "그리드선"; + Text[ japanese ] = "行数と文字数"; + Text[ korean ] = "그리드"; Text[ chinese_simplified ] = "格子线"; Text[ chinese_traditional ] = "格子線"; Text[ turkish ] = "Grid"; Text[ arabic ] = "Grid"; - Text[ catalan ] = "Grid"; - Text[ thai ] = "Grid"; + Text[ catalan ] = "Captura/encaixa"; + Text[ thai ] = "เส้นตาราง"; }; RadioButton RB_NOGRID { @@ -101,19 +101,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Kein Raster" ; Text [ english_us ] = "No grid" ; Text[ portuguese ] = "No grid"; - Text[ russian ] = "No grid"; + Text[ russian ] = " "; Text[ greek ] = "No grid"; - Text[ dutch ] = "No grid"; + Text[ dutch ] = "~Geen raster"; Text[ french ] = "Aucune grille"; Text[ spanish ] = "Sin cuadrcula"; - Text[ finnish ] = "No grid"; + Text[ finnish ] = "Ei ruudukkoa"; Text[ italian ] = "Nessuna griglia"; - Text[ danish ] = "No grid"; + Text[ danish ] = "Intet gitter"; Text[ swedish ] = "Inget raster"; Text[ polish ] = "No grid"; Text[ portuguese_brazilian ] = "No grid"; - Text[ japanese ] = "グリッド線なし"; - Text[ korean ] = "그리드선 없음"; + Text[ japanese ] = "標準の文字数を使う"; + Text[ korean ] = "그리드 없음"; Text[ chinese_simplified ] = "不使用格子线"; Text[ chinese_traditional ] = "不使用格子線"; Text[ turkish ] = "No grid"; @@ -128,19 +128,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster (nur Linien)" ; Text [ english_us ] = "Grid (lines only)" ; Text[ portuguese ] = "Grid (lines only)"; - Text[ russian ] = "Grid (lines only)"; + Text[ russian ] = " ( )"; Text[ greek ] = "Grid (lines only)"; - Text[ dutch ] = "Grid (lines only)"; + Text[ dutch ] = "Raster (a~lleen lijnen)"; Text[ french ] = "Grille (uniquement les lignes)"; Text[ spanish ] = "Cuadrcula (slo lneas)"; - Text[ finnish ] = "Grid (lines only)"; + Text[ finnish ] = "Ruudukko (vain viivat)"; Text[ italian ] = "Griglia (solo linee)"; - Text[ danish ] = "Grid (lines only)"; + Text[ danish ] = "Gitter (kun linjer)"; Text[ swedish ] = "Raster (bara linjer)"; Text[ polish ] = "Grid (lines only)"; Text[ portuguese_brazilian ] = "Grid (lines only)"; - Text[ japanese ] = "グリッド線 (行グリッド線のみ)"; - Text[ korean ] = "그리드선(줄 만)"; + Text[ japanese ] = "行数だけを指定する"; + Text[ korean ] = "그리드 (줄 만)"; Text[ chinese_simplified ] = "格子线(仅线条)"; Text[ chinese_traditional ] = "格子線(僅線條)"; Text[ turkish ] = "Grid (lines only)"; @@ -155,19 +155,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster (Linien und Zeichen)" ; Text [ english_us ] = "Grid (lines and characters)" ; Text[ portuguese ] = "Grid (lines and characters)"; - Text[ russian ] = "Grid (lines and characters)"; + Text[ russian ] = " ( )"; Text[ greek ] = "Grid (lines and characters)"; - Text[ dutch ] = "Grid (lines and characters)"; + Text[ dutch ] = "Raster (li~jnen en tekens)"; Text[ french ] = "Grille (lignes et caractres)"; Text[ spanish ] = "Cuadrcula (lneas y caracteres)"; - Text[ finnish ] = "Grid (lines and characters)"; + Text[ finnish ] = "Ruudukko (viivat ja merkit)"; Text[ italian ] = "Griglia (linee e caratteri)"; - Text[ danish ] = "Grid (lines and characters)"; + Text[ danish ] = "Gitter (linier og tegn)"; Text[ swedish ] = "Raster (linjer och tecken)"; Text[ polish ] = "Grid (lines and characters)"; Text[ portuguese_brazilian ] = "Grid (lines and characters)"; - Text[ japanese ] = "グリッド線 (行グリッド線と文字グリッド線)"; - Text[ korean ] = "그리드선(줄과 문자)"; + Text[ japanese ] = "行数と文字数を指定する"; + Text[ korean ] = "그리드 (줄과 문자)"; Text[ chinese_simplified ] = "格子线(线条和字符)"; Text[ chinese_traditional ] = "格子線(線條和字元)"; Text[ turkish ] = "Grid (lines and characters)"; @@ -187,19 +187,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Rasterlayout" ; Text [ english_us ] = "Grid layout" ; Text[ portuguese ] = "Grid layout"; - Text[ russian ] = "Grid layout"; + Text[ russian ] = " "; Text[ greek ] = "Grid layout"; - Text[ dutch ] = "Grid layout"; + Text[ dutch ] = "Rasterlay-out"; Text[ french ] = "Quadrillage"; Text[ spanish ] = "Diseo de cuadrcula"; - Text[ finnish ] = "Grid layout"; + Text[ finnish ] = "Ruudukon asettelu"; Text[ italian ] = "Layout griglia"; - Text[ danish ] = "Grid layout"; + Text[ danish ] = "Gitterlayout"; Text[ swedish ] = "Rasterlayout"; Text[ polish ] = "Grid layout"; Text[ portuguese_brazilian ] = "Grid layout"; - Text[ japanese ] = "グリッド線の設定"; - Text[ korean ] = "그리드선 설정"; + Text[ japanese ] = "行数と文字数の設定"; + Text[ korean ] = "그리드 레이아웃"; Text[ chinese_simplified ] = "格子线版式"; Text[ chinese_traditional ] = "格子線版式"; Text[ turkish ] = "Grid layout"; @@ -214,14 +214,14 @@ TabPage TP_TEXTGRID_PAGE Text = "Zeilen pro Seite" ; Text [ english_us ] = "Lines per page" ; Text[ portuguese ] = "Lines per page"; - Text[ russian ] = "Lines per page"; + Text[ russian ] = " "; Text[ greek ] = "Lines per page"; - Text[ dutch ] = "Lines per page"; + Text[ dutch ] = "Te~kens per pagina"; Text[ french ] = "Lignes par page"; Text[ spanish ] = "Lneas por pgina"; - Text[ finnish ] = "Lines per page"; + Text[ finnish ] = "Rivej sivulla"; Text[ italian ] = "Righe per pagina"; - Text[ danish ] = "Lines per page"; + Text[ danish ] = "Rkker pr. side"; Text[ swedish ] = "Rader per sida"; Text[ polish ] = "Lines per page"; Text[ portuguese_brazilian ] = "Lines per page"; @@ -257,19 +257,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Max. Basistextgre" ; Text [ english_us ] = "Max. base text size" ; Text[ portuguese ] = "Base text size"; - Text[ russian ] = "Base text size"; + Text[ russian ] = " "; Text[ greek ] = "Base text size"; - Text[ dutch ] = "Base text size"; + Text[ dutch ] = "~Basistekstgrootte"; Text[ french ] = "Taille max. du texte de base"; - Text[ spanish ] = "Tamao mx. texto base"; - Text[ finnish ] = "Base text size"; + Text[ spanish ] = "Tamao mx. del texto de base"; + Text[ finnish ] = "Leiptekstin koko"; Text[ italian ] = "Dimensioni max. testo base"; - Text[ danish ] = "Base text size"; + Text[ danish ] = "Basistekststrrelse"; Text[ swedish ] = "Max. storlek bastext"; Text[ polish ] = "Base text size"; Text[ portuguese_brazilian ] = "Base text size"; Text[ japanese ] = "対象文字列の最大サイズ"; - Text[ korean ] = "기본 텍스트 크기"; + Text[ korean ] = "대상 문자열 최대 크기"; Text[ chinese_simplified ] = "最大的主文字大小"; Text[ chinese_traditional ] = "最大的主文字大小"; Text[ turkish ] = "Base text size"; @@ -301,14 +301,14 @@ TabPage TP_TEXTGRID_PAGE Text = "Zeichen pro Zeile" ; Text [ english_us ] = "Characters per line" ; Text[ portuguese ] = "Characters per line"; - Text[ russian ] = "Characters per line"; + Text[ russian ] = " "; Text[ greek ] = "Characters per line"; - Text[ dutch ] = "Characters per line"; + Text[ dutch ] = "~Tekens per regel"; Text[ french ] = "Caractres par ligne"; Text[ spanish ] = "Caracteres por lnea"; - Text[ finnish ] = "Characters per line"; + Text[ finnish ] = "Merkkej rivill"; Text[ italian ] = "Caratteri per riga"; - Text[ danish ] = "Characters per line"; + Text[ danish ] = "Tegn pr. rkke"; Text[ swedish ] = "Tecken per rad"; Text[ polish ] = "Characters per line"; Text[ portuguese_brazilian ] = "Characters per line"; @@ -344,19 +344,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Max. Ruby-Textgre" ; Text [ english_us ] = "Max. Ruby text size" ; Text[ portuguese ] = "Ruby text size"; - Text[ russian ] = "Ruby text size"; + Text[ russian ] = " "; Text[ greek ] = "Ruby text size"; - Text[ dutch ] = "Ruby text size"; + Text[ dutch ] = "Rub~y-tekstgrootte"; Text[ french ] = "Taille max. du texte Ruby"; Text[ spanish ] = "Tamao mx. texto Ruby"; - Text[ finnish ] = "Ruby text size"; + Text[ finnish ] = "Ruby-tekstin koko"; Text[ italian ] = "Dimens. max. testo Ruby"; - Text[ danish ] = "Ruby text size"; + Text[ danish ] = "Fonetisk tekst - Tekststrrelse"; Text[ swedish ] = "Max. storlek ruby-text"; Text[ polish ] = "Ruby text size"; Text[ portuguese_brazilian ] = "Ruby text size"; Text[ japanese ] = "ルビ文字の最大サイズ"; - Text[ korean ] = "루비 텍스트 크기"; + Text[ korean ] = "최대 덧말 문자 크기"; Text[ chinese_simplified ] = "最大的拼音文字大小"; Text[ chinese_traditional ] = "最大的注音符號大小"; Text[ turkish ] = "Ruby text size"; @@ -388,19 +388,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Ruby-Text unter/links vom Basistext" ; Text [ english_us ] = "Ruby text below/left from base text" ; Text[ portuguese ] = "Ruby text below/left from base text"; - Text[ russian ] = "Ruby text below/left from base text"; + Text[ russian ] = " / "; Text[ greek ] = "Ruby text below/left from base text"; - Text[ dutch ] = "Ruby text below/left from base text"; + Text[ dutch ] = "R~uby-tekst onder/links van basistekst"; Text[ french ] = "Texte Ruby en bas/ gauche du texte de base"; - Text[ spanish ] = "Texto Ruby debajo/a la izquierda del texto base"; - Text[ finnish ] = "Ruby text below/left from base text"; + Text[ spanish ] = "Texto Ruby debajo/a la izquierda del texto de base"; + Text[ finnish ] = "Leiptekstin alapuolella tai vasemmalla oleva Ruby-teksti"; Text[ italian ] = "Testo Ruby in basso/a sinistra dal testo base"; - Text[ danish ] = "Ruby text below/left from base text"; + Text[ danish ] = "Fonetisk tekst. Under/til venstre for basistekst"; Text[ swedish ] = "Ruby-text nedanfr/till vnster om bastext"; Text[ polish ] = "Ruby text below/left from base text"; Text[ portuguese_brazilian ] = "Ruby text below/left from base text"; - Text[ japanese ] = "ルビ文字を対象文字列の下(横書き)または左(縦書き)に設定する"; - Text[ korean ] = "기본 텍스트로부터 루비 텍스트를 아래/왼쪽"; + Text[ japanese ] = "ルビを対象文字の下または左に表示"; + Text[ korean ] = "덧말 문자를 기본 문자의 아래/왼쪽에 배치"; Text[ chinese_simplified ] = "拼音文字在主文字的左下方"; Text[ chinese_traditional ] = "注音符號在主文字的左下方"; Text[ turkish ] = "Ruby text below/left from base text"; @@ -415,19 +415,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Rasterdarstellung" ; Text [ english_us ] = "Grid display" ; Text[ portuguese ] = "Grid display"; - Text[ russian ] = "Grid display"; + Text[ russian ] = " "; Text[ greek ] = "Grid display"; - Text[ dutch ] = "Grid display"; - Text[ french ] = "Reprsentation de la grille"; + Text[ dutch ] = "Rasterweergave"; + Text[ french ] = "Affichage de la grille"; Text[ spanish ] = "Representacin de la cuadrcula"; - Text[ finnish ] = "Grid display"; + Text[ finnish ] = "Ruudukon nyttminen"; Text[ italian ] = "Vista griglia"; - Text[ danish ] = "Grid display"; + Text[ danish ] = "Gittervisning"; Text[ swedish ] = "Rastervisning"; Text[ polish ] = "Grid display"; Text[ portuguese_brazilian ] = "Grid display"; - Text[ japanese ] = "グリッド線の表示"; - Text[ korean ] = "그리드선 표시"; + Text[ japanese ] = "罫線の表示"; + Text[ korean ] = "그리드 표시"; Text[ chinese_simplified ] = "显示格子线"; Text[ chinese_traditional ] = "顯示格子線"; Text[ turkish ] = "Grid display"; @@ -442,25 +442,25 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster anzeigen" ; Text [ english_us ] = "Display grid" ; Text[ portuguese ] = "Display grid"; - Text[ russian ] = "Display grid"; + Text[ russian ] = " "; Text[ greek ] = "Display grid"; - Text[ dutch ] = "Display grid"; + Text[ dutch ] = "~Raster weergeven"; Text[ french ] = "Afficher la grille"; Text[ spanish ] = "Mostrar cuadrcula"; - Text[ finnish ] = "Display grid"; + Text[ finnish ] = "Nyt ruudukko"; Text[ italian ] = "Mostra griglia"; - Text[ danish ] = "Display grid"; + Text[ danish ] = "Vis gitter"; Text[ swedish ] = "Visa raster"; Text[ polish ] = "Display grid"; Text[ portuguese_brazilian ] = "Display grid"; - Text[ japanese ] = "グリッド線を表示する"; - Text[ korean ] = "그리드선 표시"; + Text[ japanese ] = "罫線を表示する"; + Text[ korean ] = "그리드 표시"; Text[ chinese_simplified ] = "显示格子线"; Text[ chinese_traditional ] = "顯示格子線"; Text[ turkish ] = "Display grid"; Text[ arabic ] = "Display grid"; - Text[ catalan ] = "Display grid"; - Text[ thai ] = "Display grid"; + Text[ catalan ] = "Visualitza la graella"; + Text[ thai ] = "แสดงเส้นตาราง"; }; CheckBox CB_PRINT { @@ -469,19 +469,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster ausdrucken" ; Text [ english_us ] = "Print grid" ; Text[ portuguese ] = "Print grid"; - Text[ russian ] = "Print grid"; + Text[ russian ] = " "; Text[ greek ] = "Print grid"; - Text[ dutch ] = "Print grid"; + Text[ dutch ] = "R~aster afdrukken"; Text[ french ] = "Imprimer la grille"; Text[ spanish ] = "Imprimir cuadrcula"; - Text[ finnish ] = "Print grid"; + Text[ finnish ] = "Tulosta ruudukko"; Text[ italian ] = "Stampa griglia"; - Text[ danish ] = "Print grid"; + Text[ danish ] = "Udskriv gitter"; Text[ swedish ] = "Skriv ut raster"; Text[ polish ] = "Print grid"; Text[ portuguese_brazilian ] = "Print grid"; - Text[ japanese ] = "グリッド線を印刷する"; - Text[ korean ] = "그리드선 인쇄"; + Text[ japanese ] = "罫線を印刷する"; + Text[ korean ] = "그리드 인쇄"; Text[ chinese_simplified ] = "打印格子线"; Text[ chinese_traditional ] = "列印格子線"; Text[ turkish ] = "Print grid"; @@ -496,19 +496,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Rasterfarbe" ; Text [ english_us ] = "Grid color" ; Text[ portuguese ] = "Grid color"; - Text[ russian ] = "Grid color"; + Text[ russian ] = " "; Text[ greek ] = "Grid color"; - Text[ dutch ] = "Grid color"; + Text[ dutch ] = "Rast~erkleur"; Text[ french ] = "Couleur de la grille"; Text[ spanish ] = "Color de la cuadrcula"; - Text[ finnish ] = "Grid color"; + Text[ finnish ] = "Ruudukon vri"; Text[ italian ] = "Colore griglia"; - Text[ danish ] = "Grid color"; + Text[ danish ] = "Gitterfarve"; Text[ swedish ] = "Rasterfrg"; Text[ polish ] = "Grid color"; Text[ portuguese_brazilian ] = "Grid color"; - Text[ japanese ] = "グリッド線の色"; - Text[ korean ] = "그리드선 색"; + Text[ japanese ] = "罫線の色"; + Text[ korean ] = "그리드 색상"; Text[ chinese_simplified ] = "格子线的颜色"; Text[ chinese_traditional ] = "格子線的顔色"; Text[ turkish ] = "Grid color"; @@ -537,3 +537,5 @@ TabPage TP_TEXTGRID_PAGE + + diff --git a/sw/source/ui/misc/redlndlg.src b/sw/source/ui/misc/redlndlg.src index 293ad4909fd6..fd6cd95ce386 100644 --- a/sw/source/ui/misc/redlndlg.src +++ b/sw/source/ui/misc/redlndlg.src @@ -2,9 +2,9 @@ * * $RCSfile: redlndlg.src,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:49:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,10 +124,10 @@ ModalDialog DLG_MOD_REDLINE_ACCEPT Text[ portuguese_brazilian ] = "Accept or reject AutoFormat changes"; Text[ portuguese ] = "AutoFormato: aceitar ou rejeitar modificaes"; Text[ danish ] = "Accepter eller forkast AutoFormat ndringer"; - Text[ french ] = "Revoir les modifications de l'AutoFormat"; + Text[ french ] = "AutoFormat : Accepter ou rejeter les modifications"; Text[ swedish ] = "Acceptera eller ignorera AutoFormat-ndringar"; Text[ dutch ] = "AutoOpmaak: Wijzigingen accepteren of verwerpen"; - Text[ spanish ] = "AutoFormato: Aceptar o rechazar cambios"; + Text[ spanish ] = "Aceptar o rechazar modificaciones del Formateado automtico"; Text[ english_us ] = "Accept or Reject AutoFormat Changes"; Text[ chinese_simplified ] = "自动格式: 接受或者舍弃更改内容"; Text[ russian ] = ": "; @@ -159,19 +159,19 @@ Menu MN_REDLINE_POPUP Text [ swedish ] = "Redigera kommentar..." ; Text [ danish ] = "Rediger kommentar..." ; Text [ italian ] = "Modifica commento..." ; - Text [ spanish ] = "Modificar comentario..." ; + Text [ spanish ] = "Editar comentario..." ; Text [ french ] = "diter le commentaire..." ; Text [ dutch ] = "Opmerkingen bewerken..." ; Text [ portuguese ] = "Editar comentrio..." ; Text[ chinese_simplified ] = "编辑注解..."; - Text[ russian ] = " ..."; + Text[ russian ] = " ..."; Text[ polish ] = "Edytuj komentarz..."; Text[ japanese ] = "コメントの編集..."; Text[ language_user1 ] = " "; Text[ chinese_traditional ] = "編輯註解..."; Text[ arabic ] = " ..."; Text[ greek ] = " ..."; - Text[ korean ] = "주석 편집..."; + Text[ korean ] = "설명 편집..."; Text[ turkish ] = "Aklamalar dzenle..."; Text[ catalan ] = "Edita el comentari..."; Text[ finnish ] = "Muokkaa huomautusta..."; @@ -211,7 +211,7 @@ Menu MN_REDLINE_POPUP Text[ chinese_traditional ] = "動作"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "동작"; + Text[ korean ] = "작동"; Text[ turkish ] = "lem"; Text[ catalan ] = "Acci"; Text[ finnish ] = "Toiminto"; @@ -270,7 +270,7 @@ Menu MN_REDLINE_POPUP Text[ chinese_traditional ] = "日期"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "일자"; + Text[ korean ] = "날짜"; Text[ turkish ] = "Tarih"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data"; @@ -294,7 +294,7 @@ Menu MN_REDLINE_POPUP Text [ dutch ] = "Beschrijving" ; Text [ portuguese ] = "Descrio" ; Text[ chinese_simplified ] = "说明"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Opis"; Text[ japanese ] = "コメント"; Text[ chinese_traditional ] = "描述"; @@ -324,7 +324,7 @@ Menu MN_REDLINE_POPUP Text [ dutch ] = "Documentpositie" ; Text [ portuguese ] = "Posio no documento" ; Text[ chinese_simplified ] = "文档位置"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Pozycja dokumentu"; Text[ japanese ] = "ドキュメントの位置"; Text[ chinese_traditional ] = "文件位置"; @@ -355,7 +355,7 @@ Menu MN_REDLINE_POPUP Text[ chinese_traditional ] = "排序"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "분류"; + Text[ korean ] = "정렬 기준"; Text[ turkish ] = "Srala"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ordena per"; @@ -364,3 +364,8 @@ Menu MN_REDLINE_POPUP }; }; }; + + + + + diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 4942124887a2..c83687f2a797 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srtdlg.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: ama $ $Date: 2002-05-08 13:30:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -171,22 +171,26 @@ void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) BOOL lcl_GetSelTbl( SwWrtShell &rSh, USHORT& rX, USHORT& rY ) { - BOOL bRet = FALSE; const SwTableNode* pTblNd = rSh.IsCrsrInTbl(); - if( pTblNd ) + if( !pTblNd ) + return FALSE; + + _FndBox aFndBox( 0, 0 ); + + // suche alle Boxen / Lines { SwSelBoxes aSelBoxes; ::GetTblSel( rSh, aSelBoxes ); - _FndBox aFndBox( aSelBoxes ); - - rX = aFndBox.GetLines().Count(); - if( rX ) - { - rY = aFndBox.GetLines()[0]->GetBoxes().Count(); - bRet = TRUE; - } + _FndPara aPara( aSelBoxes, &aFndBox ); + const SwTable& rTbl = pTblNd->GetTable(); + ((SwTableLines&)rTbl.GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); } - return bRet; + rX = aFndBox.GetLines().Count(); + if( !rX ) + return FALSE; + + rY = aFndBox.GetLines()[0]->GetBoxes().Count(); + return TRUE; } /*-------------------------------------------------------------------- @@ -527,3 +531,8 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox ) return 0; } + + + + + diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src index cd0d78ca7b7a..c102a1101b7c 100644 --- a/sw/source/ui/misc/srtdlg.src +++ b/sw/source/ui/misc/srtdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: srtdlg.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:31:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,7 @@ ModalDialog DLG_SORTING Text [ italian ] = "Colonna" ; Text [ portuguese_brazilian ] = "Coluna" ; Text [ portuguese ] = "Coluna" ; - Text [ finnish ] = "Sarake " ; + Text [ finnish ] = "Sarake" ; Text [ danish ] = "Kolonne" ; Text [ french ] = "Colonne" ; Text [ swedish ] = "Kolumn" ; @@ -121,17 +121,18 @@ ModalDialog DLG_SORTING Text [ spanish ] = "Columna" ; Text [ english_us ] = "Column" ; Left = TRUE ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "列"; + Text[ russian ] = ""; Text[ polish ] = "Kolumna"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "列"; + Text[ chinese_traditional ] = "欄"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "단"; Text[ turkish ] = "Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columna"; + Text[ catalan ] = "COLUMN"; + Text[ thai ] = "คอลัมน์"; }; FixedText FT_KEYTYP { @@ -146,23 +147,24 @@ ModalDialog DLG_SORTING Text [ portuguese ] = "Tipo de chave" ; Text [ finnish ] = "Avainlaji" ; Text [ danish ] = "Ngletype" ; - Text [ french ] = "Type de critre" ; + Text [ french ] = "Type de cl" ; Text [ swedish ] = "Nyckeltyp" ; Text [ dutch ] = "Sleuteltype" ; Text [ spanish ] = "Tipo de clave" ; Text [ english_us ] = "Key type" ; Left = TRUE ; - Text[ chinese_simplified ] = "ؼ"; + Text[ chinese_simplified ] = "关键字类型"; Text[ russian ] = " "; Text[ polish ] = "Typ klucza"; - Text[ japanese ] = "̎"; + Text[ japanese ] = "キーの種類"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "r"; + Text[ chinese_traditional ] = "關鍵字類型"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "Ű "; + Text[ korean ] = "키 유형"; Text[ turkish ] = "Anahtar tipi"; Text[ catalan ] = "Tipo de clave"; + Text[ thai ] = "ชนิดคีย์"; }; FixedText FT_DIR { @@ -181,17 +183,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Volgorde" ; Text [ spanish ] = "Orden" ; Text [ english_us ] = "Order" ; - Text[ chinese_simplified ] = "˳"; + Text[ chinese_simplified ] = "顺序"; Text[ russian ] = ""; Text[ polish ] = "Kolejno"; - Text[ japanese ] = ""; + Text[ japanese ] = "順序"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = ""; + Text[ chinese_traditional ] = "順序"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "순서"; Text[ turkish ] = "Sra"; - Text[ catalan ] = "Orden"; + Text[ catalan ] = "Ordre"; + Text[ thai ] = "ลำดับ"; }; CheckBox CB_KEY1 { @@ -212,17 +215,18 @@ ModalDialog DLG_SORTING Text [ spanish ] = "Clave ~1" ; Text [ english_us ] = "Key ~1" ; Check = TRUE ; - Text[ chinese_simplified ] = "ؼ ~1"; + Text[ chinese_simplified ] = "关键字 ~1"; Text[ russian ] = " ~1"; Text[ polish ] = "Klucz ~1"; - Text[ japanese ] = " 1"; + Text[ japanese ] = "キー 1"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "r ~1"; + Text[ chinese_traditional ] = "關鍵字 ~1"; Text[ arabic ] = " 1"; Text[ greek ] = " ~1"; - Text[ korean ] = "Ű 1"; + Text[ korean ] = "키 1"; Text[ turkish ] = "Anahtar ~1"; Text[ catalan ] = "Clave ~1"; + Text[ thai ] = "คีย์ ~1"; }; NumericField ED_KEY1 { @@ -247,24 +251,25 @@ ModalDialog DLG_SORTING Text[ ENGLISH ] = "Numeric"; Text[ english_us ] = "Numeric"; Text[ portuguese ] = "numrico"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "numeriek"; Text[ french ] = "Numrique"; - Text[ spanish ] = "numrica"; - Text[ italian ] = "numerica"; - Text[ danish ] = "numeric"; - Text[ swedish ] = "numerisk"; + Text[ spanish ] = "Numrico"; + Text[ italian ] = "Numerico"; + Text[ danish ] = "Numerisk"; + Text[ swedish ] = "Numeriskt"; Text[ polish ] = "numeryczny"; Text[ portuguese_brazilian ] = "numeric"; - Text[ japanese ] = ""; - Text[ korean ] = "ȣ"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "Ʀr"; + Text[ japanese ] = "数字"; + Text[ korean ] = "숫자"; + Text[ chinese_simplified ] = "数字"; + Text[ chinese_traditional ] = "數字"; Text[ turkish ] = "numeric"; Text[ arabic ] = "numeric"; - Text[ finnish ] = "numeerinen"; + Text[ finnish ] = "Numeerinen"; Text[ catalan ] = "numeric"; + Text[ thai ] = "ตัวเลข"; }; ListBox DLB_KEY1 { @@ -282,29 +287,30 @@ ModalDialog DLG_SORTING Text = "~Aufsteigend" ; Text [ ENGLISH ] = "~Ascending" ; Text [ norwegian ] = "St~igende" ; - Text [ italian ] = "~Crescente" ; + Text [ italian ] = "Crescente" ; Text [ portuguese_brazilian ] = "~Ascendente" ; Text [ portuguese ] = "~Ascendente" ; Text [ finnish ] = "~Nouseva" ; Text [ danish ] = "Stigende" ; - Text [ french ] = "~Croissant" ; + Text [ french ] = "Croissant" ; Text [ swedish ] = "Stig~ande" ; Text [ dutch ] = "~Oplopend" ; Text [ spanish ] = "~Ascendente" ; Text [ english_us ] = "~Ascending" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "(~A)"; + Text[ chinese_simplified ] = "向上(~A)"; Text[ russian ] = " "; Text[ polish ] = "Rosnco"; - Text[ japanese ] = "(~A)"; - Text[ chinese_traditional ] = "VW(~A)"; + Text[ japanese ] = "昇順(~A)"; + Text[ chinese_traditional ] = "向上(~A)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~A)"; + Text[ korean ] = "오름차순(~A)"; Text[ turkish ] = "Ar~tan"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Ascendente"; + Text[ thai ] = "จาก~น้อยไปมาก"; }; RadioButton RB_DN { @@ -313,28 +319,29 @@ ModalDialog DLG_SORTING Text = "A~bsteigend" ; Text [ ENGLISH ] = "~Descending" ; Text [ norwegian ] = "~Synkende" ; - Text [ italian ] = "~Decrescente" ; + Text [ italian ] = "Decrescente" ; Text [ portuguese_brazilian ] = "~Descendente" ; Text [ portuguese ] = "~Descendente" ; Text [ finnish ] = "~Laskeva" ; Text [ danish ] = "Faldende" ; - Text [ french ] = "~Dcroissant" ; + Text [ french ] = "Dcroissant" ; Text [ swedish ] = "Fallan~de" ; Text [ dutch ] = "~Aflopend" ; Text [ spanish ] = "~Descendente" ; Text [ english_us ] = "~Descending" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "(~D)"; + Text[ chinese_simplified ] = "向下(~D)"; Text[ russian ] = " "; Text[ polish ] = "Malejco"; - Text[ japanese ] = "~(~D)"; - Text[ chinese_traditional ] = "VU(~D)"; + Text[ japanese ] = "降順(~D)"; + Text[ chinese_traditional ] = "向下(~D)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~D)"; + Text[ korean ] = "내림차순(~D)"; Text[ turkish ] = "A~zalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Descendente"; + Text[ catalan ] = "~Descendent"; + Text[ thai ] = "จาก~มากไปน้อย"; }; CheckBox CB_KEY2 { @@ -354,17 +361,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Sleutel ~2" ; Text [ spanish ] = "Clave ~2" ; Text [ english_us ] = "Key ~2" ; - Text[ chinese_simplified ] = "ؼ ~2"; + Text[ chinese_simplified ] = "关键字 ~2"; Text[ russian ] = " ~2"; Text[ polish ] = "Klucz 2"; - Text[ japanese ] = " 2"; + Text[ japanese ] = "キー 2"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "r ~2"; + Text[ chinese_traditional ] = "關鍵字 ~2"; Text[ arabic ] = " 2"; Text[ greek ] = " ~2"; - Text[ korean ] = "Ű 2"; + Text[ korean ] = "키 2"; Text[ turkish ] = "Anahtar ~2"; Text[ catalan ] = "Clave ~2"; + Text[ thai ] = "คีย์ ~2"; }; NumericField ED_KEY2 { @@ -398,29 +406,30 @@ ModalDialog DLG_SORTING Text = "A~ufsteigend" ; Text [ ENGLISH ] = "~Ascending" ; Text [ norwegian ] = "St~igende" ; - Text [ italian ] = "~Crescente" ; + Text [ italian ] = "Crescente" ; Text [ portuguese_brazilian ] = "~Ascendente" ; Text [ portuguese ] = "~Ascendente" ; Text [ finnish ] = "Nouseva" ; Text [ danish ] = "Stigende" ; - Text [ french ] = "~Croissant" ; + Text [ french ] = "Croissant" ; Text [ swedish ] = "Sti~gande" ; Text [ dutch ] = "~Oplopend" ; Text [ spanish ] = "A~scendente" ; Text [ english_us ] = "Ascending" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "向上"; Text[ russian ] = " "; Text[ polish ] = "Rosnco"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "VW"; + Text[ japanese ] = "昇順"; + Text[ chinese_traditional ] = "向上"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "오름차순"; Text[ turkish ] = "Arta~n"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~scendente"; + Text[ catalan ] = "~Ascendent"; + Text[ thai ] = "จากน้อยไปมาก"; }; RadioButton RB_DN2 { @@ -429,28 +438,29 @@ ModalDialog DLG_SORTING Text = "Ab~steigend" ; Text [ ENGLISH ] = "~Descending" ; Text [ norwegian ] = "~Synkende" ; - Text [ italian ] = "~Decrescente" ; + Text [ italian ] = "Decrescente" ; Text [ portuguese_brazilian ] = "~Descendente" ; Text [ portuguese ] = "~Descendente" ; Text [ finnish ] = "Laskeva" ; Text [ danish ] = "Faldende" ; - Text [ french ] = "~Dcroissant" ; + Text [ french ] = "Dcroissant" ; Text [ swedish ] = "Fa~llande" ; Text [ dutch ] = "~Aflopend" ; Text [ spanish ] = "Desc~endente" ; Text [ english_us ] = "Descending" ; TabStop = TRUE ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "向下"; Text[ russian ] = " "; Text[ polish ] = "Malejco"; - Text[ japanese ] = "~"; - Text[ chinese_traditional ] = "VU"; + Text[ japanese ] = "降順"; + Text[ chinese_traditional ] = "向下"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "내림차순"; Text[ turkish ] = "A~rtan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desc~endente"; + Text[ thai ] = "จากมากไปน้อย"; }; CheckBox CB_KEY3 { @@ -465,22 +475,23 @@ ModalDialog DLG_SORTING Text [ portuguese ] = "Tecla ~3" ; Text [ finnish ] = "Avain ~3" ; Text [ danish ] = "Ngle 3" ; - Text [ french ] = "Critre ~3" ; + Text [ french ] = "Cl 3" ; Text [ swedish ] = "Nyckel ~3" ; Text [ dutch ] = "Sleutel ~3" ; Text [ spanish ] = "Clave ~3" ; Text [ english_us ] = "Key ~3" ; - Text[ chinese_simplified ] = "ؼ ~3"; + Text[ chinese_simplified ] = "关键字 ~3"; Text[ russian ] = " ~3"; Text[ polish ] = "Klucz 3"; - Text[ japanese ] = " 3"; + Text[ japanese ] = "キー 3"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "r ~3"; + Text[ chinese_traditional ] = "關鍵字 ~3"; Text[ arabic ] = " 3"; Text[ greek ] = " ~3"; - Text[ korean ] = "Ű 3"; + Text[ korean ] = "키 3"; Text[ turkish ] = "Anahtar ~3"; Text[ catalan ] = "Clave ~3"; + Text[ thai ] = "คีย์ ~3"; }; NumericField ED_KEY3 { @@ -514,29 +525,30 @@ ModalDialog DLG_SORTING Text = "Aufstei~gend" ; Text [ ENGLISH ] = "~Ascending" ; Text [ norwegian ] = "St~igende" ; - Text [ italian ] = "~Crescente" ; + Text [ italian ] = "Crescente" ; Text [ portuguese_brazilian ] = "~Ascendente" ; Text [ portuguese ] = "~Ascendente" ; Text [ finnish ] = "Nouseva" ; Text [ danish ] = "Stigende" ; - Text [ french ] = "~Croissant" ; + Text [ french ] = "Croissant" ; Text [ swedish ] = "Stiga~nde" ; Text [ dutch ] = "~Oplopend" ; Text [ spanish ] = "Ascende~nte" ; Text [ english_us ] = "Ascending" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "向上"; Text[ russian ] = " "; Text[ polish ] = "Rosnco"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "VW"; + Text[ japanese ] = "昇順"; + Text[ chinese_traditional ] = "向上"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "오름차순"; Text[ turkish ] = "Artan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ascende~nte"; + Text[ thai ] = "จากน้อยไปมาก"; }; RadioButton RB_DN3 { @@ -545,28 +557,29 @@ ModalDialog DLG_SORTING Text = "Absteigen~d" ; Text [ ENGLISH ] = "~Descending" ; Text [ norwegian ] = "~Synkende" ; - Text [ italian ] = "~Decrescente" ; + Text [ italian ] = "Decrescente" ; Text [ portuguese_brazilian ] = "~Descendente" ; Text [ portuguese ] = "~Descendente" ; Text [ finnish ] = "Laskeva" ; Text [ danish ] = "Faldende" ; - Text [ french ] = "~Dcroissant" ; + Text [ french ] = "Dcroissant" ; Text [ swedish ] = "Falland~e" ; Text [ dutch ] = "~Aflopend" ; Text [ spanish ] = "Des~cendente" ; Text [ english_us ] = "Descending" ; TabStop = TRUE ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "向下"; Text[ russian ] = " "; Text[ polish ] = "Malejco"; - Text[ japanese ] = "~"; - Text[ chinese_traditional ] = "VU"; + Text[ japanese ] = "降順"; + Text[ chinese_traditional ] = "向下"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "내림차순"; Text[ turkish ] = "Aza~lan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Des~cendente"; + Text[ catalan ] = "Desce~ndent"; + Text[ thai ] = "จากมากไปน้อย"; }; FixedLine FL_SORT_2 { @@ -578,24 +591,25 @@ ModalDialog DLG_SORTING Text [ italian ] = "Criteri" ; Text [ portuguese_brazilian ] = "Regra" ; Text [ portuguese ] = "Regra" ; - Text [ finnish ] = "Lajitteluperusteet" ; - Text [ danish ] = "Kriterier" ; + Text [ finnish ] = "Lajitteluperuste" ; + Text [ danish ] = "Regel" ; Text [ french ] = "Rgle" ; Text [ swedish ] = "Regel" ; Text [ dutch ] = "Criteria" ; Text [ spanish ] = "Criterios" ; Text [ english_us ] = "Sort criteria" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "排序规则"; Text[ russian ] = " "; Text[ polish ] = "Regua"; - Text[ japanese ] = ""; + Text[ japanese ] = "条件"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "ƧdzWh"; + Text[ chinese_traditional ] = "排序規則"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = " "; + Text[ korean ] = "정렬 기준"; Text[ turkish ] = "Kural"; Text[ catalan ] = "Sort criteria"; + Text[ thai ] = "เกณฑ์การเรียง"; }; RadioButton RB_COL { @@ -615,17 +629,18 @@ ModalDialog DLG_SORTING Text [ spanish ] = "Co~lumnas" ; Text [ english_us ] = "Col~umns" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "(~U)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "列(~U)"; + Text[ russian ] = ""; Text[ polish ] = "~Kolumny"; - Text[ japanese ] = "(~U)"; - Text[ chinese_traditional ] = "(~U)"; + Text[ japanese ] = "列(~U)"; + Text[ chinese_traditional ] = "欄(~U)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~U)"; + Text[ korean ] = "열(~U)"; Text[ turkish ] = "S~tun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Co~lumnas"; + Text[ catalan ] = "Co~lumnes"; + Text[ thai ] = "คอลัม~น์"; }; RadioButton RB_ROW { @@ -639,24 +654,25 @@ ModalDialog DLG_SORTING Text [ portuguese ] = "~Linhas" ; Text [ finnish ] = "~Rivit" ; Text [ danish ] = "Rkker" ; - Text [ french ] = "~Lignes" ; + Text [ french ] = "Lignes" ; Text [ swedish ] = "~Rader" ; Text [ dutch ] = "~Rijen" ; Text [ spanish ] = "~Filas" ; Text [ english_us ] = "~Rows" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "(~R)"; + Text[ chinese_simplified ] = "行(~R)"; Text[ russian ] = ""; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "s(~R)"; - Text[ chinese_traditional ] = "(~R)"; + Text[ japanese ] = "行(~R)"; + Text[ chinese_traditional ] = "行(~R)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~R)"; + Text[ korean ] = "행(~R)"; Text[ turkish ] = "~Satr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Filas"; + Text[ catalan ] = "~Files"; + Text[ thai ] = "แ~ถว"; }; FixedLine FL_DIR { @@ -675,17 +691,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Richting" ; Text [ spanish ] = "Direccin" ; Text [ english_us ] = "Direction" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "方向"; Text[ russian ] = ""; Text[ polish ] = "Kierunek"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "V"; + Text[ japanese ] = "方向"; + Text[ chinese_traditional ] = "方向"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "방향"; Text[ turkish ] = "Yn"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Direction"; + Text[ catalan ] = "Direcci"; + Text[ thai ] = "ทิศทาง"; }; RadioButton RB_TAB { @@ -697,26 +714,27 @@ ModalDialog DLG_SORTING Text [ italian ] = "~Tabulazione" ; Text [ portuguese_brazilian ] = "~Tabula??o" ; Text [ portuguese ] = "~Tabulaes" ; - Text [ finnish ] = "~Sarkaimet" ; + Text [ finnish ] = "Sarkaimet" ; Text [ danish ] = "Tabulator" ; - Text [ french ] = "~Tabulation" ; + Text [ french ] = "Tabulation" ; Text [ swedish ] = "~Tabulator" ; Text [ dutch ] = "Ta~b" ; - Text [ spanish ] = "~Tabulacin" ; + Text [ spanish ] = "~Tabulador" ; Text [ english_us ] = "~Tabs" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "Ʊ(~T)"; + Text[ chinese_simplified ] = "制表符(~T)"; Text[ russian ] = ""; Text[ polish ] = "Tabulator"; - Text[ japanese ] = "(~T)"; - Text[ chinese_traditional ] = "s(~T)"; + Text[ japanese ] = "タブ(~T)"; + Text[ chinese_traditional ] = "定位鍵(~T)"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "(~T)"; + Text[ korean ] = "탭(~T)"; Text[ turkish ] = "~Sekmeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tabulacin"; + Text[ catalan ] = "~Pestanya"; + Text[ thai ] = "~ระยะกั้น"; }; RadioButton RB_TABCH { @@ -730,23 +748,24 @@ ModalDialog DLG_SORTING Text [ portuguese ] = "~Caracteres" ; Text [ finnish ] = "~Merkki" ; Text [ danish ] = "Tegn" ; - Text [ french ] = "Caractre" ; + Text [ french ] = "Caractres" ; Text [ swedish ] = "Te~cken" ; Text [ dutch ] = "~Teken" ; Text [ spanish ] = "Ca~rcter" ; Text [ english_us ] = "~Character" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "ַ(~C)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "字符(~C)"; + Text[ russian ] = ""; Text[ polish ] = "Znak"; - Text[ japanese ] = "L(~C)"; - Text[ chinese_traditional ] = "r(~C)"; + Text[ japanese ] = "記号(~C)"; + Text[ chinese_traditional ] = "字元(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~C)"; + Text[ korean ] = "문자(~C)"; Text[ turkish ] = "~Karakter"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ca~rcter"; + Text[ thai ] = "~ตัวอักขระ"; }; Edit ED_TABCH { @@ -773,17 +792,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Scheidingsteken" ; Text [ spanish ] = "Separador" ; Text [ english_us ] = "Separator" ; - Text[ chinese_simplified ] = "ָ"; + Text[ chinese_simplified ] = "分隔符"; Text[ russian ] = ""; Text[ polish ] = "Separator"; - Text[ japanese ] = "L"; - Text[ chinese_traditional ] = "j"; + Text[ japanese ] = "区切り記号"; + Text[ chinese_traditional ] = "分隔符"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "구분 기호"; Text[ turkish ] = "Ayrma iareti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Separator"; + Text[ thai ] = "ตัวแยก"; }; String STR_ROW { @@ -800,17 +820,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Rij" ; Text [ spanish ] = "Filas" ; Text [ english_us ] = "Rows" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "行"; Text[ russian ] = ""; Text[ polish ] = "Wiersz"; - Text[ japanese ] = "s"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "行"; + Text[ chinese_traditional ] = "行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "행"; Text[ turkish ] = "Satr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Filas"; + Text[ catalan ] = "fila"; + Text[ thai ] = "แถว"; }; String STR_COL { @@ -820,24 +841,25 @@ ModalDialog DLG_SORTING Text [ italian ] = "Colonna" ; Text [ portuguese_brazilian ] = "Coluna" ; Text [ portuguese ] = "Coluna" ; - Text [ finnish ] = "Sarake " ; + Text [ finnish ] = "Sarake" ; Text [ danish ] = "Kolonne" ; Text [ french ] = "Colonne" ; Text [ swedish ] = "Kolumn" ; Text [ dutch ] = "Kolom" ; Text [ spanish ] = "Columna" ; Text [ english_us ] = "Column" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "列"; + Text[ russian ] = ""; Text[ polish ] = "Kolumna"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "列"; + Text[ chinese_traditional ] = "欄"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "열"; Text[ turkish ] = "Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columna"; + Text[ catalan ] = "COLUMN"; + Text[ thai ] = "คอลัมน์"; }; PushButton PB_DELIM { @@ -860,18 +882,19 @@ ModalDialog DLG_SORTING Text[ french ] = "Langue"; Text[ spanish ] = "Idioma"; Text[ italian ] = "Lingua"; - Text[ danish ] = "Language"; + Text[ danish ] = "Sprog"; Text[ swedish ] = "Sprk"; Text[ polish ] = "Jzyk"; Text[ portuguese_brazilian ] = "Language"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "y"; + Text[ japanese ] = "言語"; + Text[ korean ] = "언어"; + Text[ chinese_simplified ] = "语言"; + Text[ chinese_traditional ] = "語言"; Text[ turkish ] = "Language"; Text[ arabic ] = "Language"; Text[ finnish ] = "Kieli"; Text[ catalan ] = "Language"; + Text[ thai ] = "ภาษา"; }; ListBox LB_LANG { @@ -892,21 +915,22 @@ ModalDialog DLG_SORTING Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Instelling"; - Text[ french ] = "Paramtre"; + Text[ french ] = "Paramtrage"; Text[ spanish ] = "Configuracin"; Text[ italian ] = "Impostazioni"; - Text[ danish ] = "Options"; + Text[ danish ] = "Indstilling"; Text[ swedish ] = "Instllning"; Text[ polish ] = "Ustawienie"; Text[ portuguese_brazilian ] = "Options"; - Text[ japanese ] = "ڍאݒ"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "趨"; - Text[ chinese_traditional ] = "]w"; + Text[ japanese ] = "詳細設定"; + Text[ korean ] = "설정"; + Text[ chinese_simplified ] = "设定"; + Text[ chinese_traditional ] = "設定"; Text[ turkish ] = "Options"; Text[ arabic ] = "Options"; Text[ finnish ] = "Asetus"; - Text[ catalan ] = "Options"; + Text[ catalan ] = "Configuraci"; + Text[ thai ] = "กำหนด"; }; CheckBox CB_CASE { @@ -917,37 +941,39 @@ ModalDialog DLG_SORTING Text [ ENGLISH ] = "Case sensitive" ; Text[ english_us ] = "Match case"; Text[ portuguese ] = "Comparao exacta"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Exact hetzelfde"; + Text[ dutch ] = "Exacte vergelijking"; Text[ french ] = "Comparaison exacte"; Text[ spanish ] = "Comparacin exacta"; Text[ italian ] = "Paragone esatto"; - Text[ danish ] = "Case sensitive"; + Text[ danish ] = "Eksakt sammenligning"; Text[ swedish ] = "Exakt jmfrelse"; Text[ polish ] = "Dokadne porwnanie"; Text[ portuguese_brazilian ] = "Case sensitive"; - Text[ japanese ] = "啶Əʂ"; - Text[ korean ] = "Ȯ "; - Text[ chinese_simplified ] = "ȷִСд"; - Text[ chinese_traditional ] = "TϤjpg"; + Text[ japanese ] = "大文字と小文字を区別する"; + Text[ korean ] = "대문자 및 소문자를 구분"; + Text[ chinese_simplified ] = "精确区分字母大小写"; + Text[ chinese_traditional ] = "精確區分字母大小寫"; Text[ turkish ] = "Case sensitive"; Text[ arabic ] = "Case sensitive"; - Text[ finnish ] = "Exacter Vergleich"; + Text[ finnish ] = "Sama kirjainkoko"; Text[ catalan ] = "Case sensitive"; + Text[ thai ] = "จับคู่ตัวพิมพ์"; }; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "排序"; Text[ russian ] = ""; Text[ polish ] = "Sortuj"; - Text[ japanese ] = "בւ"; - Text[ chinese_traditional ] = "Ƨ"; + Text[ japanese ] = "並べ替え"; + Text[ chinese_traditional ] = "排序"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "정렬"; Text[ turkish ] = "Srala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ordenar"; + Text[ catalan ] = "Ordena"; + Text[ thai ] = "เรียง"; }; InfoBox MSG_SRTERR { @@ -966,19 +992,36 @@ InfoBox MSG_SRTERR MESSAGE [ dutch ] = "Selectie kan niet worden gesorteerd" ; MESSAGE [ spanish ] = "No se pudo ordenar la seleccin" ; MESSAGE [ english_us ] = "Cannot sort selection" ; - MESSAGE[ chinese_simplified ] = "ѡݡ"; - MESSAGE[ russian ] = " "; + MESSAGE[ chinese_simplified ] = "无法排序选中的内容。"; + MESSAGE[ russian ] = " "; MESSAGE[ polish ] = "Nie mona sortowa selekcji"; - MESSAGE[ japanese ] = "I͈͕͂בւł܂B"; - MESSAGE[ chinese_traditional ] = "LkƧǿeC"; + MESSAGE[ japanese ] = "選択範囲は並べ替えできません。"; + MESSAGE[ chinese_traditional ] = "無法排序選取的內容。"; MESSAGE[ arabic ] = " "; MESSAGE[ greek ] = " "; - MESSAGE[ korean ] = " ϴ."; + MESSAGE[ korean ] = "선택을 정렬할 수 없습니다."; MESSAGE[ turkish ] = "Seim sralanamad"; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "No se pudo ordenar la seleccin"; + MESSAGE[ thai ] = "ไม่สามารถเรียงการเลือก"; }; + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/ui/ribbar/inputwin.src index 76d3df5ac9ed..4315c6b59f9a 100644 --- a/sw/source/ui/ribbar/inputwin.src +++ b/sw/source/ui/ribbar/inputwin.src @@ -2,9 +2,9 @@ * * $RCSfile: inputwin.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-07-13 22:00:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,18 +94,19 @@ ToolBox RID_TBX_FORMULA Text [ spanish ] = "Frmula" ; Text [ english_us ] = "Formula" ; /* ### ACHTUNG: Neuer Text in Resource? Formel auswhlen : Formel auswhlen */ - Text[ chinese_simplified ] = "ʽ"; + Text[ chinese_simplified ] = "公式"; Text[ russian ] = ""; Text[ polish ] = "Formua"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "数式"; + Text[ chinese_traditional ] = "公式"; Text[ arabic ] = ""; Text[ dutch ] = "Formule"; - Text[ chinese_simplified ] = "ʽ"; + Text[ chinese_simplified ] = "公式"; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "수식"; Text[ turkish ] = "Forml"; Text[ catalan ] = "Frmula"; + Text[ thai ] = "สูตรคำนวณ"; }; ToolBoxItem { @@ -125,18 +126,19 @@ ToolBox RID_TBX_FORMULA Text [ spanish ] = "Cancelar" ; Text [ english_us ] = "Cancel" ; /* ### ACHTUNG: Neuer Text in Resource? Formel nicht benehmen : Formel nicht benehmen */ - Text[ chinese_simplified ] = "ȡ"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "取消"; + Text[ russian ] = ""; Text[ polish ] = "Anuluj"; - Text[ japanese ] = "ݾ"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "キャンセル"; + Text[ chinese_traditional ] = "取消"; Text[ arabic ] = " "; Text[ dutch ] = "Annuleren"; - Text[ chinese_simplified ] = "ȡ"; + Text[ chinese_simplified ] = "取消"; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "취소"; Text[ turkish ] = "ptal"; - Text[ catalan ] = "Cancelar"; + Text[ catalan ] = "Cancel.la"; + Text[ thai ] = "ยกเลิก"; }; ToolBoxItem { @@ -157,18 +159,19 @@ ToolBox RID_TBX_FORMULA Text [ spanish ] = "Aplicar" ; Text [ english_us ] = "Apply" ; /* ### ACHTUNG: Neuer Text in Resource? Formel einfgen : Formel einfgen */ - Text[ chinese_simplified ] = "ʹ"; + Text[ chinese_simplified ] = "采用"; Text[ russian ] = ""; Text[ polish ] = "Zastosuj"; - Text[ japanese ] = "Kp"; - Text[ chinese_traditional ] = "ϥ"; + Text[ japanese ] = "適用"; + Text[ chinese_traditional ] = "採用"; Text[ arabic ] = ""; Text[ dutch ] = "Overnemen"; - Text[ chinese_simplified ] = "ʹ"; + Text[ chinese_simplified ] = "采用"; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "적용"; Text[ turkish ] = "Uygula"; - Text[ catalan ] = "Aplicar"; + Text[ catalan ] = "Aplica"; + Text[ thai ] = "ใช้"; }; }; Edit ED_POS @@ -197,7 +200,7 @@ Menu MN_CALC_POPUP HelpID = HID_MN_CALC_SUM ; Text = "~Summe" ; Text [ English ] = "~Sum" ; - Text [ dutch ] = "~Soml" ; + Text [ dutch ] = "~Som" ; Text [ spanish ] = "~Suma" ; Text [ english_us ] = "Sum" ; Text [ norwegian ] = "~Sum" ; @@ -208,18 +211,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Sum" ; Text [ french ] = "~Somme" ; Text [ swedish ] = "~Summa" ; - Text[ chinese_simplified ] = "ܼ"; + Text[ chinese_simplified ] = "总计"; Text[ russian ] = ""; Text[ polish ] = "Suma"; - Text[ japanese ] = "v"; - Text[ chinese_traditional ] = "pp"; + Text[ japanese ] = "合計"; + Text[ chinese_traditional ] = "小計"; Text[ arabic ] = ""; - Text[ dutch ] = "~Soml"; - Text[ chinese_simplified ] = "ܼ"; + Text[ dutch ] = "~Som"; + Text[ chinese_simplified ] = "总计"; Text[ greek ] = "~"; - Text[ korean ] = "հ"; + Text[ korean ] = "합계"; Text[ turkish ] = "Toplam"; - Text[ catalan ] = "~Suma"; + Text[ catalan ] = "Suma"; + Text[ thai ] = "ผลรวม"; }; MenuItem { @@ -236,19 +240,20 @@ Menu MN_CALC_POPUP Text [ danish ] = "Rund" ; Text [ portuguese ] = "A~rredondar" ; Text [ portuguese_brazilian ] = "Run~den" ; - Text[ chinese_simplified ] = "ת"; + Text[ chinese_simplified ] = "转换成整数"; Text[ russian ] = ""; Text[ polish ] = "Zaokrglaj"; - Text[ japanese ] = "ľܓ"; - Text[ chinese_traditional ] = "ഫ"; + Text[ japanese ] = "四捨五入"; + Text[ chinese_traditional ] = "轉換成整數"; Text[ arabic ] = ""; Text[ dutch ] = "~Afronden"; - Text[ chinese_simplified ] = "ת"; + Text[ chinese_simplified ] = "转换成整数"; Text[ greek ] = "~"; - Text[ korean ] = "ݿø"; + Text[ korean ] = "반올림"; Text[ turkish ] = "Yuvarla"; - Text[ catalan ] = "R~edondear"; + Text[ catalan ] = "Arrodoneix"; Text[ finnish ] = "Pyrist"; + Text[ thai ] = "รอบ"; }; MenuItem { @@ -267,18 +272,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Procent" ; Text [ french ] = "~Pourcentage" ; Text [ swedish ] = "~Procent" ; - Text[ chinese_simplified ] = "ٷֱ(~P)"; + Text[ chinese_simplified ] = "百分比"; Text[ russian ] = ""; Text[ polish ] = "Procent"; - Text[ japanese ] = "߰"; - Text[ chinese_traditional ] = "ʤ(~P)"; + Text[ japanese ] = "パーセント"; + Text[ chinese_traditional ] = "百分比"; Text[ arabic ] = ""; Text[ dutch ] = "Pro~cent"; - Text[ chinese_simplified ] = "ٷֱ(~P)"; + Text[ chinese_simplified ] = "百分比"; Text[ greek ] = "~ (%)"; - Text[ korean ] = ""; + Text[ korean ] = "백분율"; Text[ turkish ] = "Yzde"; - Text[ catalan ] = "~Porcentaje"; + Text[ catalan ] = "Percentatge"; + Text[ thai ] = "เปอร์เซ็นต์"; }; MenuItem { @@ -297,19 +303,20 @@ Menu MN_CALC_POPUP Text [ danish ] = "Kvadratrod" ; Text [ french ] = "~Racine carre" ; Text [ swedish ] = "~Kvadratrot" ; - Text[ chinese_simplified ] = "ƽ(~R)"; + Text[ chinese_simplified ] = "平方根"; Text[ russian ] = ""; Text[ polish ] = "Pierwiastek"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "(~R)"; + Text[ japanese ] = "平方根"; + Text[ chinese_traditional ] = "平方根"; Text[ arabic ] = ""; Text[ dutch ] = "~Vierkantswortel"; - Text[ chinese_simplified ] = "ƽ(~R)"; + Text[ chinese_simplified ] = "平方根"; Text[ language_user1 ] = "() ; - - - - - -"; Text[ greek ] = "~ "; - Text[ korean ] = ""; + Text[ korean ] = "근"; Text[ turkish ] = "Karekk"; - Text[ catalan ] = "~Raz"; + Text[ catalan ] = "Arrel quadrada"; + Text[ thai ] = "รากที่สอง"; }; MenuItem { @@ -318,28 +325,29 @@ Menu MN_CALC_POPUP Text = "Poten~ziere" ; Text [ English ] = "Po~wer" ; Text [ dutch ] = "~Machtsverheffen" ; - Text [ spanish ] = "Po~tenciando" ; + Text [ spanish ] = "Po~tencia" ; Text [ english_us ] = "Power" ; Text [ norwegian ] = "Po~tens" ; Text [ italian ] = "Elevare a potenza" ; Text [ portuguese_brazilian ] = "Po~t?ncia" ; Text [ portuguese ] = "Elevar a po~tncia" ; - Text [ finnish ] = "Potenssi" ; + Text [ finnish ] = "Potenssimritys" ; Text [ danish ] = "Oplft i potens" ; Text [ french ] = "Pu~issance" ; Text [ swedish ] = "~Upphja" ; - Text[ chinese_simplified ] = "(~W)"; + Text[ chinese_simplified ] = "乘幂"; Text[ russian ] = ""; Text[ polish ] = "Potguj"; - Text[ japanese ] = "ݏ"; - Text[ chinese_traditional ] = "(~W)"; + Text[ japanese ] = "累乗"; + Text[ chinese_traditional ] = "乘冪"; Text[ arabic ] = ""; Text[ dutch ] = "~Machtsverheffen"; - Text[ chinese_simplified ] = "(~W)"; + Text[ chinese_simplified ] = "乘幂"; Text[ greek ] = "~ "; - Text[ korean ] = ""; + Text[ korean ] = "제곱"; Text[ turkish ] = "Kuvvet kar"; - Text[ catalan ] = "Po~tenciando"; + Text[ catalan ] = "Po~tencia"; + Text[ thai ] = "ยกกำลัง"; }; MenuItem { @@ -379,18 +387,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Listeseparator" ; Text [ french ] = "Sparateur de lis~te" ; Text [ swedish ] = "List~avgrnsare" ; - Text[ chinese_simplified ] = "бָ(~S)"; + Text[ chinese_simplified ] = "列表分隔符"; Text[ russian ] = " "; Text[ polish ] = "Separator list"; - Text[ japanese ] = "ؽĂ̋L"; - Text[ chinese_traditional ] = "Mj(~S)"; + Text[ japanese ] = "リストの区切り記号"; + Text[ chinese_traditional ] = "清單分隔符"; Text[ arabic ] = " "; Text[ dutch ] = "Lijst~scheidingsteken"; - Text[ chinese_simplified ] = "бָ(~S)"; + Text[ chinese_simplified ] = "列表分隔符"; Text[ greek ] = " ~"; - Text[ korean ] = " "; + Text[ korean ] = "목록 구분 기호"; Text[ turkish ] = "~Liste eleri ayrcs"; - Text[ catalan ] = "~Separador de lista"; + Text[ catalan ] = "Separador de llista"; + Text[ thai ] = "รายการตัวแยก"; }; MenuItem { @@ -405,22 +414,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "~Uguale" ; Text [ portuguese_brazilian ] = "~Igual" ; Text [ portuguese ] = "~Igual" ; - Text [ finnish ] = "yhtsuuri" ; + Text [ finnish ] = "yht suuri" ; Text [ danish ] = "Lig med" ; Text [ french ] = "~gal" ; Text [ swedish ] = "~Lika med" ; - Text[ chinese_simplified ] = "(~E)"; + Text[ chinese_simplified ] = "等于"; Text[ russian ] = ""; Text[ polish ] = "Rwny"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "(~E)"; + Text[ japanese ] = "等しい"; + Text[ chinese_traditional ] = "等於"; Text[ arabic ] = ""; Text[ dutch ] = "~Gelijk aan"; - Text[ chinese_simplified ] = "(~E)"; + Text[ chinese_simplified ] = "等于"; Text[ greek ] = "~"; - Text[ korean ] = ""; + Text[ korean ] = "동일"; Text[ turkish ] = "Eittir"; - Text[ catalan ] = "~Igual"; + Text[ catalan ] = "Igual"; + Text[ thai ] = "เท่ากัน"; }; MenuItem { @@ -435,22 +445,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "Non uguale" ; Text [ portuguese_brazilian ] = "~N?o Igual" ; Text [ portuguese ] = "~Desigual" ; - Text [ finnish ] = "Ei yhtsuuri" ; + Text [ finnish ] = "Eri suuri" ; Text [ danish ] = "Forskellig fra" ; Text [ french ] = "D~iffrent" ; Text [ swedish ] = "~Inte lika med" ; - Text[ chinese_simplified ] = "(~N)"; + Text[ chinese_simplified ] = "不等于"; Text[ russian ] = " "; Text[ polish ] = "Nie rwny"; - Text[ japanese ] = "Ȃ"; - Text[ chinese_traditional ] = "(~N)"; + Text[ japanese ] = "等しくない"; + Text[ chinese_traditional ] = "不等於"; Text[ arabic ] = " "; Text[ dutch ] = "~Niet gelijk aan"; - Text[ chinese_simplified ] = "(~N)"; + Text[ chinese_simplified ] = "不等于"; Text[ greek ] = "~"; - Text[ korean ] = " "; + Text[ korean ] = "동일하지 않음"; Text[ turkish ] = "Eit deil"; Text[ catalan ] = "~No igual"; + Text[ thai ] = "ไม่เท่ากัน"; }; MenuItem { @@ -465,22 +476,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "Minore o uguale" ; Text [ portuguese_brazilian ] = "Me~nor ou Igual" ; Text [ portuguese ] = "Me~nor ou igual" ; - Text [ finnish ] = "Pienempi tai yhtsuuri kuin" ; + Text [ finnish ] = "Pienempi tai yht suuri kuin" ; Text [ danish ] = "Mindre end eller lig med" ; Text [ french ] = "I~nfrieur ou gal " ; Text [ swedish ] = "Mi~ndre n eller lika med" ; - Text[ chinese_simplified ] = "Сڻ(~Q)"; + Text[ chinese_simplified ] = "小于或等于"; Text[ russian ] = " "; Text[ polish ] = "Mniejszy lub rwny"; - Text[ japanese ] = "ȉ(~L)"; - Text[ chinese_traditional ] = "pε(~Q)"; + Text[ japanese ] = "以下"; + Text[ chinese_traditional ] = "小於或等於"; Text[ arabic ] = " "; Text[ dutch ] = "~Kleiner dan of gelijk aan"; - Text[ chinese_simplified ] = "Сڻ(~Q)"; + Text[ chinese_simplified ] = "小于或等于"; Text[ greek ] = "~ "; - Text[ korean ] = ""; + Text[ korean ] = "이하"; Text[ turkish ] = "Kk ya da eittir"; - Text[ catalan ] = "Me~nor o igual"; + Text[ catalan ] = "Menor que o igual"; + Text[ thai ] = "น้อยกว่าหรือเท่ากับ"; }; MenuItem { @@ -496,22 +508,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "~Maggiore uguale" ; Text [ portuguese_brazilian ] = "~Maior ou Igual" ; Text [ portuguese ] = "M~aior ou igual" ; - Text [ finnish ] = "Suurempi tai yhtsuuri kuin" ; + Text [ finnish ] = "Suurempi tai yht suuri kuin" ; Text [ danish ] = "Strre end lig med" ; Text [ french ] = "~Suprieur ou gal" ; Text [ swedish ] = "St~rre n eller lika med" ; - Text[ chinese_simplified ] = "ڻ(~G)"; + Text[ chinese_simplified ] = "大于或等于"; Text[ russian ] = " "; Text[ polish ] = "Wikszy lub rwny"; - Text[ japanese ] = "ȏ(~G)"; - Text[ chinese_traditional ] = "jε(~G)"; + Text[ japanese ] = "以上"; + Text[ chinese_traditional ] = "大於或等於"; Text[ arabic ] = " "; Text[ dutch ] = "G~roter dan of gelijk aan"; - Text[ chinese_simplified ] = "ڻ(~G)"; + Text[ chinese_simplified ] = "大于或等于"; Text[ greek ] = "~ "; - Text[ korean ] = "̻"; + Text[ korean ] = "이상"; Text[ turkish ] = "Byk ya da eittir"; - Text[ catalan ] = "M~ayor o igual"; + Text[ catalan ] = "Major que o igual"; + Text[ thai ] = "มากกว่าหรือเท่ากับ"; }; MenuItem { @@ -530,18 +543,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Mindre end" ; Text [ french ] = "In~frieur" ; Text [ swedish ] = "~Mindre n" ; - Text[ chinese_simplified ] = "С(~L)"; + Text[ chinese_simplified ] = "小于"; Text[ russian ] = ""; Text[ polish ] = "Mniejszy"; - Text[ japanese ] = "菬(~L)"; - Text[ chinese_traditional ] = "p(~L)"; + Text[ japanese ] = "より小さい"; + Text[ chinese_traditional ] = "小於"; Text[ arabic ] = ""; Text[ dutch ] = "K~leiner"; - Text[ chinese_simplified ] = "С(~L)"; + Text[ chinese_simplified ] = "小于"; Text[ greek ] = "~"; - Text[ korean ] = "̸"; + Text[ korean ] = "미만"; Text[ turkish ] = "Kktr"; - Text[ catalan ] = "M~enor"; + Text[ catalan ] = "Menys"; + Text[ thai ] = "น้อยกว่า"; }; MenuItem { @@ -561,18 +575,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Strre end" ; Text [ french ] = "S~uprieur" ; Text [ swedish ] = "~Strre n" ; - Text[ chinese_simplified ] = "(~R)"; + Text[ chinese_simplified ] = "大于"; Text[ russian ] = ""; Text[ polish ] = "Wikszy"; - Text[ japanese ] = "傫(~R)"; - Text[ chinese_traditional ] = "j(~R)"; + Text[ japanese ] = "より大きい"; + Text[ chinese_traditional ] = "大於"; Text[ arabic ] = ""; Text[ dutch ] = "Gro~ter"; - Text[ chinese_simplified ] = "(~R)"; + Text[ chinese_simplified ] = "大于"; Text[ greek ] = "~"; - Text[ korean ] = "ʰ"; + Text[ korean ] = "보다 큼"; Text[ turkish ] = "Byktr"; - Text[ catalan ] = "~Mayor"; + Text[ catalan ] = "~Major"; + Text[ thai ] = "มากกว่า"; }; MenuItem { @@ -588,25 +603,26 @@ Menu MN_CALC_POPUP Text [ spanish ] = "~O lgico" ; Text [ english_us ] = "Boolean Or" ; Text [ norwegian ] = "Logisk ~Eller" ; - Text [ italian ] = "Logica ~O" ; + Text [ italian ] = "~O logico" ; Text [ portuguese_brazilian ] = "Ou l?ico ~" ; Text [ portuguese ] = "~OU lgico" ; - Text [ finnish ] = "Boolen ehto Or (tai)" ; + Text [ finnish ] = "Boolen ehto TAI" ; Text [ danish ] = "Logisk ELLER" ; Text [ french ] = "~OU logique" ; Text [ swedish ] = "Logiskt ~Eller" ; - Text[ chinese_simplified ] = " ~Or"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "逻辑的 Or"; + Text[ russian ] = " "; Text[ polish ] = "Funkcja logiczna LUB"; - Text[ japanese ] = "_(~Or)"; - Text[ chinese_traditional ] = "誺 ~Or"; + Text[ japanese ] = "論理式"; + Text[ chinese_traditional ] = "邏輯的 Or"; Text[ arabic ] = " "; Text[ dutch ] = "Logisch ~Of"; - Text[ chinese_simplified ] = " ~Or"; + Text[ chinese_simplified ] = "逻辑的 Or"; Text[ greek ] = " ~Or Boole"; - Text[ korean ] = "Ҹ Or"; + Text[ korean ] = "불리언 Or"; Text[ turkish ] = "Mantksal Veya"; - Text[ catalan ] = "~O lgico"; + Text[ catalan ] = "~O lgic"; + Text[ thai ] = "บูลีนหรือ"; }; MenuItem { @@ -621,22 +637,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "Logica O esclusiva" ; Text [ portuguese_brazilian ] = "Xou l?ico" ; Text [ portuguese ] = "OU lgico e~xclusivo" ; - Text [ finnish ] = "Boolen ehto Xor (xtai)" ; + Text [ finnish ] = "Boolen ehto XTAI" ; Text [ danish ] = "Logisk eksklusiv ELLER" ; Text [ french ] = "Ou logique e~xclusif" ; Text [ swedish ] = "Logiskt E~xklusivt Eller" ; - Text[ chinese_simplified ] = "ij Or"; - Text[ russian ] = " \"\""; + Text[ chinese_simplified ] = "逻辑的除外的 Or"; + Text[ russian ] = " "; Text[ polish ] = "Wyczna funkcja logiczna LUB"; - Text[ japanese ] = "_(~xOr)"; - Text[ chinese_traditional ] = "誺~ Or"; + Text[ japanese ] = "排他的論理和(EXOR)"; + Text[ chinese_traditional ] = "邏輯的除外的 Or"; Text[ arabic ] = " "; Text[ dutch ] = "Logisch e~xclusief Of"; - Text[ chinese_simplified ] = "ij Or"; + Text[ chinese_simplified ] = "逻辑的除外的 Or"; Text[ greek ] = " ~Xor Boole"; - Text[ korean ] = "Ҹ Xor"; + Text[ korean ] = "불리언 Xor"; Text[ turkish ] = "Mantksal ~tek Veya"; - Text[ catalan ] = "O lgico e~xclusivo"; + Text[ catalan ] = "O lgic e~xclusiu"; + Text[ thai ] = "บูลีน Xor"; }; MenuItem { @@ -648,25 +665,26 @@ Menu MN_CALC_POPUP Text [ spanish ] = "~Y lgico" ; Text [ english_us ] = "Boolean And" ; Text [ norwegian ] = "Logisk ~Og" ; - Text [ italian ] = "Logica ~E" ; + Text [ italian ] = "~E logico" ; Text [ portuguese_brazilian ] = "E ~l?ico" ; Text [ portuguese ] = "~E lgico" ; - Text [ finnish ] = "Boolen ehto And (ja)" ; + Text [ finnish ] = "Boolen ehto JA" ; Text [ danish ] = "Logisk OG" ; Text [ french ] = "~ET logique" ; Text [ swedish ] = "Logiskt ~Och" ; - Text[ chinese_simplified ] = " ~And"; + Text[ chinese_simplified ] = "逻辑的 And"; Text[ russian ] = " ~"; Text[ polish ] = "Funkcja logiczna ORAZ"; - Text[ japanese ] = "_(~And)"; - Text[ chinese_traditional ] = "誺 ~And"; + Text[ japanese ] = "論理式(And)"; + Text[ chinese_traditional ] = "邏輯的 And"; Text[ arabic ] = " "; Text[ dutch ] = "Logisch ~En"; - Text[ chinese_simplified ] = " ~And"; + Text[ chinese_simplified ] = "逻辑的 And"; Text[ greek ] = " ~And Boole"; - Text[ korean ] = "Ҹ And"; + Text[ korean ] = "불리언 And"; Text[ turkish ] = "Mantksal ~Ve"; - Text[ catalan ] = "~Y lgico"; + Text[ catalan ] = "~Y lgic"; + Text[ thai ] = "บูลีนและ"; }; MenuItem { @@ -681,37 +699,39 @@ Menu MN_CALC_POPUP Text [ italian ] = "Logica Non" ; Text [ portuguese_brazilian ] = "N?o L?~ico" ; Text [ portuguese ] = "~NO lgico" ; - Text [ finnish ] = "Boolen ehto Not (ei)" ; + Text [ finnish ] = "Boolen ehto EI" ; Text [ danish ] = "Logisk IKKE" ; Text [ french ] = "NON log~ique" ; Text [ swedish ] = "Logiskt I~nte" ; - Text[ chinese_simplified ] = " Not"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "逻辑的 Not"; + Text[ russian ] = " "; Text[ polish ] = "Funkcja logiczna NIE"; - Text[ japanese ] = "_(Not)"; - Text[ chinese_traditional ] = "誺 Not"; + Text[ japanese ] = "論理式(Not)"; + Text[ chinese_traditional ] = "邏輯的 Not"; Text[ arabic ] = " "; Text[ dutch ] = "Log~isch Niet"; - Text[ chinese_simplified ] = " Not"; + Text[ chinese_simplified ] = "逻辑的 Not"; Text[ greek ] = "~ Not Boole"; - Text[ korean ] = "Ҹ Not"; + Text[ korean ] = "불리언 Not"; Text[ turkish ] = "Matk~al Deil"; - Text[ catalan ] = "~No lgico"; + Text[ catalan ] = "~No lgic"; + Text[ thai ] = "บูลีนไม่"; }; }; }; - Text[ chinese_simplified ] = "(~O)"; + Text[ chinese_simplified ] = "运算符"; Text[ russian ] = ""; Text[ polish ] = "Operatory"; - Text[ japanese ] = "Zq"; - Text[ chinese_traditional ] = "B(~O)"; + Text[ japanese ] = "演算子"; + Text[ chinese_traditional ] = "運算符"; Text[ arabic ] = " "; Text[ dutch ] = "O~peratoren"; - Text[ chinese_simplified ] = "(~O)"; + Text[ chinese_simplified ] = "运算符"; Text[ greek ] = "~"; - Text[ korean ] = ""; + Text[ korean ] = "연산자"; Text[ turkish ] = "leler"; - Text[ catalan ] = "~Operadores"; + Text[ catalan ] = "Operadors"; + Text[ thai ] = "ตัวปฏิบัติการ"; }; MenuItem { @@ -751,18 +771,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Middel" ; Text [ french ] = "~Moyenne" ; Text [ swedish ] = "M~edelvrde" ; - Text[ chinese_simplified ] = "ƽֵ(~M)"; + Text[ chinese_simplified ] = "平均值"; Text[ russian ] = " "; Text[ polish ] = "rednia warto"; - Text[ japanese ] = "ϒl"; - Text[ chinese_traditional ] = "(~M)"; + Text[ japanese ] = "平均値"; + Text[ chinese_traditional ] = "平均值"; Text[ arabic ] = ""; Text[ dutch ] = "~Gemiddelde waarde"; - Text[ chinese_simplified ] = "ƽֵ(~M)"; + Text[ chinese_simplified ] = "平均值"; Text[ greek ] = "~ "; - Text[ korean ] = ""; + Text[ korean ] = "평균값"; Text[ turkish ] = "Ortalama deer"; - Text[ catalan ] = "Pro~medio"; + Text[ catalan ] = "Mitja"; + Text[ thai ] = "ค่าเฉลี่ย"; }; MenuItem { @@ -781,18 +802,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Minimumvrdi" ; Text [ french ] = "~Minimum" ; Text [ swedish ] = "M~inimum" ; - Text[ chinese_simplified ] = "Сֵ(~N)"; + Text[ chinese_simplified ] = "最小值"; Text[ russian ] = " "; Text[ polish ] = "Minimum"; - Text[ japanese ] = "ŏl"; - Text[ chinese_traditional ] = "̤p(~N)"; + Text[ japanese ] = "最小値"; + Text[ chinese_traditional ] = "最小值"; Text[ arabic ] = " "; Text[ dutch ] = "M~inimumwaarde"; - Text[ chinese_simplified ] = "Сֵ(~N)"; + Text[ chinese_simplified ] = "最小值"; Text[ greek ] = " ~"; - Text[ korean ] = "ּ"; + Text[ korean ] = "최소"; Text[ turkish ] = "Asgari deer"; - Text[ catalan ] = "Valor m~nimo"; + Text[ catalan ] = "Valor m~nim"; + Text[ thai ] = "น้อยที่สุด"; }; MenuItem { @@ -811,33 +833,35 @@ Menu MN_CALC_POPUP Text [ danish ] = "Maksimumvrdi" ; Text [ french ] = "Ma~ximum" ; Text [ swedish ] = "M~aximum" ; - Text[ chinese_simplified ] = "ֵ(~X)"; + Text[ chinese_simplified ] = "最大值"; Text[ russian ] = " "; Text[ polish ] = "Maksimum"; - Text[ japanese ] = "ől"; - Text[ chinese_traditional ] = "̤j(~X)"; + Text[ japanese ] = "最大値"; + Text[ chinese_traditional ] = "最大值"; Text[ arabic ] = " "; Text[ dutch ] = "~Maximumwaarde"; - Text[ chinese_simplified ] = "ֵ(~X)"; + Text[ chinese_simplified ] = "最大值"; Text[ greek ] = "~ "; - Text[ korean ] = "ִ"; + Text[ korean ] = "최대값"; Text[ turkish ] = "Azami deer"; - Text[ catalan ] = "Valor m~ximo"; + Text[ catalan ] = "Valor m~xim"; + Text[ thai ] = "มากที่สุด"; }; }; }; - Text[ chinese_simplified ] = "ͳƹ(~T)"; + Text[ chinese_simplified ] = "统计功能"; Text[ russian ] = " "; Text[ polish ] = "Funkcje statystyczne"; - Text[ japanese ] = "v"; - Text[ chinese_traditional ] = "έp\\(~T)"; + Text[ japanese ] = "統計関数"; + Text[ chinese_traditional ] = "統計功能"; Text[ arabic ] = " "; Text[ dutch ] = "~Statistische functies"; - Text[ chinese_simplified ] = "ͳƹ(~T)"; + Text[ chinese_simplified ] = "统计功能"; Text[ greek ] = "~ "; - Text[ korean ] = " Լ"; + Text[ korean ] = "통계 함수"; Text[ turkish ] = "statistik ilevleri"; - Text[ catalan ] = "F~unciones estadsticas"; + Text[ catalan ] = "F~uncions estadstiques"; + Text[ thai ] = "ฟังก์ชั่นทางสถิติ"; }; MenuItem { @@ -852,7 +876,7 @@ Menu MN_CALC_POPUP Text [ italian ] = "Funzioni" ; Text [ portuguese_brazilian ] = "~Fun??s" ; Text [ portuguese ] = "~Funes" ; - Text [ finnish ] = "Toiminnot" ; + Text [ finnish ] = "Funktiot" ; Text [ danish ] = "Funktioner" ; Text [ french ] = "~Fonctions" ; Text [ swedish ] = "~Funktioner" ; @@ -875,19 +899,20 @@ Menu MN_CALC_POPUP Text [ french ] = "~Sinus" ; Text [ dutch ] = "~Sinus" ; Text [ portuguese ] = "~Seno" ; - Text[ chinese_simplified ] = "(~S)"; + Text[ chinese_simplified ] = "正弦"; Text[ russian ] = ""; Text[ polish ] = "Sinus"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "(~S)"; + Text[ japanese ] = "サイン"; + Text[ chinese_traditional ] = "正弦"; Text[ arabic ] = " "; Text[ dutch ] = "~Sinus"; - Text[ chinese_simplified ] = "(~S)"; + Text[ chinese_simplified ] = "正弦"; Text[ greek ] = "~"; - Text[ korean ] = ""; + Text[ korean ] = "사인"; Text[ turkish ] = "Sins"; - Text[ catalan ] = "~Seno"; + Text[ catalan ] = "Sinus"; Text[ finnish ] = "Sini"; + Text[ thai ] = "Sine"; }; MenuItem { @@ -904,19 +929,20 @@ Menu MN_CALC_POPUP Text [ french ] = "~Cosinus" ; Text [ dutch ] = "~Cosinus" ; Text [ portuguese ] = "~Coseno" ; - Text[ chinese_simplified ] = "(~C)"; + Text[ chinese_simplified ] = "余弦"; Text[ russian ] = ""; Text[ polish ] = "Cosinus"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "l(~C)"; + Text[ japanese ] = "コサイン"; + Text[ chinese_traditional ] = "餘弦"; Text[ arabic ] = " "; Text[ dutch ] = "~Cosinus"; - Text[ chinese_simplified ] = "(~C)"; + Text[ chinese_simplified ] = "余弦"; Text[ greek ] = "~"; - Text[ korean ] = "ڻ"; + Text[ korean ] = "코사인"; Text[ turkish ] = "Kosins"; - Text[ catalan ] = "~Coseno"; + Text[ catalan ] = "Cosinus"; Text[ finnish ] = "Kosini"; + Text[ thai ] = "Cosine"; }; MenuItem { @@ -933,19 +959,20 @@ Menu MN_CALC_POPUP Text [ french ] = "~Tangente" ; Text [ dutch ] = "~Tangens" ; Text [ portuguese ] = "~Tangente" ; - Text[ chinese_simplified ] = "(~T)"; + Text[ chinese_simplified ] = "正切"; Text[ russian ] = ""; Text[ polish ] = "Tangens"; - Text[ japanese ] = "ݼު"; - Text[ chinese_traditional ] = "(~T)"; + Text[ japanese ] = "タンジェント"; + Text[ chinese_traditional ] = "正切"; Text[ arabic ] = ""; Text[ dutch ] = "~Tangens"; - Text[ chinese_simplified ] = "(~T)"; + Text[ chinese_simplified ] = "正切"; Text[ greek ] = "~"; - Text[ korean ] = "źƮ"; + Text[ korean ] = "탄젠트"; Text[ turkish ] = "Tanjant"; - Text[ catalan ] = "~Tangente"; + Text[ catalan ] = "Tangent"; Text[ finnish ] = "Tangentti"; + Text[ thai ] = "Tangent"; }; MenuItem { @@ -958,23 +985,24 @@ Menu MN_CALC_POPUP 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 ] = "~Arco seno" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "反正弦"; Text[ russian ] = ""; Text[ polish ] = "Arcus sinus"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "ϥ"; + Text[ japanese ] = "アークサイン"; + Text[ chinese_traditional ] = "反正弦"; Text[ arabic ] = " "; Text[ dutch ] = "~Boogsinus"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "反正弦"; Text[ greek ] = "~ "; - Text[ korean ] = "ũ"; + Text[ korean ] = "아크사인"; Text[ turkish ] = "Arksins"; - Text[ catalan ] = "Seno de ~arco"; + Text[ catalan ] = "Arcsinus"; Text[ finnish ] = "Arkussini"; + Text[ thai ] = "Arcsine"; }; MenuItem { @@ -987,23 +1015,24 @@ Menu MN_CALC_POPUP Text [ swedish ] = "a~rcuscosinus" ; Text [ danish ] = "Arcus cosinus" ; Text [ italian ] = "A~rcocoseno" ; - Text [ spanish ] = "Coseno de a~rco" ; + Text [ spanish ] = "~Arcocoseno" ; Text [ french ] = "~Arc cosinus" ; Text [ dutch ] = "B~oogcosinus" ; Text [ portuguese ] = "Arco cose~no" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "反余弦"; Text[ russian ] = ""; Text[ polish ] = "Arcus cosinus"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "Ͼl"; + Text[ japanese ] = "アークコサイン"; + Text[ chinese_traditional ] = "反餘弦"; Text[ arabic ] = " "; Text[ dutch ] = "B~oogcosinus"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "反余弦"; Text[ greek ] = "~ "; - Text[ korean ] = "ũ ڻ"; + Text[ korean ] = "아크 코사인"; Text[ turkish ] = "Arkkosins"; - Text[ catalan ] = "Coseno de a~rco"; + Text[ catalan ] = "Arccosinus"; Text[ finnish ] = "Arkuskosini"; + Text[ thai ] = "Arccosine"; }; MenuItem { @@ -1020,35 +1049,37 @@ Menu MN_CALC_POPUP Text [ french ] = "Arc tan~gente" ; Text [ dutch ] = "Boogtan~gens" ; Text [ portuguese ] = "~Arco tangente" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "反正切"; Text[ russian ] = ""; Text[ polish ] = "Arcus tangens"; - Text[ japanese ] = "ݼު"; - Text[ chinese_traditional ] = "ϥ"; + Text[ japanese ] = "アークタンジェント"; + Text[ chinese_traditional ] = "反正切"; Text[ arabic ] = " "; Text[ dutch ] = "Boogtan~gens"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "反正切"; Text[ greek ] = " ~"; - Text[ korean ] = "ũ źƮ"; + Text[ korean ] = "아크 탄젠트"; Text[ turkish ] = "Arktanjant"; - Text[ catalan ] = "~Arcotangente"; + Text[ catalan ] = "Arctangent"; Text[ finnish ] = "Arkustangentti"; + Text[ thai ] = "Arctangent"; }; }; }; - Text[ chinese_simplified ] = "(~F)"; + Text[ chinese_simplified ] = "函数"; Text[ russian ] = ""; Text[ polish ] = "Funkcje"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "(~F)"; + Text[ japanese ] = "関数"; + Text[ chinese_traditional ] = "函數"; Text[ arabic ] = ""; Text[ dutch ] = "~Functies"; - Text[ chinese_simplified ] = "(~F)"; + Text[ chinese_simplified ] = "函数"; Text[ language_user1 ] = "() ; - - - - - -"; Text[ greek ] = "~"; - Text[ korean ] = "Լ"; + Text[ korean ] = "함수"; Text[ turkish ] = "levler"; - Text[ catalan ] = "~Funciones"; + Text[ catalan ] = "Funcions"; + Text[ thai ] = "ฟังก์ชั่น"; }; }; }; @@ -1067,19 +1098,20 @@ String STR_FORMULA Text [ danish ] = "Tekstformel" ; Text [ french ] = "Formule texte" ; Text [ swedish ] = "Textformel" ; - Text[ chinese_simplified ] = "ı"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "文本表格"; + Text[ russian ] = " "; Text[ polish ] = "Formua tekstu"; - Text[ japanese ] = "÷Č`"; - Text[ chinese_traditional ] = "r"; + Text[ japanese ] = "テキスト形式"; + Text[ chinese_traditional ] = "文字表格"; Text[ arabic ] = " "; Text[ dutch ] = "Tekstformule"; - Text[ chinese_simplified ] = "ı"; + Text[ chinese_simplified ] = "文本表格"; Text[ language_user1 ] = "() ; - - - - - -"; Text[ greek ] = " "; - Text[ korean ] = "ؽƮ "; + Text[ korean ] = "텍스트 수식"; Text[ turkish ] = "Metin formul"; - Text[ catalan ] = "Frmula de texto"; + Text[ catalan ] = "Frmula de text"; + Text[ thai ] = "ข้อความสูตรคำนวณ"; }; #define TB_INPUT \ ToolBoxItem\ @@ -1100,18 +1132,19 @@ String STR_FORMULA Text [ spanish ] = "Frmula" ; \ Text [ english_us ] = "Formula" ; \ /* ### ACHTUNG: Neuer Text in Resource? Formel auswhlen : Formel auswhlen */\ - Text[ chinese_simplified ] = "ʽ";\ + Text[ chinese_simplified ] = "公式";\ Text[ russian ] = "";\ Text[ polish ] = "Formua";\ - Text[ japanese ] = "";\ - Text[ chinese_traditional ] = "";\ + Text[ japanese ] = "数式";\ + Text[ chinese_traditional ] = "公式";\ Text[ arabic ] = "";\ Text[ dutch ] = "Formule";\ - Text[ chinese_simplified ] = "ʽ";\ + Text[ chinese_simplified ] = "公式";\ Text[ greek ] = "";\ - Text[ korean ] = "";\ + Text[ korean ] = "수식";\ Text[ turkish ] = "Forml";\ Text[ catalan ] = "Frmula";\ + Text[ thai ] = "สูตรคำนวณ";\ };\ ToolBoxItem\ {\ @@ -1131,18 +1164,19 @@ String STR_FORMULA Text [ spanish ] = "Cancelar" ; \ Text [ english_us ] = "Cancel" ; \ /* ### ACHTUNG: Neuer Text in Resource? Formel nicht benehmen : Formel nicht benehmen */\ - Text[ chinese_simplified ] = "ȡ";\ - Text[ russian ] = "";\ + Text[ chinese_simplified ] = "取消";\ + Text[ russian ] = "";\ Text[ polish ] = "Anuluj";\ - Text[ japanese ] = "ݾ";\ - Text[ chinese_traditional ] = "";\ + Text[ japanese ] = "キャンセル";\ + Text[ chinese_traditional ] = "取消";\ Text[ arabic ] = " ";\ Text[ dutch ] = "Annuleren";\ - Text[ chinese_simplified ] = "ȡ";\ + Text[ chinese_simplified ] = "取消";\ Text[ greek ] = "";\ - Text[ korean ] = "";\ + Text[ korean ] = "취소";\ Text[ turkish ] = "ptal";\ - Text[ catalan ] = "Cancelar";\ + Text[ catalan ] = "Cancel.la";\ + Text[ thai ] = "ยกเลิก";\ };\ ToolBoxItem\ {\ @@ -1163,21 +1197,35 @@ String STR_FORMULA Text [ spanish ] = "Aplicar" ; \ Text [ english_us ] = "Apply" ; \ /* ### ACHTUNG: Neuer Text in Resource? Formel einfgen : Formel einfgen */\ - Text[ chinese_simplified ] = "Ӧ";\ + Text[ chinese_simplified ] = "采用";\ Text[ russian ] = "";\ Text[ polish ] = "Zastosuj";\ - Text[ japanese ] = "Kp";\ - Text[ chinese_traditional ] = "ϥ";\ + Text[ japanese ] = "適用";\ + Text[ chinese_traditional ] = "採用";\ Text[ arabic ] = "";\ Text[ dutch ] = "Overnemen";\ - Text[ chinese_simplified ] = "Ӧ";\ + Text[ chinese_simplified ] = "采用";\ Text[ greek ] = "";\ - Text[ korean ] = "";\ + Text[ korean ] = "적용";\ Text[ turkish ] = "Uygula";\ - Text[ catalan ] = "Aplicar";\ + Text[ catalan ] = "Aplica";\ + Text[ thai ] = "ใช้";\ }; + + + + + + + + + + + + + diff --git a/sw/source/ui/ribbar/tblctrl.src b/sw/source/ui/ribbar/tblctrl.src index d782db7160bf..280558637552 100644 --- a/sw/source/ui/ribbar/tblctrl.src +++ b/sw/source/ui/ribbar/tblctrl.src @@ -2,9 +2,9 @@ * * $RCSfile: tblctrl.src,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-08-29 07:14:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,7 +102,7 @@ FloatingWindow RID_TBL_OPT_CTRL }; Text [ english_us ] = "Optimize" ; Text [ italian ] = "Ottimizza" ; - Text [ spanish ] = "Optimar" ; + Text [ spanish ] = "Optimizar" ; Text [ french ] = "Optimiser" ; Text [ dutch ] = "Optimaliseren" ; Text [ swedish ] = "Optimera" ; @@ -124,3 +124,13 @@ FloatingWindow RID_TBL_OPT_CTRL Text[ thai ] = "ทำให้เหมาะที่สุด"; }; + + + + + + + + + + diff --git a/sw/source/ui/ribbar/tbxanchr.src b/sw/source/ui/ribbar/tbxanchr.src index 4b722aa75fd8..2ec1e6579a9a 100644 --- a/sw/source/ui/ribbar/tbxanchr.src +++ b/sw/source/ui/ribbar/tbxanchr.src @@ -2,9 +2,9 @@ * * $RCSfile: tbxanchr.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:19:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,18 +81,19 @@ Menu MN_ANCHOR_POPUP Text [ spanish ] = "Pgina" ; Text [ french ] = " la page" ; Text [ dutch ] = "Pagina" ; - Text[ chinese_simplified ] = "ҳ"; + Text[ chinese_simplified ] = "页"; Text[ russian ] = ""; Text[ polish ] = "Strona"; - Text[ japanese ] = "߰"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "ページ"; + Text[ chinese_traditional ] = "頁"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "페이지"; Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pgina"; + Text[ catalan ] = "Pgina"; Text[ finnish ] = "Sivu"; + Text[ thai ] = "หน้า"; }; MenuItem { @@ -110,18 +111,19 @@ Menu MN_ANCHOR_POPUP Text [ spanish ] = "Prrafo" ; Text [ french ] = "Paragraphe" ; Text [ dutch ] = "Alinea" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "段落"; Text[ russian ] = ""; Text[ polish ] = "Akapit"; - Text[ japanese ] = "i"; - Text[ chinese_traditional ] = "q"; + Text[ japanese ] = "段落"; + Text[ chinese_traditional ] = "段落"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ܶ"; + Text[ korean ] = "단락"; Text[ turkish ] = "Paragrafa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Prrafo"; + Text[ catalan ] = "Pargraf"; Text[ finnish ] = "Kappale"; + Text[ thai ] = "ย่อหน้า"; }; MenuItem { @@ -130,7 +132,7 @@ Menu MN_ANCHOR_POPUP Identifier = FN_TOOL_ANKER_AT_CHAR ; Text = "Am Zeichen" ; Text [ ENGLISH ] = "At character" ; - Text [ english_us ] = "At Character" ; + Text [ english_us ] = "To Character" ; Text [ portuguese_brazilian ] = "Am Zeichen" ; Text [ swedish ] = "Vid tecken" ; Text [ danish ] = "Til tegn" ; @@ -139,18 +141,19 @@ Menu MN_ANCHOR_POPUP Text [ french ] = "Au caractre" ; Text [ dutch ] = "Aan teken" ; Text [ portuguese ] = "No carcter" ; - Text[ chinese_simplified ] = "ַ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "在字符上"; + Text[ russian ] = " "; Text[ polish ] = "Przy znaku"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "brW"; + Text[ japanese ] = "文字に"; + Text[ chinese_traditional ] = "在字元上"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ڿ"; + Text[ korean ] = "문자에"; Text[ turkish ] = "Karaktere"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Al carcter"; - Text[ finnish ] = "t-merkki"; + Text[ catalan ] = "Al carcter"; + Text[ finnish ] = "Merkkiin"; + Text[ thai ] = "ที่ตัวอักขระ"; }; MenuItem { @@ -168,18 +171,19 @@ Menu MN_ANCHOR_POPUP Text [ spanish ] = "Como carcter" ; Text [ french ] = "Comme caractre" ; Text [ dutch ] = "Als teken" ; - Text[ chinese_simplified ] = "ַ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "当作字符"; + Text[ russian ] = " "; Text[ polish ] = "Jako znak"; - Text[ japanese ] = "Ƃ"; - Text[ chinese_traditional ] = "@r"; + Text[ japanese ] = "文字として"; + Text[ chinese_traditional ] = "當作字元"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "ڷ"; + Text[ korean ] = "문자로"; Text[ turkish ] = "Karakter olarak"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Como carcter"; + Text[ catalan ] = "Com a carcter"; Text[ finnish ] = "Merkkin"; + Text[ thai ] = "เป็นตัวอักขระ"; }; MenuItem { @@ -197,18 +201,19 @@ Menu MN_ANCHOR_POPUP Text [ spanish ] = "Marco" ; Text [ french ] = "Cadre" ; Text [ dutch ] = "Kader" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "框"; Text[ russian ] = ""; Text[ polish ] = "Ramka"; - Text[ japanese ] = "g"; - Text[ chinese_traditional ] = "r"; + Text[ japanese ] = "枠"; + Text[ chinese_traditional ] = "文字方塊"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "프레임"; Text[ turkish ] = "ereve"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Marco"; + Text[ catalan ] = "Marc"; Text[ finnish ] = "Kehys"; + Text[ thai ] = "กรอบ"; }; }; }; @@ -216,3 +221,13 @@ Menu MN_ANCHOR_POPUP + + + + + + + + + + diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 4972090a78d5..8e4dea4bcfa9 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: workctrl.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: os $ $Date: 2002-12-02 08:38:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -707,6 +707,7 @@ SwZoomBox_Impl::SwZoomBox_Impl( Window* pParent, USHORT nSlot, SfxBindings& rBin rBindings(rBind), bRelease(TRUE) { + EnableAutocomplete( FALSE ); USHORT aZoomValues[] = { 25, 50, 75, 100, 150, 200 }; for(USHORT i = 0; i < sizeof(aZoomValues)/sizeof(USHORT); i++) @@ -731,13 +732,14 @@ void SwZoomBox_Impl::Select() String sEntry(GetText()); sEntry.EraseAllChars( '%' ); USHORT nZoom = (USHORT)sEntry.ToInt32(); - if(nZoom > MINZOOM && nZoom < MAXZOOM) - { - SfxUInt16Item aItem( nSlotId, nZoom ); - rBindings.GetDispatcher()->Execute( - nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); - ReleaseFocus(); - } + if(nZoom < MINZOOM) + nZoom = MINZOOM; + if(nZoom > MAXZOOM) + nZoom = MAXZOOM; + SfxUInt16Item aItem( nSlotId, nZoom ); + rBindings.GetDispatcher()->Execute( + nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + ReleaseFocus(); } } /* -----------------02.12.2002 07:49----------------- diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src index 37b0a18999d8..890a11e0e901 100644 --- a/sw/source/ui/ribbar/workctrl.src +++ b/sw/source/ui/ribbar/workctrl.src @@ -2,9 +2,9 @@ * * $RCSfile: workctrl.src,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: os $ $Date: 2002-11-27 08:58:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -323,7 +323,7 @@ Menu RID_INSERT_FIELD_CTRL Text [ portuguese_brazilian ] = "Seitennummer" ; Text [ portuguese ] = "Nmero de pgina" ; Text[ chinese_simplified ] = "页码"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Numer strony"; Text[ japanese ] = "ページ番号"; Text[ chinese_traditional ] = "頁碼"; @@ -333,7 +333,7 @@ Menu RID_INSERT_FIELD_CTRL Text[ turkish ] = "Sayfa numaras"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nmeros de pgina"; - Text[ finnish ] = "Sivunumerot"; + Text[ finnish ] = "Sivunumero"; Text[ thai ] = "เลขหน้า"; }; MenuItem @@ -342,7 +342,7 @@ Menu RID_INSERT_FIELD_CTRL HelpID = FN_INSERT_FLD_PGCOUNT ; Text = "Seitenanzahl" ; Text [ English ] = "Pagecount" ; - Text [ dutch ] = "Aantal paginas" ; + Text [ dutch ] = "Aantal pagina's" ; Text [ english_us ] = "Page Count" ; Text [ italian ] = "Numero di pagine" ; Text [ spanish ] = "Contar pginas" ; @@ -373,7 +373,7 @@ Menu RID_INSERT_FIELD_CTRL Text [ English ] = "Topic" ; Text [ english_us ] = "Subject" ; Text [ italian ] = "Argomento" ; - Text [ spanish ] = "Tema" ; + Text [ spanish ] = "Asunto" ; Text [ french ] = "Sujet" ; Text [ dutch ] = "Onderwerp" ; Text [ swedish ] = "mne" ; @@ -410,7 +410,7 @@ Menu RID_INSERT_FIELD_CTRL Text [ portuguese_brazilian ] = "Titel" ; Text [ portuguese ] = "Ttulo" ; Text[ chinese_simplified ] = "标题"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Tytu"; Text[ japanese ] = "タイトル"; Text[ chinese_traditional ] = "標題"; @@ -450,7 +450,7 @@ Menu RID_INSERT_FIELD_CTRL Text[ turkish ] = "Yazan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Autor"; - Text[ finnish ] = "Laatija"; + Text[ finnish ] = "Tekij"; Text[ thai ] = "ผู้เขียน"; }; MenuItem @@ -566,7 +566,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ chinese_traditional ] = "表格"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -587,7 +587,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Tekstkader" ; Text [ portuguese ] = "Moldura de texto" ; Text[ chinese_simplified ] = "文本框"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Ramka tekstu"; Text[ japanese ] = "テキスト枠"; Text[ chinese_traditional ] = "文字方塊"; @@ -624,7 +624,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Pgina"; - Text[ finnish ] = "Sivu "; + Text[ finnish ] = "Sivu"; Text[ thai ] = "หน้า"; }; String ST_DRW @@ -641,12 +641,12 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Tekenobject" ; Text [ portuguese ] = "Desenho" ; Text[ chinese_simplified ] = "绘图对象"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Obiekt graficzny"; Text[ japanese ] = "図形描画オブジェクト"; Text[ english_us ] = "Drawing"; Text[ portuguese ] = "Desenho"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ dutch ] = "Tekenobject"; Text[ french ] = "Objet de dessin"; Text[ spanish ] = "Objeto de dibujo"; @@ -691,7 +691,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ turkish ] = "Komut alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Control"; - Text[ finnish ] = "Ohjain"; + Text[ finnish ] = "Ohjausobjekti"; Text[ thai ] = "ควบคุม"; }; String ST_REG @@ -703,22 +703,22 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ swedish ] = "Omrde" ; Text [ danish ] = "Omrde" ; Text [ italian ] = "Sezione" ; - Text [ spanish ] = "rea" ; + Text [ spanish ] = "Seccin" ; Text [ french ] = "Section" ; Text [ dutch ] = "Bereik" ; Text [ portuguese ] = "Seco" ; Text[ chinese_simplified ] = "区域"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Sekcja"; Text[ japanese ] = "範囲"; Text[ chinese_traditional ] = "區域"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "영역"; + Text[ korean ] = "구역"; Text[ turkish ] = "Blm"; Text[ language_user1 ] = " "; Text[ catalan ] = "Secci"; - Text[ finnish ] = "Osio"; + Text[ finnish ] = "Osa"; Text[ thai ] = "ส่วน"; }; String ST_BKM @@ -735,7 +735,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Tekstmarkering" ; Text [ portuguese ] = "Marcador de texto" ; Text[ chinese_simplified ] = "书签"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Zakadka"; Text[ japanese ] = "テキストマーク"; Text[ chinese_traditional ] = "內文標籤"; @@ -745,7 +745,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ turkish ] = "Metin iareti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Adrea d'inters"; - Text[ finnish ] = "Kirjanmerkit"; + Text[ finnish ] = "Kirjanmerkki"; Text[ thai ] = "ที่คั่น"; }; String ST_GRF @@ -762,17 +762,17 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Afbeelding" ; Text [ portuguese ] = "Imagem" ; Text[ chinese_simplified ] = "图形"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Grafika"; Text[ japanese ] = "図"; Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Grfics"; - Text[ finnish ] = "Kuvat"; + Text[ finnish ] = "Grafiikka"; Text[ thai ] = "กราฟิค"; }; String ST_OLE @@ -789,7 +789,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "OLE-object" ; Text [ portuguese ] = "Objecto OLE" ; Text[ chinese_simplified ] = "OLE 对象"; - Text[ russian ] = " OLE"; + Text[ russian ] = "OLE "; Text[ polish ] = "Obiekt OLE"; Text[ japanese ] = "OLE オブジェクト"; Text[ chinese_traditional ] = "OLE - 物件"; @@ -817,7 +817,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Kop" ; Text [ portuguese ] = "Ttulo" ; Text[ chinese_simplified ] = "标题"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Tytu"; Text[ japanese ] = "見出し"; Text[ chinese_traditional ] = "標題"; @@ -872,7 +872,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Voetnoot" ; Text [ portuguese ] = "Nota de rodap" ; Text[ chinese_simplified ] = "注脚"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Przypis dolny"; Text[ japanese ] = "脚注"; Text[ chinese_traditional ] = "註腳"; @@ -899,13 +899,13 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Merktekens" ; Text [ portuguese ] = "Marca" ; Text[ chinese_simplified ] = "标记"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Znacznik"; Text[ japanese ] = "覚え止め"; Text[ chinese_traditional ] = "提醒"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "표시자"; + Text[ korean ] = "미리 알림"; Text[ turkish ] = "Anmsatc"; Text[ language_user1 ] = " "; Text[ catalan ] = "Recordatori"; @@ -936,7 +936,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ turkish ] = "Not"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nota"; - Text[ finnish ] = "Huomautus:"; + Text[ finnish ] = "Huomautus"; Text[ thai ] = "บันทึกย่อ"; }; String ST_SRCH_REP @@ -953,13 +953,13 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Zoeken herhalen" ; Text [ portuguese ] = "Repetir procura" ; Text[ chinese_simplified ] = "重复搜寻"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Powtrz wyszukiwanie"; Text[ japanese ] = "再検索"; Text[ chinese_traditional ] = "重複搜尋"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "찾기 반복"; + Text[ korean ] = "다시 검색"; Text[ turkish ] = "Aramay yinele"; Text[ language_user1 ] = " "; Text[ catalan ] = "Repeteix la cerca"; @@ -1207,7 +1207,7 @@ String STR_IMGBTN_DRW_DOWN Text [ dutch ] = "Volgend tekenobject" ; Text [ portuguese ] = "Objecto de desenho seguinte" ; Text[ chinese_simplified ] = "下一个绘图对象"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nastpny obiekt graficzny"; Text[ japanese ] = "次の文字オブジェクト"; Text[ chinese_traditional ] = "下一個繪圖物件"; @@ -1245,7 +1245,7 @@ String STR_IMGBTN_CTRL_DOWN Text[ turkish ] = "Sonraki komut alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Control segent"; - Text[ finnish ] = "Seuraava ohjain"; + Text[ finnish ] = "Seuraava ohjausobjekti"; Text[ thai ] = "ตัวควบคุมถัดไป"; }; String STR_IMGBTN_REG_DOWN @@ -1258,22 +1258,22 @@ String STR_IMGBTN_REG_DOWN Text [ swedish ] = "Nsta omrde" ; Text [ danish ] = "Nste omrde" ; Text [ italian ] = "Area successiva" ; - Text [ spanish ] = "rea siguiente" ; + Text [ spanish ] = "Seccin siguiente" ; Text [ french ] = "Section suivante" ; Text [ dutch ] = "Volgend bereik" ; Text [ portuguese ] = "Seco seguinte" ; Text[ chinese_simplified ] = "下一个区域"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nastpna sekcja"; Text[ japanese ] = "次の範囲"; Text[ chinese_traditional ] = "下一個區域"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "다음 영역"; + Text[ korean ] = "다음 구역"; Text[ turkish ] = "Sonraki blm"; Text[ language_user1 ] = " "; Text[ catalan ] = "Secci segent"; - Text[ finnish ] = "Seuraava osio"; + Text[ finnish ] = "Seuraava osa"; Text[ thai ] = "ส่วนถัดไป"; }; String STR_IMGBTN_BKM_DOWN @@ -1291,7 +1291,7 @@ String STR_IMGBTN_BKM_DOWN Text [ dutch ] = "Volgende tekstmarkering" ; Text [ portuguese ] = "Marcador de texto seguinte" ; Text[ chinese_simplified ] = "下一个书签"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nastpna zakadka"; Text[ japanese ] = "次のテキストマーク"; Text[ chinese_traditional ] = "下一個書籤"; @@ -1319,7 +1319,7 @@ String STR_IMGBTN_GRF_DOWN Text [ dutch ] = "Volgende afbeelding" ; Text [ portuguese ] = "Imagem seguinte" ; Text[ chinese_simplified ] = "下一个图形"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nastpna grafika"; Text[ japanese ] = "次の図"; Text[ chinese_traditional ] = "下一個圖形"; @@ -1348,7 +1348,7 @@ String STR_IMGBTN_OLE_DOWN Text [ dutch ] = "Volgend OLE-object" ; Text [ portuguese ] = "Objecto OLE seguinte" ; Text[ chinese_simplified ] = "下一个 OLE-对象"; - Text[ russian ] = " OLE"; + Text[ russian ] = " OLE "; Text[ polish ] = "Nastpny obiekt OLE"; Text[ japanese ] = "次の OLE オブジェクト"; Text[ chinese_traditional ] = "下一個 OLE-物件"; @@ -1401,7 +1401,7 @@ String STR_IMGBTN_SEL_DOWN Text [ italian ] = "Selezione successiva" ; Text [ spanish ] = "Seleccin siguiente" ; Text [ french ] = "Slection suivante" ; - Text [ dutch ] = "Volgende markering" ; + Text [ dutch ] = "Volgend merkteken" ; Text [ portuguese ] = "Seleco seguinte" ; Text[ chinese_simplified ] = "下一个选择"; Text[ russian ] = " "; @@ -1460,13 +1460,13 @@ String STR_IMGBTN_MARK_DOWN Text [ dutch ] = "Volgend merkteken" ; Text [ portuguese ] = "Marca seguinte" ; Text[ chinese_simplified ] = "下一个标记"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nastpny znacznik"; Text[ japanese ] = "次の覚え止め"; Text[ chinese_traditional ] = "下一個提醒"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "다음 표시자"; + Text[ korean ] = "다음 미리 알림"; Text[ turkish ] = "Sonraki anmsatc"; Text[ language_user1 ] = " "; Text[ catalan ] = "Recordatori segent"; @@ -1538,7 +1538,7 @@ String STR_IMGBTN_INDEX_ENTRY_DOWN Text[ danish ] = "Nste indekselement"; Text[ french ] = "Entre d'index suivante"; Text[ swedish ] = "Nsta frteckningspost"; - Text[ dutch ] = "Volgend index item"; + Text[ dutch ] = "Volgend indexitem"; Text[ spanish ] = "Entrada de ndice siguiente"; Text[ english_us ] = "Next index entry"; Text[ chinese_simplified ] = "下一个目录条目"; @@ -1583,7 +1583,7 @@ String STR_IMGBTN_TBL_UP Text[ chinese_traditional ] = "上一個表格"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "이전 시트"; + Text[ korean ] = "이전 표"; Text[ turkish ] = "nceki tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula anterior"; @@ -1658,7 +1658,7 @@ String STR_IMGBTN_DRW_UP Text [ dutch ] = "Vorig tekenobject" ; Text [ portuguese ] = "Objecto de desenho anterior" ; Text[ chinese_simplified ] = "上一个绘图对象"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Poprzedni obiekt graficzny"; Text[ japanese ] = "前の文字オブジェクト"; Text[ chinese_traditional ] = "上一個繪圖物件"; @@ -1681,7 +1681,7 @@ String STR_IMGBTN_CTRL_UP Text [ danish ] = "Forrige kontrolelement" ; Text [ italian ] = "Campo di controllo precedente" ; Text [ spanish ] = "Campo de control anterior" ; - Text [ french ] = "Elment de contrle prcdent" ; + Text [ french ] = "lment de contrle prcdent" ; Text [ dutch ] = "Vorig controleveld" ; Text [ portuguese ] = "Controlo anterior" ; Text[ chinese_simplified ] = "上一个控制"; @@ -1695,7 +1695,7 @@ String STR_IMGBTN_CTRL_UP Text[ turkish ] = "nceki komut alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Control anterior"; - Text[ finnish ] = "Edellinen ohjain"; + Text[ finnish ] = "Edellinen ohjausobjekti"; Text[ thai ] = "ตัวควบคุมอันก่อน"; }; String STR_IMGBTN_REG_UP @@ -1707,22 +1707,22 @@ String STR_IMGBTN_REG_UP Text [ swedish ] = "Fregende omrde" ; Text [ danish ] = "Forrige omrde" ; Text [ italian ] = "Area precedente" ; - Text [ spanish ] = "rea anterior" ; + Text [ spanish ] = "Seccin anterior" ; Text [ french ] = "Section prcdente" ; Text [ dutch ] = "Vorig bereik" ; Text [ portuguese ] = "Seco anterior" ; Text[ chinese_simplified ] = "上一个区域"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Poprzednia sekcja"; Text[ japanese ] = "前の範囲"; Text[ chinese_traditional ] = "上一個區域"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "이전 영역"; + Text[ korean ] = "이전 구역"; Text[ turkish ] = "nceki Blm"; Text[ language_user1 ] = " "; Text[ catalan ] = "Secci anterior"; - Text[ finnish ] = "Edellinen osio"; + Text[ finnish ] = "Edellinen osa"; Text[ thai ] = "ส่วนก่อน"; }; String STR_IMGBTN_BKM_UP @@ -1739,7 +1739,7 @@ String STR_IMGBTN_BKM_UP Text [ dutch ] = "Vorige tekstmarkering" ; Text [ portuguese ] = "Marcador de texto anterior" ; Text[ chinese_simplified ] = "上一个书签"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Poprzednia zakadka"; Text[ japanese ] = "前のテキストマーク"; Text[ chinese_traditional ] = "上一個書籤"; @@ -1766,7 +1766,7 @@ String STR_IMGBTN_GRF_UP Text [ dutch ] = "Vorige afbeelding" ; Text [ portuguese ] = "Imagem anterior" ; Text[ chinese_simplified ] = "上一个图形"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Poprzednia grafika"; Text[ japanese ] = "前の図"; Text[ chinese_traditional ] = "上一個圖形"; @@ -1794,7 +1794,7 @@ String STR_IMGBTN_OLE_UP Text [ dutch ] = "Vorig OLE-object" ; Text [ portuguese ] = "Objecto OLE anterior" ; Text[ chinese_simplified ] = "上一个 OLE-对象"; - Text[ russian ] = " OLE"; + Text[ russian ] = " OLE "; Text[ polish ] = "Poprzedni obiekt OLE"; Text[ japanese ] = "前の OLE オブジェクト"; Text[ chinese_traditional ] = "上一個 OLE-物件"; @@ -1846,7 +1846,7 @@ String STR_IMGBTN_SEL_UP Text [ italian ] = "Selezione precedente" ; Text [ spanish ] = "Seleccin anterior" ; Text [ french ] = "Slection prcdente" ; - Text [ dutch ] = "Vorige markering" ; + Text [ dutch ] = "Vorig merkteken" ; Text [ portuguese ] = "Seleco anterior" ; Text[ chinese_simplified ] = "上一个选择"; Text[ russian ] = " "; @@ -1904,13 +1904,13 @@ String STR_IMGBTN_MARK_UP Text [ dutch ] = "Vorig merkteken" ; Text [ portuguese ] = "Marca anterior" ; Text[ chinese_simplified ] = "上一个标记"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Poprzedni znacznik"; Text[ japanese ] = "前の覚え止め"; Text[ chinese_traditional ] = "上一個提醒"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "이전 표시자"; + Text[ korean ] = "이전 미리 알림"; Text[ turkish ] = "nceki anmsatc"; Text[ language_user1 ] = " "; Text[ catalan ] = "Recordatori anterior"; @@ -1964,7 +1964,7 @@ String STR_IMGBTN_SRCH_REP_UP Text[ chinese_traditional ] = "繼續向後搜尋"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "계속 뒤로 검색"; + Text[ korean ] = "뒤로 계속 검색"; Text[ turkish ] = "Geriye doru ara"; Text[ language_user1 ] = " "; Text[ catalan ] = "Continua la cerca cap enrere"; @@ -1981,7 +1981,7 @@ String STR_IMGBTN_INDEX_ENTRY_UP Text[ danish ] = "Forrige indekselement"; Text[ french ] = "Entre d'index prcdente"; Text[ swedish ] = "Fregende frteckningspost"; - Text[ dutch ] = "Vorig index item"; + Text[ dutch ] = "Vorig indexitem"; Text[ spanish ] = "Entrada de ndice anterior"; Text[ english_us ] = "Previous index entry"; Text[ chinese_simplified ] = "上一个目录条目"; @@ -2058,7 +2058,7 @@ String STR_IMGBTN_TBLFML_ERR_UP Text [ English ] = "Previous wrong table formula" ; Text[ english_us ] = "Previous faulty table formula"; Text[ portuguese ] = "Frmula de tabela anterior errada"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ dutch ] = "Vorige foutieve tabellenformule"; Text[ french ] = "Formule de table errone prcdente"; Text[ spanish ] = "Frmula de tabla anterior errnea"; @@ -2072,7 +2072,7 @@ String STR_IMGBTN_TBLFML_ERR_UP Text[ chinese_traditional ] = "上一個錯誤的工作表公式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "틀린 이전 표 수식"; + Text[ korean ] = "잘못된 이전 표 수식"; Text[ turkish ] = "nceki hatal tablo forml"; Text[ language_user1 ] = " "; Text[ catalan ] = "Frmula de taula defectuosa anterior"; @@ -2085,7 +2085,7 @@ String STR_IMGBTN_TBLFML_ERR_DOWN Text [ English ] = "Next wrong table formula" ; Text[ english_us ] = "Next faulty table formula"; Text[ portuguese ] = "Frmula de tabela seguinte errada"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ dutch ] = "Volgende foutieve tabellenformule"; Text[ french ] = "Formule de table errone suivante"; Text[ spanish ] = "Siguiente frmula errnea de tabla"; @@ -2099,7 +2099,7 @@ String STR_IMGBTN_TBLFML_ERR_DOWN Text[ chinese_traditional ] = "下一個錯誤的工作表公式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "틀린 다음 표 수식"; + Text[ korean ] = "잘못된 다음 표 수식"; Text[ turkish ] = "Sonraki hatal tablo forml"; Text[ language_user1 ] = " "; Text[ catalan ] = "Frmula de taula defectuosa segent"; @@ -2142,7 +2142,7 @@ ImageButton BTN_NAVI Text[ chinese_traditional ] = "瀏覽"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "네비게이션"; + Text[ korean ] = "탐색"; Text[ turkish ] = "Dolama"; Text[ language_user1 ] = " "; Text[ catalan ] = "Navegaci"; @@ -2161,3 +2161,8 @@ ComboBox RID_PVIEW_ZOOM_LB Hide = TRUE ; }; + + + + + diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index c39f8c84ac0d..407cf8d8a361 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basesh.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: os $ $Date: 2002-12-12 16:37:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -479,7 +479,12 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if ( nId == SID_CUT ) pTransfer->Cut(); else + { + const BOOL bLockedView = rSh.IsViewLocked(); + rSh.LockView( TRUE ); //lock visible section pTransfer->Copy(); + rSh.LockView( bLockedView ); + } break; } return; @@ -568,6 +573,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) DBG_ERROR("falscher Dispatcher"); return; } + rReq.Done(); } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 02a3b673c5aa..fe3f03eb4347 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwbassh.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fme $ $Date: 2002-12-06 09:45:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -683,7 +683,17 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) rSet.DisableItem( nWhich ); else { - rSet.Put(SfxAllEnumItem(nWhich, USHRT_MAX)); + SfxAllEnumItem aEnumItem(nWhich, USHRT_MAX); + const SdrMarkList& rMarkList = pSdrView->GetMarkList(); + //if only one object is selected it can only be vertically + // aligned because it is character bound + if( rMarkList.GetMarkCount() == 1 ) + { + aEnumItem.DisableValue(SID_OBJECT_ALIGN_LEFT); + aEnumItem.DisableValue(SID_OBJECT_ALIGN_CENTER); + aEnumItem.DisableValue(SID_OBJECT_ALIGN_RIGHT); + } + rSet.Put(aEnumItem); } break; case FN_NAME_GROUP : diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 496c6c6c3045..3af24cef05b3 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwtxtex.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: os $ $Date: 2002-12-12 17:13:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,6 +195,9 @@ #ifndef _SVTOOLS_CJKOPTIONS_HXX #include <svtools/cjkoptions.hxx> #endif +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #ifndef _DOC_HXX #include <doc.hxx> #endif @@ -666,43 +669,59 @@ ASK_ESCAPE: case SID_TEXTDIRECTION_LEFT_TO_RIGHT: case SID_TEXTDIRECTION_TOP_TO_BOTTOM: - if( pOutliner ) - bFlag = pOutliner->IsVertical() == - (SID_TEXTDIRECTION_TOP_TO_BOTTOM == nSlotId); + if ( !SvtLanguageOptions().IsVerticalTextEnabled() ) + { + rSet.DisableItem( nSlotId ); + nSlotId = 0; + } else { - com::sun::star::text::WritingMode eMode = (com::sun::star::text::WritingMode) - ( (const SvxWritingModeItem&) aEditAttr.Get( SDRATTR_TEXTDIRECTION ) ).GetValue(); - - if( nSlotId == SID_TEXTDIRECTION_LEFT_TO_RIGHT ) - { - bFlag = eMode == com::sun::star::text::WritingMode_LR_TB; - } + if( pOutliner ) + bFlag = pOutliner->IsVertical() == + (SID_TEXTDIRECTION_TOP_TO_BOTTOM == nSlotId); else { - bFlag = eMode != com::sun::star::text::WritingMode_TB_RL; + com::sun::star::text::WritingMode eMode = (com::sun::star::text::WritingMode) + ( (const SvxWritingModeItem&) aEditAttr.Get( SDRATTR_TEXTDIRECTION ) ).GetValue(); + + if( nSlotId == SID_TEXTDIRECTION_LEFT_TO_RIGHT ) + { + bFlag = eMode == com::sun::star::text::WritingMode_LR_TB; + } + else + { + bFlag = eMode != com::sun::star::text::WritingMode_TB_RL; + } } } break; case SID_ATTR_PARA_LEFT_TO_RIGHT: case SID_ATTR_PARA_RIGHT_TO_LEFT: { - if(pOutliner && pOutliner->IsVertical()) + if ( !SvtLanguageOptions().IsCTLFontEnabled() ) { rSet.DisableItem( nWhich ); nSlotId = 0; } else { - switch( ( ( (SvxFrameDirectionItem&) aEditAttr.Get( EE_PARA_WRITINGDIR ) ) ).GetValue() ) + if(pOutliner && pOutliner->IsVertical()) + { + rSet.DisableItem( nWhich ); + nSlotId = 0; + } + else { - case FRMDIR_HORI_LEFT_TOP: - bFlag = nWhich == SID_ATTR_PARA_LEFT_TO_RIGHT; - break; + switch( ( ( (SvxFrameDirectionItem&) aEditAttr.Get( EE_PARA_WRITINGDIR ) ) ).GetValue() ) + { + case FRMDIR_HORI_LEFT_TOP: + bFlag = nWhich == SID_ATTR_PARA_LEFT_TO_RIGHT; + break; - case FRMDIR_HORI_RIGHT_TOP: - bFlag = nWhich != SID_ATTR_PARA_LEFT_TO_RIGHT; - break; + case FRMDIR_HORI_RIGHT_TOP: + bFlag = nWhich != SID_ATTR_PARA_LEFT_TO_RIGHT; + break; + } } } } diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 6007393708ee..3249ae159bca 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmsh.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hbrinkm $ $Date: 2002-08-30 08:57:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -867,12 +867,17 @@ SwFrameShell::SwFrameShell(SwView &rView) : { SetName(String::CreateFromAscii("Frame")); SetHelpId(SW_FRAMESHELL); - SwTransferable::CreateSelection( rView.GetWrtShell() ); + + /* #96392# Use this to announce it is the frame shell who creates the + selection. */ + SwTransferable::CreateSelection( rView.GetWrtShell(), (ViewShell *) this ); } SwFrameShell::~SwFrameShell() { - SwTransferable::ClearSelection( GetShell() ); + /* #96392# Only clear the selection if it was this frame shell who created + it. */ + SwTransferable::ClearSelection( GetShell(), (ViewShell *) this ); } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index 56c92eaf2afc..19ba59fad4e7 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -2,9 +2,9 @@ * * $RCSfile: shells.src,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: os $ $Date: 2002-12-06 14:00:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ InfoBox MSG_NO_RULER Message [ french ] = "Il n'existe pas d'image pour le thme 'Rulers' dans la Gallery." ; Message [ dutch ] = "Onder het gallery-onderwerp 'Rulers' komen geen afbeeldingen voor." ; Message[ chinese_simplified ] = "在画廊主题'长条形'内无任何图形。"; - Message[ russian ] = " '' ."; + Message[ russian ] = " ' ' ."; Message[ polish ] = "Nie ma adnych grafik w temacie galerii \"Obramowania\""; Message[ japanese ] = "ギャラリテーマの「ルーラー」に、図はありません。"; Message[ chinese_traditional ] = "畫廊主題[長條形]內無任何圖形。"; @@ -87,7 +87,7 @@ InfoBox MSG_NO_RULER Message[ dutch ] = "Onder het gallery-onderwerp 'Rulers' komen geen afbeeldingen voor."; Message[ chinese_simplified ] = "在画廊主题'长条形'内无任何图形。"; Message[ greek ] = " 'Rulers'."; - Message[ korean ] = "갤러리- 주제 '눈금자'에 그래픽이 없습니다."; + Message[ korean ] = "갤러리 주제 '눈금자'에 그림이 없습니다."; Message[ turkish ] = "'Rulers' galeri konusunda bit elem grafik mevcut deil."; Message[ language_user1 ] = " "; Message[ catalan ] = "No hi ha cap mapa de bits en la galeria de temes 'Rulers'."; @@ -104,7 +104,7 @@ String STR_GRFILTER_OPENERROR Text [ portuguese ] = "Impossvel abrir ficheiro grfico." ; Text [ finnish ] = "Grafiikkatiedostoa ei voi avata." ; Text [ danish ] = "Det er ikke muligt at bne grafikfilen" ; - Text [ french ] = "Ouverture du fichier graphique impossible" ; + Text [ french ] = "Impossible d'ouvrir le fichier graphique !" ; Text [ swedish ] = "Grafikfil kan inte ppnas" ; Text [ dutch ] = "Grafisch bestand kan niet worden geopend" ; Text [ spanish ] = "No es posible abrir el archivo grfico" ; @@ -118,7 +118,7 @@ String STR_GRFILTER_OPENERROR Text[ dutch ] = "Grafisch bestand kan niet worden geopend"; Text[ chinese_simplified ] = "无法打开图形文件"; Text[ greek ] = " "; - Text[ korean ] = "그래픽 파일을 열 수 없습니다."; + Text[ korean ] = "그림 파일을 열 수 없습니다."; Text[ turkish ] = "Grafik dosyas alamyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot obrir el fitxer de grfics"; @@ -134,7 +134,7 @@ String STR_GRFILTER_IOERROR Text [ portuguese ] = "Impossvel ler o ficheiro grfico." ; Text [ finnish ] = "Grafiikkatiedostoa ei voi lukea." ; Text [ danish ] = "Det er ikke muligt at lse grafikfilen" ; - Text [ french ] = "Lecture du fichier graphique impossible" ; + Text [ french ] = "Impossible de lire le fichier graphique !" ; Text [ swedish ] = "Grafikfil kan inte lsas" ; Text [ dutch ] = "Grafisch bestand is onleesbaar" ; Text [ spanish ] = "No es posible leer el archivo grfico" ; @@ -148,7 +148,7 @@ String STR_GRFILTER_IOERROR Text[ dutch ] = "Grafisch bestand is onleesbaar"; Text[ chinese_simplified ] = "无法读取图形文件"; Text[ greek ] = " "; - Text[ korean ] = "그래픽 파일을 읽을 수 없습니다."; + Text[ korean ] = "그림 파일을 읽을 수 없습니다."; Text[ turkish ] = "Grafik dosyas okunamyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot llegir el fitxer de grfics"; @@ -178,7 +178,7 @@ String STR_GRFILTER_FORMATERROR Text[ dutch ] = "Onbekende grafische-bestandsindeling"; Text[ chinese_simplified ] = "不明的图形格式"; Text[ greek ] = " "; - Text[ korean ] = "알려져 있지 않은 그래픽 서식"; + Text[ korean ] = "알 수 없는 그림 서식"; Text[ turkish ] = "Bilinmeyen grafik format"; Text[ language_user1 ] = " "; Text[ catalan ] = "Format d'imatge desconegut"; @@ -298,7 +298,7 @@ String STR_INSERT_GRAPHIC Text[ dutch ] = "Afbeelding invoegen"; Text[ chinese_simplified ] = "插入图形"; Text[ greek ] = " "; - Text[ korean ] = "그래픽 삽입"; + Text[ korean ] = "그림 삽입"; Text[ turkish ] = "Grafik ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix un grfic"; @@ -430,7 +430,7 @@ String STR_REDLINE_DELETED Text [ swedish ] = "Radering" ; Text [ danish ] = "Sletning" ; Text [ italian ] = "Elimina" ; - Text [ spanish ] = "Eliminacin" ; + Text [ spanish ] = "Borrar" ; Text [ french ] = "Suppression" ; Text [ dutch ] = "Gewist" ; Text [ portuguese ] = "Eliminado" ; @@ -461,7 +461,7 @@ String STR_REDLINE_AUTOFMT TEXT[ french ] = "AutoFormat"; TEXT[ swedish ] = "Autoformat"; TEXT[ dutch ] = "AutoOpmaak"; - TEXT[ spanish ] = "AutoFormato"; + TEXT[ spanish ] = "Formateado automtico"; TEXT[ english_us ] = "AutoFormat"; TEXT[ chinese_simplified ] = "自动格式"; TEXT[ russian ] = ""; @@ -489,7 +489,7 @@ String STR_REDLINE_FORMATED Text [ danish ] = "Formateret" ; Text [ italian ] = "Attribuzione" ; Text [ spanish ] = "Formateado" ; - Text [ french ] = "Mise en forme" ; + Text [ french ] = "Formatage" ; Text [ dutch ] = "Opmaak" ; Text [ portuguese ] = "Formatado" ; Text[ chinese_simplified ] = "属性"; @@ -522,7 +522,7 @@ String STR_REDLINE_TABLECHG Text [ dutch ] = "Tabelwijziging" ; Text [ portuguese ] = "Tabela modificada" ; Text[ chinese_simplified ] = "修改表格"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zmiany w tabelach"; Text[ japanese ] = "テーブルの変更"; Text[ chinese_traditional ] = "修改表格"; @@ -530,7 +530,7 @@ String STR_REDLINE_TABLECHG Text[ dutch ] = "Tabelwijziging"; Text[ chinese_simplified ] = "修改表格"; Text[ greek ] = " "; - Text[ korean ] = "표가 변경되었습니다."; + Text[ korean ] = "표 변경 사항"; Text[ turkish ] = "Tablo deiiklii"; Text[ language_user1 ] = " "; Text[ catalan ] = "Canvis a la taula"; @@ -577,7 +577,7 @@ String STR_REDLINE_TITLE Text[ french ] = "AutoFormat"; Text[ swedish ] = "Autoformat"; Text[ dutch ] = "AutoOpmaak"; - Text[ spanish ] = "AutoFormato"; + Text[ spanish ] = "Formateado automtico"; Text[ english_us ] = "AutoFormat"; Text[ chinese_simplified ] = "自动格式"; Text[ russian ] = ""; @@ -606,7 +606,7 @@ String STR_REDLINE_MSG Text[ french ] = "L'AutoFormat a termin.\nVous pouvez choisir d'en accepter ou rejeter en une seule fois toutes les modifications, ou\n de vous faire afficher toutes les modifications pour les revoir."; Text[ swedish ] = "Autoformatet r frdigt.\nDu kan acceptera eller avbja alla ndringar\neller acceptera eller avbja ndringar en och en."; Text[ dutch ] = "AutoOpmaak voltooid.\nU kunt nu alle wijzigingen accepteren of verwerpen,\nof afzonderlijke wijzigingen accepteren of verwerpen."; - Text[ spanish ] = "El AutoFormato ha concluido.\nAhora puede aceptar o rechazar todos los cambios\na la vez o uno por uno."; + Text[ spanish ] = "El Formateado automtico ha concluido.\nAhora puede aceptar o rechazar todas las modificaciones,\na la vez o una por una."; Text[ english_us ] = "AutoFormat completed.\nYou can accept or reject all changes,\nor accept or reject particular changes."; Text[ chinese_simplified ] = "已经完成自动格式。\n您现在能够接受或拒绝所有的更改，或者\n接受或拒绝单个更改。"; Text[ russian ] = " .\n , ."; @@ -646,7 +646,7 @@ String STR_REDLINE_ACCEPT_ALL Text[ dutch ] = "~Alles accepteren"; Text[ chinese_simplified ] = "全部接受"; Text[ greek ] = " "; - Text[ korean ] = "모두 적용"; + Text[ korean ] = "모두 동의"; Text[ turkish ] = "Tmn kabul et"; Text[ language_user1 ] = " "; Text[ catalan ] = "Accepta-ho tot"; @@ -675,7 +675,7 @@ String STR_REDLINE_REJECT_ALL Text[ dutch ] = "~Alles verwerpen"; Text[ chinese_simplified ] = "全部拒绝"; Text[ greek ] = " "; - Text[ korean ] = "모두 취소"; + Text[ korean ] = "모두 거부"; Text[ turkish ] = "Tmn reddet"; Text[ language_user1 ] = " "; Text[ catalan ] = "Rebutja'ls tots"; @@ -690,7 +690,7 @@ String STR_REDLINE_EDIT Text[ portuguese_brazilian ] = "Review ~Changes"; Text[ portuguese ] = "Editar ~modificaes"; Text[ danish ] = "Rediger ndringer"; - Text[ french ] = "~Revoir les modifications"; + Text[ french ] = "~diter les modifications"; Text[ swedish ] = "Redigera ~ndringar"; Text[ dutch ] = "Wijzigingen ~bewerken"; Text[ spanish ] = "Editar ~modificaciones"; @@ -735,7 +735,7 @@ QueryBox DLG_IMPORT_DBNAME Message[ dutch ] = "Moet de databasenaam als standaarddatabase voor het document worden overgenomen?"; Message[ chinese_simplified ] = "要让文件采用默认的数据库名称？"; Message[ greek ] = " ;"; - Message[ korean ] = "데이터베이스 이름을 문서의 기본 데이터베이스로 사용하겠습니까?"; + Message[ korean ] = "데이터베이스 이름을 문서의 기본 데이터베이스로 사용하시겠습니까?"; Message[ turkish ] = "Veritaban ad, belge iin standart veritaban olarak kullanlsn m?"; Message[ language_user1 ] = " "; Message[ catalan ] = "Voleu utilitzar el nom de la base de dades com a base de dades per defecte per al document?"; @@ -829,6 +829,30 @@ ToolBox RID_TEXT_TOOLBOX MN_TEXT_BACKGROUND MN_TEXT_DIALOGS(TRUE) }; + ItemList[arabic] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT1_BLOCK + MN_TEXT_RTL_LTR + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; + ItemList[hebrew] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT1_BLOCK + MN_TEXT_RTL_LTR + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; Scroll = TRUE ; }; String RID_TABLE_TOOLBOX @@ -1124,7 +1148,7 @@ String RID_GRAFIK_TOOLBOX Text[ dutch ] = "Objectbalk afbeeldingen"; Text[ chinese_simplified ] = "图形对象栏"; Text[ greek ] = " "; - Text[ korean ] = "그래픽 개체 모음"; + Text[ korean ] = "그림 개체 모음"; Text[ turkish ] = "Grafik nesne ubuu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'objectes grfics"; @@ -1740,26 +1764,26 @@ String RID_DRAW_TEXT_TOOLBOX { Text = "Textobjektleiste/Grafik" ; Text [ norwegian ] = "Tegne tekstmodus" ; - Text [ italian ] = "Barra degli oggetti di testo" ; + Text [ italian ] = "Barra degli oggetti di testo/immagini" ; Text [ portuguese_brazilian ] = "Modo desenhar texto" ; Text [ portuguese ] = "Barra de objectos de texto" ; Text [ finnish ] = "Tekstin muotoilurivi" ; Text [ danish ] = "Tekstobjektlinje" ; - Text [ french ] = "Barre d'objets de texte" ; - Text [ swedish ] = "Textobjektlist" ; + Text [ french ] = "Barre d'objets de texte/Image" ; + Text [ swedish ] = "Textobjektlist/grafik" ; Text [ dutch ] = "Tekstobjectbalk" ; - Text [ spanish ] = "Barra de objetos de texto" ; + Text [ spanish ] = "Barra de objetos de texto/imgenes" ; Text [ english_us ] = "Text Object Bar/Graphics" ; - Text[ chinese_simplified ] = "文字对象栏"; + Text[ chinese_simplified ] = "文字对象栏/图形"; Text[ russian ] = " "; Text[ polish ] = "Pasek obiektw tekstowych"; - Text[ japanese ] = "テキストオブジェクトバー"; - Text[ chinese_traditional ] = "文字物件列"; + Text[ japanese ] = "テキストオブジェクトバー/図"; + Text[ chinese_traditional ] = "文字物件列/圖形"; Text[ arabic ] = " "; Text[ dutch ] = "Tekstobjectbalk"; - Text[ chinese_simplified ] = "文字对象栏"; + Text[ chinese_simplified ] = "文字对象栏/图形"; Text[ greek ] = " "; - Text[ korean ] = "텍스트 개체 모음"; + Text[ korean ] = "텍스트 개체 모음/그림"; Text[ turkish ] = "Metin nesne ubuu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'objectes de text"; @@ -1813,6 +1837,72 @@ ToolBox RID_DRAW_TEXT_TOOLBOX MN_TEXT_DIALOGS(FALSE) }; + ItemList[arabic] = + { + MN_FONT + MN_TEXT1_RTL(FALSE) + MN_TEXT1_BLOCK + MN_TEXT_LINESPACE + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_CHAR_COLOR + Hide = TRUE; + }; + MN_TEXT_RTL_LTR + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + }; + + MN_TEXT_DIALOGS(FALSE) + }; + ItemList[hebrew] = + { + MN_FONT + MN_TEXT1_RTL(FALSE) + MN_TEXT1_BLOCK + MN_TEXT_LINESPACE + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_CHAR_COLOR + Hide = TRUE; + }; + MN_TEXT_RTL_LTR + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + }; + + MN_TEXT_DIALOGS(FALSE) + }; Scroll = TRUE ; }; String RID_NUM_TOOLBOX @@ -1993,7 +2083,7 @@ String STR_SHELLNAME_TABLE Text[ dutch ] = "Tabel"; Text[ chinese_simplified ] = "表格"; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -2051,7 +2141,7 @@ String STR_SHELLNAME_GRAPHIC Text[ dutch ] = "Afbeelding"; Text[ chinese_simplified ] = "图形"; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Grfic"; @@ -2209,7 +2299,7 @@ String STR_SHELLNAME_DRAW_TEXT Text [ ENGLISH ] = "Draw text" ; Text [ english_us ] = "Draw text" ; Text [ italian ] = "Testo di disegno" ; - Text [ spanish ] = "Texto de diseo" ; + Text [ spanish ] = "Texto de dibujo" ; Text [ french ] = "Texte dessin" ; Text [ dutch ] = "Tekentekst" ; Text [ swedish ] = "Teckningstext" ; @@ -2284,7 +2374,7 @@ String STR_SWBG_GRAPHIC Text[ dutch ] = "Afbeelding"; Text[ chinese_simplified ] = "图形"; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Grfics"; @@ -2371,7 +2461,7 @@ String STR_SWBG_TABLE Text[ dutch ] = "Tabel"; Text[ chinese_simplified ] = "表格"; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -2578,3 +2668,8 @@ String STR_NAME_GROUP_DIALOG + + + + + diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 561f5e26a318..1d0127cad543 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: slotadd.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:56:52 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,6 +68,9 @@ #include "uiparam.hxx" #include "cmdid.h" +#include <svtools/globalnameitem.hxx> + + #ifndef _SVT_IMAGEITM_HXX #include <svtools/imageitm.hxx> #endif diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index 6656272d43ad..a85e855a8129 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textdrw.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: oj $ $Date: 2002-12-02 14:16:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,6 +104,10 @@ #include <poolfmt.hrc> #endif +#ifndef _SV_SOUND_HXX +#include <vcl/sound.hxx> +#endif + #define C2U(cChar) rtl::OUString::createFromAscii(cChar) using namespace ::com::sun::star; using namespace ::rtl; @@ -169,9 +173,12 @@ void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, con aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); xPropSet->setPropertyValue( C2U("ButtonType"), aTmp ); - // #105638# OJ - aTmp <<= sal_True; - xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aTmp ); + if ( Sound::IsSoundFile( rURL ) ) + { + // #105638# OJ + aTmp <<= sal_True; + xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aTmp ); + } } if (rSh.IsObjSelected()) diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 93a42c0dfcf1..0618319283a5 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textfld.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: os $ $Date: 2002-11-13 09:20:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -751,7 +751,7 @@ void SwTextShell::StateField( SfxItemSet &rSet ) case FN_INSERT_FIELD: { SfxViewFrame* pVFrame = GetView().GetViewFrame(); - if (pVFrame->KnowsChildWindow(FN_INSERT_FIELD)) + if(pVFrame->KnowsChildWindow(FN_INSERT_FIELD) && !pVFrame->HasChildWindow(FN_INSERT_FIELD_DATA_ONLY) ) rSet.Put(SfxBoolItem( FN_INSERT_FIELD, pVFrame->HasChildWindow(nWhich))); else rSet.DisableItem(FN_INSERT_FIELD); diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 838eb85265be..5fc82e9a1095 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textsh.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:56:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,7 @@ #include <uiparam.hxx> #endif +#include <svtools/globalnameitem.hxx> #ifndef __RSC //autogen #include <tools/errinf.hxx> @@ -427,8 +428,20 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case SID_INSERT_PLUGIN: case SID_INSERT_APPLET: case SID_INSERT_FLOATINGFRAME: - rSh.Insert( (SvInPlaceObjectRef*)0, 0, TRUE, nSlot); + { + SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); + SvGlobalName *pName = NULL; + SvGlobalName aName; + if ( pNameItem ) + { + aName = pNameItem->GetValue(); + pName = &aName; + } + + DBG_ASSERT( !pNameItem || nSlot == SID_INSERT_OBJECT, "Superfluous argument!" ); + rSh.Insert( (SvInPlaceObjectRef*)0, pName, TRUE, nSlot); break; + } case SID_INSERT_DIAGRAM: { diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index b3a58c980e51..110578fe22df 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtattr.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:56:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,9 @@ #ifndef _SFXITEMITER_HXX #include <svtools/itemiter.hxx> #endif +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #ifndef _SFX_BINDINGS_HXX //autogen #include <sfx2/bindings.hxx> #endif @@ -603,7 +606,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) else { SfxItemSet aSet(GetPool(), RES_PARATR_DROP, RES_PARATR_DROP, - HINT_END, HINT_END); + HINT_END, HINT_END, 0); rSh.GetAttr(aSet); SwDropCapsDlg *pDlg = new SwDropCapsDlg(GetView().GetWindow(), aSet); if (pDlg->Execute() == RET_OK) @@ -796,25 +799,35 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) case SID_ATTR_PARA_LEFT_TO_RIGHT : case SID_ATTR_PARA_RIGHT_TO_LEFT : { - // is the item set? - if(aCoreSet.GetItemState( RES_FRAMEDIR, FALSE ) >= SFX_ITEM_DEFAULT) + if ( !SvtLanguageOptions().IsCTLFontEnabled() ) { - SvxFrameDirection eFrmDir = (SvxFrameDirection) - ((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue(); - if (FRMDIR_ENVIRONMENT == eFrmDir) - { - eFrmDir = rSh.IsInRightToLeftText() ? - FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; - } - bFlag = (SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot && - FRMDIR_HORI_LEFT_TOP == eFrmDir) || - (SID_ATTR_PARA_RIGHT_TO_LEFT == nSlot && - FRMDIR_HORI_RIGHT_TOP == eFrmDir); + rSet.DisableItem( nSlot ); + nSlot = 0; } else { - rSet.InvalidateItem(nSlot); - nSlot = 0; + // is the item set? + USHORT nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell()); + if((!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES))) && + aCoreSet.GetItemState( RES_FRAMEDIR, FALSE ) >= SFX_ITEM_DEFAULT) + { + SvxFrameDirection eFrmDir = (SvxFrameDirection) + ((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue(); + if (FRMDIR_ENVIRONMENT == eFrmDir) + { + eFrmDir = rSh.IsInRightToLeftText() ? + FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; + } + bFlag = (SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot && + FRMDIR_HORI_LEFT_TOP == eFrmDir) || + (SID_ATTR_PARA_RIGHT_TO_LEFT == nSlot && + FRMDIR_HORI_RIGHT_TOP == eFrmDir); + } + else + { + rSet.InvalidateItem(nSlot); + nSlot = 0; + } } } break; diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index 50d8079ee6fd..a9680946c0a1 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -2,9 +2,9 @@ * * $RCSfile: chartins.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2001-06-29 06:19:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,7 +155,8 @@ SwInsertChartDlg::SwInsertChartDlg( SfxBindings* pBindings, pOutItemSet(0), pChartData(0), bUpdateChartData(TRUE), - bChartInserted(FALSE) + bChartInserted(FALSE), + bChildOpen(FALSE) { FreeResource(); pSh->Push(); @@ -225,6 +226,23 @@ BOOL SwInsertChartDlg::Close() return SfxModelessDialog::Close(); } + +void SwInsertChartDlg::Activate() +{ + SfxModelessDialog::Activate(); + + if ( bChildOpen && pChartDlg ) + { + // #107337# The ChildWindow's "hidden" state is reset if the view is activated, + // so it is hidden again on activating if the child dialog is open. + + SfxViewFrame* pVFrame = pWrtShell->GetView().GetViewFrame(); + pVFrame->ShowChildWindow(SID_INSERT_DIAGRAM, FALSE); + + pChartDlg->GrabFocus(); // child dialog should have focus + } +} + /*------------------------------------------------------------------------ Beschreibung: ------------------------------------------------------------------------*/ @@ -253,7 +271,9 @@ IMPL_LINK( SwInsertChartDlg, NextHdl, Button *, pBtn ) pChartDlg->SetPosPixel(GetPosPixel()); SfxViewFrame* pVFrame = pWrtShell->GetView().GetViewFrame(); pVFrame->ShowChildWindow(SID_INSERT_DIAGRAM, FALSE); + bChildOpen = TRUE; USHORT nResult = pChartDlg->Execute(); + bChildOpen = FALSE; switch( nResult ) { case RET_OK: diff --git a/sw/source/ui/table/chartins.src b/sw/source/ui/table/chartins.src index 7c2d992c9f35..9892d35e7822 100644 --- a/sw/source/ui/table/chartins.src +++ b/sw/source/ui/table/chartins.src @@ -2,9 +2,9 @@ * * $RCSfile: chartins.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: os $ $Date: 2002-10-30 12:41:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,7 +112,7 @@ ModelessDialog DLG_INSERT_CHART Text [ ENGLISH_US ] = "A~rea" ; Text [ italian ] = "Area" ; Text [ spanish ] = "~rea" ; - Text [ french ] = "C~atgorie" ; + Text [ french ] = "Plage" ; Text [ dutch ] = "~Bereik" ; Text [ swedish ] = "~Omrde" ; Text [ danish ] = "Omrde" ; @@ -157,7 +157,7 @@ ModelessDialog DLG_INSERT_CHART Text [ portuguese_brazilian ] = "Erste ~Reihe als Beschriftung" ; Text [ portuguese ] = "Primeira ~linha como etiqueta" ; Text[ chinese_simplified ] = "第一行作为标题(~F)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Pierwszy wiersz jako etykieta"; Text[ japanese ] = "最初の行を項目名に引用(~F)"; Text[ chinese_traditional ] = "第一行作為標題(~F)"; @@ -168,7 +168,7 @@ ModelessDialog DLG_INSERT_CHART Text[ korean ] = "첫번째 행을 캡션으로(~F)"; Text[ turkish ] = "Balklar ~birinci satrda"; Text[ catalan ] = "La ~primera fila com a llegenda"; - Text[ finnish ] = "~Ensimminen rivi kuvaotsikkona"; + Text[ finnish ] = "~Ensimminen rivi otsikkona"; Text[ thai ] = "แถวแ~รกเป็นคำอธิบายภาพ"; }; CheckBox CB_FIRST_COL @@ -189,7 +189,7 @@ ModelessDialog DLG_INSERT_CHART Text [ portuguese_brazilian ] = "Erste ~Spalte als Beschriftung" ; Text [ portuguese ] = "Primeira ~coluna como etiqueta" ; Text[ chinese_simplified ] = "第一列作为标题(~C)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Pierwsza kolumna jako etykieta"; Text[ japanese ] = "最初の列を項目名に引用(~C)"; Text[ chinese_traditional ] = "第一欄當作標題(~C)"; @@ -200,7 +200,7 @@ ModelessDialog DLG_INSERT_CHART Text[ korean ] = "첫번째 열을 캡션으로(~C)"; Text[ turkish ] = "Balklar ~birinci stunda"; Text[ catalan ] = "La primera ~columna com a llegenda"; - Text[ finnish ] = "~Ensimminen sarake kuvaotsikkona"; + Text[ finnish ] = "~Ensimminen sarake otsikkona"; Text[ thai ] = "~คอลัมน์แรกเป็นคำอธิบายภาพ"; }; FixedText FT_TEXT @@ -210,26 +210,26 @@ ModelessDialog DLG_INSERT_CHART Text = "Falls die ausgewhlten Zellen nicht die gewnschten Daten enthalten, whlen Sie jetzt den Bereich aus.\n\nBeziehen Sie die Zellen mit Spalten- bzw. Zeilenbeschriftungen mit ein, wenn Sie diese in Ihrer Grafik dargestellt haben mchten." ; Text [ ENGLISH ] = "If the marked area does not represent the desired data, mark your data now.\nInclude the cells containing the column- and row identifier in case you want them to be included in your chart." ; - Text [ ENGLISH_US ] = "If the marked cells do not represent the desired data, mark the area now.\nInclude the cells containing the column and row labels if you want them to be included in your chart." ; + Text [ ENGLISH_US ] = "If the selected cells do not contain the desired data, select the data range now.\n\nInclude the cells containing column and row labels if you want them to be included in your chart." ; WordBreak = TRUE ; - Text [ italian ] = "Se le celle evidenziate non contengono i dati voluti, selezionate l'area.\n\nIncludete le celle contenenti i titoli delle colonne e delle righe se volete che compaiano nel diagramma." ; - Text [ spanish ] = "En caso de que las celdas marcadas no contengan los datos deseados, marque ahora el rea.\n\nIncluya las celdas con los ttulos de las columnas y filas si desea que stas aparezcan en el grfico." ; - Text [ french ] = "Si les cellules marques ne contiennent pas les donnes souhaites, slectionnez prsent la plage. \n\nIncluez les cellules avec les intituls de colonnes et de lignes pour les faire figurer dans le diagramme." ; - Text [ dutch ] = "Als de gemarkeerde cellen niet de gewenste gegevens bevatten markeert u nu het bereik.\n\nMarkeer eveneens de cellen met de kolom- resp. rijlabels als u deze in uw afbeelding wilt weergeven." ; - Text [ swedish ] = "Om de markerade cellerna inte innehller de nskade data, markera d omrdet nu.\n\nTa med de celler som innehller kolumn- och radverskrifter om dessa skall visas i grafiken." ; + Text [ italian ] = "Se le celle evidenziate non contengono i dati voluti, selezionate l'area.\n\nSelezionate le celle e, se volete includerle nel diagramma, anche le intestazioni di riga e colonna." ; + Text [ spanish ] = "Si las celdas seleccionadas no contienen los datos deseados, seleccione el rea.\n\nIncluya los nombres de las columnas y filas si desea que aparezcan en el diagrama." ; + Text [ french ] = "Si les cellules slectionnes ne contiennent pas les donnes souhaites, slectionnez prsent la plage.\n\nMarquez les tiquettes des colonnes et des lignes si vous souhaitez les faire figurer dans le diagramme." ; + Text [ dutch ] = "Als de gemarkeerde cellen niet de gewenste gegevens bevatten, markeert u nu het bereik.\n\nMarkeer eveneens de cellen met de kolom- of de rijlabels als u deze in uw afbeelding wilt weergeven." ; + Text [ swedish ] = "Om de markerade cellerna inte innehller de nskade uppgifterna, markerar du dataomrdet nu.\n\nTa med de celler som innehller kolumn- och radetiketter om du vill att de ska visas i diagrammet." ; Text [ danish ] = "Hvis de markerede celler ikke indeholder de nskede data, marker det nskede omrde nu.\n\nInkluder cellerne med kolonne- hhv.rkkeetiketter, hvis de skal vises i din grafik." ; Text [ portuguese_brazilian ] = "Falls die markierten Zellen nicht die gew?schten Daten enthalten, markieren Sie jetzt den Bereich.\n\nBeziehen Sie die Zellen mit Spalten- bzw. Zeilenbezeichnern mit ein, wenn Sie diese in Ihrer Grafik dargestellt haben m?hten" ; Text [ portuguese ] = "Se as clulas marcadas no inclurem os dados desejados, marque-os agora.\n\nInclua as clulas contendo os ttulos das colunas e linhas se desejar v-las representadas no seu grfico." ; Text[ chinese_simplified ] = "如果选中的单元格没有数据，那么请您选择区域。\n\n您可以也选中列标题和行标题，如此这些资料也会被显示在图表内。"; - Text[ russian ] = " , .\n\n , ."; + Text[ russian ] = " , .\n\n , ."; Text[ polish ] = "Jeli zaznaczone komrki nie zawieraj potrzebnych danych, zaznacz teraz ten obszar ponownie.\n\nZaznacz rwnie komrki z etykietami wierszy lub kolumn , jeli maj one zosta przedstawione w twojej grafice."; - Text[ japanese ] = "必要なデータが含まれている範囲が選択されていない場合は、今選択してください。\n\nグラフに項目名を表示するには、行と列の項目欄を含めたセル範囲を選択します。"; - Text[ chinese_traditional ] = "如果選取的儲存格沒有資料﹐就請您選擇區域。\n\n您可以選中列標題和行標題，這樣，圖表也會顯示出這些資料。"; + Text[ japanese ] = "必要なデータが含まれている範囲が選択されていない場合は、データ範囲を選択してください。\n\nグラフに項目名を表示するには、行と列の項目欄を含めたセル範囲を選択します。"; + Text[ chinese_traditional ] = "如果選取的儲存格沒有需要的資料，請您現在選取資料範圍。\n\n如果要在圖表中包含有列標籤和欄標籤的儲存格，亦可將它們包含在選取範圍內。"; Text[ arabic ] = " ɡ \n\n ǡ ɡ "; - Text[ dutch ] = "Als de gemarkeerde cellen niet de gewenste gegevens bevatten markeert u nu het bereik.\n\nMarkeer eveneens de cellen met de kolom- resp. rijlabels als u deze in uw afbeelding wilt weergeven."; + Text[ dutch ] = "Als de gemarkeerde cellen niet de gewenste gegevens bevatten, markeert u nu het bereik.\n\nMarkeer eveneens de cellen met de kolom- of de rijlabels als u deze in uw afbeelding wilt weergeven."; Text[ chinese_simplified ] = "如果选中的单元格没有数据，那么请您选择区域。\n\n您可以也选中列标题和行标题，如此这些资料也会被显示在图表内。"; Text[ greek ] = " , .\n\n , ."; - Text[ korean ] = "마크표시된 셀이 원하는 데이터를 포함하고 있지 않을 경우, 지금 영역을 마크표시하십시오.\n\n열 내지 행 라벨이 있는 셀들을 그래픽에 나타내고자하면 이 셀들을 함께 포함시키십시오."; + Text[ korean ] = "선택된 셀이 원하는 데이터를 포함하고 있지 않을 경우 지금 데이터 범위를 선택하십시오.\n\n열 내지 행 레이블을 그래픽에 표시하려면 열 및 행 레이블이 있는 셀을 함께 포함시키십시오."; Text[ turkish ] = "Seilen hcreler, istenen verileri iermiyorsa aral imdi sein.\n\nGrafikte grnmelerini istiyorsanz, stun ya da satr balklarn ieren hcreleri de sein"; Text[ catalan ] = "En cas que les cel.les marcades no tinguin les dades desitjades, marqueu ara l'rea.\n\nHeu d'incloure les cel.les amb els noms de les columnes i files si voleu que apareguin al grfic."; Text[ finnish ] = "Jos merkityt solut eivt esit haluttuja tietoja, merkitse alue nyt.\nSisllyt valintaan sarake- ja riviotsikot sisltvt solut, jos haluat niiden nkyvn kaaviossa."; @@ -280,10 +280,10 @@ ModelessDialog DLG_INSERT_CHART Text[ dutch ] = "<< Vor~ige"; Text[ chinese_simplified ] = "<< 返回(~B)"; Text[ greek ] = "<< "; - Text[ korean ] = "<<뒤로(~B)"; + Text[ korean ] = "<< 뒤로(~B)"; Text[ turkish ] = "<< G~eri"; Text[ catalan ] = "<< ~Enrere"; - Text[ finnish ] = "<< Edellinen"; + Text[ finnish ] = "<< ~Edellinen"; Text[ thai ] = "<< ~กลับไป"; }; PushButton BT_NEXT @@ -335,7 +335,7 @@ ModelessDialog DLG_INSERT_CHART Text [ portuguese ] = "~Criar" ; Text [ portuguese_brazilian ] = "~Fertigstellen" ; Text[ chinese_simplified ] = "完成(~A)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Utwrz"; Text[ japanese ] = "完了(~A)"; Text[ chinese_traditional ] = "完成(~A)"; @@ -350,7 +350,7 @@ ModelessDialog DLG_INSERT_CHART Text[ thai ] = "สร้า~ง"; }; Text [ italian ] = "Formattazione automatica diagramma (1-4)" ; - Text [ spanish ] = "AutoFormato diagrama (1-4)" ; + Text [ spanish ] = "Formateado automtico diagrama (1-4)" ; Text [ french ] = "AutoFormat de diagramme (1-4)" ; Text [ dutch ] = "AutoOpmaak diagram (1-4)" ; Text [ swedish ] = "Autoformat Diagram (1-4)" ; @@ -375,3 +375,15 @@ ModelessDialog DLG_INSERT_CHART + + + + + + + + + + + + diff --git a/sw/source/ui/table/colwd.src b/sw/source/ui/table/colwd.src index bb790ae46728..17f35aba157c 100644 --- a/sw/source/ui/table/colwd.src +++ b/sw/source/ui/table/colwd.src @@ -2,9 +2,9 @@ * * $RCSfile: colwd.src,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:18:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,28 +110,29 @@ ModalDialog DLG_COL_WIDTH Text = "~Breite" ; Text [ ENGLISH ] = "~Width" ; Text [ norwegian ] = "~Bredde" ; - Text [ italian ] = "~Largh." ; + Text [ italian ] = "Larghezza" ; Text [ portuguese_brazilian ] = "~Largura" ; Text [ portuguese ] = "~Largura" ; Text [ finnish ] = "~Leveys" ; Text [ danish ] = "Bredde" ; - Text [ french ] = "~Largeur" ; + Text [ french ] = "Largeur" ; Text [ swedish ] = "~Bredd" ; Text [ dutch ] = "B~reedte" ; - Text [ spanish ] = "A~ncho" ; + Text [ spanish ] = "Ancho" ; Text [ english_us ] = "~Width" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~W)"; + Text[ chinese_simplified ] = "宽度(~W)"; Text[ russian ] = ""; Text[ polish ] = "Szer."; - Text[ japanese ] = "(~W)"; - Text[ chinese_traditional ] = "e(~W)"; + Text[ japanese ] = "幅(~W)"; + Text[ chinese_traditional ] = "寬度(~W)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ʺ(~W)"; + Text[ korean ] = "너비(~W)"; Text[ turkish ] = "~Genilik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ncho"; + Text[ catalan ] = "~Amplada"; + Text[ thai ] = "ความ~กว้าง"; }; MetricField ED_WIDTH { @@ -168,17 +169,18 @@ ModalDialog DLG_COL_WIDTH Text [ dutch ] = "Breedte" ; Text [ spanish ] = "Ancho" ; Text [ english_us ] = "Width" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "宽度"; Text[ russian ] = ""; Text[ polish ] = "Szeroko"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "e"; + Text[ japanese ] = "幅"; + Text[ chinese_traditional ] = "寬度"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ʺ"; + Text[ korean ] = "너비"; Text[ turkish ] = "Genilik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho"; + Text[ catalan ] = "Llargada"; + Text[ thai ] = "ความกว้าง"; }; FixedText FT_COL { @@ -192,23 +194,24 @@ ModalDialog DLG_COL_WIDTH Text [ portuguese ] = "~Coluna" ; Text [ finnish ] = "~Sarake" ; Text [ danish ] = "Kolonne" ; - Text [ french ] = "~Colonne" ; + Text [ french ] = "Colonne" ; Text [ swedish ] = "~Kolumn" ; Text [ dutch ] = "~Kolom" ; Text [ spanish ] = "Colu~mna" ; Text [ english_us ] = "~Column" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~C)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "栏(~C)"; + Text[ russian ] = ""; Text[ polish ] = "Kolumna"; - Text[ japanese ] = "(~C)"; - Text[ chinese_traditional ] = "(~C)"; + Text[ japanese ] = "列(~C)"; + Text[ chinese_traditional ] = "欄(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~C)"; + Text[ korean ] = "열(~C)"; Text[ turkish ] = "~Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Colu~mna"; + Text[ catalan ] = "~Columna"; + Text[ thai ] = "~คอลัมน์"; }; NumericField ED_COL { @@ -222,19 +225,32 @@ ModalDialog DLG_COL_WIDTH Maximum = 99 ; Repeat = TRUE ; }; - Text[ chinese_simplified ] = ""; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "栏宽"; + Text[ russian ] = " "; Text[ polish ] = "Szeroko kolumny"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "e"; + Text[ japanese ] = "列幅"; + Text[ chinese_traditional ] = "欄寬"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ʺ"; + Text[ korean ] = "열 너비"; Text[ turkish ] = "Stun genilii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho de columna"; + Text[ catalan ] = "Amplada de la columna"; + Text[ thai ] = "ความกว้างคอลัมน์"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src index d936fcfdacc9..3902308eaee2 100644 --- a/sw/source/ui/table/convert.src +++ b/sw/source/ui/table/convert.src @@ -2,9 +2,9 @@ * * $RCSfile: convert.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: os $ $Date: 2002-01-10 14:09:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,25 +95,26 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT [ portuguese ] = "~Tabulao" ; TEXT [ finnish ] = "~Sarkaimet" ; TEXT [ danish ] = "Tabulator" ; - TEXT [ french ] = "~Tabulation" ; + TEXT [ french ] = "Tabulation" ; TEXT [ swedish ] = "~Tabulator" ; TEXT [ dutch ] = "~Tab" ; - TEXT [ spanish ] = "Tabu~lacin" ; + TEXT [ spanish ] = "Tabulador" ; TEXT [ english_us ] = "~Tabs" ; TABSTOP = TRUE ; Group = TRUE ; Check = TRUE ; - TEXT[ chinese_simplified ] = "Ʊ(~T)"; - TEXT[ russian ] = ""; + TEXT[ chinese_simplified ] = "制表符(~T)"; + TEXT[ russian ] = ""; TEXT[ polish ] = "Tabulator"; - TEXT[ japanese ] = "(~T)"; - TEXT[ chinese_traditional ] = "s(~T)"; + TEXT[ japanese ] = "タブ(~T)"; + TEXT[ chinese_traditional ] = "定位鍵(~T)"; TEXT[ arabic ] = " "; TEXT[ greek ] = "~"; - TEXT[ korean ] = "(~T)"; + TEXT[ korean ] = "탭(~T)"; TEXT[ turkish ] = "~Sekme"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Tabu~lacin"; + TEXT[ catalan ] = "~Tabulacions"; + TEXT[ thai ] = "~ระยะกั้น"; }; RadioButton CB_SEMI { @@ -122,28 +123,29 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT = "~Semikolon" ; TEXT [ ENGLISH ] = "~Semicolon" ; TEXT [ norwegian ] = "~Semikolon" ; - TEXT [ italian ] = "~Punto e virgola" ; + TEXT [ italian ] = "Punto e virgola" ; TEXT [ portuguese_brazilian ] = "~Ponto e v?rgula" ; TEXT [ portuguese ] = "Ponto e vr~gula" ; TEXT [ finnish ] = "~Puolipisteet" ; TEXT [ danish ] = "Semikolon" ; - TEXT [ french ] = "~Point virgule" ; + TEXT [ french ] = "Point-virgule" ; TEXT [ swedish ] = "~Semikolon" ; TEXT [ dutch ] = "~Puntkomma" ; TEXT [ spanish ] = "Punto y co~ma" ; TEXT [ english_us ] = "~Semicolons" ; TABSTOP = TRUE ; - TEXT[ chinese_simplified ] = "ֺ(~S)"; + TEXT[ chinese_simplified ] = "分号(~S)"; TEXT[ russian ] = " "; TEXT[ polish ] = "rednik"; - TEXT[ japanese ] = "к(~S)"; - TEXT[ chinese_traditional ] = "(~S)"; + TEXT[ japanese ] = "セミコロン(~S)"; + TEXT[ chinese_traditional ] = "分號(~S)"; TEXT[ arabic ] = " "; TEXT[ greek ] = " ~"; - TEXT[ korean ] = "ݷ(~S)"; + TEXT[ korean ] = "세미콜론(~S)"; TEXT[ turkish ] = "N~oktal virgl"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Punto y co~ma"; + TEXT[ catalan ] = "~Punts i coma"; + TEXT[ thai ] = "~อัฒภาค"; }; RadioButton CB_PARA { @@ -152,28 +154,29 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT = "~Absatz" ; TEXT [ ENGLISH ] = "~Paragraph" ; TEXT [ norwegian ] = "~Paragraf" ; - TEXT [ italian ] = "~Paragrafo" ; + TEXT [ italian ] = "Paragrafo" ; TEXT [ portuguese_brazilian ] = "~Par?grafo" ; TEXT [ portuguese ] = "~Pargrafo" ; TEXT [ finnish ] = "~Kappale" ; TEXT [ danish ] = "Afsnit" ; - TEXT [ french ] = "~Paragraphe" ; + TEXT [ french ] = "Paragraphe" ; TEXT [ swedish ] = "Styc~ke" ; TEXT [ dutch ] = "~Alinea" ; TEXT [ spanish ] = "~Prrafo" ; TEXT [ english_us ] = "~Paragraph" ; TABSTOP = TRUE ; - TEXT[ chinese_simplified ] = "(~P)"; + TEXT[ chinese_simplified ] = "段落(~P)"; TEXT[ russian ] = ""; TEXT[ polish ] = "Akapit"; - TEXT[ japanese ] = "i(~P)"; - TEXT[ chinese_traditional ] = "q(~P)"; + TEXT[ japanese ] = "段落(~P)"; + TEXT[ chinese_traditional ] = "段落(~P)"; TEXT[ arabic ] = ""; TEXT[ greek ] = "~"; - TEXT[ korean ] = "ܶ(~P)"; + TEXT[ korean ] = "단락(~P)"; TEXT[ turkish ] = "~Paragraf"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "~Prrafo"; + TEXT[ catalan ] = "~Pargraf"; + TEXT[ thai ] = "~ย่อหน้า"; }; RadioButton RB_OTHER { @@ -188,20 +191,21 @@ ModalDialog DLG_CONV_TEXT_TABLE Text [ danish ] = "Andre: " ; Text [ italian ] = "~Altri: " ; Text [ spanish ] = "~Otros: " ; - Text [ french ] = "~Autre(s):[_]" ; - Text [ dutch ] = "An~dere: " ; - Text[ chinese_simplified ] = "(~O)"; + Text [ french ] = "~Autres : " ; + Text [ dutch ] = "An~dere:" ; + Text[ chinese_simplified ] = "其他(~O)"; Text[ russian ] = ": "; Text[ polish ] = "Inne: "; - Text[ japanese ] = "̑(~O)"; - Text[ chinese_traditional ] = "L(~O)"; + Text[ japanese ] = "その他(~O)"; + Text[ chinese_traditional ] = "其他(~O)"; Text[ arabic ] = " : "; Text[ greek ] = ": "; - Text[ korean ] = "Ÿ(~O)"; + Text[ korean ] = "기타(~O)"; Text[ turkish ] = "Di~er: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Otros: "; + Text[ catalan ] = "~Altres:"; Text[ finnish ] = "~Muu: "; + Text[ thai ] = "~อื่น ๆ: "; }; Edit ED_OTHER { @@ -228,18 +232,19 @@ ModalDialog DLG_CONV_TEXT_TABLE Text [ french ] = "~Largeur identique pour toutes les colonnes" ; Text [ dutch ] = "~Alle kolommen dezelfde breedte" ; Text [ portuguese ] = "~Largura igual para todas as colunas" ; - Text[ chinese_simplified ] = "еĿͬ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "所有列的宽度相同"; + Text[ russian ] = " "; Text[ polish ] = "~Jednakowa szeroko wszystk. kolumn"; - Text[ japanese ] = "ׂĂ̗"; - Text[ chinese_traditional ] = "ҦeۦP"; + Text[ japanese ] = "列幅を均等にする"; + Text[ chinese_traditional ] = "所有欄寬度相同"; Text[ arabic ] = " "; Text[ greek ] = " ~ "; - Text[ korean ] = " ʺ "; + Text[ korean ] = "모든 열 너비 같게"; Text[ turkish ] = "Tm stunlar a~yn genilikte"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mismo an~cho para todas las columnas"; - Text[ finnish ] = "Yhtsuuret sarakkeiden leveydet"; + Text[ catalan ] = "Amplada igual per a totes les columnes"; + Text[ finnish ] = "Yht suuret sarakeleveydet"; + Text[ thai ] = "ความกว้างเท่ากันสำหรับคอลัมน์ทั้งหมด"; }; FixedLine FL_DELIM { @@ -251,25 +256,26 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT [ italian ] = "Separatore nel testo" ; TEXT [ portuguese_brazilian ] = "Delimitador" ; TEXT [ portuguese ] = "Separador" ; - TEXT [ finnish ] = "Erota teksti kohdasta" ; - TEXT [ danish ] = "Separatorer i tekst" ; + TEXT [ finnish ] = "Tekstin erottelu" ; + TEXT [ danish ] = "Skilletegn i tekst" ; TEXT [ french ] = "Sparateur dans le texte" ; TEXT [ swedish ] = "Skiljetecken i text" ; TEXT [ dutch ] = "Scheidingsteken in tekst" ; - TEXT [ spanish ] = "Delimitador en texto" ; + TEXT [ spanish ] = "Separador en el texto" ; TEXT [ english_us ] = "Separate text at" ; Group = TRUE ; - TEXT[ chinese_simplified ] = "ڵķָ"; + TEXT[ chinese_simplified ] = "正文内的分隔符"; TEXT[ russian ] = " "; TEXT[ polish ] = "Separator w tekcie"; - TEXT[ japanese ] = "÷ē̋L"; - TEXT[ chinese_traditional ] = "媺j"; + TEXT[ japanese ] = "テキスト内の区切り記号"; + TEXT[ chinese_traditional ] = "內文的分隔符"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "ؽƮ ȣ"; + TEXT[ korean ] = "텍스트 구분 기호"; TEXT[ turkish ] = "Metin ayrma iareti"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Delimitador en texto"; + TEXT[ catalan ] = "Delimitador en text"; + TEXT[ thai ] = "แยกข้อความที่"; }; CheckBox CB_HEADER { @@ -282,23 +288,24 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ portuguese_brazilian ] = "Header"; Text[ portuguese ] = "~Ttulo"; Text[ danish ] = "Overskrift"; - Text[ french ] = "T~itre"; + Text[ french ] = "Titre"; Text[ swedish ] = "ve~rskrift"; Text[ dutch ] = "~Kop"; Text[ spanish ] = "~Encabezado"; Text[ english_us ] = "Header"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "标题"; Text[ russian ] = ""; Text[ polish ] = "Tytu"; - Text[ japanese ] = "o"; - Text[ chinese_traditional ] = "D"; + Text[ japanese ] = "見出し"; + Text[ chinese_traditional ] = "標題"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "ǥ"; + Text[ korean ] = "표제"; Text[ turkish ] = "Ba~lk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Encabezado"; - Text[ finnish ] = "Ylotsikko"; + Text[ catalan ] = "~Encapalament"; + Text[ finnish ] = "Yltunniste"; + Text[ thai ] = "ส่วนหัว"; }; CheckBox CB_REPEAT_HEADER { @@ -311,23 +318,24 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ portuguese_brazilian ] = "Repeat Header"; Text[ portuguese ] = "~Repetir em todas as pginas"; Text[ danish ] = "Gentag p hver side"; - Text[ french ] = "~Rpter sur chaque page"; + Text[ french ] = "Rpter sur chaque page"; Text[ swedish ] = "~Upprepa p varje sida"; Text[ dutch ] = "Op iedere pagina ~herhalen"; - Text[ spanish ] = "~Repetir en cada pgina"; + Text[ spanish ] = "Repetir en cada pgina"; Text[ english_us ] = "Re~peat header"; - Text[ chinese_simplified ] = "ÿҳظʾ(~P)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "在每页上重复显示(~P)"; + Text[ russian ] = " "; Text[ polish ] = "Powtrz na ~kadej stronie"; - Text[ japanese ] = "e߰ނɌJԂ(~P)"; - Text[ chinese_traditional ] = "bCW(~P)"; + Text[ japanese ] = "各ページに繰り返し(~P)"; + Text[ chinese_traditional ] = "在每頁上重複顯示(~P)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = " ʿ ݺ(~P)"; + Text[ korean ] = "모든 페이지에서 반복(~P)"; Text[ turkish ] = "lk satr her sayfada yi~nele"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Repetir en cada pgina"; - Text[ finnish ] = "~Toista ylotsikko"; + Text[ catalan ] = "~Repeteix a cada pgina"; + Text[ finnish ] = "~Toista yltunniste"; + Text[ thai ] = "ทำส่วนหัว~ซ้ำ"; }; CheckBox CB_DONT_SPLIT { @@ -340,23 +348,24 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ portuguese_brazilian ] = "Don't split table"; Text[ portuguese ] = "No ~dividir tabela"; Text[ danish ] = "Opdel tabel ikke"; - Text[ french ] = "Ne pas ~diviser le tableau"; + Text[ french ] = "Ne pas ~scinder le tableau"; Text[ swedish ] = "Dela i~nte tabell"; Text[ dutch ] = "Tabel niet ~splitsen"; Text[ spanish ] = "~No dividir tabla"; Text[ english_us ] = "Don't split table"; - Text[ chinese_simplified ] = "ָ"; + Text[ chinese_simplified ] = "不分隔表格"; Text[ russian ] = " "; Text[ polish ] = "Nie dziel tabeli"; - Text[ japanese ] = "\\Ȃ"; - Text[ chinese_traditional ] = "}"; + Text[ japanese ] = "表を分割しない"; + Text[ chinese_traditional ] = "不分開表格"; Text[ arabic ] = " "; Text[ greek ] = " ~"; - Text[ korean ] = "̺ и ʱ."; + Text[ korean ] = "표 나누지 않음"; Text[ turkish ] = "Tabloyu tek sayfaya ~sdr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~No dividir tabla"; + Text[ catalan ] = "No parteixis la taula"; Text[ finnish ] = "l jaa taulukkoa"; + Text[ thai ] = "ไม่แยกตาราง"; }; CheckBox CB_BORDER { @@ -374,18 +383,19 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ dutch ] = "~Omranding"; Text[ spanish ] = "~Borde"; Text[ english_us ] = "Border"; - Text[ chinese_simplified ] = "߿"; + Text[ chinese_simplified ] = "边框"; Text[ russian ] = ""; Text[ polish ] = "Obramowanie"; - Text[ japanese ] = "Og"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "枠"; + Text[ chinese_traditional ] = "邊框"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "ܰ"; + Text[ korean ] = "테두리"; Text[ turkish ] = "~Kenarlk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Borde"; + Text[ catalan ] = "Vora"; Text[ finnish ] = "Reuna"; + Text[ thai ] = "เส้นขอบ"; }; FixedLine FL_OPTIONS { @@ -402,18 +412,19 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ dutch ] = "Opties"; Text[ spanish ] = "Opciones"; Text[ english_us ] = "Options"; - Text[ chinese_simplified ] = "ѡ"; + Text[ chinese_simplified ] = "选项"; Text[ russian ] = ""; Text[ polish ] = "Opcje"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "ﶵ"; + Text[ japanese ] = "オプション"; + Text[ chinese_traditional ] = "選項"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ɼ"; + Text[ korean ] = "옵션"; Text[ turkish ] = "Seenekler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones"; + Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "ตัวเลือก"; }; String STR_CONVERT_TEXT_TABLE { @@ -430,17 +441,18 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT [ dutch ] = "Tekst naar tabel converteren" ; TEXT [ spanish ] = "Convertir texto en tabla" ; TEXT [ english_us ] = "Convert Text to Table" ; - TEXT[ chinese_simplified ] = "תɱ"; + TEXT[ chinese_simplified ] = "文字转换成表格"; TEXT[ russian ] = " "; TEXT[ polish ] = "Konwertuj tekst na tabel"; - TEXT[ japanese ] = "÷Ă\\ɂ"; - TEXT[ chinese_traditional ] = "rഫ"; + TEXT[ japanese ] = "テキストを表に変換する"; + TEXT[ chinese_traditional ] = "文字轉換成表格"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "ؽƮ ǥ ȯ"; + TEXT[ korean ] = "텍스트를 표로 변환"; TEXT[ turkish ] = "Metni tabloya dntr"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Convertir texto en tabla"; + TEXT[ catalan ] = "Converteix el text en una taula"; + TEXT[ thai ] = "แปลงข้อความเป็นตาราง"; }; OkButton BT_OK { @@ -473,37 +485,57 @@ ModalDialog DLG_CONV_TEXT_TABLE Text [ italian ] = "~Formattazione automatica..." ; Text [ portuguese_brazilian ] = "Formata??o Autom?tica..." ; Text [ portuguese ] = "Auto~Formato..." ; - Text [ finnish ] = "~Automaattinen muotoilu" ; + Text [ finnish ] = "~Automaattinen muotoilu..." ; Text [ danish ] = "AutoFormat..." ; Text [ french ] = "AutoFormat..." ; Text [ swedish ] = "AutoFormat..." ; Text [ dutch ] = "Auto~Opmaak..." ; - Text [ spanish ] = "Auto~Formato..." ; + Text [ spanish ] = "~Formateado automtico..." ; Text [ english_us ] = "Auto~Format..." ; - Text[ chinese_simplified ] = "Զʽ(~F)..."; + Text[ chinese_simplified ] = "自动格式(~F)..."; Text[ russian ] = "..."; Text[ polish ] = "Autoformat..."; - Text[ japanese ] = "̫ϯ(~F)..."; - Text[ chinese_traditional ] = "۰ʮ榡(~F)..."; + Text[ japanese ] = "オートフォーマット(~F)..."; + Text[ chinese_traditional ] = "自動格式(~F)..."; Text[ arabic ] = " ..."; Text[ greek ] = "~..."; - Text[ korean ] = "ڵ(~F)..."; + Text[ korean ] = "자동 서식(~F)..."; Text[ turkish ] = "Otomatik ~formatlama..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Auto~Formato..."; + Text[ catalan ] = "Auto~format..."; + Text[ thai ] = "~รูปแบบอัตโนมัติ..."; }; - TEXT[ chinese_simplified ] = "ת"; + TEXT[ chinese_simplified ] = "转换表格成文字"; TEXT[ russian ] = " "; TEXT[ polish ] = "Konwertuj tabel na tekst"; - TEXT[ japanese ] = "\\÷Ăɂ"; - TEXT[ chinese_traditional ] = "ഫr"; + TEXT[ japanese ] = "表をテキストに変換する"; + TEXT[ chinese_traditional ] = "表格轉換成文字"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "ǥ ؽƮ ȯ"; + TEXT[ korean ] = "표를 텍스트로 변환"; TEXT[ turkish ] = "Tabloyu metne dntr"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Convertir tabla en texto"; + TEXT[ catalan ] = "Converteix la taula en un text"; + TEXT[ thai ] = "แปลงตารางเป็นข้อความ"; }; + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/insrc.src b/sw/source/ui/table/insrc.src index 2ee79394d07b..6a9fc8afe35d 100644 --- a/sw/source/ui/table/insrc.src +++ b/sw/source/ui/table/insrc.src @@ -2,9 +2,9 @@ * * $RCSfile: insrc.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2001-07-26 22:37:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,23 +114,24 @@ ModalDialog DLG_INS_ROW_COL Text [ portuguese ] = " ~frente" ; Text [ finnish ] = "~Ennen" ; Text [ danish ] = "foran" ; - Text [ french ] = "A~vant" ; + Text [ french ] = "Avant" ; Text [ swedish ] = "~framfr" ; Text [ dutch ] = "~ervoor" ; Text [ spanish ] = "De~lante" ; Text [ english_us ] = "~Before" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "֮ǰ(~B)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "之前(~B)"; + Text[ russian ] = ""; Text[ polish ] = "prze~d"; - Text[ japanese ] = "O(~B)"; - Text[ chinese_traditional ] = "e(~B)"; + Text[ japanese ] = "前(~B)"; + Text[ chinese_traditional ] = "之前(~B)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "(~B)"; + Text[ korean ] = "앞(~B)"; Text[ turkish ] = "n~ne"; Text[ language_user1 ] = " "; - Text[ catalan ] = "De~lante"; + Text[ catalan ] = "A~bans de"; + Text[ thai ] = "~ก่อน"; }; RadioButton CB_POS_AFTER { @@ -144,24 +145,25 @@ ModalDialog DLG_INS_ROW_COL Text [ portuguese ] = "~atrs" ; Text [ finnish ] = "~Jlkeen" ; Text [ danish ] = "efter" ; - Text [ french ] = "~Aprs" ; + Text [ french ] = "Aprs" ; Text [ swedish ] = "~bakom" ; Text [ dutch ] = "e~rachter" ; - Text [ spanish ] = "de~trs" ; + Text [ spanish ] = "De~trs" ; Text [ english_us ] = "A~fter" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "֮(~F)"; + Text[ chinese_simplified ] = "之后(~F)"; Text[ russian ] = ""; Text[ polish ] = "za"; - Text[ japanese ] = "(~F)"; - Text[ chinese_traditional ] = "(~F)"; + Text[ japanese ] = "後(~F)"; + Text[ chinese_traditional ] = "之後(~F)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "(~F)"; + Text[ korean ] = "뒤(~F)"; Text[ turkish ] = "ar~kasna"; Text[ language_user1 ] = " "; - Text[ catalan ] = "de~trs"; + Text[ catalan ] = "da~rrera"; + Text[ thai ] = "ห~ลังจาก"; }; NumericField ED_COUNT { @@ -190,23 +192,24 @@ ModalDialog DLG_INS_ROW_COL Text [ portuguese_brazilian ] = "Inserir" ; Text [ portuguese ] = "Inserir" ; Text [ finnish ] = "Lis" ; - Text [ danish ] = "Indst" ; + Text [ danish ] = "St ind" ; Text [ french ] = "Insrer" ; Text [ swedish ] = "Infoga" ; Text [ dutch ] = "Invoegen" ; Text [ spanish ] = "Insertar" ; Text [ english_us ] = "Insert" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "插入"; Text[ russian ] = ""; Text[ polish ] = "Wstaw"; - Text[ japanese ] = "}"; - Text[ chinese_traditional ] = "J"; + Text[ japanese ] = "挿入"; + Text[ chinese_traditional ] = "插入"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "삽입"; Text[ turkish ] = "Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar"; + Text[ catalan ] = "Insereix"; + Text[ thai ] = "แทรก"; }; FixedLine FL_POS { @@ -218,22 +221,23 @@ ModalDialog DLG_INS_ROW_COL Text[ portuguese ] = "Posio"; Text[ russian ] = ""; Text[ greek ] = "start_num"; - Text[ dutch ] = "Functie"; - Text[ french ] = "Fonction"; + Text[ dutch ] = "Positie"; + Text[ french ] = "Position"; Text[ spanish ] = "Posicin"; Text[ finnish ] = "Sijainti"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Stilling"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Position"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; - Text[ japanese ] = "ʒu"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "start_num"; - Text[ chinese_traditional ] = "start_num"; + Text[ japanese ] = "位置"; + Text[ korean ] = "위치"; + Text[ chinese_simplified ] = "位置"; + Text[ chinese_traditional ] = "位置"; Text[ turkish ] = " unvan"; Text[ arabic ] = "Start_num"; - Text[ catalan ] = "Position"; + Text[ catalan ] = "Posici"; + Text[ thai ] = "ตำแหน่ง"; }; FixedText FT_COUNT { @@ -253,17 +257,18 @@ ModalDialog DLG_INS_ROW_COL Text [ spanish ] = "~Cantidad" ; Text [ english_us ] = "~Amount" ; Left = TRUE ; - Text[ chinese_simplified ] = "Ŀ(~A)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "数目(~A)"; + Text[ russian ] = "-"; Text[ polish ] = "Liczba"; - Text[ japanese ] = "(~A)"; - Text[ chinese_traditional ] = "ƥ(~A)"; + Text[ japanese ] = "数(~A)"; + Text[ chinese_traditional ] = "數目(~A)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~A)"; + Text[ korean ] = "수(~A)"; Text[ turkish ] = "~Adet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cantidad"; + Text[ catalan ] = "~Quantitat"; + Text[ thai ] = "~จำนวน"; }; String STR_ROW { @@ -280,17 +285,18 @@ ModalDialog DLG_INS_ROW_COL Text [ dutch ] = " rijen" ; Text [ spanish ] = "Filas" ; Text [ english_us ] = " Rows" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "行"; Text[ russian ] = " "; Text[ polish ] = " Wiersze"; - Text[ japanese ] = "s"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "行"; + Text[ chinese_traditional ] = "行"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "행"; Text[ turkish ] = "Satr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Filas"; + Text[ catalan ] = " Files"; + Text[ thai ] = " แถว"; }; String STR_COL { @@ -307,29 +313,31 @@ ModalDialog DLG_INS_ROW_COL Text [ dutch ] = " kolommen" ; Text [ spanish ] = "Columnas" ; Text [ english_us ] = " Columns" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "栏"; + Text[ russian ] = " "; Text[ polish ] = " Kolumny"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "列"; + Text[ chinese_traditional ] = "欄"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = " 단"; Text[ turkish ] = "Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = " Columnes"; + Text[ thai ] = " คอลัมน์"; }; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "插入"; + Text[ russian ] = ""; Text[ polish ] = "Wstaw"; - Text[ japanese ] = "}"; - Text[ chinese_traditional ] = "J"; + Text[ japanese ] = "挿入"; + Text[ chinese_traditional ] = "插入"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "삽입"; Text[ turkish ] = "Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar"; + Text[ catalan ] = "Insereix"; + Text[ thai ] = "แทรก"; }; @@ -337,3 +345,18 @@ ModalDialog DLG_INS_ROW_COL + + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src index 89e6e9c0851e..5a35f465d80f 100644 --- a/sw/source/ui/table/instable.src +++ b/sw/source/ui/table/instable.src @@ -2,9 +2,9 @@ * * $RCSfile: instable.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: os $ $Date: 2002-07-03 13:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ ModalDialog DLG_INSERT_TABLE Text [ portuguese ] = "Inserir tabela" ; Text [ finnish ] = "Lis taulukko" ; Text [ danish ] = "Indst tabel" ; - Text [ french ] = "Insrer un tableau" ; + Text [ french ] = "Insertion de tableau" ; Text [ swedish ] = "Infoga tabell" ; Text [ dutch ] = "Tabel invoegen" ; Text [ spanish ] = "Insertar tabla" ; @@ -106,18 +106,19 @@ ModalDialog DLG_INSERT_TABLE Text[ dutch ] = "Naam"; Text[ spanish ] = "Nombre"; Text[ english_us ] = "Name"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "名称"; Text[ russian ] = ""; Text[ polish ] = "Nazwa"; - Text[ japanese ] = "\\̖O"; - Text[ chinese_traditional ] = "W"; + Text[ japanese ] = "表の名前"; + Text[ chinese_traditional ] = "名稱"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "̸"; + Text[ korean ] = "이름"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre"; + Text[ catalan ] = "Nom"; Text[ finnish ] = "Nimi"; + Text[ thai ] = "ชื่อ"; }; FixedText FT_COL { @@ -137,17 +138,18 @@ ModalDialog DLG_INSERT_TABLE Text [ spanish ] = "~Columnas" ; Text [ english_us ] = "~Columns" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~C)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "列(~C)"; + Text[ russian ] = ""; Text[ polish ] = "Kolumny"; - Text[ japanese ] = "(~C)"; - Text[ chinese_traditional ] = "(~C)"; + Text[ japanese ] = "列(~C)"; + Text[ chinese_traditional ] = "欄(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~C)"; + Text[ korean ] = "열(~C)"; Text[ turkish ] = "~Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Columnas"; + Text[ catalan ] = "~Columnes"; + Text[ thai ] = "~คอลัมน์"; }; NumericField ED_COL { @@ -171,28 +173,29 @@ ModalDialog DLG_INSERT_TABLE Text = "~Zeilen" ; Text [ ENGLISH ] = "~Rows" ; Text [ norwegian ] = "~Rows" ; - Text [ italian ] = "~Righe" ; + Text [ italian ] = "Righe" ; Text [ portuguese_brazilian ] = "Filei~ras" ; Text [ portuguese ] = "~Linhas" ; Text [ finnish ] = "~Rivit" ; Text [ danish ] = "Rkker" ; - Text [ french ] = "~Lignes" ; + Text [ french ] = "Lignes" ; Text [ swedish ] = "~Rader" ; Text [ dutch ] = "~Rijen" ; Text [ spanish ] = "~Filas" ; Text [ english_us ] = "~Rows" ; Left = TRUE ; - Text[ chinese_simplified ] = "(~R)"; + Text[ chinese_simplified ] = "行(~R)"; Text[ russian ] = ""; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "s(~R)"; - Text[ chinese_traditional ] = "C(~R)"; + Text[ japanese ] = "行(~R)"; + Text[ chinese_traditional ] = "列(~R)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~R)"; + Text[ korean ] = "행(~R)"; Text[ turkish ] = "Sa~tr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Filas"; + Text[ catalan ] = "~Files"; + Text[ thai ] = "แ~ถว"; }; NumericField ED_ROW { @@ -216,25 +219,26 @@ ModalDialog DLG_INSERT_TABLE Text = "Tabellengre" ; Text [ ENGLISH ] = "Size" ; Text[ english_us ] = "Size"; - Text[ portuguese ] = "Size"; + Text[ portuguese ] = "Tamanho da tabela"; Text[ russian ] = " "; Text[ greek ] = "Size"; - Text[ dutch ] = "Size"; + Text[ dutch ] = "Tabelgrootte"; Text[ french ] = "Taille"; Text[ spanish ] = "Tamao de tabla"; - Text[ finnish ] = "Size"; + Text[ finnish ] = "Koko"; Text[ italian ] = "Dimensioni tabella"; - Text[ danish ] = "Size"; + Text[ danish ] = "Tabelstrrelse"; Text[ swedish ] = "Tabellstorlek"; Text[ polish ] = "Rozmiar tabeli"; Text[ portuguese_brazilian ] = "Size"; - Text[ japanese ] = "\\̻"; - Text[ korean ] = "ũ"; - Text[ chinese_simplified ] = "ĴС"; - Text[ chinese_traditional ] = "jp"; + Text[ japanese ] = "表のサイズ"; + Text[ korean ] = "크기"; + Text[ chinese_simplified ] = "表格的大小"; + Text[ chinese_traditional ] = "表格大小"; Text[ turkish ] = "Size"; Text[ arabic ] = "Size"; - Text[ catalan ] = "Size"; + Text[ catalan ] = "Mida"; + Text[ thai ] = "ขนาด"; }; CheckBox CB_HEADER { @@ -247,23 +251,24 @@ ModalDialog DLG_INSERT_TABLE Text[ portuguese_brazilian ] = "Header"; Text[ portuguese ] = "~Ttulo"; Text[ danish ] = "Overskrift"; - Text[ french ] = "T~itre"; + Text[ french ] = "Titre"; Text[ swedish ] = "~verskrift"; Text[ dutch ] = "~Kop"; Text[ spanish ] = "~Encabezado"; Text[ english_us ] = "Header"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "标题"; Text[ russian ] = ""; Text[ polish ] = "Tytu"; - Text[ japanese ] = "o"; - Text[ chinese_traditional ] = "D"; + Text[ japanese ] = "見出し"; + Text[ chinese_traditional ] = "標題"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ǥ"; + Text[ korean ] = "제목"; Text[ turkish ] = "Balk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Encabezado"; - Text[ finnish ] = "Ylotsikko"; + Text[ catalan ] = "~Encapalament"; + Text[ finnish ] = "Yltunniste"; + Text[ thai ] = "ส่วนหัว"; }; CheckBox CB_REPEAT_HEADER { @@ -279,20 +284,21 @@ ModalDialog DLG_INSERT_TABLE Text[ french ] = "R~pter sur chaque page"; Text[ swedish ] = "~Upprepa p varje sida"; Text[ dutch ] = "Op iedere pagina ~herhalen"; - Text[ spanish ] = "~Repetir en cada pgina"; + Text[ spanish ] = "Repetir en cada pgina"; Text[ english_us ] = "Re~peat header"; - Text[ chinese_simplified ] = "ÿҳظʾ(~P)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "在每页上重复显示(~P)"; + Text[ russian ] = " "; Text[ polish ] = "Powtrz na ~kadej stronie"; - Text[ japanese ] = "e߰ނɌJԂ(~P)"; - Text[ chinese_traditional ] = "bCW(~P)"; + Text[ japanese ] = "各ページに繰り返し(~P)"; + Text[ chinese_traditional ] = "在每頁上重複顯示(~P)"; Text[ arabic ] = " "; Text[ greek ] = "~ "; - Text[ korean ] = " ʿ ݺ(~P)"; + Text[ korean ] = "모든 페이지에서 반복(~P)"; Text[ turkish ] = "lk satr her sayfada yi~nele"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Repetir en cada pgina"; - Text[ finnish ] = "~Toista ylotsikko"; + Text[ catalan ] = "~Repeteix a cada pgina"; + Text[ finnish ] = "~Toista yltunniste"; + Text[ thai ] = "ทำส่วนหัว~ซ้ำ"; }; CheckBox CB_DONT_SPLIT { @@ -305,23 +311,24 @@ ModalDialog DLG_INSERT_TABLE Text[ portuguese_brazilian ] = "Don't split table"; Text[ portuguese ] = "No ~dividir tabela"; Text[ danish ] = "Opdel tabel ikke"; - Text[ french ] = "Ne pas ~diviser le tableau"; + Text[ french ] = "Ne pas ~scinder le tableau"; Text[ swedish ] = "Dela i~nte tabell"; Text[ dutch ] = "Tabel niet ~splitsen"; Text[ spanish ] = "~No dividir tabla"; Text[ english_us ] = "Don't split table"; - Text[ chinese_simplified ] = "ָ"; + Text[ chinese_simplified ] = "不分隔表格"; Text[ russian ] = " "; Text[ polish ] = "Nie dziel tabeli"; - Text[ japanese ] = "\\Ȃ"; - Text[ chinese_traditional ] = "}"; + Text[ japanese ] = "表を分割しない"; + Text[ chinese_traditional ] = "不分開表格"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "̺ иʱ"; + Text[ korean ] = "표 나누지 않음"; Text[ turkish ] = "Tabloyu tek sayfaya ~sdr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~No dividir tabla"; + Text[ catalan ] = "No parteixis la taula"; Text[ finnish ] = "l jaa taulukkoa"; + Text[ thai ] = "ไม่แยกตาราง"; }; CheckBox CB_BORDER { @@ -339,18 +346,50 @@ ModalDialog DLG_INSERT_TABLE Text[ dutch ] = "~Omranding"; Text[ spanish ] = "~Borde"; Text[ english_us ] = "Border"; - Text[ chinese_simplified ] = "߿"; + Text[ chinese_simplified ] = "边框"; Text[ russian ] = ""; Text[ polish ] = "Obramowanie"; - Text[ japanese ] = "g"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "枠"; + Text[ chinese_traditional ] = "邊框"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ܰ"; + Text[ korean ] = "테두리"; Text[ turkish ] = "~Kenarlk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Borde"; + Text[ catalan ] = "Vora"; Text[ finnish ] = "Reuna"; + Text[ thai ] = "เส้นขอบ"; + }; + PushButton BT_AUTOFORMAT + { + Pos = MAP_APPFONT ( 12 , 130 ) ; + Size = MAP_APPFONT ( 66 , 14 ) ; + TabStop = TRUE ; + Text = "~Autoformat..." ; + Text [ ENGLISH ] = "Autoformat..." ; + Text [ norwegian ] = "Autoformat..." ; + Text [ italian ] = "~Formatt. auto..." ; + Text [ portuguese_brazilian ] = "Formata??o Autom?tica..." ; + Text [ portuguese ] = "~AutoFormato..." ; + Text [ finnish ] = "Autom. ~muotoilu..." ; + Text [ danish ] = "AutoFormat..." ; + Text [ french ] = "~AutoFormat..." ; + Text [ swedish ] = "~Autoformat..." ; + Text [ dutch ] = "~AutoOpmaak..." ; + Text [ spanish ] = "~Formateado automtico..." ; + Text [ english_us ] = "Auto~Format..." ; + Text[ chinese_simplified ] = "自动格式(~F)..."; + Text[ russian ] = "..."; + Text[ polish ] = "Autoformat..."; + Text[ japanese ] = "オートフォーマット(~F)..."; + Text[ chinese_traditional ] = "自動格式(~F)..."; + Text[ arabic ] = " ..."; + Text[ greek ] = "~..."; + Text[ korean ] = "자동 서식(~F)..."; + Text[ turkish ] = "~Otom. formatlama..."; + Text[ language_user1 ] = " "; + Text[ catalan ] = "Auto~format..."; + Text[ thai ] = "~รูปแบบอัตโนมัติ..."; }; FixedLine FL_OPTIONS { @@ -367,18 +406,19 @@ ModalDialog DLG_INSERT_TABLE Text[ dutch ] = "Opties"; Text[ spanish ] = "Opciones"; Text[ english_us ] = "Options"; - Text[ chinese_simplified ] = "ѡ"; + Text[ chinese_simplified ] = "选项"; Text[ russian ] = ""; Text[ polish ] = "Opcje"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "ﶵ"; + Text[ japanese ] = "オプション"; + Text[ chinese_traditional ] = "選項"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ɼ"; + Text[ korean ] = "옵션"; Text[ turkish ] = "Seenekler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones"; + Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "ตัวเลือก"; }; OKButton BT_OK { @@ -399,49 +439,34 @@ ModalDialog DLG_INSERT_TABLE Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - PushButton BT_AUTOFORMAT - { - Pos = MAP_APPFONT ( 12 , 130 ) ; - Size = MAP_APPFONT ( 66 , 14 ) ; - TabStop = TRUE ; - Text = "~Autoformat..." ; - Text [ ENGLISH ] = "Autoformat..." ; - Text [ norwegian ] = "Autoformat..." ; - Text [ italian ] = "~Formatt. auto..." ; - Text [ portuguese_brazilian ] = "Formata??o Autom?tica..." ; - Text [ portuguese ] = "~AutoFormato..." ; - Text [ finnish ] = "~Automaattinen muotoilu" ; - Text [ danish ] = "AutoFormat..." ; - Text [ french ] = "~AutoFormat..." ; - Text [ swedish ] = "~Autoformat..." ; - Text [ dutch ] = "~AutoOpmaak..." ; - Text [ spanish ] = "Auto~Formato..." ; - Text [ english_us ] = "Auto~Format..." ; - Text[ chinese_simplified ] = "Զʽ(~F)..."; - Text[ russian ] = "..."; - Text[ polish ] = "Autoformat..."; - Text[ japanese ] = "̫ϯ(~F)..."; - Text[ chinese_traditional ] = "۰ʮ榡(~F)..."; - Text[ arabic ] = " ..."; - Text[ greek ] = "~..."; - Text[ korean ] = "ڵ(~F)..."; - Text[ turkish ] = "~Otom. formatlama..."; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Auto~Formato..."; - }; - Text[ chinese_simplified ] = ""; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "插入表格"; + Text[ russian ] = " "; Text[ polish ] = "Wstaw tabel"; - Text[ japanese ] = "\\̑}"; - Text[ chinese_traditional ] = "J"; + Text[ japanese ] = "表の挿入"; + Text[ chinese_traditional ] = "插入表格"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "̺ "; + Text[ korean ] = "표 삽입"; Text[ turkish ] = "Tablo ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar tabla"; + Text[ catalan ] = "Insereix una taula"; + Text[ thai ] = "แทรกตาราง"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src index b538028e7d2c..c8ac4092bcc6 100644 --- a/sw/source/ui/table/mergetbl.src +++ b/sw/source/ui/table/mergetbl.src @@ -2,9 +2,9 @@ * * $RCSfile: mergetbl.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:22:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,18 +106,19 @@ ModalDialog DLG_MERGE_TABLE Text [ french ] = "Mode" ; Text [ dutch ] = "Modus" ; Text [ portuguese ] = "Modo" ; - Text[ chinese_simplified ] = "ģʽ"; + Text[ chinese_simplified ] = "模式"; Text[ russian ] = ""; Text[ polish ] = "Tryb"; - Text[ japanese ] = "Ӱ"; - Text[ chinese_traditional ] = "Ҧ"; + Text[ japanese ] = "モード"; + Text[ chinese_traditional ] = "模式"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "모드"; Text[ turkish ] = "Kip"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modo"; + Text[ catalan ] = "Mode"; Text[ finnish ] = "Tila"; + Text[ thai ] = "โหมด"; }; RadioButton RB_MERGE_PREV { @@ -132,22 +133,23 @@ ModalDialog DLG_MERGE_TABLE Text[ russian ] = " "; Text[ dutch ] = "met de ~vorige tabel verbinden"; Text[ french ] = "Fusionner avec le tableau ~prcdent"; - Text[ spanish ] = "unir con la tabla ~anterior"; + Text[ spanish ] = "Unir con la tabla ~anterior"; Text[ italian ] = "Unisci alla tabella precedente"; Text[ danish ] = "flet med forrige tabel"; - Text[ swedish ] = "frbind med den ~fregende tabellen"; + Text[ swedish ] = "sammanfoga med den ~fregende tabellen"; Text[ polish ] = "Pocz z poprzedni tabel"; Text[ portuguese_brazilian ] = "Join with ~previous table"; - Text[ japanese ] = "O̕\\ƌ(~P)"; - Text[ chinese_simplified ] = "һϲ(~P)"; - Text[ chinese_traditional ] = "MW@ӪX(~P)"; + Text[ japanese ] = "前の表と結合(~P)"; + Text[ chinese_simplified ] = "和上一个表格合并(~P)"; + Text[ chinese_traditional ] = "和上一個表格合併(~P)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ̺ (~P)"; + Text[ korean ] = "이전 표에 연결(~P)"; Text[ turkish ] = "~nceki tablo ile birletir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "unir con la tabla ~anterior"; - Text[ finnish ] = "~Liit edelliseen taulukkoon"; + Text[ catalan ] = "Uneix a la taula ~anterior"; + Text[ finnish ] = "Liit ~edelliseen taulukkoon"; + Text[ thai ] = "ร่วมด้วยตาราง~ก่อน"; }; RadioButton RB_MERGE_NEXT { @@ -160,22 +162,23 @@ ModalDialog DLG_MERGE_TABLE Text[ russian ] = " "; Text[ dutch ] = "Met de v~olgende tabel verbinden"; Text[ french ] = "Fusionner avec le tableau ~suivant"; - Text[ spanish ] = "unir con la tabla ~siguiente"; + Text[ spanish ] = "Unir con la tabla ~siguiente"; Text[ italian ] = "Unisci alla tabella successiva"; Text[ danish ] = "flet med efterflgende tabel"; - Text[ swedish ] = "frbind med den ~efterfljande tabellen"; + Text[ swedish ] = "sammanfoga med den ~efterfljande tabellen"; Text[ polish ] = "Pocz z nastpn tabel"; Text[ portuguese_brazilian ] = "Join with ~next table"; - Text[ japanese ] = "̕\\ƌ(~N)"; - Text[ chinese_simplified ] = "һϲ(~N)"; - Text[ chinese_traditional ] = "MU@ӪX(~N)"; + Text[ japanese ] = "次の表と結合(~N)"; + Text[ chinese_simplified ] = "和下一个表格合并(~N)"; + Text[ chinese_traditional ] = "和下一個表格合併(~N)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ̺ (~N)"; + Text[ korean ] = "다음 표에 연결(~N)"; Text[ turkish ] = "S~onraki tablo ile birletir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "unir con la tabla ~siguiente"; - Text[ finnish ] = "~Liit seuraavaan taulukkoon"; + Text[ catalan ] = "uneix amb la taula ~segent"; + Text[ finnish ] = "Liit ~seuraavaan taulukkoon"; + Text[ thai ] = "ร่วมด้วยตาราง~ถัดไป"; }; Text[ english_us ] = "Merge Tables"; Text[ portuguese ] = "Unir tabelas"; @@ -185,21 +188,36 @@ ModalDialog DLG_MERGE_TABLE Text[ spanish ] = "unir tablas"; Text[ italian ] = "Unisci tabelle"; Text[ danish ] = "Flet tabeller"; - Text[ swedish ] = "Frbind tabeller"; + Text[ swedish ] = "Sammanfoga tabeller"; Text[ polish ] = "Sprzgaj tabele"; Text[ portuguese_brazilian ] = "Join tables"; - Text[ japanese ] = "\\̌"; - Text[ chinese_simplified ] = "ӱ"; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "表の結合"; + Text[ chinese_simplified ] = "连接表格"; + Text[ chinese_traditional ] = "連接表格"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ǥ "; + Text[ korean ] = "표 병합"; Text[ turkish ] = "Tablolar birletir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "unir tablas"; + Text[ catalan ] = "Fusiona les taules"; Text[ finnish ] = "Yhdist taulukot"; + Text[ thai ] = "ผสานตาราง"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/rowht.src b/sw/source/ui/table/rowht.src index 004a3bb2cbac..a6ca47982a89 100644 --- a/sw/source/ui/table/rowht.src +++ b/sw/source/ui/table/rowht.src @@ -2,9 +2,9 @@ * * $RCSfile: rowht.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:24:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,22 +132,23 @@ ModalDialog DLG_ROW_HEIGHT Text [ swedish ] = "anpassa ~dynamiskt" ; Text [ danish ] = "tilpas dynamisk" ; Text [ italian ] = "Altezza autom~atica" ; - Text [ spanish ] = "~ajuste dinmico" ; - Text [ french ] = "adaptation ~dynamique" ; + Text [ spanish ] = "~Ajuste dinmico" ; + Text [ french ] = "Adaptation dynamique" ; Text [ dutch ] = "~dynamisch aanpassen" ; Text [ portuguese_brazilian ] = "~dynamisch anpassen" ; Text [ portuguese ] = "Ajuste ~dinmico" ; - Text[ chinese_simplified ] = "Զ(~F)"; + Text[ chinese_simplified ] = "自动调整(~F)"; Text[ russian ] = " "; Text[ polish ] = "Dostosuj dynamicznie"; - Text[ japanese ] = "F߂(~F)"; - Text[ chinese_traditional ] = "۰ʳ̾Aվ(~F)"; + Text[ japanese ] = "増加を認める(~F)"; + Text[ chinese_traditional ] = "自動最適調整(~F)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ũ (~F)"; + Text[ korean ] = "크기에 맞춤(~F)"; Text[ turkish ] = "i~erik boyuna uydur"; - Text[ catalan ] = "~ajuste dinmico"; + Text[ catalan ] = "~Ajusta a la mida"; Text[ finnish ] = "~Sovita kokoon"; + Text[ thai ] = "~จัดพอดีขนาด"; }; FixedLine FL_HEIGHT { @@ -166,29 +167,42 @@ ModalDialog DLG_ROW_HEIGHT Text [ dutch ] = "Hoogte" ; Text [ spanish ] = "Altura" ; Text [ english_us ] = "Height" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "高度"; Text[ russian ] = ""; Text[ polish ] = "Wysoko"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "高さ"; + Text[ chinese_traditional ] = "高度"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "높이"; Text[ turkish ] = "Ykseklik"; - Text[ catalan ] = "Altura"; + Text[ catalan ] = "Alada"; + Text[ thai ] = "ความสูง"; }; - Text[ chinese_simplified ] = "и"; + Text[ chinese_simplified ] = "行高"; Text[ russian ] = " "; Text[ polish ] = "Wysoko wierszy"; - Text[ japanese ] = "s̍"; - Text[ chinese_traditional ] = "氪"; + Text[ japanese ] = "行の高さ"; + Text[ chinese_traditional ] = "行高"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "행 높이"; Text[ turkish ] = "Satr ykseklii"; - Text[ catalan ] = "Altura de fila"; + Text[ catalan ] = "Alada de fila"; + Text[ thai ] = "ความสูงของแถว"; }; + + + + + + + + + + + diff --git a/sw/source/ui/table/splittbl.src b/sw/source/ui/table/splittbl.src index b549734c6581..b2e6e8c33d25 100644 --- a/sw/source/ui/table/splittbl.src +++ b/sw/source/ui/table/splittbl.src @@ -2,9 +2,9 @@ * * $RCSfile: splittbl.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:26:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,18 +106,19 @@ ModalDialog DLG_SPLIT_TABLE Text [ french ] = "Mode" ; Text [ dutch ] = "Modus" ; Text [ portuguese ] = "Modo" ; - Text[ chinese_simplified ] = "ģʽ"; + Text[ chinese_simplified ] = "模式"; Text[ russian ] = ""; Text[ polish ] = "Tryb"; - Text[ japanese ] = "Ӱ"; - Text[ chinese_traditional ] = "Ҧ"; + Text[ japanese ] = "モード"; + Text[ chinese_traditional ] = "模式"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "모드"; Text[ turkish ] = "Kip"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modo"; + Text[ catalan ] = "Mode"; Text[ finnish ] = "Tila"; + Text[ thai ] = "โหมด"; }; RadioButton RB_CNTNT { @@ -134,20 +135,21 @@ ModalDialog DLG_SPLIT_TABLE Text [ danish ] = "Kopier overskrift" ; Text [ italian ] = "~Copia intestazione" ; Text [ spanish ] = "~Copiar encabezado" ; - Text [ french ] = "~Copier titre" ; + Text [ french ] = "~Copier le titre" ; Text [ dutch ] = "~Kop kopiren" ; - Text[ chinese_simplified ] = "Ʊ(~C)"; + Text[ chinese_simplified ] = "复制标题(~C)"; Text[ russian ] = " "; Text[ polish ] = "Kopiuj tytu"; - Text[ japanese ] = "o̺߰(~C)"; - Text[ chinese_traditional ] = "ƻsD(~C)"; + Text[ japanese ] = "見出しのコピー(~C)"; + Text[ chinese_traditional ] = "複製標題(~C)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~C)"; + Text[ korean ] = "제목 복사(~C)"; Text[ turkish ] = "B~al kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Copiar encabezado"; + Text[ catalan ] = "~Copia encapalament"; Text[ finnish ] = "~Kopioi otsikko"; + Text[ thai ] = "~คัดลอกหัวข้อ"; }; RadioButton RB_BOX_PARA { @@ -161,21 +163,22 @@ ModalDialog DLG_SPLIT_TABLE Text [ swedish ] = "~Egen verskrift, med formatmall" ; Text [ danish ] = "Egen overskrift, med typografi" ; Text [ italian ] = "~Propria intestazione con modello" ; - Text [ spanish ] = "~Encabezado propio, con estilos" ; + Text [ spanish ] = "~Encabezado propio (aplicar estilo)" ; Text [ french ] = "Titre personnalis, avec ~style" ; Text [ dutch ] = "~Eigen kop, met opmaakprofiel" ; - Text[ chinese_simplified ] = "Զ⣬ʽ(~U)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "自定标题，带样式(~U)"; + Text[ russian ] = " ( )"; Text[ polish ] = "Tytu uytkownika, z szablonem"; - Text[ japanese ] = "ٕtհް`̌o(~U)"; - Text[ chinese_traditional ] = "ۭqDAa˦(~U)"; + Text[ japanese ] = "スタイル付きユーザー定義の見出し(~U)"; + Text[ chinese_traditional ] = "自訂標題，帶樣式(~U)"; Text[ arabic ] = " ( )"; Text[ greek ] = " ( )"; - Text[ korean ] = " 룩(~U)"; + Text[ korean ] = "스타일이 표함된 사용자 정의 제목(~U)"; Text[ turkish ] = "~zel balk (biim uygula)"; Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; - Text[ catalan ] = "~Encabezado propio, con estilos"; + Text[ catalan ] = "~Encapalament propi, amb estils"; Text[ finnish ] = "~Mukautettu otsikko (kyt tyyli)"; + Text[ thai ] = "กำ~หนดหัวข้อเอง (ใช้ลักษณะ)"; }; RadioButton RB_BOX_NOPARA { @@ -190,20 +193,21 @@ ModalDialog DLG_SPLIT_TABLE Text [ danish ] = "Egen overskrift" ; Text [ italian ] = "Propria ~intestazione" ; Text [ spanish ] = "Encabezado ~propio" ; - Text [ french ] = "Titre ~personnalis" ; + Text [ french ] = "Titre personnalis" ; Text [ dutch ] = "E~igen kop" ; - Text[ chinese_simplified ] = "Զ(~S)"; + Text[ chinese_simplified ] = "自定标题(~S)"; Text[ russian ] = " "; Text[ polish ] = "Tytu uytkownika"; - Text[ japanese ] = "հް`̌o(~S)"; - Text[ chinese_traditional ] = "ۭqD(~S)"; + Text[ japanese ] = "ユーザー定義の見出し(~S)"; + Text[ chinese_traditional ] = "自訂標題(~S)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~S)"; + Text[ korean ] = "사용자 제목(~S)"; Text[ turkish ] = "~zel balk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado ~propio"; - Text[ finnish ] = "~Mukautettu otsikko"; + Text[ catalan ] = "Encapalament ~propi"; + Text[ finnish ] = "Mukautettu otsikko"; + Text[ thai ] = "กำหน~ดหัวข้อเอง"; }; RadioButton RB_BORDER { @@ -218,20 +222,21 @@ ModalDialog DLG_SPLIT_TABLE Text [ danish ] = "Ingen overskrift" ; Text [ italian ] = "~Senza intestazione" ; Text [ spanish ] = "~Sin encabezado" ; - Text [ french ] = "~Pas de titre" ; + Text [ french ] = "Aucun titre" ; Text [ dutch ] = "~Geen kop" ; - Text[ chinese_simplified ] = "ޱ(~N)"; + Text[ chinese_simplified ] = "无标题(~N)"; Text[ russian ] = " "; Text[ polish ] = "Bez tytuu"; - Text[ japanese ] = "oȂ(~N)"; - Text[ chinese_traditional ] = "LD(~N)"; + Text[ japanese ] = "見出しなし(~N)"; + Text[ chinese_traditional ] = "無標題(~N)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~N)"; + Text[ korean ] = "제목 없음(~N)"; Text[ turkish ] = "~Balk yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Sin encabezado"; + Text[ catalan ] = "~Sense encapalement"; Text[ finnish ] = "~Ei otsikkoa"; + Text[ thai ] = "ไ~ม่มีหัวข้อ"; }; Text [ english_us ] = "Split Table" ; Text [ portuguese_brazilian ] = "Tabelle auftrennen" ; @@ -239,23 +244,35 @@ ModalDialog DLG_SPLIT_TABLE Text [ danish ] = "Opdel tabel" ; Text [ italian ] = "Dividi tabella" ; Text [ spanish ] = "Dividir tabla" ; - Text [ french ] = "Scinder le tableau" ; - Text [ dutch ] = "Tabel splitsen" ; + Text [ french ] = "Scission de tableau" ; + Text [ dutch ] = "Tabel opsplitsen" ; Text [ portuguese ] = "Dividir tabela" ; - Text[ chinese_simplified ] = "ָ"; + Text[ chinese_simplified ] = "分隔表格"; Text[ russian ] = " "; Text[ polish ] = "Rozdziel tabel"; - Text[ japanese ] = "\\̕"; - Text[ chinese_traditional ] = "}"; + Text[ japanese ] = "表の分割"; + Text[ chinese_traditional ] = "分開表格"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ǥ "; + Text[ korean ] = "표 나누기"; Text[ turkish ] = "Tabloyu bl"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dividir tabla"; + Text[ catalan ] = "Divideix la taula"; Text[ finnish ] = "Jaa taulukko"; + Text[ thai ] = "แยกตาราง"; }; + + + + + + + + + + + diff --git a/sw/source/ui/table/table.src b/sw/source/ui/table/table.src index 5a19f31deb26..6f4d0ecbb7db 100644 --- a/sw/source/ui/table/table.src +++ b/sw/source/ui/table/table.src @@ -2,9 +2,9 @@ * * $RCSfile: table.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-07-14 03:10:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,18 +75,27 @@ InfoBox MSG_ERR_TABLE_MERGE MESSAGE [ dutch ] = "De geselecteerde tabelcellen zijn te complex voor samenvoeging." ; MESSAGE [ spanish ] = "Las celdas seleccionadas de la tabla son demasiado complejas para enlazarlas." ; MESSAGE [ english_us ] = "Selected table cells are too complex to merge." ; - MESSAGE[ chinese_simplified ] = "ѡıԪ̫ۺ϶ϲ"; - MESSAGE[ russian ] = " ."; + MESSAGE[ chinese_simplified ] = "所选择的表格单元格太综合而无法合并。"; + MESSAGE[ russian ] = " ."; MESSAGE[ polish ] = "Zaznaczone komrki tabeli s zbyt komplekowe, aby je sprzga."; - MESSAGE[ japanese ] = "Iꂽ\\̾ق́Aɂ͕G߂܂B"; - MESSAGE[ chinese_traditional ] = "ҿܪxsӺXӵLkX֡C"; + MESSAGE[ japanese ] = "選択された表のセルは、結合するには複雑過ぎます。"; + MESSAGE[ chinese_traditional ] = "所選擇的表格儲存格太綜合而無法合併。"; MESSAGE[ arabic ] = " ."; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "õ ǥ ϱ ʹ մϴ."; + MESSAGE[ korean ] = "표의 선택된 셀은 병합하기에 너무 복잡합니다."; MESSAGE[ turkish ] = "Seilen tablo hcreleri birletirilmek iin fazla karmak."; - MESSAGE[ catalan ] = "Las celdas seleccionadas de la tabla son demasiado complejas para enlazarlas."; + MESSAGE[ catalan ] = "Les cel.les seleccionades de la taula sn massa complexes per poder-les enllaar."; + MESSAGE[ thai ] = "เลือกตารางเซลล์ซับซ้อนเกินไปในการผสาน"; }; + + + + + + + + diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src index 3e72f0fe299c..d07106d01e83 100644 --- a/sw/source/ui/table/tabledlg.src +++ b/sw/source/ui/table/tabledlg.src @@ -2,9 +2,9 @@ * * $RCSfile: tabledlg.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: os $ $Date: 2002-06-17 12:14:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ Text [ spanish ] = "Flujo del texto" ; \ Text [ english_us ] = "Text Flow" ; \ Text[ chinese_simplified ] = "换行和分页"; \ - Text[ russian ] = " "; \ + Text[ russian ] = " "; \ Text[ polish ] = "Tekst"; \ Text[ japanese ] = "体裁"; \ Text[ chinese_traditional ] = "換行和分頁"; \ @@ -86,7 +86,7 @@ Text[ korean ] = "텍스트 흐름"; \ Text[ turkish ] = "Metin ak"; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "Flujo del texto"; \ + Text[ catalan ] = "Flux del text"; \ Text[ thai ] = "การไหลของข้อความ"; /**************************************************************************/ @@ -141,10 +141,10 @@ TabDialog DLG_FORMAT_TABLE Text[ chinese_traditional ] = "表格"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabla"; + Text[ catalan ] = "Taula"; Text[ thai ] = "ตาราง"; }; PageItem @@ -179,7 +179,7 @@ TabDialog DLG_FORMAT_TABLE Text[ korean ] = "열"; Text[ turkish ] = "Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = "Columnes"; Text[ thai ] = "คอลัมน์"; }; PageItem @@ -196,7 +196,7 @@ TabDialog DLG_FORMAT_TABLE Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; PageResID = TP_BORDER ; Text[ chinese_simplified ] = "边框"; @@ -209,7 +209,7 @@ TabDialog DLG_FORMAT_TABLE Text[ korean ] = "테두리"; Text[ turkish ] = "Kenarlk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; Text[ thai ] = "เส้นขอบ"; }; PageItem @@ -239,13 +239,13 @@ TabDialog DLG_FORMAT_TABLE Text[ korean ] = "배경"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; Text[ thai ] = "พื้นหลัง"; }; }; }; Text[ chinese_simplified ] = "表格格式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Format tabeli"; Text[ japanese ] = "表の書式"; Text[ chinese_traditional ] = "表格格式"; @@ -254,7 +254,7 @@ TabDialog DLG_FORMAT_TABLE Text[ korean ] = "표 서식"; Text[ turkish ] = "Tablo format"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formato de tabla"; + Text[ catalan ] = "Format de la taula"; Text[ thai ] = "รูปแบบตาราง"; }; /**************************************************************************/ @@ -293,7 +293,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "이름(~N)"; Text[ turkish ] = "~Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nombre"; + Text[ catalan ] = "~Nom"; Text[ finnish ] = "~Nimi"; Text[ thai ] = "~ชื่อ"; }; @@ -331,7 +331,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "너비(~I)"; Text[ turkish ] = "G~enilik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ncho"; + Text[ catalan ] = "~Amplada"; Text[ thai ] = "ความก~ว้าง"; }; MetricField ED_WIDTH @@ -369,16 +369,16 @@ TabPage TP_FORMAT_TABLE Text [ portuguese_brazilian ] = "Relati~v" ; Text [ portuguese ] = "Relat~ivo" ; Text[ chinese_simplified ] = "相对的(~V)"; - Text[ russian ] = "."; + Text[ russian ] = ""; Text[ polish ] = "Wz~gldny"; Text[ japanese ] = "パーセント表示(~V)"; Text[ chinese_traditional ] = "相對的(~V)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "비례(~V)"; + Text[ korean ] = "비례하여(~V)"; Text[ turkish ] = "Greceli"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Relati~vo"; + Text[ catalan ] = "Relati~u"; Text[ finnish ] = "~Suhteellinen"; Text[ thai ] = "สัมพัท~ธ์"; }; @@ -406,10 +406,10 @@ TabPage TP_FORMAT_TABLE Text[ chinese_traditional ] = "屬性"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "특성"; + Text[ korean ] = "등록 정보"; Text[ turkish ] = "zellikler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Propiedades"; + Text[ catalan ] = "Propietats"; Text[ thai ] = "คุณสมบัติ"; }; RadioButton RB_FULL @@ -420,7 +420,7 @@ TabPage TP_FORMAT_TABLE Text = "~Automatisch" ; Text [ ENGLISH ] = "~Automatic" ; Text [ italian ] = "Automatico" ; - Text [ finnish ] = "A~utomaattinen" ; + Text [ finnish ] = "Automaattinen" ; Text [ swedish ] = "~Automatiskt" ; Text [ dutch ] = "~Automatisch" ; Text [ english_us ] = "A~utomatic" ; @@ -439,7 +439,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "자동(~U)"; Text[ turkish ] = "Otomatik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Au~tomtica"; + Text[ catalan ] = "Au~tomtica"; Text[ thai ] = "อั~ตโนมัติ"; }; RadioButton RB_LEFT @@ -452,7 +452,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "Sinistra" ; Text [ portuguese_brazilian ] = "~Esquerda" ; Text [ portuguese ] = "~Esquerda" ; - Text [ finnish ] = "~Vasen:" ; + Text [ finnish ] = "Vasen" ; Text [ danish ] = "Venstre" ; Text [ french ] = " gauche" ; Text [ swedish ] = "Vn~ster" ; @@ -470,7 +470,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "왼쪽(~L)"; Text[ turkish ] = "S~ola"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Izquierda"; + Text[ catalan ] = "~Esquerra"; Text[ thai ] = "~ซ้าย"; }; RadioButton RB_FROM_LEFT @@ -482,7 +482,7 @@ TabPage TP_FORMAT_TABLE TabStop = TRUE ; Text[ english_us ] = "~From left"; Text[ portuguese ] = "~Esquerda"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ greek ] = "A "; Text[ dutch ] = "~Van links"; Text[ french ] = "De gauche"; @@ -498,8 +498,8 @@ TabPage TP_FORMAT_TABLE Text[ chinese_traditional ] = "從左(~F)"; Text[ arabic ] = " "; Text[ turkish ] = "S~oldan"; - Text[ catalan ] = "De iz~quierda"; - Text[ finnish ] = "~Vasemmalta"; + Text[ catalan ] = "~Des de l'esquerra"; + Text[ finnish ] = "Vasemmalta"; Text[ thai ] = "~จากด้านซ้าย"; }; RadioButton RB_RIGHT @@ -512,7 +512,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "Destra" ; Text [ portuguese_brazilian ] = "~Direita" ; Text [ portuguese ] = "~Direita" ; - Text [ finnish ] = "~Oikea" ; + Text [ finnish ] = "Oikea" ; Text [ danish ] = "Hjre" ; Text [ french ] = " droite" ; Text [ swedish ] = "Hge~r" ; @@ -530,7 +530,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "오른쪽(~I)"; Text[ turkish ] = "Sa~a"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Derecha"; + Text[ catalan ] = "D~reta"; Text[ thai ] = "ข~วา"; }; RadioButton RB_CENTER @@ -543,7 +543,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "~Centrato" ; Text [ portuguese_brazilian ] = "~Centralizado" ; Text [ portuguese ] = "~Centrado" ; - Text [ finnish ] = "~Keskit" ; + Text [ finnish ] = "Keskit" ; Text [ danish ] = "Centreret" ; Text [ french ] = "Centr" ; Text [ swedish ] = "~Centrerat" ; @@ -561,7 +561,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "가운데(~C)"; Text[ turkish ] = "~Ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Centrado"; + Text[ catalan ] = "~Centrat"; Text[ thai ] = "~ตรงกลาง"; }; RadioButton RB_FREE @@ -591,7 +591,7 @@ TabPage TP_FORMAT_TABLE Text[ turkish ] = "~Manel"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Manual"; - Text[ finnish ] = "~Manuaalinen"; + Text[ finnish ] = "Manuaalinen"; Text[ thai ] = "~ด้วยตนเอง"; }; FixedLine FL_POS @@ -621,7 +621,7 @@ TabPage TP_FORMAT_TABLE Text[ greek ] = ""; Text[ korean ] = "맞춤"; Text[ turkish ] = "Hizalama"; - Text[ catalan ] = "Alineacin"; + Text[ catalan ] = "Alineament"; Text[ thai ] = "จัดตำแหน่ง"; }; FixedLine FL_DIST @@ -634,7 +634,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "Distanze" ; Text [ portuguese_brazilian ] = "Dist?ncia" ; Text [ portuguese ] = "Espaamento" ; - Text [ finnish ] = "Objektivlit" ; + Text [ finnish ] = "Vlit" ; Text [ danish ] = "Afstand" ; Text [ french ] = "carts" ; Text [ swedish ] = "Avstnd" ; @@ -642,7 +642,7 @@ TabPage TP_FORMAT_TABLE Text [ spanish ] = "Espacios" ; Text [ english_us ] = "Spacing" ; Text[ chinese_simplified ] = "间隔"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Odstpy"; Text[ japanese ] = "間隔"; Text[ chinese_traditional ] = "間隔"; @@ -651,7 +651,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "간격"; Text[ turkish ] = "Aralk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Espacios"; + Text[ catalan ] = "Espaiat"; Text[ thai ] = "ระยะห่าง"; }; FixedText FT_LEFT_DIST @@ -664,8 +664,8 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "A sinistra" ; Text [ portuguese_brazilian ] = "Para a esqueda" ; Text [ portuguese ] = " esqueda" ; - Text [ finnish ] = "~Vasen" ; - Text [ danish ] = "Til venstre" ; + Text [ finnish ] = "Vasen" ; + Text [ danish ] = "T~il venstre" ; Text [ french ] = " gauche" ; Text [ swedish ] = "Till vns~ter" ; Text [ dutch ] = "~Naar links" ; @@ -681,7 +681,7 @@ TabPage TP_FORMAT_TABLE Text[ greek ] = " "; Text[ korean ] = "왼쪽(~T)"; Text[ turkish ] = "S~ola"; - Text[ catalan ] = "Hacia la i~zda."; + Text[ catalan ] = "Esquer~ra"; Text[ thai ] = "ซ้า~ย"; }; MetricField ED_LEFT_DIST @@ -711,7 +711,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "A destra" ; Text [ portuguese_brazilian ] = "Para a direita" ; Text [ portuguese ] = " direita" ; - Text [ finnish ] = "Oi~kea" ; + Text [ finnish ] = "Oikea" ; Text [ danish ] = "Til hjre" ; Text [ french ] = " droite" ; Text [ swedish ] = "Till h~ger" ; @@ -728,7 +728,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "오른쪽(~G)"; Text[ turkish ] = "Sa~a"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hacia la d~cha."; + Text[ catalan ] = "Dre~ta"; Text[ thai ] = "ข~วา"; }; @@ -776,7 +776,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "위(~A)"; Text[ turkish ] = "n~ce"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hacia ~arriba"; + Text[ catalan ] = "~A sobre"; Text[ thai ] = "~ข้างบน"; }; MetricField ED_TOP_DIST @@ -806,7 +806,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "In basso" ; Text [ portuguese_brazilian ] = "Para a ~base" ; Text [ portuguese ] = "Para ~baixo" ; - Text [ finnish ] = "~Alhaalla" ; + Text [ finnish ] = "Alhaalla" ; Text [ danish ] = "Forneden" ; Text [ french ] = "Vers le bas" ; Text [ swedish ] = "N~ere" ; @@ -823,7 +823,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "아래(~B)"; Text[ turkish ] = "So~nra"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hacia a~bajo"; + Text[ catalan ] = "~Sota"; Text[ thai ] = "ข้าง~ล่าง"; }; MetricField ED_BOTTOM_DIST @@ -850,6 +850,27 @@ TabPage TP_FORMAT_TABLE Hide = TRUE ; Text = "Eigenschaften" ; Text [ ENGLISH ] = "Properties" ; + Text[ english_us ] = "Properties"; + Text[ portuguese ] = "Properties"; + Text[ russian ] = "Properties"; + Text[ greek ] = "Properties"; + Text[ dutch ] = "Properties"; + Text[ french ] = "Proprits"; + Text[ spanish ] = "Propiedades"; + Text[ finnish ] = "Properties"; + Text[ italian ] = "Propriet"; + Text[ danish ] = "Properties"; + Text[ swedish ] = "Egenskaper"; + Text[ polish ] = "Properties"; + Text[ japanese ] = "属性"; + Text[ korean ] = "등록 정보"; + Text[ chinese_simplified ] = "属性"; + Text[ chinese_traditional ] = "屬性"; + Text[ turkish ] = "Properties"; + Text[ arabic ] = "Properties"; + Text[ catalan ] = "Opcions"; + Text[ thai ] = "คุณสมบัติ"; + Text[ portuguese_brazilian ] = "Propriedades"; }; FixedText FT_TEXTDIRECTION { @@ -858,6 +879,24 @@ TabPage TP_FORMAT_TABLE Hide = TRUE ; Text = "~Textfluss" ; Text [ ENGLISH ] = "Text ~direction" ; + Text[ english_us ] = "Text ~direction"; + Text[ portuguese ] = "Text ~direction"; + Text[ russian ] = "Text ~direction"; + Text[ greek ] = "Text ~direction"; + Text[ dutch ] = "Text ~direction"; + Text[ french ] = "Orientation du texte"; + Text[ spanish ] = "~Direccin de escritura"; + Text[ finnish ] = "Text ~direction"; + Text[ italian ] = "Testo"; + Text[ danish ] = "Text ~direction"; + Text[ swedish ] = "Te~xtriktning"; + Text[ polish ] = "Text ~direction"; + Text[ japanese ] = "文字方向"; + Text[ korean ] = "텍스트 방향"; + Text[ chinese_simplified ] = "文字方向"; + Text[ chinese_traditional ] = "文字方向"; + Text[ turkish ] = "Text ~direction"; + Text[ arabic ] = "Text ~direction"; }; ListBox LB_TEXTDIRECTION { @@ -868,8 +907,8 @@ TabPage TP_FORMAT_TABLE Hide = TRUE ; StringList = { - < "Links nach rechts" ; 0; > ; - < "Rechts nach links" ; 1; > ; + < "Links-nach-rechts" ; 0; > ; + < "Rechts-nach-links" ; 1; > ; < "Einstellungen des bergeordneten Objektes verwenden" ; 4; > ; }; StringList [ ENGLISH ] = @@ -878,6 +917,66 @@ TabPage TP_FORMAT_TABLE < "Right-to-left" ; 1; > ; < "Use superordinate settings" ; 4; > ; }; + StringList [ english_us ] = + { + < "Left-to-right" ; 0; > ; + < "Right-to-left" ; 1; > ; + < "Use superordinate object settings" ; 4; > ; + }; + StringList [ japanese ] = + { + < "左から右へ" ; 0; > ; + < "右から左へ" ; 1; > ; + < "周りのテキストの文字方向に合わせる" ; 4; > ; + }; + StringList [ language_user1 ] = + { + < "Links nach rechts" ; 0; > ; + < "Rechts nach links" ; 1; > ; + < "Einstellungen des bergeordneten Objektes verwenden" ; 4; > ; + }; + StringList [ korean ] = + { + < "왼쪽에서 오른쪽으로" ; 0; > ; + < "오른쪽에서 왼쪽으로" ; 1; > ; + < "현재 문자 방향의 설정 적용" ; 4; > ; + }; + StringList [ chinese_traditional ] = + { + < "從左向右" ; 0; > ; + < "從右向左" ; 1; > ; + < "沿用現有的文字方向的設定" ; 4; > ; + }; + StringList [ french ] = + { + < "De gauche droite" ; 0; > ; + < "De droite gauche" ; 1; > ; + < "Utiliser les paramtres de l'objet suprieur" ; 4; > ; + }; + StringList [ italian ] = + { + < "Da sinistra a destra" ; 0; > ; + < "Da destra a sinistra" ; 1; > ; + < "Usa le impostazioni dell'oggetto superiore" ; 4; > ; + }; + StringList [ chinese_simplified ] = + { + < "从左向右" ; 0; > ; + < "从右向左" ; 1; > ; + < "沿用现有的文字方向的设定" ; 4; > ; + }; + StringList [ swedish ] = + { + < "Vnster-till-hger" ; 0; > ; + < "Hger-till-vnster" ; 1; > ; + < "Anvnd det verordnade objektets instllningar" ; 4; > ; + }; + StringList [ spanish ] = + { + < "De izquierda a derecha" ; 0; > ; + < "De derecha a izquierda" ; 1; > ; + < "Utilizar la configuracin del objeto superior. " ; 4; > ; + }; }; }; /**************************************************************************/ @@ -903,7 +1002,7 @@ TabPage TP_TABLE_COLUMN Text [ dutch ] = "~Tabelbreedte aanpassen" ; Text [ english_us ] = "Adapt table ~width" ; Text [ swedish ] = "Anpassa ~tabellbredd" ; - Text [ danish ] = "Tilpas tabelbredde" ; + Text [ danish ] = "T~ilpas tabelbredde" ; Text [ portuguese_brazilian ] = "Tabellenbreite anpassen" ; Text [ portuguese ] = "A~justar largura da tabela" ; Text[ chinese_simplified ] = "调整表格宽度(~W)"; @@ -913,10 +1012,10 @@ TabPage TP_TABLE_COLUMN Text[ chinese_traditional ] = "調整表格寬度(~W)"; Text[ arabic ] = " "; Text[ greek ] = " ~ "; - Text[ korean ] = "표 너비 맞춤(~W)"; + Text[ korean ] = "표 너비 조정(~W)"; Text[ turkish ] = "Tablo geniliine gre ayarla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Ajustar ancho de la tabla"; + Text[ catalan ] = "Adap~ta l'amplada de la taula"; Text[ finnish ] = "Sovita taulukon ~leveys"; Text[ thai ] = "ปรับความ~กว้างตาราง"; }; @@ -930,14 +1029,14 @@ TabPage TP_TABLE_COLUMN Text [ english_us ] = "Ad~just columns proportionally" ; Text [ portuguese_brazilian ] = "Spalten proportional ?ndern" ; Text [ swedish ] = "ndra ~kolumner proportionellt" ; - Text [ danish ] = "Modificer kolonner jvnt" ; + Text [ danish ] = "~Modificer kolonner jvnt" ; Text [ italian ] = "Modifica colonne proporzionalmente" ; Text [ spanish ] = "~Modificar columnas proporcionalmente" ; Text [ french ] = "Modifier les colonnes ~proportionnellement" ; Text [ dutch ] = "~Kolommen gelijkmatig wijzigen" ; Text [ portuguese ] = "Ajustar colunas ~proporcionalmente" ; Text[ chinese_simplified ] = "对称地调整列宽(~J)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Z~modyfikuj rwnomiernie kolumny"; Text[ japanese ] = "全列を同様に調整(~J)"; Text[ chinese_traditional ] = "對稱調整欄寬(~J)"; @@ -946,7 +1045,7 @@ TabPage TP_TABLE_COLUMN Text[ korean ] = "열 일정하게 변경(~J)"; Text[ turkish ] = "Stunlar orantl deitir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Modificar columnas proporcionalmente"; + Text[ catalan ] = "A~justa les columnes proporcionalment"; Text[ finnish ] = "~Sd sarakkeet suhteessa"; Text[ thai ] = "ปรั~บสัดส่วนคอลัมน์"; }; @@ -966,16 +1065,16 @@ TabPage TP_TABLE_COLUMN Text [ portuguese ] = "Espao restante" ; Text [ portuguese_brazilian ] = "Noch verf?barer Platz" ; Text[ chinese_simplified ] = "还有现存可用空间"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Miejsce do dyspozycji"; Text[ japanese ] = "残りのスペース"; Text[ chinese_traditional ] = "還有現存可用空間"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "아직 사용가능한 공간"; + Text[ korean ] = "남아 있는 공간"; Text[ turkish ] = "Kalan boluk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Espacio disponible"; + Text[ catalan ] = "Espai restant"; Text[ finnish ] = "Tilaa jljell"; Text[ thai ] = "ระยะห่างที่เหลือ"; }; @@ -1201,7 +1300,7 @@ TabPage TP_TABLE_COLUMN Text[ korean ] = "열 너비"; Text[ turkish ] = "Stun genilii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho de columna"; + Text[ catalan ] = "Amplada de columna"; Text[ thai ] = "ความกว้างคอลัมน์"; }; }; @@ -1233,7 +1332,7 @@ TabPage TP_TABLE_TEXTFLOW Text [ italian ] = "I~nterruzione" ; Text [ portuguese_brazilian ] = "~Interrup??o" ; Text [ portuguese ] = "~Quebra" ; - Text [ finnish ] = "~Keskeytys" ; + Text [ finnish ] = "~Vaihto" ; Text [ danish ] = "Skift" ; Text [ french ] = "~Saut" ; Text [ swedish ] = "~Brytning" ; @@ -1252,7 +1351,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "나누기(~B)"; Text[ turkish ] = "Kesme"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Salto"; + Text[ catalan ] = "~Salt"; Text[ thai ] = "แ~บ่ง"; }; RadioButton RB_BREAKPAGE @@ -1284,7 +1383,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "페이지(~P)"; Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Pgina"; + Text[ catalan ] = "~Pgina"; Text[ thai ] = "~หน้า"; }; RadioButton RB_BREAKCOLUMN @@ -1340,16 +1439,16 @@ TabPage TP_TABLE_TEXTFLOW Group = TRUE ; Check = TRUE ; Text[ chinese_simplified ] = "之前(~F)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "przed"; Text[ japanese ] = "前(~F)"; Text[ chinese_traditional ] = "之前(~F)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "전에(~F)"; + Text[ korean ] = "앞(~F)"; Text[ turkish ] = "n~ce"; Text[ language_user1 ] = " "; - Text[ catalan ] = "delan~te"; + Text[ catalan ] = "A~bans"; Text[ thai ] = "ก่อ~น"; }; RadioButton RB_PAGEBREAKAFTER @@ -1371,16 +1470,16 @@ TabPage TP_TABLE_TEXTFLOW Text [ spanish ] = "~Detrs" ; Text [ english_us ] = "~After" ; Text[ chinese_simplified ] = "之后(~A)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "za"; Text[ japanese ] = "後(~A)"; Text[ chinese_traditional ] = "之後(~A)"; Text[ arabic ] = ""; Text[ greek ] = " "; - Text[ korean ] = "이후(~A)"; + Text[ korean ] = "뒤(~A)"; Text[ turkish ] = "Son~ra"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~detrs"; + Text[ catalan ] = "~Desprs"; Text[ thai ] = "~หลังจาก"; }; CheckBox CB_PAGECOLL @@ -1410,10 +1509,10 @@ TabPage TP_TABLE_TEXTFLOW Text[ chinese_traditional ] = "帶頁面樣式(~Y)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "페이지 스타일과 함께(~Y)"; + Text[ korean ] = "페이지 스타일 포함(~Y)"; Text[ turkish ] = "Sayfa dzeni ile"; Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; - Text[ catalan ] = "C~on estilo de pgina"; + Text[ catalan ] = "Amb est~il de pgina"; Text[ thai ] = "ด้วยลัก~ษณะหน้า"; }; ListBox LB_PAGECOLL @@ -1448,7 +1547,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "페이지 번호(~N)"; Text[ turkish ] = "Sayfa ~numaralar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N~mero de pgina"; + Text[ catalan ] = "N~mero de pgina"; Text[ finnish ] = "~Sivunumero"; Text[ thai ] = "เ~ลขหน้า"; }; @@ -1490,10 +1589,10 @@ TabPage TP_TABLE_TEXTFLOW Text[ chinese_traditional ] = "不分開表格(~D)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "표 나누지 않음.(~D)"; + Text[ korean ] = "표 나누지 않음(~D)"; Text[ turkish ] = "Tabloyu ayrma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~No dividir tabla"; + Text[ catalan ] = "N~o divideixis la taula"; Text[ finnish ] = "~l jaa taulukkoa"; Text[ thai ] = "ไ~ม่แยกตาราง"; }; @@ -1504,10 +1603,10 @@ TabPage TP_TABLE_TEXTFLOW Text = "Mit folgendem Absatz ~zusammenhalten" ; Text [ ENGLISH ] = "~keep with next" ; TabStop = TRUE ; - Text [ english_us ] = "~keep with next paragraph" ; + Text [ english_us ] = "~Keep with next paragraph" ; Text [ portuguese_brazilian ] = "Mit folgendem Absatz ~zusammenhalten" ; Text [ swedish ] = "Hll ih~op med fljande stycke" ; - Text [ danish ] = "Hold sammen med nste afsnit" ; + Text [ danish ] = "Ho~ld sammen med nste afsnit" ; Text [ italian ] = "Non separare dal paragrafo seguente." ; Text [ spanish ] = "Mantener ~junto al prrafo siguiente" ; Text [ french ] = "~Ne pas sparer du paragraphe suivant" ; @@ -1523,8 +1622,8 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "다음 단락을 같은 페이지에(~K)"; Text[ turkish ] = "Alttaki paragraf ile birlikte tut"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mantener ~junto al prrafo siguiente"; - Text[ finnish ] = "~sido seuraavaan kappaleeseen"; + Text[ catalan ] = "~Conserva amb el pargraf segent"; + Text[ finnish ] = "Si~do seuraavaan kappaleeseen"; Text[ thai ] = "~ตามด้วยย่อหน้าถัดไป"; }; CheckBox CB_HEADLINE @@ -1555,7 +1654,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "제목 반복(~E)"; Text[ turkish ] = "Bal yinele"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Repet~ir encabezado"; + Text[ catalan ] = "R~epeteix l'encapalament"; Text[ thai ] = "ทำหัวข้อ~ซ้ำ"; }; FixedLine FL_VERT_ORIENT @@ -1570,7 +1669,7 @@ TabPage TP_TABLE_TEXTFLOW Text [ italian ] = "Allineamento verticale" ; Text [ spanish ] = "Alineacin vertical" ; Text [ french ] = "Alignement vertical" ; - Text [ dutch ] = "Verticale uitlijning" ; + Text [ dutch ] = "Verticale tekstuitlijning" ; Text [ portuguese_brazilian ] = "Vertikale Ausrichtung" ; Text [ portuguese ] = "Alinhamento vertical" ; Text[ chinese_simplified ] = "垂直方向对齐"; @@ -1583,7 +1682,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "수직 맞춤"; Text[ turkish ] = "Dikey hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineacin vertical"; + Text[ catalan ] = "Alineament vertical"; Text[ finnish ] = "Tasaus pystysuunnassa"; Text[ thai ] = "จัดชิดแนวตั้ง"; }; @@ -1595,7 +1694,7 @@ TabPage TP_TABLE_TEXTFLOW Text [ ENGLISH ] = "Top" ; Text [ english_us ] = "T~op" ; Text [ swedish ] = "~Uppe" ; - Text [ danish ] = "Top" ; + Text [ danish ] = "To~p" ; Text [ italian ] = "Alto" ; Text [ spanish ] = "~Arriba" ; Text [ french ] = "En haut" ; @@ -1612,8 +1711,8 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "위(~O)"; Text[ turkish ] = "Orta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Arriba"; - Text[ finnish ] = "~Ylosa"; + Text[ catalan ] = "S~uperior"; + Text[ finnish ] = "~Ylreuna"; Text[ thai ] = "บ~น"; }; RadioButton RB_VERT_CENTER @@ -1624,15 +1723,15 @@ TabPage TP_TABLE_TEXTFLOW Text [ ENGLISH ] = "Middle" ; Text [ english_us ] = "Cente~red" ; Text [ swedish ] = "~Mitten" ; - Text [ danish ] = "Centreret" ; + Text [ danish ] = "~Centreret" ; Text [ italian ] = "Centro" ; Text [ spanish ] = "Centrado" ; - Text [ french ] = "~Milieu" ; + Text [ french ] = "Centre" ; Text [ dutch ] = "~Midden" ; Text [ portuguese_brazilian ] = "Mitte" ; Text [ portuguese ] = "~Centro" ; Text[ chinese_simplified ] = "中(~R)"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Porodku"; Text[ japanese ] = "中央(~R)"; Text[ chinese_traditional ] = "中(~R)"; @@ -1641,7 +1740,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "가운데(~R)"; Text[ turkish ] = "Aa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Centro"; + Text[ catalan ] = "Cent~rat"; Text[ finnish ] = "~Keskitetty"; Text[ thai ] = "ตรง~กลาง"; }; @@ -1653,7 +1752,7 @@ TabPage TP_TABLE_TEXTFLOW Text [ ENGLISH ] = "Bottom" ; Text [ english_us ] = "Bottom" ; Text [ swedish ] = "~Nere" ; - Text [ danish ] = "Nederst" ; + Text [ danish ] = "~Nederst" ; Text [ italian ] = "Basso" ; Text [ spanish ] = "A~bajo" ; Text [ french ] = "En bas" ; @@ -1670,8 +1769,8 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "아래"; Text[ turkish ] = "Yukar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~bajo"; - Text[ finnish ] = "Alaosa"; + Text[ catalan ] = "Part inferior"; + Text[ finnish ] = "Alareuna"; Text[ thai ] = "ล่าง"; }; }; @@ -1689,17 +1788,36 @@ InfoBox MSG_WRONG_TABLENAME Message [ dutch ] = "In de naam van de tabel mogen geen spaties voorkomen." ; Message [ portuguese ] = "O nome da tabela no pode ter espaos vazios" ; Message[ chinese_simplified ] = "表格名称不能含有空格字符。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Nazwa tabeli nie moe zawiera spacji."; Message[ japanese ] = "表名にスペースは入れられません"; Message[ chinese_traditional ] = "表格名稱不能含有空格字元。"; Message[ arabic ] = " ."; Message[ greek ] = " "; - Message[ korean ] = "표 이름에는 공백이 포함되어서는 안됩니다."; + Message[ korean ] = "표 이름에 공백이 포함되어서는 안됩니다."; Message[ turkish ] = "Tablo adnda boluk bulunmamaldr."; Message[ language_user1 ] = " "; - Message[ catalan ] = "El nombre de la tabla no debe contener espacios."; + Message[ catalan ] = "El nom de la taula no ha d'incloure espais."; Message[ finnish ] = "Taulukon nimess ei saa olla vlej."; Message[ thai ] = "ชื่อตารางต้องไม่มีระยะห่าง"; }; + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/tautofmt.src b/sw/source/ui/table/tautofmt.src index 935f2801135a..4a4694f5b9d8 100644 --- a/sw/source/ui/table/tautofmt.src +++ b/sw/source/ui/table/tautofmt.src @@ -2,9 +2,9 @@ * * $RCSfile: tautofmt.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: os $ $Date: 2002-06-03 12:26:00 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ french ] = "AutoFormat" ; Text [ swedish ] = "Autoformat" ; Text [ dutch ] = "AutoOpmaak" ; - Text [ spanish ] = "AutoFormato" ; + Text [ spanish ] = "Formateado automtico" ; Text [ english_us ] = "AutoFormat" ; Moveable = TRUE ; FixedLine FL_FORMAT @@ -87,7 +87,7 @@ ModalDialog DLG_AUTOFMT_TABLE Size = MAP_APPFONT ( 243 , 8 ) ; Text = "Format" ; Text [ english_us ] = "Format" ; - Text[ portuguese ] = "Formatar"; + Text[ portuguese ] = "Formato"; Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Opmaak"; @@ -95,17 +95,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text[ spanish ] = "Formato"; Text[ finnish ] = "Muotoilu"; Text[ italian ] = "Formattazione"; - Text[ danish ] = "Formatering"; + Text[ danish ] = "Format"; Text[ swedish ] = "Format"; Text[ polish ] = "Format"; Text[ portuguese_brazilian ] = "Formatos"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "ʽ"; - Text[ chinese_traditional ] = "榡"; + Text[ japanese ] = "書式"; + Text[ korean ] = "서식"; + Text[ chinese_simplified ] = "格式"; + Text[ chinese_traditional ] = "格式"; Text[ turkish ] = "Formatlama"; Text[ arabic ] = ""; Text[ catalan ] = "Formato"; + Text[ thai ] = "รูปแบบ"; }; ListBox LB_FORMAT { @@ -131,7 +132,7 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ italian ] = "Formato ~numero" ; Text [ portuguese_brazilian ] = "~Formatodon?ero" ; Text [ portuguese ] = "~Formato numrico" ; - Text [ finnish ] = "~Numeromuoto" ; + Text [ finnish ] = "Lukumuoto" ; Text [ danish ] = "Talformat" ; Text [ french ] = "~Format numrique" ; Text [ swedish ] = "Talf~ormat" ; @@ -139,17 +140,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ spanish ] = "Formato nu~mrico" ; Text [ english_us ] = "~Number format" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "ָʽ(~N)"; + Text[ chinese_simplified ] = "数字格式(~N)"; Text[ russian ] = " "; Text[ polish ] = "Format liczb"; - Text[ japanese ] = "̏(~N)"; - Text[ chinese_traditional ] = "Ʀr榡(~N)"; + Text[ japanese ] = "数の書式(~N)"; + Text[ chinese_traditional ] = "數字格式(~N)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " (~N)"; + Text[ korean ] = "숫자 표기 형식(~N)"; Text[ turkish ] = "Say f~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formato nu~mrico"; + Text[ catalan ] = "Format nu~mric"; + Text[ thai ] = "รูปแบบ~ตัวเลข"; }; CheckBox BTN_BORDER { @@ -167,20 +169,21 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ french ] = "~Bordure" ; Text [ swedish ] = "~Inramning" ; Text [ dutch ] = "~Omranding" ; - Text [ spanish ] = "~Borde" ; + Text [ spanish ] = "~Bordes" ; Text [ english_us ] = "~Borders" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "߿(~B)"; + Text[ chinese_simplified ] = "边框(~B)"; Text[ russian ] = ""; Text[ polish ] = "Obramowanie"; - Text[ japanese ] = "Og(~B)"; - Text[ chinese_traditional ] = "(~B)"; + Text[ japanese ] = "外枠(~B)"; + Text[ chinese_traditional ] = "邊框(~B)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "θ(~B)"; + Text[ korean ] = "테두리(~B)"; Text[ turkish ] = "~Kenarlk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Borde"; + Text[ catalan ] = "~Vores"; + Text[ thai ] = "เ~ส้นขอบ"; }; CheckBox BTN_FONT { @@ -195,23 +198,24 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "~Tipo de letra" ; Text [ finnish ] = "~Fontti" ; Text [ danish ] = "Skrifttype" ; - Text [ french ] = "~Police" ; + Text [ french ] = "Police" ; Text [ swedish ] = "~Teckensnitt" ; Text [ dutch ] = "~Lettertype" ; Text [ spanish ] = "Fuen~te" ; Text [ english_us ] = "F~ont" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "(~O)"; + Text[ chinese_simplified ] = "字体(~O)"; Text[ russian ] = ""; Text[ polish ] = "Czcionka"; - Text[ japanese ] = "̫Ă̎(~O)"; - Text[ chinese_traditional ] = "r(~O)"; + Text[ japanese ] = "フォントの種類(~O)"; + Text[ chinese_traditional ] = "字型(~O)"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "۲(~O)"; + Text[ korean ] = "글꼴(~O)"; Text[ turkish ] = "Yazti~pi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fuen~te"; + Text[ catalan ] = "Tipus de ~lletra"; + Text[ thai ] = "ตัวอั~กษร"; }; CheckBox BTN_PATTERN { @@ -232,17 +236,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ spanish ] = "Mo~delo" ; Text [ english_us ] = "~Pattern" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "ͼ(~P)"; - Text[ russian ] = "~"; + Text[ chinese_simplified ] = "图案(~P)"; + Text[ russian ] = "~"; Text[ polish ] = "De~se"; - Text[ japanese ] = "(~P)"; - Text[ chinese_traditional ] = "Ϯ(~P)"; + Text[ japanese ] = "背景(~P)"; + Text[ chinese_traditional ] = "圖案(~P)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~P)"; + Text[ korean ] = "패턴(~P)"; Text[ turkish ] = "~Desen"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mo~delo"; + Text[ catalan ] = "~Patr"; + Text[ thai ] = "~ลวดลาย"; }; CheckBox BTN_ALIGNMENT { @@ -252,28 +257,29 @@ ModalDialog DLG_AUTOFMT_TABLE Text = "~Ausrichtung" ; Text [ ENGLISH ] = "Orien~tation" ; Text [ norwegian ] = "Orien~tation" ; - Text [ italian ] = "~Allineamento" ; + Text [ italian ] = "Allineamento" ; Text [ portuguese_brazilian ] = "Orien~ta??o" ; Text [ portuguese ] = "~Alinhamento" ; Text [ finnish ] = "~Tasaus" ; Text [ danish ] = "Justering" ; - Text [ french ] = "~Alignement" ; + Text [ french ] = "Alignement" ; Text [ swedish ] = "~Justering" ; Text [ dutch ] = "~Uitlijning" ; - Text [ spanish ] = "Orienta~cin" ; + Text [ spanish ] = "Alineacin" ; Text [ english_us ] = "Alignmen~t" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "(~T)"; + Text[ chinese_simplified ] = "对齐(~T)"; Text[ russian ] = ""; Text[ polish ] = "Wyrwnanie"; - Text[ japanese ] = "zu(~T)"; - Text[ chinese_traditional ] = "(~T)"; + Text[ japanese ] = "配置(~T)"; + Text[ chinese_traditional ] = "對齊(~T)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~T)"; + Text[ korean ] = "맞춤(~T)"; Text[ turkish ] = "~Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Orienta~cin"; + Text[ catalan ] = "Alineamen~t"; + Text[ thai ] = "จัดตำแหน่~ง"; }; FixedLine FL_FORMATS { @@ -293,17 +299,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Opmaak" ; Text [ spanish ] = "Formato" ; Text [ english_us ] = "Formatting" ; - Text[ chinese_simplified ] = "ʽ"; + Text[ chinese_simplified ] = "格式化"; Text[ russian ] = ""; Text[ polish ] = "Formatowanie"; - Text[ japanese ] = "ݒ"; - Text[ chinese_traditional ] = "榡"; + Text[ japanese ] = "書式設定"; + Text[ chinese_traditional ] = "格式化"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "서식 설정"; Text[ turkish ] = "Formatlama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formato"; + Text[ catalan ] = "Formatatge"; + Text[ thai ] = "จัดรูปแบบ"; }; OKButton BTN_OK { @@ -338,17 +345,18 @@ ModalDialog DLG_AUTOFMT_TABLE TabStop = TRUE ; MapUnit = MAP_APPFONT ; Delta = 48 ; - Text[ chinese_simplified ] = "(~M)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "其他(~M)"; + Text[ russian ] = ""; Text[ polish ] = "Dod~atki"; - Text[ japanese ] = "(~M)"; - Text[ chinese_traditional ] = "L(~M)"; + Text[ japanese ] = "オプション(~M)"; + Text[ chinese_traditional ] = "其他(~M)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~M)"; + Text[ korean ] = "옵션(~M)"; Text[ turkish ] = "Ay~rntlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Opciones"; + Text[ catalan ] = "~Ms"; + Text[ thai ] = "~รายละเอียด"; }; PushButton BTN_ADD { @@ -362,23 +370,24 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "~Adicionar" ; Text [ finnish ] = "~Lis" ; Text [ danish ] = "Tilfj" ; - Text [ french ] = "~Ajouter" ; + Text [ french ] = "Ajouter" ; Text [ swedish ] = "L~gg till" ; Text [ dutch ] = "~Toevoegen" ; Text [ spanish ] = "~Aadir" ; Text [ english_us ] = "~Add" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "(~A)"; + Text[ chinese_simplified ] = "新增(~A)"; Text[ russian ] = ""; Text[ polish ] = "~Dodaj"; - Text[ japanese ] = "}(~A)"; - Text[ chinese_traditional ] = "[J(~A)"; + Text[ japanese ] = "挿入(~A)"; + Text[ chinese_traditional ] = "加入(~A)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "߰(~A)"; + Text[ korean ] = "추가(~A)"; Text[ turkish ] = "~Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Aadir"; + Text[ catalan ] = "~Afegeix"; + Text[ thai ] = "เ~พิ่ม"; }; PushButton BTN_REMOVE { @@ -392,23 +401,24 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "E~liminar" ; Text [ finnish ] = "~Poista" ; Text [ danish ] = "Slet" ; - Text [ french ] = "~Supprimer" ; + Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "ɾ(~D)"; + Text[ chinese_simplified ] = "删除(~D)"; Text[ russian ] = ""; Text[ polish ] = "Usu"; - Text[ japanese ] = "폜(~D)"; - Text[ chinese_traditional ] = "R(~D)"; + Text[ japanese ] = "削除(~D)"; + Text[ chinese_traditional ] = "刪除(~D)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~D)"; + Text[ korean ] = "삭제(~D)"; Text[ turkish ] = "~Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; + Text[ thai ] = "~ลบ"; }; PushButton BTN_RENAME { @@ -426,18 +436,19 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ spanish ] = "Cambiar ~nombre" ; Text [ french ] = "Re~nommer" ; Text [ dutch ] = "~Naam wijzigen" ; - Text[ chinese_simplified ] = "(~R)"; + Text[ chinese_simplified ] = "重命名(~R)"; Text[ russian ] = ""; Text[ polish ] = "Zmie nazw"; - Text[ japanese ] = "O̕ύX(~R)"; - Text[ chinese_traditional ] = "sRW(~R)"; + Text[ japanese ] = "名前の変更(~R)"; + Text[ chinese_traditional ] = "重新命名(~R)"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "̸ ٲٱ(~R)"; + Text[ korean ] = "이름 바꾸기(~R)"; Text[ turkish ] = "Yeniden~adlandr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar ~nombre"; + Text[ catalan ] = "~Reanomena"; Text[ finnish ] = "~Nime uudelleen"; + Text[ thai ] = "เ~ปลี่ยนชื่อ"; }; HelpButton BTN_HELP { @@ -455,22 +466,23 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "Adicionar AutoFormato" ; Text [ finnish ] = "Lis automaattinen muotoilu" ; Text [ danish ] = "Tilfj AutoFormat" ; - Text [ french ] = "Ajouter AutoFormat" ; + Text [ french ] = "Ajouter un AutoFormat" ; Text [ swedish ] = "Lgg till autoformat" ; - Text [ dutch ] = "AutoOpmaak toepassen" ; - Text [ spanish ] = "Aadir AutoFormato" ; + Text [ dutch ] = "AutoOpmaak toevoegen" ; + Text [ spanish ] = "Aadir Formateado automtico" ; Text [ english_us ] = "Add AutoFormat" ; - Text[ chinese_simplified ] = "Զʽ"; + Text[ chinese_simplified ] = "新增自动格式"; Text[ russian ] = " "; Text[ polish ] = "Dodaj Autoformat"; - Text[ japanese ] = "̫ϯĂ̒lj"; - Text[ chinese_traditional ] = "sW۰ʮ榡"; + Text[ japanese ] = "オートフォーマットの追加"; + Text[ chinese_traditional ] = "新增自動格式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ڵ ߰"; + Text[ korean ] = "자동 서식 추가"; Text[ turkish ] = "Otomatik formatlamay ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aadir AutoFormato"; + Text[ catalan ] = "Afegeix formatatge automtic"; + Text[ thai ] = "เพิ่มรูปแบบอัตโนมัติ"; }; String STR_ADD_LABEL { @@ -487,17 +499,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Naam" ; Text [ spanish ] = "Nombre" ; Text [ english_us ] = "Name" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "名称"; Text[ russian ] = ""; Text[ polish ] = "Nazwa"; - Text[ japanese ] = "O"; - Text[ chinese_traditional ] = "W"; + Text[ japanese ] = "名前"; + Text[ chinese_traditional ] = "名稱"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "̸"; + Text[ korean ] = "이름"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre"; + Text[ catalan ] = "Nom"; + Text[ thai ] = "ชื่อ"; }; String STR_DEL_TITLE { @@ -512,19 +525,20 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ french ] = "Supprimer l'AutoFormat" ; Text [ swedish ] = "Radera Autoformat" ; Text [ dutch ] = "AutoOpmaak wissen" ; - Text [ spanish ] = "Eliminar AutoFormato" ; + Text [ spanish ] = "Borrar Formateado automtico" ; Text [ english_us ] = "Delete AutoFormat" ; - Text[ chinese_simplified ] = "ɾԶʽ"; + Text[ chinese_simplified ] = "删除自动格式"; Text[ russian ] = " "; Text[ polish ] = "Usu Autoformat"; - Text[ japanese ] = "̫ϯĂ̍폜"; - Text[ chinese_traditional ] = "R۰ʮ榡"; + Text[ japanese ] = "オートフォーマットの削除"; + Text[ chinese_traditional ] = "刪除自動格式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ڵ "; + Text[ korean ] = "자동 서식 삭제"; Text[ turkish ] = "Otomatik formatlamay sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar AutoFormato"; + Text[ catalan ] = "Suprimeix el formatatge automtic"; + Text[ thai ] = "ลบรูปแบบอัตโนมัติ"; }; String STR_DEL_MSG { @@ -539,19 +553,20 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ french ] = "L'AutoFormat suivant va tre supprim :" ; Text [ swedish ] = "Fljande autoformat raderas:" ; Text [ dutch ] = "Het volgende AutoOpmaak-item wordt gewist." ; - Text [ spanish ] = "El siguiente AutoFormato se eliminar:" ; + Text [ spanish ] = "El Formateado automtico siguiente se borrar:" ; Text [ english_us ] = "The following AutoFormat entry will be deleted:" ; - Text[ chinese_simplified ] = "ɾµԶʽ"; + Text[ chinese_simplified ] = "删除以下的自动格式："; Text[ russian ] = " :"; Text[ polish ] = "Usunity zostanie nastpujcy Autoformat:"; - Text[ japanese ] = "ȉ̵̫ϯĂ͍폜܂:"; - Text[ chinese_traditional ] = "RHU۰ʮ榡G"; + Text[ japanese ] = "以下のオートフォーマットは削除されます:"; + Text[ chinese_traditional ] = "刪除以下的自動格式："; Text[ arabic ] = " :"; Text[ greek ] = " :"; - Text[ korean ] = " ڵ ˴ϴ:"; + Text[ korean ] = "다음과 같은 자동 서식은 삭제됩니다:"; Text[ turkish ] = "Aadaki otomatik formatlama silinecek:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "El siguiente AutoFormato se eliminar:"; + Text[ catalan ] = "L'entrada de formatatge automtic segent se suprimir:"; + Text[ thai ] = "รายการรูปแบบอัตโนมัตินี้จะถูกลบ:"; }; String STR_RENAME_TITLE { @@ -563,21 +578,22 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ swedish ] = "Byt namn p autoformat" ; Text [ danish ] = "Omdb AutoFormat" ; Text [ italian ] = "Rinomina formattazione automatica" ; - Text [ spanish ] = "Cambiar nombre del AutoFormato" ; + Text [ spanish ] = "Cambiar nombre del Formateado automtico" ; Text [ french ] = "Renommer l'AutoFormat" ; Text [ dutch ] = "AutoOpmaak nieuwe naam geven" ; - Text[ chinese_simplified ] = "Զʽ"; + Text[ chinese_simplified ] = "重命名自动格式"; Text[ russian ] = " "; Text[ polish ] = "Zmie nazw Autoformatu"; - Text[ japanese ] = "̫ϯĂ̖O̕ύX"; - Text[ chinese_traditional ] = "sRW۰ʮ榡"; + Text[ japanese ] = "オートフォーマットの名前の変更"; + Text[ chinese_traditional ] = "重新命名自動格式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ڵ ̸ ٲٱ"; + Text[ korean ] = "자동 서식 이름 바꾸기"; Text[ turkish ] = "Otomatik formatlamay yeniden adlandr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre del AutoFormato"; + Text[ catalan ] = "Reanomena el formatatge automtic"; Text[ finnish ] = "Nime automaattinen muotoilu uudelleen"; + Text[ thai ] = "เปลี่ยนชื่อรูปแบบอัตโนมัติ"; }; String STR_BTN_CLOSE { @@ -589,22 +605,23 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "~Fechar" ; Text [ finnish ] = "~Sulje" ; Text [ danish ] = "Luk" ; - Text [ french ] = "~Fermer" ; + Text [ french ] = "Fermer" ; Text [ swedish ] = "~Stng" ; Text [ dutch ] = "~Sluiten" ; Text [ spanish ] = "~Cerrar" ; Text [ english_us ] = "~Close" ; - Text[ chinese_simplified ] = "ر(~C)"; + Text[ chinese_simplified ] = "关闭(~C)"; Text[ russian ] = ""; Text[ polish ] = "Zamknij"; - Text[ japanese ] = "(~C)"; - Text[ chinese_traditional ] = "(~C)"; + Text[ japanese ] = "閉じる(~C)"; + Text[ chinese_traditional ] = "關閉(~C)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ݱ(~C)"; + Text[ korean ] = "닫기(~C)"; Text[ turkish ] = "~Kapat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cerrar"; + Text[ catalan ] = "~Tanca"; + Text[ thai ] = "~ปิด"; }; String STR_JAN { @@ -621,17 +638,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Jan" ; Text [ spanish ] = "Ene" ; Text [ english_us ] = "Jan" ; - Text[ chinese_simplified ] = "һ"; + Text[ chinese_simplified ] = "一月"; Text[ russian ] = ""; Text[ polish ] = "Stycze"; - Text[ japanese ] = "1"; - Text[ chinese_traditional ] = "@"; + Text[ japanese ] = "1月"; + Text[ chinese_traditional ] = "一月"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "1"; + Text[ korean ] = "1월"; Text[ turkish ] = "Ock"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ene"; + Text[ catalan ] = "Gen."; + Text[ thai ] = "ม.ค."; }; String STR_FEB { @@ -648,17 +666,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Feb" ; Text [ spanish ] = "Feb" ; Text [ english_us ] = "Feb" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "二月"; Text[ russian ] = ""; Text[ polish ] = "Luty"; - Text[ japanese ] = "2"; - Text[ chinese_traditional ] = "G"; + Text[ japanese ] = "2月"; + Text[ chinese_traditional ] = "二月"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "2"; + Text[ korean ] = "2월"; Text[ turkish ] = "ub"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Feb"; + Text[ catalan ] = "Feb."; + Text[ thai ] = "ก.พ."; }; String STR_MAR { @@ -675,17 +694,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Mrt" ; Text [ spanish ] = "Mar" ; Text [ english_us ] = "Mar" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "三月"; Text[ russian ] = ""; Text[ polish ] = "Marzec"; - Text[ japanese ] = "3"; - Text[ chinese_traditional ] = "T"; + Text[ japanese ] = "3月"; + Text[ chinese_traditional ] = "三月"; Text[ arabic ] = ""; Text[ greek ] = "M"; - Text[ korean ] = "3"; + Text[ korean ] = "3월"; Text[ turkish ] = "Mar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mar"; + Text[ catalan ] = "Mar"; + Text[ thai ] = "มี.ค."; }; String STR_NORTH { @@ -702,17 +722,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Noorden" ; Text [ spanish ] = "Norte" ; Text [ english_us ] = "North" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "北"; Text[ russian ] = ""; Text[ polish ] = "Pnoc"; - Text[ japanese ] = "k"; - Text[ chinese_traditional ] = "_"; + Text[ japanese ] = "北"; + Text[ chinese_traditional ] = "北"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "북쪽"; Text[ turkish ] = "Kuzey"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Norte"; + Text[ catalan ] = "Nord"; + Text[ thai ] = "เหนือ"; }; String STR_MID { @@ -724,22 +745,23 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "Centro" ; Text [ finnish ] = "Keski" ; Text [ danish ] = "Midte" ; - Text [ french ] = "Milieu" ; + Text [ french ] = "Centre" ; Text [ swedish ] = "Mitten" ; Text [ dutch ] = "Midden" ; - Text [ spanish ] = "Centro" ; + Text [ spanish ] = "Centrado" ; Text [ english_us ] = "Mid" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "中"; Text[ russian ] = ""; Text[ polish ] = "Porodku"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "中央"; + Text[ chinese_traditional ] = "中"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "가운데"; Text[ turkish ] = "Orta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Centro"; + Text[ catalan ] = "Mig"; + Text[ thai ] = "กลาง"; }; String STR_SOUTH { @@ -756,17 +778,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Zuiden" ; Text [ spanish ] = "Sur" ; Text [ english_us ] = "South" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "南"; Text[ russian ] = ""; Text[ polish ] = "Poudnie"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "n"; + Text[ japanese ] = "南"; + Text[ chinese_traditional ] = "南"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "남쪽"; Text[ turkish ] = "Gney"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sur"; + Text[ catalan ] = "Sud"; + Text[ thai ] = "ใต้"; }; String STR_SUM { @@ -783,17 +806,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Totaal" ; Text [ spanish ] = "Suma" ; Text [ english_us ] = "Sum" ; - Text[ chinese_simplified ] = "ܼ"; + Text[ chinese_simplified ] = "总计"; Text[ russian ] = ""; Text[ polish ] = "Suma"; - Text[ japanese ] = "v"; - Text[ chinese_traditional ] = "pp"; + Text[ japanese ] = "合計"; + Text[ chinese_traditional ] = "小計"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "հ"; + Text[ korean ] = "합계"; Text[ turkish ] = "Toplam"; Text[ language_user1 ] = " "; Text[ catalan ] = "Suma"; + Text[ thai ] = "ผลรวม"; }; String STR_INVALID_AFNAME { @@ -809,32 +833,34 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ danish ] = "Du har indtastet et ugyldigt navn.\nDet var ikke muligt at oprette AutoFormatet.\nVlg venligst et andet navn." ; Text [ french ] = "Vous avez saisi un nom non valide.\nL'AutoFormat n'a pas ou tre ffectu.\nIndiquez un autre nom." ; Text [ swedish ] = "Du har angett ett ogiltigt namn.\nDet gick inte att skapa autoformatet.\nVlj ett annat namn." ; - Text [ dutch ] = "U heeft een ongeldige naam vermeld.\nDe gewenste AutoOpmaak kon niet worden uitgevoerd.\nKies een andere naam." ; - Text [ spanish ] = "Ha indicado un nombre no vlido, \npor lo que no se pudo crear el AutoFormato.\nSeleccione otro nombre." ; + Text [ dutch ] = "U heeft een ongeldige naam vermeld.\nDe gewenste AutoOpmaak kan niet worden uitgevoerd.\nKies een andere naam." ; + Text [ spanish ] = "Ha indicado un nombre no vlido.\nEl Formateado automtico no se ha podido efectuar.\nSeleccione otro nombre." ; Text [ ENGLISH_US ] = "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name." ; - Text[ chinese_simplified ] = "һЧơ\nԶʽ\nһЧơ"; - Text[ russian ] = " .\n .\n ."; + Text[ chinese_simplified ] = "您给定了一个无效的名称。\n因此无法建立自动格式。\n请您输入一个有效名称。"; + Text[ russian ] = " .\n .\n ."; Text[ polish ] = "Podano nieprawidow nazw.\nUtworzenie Autoformatu nie byo moliwe.\nWybierz inn nazw."; - Text[ japanese ] = "͂O͖łB\n̵̫ϯĂł͍쐬ł܂B\nʂ̖OgĂB"; - Text[ chinese_traditional ] = "zJF@ӵLĪW١C\nLkإߦ۰ʮ榡C\nпJ@ӦĦW١C"; + Text[ japanese ] = "入力した名前は無効です。\nこのオートフォーマットでは作成できません。\n別の名前を使ってください。"; + Text[ chinese_traditional ] = "您輸入了一個無效的名稱。\n無法建立自動格式。\n請輸入一個有效名稱。"; Text[ arabic ] = " .\n .\n ."; Text[ greek ] = " .\n .\n ."; - Text[ korean ] = "ȿ ̸ Է߽ϴ.\n䱸 ڵ ϴ.\nٸ ̸ Ͻʽÿ."; + Text[ korean ] = "잘못된 이름을 입력하셨습니다.\n요구되는 자동 서식을 만들 수 없습니다.\n다른 이름을 선택하십시오."; Text[ turkish ] = "Geersiz bir ad girdiniz.\nOtomatik formatlama oluturulamad.\nBaka bir ad seiniz."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ha indicado un nombre no vlido, \npor lo que no se pudo crear el AutoFormato.\nSeleccione otro nombre."; + Text[ catalan ] = "Heu introdut un nom incorrecte.\nNo s'ha pogut crear el formatatge automtic desitjat.\nTorneu-ho a provar amb un altre nom."; + Text[ thai ] = "คุณได้ใส่ชื่อที่ไม่ถูกต้อง\nไม่สามารถสร้างรูปแบบอัตโนมัติที่ต้องการได้ \nลองใช้ชื่อที่ต่างกันดูอีกครั้ง"; }; - Text[ chinese_simplified ] = "Զʽ"; + Text[ chinese_simplified ] = "自动格式"; Text[ russian ] = ""; Text[ polish ] = "Autoformat"; - Text[ japanese ] = "̫ϯ"; - Text[ chinese_traditional ] = "۰ʮ榡"; + Text[ japanese ] = "オートフォーマット"; + Text[ chinese_traditional ] = "自動格式"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "ڵ"; + Text[ korean ] = "자동 서식"; Text[ turkish ] = "Otomatik formatlama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoFormato"; + Text[ catalan ] = "Formatatge automtic"; + Text[ thai ] = "รูปแบบอัตโนมัติ"; }; ModalDialog DLG_SWDLG_STRINPUT { @@ -875,3 +901,19 @@ ModalDialog DLG_SWDLG_STRINPUT + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 319e605fa205..5999df3944bc 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pview.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: fme $ $Date: 2002-12-10 10:26:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -220,9 +220,10 @@ #ifndef _SWSLOTS_HXX #include <swslots.hxx> #endif - -// OD 02.12.2002 #103492# -#define NEW_PREVIEW +// OD 12.12.2002 #103492# +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif SFX_IMPL_VIEWFACTORY(SwPagePreView, SW_RES(STR_NONAME)) { @@ -476,7 +477,8 @@ SwPreviewPrintOptionsDialog::SwPreviewPrintOptionsDialog( SwPagePreViewWin& rPar { FreeResource(); ViewShell& rViewSh = *rPreView.GetViewShell(); - aSettings.aPageMaxSize = rViewSh.GetPagePreViewPrtMaxSize(); + // OD 18.12.2002 #103492# + aSettings.aPageMaxSize = rViewSh.PagePreviewLayout()->GetMaxPageSize(); SfxPrinter* pPrinter = rViewSh.GetPrt( TRUE ); aSettings.aPrtSize = pPrinter->GetPaperSize(); //#97682# make sure that no division by zero occurs @@ -839,11 +841,10 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView ) : Window( pParent, WinBits( WB_CLIPCHILDREN) ), mpViewShell( 0 ), mrView( rPView ), - // OD 02.12.2002 #103492# - maPreviewDocSize( Size(0,0) ), mbCalcScaleForPreviewLayout( true ), maPaintedPreviewDocRect( Rectangle(0,0,0,0) ) { + SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); //#106611# SetHelpId(HID_PAGEPREVIEW); SetFillColor( GetBackground().GetColor() ); SetLineColor( GetBackground().GetColor()); @@ -852,7 +853,7 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView ) const SwMasterUsrPref *pUsrPref = SW_MOD()->GetUsrPref(FALSE); mnRow = pUsrPref->GetPagePrevRow(); // 1 Zeile mnCol = pUsrPref->GetPagePrevCol(); // 1 Spalte - mnVirtPage = mnSttPage = mnSelectedPage = USHRT_MAX; + mnVirtPage = mnSttPage = USHRT_MAX; } /*-------------------------------------------------------------------- @@ -884,38 +885,20 @@ void SwPagePreViewWin::Paint( const Rectangle& rRect ) maPxWinSize = GetOutputSizePixel(); Rectangle aRect( LogicToPixel( rRect )); -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# - { - mnSelectedPage = 1; - mpViewShell->PreparePreviewPaint( 1, Point(0,0), &maPxWinSize, - mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); - mpViewShell->PaintPreview( mnSelectedPage, PixelToLogic( aRect ) ); - } -#else - mnSelectedPage = mnSttPage = mpViewShell->CalcPreViewPage( maPxWinSize, nRowCol, - 0, aPgSize, mnVirtPage, - mnSelectedPage ); - mpViewShell->PreViewPage( PixelToLogic( aRect ), nRowCol, mnSttPage, - aPgSize, mnSelectedPage ); - mnRow = BYTE( nRowCol >> 8 ); - mnCol = BYTE( nRowCol & 0xff ); -#endif + mpPgPrevwLayout->Prepare( 1, Point(0,0), maPxWinSize, + mnSttPage, mnVirtPage, + maPaintedPreviewDocRect ); + SetSelectedPage( 1 ); + mpPgPrevwLayout->Paint( PixelToLogic( aRect ) ); SetPagePreview(mnRow, mnCol); - maScale = GetMapMode().GetScaleX(); } else { - // OD 02.12.2002 #103492# - WHY SETTING SCALING??? MapMode aMM( GetMapMode() ); aMM.SetScaleX( maScale ); aMM.SetScaleY( maScale ); SetMapMode( aMM ); -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# - mpViewShell->PaintPreview( mnSelectedPage, rRect ); -#else - mpViewShell->PreViewPage( rRect, nRowCol, mnSttPage, aPgSize, mnSelectedPage ); -#endif + mpPgPrevwLayout->Paint( rRect ); } } @@ -937,22 +920,10 @@ void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol ) if( mnSttPage > nLastSttPg ) mnSttPage = nLastSttPg; -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# - { - mpViewShell->InitPreviewLayout( mnCol, mnRow, maPgSize, maPreviewDocSize, - true, &maPxWinSize ); - mpViewShell->PreparePreviewPaint( mnSttPage, Point(0,0), &maPxWinSize, - mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); - mnSelectedPage = mnSttPage; - } -#else - USHORT nRowCol = ( mnRow << 8 ) + mnCol; // Zeilen / Spalten - mnSelectedPage = mnSttPage = mpViewShell->CalcPreViewPage( maPxWinSize, nRowCol, mnSttPage, - aPgSize, mnVirtPage, USHRT_MAX ); - mnRow = BYTE( nRowCol >> 8 ); - mnCol = BYTE( nRowCol & 0xff ); -#endif + mpPgPrevwLayout->Init( mnCol, mnRow, maPxWinSize, true ); + mpPgPrevwLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, + mnSttPage, mnVirtPage, maPaintedPreviewDocRect ); + SetSelectedPage( mnSttPage ); SetPagePreview(mnRow, mnCol); maScale = GetMapMode().GetScaleX(); @@ -975,6 +946,8 @@ void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol ) rBindings.Invalidate( aInval ); rBindings.Update( FN_SHOW_TWO_PAGES ); rBindings.Update( FN_SHOW_MULTIPLE_PAGES ); + // OD 18.12.2002 #103492# - adjust scrollbars + mrView.ScrollViewSzChg(); } /*-------------------------------------------------------------------- Beschreibung: @@ -997,71 +970,70 @@ int SwPagePreViewWin::MovePage( int eMoveMode ) case MV_PAGE_UP: // OD 03.12.2002 #103492# - correct calculation of new start page. nNewSttPage = (mnSttPage - nPages > 0) ? (mnSttPage - nPages) : nDefSttPg; - // OD 03.12.2002 #103492# - correct calculation of new selected page. - mnSelectedPage = (mnSelectedPage - nPages > 0) ? (mnSelectedPage - nPages) : 1; + // OD 13.12.2002 #103492# - correct calculation of new selected page. + if ( (SelectedPage() - nPages) > 0 ) + SetSelectedPage( SelectedPage() - nPages ); + else + SetSelectedPage( 1 ); break; case MV_PAGE_DOWN: // OD 03.12.2002 #103492# - correct calculation of new start page. nNewSttPage = (mnSttPage + nPages) < nPageCount ? (mnSttPage + nPages) : nPageCount; // OD 03.12.2002 #103492# - correct calculation of new selected page. - mnSelectedPage = (mnSelectedPage + nPages) < nPageCount ? (mnSelectedPage + nPages) : nPageCount; + if ( (SelectedPage() + nPages) < nPageCount ) + SetSelectedPage( SelectedPage() + nPages ); + else + SetSelectedPage( nPageCount ); break; case MV_DOC_STT: nNewSttPage = nDefSttPg; - mnSelectedPage = nNewSttPage ? nNewSttPage : 1; + SetSelectedPage( nNewSttPage ? nNewSttPage : 1 ); break; case MV_DOC_END: // OD 03.12.2002 #103492# - correct calculation of new start page. nNewSttPage = nPageCount; - mnSelectedPage = nPageCount; + SetSelectedPage( nPageCount ); break; - default: + // OD 12.12.2002 #103492# - add new move mode + case MV_SELPAGE: + // <nNewSttPage> and <SelectedPage()> are already set. + // OD 20.02.2003 #107369# - not start at first column, only if the + // complete preview layout columns doesn't fit into window. + if ( !mpPgPrevwLayout->DoesPreviewLayoutColsFitIntoWindow() ) + bPaintPageAtFirstCol = false; + break; + case MV_SCROLL: + // OD 17.01.2003 #103492# - check, if paint page at first column + // has to be avoided + if ( !mpPgPrevwLayout->DoesPreviewLayoutRowsFitIntoWindow() || + !mpPgPrevwLayout->DoesPreviewLayoutColsFitIntoWindow() ) + bPaintPageAtFirstCol = false; + break; + case MV_NEWWINSIZE: + // OD 18.12.2002 #103492# - nothing special to do. + break; + case MV_CALC: + // OD 18.12.2002 #103492# - re-init page preview layout. + mpPgPrevwLayout->ReInit(); + // OD 03.12.2002 #103492# - correct calculation of new start page. if( nNewSttPage > nPageCount ) - { -#ifdef DEBUG - ASSERT( false, "SwPagePreViewWin::MovePage - start page > page count - OD-DEBUG" ); -#endif nNewSttPage = nPageCount; - } - - //put the the selected page into the current range - if(mnSelectedPage < nNewSttPage || mnSelectedPage >= (nNewSttPage + nPages) ) - { -#ifdef DEBUG - ASSERT( false, "SwPagePreViewWin::MovePage - selected page out of range - OD-DEBUG" ); -#endif - mnSelectedPage = nNewSttPage ? nNewSttPage : 1; - } - // OD 06.12.2002 #103492# - if ( !mpViewShell->DoesPreviewLayoutRowsFitIntoWindow() || - !mpViewShell->DoesPreviewLayoutColsFitIntoWindow() ) - bPaintPageAtFirstCol = false; + // OD 18.12.2002 #103492# - correct selected page number + if( SelectedPage() > nPageCount ) + SetSelectedPage( nNewSttPage ? nNewSttPage : 1 ); } - Size aSave( maPgSize ); -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# - { - mpViewShell->PreparePreviewPaint( nNewSttPage, Point(0,0), &maPxWinSize, - nNewSttPage, mnVirtPage, - maPaintedPreviewDocRect, - bPaintPageAtFirstCol ); - } -#else - USHORT nRowCol = ( mnRow << 8 ) + mnCol; // Zeilen / DoppelSeiten - nNewSttPage = mpViewShell->CalcPreViewPage( maPxWinSize, nRowCol, - nNewSttPage, maPgSize, mnVirtPage, - mnSelectedPage ); - mnRow = BYTE( nRowCol >> 8 ); - mnCol = BYTE( nRowCol & 0xff ); -#endif - if( nNewSttPage == mnSttPage && maPgSize == aSave ) + mpPgPrevwLayout->Prepare( nNewSttPage, Point(0,0), maPxWinSize, + nNewSttPage, mnVirtPage, + maPaintedPreviewDocRect, bPaintPageAtFirstCol ); + if( nNewSttPage == mnSttPage && + eMoveMode != MV_SELPAGE ) return FALSE; SetPagePreview(mnRow, mnCol); mnSttPage = nNewSttPage; - maScale = GetMapMode().GetScaleX(); static USHORT __READONLY_DATA aInval[] = { @@ -1086,31 +1058,23 @@ void SwPagePreViewWin::SetWinSize( const Size& rNewSize ) USHORT nRowCol = ( mnRow << 8 ) + mnCol; // Zeilen / DoppelSeiten if( USHRT_MAX == mnSttPage ) - mnSelectedPage = mnSttPage = GetDefSttPage(); + { + mnSttPage = GetDefSttPage(); + SetSelectedPage( GetDefSttPage() ); + } -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# + if ( mbCalcScaleForPreviewLayout ) { - if ( mbCalcScaleForPreviewLayout ) - { - mpViewShell->InitPreviewLayout( mnCol, mnRow, maPgSize, maPreviewDocSize, - true, &maPxWinSize ); - mbCalcScaleForPreviewLayout = false; - } - mpViewShell->PreparePreviewPaint( mnSttPage, Point(0,0), &maPxWinSize, - mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); + mpPgPrevwLayout->Init( mnCol, mnRow, maPxWinSize, true ); + maScale = GetMapMode().GetScaleX(); } -#else - mnSttPage = mpViewShell->CalcPreViewPage( maPxWinSize, nRowCol, - mnSttPage, maPgSize, - mnVirtPage, mnSelectedPage ); -#endif - if(mnSelectedPage < mnSttPage || mnSelectedPage > mnSttPage + (mnRow * mnCol) ) + mpPgPrevwLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, + mnSttPage, mnVirtPage, maPaintedPreviewDocRect ); + if ( mbCalcScaleForPreviewLayout ) { - mnSelectedPage = mnSttPage ? mnSttPage : 1; + SetSelectedPage( mnSttPage ); + mbCalcScaleForPreviewLayout = false; } - mnRow = BYTE( nRowCol >> 8 ); - mnCol = BYTE( nRowCol & 0xff ); SetPagePreview(mnRow, mnCol); maScale = GetMapMode().GetScaleX(); } @@ -1184,7 +1148,9 @@ void SwPagePreViewWin::Command( const CommandEvent& rCEvt ) bCallBase = !mrView.HandleWheelCommands( rCEvt ); break; - default: ASSERT( !this, "unknown command." ); + default: + // OD 17.12.2002 #103492# - delete assertion + ; } if( bCallBase ) @@ -1193,18 +1159,20 @@ void SwPagePreViewWin::Command( const CommandEvent& rCEvt ) void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) { - if( MOUSE_LEFT == ( rMEvt.GetModifier() + rMEvt.GetButtons() ) && - 2 == rMEvt.GetClicks() ) + // OD 17.12.2002 #103492# - consider single-click to set selected page + if( MOUSE_LEFT == ( rMEvt.GetModifier() + rMEvt.GetButtons() ) ) { - Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) ); - - // was habe wir denn hier getroffen?? - USHORT nRowCol = ( mnRow << 8 ) + mnCol; // Zeilen / DoppelSeiten - BOOL bDocPos = mpViewShell->IsPreViewDocPos( aDocPos, nRowCol, - mnSttPage, maPgSize ); - - if( bDocPos ) // dann kann man ja umschalten + Point aPrevwPos( PixelToLogic( rMEvt.GetPosPixel() ) ); + Point aDocPos; + bool bPosInEmptyPage; + sal_uInt16 nNewSelectedPage; + bool bIsDocPos = + mpPgPrevwLayout->IsPrevwPosInDocPrevwPage( aPrevwPos, + aDocPos, bPosInEmptyPage, nNewSelectedPage ); + if ( bIsDocPos && rMEvt.GetClicks() == 2 ) { + // close page preview, set new cursor position and switch to + // normal view. String sNewCrsrPos( String::CreateFromInt32( aDocPos.X() )); ((( sNewCrsrPos += ';' ) += String::CreateFromInt32( aDocPos.Y() )) ) @@ -1215,6 +1183,15 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) pTmpFrm->GetBindings().Execute( SID_VIEWSHELL0, NULL, 0, SFX_CALLMODE_ASYNCHRON ); } + else if ( bIsDocPos || bPosInEmptyPage ) + // show clicked page as the selected one + mpPgPrevwLayout->MarkNewSelectedPage( nNewSelectedPage ); + GetViewShell()->ShowPreViewSelection( nNewSelectedPage ); + // OD 19.02.2003 #107369# - adjust position at vertical scrollbar. + if ( mpPgPrevwLayout->DoesPreviewLayoutRowsFitIntoWindow() ) + { + mrView.SetVScrollbarThumbPos( nNewSelectedPage ); + } } } @@ -1238,6 +1215,28 @@ void SwPagePreViewWin::SetPagePreview( BYTE nRow, BYTE nCol ) } } +/** get selected page in document preview + + OD 13.12.2002 #103492# + + @author OD +*/ +sal_uInt16 SwPagePreViewWin::SelectedPage() const +{ + return mpPgPrevwLayout->SelectedPage(); +} + +/** set selected page number in document preview + + OD 13.12.2002 #103492# + + @author OD +*/ +void SwPagePreViewWin::SetSelectedPage( sal_uInt16 _nSelectedPageNum ) +{ + mpPgPrevwLayout->SetSelectedPage( _nSelectedPageNum ); +} + void SwPagePreViewWin::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -1251,6 +1250,8 @@ void SwPagePreViewWin::DataChanged( const DataChangedEvent& rDCEvt ) // den Settings abgefragt werden. if( rDCEvt.GetFlags() & SETTINGS_STYLE ) mrView.InvalidateBorder(); //Scrollbarbreiten + //#106746# zoom has to be disabled if Accessibility support is switched on + lcl_InvalidateZoomSlots(mrView.GetViewFrame()->GetBindings()); break; case DATACHANGED_PRINTER: @@ -1264,7 +1265,82 @@ void SwPagePreViewWin::DataChanged( const DataChangedEvent& rDCEvt ) } } -/* */ +/** help method to execute SfxRequest FN_PAGEUP and FN_PAGEDOWN + + OD 04.03.2003 #107369# + + @author OD +*/ +void SwPagePreView::_ExecPgUpAndPgDown( const bool _bPgUp, + SfxRequest* _pReq ) +{ + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); + // check, if top/bottom of preview is *not* already visible. + if( pPagePrevwLay->GetWinPagesScrollAmount( _bPgUp ? -1 : 1 ) != 0 ) + { + if ( pPagePrevwLay->DoesPreviewLayoutRowsFitIntoWindow() && + pPagePrevwLay->DoesPreviewLayoutColsFitIntoWindow() ) + { + const int eMvMode = _bPgUp ? + SwPagePreViewWin::MV_PAGE_UP : + SwPagePreViewWin::MV_PAGE_DOWN; + if ( ChgPage( eMvMode, TRUE ) ) + aViewWin.Invalidate(); + } + else + { + SwTwips nScrollAmount; + sal_uInt16 nNewSelectedPageNum = 0; + const sal_uInt16 nVisPages = aViewWin.GetRow() * aViewWin.GetCol(); + if( _bPgUp ) + { + if ( pPagePrevwLay->DoesPreviewLayoutRowsFitIntoWindow() ) + { + nScrollAmount = pPagePrevwLay->GetWinPagesScrollAmount( -1 ); + if ( (aViewWin.SelectedPage() - nVisPages) > 0 ) + nNewSelectedPageNum = aViewWin.SelectedPage() - nVisPages; + else + nNewSelectedPageNum = 1; + } + else + nScrollAmount = - Min( aViewWin.GetOutputSize().Height(), + aViewWin.GetPaintedPreviewDocRect().Top() ); + } + else + { + if ( pPagePrevwLay->DoesPreviewLayoutRowsFitIntoWindow() ) + { + nScrollAmount = pPagePrevwLay->GetWinPagesScrollAmount( 1 ); + if ( (aViewWin.SelectedPage() + nVisPages) <= mnPageCount ) + nNewSelectedPageNum = aViewWin.SelectedPage() + nVisPages; + else + nNewSelectedPageNum = mnPageCount; + } + else + nScrollAmount = Min( aViewWin.GetOutputSize().Height(), + ( pPagePrevwLay->GetPrevwDocSize().Height() - + aViewWin.GetPaintedPreviewDocRect().Bottom() ) ); + } + aViewWin.Scroll( 0, nScrollAmount ); + if ( nNewSelectedPageNum != 0 ) + { + aViewWin.SetSelectedPage( nNewSelectedPageNum ); + } + ScrollViewSzChg(); + static USHORT __READONLY_DATA aInval[] = + { + FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN, 0 + }; + SfxBindings& rBindings = GetViewFrame()->GetBindings(); + rBindings.Invalidate( aInval ); + aViewWin.Invalidate(); + } + } + + if ( _pReq ) + _pReq->Done(); +} + /*-------------------------------------------------------------------- Beschreibung: --------------------------------------------------------------------*/ @@ -1273,7 +1349,8 @@ void SwPagePreView::Execute( SfxRequest &rReq ) { int eMvMode; BYTE nRow = 1; - BOOL bRetVal = FALSE, bRefresh = TRUE; + BOOL bRetVal = FALSE; + bool bRefresh = true; USHORT nSttPage = aViewWin.GetSttPage(), nPages = aViewWin.GetRow() * aViewWin.GetCol(), @@ -1366,58 +1443,58 @@ void SwPagePreView::Execute( SfxRequest &rReq ) break; case FN_CHAR_LEFT: case FN_CHAR_RIGHT: - { - sal_uInt16 nNewSelectedPage; - sal_uInt16 nNewStartPage; - Point aNewStartPos; - sal_Int16 nHoriMove; - if( rReq.GetSlot() == FN_CHAR_LEFT ) - nHoriMove = -1; - else - nHoriMove = 1; - GetViewShell()->MovePreviewSelectedPage( - aViewWin.GetSelectedPage(), nHoriMove, 0, - nNewSelectedPage, nNewStartPage, aNewStartPos ); - aViewWin.GetSelectedPage() = nNewSelectedPage; - if ( GetViewShell()->IsPageVisibleInCurrPreview( nNewSelectedPage ) ) - break; - aViewWin.SetSttPage( nNewStartPage ); - eMvMode = SwPagePreViewWin::MV_CALC; - goto MOVEPAGE; - } case FN_LINE_UP: case FN_LINE_DOWN: { + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); sal_uInt16 nNewSelectedPage; sal_uInt16 nNewStartPage; Point aNewStartPos; - sal_Int16 nVertMove; - if( rReq.GetSlot() == FN_LINE_UP ) - nVertMove = -1; - else - nVertMove = 1; - GetViewShell()->MovePreviewSelectedPage( - aViewWin.GetSelectedPage(), 0, nVertMove, + sal_Int16 nHoriMove = 0; + sal_Int16 nVertMove = 0; + switch(rReq.GetSlot()) + { + case FN_CHAR_LEFT: nHoriMove = -1; break; + case FN_CHAR_RIGHT: nHoriMove = 1; break; + case FN_LINE_UP: nVertMove = -1; break; + case FN_LINE_DOWN: nVertMove = 1; break; + } + pPagePrevwLay->CalcStartValuesForSelectedPageMove( nHoriMove, nVertMove, nNewSelectedPage, nNewStartPage, aNewStartPos ); - aViewWin.GetSelectedPage() = nNewSelectedPage; - if ( GetViewShell()->IsPageVisibleInCurrPreview( nNewSelectedPage ) ) - break; - aViewWin.SetSttPage( nNewStartPage ); - eMvMode = SwPagePreViewWin::MV_CALC; - goto MOVEPAGE; + if ( aViewWin.SelectedPage() != nNewSelectedPage ) + { + if ( pPagePrevwLay->IsPageVisible( nNewSelectedPage ) ) + { + pPagePrevwLay->MarkNewSelectedPage( nNewSelectedPage ); + // OD 19.02.2003 #107369# - adjust position at vertical scrollbar. + SetVScrollbarThumbPos( nNewSelectedPage ); + bRefresh = false; + } + else + { + aViewWin.SetSelectedPage( nNewSelectedPage ); + aViewWin.SetSttPage( nNewStartPage ); + int nRet = ChgPage( SwPagePreViewWin::MV_SELPAGE, TRUE ); + bRefresh = 0 != nRet; + } + GetViewShell()->ShowPreViewSelection( nNewSelectedPage ); + rReq.Done(); + } + break; } case FN_PAGEUP: - eMvMode = SwPagePreViewWin::MV_PAGE_UP; goto MOVEPAGE; case FN_PAGEDOWN: - eMvMode = SwPagePreViewWin::MV_PAGE_DOWN; goto MOVEPAGE; - + { + _ExecPgUpAndPgDown( rReq.GetSlot() == FN_PAGEUP, &rReq ); + break; + } case FN_START_OF_LINE: case FN_START_OF_DOCUMENT: - aViewWin.GetSelectedPage() = 1; + aViewWin.SetSelectedPage( 1 ); eMvMode = SwPagePreViewWin::MV_DOC_STT; bRetVal = TRUE; goto MOVEPAGE; case FN_END_OF_LINE: case FN_END_OF_DOCUMENT: - aViewWin.GetSelectedPage() = mnPageCount; + aViewWin.SetSelectedPage( mnPageCount ); eMvMode = SwPagePreViewWin::MV_DOC_END; bRetVal = TRUE; goto MOVEPAGE; MOVEPAGE: { @@ -1471,7 +1548,7 @@ MOVEPAGE: break; case FN_INSERT_BREAK: { - USHORT nSelPage = aViewWin.GetSelectedPage(); + USHORT nSelPage = aViewWin.SelectedPage(); //if a dummy page is selected (e.g. a non-existing right/left page) //the direct neighbor is used if(GetViewShell()->IsDummyPage( nSelPage ) && GetViewShell()->IsDummyPage( --nSelPage )) @@ -1502,27 +1579,38 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) BYTE nRow = 1; USHORT nWhich = aIter.FirstWhich(); ASSERT(nWhich, leeres Set); + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); + //#106746# zoom has to be disabled if Accessibility support is switched on + BOOL bZoomEnabled = !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport(); while(nWhich) { switch(nWhich) { case FN_START_OF_DOCUMENT: + { + if ( pPagePrevwLay->IsPageVisible( 1 ) ) + rSet.DisableItem(nWhich); + break; + } + case FN_END_OF_DOCUMENT: + { + if ( pPagePrevwLay->IsPageVisible( mnPageCount ) ) + rSet.DisableItem(nWhich); + break; + } case FN_PAGEUP: - if( aViewWin.GetSttPage() == aViewWin.GetDefSttPage() ) + { + if( pPagePrevwLay->GetWinPagesScrollAmount( -1 ) == 0 ) rSet.DisableItem(nWhich); break; - + } case FN_PAGEDOWN: - case FN_END_OF_DOCUMENT: - { - USHORT nNextPg = ( aViewWin.GetRow() * aViewWin.GetCol() ) + - aViewWin.GetSttPage() - 1; - - if( nNextPg >= mnPageCount ) - rSet.DisableItem( nWhich ); - } + { + if( pPagePrevwLay->GetWinPagesScrollAmount( 1 ) == 0 ) + rSet.DisableItem(nWhich); break; + } case FN_STAT_PAGE: { @@ -1535,29 +1623,39 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) case SID_ATTR_ZOOM: case FN_STAT_ZOOM: { - const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); - SvxZoomItem aZoom((SvxZoomType)pVOpt->GetZoomType(), - pVOpt->GetZoom()); - aZoom.SetValueSet( - SVX_ZOOM_ENABLE_50| - SVX_ZOOM_ENABLE_75| - SVX_ZOOM_ENABLE_100| - SVX_ZOOM_ENABLE_150| - SVX_ZOOM_ENABLE_200); - rSet.Put( aZoom ); + if(bZoomEnabled) + { + const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); + SvxZoomItem aZoom((SvxZoomType)pVOpt->GetZoomType(), + pVOpt->GetZoom()); + aZoom.SetValueSet( + SVX_ZOOM_ENABLE_50| + SVX_ZOOM_ENABLE_75| + SVX_ZOOM_ENABLE_100| + SVX_ZOOM_ENABLE_150| + SVX_ZOOM_ENABLE_200); + rSet.Put( aZoom ); + } + else + rSet.DisableItem(nWhich); } break; case FN_PREVIEW_ZOOM: { - const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); - rSet.Put(SfxUInt16Item(nWhich, pVOpt->GetZoom())); + if(bZoomEnabled) + { + const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); + rSet.Put(SfxUInt16Item(nWhich, pVOpt->GetZoom())); + } + else + rSet.DisableItem(nWhich); } break; case SID_ZOOM_IN: case SID_ZOOM_OUT: { const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); - if((SID_ZOOM_OUT == nWhich && pVOpt->GetZoom() >= MAX_PREVIEW_ZOOM)|| + if(!bZoomEnabled || (SID_ZOOM_OUT == nWhich && pVOpt->GetZoom() >= MAX_PREVIEW_ZOOM)|| (SID_ZOOM_IN == nWhich && pVOpt->GetZoom() <= MIN_PREVIEW_ZOOM)) { rSet.DisableItem(nWhich); @@ -1667,6 +1765,11 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) GetViewShell()->ApplyViewOptions( aOpt ); GetViewShell()->ApplyAccessiblityOptions(SW_MOD()->GetAccessibilityOptions()); + // OD 09.01.2003 #i6467# - adjust view shell option to the same as for print + SwPrtOptions aPrintOptions( GetViewFrame()->GetObjectShell()->GetTitle(0) ); + SwView::MakeOptions( 0, aPrintOptions, 0, false, 0, 0 ); + GetViewShell()->AdjustOptionsForPagePreview( aPrintOptions ); + if( pESh->GetDoc()->IsBrowseMode() ) { pESh->GetDoc()->SetBrowseMode( FALSE ); @@ -1703,7 +1806,10 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pFrame, SfxViewShell* pOldSh): GetDocShell()->IsInFrame()? 0 : WB_SIZEABLE )), sPageStr( SW_RES(STR_PAGE) ), mnPageCount( 0 ), - nNewPage(USHRT_MAX) + nNewPage(USHRT_MAX), + // OD 09.01.2003 #106334# + mbResetFormDesignMode( false ), + mbFormDesignModeToReset( false ) { SetName(String::CreateFromAscii("PageView" )); SetWindow( &aViewWin ); @@ -1747,6 +1853,14 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pFrame, SfxViewShell* pOldSh): } } + // OD 09.01.2003 #106334# - for form shell remember design mode of draw view + // of previous view shell + if ( pVS && pVS->HasDrawView() ) + { + mbResetFormDesignMode = true; + mbFormDesignModeToReset = pVS->GetDrawView()->IsDesignMode(); + } + if( pVS ) pNew = new ViewShell( *pVS, &aViewWin, 0, VSHELLFLAG_ISPREVIEW ); else @@ -1854,11 +1968,9 @@ int SwPagePreView::_CreateScrollbar( int bHori ) */ IMPL_LINK_INLINE_START( SwPagePreView, BtnPage, Button *, pButton ) { - int eMvMode = pButton == pPageUpBtn - ? SwPagePreViewWin::MV_PAGE_UP - : SwPagePreViewWin::MV_PAGE_DOWN; - if( ChgPage( eMvMode ) ) - aViewWin.Invalidate(); + // OD 04.03.2003 #107369# - use new helper method to perform page up + // respectively page down. + _ExecPgUpAndPgDown( pButton == pPageUpBtn ); return 0; } IMPL_LINK_INLINE_END( SwPagePreView, BtnPage, Button *, pButton ) @@ -1872,7 +1984,8 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar ) { Rectangle aPixVisArea( aViewWin.LogicToPixel( aVisArea ) ); int bChg = aViewWin.MovePage( eMvMode ) || - eMvMode == SwPagePreViewWin::MV_CALC; + eMvMode == SwPagePreViewWin::MV_CALC || + eMvMode == SwPagePreViewWin::MV_NEWWINSIZE; aVisArea = aViewWin.PixelToLogic( aPixVisArea ); if( bChg ) @@ -2014,7 +2127,8 @@ void SwPagePreView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar ) // setze am View-Win die aktuelle Size aVisArea = aLR; aViewWin.SetWinSize( aLR.GetSize() ); - ChgPage( SwPagePreViewWin::MV_CALC, bUpdateScrollbar ); + // OD 18.12.2002 #103492# - use new mode + ChgPage( SwPagePreViewWin::MV_NEWWINSIZE, bUpdateScrollbar ); aViewWin.Invalidate(); } @@ -2031,7 +2145,7 @@ IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar ) if( !pScrollbar->IsHoriScroll() && pScrollbar->GetType() == SCROLL_DRAG && Help::IsQuickHelpEnabled() && - GetViewShell()->DoesPreviewLayoutRowsFitIntoWindow()) + GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow()) { // wieviele Seiten scrollen ?? String sStateStr(sPageStr); @@ -2067,20 +2181,64 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) { if(!GetViewShell()) return 0; + + // OD 04.03.2003 #107369# - boolean to avoid unnecessary invalidation of the window. + bool bInvalidateWin = true; + if( !pScrollbar->IsHoriScroll() ) // scroll vertically { - if(Help::IsQuickHelpEnabled()) + if ( Help::IsQuickHelpEnabled() ) Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyStr, 0); - if(GetViewShell()->DoesPreviewLayoutRowsFitIntoWindow()) + if ( GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow() ) { // wieviele Seiten scrollen ?? USHORT nThmbPos = (USHORT)pScrollbar->GetThumbPos(); // OD 05.12.2002 #103492# - adjust to new preview functionality - if( nThmbPos != aViewWin.GetSelectedPage() ) + if( nThmbPos != aViewWin.SelectedPage() ) { - aViewWin.SetSttPage( nThmbPos ); - aViewWin.GetSelectedPage() = nThmbPos; - ChgPage( SwPagePreViewWin::MV_CALC, FALSE ); + // OD 17.01.2003 #103492# - consider case that page <nThmbPos> + // is already visible + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); + if ( pPagePrevwLay->IsPageVisible( nThmbPos ) ) + { + pPagePrevwLay->MarkNewSelectedPage( nThmbPos ); + // OD 04.03.2003 #107369# - invalidation of window is unnecessary + bInvalidateWin = false; + } + else + { + // OD 17.01.2003 #103492# - consider whether layout columns + // fit or not. + if ( !pPagePrevwLay->DoesPreviewLayoutColsFitIntoWindow() ) + { + aViewWin.SetSttPage( nThmbPos ); + aViewWin.SetSelectedPage( nThmbPos ); + ChgPage( SwPagePreViewWin::MV_SCROLL, FALSE ); + // OD 20.01.2003 #103492# - update scrollbars + ScrollViewSzChg(); + } + else + { + // OD 04.03.2003 #107369# - correct scroll amount + const sal_Int16 nPageDiff = nThmbPos - aViewWin.SelectedPage(); + const sal_uInt16 nVisPages = aViewWin.GetRow() * aViewWin.GetCol(); + sal_Int16 nWinPagesToScroll = nPageDiff / nVisPages; + if ( nPageDiff % nVisPages ) + { + // decrease/increase number of preview pages to scroll + nPageDiff < 0 ? --nWinPagesToScroll : ++nWinPagesToScroll; + } + aViewWin.SetSelectedPage( nThmbPos ); + aViewWin.Scroll( 0, pPagePrevwLay->GetWinPagesScrollAmount( nWinPagesToScroll ) ); + } + } + // OD 17.01.2003 #103492# - update accessibility + GetViewShell()->ShowPreViewSelection( nThmbPos ); + } + else + { + // OD 04.03.2003 #107369# - invalidation of window is unnecessary + bInvalidateWin = false; } } else @@ -2100,7 +2258,11 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) }; SfxBindings& rBindings = GetViewFrame()->GetBindings(); rBindings.Invalidate( aInval ); - aViewWin.Invalidate(); + // OD 04.03.2003 #107369# - control invalidation of window + if ( bInvalidateWin ) + { + aViewWin.Invalidate(); + } return 0; } /*-------------------------------------------------------------------- @@ -2152,29 +2314,38 @@ void SwPagePreView::ScrollViewSzChg() return ; if(pVScrollbar) { - if(GetViewShell()->DoesPreviewLayoutRowsFitIntoWindow()) + if(GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow()) { //vertical scrolling by row // OD 04.12.2002 #103492# - adjust to new preview functionality USHORT nVisPages = aViewWin.GetRow() * aViewWin.GetCol(); pVScrollbar->SetVisibleSize( nVisPages ); - pVScrollbar->SetThumbPos( aViewWin.GetSttPage() ); + // OD 19.02.2003 #107369# - set selected page as scroll bar position, + // if it is visible. + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); + if ( pPagePrevwLay->IsPageVisible( aViewWin.SelectedPage() ) ) + { + pVScrollbar->SetThumbPos( aViewWin.SelectedPage() ); + } + else + { + pVScrollbar->SetThumbPos( aViewWin.GetSttPage() ); + } pVScrollbar->SetLineSize( aViewWin.GetCol() ); pVScrollbar->SetPageSize( nVisPages ); // calculate and set scrollbar range Range aScrollbarRange( 1, mnPageCount ); // increase range by one, because left-top-corner is left blank. ++aScrollbarRange.Max(); - // increase range by number of blank page places in last layout row. - sal_uInt16 nTmp = (mnPageCount+1) % aViewWin.GetCol(); - if ( nTmp > 0 ) - aScrollbarRange.Max() += aViewWin.GetCol() - nTmp; + // OD 17.01.2003 #103492# - increase range in order to access all pages + aScrollbarRange.Max() += ( nVisPages - 1 ); pVScrollbar->SetRange( aScrollbarRange ); } else //vertical scrolling by pixel { const Rectangle& rDocRect = aViewWin.GetPaintedPreviewDocRect(); - const Size& rPreviewSize = aViewWin.GetPreviewDocSize(); + const Size& rPreviewSize = + GetViewShell()->PagePreviewLayout()->GetPrevwDocSize(); pVScrollbar->SetRangeMax(rPreviewSize.Height()) ; long nVisHeight = rDocRect.GetHeight(); pVScrollbar->SetVisibleSize( nVisHeight ); @@ -2186,7 +2357,8 @@ void SwPagePreView::ScrollViewSzChg() if(pHScrollbar) { const Rectangle& rDocRect = aViewWin.GetPaintedPreviewDocRect(); - const Size& rPreviewSize = aViewWin.GetPreviewDocSize(); + const Size& rPreviewSize = + GetViewShell()->PagePreviewLayout()->GetPrevwDocSize(); long nVisWidth = 0; long nThumb = 0; long nVisPage = 0; @@ -2379,13 +2551,17 @@ PrintDialog* SwPagePreView::CreatePrintDialog( Window *pParent ) --------------------------------------------------------------------*/ +// OD 18.12.2002 #103492# - no longer needed ?? Size SwPagePreView::GetOptimalSizePixel() const { + ASSERT( false, "overloaded virtual method <SwPagePreView::GetOptimalSizePixel()> needed ??" ) + return Size( -1, -1 ); +/* //JP 09.06.99: was wird hier errechnet ????? -/* ALT: - SfxApplicationWindow* pWin = SFX_APPWINDOW ; - Rectangle aRect = pWin->GetClientAreaPixel(); -*/ +// ALT: +// SfxApplicationWindow* pWin = SFX_APPWINDOW ; +// Rectangle aRect = pWin->GetClientAreaPixel(); + Window& rWin = GetViewFrame()->GetWindow(); Rectangle aRect( Point(0, 0), rWin.GetOutputSizePixel() ); Size aMaxSize( aRect.GetWidth(), aRect.GetHeight() ); @@ -2403,65 +2579,26 @@ Size SwPagePreView::GetOptimalSizePixel() const aMaxSize.Height() += nYBorder; aMaxSize.Width() += nXBorder; return aMaxSize; +*/ } /*-------------------------------------------------------------------- Beschreibung: --------------------------------------------------------------------*/ - -void SwPagePreViewWin::GetOptimalSize( Size& rSize ) const +// OD 12.12.2002 #103492# +void SwPagePreViewWin::SetViewShell( ViewShell* pShell ) { -#ifdef DEBUG - ASSERT( false, "SwPagePreViewWin called [Debug-Assertion by OD]"); -#endif - Size aPageSize, aPrevwDocSize; - USHORT nVirtPage; - Rectangle aPaintedDocPreviewRect; - -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# + mpViewShell = pShell; + if ( mpViewShell && mpViewShell->IsPreView() ) { - mpViewShell->InitPreviewLayout( mnCol, mnRow, aPageSize, aPrevwDocSize, - true, &rSize ); - sal_uInt16 nDummy; - mpViewShell->PreparePreviewPaint( mnSttPage, Point(0,0), &rSize, - nDummy, nVirtPage, - aPaintedDocPreviewRect ); - } -#else - USHORT nRowCol = ( mnRow << 8 ) + mnCol; - mpViewShell->CalcPreViewPage( rSize, nRowCol, - mnSttPage, aPageSize, - nVirtPage, USHRT_MAX ); -#endif - - if(aPageSize.Width() && aPageSize.Height()) - { - long nXRel = (long )aPageSize.Width() * mnCol + (( mnCol + 1) * 142); - nXRel /= rSize.Width(); - long nYRel = aPageSize.Height() * mnRow + (( mnRow + 1) * 142); - nYRel /= rSize.Height(); - //n?Rel geben das Verhaeltnis von benoetigten Pixeln zu - //vorhandenen Pixeln wieder - //Danach wird in der Richtung abgeschnitten, in der mehr Platz ist - if(nXRel < nYRel ) - { - rSize.Width() *= nXRel; - rSize.Width() /= nYRel; - } - else - { - rSize.Height() *= nYRel; - rSize.Height() /= nXRel; - } + mpPgPrevwLayout = mpViewShell->PagePreviewLayout(); } } - void SwPagePreViewWin::RepaintCoreRect( const SwRect& rRect ) { - USHORT nRowCol = ( mnRow << 8 ) + mnCol; - mpViewShell->RepaintCoreRect( rRect, nRowCol, mnSttPage, maPgSize ); + mpPgPrevwLayout->Repaint( Rectangle( rRect.Pos(), rRect.SSize() ) ); } /** method to adjust preview to a new zoom factor @@ -2480,15 +2617,14 @@ void SwPagePreViewWin::AdjustPreviewToNewZoom( const sal_uInt16 nZoomFactor) // calculate new start position for preview paint Size aNewWinSize = PixelToLogic( maPxWinSize ); Point aNewPaintStartPos = - mpViewShell->GetPreviewStartPosForNewScale( aNewScale, maScale, aNewWinSize ); + mpPgPrevwLayout->GetPreviewStartPosForNewScale( aNewScale, maScale, aNewWinSize ); // remember new scaling and prepare preview paint // Note: paint of preview will be performed by a corresponding invalidate // due to property changes. maScale = aNewScale; - mpViewShell->PreparePreviewPaint( 0, aNewPaintStartPos, - &maPxWinSize, mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); + mpPgPrevwLayout->Prepare( 0, aNewPaintStartPos, maPxWinSize, + mnSttPage, mnVirtPage, maPaintedPreviewDocRect ); } /* -----------------04.12.2002 10:46----------------- @@ -2499,9 +2635,10 @@ void SwPagePreViewWin::AdjustPreviewToNewZoom( const sal_uInt16 nZoomFactor) void SwPagePreViewWin::Scroll(long nXMove, long nYMove) { maPaintedPreviewDocRect.Move(nXMove, nYMove); - mpViewShell->PreparePreviewPaint( 0, maPaintedPreviewDocRect.TopLeft(), - &maPxWinSize, mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); + mpPgPrevwLayout->Prepare( 0, maPaintedPreviewDocRect.TopLeft(), + maPxWinSize, mnSttPage, mnVirtPage, + maPaintedPreviewDocRect ); + } BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) @@ -2510,29 +2647,32 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) const CommandWheelData* pWData = rCEvt.GetWheelData(); if( pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode() ) { - BYTE nRow = aViewWin.GetRow(), nCol = aViewWin.GetCol(); - if( 0L > pWData->GetDelta() ) - { - if( PVIEW_MIN_ROW < nRow ) --nRow; - if( PVIEW_MIN_COL < nCol ) --nCol; - } - else + if(!Application::GetSettings().GetMiscSettings().GetEnableATToolSupport()) { - if( PVIEW_MAX_ROW > nRow ) ++nRow; - if( PVIEW_MAX_COL > nCol ) ++nCol; + USHORT nFactor = GetViewShell()->GetViewOptions()->GetZoom(); + const USHORT nOffset = 10; + if( 0L > pWData->GetDelta() ) + { + nFactor -= nOffset; + if(nFactor < MIN_PREVIEW_ZOOM) + nFactor = MIN_PREVIEW_ZOOM; + } + else + { + nFactor += nOffset; + if(nFactor > MAX_PREVIEW_ZOOM) + nFactor = MAX_PREVIEW_ZOOM; + } + SetZoom(SVX_ZOOM_PERCENT, nFactor); } - aViewWin.CalcWish( nRow, nCol ); - aViewWin.Invalidate(); bOk = TRUE; } else - bOk = aViewWin.HandleScrollCommand( rCEvt, 0, - pVScrollbar && pVScrollbar->IsVisible(TRUE) ? pVScrollbar : 0 ); + bOk = aViewWin.HandleScrollCommand( rCEvt, pHScrollbar, pVScrollbar ); return bOk; } -#ifdef ACCESSIBLE_LAYOUT ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible> SwPagePreViewWin::CreateAccessible() { @@ -2540,11 +2680,8 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) // happend already!!! DBG_ASSERT( GetViewShell() != NULL, "We need a view shell" ); - return GetViewShell()->CreateAccessiblePreview( - mnRow, mnCol, mnSttPage, maPgSize, - GetViewShell()->GetPreviewFreePix(), maScale, mnSelectedPage ); + return GetViewShell()->CreateAccessiblePreview(); } -#endif /* -----------------------------06.05.2002 13:18------------------------------ @@ -2590,12 +2727,30 @@ void SwPagePreView::SetZoom(SvxZoomType eType, USHORT nFactor) { ViewShell& rSh = *GetViewShell(); SwViewOption aOpt(*rSh.GetViewOptions()); - aOpt.SetZoom(nFactor); - aOpt.SetZoomType(eType); - rSh.ApplyViewOptions( aOpt ); - lcl_InvalidateZoomSlots(GetViewFrame()->GetBindings()); - // OD 02.12.2002 #103492# - aViewWin.AdjustPreviewToNewZoom( nFactor ); - ScrollViewSzChg(); + // OD 16.12.2002 #103492# - perform action only on changes of zoom or zoom type. + if ( aOpt.GetZoom() != nFactor || + aOpt.GetZoomType() != eType ) + { + aOpt.SetZoom(nFactor); + aOpt.SetZoomType(eType); + rSh.ApplyViewOptions( aOpt ); + lcl_InvalidateZoomSlots(GetViewFrame()->GetBindings()); + // OD 02.12.2002 #103492# + aViewWin.AdjustPreviewToNewZoom( nFactor ); + ScrollViewSzChg(); + } } +/** adjust position of vertical scrollbar + + OD 19.02.2003 #107369 + + @author OD +*/ +void SwPagePreView::SetVScrollbarThumbPos( const sal_uInt16 _nNewThumbPos ) +{ + if ( pVScrollbar ) + { + pVScrollbar->SetThumbPos( _nNewThumbPos ); + } +} diff --git a/sw/source/ui/uiview/pview.src b/sw/source/ui/uiview/pview.src index c39a9588a83f..f41e89e7d6d8 100644 --- a/sw/source/ui/uiview/pview.src +++ b/sw/source/ui/uiview/pview.src @@ -2,9 +2,9 @@ * * $RCSfile: pview.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: os $ $Date: 2002-12-06 14:13:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,7 +97,7 @@ ModalDialog DLG_PAGEPREVIEW_PRINTOPTIONS TEXT[ dutch ] = "Verdeling"; TEXT[ chinese_simplified ] = "分布"; TEXT[ greek ] = ""; - TEXT[ korean ] = "분할"; + TEXT[ korean ] = "배분"; TEXT[ turkish ] = "Dalm"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Distribuci"; @@ -514,10 +514,10 @@ ModalDialog DLG_PAGEPREVIEW_PRINTOPTIONS TEXT[ portuguese_brazilian ] = "~Vertikal"; TEXT[ portuguese ] = "~Vertical"; TEXT[ danish ] = "Lodret"; - TEXT[ french ] = "~Vertical"; + TEXT[ french ] = " la verticale"; TEXT[ swedish ] = "~Vertikalt"; TEXT[ dutch ] = "~Verticaal"; - TEXT[ spanish ] = "~Vertical"; + TEXT[ spanish ] = "~Verticalmente"; TEXT[ english_us ] = "~Vertically"; TEXT[ chinese_simplified ] = "纵向(~V)"; TEXT[ russian ] = ""; @@ -698,7 +698,7 @@ ModalDialog DLG_PAGEPREVIEW_PRINTOPTIONS TEXT[ dutch ] = "Standaar~d"; TEXT[ chinese_simplified ] = "默认(~D)"; TEXT[ greek ] = ""; - TEXT[ korean ] = "기본 값(~D)"; + TEXT[ korean ] = "기본값(~D)"; TEXT[ turkish ] = "Standar~t"; TEXT[ catalan ] = "~Per defecte"; TEXT[ finnish ] = "~Oletus"; @@ -736,7 +736,7 @@ ModalDialog DLG_PAGEPREVIEW_ZOOM SVLook = TRUE ; Size = MAP_APPFONT ( 141 , 69 ) ; Text = "Mehrere Seiten" ; - Text [ english_us ] = "Multiple pages" ; + Text [ english_us ] = "Multiple Pages" ; Moveable = TRUE ; FixedText FT_COL { @@ -853,20 +853,27 @@ ModalDialog DLG_PAGEPREVIEW_ZOOM Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - Text[ chinese_simplified ] = "显示比例"; + Text[ chinese_simplified ] = "多页"; Text[ russian ] = ""; Text[ polish ] = "Skala"; - Text[ japanese ] = "プレビューのズーム"; - Text[ chinese_traditional ] = "顯示比例"; + Text[ japanese ] = "複数ページ"; + Text[ chinese_traditional ] = "四頁"; Text[ arabic ] = " "; Text[ dutch ] = "Maatstaf"; - Text[ chinese_simplified ] = "显示比例"; + Text[ chinese_simplified ] = "多页"; Text[ greek ] = ""; - Text[ korean ] = "확대/축소"; + Text[ korean ] = "다중 페이지"; Text[ turkish ] = "Yaknlatr"; Text[ language_user1 ] = " "; Text[ catalan ] = "Zoom"; Text[ thai ] = "ย่อ/ขยาย"; + Text[ portuguese ] = "Zoom"; + Text[ french ] = "Plusieurs pages"; + Text[ spanish ] = "Varias pginas"; + Text[ finnish ] = "Zoomaus"; + Text[ italian ] = "Pi pagine"; + Text[ danish ] = "Mlestok"; + Text[ swedish ] = "Flera sidor"; }; String RID_PVIEW_TOOLBOX { @@ -890,7 +897,7 @@ String RID_PVIEW_TOOLBOX Text[ dutch ] = "Afdrukvoorbeeld"; Text[ chinese_simplified ] = "页面视图"; Text[ greek ] = " "; - Text[ korean ] = "인쇄 미리보기"; + Text[ korean ] = "인쇄 미리 보기"; Text[ turkish ] = "Sayfa nizleme"; Text[ language_user1 ] = " "; Text[ catalan ] = "Visualitzaci prvia de la pgina"; @@ -942,7 +949,9 @@ ToolBox RID_PVIEW_TOOLBOX { Identifier = FN_SHOW_MULTIPLE_PAGES ; HelpID = FN_SHOW_MULTIPLE_PAGES ; + DropDown = TRUE; }; + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; ToolBoxItem { Identifier = SID_ZOOM_OUT; @@ -986,3 +995,8 @@ ToolBox RID_PVIEW_TOOLBOX + + + + + diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx index 19f5ef4bb129..af9252bd03ad 100644 --- a/sw/source/ui/uiview/scroll.cxx +++ b/sw/source/ui/uiview/scroll.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scroll.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: ssa $ $Date: 2002-09-17 09:40:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,8 @@ #include "swrect.hxx" #include "scroll.hxx" +#define SCROLL_LINE_SIZE 250 + SwScrollbar::SwScrollbar( Window *pWin, int bHoriz ) : ScrollBar( pWin, @@ -92,13 +94,13 @@ SwScrollbar::SwScrollbar( Window *pWin, int bHoriz ) : Range des Scrollbars neu einzustellen. ------------------------------------------------------------------------*/ - void SwScrollbar::DocSzChgd( const Size &rSize ) { aDocSz = rSize; SetRange( Range( 0, bHori ? rSize.Width() : rSize.Height()) ); const ULONG nVisSize = GetVisibleSize(); - SetLineSize( nVisSize * 10 / 100 ); + SetLineSize( SCROLL_LINE_SIZE ); +// SetLineSize( nVisSize * 10 / 100 ); SetPageSize( nVisSize * 77 / 100 ); } @@ -148,7 +150,7 @@ void SwScrollbar::EnableThumbPos( BOOL bEnable, const SwRect &rVisArea ) void SwScrollbar::Show( BOOL bSet ) { bVisible = bSet; - if( (!bSet || bSizeSet || !bAuto) && IsUpdateMode() ) + if( (!bSet || !bAuto) && IsUpdateMode() && bSizeSet) ScrollBar::Show(bSet); } diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 8be25bf88d68..4b0a583dacc8 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srcview.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2002-10-25 10:08:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -587,11 +587,11 @@ void SwSrcView::Execute(SfxRequest& rReq) } if(pMed) { - SvStream* pInStream = pMed->GetInStream(); - pInStream->Seek(0); - pInStream->SetStreamSize(0); - aEditWin.Write( *pInStream ); - pMed->CloseInStream(); + SvStream* pOutStream = pMed->GetOutStream(); + pOutStream->Seek(0); + pOutStream->SetStreamSize(0); + aEditWin.Write( *pOutStream ); + pMed->CloseOutStream(); pMed->Commit(); pDocShell->GetDoc()->ResetModified(); SourceSaved(); @@ -739,6 +739,11 @@ void SwSrcView::GetState(SfxItemSet& rSet) } } break; + case SID_MAIL_SENDDOCASPDF: + case SID_MAIL_SENDDOC : + case SID_EXPORTDOCASPDF: + case SID_DIRECTEXPORTDOCASPDF: + case SID_EXPORTDOC: case SID_REPEAT: rSet.DisableItem(nWhich); break; @@ -762,7 +767,6 @@ void SwSrcView::GetState(SfxItemSet& rSet) rSet.DisableItem(nWhich); } break; - } nWhich = aIter.NextWhich(); } @@ -1041,14 +1045,8 @@ void SwSrcView::Load(SwDocShell* pDocShell) rtl_getBestMimeCharsetFromTextEncoding( pHtmlOptions->GetTextEncoding() ); rtl_TextEncoding eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet ); - rtl_TextEncoding eHeaderEnc = SfxHTMLParser::GetEncodingByHttpHeader( - pDocShell->GetHeaderAttributes() ); - if( RTL_TEXTENCODING_DONTKNOW != eHeaderEnc ) - eDestEnc = eHeaderEnc; - eLoadEncoding = eDestEnc; - aEditWin.SetReadonly(pDocShell->IsReadOnly()); - aEditWin.SetTextEncoding(eLoadEncoding); + aEditWin.SetTextEncoding(eDestEnc); SfxMedium* pMedium = pDocShell->GetMedium(); const SfxFilter* pFilter = pMedium->GetFilter(); @@ -1059,6 +1057,15 @@ void SwSrcView::Load(SwDocShell* pDocShell) SvStream* pStream = pMedium->GetInStream(); if(pStream && 0 == pStream->GetError() ) { + rtl_TextEncoding eHeaderEnc = + SfxHTMLParser::GetEncodingByHttpHeader( + pDocShell->GetHeaderAttributes() ); + if( RTL_TEXTENCODING_DONTKNOW != eHeaderEnc && + eDestEnc != eHeaderEnc ) + { + eDestEnc = eHeaderEnc; + aEditWin.SetTextEncoding(eDestEnc); + } pStream->SetStreamCharSet( eDestEnc ); pStream->Seek(0); TextEngine* pTextEngine = aEditWin.GetTextEngine(); @@ -1112,6 +1119,8 @@ void SwSrcView::Load(SwDocShell* pDocShell) } aEditWin.ClearModifyFlag(); + eLoadEncoding = eDestEnc; + if(bDocModified) pDocShell->SetModified();// das Flag wird zwischendurch zurueckgesetzt // AutoLoad abschalten diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 716db5fc423c..9b407c69c53a 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: os $ $Date: 2002-12-10 15:31:12 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -382,7 +382,8 @@ void SwView::SelectShell() // //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - + if(bInDtor) + return; // Entscheidung, ob UpdateTable gerufen werden muss sal_Bool bUpdateTable = sal_False; const SwFrmFmt* pCurTableFmt = pWrtShell->GetTableFmt(); @@ -830,8 +831,17 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) nFormSfxId( USHRT_MAX ), nSelectionType( INT_MAX ), nLastPasteDestination( 0xFFFF ), - nNewPage(USHRT_MAX) + nNewPage(USHRT_MAX), + bInMailMerge(FALSE), + bInDtor(FALSE) { + // OD 18.12.2002 #103492# - According to discussion with MBA and further + // investigations, no old SfxViewShell will be set as parameter <pOldSh>, + // if function "New Window" is performed to open an additional view beside + // an already existing one. + // If the view is switch from one to another, the 'old' view is given by + // parameter <pOldSh>. + RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwView::SwView" ); _CreateScrollbar( TRUE ); @@ -868,29 +878,38 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) sal_Bool bOldShellWasPagePreView = FALSE, bOldShellWasSrcView = FALSE; - if( !pOldSh ) + + // OD 18.12.2002 #103492# - determine, if there is an existing view for + // document + SfxViewShell* pExistingSh = 0; + if ( pOldSh ) + pExistingSh = pOldSh; + else { - //Gibt es schon eine Sicht auf das Dokument? SfxViewFrame *pF = SfxViewFrame::GetFirst( pDocSh ); if( pF == pFrame ) pF = SfxViewFrame::GetNext( *pF, pDocSh ); if( pF ) - pOldSh = pF->GetViewShell(); + pExistingSh = pF->GetViewShell(); } - else if( pOldSh->IsA( TYPE( SwPagePreView ) ) ) + + // determine type of existing view + if( pExistingSh && + pExistingSh->IsA( TYPE( SwPagePreView ) ) ) { - sSwViewData = ((SwPagePreView*)pOldSh)->GetPrevSwViewData(); - sNewCrsrPos = ((SwPagePreView*)pOldSh)->GetNewCrsrPos(); - nNewPage = ((SwPagePreView*)pOldSh)->GetNewPage(); + sSwViewData = ((SwPagePreView*)pExistingSh)->GetPrevSwViewData(); + sNewCrsrPos = ((SwPagePreView*)pExistingSh)->GetNewCrsrPos(); + nNewPage = ((SwPagePreView*)pExistingSh)->GetNewPage(); bOldShellWasPagePreView = TRUE; } - else if( pOldSh->IsA( TYPE( SwSrcView ) ) ) + else if( pExistingSh && + pExistingSh->IsA( TYPE( SwSrcView ) ) ) bOldShellWasSrcView = TRUE; RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create WrtShell" ); - if(PTR_CAST( SwView, pOldSh)) + if(PTR_CAST( SwView, pExistingSh)) { - pWrtShell = new SwWrtShell( *((SwView*)pOldSh)->pWrtShell, + pWrtShell = new SwWrtShell( *((SwView*)pExistingSh)->pWrtShell, pEditWin, *this); //MA: Das kann doch nur zu einem GPF fuehren! // nSelectionType = ((SwView*)pOldSh)->nSelectionType; @@ -915,7 +934,7 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) // add the ViewShell to the ring of the other ViewShell(s) if(bOldShellWasPagePreView) { - ViewShell& rPreviewViewShell = *((SwPagePreView*)pOldSh)->GetViewShell(); + ViewShell& rPreviewViewShell = *((SwPagePreView*)pExistingSh)->GetViewShell(); pWrtShell->MoveTo(&rPreviewViewShell); //#95521# to update the field command et.al. if necessary const SwViewOption* pPreViewOpt = rPreviewViewShell.GetViewOptions(); @@ -923,6 +942,14 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) pPreViewOpt->IsHidden() != aUsrPref.IsHidden() || pPreViewOpt->IsShowHiddenPara() != aUsrPref.IsShowHiddenPara() ) rPreviewViewShell.ApplyViewOptions(aUsrPref); + // OD 09.01.2003 #106334# - reset design mode at draw view for form + // shell, if needed. + if ( ((SwPagePreView*)pExistingSh)->ResetFormDesignMode() && + pWrtShell->HasDrawView() ) + { + SdrView* pDrawView = pWrtShell->GetDrawView(); + pDrawView->SetDesignMode( ((SwPagePreView*)pExistingSh)->FormDesignModeToReset() ); + } } } RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create WrtShell" ); @@ -1090,6 +1117,7 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) SwView::~SwView() { + bInDtor = TRUE; pEditWin->Hide(); // damit kein Paint Aerger machen kann! // An der SwDocShell den Pointer auf die View ruecksetzen SwDocShell* pDocSh = GetDocShell(); @@ -1221,12 +1249,31 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse ) sal_Bool bSelectObj = (0 != rUserData.GetToken( nOff, ';', nPos ).ToInt32()) && pWrtShell->IsObjSelectable( aCrsrPos ); + // OD 11.02.2003 #100556# - set flag value to avoid macro execution. + bool bSavedFlagValue = pWrtShell->IsMacroExecAllowed(); + pWrtShell->SetMacroExecAllowed( false ); pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj ); if( bSelectObj ) { pWrtShell->SelectObj( aCrsrPos ); pWrtShell->EnterSelFrmMode( &aCrsrPos ); } + // OD 11.02.2003 #100556# - reset flag value + pWrtShell->SetMacroExecAllowed( bSavedFlagValue ); + + //apply information from page preview - if available + if( sNewCrsrPos.Len() ) + { + long nX = sNewCrsrPos.GetToken( 0, ';' ).ToInt32(), + nY = sNewCrsrPos.GetToken( 1, ';' ).ToInt32(); + pWrtShell->SwCrsrShell::SetCrsr( Point( nX, nY ), FALSE ); + sNewCrsrPos.Erase(); + } + else if(USHRT_MAX != nNewPage) + { + pWrtShell->GotoPage(nNewPage); + nNewPage = USHRT_MAX; + } SelectShell(); @@ -1346,12 +1393,17 @@ void SwView::ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::s sal_Bool bSelectObj = (sal_False != bSelectedFrame ) && pWrtShell->IsObjSelectable( aCrsrPos ); + // OD 11.02.2003 #100556# - set flag value to avoid macro execution. + bool bSavedFlagValue = pWrtShell->IsMacroExecAllowed(); + pWrtShell->SetMacroExecAllowed( false ); pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj ); if( bSelectObj ) { pWrtShell->SelectObj( aCrsrPos ); pWrtShell->EnterSelFrmMode( &aCrsrPos ); } + // OD 11.02.2003 #100556# - reset flag value + pWrtShell->SetMacroExecAllowed( bSavedFlagValue ); } SelectShell(); diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src index fb1d9de24cf0..65e38612f66a 100644 --- a/sw/source/ui/uiview/view.src +++ b/sw/source/ui/uiview/view.src @@ -2,9 +2,9 @@ * * $RCSfile: view.src,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: os $ $Date: 2002-08-30 10:37:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,7 @@ QueryBox DLG_WRAP MESSAGE [ portuguese ] = "Deseja continuar com a verificao no incio do documento?" ; MESSAGE [ finnish ] = "Haluatko jatkaa tarkistusta asiakirjan alusta?" ; MESSAGE [ danish ] = "Vil du fortstte kontrollen fra dokumentets start?" ; - MESSAGE [ french ] = "Voulez-vous continuer la vrification depuis le dbut du document?" ; + MESSAGE [ french ] = "Continuer la vrification au dbut du document ?" ; MESSAGE [ swedish ] = "Vill du fortstta kontrollen i brjan p dokumentet?" ; MESSAGE [ dutch ] = "Wilt u dat de spellingcontrole wordt voortgezet bij het begin van het document?" ; MESSAGE [ spanish ] = "Desea continuar la revisin desde el comienzo del documento?" ; @@ -123,7 +123,7 @@ QueryBox DLG_BODY MESSAGE [ italian ] = "Controllare il testo principale?" ; MESSAGE [ portuguese_brazilian ] = "Deseja verificar o corpo do documento?" ; MESSAGE [ portuguese ] = "Deseja verificar o texto principal?" ; - MESSAGE [ finnish ] = "Haluatko tarkistaa p??tekstin?" ; + MESSAGE [ finnish ] = "Haluatko tarkistaa ptekstin?" ; MESSAGE [ danish ] = "Vil du kontrollere brdteksten?" ; MESSAGE [ french ] = "Voulez-vous vrifier le texte principal?" ; MESSAGE [ swedish ] = "Vill du kontrollera huvudtexten?" ; @@ -131,7 +131,7 @@ QueryBox DLG_BODY MESSAGE [ spanish ] = "Desea verificar el texto principal?" ; MESSAGE [ english_us ] = "Do you want to check the main text?" ; MESSAGE[ chinese_simplified ] = "您要检查正文吗？"; - MESSAGE[ russian ] = " ?"; + MESSAGE[ russian ] = " ?"; MESSAGE[ polish ] = "Czy chcesz sprawdza tekst gwny?"; MESSAGE[ japanese ] = "本文をチェックしますか。"; MESSAGE[ chinese_traditional ] = "您要檢查內文﹖"; @@ -154,20 +154,20 @@ QueryBox DLG_PRT_FIELDNAME MESSAGE [ portuguese_brazilian ] = "Option Show fieldname is checked.\nDo you want to print the document with fieldnames?" ; MESSAGE [ portuguese ] = "A opo 'Mostrar nome do campo' est activada.\nImprimir o documento com os nomes do campo?" ; MESSAGE [ french ] = "L'option Afficher le nom de champ est active.\nVoulez-vous imprimer le document avec le nom de champ ?" ; - MESSAGE [ dutch ] = "Optie Veldnaam weergeven is actief.\nWilt u het document met de veldnaam afdrukken?" ; + MESSAGE [ dutch ] = "Optie 'Veldnaam weergeven' is actief.\nWilt u het document met de veldnaam afdrukken?" ; MESSAGE [ spanish ] = "La opcin nombre de campo est activada. \nDesea imprimir el archivo con nombres de campo?" ; MESSAGE [ danish ] = "Vis feltnavn er aktiveret\nVil du udskrive dokumentet med feltnavn?" ; MESSAGE [ swedish ] = "Alternativet Visa fltnamn r aktiverat.\nVill du skriva ut dokumentet med fltnamn?" ; MESSAGE [ finnish ] = "Nyt kenttkomennot -asetus on valittuna.\nHaluatko tulostaa asiakirjan niin, ett kenttnimet nkyvt?" ; MESSAGE [ english_us ] = "Show field commands option is checked.\nDo you want to print the document with field names?" ; MESSAGE[ chinese_simplified ] = "字段名称选项还处于使用的状态。\n您要连同字段名称一起打印这个文件吗？"; - MESSAGE[ russian ] = " ' ' .\n ?"; + MESSAGE[ russian ] = " ' ' .\n ?"; MESSAGE[ polish ] = "Opcja Poka nazw pola jest uaktywiona.\nCzy chcesz wydrukowa ten dokument z nazw pola?"; MESSAGE[ japanese ] = "オプションでフィールド名がアクティブになっています。\n文書にフィールド名を印刷しますか。"; MESSAGE[ chinese_traditional ] = "欄位名稱選項還處於使用狀態。\n您要連同欄位名稱一起列印這個檔案﹖"; MESSAGE[ arabic ] = " \" \" .\n "; MESSAGE[ greek ] = " .\n ;"; - MESSAGE[ korean ] = "옵션 필드 이름 표시가 활성화되어 있습니다.\n필드 이름과 함께 문서를 인쇄하겠습니까?"; + MESSAGE[ korean ] = "옵션 필드의 이름 표시가 활성화되어 있습니다.\n필드 이름을 같이 문서에 인쇄하시겠습니까?"; MESSAGE[ turkish ] = "\"Alan adn grntle\" seenei etkin.\nBelgeyi alan adlaryla yazdrmak istiyor musunuz?"; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "L'opci Mostra les ordres de camp est activada. \nVoleu imprimir el document amb els noms de camp?"; @@ -197,7 +197,7 @@ QueryBox DLG_SPECIAL MESSAGE[ chinese_traditional ] = "您要檢查特殊區域﹖"; MESSAGE[ arabic ] = " ɿ"; MESSAGE[ greek ] = " ;"; - MESSAGE[ korean ] = "특정한 영역을 검사하겠습니까?"; + MESSAGE[ korean ] = "특수 영역을 검사하시겠습니까?"; MESSAGE[ turkish ] = "zel blmler denetlensin mi?"; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "Voleu revisar les regions especials?"; @@ -213,15 +213,15 @@ QueryBox DLG_THESAURUS MESSAGE [ italian ] = "Tale temine andrebbe evitato. Avviare il dizionario dei sinonimi?" ; MESSAGE [ portuguese_brazilian ] = "Por favor evite esta palavra!Iniciar thesaurus?" ; MESSAGE [ portuguese ] = "Evite esta palavra! Iniciar o dicionrio de sinnimos?" ; - MESSAGE [ finnish ] = "T?m? sana esiintyy v?ltett?vien sanojen luettelossa! Avataanko synonyymisanasto?" ; + MESSAGE [ finnish ] = "Tm sana esiintyy vltettvien sanojen luettelossa. Avataanko synonyymisanasto?" ; MESSAGE [ danish ] = "Undg venligst dette ord! Vil du bruge synonymordbogen?" ; MESSAGE [ french ] = "Il vaudrait mieux viter d'employer ce mot ! Souhaitez-vous consulter le dictionnaire des synonymes ?" ; MESSAGE [ swedish ] = "Undvik det hr ordet! Starta synonymordlista?" ; MESSAGE [ dutch ] = "Dit woord niet gebruiken! Thesaurus starten?" ; - MESSAGE [ spanish ] = "Debera evitar esta palabra! Iniciar bsqueda de sinnimos?" ; + MESSAGE [ spanish ] = "Evite esta palabra! Iniciar bsqueda de sinnimos?" ; MESSAGE [ english_us ] = "This word appears in the list of words you want to avoid! Start thesaurus?" ; MESSAGE[ chinese_simplified ] = "您应该避免使用这个字！您要启动同义词词典吗？"; - MESSAGE[ russian ] = " ! ?"; + MESSAGE[ russian ] = " ! ?"; MESSAGE[ polish ] = "Unikaj tego sowa! Wczy Tezaurus?"; MESSAGE[ japanese ] = "この単語の使用は避けてください。類義語辞典を開始しますか。"; MESSAGE[ chinese_traditional ] = "您應該避免使用這個字﹗您要啟動同義詞詞典嗎﹖"; @@ -243,7 +243,7 @@ QueryBox DLG_SPECIAL_FORCED MESSAGE [ italian ] = "Il controllo delle aree speciali non attivo, controllare lo stesso?" ; MESSAGE [ portuguese_brazilian ] = "Verifica??o de Regi?s especiais est? desativada, Verificar assim mesmo?" ; MESSAGE [ portuguese ] = "A verificao de zonas especiais est desactivada, mesmo assim prosseguir?" ; - MESSAGE [ finnish ] = "Tarkista erityisalueet -toiminto on poistettu k?yt?t?. Tarkistetaanko kuitenkin?" ; + MESSAGE [ finnish ] = "Tarkista erityisalueet -toiminto on poistettu kytst. Tarkistetaanko kuitenkin?" ; MESSAGE [ danish ] = "Stavekontrol af sromrder er slet fra, skal der kontrolleres alligevel?" ; MESSAGE [ french ] = "La vrification dans les zones spciales est dsactive. Vrifier tout de mme ?" ; MESSAGE [ swedish ] = "Kontroll av specialomrden r avstngd. Kontrollera nd?" ; @@ -251,7 +251,7 @@ QueryBox DLG_SPECIAL_FORCED MESSAGE [ spanish ] = "La verificacin de las reas especiales est desactivada, Desea de todas maneras verificar?" ; MESSAGE [ english_us ] = "Check special regions is deactivated. Check anyway?" ; MESSAGE[ chinese_simplified ] = "特殊区域的检查已经关闭，您还是要执行这项检查？"; - MESSAGE[ russian ] = " , ?"; + MESSAGE[ russian ] = " . , ?"; MESSAGE[ polish ] = "Sprawdzanie obszarw specjalnych jest wyczone, mimo to sprawdza?"; MESSAGE[ japanese ] = "特別範囲はオフになっています。それでもチェックしますか。"; MESSAGE[ chinese_traditional ] = "已經關閉特殊區域的檢查﹐還是要執行這個指令﹖"; @@ -281,7 +281,7 @@ QueryBox MSG_SEARCH_END Message [ spanish ] = "%PRODUCTNAME Writer ha buscado hasta el final del documento. Desea continuar la bsqueda desde el principio?" ; Message [ english_us ] = "%PRODUCTNAME Writer has searched to the end of the document. Do you want to continue at the beginning?" ; Message[ chinese_simplified ] = "%PRODUCTNAME Writer 已经搜寻至文档的结束位置。要继续从文档的起始位置开始搜寻？"; - Message[ russian ] = "%PRODUCTNAME Writer . ?"; + Message[ russian ] = "%PRODUCTNAME Writer . ?"; Message[ polish ] = "%PRODUCTNAME Writer przeszuka dokument do koca. Czy kontynuowa wyszukiwanie od pocztku dokumentu?"; Message[ japanese ] = "%PRODUCTNAME Writer は、文書末まで検索しました。文書の始めに戻って続行しますか。"; Message[ chinese_traditional ] = "%PRODUCTNAME Writer 已經搜尋至文件的結束位置。要從文件的起始位置繼續搜尋？"; @@ -311,13 +311,13 @@ QueryBox MSG_SEARCH_START Message [ spanish ] = "%PRODUCTNAME Writer ha buscado hasta el principio del documento. Desea continuar desde el final?" ; Message [ english_us ] = "%PRODUCTNAME Writer has searched to the beginning of the document. Do you want to continue at the end?" ; Message[ chinese_simplified ] = "%PRODUCTNAME Writer 已经搜寻至文档的起始位置。要继续从文件的结束位置开始搜寻？"; - Message[ russian ] = "%PRODUCTNAME Writer . ?"; + Message[ russian ] = "%PRODUCTNAME Writer . ?"; Message[ polish ] = "%PRODUCTNAME Writer przeszuka dokument do pocztku. Czy kontynuowa wyszukiwanie od koca dokumentu?"; Message[ japanese ] = "%PRODUCTNAME Writer は、文書の始めまで検索しました。文書末に戻って検索を続けますか。"; Message[ chinese_traditional ] = "%PRODUCTNAME Writer 已經搜尋至文件的起始位置。要從文件的結束位置繼續搜尋﹖"; Message[ arabic ] = " %PRODUCTNAME Writer . Ͽ"; Message[ greek ] = " %PRODUCTNAME Writer . ;"; - Message[ korean ] = "%PRODUCTNAME Writer가 문서의 시작부분까지 검색했습니다. 문서의 끝부분에서 검색을 계속하겠습니까?"; + Message[ korean ] = "%PRODUCTNAME Writer가 문서의 시작까지 검색했습니다. 문서의 끝에서 검색을 계속하시겠습니까?"; Message[ turkish ] = "%PRODUCTNAME Writer belgenin bana kadar aramay tamamlad. Belgenin sonundan aramaya devam etmek istiyor musunuz?"; Message[ language_user1 ] = " "; Message[ catalan ] = "%PRODUCTNAME Writer ha buscado hasta el principio del documento. Desea continuar desde el final?"; @@ -334,10 +334,10 @@ InfoBox MSG_NO_MERGE_ENTRY Message [ italian ] = "Non stato possibile unire alcunch." ; Message [ spanish ] = "No se pudieron fusionar los documentos." ; Message [ french ] = "Impossible de fusionner les documents." ; - Message [ dutch ] = "Er was geen merge van documenten mogelijk." ; + Message [ dutch ] = "Er is geen samenvoeging van documenten mogelijk." ; Message [ portuguese ] = "Foi impossvel intercalar os documentos." ; Message[ chinese_simplified ] = "无法合并文档。"; - Message[ russian ] = " - ."; + Message[ russian ] = " ."; Message[ polish ] = "Nie mona byo scali dokumentw."; Message[ japanese ] = "なにも結合できませんでした。"; Message[ chinese_traditional ] = "無法合併文件。"; @@ -358,21 +358,21 @@ InfoBox MSG_ERR_INSERT_GLOS MESSAGE [ italian ] = "Impossibile creare voce di glossario." ; MESSAGE [ portuguese_brazilian ] = "N?o pude inserir Texto Autom?tico." ; MESSAGE [ portuguese ] = "Impossvel inserir o AutoTexto." ; - MESSAGE [ finnish ] = "Automaattista teksti? ei voitu luoda." ; + MESSAGE [ finnish ] = "Automaattista teksti ei voitu luoda." ; MESSAGE [ danish ] = "Det var ikke muligt at oprette AutoTekst." ; MESSAGE [ french ] = "Impossible de crer l'AutoTexte." ; MESSAGE [ swedish ] = "AutoText kunde inte skapas." ; - MESSAGE [ dutch ] = "AutoTekst kon niet worden toegepast." ; - MESSAGE [ spanish ] = "No se pudo crear el AutoTexto." ; + MESSAGE [ dutch ] = "AutoTekst kan niet worden toegepast." ; + MESSAGE [ spanish ] = "No se pudo crear el Texto automtico." ; MESSAGE [ english_us ] = "AutoText could not be created." ; MESSAGE[ chinese_simplified ] = "无法建立自动图文集。"; - MESSAGE[ russian ] = " ."; + MESSAGE[ russian ] = " ."; MESSAGE[ polish ] = "Autotekst nie mg zosta utworzony."; MESSAGE[ japanese ] = "入力支援が作成できませんでした。"; MESSAGE[ chinese_traditional ] = "無法建立自動圖文集。"; MESSAGE[ arabic ] = ". "; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "자동 텍스트를 만들 수 없었습니다."; + MESSAGE[ korean ] = "자동 텍스트를 만들지 못했습니다."; MESSAGE[ turkish ] = "Otomatik metin yaratlamad."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "No s'ha pogut crear el text automtic."; @@ -392,13 +392,13 @@ InfoBox MSG_ERR_SRCSTREAM Message [ dutch ] = "De brontekst kan niet worden geladen." ; Message [ portuguese ] = " impossvel carregar o texto-fonte." ; Message[ chinese_simplified ] = "无法装入源文本。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Nie mona byo zaadowa tekstu rdowego."; Message[ japanese ] = "ソーステキストを読み込みできません。"; Message[ chinese_traditional ] = "無法載入原始檔。"; Message[ arabic ] = ". "; Message[ greek ] = " ."; - Message[ korean ] = "소스 텍스트를 로드할 수 없습니다."; + Message[ korean ] = "원본을 로드할 수 없습니다."; Message[ turkish ] = "Kaynak kod yklenemiyor."; Message[ language_user1 ] = " "; Message[ catalan ] = "No es pot carregar el text font"; @@ -421,10 +421,10 @@ InfoBox MSG_ERR_NO_FAX Message[ polish ] = "W sekwencji Narzdzia/Opcje/%1/Drukuj nie ustawiono drukarki faksu."; Message[ turkish ] = "Aralar/Seenekler/Yazdrma altnda faks konfigrasyonu yaplmad."; Message[ language_user1 ] = " "; - Message[ russian ] = " //%1/ - ."; + Message[ russian ] = " //%1/- ."; Message[ greek ] = " Fax //%1/."; Message[ japanese ] = "ツール → オプション → %1 → 印刷で Fax プリンタが設定されていません。"; - Message[ korean ] = "도구/옵션/%1/인쇄하에서 팩스 프린터가 설정되지 않았습니다."; + Message[ korean ] = "도구 -> 옵션 -> %1 -> 인쇄에서 팩스 프린터가 설정되지 않았습니다."; Message[ chinese_simplified ] = "在工具/选项/%1/打印机处没有设定传真打印机。"; Message[ chinese_traditional ] = "在工具/選項/%1/機印表機處沒有設定列印傳真的驅動程式。"; Message[ arabic ] = " \"//%1/\"."; @@ -438,7 +438,7 @@ String STR_WEBOPTIONS TEXT [ English ] = "HTML document" ; TEXT[ english_us ] = "HTML document"; TEXT[ portuguese ] = "Documento HTML"; - TEXT[ russian ] = " HTML"; + TEXT[ russian ] = "-"; TEXT[ greek ] = " HTML"; TEXT[ dutch ] = "HTML-document"; TEXT[ french ] = "Document HTML"; @@ -492,7 +492,7 @@ InfoBox MSG_NOT_FOUND Message [ italian ] = "Termine non trovato" ; Message [ portuguese_brazilian ] = "Padrao de busca n?o encontrado." ; Message [ portuguese ] = "Impossvel encontrar expresso procurada." ; - Message [ finnish ] = "Hakuavainta ei l?tynyt." ; + Message [ finnish ] = "Etsittv ei lytynyt." ; Message [ danish ] = "Sgningen gav intet resultat." ; Message [ french ] = "Terme recherch introuvable !" ; Message [ swedish ] = "Skord hittades inte." ; @@ -506,7 +506,7 @@ InfoBox MSG_NOT_FOUND Message[ chinese_traditional ] = "沒有找到所要搜尋的條目。"; Message[ arabic ] = " ."; Message[ greek ] = " ."; - Message[ korean ] = "검색용어를 찾지 못했습니다."; + Message[ korean ] = "검색 키를 찾지 못했습니다."; Message[ turkish ] = "Arama terimi bulunamad."; Message[ language_user1 ] = " "; Message[ catalan ] = "No s'ha trobat la clau de cerca."; @@ -520,7 +520,7 @@ InfoBox MSG_INDEX_OVERFLOW Message [ italian ] = "Termine non trovato" ; Message [ portuguese_brazilian ] = "Padrao de busca n?o encontrado." ; Message [ portuguese ] = "localizado." ; - Message [ finnish ] = "l?tynyt." ; + Message [ finnish ] = "lytynyt." ; Message [ danish ] = "fundet." ; Message [ french ] = "trouv(e/s)." ; Message [ swedish ] = "funnet." ; @@ -550,7 +550,7 @@ InfoBox MSG_SCAN_NOSOURCE Message [ italian ] = "Sorgente non specificata." ; Message [ spanish ] = "No se especific la fuente." ; Message [ french ] = "Source non dfinie." ; - Message [ dutch ] = "Bron niet aangegeven." ; + Message [ dutch ] = "Bron niet gedefinieerd." ; Message [ portuguese_brazilian ] = "Quelle nicht gesetzt." ; Message [ portuguese ] = "Fonte no especificada." ; Message[ chinese_simplified ] = "没有指定源。"; @@ -560,7 +560,7 @@ InfoBox MSG_SCAN_NOSOURCE Message[ chinese_traditional ] = "沒有定義來源。"; Message[ arabic ] = ". "; Message[ greek ] = " ."; - Message[ korean ] = "소스가 설정되지 않았습니다."; + Message[ korean ] = "원본이 지정되지 않았습니다."; Message[ turkish ] = "Kaynak belirlenmedi."; Message[ language_user1 ] = " "; Message[ catalan ] = "No s'ha indicat la font."; @@ -575,12 +575,12 @@ String STR_NOGLOS1 TEXT [ italian ] = "Testo automatico per la sigla '" ; TEXT [ portuguese_brazilian ] = "Texto Autom?tico para Abrevia??o" ; TEXT [ portuguese ] = "AutoTexto para abreviatura '" ; - TEXT [ finnish ] = "Automaattinen teksti pikavalinnalle '" ; + TEXT [ finnish ] = "Automaattista teksti pikavalinnalle" ; TEXT [ danish ] = "AutoTekst til genvej '" ; TEXT [ french ] = "AutoTexte pour raccourci ' " ; TEXT [ swedish ] = "AutoText fr genvg '" ; TEXT [ dutch ] = "AutoTekst voor afkortingen '" ; - TEXT [ spanish ] = "AutoTexto para la abreviatura '" ; + TEXT [ spanish ] = "Texto automtico para la abreviatura '" ; TEXT [ english_us ] = "AutoText for Shortcut '" ; TEXT[ chinese_simplified ] = "自动图文集缩写 '"; TEXT[ russian ] = " '"; @@ -589,7 +589,7 @@ String STR_NOGLOS1 TEXT[ chinese_traditional ] = "自動圖文集縮寫<"; TEXT[ arabic ] = " '"; TEXT[ greek ] = " '"; - TEXT[ korean ] = "자동 텍스트 바로가기 '"; + TEXT[ korean ] = "자동 텍스트 바로 가기 '"; TEXT[ turkish ] = "Otomatik metin ksaltmas '"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "El text automtic per a la drecera '"; @@ -607,7 +607,7 @@ String STR_NOGLOS2 TEXT [ italian ] = "' non trovato." ; TEXT [ portuguese_brazilian ] = "' n?o encontrado." ; TEXT [ portuguese ] = "' no encontrado." ; - TEXT [ finnish ] = "Kohdetta ' ei l?dy." ; + TEXT [ finnish ] = "ei lydy." ; TEXT [ danish ] = "'blev ikke fundet." ; TEXT [ french ] = "' est introuvable." ; TEXT [ swedish ] = "' hittades inte." ; @@ -615,13 +615,13 @@ String STR_NOGLOS2 TEXT [ spanish ] = "' no se encontr." ; TEXT [ english_us ] = "' not found." ; TEXT[ chinese_simplified ] = "' 没有被找到。"; - TEXT[ russian ] = "' ."; + TEXT[ russian ] = " ."; TEXT[ polish ] = "' nie znaleziono."; TEXT[ japanese ] = "」は見つかりませんでした。"; TEXT[ chinese_traditional ] = ">沒有找到。"; TEXT[ arabic ] = " '"; TEXT[ greek ] = "' ."; - TEXT[ korean ] = "' 찾지 못했음."; + TEXT[ korean ] = "' 찾지 못했습니다."; TEXT[ turkish ] = "' bulunamad."; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "' no s'ha trobat."; @@ -631,7 +631,7 @@ String STR_NUM_LEVEL { TEXT = "Ebene " ; TEXT [ English ] = "Level " ; - Text [ dutch ] = "Niveau " ; + Text [ dutch ] = "Niveau" ; Text [ english_us ] = "Level " ; Text [ italian ] = "Livello " ; Text [ spanish ] = "Nivel " ; @@ -662,21 +662,21 @@ String STR_ERROR_NOLANG TEXT [ italian ] = "Nell'area verificata non stata impostata nessuna lingua." ; TEXT [ portuguese_brazilian ] = "No language choosed in checked region." ; TEXT [ portuguese ] = "Na seco verificada no existe nenhuma lngua definida." ; - TEXT [ finnish ] = "Tarkistettavassa alueessa ei ole valittu kielt?." ; + TEXT [ finnish ] = "Tarkistettavassa osassa ei ole valittu kielt." ; TEXT [ danish ] = "Der er ikke angivet et sprog i det kontrollerede omrde." ; TEXT [ french ] = "Aucune langue choisie pour rgion dfinie." ; TEXT [ swedish ] = "Inget sprk r instllt i det kontrollerade omrdet." ; - TEXT [ dutch ] = "In gecontroleerd bereik geen taal vastgelegd." ; - TEXT [ spanish ] = "No se ha seleccionado ningn idioma en el rea revisada." ; + TEXT [ dutch ] = "In gecontroleerd bereik is geen taal vastgelegd." ; + TEXT [ spanish ] = "No se ha seleccionado ningn idioma para la seccin controlada." ; TEXT [ english_us ] = "No language is selected in the proofed section." ; TEXT[ chinese_simplified ] = "在检查的区域内没有选中任何语言。"; - TEXT[ russian ] = " ."; + TEXT[ russian ] = " ."; TEXT[ polish ] = "W sprawdzanym obszarze nie ustawiono jzyka."; TEXT[ japanese ] = "チェックした範囲には言語が設定されていません。"; TEXT[ chinese_traditional ] = "在已經檢查的區域內沒有設定任何一個語言。"; TEXT[ arabic ] = ". "; TEXT[ greek ] = " ."; - TEXT[ korean ] = "검색된 영역에는 설정된 언어가 없습니다."; + TEXT[ korean ] = "검색된 구역에는 설정된 언어가 없습니다."; TEXT[ turkish ] = "Denetlenen blmde dil seilmedi."; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "No s'ha seleccionat cap idioma en l'rea revisada."; @@ -690,7 +690,7 @@ String STR_EDIT_FOOTNOTE TEXT [ italian ] = "Modifica nota a pi pagina" ; TEXT [ portuguese_brazilian ] = "Editar nota de rodap?" ; TEXT [ portuguese ] = "Editar nota de rodap" ; - TEXT [ finnish ] = "Muokkaa alaviitett?" ; + TEXT [ finnish ] = "Muokkaa alaviitett" ; TEXT [ danish ] = "Rediger fodnote" ; TEXT [ french ] = "dition de note de bas de page" ; TEXT [ swedish ] = "Redigera fotnot" ; @@ -718,21 +718,21 @@ String STR_NB_REPLACED Text [ italian ] = "Testo sostituito XX volte" ; Text [ portuguese_brazilian ] = "Padrao de busca substitu?do XX vezes." ; Text [ portuguese ] = "Expresso procurada substituda XX vezes." ; - Text [ finnish ] = "Hakuavain korvattu XX kertaa." ; + Text [ finnish ] = "Etsittv korvattu XX kertaa." ; Text [ danish ] = "Sgeord erstattet XX gange." ; Text [ french ] = "Le terme recherch a t remplac XX fois." ; Text [ swedish ] = "Skord ersatt XX gnger." ; - Text [ dutch ] = "Het gezochte item is XX keer vervangen." ; + Text [ dutch ] = "Zoekbegrip XX keer vervangen." ; Text [ spanish ] = "La expresin buscada ha sido reemplazada XX veces." ; Text [ english_us ] = "Search key replaced XX times." ; Text[ chinese_simplified ] = "搜寻条目被 XX 次替换。"; - Text[ russian ] = " XX."; + Text[ russian ] = " XX ."; Text[ polish ] = "Szukane haso zostao XX razy zastpione."; Text[ japanese ] = "XX 個の検索キーが置換されました。"; Text[ chinese_traditional ] = "搜尋項目被 XX 次代替。"; Text[ arabic ] = " ."; Text[ greek ] = " XX ."; - Text[ korean ] = "검색 용어가 XX번 대체됨."; + Text[ korean ] = "검색 키가 XX번 바뀌었습니다."; Text[ turkish ] = "Arama terimi XX kez deitirildi."; Text[ language_user1 ] = " "; Text[ catalan ] = "La clau de cerca ha estat reemplaada XX vegades."; @@ -773,11 +773,11 @@ String STR_SRCVIEW_ROW Text [ italian ] = "Riga " ; Text [ portuguese_brazilian ] = "Fileira " ; Text [ portuguese ] = "Linha " ; - Text [ finnish ] = "Rivi" ; + Text [ finnish ] = "Rivi " ; Text [ danish ] = "Rkke " ; Text [ french ] = "Ligne " ; Text [ swedish ] = "Rad " ; - Text [ dutch ] = "Rij " ; + Text [ dutch ] = "Rij" ; Text [ spanish ] = "Fila " ; Text [ english_us ] = "Row " ; Text[ chinese_simplified ] = "行 "; @@ -801,15 +801,15 @@ String STR_SRCVIEW_COL Text [ italian ] = "Colonna " ; Text [ portuguese_brazilian ] = "Coluna " ; Text [ portuguese ] = "Coluna " ; - Text [ finnish ] = "Sarake" ; + Text [ finnish ] = "Palsta " ; Text [ danish ] = "Kolonne " ; Text [ french ] = "Colonne " ; Text [ swedish ] = "Kolumn " ; - Text [ dutch ] = "Kolom " ; + Text [ dutch ] = "Kolom" ; Text [ spanish ] = "Columna " ; Text [ english_us ] = "Column " ; Text[ chinese_simplified ] = "列 "; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Kolumna "; Text[ japanese ] = "列 "; Text[ chinese_traditional ] = "欄 "; @@ -831,7 +831,7 @@ String STR_PRINT_TITLE Text[ danish ] = "Udskriv det markerede"; Text[ french ] = "Imprimer la slection"; Text[ swedish ] = "Skriv ut det markerade"; - Text[ dutch ] = "Afdrukken van de selectie"; + Text[ dutch ] = "Selectie afdrukken"; Text[ spanish ] = "Imprimir la seleccin"; Text[ english_us ] = "Printing selection"; Text[ chinese_simplified ] = "打印选中的部分"; @@ -841,7 +841,7 @@ String STR_PRINT_TITLE Text[ chinese_traditional ] = "列印選取部份"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "선택 인쇄"; + Text[ korean ] = "선택한 범위 인쇄"; Text[ turkish ] = "Seimi yazdr"; Text[ language_user1 ] = " "; Text[ catalan ] = "Impressi de la selecci"; @@ -862,13 +862,13 @@ String STR_PRINT_MSG Text[ spanish ] = "Desea imprimir solo la seleccin o todo el documento?"; Text[ english_us ] = "Do you want to print the selection or the entire document?"; Text[ chinese_simplified ] = "要打印选中的部分还是要打印整个文档？"; - Text[ russian ] = " ?"; + Text[ russian ] = " ?"; Text[ polish ] = "Czy chcesz wydrukowa selekcj czy te cay dokument?"; Text[ japanese ] = "選択範囲か文書全体のどちらを印刷しますか？"; Text[ chinese_traditional ] = "您要列印選取的部份還是要列印整個文件﹖"; Text[ arabic ] = " "; Text[ greek ] = " ;"; - Text[ korean ] = "선택된 문서나 전체 문서를 인쇄하겠습니까?"; + Text[ korean ] = "선택 범위만 인쇄하시겠습니까, 아니면 전체 문서를 인쇄하시겠습니까?"; Text[ turkish ] = "Seimi ya da tm belgeyi yazdrmak istiyor musunuz?"; Text[ language_user1 ] = " "; Text[ catalan ] = "Voleu imprimir la selecci o b tot el document?"; @@ -936,7 +936,7 @@ String STR_READONLY_SEL TEXT[ english_us ] = "read-only"; TEXT[ portuguese ] = "s leitura"; TEXT[ russian ] = " "; - TEXT[ dutch ] = "schrijfbeveiligd"; + TEXT[ dutch ] = "Alleen-lezen"; TEXT[ french ] = "en lecture seule"; TEXT[ spanish ] = "slo lectura"; TEXT[ italian ] = "a sola lettura"; @@ -976,11 +976,11 @@ String STR_SAVEAS_SRC Text[ chinese_traditional ] = "匯出原始檔(~E)..."; Text[ arabic ] = " ..."; Text[ greek ] = " ..."; - Text[ korean ] = "소스텍스트 내보내기(~E)..."; + Text[ korean ] = "원본 내보내기(~E)..."; Text[ turkish ] = "Kaynak kodu da aktar..."; Text[ language_user1 ] = " "; Text[ catalan ] = "~Exporta la font..."; - Text[ finnish ] = "~Vie lhde"; + Text[ finnish ] = "~Vie lhde..."; Text[ thai ] = "~ส่งออกที่มา..."; }; String MN_SRCVIEW_POPUPMENU @@ -995,7 +995,7 @@ String MN_SRCVIEW_POPUPMENU Text [ italian ] = "Testo sorgente HTML" ; Text [ spanish ] = "Texto fuente HTML" ; Text [ french ] = "Texte source HTML" ; - Text [ dutch ] = "HTML - brontekst" ; + Text [ dutch ] = "HTML-brontekst" ; Text[ chinese_simplified ] = "HTML 源文本"; Text[ russian ] = " HTML"; Text[ polish ] = "Tekst rdowy HTML"; @@ -1003,7 +1003,7 @@ String MN_SRCVIEW_POPUPMENU Text[ chinese_traditional ] = "HTML 原始檔"; Text[ arabic ] = " HTML"; Text[ greek ] = " HTML"; - Text[ korean ] = "HTML 소스텍스트"; + Text[ korean ] = "HTML 원본"; Text[ turkish ] = "HTML kaynak kodu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Font HTML"; @@ -1203,7 +1203,7 @@ Menu MN_SRCVIEW_POPUPMENU Text[ chinese_traditional ] = "HTML 原始檔"; Text[ arabic ] = " HTML"; Text[ greek ] = " HTML"; - Text[ korean ] = "HTML 소스텍스트"; + Text[ korean ] = "HTML 원본"; Text[ turkish ] = "HTML kaynak kodu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Font HTML"; @@ -1215,3 +1215,18 @@ Menu MN_SRCVIEW_POPUPMENU + + + + + + + + + + + + + + + diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 0121c5aa3f1a..de94e65f0a8a 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view0.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: os $ $Date: 2002-08-28 12:23:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -157,7 +157,7 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) ) SFX_CHILDWINDOW_REGISTRATION(FN_REDLINE_ACCEPT); SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG); SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId()); - + SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD_DATA_ONLY); SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_SYNC_LABELS, 1); SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS| diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx index c51a715cbf1c..b281817dc7fd 100644 --- a/sw/source/ui/uiview/view1.cxx +++ b/sw/source/ui/uiview/view1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view1.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: os $ $Date: 2002-03-15 07:32:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,18 +149,6 @@ void SwView::Activate(BOOL bMDIActivate) if( sSwViewData.Len() ) { ReadUserData( sSwViewData, FALSE ); - if( sNewCrsrPos.Len() ) - { - long nX = sNewCrsrPos.GetToken( 0, ';' ).ToInt32(), - nY = sNewCrsrPos.GetToken( 1, ';' ).ToInt32(); - pWrtShell->SwCrsrShell::SetCrsr( Point( nX, nY ), FALSE ); - sNewCrsrPos.Erase(); - } - else if(USHRT_MAX != nNewPage) - { - pWrtShell->GotoPage(nNewPage); - nNewPage = USHRT_MAX; - } sSwViewData.Erase(); } diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 38dd92366721..4f8a3ae17e25 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view2.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: os $ $Date: 2002-12-12 16:37:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,9 @@ #ifndef _SFX_PASSWD_HXX #include <sfx2/passwd.hxx> #endif +#ifndef _SFX_HELP_HXX +#include <sfx2/sfxhelp.hxx> +#endif #ifndef _SVX_LANGITEM_HXX //autogen #include <svx/langitem.hxx> #endif @@ -285,16 +288,41 @@ #ifndef _VIEW_HRC #include <view.hrc> #endif +#ifndef _APP_HRC +#include <app.hrc> +#endif #ifndef _FMTCLDS_HXX //autogen #include <fmtclds.hxx> #endif #include <helpid.h> +#ifndef _SVTOOLS_TEMPLDLG_HXX +#include <svtools/templdlg.hxx> +#endif +#ifndef _DBCONFIG_HXX +#include <dbconfig.hxx> +#endif +#ifndef _DBMGR_HXX +#include <dbmgr.hxx> +#endif +#ifndef _MAILMRGE_HXX +#include "mailmrge.hxx" +#endif +#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +#include <comphelper/processfactory.hxx> +#endif +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif +#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ +#include <com/sun/star/container/XNameAccess.hpp> +#endif //Damit die Seitenanzeige in der Statusleiste nicht unnoetig erfolgt. static String sLstPg; static USHORT nPageCnt = 0; const char __FAR_DATA sStatusDelim[] = " : "; +using namespace ::rtl; using namespace com::sun::star; using namespace com::sun::star::i18n; using namespace com::sun::star::util; @@ -302,6 +330,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::scanner; using namespace ::com::sun::star::i18n; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::container; +#define C2U(char) rtl::OUString::createFromAscii(char) /*--------------------------------------------------------------------------- Beschreibung: String fuer die Seitenanzeige in der Statusbar basteln. @@ -753,6 +784,63 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) } } break; + case FN_INSERT_FIELD_DATA_ONLY : + { + BOOL bShow = FALSE; + if( pArgs && + SFX_ITEM_SET == pArgs->GetItemState(nSlot, FALSE, &pItem )) + bShow = ((const SfxBoolItem*)pItem)->GetValue(); + //GetViewFrame()->ShowChildWindow(nSlot, bShow && bInMailMerge); + if((bShow && bInMailMerge) != GetViewFrame()->HasChildWindow(nSlot)) + GetViewFrame()->ToggleChildWindow(nSlot); + //if fields have been succesfully inserted call the "real" + //mail merge dialog + SwWrtShell &rSh = GetWrtShell(); + if(bInMailMerge && rSh.IsAnyDatabaseFieldInDoc()) + { + SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr(); + if (pNewDBMgr) + { + SwDBData aData; + aData = rSh.GetDBData(); + rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer + // das Mischen von DB-Feldern notwendig. + AttrChangedNotify( &rSh ); + pNewDBMgr->SetMergeType( DBMGR_MERGE ); + + Sequence<PropertyValue> aProperties(3); + PropertyValue* pValues = aProperties.getArray(); + pValues[0].Name = C2U("DataSourceName"); + pValues[1].Name = C2U("Command"); + pValues[2].Name = C2U("CommandType"); + pValues[0].Value <<= aData.sDataSource; + pValues[1].Value <<= aData.sCommand; + pValues[2].Value <<= aData.nCommandType; + pNewDBMgr->ExecuteFormLetter(rSh, aProperties, TRUE); + } + } + bInMailMerge &= bShow; + GetViewFrame()->GetBindings().Invalidate(FN_INSERT_FIELD); + } + break; + case FN_QRY_MERGE: + { + BOOL bUseCurrentDocument = TRUE; + BOOL bQuery = !pArgs||SFX_ITEM_SET != pArgs->GetItemState(nSlot); + if(bQuery) + { + SfxViewFrame* pFrame = GetViewFrame(); + SfxHelp::OpenHelpAgent( pFrame->GetFrame(), HID_MAIL_MERGE_SELECT ); + SwMailMergeCreateFromDlg* pDlg = new SwMailMergeCreateFromDlg( + &pFrame->GetWindow()); + if(RET_OK == pDlg->Execute()) + bUseCurrentDocument = pDlg->IsThisDocument(); + else + break; + } + GenerateFormLetter(bUseCurrentDocument); + } + break; default: ASSERT(!this, falscher Dispatcher); return; @@ -930,10 +1018,15 @@ void SwView::StateStatusLine(SfxItemSet &rSet) rShell.GetAttr(aSet); const SfxPoolItem* pItem; if(SFX_ITEM_AVAILABLE <= - aSet.GetItemState(RES_PARATR_NUMRULE, TRUE, &pItem)) + aSet.GetItemState(RES_PARATR_NUMRULE, TRUE + /*, &pItem */ )) { const String& rNumStyle = - ((const SfxStringItem*)pItem)->GetValue(); + ((const SfxStringItem &) + aSet.Get(RES_PARATR_NUMRULE)).GetValue(); + /* #i5116# GetItemState does not necessarily + change pItem */ + // ((const SfxStringItem*)pItem)->GetValue(); if(rNumStyle.Len()) { sStr.AppendAscii(sStatusDelim); @@ -1485,4 +1578,149 @@ extern int lcl_FindDocShell( SfxObjectShellRef& xDocSh, delete pMed; return nFound; } +/* -----------------05.02.2003 12:06----------------- + * + * --------------------------------------------------*/ +void SwView::EnableMailMerge(BOOL bEnable ) +{ + bInMailMerge = bEnable; + SfxBindings& rBind = GetViewFrame()->GetBindings(); + rBind.Invalidate(FN_INSERT_FIELD_DATA_ONLY); + rBind.Update(FN_INSERT_FIELD_DATA_ONLY); +} +/* -----------------05.02.2003 16:33----------------- + * + * --------------------------------------------------*/ +/* -----------------27.11.2002 12:12----------------- + * + * --------------------------------------------------*/ +void SwView::GenerateFormLetter(BOOL bUseCurrentDocument) +{ + if(bUseCurrentDocument) + { + if(!GetWrtShell().IsAnyDatabaseFieldInDoc()) + { + //check availability of data sources (except biblio source) + Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); + Reference<XNameAccess> xDBContext; + if( xMgr.is() ) + { + Reference<XInterface> xInstance = xMgr->createInstance( + OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" )); + xDBContext = Reference<XNameAccess>(xInstance, UNO_QUERY) ; + } + if(!xDBContext.is()) + return ; + Sequence < OUString > aNames = xDBContext->getElementNames(); + BOOL bCallAddressPilot = FALSE; + if(!aNames.getLength() || + (1 == aNames.getLength() && + aNames.getConstArray()[0] == SW_MOD()->GetDBConfig()->GetBibliographySource().sDataSource)) + { + // no data sources are available - create a new one + WarningBox aWarning( + &GetViewFrame()->GetWindow(), + SW_RES(MSG_DATA_SOURCES_UNAVAILABLE)); + // no cancel allowed + aWarning.Execute(); + bCallAddressPilot = TRUE; + } + else + { + //take an existing data source or create a new one? + SwMailMergeFieldConnectionsDlg* pConnectionsDlg = new SwMailMergeFieldConnectionsDlg( + &GetViewFrame()->GetWindow()); + if(RET_OK == pConnectionsDlg->Execute()) + bCallAddressPilot = !pConnectionsDlg->IsUseExistingConnections(); + else + return; + + } + if(bCallAddressPilot) + { + GetViewFrame()->GetDispatcher()->Execute( + SID_ADDRESS_DATA_SOURCE, SFX_CALLMODE_SYNCHRON); + } + + //call insert fields with database field page available, only + SfxViewFrame* pVFrame = GetViewFrame(); + //at first hide the default field dialog if currently visible + pVFrame->SetChildWindow(FN_INSERT_FIELD, FALSE); + //enable the status of the db field dialog - it is disabled in the status method + //to prevent creation of the dialog without mail merge active + EnableMailMerge(); + //then show the "Data base only" field dialog + SfxBoolItem aOn(FN_INSERT_FIELD_DATA_ONLY, TRUE); + pVFrame->GetDispatcher()->Execute(FN_INSERT_FIELD_DATA_ONLY, + SFX_CALLMODE_SYNCHRON, &aOn, 0); + return; + } + else + { + // check whether the + String sSource; + if(!GetWrtShell().IsFieldDataSourceAvailable(sSource)) + { + WarningBox aWarning( &GetViewFrame()->GetWindow(), + SW_RES(MSG_MERGE_SOURCE_UNAVAILABLE)); + String sTmp(aWarning.GetMessText()); + sTmp.SearchAndReplaceAscii("%1", sSource); + aWarning.SetMessText(sTmp); + aWarning.Execute(); + return ; + } + } + SwNewDBMgr* pNewDBMgr = GetWrtShell().GetNewDBMgr(); + + SwDBData aData; + SwWrtShell &rSh = GetWrtShell(); + aData = rSh.GetDBData(); + rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer + // das Mischen von DB-Feldern notwendig. + AttrChangedNotify( &rSh ); + pNewDBMgr->SetMergeType( DBMGR_MERGE ); + + if (pNewDBMgr) + { + Sequence<PropertyValue> aProperties(3); + PropertyValue* pValues = aProperties.getArray(); + pValues[0].Name = C2U("DataSourceName"); + pValues[1].Name = C2U("Command"); + pValues[2].Name = C2U("CommandType"); + pValues[0].Value <<= aData.sDataSource; + pValues[1].Value <<= aData.sCommand; + pValues[2].Value <<= aData.nCommandType; + pNewDBMgr->ExecuteFormLetter(GetWrtShell(), aProperties, TRUE); + } + } + else + { + //call documents and template dialog + SfxApplication* pSfxApp = SFX_APP(); + Window* pTopWin = pSfxApp->GetTopWindow(); + SvtDocumentTemplateDialog* pDocTemplDlg = new SvtDocumentTemplateDialog( pTopWin ); + pDocTemplDlg->SelectTemplateFolder(); + + int nRet = pDocTemplDlg->Execute(); + sal_Bool bNewWin = sal_False; + if ( nRet == RET_OK ) + { + if ( pTopWin != pSfxApp->GetTopWindow() ) + { + // the dialogue opens a document -> a new TopWindow appears + pTopWin = pSfxApp->GetTopWindow(); + bNewWin = sal_True; + } + } + + delete pDocTemplDlg; + if ( bNewWin ) + // after the destruction of the dialogue its parent comes to top, + // but we want that the new document is on top + pTopWin->ToTop(); + +// return; + } +} + diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 1a58d557ffdc..d77437df94ef 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewport.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: os $ $Date: 2002-12-11 09:33:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1100,41 +1100,54 @@ void SwView::ShowAtResize() void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize ) { bInInnerResizePixel = TRUE; - SvBorder aBorder; - CalcAndSetBorderPixel( aBorder, TRUE ); - Size aSz( rSize ); - aSz.Height() += aBorder.Top() + aBorder.Bottom(); - aSz.Width() += aBorder.Left() + aBorder.Right(); - Size aEditSz( GetEditWin().GetOutputSizePixel() ); - const BOOL bBrowse = pWrtShell->IsBrowseMode(); - ViewResizePixel( GetEditWin(), rOfst, aSz, aEditSz, TRUE, *pVScrollbar, + const BOOL bHScrollVisible = pHScrollbar->IsVisible(TRUE); + const BOOL bVScrollVisible = pVScrollbar->IsVisible(TRUE); + BOOL bRepeat = FALSE; + do + { + SvBorder aBorder; + CalcAndSetBorderPixel( aBorder, TRUE ); + Size aSz( rSize ); + aSz.Height() += aBorder.Top() + aBorder.Bottom(); + aSz.Width() += aBorder.Left() + aBorder.Right(); + Size aEditSz( GetEditWin().GetOutputSizePixel() ); + const BOOL bBrowse = pWrtShell->IsBrowseMode(); + ViewResizePixel( GetEditWin(), rOfst, aSz, aEditSz, TRUE, *pVScrollbar, *pHScrollbar, pPageUpBtn, pPageDownBtn, pNaviBtn, *pScrollFill, pVRuler, pHRuler, 0 != PTR_CAST(SwWebView, this), pWrtShell->GetViewOptions()->IsVRulerRight()); - if ( bShowAtResize ) - ShowAtResize(); + if ( bShowAtResize ) + ShowAtResize(); - if( pHRuler->IsVisible() || pVRuler->IsVisible() ) - { - const Fraction& rFrac = GetEditWin().GetMapMode().GetScaleX(); - USHORT nZoom = USHORT(rFrac.GetNumerator() * 100L / rFrac.GetDenominator()); + if( pHRuler->IsVisible() || pVRuler->IsVisible() ) + { + const Fraction& rFrac = GetEditWin().GetMapMode().GetScaleX(); + USHORT nZoom = USHORT(rFrac.GetNumerator() * 100L / rFrac.GetDenominator()); - const Fraction aFrac( nZoom, 100 ); - pVRuler->SetZoom( aFrac ); - pHRuler->SetZoom( aFrac ); - InvalidateRulerPos(); //Inhalt invalidieren. - } - //CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down - //nicht mehr zum aktuell sichtbaren Bereich passen - pWrtShell->ResetCursorStack(); + const Fraction aFrac( nZoom, 100 ); + pVRuler->SetZoom( aFrac ); + pHRuler->SetZoom( aFrac ); + InvalidateRulerPos(); //Inhalt invalidieren. + } + //CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down + //nicht mehr zum aktuell sichtbaren Bereich passen + pWrtShell->ResetCursorStack(); - //EditWin niemals einstellen! + //EditWin niemals einstellen! - //VisArea einstellen, aber dort nicht das SetVisArea der DocShell rufen! - bProtectDocShellVisArea = TRUE; - CalcVisArea( aEditSz ); + //VisArea einstellen, aber dort nicht das SetVisArea der DocShell rufen! + bProtectDocShellVisArea = TRUE; + CalcVisArea( aEditSz ); + //visibility changes of the automatic horizontal scrollbar + //require to repeat the ViewResizePixel() call - but only once! + if(bRepeat) + bRepeat = FALSE; + else if(bHScrollVisible != pHScrollbar->IsVisible(TRUE) || + bVScrollVisible != pVScrollbar->IsVisible(TRUE)) + bRepeat = TRUE; + }while( bRepeat ); bProtectDocShellVisArea = FALSE; bInInnerResizePixel = FALSE; } @@ -1220,8 +1233,12 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) //nicht mehr zum aktuell sichtbaren Bereich passen pWrtShell->ResetCursorStack(); - ASSERT( ( aEditSz.Width() > 0 && aEditSz.Height() > 0 ) - || !aVisArea.IsEmpty(), "Small world, isn't it?" ); +#ifdef DEBUG + SwEditWin &rW = GetEditWin(); +#endif + ASSERT( !GetEditWin().IsVisible() || + (( aEditSz.Width() > 0 && aEditSz.Height() > 0 ) + || !aVisArea.IsEmpty()), "Small world, isn't it?" ); //EditWin niemals einstellen! diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index eb5a90fdc318..45f86945e09d 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewprt.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:14:12 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -318,6 +318,9 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg, } else { + const BOOL bLockedView = pSh->IsViewLocked(); + pSh->LockView( TRUE ); + //BrowseView abschalten und die View gegen alle Paints locken. FASTBOOL bBrowse = pSh->IsBrowseMode(); SfxAllItemSet aSet( SFX_APP()->GetPool() ); @@ -327,7 +330,6 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg, if ( pSh->GetWin() ) pSh->GetWin()->Update(); pSh->LockPaint(); - pSh->LockView( TRUE ); aSet.Put( aBrowse, aBrowse.Which() ); SfxRequest aReq( SID_BROWSER_MODE, 0, aSet ); GetDocShell()->Execute( aReq ); @@ -372,9 +374,10 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg, aSet.Put( aBrowse, aBrowse.Which() ); SfxRequest aReq( SID_BROWSER_MODE, 0, aSet ); GetDocShell()->Execute( aReq ); - pSh->LockView( FALSE ); pSh->UnlockPaint(); } + + pSh->LockView( bLockedView ); } } @@ -486,6 +489,8 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq) SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, FALSE); BOOL bSilent = pSilentItem ? pSilentItem->GetValue() : FALSE; SFX_REQUEST_ARG(rReq, pPrintFromMergeItem, SfxBoolItem, FN_QRY_MERGE, FALSE); + if(pPrintFromMergeItem) + rReq.RemoveItem(FN_QRY_MERGE); BOOL bFromMerge = pPrintFromMergeItem ? pPrintFromMergeItem->GetValue() : FALSE; if(!bSilent && !bFromMerge && pSh->IsAnyDatabaseFieldInDoc()) { diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index ed534feba949..ecec90bd5c1f 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewsrch.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:26:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,6 +84,9 @@ #ifndef _SVTOOLS_CJKOPTIONS_HXX #include <svtools/cjkoptions.hxx> #endif +#ifndef _SVTOOLS_CTLOPTIONS_HXX +#include <svtools/ctloptions.hxx> +#endif #ifndef _SVX_PAGEITEM_HXX //autogen #include <svx/pageitem.hxx> #endif @@ -453,7 +456,8 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage) aArr.Insert( aNormalAttr, sizeof( aNormalAttr ) / sizeof( aNormalAttr[0] ), 0 ); - if( /*CTL*/ FALSE ) + SvtCTLOptions aCTLOpt; + if( aCTLOpt.IsCTLFontEnabled() ) aArr.Insert( aCTLAttr, sizeof( aCTLAttr ) / sizeof( aCTLAttr[0] ), 14 ); @@ -629,7 +633,7 @@ BOOL SwView::SearchAll(USHORT* pFound) pWrtShell->SttDoc(); } bExtra = FALSE; - USHORT nFound = FUNC_Search( aOpts ); + USHORT nFound = (USHORT)FUNC_Search( aOpts ); if(pFound) *pFound = nFound; bFound = 0 != nFound; @@ -735,7 +739,7 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions ) // build SearchOptions to be used // SearchOptions aSearchOpt( pSrchItem->GetSearchOptions() ); - aSearchOpt.Locale = CreateLocale( GetAppLanguage() ); + aSearchOpt.Locale = CreateLocale( (USHORT)GetAppLanguage() ); if( !bDoReplace ) aSearchOpt.replaceString = aEmptyStr; diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index 9f7567059806..60eb564d8ae1 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewstat.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2002-05-03 11:10:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,6 +88,9 @@ #ifndef _SVT_IMAGEITM_HXX #include <svtools/imageitm.hxx> #endif +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #ifndef _SVX_PROTITEM_HXX //autogen #include <svx/protitem.hxx> #endif @@ -444,6 +447,10 @@ void SwView::GetState(SfxItemSet &rSet) rSet.Put(aImageItem); } break; + case FN_INSERT_FIELD_DATA_ONLY : + if(!bInMailMerge && !GetViewFrame()->HasChildWindow(nWhich)) + rSet.DisableItem(nWhich); + break; } nWhich = aIter.NextWhich(); } @@ -469,6 +476,11 @@ void SwView::GetDrawState(SfxItemSet &rSet) else { SfxAllEnumItem aEnum(SID_INSERT_DRAW, nDrawSfxId); + if ( !SvtLanguageOptions().IsVerticalTextEnabled() ) + { + aEnum.DisableValue( SID_DRAW_CAPTION_VERTICAL ); + aEnum.DisableValue( SID_DRAW_TEXT_VERTICAL ); + } rSet.Put(aEnum); } break; diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index faf57b91c62e..9ac9a6012c84 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewtab.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2002-09-26 13:21:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1101,7 +1101,8 @@ void SwView::ExecTabWin( SfxRequest& rReq ) nBorder = nPageWidth - aTabCols.GetLeftMin() + DOCUMENTBORDER - aColItem.GetRight(); - aTabCols.SetRight( nBorder ); + if ( nPageWidth >= aTabCols.GetLeftMin() + aTabCols.GetRight() ) + aTabCols.SetRight( nBorder ); // Tabcols der Reihe nach // Die letzte Col wird durch den Rand definiert @@ -1493,8 +1494,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) case SID_RULER_BORDERS_VERTICAL: case SID_RULER_BORDERS: { - BOOL bRTL; - BOOL bFrameHasVerticalColumns = bFrmSelection && rSh.IsFrmVertical(FALSE, bRTL); + BOOL bFrameRTL; + BOOL bFrameHasVerticalColumns = rSh.IsFrmVertical(FALSE, bFrameRTL) && bFrmSelection; if((SID_RULER_BORDERS_VERTICAL == nWhich) && ((!bVerticalWriting && !bFrmSelection) || (bFrmSelection && !bFrameHasVerticalColumns)) || @@ -1516,6 +1517,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) { rSh.GetTabCols( aTabCols ); nNum = rSh.GetCurTabColNum(); + if(rSh.IsTableRightToLeft()) + nNum = aTabCols.Count() - nNum; } ASSERT(nNum <= aTabCols.Count(), "TabCol not found"); @@ -1589,7 +1592,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) if( //eigentlich sollte FRMTYPE_COLSECT nicht enthalten sein, wenn der Rahmen selektiert ist! !bFrmSelection && - nFrmType & FRMTYPE_COLSECT ) + nFrmType & FRMTYPE_COLSECT ) { const SwSection *pSect = rSh.GetAnySection(FALSE, pPt); ASSERT( pSect, "Welcher Bereich?"); @@ -1597,7 +1600,11 @@ void SwView::StateTabWin(SfxItemSet& rSet) { SwSectionFmt *pFmt = pSect->GetFmt(); const SwFmtCol& rCol = pFmt->GetCol(); - SvxColumnItem aColItem(--nNum); + if(rSh.IsInRightToLeftText()) + nNum = rCol.GetColumns().Count() - nNum; + else + --nNum; + SvxColumnItem aColItem(nNum); const SwRect &rRect = rSh.GetAnyCurRect(RECT_SECTION, pPt); ::lcl_FillSvxColumn(rCol, USHORT(bVerticalWriting ? rRect.Height() : rRect.Width()), aColItem, 0); @@ -1625,10 +1632,13 @@ void SwView::StateTabWin(SfxItemSet& rSet) // Spalten in Rahmen if ( nNum ) { - nNum--; const SwFrmFmt* pFmt = rSh.GetFlyFrmFmt() ; const SwFmtCol& rCol = pFmt->GetCol(); + if(rSh.IsInRightToLeftText()) + nNum = rCol.GetColumns().Count() - nNum; + else + nNum--; SvxColumnItem aColItem(nNum); const SwRect &rSizeRect = rSh.GetAnyCurRect(RECT_FLY_PRT_EMBEDDED, pPt); @@ -1664,9 +1674,13 @@ void SwView::StateTabWin(SfxItemSet& rSet) } else { // Spalten auf der Seite - nNum--; const SwFrmFmt& rMaster = rDesc.GetMaster(); SwFmtCol aCol(rMaster.GetCol()); + if(rFrameDir.GetValue() == FRMDIR_HORI_RIGHT_TOP) + nNum = aCol.GetColumns().Count() - nNum; + else + nNum--; + SvxColumnItem aColItem(nNum); const SwRect aPrtRect = rSh.GetAnyCurRect(RECT_PAGE_PRT, pPt); const SvxBoxItem& rBox = (const SvxBoxItem&)rMaster.GetAttr(RES_BOX); diff --git a/sw/source/ui/uno/RefreshListenerContainer.cxx b/sw/source/ui/uno/RefreshListenerContainer.cxx index 8efc1f021a5e..26af61dcac30 100644 --- a/sw/source/ui/uno/RefreshListenerContainer.cxx +++ b/sw/source/ui/uno/RefreshListenerContainer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: RefreshListenerContainer.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mtg $ $Date: 2001-11-27 18:45:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ #ifdef PRECOMPILED -#include "ui_pch.hxx" +#include "core_pch.hxx" #endif #pragma hdrstop diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index fec3159051bb..09b611d54c1d 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SwXDocumentSettings.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: tl $ $Date: 2002-11-11 13:27:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,10 +59,17 @@ * ************************************************************************/ #ifdef PRECOMPILED -#include "ui_pch.hxx" +#include "core_pch.hxx" #endif #pragma hdrstop +#ifndef _VOS_MUTEX_HXX_ +#include <vos/mutex.hxx> +#endif +#ifndef _SFX_SFXBASECONTROLLER_HXX_ +#include <sfx2/sfxbasecontroller.hxx> +#endif + #ifndef _SW_XDOCUMENT_SETTINGS_HXX #include <SwXDocumentSettings.hxx> #endif @@ -122,6 +129,7 @@ #include <vcl/svapp.hxx> #endif + using namespace rtl; using namespace comphelper; using namespace com::sun::star; @@ -178,7 +186,7 @@ MasterPropertySetInfo * lcl_createSettingsInfo() { RTL_CONSTASCII_STRINGPARAM("SaveGlobalDocumentLinks"), HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseDataSource"), HANDLE_CURRENT_DATABASE_DATA_SOURCE, CPPUTYPE_OUSTRING, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommand"), HANDLE_CURRENT_DATABASE_COMMAND, CPPUTYPE_OUSTRING, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommandType"), HANDLE_CURRENT_DATABASE_COMMAND_TYPE, CPPUTYPE_INT32, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommandType"), HANDLE_CURRENT_DATABASE_COMMAND_TYPE, CPPUTYPE_INT32, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("SaveVersionOnClose"), HANDLE_SAVE_VERSION_ON_CLOSE, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("UpdateFromTemplate"), HANDLE_UPDATE_FROM_TEMPLATE, CPPUTYPE_BOOLEAN, 0, 0}, /* @@ -213,11 +221,13 @@ MasterPropertySetInfo * lcl_createSettingsInfo() } SwXDocumentSettings::SwXDocumentSettings ( SwXTextDocument * pModel ) -: MasterHelperNoState ( lcl_createSettingsInfo (), &Application::GetSolarMutex () ) +: MasterPropertySet ( lcl_createSettingsInfo (), + &Application::GetSolarMutex () ) , mxModel ( pModel ) , mpModel ( pModel ) , mpDocSh ( NULL ) , mpDoc ( NULL ) +, mpPrinter( NULL ) { registerSlave ( new SwXPrintSettings ( PRINT_SETTINGS_DOCUMENT, mpModel->GetDocShell()->GetDoc() ) ); registerSlave ( new SwXPrintPreviewSettings ( mpModel->GetDocShell()->GetDoc() ) ); @@ -227,6 +237,65 @@ SwXDocumentSettings::~SwXDocumentSettings() throw() { } + +Any SAL_CALL SwXDocumentSettings::queryInterface( const Type& rType ) + throw(RuntimeException) +{ + return ::cppu::queryInterface ( rType, + // OWeakObject interfaces + reinterpret_cast< XInterface* > ( this ), + static_cast< XWeak* > ( this ), + // my own interfaces + static_cast< XPropertySet* > ( this ), + static_cast< XPropertyState* > ( this ), + static_cast< XMultiPropertySet* > ( this ), + static_cast< XServiceInfo* > ( this ), + static_cast< XTypeProvider* > ( this ) ); +} +void SwXDocumentSettings::acquire () + throw () +{ + OWeakObject::acquire(); +} +void SwXDocumentSettings::release () + throw () +{ + OWeakObject::release(); +} + +uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( ) + throw (RuntimeException) +{ + vos::OGuard aGuard(Application::GetSolarMutex()); + + uno::Sequence< uno::Type > aBaseTypes( 5 ); + uno::Type* pBaseTypes = aBaseTypes.getArray(); + + // from MasterPropertySet + pBaseTypes[0] = ::getCppuType((Reference< XPropertySet >*)0); + pBaseTypes[1] = ::getCppuType((Reference< XPropertyState >*)0); + pBaseTypes[2] = ::getCppuType((Reference< XMultiPropertySet >*)0); + // + pBaseTypes[3] = ::getCppuType((Reference< XServiceInfo >*)0); + pBaseTypes[4] = ::getCppuType((Reference< XTypeProvider >*)0); + + return aBaseTypes; +} + +uno::Sequence< sal_Int8 > SAL_CALL SwXDocumentSettings::getImplementationId( ) + throw (RuntimeException) +{ + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; + if(!bInit) + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } + return aId; +} + void SwXDocumentSettings::_preSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) { @@ -313,7 +382,11 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf { SfxPrinter *pNewPrinter = new SfxPrinter ( pPrinter->GetOptions().Clone(), sPrinterName ); if (pNewPrinter->IsKnown()) - mpDoc->SetPrt ( pNewPrinter, sal_False ); + { + // set printer only once; in _postSetValues + delete mpPrinter; + mpPrinter = pNewPrinter; + } else delete pNewPrinter; } @@ -345,7 +418,9 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf SfxItemSet *pItemSet = new SfxItemSet( mpDoc->GetAttrPool(), nRange ); SfxPrinter *pPrinter = SfxPrinter::Create ( aStream, pItemSet ); - mpDoc->SetPrt( pPrinter, sal_False ); + // set printer only once; in _postSetValues + delete mpPrinter; + mpPrinter = pPrinter; if ( !pPrinter->IsOriginal() ) { @@ -441,6 +516,10 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf void SwXDocumentSettings::_postSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) { + // set printer only once, namely here! + if( mpPrinter != NULL ) + mpDoc->SetPrt( mpPrinter, true ); + mpDocSh = 0; mpDoc = 0; } @@ -625,3 +704,5 @@ Sequence< OUString > SAL_CALL SwXDocumentSettings::getSupportedServiceNames( ) aSeq[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.Settings") ); return aSeq; } + + diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx index dc4bd1e65d44..a1e6a5be46eb 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.hxx +++ b/sw/source/ui/uno/SwXDocumentSettings.hxx @@ -2,9 +2,9 @@ * * $RCSfile: SwXDocumentSettings.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mtg $ $Date: 2001-11-27 18:46:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,16 +73,30 @@ #ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP #include <com/sun/star/text/XTextDocument.hpp> #endif -#ifndef _COMPHELPER_SETTINGSHELPER_HXX_ -#include <comphelper/SettingsHelper.hxx> +#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ +#include <com/sun/star/lang/XServiceInfo.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_ +#include <com/sun/star/lang/XTypeProvider.hpp> +#endif +#ifndef _CPPUHELPER_WEAK_HXX_ +#include <cppuhelper/weak.hxx> +#endif +#ifndef _CPPUHELPER_IMPLBASE5_HXX_ +#include <cppuhelper/implbase5.hxx> #endif + class SwXTextDocument; class SwDocShell; class SwDoc; +class SfxPrinter; - -class SwXDocumentSettings : public comphelper::MasterHelperNoState +class SwXDocumentSettings : + public comphelper::MasterPropertySet, + public com::sun::star::lang::XServiceInfo, + public com::sun::star::lang::XTypeProvider, + public cppu::OWeakObject { protected: com::sun::star::uno::Reference< com::sun::star::text::XTextDocument > mxModel; @@ -90,6 +104,12 @@ protected: SwDocShell* mpDocSh; SwDoc* mpDoc; + /** the printer should be set only once; since there are several + * printer-related properties, remember the last printer and set it in + * _postSetValues */ + SfxPrinter* mpPrinter; + + virtual void _preSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) @@ -109,6 +129,14 @@ public: virtual ~SwXDocumentSettings() throw(); + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire( ) + throw (); + virtual void SAL_CALL release( ) + throw (); + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(com::sun::star::uno::RuntimeException); @@ -116,5 +144,9 @@ public: throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(com::sun::star::uno::RuntimeException); + + // XTypeProvider + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); }; #endif diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx index ef6f0768126a..24d2c0ceb948 100644 --- a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx +++ b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SwXPrintPreviewSettings.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mtg $ $Date: 2001-11-27 18:47:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,7 @@ * ************************************************************************/ #ifdef PRECOMPILED -#include "ui_pch.hxx" +#include "core_pch.hxx" #endif #pragma hdrstop #ifndef _SW_XPRINTPREVIEWSETTINGS_HXX_ @@ -124,7 +124,7 @@ static ChainablePropertySetInfo * lcl_createPrintPreviewSettingsInfo() return new ChainablePropertySetInfo ( aPrintPreviewSettingsMap_Impl ); } SwXPrintPreviewSettings::SwXPrintPreviewSettings( SwDoc *pDoc) -: ChainableHelperNoState( lcl_createPrintPreviewSettingsInfo (), &Application::GetSolarMutex() ) +: ChainablePropertySet ( lcl_createPrintPreviewSettingsInfo (), &Application::GetSolarMutex() ) , mbPreviewDataChanged( sal_False ) , mpDoc( pDoc) { @@ -137,6 +137,29 @@ SwXPrintPreviewSettings::~SwXPrintPreviewSettings() { } +Any SAL_CALL SwXPrintPreviewSettings::queryInterface( const Type& rType ) + throw(RuntimeException) +{ + return ::cppu::queryInterface ( rType , + // OWeakObject interfaces + reinterpret_cast< XInterface* > ( this ) , + static_cast< XWeak* > ( this ) , + // my own interfaces + static_cast< XServiceInfo* > ( this ) , + static_cast< XPropertySet* > ( this ) , + static_cast< XMultiPropertySet* > ( this ) ); +} +void SwXPrintPreviewSettings::acquire () + throw () +{ + OWeakObject::acquire(); +} +void SwXPrintPreviewSettings::release () + throw () +{ + OWeakObject::release(); +} + void SwXPrintPreviewSettings::_preSetValues () throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) { diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx index 97a4e433ae03..2c4387e5580c 100644 --- a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx +++ b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx @@ -2,9 +2,9 @@ * * $RCSfile: SwXPrintPreviewSettings.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mtg $ $Date: 2001-11-27 18:48:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,14 +67,17 @@ #endif #pragma hdrstop +#ifndef _COMPHELPER_CHAINABLEPROPERTYSET_HXX_ +#include <comphelper/ChainablePropertySet.hxx> +#endif #ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP #include <com/sun/star/text/XTextDocument.hpp> #endif -#ifndef _COMPHELPER_CHAINABLEPROPERTYSET_HXX_ -#include <comphelper/ChainablePropertySet.hxx> +#ifndef _CPPUHELPER_WEAK_HXX_ +#include <cppuhelper/weak.hxx> #endif -#ifndef _COMPHELPER_SETTINGSHELPER_HXX_ -#include <comphelper/SettingsHelper.hxx> +#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ +#include <com/sun/star/lang/XServiceInfo.hpp> #endif class SwXTextDocument; @@ -82,7 +85,9 @@ class SwDocShell; class SwDoc; class SwPagePreViewPrtData; -class SwXPrintPreviewSettings : public comphelper::ChainableHelperNoState +class SwXPrintPreviewSettings :public comphelper::ChainablePropertySet, + public cppu::OWeakObject, + public com::sun::star::lang::XServiceInfo { friend class SwXDocumentSettings; protected: @@ -109,6 +114,14 @@ public: virtual ~SwXPrintPreviewSettings() throw(); + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire( ) + throw (); + virtual void SAL_CALL release( ) + throw (); + //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/sw/source/ui/uno/makefile.mk b/sw/source/ui/uno/makefile.mk index 6a3f37911274..883a6de23af5 100644 --- a/sw/source/ui/uno/makefile.mk +++ b/sw/source/ui/uno/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: os $ $Date: 2002-06-21 14:21:42 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:44:55 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,6 +84,7 @@ SLOFILES = \ $(SLO)$/unodispatch.obj\ $(SLO)$/unotxdoc.obj\ $(SLO)$/unoatxt.obj \ + $(SLO)$/unomailmerge.obj \ $(SLO)$/unomod.obj \ $(SLO)$/unotxvw.obj \ $(SLO)$/dlelstnr.obj \ @@ -98,6 +99,7 @@ EXCEPTIONSFILES= \ $(SLO)$/dlelstnr.obj \ $(SLO)$/unotxdoc.obj \ $(SLO)$/unoatxt.obj \ + $(SLO)$/unomailmerge.obj \ $(SLO)$/unomod.obj \ $(SLO)$/unotxvw.obj \ $(SLO)$/unofreg.obj \ diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 473c0c608700..df4147ed7b12 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoatxt.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: tl $ $Date: 2002-08-14 12:16:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -763,6 +763,7 @@ sal_Bool SwXAutoTextGroup::hasElements(void) throw( uno::RuntimeException ) nCount = pGlosGroup->GetCount(); else throw uno::RuntimeException(); + delete pGlosGroup; return nCount > 0; } @@ -890,7 +891,7 @@ void SwXAutoTextGroup::setPropertyValue( throw beans::UnknownPropertyException(); SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(sGroupName, sal_False) : 0; - if(!pGlosGroup && !pGlosGroup->GetError()) + if(!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); switch(pMap->nWID) { @@ -1233,6 +1234,7 @@ void SwXAutoTextEntry::applyTo(const Reference< text::XTextRange > & xTextRange) SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(sGroupName); sal_Bool bResult = pBlock && !pBlock->GetError() && pDoc->InsertGlossary( *pBlock, sEntryName, *pInsertPaM); + delete pBlock; delete pInsertPaM; if(!bResult) @@ -1342,6 +1344,8 @@ void SwAutoTextEventDescriptor::replaceByName( pBlocks->SetMacroTable( nIndex, aMacroTable ); } } + + delete pBlocks; } // else: ignore } @@ -1385,6 +1389,8 @@ void SwAutoTextEventDescriptor::getByName( rMacro = *pMacro; } } + + delete pBlocks; } } diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx index 81f93dbd634c..dcc9ecbd7fad 100644 --- a/sw/source/ui/uno/unofreg.cxx +++ b/sw/source/ui/uno/unofreg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unofreg.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-06-24 13:58:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,6 +124,14 @@ extern uno::Sequence< OUString > SAL_CALL SwXModule_getSupportedServiceNames() t extern OUString SAL_CALL SwXModule_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL SwXModule_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); +extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); + +extern uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); +extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); + // #ifdef __cplusplus extern "C" @@ -187,6 +195,8 @@ sal_Bool SAL_CALL component_writeInfo( SwXAutoTextContainer_getSupportedServiceNames() ); lcl_uno_writeInfo( pKey, SwXModule_getImplementationName(), SwXModule_getSupportedServiceNames() ); + lcl_uno_writeInfo( pKey, SwXMailMerge_getImplementationName(), + SwXMailMerge_getSupportedServiceNames() ); //Filter options lcl_uno_writeInfo( pKey, SwXFilterOptions::getImplementationName_Static(), SwXFilterOptions::getSupportedServiceNames_Static() ); @@ -309,6 +319,14 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, SwXModule_createInstance, SwXModule_getSupportedServiceNames() ); } + else if( SwXMailMerge_getImplementationName().equalsAsciiL( + pImplName, nImplNameLen ) ) + { + xFactory = ::cppu::createSingleFactory( xMSF, + SwXMailMerge_getImplementationName(), + SwXMailMerge_createInstance, + SwXMailMerge_getSupportedServiceNames() ); + } else if( SwXFilterOptions::getImplementationName_Static().equalsAsciiL( pImplName, nImplNameLen ) ) { diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx new file mode 100644 index 000000000000..9f481cfcf812 --- /dev/null +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -0,0 +1,1000 @@ +/************************************************************************* + * + * $RCSfile: unomailmerge.cxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2003-03-27 15:44:56 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifdef PRECOMPILED +#include "ui_pch.hxx" +#endif + +#pragma hdrstop + +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif +#ifndef _VOS_MUTEX_HXX_ +#include <vos/mutex.hxx> +#endif +#ifndef _OSL_MUTEX_HXX_ +#include <osl/mutex.hxx> +#endif +#ifndef _SFX_ITEMPROP_HXX +#include <svtools/itemprop.hxx> +#endif +#ifndef SVTOOLS_URIHELPER_HXX +#include <svtools/urihelper.hxx> +#endif +#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ +#include <svx/dataaccessdescriptor.hxx> +#endif +#ifndef _SHL_HXX +#include <tools/shl.hxx> // GetAppData +#endif +#ifndef _URLOBJ_HXX +#include <tools/urlobj.hxx> +#endif +#ifndef _TOOLS_TEMPFILE_HXX +#include <tools/tempfile.hxx> +#endif +#ifndef _RTTI_HXX +#include <tools/rtti.hxx> +#endif +#ifndef _SFXAPP_HXX +#include <sfx2/app.hxx> +#endif +#ifndef _SFXDOCFILE_HXX +#include <sfx2/docfile.hxx> +#endif +#ifndef _SFX_DOCFILT_HACK_HXX +#include <sfx2/docfilt.hxx> +#endif +#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +#include <comphelper/processfactory.hxx> +#endif +#ifndef _CPPUHELPER_IMPLBASE1_HXX_ +#include <cppuhelper/implbase1.hxx> // WeakImplHelper1 +#endif + +#ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_ +#include <com/sun/star/sdb/CommandType.hpp> +#endif +#ifndef _COM_SUN_STAR_TEXT_MAILMERGETYPE_HPP_ +#include <com/sun/star/text/MailMergeType.hpp> +#endif +#ifndef _COM_SUN_STAR_TEXT_MAILMERGEEVENT_HPP_ +#include <com/sun/star/text/MailMergeEvent.hpp> +#endif +#ifndef _COM_SUN_STAR_TEXT_XMAILMERGELISTENER_HPP_ +#include <com/sun/star/text/XMailMergeListener.hpp> +#endif +#ifndef _COM_SUN_STAR_TEXT_XMAILMERGEBROADCASTER_HPP_ +#include <com/sun/star/text/XMailMergeBroadcaster.hpp> +#endif +#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ +#include <com/sun/star/beans/PropertyAttribute.hpp> +#endif + +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ +#include <com/sun/star/lang/XUnoTunnel.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ +#include <com/sun/star/sdbc/XResultSet.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ +#include <com/sun/star/sdbc/XConnection.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ +#include <com/sun/star/sdbc/XRowSet.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ +#include <com/sun/star/sdbc/XResultSet.hpp> +#endif +#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ +#include <com/sun/star/frame/XModel.hpp> +#endif +#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ +#include <com/sun/star/frame/XComponentLoader.hpp> +#endif +#ifndef _COM_SUN_STAR_UTIL_XCLOSEABLE_HPP_ +#include <com/sun/star/util/XCloseable.hpp> +#endif +#ifndef _COM_SUN_STAR_UTIL_CloseVetoException_HPP_ +#include <com/sun/star/util/CloseVetoException.hpp> +#endif + + +#ifndef _UNOMAILMERGE_HXX_ +#include <unomailmerge.hxx> +#endif +#ifndef SW_SWDLL_HXX +#include <swdll.hxx> +#endif +#ifndef _SWMODULE_HXX +#include <swmodule.hxx> +#endif +#ifndef _UNOPRNMS_HXX +#include <unoprnms.hxx> +#endif +#ifndef _UNOMAP_HXX +#include <unomap.hxx> +#endif +#ifndef _SWUNOHELPER_HXX +#include <swunohelper.hxx> +#endif +#ifndef _SWDOCSH_HXX +#include <docsh.hxx> +#endif +#ifndef _SWVIEW_HXX +#include <view.hxx> +#endif +#ifndef _SWDBMGR_HXX +#include <dbmgr.hxx> +#endif +#ifndef _UNOTXDOC_HXX +#include <unotxdoc.hxx> +#endif +#ifndef _PRTOPT_HXX +#include <prtopt.hxx> +#endif +#ifndef _WRTSH_HXX +#include <wrtsh.hxx> +#endif +#ifndef _SHELLIO_HXX +#include <shellio.hxx> +#endif +#ifndef _SWDBMGR_HXX +#include <dbmgr.hxx> +#endif + +#define C2U(x) OUString::createFromAscii(x) +#define SN_MAILMERGE "com.sun.star.text.MailMerge" + +using namespace com::sun::star; +using namespace com::sun::star::frame; +using namespace com::sun::star::uno; +using namespace com::sun::star::lang; +using namespace com::sun::star::beans; +using namespace com::sun::star::text; +using namespace rtl; +using namespace SWUnoHelper; + +//////////////////////////////////////////////////////////// + +class DisposeHelper +{ + uno::Reference< XComponent > xC; + + // disallow use of copy c-tor and assignment operator + DisposeHelper( const DisposeHelper & ); + DisposeHelper & operator = ( const DisposeHelper & ); + +public: + DisposeHelper() {} +#ifdef DEBUG + ~DisposeHelper(); +#else + ~DisposeHelper() { if (xC.is()) xC->dispose(); } +#endif + + BOOL SetInterface( uno::Reference< XInterface > &rxRef ) { return (xC = uno::Reference< XComponent >( rxRef, UNO_QUERY )).is(); } +}; + +#ifdef DEBUG +DisposeHelper::~DisposeHelper() +{ + if (xC.is()) + xC->dispose(); +} +#endif + +//////////////////////////////////////////////////////////// + +osl::Mutex & GetMailMergeMutex() +{ + static osl::Mutex aMutex; + return aMutex; +} + +//////////////////////////////////////////////////////////// + + static void CloseModelAndDocSh( + Reference< frame::XModel > &rxModel, + SfxObjectShellRef &rxDocSh ) + { + rxDocSh = 0; + + //! models/documents should never be disposed (they may still be + //! used for printing which is called asynchronously for example) + //! instead call close + Reference< util::XCloseable > xClose( rxModel, UNO_QUERY ); + if (xClose.is()) + { + try + { + xClose->close( sal_True ); + } + catch (util::CloseVetoException &) + { + } + } +} + +//////////////////////////////////////////////////////////// + +static BOOL LoadFromURL_impl( + Reference< frame::XModel > &rxModel, + SfxObjectShellRef &rxDocSh, + const String &rURL, + BOOL bClose ) + throw (RuntimeException) +{ + // try to open the document readonly and hidden + Reference< frame::XModel > xTmpModel; + Sequence < PropertyValue > aArgs( 1 ); + aArgs[0].Name = C2U("Hidden"); + sal_Bool bVal = sal_True; + aArgs[0].Value <<= bVal; + try + { + Reference < XComponentLoader > xDesktop( ::comphelper::getProcessServiceFactory()-> + createInstance( C2U("com.sun.star.frame.Desktop") ), UNO_QUERY ); + xTmpModel = Reference < XModel >( xDesktop->loadComponentFromURL( + rURL, C2U("_blank"), 0, aArgs ), UNO_QUERY ); + } + catch( Exception & ) + { + return FALSE; + } + + // try to get the DocShell + SwDocShell *pTmpDocShell = 0; + Reference < XUnoTunnel > xTunnel( xTmpModel, UNO_QUERY ); + if (xTunnel.is()) + { + SwXTextDocument* pTextDoc = (SwXTextDocument *) xTunnel->getSomething( SwXTextDocument::getUnoTunnelId() ); + pTmpDocShell = pTextDoc ? pTextDoc->GetDocShell() : 0; + } + + BOOL bRes = FALSE; + if (xTmpModel.is() && pTmpDocShell) // everything available? + { + if (bClose) + CloseModelAndDocSh( rxModel, rxDocSh ); + // set new stuff + rxModel = xTmpModel; + rxDocSh = pTmpDocShell; + bRes = TRUE; + } + else + { + SfxObjectShellRef xTmpDocSh = pTmpDocShell; + CloseModelAndDocSh( xTmpModel, xTmpDocSh ); + } + + return bRes; +} + +//////////////////////////////////////////////////////////// + +static BOOL DeleteTmpFile_Impl( + Reference< frame::XModel > &rxModel, + SfxObjectShellRef &rxDocSh, + const String &rTmpFileURL, + BOOL bClose ) +{ + BOOL bRes = FALSE; + if (rTmpFileURL.Len()) + { + if (bClose) + { + rxDocSh = 0; + + //! models/documents should never be disposed (they may still be + //! used for printing which is called asynchronously for example) + //! instead call close + Reference< util::XCloseable > xClose( rxModel, UNO_QUERY ); + if (xClose.is()) + { + try + { + xClose->close( sal_True ); + } + catch (util::CloseVetoException &) + { + //! here we have the problem that the temporary file that is + //! currently being printed will never be deleted. :-( + } + } + } + + rxModel = 0; + rxDocSh = 0; // destroy doc shell + + bRes = SWUnoHelper::UCB_DeleteFile( rTmpFileURL ); + DBG_ASSERT( bRes, "temp file not deleted" ); + } + return bRes; +} + +//////////////////////////////////////////////////////////// + +SwXMailMerge::SwXMailMerge() : + pMap( aSwMapProvider.GetPropertyMap( PROPERTY_MAP_MAILMERGE ) ), + aEvtListeners ( GetMailMergeMutex() ), + aMergeListeners ( GetMailMergeMutex() ), + aPropListeners ( GetMailMergeMutex() ) +{ + // create empty document + // like in: SwModule::InsertEnv (appenv.cxx) + SwDocShell *pDocShell = new SwDocShell( SFX_CREATE_MODE_STANDARD ); + xDocSh = pDocShell; + xDocSh->DoInitNew( 0 ); + SfxViewFrame *pFrame = SFX_APP()->CreateViewFrame( *xDocSh, 0, TRUE ); + SwView *pView = (SwView*) pFrame->GetViewShell(); + pView->AttrChangedNotify( &pView->GetWrtShell() );//Damit SelectShell gerufen wird. + + xModel = pDocShell->GetModel(); + + nDataCommandType = sdb::CommandType::TABLE; + nOutputType = MailMergeType::PRINTER; + bEscapeProcessing = sal_False; + bSinglePrintJobs = sal_False; + bFileNameFromColumn = sal_False; + + bDisposing = sal_False; +} + +SwXMailMerge::~SwXMailMerge() +{ + DeleteTmpFile_Impl( xModel, xDocSh, aTmpFileName, TRUE ); +} + +uno::Any SAL_CALL SwXMailMerge::execute( + const uno::Sequence< beans::NamedValue >& rArguments ) + throw (IllegalArgumentException, Exception, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + // + // get property values to be used + // (use values from the service as default and override them with + // the values that are provided as arguments) + // + uno::Sequence< uno::Any > aCurSelection = aSelection; + uno::Reference< sdbc::XResultSet > xCurResultSet = xResultSet; + uno::Reference< sdbc::XConnection > xCurConnection = xConnection; + uno::Reference< frame::XModel > xCurModel = xModel; + OUString aCurDataSourceName = aDataSourceName; + OUString aCurDataCommand = aDataCommand; + OUString aCurFilter = aFilter; + OUString aCurDocumentURL = aDocumentURL; + OUString aCurOutputURL = aOutputURL; + OUString aCurFileNamePrefix = aFileNamePrefix; + sal_Int32 nCurDataCommandType = nDataCommandType; + sal_Int16 nCurOutputType = nOutputType; + sal_Bool bCurEscapeProcessing = bEscapeProcessing; + sal_Bool bCurSinglePrintJobs = bSinglePrintJobs; + sal_Bool bCurFileNameFromColumn = bFileNameFromColumn; + // + SfxObjectShellRef xCurDocSh = xDocSh; // the document + // + const beans::NamedValue *pArguments = rArguments.getConstArray(); + sal_Int32 nArgs = rArguments.getLength(); + for (sal_Int32 i = 0; i < nArgs; ++i) + { + const OUString &rName = pArguments[i].Name; + const Any &rValue = pArguments[i].Value; + + BOOL bOK = TRUE; + if (rName.equalsAscii( GetPropName( UNO_NAME_SELECTION ) )) + bOK = rValue >>= aCurSelection; + else if (rName.equalsAscii( GetPropName( UNO_NAME_RESULT_SET ) )) + bOK = rValue >>= xCurResultSet; + else if (rName.equalsAscii( GetPropName( UNO_NAME_CONNECTION ) )) + bOK = rValue >>= xCurConnection; + else if (rName.equalsAscii( GetPropName( UNO_NAME_MODEL ) )) + throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rName, static_cast < cppu::OWeakObject * > ( this ) ); + else if (rName.equalsAscii( GetPropName( UNO_NAME_DATA_SOURCE_NAME ) )) + bOK = rValue >>= aCurDataSourceName; + else if (rName.equalsAscii( GetPropName( UNO_NAME_DATA_COMMAND ) )) + bOK = rValue >>= aCurDataCommand; + else if (rName.equalsAscii( GetPropName( UNO_NAME_FILTER ) )) + bOK = rValue >>= aCurFilter; + else if (rName.equalsAscii( GetPropName( UNO_NAME_DOCUMENT_URL ) )) + { + bOK = rValue >>= aCurDocumentURL; + if (aCurDocumentURL.getLength() + && !LoadFromURL_impl( xCurModel, xCurDocSh, aCurDocumentURL, FALSE )) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to create document from URL: " ) ) + aCurDocumentURL, static_cast < cppu::OWeakObject * > ( this ) ); + } + else if (rName.equalsAscii( GetPropName( UNO_NAME_OUTPUT_URL ) )) + { + bOK = rValue >>= aCurOutputURL; + if (aCurOutputURL.getLength()) + { + if (!UCB_IsDirectory(aCurOutputURL)) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL does not point to a directory: " ) ) + aCurOutputURL, static_cast < cppu::OWeakObject * > ( this ), 0 ); + if (UCB_IsReadOnlyFileName(aCurOutputURL)) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL is read-only: " ) ) + aCurOutputURL, static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + } + else if (rName.equalsAscii( GetPropName( UNO_NAME_FILE_NAME_PREFIX ) )) + bOK = rValue >>= aCurFileNamePrefix; + else if (rName.equalsAscii( GetPropName( UNO_NAME_DATA_COMMAND_TYPE ) )) + bOK = rValue >>= nCurDataCommandType; + else if (rName.equalsAscii( GetPropName( UNO_NAME_OUTPUT_TYPE ) )) + bOK = rValue >>= nCurOutputType; + else if (rName.equalsAscii( GetPropName( UNO_NAME_ESCAPE_PROCESSING ) )) + bOK = rValue >>= bCurEscapeProcessing; + else if (rName.equalsAscii( GetPropName( UNO_NAME_SINGLE_PRINT_JOBS ) )) + bOK = rValue >>= bCurSinglePrintJobs; + else if (rName.equalsAscii( GetPropName( UNO_NAME_FILE_NAME_FROM_COLUMN ) )) + bOK = rValue >>= bCurFileNameFromColumn; + else + throw UnknownPropertyException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is unknown: " ) ) + rName, static_cast < cppu::OWeakObject * > ( this ) ); + + if (!bOK) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property type mismatch or property not set: " ) ) + rName, static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + + SfxViewFrame* pFrame = SfxViewFrame::GetFirst( xCurDocSh, 0, FALSE); + SwView *pView = PTR_CAST( SwView, pFrame->GetViewShell() ); + if (!pView) + throw RuntimeException(); + SwWrtShell &rSh = *pView->GetWrtShellPtr(); + + // avoid assertion in 'Update' from Sfx by supplying a shell + // and thus avoiding the SelectShell call in Writers GetState function + // while still in Update of Sfx. + // (GetSelection in Update is not allowed) + if (pView && aCurDocumentURL.getLength()) + pView->AttrChangedNotify( &pView->GetWrtShell() );//Damit SelectShell gerufen wird. + + DisposeHelper aRowSetDisposeHelper; + if (!xCurResultSet.is()) + { + if (!aCurDataSourceName.getLength() || !aCurDataCommand.getLength() ) + { + DBG_ERROR("PropertyValues missing or unset") + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Either the ResultSet or DataSourceName and DataCommand must be set." ) ), static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + + // + // build ResultSet from DataSourceName, DataCommand and DataCommandType + // + Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); + if (xMgr.is()) + { + Reference< XInterface > xInstance = xMgr->createInstance( + C2U( "com.sun.star.sdb.RowSet" )); + aRowSetDisposeHelper.SetInterface( xInstance ); + Reference< XPropertySet > xRowSetPropSet( xInstance, UNO_QUERY ); + DBG_ASSERT( xRowSetPropSet.is(), "failed to get XPropertySet interface from RowSet" ); + if (xRowSetPropSet.is()) + { + if (xCurConnection.is()) + xRowSetPropSet->setPropertyValue( C2U("ActiveConnection"), makeAny( xCurConnection ) ); + xRowSetPropSet->setPropertyValue( C2U("DataSourceName"), makeAny( aCurDataSourceName ) ); + xRowSetPropSet->setPropertyValue( C2U("Command"), makeAny( aCurDataCommand ) ); + xRowSetPropSet->setPropertyValue( C2U("CommandType"), makeAny( nCurDataCommandType ) ); + xRowSetPropSet->setPropertyValue( C2U("EscapeProcessing"), makeAny( bCurEscapeProcessing ) ); + xRowSetPropSet->setPropertyValue( C2U("ApplyFilter"), makeAny( sal_True ) ); + xRowSetPropSet->setPropertyValue( C2U("Filter"), makeAny( aCurFilter ) ); + + Reference< sdbc::XRowSet > xRowSet( xInstance, UNO_QUERY ); + if (xRowSet.is()) + xRowSet->execute(); // build ResultSet from properties + xCurResultSet = Reference< sdbc::XResultSet >( xRowSet, UNO_QUERY ); + DBG_ASSERT( xCurResultSet.is(), "failed to build ResultSet" ); + } + } + } + + svx::ODataAccessDescriptor aDescriptor; + aDescriptor[ svx::daDataSource ] <<= aCurDataSourceName; + aDescriptor[ svx::daConnection ] <<= xCurConnection; + aDescriptor[ svx::daCommand ] <<= aCurDataCommand; + aDescriptor[ svx::daCommandType ] <<= nCurDataCommandType; + aDescriptor[ svx::daEscapeProcessing ] <<= bCurEscapeProcessing; + aDescriptor[ svx::daCursor ] <<= xCurResultSet; + // aDescriptor[ svx::daColumnName ] not used + // aDescriptor[ svx::daColumnObject ] not used + aDescriptor[ svx::daSelection ] <<= aCurSelection; + + USHORT nMergeType; + switch (nCurOutputType) + { + case MailMergeType::PRINTER : nMergeType = DBMGR_MERGE_MAILMERGE; break; + case MailMergeType::FILE : nMergeType = DBMGR_MERGE_MAILFILES; break; + default: + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Invalid value of property:" ) ) + C2U("OutputType"), static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + + SwNewDBMgr* pMgr = rSh.GetNewDBMgr(); + DBG_ASSERT( pMgr, "database manager missing" ); + if (MailMergeType::PRINTER == nCurOutputType) + { + SwPrintData aPrtData = *SW_MOD()->GetPrtOptions( FALSE ); + SwPrintData* pShellPrintData = rSh.GetPrintData(); + if (pShellPrintData) + aPrtData = *pShellPrintData; + aPrtData.SetPrintSingleJobs( bCurSinglePrintJobs ); + rSh.SetPrintData( aPrtData ); + } + else if (MailMergeType::FILE == nCurOutputType) + { + INetURLObject aURLObj; + aURLObj.SetSmartProtocol( INET_PROT_FILE ); + + if (aCurDocumentURL.getLength()) + { + // if OutputURL or FileNamePrefix are missing get + // them from DocumentURL + aURLObj.SetSmartURL( aCurDocumentURL ); + if (!aCurFileNamePrefix.getLength()) + aCurFileNamePrefix = aURLObj.GetBase(); // filename without extension + if (!aCurOutputURL.getLength()) + { + //aCurOutputURL = aURLObj.GetURLPath(); + aURLObj.removeSegment(); + aCurOutputURL = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); + } + } + else // default empty document without URL + { + if (!aCurOutputURL.getLength()) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OutputURL is not set and can not be obtained." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + } + + aURLObj.SetSmartURL( aCurOutputURL ); + String aPath = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); + + String aDelim( INET_PATH_TOKEN ); + if (aPath.Len() >= aDelim.Len() && + aPath.Copy( aPath.Len()-aDelim.Len() ).CompareTo( aDelim ) != COMPARE_EQUAL) + aPath += aDelim; + if (bCurFileNameFromColumn) + pMgr->SetEMailColumn( aCurFileNamePrefix ); + else + { + aPath += String( aCurFileNamePrefix ); + pMgr->SetEMailColumn( String() ); + } + pMgr->SetSubject( aPath ); + } + + // save document with temporary filename +// if (aTmpFileName.Len()) +// xCurDocSh->DoSave(); +// else + { + const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( + String::CreateFromAscii( FILTER_XML ), + SwDocShell::Factory().GetFilterContainer() ); + String aExtension( pSfxFlt->GetDefaultExtension() ); + aExtension.EraseLeadingChars( '*' ); + TempFile aTempFile( C2U("SwMM"), &aExtension ); + aTmpFileName = aTempFile.GetName(); + SfxMedium *pDstMed = new SfxMedium( aTmpFileName, STREAM_STD_READWRITE, TRUE ); + pDstMed->SetFilter( pSfxFlt ); + + xCurDocSh->DoSaveAs(*pDstMed); + xCurDocSh->DoSaveCompleted(pDstMed); + if (xCurDocSh->GetError()) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to save temporary file." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + } + + pMgr->SetMergeSilent( TRUE ); // suppress dialogs, message boxes, etc. + const SwXMailMerge *pOldSrc = pMgr->GetMailMergeEvtSrc(); + DBG_ASSERT( !pOldSrc || pOldSrc == this, "Ooops... different event source already set." ); + pMgr->SetMailMergeEvtSrc( this ); // launch events for listeners + BOOL bSucc = pMgr->MergeNew( nMergeType, rSh, aDescriptor ); + pMgr->SetMailMergeEvtSrc( pOldSrc ); + + DeleteTmpFile_Impl( xCurModel, xCurDocSh, aTmpFileName, xCurModel != xModel ); + //aTmpFileName.Erase(); + + if (xCurModel != xModel) // temporary model and doc shell used? + CloseModelAndDocSh( xCurModel, xCurDocSh ); + + if (!bSucc) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Mail merge failed." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + + return makeAny( sal_True ); +} + +void SwXMailMerge::LaunchMailMergeEvent( const MailMergeEvent &rEvt ) const +{ + cppu::OInterfaceIteratorHelper aIt( ((SwXMailMerge *) this)->aMergeListeners ); + while (aIt.hasMoreElements()) + { + Reference< XMailMergeListener > xRef( aIt.next(), UNO_QUERY ); + if (xRef.is()) + xRef->notifyMailMergeEvent( rEvt ); + } +} + +void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const +{ + cppu::OInterfaceContainerHelper *pContainer = + aPropListeners.getContainer( rEvt.PropertyHandle ); + if (pContainer) + { + cppu::OInterfaceIteratorHelper aIt( *pContainer ); + while (aIt.hasMoreElements()) + { + Reference< XPropertyChangeListener > xRef( aIt.next(), UNO_QUERY ); + if (xRef.is()) + xRef->propertyChange( rEvt ); + } + } +} + + +uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetInfo( ) + throw (RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + static Reference< XPropertySetInfo > aRef = new SfxItemPropertySetInfo( pMap ); + return aRef; +} + +void SAL_CALL SwXMailMerge::setPropertyValue( + const OUString& rPropertyName, const uno::Any& rValue ) + throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + const SfxItemPropertyMap* pCur = + SfxItemPropertyMap::GetByName( pMap, rPropertyName ); + if (!pCur) + throw UnknownPropertyException(); + else if (pCur->nFlags & PropertyAttribute::READONLY) + throw PropertyVetoException(); + else + { + void *pData = NULL; + const com::sun::star::uno::Type* pType = pCur->pType; + switch (pCur->nWID) + { + case WID_SELECTION : pData = &aSelection; break; + case WID_RESULT_SET : pData = &xResultSet; break; + case WID_CONNECTION : pData = &xConnection; break; + case WID_MODEL : pData = &xModel; break; + case WID_DATA_SOURCE_NAME : pData = &aDataSourceName; break; + case WID_DATA_COMMAND : pData = &aDataCommand; break; + case WID_FILTER : pData = &aFilter; break; + case WID_DOCUMENT_URL : pData = &aDocumentURL; break; + case WID_OUTPUT_URL : pData = &aOutputURL; break; + case WID_DATA_COMMAND_TYPE : pData = &nDataCommandType; break; + case WID_OUTPUT_TYPE : pData = &nOutputType; break; + case WID_ESCAPE_PROCESSING : pData = &bEscapeProcessing; break; + case WID_SINGLE_PRINT_JOBS : pData = &bSinglePrintJobs; break; + case WID_FILE_NAME_FROM_COLUMN : pData = &bFileNameFromColumn; break; + case WID_FILE_NAME_PREFIX : pData = &aFileNamePrefix; break; + default : + DBG_ERROR("unknown WID"); + } + Any aOld( pData, *pType ); + + sal_Bool bChanged = sal_False; + sal_Bool bOK = sal_True; + if (aOld != rValue) + { + if (pData == &aSelection) + bOK = rValue >>= aSelection; + else if (pData == &xResultSet) + bOK = rValue >>= xResultSet; + else if (pData == &xConnection) + bOK = rValue >>= xConnection; + else if (pData == &xModel) + bOK = rValue >>= xModel; + else if (pData == &aDataSourceName) + bOK = rValue >>= aDataSourceName; + else if (pData == &aDataCommand) + bOK = rValue >>= aDataCommand; + else if (pData == &aFilter) + bOK = rValue >>= aFilter; + else if (pData == &aDocumentURL) + { + OUString aText; + bOK = rValue >>= aText; + if (aText.getLength() + && !LoadFromURL_impl( xModel, xDocSh, aText, TRUE )) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to create document from URL: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ) ); + aDocumentURL = aText; + } + else if (pData == &aOutputURL) + { + OUString aText; + bOK = rValue >>= aText; + if (aText.getLength()) + { + if (!UCB_IsDirectory(aText)) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL does not point to a directory: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ), 0 ); + if (UCB_IsReadOnlyFileName(aText)) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL is read-only: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + aOutputURL = aText; + } + else if (pData == &nDataCommandType) + bOK = rValue >>= nDataCommandType; + else if (pData == &nOutputType) + bOK = rValue >>= nOutputType; + else if (pData == &bEscapeProcessing) + bOK = rValue >>= bEscapeProcessing; + else if (pData == &bSinglePrintJobs) + bOK = rValue >>= bSinglePrintJobs; + else if (pData == &bFileNameFromColumn) + bOK = rValue >>= bFileNameFromColumn; + else if (pData == &aFileNamePrefix) + bOK = rValue >>= aFileNamePrefix; + else + DBG_ERROR( "invalid pointer" ); + DBG_ASSERT( bOK, "set value failed" ); + bChanged = sal_True; + } + if (!bOK) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property type mismatch or property not set: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ), 0 ); + + if (bChanged) + { + PropertyChangeEvent aChgEvt( (XPropertySet *) this, rPropertyName, + FALSE, pCur->nWID, aOld, rValue ); + launchEvent( aChgEvt ); + } + } +} + +uno::Any SAL_CALL SwXMailMerge::getPropertyValue( + const OUString& rPropertyName ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + Any aRet; + + const SfxItemPropertyMap* pCur = SfxItemPropertyMap::GetByName( pMap, rPropertyName ); + if (!pCur) + throw UnknownPropertyException(); + else + { + switch (pCur->nWID) + { + case WID_SELECTION : aRet <<= aSelection; break; + case WID_RESULT_SET : aRet <<= xResultSet; break; + case WID_CONNECTION : aRet <<= xConnection; break; + case WID_MODEL : aRet <<= xModel; break; + case WID_DATA_SOURCE_NAME : aRet <<= aDataSourceName; break; + case WID_DATA_COMMAND : aRet <<= aDataCommand; break; + case WID_FILTER : aRet <<= aFilter; break; + case WID_DOCUMENT_URL : aRet <<= aDocumentURL; break; + case WID_OUTPUT_URL : aRet <<= aOutputURL; break; + case WID_DATA_COMMAND_TYPE : aRet <<= nDataCommandType; break; + case WID_OUTPUT_TYPE : aRet <<= nOutputType; break; + case WID_ESCAPE_PROCESSING : aRet <<= bEscapeProcessing; break; + case WID_SINGLE_PRINT_JOBS : aRet <<= bSinglePrintJobs; break; + case WID_FILE_NAME_FROM_COLUMN : aRet <<= bFileNameFromColumn; break; + case WID_FILE_NAME_PREFIX : aRet <<= aFileNamePrefix; break; + default : + DBG_ERROR("unknown WID"); + } + } + + return aRet; +} + +void SAL_CALL SwXMailMerge::addPropertyChangeListener( + const OUString& rPropertyName, + const uno::Reference< beans::XPropertyChangeListener >& rListener ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rListener.is()) + { + const SfxItemPropertyMap* pCur = + SfxItemPropertyMap::GetByName( pMap, rPropertyName ); + if (pCur) + aPropListeners.addInterface( pCur->nWID, rListener ); + else + throw UnknownPropertyException(); + } +} + +void SAL_CALL SwXMailMerge::removePropertyChangeListener( + const OUString& rPropertyName, + const uno::Reference< beans::XPropertyChangeListener >& rListener ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rListener.is()) + { + const SfxItemPropertyMap* pCur = + SfxItemPropertyMap::GetByName( pMap, rPropertyName ); + if (pCur) + aPropListeners.removeInterface( pCur->nWID, rListener ); + else + throw UnknownPropertyException(); + } +} + +void SAL_CALL SwXMailMerge::addVetoableChangeListener( + const OUString& rPropertyName, + const uno::Reference< beans::XVetoableChangeListener >& rListener ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + // no vetoable property, thus no support for vetoable change listeners + DBG_WARNING( "not implemented"); +} + +void SAL_CALL SwXMailMerge::removeVetoableChangeListener( + const OUString& rPropertyName, + const uno::Reference< beans::XVetoableChangeListener >& rListener ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + // no vetoable property, thus no support for vetoable change listeners + DBG_WARNING( "not implemented"); +} + + +void SAL_CALL SwXMailMerge::dispose() + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + if (!bDisposing) + { + bDisposing = sal_True; + + EventObject aEvtObj( (XPropertySet *) this ); + aEvtListeners.disposeAndClear( aEvtObj ); + aMergeListeners.disposeAndClear( aEvtObj ); + aPropListeners.disposeAndClear( aEvtObj ); + } +} + +void SAL_CALL SwXMailMerge::addEventListener( + const Reference< XEventListener >& rxListener ) + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rxListener.is()) + aEvtListeners.addInterface( rxListener ); +} + +void SAL_CALL SwXMailMerge::removeEventListener( + const Reference< XEventListener >& rxListener ) + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rxListener.is()) + aEvtListeners.removeInterface( rxListener ); +} + +void SAL_CALL SwXMailMerge::addMailMergeEventListener( + const uno::Reference< XMailMergeListener >& rxListener ) + throw (RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rxListener.is()) + aMergeListeners.addInterface( rxListener ); +} + +void SAL_CALL SwXMailMerge::removeMailMergeEventListener( + const uno::Reference< XMailMergeListener >& rxListener ) + throw (RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rxListener.is()) + aMergeListeners.removeInterface( rxListener ); +} + +OUString SAL_CALL SwXMailMerge::getImplementationName() + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + return SwXMailMerge_getImplementationName(); +} + +sal_Bool SAL_CALL SwXMailMerge::supportsService( const OUString& rServiceName ) + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + return C2U( SN_MAILMERGE ) == rServiceName; +} + +uno::Sequence< OUString > SAL_CALL SwXMailMerge::getSupportedServiceNames() + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + return SwXMailMerge_getSupportedServiceNames(); +} + +//////////////////////////////////////////////////////////// + +uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() + throw() +{ + uno::Sequence< OUString > aNames(1); + aNames.getArray()[0] = C2U( SN_MAILMERGE ); + return aNames; +} + +OUString SAL_CALL SwXMailMerge_getImplementationName() + throw() +{ + return OUString( C2U( "SwXMailMerge" ) ); +} + +uno::Reference< uno::XInterface > SAL_CALL SwXMailMerge_createInstance( + const uno::Reference< XMultiServiceFactory > & rSMgr) + throw( uno::Exception ) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + //the module may not be loaded + SW_MOD()->Load(); + + uno::Reference< uno::XInterface > xRef = (cppu::OWeakObject *) new SwXMailMerge(); + return xRef; +} + diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 59c302f0e537..da5bde61b376 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unotxdoc.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: os $ $Date: 2002-12-04 12:19:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2451,7 +2451,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( if (!pDoc) throw RuntimeException(); SwWrtShell *pWrtShell = pDoc->GetDocShell()->GetWrtShell(); - pWrtShell->CalcLayout(); + if(pWrtShell) + pWrtShell->CalcLayout(); return pDoc->GetPageCount(); } diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 48ef72760405..a5a0feab4cd2 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unotxvw.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: tl $ $Date: 2002-11-11 14:14:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -345,12 +345,13 @@ Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(::com::sun::star: ---------------------------------------------------------------------------*/ Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -531,6 +532,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg const SwUnoCrsr* pUnoCrsr = pRange->GetTblCrsr(); if(pUnoCrsr) { + UnoActionRemoveContext aContext(pDoc); rSh.EnterStdMode(); rSh.SetSelection(*pUnoCrsr); return sal_True; @@ -1324,6 +1326,15 @@ void SwXTextViewCursor::gotoRange( FindSttNodeByType(eSearchNodeType); const SwNode* pSrcNode = 0; + if(pCursor && pCursor->GetCrsr()) + { + pSrcNode = pCursor->GetCrsr()->GetNode(); + } + else if(pRange && pRange->GetBookmark()) + { + SwBookmark* pBkm = pRange->GetBookmark(); + pSrcNode = &pBkm->GetPos().nNode.GetNode(); + } const SwStartNode* pTmp = pSrcNode ? pSrcNode->FindSttNodeByType(eSearchNodeType) : 0; //SectionNodes ueberspringen @@ -1331,6 +1342,10 @@ void SwXTextViewCursor::gotoRange( { pTmp = pTmp->FindStartNode(); } + while(pOwnStartNode && pOwnStartNode->IsSectionNode()) + { + pOwnStartNode = pOwnStartNode->FindStartNode(); + } //ohne Expand darf mit dem ViewCursor ueberall hingesprungen werden //mit Expand nur in der gleichen Umgebung if(bExpand && diff --git a/sw/source/ui/utlui/attrdesc.src b/sw/source/ui/utlui/attrdesc.src index 4c149ac9ef6c..d4e71fa53bdf 100644 --- a/sw/source/ui/utlui/attrdesc.src +++ b/sw/source/ui/utlui/attrdesc.src @@ -2,9 +2,9 @@ * * $RCSfile: attrdesc.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2002-04-26 09:36:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,11 +87,12 @@ String STR_DROP_OVER Text[ dutch ] = "Initialen over"; Text[ chinese_simplified ] = "字首大写，高度等于"; Text[ greek ] = " "; - Text[ korean ] = "단락의 첫 문자 장식 위치"; + Text[ korean ] = "단락 첫 문자 장식"; Text[ turkish ] = "Baharfi/leri byt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lneas para iniciales"; + Text[ catalan ] = "Caplletres sobre"; Text[ finnish ] = "Anfangikoko"; + Text[ thai ] = "ตัวอักษรขึ้นต้นที่มีขนาดใหญ่บน"; }; String STR_DROP_LINES { @@ -107,7 +108,7 @@ String STR_DROP_LINES Text [ portuguese ] = "Linhas" ; Text [ portuguese_brazilian ] = "Zeilen" ; Text[ chinese_simplified ] = "行"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Wiersze"; Text[ japanese ] = "行"; Text[ chinese_traditional ] = "行"; @@ -115,11 +116,12 @@ String STR_DROP_LINES Text[ dutch ] = "Regels"; Text[ chinese_simplified ] = "行"; Text[ greek ] = ""; - Text[ korean ] = "행"; + Text[ korean ] = "줄"; Text[ turkish ] = "Satr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Filas"; + Text[ catalan ] = "files"; Text[ finnish ] = "rivit"; + Text[ thai ] = "แถว"; }; String STR_NO_DROP_LINES { @@ -146,8 +148,9 @@ String STR_NO_DROP_LINES Text[ korean ] = "단락 첫 문자 장식 없음"; Text[ turkish ] = "Baharf yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin iniciales"; + Text[ catalan ] = "Sense caplletra"; Text[ finnish ] = "Ei anfangeja"; + Text[ thai ] = "ตัวอักษรขึ้นต้นที่ไม่มีขนาดใหญ่"; }; String STR_NO_PAGEDESC { @@ -163,7 +166,7 @@ String STR_NO_PAGEDESC Text [ portuguese ] = "Sem quebra de pgina" ; Text [ portuguese_brazilian ] = "kein Seitenumbruch" ; Text[ chinese_simplified ] = "不换页"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Bez amania strony"; Text[ japanese ] = "改ページなし"; Text[ chinese_traditional ] = "不換頁"; @@ -174,8 +177,9 @@ String STR_NO_PAGEDESC Text[ korean ] = "페이지 나누기 없음"; Text[ turkish ] = "Sayfa sonu yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "sin salto de pgina"; - Text[ finnish ] = "Ei rivinvaihtoa"; + Text[ catalan ] = "sense salt de pgina"; + Text[ finnish ] = "Ei sivunvaihtoa"; + Text[ thai ] = "ไม่แบ่งหน้า"; }; String STR_NO_MIRROR { @@ -191,7 +195,7 @@ String STR_NO_MIRROR Text [ portuguese ] = "No reflectir" ; Text [ portuguese_brazilian ] = "nicht Spiegeln" ; Text[ chinese_simplified ] = "不翻转"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nie odbijaj"; Text[ japanese ] = "反転しない"; Text[ chinese_traditional ] = "不翻轉"; @@ -199,11 +203,12 @@ String STR_NO_MIRROR Text[ dutch ] = "niet spiegelen"; Text[ chinese_simplified ] = "不翻转"; Text[ greek ] = " "; - Text[ korean ] = "대칭 않음"; + Text[ korean ] = "대칭 안함"; Text[ turkish ] = "Yanstma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No reflejar"; + Text[ catalan ] = "No reflexis"; Text[ finnish ] = "l peilaa"; + Text[ thai ] = "อย่าส่องกระจก"; }; String STR_VERT_MIRROR { @@ -212,7 +217,7 @@ String STR_VERT_MIRROR Text [ dutch ] = "verticaal spiegelen" ; Text [ english_us ] = "Flip vertically" ; Text [ italian ] = "Rispecchia in verticale" ; - Text [ spanish ] = "Reflejar vertical" ; + Text [ spanish ] = "Reflejar verticalmente" ; Text [ french ] = "Reflter verticalement" ; Text [ swedish ] = "spegelvnd vertikalt" ; Text [ danish ] = "spejlvend lodret" ; @@ -227,11 +232,12 @@ String STR_VERT_MIRROR Text[ dutch ] = "verticaal spiegelen"; Text[ chinese_simplified ] = "垂直翻转"; Text[ greek ] = " "; - Text[ korean ] = "수직 대칭"; + Text[ korean ] = "상하 반전"; Text[ turkish ] = "Dikey yanst"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reflejar vertical"; + Text[ catalan ] = "Inverteix verticalment"; Text[ finnish ] = "Knn pystysuunta"; + Text[ thai ] = "พลิกตามแนวตั้ง"; }; String STR_HORI_MIRROR { @@ -240,7 +246,7 @@ String STR_HORI_MIRROR Text [ dutch ] = "horizontaal spiegelen" ; Text [ english_us ] = "Flip horizontal" ; Text [ italian ] = "Rispecchia in orizzontale" ; - Text [ spanish ] = "Reflejar horizontal" ; + Text [ spanish ] = "Reflejar horizontalmente" ; Text [ french ] = "Reflter horizontalement" ; Text [ swedish ] = "Spegelvnd horisontellt" ; Text [ danish ] = "spejlvend vandret" ; @@ -255,11 +261,12 @@ String STR_HORI_MIRROR Text[ dutch ] = "horizontaal spiegelen"; Text[ chinese_simplified ] = "水平翻转"; Text[ greek ] = " "; - Text[ korean ] = "수평 대칭"; + Text[ korean ] = "좌우 반전"; Text[ turkish ] = "Yatay yanst"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reflejar horizontal"; - Text[ finnish ] = "Knn vaakasuunta"; + Text[ catalan ] = "Inverteix horitzontalment"; + Text[ finnish ] = "Knn vaakasuunnassa"; + Text[ thai ] = "พลิกตามแนวนอน"; }; String STR_BOTH_MIRROR { @@ -269,7 +276,7 @@ String STR_BOTH_MIRROR Text [ italian ] = "Rispecchiare in orizzontale e verticale" ; Text [ spanish ] = "Reflejar vertical y horizontalmente" ; Text [ french ] = "Reflter verticalement et horizontalement" ; - Text [ dutch ] = "Hoizontaal en verticaal spiegelen" ; + Text [ dutch ] = "Horizontaal en verticaal spiegelen" ; Text [ swedish ] = "spegelvnd vert. o. hori." ; Text [ danish ] = "spejlvend lodret og vandret" ; Text [ portuguese_brazilian ] = "vert. und horizontal Spiegeln" ; @@ -280,14 +287,15 @@ String STR_BOTH_MIRROR Text[ japanese ] = "上下と左右に反転"; Text[ chinese_traditional ] = "垂直和水平翻轉"; Text[ arabic ] = " "; - Text[ dutch ] = "Hoizontaal en verticaal spiegelen"; + Text[ dutch ] = "Horizontaal en verticaal spiegelen"; Text[ chinese_simplified ] = "垂直和水平翻转"; Text[ greek ] = " "; - Text[ korean ] = "수평과 수직 대칭"; + Text[ korean ] = "상하 반전 및 좌우 반전"; Text[ turkish ] = "Dikey ve yatay yanst"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reflejar vertical y horizontalmente"; + Text[ catalan ] = "Inverteix horitzontalment i verticalment"; Text[ finnish ] = "Vaaka- ja pystysuuntainen knns"; + Text[ thai ] = "พลิกตามแนวนอนและแนวตั้ง"; }; String STR_MIRROR_TOGGLE { @@ -303,7 +311,7 @@ String STR_MIRROR_TOGGLE Text [ french ] = "+ reflter horizontalement sur les pages paires" ; Text [ dutch ] = "+ op even pagina's horizontaal spiegelen" ; Text[ chinese_simplified ] = "+ 水平翻转到偶数页面"; - Text[ russian ] = " + "; + Text[ russian ] = " "; Text[ polish ] = "+ odbij w poziomie na stronach parzystych"; Text[ japanese ] = "+ 偶数ページに上下反転"; Text[ chinese_traditional ] = "+ 水平翻轉到偶數頁面"; @@ -311,11 +319,12 @@ String STR_MIRROR_TOGGLE Text[ dutch ] = "+ op even pagina's horizontaal spiegelen"; Text[ chinese_simplified ] = "+ 水平翻转到偶数页面"; Text[ greek ] = "+ "; - Text[ korean ] = " + 짝수 페이지에서 수평으로 대칭"; + Text[ korean ] = "+ 짝수 페이지에서 좌우 반전"; Text[ turkish ] = "+ ift numaral sayfalarda yatay yanst"; Text[ language_user1 ] = " "; - Text[ catalan ] = "+ reflejar horizontalmente en las pginas pares"; + Text[ catalan ] = "+ reflexa horitzontalment a les pgines parells"; Text[ finnish ] = "+ peilaa vaakasuunnassa parillisilla sivuilla"; + Text[ thai ] = "+ ส่องตามแนวนอนบนหน้าที่เหมือนกัน"; }; String STR_CHARFMT { @@ -331,7 +340,7 @@ String STR_CHARFMT Text [ portuguese ] = "Estilos de caracteres" ; Text [ portuguese_brazilian ] = "Zeichenvorlage" ; Text[ chinese_simplified ] = "字符样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Styl znaku"; Text[ japanese ] = "文字スタイル"; Text[ chinese_traditional ] = "字元樣式"; @@ -339,11 +348,12 @@ String STR_CHARFMT Text[ dutch ] = "Tekenopmaakprofiel"; Text[ chinese_simplified ] = "字符样式"; Text[ greek ] = " "; - Text[ korean ] = "문자 템플릿"; + Text[ korean ] = "문자 스타일"; Text[ turkish ] = "Karakter biimi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de caracteres"; - Text[ finnish ] = "Merkistn tyyli"; + Text[ catalan ] = "Estil de carcters"; + Text[ finnish ] = "Merkkityyli"; + Text[ thai ] = "ลักษณะตัวอักขระ"; }; String STR_NO_CHARFMT { @@ -359,7 +369,7 @@ String STR_NO_CHARFMT Text [ portuguese ] = "Estilo de caracteres inexistente" ; Text [ portuguese_brazilian ] = "keine Zeichenvorlage" ; Text[ chinese_simplified ] = "无字符样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Brak stylu znakw"; Text[ japanese ] = "文字スタイルなし"; Text[ chinese_traditional ] = "無字元樣式"; @@ -367,11 +377,12 @@ String STR_NO_CHARFMT Text[ dutch ] = "geen opmaakprofiel"; Text[ chinese_simplified ] = "无字符样式"; Text[ greek ] = " "; - Text[ korean ] = "문자 템플릿 없음."; + Text[ korean ] = "문자 스타일 없음"; Text[ turkish ] = "Karakter biimi yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "El estilo de carcter no existe"; - Text[ finnish ] = "Ei merkistn tyyli"; + Text[ catalan ] = "L'estil de carcter no existeix"; + Text[ finnish ] = "Ei merkkityyli"; + Text[ thai ] = "ไม่มีลักษณะตัวอักขระ"; }; String STR_FOOTER { @@ -399,8 +410,9 @@ String STR_FOOTER Text[ korean ] = "바닥글"; Text[ turkish ] = "Altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de pgina"; - Text[ finnish ] = "Alaselite"; + Text[ catalan ] = "Peu de pgina"; + Text[ finnish ] = "Alatunniste"; + Text[ thai ] = "ส่วนท้าย"; }; String STR_NO_FOOTER { @@ -417,7 +429,7 @@ String STR_NO_FOOTER Text [ portuguese ] = "Sem rodap" ; Text [ portuguese_brazilian ] = "keine Fu?zeile" ; Text[ chinese_simplified ] = "无页脚"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Bez stopki"; Text[ japanese ] = "フッタなし"; Text[ chinese_traditional ] = "無頁尾"; @@ -425,11 +437,12 @@ String STR_NO_FOOTER Text[ dutch ] = "geen voettekst"; Text[ chinese_simplified ] = "无页脚"; Text[ greek ] = " "; - Text[ korean ] = "바닥글 없음."; + Text[ korean ] = "바닥글 없음"; Text[ turkish ] = "Altbilgi yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin pie de pgina"; - Text[ finnish ] = "Ei alaselitett"; + Text[ catalan ] = "Sense peu de pgina"; + Text[ finnish ] = "Ei alatunnistetta"; + Text[ thai ] = "ไม่มีส่วนท้าย"; }; String STR_HEADER { @@ -456,8 +469,9 @@ String STR_HEADER Text[ korean ] = "머리글"; Text[ turkish ] = "stbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento"; - Text[ finnish ] = "Ylotsikko"; + Text[ catalan ] = "Encapalament"; + Text[ finnish ] = "Yltunniste"; + Text[ thai ] = "ส่วนหัว"; }; String STR_NO_HEADER { @@ -473,7 +487,7 @@ String STR_NO_HEADER Text [ portuguese ] = "Sem cabealho" ; Text [ portuguese_brazilian ] = "keine Kopfzeile" ; Text[ chinese_simplified ] = "无页眉"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Bez nagwka"; Text[ japanese ] = "ヘッダなし"; Text[ chinese_traditional ] = "無頁首"; @@ -481,11 +495,12 @@ String STR_NO_HEADER Text[ dutch ] = "geen koptekst"; Text[ chinese_simplified ] = "无页眉"; Text[ greek ] = " "; - Text[ korean ] = "머리글 없음."; + Text[ korean ] = "머리글 없음"; Text[ turkish ] = "stbilgi yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin encabezamiento"; - Text[ finnish ] = "Ei ylotsikkoa"; + Text[ catalan ] = "Sense encapalament"; + Text[ finnish ] = "Ei yltunnistetta"; + Text[ thai ] = "ไม่มีส่วนหัว"; }; String STR_SURROUND_IDEAL { @@ -501,7 +516,7 @@ String STR_SURROUND_IDEAL Text [ portuguese ] = "Ajuste ideal" ; Text [ portuguese_brazilian ] = "idealer Umlauf" ; Text[ chinese_simplified ] = "最佳文字环绕"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Obieg idealny"; Text[ japanese ] = "最適な折り返し"; Text[ chinese_traditional ] = "最適合文字環繞"; @@ -509,11 +524,12 @@ String STR_SURROUND_IDEAL Text[ dutch ] = "ideale omloop"; Text[ chinese_simplified ] = "最佳文字环绕"; Text[ greek ] = " "; - Text[ korean ] = "최적 문자열 배치"; + Text[ korean ] = "최적으로 문장 배치"; Text[ turkish ] = "Optimum metin dalm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste ideal"; + Text[ catalan ] = "Ajustament ideal"; Text[ finnish ] = "Optimaalinen rivitys"; + Text[ thai ] = "ตัดเหมาะที่สุด"; }; String STR_SURROUND_NONE { @@ -529,7 +545,7 @@ String STR_SURROUND_NONE Text [ portuguese ] = "Sem ajuste" ; Text [ portuguese_brazilian ] = "kein Umlauf" ; Text[ chinese_simplified ] = "不环绕"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Brak obiegu"; Text[ japanese ] = "上下折り返し"; Text[ chinese_traditional ] = "不環繞"; @@ -537,11 +553,12 @@ String STR_SURROUND_NONE Text[ dutch ] = "geen omloop"; Text[ chinese_simplified ] = "不环绕"; Text[ greek ] = " "; - Text[ korean ] = "문자열 배치 없음"; + Text[ korean ] = "문장 배치 없음"; Text[ turkish ] = "Metin dalm yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin ajuste"; + Text[ catalan ] = "Sense ajustament"; Text[ finnish ] = "Ei rivityst"; + Text[ thai ] = "ไม่ตัด"; }; String STR_SURROUND_THROUGHT { @@ -565,11 +582,12 @@ String STR_SURROUND_THROUGHT Text[ dutch ] = "doorloop"; Text[ chinese_simplified ] = "贯穿"; Text[ greek ] = " "; - Text[ korean ] = "문장흐르기"; + Text[ korean ] = "배치 없음"; Text[ turkish ] = "Metin arkasna gnder"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Continuo"; + Text[ catalan ] = "Continu"; Text[ finnish ] = "Kautta"; + Text[ thai ] = "ผ่าน"; }; String STR_SURROUND_PARALLEL { @@ -585,7 +603,7 @@ String STR_SURROUND_PARALLEL Text [ portuguese ] = "Ajuste paralelo" ; Text [ portuguese_brazilian ] = "paralleler Umlauf" ; Text[ chinese_simplified ] = "平行环绕"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Obieg rwnolegy"; Text[ japanese ] = "上下折り返し"; Text[ chinese_traditional ] = "平行環繞"; @@ -593,11 +611,12 @@ String STR_SURROUND_PARALLEL Text[ dutch ] = "omloop parallel"; Text[ chinese_simplified ] = "平行环绕"; Text[ greek ] = " "; - Text[ korean ] = "문자열 배치，평행"; + Text[ korean ] = "평행으로 문장 배치"; Text[ turkish ] = "Paralel metin dalm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste paralelo"; + Text[ catalan ] = "Ajustament paral.lel"; Text[ finnish ] = "Samansuuntainen rivitys"; + Text[ thai ] = "ตัดแบบขนาน"; }; String STR_SURROUND_COLUMN { @@ -613,7 +632,7 @@ String STR_SURROUND_COLUMN Text [ portuguese ] = "Ajustar colunas" ; Text [ portuguese_brazilian ] = "spaltiger Umlauf" ; Text[ chinese_simplified ] = "列内文字环绕"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Obieg kolumnowy"; Text[ japanese ] = "列の折り返し"; Text[ chinese_traditional ] = "列內文字環繞"; @@ -621,11 +640,12 @@ String STR_SURROUND_COLUMN Text[ dutch ] = "omloop kolom"; Text[ chinese_simplified ] = "列内文字环绕"; Text[ greek ] = " "; - Text[ korean ] = "문자열 배치，단에서"; + Text[ korean ] = "열 문장 배치"; Text[ turkish ] = "-"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste en columnas"; - Text[ finnish ] = "Sarakkeen rivitys"; + Text[ catalan ] = "Ajustament de columnes"; + Text[ finnish ] = "Palstan rivitys"; + Text[ thai ] = "ตัดคอลัมน์"; }; String STR_SURROUND_LEFT { @@ -649,11 +669,12 @@ String STR_SURROUND_LEFT Text[ dutch ] = "omloop linkerkant"; Text[ chinese_simplified ] = "左环绕"; Text[ greek ] = " "; - Text[ korean ] = "문자열 배치，왼쪽"; + Text[ korean ] = "문장 배치 왼쪽"; Text[ turkish ] = "Sol metin dalm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste a la izquierda"; + Text[ catalan ] = "Ajustament esquerre"; Text[ finnish ] = "Rivitys vasemmalle"; + Text[ thai ] = "ตัดด้านซ้าย"; }; String STR_SURROUND_RIGHT { @@ -677,11 +698,12 @@ String STR_SURROUND_RIGHT Text[ dutch ] = "omloop rechterkant"; Text[ chinese_simplified ] = "右环绕"; Text[ greek ] = " "; - Text[ korean ] = "문자열 배치，오른쪽"; + Text[ korean ] = "본문의 오른쪽으로 배치"; Text[ turkish ] = "Sa metin dalm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste a la derecha"; + Text[ catalan ] = "Ajustament dret"; Text[ finnish ] = "Rivit oikealle"; + Text[ thai ] = "ตัดด้านขวา"; }; String STR_SURROUND_INSIDE { @@ -705,11 +727,12 @@ String STR_SURROUND_INSIDE Text[ dutch ] = "omloop binnenkant"; Text[ chinese_simplified ] = "内部环绕"; Text[ greek ] = " - "; - Text[ korean ] = "문자열 배치，안쪽"; + Text[ korean ] = "문장 배치 안으로"; Text[ turkish ] = " metin dalm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste interno"; + Text[ catalan ] = "Ajustament intern"; Text[ finnish ] = "Sisempi rivitys"; + Text[ thai ] = "ตัดด้านใน"; }; String STR_SURROUND_OUTSIDE { @@ -734,11 +757,12 @@ String STR_SURROUND_OUTSIDE Text[ dutch ] = "omloop buitenkant"; Text[ chinese_simplified ] = "外环绕"; Text[ greek ] = " - "; - Text[ korean ] = "문자열 배치，바깥쪽"; + Text[ korean ] = "문장 배치 바깥쪽으로"; Text[ turkish ] = "D metin dalm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste externo"; + Text[ catalan ] = "Ajustament exterior"; Text[ finnish ] = "Ulompi rivitys"; + Text[ thai ] = "ตัดด้านนอก"; }; String STR_SURROUND_ANCHORONLY { @@ -754,7 +778,7 @@ String STR_SURROUND_ANCHORONLY Text [ portuguese ] = "(s ncora)" ; Text [ portuguese_brazilian ] = "(nur Anker)" ; Text[ chinese_simplified ] = "(只是标记)"; - Text[ russian ] = "( )"; + Text[ russian ] = "( )"; Text[ polish ] = "(tylko kotwica)"; Text[ japanese ] = "(アンカーのみ)"; Text[ chinese_traditional ] = "(只是標號)"; @@ -762,11 +786,12 @@ String STR_SURROUND_ANCHORONLY Text[ dutch ] = "(alleen anker)"; Text[ chinese_simplified ] = "(只是标记)"; Text[ greek ] = "( )"; - Text[ korean ] = "(고정 기준만)"; + Text[ korean ] = "(기준 위치만)"; Text[ turkish ] = "(yalnzca sabitleyici)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "(solo ancla)"; + Text[ catalan ] = "(noms ancla)"; Text[ finnish ] = "(Vain ankkuri)"; + Text[ thai ] = "(สมออย่างเดียว)"; }; String STR_FRM_WIDTH { @@ -793,8 +818,9 @@ String STR_FRM_WIDTH Text[ korean ] = "너비:"; Text[ turkish ] = "Genilik:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho:"; + Text[ catalan ] = "Amplada"; Text[ finnish ] = "Leveys:"; + Text[ thai ] = "ความกว้าง:"; }; String STR_FRM_FIXEDHEIGHT { @@ -811,7 +837,7 @@ String STR_FRM_FIXEDHEIGHT Text [ portuguese ] = "Altura fixa:" ; Text [ portuguese_brazilian ] = "feste H?e:" ; Text[ chinese_simplified ] = "固定高度："; - Text[ russian ] = " :"; + Text[ russian ] = " :"; Text[ polish ] = "Staa wysoko:"; Text[ japanese ] = "規定の高さ:"; Text[ chinese_traditional ] = "固定高度："; @@ -822,8 +848,9 @@ String STR_FRM_FIXEDHEIGHT Text[ korean ] = "고정된 높이:"; Text[ turkish ] = "Sabit ykseklik:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura fija:"; + Text[ catalan ] = "Alada fixa"; Text[ finnish ] = "Kiinte korkeus:"; + Text[ thai ] = "ความสูงคงที่:"; }; String STR_FRM_MINHEIGHT { @@ -840,7 +867,7 @@ String STR_FRM_MINHEIGHT Text [ portuguese ] = "Altura min.:" ; Text [ portuguese_brazilian ] = "min. H?e:" ; Text[ chinese_simplified ] = "最小高度："; - Text[ russian ] = ". :"; + Text[ russian ] = ". :"; Text[ polish ] = "Min. wysoko:"; Text[ japanese ] = "最低の高さ:"; Text[ chinese_traditional ] = "最小高度："; @@ -851,36 +878,38 @@ String STR_FRM_MINHEIGHT Text[ korean ] = "최소 높이:"; Text[ turkish ] = "Asg.ykseklik:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura mnima:"; + Text[ catalan ] = "Alada mnima:"; Text[ finnish ] = "Korkeus vh."; + Text[ thai ] = "ความสูงน้อยที่สุด:"; }; String STR_FLY_AT_CNTNT { TEXT = "absatzgebunden" ; TEXT [ English ] = "at paragraph" ; - Text [ dutch ] = "alinea-gebonden" ; + Text [ dutch ] = "alineagebonden" ; Text [ english_us ] = "to paragraph" ; Text [ italian ] = "al paragrafo" ; - Text [ spanish ] = "segn prrafo" ; + Text [ spanish ] = "al prrafo" ; Text [ french ] = "li au paragraphe" ; Text [ swedish ] = "bunden till stycke" ; Text [ danish ] = "bundet til afsnit" ; Text [ portuguese ] = "ligado ao pargrafo" ; Text [ portuguese_brazilian ] = "absatzgebunden" ; Text[ chinese_simplified ] = "和段落连在一起"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "zwizany z akapitem"; Text[ japanese ] = "段落に結合"; Text[ chinese_traditional ] = "和段落連在一起"; Text[ arabic ] = " "; - Text[ dutch ] = "alinea-gebonden"; + Text[ dutch ] = "alineagebonden"; Text[ chinese_simplified ] = "和段落连在一起"; Text[ greek ] = " "; - Text[ korean ] = "단락에"; + Text[ korean ] = "단락에 결합"; Text[ turkish ] = "Paragrafa bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "segn prrafo"; + Text[ catalan ] = "segons pargraf"; Text[ finnish ] = "kappaleeseen"; + Text[ thai ] = "ไปยังย่อหน้า"; }; String STR_FLY_IN_CNTNT { @@ -888,27 +917,28 @@ String STR_FLY_IN_CNTNT TEXT [ English ] = "at character" ; Text [ english_us ] = "to character" ; Text [ italian ] = "al carattere" ; - Text [ spanish ] = "segn carcter" ; + Text [ spanish ] = "al carcter" ; Text [ french ] = "au caractre" ; - Text [ dutch ] = "schriftteken-gebonden" ; + Text [ dutch ] = "Tekengebonden" ; Text [ swedish ] = "bunden till tecken" ; Text [ danish ] = "bundet til tegn" ; Text [ portuguese ] = "conforme carcter" ; Text [ portuguese_brazilian ] = "zeichengebunden" ; Text[ chinese_simplified ] = "和文字连在一起"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "zwizany ze znakiem"; Text[ japanese ] = "文字に結合"; Text[ chinese_traditional ] = "和文字連在一起"; Text[ arabic ] = " "; - Text[ dutch ] = "schriftteken-gebonden"; + Text[ dutch ] = "Tekengebonden"; Text[ chinese_simplified ] = "和文字连在一起"; Text[ greek ] = " "; - Text[ korean ] = "문자에"; + Text[ korean ] = "문자에 결합"; Text[ turkish ] = "Karaktere bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "segn carcter"; + Text[ catalan ] = "segons carcter"; Text[ finnish ] = "merkkiin"; + Text[ thai ] = "ไปยังตัวอักขระ"; }; String STR_FLY_PAGE { @@ -918,25 +948,26 @@ String STR_FLY_PAGE Text [ italian ] = "alla pagina" ; Text [ spanish ] = "a la pgina" ; Text [ french ] = " la page" ; - Text [ dutch ] = "pagina-gebonden" ; + Text [ dutch ] = "paginagebonden" ; Text [ swedish ] = "bunden till sida" ; Text [ danish ] = "bundet til side" ; Text [ portuguese ] = "conforme pgina" ; Text [ portuguese_brazilian ] = "seitengebunden" ; Text[ chinese_simplified ] = "和页连在一起"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "zwizany ze stron"; Text[ japanese ] = "ページに結合"; Text[ chinese_traditional ] = "和頁連在一起"; Text[ arabic ] = " "; - Text[ dutch ] = "pagina-gebonden"; + Text[ dutch ] = "paginagebonden"; Text[ chinese_simplified ] = "和页连在一起"; Text[ greek ] = " "; - Text[ korean ] = "페이지 관련"; + Text[ korean ] = "페이지에 결합"; Text[ turkish ] = "Sayfaya bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "a la pgina"; + Text[ catalan ] = "a la pgina"; Text[ finnish ] = "sivulle"; + Text[ thai ] = "ไปยังหน้า"; }; String STR_POS_X { @@ -963,8 +994,9 @@ String STR_POS_X Text[ korean ] = "X 좌표:"; Text[ turkish ] = "X koord.:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Coord. X:"; + Text[ catalan ] = "Coordenada X"; Text[ finnish ] = "X-koordinaatti:"; + Text[ thai ] = "พิกัด X :"; }; String STR_POS_Y { @@ -991,8 +1023,9 @@ String STR_POS_Y Text[ korean ] = "Y 좌표:"; Text[ turkish ] = "Y koord.:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Coord. Y:"; + Text[ catalan ] = "Coordenada Y"; Text[ finnish ] = "Y-koordinaatti:"; + Text[ thai ] = "พิกัด Y :"; }; String STR_VERT_TOP { @@ -1016,11 +1049,12 @@ String STR_VERT_TOP Text[ dutch ] = "boven"; Text[ chinese_simplified ] = "上"; Text[ greek ] = ""; - Text[ korean ] = "위에"; + Text[ korean ] = "위"; Text[ turkish ] = "stte"; Text[ language_user1 ] = " "; - Text[ catalan ] = "arriba"; + Text[ catalan ] = "a la part superior"; Text[ finnish ] = "ylhll"; + Text[ thai ] = "ที่ด้านบน"; }; String STR_VERT_CENTER { @@ -1029,7 +1063,7 @@ String STR_VERT_CENTER Text [ dutch ] = "verticaal gecentreerd" ; Text [ english_us ] = "Centered vertically" ; Text [ italian ] = "Centrato in verticale" ; - Text [ spanish ] = "centrado vertical" ; + Text [ spanish ] = "Centrado verticalmente" ; Text [ french ] = "Centr verticalement" ; Text [ swedish ] = "vertikalt centrerad" ; Text [ danish ] = "lodret centreret" ; @@ -1047,8 +1081,9 @@ String STR_VERT_CENTER Text[ korean ] = "수직으로 가운데"; Text[ turkish ] = "Dikey ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "centrado vertical"; + Text[ catalan ] = "Centrat verticalment"; Text[ finnish ] = "Keskitetty pystytasossa"; + Text[ thai ] = "ตรงกลางตามแนวตั้ง"; }; String STR_VERT_BOTTOM { @@ -1075,8 +1110,9 @@ String STR_VERT_BOTTOM Text[ korean ] = "아래에"; Text[ turkish ] = "altta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "abajo"; + Text[ catalan ] = "a la part inferior"; Text[ finnish ] = "pohjalla"; + Text[ thai ] = "ที่ด้านล่าง"; }; String STR_LINE_TOP { @@ -1085,8 +1121,8 @@ String STR_LINE_TOP Text [ dutch ] = "bovenste regel" ; Text [ english_us ] = "Top of line" ; Text [ italian ] = "Riga in alto" ; - Text [ spanish ] = "Lnea superior" ; - Text [ french ] = "Ligne suprieure" ; + Text [ spanish ] = "Lnea arriba" ; + Text [ french ] = "Ligne en haut" ; Text [ swedish ] = "versta raden" ; Text [ danish ] = "rkke verst" ; Text [ portuguese ] = "Linha superior" ; @@ -1100,11 +1136,12 @@ String STR_LINE_TOP Text[ dutch ] = "bovenste regel"; Text[ chinese_simplified ] = "行上方"; Text[ greek ] = " "; - Text[ korean ] = "선 위"; + Text[ korean ] = "줄 위"; Text[ turkish ] = "Satr st"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lnea superior"; - Text[ finnish ] = "Viivan ylosa"; + Text[ catalan ] = "Lnia superior"; + Text[ finnish ] = "Viivan ylreuna"; + Text[ thai ] = "บรรทัดบน"; }; String STR_LINE_CENTER { @@ -1120,7 +1157,7 @@ String STR_LINE_CENTER Text [ portuguese ] = "Centrado sobre a linha na vertical" ; Text [ portuguese_brazilian ] = "vertikal zur Zeile zentriert" ; Text[ chinese_simplified ] = "和行垂直居中"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Wyrodkowany pionowo do wiersza"; Text[ japanese ] = "セルに垂直に中央揃え"; Text[ chinese_traditional ] = "和行垂直置中"; @@ -1128,11 +1165,12 @@ String STR_LINE_CENTER Text[ dutch ] = "verticaal op de regel gecentreerd"; Text[ chinese_simplified ] = "和行垂直居中"; Text[ greek ] = " "; - Text[ korean ] = "줄에 대해 수직으로 가운데"; + Text[ korean ] = "줄을 가운데로"; Text[ turkish ] = "Satra gre dikey ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Centrado verticalmente a la lnea"; + Text[ catalan ] = "Centrat verticalment a la lnia"; Text[ finnish ] = "Keskitetty rivi"; + Text[ thai ] = "บรรทัดตรงกลาง"; }; String STR_LINE_BOTTOM { @@ -1141,8 +1179,8 @@ String STR_LINE_BOTTOM Text [ dutch ] = "onderste regel" ; Text [ english_us ] = "Bottom of line" ; Text [ italian ] = "Riga in basso" ; - Text [ spanish ] = "Lnea inferior" ; - Text [ french ] = "Ligne infrieure" ; + Text [ spanish ] = "Lnea abajo" ; + Text [ french ] = "Ligne en bas" ; Text [ swedish ] = "Nedersta raden" ; Text [ danish ] = "rkke nederst" ; Text [ portuguese ] = "Linha inferior" ; @@ -1156,11 +1194,12 @@ String STR_LINE_BOTTOM Text[ dutch ] = "onderste regel"; Text[ chinese_simplified ] = "行下方"; Text[ greek ] = " "; - Text[ korean ] = "선 아래"; + Text[ korean ] = "줄 아래"; Text[ turkish ] = "Satr alt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lnea inferior"; - Text[ finnish ] = "Viivan alaosa"; + Text[ catalan ] = "Lnia inferior"; + Text[ finnish ] = "Viivan alareuna"; + Text[ thai ] = "บรรทัดล่าง"; }; String STR_REGISTER_ON { @@ -1170,7 +1209,7 @@ String STR_REGISTER_ON Text [ italian ] = "Conformit registro" ; Text [ spanish ] = "Conformidad registro" ; Text [ french ] = "Contrle de reprage" ; - Text [ dutch ] = "registeren" ; + Text [ dutch ] = "registreren" ; Text [ swedish ] = "Register" ; Text [ danish ] = "hold register" ; Text [ portuguese ] = "Registo" ; @@ -1181,23 +1220,24 @@ String STR_REGISTER_ON Text[ japanese ] = "印刷見当を合わせる"; Text[ chinese_traditional ] = "正反頁的行距相等"; Text[ arabic ] = ""; - Text[ dutch ] = "registeren"; + Text[ dutch ] = "registreren"; Text[ chinese_simplified ] = "正反页的行距相等"; Text[ greek ] = " "; - Text[ korean ] = "레지스터 보유"; + Text[ korean ] = "인쇄할 때 가늠 맞춤 "; Text[ turkish ] = "Eit satr ykseklii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Conformidad registro"; - Text[ finnish ] = "Rekisteri-tosi"; + Text[ catalan ] = "Conforme al registre"; + Text[ finnish ] = "Rivirekisteri"; + Text[ thai ] = "ลงทะเบียน-จริง"; }; String STR_REGISTER_OFF { TEXT = "keine Registerhaltigkeit" ; TEXT [ English ] = "no register" ; - Text [ dutch ] = "niet registeren" ; + Text [ dutch ] = "niet registreren" ; Text [ english_us ] = "Not register-true" ; Text [ italian ] = "Senza conformit registro" ; - Text [ spanish ] = "Sin conformidad registro" ; + Text [ spanish ] = "Sin conformidad de registro" ; Text [ french ] = "Pas de contrle de reprage" ; Text [ swedish ] = "inget register" ; Text [ danish ] = "hold ikke register" ; @@ -1209,14 +1249,15 @@ String STR_REGISTER_OFF Text[ japanese ] = "印刷見当を合わせない"; Text[ chinese_traditional ] = "正反頁的行距不相等"; Text[ arabic ] = " "; - Text[ dutch ] = "niet registeren"; + Text[ dutch ] = "niet registreren"; Text[ chinese_simplified ] = "正反页的行距不相等"; Text[ greek ] = " "; - Text[ korean ] = "레지스터 보유 없음"; + Text[ korean ] = "가늠 맞춤 없음"; Text[ turkish ] = "Eit satr ykseklii mevcut deil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin conformidad registro"; - Text[ finnish ] = "Ei rekisterity-tosi"; + Text[ catalan ] = "No conforme al registre"; + Text[ finnish ] = "Ei rivirekisteri"; + Text[ thai ] = "ไม่ลงทะเบียน-จริง"; }; String STR_HORI_RIGHT { @@ -1225,7 +1266,7 @@ String STR_HORI_RIGHT Text [ dutch ] = "rechts" ; Text [ english_us ] = "at the right" ; Text [ italian ] = "Destra" ; - Text [ spanish ] = "derecha" ; + Text [ spanish ] = "a la derecha" ; Text [ french ] = " droite" ; Text [ swedish ] = "hger" ; Text [ danish ] = "hjre" ; @@ -1243,8 +1284,9 @@ String STR_HORI_RIGHT Text[ korean ] = "오른쪽"; Text[ turkish ] = "sa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "derecha"; + Text[ catalan ] = "a la dreta"; Text[ finnish ] = "oikealla"; + Text[ thai ] = "ที่ด้านขวา"; }; String STR_HORI_CENTER { @@ -1253,7 +1295,7 @@ String STR_HORI_CENTER Text [ dutch ] = "horizontaal gecentreerd" ; Text [ english_us ] = "Centered horizontally" ; Text [ italian ] = "Centrato in orizzontale" ; - Text [ spanish ] = "Centrado horizontal" ; + Text [ spanish ] = "Centrado horizontalmente" ; Text [ french ] = "Centr horizontalement" ; Text [ swedish ] = "Horisontellt centrerad" ; Text [ danish ] = "vandret centreret" ; @@ -1268,11 +1310,12 @@ String STR_HORI_CENTER Text[ dutch ] = "horizontaal gecentreerd"; Text[ chinese_simplified ] = "水平居中"; Text[ greek ] = " "; - Text[ korean ] = "수평으로 가운데"; + Text[ korean ] = "수평으로 가운데에"; Text[ turkish ] = "Yatay ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Centrado horizontal"; + Text[ catalan ] = "Centrat horitzontalment"; Text[ finnish ] = "Keskitetty vaakataso"; + Text[ thai ] = "ตรงกลางตามแนวนอน"; }; String STR_HORI_LEFT { @@ -1280,7 +1323,7 @@ String STR_HORI_LEFT TEXT [ English ] = "at the left" ; Text [ english_us ] = "at the left" ; Text [ italian ] = "sinistra" ; - Text [ spanish ] = "Izquierda" ; + Text [ spanish ] = "a la izquierda" ; Text [ french ] = " gauche" ; Text [ dutch ] = "links" ; Text [ swedish ] = "vnster" ; @@ -1299,8 +1342,9 @@ String STR_HORI_LEFT Text[ korean ] = "왼쪽"; Text[ turkish ] = "sol"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Izquierda"; + Text[ catalan ] = "a l'esquerra"; Text[ finnish ] = "vasemmalla"; + Text[ thai ] = "ที่ด้านซ้าย"; }; String STR_HORI_INSIDE { @@ -1327,8 +1371,9 @@ String STR_HORI_INSIDE Text[ korean ] = "내부"; Text[ turkish ] = "i"; Text[ language_user1 ] = " "; - Text[ catalan ] = "interior"; + Text[ catalan ] = "dins"; Text[ finnish ] = "sisll"; + Text[ thai ] = "ข้างใน"; }; String STR_HORI_OUTSIDE { @@ -1356,8 +1401,9 @@ String STR_HORI_OUTSIDE Text[ korean ] = "외부"; Text[ turkish ] = "d"; Text[ language_user1 ] = " "; - Text[ catalan ] = "exterior"; + Text[ catalan ] = "fora"; Text[ finnish ] = "ulkopuolella"; + Text[ thai ] = "ข้างนอก"; }; String STR_HORI_FULL { @@ -1381,11 +1427,12 @@ String STR_HORI_FULL Text[ dutch ] = "volle breedte"; Text[ chinese_simplified ] = "整个宽度"; Text[ greek ] = " "; - Text[ korean ] = "전체 너비"; + Text[ korean ] = "최대 너비"; Text[ turkish ] = "Tam genilik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho total"; + Text[ catalan ] = "Amplada completa"; Text[ finnish ] = "Tysi leveys"; + Text[ thai ] = "ความกว้างเต็ม"; }; String STR_COLUMNS { @@ -1401,7 +1448,7 @@ String STR_COLUMNS Text [ portuguese ] = "Colunas" ; Text [ portuguese_brazilian ] = "Spalten" ; Text[ chinese_simplified ] = "列"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Kolumny"; Text[ japanese ] = "段組み"; Text[ chinese_traditional ] = "欄"; @@ -1412,8 +1459,9 @@ String STR_COLUMNS Text[ korean ] = "단"; Text[ turkish ] = "Stun"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; - Text[ finnish ] = "Sarakkeet"; + Text[ catalan ] = "Columnes"; + Text[ finnish ] = "Palstat"; + Text[ thai ] = "คอลัมน์"; }; String STR_LINE_WIDTH { @@ -1437,11 +1485,12 @@ String STR_LINE_WIDTH Text[ dutch ] = "breedte scheidingslijn:"; Text[ chinese_simplified ] = "分隔线粗："; Text[ greek ] = " :"; - Text[ korean ] = "구분 기호 너비:"; + Text[ korean ] = "구분선 너비:"; Text[ turkish ] = "Ayrma izgisi genilii:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho de la lnea de separacin:"; + Text[ catalan ] = "Amplada del separador:"; Text[ finnish ] = "Erottimen leveys:"; + Text[ thai ] = "ตัวแยกความกว้าง:"; }; String STR_MAX_FTN_HEIGHT { @@ -1469,8 +1518,9 @@ String STR_MAX_FTN_HEIGHT Text[ korean ] = "최대 각주 영역:"; Text[ turkish ] = "azm. dipnot alan:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "rea mx. de la nota al pie:"; + Text[ catalan ] = "rea mx. de la nota al peu:"; Text[ finnish ] = "Suurin alaviiteala:"; + Text[ thai ] = "พื้นที่เชิงอรรถที่มากที่สุด:"; }; String STR_EDIT_IN_READONLY { @@ -1490,21 +1540,22 @@ String STR_EDIT_IN_READONLY Text [ italian ] = "modificabile nel documento a sola lettura" ; Text [ spanish ] = "Se puede editar en documentos de slo lectura" ; Text [ french ] = " diter dans le document en mode Lecture seule" ; - Text [ dutch ] = "editeerbaar in schrijfbeveiligd document" ; + Text [ dutch ] = "bewerkbaar in alleen-lezen document" ; Text[ chinese_simplified ] = "能够编辑受保护的文档"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Moliwy do edycji tylko w dokumencie do odczytu"; Text[ japanese ] = "読み取り専用ドキュメント内で編集可能"; Text[ chinese_traditional ] = "能夠編輯受保護的文件"; Text[ arabic ] = " "; - Text[ dutch ] = "editeerbaar in schrijfbeveiligd document"; + Text[ dutch ] = "bewerkbaar in alleen-lezen document"; Text[ chinese_simplified ] = "能够编辑受保护的文档"; Text[ greek ] = " ' '"; Text[ korean ] = "읽기 전용 문서에서 편집 가능"; Text[ turkish ] = "Salt okunur belgede dzenlenebilir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se puede editar en documentos de solo lectura"; + Text[ catalan ] = "Es pot editar en documents de noms lectura"; Text[ finnish ] = "Muokattavissa ainoastaan vain luku -asiakirjoissa"; + Text[ thai ] = "สามารถแก้ไขในเอกสารแบบอ่านอย่างเดียว"; }; String STR_LAYOUT_SPLIT { @@ -1520,7 +1571,7 @@ String STR_LAYOUT_SPLIT Text [ french ] = "Scinder" ; Text [ dutch ] = "splitsen" ; Text[ chinese_simplified ] = "分隔"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Podziel"; Text[ japanese ] = "分割"; Text[ chinese_traditional ] = "分開"; @@ -1531,8 +1582,9 @@ String STR_LAYOUT_SPLIT Text[ korean ] = "나누기"; Text[ turkish ] = "Bl"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dividir"; + Text[ catalan ] = "Divideix"; Text[ finnish ] = "Jaa"; + Text[ thai ] = "แยก"; }; String STR_NUMRULE_ON { @@ -1559,8 +1611,9 @@ String STR_NUMRULE_ON Text[ korean ] = "번호 매기기"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin"; + Text[ catalan ] = "Numeraci"; Text[ finnish ] = "Numerointi"; + Text[ thai ] = "ลำดับตัวเลข"; }; String STR_NUMRULE_OFF { @@ -1576,7 +1629,7 @@ String STR_NUMRULE_OFF Text [ french ] = "pas de numrotation" ; Text [ dutch ] = "geen nummering" ; Text[ chinese_simplified ] = "无编号"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Bez numeracji"; Text[ japanese ] = "番号付けなし"; Text[ chinese_traditional ] = "不編號"; @@ -1587,8 +1640,9 @@ String STR_NUMRULE_OFF Text[ korean ] = "번호 매기기 없음"; Text[ turkish ] = "Numaralama yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin numeracin"; + Text[ catalan ] = "Sense numeraci"; Text[ finnish ] = "ei numerointia"; + Text[ thai ] = "ไม่ลำดับตัวเลข"; }; String STR_CONNECT1 { @@ -1601,22 +1655,23 @@ String STR_CONNECT1 Text [ danish ] = "forbundet med " ; Text [ italian ] = "Collegato con " ; Text [ spanish ] = "Vinculado a " ; - Text [ french ] = "Li [_] " ; - Text [ dutch ] = "Verbonden met " ; + Text [ french ] = "Li " ; + Text [ dutch ] = "Verbonden met" ; Text[ chinese_simplified ] = "连接到 "; Text[ russian ] = " "; Text[ polish ] = "Poczony z "; Text[ japanese ] = "結合先 "; Text[ chinese_traditional ] = "連結到 "; Text[ arabic ] = " "; - Text[ dutch ] = "Verbonden met "; + Text[ dutch ] = "Verbonden met"; Text[ chinese_simplified ] = "连接到 "; Text[ greek ] = " "; - Text[ korean ] = "연결 "; + Text[ korean ] = "연결 대상"; Text[ turkish ] = "Balanlan "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Vinculado a "; + Text[ catalan ] = "Enllaat a "; Text[ finnish ] = "linkitetty kohteeseen "; + Text[ thai ] = "เชื่อมโยงไปยัง "; }; String STR_CONNECT2 { @@ -1630,21 +1685,22 @@ String STR_CONNECT2 Text [ italian ] = "e " ; Text [ spanish ] = "y " ; Text [ french ] = "et " ; - Text [ dutch ] = "en " ; + Text [ dutch ] = "en" ; Text[ chinese_simplified ] = "和 "; Text[ russian ] = " "; Text[ polish ] = "i "; Text[ japanese ] = "および "; Text[ chinese_traditional ] = "和 "; Text[ arabic ] = " "; - Text[ dutch ] = "en "; + Text[ dutch ] = "en"; Text[ chinese_simplified ] = "和 "; Text[ greek ] = " "; - Text[ korean ] = "와 "; + Text[ korean ] = "와(과)"; Text[ turkish ] = "ve "; Text[ language_user1 ] = " "; - Text[ catalan ] = "y "; - Text[ finnish ] = "ja"; + Text[ catalan ] = "i"; + Text[ finnish ] = "ja "; + Text[ thai ] = "และ "; }; String STR_LINECOUNT { @@ -1671,8 +1727,9 @@ String STR_LINECOUNT Text[ korean ] = "줄 세기"; Text[ turkish ] = "Satr say"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contar lneas"; + Text[ catalan ] = "Compte lnies"; Text[ finnish ] = "Laske rivit"; + Text[ thai ] = "นับบรรทัด"; }; String STR_DONTLINECOUNT { @@ -1696,11 +1753,12 @@ String STR_DONTLINECOUNT Text[ dutch ] = "Regels niet tellen"; Text[ chinese_simplified ] = "不计数行"; Text[ greek ] = " "; - Text[ korean ] = "선 세지 않음"; + Text[ korean ] = "줄 세지 않음"; Text[ turkish ] = "Satrlar sayma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No contar las lneas"; + Text[ catalan ] = "No comptis les lnies"; Text[ finnish ] = "ei rivien laskemista"; + Text[ thai ] = "ไม่นับบรรทัด"; }; String STR_LINCOUNT_START { @@ -1714,21 +1772,22 @@ String STR_LINCOUNT_START Text [ italian ] = "Iniziare a contare le righe con: " ; Text [ spanish ] = "Iniciar recuento de lneas con: " ; Text [ french ] = "Commencer le compte des lignes : " ; - Text [ dutch ] = "regels telllen starten bij: " ; + Text [ dutch ] = "regels tellen starten bij:" ; Text[ chinese_simplified ] = "计数行从： "; Text[ russian ] = " : "; Text[ polish ] = "Rozpocznij liczenie wierszy od: "; Text[ japanese ] = "行数えの開始: "; Text[ chinese_traditional ] = "計數行從： "; Text[ arabic ] = " : "; - Text[ dutch ] = "regels telllen starten bij: "; + Text[ dutch ] = "regels tellen starten bij:"; Text[ chinese_simplified ] = "计数行从： "; Text[ greek ] = " : "; - Text[ korean ] = "줄 세기 시작 위치: "; + Text[ korean ] = "줄 세기 시작: "; Text[ turkish ] = "Satr sayma balangc: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciar recuento de lneas con: "; + Text[ catalan ] = "Inicia el recompte de lnies amb: "; Text[ finnish ] = "aloita rivilaskenta uudelleen mrityksell: "; + Text[ thai ] = "เริ่มนับบรรทัดใหม่ด้วย: "; }; String STR_LUMINANCE @@ -1739,7 +1798,7 @@ String STR_LUMINANCE Text[ portuguese ] = "Brilho: "; Text[ russian ] = ": "; Text[ greek ] = ": "; - Text[ dutch ] = "Helderheid: "; + Text[ dutch ] = "Helderheid:"; Text[ french ] = "Luminosit : "; Text[ spanish ] = "Brillo: "; Text[ italian ] = "Luminosit: "; @@ -1753,8 +1812,9 @@ String STR_LUMINANCE Text[ chinese_traditional ] = "亮度： "; Text[ turkish ] = "Luminance: "; Text[ arabic ] = ":"; - Text[ catalan ] = "Brillo: "; + Text[ catalan ] = "Lluminositat:"; Text[ finnish ] = "Kirkkaus: "; + Text[ thai ] = "ความสว่าง: "; }; String STR_CHANNELR @@ -1765,7 +1825,7 @@ String STR_CHANNELR Text[ portuguese ] = "Proporo de vermelho: "; Text[ russian ] = " : "; Text[ greek ] = " : "; - Text[ dutch ] = "Rood: "; + Text[ dutch ] = "Rood:"; Text[ french ] = "Proportion de rouge : "; Text[ spanish ] = "Proporcin de rojo: "; Text[ italian ] = "Percentuale di rosso: "; @@ -1779,8 +1839,9 @@ String STR_CHANNELR Text[ chinese_traditional ] = "紅色比例： "; Text[ turkish ] = "Red portion: "; Text[ arabic ] = " :"; - Text[ catalan ] = "Proporcin de rojo: "; + Text[ catalan ] = "Vermell:"; Text[ finnish ] = "Punainen: "; + Text[ thai ] = "แดง: "; }; String STR_CHANNELG @@ -1791,7 +1852,7 @@ String STR_CHANNELG Text[ portuguese ] = "Proporo de verde: "; Text[ russian ] = " : "; Text[ greek ] = " : "; - Text[ dutch ] = "Green: "; + Text[ dutch ] = "Groen:"; Text[ french ] = "Proportion de vert : "; Text[ spanish ] = "Proporcin verde: "; Text[ italian ] = "Percentuale di verde: "; @@ -1805,8 +1866,9 @@ String STR_CHANNELG Text[ chinese_traditional ] = "綠色比例： "; Text[ turkish ] = "Green portion: "; Text[ arabic ] = " :"; - Text[ catalan ] = "Proporcin verde: "; + Text[ catalan ] = "Verd:"; Text[ finnish ] = "Vihre: "; + Text[ thai ] = "เขียว: "; }; String STR_CHANNELB @@ -1817,7 +1879,7 @@ String STR_CHANNELB Text[ portuguese ] = "Proporo de azul: "; Text[ russian ] = " : "; Text[ greek ] = " : "; - Text[ dutch ] = "Blauw: "; + Text[ dutch ] = "Blauw:"; Text[ french ] = "Proportion de bleu : "; Text[ spanish ] = "Proporcin de azul: "; Text[ italian ] = "Percentuale di blu: "; @@ -1831,8 +1893,9 @@ String STR_CHANNELB Text[ chinese_traditional ] = "藍色比例： "; Text[ turkish ] = "Blue portion: "; Text[ arabic ] = " :"; - Text[ catalan ] = "Proporcin de azul: "; + Text[ catalan ] = "Blau:"; Text[ finnish ] = "Sininen: "; + Text[ thai ] = "น้ำเงิน: "; }; String STR_CONTRAST @@ -1843,7 +1906,7 @@ String STR_CONTRAST Text[ portuguese ] = "Contraste: "; Text[ russian ] = ": "; Text[ greek ] = ": "; - Text[ dutch ] = "Contrast: "; + Text[ dutch ] = "Contrast:"; Text[ french ] = "Contraste : "; Text[ spanish ] = "Contraste: "; Text[ italian ] = "Contrasto: "; @@ -1852,13 +1915,14 @@ String STR_CONTRAST Text[ polish ] = "Kontrast: "; Text[ portuguese_brazilian ] = "Contrast: "; Text[ japanese ] = "コントラスト: "; - Text[ korean ] = "대조: "; + Text[ korean ] = "대비: "; Text[ chinese_simplified ] = "对比度： "; Text[ chinese_traditional ] = "對比度： "; Text[ turkish ] = "Contrast: "; Text[ arabic ] = ":"; - Text[ catalan ] = "Contraste: "; + Text[ catalan ] = "Contrast:"; Text[ finnish ] = "Kontrasti: "; + Text[ thai ] = "ความคมชัด: "; }; String STR_GAMMA @@ -1869,7 +1933,7 @@ String STR_GAMMA Text[ portuguese ] = "Gamma: "; Text[ russian ] = ": "; Text[ greek ] = ": "; - Text[ dutch ] = "Gamma: "; + Text[ dutch ] = "Gamma:"; Text[ french ] = "Gamma : "; Text[ spanish ] = "Gamma: "; Text[ italian ] = "Gamma: "; @@ -1883,8 +1947,9 @@ String STR_GAMMA Text[ chinese_traditional ] = "灰色系數： "; Text[ turkish ] = "Gamma: "; Text[ arabic ] = ":"; - Text[ catalan ] = "Gamma: "; + Text[ catalan ] = "Gamma:"; Text[ finnish ] = "Gamma: "; + Text[ thai ] = "แกมม่า: "; }; String STR_TRANSPARENCY @@ -1895,7 +1960,7 @@ String STR_TRANSPARENCY Text[ portuguese ] = "Transparncia: "; Text[ russian ] = ": "; Text[ greek ] = ": "; - Text[ dutch ] = "Transparantie: "; + Text[ dutch ] = "Transparantie:"; Text[ french ] = "Transparence: "; Text[ spanish ] = "Transparencia: "; Text[ italian ] = "Trasparenza: "; @@ -1904,13 +1969,14 @@ String STR_TRANSPARENCY Text[ polish ] = "Przezroczysto: "; Text[ portuguese_brazilian ] = "Transparency: "; Text[ japanese ] = "透過性: "; - Text[ korean ] = "투명: "; + Text[ korean ] = "투명도: "; Text[ chinese_simplified ] = "透明 "; Text[ chinese_traditional ] = "透明 "; Text[ turkish ] = "Transparency: "; Text[ arabic ] = ":"; - Text[ catalan ] = "Transparencia: "; - Text[ finnish ] = "Lpikuultavuus: "; + Text[ catalan ] = "Transparncia: "; + Text[ finnish ] = "Lpinkyvyys: "; + Text[ thai ] = "ความโปร่งแสง: "; }; String STR_INVERT @@ -1925,7 +1991,7 @@ String STR_INVERT Text[ french ] = "Invertir"; Text[ spanish ] = "Invertir"; Text[ italian ] = "Inverti"; - Text[ danish ] = "Invert"; + Text[ danish ] = "Inverter"; Text[ swedish ] = "Invertera"; Text[ polish ] = "Odwr"; Text[ portuguese_brazilian ] = "Invert"; @@ -1935,8 +2001,9 @@ String STR_INVERT Text[ chinese_traditional ] = "互補色轉換"; Text[ turkish ] = "Invert"; Text[ arabic ] = ""; - Text[ catalan ] = "Invertir"; + Text[ catalan ] = "Inverteix"; Text[ finnish ] = "Knn"; + Text[ thai ] = "สลับ"; }; String STR_INVERT_NOT { @@ -1955,13 +2022,14 @@ String STR_INVERT_NOT Text[ polish ] = "nie odwracaj"; Text[ portuguese_brazilian ] = "not invert"; Text[ japanese ] = "逆転なし"; - Text[ korean ] = "반전 않음"; + Text[ korean ] = "반전하지 않음"; Text[ chinese_simplified ] = "不转换互补色"; Text[ chinese_traditional ] = "不轉換互補色"; Text[ turkish ] = "not invert"; Text[ arabic ] = " "; - Text[ catalan ] = "no invertir"; + Text[ catalan ] = "no inverteixis"; Text[ finnish ] = "l knn"; + Text[ thai ] = "ไม่สลับ"; }; String STR_DRAWMODE @@ -1970,9 +2038,9 @@ String STR_DRAWMODE Text[ english ] = "Graphics mode: "; Text[ english_us ] = "Graphics mode: "; Text[ portuguese ] = "Modo Grfico: "; - Text[ russian ] = " : "; + Text[ russian ] = " "; Text[ greek ] = " : "; - Text[ dutch ] = "Afbeeldingenmodus: "; + Text[ dutch ] = "Afbeeldingenmodus:"; Text[ french ] = "Mode Graphique : "; Text[ spanish ] = "Modo grfico: "; Text[ italian ] = "Modo immagine: "; @@ -1981,13 +2049,14 @@ String STR_DRAWMODE Text[ polish ] = "Tryb grafiki: "; Text[ portuguese_brazilian ] = "Graphics mode: "; Text[ japanese ] = "図モード: "; - Text[ korean ] = "그래픽 모드: "; + Text[ korean ] = "그림 모드: "; Text[ chinese_simplified ] = "图形模式： "; Text[ chinese_traditional ] = "圖形模式： "; Text[ turkish ] = "Graphics mode: "; Text[ arabic ] = " :"; - Text[ catalan ] = "Modo grfico: "; + Text[ catalan ] = "Mode grfic: "; Text[ finnish ] = "Grafiikkatila: "; + Text[ thai ] = "โหมดกราฟิค: "; }; String STR_DRAWMODE_STD @@ -1996,7 +2065,7 @@ String STR_DRAWMODE_STD Text[ english ] = "Standard"; Text[ english_us ] = "Standard"; Text[ portuguese ] = "Padro"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ greek ] = ""; Text[ dutch ] = "Standaard"; Text[ french ] = "Standard"; @@ -2012,8 +2081,9 @@ String STR_DRAWMODE_STD Text[ chinese_traditional ] = "標準"; Text[ turkish ] = "Standart"; Text[ arabic ] = ""; - Text[ catalan ] = "Estndar"; + Text[ catalan ] = "Estndard"; Text[ finnish ] = "Vakio"; + Text[ thai ] = "มาตรฐาน"; }; String STR_DRAWMODE_GREY { @@ -2032,13 +2102,14 @@ String STR_DRAWMODE_GREY Text[ polish ] = "Odcienie szaroci"; Text[ portuguese_brazilian ] = "Greys"; Text[ japanese ] = "グレースケール"; - Text[ korean ] = "회색도"; + Text[ korean ] = "회색조"; Text[ chinese_simplified ] = "灰度"; Text[ chinese_traditional ] = "灰階"; Text[ turkish ] = "Greys"; Text[ arabic ] = " "; - Text[ catalan ] = "Escala de grises"; + Text[ catalan ] = "Escales de grisos"; Text[ finnish ] = "Harmaasvyt"; + Text[ thai ] = "สเกลสีเทา"; }; String STR_DRAWMODE_BLACKWHITE { @@ -2050,20 +2121,21 @@ String STR_DRAWMODE_BLACKWHITE Text[ greek ] = "/"; Text[ dutch ] = "Zwart-wit"; Text[ french ] = "Noir/Blanc"; - Text[ spanish ] = "Negro/Blanco"; + Text[ spanish ] = "Blanco y Negro"; Text[ italian ] = "Bianco/nero"; Text[ danish ] = "Sort-hvid"; Text[ swedish ] = "Svartvitt"; Text[ polish ] = "Czarno-biay"; Text[ portuguese_brazilian ] = "Black/White"; Text[ japanese ] = "白黒"; - Text[ korean ] = "흑/백"; + Text[ korean ] = "흑백"; Text[ chinese_simplified ] = "黑白"; Text[ chinese_traditional ] = "黑白"; Text[ turkish ] = "Black/White"; Text[ arabic ] = "/"; - Text[ catalan ] = "Negro/Blanco"; + Text[ catalan ] = "Blanc i negre"; Text[ finnish ] = "Mustavalkoinen"; + Text[ thai ] = "ดำและขาว"; }; String STR_DRAWMODE_WATERMARK { @@ -2075,20 +2147,21 @@ String STR_DRAWMODE_WATERMARK Text[ greek ] = ""; Text[ dutch ] = "Watermerk"; Text[ french ] = "Filigrane"; - Text[ spanish ] = "Marca de agua"; + Text[ spanish ] = "Filigrana"; Text[ italian ] = "Filigrana"; Text[ danish ] = "Vandmrke"; Text[ swedish ] = "Vattenmrke"; Text[ polish ] = "Znak wodny"; Text[ portuguese_brazilian ] = "Watermark"; Text[ japanese ] = "透かし"; - Text[ korean ] = "불빛에 비춰봐야 보이는 무늬(예: 지폐)"; + Text[ korean ] = "워터마크"; Text[ chinese_simplified ] = "水印"; Text[ chinese_traditional ] = "水印"; Text[ turkish ] = "Watermark"; Text[ arabic ] = " "; - Text[ catalan ] = "Marca de agua"; + Text[ catalan ] = "Marca d'aigua"; Text[ finnish ] = "Vesileima"; + Text[ thai ] = "ลายน้ำ"; }; String STR_ROTATION { @@ -2112,8 +2185,9 @@ String STR_ROTATION Text[ chinese_traditional ] = "旋轉"; Text[ turkish ] = "Rotation"; Text[ arabic ] = ""; - Text[ catalan ] = "Rotacin"; + Text[ catalan ] = "Gir"; Text[ finnish ] = "Kierto"; + Text[ thai ] = "หมุน"; }; String STR_GRID_NONE @@ -2133,13 +2207,14 @@ String STR_GRID_NONE Text[ swedish ] = "Inget raster"; Text[ polish ] = "No grid"; Text[ portuguese_brazilian ] = "No grid"; - Text[ japanese ] = "グリッド線なし"; - Text[ korean ] = "문자 수/열 수 외곽선 없음"; + Text[ japanese ] = "なし"; + Text[ korean ] = "그리드 없음"; Text[ chinese_simplified ] = "不使用格子线"; Text[ chinese_traditional ] = "不使用格子線"; Text[ turkish ] = "No grid"; Text[ arabic ] = "No grid"; Text[ catalan ] = "No grid"; + Text[ thai ] = "No grid"; }; String STR_GRID_LINES_ONLY @@ -2159,13 +2234,14 @@ String STR_GRID_LINES_ONLY Text[ swedish ] = "Raster (bara linjer)"; Text[ polish ] = "Line grid"; Text[ portuguese_brazilian ] = "Line grid"; - Text[ japanese ] = "グリッド線 (行グリッド線のみ)"; - Text[ korean ] = "문자 수/열 수 외곽선(줄 만)"; + Text[ japanese ] = "罫線"; + Text[ korean ] = "그리드 (줄 만)"; Text[ chinese_simplified ] = "格子线(仅线条)"; Text[ chinese_traditional ] = "格子線(僅線條)"; Text[ turkish ] = "Line grid"; Text[ arabic ] = "Line grid"; Text[ catalan ] = "Line grid"; + Text[ thai ] = "Line grid"; }; String STR_GRID_LINES_CHARS @@ -2185,12 +2261,18 @@ String STR_GRID_LINES_CHARS Text[ swedish ] = "Raster (linjer och tecken)"; Text[ polish ] = "Line and character grid"; Text[ portuguese_brazilian ] = "Line and character grid"; - Text[ japanese ] = "グリッド線 (行グリッド線と文字グリッド線)"; - Text[ korean ] = "문자 수/열 수 외곽선(줄과 문자)"; + Text[ japanese ] = "原稿用紙"; + Text[ korean ] = "그리드 (줄과 문자)"; Text[ chinese_simplified ] = "格子线(线条和字符)"; Text[ chinese_traditional ] = "格子線(線條和字元)"; Text[ turkish ] = "Line and character grid"; Text[ arabic ] = "Line and character grid"; Text[ catalan ] = "Line and character grid"; + Text[ thai ] = "Line and character grid"; }; + + + + + diff --git a/sw/source/ui/utlui/gloslst.src b/sw/source/ui/utlui/gloslst.src index 6adef660d2f1..5ff11217b67b 100644 --- a/sw/source/ui/utlui/gloslst.src +++ b/sw/source/ui/utlui/gloslst.src @@ -2,9 +2,9 @@ * * $RCSfile: gloslst.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:19:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,22 +85,23 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG Text [ swedish ] = "AutoText - grupp" ; Text [ danish ] = "AutoTekst - gruppe" ; Text [ italian ] = "Testo automatico - Gruppo" ; - Text [ spanish ] = "Grupo AutoTexto" ; + Text [ spanish ] = "Texto automtico - Grupo" ; Text [ french ] = "AutoTexte - Groupe" ; - Text [ dutch ] = "AutoTekst-groep" ; + Text [ dutch ] = "AutoTekst - groep" ; Text [ portuguese ] = "AutoTexto - Grupo" ; - Text[ chinese_simplified ] = "ԶͼļС"; + Text[ chinese_simplified ] = "自动图文集小组"; Text[ russian ] = " - "; Text[ polish ] = "Autotekst - Grupa"; - Text[ japanese ] = "͎x ٰ"; - Text[ chinese_traditional ] = "۰ʹϤ嶰s"; + Text[ japanese ] = "入力支援 グループ"; + Text[ chinese_traditional ] = "自動圖文集群組"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ڵؽƮ"; + Text[ korean ] = "자동 텍스트 그룹"; Text[ turkish ] = "Otomatik metin - Grup"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Grupo AutoTexto"; + Text[ catalan ] = "Grup AutoText"; Text[ finnish ] = "Automaattinen teksti - ryhm"; + Text[ thai ] = "ข้อความอัตโนมัติ - จัดกลุ่ม"; }; OKButton PB_OK { @@ -138,20 +139,21 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG Text [ italian ] = "Seleziona modulo di testo: " ; Text [ spanish ] = "Seleccionar mdulo de texto: " ; Text [ french ] = "Slection du module de texte : " ; - Text [ dutch ] = "Tekstbouwsteen selecteren: " ; + Text [ dutch ] = "Tekstbouwsteen selecteren:" ; Text [ portuguese ] = "Seleccionar mdulo de texto: " ; - Text[ chinese_simplified ] = "ѡԶͼļĿ "; + Text[ chinese_simplified ] = "选择自动图文集条目： "; Text[ russian ] = " : "; Text[ polish ] = "Zaznacz blok tekstu: "; - Text[ japanese ] = "÷ۯ̑I: "; - Text[ chinese_traditional ] = "ܦ۰ʹϤ嶰G "; + Text[ japanese ] = "テキストブロックの選択: "; + Text[ chinese_traditional ] = "選擇自動圖文集： "; Text[ arabic ] = " : "; Text[ greek ] = " : "; - Text[ korean ] = "ؽƮ : "; + Text[ korean ] = "자동 텍스트 선택: "; Text[ turkish ] = "Metin bileeni se: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Seleccionar mdulo de texto: "; + Text[ catalan ] = "Selecciona el mdulo de text: "; Text[ finnish ] = "Valitse automaattinen teksti: "; + Text[ thai ] = "เลือกข้อความอัตโนมัติ: "; }; @@ -159,3 +161,14 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG + + + + + + + + + + + diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src index 3b16202e69a1..fd9fa81535ea 100644 --- a/sw/source/ui/utlui/initui.src +++ b/sw/source/ui/utlui/initui.src @@ -2,9 +2,9 @@ * * $RCSfile: initui.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: os $ $Date: 2002-08-21 13:15:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,24 +77,25 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "Pagina" ; TEXT [ portuguese_brazilian ] = "P?gina" ; TEXT [ portuguese ] = "Pgina" ; - TEXT [ finnish ] = "Sivu " ; + TEXT [ finnish ] = "Sivu" ; TEXT [ danish ] = "Side" ; TEXT [ french ] = "Page" ; TEXT [ swedish ] = "Sida" ; TEXT [ dutch ] = "Pagina" ; TEXT [ spanish ] = "Pgina" ; TEXT [ english_us ] = "Page" ; - TEXT[ chinese_simplified ] = "ҳ"; + TEXT[ chinese_simplified ] = "页"; TEXT[ russian ] = ""; TEXT[ polish ] = "Strona"; - TEXT[ japanese ] = "߰"; - TEXT[ chinese_traditional ] = ""; + TEXT[ japanese ] = "ページ"; + TEXT[ chinese_traditional ] = "頁"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = ""; + TEXT[ korean ] = "페이지"; TEXT[ turkish ] = "Sayfa"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Pgina"; + TEXT[ catalan ] = "Pgina"; + TEXT[ thai ] = "หน้า"; }; String STR_POSTIT_LINE { @@ -109,18 +110,19 @@ Resource RID_SW_SHELLRES Text [ spanish ] = "Lnea" ; Text [ french ] = "Ligne" ; Text [ dutch ] = "Regel" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "行"; Text[ russian ] = ""; Text[ polish ] = "Wiersz"; - Text[ japanese ] = "s"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "行"; + Text[ chinese_traditional ] = "行"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "줄"; Text[ turkish ] = "Satr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lnea"; + Text[ catalan ] = "Lnia"; Text[ finnish ] = "Viiva"; + Text[ thai ] = "บรรทัด"; }; String STR_POSTIT_AUTHOR { @@ -130,24 +132,25 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "Autore" ; TEXT [ portuguese_brazilian ] = "Autor" ; TEXT [ portuguese ] = "Autor" ; - TEXT [ finnish ] = "Laatija" ; + TEXT [ finnish ] = "Tekij" ; TEXT [ danish ] = "Forfatter" ; TEXT [ french ] = "Auteur" ; TEXT [ swedish ] = "Frfattare" ; TEXT [ dutch ] = "Auteur" ; TEXT [ spanish ] = "Autor" ; TEXT [ english_us ] = "Author" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "作者"; TEXT[ russian ] = ""; TEXT[ polish ] = "Autor"; - TEXT[ japanese ] = "쐬"; - TEXT[ chinese_traditional ] = "@"; + TEXT[ japanese ] = "作成者"; + TEXT[ chinese_traditional ] = "作者"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "ۼ"; + TEXT[ korean ] = "작성자"; TEXT[ turkish ] = "Yazan"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Autor"; + TEXT[ thai ] = "ผู้เขียน"; }; String STR_CALC_SYNTAX { @@ -164,17 +167,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** Error de sintaxis **" ; TEXT [ english_us ] = "** Syntax Error **" ; TEXT = "** Syntax Fehler **" ; - TEXT[ chinese_simplified ] = "** **"; + TEXT[ chinese_simplified ] = "** 语法错误 **"; TEXT[ russian ] = "** **"; TEXT[ polish ] = "** Bd w skadni **"; - TEXT[ japanese ] = "**װ**"; - TEXT[ chinese_traditional ] = "** yk~ **"; + TEXT[ japanese ] = "**シンタックスエラー**"; + TEXT[ chinese_traditional ] = "** 語法錯誤 **"; TEXT[ arabic ] = "** **"; TEXT[ greek ] = "** **"; - TEXT[ korean ] = "** **"; + TEXT[ korean ] = "** 구문 오류 **"; TEXT[ turkish ] = "** Sz dizimi hatas **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Error de sintaxis **"; + TEXT[ catalan ] = "** Error de sintaxi **"; + TEXT[ thai ] = "** ไวยกรณ์ผิดพลาด **"; }; String STR_CALC_ZERODIV { @@ -191,17 +195,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** Dividir por cero **" ; TEXT [ english_us ] = "** Division by zero **" ; TEXT = "** Division durch Null **" ; - TEXT[ chinese_simplified ] = "** **"; + TEXT[ chinese_simplified ] = "** 除于零 **"; TEXT[ russian ] = "** **"; TEXT[ polish ] = "** Dzielenie przez zero **"; - TEXT[ japanese ] = "**ۂŊ**"; - TEXT[ chinese_traditional ] = "** _s **"; + TEXT[ japanese ] = "**ゼロで割る**"; + TEXT[ chinese_traditional ] = "** 除於零 **"; TEXT[ arabic ] = "** **"; TEXT[ greek ] = "** 0 **"; - TEXT[ korean ] = "** 0 **"; + TEXT[ korean ] = "** 0으로 나누기 **"; TEXT[ turkish ] = "** Sfr ile blme **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Dividir por cero **"; + TEXT[ catalan ] = "** Dividir per zero **"; + TEXT[ thai ] = "** หารด้วยศูนย์ **"; }; String STR_CALC_BRACK { @@ -218,17 +223,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** Error de parntesis **" ; TEXT [ english_us ] = "** Wrong use of brackets **" ; TEXT = "** Fehlerhafte Klammerung **" ; - TEXT[ chinese_simplified ] = "** **"; + TEXT[ chinese_simplified ] = "** 错误的括号 **"; TEXT[ russian ] = "** **"; TEXT[ polish ] = "** Nieprawidowo uyte nawiasy **"; - TEXT[ japanese ] = "**gp̂**"; - TEXT[ chinese_traditional ] = "** ~A **"; + TEXT[ japanese ] = "**誤使用のかっこ**"; + TEXT[ chinese_traditional ] = "** 錯誤的括號 **"; TEXT[ arabic ] = "** **"; TEXT[ greek ] = "** **"; - TEXT[ korean ] = "**߸ ȣ **"; + TEXT[ korean ] = "**잘못된 괄호 **"; TEXT[ turkish ] = "** Hatal ayra kullanm **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Error de parntesis **"; + TEXT[ catalan ] = "** Error de parntesi **"; + TEXT[ thai ] = "** ใช้วงเล็บก้ามปูผิด **"; }; String STR_CALC_POW { @@ -237,26 +243,27 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "** Overflow nella funzione quadrato **" ; TEXT [ portuguese_brazilian ] = "** Transbordo de fun??o quadr?tica **" ; TEXT [ portuguese ] = "** Transbordo da funo quadrtica **" ; - TEXT [ finnish ] = "** Nelifunktion ylivuoto **" ; + TEXT [ finnish ] = "** Potenssifunktion ylivuoto **" ; TEXT [ danish ] = "** Overlb i kvadratfunktion **" ; TEXT [ french ] = "** Dpassement de capacit de la fonction carr**" ; TEXT [ swedish ] = "** Spill i kvadratfunktion **" ; - TEXT [ dutch ] = "** Overflow in kwadraatfunctie **" ; - TEXT [ spanish ] = "** Desbordamiento en funcin al cuadrado **" ; + TEXT [ dutch ] = "** Overloop in kwadraatfunctie **" ; + TEXT [ spanish ] = "** Desbordamiento en la funcin al cuadrado **" ; TEXT [ english_us ] = "** Square function overflow **" ; /* ### ACHTUNG: Neuer Text in Resource? ** berlauf in Quadratfunktion ** : ** berlauf in Quadratfunktion ** */ TEXT = "** berlauf in Quadratfunktion **" ; - TEXT[ chinese_simplified ] = "** ƽֵ **"; + TEXT[ chinese_simplified ] = "** 平方函数的溢值 **"; TEXT[ russian ] = "** **"; TEXT[ polish ] = "** Przepenienie w funkcji kwadratowej **"; - TEXT[ japanese ] = "**lp`@\\̵ް۰**"; - TEXT[ chinese_traditional ] = "** ڨƷ **"; + TEXT[ japanese ] = "**四角形機能のオーバーフロー**"; + TEXT[ chinese_traditional ] = "** 根函數溢值 **"; TEXT[ arabic ] = "** **"; TEXT[ greek ] = "** **"; - TEXT[ korean ] = "** Լ ÷ο **"; + TEXT[ korean ] = "**제곱 함수 오버플로우 **"; TEXT[ turkish ] = "** Kare fonksiyonu tamas **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Desbordamiento en funcin al cuadrado **"; + TEXT[ catalan ] = "** Desbordament en funci al quadrat **"; + TEXT[ thai ] = "** ฟังก์ชั่นสี่เหลี่ยมจัตุรัสล้น **"; }; String STR_CALC_VARNFND { @@ -273,17 +280,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** No se ha encontrado la variable **" ; TEXT [ english_us ] = "** Variable not found **" ; TEXT = "** Variable wurde nicht gefunden **" ; - TEXT[ chinese_simplified ] = "** ûҵ **"; + TEXT[ chinese_simplified ] = "** 没有找到变量 **"; TEXT[ russian ] = "** **"; TEXT[ polish ] = "** Zmiennej nie znaleziono **"; - TEXT[ japanese ] = "**ϐ܂**"; - TEXT[ chinese_traditional ] = "** Sܶq **"; + TEXT[ japanese ] = "**変数が見つかりません**"; + TEXT[ chinese_traditional ] = "** 沒有找到變量 **"; TEXT[ arabic ] = "** **"; TEXT[ greek ] = "** **"; - TEXT[ korean ] = "** ã ߽ϴ. **"; + TEXT[ korean ] = "** 변수를 찾지 못했습니다 **"; TEXT[ turkish ] = "** Deiken bulunamad **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** No se ha encontrado la variable **"; + TEXT[ catalan ] = "** No s'ha trobat la variable **"; + TEXT[ thai ] = "** ไม่พบตัวแปร **"; }; String STR_CALC_OVERFLOW { @@ -301,17 +309,18 @@ Resource RID_SW_SHELLRES TEXT [ english_us ] = "** Overflow **" ; /* ### ACHTUNG: Neuer Text in Resource? ** berlauf ** : ** berlauf ** */ TEXT = "** berlauf **" ; - TEXT[ chinese_simplified ] = "** ֵ **"; + TEXT[ chinese_simplified ] = "** 溢值 **"; TEXT[ russian ] = "** **"; TEXT[ polish ] = "** Przepenienie **"; - TEXT[ japanese ] = "**ް۰**"; + TEXT[ japanese ] = "**オーバーフロー**"; TEXT[ language_user1 ] = " "; - TEXT[ chinese_traditional ] = "** **"; + TEXT[ chinese_traditional ] = "** 溢值 **"; TEXT[ arabic ] = "** **"; TEXT[ greek ] = "** **"; - TEXT[ korean ] = "** ÷ο **"; + TEXT[ korean ] = "** 오버 플로우 **"; TEXT[ turkish ] = "** Tama **"; - TEXT[ catalan ] = "** Desbordamiento **"; + TEXT[ catalan ] = "** Sobreeximent **"; + TEXT[ thai ] = "** ล้น **"; }; String STR_CALC_WRONGTIME { @@ -320,25 +329,26 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "** Formato orario errato **" ; TEXT [ portuguese_brazilian ] = "** Formato de tempo errado**" ; TEXT [ portuguese ] = "** Formato de hora errado**" ; - TEXT [ finnish ] = "** Vr aikamuoto **" ; + TEXT [ finnish ] = "** Ajan muoto ei kelpaa **" ; TEXT [ danish ] = "** Forkert tidsformat **" ; TEXT [ french ] = "** Format d'heure erron **" ; TEXT [ swedish ] = "** Fel tidsformat **" ; - TEXT [ dutch ] = "** Foutief tijdformaat **" ; + TEXT [ dutch ] = "** Foutieve tijdnotatie **" ; TEXT [ spanish ] = "** Formato de hora errneo **" ; TEXT [ english_us ] = "** Wrong time format **" ; TEXT = "** Falsches Zeitformat **" ; - TEXT[ chinese_simplified ] = "** ʱʽ **"; + TEXT[ chinese_simplified ] = "** 错误的时间格式 **"; TEXT[ russian ] = "** **"; TEXT[ polish ] = "** Nieprawidowy format czasu **"; - TEXT[ japanese ] = "**ȂԂ̏**"; - TEXT[ chinese_traditional ] = "** ~ɶ榡 **"; + TEXT[ japanese ] = "**正しくない時間の書式**"; + TEXT[ chinese_traditional ] = "** 錯誤時間格式 **"; TEXT[ arabic ] = "** **"; TEXT[ greek ] = "** **"; - TEXT[ korean ] = "**߸ ð **"; + TEXT[ korean ] = "** 잘못된 시간 표기 형식 **"; TEXT[ turkish ] = "** Yanl zaman format **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Formato de hora errneo **"; + TEXT[ catalan ] = "** Format de temps erroni"; + TEXT[ thai ] = "** รูปแบบเวลาผิด **"; }; String STR_CALC_DEFAULT { @@ -355,17 +365,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** Error **" ; TEXT [ english_us ] = "** Error **" ; TEXT = "** Fehler **" ; - TEXT[ chinese_simplified ] = "** **"; + TEXT[ chinese_simplified ] = "**错误 **"; TEXT[ russian ] = "** **"; TEXT[ polish ] = "** Bd **"; - TEXT[ japanese ] = "**װ**"; - TEXT[ chinese_traditional ] = "**~ **"; + TEXT[ japanese ] = "**エラー**"; + TEXT[ chinese_traditional ] = "**錯誤 **"; TEXT[ arabic ] = "** **"; TEXT[ greek ] = "** **"; - TEXT[ korean ] = "** **"; + TEXT[ korean ] = "** 오류 **"; TEXT[ turkish ] = "** Hata **"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "** Error **"; + TEXT[ thai ] = "** ผิดพลาด **"; }; String STR_CALC_ERROR { @@ -382,17 +393,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "** Foutieve uitdrukking **" ; TEXT [ spanish ] = "** Expresin errnea **" ; TEXT [ english_us ] = "** Expression is faulty **" ; - TEXT[ chinese_simplified ] = "** ıʽ **"; + TEXT[ chinese_simplified ] = "** 错误的表达式 **"; TEXT[ russian ] = "** **"; TEXT[ polish ] = "** Nieprawidowe wyraenie **"; - TEXT[ japanese ] = "**װ\\**"; - TEXT[ chinese_traditional ] = "** ~F **"; + TEXT[ japanese ] = "**エラー表現**"; + TEXT[ chinese_traditional ] = "** 錯誤的表達式 **"; TEXT[ arabic ] = "** **"; TEXT[ greek ] = "** **"; - TEXT[ korean ] = "**Ʋ ǥ **"; + TEXT[ korean ] = "** 오류가 있는 식 **"; TEXT[ turkish ] = "** Yanl ifade **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Expresin errnea **"; + TEXT[ catalan ] = "** Expressi errnia **"; + TEXT[ thai ] = "** คำอธิบายผิด **"; }; String STR_GETREFFLD_UP { @@ -402,23 +414,24 @@ Resource RID_SW_SHELLRES Text [ english_us ] = "above" ; Text [ italian ] = "Sopra" ; Text [ spanish ] = "arriba" ; - Text [ french ] = "en haut" ; + Text [ french ] = "En haut" ; Text [ swedish ] = "ver" ; Text [ danish ] = "foroven" ; Text [ portuguese ] = "acima" ; Text [ portuguese_brazilian ] = "oben" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "上"; Text[ russian ] = ""; Text[ polish ] = "w grze"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "W"; + Text[ japanese ] = "上"; + Text[ chinese_traditional ] = "上"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "위"; Text[ turkish ] = "st"; Text[ language_user1 ] = " "; - Text[ catalan ] = "arriba"; + Text[ catalan ] = "a sobre"; Text[ finnish ] = "ylhll"; + Text[ thai ] = "ข้างบน"; }; String STR_GETREFFLD_DOWN { @@ -428,23 +441,24 @@ Resource RID_SW_SHELLRES Text [ english_us ] = "below" ; Text [ italian ] = "Sotto" ; Text [ spanish ] = "abajo" ; - Text [ french ] = "en bas" ; + Text [ french ] = "En bas" ; Text [ swedish ] = "under" ; Text [ danish ] = "forneden" ; Text [ portuguese ] = "abaixo" ; Text [ portuguese_brazilian ] = "unten" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "下"; Text[ russian ] = ""; Text[ polish ] = "w dole"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "U"; + Text[ japanese ] = "下"; + Text[ chinese_traditional ] = "下"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "Ʒ"; + Text[ korean ] = "아래"; Text[ turkish ] = "alt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "abajo"; + Text[ catalan ] = "sota"; Text[ finnish ] = "alhaalla"; + Text[ thai ] = "ข้างใต้"; }; String STR_ALLPAGE_HEADFOOT { @@ -459,18 +473,19 @@ Resource RID_SW_SHELLRES Text [ danish ] = "Alle" ; Text [ portuguese ] = "Todos" ; Text [ portuguese_brazilian ] = "Alle" ; - Text[ chinese_simplified ] = "ȫ"; + Text[ chinese_simplified ] = "全部"; Text[ russian ] = ""; Text[ polish ] = "Wszystkie"; - Text[ japanese ] = "ׂ"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "すべて"; + Text[ chinese_traditional ] = "全部"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "ü"; + Text[ korean ] = "모두"; Text[ turkish ] = "Tm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Todos"; + Text[ catalan ] = "Tot"; Text[ finnish ] = "Kaikki"; + Text[ thai ] = "ทั้งหมด"; }; String STR_TEMPLATE_NONE { @@ -478,25 +493,26 @@ Resource RID_SW_SHELLRES Text [ ENGLISH ] = "none" ; Text [ dutch ] = "geen" ; Text [ english_us ] = "None" ; - Text [ swedish ] = "ingen" ; + Text [ swedish ] = "Ingen" ; Text [ danish ] = "Ingen" ; Text [ italian ] = "Senza" ; Text [ spanish ] = "Ninguno" ; Text [ french ] = "Aucun(e)" ; Text [ portuguese_brazilian ] = "keine" ; Text [ portuguese ] = "Nenhum" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "无"; + Text[ russian ] = ""; Text[ polish ] = "brak"; - Text[ japanese ] = "Ȃ"; - Text[ chinese_traditional ] = "L"; + Text[ japanese ] = "なし"; + Text[ chinese_traditional ] = "無"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "없음"; Text[ turkish ] = "yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ninguno"; + Text[ catalan ] = "Cap"; Text[ finnish ] = "Ei mitn"; + Text[ thai ] = "ไม่มี"; }; String STR_FIELD_FIXED { @@ -513,17 +529,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "(vast)" ; TEXT [ spanish ] = "(fija)" ; TEXT [ english_us ] = "(fixed)" ; - TEXT[ chinese_simplified ] = "(̶)"; + TEXT[ chinese_simplified ] = "(固定)"; TEXT[ russian ] = "(.)"; TEXT[ polish ] = "(stay)"; - TEXT[ japanese ] = "(ύXs)"; - TEXT[ chinese_traditional ] = "(Tw)"; + TEXT[ japanese ] = "(変更不可)"; + TEXT[ chinese_traditional ] = "(固定)"; TEXT[ arabic ] = "()"; TEXT[ greek ] = "()"; - TEXT[ korean ] = "()"; + TEXT[ korean ] = "(고정)"; TEXT[ turkish ] = "(sabit)"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(fija)"; + TEXT[ catalan ] = "(fix)"; + TEXT[ thai ] = "(คงที่)"; }; String STR_TOI { @@ -533,24 +550,25 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "Indice analitico" ; TEXT [ portuguese_brazilian ] = "?ndice" ; TEXT [ portuguese ] = "ndice remissivo" ; - TEXT [ finnish ] = "Aakkostettu hakemisto" ; + TEXT [ finnish ] = "Aakkosellinen hakemisto" ; TEXT [ danish ] = "Stikordsregister" ; TEXT [ french ] = "Index lexical" ; TEXT [ swedish ] = "Sakregister" ; TEXT [ dutch ] = "Index" ; TEXT [ spanish ] = "ndice alfabtico" ; TEXT [ english_us ] = "Alphabetical Index" ; - TEXT[ chinese_simplified ] = ""; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "索引目录"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Skorowidz"; - TEXT[ japanese ] = ""; - TEXT[ chinese_traditional ] = "ޥؿ"; + TEXT[ japanese ] = "索引"; + TEXT[ chinese_traditional ] = "索引目錄"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "Ű "; + TEXT[ korean ] = "색인"; TEXT[ turkish ] = "Alfabetik dizin"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "ndice alfabtico"; + TEXT[ catalan ] = "ndex alfabtic"; + TEXT[ thai ] = "ดัชนีเรียงตามตัวอักษร"; }; String STR_TOU @@ -568,17 +586,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Gebruikersindex" ; TEXT [ spanish ] = "ndice del usuario" ; TEXT [ english_us ] = "User-Defined" ; - TEXT[ chinese_simplified ] = "ʹԶ"; + TEXT[ chinese_simplified ] = "使用者自定"; TEXT[ russian ] = " "; TEXT[ polish ] = "Ustawienia indywidualne"; - TEXT[ japanese ] = "հް`"; - TEXT[ chinese_traditional ] = "ϥΪ̦ۭq"; + TEXT[ japanese ] = "ユーザー定義"; + TEXT[ chinese_traditional ] = "使用者自訂"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = " "; + TEXT[ korean ] = "사용자 정의"; TEXT[ turkish ] = "Kullanc tanml"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "ndice del usuario"; + TEXT[ catalan ] = "Definit per l'usuari"; + TEXT[ thai ] = "ระบุผู้ใช้"; }; String STR_TOC @@ -596,17 +615,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Inhoudsopgave" ; TEXT [ spanish ] = "ndice de contenido" ; TEXT [ english_us ] = "Table of Contents" ; - TEXT[ chinese_simplified ] = "Ŀ¼"; + TEXT[ chinese_simplified ] = "内容目录"; TEXT[ language_user1 ] = " "; TEXT[ russian ] = ""; TEXT[ polish ] = "Spis treci"; - TEXT[ japanese ] = "ڎ"; - TEXT[ chinese_traditional ] = "eؿ"; + TEXT[ japanese ] = "目次"; + TEXT[ chinese_traditional ] = "內容目錄"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = ""; + TEXT[ korean ] = "목차"; TEXT[ turkish ] = "indekiler dizini"; - TEXT[ catalan ] = "ndice de contenido"; + TEXT[ catalan ] = "ndex de contingut"; + TEXT[ thai ] = "ตารางเนื้แหา"; }; String STR_TOX_AUTH @@ -615,7 +635,7 @@ Resource RID_SW_SHELLRES TEXT [ English ] = "Table of authorities" ; TEXT[ english_us ] = "Bibliography"; TEXT[ portuguese ] = "Bibliografia"; - TEXT[ russian ] = " "; + TEXT[ russian ] = ""; TEXT[ greek ] = ""; TEXT[ dutch ] = "Literatuurlijst"; TEXT[ french ] = "Bibliographie"; @@ -625,15 +645,16 @@ Resource RID_SW_SHELLRES TEXT[ swedish ] = "Litteraturfrteckning"; TEXT[ polish ] = "Bibliografia"; TEXT[ portuguese_brazilian ] = "Table of authorities"; - TEXT[ japanese ] = "Ql\\"; - TEXT[ korean ] = ""; - TEXT[ chinese_simplified ] = "Ŀ¼"; - TEXT[ chinese_traditional ] = "mؿ"; + TEXT[ japanese ] = "参考文献表"; + TEXT[ korean ] = "참고문헌"; + TEXT[ chinese_simplified ] = "文献目录"; + TEXT[ chinese_traditional ] = "文獻目錄"; TEXT[ arabic ] = " "; TEXT[ turkish ] = "Kaynaka dizini"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Bibliografa"; - TEXT[ finnish ] = "Bibliografia"; + TEXT[ catalan ] = "Bibliografia"; + TEXT[ finnish ] = "Lhdeluettelo"; + TEXT[ thai ] = "บรรณานุกรม"; }; String STR_TOX_TBL { @@ -651,15 +672,16 @@ Resource RID_SW_SHELLRES TEXT[ swedish ] = "Tabellfrteckning"; TEXT[ polish ] = "Spis tabel"; TEXT[ portuguese_brazilian ] = "Table of tables"; - TEXT[ japanese ] = "\\̍"; - TEXT[ korean ] = "ǥ "; - TEXT[ chinese_simplified ] = "Ŀ¼"; - TEXT[ chinese_traditional ] = "ؿ"; + TEXT[ japanese ] = "表の索引"; + TEXT[ korean ] = "표 색인"; + TEXT[ chinese_simplified ] = "表格目录"; + TEXT[ chinese_traditional ] = "表格目錄"; TEXT[ arabic ] = " "; TEXT[ turkish ] = "Tablo dizini"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "ndice de tablas"; - TEXT[ finnish ] = "Taulukkohakemisto"; + TEXT[ catalan ] = "ndex de taules"; + TEXT[ finnish ] = "Taulukkolettelo"; + TEXT[ thai ] = "ดัชนีตาราง"; }; String STR_TOX_OBJ { @@ -669,7 +691,7 @@ Resource RID_SW_SHELLRES TEXT[ portuguese ] = "ndice de objectos"; TEXT[ russian ] = " "; TEXT[ greek ] = " "; - TEXT[ dutch ] = "Objectenregister"; + TEXT[ dutch ] = "Objectregister"; TEXT[ french ] = "Index des objets"; TEXT[ spanish ] = "ndice de objetos"; TEXT[ italian ] = "Indice degli oggetti"; @@ -677,15 +699,16 @@ Resource RID_SW_SHELLRES TEXT[ swedish ] = "Objektfrteckning"; TEXT[ polish ] = "Spis obiektw"; TEXT[ portuguese_brazilian ] = "Table of objects"; - TEXT[ japanese ] = "ުĂ̍"; - TEXT[ korean ] = "ü "; - TEXT[ chinese_simplified ] = "Ŀ¼"; - TEXT[ chinese_traditional ] = "ؿ"; + TEXT[ japanese ] = "オブジェクトの索引"; + TEXT[ korean ] = "개체 색인"; + TEXT[ chinese_simplified ] = "对象目录"; + TEXT[ chinese_traditional ] = "物件目錄"; TEXT[ arabic ] = " "; TEXT[ turkish ] = "Nesne dizini"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "ndice de objetos"; + TEXT[ catalan ] = "Taula d'objectes"; TEXT[ finnish ] = "Objektiluettelo"; + TEXT[ thai ] = "ตารางวัตถุ"; }; String STR_TOX_ILL { @@ -693,7 +716,7 @@ Resource RID_SW_SHELLRES TEXT [ English ] = "Table of illustrations" ; TEXT[ english_us ] = "Illustration Index"; TEXT[ portuguese ] = "ndice de ilustraes"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ greek ] = " "; TEXT[ dutch ] = "Afbeeldingenregister"; TEXT[ french ] = "Index des illustrations"; @@ -703,15 +726,16 @@ Resource RID_SW_SHELLRES TEXT[ swedish ] = "Illustrationsfrteckning"; TEXT[ polish ] = "Spis ilustracji"; TEXT[ portuguese_brazilian ] = "Table of illustrations"; - TEXT[ japanese ] = "}̍"; - TEXT[ korean ] = "ȭ "; - TEXT[ chinese_simplified ] = "ͼĿ¼"; - TEXT[ chinese_traditional ] = "ϥؿ"; + TEXT[ japanese ] = "図の索引"; + TEXT[ korean ] = "삽화 색인"; + TEXT[ chinese_simplified ] = "插图目录"; + TEXT[ chinese_traditional ] = "插圖目錄"; TEXT[ arabic ] = " "; TEXT[ turkish ] = "Resim dizini"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "ndice de ilustraciones"; - TEXT[ finnish ] = "Kuvitushakemisto"; + TEXT[ catalan ] = "ndex d'il.lustracions"; + TEXT[ finnish ] = "Kuvitusluettelo"; + TEXT[ thai ] = "ดัชนีภาพประกอบ"; }; @@ -732,17 +756,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Titel" ; TEXT [ spanish ] = "Ttulo" ; TEXT [ english_us ] = "Title" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "标题"; TEXT[ russian ] = ""; TEXT[ polish ] = "Tytu"; - TEXT[ japanese ] = ""; - TEXT[ chinese_traditional ] = "D"; + TEXT[ japanese ] = "タイトル"; + TEXT[ chinese_traditional ] = "標題"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = ""; + TEXT[ korean ] = "제목"; TEXT[ turkish ] = "Balk"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Ttulo"; + TEXT[ catalan ] = "Ttol"; + TEXT[ thai ] = "ชื่อ"; }; String FLD_DOCINFO_THEMA { @@ -757,19 +782,20 @@ Resource RID_SW_SHELLRES TEXT [ french ] = "Sujet" ; TEXT [ swedish ] = "Tema" ; TEXT [ dutch ] = "Onderwerp" ; - TEXT [ spanish ] = "Tema" ; + TEXT [ spanish ] = "Asunto" ; TEXT [ english_us ] = "Subject" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "主题"; TEXT[ russian ] = ""; TEXT[ polish ] = "Temat"; - TEXT[ japanese ] = "ð"; - TEXT[ chinese_traditional ] = "DD"; + TEXT[ japanese ] = "テーマ"; + TEXT[ chinese_traditional ] = "主題"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = ""; + TEXT[ korean ] = "주제"; TEXT[ turkish ] = "Konu"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Tema"; + TEXT[ catalan ] = "Assumpte"; + TEXT[ thai ] = "ชื่อเรื่อง"; }; String FLD_DOCINFO_KEYS { @@ -787,21 +813,22 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Sleutelwoorden" ; TEXT [ spanish ] = "Palabras clave" ; TEXT [ english_us ] = "Keywords" ; - TEXT[ chinese_simplified ] = "ؼ"; + TEXT[ chinese_simplified ] = "关键字"; TEXT[ russian ] = " "; TEXT[ polish ] = "Sowa kluczowe"; - TEXT[ japanese ] = "ܰ"; - TEXT[ chinese_traditional ] = "r"; + TEXT[ japanese ] = "キーワード"; + TEXT[ chinese_traditional ] = "關鍵字"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "Ű "; + TEXT[ korean ] = "키워드"; TEXT[ turkish ] = "Anahtar szck"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Palabras clave"; + TEXT[ catalan ] = "Paraules clau"; + TEXT[ thai ] = "คำสำคัญ"; }; String FLD_DOCINFO_COMMENT { - TEXT = "Beschreibung" ; + TEXT = "Kommentar" ; TEXT [ English ] = "Description" ; TEXT [ norwegian ] = "Beskrivelse" ; TEXT [ italian ] = "Descrizione" ; @@ -813,18 +840,19 @@ Resource RID_SW_SHELLRES TEXT [ swedish ] = "Beskrivning" ; TEXT [ dutch ] = "Beschrijving" ; TEXT [ spanish ] = "Descripcin" ; - TEXT [ english_us ] = "Description" ; - TEXT[ chinese_simplified ] = "˵"; + TEXT [ english_us ] = "Comments" ; + TEXT[ chinese_simplified ] = "说明"; TEXT[ russian ] = ""; TEXT[ polish ] = "Opis"; - TEXT[ japanese ] = ""; - TEXT[ chinese_traditional ] = "yz"; + TEXT[ japanese ] = "コメント"; + TEXT[ chinese_traditional ] = "描述"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = ""; + TEXT[ korean ] = "설명"; TEXT[ turkish ] = "Tanm"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Descripcin"; + TEXT[ catalan ] = "Descripci"; + TEXT[ thai ] = "คำอธิบาย"; }; String FLD_DOCINFO_INFO1 { @@ -841,17 +869,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Info 0" ; TEXT [ spanish ] = "Info 0" ; TEXT [ english_us ] = "Info 0" ; - TEXT[ chinese_simplified ] = "Ϣ 0"; + TEXT[ chinese_simplified ] = "信息 0"; TEXT[ russian ] = " 0"; TEXT[ polish ] = "Informacja 0"; - TEXT[ japanese ] = " 0"; - TEXT[ chinese_traditional ] = "T 0"; + TEXT[ japanese ] = "情報 0"; + TEXT[ chinese_traditional ] = "資訊 0"; TEXT[ arabic ] = " 0"; TEXT[ greek ] = " 0"; - TEXT[ korean ] = " 0"; + TEXT[ korean ] = "정보 0"; TEXT[ turkish ] = "Bilgi 0"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Info 0"; + TEXT[ catalan ] = "Informaci 0"; + TEXT[ thai ] = "ข้อมูล 0"; }; String FLD_DOCINFO_INFO2 { @@ -868,17 +897,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Info 1" ; TEXT [ spanish ] = "Info 1" ; TEXT [ english_us ] = "Info 1" ; - TEXT[ chinese_simplified ] = "Ϣ 1"; + TEXT[ chinese_simplified ] = "信息 1"; TEXT[ russian ] = " 1"; TEXT[ polish ] = "Informacja 1"; - TEXT[ japanese ] = " 1"; - TEXT[ chinese_traditional ] = "T 1"; + TEXT[ japanese ] = "情報 1"; + TEXT[ chinese_traditional ] = "資訊 1"; TEXT[ arabic ] = " 1"; TEXT[ greek ] = " 1"; - TEXT[ korean ] = " 1"; + TEXT[ korean ] = "정보 1"; TEXT[ turkish ] = "Bilgi 1"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Info 1"; + TEXT[ catalan ] = "Informaci 1"; + TEXT[ thai ] = "ข้อมูล 1"; }; String FLD_DOCINFO_INFO3 { @@ -895,17 +925,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Info 2" ; TEXT [ spanish ] = "Info 2" ; TEXT [ english_us ] = "Info 2" ; - TEXT[ chinese_simplified ] = "Ϣ 2"; + TEXT[ chinese_simplified ] = "信息 2"; TEXT[ russian ] = " 2"; TEXT[ polish ] = "Informacja 2"; - TEXT[ japanese ] = " 2"; - TEXT[ chinese_traditional ] = "T 2"; + TEXT[ japanese ] = "情報 2"; + TEXT[ chinese_traditional ] = "資訊 2"; TEXT[ arabic ] = " 2"; TEXT[ greek ] = " 2"; - TEXT[ korean ] = " 2"; + TEXT[ korean ] = "정보 2"; TEXT[ turkish ] = "Bilgi 2"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Info 2"; + TEXT[ catalan ] = "Informaci 2"; + TEXT[ thai ] = "ข้อมูล 2"; }; String FLD_DOCINFO_INFO4 { @@ -922,17 +953,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Info 3" ; TEXT [ spanish ] = "Info 3" ; TEXT [ english_us ] = "Info 3" ; - TEXT[ chinese_simplified ] = "Ϣ 3"; + TEXT[ chinese_simplified ] = "信息 3"; TEXT[ russian ] = " 3"; TEXT[ polish ] = "Informacja 3"; - TEXT[ japanese ] = " 3"; - TEXT[ chinese_traditional ] = "T 3"; + TEXT[ japanese ] = "情報 3"; + TEXT[ chinese_traditional ] = "資訊 3"; TEXT[ arabic ] = " 3"; TEXT[ greek ] = " 3"; - TEXT[ korean ] = " 3"; + TEXT[ korean ] = "정보 3"; TEXT[ turkish ] = "Bilgi 3"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Info 3"; + TEXT[ catalan ] = "Informaci 3"; + TEXT[ thai ] = "ข้อมูล 3"; }; String FLD_DOCINFO_CREATE { @@ -949,17 +981,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Gemaakt" ; TEXT [ spanish ] = "Creacin" ; TEXT [ english_us ] = "Created" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "建立"; TEXT[ russian ] = ""; TEXT[ polish ] = "Utworzenie"; - TEXT[ japanese ] = "쐬"; - TEXT[ chinese_traditional ] = ""; + TEXT[ japanese ] = "作成"; + TEXT[ chinese_traditional ] = "產生"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = "ۼ"; + TEXT[ korean ] = "만들기"; TEXT[ turkish ] = "Oluturma"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Creacin"; + TEXT[ catalan ] = "Creat"; + TEXT[ thai ] = "สร้าง"; }; String FLD_DOCINFO_CHANGE { @@ -977,17 +1010,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Wijziging" ; TEXT [ spanish ] = "Modificacin" ; TEXT [ english_us ] = "Modified" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "更改"; TEXT[ russian ] = ""; TEXT[ polish ] = "Modyfikacja"; - TEXT[ japanese ] = "ύX"; - TEXT[ chinese_traditional ] = "ܧ"; + TEXT[ japanese ] = "変更"; + TEXT[ chinese_traditional ] = "變更"; TEXT[ arabic ] = ""; TEXT[ greek ] = ""; - TEXT[ korean ] = ""; + TEXT[ korean ] = "변경"; TEXT[ turkish ] = "Deitirme"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Modificacin"; + TEXT[ catalan ] = "Modificat"; + TEXT[ thai ] = "ดัดแปลงแก้ไข"; }; String FLD_DOCINFO_PRINT { @@ -1004,17 +1038,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Laatste afdruk" ; TEXT [ spanish ] = "ltima impresin" ; TEXT [ english_us ] = "Last printed" ; - TEXT[ chinese_simplified ] = "һδӡ"; + TEXT[ chinese_simplified ] = "上一次打印"; TEXT[ russian ] = " "; TEXT[ polish ] = "Ostatni wydruk"; - TEXT[ japanese ] = "Ö"; - TEXT[ chinese_traditional ] = "W@CL"; + TEXT[ japanese ] = "前回の印刷"; + TEXT[ chinese_traditional ] = "上一次列印"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = " μ"; + TEXT[ korean ] = "최근 인쇄"; TEXT[ turkish ] = "Son yazdrma"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "ltima impresin"; + TEXT[ catalan ] = "ltima impressi"; + TEXT[ thai ] = "พิมพ์ครั้งสุดท้าย"; }; String FLD_DOCINFO_DOCNO { @@ -1029,18 +1064,19 @@ Resource RID_SW_SHELLRES Text [ danish ] = "Dokumentnummer" ; Text [ portuguese ] = "Nmero do documento" ; Text [ portuguese_brazilian ] = "Dokumentnummer" ; - Text[ chinese_simplified ] = "ĵ"; + Text[ chinese_simplified ] = "文档号码"; Text[ russian ] = " "; Text[ polish ] = "Numer dokumentu"; - Text[ japanese ] = "Ĕԍ"; - Text[ chinese_traditional ] = "X"; + Text[ japanese ] = "ドキュメント番号"; + Text[ chinese_traditional ] = "文件號碼"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ȣ"; + Text[ korean ] = "문서 번호"; Text[ turkish ] = "Belge numaras"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero del documento"; + Text[ catalan ] = "Nmero del document"; Text[ finnish ] = "Asiakirjan numero"; + Text[ thai ] = "เลขเอกสาร"; }; String FLD_DOCINFO_EDIT { @@ -1055,18 +1091,19 @@ Resource RID_SW_SHELLRES Text [ danish ] = "Redigeringstid" ; Text [ portuguese ] = "Tempo de edio" ; Text [ portuguese_brazilian ] = "Bearbeitungszeit" ; - Text[ chinese_simplified ] = "༭ʱ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "编辑时间"; + Text[ russian ] = " "; Text[ polish ] = "Czas edycji"; - Text[ japanese ] = "ҏW"; - Text[ chinese_traditional ] = "sɶ"; + Text[ japanese ] = "編集時刻"; + Text[ chinese_traditional ] = "編輯時間"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ð"; + Text[ korean ] = "편집 시간"; Text[ turkish ] = "Dzenleme sresi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tiempo de edicin"; + Text[ catalan ] = "Temps d'edici"; Text[ finnish ] = "Muokkausaika"; + Text[ thai ] = "แก้ไขเวลา"; }; BITMAP BMP_FRAME_ANCHOR { FILE = "anchor.bmp" ; }; BITMAP BMP_FRAME_DRAG_ANCHOR { FILE = "danchor.bmp" ; }; @@ -1083,19 +1120,20 @@ Resource RID_SW_SHELLRES Text[ french ] = "Conversion $(ARG1)"; Text[ spanish ] = "Convertir $(ARG1)"; Text[ italian ] = "Conversione $(ARG1)"; - Text[ danish ] = "Convert $(ARG1)"; + Text[ danish ] = "Konvertering $(ARG1)"; Text[ swedish ] = "Konvertera $(ARG1)"; Text[ polish ] = "Konwersja $(ARG1)"; Text[ portuguese_brazilian ] = "Convert $(ARG1)"; - Text[ japanese ] = "$(ARG1) ϊ"; - Text[ korean ] = "ȯ $(ARG1)"; - Text[ chinese_simplified ] = "ת $(ARG1)"; - Text[ chinese_traditional ] = "ഫ $(ARG1)"; + Text[ japanese ] = "$(ARG1) を変換"; + Text[ korean ] = "$(ARG1)을(를) 변환"; + Text[ chinese_simplified ] = "转换 $(ARG1)"; + Text[ chinese_traditional ] = "轉換 $(ARG1)"; Text[ turkish ] = "Convert $(ARG1)"; Text[ arabic ] = " $(ARG1)"; - Text[ language_user1 ] = "DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet."; - Text[ catalan ] = "Convertir $(ARG1)"; - Text[ finnish ] = "Konvert $(ARG1)"; + Text[ language_user1 ] = "DD (; DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet."; + Text[ catalan ] = "Converteix $(ARG1)"; + Text[ finnish ] = "Muunna $(ARG1)"; + Text[ thai ] = "แปลง $(ARG1)"; }; String STR_PAGEDESC_FIRSTNAME { @@ -1105,23 +1143,24 @@ Resource RID_SW_SHELLRES Text[ portuguese ] = "Primeira converso $(ARG1)"; Text[ russian ] = " $(ARG1)"; Text[ greek ] = " $(ARG1)"; - Text[ dutch ] = "Eerste convertering $(ARG1)"; + Text[ dutch ] = "Eerste conversie $(ARG1)"; Text[ french ] = "Premire conversion $(ARG1)"; - Text[ spanish ] = "Primer Convertir $(ARG1)"; + Text[ spanish ] = "Primera conversin $(ARG1)"; Text[ italian ] = "Prima conversione $(ARG1)"; - Text[ danish ] = "First convert $(ARG1)"; + Text[ danish ] = "Frste konvertering $(ARG1)"; Text[ swedish ] = "Frsta konvertering $(ARG1)"; Text[ polish ] = "Pierwsza konwersja $(ARG1)"; Text[ portuguese_brazilian ] = "First convert $(ARG1)"; - Text[ japanese ] = "ŏ $(ARG1) ϊ"; - Text[ korean ] = "ù° ȯ $(ARG1)"; - Text[ chinese_simplified ] = "һת $(ARG1)"; - Text[ chinese_traditional ] = "Ĥ@ഫ $(ARG1)"; + Text[ japanese ] = "最初に $(ARG1) を変換"; + Text[ korean ] = "첫번째 $(ARG1)을(를) 변환"; + Text[ chinese_simplified ] = "第一个转换 $(ARG1)"; + Text[ chinese_traditional ] = "第一個轉換 $(ARG1)"; Text[ turkish ] = "First convert $(ARG1)"; Text[ arabic ] = " $(ARG1)"; - Text[ language_user1 ] = "DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet. Mit $(ARG1) ist die Seitenzahl oder eine Folge von Seiten (z.B. 1-12) gemeint."; - Text[ catalan ] = "Primera conversin $(ARG1)"; - Text[ finnish ] = "Erste Konvert $(ARG1)"; + Text[ language_user1 ] = "DD (; DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet. Mit $(ARG1) ist die Seitenzahl oder eine Folge von Seiten (z.B. 1-12) gemeint."; + Text[ catalan ] = "Primera conversi $(ARG1)"; + Text[ finnish ] = "Muunna ensin $(ARG1)"; + Text[ thai ] = "แปลง $(ARG1) ครั้งแรก"; }; String STR_PAGEDESC_FOLLOWNAME { @@ -1129,25 +1168,26 @@ Resource RID_SW_SHELLRES Text [ ENGLISH ] = "Convert follow $(ARG1)" ; Text[ english_us ] = "Next convert $(ARG1)"; Text[ portuguese ] = "Converso seguinte $(ARG1)"; - Text[ russian ] = " $(ARG1)"; + Text[ russian ] = " $(ARG1)"; Text[ greek ] = " $(ARG1)"; - Text[ dutch ] = "Converteer volgende $(ARG1)"; + Text[ dutch ] = "Converteer volgorde $(ARG1)"; Text[ french ] = "Conversion suivante $(ARG1)"; - Text[ spanish ] = "Convertir, serie $(ARG1)"; + Text[ spanish ] = "Conversin siguiente $(ARG1)"; Text[ italian ] = "Conversione seguente $(ARG1)"; - Text[ danish ] = "Convert follow $(ARG1)"; + Text[ danish ] = "Konvertering Flge $(ARG1)"; Text[ swedish ] = "Konvertering fljande $(ARG1)"; Text[ polish ] = "Kolejno konwersji $(ARG1)"; Text[ portuguese_brazilian ] = "Convert follow $(ARG1)"; - Text[ japanese ] = " $(ARG1) ϊ"; - Text[ korean ] = "ȯ $(ARG1)"; - Text[ chinese_simplified ] = "ת $(ARG1)"; - Text[ chinese_traditional ] = "ഫ $(ARG1)"; + Text[ japanese ] = "次に $(ARG1) を変換"; + Text[ korean ] = "다음으로 $(ARG1)을(를) 변환"; + Text[ chinese_simplified ] = "转换组 $(ARG1)"; + Text[ chinese_traditional ] = "轉換組 $(ARG1)"; Text[ turkish ] = "Convert follow $(ARG1)"; Text[ arabic ] = " $(ARG1)"; - Text[ language_user1 ] = "DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet. Mit $(ARG1) ist die Seitenzahl oder eine Folge von Seiten (z.B. 1-12) gemeint."; - Text[ catalan ] = "Convertir serie $(ARG1)"; - Text[ finnish ] = "Konvert Folge $(ARG1)"; + Text[ language_user1 ] = "DD (; DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet. Mit $(ARG1) ist die Seitenzahl oder eine Folge von Seiten (z.B. 1-12) gemeint."; + Text[ catalan ] = "Converteix srie $(ARG1)"; + Text[ finnish ] = "Muunna seuraavaksi $(ARG1)"; + Text[ thai ] = "แปลง $(ARG1) ถัดไป"; }; }; @@ -1155,26 +1195,27 @@ String STR_AUTH_TYPE_ARTICLE { Text = "Artikel" ; Text [ English ] = "Article" ; - Text[ english_us ] = "Magazine Article"; - Text[ portuguese ] = "Artigo de revista"; - Text[ russian ] = " /"; + Text[ english_us ] = "Article"; + Text[ portuguese ] = "Artigo"; + Text[ russian ] = ""; Text[ greek ] = " "; - Text[ dutch ] = "Krantenartikel"; - Text[ french ] = "Article (revue)"; - Text[ spanish ] = "Artculo de revista"; + Text[ dutch ] = "Artikel"; + Text[ french ] = "Article"; + Text[ spanish ] = "Artculo"; Text[ finnish ] = "Lehtiartikkeli"; Text[ italian ] = "Articolo di rivista"; - Text[ danish ] = "Tidsskriftsartikel"; + Text[ danish ] = "Artikel"; Text[ swedish ] = "Artikel"; Text[ polish ] = "Artyku"; Text[ portuguese_brazilian ] = "Article"; - Text[ japanese ] = "L"; - Text[ korean ] = " "; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "峹"; + Text[ japanese ] = "記事"; + Text[ korean ] = "기사"; + Text[ chinese_simplified ] = "文章"; + Text[ chinese_traditional ] = "文章"; Text[ turkish ] = "Dergi makalesi"; Text[ arabic ] = " "; - Text[ catalan ] = "Artculo de revista"; + Text[ catalan ] = "Article de revista"; + Text[ thai ] = "บทความในนิตยสาร"; }; String STR_AUTH_TYPE_BOOK { @@ -1192,15 +1233,16 @@ String STR_AUTH_TYPE_BOOK Text[ swedish ] = "Bok"; Text[ polish ] = "Ksika"; Text[ portuguese_brazilian ] = "Book"; - Text[ japanese ] = "{"; - Text[ korean ] = "å"; - Text[ chinese_simplified ] = "鼮"; - Text[ chinese_traditional ] = "y"; + Text[ japanese ] = "本"; + Text[ korean ] = "책"; + Text[ chinese_simplified ] = "书籍"; + Text[ chinese_traditional ] = "書籍"; Text[ arabic ] = ""; Text[ turkish ] = "Kitap"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Libro"; + Text[ catalan ] = "Llibre"; Text[ finnish ] = "Kirja"; + Text[ thai ] = "หนังสือ"; }; String STR_AUTH_TYPE_BOOKLET { @@ -1218,15 +1260,16 @@ String STR_AUTH_TYPE_BOOKLET Text[ swedish ] = "Broschyr"; Text[ polish ] = "Broszura"; Text[ portuguese_brazilian ] = "Booklet"; - Text[ japanese ] = "q"; - Text[ korean ] = "÷"; - Text[ chinese_simplified ] = "С"; - Text[ chinese_traditional ] = "pU"; + Text[ japanese ] = "冊子"; + Text[ korean ] = "팜플렛"; + Text[ chinese_simplified ] = "小册子"; + Text[ chinese_traditional ] = "小手冊"; Text[ arabic ] = ""; Text[ turkish ] = "Bror"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Folleto"; + Text[ catalan ] = "Fullets"; Text[ finnish ] = "Esitteet"; + Text[ thai ] = "โบรชัวร์"; }; String STR_AUTH_TYPE_CONFERENCE { @@ -1236,23 +1279,24 @@ String STR_AUTH_TYPE_CONFERENCE Text[ portuguese ] = "Relatrio de conferncia"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Conferentierapport"; + Text[ dutch ] = "Notulen"; Text[ french ] = "Rapport de confrence"; - Text[ spanish ] = "Informe de conferencia"; + Text[ spanish ] = "Informe sobre la conferencia"; Text[ italian ] = "Rapporto sulla conferenza"; Text[ danish ] = "Konferencerapport"; Text[ swedish ] = "Konferensrapport"; Text[ polish ] = "Sprawozdanie z konferencji"; Text[ portuguese_brazilian ] = "Conference report"; - Text[ japanese ] = "c"; - Text[ korean ] = "ȸ "; - Text[ chinese_simplified ] = "ۻᱨ"; - Text[ chinese_traditional ] = "|ͳi"; + Text[ japanese ] = "会議報告"; + Text[ korean ] = "학회 보고서"; + Text[ chinese_simplified ] = "讨论会报告"; + Text[ chinese_traditional ] = "會談報告"; Text[ arabic ] = " "; Text[ turkish ] = "Toplant raporu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Informe de conferencia"; - Text[ finnish ] = "Konferenssimenettelyt"; + Text[ finnish ] = "Konferenssijulkaisut"; + Text[ thai ] = "ดำเนินการประชุม"; }; String STR_AUTH_TYPE_INBOOK { @@ -1262,23 +1306,24 @@ String STR_AUTH_TYPE_INBOOK Text[ portuguese ] = "Extracto de livro"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Boekuittreksel"; + Text[ dutch ] = "Uittreksel"; Text[ french ] = "Extrait de livre"; - Text[ spanish ] = "Extracto de libro"; + Text[ spanish ] = "Extracto del libro"; Text[ italian ] = "Brano"; Text[ danish ] = "Boguddrag"; Text[ swedish ] = "Bokutdrag"; Text[ polish ] = "Wycig z ksiki"; Text[ portuguese_brazilian ] = "Book extract"; - Text[ japanese ] = "{"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "鼮ժ¼"; - Text[ chinese_traditional ] = "y峹Kn"; + Text[ japanese ] = "本の抜粋"; + Text[ korean ] = "발췌"; + Text[ chinese_simplified ] = "书籍摘录文"; + Text[ chinese_traditional ] = "書籍文章摘要"; Text[ arabic ] = " "; Text[ turkish ] = "Kitap blm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Extracto de libro"; + Text[ catalan ] = "Extracte del llibre"; Text[ finnish ] = "Kirjan otos"; + Text[ thai ] = "คัดลอกมาจากหนังสือ"; }; String STR_AUTH_TYPE_INCOLLECTION { @@ -1288,7 +1333,7 @@ String STR_AUTH_TYPE_INCOLLECTION Text[ portuguese ] = "Extracto do livro com ttulo"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Boekuittreksel met titel"; + Text[ dutch ] = "Uittreksel met titel"; Text[ french ] = "Extrait de livre avec titre"; Text[ spanish ] = "Extracto de libro con ttulo"; Text[ italian ] = "Brano con titolo"; @@ -1296,15 +1341,16 @@ String STR_AUTH_TYPE_INCOLLECTION Text[ swedish ] = "Bokutdrag med titel"; Text[ polish ] = "Wycig z ksiki z tytuem"; Text[ portuguese_brazilian ] = "Book extract with title"; - Text[ japanese ] = "ٕt̏{"; - Text[ korean ] = "å ( )"; - Text[ chinese_simplified ] = "ע鼮ժ¼"; - Text[ chinese_traditional ] = "tDy峹Kn"; + Text[ japanese ] = "本の抜粋（題付き）"; + Text[ korean ] = "발췌(제목 포함)"; + Text[ chinese_simplified ] = "注明标题的书籍摘录文"; + Text[ chinese_traditional ] = "含有標題的書籍文章摘要"; Text[ arabic ] = " "; Text[ turkish ] = "Balkl kitap blm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Extracto de libro con ttulo"; + Text[ catalan ] = "Extracte de llibre amb ttol"; Text[ finnish ] = "Kirjan otos ja otsikko"; + Text[ thai ] = "คัดลอกชื่อเรื่องมาจากหนังสือ"; }; String STR_AUTH_TYPE_INPROCEEDINGS { @@ -1314,49 +1360,51 @@ String STR_AUTH_TYPE_INPROCEEDINGS Text[ portuguese ] = "Relatrio sobre reunio"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Notulen van vergadering"; + Text[ dutch ] = "Notulen"; Text[ french ] = "Rapport de congrs"; - Text[ spanish ] = "Informe de reunin"; + Text[ spanish ] = "Informe sobre la conferencia"; Text[ italian ] = "Rapporto sulla conferenza"; Text[ danish ] = "Kongresberetning"; - Text[ swedish ] = "Konferensrapport"; + Text[ swedish ] = "Kongressrapport"; Text[ polish ] = "Sprawozdanie z obrady"; Text[ portuguese_brazilian ] = "Proceedings report"; - Text[ japanese ] = ""; - Text[ korean ] = "ȸ "; - Text[ chinese_simplified ] = "鱨"; - Text[ chinese_traditional ] = "|iji"; + Text[ japanese ] = "会報"; + Text[ korean ] = "학회 보고서"; + Text[ chinese_simplified ] = "会议报告"; + Text[ chinese_traditional ] = "會議報告"; Text[ arabic ] = " "; Text[ turkish ] = "Konferans raporu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informe de reunin"; - Text[ finnish ] = "Konferenssimenettelyt"; + Text[ catalan ] = "Informe de reuni"; + Text[ finnish ] = "Konferenssijulkaisut"; + Text[ thai ] = "ดำเนินการประชุม"; }; String STR_AUTH_TYPE_JOURNAL { Text = "Zeitschrift" ; Text [ ENGLISH ] = "Journal" ; - Text[ english_us ] = "Magazine"; + Text[ english_us ] = "Journal"; Text[ portuguese ] = "Revista"; Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Tijdschrift"; - Text[ french ] = "Revue"; + Text[ french ] = "Magazine"; Text[ spanish ] = "Revista"; Text[ italian ] = "Rivista"; Text[ danish ] = "Tidsskrift"; Text[ swedish ] = "Tidskrift"; Text[ polish ] = "Czasopismo"; Text[ portuguese_brazilian ] = "Journal"; - Text[ japanese ] = "G"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "־"; - Text[ chinese_traditional ] = "x"; + Text[ japanese ] = "雑誌"; + Text[ korean ] = "잡지"; + Text[ chinese_simplified ] = "杂志"; + Text[ chinese_traditional ] = "雜誌"; Text[ arabic ] = ""; Text[ turkish ] = "Dergi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Revista"; - Text[ finnish ] = "Lehti"; + Text[ finnish ] = "Pivkirja"; + Text[ thai ] = "นิตยสาร"; }; String STR_AUTH_TYPE_MANUAL { @@ -1368,21 +1416,22 @@ String STR_AUTH_TYPE_MANUAL Text[ greek ] = " "; Text[ dutch ] = "Technische documentatie"; Text[ french ] = "Documentation technique"; - Text[ spanish ] = "Manual"; + Text[ spanish ] = "Documentacin tcnica"; Text[ italian ] = "Documentazione tecnica"; Text[ danish ] = "Teknisk dokumentation"; Text[ swedish ] = "Teknisk dokumentation"; Text[ polish ] = "Dokumentacja techn."; Text[ portuguese_brazilian ] = "Manual"; - Text[ japanese ] = "ƭ"; - Text[ korean ] = " "; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "Nm"; + Text[ japanese ] = "マニュアル"; + Text[ korean ] = "기술 문서"; + Text[ chinese_simplified ] = "技术说明书"; + Text[ chinese_traditional ] = "技術說明書"; Text[ arabic ] = " "; Text[ turkish ] = "Teknik dokmantasyon"; Text[ language_user1 ] = " "; Text[ catalan ] = "Manual"; Text[ finnish ] = "Tekninen asiakirja"; + Text[ thai ] = "เอกสารทางเทคนิค"; }; String STR_AUTH_TYPE_MASTERSTHESIS { @@ -1394,21 +1443,22 @@ String STR_AUTH_TYPE_MASTERSTHESIS Text[ greek ] = " "; Text[ dutch ] = "Scriptie"; Text[ french ] = "Mmoire"; - Text[ spanish ] = "Diplomatura"; + Text[ spanish ] = "Tesina"; Text[ italian ] = "Tesi di laurea"; Text[ danish ] = "Eksamensopgave"; Text[ swedish ] = "Examensarbete"; Text[ polish ] = "Praca dyplomowa"; Text[ portuguese_brazilian ] = "Masters thesis"; - Text[ japanese ] = "Ƙ_"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "ѧҵ"; - Text[ chinese_traditional ] = "zujDz~פ"; + Text[ japanese ] = "卒業論文"; + Text[ korean ] = "학위 논문"; + Text[ chinese_simplified ] = "大学毕业论文"; + Text[ chinese_traditional ] = "理工科大學畢業論文"; Text[ arabic ] = " "; Text[ turkish ] = "Tez"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Diplomatura"; + Text[ catalan ] = "Tesi"; Text[ finnish ] = "Tutkielma"; + Text[ thai ] = "วิทยานิพนธ์"; }; String STR_AUTH_TYPE_MISC { @@ -1426,15 +1476,16 @@ String STR_AUTH_TYPE_MISC Text[ swedish ] = "Diverse"; Text[ polish ] = "Rne"; Text[ portuguese_brazilian ] = "Miscellaneous"; - Text[ japanese ] = "l"; - Text[ korean ] = " "; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "L"; + Text[ japanese ] = "その他"; + Text[ korean ] = "기타"; + Text[ chinese_simplified ] = "其它"; + Text[ chinese_traditional ] = "其他"; Text[ arabic ] = ""; Text[ turkish ] = "Muhtelif"; Text[ language_user1 ] = " "; Text[ catalan ] = "Diversos"; Text[ finnish ] = "Sekalaiset"; + Text[ thai ] = "เบ็ดเตล็ด"; }; String STR_AUTH_TYPE_PHDTHESIS { @@ -1452,15 +1503,16 @@ String STR_AUTH_TYPE_PHDTHESIS Text[ swedish ] = "Doktorsavhandling"; Text[ polish ] = "Praca doktorska"; Text[ portuguese_brazilian ] = "PhD thesis"; - Text[ japanese ] = "m_"; - Text[ korean ] = "ڻ "; - Text[ chinese_simplified ] = "ʿ"; - Text[ chinese_traditional ] = "դhפ"; + Text[ japanese ] = "博士論文"; + Text[ korean ] = "박사 학위 논문"; + Text[ chinese_simplified ] = "博士论文"; + Text[ chinese_traditional ] = "博士論文"; Text[ arabic ] = " "; Text[ turkish ] = "Doktora almas"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tesis doctoral"; + Text[ catalan ] = "Tesi doctoral"; Text[ finnish ] = "Vitskirja"; + Text[ thai ] = "สารนิพนธ์"; }; String STR_AUTH_TYPE_PROCEEDINGS { @@ -1472,21 +1524,22 @@ String STR_AUTH_TYPE_PROCEEDINGS Text[ greek ] = " "; Text[ dutch ] = "Notulen"; Text[ french ] = "Rapport de congrs"; - Text[ spanish ] = "Informe de reunin"; + Text[ spanish ] = "Informe sobre la conferencia"; Text[ italian ] = "Rapporto sulla conferenza"; Text[ danish ] = "Kongresberetning"; - Text[ swedish ] = "Konferensrapport"; + Text[ swedish ] = "Kongressrapport"; Text[ polish ] = "Sprawozdanie z obrady"; Text[ portuguese_brazilian ] = "Proceedings"; - Text[ japanese ] = ""; - Text[ korean ] = "ȸ "; - Text[ chinese_simplified ] = "鱨"; - Text[ chinese_traditional ] = "|iji"; + Text[ japanese ] = "会報"; + Text[ korean ] = "학회 보고서"; + Text[ chinese_simplified ] = "会议报告"; + Text[ chinese_traditional ] = "會議報告"; Text[ arabic ] = " "; Text[ turkish ] = "Konferans raporu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informe de reunin"; - Text[ finnish ] = "Konferenssimenettelyt"; + Text[ catalan ] = "Informe de reuni"; + Text[ finnish ] = "Konferenssijulkaisut"; + Text[ thai ] = "ดำเนินการประชุม"; }; String STR_AUTH_TYPE_TECHREPORT { @@ -1504,15 +1557,16 @@ String STR_AUTH_TYPE_TECHREPORT Text[ swedish ] = "Forskningsrapport"; Text[ polish ] = "Sprawozdanie naukowe"; Text[ portuguese_brazilian ] = "Technical report"; - Text[ japanese ] = ""; - Text[ korean ] = " "; - Text[ chinese_simplified ] = "б"; - Text[ chinese_traditional ] = "i"; + Text[ japanese ] = "研究報告"; + Text[ korean ] = "연구 보고서"; + Text[ chinese_simplified ] = "科研报告"; + Text[ chinese_traditional ] = "科研報告"; Text[ arabic ] = " "; Text[ turkish ] = "Aratrma raporu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informe de investigacin"; + Text[ catalan ] = "Informe de recerca"; Text[ finnish ] = "Tutkimusraportti"; + Text[ thai ] = "รายงานการวิจัย"; }; String STR_AUTH_TYPE_UNPUBLISHED { @@ -1520,7 +1574,7 @@ String STR_AUTH_TYPE_UNPUBLISHED Text [ ENGLISH ] = "Unpublished" ; Text[ english_us ] = "Unpublished"; Text[ portuguese ] = "Indito"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ greek ] = ""; Text[ dutch ] = "Niet gepubliceerd"; Text[ french ] = "Non publi"; @@ -1530,15 +1584,16 @@ String STR_AUTH_TYPE_UNPUBLISHED Text[ swedish ] = "Opublicerad"; Text[ polish ] = "Nieopublikowany"; Text[ portuguese_brazilian ] = "Unpublished"; - Text[ japanese ] = "\\"; - Text[ korean ] = "ǥ "; - Text[ chinese_simplified ] = "δ"; - Text[ chinese_traditional ] = "|o"; + Text[ japanese ] = "未発表"; + Text[ korean ] = "비공표"; + Text[ chinese_simplified ] = "尚未发表的"; + Text[ chinese_traditional ] = "尚未發表"; Text[ arabic ] = " "; Text[ turkish ] = "Yaymlanmam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Indito"; + Text[ catalan ] = "Sense publicar"; Text[ finnish ] = "Julkaisematon"; + Text[ thai ] = "ไม่จัดพิมพ์"; }; String STR_AUTH_TYPE_EMAIL { @@ -1546,25 +1601,26 @@ String STR_AUTH_TYPE_EMAIL Text [ ENGLISH ] = "eMail" ; Text[ english_us ] = "e-mail"; Text[ portuguese ] = "e-mail"; - Text[ russian ] = "."; + Text[ russian ] = ". "; Text[ greek ] = "e-Mail"; Text[ dutch ] = "e-mail"; Text[ french ] = "E-mail"; - Text[ spanish ] = "E-mail"; + Text[ spanish ] = "Correo-e"; Text[ italian ] = "eMail"; Text[ danish ] = "E-mail"; Text[ swedish ] = "e-post"; Text[ polish ] = "e-mail"; Text[ portuguese_brazilian ] = "eMail"; Text[ japanese ] = "E-mail"; - Text[ korean ] = "e-mail"; - Text[ chinese_simplified ] = "ʼ"; - Text[ chinese_traditional ] = "qll"; + Text[ korean ] = "전자 메일"; + Text[ chinese_simplified ] = "电子邮件"; + Text[ chinese_traditional ] = "電子郵件"; Text[ arabic ] = " "; Text[ turkish ] = "e-posta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "E-mail"; + Text[ catalan ] = "correu electrnic"; Text[ finnish ] = "shkposti"; + Text[ thai ] = "อีเมล์"; }; String STR_AUTH_TYPE_WWW { @@ -1572,9 +1628,9 @@ String STR_AUTH_TYPE_WWW Text [ ENGLISH ] = "WWW document" ; Text[ english_us ] = "WWW document"; Text[ portuguese ] = "Documento WWW"; - Text[ russian ] = " WWW"; + Text[ russian ] = "-"; Text[ greek ] = " WWW"; - Text[ dutch ] = "WWW document"; + Text[ dutch ] = "WWW-document"; Text[ french ] = "Document WWW"; Text[ spanish ] = "Documento WWW"; Text[ italian ] = "Documento Web"; @@ -1582,15 +1638,16 @@ String STR_AUTH_TYPE_WWW Text[ swedish ] = "WWW-dokument"; Text[ polish ] = "Dokument WWW"; Text[ portuguese_brazilian ] = "WWW document"; - Text[ japanese ] = "WWW"; - Text[ korean ] = "WWW "; - Text[ chinese_simplified ] = "WWW ĵ"; - Text[ chinese_traditional ] = "WWW "; + Text[ japanese ] = "WWWドキュメント"; + Text[ korean ] = "웹 문서"; + Text[ chinese_simplified ] = "网页文档"; + Text[ chinese_traditional ] = "網頁文件"; Text[ arabic ] = " "; Text[ turkish ] = "WWW belgesi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Documento WWW"; + Text[ catalan ] = "Document WWW"; Text[ finnish ] = "Web-asiakirja"; + Text[ thai ] = "เอกสาร WWW "; }; String STR_AUTH_TYPE_CUSTOM1 { @@ -1601,22 +1658,23 @@ String STR_AUTH_TYPE_CUSTOM1 Text[ russian ] = " 1"; Text[ greek ] = " 1"; Text[ dutch ] = "Gebruikerstype1"; - Text[ french ] = "Type d'utilisateur1"; + Text[ french ] = "Utilisateur1"; Text[ spanish ] = "Usuario1"; - Text[ italian ] = "Tipo1"; + Text[ italian ] = "Utente1"; Text[ danish ] = "Brugerdefineret type1"; Text[ swedish ] = "Anvndartyp1"; Text[ polish ] = "Uytkownik1"; Text[ portuguese_brazilian ] = "Custom1"; - Text[ japanese ] = "հް 1"; - Text[ korean ] = " Ÿ1"; - Text[ chinese_simplified ] = "û1"; - Text[ chinese_traditional ] = "ۭq 1"; + Text[ japanese ] = "ユーザータイプ 1"; + Text[ korean ] = "사용자 정의1"; + Text[ chinese_simplified ] = "使用者类型1"; + Text[ chinese_traditional ] = "自訂類型 1"; Text[ arabic ] = " 1"; Text[ turkish ] = "Kullanc tipi1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario1"; + Text[ catalan ] = "Definit per l'usuari 1"; Text[ finnish ] = "Kyttjn mrittm1"; + Text[ thai ] = "ระบุผู้ใช้1"; }; String STR_AUTH_TYPE_CUSTOM2 { @@ -1627,22 +1685,23 @@ String STR_AUTH_TYPE_CUSTOM2 Text[ russian ] = " 2"; Text[ greek ] = " 2"; Text[ dutch ] = "Gebruikerstype2"; - Text[ french ] = "Type d'utilisateur2"; + Text[ french ] = "Utilisateur2"; Text[ spanish ] = "Usuario2"; - Text[ italian ] = "Tipo2"; + Text[ italian ] = "Utente2"; Text[ danish ] = "Brugerdefineret type2"; Text[ swedish ] = "Anvndartyp2"; Text[ polish ] = "Uytkownik2"; Text[ portuguese_brazilian ] = "Custom2"; - Text[ japanese ] = "հް2"; - Text[ korean ] = " Ÿ2"; - Text[ chinese_simplified ] = "û2"; - Text[ chinese_traditional ] = "ۭq 2"; + Text[ japanese ] = "ユーザータイプ 2"; + Text[ korean ] = "사용자 정의2"; + Text[ chinese_simplified ] = "使用者类型2"; + Text[ chinese_traditional ] = "自訂類型 2"; Text[ arabic ] = " 2"; Text[ turkish ] = "Kullanc tipi2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario2"; + Text[ catalan ] = "Definit per l'usuari 2"; Text[ finnish ] = "Kyttjn mrittm2"; + Text[ thai ] = "ระบุผู้ใช้2"; }; String STR_AUTH_TYPE_CUSTOM3 { @@ -1653,22 +1712,23 @@ String STR_AUTH_TYPE_CUSTOM3 Text[ russian ] = " 3"; Text[ greek ] = " 3"; Text[ dutch ] = "Gebruikerstype3"; - Text[ french ] = "Type d'utilisateur3"; + Text[ french ] = "Utilisateur3"; Text[ spanish ] = "Usuario3"; - Text[ italian ] = "Tipo3"; + Text[ italian ] = "Utente3"; Text[ danish ] = "Brugerdefineret type3"; Text[ swedish ] = "Anvndartyp3"; Text[ polish ] = "Uytkownik3"; Text[ portuguese_brazilian ] = "Custom3"; - Text[ japanese ] = "հް3"; - Text[ korean ] = " Ÿ3"; - Text[ chinese_simplified ] = "û3"; - Text[ chinese_traditional ] = "ۭq 3"; + Text[ japanese ] = "ユーザータイプ 3"; + Text[ korean ] = "사용자 정의3"; + Text[ chinese_simplified ] = "使用者类型3"; + Text[ chinese_traditional ] = "自訂類型 3"; Text[ arabic ] = " 3"; Text[ turkish ] = "Kullanc tipi3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario3"; + Text[ catalan ] = "Definit per l'usuari 3"; Text[ finnish ] = "Kyttjn mrittm3"; + Text[ thai ] = "ระบุผู้ใช้3"; }; String STR_AUTH_TYPE_CUSTOM4 { @@ -1679,22 +1739,23 @@ String STR_AUTH_TYPE_CUSTOM4 Text[ russian ] = " 4"; Text[ greek ] = " 4"; Text[ dutch ] = "Gebruikerstype4"; - Text[ french ] = "Type d'utilisateur4"; + Text[ french ] = "Utilisateur4"; Text[ spanish ] = "Usuario4"; - Text[ italian ] = "Tipo4"; + Text[ italian ] = "Utente4"; Text[ danish ] = "Brugerdefineret type4"; Text[ swedish ] = "Anvndartyp4"; Text[ polish ] = "Uytkownik4"; Text[ portuguese_brazilian ] = "Custom4"; - Text[ japanese ] = "հް4"; - Text[ korean ] = " Ÿ4"; - Text[ chinese_simplified ] = "û4"; - Text[ chinese_traditional ] = "ۭq 4"; + Text[ japanese ] = "ユーザータイプ 4"; + Text[ korean ] = "사용자 정의4"; + Text[ chinese_simplified ] = "使用者类型4"; + Text[ chinese_traditional ] = "自訂類型 4"; Text[ arabic ] = " 4"; Text[ turkish ] = "Kullanc tipi4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario4"; + Text[ catalan ] = "Definit per l'usuari 4"; Text[ finnish ] = "Kyttjn mrittm4"; + Text[ thai ] = "ระบุผู้ใช้4"; }; String STR_AUTH_TYPE_CUSTOM5 { @@ -1705,22 +1766,23 @@ String STR_AUTH_TYPE_CUSTOM5 Text[ russian ] = " 5"; Text[ greek ] = " 5"; Text[ dutch ] = "Gebruikerstype5"; - Text[ french ] = "Type d'utilisateur5"; + Text[ french ] = "Utilisateur5"; Text[ spanish ] = "Usuario5"; - Text[ italian ] = "Tipo5"; + Text[ italian ] = "Utente5"; Text[ danish ] = "Brugerdefineret type5"; Text[ swedish ] = "Anvndartyp5"; Text[ polish ] = "Uytkownik5"; Text[ portuguese_brazilian ] = "Custom5"; - Text[ japanese ] = "հް5"; - Text[ korean ] = " Ÿ5"; - Text[ chinese_simplified ] = "û5"; - Text[ chinese_traditional ] = "ۭq 5"; + Text[ japanese ] = "ユーザータイプ 5"; + Text[ korean ] = "사용자 정의5"; + Text[ chinese_simplified ] = "使用者类型5"; + Text[ chinese_traditional ] = "自訂類型 5"; Text[ arabic ] = " 5"; Text[ turkish ] = "Kullanc tipi5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario5"; + Text[ catalan ] = "Definit per l'usuari 5"; Text[ finnish ] = "Kyttjn mrittm5"; + Text[ thai ] = "ระบุผู้ใช้5"; }; String STR_AUTH_FIELD_IDENTIFIER @@ -1732,21 +1794,22 @@ String STR_AUTH_FIELD_IDENTIFIER Text[ russian ] = ""; Text[ greek ] = "~"; Text[ dutch ] = "~Beknopte aanduiding"; - Text[ french ] = "~Abrg"; + Text[ french ] = "Abrg"; Text[ spanish ] = "~Abreviatura"; Text[ italian ] = "Abbreviazione"; Text[ danish ] = "Kort betegnelse"; - Text[ swedish ] = "~Kort beteckning"; + Text[ swedish ] = "Kort beteckning"; Text[ polish ] = "Skrt"; Text[ portuguese_brazilian ] = "Identifier"; - Text[ japanese ] = ""; - Text[ korean ] = "ª ̸"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "²uyz"; + Text[ japanese ] = "略称"; + Text[ korean ] = "약칭"; + Text[ chinese_simplified ] = "简短说明文"; + Text[ chinese_traditional ] = "簡短描述文"; Text[ arabic ] = " "; Text[ turkish ] = "~Ksa ad"; - Text[ catalan ] = "~Abreviatura"; + Text[ catalan ] = "Nom curt"; Text[ finnish ] = "Lyhyt nimi"; + Text[ thai ] = "ชื่อย่อ"; }; String STR_AUTH_FIELD_AUTHORITY_TYPE { @@ -1757,72 +1820,75 @@ String STR_AUTH_FIELD_AUTHORITY_TYPE Text[ russian ] = ""; Text[ greek ] = "~"; Text[ dutch ] = "~Type"; - Text[ french ] = "~Type"; + Text[ french ] = "Type"; Text[ spanish ] = "~Tipo"; Text[ italian ] = "~Tipo"; Text[ danish ] = "Type"; Text[ swedish ] = "Typ"; Text[ polish ] = "Typ"; Text[ portuguese_brazilian ] = "Type"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "タイプ"; + Text[ korean ] = "유형"; + Text[ chinese_simplified ] = "类型"; + Text[ chinese_traditional ] = "類型"; Text[ arabic ] = ""; Text[ turkish ] = "~Tip"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo"; + Text[ catalan ] = "Tipus"; Text[ finnish ] = "Tyyppi"; + Text[ thai ] = "ชนิด"; }; String STR_AUTH_FIELD_ADDRESS { Text = "Adresse"; Text [ENGLISH] = "Address"; - Text[ english_us ] = "Publisher address"; - Text[ portuguese ] = "~Endereo da editora"; - Text[ russian ] = " "; + Text[ english_us ] = "Address"; + Text[ portuguese ] = "Endereo"; + Text[ russian ] = ""; Text[ greek ] = " "; - Text[ dutch ] = "~Adres uitgeverij"; - Text[ french ] = "Adresse de l'dition"; - Text[ spanish ] = "~Direccin editorial"; - Text[ finnish ] = "Julkaisijan osoite"; - Text[ italian ] = "Indirizzo editore"; - Text[ danish ] = "Forlagsadresse"; + Text[ dutch ] = "Adres"; + Text[ french ] = "Adresse"; + Text[ spanish ] = "Direccin"; + Text[ finnish ] = "Osoite"; + Text[ italian ] = "Indirizzo"; + Text[ danish ] = "Adresse"; Text[ swedish ] = "Adress"; Text[ polish ] = "Adres"; Text[ portuguese_brazilian ] = "Publisher address"; - Text[ japanese ] = "Z"; - Text[ korean ] = "ǻ ּ"; - Text[ chinese_simplified ] = "ַ"; - Text[ chinese_traditional ] = "a}"; + Text[ japanese ] = "住所"; + Text[ korean ] = "주소"; + Text[ chinese_simplified ] = "地址"; + Text[ chinese_traditional ] = "地址"; Text[ turkish ] = "~Yaynevi adresi"; Text[ arabic ] = " "; - Text[ catalan ] = "~Direccin editorial"; + Text[ catalan ] = "~Direcci editorial"; + Text[ thai ] = "ที่อยู่ผู้จัดพิมพ์"; }; String STR_AUTH_FIELD_ANNOTE { Text = "~Anmerkung" ; Text [ ENGLISH ] = "Annotation" ; - Text[ english_us ] = "Notes"; - Text[ portuguese ] = "A~notaes"; + Text[ english_us ] = "Ann~otation"; + Text[ portuguese ] = "Ob~servao"; Text[ russian ] = ""; Text[ greek ] = ""; - Text[ dutch ] = "~Commentaar"; - Text[ french ] = "~Commentaire"; - Text[ spanish ] = "~Notas"; - Text[ finnish ] = "Huomautukset"; - Text[ italian ] = "~Annotazione"; + Text[ dutch ] = "~Opmerkingen"; + Text[ french ] = "Annotation"; + Text[ spanish ] = "Observacin"; + Text[ finnish ] = "Huomautus"; + Text[ italian ] = "Annotazione"; Text[ danish ] = "Anmrkning"; Text[ swedish ] = "Anmrkning"; Text[ polish ] = "Adnotacja"; Text[ portuguese_brazilian ] = "Annotation"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "˵(~M)"; - Text[ chinese_traditional ] = "Ƶ(~M)"; + Text[ japanese ] = "注釈"; + Text[ korean ] = "주"; + Text[ chinese_simplified ] = "说明"; + Text[ chinese_traditional ] = "備註"; Text[ turkish ] = "~Not"; Text[ arabic ] = ""; - Text[ catalan ] = "~Notas"; + Text[ catalan ] = "Notes"; + Text[ thai ] = "บันทึกย่อ"; }; String STR_AUTH_FIELD_AUTHOR { @@ -1833,22 +1899,23 @@ String STR_AUTH_FIELD_AUTHOR Text[ russian ] = "()"; Text[ greek ] = "(-)"; Text[ dutch ] = "A~uteur(s)"; - Text[ french ] = "A~uteur(s)"; - Text[ spanish ] = "A~utor(es)"; + Text[ french ] = "Auteur(s)"; + Text[ spanish ] = "Autor(es)"; Text[ italian ] = "A~utore/i"; Text[ danish ] = "Forfatter(e)"; Text[ swedish ] = "Frfattare"; Text[ polish ] = "Autor(zy)"; Text[ portuguese_brazilian ] = "Author(s)"; - Text[ japanese ] = ""; - Text[ korean ] = "ۼ()"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "@"; + Text[ japanese ] = "著者"; + Text[ korean ] = "저자"; + Text[ chinese_simplified ] = "作者"; + Text[ chinese_traditional ] = "作者"; Text[ arabic ] = " ()"; Text[ turkish ] = "Ya~zan(lar)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~utor(es)"; - Text[ finnish ] = "Laatijat"; + Text[ catalan ] = "Autor(s)"; + Text[ finnish ] = "Tekij(t)"; + Text[ thai ] = "ผู้เขียน"; }; String STR_AUTH_FIELD_BOOKTITLE { @@ -1859,22 +1926,23 @@ String STR_AUTH_FIELD_BOOKTITLE Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Boe~ktitel"; - Text[ french ] = "Titre de ~livre"; + Text[ french ] = "Titre du livre"; Text[ spanish ] = "Ttulo del li~bro"; Text[ italian ] = "Titolo del libro"; Text[ danish ] = "Bogtitel"; Text[ swedish ] = "Boktitel"; Text[ polish ] = "Tytu ksiki"; Text[ portuguese_brazilian ] = "Book title"; - Text[ japanese ] = ""; - Text[ korean ] = "å "; - Text[ chinese_simplified ] = "鼮"; - Text[ chinese_traditional ] = "ѦW"; + Text[ japanese ] = "書名"; + Text[ korean ] = "책 제목"; + Text[ chinese_simplified ] = "书名"; + Text[ chinese_traditional ] = "書名"; Text[ arabic ] = " "; Text[ turkish ] = "Kitap ~ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ttulo del li~bro"; + Text[ catalan ] = "Ttol del lli~bre"; Text[ finnish ] = "Kirjan otsikko"; + Text[ thai ] = "ชื่อหนังสือ"; }; String STR_AUTH_FIELD_CHAPTER { @@ -1886,21 +1954,22 @@ String STR_AUTH_FIELD_CHAPTER Text[ greek ] = ""; Text[ dutch ] = "Hoo~fdstuk"; Text[ french ] = "~Chapitre"; - Text[ spanish ] = "Capt~ulo"; + Text[ spanish ] = "Captulo"; Text[ italian ] = "Ca~pitolo"; Text[ danish ] = "Kapitel"; Text[ swedish ] = "Kapitel"; Text[ polish ] = "Rozdzia"; Text[ portuguese_brazilian ] = "Chapter"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "`"; + Text[ japanese ] = "章"; + Text[ korean ] = "장"; + Text[ chinese_simplified ] = "章"; + Text[ chinese_traditional ] = "章節"; Text[ arabic ] = ""; Text[ turkish ] = "B~lm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Capt~ulo"; + Text[ catalan ] = "Capt~ol"; Text[ finnish ] = "Luku"; + Text[ thai ] = "บท"; }; String STR_AUTH_FIELD_EDITION { @@ -1910,23 +1979,24 @@ String STR_AUTH_FIELD_EDITION Text[ portuguese ] = "Ed~io"; Text[ russian ] = ""; Text[ greek ] = "~"; - Text[ dutch ] = "~Editie"; - Text[ french ] = "~dition"; - Text[ spanish ] = "Edi~cin"; + Text[ dutch ] = "Uitgav~e"; + Text[ french ] = "dition"; + Text[ spanish ] = "Edicin"; Text[ italian ] = "Edizione"; Text[ danish ] = "Udgave"; Text[ swedish ] = "Utgva"; Text[ polish ] = "Wydanie"; Text[ portuguese_brazilian ] = "Edition"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "汾"; - Text[ chinese_traditional ] = "X"; + Text[ japanese ] = "版"; + Text[ korean ] = "판"; + Text[ chinese_simplified ] = "版本"; + Text[ chinese_traditional ] = "出版"; Text[ arabic ] = ""; Text[ turkish ] = "Bas~m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Edi~cin"; + Text[ catalan ] = "Edi~ci"; Text[ finnish ] = "Laitos"; + Text[ thai ] = "ฉบับ"; }; String STR_AUTH_FIELD_EDITOR { @@ -1938,21 +2008,22 @@ String STR_AUTH_FIELD_EDITOR Text[ greek ] = "~"; Text[ dutch ] = "~Uitgever"; Text[ french ] = "diteur"; - Text[ spanish ] = "~Editor"; + Text[ spanish ] = "Editor"; Text[ italian ] = "Editore"; Text[ danish ] = "Udgiver"; Text[ swedish ] = "Utgivare"; Text[ polish ] = "Wydawca"; Text[ portuguese_brazilian ] = "Editor"; - Text[ japanese ] = "Ҏ"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "X"; + Text[ japanese ] = "編者"; + Text[ korean ] = "편집인"; + Text[ chinese_simplified ] = "出版者"; + Text[ chinese_traditional ] = "出版者"; Text[ arabic ] = ""; Text[ turkish ] = "Yaym~c"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Editor"; + Text[ catalan ] = "Editor"; Text[ finnish ] = "Muokkaaja"; + Text[ thai ] = "บรรณาธิการ"; }; String STR_AUTH_FIELD_HOWPUBLISHED { @@ -1963,22 +2034,23 @@ String STR_AUTH_FIELD_HOWPUBLISHED Text[ russian ] = " "; Text[ greek ] = "~ "; Text[ dutch ] = "Wijze van ~publiceren"; - Text[ french ] = "~Type de publication"; - Text[ spanish ] = "Tip~o de edicin"; + Text[ french ] = "Type de publication"; + Text[ spanish ] = "T~ipo de publicacin"; Text[ italian ] = "Tipo di edizione"; Text[ danish ] = "Udgivelsestype"; Text[ swedish ] = "Utgivningstyp"; Text[ polish ] = "Rodzaj edycji"; Text[ portuguese_brazilian ] = "How published"; - Text[ japanese ] = "ް"; - Text[ korean ] = " "; - Text[ chinese_simplified ] = "淽ʽ"; - Text[ chinese_traditional ] = "X"; + Text[ japanese ] = "カバータイプ"; + Text[ korean ] = "출판 유형"; + Text[ chinese_simplified ] = "发行方式"; + Text[ chinese_traditional ] = "出版類型"; Text[ arabic ] = " "; Text[ turkish ] = "Yaym ~tr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tip~o de edicin"; + Text[ catalan ] = "Tip~us d'edici"; Text[ finnish ] = "Julkaisutyyppi"; + Text[ thai ] = "ชนิดการจัดพิมพ์"; }; String STR_AUTH_FIELD_INSTITUTION { @@ -1986,51 +2058,53 @@ String STR_AUTH_FIELD_INSTITUTION Text [ ENGLISH ] = "Institution" ; Text[ english_us ] = "Institution"; Text[ portuguese ] = "~Instituio"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "~Instelling"; - Text[ french ] = "~Institution"; + Text[ french ] = "Institution"; Text[ spanish ] = "Institu~cin"; - Text[ italian ] = "~Istituzione"; + Text[ italian ] = "Istituzione"; Text[ danish ] = "Institution"; Text[ swedish ] = "Institution"; Text[ polish ] = "Instytucja"; Text[ portuguese_brazilian ] = "Institution"; - Text[ japanese ] = "@"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "c"; + Text[ japanese ] = "機関名"; + Text[ korean ] = "기관"; + Text[ chinese_simplified ] = "机构"; + Text[ chinese_traditional ] = "機構"; Text[ arabic ] = ""; Text[ turkish ] = "K~urum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Institu~cin"; + Text[ catalan ] = "Institu~ci"; Text[ finnish ] = "Instituutio"; + Text[ thai ] = "สถาบัน"; }; String STR_AUTH_FIELD_JOURNAL { Text = "~Zeitschrift" ; Text [ ENGLISH ] = "Journal" ; - Text[ english_us ] = "Magazine"; + Text[ english_us ] = "Journal"; Text[ portuguese ] = "~Revista"; Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "~Tijdschrift"; - Text[ french ] = "~Revue"; + Text[ french ] = "Magazine"; Text[ spanish ] = "~Revista"; Text[ italian ] = "Rivista"; Text[ danish ] = "Tidsskrift"; Text[ swedish ] = "Tidskrift"; Text[ polish ] = "Czasopismo"; Text[ portuguese_brazilian ] = "Journal"; - Text[ japanese ] = "G"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "־"; - Text[ chinese_traditional ] = "x"; + Text[ japanese ] = "雑誌"; + Text[ korean ] = "잡지"; + Text[ chinese_simplified ] = "杂志"; + Text[ chinese_traditional ] = "雜誌"; Text[ arabic ] = ""; Text[ turkish ] = "De~rgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Revista"; - Text[ finnish ] = "Lehti"; + Text[ catalan ] = "Revista"; + Text[ finnish ] = "Pivkirja"; + Text[ thai ] = "นิตยสาร"; }; String STR_AUTH_FIELD_MONTH { @@ -2041,22 +2115,23 @@ String STR_AUTH_FIELD_MONTH Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "~Maand"; - Text[ french ] = "~Mois"; + Text[ french ] = "Mois"; Text[ spanish ] = "~Mes"; Text[ italian ] = "~Mese"; Text[ danish ] = "Mned"; Text[ swedish ] = "Mnad"; Text[ polish ] = "Miesic"; Text[ portuguese_brazilian ] = "Month"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "月"; + Text[ korean ] = "월"; + Text[ chinese_simplified ] = "月"; + Text[ chinese_traditional ] = "月"; Text[ arabic ] = ""; Text[ turkish ] = "~Ay"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mes"; + Text[ catalan ] = "Mes"; Text[ finnish ] = "Kuukausi"; + Text[ thai ] = "เดือน"; }; String STR_AUTH_FIELD_NOTE { @@ -2066,23 +2141,24 @@ String STR_AUTH_FIELD_NOTE Text[ portuguese ] = "~Anotao"; Text[ russian ] = ""; Text[ greek ] = ""; - Text[ dutch ] = "~Notitie"; - Text[ french ] = "~Note"; - Text[ spanish ] = "~Nota"; + Text[ dutch ] = "Aa~ntekening"; + Text[ french ] = "Note"; + Text[ spanish ] = "Nota"; Text[ italian ] = "~Nota"; Text[ danish ] = "Note"; - Text[ swedish ] = "Not"; + Text[ swedish ] = "Anteckning"; Text[ polish ] = "Notatka"; Text[ portuguese_brazilian ] = "Note"; - Text[ japanese ] = "(~E)"; - Text[ korean ] = "(~E)"; - Text[ chinese_simplified ] = "ע(~E)"; - Text[ chinese_traditional ] = "Ƶ(~E)"; + Text[ japanese ] = "メモ(~E)"; + Text[ korean ] = "메모(~E)"; + Text[ chinese_simplified ] = "备注(~E)"; + Text[ chinese_traditional ] = "備註(~E)"; Text[ arabic ] = ""; Text[ turkish ] = "~Not"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nota"; - Text[ finnish ] = "Huomau~tus"; + Text[ catalan ] = "No~ta"; + Text[ finnish ] = "Kommentti"; + Text[ thai ] = "บันทึก~ย่อ"; }; String STR_AUTH_FIELD_NUMBER { @@ -2093,22 +2169,23 @@ String STR_AUTH_FIELD_NUMBER Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Numme~r"; - Text[ french ] = "N~umro"; - Text[ spanish ] = "N~mero"; + Text[ french ] = "Numro"; + Text[ spanish ] = "Nmero"; Text[ italian ] = "Nume~ro"; Text[ danish ] = "Nummer"; Text[ swedish ] = "Nummer"; Text[ polish ] = "Numer"; Text[ portuguese_brazilian ] = "Number"; - Text[ japanese ] = "ԍ"; - Text[ korean ] = "ȣ"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "s"; + Text[ japanese ] = "番号"; + Text[ korean ] = "번호"; + Text[ chinese_simplified ] = "编号"; + Text[ chinese_traditional ] = "編號"; Text[ arabic ] = ""; Text[ turkish ] = "Numa~ra"; Text[ language_user1 ] = " "; Text[ catalan ] = "N~mero"; - Text[ finnish ] = "Luku"; + Text[ finnish ] = "Numero"; + Text[ thai ] = "ตัวเลข"; }; String STR_AUTH_FIELD_ORGANIZATIONS { @@ -2126,67 +2203,70 @@ String STR_AUTH_FIELD_ORGANIZATIONS Text[ swedish ] = "Organisation"; Text[ polish ] = "Organizacja"; Text[ portuguese_brazilian ] = "Organization"; - Text[ japanese ] = "gDc"; - Text[ korean ] = "ⱸ"; - Text[ chinese_simplified ] = "֯"; - Text[ chinese_traditional ] = "c"; + Text[ japanese ] = "組織団体名"; + Text[ korean ] = "조직 단체"; + Text[ chinese_simplified ] = "组织"; + Text[ chinese_traditional ] = "機構"; Text[ arabic ] = ""; Text[ turkish ] = "~Organizasyon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Organizacin"; + Text[ catalan ] = "~Organitzaci"; Text[ finnish ] = "Organisaatio"; + Text[ thai ] = "องค์กร"; }; String STR_AUTH_FIELD_PAGES { Text = "Seite(n)" ; Text [ ENGLISH ] = "Pages" ; - Text[ english_us ] = "Pages"; + Text[ english_us ] = "Page(s)"; Text[ portuguese ] = "Pginas"; Text[ russian ] = " "; Text[ greek ] = ""; Text[ dutch ] = "Pagina's"; - Text[ french ] = "Pages"; - Text[ spanish ] = "Pginas"; - Text[ italian ] = "Pagine"; + Text[ french ] = "Page(s)"; + Text[ spanish ] = "Pgina(s)"; + Text[ italian ] = "Pagina/e"; Text[ danish ] = "Sider"; - Text[ swedish ] = "Sidor"; + Text[ swedish ] = "Sida/sidor"; Text[ polish ] = "Strony"; Text[ portuguese_brazilian ] = "Pages"; - Text[ japanese ] = "߰"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "ҳ"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "ページ"; + Text[ korean ] = "페이지"; + Text[ chinese_simplified ] = "页"; + Text[ chinese_traditional ] = "頁"; Text[ arabic ] = ""; Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pginas"; + Text[ catalan ] = "Pgines"; Text[ finnish ] = "Sivut"; + Text[ thai ] = "หน้า"; }; String STR_AUTH_FIELD_PUBLISHER { Text = "Ver~lag" ; Text [ ENGLISH ] = "Publisher" ; - Text[ english_us ] = "Publishers"; + Text[ english_us ] = "Publisher"; Text[ portuguese ] = "E~ditora"; Text[ russian ] = ""; Text[ greek ] = " "; Text[ dutch ] = "~Uitgeverij"; - Text[ french ] = "~dition"; - Text[ spanish ] = "~Editorial"; + Text[ french ] = "Maison d'dition"; + Text[ spanish ] = "Editorial"; Text[ italian ] = "Casa editrice"; Text[ danish ] = "Forlag"; Text[ swedish ] = "Frlag"; Text[ polish ] = "Wydawnictwo"; Text[ portuguese_brazilian ] = "Publisher"; - Text[ japanese ] = "oŎ"; - Text[ korean ] = "ǻ"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "X"; + Text[ japanese ] = "出版社"; + Text[ korean ] = "출판사"; + Text[ chinese_simplified ] = "出版社"; + Text[ chinese_traditional ] = "出版社"; Text[ arabic ] = " "; Text[ turkish ] = "Yaynev~i"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Editorial"; - Text[ finnish ] = "Julkaisijat"; + Text[ catalan ] = "Editors"; + Text[ finnish ] = "Julkaisija"; + Text[ thai ] = "ผู้จัดพิมพ์"; }; String STR_AUTH_FIELD_SCHOOL { @@ -2194,50 +2274,52 @@ String STR_AUTH_FIELD_SCHOOL Text [ ENGLISH ] = "University" ; Text[ english_us ] = "University"; Text[ portuguese ] = "Escola superior/Uni~versidade"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = "../..."; Text[ dutch ] = "Hogeschool/~Universiteit"; Text[ french ] = "cole suprieure/Universit"; - Text[ spanish ] = "Colegio/~Universidad"; + Text[ spanish ] = "~Universidad"; Text[ italian ] = "Universit"; Text[ danish ] = "Universitet/lreanstalt"; Text[ swedish ] = "Hgskola/universitet"; Text[ polish ] = "Szkoa wysza/Uniwersytet"; Text[ portuguese_brazilian ] = "University"; - Text[ japanese ] = "w"; - Text[ korean ] = ""; - Text[ chinese_simplified ] = "ѧ"; - Text[ chinese_traditional ] = "|"; + Text[ japanese ] = "大学"; + Text[ korean ] = "대학"; + Text[ chinese_simplified ] = "大学"; + Text[ chinese_traditional ] = "高等院校"; Text[ arabic ] = ""; Text[ turkish ] = "niversite"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Colegio/~Universidad"; + Text[ catalan ] = "Universitat"; Text[ finnish ] = "Yliopisto"; + Text[ thai ] = "มหาวิทยาลัย"; }; String STR_AUTH_FIELD_SERIES { Text = "Ser~ie"; Text[English]= "Series"; - Text[ english_us ] = "Series name"; - Text[ portuguese ] = "Nome da ~srie"; - Text[ russian ] = " "; + Text[ english_us ] = "Series"; + Text[ portuguese ] = "~Srie"; + Text[ russian ] = ""; Text[ greek ] = " "; - Text[ dutch ] = "Naam van de ~serie"; - Text[ french ] = "Nom de la srie"; - Text[ spanish ] = "No~mbre de la serie"; + Text[ dutch ] = "~Serie"; + Text[ french ] = "Srie"; + Text[ spanish ] = "Serie"; Text[ finnish ] = "Sarjan nimi"; - Text[ italian ] = "Nome ~della serie"; - Text[ danish ] = "Seriens navn"; - Text[ swedish ] = "Ser~ie"; + Text[ italian ] = "~Serie"; + Text[ danish ] = "Ser~ie"; + Text[ swedish ] = "Serie"; Text[ polish ] = "Seria"; Text[ portuguese_brazilian ] = "Series name"; - Text[ japanese ] = "p"; - Text[ korean ] = "ø ̸"; - Text[ chinese_simplified ] = "ϵ"; - Text[ chinese_traditional ] = "tC"; + Text[ japanese ] = "叢書"; + Text[ korean ] = "간행물"; + Text[ chinese_simplified ] = "系列"; + Text[ chinese_traditional ] = "系列"; Text[ turkish ] = "Seri ~ad"; Text[ arabic ] = " "; - Text[ catalan ] = "No~mbre de la serie"; + Text[ catalan ] = "No~m de la srie"; + Text[ thai ] = "ชื่อชุด"; }; String STR_AUTH_FIELD_TITLE { @@ -2249,31 +2331,32 @@ String STR_AUTH_FIELD_TITLE Text[ greek ] = ""; Text[ dutch ] = "Tit~el"; Text[ french ] = "Titre"; - Text[ spanish ] = "Tt~ulo"; + Text[ spanish ] = "Ttulo"; Text[ italian ] = "Titolo"; Text[ danish ] = "Titel"; Text[ swedish ] = "Titel"; Text[ polish ] = "Tytu"; Text[ portuguese_brazilian ] = "Title"; - Text[ japanese ] = ""; - Text[ korean ] = ""; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "D"; + Text[ japanese ] = "タイトル"; + Text[ korean ] = "제목"; + Text[ chinese_simplified ] = "标题"; + Text[ chinese_traditional ] = "標題"; Text[ arabic ] = ""; Text[ turkish ] = "A~d"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tt~ulo"; + Text[ catalan ] = "Tt~ol"; Text[ finnish ] = "Otsikko"; + Text[ thai ] = "ชื่อเรื่อง"; }; String STR_AUTH_FIELD_TYPE { Text = "Art des Berichts" ; Text [ ENGLISH ] = "Type of proceedings" ; - Text[ english_us ] = "Report type"; + Text[ english_us ] = "Type of report"; Text[ portuguese ] = "Tipo de relatrio"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Soort bericht"; + Text[ dutch ] = "Soort rapport"; Text[ french ] = "Type de rapport"; Text[ spanish ] = "Tipo de informe"; Text[ italian ] = "Tipo di relazione"; @@ -2281,65 +2364,68 @@ String STR_AUTH_FIELD_TYPE Text[ swedish ] = "Typ av rapport"; Text[ polish ] = "Rodzaj raportu"; Text[ portuguese_brazilian ] = "Type of proceedings"; - Text[ japanese ] = "̎"; - Text[ korean ] = " "; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "報告の種類"; + Text[ korean ] = "보고서 유형"; + Text[ chinese_simplified ] = "报表的类型"; + Text[ chinese_traditional ] = "報表的類型"; Text[ arabic ] = " "; Text[ turkish ] = "Rapor tr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo de informe"; - Text[ finnish ] = "Raporttityyppi"; + Text[ catalan ] = "Tipus d'informe"; + Text[ finnish ] = "Raportin tyyppi"; + Text[ thai ] = "ชนิดรายงาน"; }; String STR_AUTH_FIELD_VOLUME { Text = "Band" ; Text [ ENGLISH ] = "Volume" ; - Text[ english_us ] = "Volume number"; + Text[ english_us ] = "Volume"; Text[ portuguese ] = "Volume"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ greek ] = " "; - Text[ dutch ] = "Deel nummer"; - Text[ french ] = "No. de volume"; - Text[ spanish ] = "Nmero de tomo"; + Text[ dutch ] = "Deel"; + Text[ french ] = "Volume"; + Text[ spanish ] = "Tomo"; Text[ finnish ] = "Osan numero"; - Text[ italian ] = "Numero del volume"; + Text[ italian ] = "Volume"; Text[ danish ] = "Bind"; Text[ swedish ] = "Band"; Text[ polish ] = "Tom"; Text[ portuguese_brazilian ] = "Volume"; - Text[ japanese ] = ""; - Text[ korean ] = " ȣ"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "U"; + Text[ japanese ] = "巻"; + Text[ korean ] = "권"; + Text[ chinese_simplified ] = "册"; + Text[ chinese_traditional ] = "冊"; Text[ turkish ] = "Cilt says"; Text[ arabic ] = " "; - Text[ catalan ] = "Nmero de tomo"; + Text[ catalan ] = "Nmero de volum"; + Text[ thai ] = "จำนวนเล่ม"; }; String STR_AUTH_FIELD_YEAR { Text = "~Jahr" ; Text [ ENGLISH ] = "Year" ; - Text[ english_us ] = "Year of publication"; - Text[ portuguese ] = "~Ano de publicao"; - Text[ russian ] = " "; + Text[ english_us ] = "Year"; + Text[ portuguese ] = "~Ano"; + Text[ russian ] = ""; Text[ greek ] = " "; - Text[ dutch ] = "Verschijnings~jaar"; - Text[ french ] = "Anne de parution"; - Text[ spanish ] = "Ao de publi~cacin"; - Text[ finnish ] = "Julkaisuvuosi"; - Text[ italian ] = "Anno di pubblicazione"; - Text[ danish ] = "Udgivelsesr"; - Text[ swedish ] = "~r"; + Text[ dutch ] = "~Jaar"; + Text[ french ] = "Anne"; + Text[ spanish ] = "Ao"; + Text[ finnish ] = "Vuosi"; + Text[ italian ] = "Anno"; + Text[ danish ] = "~r"; + Text[ swedish ] = "r"; Text[ polish ] = "Rok"; Text[ portuguese_brazilian ] = "Year"; - Text[ japanese ] = "N"; - Text[ korean ] = "dz"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "~"; + Text[ japanese ] = "年"; + Text[ korean ] = "연도"; + Text[ chinese_simplified ] = "年份"; + Text[ chinese_traditional ] = "年份"; Text[ turkish ] = "Yaym yl"; Text[ arabic ] = " "; - Text[ catalan ] = "Ao de publi~cacin"; + Text[ catalan ] = "Any de publi~caci"; + Text[ thai ] = "ปีที่จัดพิมพ"; }; String STR_AUTH_FIELD_URL { @@ -2366,6 +2452,7 @@ String STR_AUTH_FIELD_URL Text[ language_user1 ] = " "; Text[ catalan ] = "URL"; Text[ finnish ] = "URL-osoite"; + Text[ thai ] = "URL"; }; String STR_AUTH_FIELD_CUSTOM1 { @@ -2383,15 +2470,16 @@ String STR_AUTH_FIELD_CUSTOM1 Text[ swedish ] = "Anvndarflt1"; Text[ polish ] = "Pole uytkownika~1"; Text[ portuguese_brazilian ] = "Custom1"; - Text[ japanese ] = "հް̨1"; - Text[ korean ] = " ʵ1"; - Text[ chinese_simplified ] = "û1"; - Text[ chinese_traditional ] = "ۭq 1"; + Text[ japanese ] = "ユーザー欄 ~1"; + Text[ korean ] = "사용자 정의1"; + Text[ chinese_simplified ] = "使用者栏位1"; + Text[ chinese_traditional ] = "自訂欄位 1"; Text[ arabic ] = " 1"; Text[ turkish ] = "Kullanc alan~1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~1"; - Text[ finnish ] = "Kyttjn mrittm~1"; + Text[ catalan ] = "Definit per l'usuari~1"; + Text[ finnish ] = "Kyttjn mrittm1"; + Text[ thai ] = "ระบุผู้ใช้~1"; }; String STR_AUTH_FIELD_CUSTOM2 { @@ -2409,15 +2497,16 @@ String STR_AUTH_FIELD_CUSTOM2 Text[ swedish ] = "Anvndarflt2"; Text[ polish ] = "Pole uytkownika~2"; Text[ portuguese_brazilian ] = "Custom2"; - Text[ japanese ] = "հް̨2"; - Text[ korean ] = " ʵ2"; - Text[ chinese_simplified ] = "û2"; - Text[ chinese_traditional ] = "ۭq 2"; + Text[ japanese ] = "ユーザー欄 ~2"; + Text[ korean ] = "사용자 정의2"; + Text[ chinese_simplified ] = "使用者栏位2"; + Text[ chinese_traditional ] = "自訂欄位 2"; Text[ arabic ] = " 2"; Text[ turkish ] = "Kullanc alan~2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~2"; - Text[ finnish ] = "Kyttjn mrittm~2"; + Text[ catalan ] = "Definit per l'usuari~2"; + Text[ finnish ] = "Kyttjn mrittm2"; + Text[ thai ] = "ระบุผู้ใช้~2"; }; String STR_AUTH_FIELD_CUSTOM3 { @@ -2435,15 +2524,16 @@ String STR_AUTH_FIELD_CUSTOM3 Text[ swedish ] = "Anvndarflt3"; Text[ polish ] = "Pole uytkownika~3"; Text[ portuguese_brazilian ] = "Custom3"; - Text[ japanese ] = "հް̨3"; - Text[ korean ] = " ʵ3"; - Text[ chinese_simplified ] = "û3"; - Text[ chinese_traditional ] = "ۭq 3"; + Text[ japanese ] = "ユーザー欄 ~3"; + Text[ korean ] = "사용자 정의3"; + Text[ chinese_simplified ] = "使用者栏位3"; + Text[ chinese_traditional ] = "自訂欄位 3"; Text[ arabic ] = " 3"; Text[ turkish ] = "Kullanc alan~3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~3"; - Text[ finnish ] = "Kyttjn mrittm~3"; + Text[ catalan ] = "Definit per l'usuari~3"; + Text[ finnish ] = "Kyttjn mrittm3"; + Text[ thai ] = "ระบุผู้ใช้~3"; }; String STR_AUTH_FIELD_CUSTOM4 { @@ -2461,15 +2551,16 @@ String STR_AUTH_FIELD_CUSTOM4 Text[ swedish ] = "Anvndarflt4"; Text[ polish ] = "Pole uytkownika~4"; Text[ portuguese_brazilian ] = "Custom4"; - Text[ japanese ] = "հް̨4"; - Text[ korean ] = " ʵ4"; - Text[ chinese_simplified ] = "û4"; - Text[ chinese_traditional ] = "ۭq 4"; + Text[ japanese ] = "ユーザー欄 ~4"; + Text[ korean ] = "사용자 정의4"; + Text[ chinese_simplified ] = "使用者栏位4"; + Text[ chinese_traditional ] = "自訂欄位 4"; Text[ arabic ] = " 4"; Text[ turkish ] = "Kullanc alan~4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~4"; - Text[ finnish ] = "Kyttjn mrittm~4"; + Text[ catalan ] = "Definit per l'usuari~4"; + Text[ finnish ] = "Kyttjn mrittm4"; + Text[ thai ] = "ระบุผู้ใช้~4"; }; String STR_AUTH_FIELD_CUSTOM5 { @@ -2487,15 +2578,16 @@ String STR_AUTH_FIELD_CUSTOM5 Text[ swedish ] = "Anvndarflt5"; Text[ polish ] = "Pole uytkownika~5"; Text[ portuguese_brazilian ] = "Custom5"; - Text[ japanese ] = "հް̨5"; - Text[ korean ] = " ʵ5"; - Text[ chinese_simplified ] = "û5"; - Text[ chinese_traditional ] = "ۭq 5"; + Text[ japanese ] = "ユーザー欄 ~5"; + Text[ korean ] = "사용자 정의5"; + Text[ chinese_simplified ] = "使用者栏位5"; + Text[ chinese_traditional ] = "自訂欄位 5"; Text[ arabic ] = " 5"; Text[ turkish ] = "Kullanc alan~5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~5"; - Text[ finnish ] = "Kyttjn mrittm~5"; + Text[ catalan ] = "Definit per l'usuari~5"; + Text[ finnish ] = "Kyttjn mrittm5"; + Text[ thai ] = "ระบุผู้ใช้~5"; }; String STR_AUTH_FIELD_ISBN { @@ -2522,6 +2614,7 @@ String STR_AUTH_FIELD_ISBN Text[ language_user1 ] = " "; Text[ catalan ] = "ISBN"; Text[ finnish ] = "ISBN"; + Text[ thai ] = "ISBN"; }; @@ -2530,3 +2623,24 @@ String STR_AUTH_FIELD_ISBN + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/utlui/navipi.src b/sw/source/ui/utlui/navipi.src index 6066f318fee8..9e4f7c76d0b5 100644 --- a/sw/source/ui/utlui/navipi.src +++ b/sw/source/ui/utlui/navipi.src @@ -2,9 +2,9 @@ * * $RCSfile: navipi.src,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: os $ $Date: 2002-09-06 13:54:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Navigatore" ; Text [ portuguese_brazilian ] = "Navegador" ; Text [ portuguese ] = "Navegador" ; - Text [ finnish ] = "Navigaattori" ; + Text [ finnish ] = "Etsin" ; Text [ danish ] = "Navigator" ; Text [ french ] = "Navigateur" ; Text [ swedish ] = "Navigator" ; @@ -199,7 +199,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "瀏覽"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "네비게이션"; + Text[ korean ] = "탐색"; Text[ turkish ] = "Dolama"; Text[ catalan ] = "Navegaci"; Text[ finnish ] = "Siirtyminen"; @@ -239,7 +239,7 @@ Window DLG_NAVIGATION_PI Text [ french ] = "Prcdent" ; Text [ swedish ] = "Bakt" ; Text [ dutch ] = "Achteruit" ; - Text [ spanish ] = "Retroceder" ; + Text [ spanish ] = "Regresar" ; Text [ english_us ] = "Back" ; Text[ chinese_simplified ] = "向后"; Text[ russian ] = ""; @@ -304,7 +304,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Modo drag" ; Text [ spanish ] = "Modo Arrastrar" ; Text [ french ] = "Mode Glisser" ; - Text [ dutch ] = "Modus Slepen" ; + Text [ dutch ] = "Sleepmodus" ; Text [ swedish ] = "Dralge" ; Text [ danish ] = "Trkmodus" ; Text [ portuguese_brazilian ] = "Dragmodus" ; @@ -337,7 +337,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Capitolo superiore" ; Text [ portuguese_brazilian ] = "Cap?tulo acima" ; Text [ portuguese ] = "Subir um captulo" ; - Text [ finnish ] = "Pienenn kappaleen sisennyst" ; + Text [ finnish ] = "Siirr luku ylemmlle tasolle" ; Text [ danish ] = "Kapitel op" ; Text [ french ] = "Chapitre vers le haut" ; Text [ swedish ] = "Kapitel uppt" ; @@ -346,13 +346,13 @@ Window DLG_NAVIGATION_PI Text [ english_us ] = "Promote Chapter" ; //HelpText[english_us-wrong] = "Move chapter down";//"Move chapter up" Text[ chinese_simplified ] = "章升级"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Rozdzia do gry"; Text[ japanese ] = "章を上に移動"; Text[ chinese_traditional ] = "章升級"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "장 승격"; + Text[ korean ] = "장을 위로 이동"; Text[ turkish ] = "Blm yukar al"; Text[ catalan ] = "Un captol cap amunt"; Text[ thai ] = "เลื่อนบท"; @@ -368,7 +368,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Capitolo inferiore" ; Text [ portuguese_brazilian ] = "Cap?tulo abaixo" ; Text [ portuguese ] = "Descer um captulo" ; - Text [ finnish ] = "Suurenna kappaleen sisennyst" ; + Text [ finnish ] = "Siirr luku alemmalle tasolle" ; Text [ danish ] = "Kapitel ned" ; Text [ french ] = "Chapitre vers le bas" ; Text [ swedish ] = "Kapitel nedt" ; @@ -376,13 +376,13 @@ Window DLG_NAVIGATION_PI Text [ spanish ] = "Un captulo hacia abajo" ; Text [ english_us ] = "Demote Chapter" ; Text[ chinese_simplified ] = "章降级"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Rozdzia w d"; Text[ japanese ] = "章を下に移動"; Text[ chinese_traditional ] = "章降級"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "장 낮추기"; + Text[ korean ] = "장을 아래로 이동"; Text[ turkish ] = "Blm aa ek"; Text[ catalan ] = "Un captol cap avall"; Text[ thai ] = "ลดบท"; @@ -401,13 +401,13 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Mostra/nascondi la casella di selezione" ; Text [ spanish ] = "Mostrar/ocultar cuadro de seleccin" ; Text [ french ] = "Afficher/masquer la bote de slection" ; - Text [ dutch ] = "Keuzebox in-/uitschakelen" ; + Text [ dutch ] = "Keuzevak in-/uitschakelen" ; Text [ swedish ] = "Urvalsbox p/av" ; Text [ danish ] = "Vis/skjul liste" ; Text [ portuguese_brazilian ] = "Auswahlbox an-/ausschalten" ; Text [ portuguese ] = "Act./Desactivar caixa de seleco" ; Text[ chinese_simplified ] = "显示/隐入列表框"; - Text[ russian ] = "./. "; + Text[ russian ] = ""; Text[ polish ] = "Wcz/Wycz pole listy"; Text[ japanese ] = "リストボックス オン/オフ"; Text[ chinese_traditional ] = "顯示/隱入清單方塊"; @@ -416,7 +416,7 @@ Window DLG_NAVIGATION_PI Text[ korean ] = "목록상자 표시/숨기기"; Text[ turkish ] = "Liste kutusu ak/kapal"; Text[ catalan ] = "Quadre de llista activat/desactivat"; - Text[ finnish ] = "Luetteloruutu on/off"; + Text[ finnish ] = "Luetteloruutu kytss / poissa kytst"; Text[ thai ] = "กล่องรายการ เปิด/ปิด"; }; ToolBoxItem @@ -435,13 +435,13 @@ Window DLG_NAVIGATION_PI Text [ portuguese_brazilian ] = "Inhaltsansicht umschalten" ; Text [ portuguese ] = "Comutar vista do contedo" ; Text[ chinese_simplified ] = "切换内容视图"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Przecz widok treci"; Text[ japanese ] = "内容ビューの切り換え"; Text[ chinese_traditional ] = "切換內容檢視"; Text[ arabic ] = " "; Text[ greek ] = " /"; - Text[ korean ] = "내용보기 전환"; + Text[ korean ] = "내용 보기"; Text[ turkish ] = "erik grnmn deitir"; Text[ catalan ] = "Commuta visualitzaci del contingut"; Text[ finnish ] = "Sisltnkym"; @@ -470,13 +470,13 @@ Window DLG_NAVIGATION_PI Text [ spanish ] = "Insertar marca" ; Text [ english_us ] = "Set Reminder" ; Text[ chinese_simplified ] = "设置标记"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Osad znaczniki"; Text[ japanese ] = "覚え止めを付ける"; Text[ chinese_traditional ] = "設定提醒"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "표시자 설정"; + Text[ korean ] = "미리 알림 설정"; Text[ turkish ] = "Anmsatc yerletir"; Text[ catalan ] = "Defineix un recordatori"; Text[ thai ] = "ตั้งค่าตัวเตือน"; @@ -496,7 +496,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Intestazione" ; Text [ portuguese_brazilian ] = "Cabe?alho" ; Text [ portuguese ] = "Cabealho" ; - Text [ finnish ] = "Ylotsikko" ; + Text [ finnish ] = "Yltunniste" ; Text [ danish ] = "Sidehoved" ; Text [ french ] = "En-tte " ; Text [ swedish ] = "Sidhuvud" ; @@ -527,7 +527,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Pi di pagina" ; Text [ portuguese_brazilian ] = "Rodap?" ; Text [ portuguese ] = "Rodap" ; - Text [ finnish ] = "Alaselite" ; + Text [ finnish ] = "Alatunniste" ; Text [ danish ] = "Sidefod" ; Text [ french ] = "Pied de page" ; Text [ swedish ] = "Sidfot" ; @@ -567,13 +567,13 @@ Window DLG_NAVIGATION_PI Text [ english_us ] = "Anchor<->Text" ; /* ### ACHTUNG: Neuer Text in Resource? Springen zwischen Funotenankern und dem Funotentext : Springen zwischen Funotenankern und dem Funotentext */ Text[ chinese_simplified ] = "标记<->正文"; - Text[ russian ] = "<->"; + Text[ russian ] = "<->"; Text[ polish ] = "Kotwica<->Tekst"; Text[ japanese ] = "脚注"; Text[ chinese_traditional ] = "標號<->內文"; Text[ arabic ] = "<->"; Text[ greek ] = "<->"; - Text[ korean ] = "고정<->텍스트"; + Text[ korean ] = "기준 위치<->텍스트"; Text[ turkish ] = "Sabitleyici<->Metin"; Text[ catalan ] = "Ancora<->Text"; Text[ thai ] = "สมอ<->ข้อความ"; @@ -600,13 +600,13 @@ Window DLG_NAVIGATION_PI Text [ portuguese_brazilian ] = "Angezeigte ?berschriftenebenen" ; Text [ portuguese ] = "Nveis de ttulos mostrados" ; Text[ chinese_simplified ] = "显示的大纲级"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Wywietlone poziomy konspektu"; Text[ japanese ] = "見出しレベル"; Text[ chinese_traditional ] = "顯示的大綱級"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "나타나는 표제 수준"; + Text[ korean ] = "표시되는 제목 수준"; Text[ turkish ] = "Grntlenen balk dzeyleri"; Text[ catalan ] = "Nivells d'encapalament mostrats"; Text[ finnish ] = "Otsikkotasojen nytt"; @@ -627,7 +627,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Livello superiore" ; Text [ portuguese_brazilian ] = "Aumentar N?vel" ; Text [ portuguese ] = "Subir um nvel" ; - Text [ finnish ] = "Pienenn tason sisennyst" ; + Text [ finnish ] = "Korota tasoa" ; Text [ danish ] = "Niveau op" ; Text [ french ] = "Hausser d'un niveau" ; Text [ swedish ] = "En niv upp" ; @@ -635,13 +635,13 @@ Window DLG_NAVIGATION_PI Text [ spanish ] = "Subir un nivel" ; Text [ english_us ] = "Promote Level" ; Text[ chinese_simplified ] = "升级"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Poziom wyej"; Text[ japanese ] = "レベルを上げる"; Text[ chinese_traditional ] = "升級"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "수준 높이기"; + Text[ korean ] = "수준 올림"; Text[ turkish ] = "Dzeyi yukar al"; Text[ catalan ] = "Promou el nivell"; Text[ thai ] = "เลื่อนระดับ"; @@ -657,7 +657,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Livello inferiore" ; Text [ portuguese_brazilian ] = "Diminuir N?vel" ; Text [ portuguese ] = "Descer um nvel" ; - Text [ finnish ] = "Suurenna tason sisennyst" ; + Text [ finnish ] = "Alenna tasoa" ; Text [ danish ] = "Niveau ned" ; Text [ french ] = "Abaisser d'un niveau" ; Text [ swedish ] = "En niv ner" ; @@ -665,7 +665,7 @@ Window DLG_NAVIGATION_PI Text [ spanish ] = "Bajar un nivel" ; Text [ english_us ] = "Demote Level" ; Text[ chinese_simplified ] = "降级"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Poziom niej"; Text[ japanese ] = "レベルを下げる"; Text[ chinese_traditional ] = "降級"; @@ -734,7 +734,7 @@ Window DLG_NAVIGATION_PI Text [ dutch ] = "Bewerken" ; Text [ portuguese ] = "Editar" ; Text[ chinese_simplified ] = "编辑"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Edytuj"; Text[ japanese ] = "編集"; Text[ chinese_traditional ] = "編輯"; @@ -759,7 +759,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Aggiorna" ; Text [ spanish ] = "Actualizar" ; Text [ french ] = "Actualiser" ; - Text [ dutch ] = "Actualiseren" ; + Text [ dutch ] = "Bijwerken" ; Text [ portuguese ] = "Actualizar" ; Text[ chinese_simplified ] = "更新"; Text[ russian ] = ""; @@ -822,7 +822,7 @@ Window DLG_NAVIGATION_PI Text [ french ] = "Enregistrer le contenu" ; Text [ dutch ] = "Inhoud opslaan" ; Text [ portuguese ] = "Guardar tambm contedos" ; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zapisz zawarto"; Text[ japanese ] = "内容を保存する"; Text[ chinese_simplified ] = "存盘内容"; @@ -865,7 +865,7 @@ Window DLG_NAVIGATION_PI Text[ korean ] = "위로 이동"; Text[ turkish ] = "Yukar ta"; Text[ catalan ] = "Mou cap amunt"; - Text[ finnish ] = "Siirr yls"; + Text[ finnish ] = "Siirr ylemms"; Text[ thai ] = "ย้ายขึ้น"; }; ToolBoxItem @@ -891,10 +891,10 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "向下移動"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "아래로 이동"; + Text[ korean ] = "아래로"; Text[ turkish ] = "Aa ta"; Text[ catalan ] = "Mou cap avall"; - Text[ finnish ] = "Siirr alas"; + Text[ finnish ] = "Siirr alemmas"; Text[ thai ] = "ย้ายลง"; }; }; @@ -963,7 +963,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "大綱級"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "아웃트라인"; + Text[ korean ] = "개요 수준"; Text[ turkish ] = "Anahat dzeyleri"; Text[ catalan ] = "Nivell de contorn"; Text[ finnish ] = "Jsennystaso"; @@ -973,7 +973,7 @@ Window DLG_NAVIGATION_PI { Text = "Dragmodus" ; Text [ English ] = "Drag mode" ; - Text [ dutch ] = "Dragmodus" ; + Text [ dutch ] = "Sleepmodus" ; Text [ english_us ] = "Drag Mode" ; Text [ italian ] = "Modo drag" ; Text [ spanish ] = "Modo Arrastrar" ; @@ -1043,7 +1043,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "當作捷徑插入"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "연결로 삽입"; + Text[ korean ] = "링크로 삽입"; Text[ turkish ] = "Balant olarak ekle"; Text[ catalan ] = "Insereix com a enlla"; Text[ finnish ] = "Lis linkkin"; @@ -1149,7 +1149,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "隱入"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "숨기기"; + Text[ korean ] = "숨김"; Text[ turkish ] = "gizli"; Text[ catalan ] = "ocult"; Text[ finnish ] = "piilotettu"; @@ -1175,7 +1175,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "使用中的"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "활성"; + Text[ korean ] = "활성 중"; Text[ turkish ] = "etkin"; Text[ catalan ] = "actiu"; Text[ finnish ] = "aktiivinen"; @@ -1230,14 +1230,14 @@ Window DLG_NAVIGATION_PI Text[ korean ] = "편집..."; Text[ turkish ] = "~Dzenle..."; Text[ catalan ] = "Edita..."; - Text[ finnish ] = "Muokkaa"; + Text[ finnish ] = "Muokkaa..."; Text[ thai ] = "แก้ไข..."; }; String ST_UPDATE { Text = "~Aktualisieren" ; Text [ English ] = "Update" ; - Text [ dutch ] = "~Actualiseren" ; + Text [ dutch ] = "~Bijwerken" ; Text [ english_us ] = "~Update" ; Text [ italian ] = "~Aggiorna" ; Text [ spanish ] = "Actuali~zar" ; @@ -1296,14 +1296,14 @@ Window DLG_NAVIGATION_PI Text[ dutch ] = "Koppeling bewerken"; Text[ french ] = "diter le lien"; Text[ spanish ] = "Editar vnculo"; - Text[ finnish ] = "Edit link"; + Text[ finnish ] = "Muokkaa linkki"; Text[ italian ] = "Modifica collegamento"; Text[ danish ] = "Rediger kde"; Text[ swedish ] = "Redigera lnk"; Text[ polish ] = "Edytuj cze"; Text[ portuguese_brazilian ] = "Edit link"; Text[ japanese ] = "リンクの編集"; - Text[ korean ] = "연결 편집"; + Text[ korean ] = "링크 편집"; Text[ chinese_simplified ] = "编辑链接"; Text[ chinese_traditional ] = "編輯捷徑"; Text[ turkish ] = "Edit link"; @@ -1356,7 +1356,7 @@ Window DLG_NAVIGATION_PI Text[ polish ] = "Indeks"; Text[ portuguese_brazilian ] = "?n~ice"; Text[ japanese ] = "目次と索引(~I)"; - Text[ korean ] = "색인(~I)"; + Text[ korean ] = "색인 및 목차(~I)"; Text[ chinese_simplified ] = "目录(~I)"; Text[ chinese_traditional ] = "索引(~I)"; Text[ arabic ] = ""; @@ -1400,12 +1400,12 @@ Window DLG_NAVIGATION_PI Text [ swedish ] = "Nytt dokument" ; Text [ danish ] = "Nyt dokument" ; Text [ italian ] = "Nuovo documento" ; - Text [ spanish ] = "Nuevo documento" ; + Text [ spanish ] = "Documento nuevo" ; Text [ french ] = "Nouveau document" ; Text [ dutch ] = "Nieuw document" ; Text [ portuguese ] = "Novo documento" ; Text[ chinese_simplified ] = "新建文档"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nowy dokument"; Text[ japanese ] = "新しいドキュメント"; Text[ chinese_traditional ] = "新增文件"; @@ -1457,7 +1457,7 @@ Window DLG_NAVIGATION_PI Text [ french ] = "Supprimer" ; Text [ swedish ] = "Radera" ; Text [ dutch ] = "Wissen" ; - Text [ spanish ] = "Eliminar" ; + Text [ spanish ] = "Borrar" ; Text [ english_us ] = "Delete" ; Text[ chinese_simplified ] = "删除"; Text[ russian ] = ""; @@ -1484,7 +1484,7 @@ Window DLG_NAVIGATION_PI Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "Wis~sen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; Text[ chinese_simplified ] = "删除(~D)"; Text[ russian ] = ""; @@ -1512,7 +1512,7 @@ Window DLG_NAVIGATION_PI Text [ dutch ] = "Selectie" ; Text [ portuguese ] = "Seleco" ; Text[ chinese_simplified ] = "选中"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Selekcja"; Text[ japanese ] = "選択範囲"; Text[ chinese_traditional ] = "選取"; @@ -1544,7 +1544,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "目錄"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "색인"; + Text[ korean ] = "색인 및 목차"; Text[ turkish ] = "Dizin"; Text[ catalan ] = "ndex"; Text[ finnish ] = "Hakemistot"; @@ -1571,7 +1571,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "捷徑"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "연결"; + Text[ korean ] = "링크"; Text[ turkish ] = "Balant"; Text[ catalan ] = "Enllaos"; Text[ finnish ] = "Linkit"; @@ -1597,7 +1597,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "全部"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "전체"; + Text[ korean ] = "모두"; Text[ turkish ] = "Tm"; Text[ catalan ] = "Tot"; Text[ finnish ] = "Kaikki"; @@ -1612,18 +1612,18 @@ Window DLG_NAVIGATION_PI Text [ swedish ] = "Upph~v frteckning" ; Text [ danish ] = "Ophv indeks" ; Text [ italian ] = "Rimuovi indice" ; - Text [ spanish ] = "Eliminar dire~ctorio" ; + Text [ spanish ] = "Borrar el dire~ctorio" ; Text [ french ] = "~Supprimer l'index" ; Text [ dutch ] = "~Index opheffen" ; Text [ portuguese ] = "~Remover ndice" ; Text[ chinese_simplified ] = "取消目录(~R)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Usu indeks"; Text[ japanese ] = "解除(~R)"; Text[ chinese_traditional ] = "取消目錄(~R)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "색인 해제(~R)"; + Text[ korean ] = "색인 제거(~R)"; Text[ turkish ] = "D~izini kaldr"; Text[ catalan ] = "Elimina el dire~ctori"; Text[ finnish ] = "~Poista hakemisto"; @@ -1673,7 +1673,7 @@ Window DLG_NAVIGATION_PI Text[ polish ] = "schowany"; Text[ portuguese_brazilian ] = "hidden"; Text[ japanese ] = "隠し"; - Text[ korean ] = "숨기기"; + Text[ korean ] = "숨김"; Text[ chinese_simplified ] = "隐入的"; Text[ chinese_traditional ] = "隱入"; Text[ arabic ] = ""; @@ -1742,7 +1742,7 @@ Window DLG_NAVIGATION_PI Text[ portuguese ] = "S ~leitura"; Text[ russian ] = " "; Text[ greek ] = "M "; - Text[ dutch ] = "~Schrijfbeveiligd"; + Text[ dutch ] = "~Alleen-lezen"; Text[ french ] = "en ~lecture seule"; Text[ spanish ] = "Solo le~ctura"; Text[ italian ] = "A sola lettura"; @@ -1751,7 +1751,7 @@ Window DLG_NAVIGATION_PI Text[ polish ] = "Tylko do odczytu"; Text[ portuguese_brazilian ] = "Readonly"; Text[ japanese ] = "読み取り専用(~O)"; - Text[ korean ] = "읽기전용(~O)"; + Text[ korean ] = "읽기 전용(~O)"; Text[ chinese_simplified ] = "防改写(~O)"; Text[ chinese_traditional ] = "唯讀(~O)"; Text[ arabic ] = " "; @@ -1807,3 +1807,18 @@ ImageList IMG_NAVI_ENTRYBMPH }; + + + + + + + + + + + + + + + diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src index d576562e7c75..4f655286d49a 100644 --- a/sw/source/ui/utlui/poolfmt.src +++ b/sw/source/ui/utlui/poolfmt.src @@ -2,9 +2,9 @@ * * $RCSfile: poolfmt.src,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: os $ $Date: 2002-06-05 12:27:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ String STR_POOLCHR_FOOTNOTE Text [ portuguese ] = "Smbolo de nota de rodap" ; Text [ portuguese_brazilian ] = "Fu?notenzeichen" ; Text[ chinese_simplified ] = "注脚符"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Symbol przypisw doln."; Text[ japanese ] = "脚注番号"; Text[ chinese_traditional ] = "註腳符"; @@ -87,8 +87,9 @@ String STR_POOLCHR_FOOTNOTE Text[ korean ] = "각주 기호"; Text[ turkish ] = "Dipnot karakterleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Smbolo de nota al pie"; + Text[ catalan ] = "Carcters de nota al peu"; Text[ finnish ] = "Alaviitemerkit"; + Text[ thai ] = "ตัวอักขระของเชิงอรรถ"; }; String STR_POOLCHR_PAGENO { @@ -106,15 +107,16 @@ String STR_POOLCHR_PAGENO Text[ chinese_simplified ] = "页码"; Text[ russian ] = " "; Text[ polish ] = "Ilo stron"; - Text[ japanese ] = "ﾍﾟｰｼﾞ番号"; + Text[ japanese ] = "ページ番号"; Text[ chinese_traditional ] = "頁碼"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "쪽 번호"; + Text[ korean ] = "페이지 번호"; Text[ turkish ] = "Sayfa says"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero de pgina"; + Text[ catalan ] = "Nmero de pgina"; Text[ finnish ] = "Sivunumero"; + Text[ thai ] = "เลขหน้า"; }; String STR_POOLCHR_LABEL { @@ -130,7 +132,7 @@ String STR_POOLCHR_LABEL Text [ portuguese ] = "Caracteres para etiqueta" ; Text [ portuguese_brazilian ] = "Beschriftungszeichen" ; Text[ chinese_simplified ] = "标签文"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Tekst etykiety"; Text[ japanese ] = "図表番号文字"; Text[ chinese_traditional ] = "標籤文"; @@ -139,8 +141,9 @@ String STR_POOLCHR_LABEL Text[ korean ] = "캡션 문자"; Text[ turkish ] = "Etiket karakterleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Caracteres de etiqueta"; + Text[ catalan ] = "Carcters de la llegenda"; Text[ finnish ] = "Kuvaotsikon merkit"; + Text[ thai ] = "ตัวอักขระของคำบรรยายภาพ"; }; String STR_POOLCHR_DROPCAPS { @@ -156,17 +159,18 @@ String STR_POOLCHR_DROPCAPS Text [ portuguese ] = "Caracteres capitulares" ; Text [ portuguese_brazilian ] = "Initialenzeichen" ; Text[ chinese_simplified ] = "字首大写"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Inicjay"; - Text[ japanese ] = "ﾄﾞﾛｯﾌﾟｷｬｯﾌﾟ"; + Text[ japanese ] = "ドロップキャップ"; Text[ chinese_traditional ] = "字首大寫"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "단락의 첫문자 장식"; + Text[ korean ] = "단락 첫문자 장식"; Text[ turkish ] = "Baharfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; Text[ finnish ] = "Anfangit"; + Text[ thai ] = "ตัวอักษรขึ้นต้นที่มีขนาดใหญ่"; }; String STR_POOLCHR_NUM_LEVEL { @@ -176,13 +180,13 @@ String STR_POOLCHR_NUM_LEVEL Text [ italian ] = "Carattere di numerazione" ; Text [ spanish ] = "Carcter de numeracin" ; Text [ french ] = "Caractres de numrotation" ; - Text [ dutch ] = "Nummeringsteken" ; + Text [ dutch ] = "Opsommingstekens" ; Text [ swedish ] = "Numreringstecken" ; Text [ danish ] = "Nummereringstegn" ; Text [ portuguese ] = "Caracteres de numerao" ; Text [ portuguese_brazilian ] = "Numerierungszeichen" ; Text[ chinese_simplified ] = "编号字符"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Znaki numeracji"; Text[ japanese ] = "番号付け記号"; Text[ chinese_traditional ] = "編號字元"; @@ -191,15 +195,16 @@ String STR_POOLCHR_NUM_LEVEL Text[ korean ] = "번호 매기기 기호"; Text[ turkish ] = "Numaralama karakterleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Carcter de numeracin"; + Text[ catalan ] = "Smbols de numeraci"; Text[ finnish ] = "Numerointisymbolit"; + Text[ thai ] = "สัญลักษณ์ลำดับตัวเลข"; }; String STR_POOLCHR_BUL_LEVEL { /* ### ACHTUNG: Neuer Text in Resource? Aufzhlungszeichen : Aufzhlungszeichen */ Text = "Aufzhlungszeichen" ; Text [ English ] = "Bullet" ; - Text [ english_us ] = "Bullet Symbols" ; + Text [ english_us ] = "Bullets" ; Text [ italian ] = "Carattere per numerazione" ; Text [ spanish ] = "Vietas" ; Text [ french ] = "Puces" ; @@ -218,8 +223,9 @@ String STR_POOLCHR_BUL_LEVEL Text[ korean ] = "글머리 기호"; Text[ turkish ] = "Madde iaretleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Vietas"; + Text[ catalan ] = "Smbols de pic"; Text[ finnish ] = "Luettelomerkkisymbolit"; + Text[ thai ] = "สัญลักษณ์แสดงหัวข้อย่อย"; }; String STR_POOLCHR_INET_NORMAL { @@ -227,25 +233,26 @@ String STR_POOLCHR_INET_NORMAL Text [ English ] = "Internet link" ; Text [ english_us ] = "Internet Link" ; Text [ italian ] = "Link Internet" ; - Text [ spanish ] = "Vnculo Internet" ; + Text [ spanish ] = "Vnculo de Internet" ; Text [ french ] = "Lien Internet" ; - Text [ dutch ] = "Internet Link" ; + Text [ dutch ] = "Internetkoppeling" ; Text [ swedish ] = "Internetlnk" ; Text [ danish ] = "Hyperlink" ; Text [ portuguese ] = "Link Internet" ; Text [ portuguese_brazilian ] = "Internet Link" ; Text[ chinese_simplified ] = "国际互联网链接"; - Text[ russian ] = " "; + Text[ russian ] = "-"; Text[ polish ] = "cze internetowe"; - Text[ japanese ] = "ｲﾝﾀｰﾈｯﾄ ﾘﾝｸ"; + Text[ japanese ] = "インターネットリンク"; Text[ chinese_traditional ] = "Internet 捷徑"; Text[ arabic ] = " "; Text[ greek ] = " Internet"; Text[ korean ] = "인터넷 링크"; Text[ turkish ] = "Internet balants"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Vnculo Internet"; + Text[ catalan ] = "Enlla d'Internet"; Text[ finnish ] = "Internet-linkki"; + Text[ thai ] = "เชื่อมโยงอินเตอร์เน็ต"; }; String STR_POOLCHR_INET_VISIT { @@ -255,25 +262,26 @@ String STR_POOLCHR_INET_VISIT Text [ English ] = "Visit internet link" ; Text [ english_us ] = "Visited Internet Link" ; Text [ italian ] = "Link Internet visitato" ; - Text [ spanish ] = "Pgina Internet visitada" ; + Text [ spanish ] = "Enlace de Internet visitado" ; Text [ french ] = "Lien Internet visit" ; - Text [ dutch ] = "Bezochte Internet Link" ; + Text [ dutch ] = "Bezochte internetkoppeling" ; Text [ swedish ] = "Anvnd Internetlnk" ; Text [ danish ] = "Besgt hyperlink" ; Text [ portuguese ] = "Link Internet visitado" ; Text [ portuguese_brazilian ] = "Besuchter Internet Link" ; Text[ chinese_simplified ] = "访问过的国际互联网链接"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Odwiedzone cze internetowe"; - Text[ japanese ] = "訪れたｲﾝﾀｰﾈｯﾄ ﾘﾝｸ"; + Text[ japanese ] = "訪れたインターネットリンク"; Text[ chinese_traditional ] = "訪問過的 Internet 捷徑"; Text[ arabic ] = " "; Text[ greek ] = " Internet "; Text[ korean ] = "방문한 인터넷 링크"; Text[ turkish ] = "Kullanlm Internet balants"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pgina Internet visitada"; - Text[ finnish ] = "Kyty Internet-linkki"; + Text[ catalan ] = "Enlla d'Internet visitat"; + Text[ finnish ] = "Avattu Internet-linkki"; + Text[ thai ] = "ดูการเชื่อมโยงอินเตอร์เน็ต"; }; String STR_POOLCHR_JUMPEDIT { @@ -289,17 +297,18 @@ String STR_POOLCHR_JUMPEDIT Text [ portuguese ] = "Marcador de posio" ; Text [ portuguese_brazilian ] = "Platzhalter" ; Text[ chinese_simplified ] = "通配符"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Znak-wypeniacz"; - Text[ japanese ] = "ﾌﾟﾚｰｽﾎﾙﾀﾞ"; - Text[ chinese_traditional ] = "通配符"; + Text[ japanese ] = "プレースホルダ"; + Text[ chinese_traditional ] = "萬用字元"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "플레이스홀더"; Text[ turkish ] = "Genel arama karakteri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comodn"; + Text[ catalan ] = "Marcador"; Text[ finnish ] = "Paikkamerkki"; + Text[ thai ] = "ตัวยึดตำแหน่ง"; }; String STR_POOLCHR_TOXJUMP { @@ -317,15 +326,16 @@ String STR_POOLCHR_TOXJUMP Text[ chinese_simplified ] = "目录链接"; Text[ russian ] = " "; Text[ polish ] = "Skok w indeksie"; - Text[ japanese ] = "索引ｼﾞｬﾝﾌﾟ"; + Text[ japanese ] = "索引ジャンプ"; Text[ chinese_traditional ] = "目錄捷徑"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "색인 연결"; + Text[ korean ] = "색인 링크"; Text[ turkish ] = "Dizin balants"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salto de ndice"; + Text[ catalan ] = "Salt d'ndex"; Text[ finnish ] = "Hakemistolinkki"; + Text[ thai ] = "เชื่อมโยงดัชนี"; }; String STR_POOLCHR_ENDNOTE { @@ -341,7 +351,7 @@ String STR_POOLCHR_ENDNOTE Text [ french ] = "Caractre de note de fin" ; Text [ dutch ] = "Eindnootteken" ; Text[ chinese_simplified ] = "尾标符"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Symbol przypisw koc."; Text[ japanese ] = "文末脚注番号"; Text[ chinese_traditional ] = "尾註符號"; @@ -350,8 +360,9 @@ String STR_POOLCHR_ENDNOTE Text[ korean ] = "미주 기호"; Text[ turkish ] = "Sonnot karakterleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Smbolo de nota final"; - Text[ finnish ] = "Loppuhuomautusmerkit"; + Text[ catalan ] = "Carcters de nota final"; + Text[ finnish ] = "Loppuviitemerkit"; + Text[ thai ] = "ตัวอักขระอ้างอิงท้ายเรื่อง"; }; String STR_POOLCHR_LINENUM { @@ -373,11 +384,12 @@ String STR_POOLCHR_LINENUM Text[ chinese_traditional ] = "行編號"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "행 번호 매기기"; + Text[ korean ] = "줄 번호 매기기"; Text[ turkish ] = "Satr numaralamas"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin de lneas"; + Text[ catalan ] = "Numeraci de lnies"; Text[ finnish ] = "Rivien numerointi"; + Text[ thai ] = "ลำดับตัวเลขบรรทัด"; }; String STR_POOLCHR_IDX_MAIN_ENTRY { @@ -385,7 +397,7 @@ String STR_POOLCHR_IDX_MAIN_ENTRY Text [ English ] = "Main index entry" ; Text[ english_us ] = "Main index entry"; Text[ portuguese ] = "Entrada principal de ndice remissivo"; - Text[ russian ] = " : "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Index hoofditem"; Text[ french ] = "Index lexical : entre principale"; @@ -402,8 +414,9 @@ String STR_POOLCHR_IDX_MAIN_ENTRY Text[ arabic ] = " "; Text[ turkish ] = "Alfabetik dizin ana girii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Entrada principal ndice alfabtico"; + Text[ catalan ] = "Entrada principal de l'ndex"; Text[ finnish ] = "Phakemistomerkint"; + Text[ thai ] = "รายการดัชนีหลัก"; }; String STR_POOLCHR_FOOTNOTE_ANCHOR { @@ -411,7 +424,7 @@ String STR_POOLCHR_FOOTNOTE_ANCHOR Text [ English ] = "Footnote anchor" ; Text[ english_us ] = "Footnote anchor"; Text[ portuguese ] = "ncora para nota de rodap"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Voetnootanker"; Text[ french ] = "Appel de note de bas de page"; @@ -422,13 +435,14 @@ String STR_POOLCHR_FOOTNOTE_ANCHOR Text[ polish ] = "Zakotwiczenie przypisw doln."; Text[ portuguese_brazilian ] = "Footnote anchor"; Text[ japanese ] = "脚注参照番号"; - Text[ korean ] = "각주 고정 기준"; + Text[ korean ] = "각주 기준 위치"; Text[ chinese_simplified ] = "注脚标记"; Text[ chinese_traditional ] = "註腳標號"; Text[ arabic ] = " "; Text[ turkish ] = "Dipnot sabitleyicisi"; - Text[ catalan ] = "Ancla de nota al pie"; + Text[ catalan ] = "ncora de nota al peu"; Text[ finnish ] = "Alaviitteen ankkuri"; + Text[ thai ] = "สมอเชิงอรรถ"; }; String STR_POOLCHR_ENDNOTE_ANCHOR { @@ -436,24 +450,25 @@ String STR_POOLCHR_ENDNOTE_ANCHOR Text [ English ] = "Endnote anchor" ; Text[ english_us ] = "Endnote anchor"; Text[ portuguese ] = "ncora de nota final"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Eindnootanker"; Text[ french ] = "Appel de note de fin"; - Text[ spanish ] = "Ancla de nota al final"; + Text[ spanish ] = "Ancla de nota final"; Text[ italian ] = "Richiamo di nota di chiusura"; Text[ danish ] = "Slutnoteanker"; Text[ swedish ] = "Slutnotsankare"; Text[ polish ] = "Zakotwiczenie przypisw koc."; Text[ portuguese_brazilian ] = "Endnote anchor"; Text[ japanese ] = "文末脚注参照記号"; - Text[ korean ] = "미주 고정 기준"; + Text[ korean ] = "미주 기준 위치"; Text[ chinese_simplified ] = "尾注标记"; Text[ chinese_traditional ] = "尾註標號"; Text[ arabic ] = " "; Text[ turkish ] = "Sonnot sabitleyicisi"; - Text[ catalan ] = "Ancla de nota al final"; + Text[ catalan ] = "ncora de nota final"; Text[ finnish ] = "Loppuviitteen ankkuri"; + Text[ thai ] = "สมออ้างอิงท้ายเรื่อง"; }; // Zeichenvorlagen fuer HTML @@ -480,8 +495,9 @@ String STR_POOLCHR_HTML_EMPHASIS Text[ korean ] = "강조"; Text[ turkish ] = "Vurgu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Destacado"; + Text[ catalan ] = "mfasi"; Text[ finnish ] = "Painotus"; + Text[ thai ] = "เน้น"; }; String STR_POOLCHR_HTML_CITIATION { @@ -506,8 +522,9 @@ String STR_POOLCHR_HTML_CITIATION Text[ korean ] = "인용"; Text[ turkish ] = "Alnt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cita"; + Text[ catalan ] = "Citaci"; Text[ finnish ] = "Lainaus"; + Text[ thai ] = "การอ้างอิง"; }; String STR_POOLCHR_HTML_STRONG { @@ -532,8 +549,9 @@ String STR_POOLCHR_HTML_STRONG Text[ korean ] = "강한 강조"; Text[ turkish ] = "Kuvvetli vurgu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Muy destacado"; + Text[ catalan ] = "mfasi fort"; Text[ finnish ] = "Vahva painotus"; + Text[ thai ] = "เน้นหนัก"; }; String STR_POOLCHR_HTML_CODE { @@ -551,15 +569,16 @@ String STR_POOLCHR_HTML_CODE Text[ chinese_simplified ] = "源文本"; Text[ russian ] = " "; Text[ polish ] = "Tekst rdowy"; - Text[ japanese ] = "ｿｰｽﾃｷｽﾄ"; + Text[ japanese ] = "ソーステキスト"; Text[ chinese_traditional ] = "原始檔"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "소스 텍스트"; + Text[ korean ] = "원본 텍스트"; Text[ turkish ] = "Kaynak kodu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto fuente"; + Text[ catalan ] = "Text font"; Text[ finnish ] = "Lhdeteksti"; + Text[ thai ] = "แหล่งข้อความ"; }; String STR_POOLCHR_HTML_SAMPLE { @@ -584,14 +603,15 @@ String STR_POOLCHR_HTML_SAMPLE Text[ korean ] = "예"; Text[ turkish ] = "rnek"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ejemplo"; + Text[ catalan ] = "Exemple"; Text[ finnish ] = "Esimerkki"; + Text[ thai ] = "ตัวอย่าง"; }; String STR_POOLCHR_HTML_KEYBOARD { Text = "Benutzereingabe" ; Text [ English ] = "User typed text" ; - Text [ dutch ] = "Gebruikergegevens" ; + Text [ dutch ] = "Gebruikersgegevens" ; Text [ english_us ] = "User Entry" ; Text [ swedish ] = "Anvndarinmatning" ; Text [ danish ] = "Brugerinput" ; @@ -603,15 +623,16 @@ String STR_POOLCHR_HTML_KEYBOARD Text[ chinese_simplified ] = "使用者输入"; Text[ russian ] = " "; Text[ polish ] = "Wpis uytkownika"; - Text[ japanese ] = "ﾕｰｻﾞｰ入力"; + Text[ japanese ] = "ユーザー入力"; Text[ chinese_traditional ] = "使用者輸入"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "사용자 항목"; Text[ turkish ] = "Kullanc girii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Entrada del usuario"; + Text[ catalan ] = "Entrada de l'usuari"; Text[ finnish ] = "Kyttjmerkint"; + Text[ thai ] = "รายการผู้ใช้"; }; String STR_POOLCHR_HTML_VARIABLE { @@ -638,6 +659,7 @@ String STR_POOLCHR_HTML_VARIABLE Text[ language_user1 ] = " "; Text[ catalan ] = "Variable"; Text[ finnish ] = "Muuttuja"; + Text[ thai ] = "ตัวแปร"; }; String STR_POOLCHR_HTML_DEFINSTANCE { @@ -662,8 +684,9 @@ String STR_POOLCHR_HTML_DEFINSTANCE Text[ korean ] = "정의"; Text[ turkish ] = "Tanm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Definicin"; + Text[ catalan ] = "Definici"; Text[ finnish ] = "Mritys"; + Text[ thai ] = "คำจำกัดความ"; }; String STR_POOLCHR_HTML_TELETYPE { @@ -681,15 +704,16 @@ String STR_POOLCHR_HTML_TELETYPE Text[ chinese_simplified ] = "非成比例文字"; Text[ russian ] = " "; Text[ polish ] = "Tekst nieproporcjonalny"; - Text[ japanese ] = "不均整なﾃｷｽﾄ"; + Text[ japanese ] = "等幅フォント"; Text[ chinese_traditional ] = "非成比例文字"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "텔레타이프"; Text[ turkish ] = "Orantsz yaztipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto no proporcional"; + Text[ catalan ] = "Teletip"; Text[ finnish ] = "Konekirjoitusteksti"; + Text[ thai ] = "โทรเลข"; }; // Rahmenvorlagen @@ -707,7 +731,7 @@ String STR_POOLFRM_FRAME Text [ portuguese ] = "Moldura" ; Text [ portuguese_brazilian ] = "Rahmen" ; Text[ chinese_simplified ] = "框"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Ramka"; Text[ japanese ] = "枠"; Text[ language_user1 ] = " "; @@ -716,8 +740,9 @@ String STR_POOLFRM_FRAME Text[ greek ] = ""; Text[ korean ] = "프레임"; Text[ turkish ] = "ereve"; - Text[ catalan ] = "Marco"; + Text[ catalan ] = "Marc"; Text[ finnish ] = "Kehys"; + Text[ thai ] = "กรอบ"; }; String STR_POOLFRM_GRAPHIC { @@ -739,11 +764,12 @@ String STR_POOLFRM_GRAPHIC Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Imagen"; - Text[ finnish ] = "Kuvat"; + Text[ catalan ] = "Grfic"; + Text[ finnish ] = "Grafiikka"; + Text[ thai ] = "กราฟิค"; }; String STR_POOLFRM_OLE { @@ -770,6 +796,7 @@ String STR_POOLFRM_OLE Text[ language_user1 ] = " "; Text[ catalan ] = "OLE"; Text[ finnish ] = "OLE"; + Text[ thai ] = "OLE"; }; String STR_POOLFRM_FORMEL { @@ -796,6 +823,7 @@ String STR_POOLFRM_FORMEL Text[ language_user1 ] = " "; Text[ catalan ] = "Frmula"; Text[ finnish ] = "Kaava"; + Text[ thai ] = "สูตรคำนวณ"; }; String STR_POOLFRM_MARGINAL { @@ -811,7 +839,7 @@ String STR_POOLFRM_MARGINAL Text [ portuguese ] = "Notas margem" ; Text [ portuguese_brazilian ] = "Marginalie" ; Text[ chinese_simplified ] = "旁注"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Marginesy"; Text[ japanese ] = "傍注"; Text[ chinese_traditional ] = "旁註"; @@ -820,8 +848,9 @@ String STR_POOLFRM_MARGINAL Text[ korean ] = "여백"; Text[ turkish ] = "Derkenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al margen"; + Text[ catalan ] = "Comentaris al marge"; Text[ finnish ] = "Reunahuomautukset"; + Text[ thai ] = "หมายเหตุข้าง ๆ"; }; String STR_POOLFRM_WATERSIGN { @@ -830,7 +859,7 @@ String STR_POOLFRM_WATERSIGN Text [ dutch ] = "Watermerk" ; Text [ english_us ] = "Watermark" ; Text [ italian ] = "Filigrana" ; - Text [ spanish ] = "Marca de agua" ; + Text [ spanish ] = "Filigrana" ; Text [ french ] = "Filigrane" ; Text [ swedish ] = "Vattenmrke" ; Text [ danish ] = "Vandmrke" ; @@ -843,11 +872,12 @@ String STR_POOLFRM_WATERSIGN Text[ chinese_traditional ] = "水印"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "배경무늬"; + Text[ korean ] = "워터마크"; Text[ turkish ] = "Filigran"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Marca de agua"; + Text[ catalan ] = "Marca a l'aigua"; Text[ finnish ] = "Vesileima"; + Text[ thai ] = "ลายน้ำ"; }; String STR_POOLFRM_LABEL { @@ -857,7 +887,7 @@ String STR_POOLFRM_LABEL Text [ italian ] = "Etichette" ; Text [ portuguese_brazilian ] = "Etiquetas" ; Text [ portuguese ] = "Etiquetas" ; - Text [ finnish ] = "Nimit" ; + Text [ finnish ] = "Selitteet" ; Text [ danish ] = "Etiketter" ; Text [ french ] = "tiquettes" ; Text [ swedish ] = "Etiketter" ; @@ -865,16 +895,17 @@ String STR_POOLFRM_LABEL Text [ spanish ] = "Etiquetas" ; Text [ english_us ] = "Labels" ; Text[ chinese_simplified ] = "标签"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Etykiety"; - Text[ japanese ] = "ﾗﾍﾞﾙ"; + Text[ japanese ] = "ラベル書き"; Text[ chinese_traditional ] = "貼標"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "라벨"; + Text[ korean ] = "레이블"; Text[ turkish ] = "Etiket"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Etiquetas"; + Text[ catalan ] = "Etiquetes"; + Text[ thai ] = "ป้ายชื่อ"; }; // ----------------- // Vorlagen-Namen @@ -893,17 +924,18 @@ String STR_POOLCOLL_STANDARD Text [ portuguese ] = "Padro" ; Text [ portuguese_brazilian ] = "Standard" ; Text[ chinese_simplified ] = "标准"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Domylnie"; Text[ japanese ] = "標準"; Text[ chinese_traditional ] = "標準"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "표준"; + Text[ korean ] = "기본값"; Text[ turkish ] = "Standart"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Predeterminado"; - Text[ finnish ] = "Vakio"; + Text[ catalan ] = "Per defecte"; + Text[ finnish ] = "Oletus"; + Text[ thai ] = "ค่าเริ่มต้น"; }; String STR_POOLCOLL_TEXT { @@ -926,11 +958,12 @@ String STR_POOLCOLL_TEXT Text[ chinese_traditional ] = "內文"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "텍스트 본문"; + Text[ korean ] = "본문"; Text[ turkish ] = "Metin gvdesi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cuerpo de texto"; + Text[ catalan ] = "Cos del text"; Text[ finnish ] = "Leipteksti"; + Text[ thai ] = "เนื้อความ"; }; String STR_POOLCOLL_TEXT_IDENT { @@ -949,15 +982,16 @@ String STR_POOLCOLL_TEXT_IDENT Text[ chinese_simplified ] = "正文缩进"; Text[ russian ] = " "; Text[ polish ] = "Wcicie pierwszego wiersza"; - Text[ japanese ] = "本文ｲﾝﾃﾞﾝﾄ"; + Text[ japanese ] = "本文インデント"; Text[ chinese_traditional ] = "內文縮排"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "첫 줄 들여쓰기"; Text[ turkish ] = "lk satr girintisi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sangra de primera lnea"; + Text[ catalan ] = "Sagnat de primera lnia"; Text[ finnish ] = "Ensimmisen rivin sisennys"; + Text[ thai ] = "ระยะเยื้องบรรทัดแรก"; }; String STR_POOLCOLL_TEXT_NEGIDENT { @@ -976,15 +1010,16 @@ String STR_POOLCOLL_TEXT_NEGIDENT Text[ chinese_simplified ] = "正文反向缩进"; Text[ russian ] = " "; Text[ polish ] = "Wysunicie tekstu"; - Text[ japanese ] = "本文ﾏｲﾅｽｲﾝﾃﾞﾝﾄ"; + Text[ japanese ] = "本文マイナスインデント"; Text[ chinese_traditional ] = "內文反向縮排"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "내어쓰기"; Text[ turkish ] = "Asl girinti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sangra negativa de primera lnea"; + Text[ catalan ] = "Sagnat negatiu"; Text[ finnish ] = "Riippuva sisennys"; + Text[ thai ] = "ระยะเยื้องลอย"; }; String STR_POOLCOLL_TEXT_MOVE { @@ -1003,15 +1038,16 @@ String STR_POOLCOLL_TEXT_MOVE Text[ chinese_simplified ] = "正文缩进"; Text[ russian ] = " "; Text[ polish ] = "Wcicie tekstu"; - Text[ japanese ] = "ｲﾝﾃﾞﾝﾄ"; + Text[ japanese ] = "インデント"; Text[ language_user1 ] = " "; Text[ chinese_traditional ] = "內文縮排"; Text[ arabic ] = " ( )"; Text[ greek ] = " "; - Text[ korean ] = "텍스트 본문 들여쓰기"; + Text[ korean ] = "본문 들여쓰기"; Text[ turkish ] = "Metin gvdesi girintisi"; - Text[ catalan ] = "Cuerpo de texto con sangra"; + Text[ catalan ] = "Sagnat del cos del text"; Text[ finnish ] = "Sisennetty leipteksti"; + Text[ thai ] = "ระยะเยื้องเนื้อความ"; }; String STR_POOLCOLL_GREETING { @@ -1021,7 +1057,7 @@ String STR_POOLCOLL_GREETING Text [ dutch ] = "Aanhef" ; Text [ english_us ] = "Complimentary close" ; Text [ italian ] = "Formula di saluto" ; - Text [ spanish ] = "Frmula de saludo" ; + Text [ spanish ] = "Frmula de despedida" ; Text [ french ] = "Formule finale" ; Text [ swedish ] = "Hlsningsfras" ; Text [ danish ] = "Sluthilsen" ; @@ -1037,8 +1073,9 @@ String STR_POOLCOLL_GREETING Text[ korean ] = "인사말"; Text[ turkish ] = "Selamlama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Frmula de saludo"; - Text[ finnish ] = "Tervehdys"; + Text[ catalan ] = "Tancament complementari"; + Text[ finnish ] = "Loppusanat"; + Text[ thai ] = "ลงท้ายแสดงความเคารพ"; }; String STR_POOLCOLL_SIGNATURE { @@ -1063,8 +1100,9 @@ String STR_POOLCOLL_SIGNATURE Text[ korean ] = "서명"; Text[ turkish ] = "mza"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Firma"; + Text[ catalan ] = "Signatura"; Text[ finnish ] = "Allekirjoitus"; + Text[ thai ] = "ลายเซ็น"; }; String STR_POOLCOLL_HEADLINE_BASE { @@ -1090,8 +1128,9 @@ String STR_POOLCOLL_HEADLINE_BASE Text[ korean ] = "제목"; Text[ turkish ] = "Balk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado"; + Text[ catalan ] = "Encapalament"; Text[ finnish ] = "Otsikko"; + Text[ thai ] = "หัวข้อ"; }; String STR_POOLCOLL_NUMBUL_BASE { @@ -1109,15 +1148,16 @@ String STR_POOLCOLL_NUMBUL_BASE Text[ chinese_simplified ] = "列单"; Text[ russian ] = ""; Text[ polish ] = "Lista"; - Text[ japanese ] = "ﾘｽﾄ"; + Text[ japanese ] = "リスト"; Text[ chinese_traditional ] = "清單"; Text[ arabic ] = ""; Text[ greek ] = ""; Text[ korean ] = "목록"; Text[ turkish ] = "Liste"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lista"; + Text[ catalan ] = "Llista"; Text[ finnish ] = "Luettelo"; + Text[ thai ] = "รายการ"; }; String STR_POOLCOLL_REGISTER_BASE { @@ -1133,7 +1173,7 @@ String STR_POOLCOLL_REGISTER_BASE Text [ portuguese ] = "ndice" ; Text [ portuguese_brazilian ] = "Verzeichnis" ; Text[ chinese_simplified ] = "目录"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Indeks"; Text[ japanese ] = "索引"; Text[ chinese_traditional ] = "目錄"; @@ -1142,8 +1182,9 @@ String STR_POOLCOLL_REGISTER_BASE Text[ korean ] = "색인"; Text[ turkish ] = "Dizin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice"; + Text[ catalan ] = "ndex"; Text[ finnish ] = "Hakemisto"; + Text[ thai ] = "ดัชนี"; }; String STR_POOLCOLL_CONFRONTATION { @@ -1162,15 +1203,16 @@ String STR_POOLCOLL_CONFRONTATION Text[ chinese_simplified ] = "缩进"; Text[ russian ] = ""; Text[ polish ] = "Wcicie i wysunicie"; - Text[ japanese ] = "ｲﾝﾃﾞﾝﾄ"; + Text[ japanese ] = "リストインデント"; Text[ chinese_traditional ] = "縮排"; Text[ arabic ] = ""; Text[ language_user1 ] = " "; Text[ greek ] = ""; - Text[ korean ] = "대조"; + Text[ korean ] = "들여쓰기 비교 검토"; Text[ turkish ] = "Karlatrma"; - Text[ catalan ] = "Confrontacin"; + Text[ catalan ] = "Sagnat de la llista"; Text[ finnish ] = "Luettelon sisennys"; + Text[ thai ] = "ระยะเยื้องรายการ"; }; String STR_POOLCOLL_MARGINAL { @@ -1186,7 +1228,7 @@ String STR_POOLCOLL_MARGINAL Text [ portuguese ] = "Notas margem" ; Text [ portuguese_brazilian ] = "Marginalie" ; Text[ chinese_simplified ] = "旁注"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Marginesy"; Text[ japanese ] = "傍注"; Text[ language_user1 ] = " "; @@ -1195,8 +1237,9 @@ String STR_POOLCOLL_MARGINAL Text[ greek ] = " "; Text[ korean ] = "여백"; Text[ turkish ] = "Derkenar"; - Text[ catalan ] = "Nota al margen"; + Text[ catalan ] = "Comentaris al marge"; Text[ finnish ] = "Reunahuomautukset"; + Text[ thai ] = "หมายเหตุข้าง ๆ"; }; String STR_POOLCOLL_HEADLINE1 { @@ -1222,8 +1265,9 @@ String STR_POOLCOLL_HEADLINE1 Text[ korean ] = "제목 1"; Text[ turkish ] = "Balk 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 1"; + Text[ catalan ] = "Encapalament 1"; Text[ finnish ] = "Otsikko 1"; + Text[ thai ] = "หัวข้อ 1"; }; String STR_POOLCOLL_HEADLINE2 { @@ -1249,8 +1293,9 @@ String STR_POOLCOLL_HEADLINE2 Text[ korean ] = "제목 2"; Text[ turkish ] = "Balk 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 2"; + Text[ catalan ] = "Encapalament 2"; Text[ finnish ] = "Otsikko 2"; + Text[ thai ] = "หัวข้อ 2"; }; String STR_POOLCOLL_HEADLINE3 { @@ -1276,8 +1321,9 @@ String STR_POOLCOLL_HEADLINE3 Text[ korean ] = "제목 3"; Text[ turkish ] = "Balk 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 3"; + Text[ catalan ] = "Encapalament 3"; Text[ finnish ] = "Otsikko 3"; + Text[ thai ] = "หัวข้อ 3"; }; String STR_POOLCOLL_HEADLINE4 { @@ -1303,8 +1349,9 @@ String STR_POOLCOLL_HEADLINE4 Text[ korean ] = "제목 4"; Text[ turkish ] = "Balk 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 4"; + Text[ catalan ] = "Encapalament 4"; Text[ finnish ] = "Otsikko 4"; + Text[ thai ] = "หัวข้อ 4"; }; String STR_POOLCOLL_HEADLINE5 { @@ -1330,8 +1377,9 @@ String STR_POOLCOLL_HEADLINE5 Text[ korean ] = "제목 5"; Text[ turkish ] = "Balk 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 5"; + Text[ catalan ] = "Encapalament 5"; Text[ finnish ] = "Otsikko 5"; + Text[ thai ] = "หัวข้อ 5"; }; String STR_POOLCOLL_HEADLINE6 { @@ -1357,8 +1405,9 @@ String STR_POOLCOLL_HEADLINE6 Text[ korean ] = "제목 6"; Text[ turkish ] = "Balk 6"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 6"; + Text[ catalan ] = "Encapalament 6"; Text[ finnish ] = "Otsikko 6"; + Text[ thai ] = "หัวข้อ 6"; }; String STR_POOLCOLL_HEADLINE7 { @@ -1384,8 +1433,9 @@ String STR_POOLCOLL_HEADLINE7 Text[ korean ] = "제목 7"; Text[ turkish ] = "Balk 7"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 7"; + Text[ catalan ] = "Encapalament 7"; Text[ finnish ] = "Otsikko 7"; + Text[ thai ] = "หัวข้อ 7"; }; String STR_POOLCOLL_HEADLINE8 { @@ -1411,8 +1461,9 @@ String STR_POOLCOLL_HEADLINE8 Text[ korean ] = "제목 8"; Text[ turkish ] = "Balk 8"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 8"; + Text[ catalan ] = "Encapalament 8"; Text[ finnish ] = "Otsikko 8"; + Text[ thai ] = "หัวข้อ 8"; }; String STR_POOLCOLL_HEADLINE9 { @@ -1435,11 +1486,12 @@ String STR_POOLCOLL_HEADLINE9 Text[ chinese_traditional ] = "標題 9"; Text[ arabic ] = " 9"; Text[ greek ] = " 9"; - Text[ korean ] = "제목 ９"; + Text[ korean ] = "제목 9"; Text[ turkish ] = "Balk 9"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 9"; + Text[ catalan ] = "Encapalament 9"; Text[ finnish ] = "Otsikko 9"; + Text[ thai ] = "หัวข้อ 9"; }; String STR_POOLCOLL_HEADLINE10 { @@ -1465,8 +1517,9 @@ String STR_POOLCOLL_HEADLINE10 Text[ korean ] = "제목 10"; Text[ turkish ] = "Balk 10"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 10"; + Text[ catalan ] = "Encapalament 10"; Text[ finnish ] = "Otsikko 10"; + Text[ thai ] = "หัวข้อ 10"; }; String STR_POOLCOLL_NUM_LEVEL1S { @@ -1491,8 +1544,9 @@ String STR_POOLCOLL_NUM_LEVEL1S Text[ korean ] = "번호 매기기 1 시작"; Text[ turkish ] = "Numaralama 1 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 1 inicio"; + Text[ catalan ] = "Numeraci 1 inici"; Text[ finnish ] = "Numeroinnin 1 alku"; + Text[ thai ] = "เริ่มลำดับตัวเลข 1"; }; String STR_POOLCOLL_NUM_LEVEL1 { @@ -1515,10 +1569,11 @@ String STR_POOLCOLL_NUM_LEVEL1 Text[ chinese_traditional ] = "編號 1"; Text[ arabic ] = " 1"; Text[ greek ] = " 1"; - Text[ korean ] = "번호1"; + Text[ korean ] = "번호 매기기 1"; Text[ turkish ] = "Numaralama 1"; - Text[ catalan ] = "Numeracin 1"; + Text[ catalan ] = "Numeraci 1"; Text[ finnish ] = "Numerointi 1"; + Text[ thai ] = "ลำดับตัวเลข 1"; }; String STR_POOLCOLL_NUM_LEVEL1E { @@ -1540,11 +1595,12 @@ String STR_POOLCOLL_NUM_LEVEL1E Text[ chinese_traditional ] = "編號 1 結尾"; Text[ arabic ] = " 1 "; Text[ greek ] = " 1 "; - Text[ korean ] = "번호 매기기 1 종료"; + Text[ korean ] = "번호 매기기 1 끝"; Text[ turkish ] = "Numaralama 1 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 1 fin"; + Text[ catalan ] = "Numeraci 1 final"; Text[ finnish ] = "Numeroinnin 1 loppu"; + Text[ thai ] = "สิ้นสุดลำดับตัวเลข 1 "; }; String STR_POOLCOLL_NUM_NONUM1 { @@ -1554,7 +1610,7 @@ String STR_POOLCOLL_NUM_NONUM1 Text [ italian ] = "Numerazione 1 succ." ; Text [ spanish ] = "Numeracin 1 continuacin" ; Text [ french ] = "Numrotation 1 suite" ; - Text [ dutch ] = "Nummering 1 voortzetting" ; + Text [ dutch ] = "Nummering 1 vervolg" ; Text [ swedish ] = "Numrering 1 fortsttning" ; Text [ danish ] = "Nummerering 1 fortsttelse" ; Text [ portuguese ] = "Numerao 1 Continuao" ; @@ -1566,11 +1622,12 @@ String STR_POOLCOLL_NUM_NONUM1 Text[ chinese_traditional ] = "編號 1 繼續"; Text[ arabic ] = " 1 "; Text[ greek ] = " 1 "; - Text[ korean ] = "번호 1 계속"; + Text[ korean ] = "번호 매기기 1 계속"; Text[ turkish ] = "Numaralama 1 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 1 continuacin"; + Text[ catalan ] = "Numeraci 1 continuaci"; Text[ finnish ] = "Numeroinnin 1 jatko"; + Text[ thai ] = "ลำดับตัวเลข 1 Cont."; }; String STR_POOLCOLL_NUM_LEVEL2S { @@ -1592,11 +1649,12 @@ String STR_POOLCOLL_NUM_LEVEL2S Text[ chinese_traditional ] = "編號 2 起始"; Text[ arabic ] = " 2 "; Text[ greek ] = " 2 "; - Text[ korean ] = "번호 2 시작"; + Text[ korean ] = "번호 매기기 2 시작"; Text[ turkish ] = "Numaralama 2 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 2 inicio"; + Text[ catalan ] = "Numeraci 2 inici"; Text[ finnish ] = "Numeroinnin 2 alku"; + Text[ thai ] = "เริ่มลำดับตัวเลข 2 "; }; String STR_POOLCOLL_NUM_LEVEL2 { @@ -1618,11 +1676,12 @@ String STR_POOLCOLL_NUM_LEVEL2 Text[ chinese_traditional ] = "編號 2"; Text[ arabic ] = " 2"; Text[ greek ] = " 2"; - Text[ korean ] = "번호2"; + Text[ korean ] = "번호 매기기 2"; Text[ turkish ] = "Numaralama 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 2"; + Text[ catalan ] = "Numeraci 2"; Text[ finnish ] = "Numerointi 2"; + Text[ thai ] = "ลำดับตัวเลข 2"; }; String STR_POOLCOLL_NUM_LEVEL2E { @@ -1644,11 +1703,12 @@ String STR_POOLCOLL_NUM_LEVEL2E Text[ chinese_traditional ] = "編號 2 結尾"; Text[ arabic ] = " 2 "; Text[ greek ] = " 2 "; - Text[ korean ] = "번호 매기기 2 종료"; + Text[ korean ] = "번호 매기기 2 끝"; Text[ turkish ] = "Numaralama 2 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 2 fin"; + Text[ catalan ] = "Numeraci 2 final"; Text[ finnish ] = "Numeroinnin 2 loppu"; + Text[ thai ] = "สิ้นสุดลำดับตัวเลข 2 "; }; String STR_POOLCOLL_NUM_NONUM2 { @@ -1658,7 +1718,7 @@ String STR_POOLCOLL_NUM_NONUM2 Text [ italian ] = "Numerazione 2 succ." ; Text [ spanish ] = "Numeracin 2 continuacin" ; Text [ french ] = "Numrotation 2 suite" ; - Text [ dutch ] = "Nummering 2 voortzetting" ; + Text [ dutch ] = "Nummering 2 vervolg" ; Text [ swedish ] = "Numrering 2 fortsttning" ; Text [ danish ] = "Nummerering 2 fortsttelse" ; Text [ portuguese ] = "Numerao 2 Continuao" ; @@ -1670,11 +1730,12 @@ String STR_POOLCOLL_NUM_NONUM2 Text[ chinese_traditional ] = "編號 2 繼續"; Text[ arabic ] = " 2 "; Text[ greek ] = " 2 "; - Text[ korean ] = "번호 2 계속"; + Text[ korean ] = "번호 매기기 2 계속"; Text[ turkish ] = "Numaralama 2 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 2 continuacin"; + Text[ catalan ] = "Numeraci 2 continuaci"; Text[ finnish ] = "Numeroinnin 2 jatko"; + Text[ thai ] = "ลำดับตัวเลข 2 Cont."; }; String STR_POOLCOLL_NUM_LEVEL3S { @@ -1696,11 +1757,12 @@ String STR_POOLCOLL_NUM_LEVEL3S Text[ chinese_traditional ] = "編號 3 起始"; Text[ arabic ] = " 3 "; Text[ greek ] = " 3 "; - Text[ korean ] = "번호 3 시작"; + Text[ korean ] = "번호 매기기 3 시작"; Text[ turkish ] = "Numaralama 3 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 3 inicio"; + Text[ catalan ] = "Numeraci 3 inici"; Text[ finnish ] = "Numeroinnin 3 alku"; + Text[ thai ] = "เริ่มลำดับตัวเลข 3 "; }; String STR_POOLCOLL_NUM_LEVEL3 { @@ -1722,11 +1784,12 @@ String STR_POOLCOLL_NUM_LEVEL3 Text[ chinese_traditional ] = "編號 3"; Text[ arabic ] = " 3"; Text[ greek ] = " 3"; - Text[ korean ] = "번호 3"; + Text[ korean ] = "번호 매기기 3"; Text[ turkish ] = "Numaralama 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 3"; + Text[ catalan ] = "Numeraci 3"; Text[ finnish ] = "Numerointi 3"; + Text[ thai ] = "ลำดับตัวเลข 3"; }; String STR_POOLCOLL_NUM_LEVEL3E { @@ -1748,11 +1811,12 @@ String STR_POOLCOLL_NUM_LEVEL3E Text[ chinese_traditional ] = "編號 3 結尾"; Text[ arabic ] = " 3 "; Text[ greek ] = " 3 "; - Text[ korean ] = "번호 매기기 3 종료"; + Text[ korean ] = "번호 매기기 3 끝"; Text[ turkish ] = "Numaralama 3 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 3 fin"; + Text[ catalan ] = "Numeraci 3 final"; Text[ finnish ] = "Numeroinnin 3 loppu"; + Text[ thai ] = "สิ้นสุดลำดับตัวเลข 3 "; }; String STR_POOLCOLL_NUM_NONUM3 { @@ -1762,7 +1826,7 @@ String STR_POOLCOLL_NUM_NONUM3 Text [ italian ] = "Numerazione 3 succ." ; Text [ spanish ] = "Numeracin 3 continuacin" ; Text [ french ] = "Numrotation 3 suite" ; - Text [ dutch ] = "Nummering 3 voortzetting" ; + Text [ dutch ] = "Nummering 3 vervolg" ; Text [ swedish ] = "Numrering 3 fortsttning" ; Text [ danish ] = "Nummerering 3 fortsttelse" ; Text [ portuguese ] = "Numerao 3 Continuao" ; @@ -1774,11 +1838,12 @@ String STR_POOLCOLL_NUM_NONUM3 Text[ chinese_traditional ] = "編號 3 繼續"; Text[ arabic ] = " 3 "; Text[ greek ] = " 3 "; - Text[ korean ] = "번호 3 계속"; + Text[ korean ] = "번호 매기기 3 계속"; Text[ turkish ] = "Numaralama 3 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 3 continuacin"; + Text[ catalan ] = "Numeraci 3 continuaci"; Text[ finnish ] = "Numeroinnin 3 jatko"; + Text[ thai ] = "ลำดับตัวเลข 3 Cont."; }; String STR_POOLCOLL_NUM_LEVEL4S { @@ -1800,11 +1865,12 @@ String STR_POOLCOLL_NUM_LEVEL4S Text[ chinese_traditional ] = "編號 4 起始"; Text[ arabic ] = " 4 "; Text[ greek ] = " 4 "; - Text[ korean ] = "번호 4 시작"; + Text[ korean ] = "번호 매기기 4 시작"; Text[ turkish ] = "Numaralama 4 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 4 inicio"; + Text[ catalan ] = "Numeraci 4 inici"; Text[ finnish ] = "Numeroinnin 4 alku"; + Text[ thai ] = "เริ่มลำดับตัวเลข 4 "; }; String STR_POOLCOLL_NUM_LEVEL4 { @@ -1826,11 +1892,12 @@ String STR_POOLCOLL_NUM_LEVEL4 Text[ chinese_traditional ] = "編號 4"; Text[ arabic ] = " 4"; Text[ greek ] = " 4"; - Text[ korean ] = "번호 4"; + Text[ korean ] = "번호 매기기 4"; Text[ turkish ] = "Numaralama 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 4"; + Text[ catalan ] = "Numeraci 4"; Text[ finnish ] = "Numerointi 4"; + Text[ thai ] = "ลำดับตัวเลข 4"; }; String STR_POOLCOLL_NUM_LEVEL4E { @@ -1852,11 +1919,12 @@ String STR_POOLCOLL_NUM_LEVEL4E Text[ chinese_traditional ] = "編號 4 結尾"; Text[ arabic ] = " 4 "; Text[ greek ] = " 4 "; - Text[ korean ] = "번호 매기기 4 종료"; + Text[ korean ] = "번호 매기기 4 끝"; Text[ turkish ] = "Numaralama 4 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 4 fin"; + Text[ catalan ] = "Numeraci 4 final"; Text[ finnish ] = "Numeroinnin 4 loppu"; + Text[ thai ] = "สิ้นสุดลำดับตัวเลข 4 "; }; String STR_POOLCOLL_NUM_NONUM4 { @@ -1866,7 +1934,7 @@ String STR_POOLCOLL_NUM_NONUM4 Text [ italian ] = "Numerazione 4 succ." ; Text [ spanish ] = "Numeracin 4 continuacin" ; Text [ french ] = "Numrotation 4 suite" ; - Text [ dutch ] = "Nummering 4 voortzetting" ; + Text [ dutch ] = "Nummering 4 vervolg" ; Text [ swedish ] = "Numrering 4 fortsttning" ; Text [ danish ] = "Nummerering 4 fortsttelse" ; Text [ portuguese ] = "Numerao 4 Continuao" ; @@ -1878,11 +1946,12 @@ String STR_POOLCOLL_NUM_NONUM4 Text[ chinese_traditional ] = "編號 4 繼續"; Text[ arabic ] = " 4 "; Text[ greek ] = " 4 "; - Text[ korean ] = "번호 4 계속"; + Text[ korean ] = "번호 매기기 4 계속"; Text[ turkish ] = "Numaralama 4 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 4 continuacin"; + Text[ catalan ] = "Numeraci 4 continuaci"; Text[ finnish ] = "Numeroinnin 4 jatko"; + Text[ thai ] = "ลำดับตัวเลข 4 Cont."; }; String STR_POOLCOLL_NUM_LEVEL5S { @@ -1904,11 +1973,12 @@ String STR_POOLCOLL_NUM_LEVEL5S Text[ chinese_traditional ] = "編號 5 起始"; Text[ arabic ] = " 5 "; Text[ greek ] = " 5 "; - Text[ korean ] = "번호 5 시작"; + Text[ korean ] = "번호 매기기 5 시작"; Text[ turkish ] = "Numaralama 5 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 5 inicio"; + Text[ catalan ] = "Numeraci 5 inici"; Text[ finnish ] = "Numeroinnin 5 alku"; + Text[ thai ] = "เริ่มลำดับตัวเลข 5 "; }; String STR_POOLCOLL_NUM_LEVEL5 { @@ -1930,11 +2000,12 @@ String STR_POOLCOLL_NUM_LEVEL5 Text[ chinese_traditional ] = "編號 5"; Text[ arabic ] = " 5"; Text[ greek ] = " 5"; - Text[ korean ] = "번호 5"; + Text[ korean ] = "번호 매기기 5"; Text[ turkish ] = "Numaralama 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 5"; + Text[ catalan ] = "Numeraci 5"; Text[ finnish ] = "Numerointi 5"; + Text[ thai ] = "ลำดับตัวเลข 5"; }; String STR_POOLCOLL_NUM_LEVEL5E { @@ -1956,11 +2027,12 @@ String STR_POOLCOLL_NUM_LEVEL5E Text[ chinese_traditional ] = "編號 5 結尾"; Text[ arabic ] = " 5 "; Text[ greek ] = " 5 "; - Text[ korean ] = "번호 매기기 5 종료"; + Text[ korean ] = "번호 매기기 5 끝"; Text[ turkish ] = "Numaralama 5 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 5 fin"; + Text[ catalan ] = "Numeraci 5 final"; Text[ finnish ] = "Numeroinnin 5 loppu"; + Text[ thai ] = "สิ้นสุดลำดับตัวเลข 5 "; }; String STR_POOLCOLL_NUM_NONUM5 { @@ -1970,7 +2042,7 @@ String STR_POOLCOLL_NUM_NONUM5 Text [ italian ] = "Numerazione 5 succ." ; Text [ spanish ] = "Numeracin 5 continuacin" ; Text [ french ] = "Numrotation 5 suite" ; - Text [ dutch ] = "Nummering 5 voortzetting" ; + Text [ dutch ] = "Nummering 5 vervolg" ; Text [ swedish ] = "Numrering 5 fortsttning" ; Text [ danish ] = "Nummerering 5 fortsttelse" ; Text [ portuguese ] = "Numerao 5 Continuao" ; @@ -1982,11 +2054,12 @@ String STR_POOLCOLL_NUM_NONUM5 Text[ chinese_traditional ] = "編號 5 繼續"; Text[ arabic ] = " 5 "; Text[ greek ] = " 5 "; - Text[ korean ] = "번호 5 계속"; + Text[ korean ] = "번호 매기기 5 계속"; Text[ turkish ] = "Numaralama 5 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 5 continuacin"; + Text[ catalan ] = "Numeraci 5 continuaci"; Text[ finnish ] = "Numeroinnin 5 jatko"; + Text[ thai ] = "ลำดับตัวเลข 5 Cont."; }; String STR_POOLCOLL_BUL_LEVEL1S { @@ -2012,8 +2085,9 @@ String STR_POOLCOLL_BUL_LEVEL1S Text[ korean ] = "글머리 기호 1 시작"; Text[ turkish ] = "Liste 1 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 1 inicio"; + Text[ catalan ] = "Inici de la llista 1"; Text[ finnish ] = "Luettelon 1 alku"; + Text[ thai ] = "เริ่มรายการ 1 "; }; String STR_POOLCOLL_BUL_LEVEL1 { @@ -2039,8 +2113,9 @@ String STR_POOLCOLL_BUL_LEVEL1 Text[ korean ] = "글머리 기호 1"; Text[ turkish ] = "Liste 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 1"; + Text[ catalan ] = "Llista 1"; Text[ finnish ] = "Luettelo 1"; + Text[ thai ] = "รายการ 1"; }; String STR_POOLCOLL_BUL_LEVEL1E { @@ -2066,8 +2141,9 @@ String STR_POOLCOLL_BUL_LEVEL1E Text[ korean ] = "글머리 기호 1 종료"; Text[ turkish ] = "Liste 1 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 1 fin"; + Text[ catalan ] = "Fi de la llista 1"; Text[ finnish ] = "Luettelon 1 loppu"; + Text[ thai ] = "สิ้นสุดรายการ 1 "; }; String STR_POOLCOLL_BUL_NONUM1 { @@ -2078,7 +2154,7 @@ String STR_POOLCOLL_BUL_NONUM1 Text [ italian ] = "Elenco 1 succ." ; Text [ spanish ] = "Enumeracin 1 continuacin" ; Text [ french ] = "Puce 1 suivante" ; - Text [ dutch ] = "Opsomming 1 voortzetting" ; + Text [ dutch ] = "Opsomming 1 vervolg" ; Text [ swedish ] = "Punktuppstllning 1 fortsttning" ; Text [ danish ] = "Punktopstilling 1 fortsttelse" ; Text [ portuguese ] = "Marca 1 Continuao" ; @@ -2093,8 +2169,9 @@ String STR_POOLCOLL_BUL_NONUM1 Text[ korean ] = "글머리 기호 1 계속"; Text[ turkish ] = "Liste 1 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 1 continuacin"; + Text[ catalan ] = "Enumeraci 1 continuaci"; Text[ finnish ] = "Luettelo 1 jatkuu"; + Text[ thai ] = "รายการ 1 Cont."; }; String STR_POOLCOLL_BUL_LEVEL2S { @@ -2120,8 +2197,9 @@ String STR_POOLCOLL_BUL_LEVEL2S Text[ korean ] = "글머리 기호 2 시작"; Text[ turkish ] = "Liste 2 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 2 inicio"; + Text[ catalan ] = "Inici de la llista 2"; Text[ finnish ] = "Luettelon 2 alku"; + Text[ thai ] = "เริ่มรายการ 2 "; }; String STR_POOLCOLL_BUL_LEVEL2 { @@ -2147,8 +2225,9 @@ String STR_POOLCOLL_BUL_LEVEL2 Text[ korean ] = "글머리 기호 2"; Text[ turkish ] = "Liste 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 2"; + Text[ catalan ] = "Llista 2"; Text[ finnish ] = "Luettelo 2"; + Text[ thai ] = "รายการ 2"; }; String STR_POOLCOLL_BUL_LEVEL2E { @@ -2165,7 +2244,7 @@ String STR_POOLCOLL_BUL_LEVEL2E Text [ portuguese ] = "Marca 2 Fim" ; Text [ portuguese_brazilian ] = "Aufz?hlung 2 Ende" ; Text[ chinese_simplified ] = "项目符号 2 结束"; - Text[ russian ] = " 2"; + Text[ russian ] = " 2"; Text[ polish ] = "Koniec listy 2 "; Text[ japanese ] = "箇条書き 2 終り"; Text[ language_user1 ] = " "; @@ -2174,8 +2253,9 @@ String STR_POOLCOLL_BUL_LEVEL2E Text[ greek ] = " 2 "; Text[ korean ] = "글머리 기호 2 종료"; Text[ turkish ] = "Liste 2 Son"; - Text[ catalan ] = "Enumeracin 2 fin"; + Text[ catalan ] = "Fi de la llista 2"; Text[ finnish ] = "Luettelon 2 loppu"; + Text[ thai ] = "สิ้นสุดรายการ 2 "; }; String STR_POOLCOLL_BUL_NONUM2 { @@ -2186,7 +2266,7 @@ String STR_POOLCOLL_BUL_NONUM2 Text [ italian ] = "Elenco 2 succ." ; Text [ spanish ] = "Enumeracin 2 continuacin" ; Text [ french ] = "Puce 2 suivante" ; - Text [ dutch ] = "Opsomming 2 voortzetting" ; + Text [ dutch ] = "Opsomming 2 vervolg" ; Text [ swedish ] = "Punktuppstllning 2 fortsttning" ; Text [ danish ] = "Punktopstilling 2 fortsttelse" ; Text [ portuguese ] = "Marca 2 Continuao" ; @@ -2201,8 +2281,9 @@ String STR_POOLCOLL_BUL_NONUM2 Text[ korean ] = "글머리 기호 2 계속"; Text[ turkish ] = "Liste 2 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 2 continuacin"; + Text[ catalan ] = "Enumeraci 2 continuaci"; Text[ finnish ] = "Luettelo 2 jatkuu"; + Text[ thai ] = "รายการ 2 Cont."; }; String STR_POOLCOLL_BUL_LEVEL3S { @@ -2228,8 +2309,9 @@ String STR_POOLCOLL_BUL_LEVEL3S Text[ korean ] = "글머리 기호 3 시작"; Text[ turkish ] = "Liste 3 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 3 inicio"; + Text[ catalan ] = "Inici de la llista 3"; Text[ finnish ] = "Luettelon 3 alku"; + Text[ thai ] = "เริ่มรายการ 3 "; }; String STR_POOLCOLL_BUL_LEVEL3 { @@ -2255,8 +2337,9 @@ String STR_POOLCOLL_BUL_LEVEL3 Text[ korean ] = "글머리 기호 3"; Text[ turkish ] = "Liste 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 3"; + Text[ catalan ] = "Llista 3"; Text[ finnish ] = "Luettelo 3"; + Text[ thai ] = "รายการ 3"; }; String STR_POOLCOLL_BUL_LEVEL3E { @@ -2282,8 +2365,9 @@ String STR_POOLCOLL_BUL_LEVEL3E Text[ korean ] = "글머리 기호 3 종료"; Text[ turkish ] = "Liste 3 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 3 fin"; + Text[ catalan ] = "Fi de la llista 3"; Text[ finnish ] = "Luettelon 3 loppu"; + Text[ thai ] = "สิ้นสุดรายการ 3 "; }; String STR_POOLCOLL_BUL_NONUM3 { @@ -2294,7 +2378,7 @@ String STR_POOLCOLL_BUL_NONUM3 Text [ italian ] = "Elenco 3 succ." ; Text [ spanish ] = "Enumeracin 3 continuacin" ; Text [ french ] = "Puce 3 suivante" ; - Text [ dutch ] = "Opsomming 3 voortzetting" ; + Text [ dutch ] = "Opsomming 3 vervolg" ; Text [ swedish ] = "Punktuppstllning 3 fortsttning" ; Text [ danish ] = "Punktopstilling 3 fortsttelse" ; Text [ portuguese ] = "Marca 3 Continuao" ; @@ -2309,8 +2393,9 @@ String STR_POOLCOLL_BUL_NONUM3 Text[ korean ] = "글머리 기호 3 계속"; Text[ turkish ] = "Liste 3 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 3 continuacin"; + Text[ catalan ] = "Enumeraci 3 continuaci"; Text[ finnish ] = "Luettelo 3 jatkuu"; + Text[ thai ] = "รายการ 3 Cont."; }; String STR_POOLCOLL_BUL_LEVEL4S { @@ -2336,8 +2421,9 @@ String STR_POOLCOLL_BUL_LEVEL4S Text[ korean ] = "글머리 기호 4 시작"; Text[ turkish ] = "Liste 4 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 4 inicio"; + Text[ catalan ] = "Inici de la llista 4"; Text[ finnish ] = "Luettelon 4 alku"; + Text[ thai ] = "เริ่มรายการ 4 "; }; String STR_POOLCOLL_BUL_LEVEL4 { @@ -2363,8 +2449,9 @@ String STR_POOLCOLL_BUL_LEVEL4 Text[ korean ] = "글머리 기호 4"; Text[ turkish ] = "Liste 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 4"; + Text[ catalan ] = "Llista 4"; Text[ finnish ] = "Luettelo 4"; + Text[ thai ] = "รายการ 4"; }; String STR_POOLCOLL_BUL_LEVEL4E { @@ -2390,8 +2477,9 @@ String STR_POOLCOLL_BUL_LEVEL4E Text[ korean ] = "글머리 기호 4 종료"; Text[ turkish ] = "Liste 4 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 4 fin"; + Text[ catalan ] = "Fi de la llista 4"; Text[ finnish ] = "Luettelon 4 loppu"; + Text[ thai ] = "สิ้นสุดรายการ 4 "; }; String STR_POOLCOLL_BUL_NONUM4 { @@ -2402,7 +2490,7 @@ String STR_POOLCOLL_BUL_NONUM4 Text [ italian ] = "Elenco 4 succ." ; Text [ spanish ] = "Enumeracin 4 continuacin" ; Text [ french ] = "Puce 4 suivante" ; - Text [ dutch ] = "Opsomming 4 voortzetting" ; + Text [ dutch ] = "Opsomming 4 vervolg" ; Text [ swedish ] = "Punktuppstllning 4 fortsttning" ; Text [ danish ] = "Punktopstilling 4 fortsttelse" ; Text [ portuguese ] = "Marca 4 Continuao" ; @@ -2417,8 +2505,9 @@ String STR_POOLCOLL_BUL_NONUM4 Text[ korean ] = "글머리 기호 4 계속"; Text[ turkish ] = "Liste 4 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 4 continuacin"; + Text[ catalan ] = "Enumeraci 4 continuaci"; Text[ finnish ] = "Luettelo 4 jatkuu"; + Text[ thai ] = "รายการ 4 Cont."; }; String STR_POOLCOLL_BUL_LEVEL5S { @@ -2444,8 +2533,9 @@ String STR_POOLCOLL_BUL_LEVEL5S Text[ korean ] = "글머리 기호 5 시작"; Text[ turkish ] = "Liste 5 Balang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 5 inicio"; + Text[ catalan ] = "Inici de la llista 5"; Text[ finnish ] = "Luettelon 5 alku"; + Text[ thai ] = "เริ่มรายการ 5 "; }; String STR_POOLCOLL_BUL_LEVEL5 { @@ -2471,8 +2561,9 @@ String STR_POOLCOLL_BUL_LEVEL5 Text[ korean ] = "글머리 기호 5"; Text[ turkish ] = "Liste 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 5"; + Text[ catalan ] = "Llista 5"; Text[ finnish ] = "Luettelo 5"; + Text[ thai ] = "รายการ 5"; }; String STR_POOLCOLL_BUL_LEVEL5E { @@ -2495,11 +2586,12 @@ String STR_POOLCOLL_BUL_LEVEL5E Text[ chinese_traditional ] = "項目符號 5 結束"; Text[ arabic ] = " 5 "; Text[ greek ] = " 5 "; - Text[ korean ] = "글머리 기호 ５ 종료"; + Text[ korean ] = "글머리 기호 5 종료"; Text[ turkish ] = "Liste 5 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 5 fin"; + Text[ catalan ] = "Fi de la llista 5"; Text[ finnish ] = "Luettelon 5 loppu"; + Text[ thai ] = "สิ้นสุดรายการ 5 "; }; String STR_POOLCOLL_BUL_NONUM5 { @@ -2510,7 +2602,7 @@ String STR_POOLCOLL_BUL_NONUM5 Text [ italian ] = "Elenco 5 succ." ; Text [ spanish ] = "Enumeracin 5 continuacin" ; Text [ french ] = "Puce 5 suivante" ; - Text [ dutch ] = "Opsomming 5 voortzetting" ; + Text [ dutch ] = "Opsomming 5 vervolg" ; Text [ swedish ] = "Punktuppstllning 5 fortsttning" ; Text [ danish ] = "Punktopstilling 5 fortsttelse" ; Text [ portuguese ] = "Marca 5 Continuao" ; @@ -2525,8 +2617,9 @@ String STR_POOLCOLL_BUL_NONUM5 Text[ korean ] = "글머리 기호 5 계속"; Text[ turkish ] = "Liste 5 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 5 continuacin"; + Text[ catalan ] = "Enumeraci 5 continuaci"; Text[ finnish ] = "Luettelo 5 jatkuu"; + Text[ thai ] = "รายการ 5 Cont."; }; String STR_POOLCOLL_HEADER { @@ -2544,15 +2637,16 @@ String STR_POOLCOLL_HEADER Text[ chinese_simplified ] = "页眉"; Text[ russian ] = " "; Text[ polish ] = "Nagwek"; - Text[ japanese ] = "ﾍｯﾀﾞ"; + Text[ japanese ] = "ヘッダ"; Text[ chinese_traditional ] = "頁首"; Text[ arabic ] = " "; Text[ greek ] = ""; Text[ korean ] = "머리글"; Text[ turkish ] = "stbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento"; - Text[ finnish ] = "Ylotsikko"; + Text[ catalan ] = "Capalera"; + Text[ finnish ] = "Yltunniste"; + Text[ thai ] = "ส่วนหัว"; }; String STR_POOLCOLL_HEADERL { @@ -2570,15 +2664,16 @@ String STR_POOLCOLL_HEADERL Text[ chinese_simplified ] = "左页眉"; Text[ russian ] = " "; Text[ polish ] = "Nagwek z lewej strony"; - Text[ japanese ] = "ﾍｯﾀﾞ左"; + Text[ japanese ] = "ヘッダ左"; Text[ chinese_traditional ] = "左頁首"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "머리글 왼쪽"; Text[ turkish ] = "Sol stbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento izquierdo"; - Text[ finnish ] = "Ylotsikko vasemmalla"; + Text[ catalan ] = "Capalera esquerra"; + Text[ finnish ] = "Yltunniste vasemmalla"; + Text[ thai ] = "ส่วนหัวด้านซ้าย"; }; String STR_POOLCOLL_HEADERR { @@ -2596,15 +2691,16 @@ String STR_POOLCOLL_HEADERR Text[ chinese_simplified ] = "右页眉"; Text[ russian ] = " "; Text[ polish ] = "Nagwek z prawej strony"; - Text[ japanese ] = "ﾍｯﾀﾞ右"; + Text[ japanese ] = "ヘッダ右"; Text[ chinese_traditional ] = "右頁首"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "머리글 오른쪽"; Text[ turkish ] = "Sa stbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento derecho"; - Text[ finnish ] = "Ylotsikko oikealla"; + Text[ catalan ] = "Capalera dreta"; + Text[ finnish ] = "Yltunniste oikealla"; + Text[ thai ] = "ส่วนหัวด้านขวา"; }; String STR_POOLCOLL_FOOTER { @@ -2623,15 +2719,16 @@ String STR_POOLCOLL_FOOTER Text[ chinese_simplified ] = "页脚"; Text[ russian ] = " "; Text[ polish ] = "Stopka"; - Text[ japanese ] = "ﾌｯﾀ"; + Text[ japanese ] = "フッタ"; Text[ chinese_traditional ] = "頁尾"; Text[ arabic ] = " "; Text[ greek ] = ""; Text[ korean ] = "바닥글"; Text[ turkish ] = "Altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de pgina"; - Text[ finnish ] = "Alaselite"; + Text[ catalan ] = "Peu de pgina"; + Text[ finnish ] = "Alatunniste"; + Text[ thai ] = "ส่วนท้าย"; }; String STR_POOLCOLL_FOOTERL { @@ -2650,15 +2747,16 @@ String STR_POOLCOLL_FOOTERL Text[ chinese_simplified ] = "左页脚"; Text[ russian ] = " "; Text[ polish ] = "Stopka z lewej strony"; - Text[ japanese ] = "ﾌｯﾀ 左"; + Text[ japanese ] = "フッタ 左"; Text[ chinese_traditional ] = "左頁尾"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "바닥글 왼쪽"; Text[ turkish ] = "Sol altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de pgina izquierdo"; - Text[ finnish ] = "Alaselite vasemmalla"; + Text[ catalan ] = "Peu de pgina esquerre"; + Text[ finnish ] = "Alatunniste vasemmalla"; + Text[ thai ] = "ส่วนท้ายด้านซ้าย"; }; String STR_POOLCOLL_FOOTERR { @@ -2677,15 +2775,16 @@ String STR_POOLCOLL_FOOTERR Text[ chinese_simplified ] = "右页脚"; Text[ russian ] = " "; Text[ polish ] = "Stopka z prawej strony"; - Text[ japanese ] = "ﾌｯﾀ 右"; + Text[ japanese ] = "フッタ 右"; Text[ chinese_traditional ] = "右頁尾"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "바닥글 오른쪽"; Text[ turkish ] = "Sa altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de pgina derecho"; - Text[ finnish ] = "Alaselite oikealla"; + Text[ catalan ] = "Peu de pgina dret"; + Text[ finnish ] = "Alatunniste oikealla"; + Text[ thai ] = "ส่วนท้ายด้านขวา"; }; String STR_POOLCOLL_TABLE { @@ -2707,11 +2806,12 @@ String STR_POOLCOLL_TABLE Text[ chinese_traditional ] = "表格內容"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "표 내용"; + Text[ korean ] = "표 목차"; Text[ turkish ] = "Tablo ierii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido de la tabla"; + Text[ catalan ] = "Contingut de la taula"; Text[ finnish ] = "Taulukon sislt"; + Text[ thai ] = "เนื้อหาตาราง"; }; String STR_POOLCOLL_TABLE_HDLN { @@ -2734,17 +2834,18 @@ String STR_POOLCOLL_TABLE_HDLN Text[ chinese_traditional ] = "表格標題"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "표제목"; + Text[ korean ] = "표 제목"; Text[ turkish ] = "Tablo bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado de la tabla"; + Text[ catalan ] = "Encapalament de la taula"; Text[ finnish ] = "Taulukon otsikko"; + Text[ thai ] = "หัวข้อตาราง"; }; String STR_POOLCOLL_FRAME { Text = "Rahmeninhalt" ; Text [ English ] = "Frame body" ; - Text [ dutch ] = "Inhoud kader" ; + Text [ dutch ] = "Kaderinhoud" ; Text [ english_us ] = "Frame contents" ; Text [ italian ] = "Contenuto cornice" ; Text [ spanish ] = "Contenido del marco" ; @@ -2754,7 +2855,7 @@ String STR_POOLCOLL_FRAME Text [ portuguese ] = "Contedo da moldura" ; Text [ portuguese_brazilian ] = "Rahmeninhalt" ; Text[ chinese_simplified ] = "框内容"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zawarto ramki"; Text[ japanese ] = "枠の内容"; Text[ chinese_traditional ] = "訊框內容"; @@ -2763,8 +2864,9 @@ String STR_POOLCOLL_FRAME Text[ korean ] = "프레임 내용"; Text[ turkish ] = "ereve ierii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido del marco"; + Text[ catalan ] = "Contingut del marc"; Text[ finnish ] = "Kehyksen sislt"; + Text[ thai ] = "เนื้อหากรอบ"; }; String STR_POOLCOLL_FOOTNOTE { @@ -2790,8 +2892,9 @@ String STR_POOLCOLL_FOOTNOTE Text[ korean ] = "각주"; Text[ turkish ] = "Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al pie"; + Text[ catalan ] = "Nota al peu"; Text[ finnish ] = "Alaviite"; + Text[ thai ] = "เชิงอรรถ"; }; String STR_POOLCOLL_ENDNOTE { @@ -2803,7 +2906,7 @@ String STR_POOLCOLL_ENDNOTE Text [ swedish ] = "Slutnot" ; Text [ danish ] = "Slutnote" ; Text [ italian ] = "Nota di chiusura" ; - Text [ spanish ] = "Nota al final" ; + Text [ spanish ] = "Nota final" ; Text [ french ] = "Note de fin" ; Text [ dutch ] = "Eindnoot" ; Text[ chinese_simplified ] = "尾注"; @@ -2816,8 +2919,9 @@ String STR_POOLCOLL_ENDNOTE Text[ korean ] = "미주"; Text[ turkish ] = "Sonnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al final"; - Text[ finnish ] = "Loppuhuomautus"; + Text[ catalan ] = "Nota final"; + Text[ finnish ] = "Loppuviite"; + Text[ thai ] = "อ้างอิงท้ายเรื่อง"; }; String STR_POOLCOLL_LABEL { @@ -2833,7 +2937,7 @@ String STR_POOLCOLL_LABEL Text [ portuguese ] = "Legenda" ; Text [ portuguese_brazilian ] = "Beschriftung" ; Text[ chinese_simplified ] = "标签"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Etykieta"; Text[ japanese ] = "図表番号"; Text[ chinese_traditional ] = "標籤"; @@ -2842,8 +2946,9 @@ String STR_POOLCOLL_LABEL Text[ korean ] = "캡션"; Text[ turkish ] = "Yaz"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Etiqueta"; + Text[ catalan ] = "Llegenda"; Text[ finnish ] = "Kuvaotsikko"; + Text[ thai ] = "คำอธิบายเฉพาะ"; }; String STR_POOLCOLL_LABEL_ABB { @@ -2861,15 +2966,16 @@ String STR_POOLCOLL_LABEL_ABB Text[ chinese_simplified ] = "插图"; Text[ russian ] = ""; Text[ polish ] = "Ilustracja"; - Text[ japanese ] = "ｲﾗｽﾄﾚｰｼｮﾝ"; + Text[ japanese ] = "図"; Text[ chinese_traditional ] = "插圖"; Text[ arabic ] = " "; Text[ greek ] = ""; - Text[ korean ] = "그림"; + Text[ korean ] = "삽화"; Text[ turkish ] = "Resim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ilustracin"; + Text[ catalan ] = "Il.lustraci"; Text[ finnish ] = "Kuvitus"; + Text[ thai ] = "ภาพประกอบ"; }; String STR_POOLCOLL_LABEL_TABLE { @@ -2894,8 +3000,9 @@ String STR_POOLCOLL_LABEL_TABLE Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabla"; + Text[ catalan ] = "Taula"; Text[ finnish ] = "Taulukko"; + Text[ thai ] = "ตาราง"; }; String STR_POOLCOLL_LABEL_FRAME { @@ -2913,15 +3020,16 @@ String STR_POOLCOLL_LABEL_FRAME Text[ chinese_simplified ] = "文字"; Text[ russian ] = ""; Text[ polish ] = "Tekst"; - Text[ japanese ] = "ﾃｷｽﾄ"; + Text[ japanese ] = "テキスト"; Text[ chinese_traditional ] = "內文"; Text[ arabic ] = ""; Text[ greek ] = ""; Text[ korean ] = "텍스트"; Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto"; + Text[ catalan ] = "Text"; Text[ finnish ] = "Teksti"; + Text[ thai ] = "ข้อความ"; }; String STR_POOLCOLL_LABEL_DRAWING { @@ -2946,8 +3054,9 @@ String STR_POOLCOLL_LABEL_DRAWING Text[ korean ] = "그리기"; Text[ turkish ] = "izim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dibujo"; - Text[ finnish ] = "Piirustus"; + Text[ catalan ] = "Dibuix"; + Text[ finnish ] = "Piirros"; + Text[ thai ] = "วาดรูป"; }; String STR_POOLCOLL_JAKETADRESS { @@ -2973,8 +3082,9 @@ String STR_POOLCOLL_JAKETADRESS Text[ korean ] = "받는 사람"; Text[ turkish ] = "Alc"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Destinatario"; + Text[ catalan ] = "Destinatari"; Text[ finnish ] = "Saaja"; + Text[ thai ] = "ผู้รับ"; }; String STR_POOLCOLL_SENDADRESS { @@ -2999,8 +3109,9 @@ String STR_POOLCOLL_SENDADRESS Text[ korean ] = "보낸 사람"; Text[ turkish ] = "Gnderen"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Remitente"; + Text[ catalan ] = "Remitent"; Text[ finnish ] = "Lhettj"; + Text[ thai ] = "ผู้ส่ง"; }; String STR_POOLCOLL_TOX_IDXH { @@ -3023,11 +3134,12 @@ String STR_POOLCOLL_TOX_IDXH Text[ chinese_traditional ] = "索引目錄 標題"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "표제어 색인"; + Text[ korean ] = "색인 제목"; Text[ turkish ] = "Alfabetik dizin bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado del ndice alfabtico"; + Text[ catalan ] = "Encapalament de l'ndex"; Text[ finnish ] = "Hakemiston otsikko"; + Text[ thai ] = "หัวเรื่องดัชนี"; }; String STR_POOLCOLL_TOX_IDX1 { @@ -3052,8 +3164,9 @@ String STR_POOLCOLL_TOX_IDX1 Text[ korean ] = "색인 1"; Text[ turkish ] = "Alfabetik dizin 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice afabtico 1"; + Text[ catalan ] = "ndex 1"; Text[ finnish ] = "Hakemisto 1"; + Text[ thai ] = "ดัชนี 1"; }; String STR_POOLCOLL_TOX_IDX2 { @@ -3078,8 +3191,9 @@ String STR_POOLCOLL_TOX_IDX2 Text[ korean ] = "색인 2"; Text[ turkish ] = "Alfabetik dizin 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice alfabtico 2"; + Text[ catalan ] = "ndex 2"; Text[ finnish ] = "Hakemisto 2"; + Text[ thai ] = "ดัชนี 2"; }; String STR_POOLCOLL_TOX_IDX3 { @@ -3104,8 +3218,9 @@ String STR_POOLCOLL_TOX_IDX3 Text[ korean ] = "색인 3"; Text[ turkish ] = "Alfabetik dizin 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice alfabtico 3"; + Text[ catalan ] = "ndex 3"; Text[ finnish ] = "Hakemisto 3"; + Text[ thai ] = "ดัชนี 3"; }; String STR_POOLCOLL_TOX_IDXBREAK { @@ -3123,15 +3238,16 @@ String STR_POOLCOLL_TOX_IDXBREAK Text[ chinese_simplified ] = "索引目录 分隔符"; Text[ russian ] = " "; Text[ polish ] = "Separator skorowidza"; - Text[ japanese ] = "索引 ｾﾊﾟﾚｰﾀ"; + Text[ japanese ] = "索引 セパレータ"; Text[ chinese_traditional ] = "索引目錄 分隔符"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "색인 구분자"; + Text[ korean ] = "구분 기호 색인"; Text[ turkish ] = "Alfabetik dizin ayrma iareti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Separador del ndice alfabtico"; + Text[ catalan ] = "Separador de l'ndex"; Text[ finnish ] = "Hakemistoerotin"; + Text[ thai ] = "ตัวแยกดัชนี"; }; String STR_POOLCOLL_TOX_CNTNTH { @@ -3157,8 +3273,9 @@ String STR_POOLCOLL_TOX_CNTNTH Text[ korean ] = "목차 제목"; Text[ turkish ] = "indekiler dizini bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado del ndice"; + Text[ catalan ] = "Encapalament de l'ndex"; Text[ finnish ] = "Sisltotsikko"; + Text[ thai ] = "หัวเรื่องเนื้อหา"; }; String STR_POOLCOLL_TOX_CNTNT1 { @@ -3183,8 +3300,9 @@ String STR_POOLCOLL_TOX_CNTNT1 Text[ korean ] = "목차 1"; Text[ turkish ] = "indekiler dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice 1"; + Text[ catalan ] = "Contingut 1"; Text[ finnish ] = "Sislt 1"; + Text[ thai ] = "เนื้อหา 1"; }; String STR_POOLCOLL_TOX_CNTNT2 { @@ -3209,8 +3327,9 @@ String STR_POOLCOLL_TOX_CNTNT2 Text[ korean ] = "목차 2"; Text[ turkish ] = "indekiler dizini 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice 2"; + Text[ catalan ] = "Contingut 2"; Text[ finnish ] = "Sislt 2"; + Text[ thai ] = "เนื้อหา 2"; }; String STR_POOLCOLL_TOX_CNTNT3 { @@ -3235,8 +3354,9 @@ String STR_POOLCOLL_TOX_CNTNT3 Text[ korean ] = "목차 3"; Text[ turkish ] = "indekiler dizini 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice 3"; + Text[ catalan ] = "Contingut 3"; Text[ finnish ] = "Sislt 3"; + Text[ thai ] = "เนื้อหา 3"; }; String STR_POOLCOLL_TOX_CNTNT4 { @@ -3261,8 +3381,9 @@ String STR_POOLCOLL_TOX_CNTNT4 Text[ korean ] = "목차 4"; Text[ turkish ] = "indekiler dizini 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice 4"; + Text[ catalan ] = "Contingut 4"; Text[ finnish ] = "Sislt 4"; + Text[ thai ] = "เนื้อหา 4"; }; String STR_POOLCOLL_TOX_CNTNT5 { @@ -3287,8 +3408,9 @@ String STR_POOLCOLL_TOX_CNTNT5 Text[ korean ] = "목차 5"; Text[ turkish ] = "indekiler dizini 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice 5"; + Text[ catalan ] = "Contingut 5"; Text[ finnish ] = "Sislt 5"; + Text[ thai ] = "เนื้อหา 5"; }; String STR_POOLCOLL_TOX_CNTNT6 { @@ -3313,8 +3435,9 @@ String STR_POOLCOLL_TOX_CNTNT6 Text[ korean ] = "목차 6"; Text[ turkish ] = "indekiler dizini 6"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice 6"; + Text[ catalan ] = "Contingut 6"; Text[ finnish ] = "Sislt 6"; + Text[ thai ] = "เนื้อหา 6"; }; String STR_POOLCOLL_TOX_CNTNT7 { @@ -3339,8 +3462,9 @@ String STR_POOLCOLL_TOX_CNTNT7 Text[ korean ] = "목차 7"; Text[ turkish ] = "indekiler dizini 7"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice 7"; + Text[ catalan ] = "Contingut 7"; Text[ finnish ] = "Sislt 7"; + Text[ thai ] = "เนื้อหา 7"; }; String STR_POOLCOLL_TOX_CNTNT8 { @@ -3365,8 +3489,9 @@ String STR_POOLCOLL_TOX_CNTNT8 Text[ korean ] = "목차 8"; Text[ turkish ] = "indekiler dizini 8"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice 8"; + Text[ catalan ] = "Contingut 8"; Text[ finnish ] = "Sislt 8"; + Text[ thai ] = "เนื้อหา 8"; }; String STR_POOLCOLL_TOX_CNTNT9 { @@ -3391,8 +3516,9 @@ String STR_POOLCOLL_TOX_CNTNT9 Text[ korean ] = "목차 9"; Text[ turkish ] = "indekiler dizini 9"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice 9"; + Text[ catalan ] = "Contingut 9"; Text[ finnish ] = "Sislt 9"; + Text[ thai ] = "เนื้อหา 9"; }; String STR_POOLCOLL_TOX_CNTNT10 { @@ -3417,8 +3543,9 @@ String STR_POOLCOLL_TOX_CNTNT10 Text[ korean ] = "목차 10"; Text[ turkish ] = "indekiler dizini 10"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndicel 10"; + Text[ catalan ] = "Contingut 10"; Text[ finnish ] = "Sislt 10"; + Text[ thai ] = "เนื้อหา 10"; }; String STR_POOLCOLL_TOX_USERH { @@ -3435,17 +3562,18 @@ String STR_POOLCOLL_TOX_USERH Text [ portuguese ] = "Ttulo do ndice do utilizador" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis ?berschrift" ; Text[ chinese_simplified ] = "使用者目录 标题"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Tytu indeksu uytkownika"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 見出し"; + Text[ japanese ] = "ユーザー定義の索引 見出し"; Text[ chinese_traditional ] = "自訂目錄標題"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "사용자 색인 제목"; Text[ turkish ] = "Kullanc dizini bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado del ndice del usuario"; + Text[ catalan ] = "Encapalament de l'ndex d'usuari"; Text[ finnish ] = "Kyttjhakemiston otsikko"; + Text[ thai ] = "หัวเรื่องดัชนีผู้ใช้"; }; String STR_POOLCOLL_TOX_USER1 { @@ -3461,17 +3589,18 @@ String STR_POOLCOLL_TOX_USER1 Text [ portuguese ] = "ndice do utilizador 1" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 1" ; Text[ chinese_simplified ] = "使用者目录 1"; - Text[ russian ] = " 1"; + Text[ russian ] = " 1"; Text[ polish ] = "Indeks uytkownika 1"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 1"; + Text[ japanese ] = "ユーザー定義の索引 1"; Text[ chinese_traditional ] = "自訂目錄 1"; Text[ arabic ] = " 1"; Text[ greek ] = " 1"; Text[ korean ] = "사용자 색인 1"; Text[ turkish ] = "Kullanc dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 1"; + Text[ catalan ] = "ndex d'usuari 1"; Text[ finnish ] = "Kyttjhakemisto 1"; + Text[ thai ] = "ดัชนีผู้ใช้ 1"; }; String STR_POOLCOLL_TOX_USER2 { @@ -3487,17 +3616,18 @@ String STR_POOLCOLL_TOX_USER2 Text [ portuguese ] = "ndice do utilizador 2" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 2" ; Text[ chinese_simplified ] = "使用者目录 2"; - Text[ russian ] = " 2"; + Text[ russian ] = " 2"; Text[ polish ] = "Indeks uytkownika 2"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 2"; + Text[ japanese ] = "ユーザー定義の索引 2"; Text[ chinese_traditional ] = "自訂目錄 2"; Text[ arabic ] = " 2"; Text[ greek ] = " 2"; Text[ korean ] = "사용자 색인 2"; Text[ turkish ] = "Kullanc dizini 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 2"; + Text[ catalan ] = "ndex d'usuari 2"; Text[ finnish ] = "Kyttjhakemisto 2"; + Text[ thai ] = "ดัชนีผู้ใช้ 2"; }; String STR_POOLCOLL_TOX_USER3 { @@ -3513,17 +3643,18 @@ String STR_POOLCOLL_TOX_USER3 Text [ portuguese ] = "ndice do utilizador 3" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 3" ; Text[ chinese_simplified ] = "使用者目录 3"; - Text[ russian ] = " 3"; + Text[ russian ] = " 3"; Text[ polish ] = "Indeks uytkownika 3"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 3"; + Text[ japanese ] = "ユーザー定義の索引 3"; Text[ chinese_traditional ] = "自訂目錄 3"; Text[ arabic ] = " 3"; Text[ greek ] = " 3"; Text[ korean ] = "사용자 색인 3"; Text[ turkish ] = "Kullanc dizini 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 3"; + Text[ catalan ] = "ndex d'usuari 3"; Text[ finnish ] = "Kyttjhakemisto 3"; + Text[ thai ] = "ดัชนีผู้ใช้ 3"; }; String STR_POOLCOLL_TOX_USER4 { @@ -3539,17 +3670,18 @@ String STR_POOLCOLL_TOX_USER4 Text [ portuguese ] = "ndice do utilizador 4" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 4" ; Text[ chinese_simplified ] = "使用者目录 4"; - Text[ russian ] = " 4"; + Text[ russian ] = " 4"; Text[ polish ] = "Indeks uytkownika 4"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 4"; + Text[ japanese ] = "ユーザー定義の索引 4"; Text[ chinese_traditional ] = "自訂目錄 4"; Text[ arabic ] = " 4"; Text[ greek ] = " 4"; Text[ korean ] = "사용자 색인 4"; Text[ turkish ] = "Kullanc dizini 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 4"; + Text[ catalan ] = "ndex d'usuari 4"; Text[ finnish ] = "Kyttjhakemisto 4"; + Text[ thai ] = "ดัชนีผู้ใช้ 4"; }; String STR_POOLCOLL_TOX_USER5 { @@ -3565,17 +3697,18 @@ String STR_POOLCOLL_TOX_USER5 Text [ portuguese ] = "ndice do utilizador 5" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 5" ; Text[ chinese_simplified ] = "使用者目录 5"; - Text[ russian ] = " 5"; + Text[ russian ] = " 5"; Text[ polish ] = "Indeks uytkownika 5"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 5"; + Text[ japanese ] = "ユーザー定義の索引 5"; Text[ chinese_traditional ] = "自訂目錄 5"; Text[ arabic ] = " 5"; Text[ greek ] = " 5"; Text[ korean ] = "사용자 색인 5"; Text[ turkish ] = "Kullanc dizini 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 5"; + Text[ catalan ] = "ndex d'usuari 5"; Text[ finnish ] = "Kyttjhakemisto 5"; + Text[ thai ] = "ดัชนีผู้ใช้ 5"; }; String STR_POOLCOLL_TOX_USER6 { @@ -3590,9 +3723,9 @@ String STR_POOLCOLL_TOX_USER6 Text [ danish ] = "Brugerindeks 6" ; Text [ portuguese ] = "ndice personalizado 6" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 6" ; - Text[ russian ] = " 6"; + Text[ russian ] = " 6"; Text[ polish ] = "Indeks uytkownika 6"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 6"; + Text[ japanese ] = "ユーザー定義の索引 6"; Text[ arabic ] = " 6"; Text[ greek ] = " 6"; Text[ korean ] = "사용자 색인 6"; @@ -3600,8 +3733,9 @@ String STR_POOLCOLL_TOX_USER6 Text[ chinese_traditional ] = "自訂目錄 6"; Text[ turkish ] = "Kullanc dizini 6"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 6"; + Text[ catalan ] = "ndex d'usuari 6"; Text[ finnish ] = "Kyttjhakemisto 6"; + Text[ thai ] = "ดัชนีผู้ใช้ 6"; }; String STR_POOLCOLL_TOX_USER7 { @@ -3616,9 +3750,9 @@ String STR_POOLCOLL_TOX_USER7 Text [ danish ] = "Brugerindeks 7" ; Text [ portuguese ] = "ndice personalizado 7" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 7" ; - Text[ russian ] = " 7"; + Text[ russian ] = " 7"; Text[ polish ] = "Indeks uytkownika 7"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 7"; + Text[ japanese ] = "ユーザー定義の索引 7"; Text[ arabic ] = " 7"; Text[ greek ] = " 7"; Text[ korean ] = "사용자 색인 7"; @@ -3626,8 +3760,9 @@ String STR_POOLCOLL_TOX_USER7 Text[ chinese_traditional ] = "自訂目錄 7"; Text[ turkish ] = "Kullanc dizini 7"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 7"; + Text[ catalan ] = "ndex d'usuari 7"; Text[ finnish ] = "Kyttjhakemisto 7"; + Text[ thai ] = "ดัชนีผู้ใช้ 7"; }; String STR_POOLCOLL_TOX_USER8 { @@ -3642,9 +3777,9 @@ String STR_POOLCOLL_TOX_USER8 Text [ danish ] = "Brugerindeks 8" ; Text [ portuguese ] = "ndice personalizado 8" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 8" ; - Text[ russian ] = " 8"; + Text[ russian ] = " 8"; Text[ polish ] = "Indeks uytkownika 8"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 8"; + Text[ japanese ] = "ユーザー定義の索引 8"; Text[ arabic ] = " 8"; Text[ greek ] = " 8"; Text[ korean ] = "사용자 색인 8"; @@ -3652,8 +3787,9 @@ String STR_POOLCOLL_TOX_USER8 Text[ chinese_traditional ] = "自訂目錄 8"; Text[ turkish ] = "Kullanc dizini 8"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 8"; + Text[ catalan ] = "ndex d'usuari 8"; Text[ finnish ] = "Kyttjhakemisto 8"; + Text[ thai ] = "ดัชนีผู้ใช้ 8"; }; String STR_POOLCOLL_TOX_USER9 { @@ -3668,9 +3804,9 @@ String STR_POOLCOLL_TOX_USER9 Text [ danish ] = "Brugerindeks 9" ; Text [ portuguese ] = "ndice personalizado 9" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 9" ; - Text[ russian ] = " 9"; + Text[ russian ] = " 9"; Text[ polish ] = "Indeks uytkownika 9"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 9"; + Text[ japanese ] = "ユーザー定義の索引 9"; Text[ arabic ] = " 9"; Text[ greek ] = " 9"; Text[ korean ] = "사용자 색인 9"; @@ -3678,8 +3814,9 @@ String STR_POOLCOLL_TOX_USER9 Text[ chinese_traditional ] = "自訂目錄 9"; Text[ turkish ] = "Kullanc dizini 9"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 9"; + Text[ catalan ] = "ndex d'usuari 9"; Text[ finnish ] = "Kyttjhakemisto 9"; + Text[ thai ] = "ดัชนีผู้ใช้ 9"; }; String STR_POOLCOLL_TOX_USER10 { @@ -3694,9 +3831,9 @@ String STR_POOLCOLL_TOX_USER10 Text [ danish ] = "Brugerindeks 10" ; Text [ portuguese ] = "ndice personalizado 10" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 10" ; - Text[ russian ] = " 10"; + Text[ russian ] = " 10"; Text[ polish ] = "Indeks uytkownika 10"; - Text[ japanese ] = "ﾕｰｻﾞｰ定義の索引 10"; + Text[ japanese ] = "ユーザー定義の索引 10"; Text[ arabic ] = " 10"; Text[ greek ] = " 10"; Text[ korean ] = "사용자 색인 10"; @@ -3704,8 +3841,9 @@ String STR_POOLCOLL_TOX_USER10 Text[ chinese_traditional ] = "自訂目錄 10"; Text[ turkish ] = "Kullanc dizini 10"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice del usuario 10"; + Text[ catalan ] = "ndex d'usuari 10"; Text[ finnish ] = "Kyttjhakemisto 10"; + Text[ thai ] = "ดัชนีผู้ใช้ 10"; }; String STR_POOLCOLL_TOX_ILLUSH { @@ -3713,9 +3851,9 @@ String STR_POOLCOLL_TOX_ILLUSH Text [ English ] = "Illustration index heading" ; Text[ english_us ] = "Illustration Index Heading"; Text[ portuguese ] = "Ttulo - ndice de ilustraes"; - Text[ russian ] = " : "; + Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Opschrift afbeeldingenregister"; + Text[ dutch ] = "Titel afbeeldingenregister"; Text[ french ] = "Titre de l'index des illustrations"; Text[ spanish ] = "Encabezado ndice de ilustraciones"; Text[ italian ] = "Intestazione indice illustrazioni"; @@ -3730,8 +3868,9 @@ String STR_POOLCOLL_TOX_ILLUSH Text[ arabic ] = " "; Text[ turkish ] = "Resim dizini bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado ndice de ilustraciones"; - Text[ finnish ] = "Kuvitushakemiston otsikko"; + Text[ catalan ] = "Encapalament de l'ndex d'il.lustracions"; + Text[ finnish ] = "Kuvitusluettelon otsikko"; + Text[ thai ] = "หัวเรื่องดัชนีภาพประกอบ"; }; String STR_POOLCOLL_TOX_ILLUS1 { @@ -3739,7 +3878,7 @@ String STR_POOLCOLL_TOX_ILLUS1 Text [ English ] = "Illustration index 1" ; Text[ english_us ] = "Illustration Index 1"; Text[ portuguese ] = "ndice de ilustraes 1"; - Text[ russian ] = " 1"; + Text[ russian ] = " 1"; Text[ greek ] = " 1"; Text[ dutch ] = "Afbeeldingenregister 1"; Text[ french ] = "Index des illustrations 1"; @@ -3756,8 +3895,9 @@ String STR_POOLCOLL_TOX_ILLUS1 Text[ arabic ] = " 1"; Text[ turkish ] = "Resim dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice de ilustraciones 1"; - Text[ finnish ] = "Kuvitushakemisto 1"; + Text[ catalan ] = "ndex d'il.lustracions 1"; + Text[ finnish ] = "Kuvitusluettelo 1"; + Text[ thai ] = "ดัชนีภาพประกอบ 1"; }; String STR_POOLCOLL_TOX_OBJECTH { @@ -3765,25 +3905,26 @@ String STR_POOLCOLL_TOX_OBJECTH Text [ English ] = "Object index heading" ; Text[ english_us ] = "Object index heading"; Text[ portuguese ] = "Ttulo - ndice de objectos"; - Text[ russian ] = " : "; + Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Opschrift objectenregister"; - Text[ french ] = "Titre d'index d'objets"; + Text[ dutch ] = "Titel objectregister"; + Text[ french ] = "Titre d'index des objets"; Text[ spanish ] = "Encabezado ndice de objetos"; Text[ italian ] = "Intestazione indice degli oggetti"; Text[ danish ] = "Objektindeks overskrift"; Text[ swedish ] = "Objektfrteckning verskrift"; Text[ polish ] = "Indeks obiektw Tytu"; Text[ portuguese_brazilian ] = "Object index heading"; - Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄ索引見出し"; + Text[ japanese ] = "オブジェクト索引見出し"; Text[ korean ] = "개체 색인 제목"; Text[ chinese_simplified ] = "对象目录标题"; Text[ chinese_traditional ] = "物件目錄標題"; Text[ arabic ] = " "; Text[ turkish ] = "Nesne dizini bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado ndice de objetos"; + Text[ catalan ] = "Encapalament de l'ndex d'objectes"; Text[ finnish ] = "Objektihakemiston otsikko"; + Text[ thai ] = "หัวเรื่องดัชนีวัตถุ"; }; String STR_POOLCOLL_TOX_OBJECT1 { @@ -3793,23 +3934,24 @@ String STR_POOLCOLL_TOX_OBJECT1 Text[ portuguese ] = "ndice de objectos 1"; Text[ russian ] = " 1"; Text[ greek ] = " 1"; - Text[ dutch ] = "Objectenregister 1"; - Text[ french ] = "Index d'objet 1"; + Text[ dutch ] = "Objectregister 1"; + Text[ french ] = "Index des objets 1"; Text[ spanish ] = "ndice de objetos 1"; Text[ italian ] = "Indice degli oggetti 1"; Text[ danish ] = "Objektindeks 1"; Text[ swedish ] = "Objektfrteckning 1"; Text[ polish ] = "Indeks obiektw 1"; Text[ portuguese_brazilian ] = "Object index 1"; - Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄ索引 1"; + Text[ japanese ] = "オブジェクト索引 1"; Text[ korean ] = "개체 색인 1"; Text[ chinese_simplified ] = "对象目录 1"; Text[ chinese_traditional ] = "物件目錄 1"; Text[ arabic ] = " 1"; Text[ turkish ] = "Nesne dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice de objetos 1"; + Text[ catalan ] = "ndex d'objectes 1"; Text[ finnish ] = "Objektihakemisto 1"; + Text[ thai ] = "ดัชนีวัตถุ 1"; }; String STR_POOLCOLL_TOX_TABLESH { @@ -3817,7 +3959,7 @@ String STR_POOLCOLL_TOX_TABLESH Text [ English ] = "Table index heading" ; Text[ english_us ] = "Table index heading"; Text[ portuguese ] = "Ttulo - ndice de tabelas"; - Text[ russian ] = " : "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Opschrift tabellenregister"; Text[ french ] = "Titre d'index de tables"; @@ -3834,8 +3976,9 @@ String STR_POOLCOLL_TOX_TABLESH Text[ arabic ] = " "; Text[ turkish ] = "Tablo dizini bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado ndice de tablas"; + Text[ catalan ] = "Encapalament de l'ndex de taules"; Text[ finnish ] = "Taulukkohakemiston otsikko"; + Text[ thai ] = "หัวเรื่องดัชนีตาราง"; }; String STR_POOLCOLL_TOX_TABLES1 { @@ -3860,8 +4003,9 @@ String STR_POOLCOLL_TOX_TABLES1 Text[ arabic ] = " 1"; Text[ turkish ] = "Tablo dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice de tablas 1"; + Text[ catalan ] = "ndex de taules 1"; Text[ finnish ] = "Taulukkohakemisto 1"; + Text[ thai ] = "ดัชนีตาราง 1"; }; String STR_POOLCOLL_TOX_AUTHORITIESH { @@ -3869,25 +4013,26 @@ String STR_POOLCOLL_TOX_AUTHORITIESH Text [ English ] = "Index of authorities heading" ; Text[ english_us ] = "Bibliography Heading"; Text[ portuguese ] = "Ttulo - Bibliografia"; - Text[ russian ] = " : "; + Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Opschrift literatuurlijst"; + Text[ dutch ] = "Titel literatuurlijst"; Text[ french ] = "Titre de bibliographie"; - Text[ spanish ] = "Encabezado Bibliografa"; + Text[ spanish ] = "Encabezado de bibliografa"; Text[ italian ] = "Intestazione bibliografia"; Text[ danish ] = "Litteraturliste overskrift"; Text[ swedish ] = "Litteraturfrteckning verskrift"; Text[ polish ] = "Bibliografia - Tytu"; Text[ portuguese_brazilian ] = "Index of authorities heading"; Text[ japanese ] = "参考文献表見出し"; - Text[ korean ] = "참고문헌 머리글"; + Text[ korean ] = "참고 문헌 제목"; Text[ chinese_simplified ] = "文献目录标题"; Text[ chinese_traditional ] = "文獻目錄標題"; Text[ arabic ] = " "; Text[ turkish ] = "Kaynaka dizini bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado Bibliografa"; - Text[ finnish ] = "Bibliografian otsikko"; + Text[ catalan ] = "Encapalament de la bibliografia"; + Text[ finnish ] = "Lhdeluettelon otsikko"; + Text[ thai ] = "หัวเรื่องบรรณานุกรม"; }; String STR_POOLCOLL_TOX_AUTHORITIES1 { @@ -3895,7 +4040,7 @@ String STR_POOLCOLL_TOX_AUTHORITIES1 Text [ English ] = "Index of authorities 1" ; Text[ english_us ] = "Bibliography 1"; Text[ portuguese ] = "Bibliografia 1"; - Text[ russian ] = " 1"; + Text[ russian ] = " 1"; Text[ greek ] = " 1"; Text[ dutch ] = "Literatuurlijst 1"; Text[ french ] = "Bibliographie 1"; @@ -3912,8 +4057,9 @@ String STR_POOLCOLL_TOX_AUTHORITIES1 Text[ arabic ] = " 1"; Text[ turkish ] = "Kaynaka dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Bibliografa 1"; - Text[ finnish ] = "Bibliografia 1"; + Text[ catalan ] = "Bibliografia 1"; + Text[ finnish ] = "Lhdeluettelo 1"; + Text[ thai ] = "บรรณานุกรม 1"; }; String STR_POOLCOLL_DOC_TITEL @@ -3924,7 +4070,7 @@ String STR_POOLCOLL_DOC_TITEL Text [ english_us ] = "Title" ; Text [ italian ] = "Titolo" ; Text [ spanish ] = "Ttulo" ; - Text [ french ] = "Titre" ; + Text [ french ] = "Titre principal" ; Text [ swedish ] = "Rubrik" ; Text [ danish ] = "Titel" ; Text [ portuguese ] = "Ttulo principal" ; @@ -3932,15 +4078,16 @@ String STR_POOLCOLL_DOC_TITEL Text[ chinese_simplified ] = "大标题"; Text[ russian ] = ""; Text[ polish ] = "Tytu"; - Text[ japanese ] = "ﾀｲﾄﾙ"; + Text[ japanese ] = "タイトル"; Text[ chinese_traditional ] = "大標題"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "Title"; + Text[ korean ] = "주제"; Text[ turkish ] = "Blm bal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ttulo"; + Text[ catalan ] = "Ttol"; Text[ finnish ] = "Otsikko"; + Text[ thai ] = "ชื่อเรื่อง"; }; String STR_POOLCOLL_DOC_SUBTITEL { @@ -3965,8 +4112,9 @@ String STR_POOLCOLL_DOC_SUBTITEL Text[ korean ] = "부제"; Text[ turkish ] = "Alt balk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Subttulo"; - Text[ finnish ] = "Aliotsikko"; + Text[ catalan ] = "Subttol"; + Text[ finnish ] = "Alaotsikko"; + Text[ thai ] = "ชื่อเรื่องรอง"; }; String STR_POOLCOLL_HTML_BLOCKQUOTE { @@ -3991,8 +4139,9 @@ String STR_POOLCOLL_HTML_BLOCKQUOTE Text[ korean ] = "인용"; Text[ turkish ] = "Alnt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cita"; + Text[ catalan ] = "Citacions"; Text[ finnish ] = "Lainaukset"; + Text[ thai ] = "การอ้างอิง"; }; String STR_POOLCOLL_HTML_PRE { @@ -4010,15 +4159,16 @@ String STR_POOLCOLL_HTML_PRE Text[ chinese_simplified ] = "预格式化的正文"; Text[ russian ] = " "; Text[ polish ] = "Tekst niesformatowany"; - Text[ japanese ] = "書式設定前のﾃｷｽﾄ"; + Text[ japanese ] = "書式設定前のテキスト"; Text[ chinese_traditional ] = "預格式化的內文"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "사전 포맷된 텍스트"; + Text[ korean ] = "사전 서식된 텍스트"; Text[ turkish ] = "nceden formatlanm metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto preformateado"; + Text[ catalan ] = "Text preformatat"; Text[ finnish ] = "Esimuotoiltu teksti"; + Text[ thai ] = "ข้อความที่จัดรูปแบบไว้แล้ว"; }; String STR_POOLCOLL_HTML_HR { @@ -4040,11 +4190,12 @@ String STR_POOLCOLL_HTML_HR Text[ chinese_traditional ] = "水平線"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "수평 선"; + Text[ korean ] = "가로선"; Text[ turkish ] = "Yatay izgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lnea horizontal"; + Text[ catalan ] = "Lnia horitzontal"; Text[ finnish ] = "Vaakaviiva"; + Text[ thai ] = "บรรทัดตามแนวนอน"; }; String STR_POOLCOLL_HTML_DD { @@ -4055,22 +4206,23 @@ String STR_POOLCOLL_HTML_DD Text [ swedish ] = "Listinnehll" ; Text [ danish ] = "Listeindhold" ; Text [ italian ] = "Contenuto elenco" ; - Text [ spanish ] = "Contenido de lista" ; + Text [ spanish ] = "Contenido de la lista" ; Text [ french ] = "Contenu de liste" ; Text [ portuguese ] = "Contedo da lista" ; Text [ portuguese_brazilian ] = "Listeninhalt" ; Text[ chinese_simplified ] = "列表内容"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zawarto listy"; - Text[ japanese ] = "ﾘｽﾄの内容"; + Text[ japanese ] = "リストの内容"; Text[ chinese_traditional ] = "清單內容"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "목록 내용"; Text[ turkish ] = "Liste ierii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido de lista"; + Text[ catalan ] = "Contingut de la llista"; Text[ finnish ] = "Luetteloiden sisllt"; + Text[ thai ] = "รายการเนื้อหา"; }; String STR_POOLCOLL_HTML_DT { @@ -4088,15 +4240,16 @@ String STR_POOLCOLL_HTML_DT Text[ chinese_simplified ] = "列表标题"; Text[ russian ] = " "; Text[ polish ] = "Nagwek listy"; - Text[ japanese ] = "ﾘｽﾄの見出し"; + Text[ japanese ] = "リストの見出し"; Text[ language_user1 ] = " "; Text[ chinese_traditional ] = "清單標題"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "목록 제목"; Text[ turkish ] = "Liste bal"; - Text[ catalan ] = "Encabezamiento de lista"; + Text[ catalan ] = "Encapalament de llista"; Text[ finnish ] = "Luettelon otsikko"; + Text[ thai ] = "รายการหัวเรื่อง"; }; //page style names String STR_POOLPAGE_STANDARD @@ -4113,17 +4266,18 @@ String STR_POOLPAGE_STANDARD Text [ portuguese ] = "Padro" ; Text [ portuguese_brazilian ] = "Standard" ; Text[ chinese_simplified ] = "标准"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Domylnie"; Text[ japanese ] = "標準"; Text[ chinese_traditional ] = "標準"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "표준"; + Text[ korean ] = "기본값"; Text[ turkish ] = "Standart"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Predeterminado"; - Text[ finnish ] = "Vakio"; + Text[ catalan ] = "Per defecte"; + Text[ finnish ] = "Oletus"; + Text[ thai ] = "ค่าเริ่มต้น"; }; String STR_POOLPAGE_FIRST { @@ -4141,15 +4295,16 @@ String STR_POOLPAGE_FIRST Text[ chinese_simplified ] = "首页"; Text[ russian ] = " "; Text[ polish ] = "Pierwsza strona"; - Text[ japanese ] = "最初のﾍﾟｰｼﾞ"; + Text[ japanese ] = "最初のページ"; Text[ chinese_traditional ] = "首頁"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "첫 페이지"; Text[ turkish ] = "lk sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Primera pgina"; + Text[ catalan ] = "Primera pgina"; Text[ finnish ] = "Ensimminen sivu"; + Text[ thai ] = "หน้าแรก"; }; String STR_POOLPAGE_LEFT { @@ -4158,7 +4313,7 @@ String STR_POOLPAGE_LEFT Text [ english_us ] = "Left Page" ; Text [ italian ] = "Pagina sinistra" ; Text [ spanish ] = "Pgina izquierda" ; - Text [ french ] = "Page gauche" ; + Text [ french ] = "Page de gauche" ; Text [ dutch ] = "Linkerpagina" ; Text [ swedish ] = "Vnstersida" ; Text [ danish ] = "Venstre side" ; @@ -4167,15 +4322,16 @@ String STR_POOLPAGE_LEFT Text[ chinese_simplified ] = "左页"; Text[ russian ] = " "; Text[ polish ] = "Strona nieparzysta"; - Text[ japanese ] = "左ﾍﾟｰｼﾞ"; + Text[ japanese ] = "左ページ"; Text[ chinese_traditional ] = "左頁"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "왼쪽"; Text[ turkish ] = "Sol sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pgina izquierda"; + Text[ catalan ] = "Pgina esquerra"; Text[ finnish ] = "Vasen sivu"; + Text[ thai ] = "หน้าซ้าย"; }; String STR_POOLPAGE_RIGHT { @@ -4193,15 +4349,16 @@ String STR_POOLPAGE_RIGHT Text[ chinese_simplified ] = "右页"; Text[ russian ] = " "; Text[ polish ] = "Strona parzysta"; - Text[ japanese ] = "右ﾍﾟｰｼﾞ"; + Text[ japanese ] = "右ページ"; Text[ chinese_traditional ] = "右頁"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "오른쪽"; Text[ turkish ] = "Sa sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pgina derecha"; + Text[ catalan ] = "Pgina dreta"; Text[ finnish ] = "Oikea sivu"; + Text[ thai ] = "หน้าขวา"; }; String STR_POOLPAGE_JAKET { @@ -4227,7 +4384,8 @@ String STR_POOLPAGE_JAKET Text[ turkish ] = "Zarf"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sobre"; - Text[ finnish ] = "Kirjekuori (Envelope)"; + Text[ finnish ] = "Kirjekuori"; + Text[ thai ] = "ซองจดหมาย"; }; String STR_POOLPAGE_REGISTER { @@ -4243,7 +4401,7 @@ String STR_POOLPAGE_REGISTER Text [ portuguese ] = "ndice" ; Text [ portuguese_brazilian ] = "Verzeichnis" ; Text[ chinese_simplified ] = "目录"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Indeks"; Text[ japanese ] = "索引"; Text[ chinese_traditional ] = "目錄"; @@ -4252,8 +4410,9 @@ String STR_POOLPAGE_REGISTER Text[ korean ] = "색인"; Text[ turkish ] = "Dizin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "ndice"; + Text[ catalan ] = "ndex"; Text[ finnish ] = "Hakemisto"; + Text[ thai ] = "ดัชนี"; }; String STR_POOLPAGE_HTML { @@ -4280,6 +4439,7 @@ String STR_POOLPAGE_HTML Text[ language_user1 ] = " "; Text[ catalan ] = "HTML"; Text[ finnish ] = "HTML"; + Text[ thai ] = "HTML"; }; String STR_POOLPAGE_FOOTNOTE { @@ -4304,8 +4464,9 @@ String STR_POOLPAGE_FOOTNOTE Text[ korean ] = "각주"; Text[ turkish ] = "Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al pie"; + Text[ catalan ] = "Nota al peu"; Text[ finnish ] = "Alaviite"; + Text[ thai ] = "เชิงอรรถ"; }; String STR_POOLPAGE_ENDNOTE { @@ -4317,7 +4478,7 @@ String STR_POOLPAGE_ENDNOTE Text [ swedish ] = "Slutnot" ; Text [ danish ] = "Slutnote" ; Text [ italian ] = "Nota di chiusura" ; - Text [ spanish ] = "Nota al final" ; + Text [ spanish ] = "Nota final" ; Text [ french ] = "Note de fin" ; Text [ dutch ] = "Eindnoot" ; Text[ chinese_simplified ] = "尾注"; @@ -4330,8 +4491,9 @@ String STR_POOLPAGE_ENDNOTE Text[ korean ] = "미주"; Text[ turkish ] = "Sonnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al final"; - Text[ finnish ] = "Loppuhuomautus"; + Text[ catalan ] = "Nota final"; + Text[ finnish ] = "Loppuviite"; + Text[ thai ] = "อ้างอิงท้ายเรื่อง"; }; /* Numerierungs Regeln @@ -4356,11 +4518,12 @@ String STR_POOLNUMRULE_NUM1 Text[ chinese_traditional ] = "編號 1"; Text[ arabic ] = " 1"; Text[ greek ] = " 1"; - Text[ korean ] = "번호 1"; + Text[ korean ] = "번호 매기기 1"; Text[ turkish ] = "Numaralama 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 1"; + Text[ catalan ] = "Numeraci 1"; Text[ finnish ] = "Numerointi 1"; + Text[ thai ] = "ลำดับหมายเลข 1"; }; String STR_POOLNUMRULE_NUM2 { @@ -4382,11 +4545,12 @@ String STR_POOLNUMRULE_NUM2 Text[ chinese_traditional ] = "編號 2"; Text[ arabic ] = " 2"; Text[ greek ] = " 2"; - Text[ korean ] = "번호 2"; + Text[ korean ] = "번호 매기기 2"; Text[ turkish ] = "Numaralama 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 2"; + Text[ catalan ] = "Numeraci 2"; Text[ finnish ] = "Numerointi 2"; + Text[ thai ] = "ลำดับหมายเลข 2"; }; String STR_POOLNUMRULE_NUM3 { @@ -4408,11 +4572,12 @@ String STR_POOLNUMRULE_NUM3 Text[ chinese_traditional ] = "編號 3"; Text[ arabic ] = " 3"; Text[ greek ] = " 3"; - Text[ korean ] = "번호 3"; + Text[ korean ] = "번호 매기기 3"; Text[ turkish ] = "Numaralama 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 3"; + Text[ catalan ] = "Numeraci 3"; Text[ finnish ] = "Numerointi 3"; + Text[ thai ] = "ลำดับหมายเลข 3"; }; String STR_POOLNUMRULE_NUM4 { @@ -4434,11 +4599,12 @@ String STR_POOLNUMRULE_NUM4 Text[ chinese_traditional ] = "編號 4"; Text[ arabic ] = " 4"; Text[ greek ] = " 4"; - Text[ korean ] = "번호 4"; + Text[ korean ] = "번호 매기기 4"; Text[ turkish ] = "Numaralama 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 4"; + Text[ catalan ] = "Numeraci 4"; Text[ finnish ] = "Numerointi 4"; + Text[ thai ] = "ลำดับหมายเลข 4"; }; String STR_POOLNUMRULE_NUM5 { @@ -4460,11 +4626,12 @@ String STR_POOLNUMRULE_NUM5 Text[ chinese_traditional ] = "編號 5"; Text[ arabic ] = " 5"; Text[ greek ] = " 5"; - Text[ korean ] = "번호 5"; + Text[ korean ] = "번호 매기기 5"; Text[ turkish ] = "Numaralama 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeracin 5"; + Text[ catalan ] = "Numeraci 5"; Text[ finnish ] = "Numerointi 5"; + Text[ thai ] = "ลำดับหมายเลข 5"; }; String STR_POOLNUMRULE_BUL1 { @@ -4490,8 +4657,9 @@ String STR_POOLNUMRULE_BUL1 Text[ korean ] = "글머리 기호 1"; Text[ turkish ] = "Liste 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 1"; + Text[ catalan ] = "Llista 1"; Text[ finnish ] = "Luettelo 1"; + Text[ thai ] = "รายการ 1"; }; String STR_POOLNUMRULE_BUL2 { @@ -4517,8 +4685,9 @@ String STR_POOLNUMRULE_BUL2 Text[ korean ] = "글머리 기호 2"; Text[ turkish ] = "Liste 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 2"; + Text[ catalan ] = "Llista 2"; Text[ finnish ] = "Luettelo 2"; + Text[ thai ] = "รายการ 2"; }; String STR_POOLNUMRULE_BUL3 { @@ -4544,8 +4713,9 @@ String STR_POOLNUMRULE_BUL3 Text[ korean ] = "글머리 기호 3"; Text[ turkish ] = "Liste 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 3"; + Text[ catalan ] = "Llista 3"; Text[ finnish ] = "Luettelo 3"; + Text[ thai ] = "รายการ 3"; }; String STR_POOLNUMRULE_BUL4 { @@ -4571,8 +4741,9 @@ String STR_POOLNUMRULE_BUL4 Text[ korean ] = "글머리 기호 4"; Text[ turkish ] = "Liste 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 4"; + Text[ catalan ] = "Llista 4"; Text[ finnish ] = "Luettelo 4"; + Text[ thai ] = "รายการ 4"; }; String STR_POOLNUMRULE_BUL5 { @@ -4598,8 +4769,9 @@ String STR_POOLNUMRULE_BUL5 Text[ korean ] = "글머리 기호 5"; Text[ turkish ] = "Liste 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeracin 5"; + Text[ catalan ] = "Llista 5"; Text[ finnish ] = "Luettelo 5"; + Text[ thai ] = "รายการ 5"; }; String STR_POOLCHR_RUBYTEXT @@ -4608,32 +4780,54 @@ String STR_POOLCHR_RUBYTEXT Text [ English ] = "Rubies" ; Text[ english_us ] = "Rubies"; Text[ portuguese ] = "Rubys"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ greek ] = " "; Text[ dutch ] = "Fonetische tekens"; Text[ french ] = "Rubys"; Text[ spanish ] = "Rubys"; - Text[ finnish ] = "Foneettiset merkit"; + Text[ finnish ] = "Ruby-tekstit"; Text[ italian ] = "Testo Ruby"; - Text[ danish ] = "Phonetic Symbols"; + Text[ danish ] = "Fonetisk tekst"; Text[ swedish ] = "Rubytext"; Text[ polish ] = "Znaki Ruby"; Text[ portuguese_brazilian ] = "Phonetic Symbols"; Text[ japanese ] = "ふりがな"; - Text[ korean ] = "루비"; + Text[ korean ] = "덧말"; Text[ chinese_simplified ] = "拼音和注音符号"; Text[ chinese_traditional ] = "注音符號"; Text[ turkish ] = "Phonetic Symbols"; Text[ arabic ] = " "; - Text[ catalan ] = "Smbolos fonticos"; + Text[ catalan ] = "Smbols fontics"; + Text[ thai ] = "ตัวพิมพ์เล็ก"; }; String STR_POOLCHR_VERT_NUM { Text = "Vertikale Nummerierungszeichen" ; Text [ English ] = "Vertical Numbering Symbols" ; + Text[ english_us ] = "Vertical Numbering Symbols"; + Text[ portuguese ] = "Vertical Numbering Symbols"; + Text[ russian ] = "Vertical Numbering Symbols"; + Text[ greek ] = "Vertical Numbering Symbols"; + Text[ dutch ] = "Vertical Numbering Symbols"; + Text[ french ] = "Caractres de numrotation verticaux"; + Text[ spanish ] = "Caracteres de numeracin vertical"; + Text[ finnish ] = "Vertical Numbering Symbols"; + Text[ italian ] = "Carattere di numerazione verticale"; + Text[ danish ] = "Vertical Numbering Symbols"; + Text[ swedish ] = "Vertikala numreringstecken"; + Text[ polish ] = "Vertical Numbering Symbols"; + Text[ japanese ] = "縦書き番号付け記号"; + Text[ korean ] = "세로 번호 매기기 기호"; + Text[ chinese_simplified ] = "竖写式编号字符"; + Text[ chinese_traditional ] = "直書式編號字元"; + Text[ turkish ] = "Vertical Numbering Symbols"; + Text[ arabic ] = "Vertical Numbering Symbols"; }; + + + diff --git a/sw/source/ui/utlui/unotools.src b/sw/source/ui/utlui/unotools.src index 92ca7e36efab..9d98385a8adf 100644 --- a/sw/source/ui/utlui/unotools.src +++ b/sw/source/ui/utlui/unotools.src @@ -2,9 +2,9 @@ * * $RCSfile: unotools.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:24:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,25 +80,26 @@ ModalDialog DLG_RENAME_XNAMED Text [ ENGLISH ] = "New name" ; Text[ english_us ] = "New name"; Text[ portuguese ] = "Novo nome"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Nieuwe naam"; Text[ french ] = "Nouveau nom"; - Text[ spanish ] = "Nuevo nombre"; + Text[ spanish ] = "Nombre nuevo"; Text[ italian ] = "Nome nuovo"; Text[ danish ] = "Nyt navn"; Text[ swedish ] = "Nytt namn"; Text[ polish ] = "Nowa nazwa"; Text[ portuguese_brazilian ] = "New name"; - Text[ japanese ] = "VO"; - Text[ korean ] = " ̸"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "sW"; + Text[ japanese ] = "新しい名前"; + Text[ korean ] = "새 이름"; + Text[ chinese_simplified ] = "新名称"; + Text[ chinese_traditional ] = "新名稱"; Text[ arabic ] = " "; Text[ turkish ] = "Yeni ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nuevo nombre"; + Text[ catalan ] = "Nom nou"; Text[ finnish ] = "Uusi nimi"; + Text[ thai ] = "ชื่อใหม่"; }; Edit ED_NEW_NAME { @@ -120,19 +121,20 @@ ModalDialog DLG_RENAME_XNAMED Text[ french ] = "Modifier le nom"; Text[ spanish ] = "Cambiar nombre"; Text[ italian ] = "Cambia nome"; - Text[ danish ] = "Modificer navn"; + Text[ danish ] = "Rediger navn"; Text[ swedish ] = "ndra namn"; Text[ polish ] = "Zmie nazw"; Text[ portuguese_brazilian ] = "Change name"; - Text[ japanese ] = "O̕ύX"; - Text[ korean ] = "̸ "; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "ܧW"; + Text[ japanese ] = "名前の変更"; + Text[ korean ] = "이름 변경"; + Text[ chinese_simplified ] = "更改名称"; + Text[ chinese_traditional ] = "變更名稱"; Text[ arabic ] = " "; Text[ turkish ] = "Ad deitir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre"; + Text[ catalan ] = "Canvia el nom"; Text[ finnish ] = "Muuta nimi"; + Text[ thai ] = "เปลี่ยนชื่อ"; }; OKButton PB_OK { @@ -168,15 +170,16 @@ ModalDialog DLG_RENAME_XNAMED Text[ swedish ] = "Byt namn p objekt: "; Text[ polish ] = "Zmie nazw obiektu: "; Text[ portuguese_brazilian ] = "Rename object: "; - Text[ japanese ] = "ުĖ̕ύX: "; - Text[ korean ] = "ü ̸ ٲٱ: "; - Text[ chinese_simplified ] = " "; - Text[ chinese_traditional ] = "sRWG "; + Text[ japanese ] = "オブジェクト名の変更: "; + Text[ korean ] = "개체 이름 바꾸기: "; + Text[ chinese_simplified ] = "重命名对象： "; + Text[ chinese_traditional ] = "重新命名物件： "; Text[ arabic ] = " : "; Text[ turkish ] = "Nesneyi yeniden adlandr: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre de objeto: "; + Text[ catalan ] = "Reanomena l'objecte: "; Text[ finnish ] = "Nime objekti uudelleen: "; + Text[ thai ] = "เปลี่ยนชื่อวัตถุ: "; }; String STR_SERVICE_UNAVAILABLE { @@ -184,9 +187,9 @@ String STR_SERVICE_UNAVAILABLE Text [ English ] = "The following service is not available: " ; Text[ english_us ] = "The following service is not available: "; Text[ portuguese ] = "O seguinte servio no est disponvel: "; - Text[ russian ] = " : "; + Text[ russian ] = " : "; Text[ greek ] = " : "; - Text[ dutch ] = "De volgende service is niet beschikbaar: "; + Text[ dutch ] = "De volgende service is niet beschikbaar:"; Text[ french ] = "Le service suivant n'est pas disponible : "; Text[ spanish ] = "El siguiente servicio no est disponible: "; Text[ italian ] = "Il seguente servizio non disponibile. "; @@ -194,15 +197,16 @@ String STR_SERVICE_UNAVAILABLE Text[ swedish ] = "Fljande service r inte tillgnglig: "; Text[ polish ] = "Nastpujcy serwis jest niedostpny: "; Text[ portuguese_brazilian ] = "The following service is not available: "; - Text[ japanese ] = "̻͎gpł܂: "; - Text[ korean ] = " ʽϴ: "; - Text[ chinese_simplified ] = "зܣ "; - Text[ chinese_traditional ] = "oӪAȥ\\णsbG "; + Text[ japanese ] = "次のサービスは使用できません: "; + Text[ korean ] = "다음과 같은 서비스는 사용할 수 없습니다: "; + Text[ chinese_simplified ] = "不存在下列服务功能： "; + Text[ chinese_traditional ] = "這個服務功能不存在： "; Text[ arabic ] = " : "; Text[ turkish ] = "Aadaki hizmet kullanlamyor: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "El siguiente servicio no est disponible: "; + Text[ catalan ] = "El segent servei no est disponible: "; Text[ finnish ] = "Seuraava palvelu ei ole kytettviss: "; + Text[ thai ] = "บริการนี้ใช้ไม่ได้: "; }; Resource RES_FRMEX_MENU { @@ -260,7 +264,7 @@ Resource RES_FRMEX_MENU { < "~chelle" ; ST_MENU_ZOOM; > ; < "Vers le ~haut" ; ST_MENU_UP; > ; - < "Vers le ~bas" ; ST_MENU_DOWN; > ; + < "Vers le bas" ; ST_MENU_DOWN; > ; }; ItemList [ spanish ] = { @@ -300,27 +304,27 @@ Resource RES_FRMEX_MENU }; ItemList [ japanese ] = { - < "ް(~Z)" ; ST_MENU_ZOOM; > ; - < "(~U)" ; ST_MENU_UP; > ; - < "(~W)" ; ST_MENU_DOWN; > ; + < "ズーム(~Z)" ; ST_MENU_ZOOM; > ; + < "上へ(~U)" ; ST_MENU_UP; > ; + < "下へ(~W)" ; ST_MENU_DOWN; > ; }; ItemList [ korean ] = { - < "/Ȯ(~Z)" ; ST_MENU_ZOOM; > ; - < "(~U)" ; ST_MENU_UP; > ; - < "Ʒ(~W)" ; ST_MENU_DOWN; > ; + < "축소/확대(~Z)" ; ST_MENU_ZOOM; > ; + < "위로(~U)" ; ST_MENU_UP; > ; + < "아래로(~W)" ; ST_MENU_DOWN; > ; }; ItemList [ chinese_simplified ] = { - < "(~Z)" ; ST_MENU_ZOOM; > ; - < "(~U)" ; ST_MENU_UP; > ; - < "(~W)" ; ST_MENU_DOWN; > ; + < "显示比例(~Z)" ; ST_MENU_ZOOM; > ; + < "向上(~U)" ; ST_MENU_UP; > ; + < "向下(~W)" ; ST_MENU_DOWN; > ; }; ItemList [ chinese_traditional ] = { - < "ܤ(~Z)" ; ST_MENU_ZOOM; > ; - < "VW(~U)" ; ST_MENU_UP; > ; - < "VU(~W)" ; ST_MENU_DOWN; > ; + < "顯示比例(~Z)" ; ST_MENU_ZOOM; > ; + < "向上(~U)" ; ST_MENU_UP; > ; + < "向下(~W)" ; ST_MENU_DOWN; > ; }; ItemList [ arabic ] = { @@ -336,15 +340,21 @@ Resource RES_FRMEX_MENU }; ItemList [ catalan ] = { - < "~Escala" ; ST_MENU_ZOOM; > ; - < "Hacia ~arriba" ; ST_MENU_UP; > ; - < "Hacia a~bajo" ; ST_MENU_DOWN; > ; + < "~Zoom" ; ST_MENU_ZOOM; > ; + < "~Cap amunt" ; ST_MENU_UP; > ; + < "Cap ~avall" ; ST_MENU_DOWN; > ; }; ItemList [ finnish ] = { - < "~Zoomaa" ; ST_MENU_ZOOM; > ; + < "~Zoomaus" ; ST_MENU_ZOOM; > ; < "~Yls" ; ST_MENU_UP; > ; - < "A~las" ; ST_MENU_DOWN; > ; + < "Al~as" ; ST_MENU_DOWN; > ; + }; + ItemList [ thai ] = + { + < "~Ma฿stab" ; ST_MENU_ZOOM; > ; + < "Nach ~oben" ; ST_MENU_UP; > ; + < "Nach ~unten" ; ST_MENU_DOWN; > ; }; }; }; @@ -352,3 +362,18 @@ Resource RES_FRMEX_MENU + + + + + + + + + + + + + + + diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src index eceaac1c0bdc..93f01c191374 100644 --- a/sw/source/ui/utlui/utlui.src +++ b/sw/source/ui/utlui/utlui.src @@ -2,9 +2,9 @@ * * $RCSfile: utlui.src,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:53:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text [ swedish ] = "Ta bort tomma stycken" ; Text [ danish ] = "Fjern tomme afsnit" ; Text [ italian ] = "Elimina paragrafi vuoti" ; - Text [ spanish ] = "Eliminar prrafos vacos" ; + Text [ spanish ] = "Borrar prrafos vacos" ; Text [ french ] = "Supprimer les paragraphes vides" ; Text [ dutch ] = "Lege alinea's verwijderen" ; Text [ portuguese_brazilian ] = "Leere Abs?tze entfernen" ; @@ -114,7 +114,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "使用替代清單"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "대체 표 적용"; + Text[ korean ] = "대체 테이블 사용"; Text[ turkish ] = "Deitirme tablosunu kullan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Utilitza la taula de reemplaament"; @@ -144,7 +144,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "校正字首雙大寫字母"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "단어 시작부분에서 두 대문자 수정"; + Text[ korean ] = "단어 어두에 대문자가 두개인 경우 수정"; Text[ turkish ] = "Szck bandaki Ki byk harfi dzelt"; Text[ language_user1 ] = " "; Text[ catalan ] = "Corregeix DUes MAjscules al COmenament de PAraula"; @@ -201,7 +201,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "直型引號由%1字型引號%2 替代"; Text[ arabic ] = " \"\" %1%2"; Text[ greek ] = " \"\" %1%2"; - Text[ korean ] = "\"직선\" 인용 부호를 %1인쇄체%2 인용 부호로 바꾸기"; + Text[ korean ] = "\"표준\" 인용 부호를 %1인쇄체%2 인용 부호로 바꾸기"; Text[ turkish ] = "\"Dz\" trnak iaretlerini %1tipografik iaretler ile%2 deitir"; Text[ catalan ] = "Reemplaa les cometes \"estndard\" per cometes %1personalitzades%2"; Text[ thai ] = "แทนที่ \"มาตรฐาน\" อ้างคำพูดด้วย %1คำพูด%2 ที่กำหนดเอง"; @@ -227,7 +227,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "替代自訂樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "사용자 템플릿 바꾸기"; + Text[ korean ] = "사용자 정의 스타일 바꾸기"; Text[ turkish ] = "Kullanc biimini deitir"; Text[ catalan ] = "Reemplaa els estils personalitzats"; Text[ finnish ] = "Korvaa mukautetut tyylit"; @@ -280,7 +280,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "自動加底線"; Text[ arabic ] = "_ _ "; Text[ greek ] = " __"; - Text[ korean ] = "자동 _밑줄_"; + Text[ korean ] = "자동으로 _밑줄_"; Text[ turkish ] = "Altn_otomatik_iz_"; Text[ language_user1 ] = " "; Text[ catalan ] = "_Subratllat_ automtic"; @@ -328,7 +328,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text [ french ] = "Remplacer 1/2 ... par ..." ; Text [ portuguese ] = "Substituir 1/2 ... por ..." ; Text[ chinese_simplified ] = "用 ½ ... 替换 1/2 ..."; - Text[ russian ] = " 1/2 ... ? ..."; + Text[ russian ] = " 1/2 ... ..."; Text[ polish ] = "Zamie 1/2 ... na ? ... "; Text[ japanese ] = "1/2 ...を ½ ...に置換"; Text[ chinese_traditional ] = "用 ½ ... 代替 1/2 ..."; @@ -409,7 +409,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text [ portuguese_brazilian ] = "1st ... gegen 1^st ... ersetzen" ; Text [ portuguese ] = "Substituir 1o... por 1..." ; Text[ chinese_simplified ] = "用 1^st... 替换 1st..."; - Text[ russian ] = " 1st ... 1^st ..."; + Text[ russian ] = " (1st) ... (1^st)..."; Text[ polish ] = "Zamie 1st ... na 1^st ... "; Text[ japanese ] = "1st ...を 1^st ... に置き換える"; Text[ chinese_traditional ] = "用 1^st... 代替 1st..."; @@ -442,7 +442,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "合併單行段落"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "한줄 단락 합치기"; + Text[ korean ] = "한줄 단락을 결합"; Text[ turkish ] = "Tek satrl paragraflar birletir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Combina els pargrafs de lnia nica"; @@ -470,7 +470,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "設定樣式<內文>"; Text[ arabic ] = " \" \""; Text[ greek ] = " \" \""; - Text[ korean ] = "템플릿 \"본문\" 설정"; + Text[ korean ] = "\"본문\" 스타일 설정"; Text[ turkish ] = "\"Metin gvdesi\" biimini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil del \"cos de text\""; @@ -497,7 +497,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "設定樣式<內文縮排>"; Text[ arabic ] = " \" \""; Text[ greek ] = " \" \""; - Text[ korean ] = "템플릿 \"첫 줄 들여쓰기\" 설정"; + Text[ korean ] = "[본문 들여쓰기] 스타일 설정"; Text[ turkish ] = "\"Metin gvdesi - girinti\" biimini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil del \"sagnat del cos de text\""; @@ -524,7 +524,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "設定樣式<內文負縮排>"; Text[ arabic ] = " \" \""; Text[ greek ] = " \" \""; - Text[ korean ] = "템플릿 \"첫 줄을 기준으로 나머지 본문 들여쓰기\" 설정"; + Text[ korean ] = "[본문 내어쓰기] 스타일 설정"; Text[ turkish ] = "\"Asl girinti\" biimini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil del \"sagnat negatiu\""; @@ -551,7 +551,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "設定樣式<內文縮排>"; Text[ arabic ] = " \" ( )\""; Text[ greek ] = " \" \""; - Text[ korean ] = "템플릿 \"본문 들여쓰기\" 설정"; + Text[ korean ] = "[본문 들여쓰기] 스타일 설정"; Text[ turkish ] = "\"Metin gvdesi - satrba\" biimini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil del \"sagnat del cos de text\""; @@ -578,7 +578,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "設定樣式<標題 $(ARG1)>"; Text[ arabic ] = " \" $(ARG1)\""; Text[ greek ] = " \" $(ARG1)\""; - Text[ korean ] = "템플릿 \"제목 $(ARG1)\" 설정"; + Text[ korean ] = "\"제목 $(ARG1)\" 스타일 설정"; Text[ turkish ] = "\"Balk $(ARG1)\" biimini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil \"Encapalament $(ARG1)\""; @@ -605,7 +605,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "設定樣式<項目符號>和<編號>"; Text[ arabic ] = " \"\" \"\""; Text[ greek ] = " \"\" \"\""; - Text[ korean ] = "템플릿 \"글머리 기호\" 또는 \"번호 매기기\" 설정"; + Text[ korean ] = "\"글머리 기호\" 또는 \"번호 매기기\" 스타일 설정"; Text[ turkish ] = "\"Madde\" ya da \"numaralama\" biimini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil \"pics\" o \"numeraci\""; @@ -624,7 +624,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ french ] = "Fusionner des paragraphes"; Text[ swedish ] = "Sammanfoga stycken"; Text[ dutch ] = "Alinea's samenvoegen"; - Text[ spanish ] = "Unir prrafos"; + Text[ spanish ] = "Combinar prrafos"; Text[ english_us ] = "Combine paragraphs"; Text[ chinese_simplified ] = "合并段落"; Text[ russian ] = " "; @@ -633,7 +633,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "合併段落"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "단락 합치기"; + Text[ korean ] = "단락 결합"; Text[ turkish ] = "Paragraflar birletir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Combina els pargrafs"; @@ -666,7 +666,7 @@ String STR_EVENT_OBJECT_SELECT Text[ chinese_traditional ] = "按一下物件"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "개체 선택"; + Text[ korean ] = "개체 클릭"; Text[ turkish ] = "Nesneye tkla"; Text[ language_user1 ] = " "; Text[ catalan ] = "Feu clic a l'objecte"; @@ -684,14 +684,14 @@ String STR_EVENT_START_INS_GLOSSARY TEXT[ greek ] = " "; TEXT[ dutch ] = "Voor het invoegen van AutoTekst"; TEXT[ french ] = "Avant insertion de l'AutoTexte"; - TEXT[ spanish ] = "Antes de insertar el AutoTexto"; + TEXT[ spanish ] = "Antes de insertar el Texto automtico"; TEXT[ italian ] = "Prima d'inserire il testo automatico"; TEXT[ danish ] = "Inden input af AutoTekst"; TEXT[ swedish ] = "Innan AutoText infogas"; TEXT[ polish ] = "Wstaw przed autotekstem"; TEXT[ portuguese_brazilian ] = "Vor AutoText einf?en"; TEXT[ japanese ] = "入力支援を挿入する前"; - TEXT[ korean ] = "자동텍스트 삽입 전"; + TEXT[ korean ] = "자동 텍스트 삽입 전"; TEXT[ chinese_simplified ] = "在插入自动图文集之前"; TEXT[ chinese_traditional ] = "在插入自動圖文集之前"; TEXT[ arabic ] = " "; @@ -712,14 +712,14 @@ String STR_EVENT_END_INS_GLOSSARY TEXT[ greek ] = " "; TEXT[ dutch ] = "Na invoegen van AutoTekst"; TEXT[ french ] = "Aprs insertion de l'AutoTexte"; - TEXT[ spanish ] = "Tras insertar el AutoTexto"; + TEXT[ spanish ] = "Tras insertar el Texto automtico"; TEXT[ italian ] = "Dopo aver inserito il testo automatico"; TEXT[ danish ] = "Efter input af AutoTekst"; TEXT[ swedish ] = "Nr AutoText har infogats"; TEXT[ polish ] = "Wstaw za autotekstem"; TEXT[ portuguese_brazilian ] = "Nach AutoText einf?en"; TEXT[ japanese ] = "入力支援を挿入した後"; - TEXT[ korean ] = "자동텍스트 삽입 후"; + TEXT[ korean ] = "자동 텍스트 삽입 후"; TEXT[ chinese_simplified ] = "在插入自动图文集之后"; TEXT[ chinese_traditional ] = "在自動圖文集插入之後"; TEXT[ arabic ] = " "; @@ -833,7 +833,7 @@ String STR_EVENT_IMAGE_LOAD Text[ chinese_traditional ] = "載入圖形成功"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "그래픽을 성공적으로 로드함"; + Text[ korean ] = "그림 로드를 성공적으로 완료 "; Text[ turkish ] = "Grafik baaryla yklendi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Els grfics s'han carregat amb xit"; @@ -860,7 +860,7 @@ String STR_EVENT_IMAGE_ABORT Text[ chinese_traditional ] = "中斷載入圖形"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "그래픽 로드 중단됨"; + Text[ korean ] = "그림 로드 중단됨"; Text[ turkish ] = "Grafik yklemesi kesildi"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha interromput la crrega dels grfics"; @@ -887,7 +887,7 @@ String STR_EVENT_IMAGE_ERROR Text[ chinese_traditional ] = "載入圖形不完整"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "그래픽 로드 오류"; + Text[ korean ] = "그림 로드 오류"; Text[ turkish ] = "Grafik yklemede hata"; Text[ language_user1 ] = " "; Text[ catalan ] = "Els grfics s'han carregat de manera defectuosa"; @@ -908,7 +908,7 @@ String STR_EVENT_FRM_KEYINPUT_A Text [ french ] = "Saisie de caractres alphanumriques" ; Text [ dutch ] = "Invoer van alfanumerieke tekens" ; Text[ chinese_simplified ] = "输入希腊语字母阿尔法"; - Text[ russian ] = " - "; + Text[ russian ] = " .-. "; Text[ polish ] = "Wpisz znaki alfanumeryczne"; Text[ japanese ] = "アルファベット文字の入力"; Text[ chinese_traditional ] = "輸入希臘語第一個字母"; @@ -935,7 +935,7 @@ String STR_EVENT_FRM_KEYINPUT_NOA Text [ portuguese_brazilian ] = "Eingabe von nicht Alphazeichen" ; Text [ danish ] = "Input af ikke-alfategn" ; Text[ chinese_simplified ] = "输入的不是希腊语字母阿尔法"; - Text[ russian ] = " - "; + Text[ russian ] = " .-. "; Text[ polish ] = "Wpisz znaki nie bdce znakami alfanumerycznymi"; Text[ japanese ] = "アルファベットでない文字の入力"; Text[ chinese_traditional ] = "輸入的不是希臘語第一個字母"; @@ -1078,7 +1078,7 @@ String STR_CONTENT_TYPE_FRAME Text[ chinese_traditional ] = "文字方塊"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "텍스트 틀"; + Text[ korean ] = "텍스트 프레임"; Text[ turkish ] = "Metin kutusu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marc de text"; @@ -1105,7 +1105,7 @@ String STR_CONTENT_TYPE_GRAPHIC Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Grfics"; @@ -1172,7 +1172,7 @@ String STR_CONTENT_TYPE_REGION TEXT [ English ] = "Regions" ; Text [ english_us ] = "Sections" ; Text [ italian ] = "Sezioni" ; - Text [ spanish ] = "Categoras" ; + Text [ spanish ] = "Secciones" ; Text [ french ] = "Sections" ; Text [ dutch ] = "Bereiken" ; Text [ swedish ] = "Kategorier" ; @@ -1186,7 +1186,7 @@ String STR_CONTENT_TYPE_REGION Text[ chinese_traditional ] = "區域"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "영역"; + Text[ korean ] = "구역"; Text[ turkish ] = "Blm"; Text[ language_user1 ] = " "; Text[ catalan ] = "Seccions"; @@ -1349,7 +1349,7 @@ String STR_CONTENT_TYPE_SINGLE_OUTLINE Text[ chinese_traditional ] = "標題"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "표제"; + Text[ korean ] = "제목"; Text[ turkish ] = "Balk"; Text[ language_user1 ] = " "; Text[ catalan ] = "Encapalament"; @@ -1376,7 +1376,7 @@ String STR_CONTENT_TYPE_SINGLE_TABLE Text[ chinese_traditional ] = "表格"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -1403,7 +1403,7 @@ String STR_CONTENT_TYPE_SINGLE_FRAME Text[ chinese_traditional ] = "文字方塊"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "텍스트 틀"; + Text[ korean ] = "텍스트 프레임"; Text[ turkish ] = "Metin kutusu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marc de text"; @@ -1430,7 +1430,7 @@ String STR_CONTENT_TYPE_SINGLE_GRAPHIC Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Grfics"; @@ -1497,7 +1497,7 @@ String STR_CONTENT_TYPE_SINGLE_REGION TEXT [ English ] = "Region" ; Text [ english_us ] = "Section" ; Text [ italian ] = "Area" ; - Text [ spanish ] = "rea" ; + Text [ spanish ] = "Seccin" ; Text [ french ] = "Section" ; Text [ dutch ] = "Bereik" ; Text [ swedish ] = "Kategori" ; @@ -1511,7 +1511,7 @@ String STR_CONTENT_TYPE_SINGLE_REGION Text[ chinese_traditional ] = "區域"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "영역"; + Text[ korean ] = "구역"; Text[ turkish ] = "Blm"; Text[ language_user1 ] = " "; Text[ catalan ] = "Secci"; @@ -1673,7 +1673,7 @@ String STR_DEFINE_NUMBERFORMAT Text[ chinese_traditional ] = "其它格式..."; Text[ arabic ] = "... "; Text[ greek ] = " ..."; - Text[ korean ] = "부가적인 서식..."; + Text[ korean ] = "추가 서식..."; Text[ turkish ] = "Dier formatlar..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Formats addicionals..."; @@ -1922,3 +1922,8 @@ String STR_HYPERCTRL_HYP Text[ thai ] = "HYP"; }; + + + + + diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src index 8def4ad0753f..28d3875315bc 100644 --- a/sw/source/ui/web/web.src +++ b/sw/source/ui/web/web.src @@ -2,9 +2,9 @@ * * $RCSfile: web.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: kz $ $Date: 2002-12-09 09:58:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,7 +117,7 @@ String STR_WRITER_WEBDOC_FULLTYPE_40 Text [ swedish ] = "%PRODUCTNAME 4.0 HTML" ; Text [ danish ] = "%PRODUCTNAME 4.0 HTML" ; Text [ italian ] = "HTML %PRODUCTNAME 4.0" ; - Text [ spanish ] = "%PRODUCTNAME 4.0 HTML" ; + Text [ spanish ] = "%PRODUCTNAME 4.0 - HTML" ; Text [ french ] = "%PRODUCTNAME 4.0 HTML" ; Text [ dutch ] = "%PRODUCTNAME 4.0 HTML" ; Text [ portuguese ] = "HTML (%PRODUCTNAME 4.0)" ; @@ -146,7 +146,7 @@ String STR_WRITER_WEBDOC_FULLTYPE_50 Text [ swedish ] = "%PRODUCTNAME 5.0 HTML" ; Text [ danish ] = "%PRODUCTNAME 5.0 HTML" ; Text [ italian ] = "HTML %PRODUCTNAME 5.0" ; - Text [ spanish ] = "%PRODUCTNAME 5.0 HTML" ; + Text [ spanish ] = "%PRODUCTNAME 5.0 - HTML" ; Text [ french ] = "%PRODUCTNAME 5.0 HTML" ; Text [ dutch ] = "%PRODUCTNAME 5.0 HTML" ; Text [ portuguese ] = "%PRODUCTNAME 5.0 HTML" ; @@ -172,11 +172,11 @@ String STR_WRITER_WEBDOC_FULLTYPE Text [ English ] = "%PRODUCTNAME 6.0 HTML Document" ; Text[ english_us ] = "%PRODUCTNAME 6.0 HTML Document"; Text[ portuguese ] = "%PRODUCTNAME 6.0 Documento HTML"; - Text[ russian ] = "HTML- (%PRODUCTNAME 6.0) "; + Text[ russian ] = "- (%PRODUCTNAME 6.0) "; Text[ greek ] = "%PRODUCTNAME 6.0 HTML - "; Text[ dutch ] = "%PRODUCTNAME 6.0 HTML Document"; Text[ french ] = "%PRODUCTNAME 6.0 Document HTML"; - Text[ spanish ] = "%PRODUCTNAME 6.0 Documento HTML"; + Text[ spanish ] = "%PRODUCTNAME 6.0 - Documento HTML"; Text[ italian ] = "%PRODUCTNAME 6.0 Documento HTML"; Text[ danish ] = "%PRODUCTNAME 6,0 HTML-dokument"; Text[ swedish ] = "HTML-dokument %PRODUCTNAME 6.0"; @@ -272,7 +272,7 @@ String RID_WEBTOOLS_TOOLBOX Text[ dutch ] = "Werktuigbalk/Web"; Text[ chinese_simplified ] = "主工具栏/万维网"; Text[ greek ] = " /Web"; - Text[ korean ] = "주 도구 모음/웹"; + Text[ korean ] = "주 도구모음/웹"; Text[ turkish ] = "Ana ara ubuu/Web"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'eines principal/Web"; @@ -449,6 +449,29 @@ ToolBox RID_WEBTEXT_TOOLBOX MN_TEMPLATE MN_FONT MN_TEXT1(TRUE) + MN_TEXT_LTR_RTL + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; + ItemList[arabic] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT_RTL_LTR + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; + ItemList[hebrew] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT_RTL_LTR MN_TEXT_LINESPACE MN_TEXT2 MN_TEXT_BACKGROUND @@ -548,7 +571,7 @@ String RID_WEBGRAPHIC_TOOLBOX Text[ dutch ] = "Objectbalk afbeeldingen/Web"; Text[ chinese_simplified ] = "图形对象栏/Web"; Text[ greek ] = " /Web"; - Text[ korean ] = "그래픽 개체 모음/웹"; + Text[ korean ] = "그림 개체 모음/웹"; Text[ turkish ] = "Grafik nesne ubuu/Web"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra de objectes grfics/Web"; @@ -593,24 +616,24 @@ String RID_WEBOLE_TOOLBOX Text = "Objekt/Web" ; Text [ English ] = "Object/Web" ; Text [ norwegian ] = "Object" ; - Text [ italian ] = "Oggetto" ; + Text [ italian ] = "Oggetto/Web" ; Text [ portuguese_brazilian ] = "Objeto" ; Text [ portuguese ] = "Objecto" ; Text [ finnish ] = "Objekti" ; Text [ danish ] = "Objekt" ; - Text [ french ] = "Objet" ; - Text [ swedish ] = "Objekt" ; + Text [ french ] = "Objet/Web" ; + Text [ swedish ] = "Objekt/Webb" ; Text [ dutch ] = "Object" ; - Text [ spanish ] = "Objeto" ; + Text [ spanish ] = "Objeto/Web" ; Text [ english_us ] = "Object/Web" ; - Text[ chinese_simplified ] = "对象"; + Text[ chinese_simplified ] = "对象/万维网"; Text[ russian ] = ""; Text[ polish ] = "Obiekt"; - Text[ japanese ] = "オブジェクト"; - Text[ chinese_traditional ] = "物件"; + Text[ japanese ] = "オブジェクト/Web"; + Text[ chinese_traditional ] = "物件/Web"; Text[ arabic ] = ""; Text[ dutch ] = "Object"; - Text[ chinese_simplified ] = "对象"; + Text[ chinese_simplified ] = "对象/万维网"; Text[ greek ] = ""; Text[ korean ] = "개체/웹"; Text[ turkish ] = "Nesne"; @@ -655,3 +678,8 @@ ToolBox RID_WEBOLE_TOOLBOX /************************************************************************* *************************************************************************/ + + + + + diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index b775ed1ee78d..04aeffe78417 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -2,9 +2,9 @@ * * $RCSfile: delete.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:42:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -179,15 +179,19 @@ long SwWrtShell::DelLeft() // JP 29.06.95: nie eine davor stehende Tabelle loeschen. BOOL bSwap = FALSE; - if( SwCrsrShell::IsSttPara() && !SwCrsrShell::IsCrsrInTbl() ) + const SwTableNode * pWasInTblNd = SwCrsrShell::IsCrsrInTbl(); + if( SwCrsrShell::IsSttPara()) { + /* If the cursor is at the beginning of a paragraph, try to step + backwards. On failure we are done. */ if( !SwCrsrShell::Left(1,CRSR_SKIP_CHARS) ) return 0; - if( SwCrsrShell::IsCrsrInTbl() ) - { - SwCrsrShell::Right(1,CRSR_SKIP_CHARS); + + /* If the cursor entered or left a table (or both) we are done. No step + back. */ + if( SwCrsrShell::IsCrsrInTbl() != pWasInTblNd ) return 0; - } + OpenMark(); SwCrsrShell::Right(1,CRSR_SKIP_CHARS); SwCrsrShell::SwapPam(); @@ -205,8 +209,6 @@ long SwWrtShell::DelLeft() return nRet; } - - long SwWrtShell::DelRight(BOOL bDelFrm) { // werden verodert, wenn Tabellenselektion vorliegt; @@ -217,6 +219,9 @@ long SwWrtShell::DelRight(BOOL bDelFrm) nSelection = SwWrtShell::SEL_TBL; if(nSelection & SwWrtShell::SEL_TXT) nSelection = SwWrtShell::SEL_TXT; + + const SwTableNode * pWasInTblNd = NULL; + switch( nSelection & ~(SEL_BEZ) ) { case SEL_TXT: @@ -238,6 +243,8 @@ long SwWrtShell::DelRight(BOOL bDelFrm) break; } + pWasInTblNd = IsCrsrInTbl(); + if( SEL_TXT & nSelection && SwCrsrShell::IsSttPara() && SwCrsrShell::IsEndPara() && !IsCrsrInTbl() && SwCrsrShell::Right(1,CRSR_SKIP_CHARS) ) @@ -252,6 +259,14 @@ long SwWrtShell::DelRight(BOOL bDelFrm) break; } } + else if (SwCrsrShell::IsEndPara() && + SwCrsrShell::Right(1, CRSR_SKIP_CHARS)) + { + if (IsCrsrInTbl() || (pWasInTblNd != IsCrsrInTbl())) + break; + + SwCrsrShell::Left(1, CRSR_SKIP_CHARS); + } OpenMark(); SwCrsrShell::Right(1,CRSR_SKIP_CELLS); diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 3f99ce46564f..5194f13bdc9e 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -2,9 +2,9 @@ * * $RCSfile: select.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: os $ $Date: 2002-10-24 11:05:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -220,6 +220,9 @@ void SwWrtShell::SelLine(const Point *pPt, BOOL ) long SwWrtShell::SelAll() { + const BOOL bLockedView = IsViewLocked(); + LockView( TRUE ); + { MV_KONTEXT(this); BOOL bMoveTable = FALSE; @@ -243,6 +246,9 @@ long SwWrtShell::SelAll() GoEnd(TRUE, &bMoveTable); } EndSelect(); + + LockView( bLockedView ); + return 1; } diff --git a/sw/source/ui/wrtsh/wrtsh.src b/sw/source/ui/wrtsh/wrtsh.src index becad60a48ef..536cdc0f2225 100644 --- a/sw/source/ui/wrtsh/wrtsh.src +++ b/sw/source/ui/wrtsh/wrtsh.src @@ -2,10 +2,9 @@ * * $RCSfile: wrtsh.src,v $ * - * $Revision: 1.33 $ - * - * last change: $Author: hbrinkm $ $Date: 2002-11-21 14:39:17 $ + * $Revision: 1.34 $ * + * last change: $Author: hr $ $Date: 2003-03-27 15:45:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,19 +76,20 @@ String STR_CANT_UNDO TEXT [ dutch ] = "Onmogelijk" ; TEXT [ spanish ] = "imposible" ; TEXT [ english_us ] = "not possible" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "不可能"; TEXT[ russian ] = ""; TEXT[ polish ] = "niemoliwy"; - TEXT[ japanese ] = "s\\"; - TEXT[ chinese_traditional ] = "i"; + TEXT[ japanese ] = "不可能"; + TEXT[ chinese_traditional ] = "不可能"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Onmogelijk"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "不可能"; TEXT[ greek ] = ""; - TEXT[ korean ] = "Ұ."; + TEXT[ korean ] = "불가능"; TEXT[ turkish ] = "olanaksz"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "imposible"; + TEXT[ catalan ] = "impossible"; + TEXT[ thai ] = "ไม่สามารถเป็นไปได้"; }; String STR_DELETE_UNDO { @@ -104,21 +104,22 @@ String STR_DELETE_UNDO TEXT [ french ] = "Supprimer" ; TEXT [ swedish ] = "Radera" ; TEXT [ dutch ] = "Wissen" ; - TEXT [ spanish ] = "Eliminar" ; + TEXT [ spanish ] = "Borrar" ; TEXT [ english_us ] = "Delete" ; - TEXT[ chinese_simplified ] = "ɾ"; + TEXT[ chinese_simplified ] = "删除"; TEXT[ russian ] = ""; TEXT[ polish ] = "Usu"; - TEXT[ japanese ] = "폜"; - TEXT[ chinese_traditional ] = "R"; + TEXT[ japanese ] = "削除"; + TEXT[ chinese_traditional ] = "刪除"; TEXT[ arabic ] = ""; TEXT[ dutch ] = "Wissen"; - TEXT[ chinese_simplified ] = "ɾ"; + TEXT[ chinese_simplified ] = "删除"; TEXT[ greek ] = ""; - TEXT[ korean ] = ""; + TEXT[ korean ] = "삭제"; TEXT[ turkish ] = "Sil"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar"; + TEXT[ catalan ] = "Suprimeix"; + TEXT[ thai ] = "ลบ"; }; String STR_INSERT_UNDO { @@ -135,19 +136,20 @@ String STR_INSERT_UNDO TEXT [ dutch ] = "Invoegen" ; TEXT [ spanish ] = "Insertar" ; TEXT [ english_us ] = "Insert" ; - TEXT[ chinese_simplified ] = ""; - TEXT[ russian ] = ""; + TEXT[ chinese_simplified ] = "插入"; + TEXT[ russian ] = ""; TEXT[ polish ] = "Wstaw"; - TEXT[ japanese ] = "}"; - TEXT[ chinese_traditional ] = "J"; + TEXT[ japanese ] = "挿入"; + TEXT[ chinese_traditional ] = "插入"; TEXT[ arabic ] = ""; TEXT[ dutch ] = "Invoegen"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "插入"; TEXT[ greek ] = ""; - TEXT[ korean ] = ""; + TEXT[ korean ] = "삽입"; TEXT[ turkish ] = "Ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar"; + TEXT[ catalan ] = "Insereix"; + TEXT[ thai ] = "แทรก"; }; String STR_OVR_UNDO { @@ -164,19 +166,20 @@ String STR_OVR_UNDO TEXT [ dutch ] = "Overschrijven" ; TEXT [ spanish ] = "Sobrescribir" ; TEXT [ english_us ] = "Overwrite" ; - TEXT[ chinese_simplified ] = "д"; + TEXT[ chinese_simplified ] = "改写"; TEXT[ russian ] = ""; TEXT[ polish ] = "Skasuj przez zapisanie"; - TEXT[ japanese ] = "㏑"; - TEXT[ chinese_traditional ] = "мg"; + TEXT[ japanese ] = "上書き"; + TEXT[ chinese_traditional ] = "覆寫"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Overschrijven"; - TEXT[ chinese_simplified ] = "д"; + TEXT[ chinese_simplified ] = "改写"; TEXT[ greek ] = ""; - TEXT[ korean ] = ""; + TEXT[ korean ] = "겹쳐쓰기"; TEXT[ turkish ] = "zerine yaz"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Sobrescribir"; + TEXT[ catalan ] = "Sobreescriu"; + TEXT[ thai ] = "เขียนทับ"; }; String STR_SPLITNODE_UNDO { @@ -193,19 +196,20 @@ String STR_SPLITNODE_UNDO TEXT [ dutch ] = "Nieuwe alinea" ; TEXT [ spanish ] = "Prrafo nuevo" ; TEXT [ english_us ] = "New Paragraph" ; - TEXT[ chinese_simplified ] = "½"; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "新建段落"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Nowy akapit"; - TEXT[ japanese ] = "Vi"; - TEXT[ chinese_traditional ] = "sجq"; + TEXT[ japanese ] = "新しい段落"; + TEXT[ chinese_traditional ] = "新建段落"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Nieuwe alinea"; - TEXT[ chinese_simplified ] = "½"; + TEXT[ chinese_simplified ] = "新建段落"; TEXT[ greek ] = " "; - TEXT[ korean ] = " ܶ"; + TEXT[ korean ] = "새 단락"; TEXT[ turkish ] = "Yeni paragraf"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Prrafo nuevo"; + TEXT[ catalan ] = "Pargraf nou"; + TEXT[ thai ] = "ย่อหน้าใหม่"; }; String STR_MOVE_UNDO { @@ -222,19 +226,20 @@ String STR_MOVE_UNDO TEXT [ dutch ] = "Verplaatsen" ; TEXT [ spanish ] = "Desplazar" ; TEXT [ english_us ] = "Move" ; - TEXT[ chinese_simplified ] = "ƶ"; + TEXT[ chinese_simplified ] = "移动"; TEXT[ russian ] = ""; TEXT[ polish ] = "Przesu"; - TEXT[ japanese ] = "ړ"; - TEXT[ chinese_traditional ] = ""; + TEXT[ japanese ] = "移動"; + TEXT[ chinese_traditional ] = "移動"; TEXT[ arabic ] = ""; TEXT[ dutch ] = "Verplaatsen"; - TEXT[ chinese_simplified ] = "ƶ"; + TEXT[ chinese_simplified ] = "移动"; TEXT[ greek ] = ""; - TEXT[ korean ] = "̵"; + TEXT[ korean ] = "이동"; TEXT[ turkish ] = "Ta"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Desplazar"; + TEXT[ catalan ] = "Mou"; + TEXT[ thai ] = "ย้าย"; }; String STR_INSATTR_UNDO { @@ -251,19 +256,20 @@ String STR_INSATTR_UNDO TEXT [ dutch ] = "Attributen toepassen" ; TEXT [ spanish ] = "Aplicar atributos" ; TEXT [ english_us ] = "Apply attributes" ; - TEXT[ chinese_simplified ] = "ʹ"; + TEXT[ chinese_simplified ] = "使用属性"; TEXT[ russian ] = " "; TEXT[ polish ] = "Zastosuj atrybuty"; - TEXT[ japanese ] = "̓Kp"; - TEXT[ chinese_traditional ] = "ϥݩ"; + TEXT[ japanese ] = "属性の適用"; + TEXT[ chinese_traditional ] = "使用屬性"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Attributen toepassen"; - TEXT[ chinese_simplified ] = "ʹ"; + TEXT[ chinese_simplified ] = "使用属性"; TEXT[ greek ] = " "; - TEXT[ korean ] = "Ӽ "; + TEXT[ korean ] = "속성 적용"; TEXT[ turkish ] = "znitelikleri deitir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Aplicar atributos"; + TEXT[ catalan ] = "Aplica els atributs"; + TEXT[ thai ] = "ใช้คุณลักษณะ"; }; String STR_SETFMTCOLL_UNDO { @@ -280,19 +286,20 @@ String STR_SETFMTCOLL_UNDO TEXT [ dutch ] = "Opmaakprofielen toepassen" ; TEXT [ spanish ] = "Aplicar estilos" ; TEXT [ english_us ] = "Apply Styles" ; - TEXT[ chinese_simplified ] = "ʹʽ"; + TEXT[ chinese_simplified ] = "使用样式"; TEXT[ russian ] = " "; TEXT[ polish ] = "Zastosuj style"; - TEXT[ japanese ] = "ق̓Kp"; - TEXT[ chinese_traditional ] = "ϥμ˦"; + TEXT[ japanese ] = "スタイルの適用"; + TEXT[ chinese_traditional ] = "使用樣式"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Opmaakprofielen toepassen"; - TEXT[ chinese_simplified ] = "ʹʽ"; + TEXT[ chinese_simplified ] = "使用样式"; TEXT[ greek ] = " "; - TEXT[ korean ] = " "; + TEXT[ korean ] = "스타일 적용"; TEXT[ turkish ] = "Biim uygula"; - TEXT[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; - TEXT[ catalan ] = "Aplicar estilos"; + TEXT[ language_user1 ] = "All ; All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; + TEXT[ catalan ] = "Aplica els estils"; + TEXT[ thai ] = "ใช้ลักษณะ"; }; String STR_RESET_ATTR_UNDO { @@ -306,22 +313,23 @@ String STR_RESET_ATTR_UNDO TEXT [ danish ] = "Nulstil attributter" ; TEXT [ french ] = "Restaurer les attributs" ; TEXT [ swedish ] = "terstll attribut" ; - TEXT [ dutch ] = "Attributen terugzetten" ; + TEXT [ dutch ] = "Attributen herstellen" ; TEXT [ spanish ] = "Restablecer atributos" ; TEXT [ english_us ] = "Reset attributes" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "重设属性"; TEXT[ russian ] = " "; TEXT[ polish ] = "Zresetuj atrybuty"; - TEXT[ japanese ] = "ؾ"; - TEXT[ chinese_traditional ] = "]ݩ"; + TEXT[ japanese ] = "属性のリセット"; + TEXT[ chinese_traditional ] = "重設屬性"; TEXT[ arabic ] = " "; - TEXT[ dutch ] = "Attributen terugzetten"; - TEXT[ chinese_simplified ] = ""; + TEXT[ dutch ] = "Attributen herstellen"; + TEXT[ chinese_simplified ] = "重设属性"; TEXT[ greek ] = " "; - TEXT[ korean ] = "Ӽ "; + TEXT[ korean ] = "속성 원래대로"; TEXT[ turkish ] = "znitelikleri baa al"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Restablecer atributos"; + TEXT[ catalan ] = "Reinicia els atributs"; + TEXT[ thai ] = "กำหนดคุณลักษณะใหม่"; }; String STR_APPLY_ATTR_UNDO { @@ -338,19 +346,20 @@ String STR_APPLY_ATTR_UNDO TEXT [ dutch ] = "Attributen toepassen" ; TEXT [ spanish ] = "Aplicar atributos" ; TEXT [ english_us ] = "Apply attributes" ; - TEXT[ chinese_simplified ] = "ʹ"; + TEXT[ chinese_simplified ] = "使用属性"; TEXT[ russian ] = " "; TEXT[ polish ] = "Zastosuj atrybuty"; - TEXT[ japanese ] = "̓Kp"; - TEXT[ chinese_traditional ] = "ϥݩ"; + TEXT[ japanese ] = "属性の適用"; + TEXT[ chinese_traditional ] = "使用屬性"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Attributen toepassen"; - TEXT[ chinese_simplified ] = "ʹ"; + TEXT[ chinese_simplified ] = "使用属性"; TEXT[ greek ] = " "; - TEXT[ korean ] = "Ӽ "; + TEXT[ korean ] = "속성 적용"; TEXT[ turkish ] = "znitelikleri kullan"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Aplicar atributos"; + TEXT[ catalan ] = "Aplica els atributs"; + TEXT[ thai ] = "ใช้คุณลักษณะ"; }; String STR_INSERT_DOC_UNDO { @@ -367,19 +376,20 @@ String STR_INSERT_DOC_UNDO TEXT [ dutch ] = "Document invoegen" ; TEXT [ spanish ] = "Insertar documento" ; TEXT [ english_us ] = "Insert Document" ; - TEXT[ chinese_simplified ] = "ĵ"; + TEXT[ chinese_simplified ] = "插入文档"; TEXT[ russian ] = " "; TEXT[ polish ] = "Wstaw dokument"; - TEXT[ japanese ] = "Ă̑}"; - TEXT[ chinese_traditional ] = "J"; + TEXT[ japanese ] = "ドキュメントの挿入"; + TEXT[ chinese_traditional ] = "插入文件"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Document invoegen"; - TEXT[ chinese_simplified ] = "ĵ"; + TEXT[ chinese_simplified ] = "插入文档"; TEXT[ greek ] = " "; - TEXT[ korean ] = " "; + TEXT[ korean ] = "문서 삽입"; TEXT[ turkish ] = "Belge ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar documento"; + TEXT[ catalan ] = "Insereix el document"; + TEXT[ thai ] = "แทรกเอกสาร"; }; String STR_INSERT_GLOSSARY { @@ -394,21 +404,22 @@ String STR_INSERT_GLOSSARY TEXT [ french ] = "Insrer un AutoTexte" ; TEXT [ swedish ] = "Infoga AutoText" ; TEXT [ dutch ] = "AutoTekst invoegen" ; - TEXT [ spanish ] = "Insertar AutoTexto" ; + TEXT [ spanish ] = "Insertar Texto automtico" ; TEXT [ english_us ] = "Insert AutoText" ; - TEXT[ chinese_simplified ] = "Զͼļ"; + TEXT[ chinese_simplified ] = "插入自动图文集"; TEXT[ russian ] = " "; TEXT[ polish ] = "Wstaw Autotekst"; - TEXT[ japanese ] = "͎x̑}"; - TEXT[ chinese_traditional ] = "J۰ʹϤ嶰"; + TEXT[ japanese ] = "入力支援の挿入"; + TEXT[ chinese_traditional ] = "插入自動圖文集"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "AutoTekst invoegen"; - TEXT[ chinese_simplified ] = "Զͼļ"; + TEXT[ chinese_simplified ] = "插入自动图文集"; TEXT[ greek ] = " "; - TEXT[ korean ] = "ڵؽƮ "; + TEXT[ korean ] = "자동 텍스트 삽입"; TEXT[ turkish ] = "Otomatik metin ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar AutoTexto"; + TEXT[ catalan ] = "Insereix el text automtic"; + TEXT[ thai ] = "แทรกข้อความอัตโนมัติ"; }; String STR_DELBOOKMARK { @@ -423,21 +434,22 @@ String STR_DELBOOKMARK TEXT [ french ] = "Supprimer le repre de texte" ; TEXT [ swedish ] = "Radera bokmrke" ; TEXT [ dutch ] = "Tekstmarkering verwijderen" ; - TEXT [ spanish ] = "Eliminar marca de texto" ; + TEXT [ spanish ] = "Borrar marca de texto" ; TEXT [ english_us ] = "Delete bookmark" ; - TEXT[ chinese_simplified ] = "ɾǩ"; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "删除书签"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Usu zakadk"; - TEXT[ japanese ] = "÷ϰ̍폜"; - TEXT[ chinese_traditional ] = "R"; + TEXT[ japanese ] = "テキストマークの削除"; + TEXT[ chinese_traditional ] = "刪除內文標籤"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Tekstmarkering verwijderen"; - TEXT[ chinese_simplified ] = "ɾǩ"; + TEXT[ chinese_simplified ] = "删除书签"; TEXT[ greek ] = " "; - TEXT[ korean ] = "å "; + TEXT[ korean ] = "책갈피 삭제"; TEXT[ turkish ] = "Metin iaretini sil"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar marca de texto"; + TEXT[ catalan ] = "Suprimeix l'adrea d'inters"; + TEXT[ thai ] = "ลบตัวคั่น"; }; String STR_INSBOOKMARK { @@ -454,19 +466,20 @@ String STR_INSBOOKMARK TEXT [ dutch ] = "Tekstmarkering invoegen" ; TEXT [ spanish ] = "Insertar marca" ; TEXT [ english_us ] = "Insert bookmark" ; - TEXT[ chinese_simplified ] = "ǩ"; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "插入书签"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Wstaw zakadk"; - TEXT[ japanese ] = "÷ϰ̑}"; - TEXT[ chinese_traditional ] = "J"; + TEXT[ japanese ] = "テキストマークの挿入"; + TEXT[ chinese_traditional ] = "插入內文標籤"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Tekstmarkering invoegen"; - TEXT[ chinese_simplified ] = "ǩ"; + TEXT[ chinese_simplified ] = "插入书签"; TEXT[ greek ] = " "; - TEXT[ korean ] = "å "; + TEXT[ korean ] = "책갈피 삽입"; TEXT[ turkish ] = "Metin iareti ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar marca"; + TEXT[ catalan ] = "Insereix una adrea d'inters"; + TEXT[ thai ] = "แทรกตัวคั่น"; }; String STR_SORT_TBL { @@ -483,19 +496,20 @@ String STR_SORT_TBL TEXT [ dutch ] = "Tabel sorteren" ; TEXT [ spanish ] = "Ordenar tabla" ; TEXT [ english_us ] = "Sort table" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "排序表格"; TEXT[ russian ] = " "; TEXT[ polish ] = "Sortuj tabel"; - TEXT[ japanese ] = "\\̕בւ"; - TEXT[ chinese_traditional ] = "ƧǪ"; + TEXT[ japanese ] = "表の並べ替え"; + TEXT[ chinese_traditional ] = "排序表格"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Tabel sorteren"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "排序表格"; TEXT[ greek ] = " "; - TEXT[ korean ] = "̺ "; + TEXT[ korean ] = "표 정렬"; TEXT[ turkish ] = "Tabloyu srala"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Ordenar tabla"; + TEXT[ catalan ] = "Ordena la taula"; + TEXT[ thai ] = "เรียงตาราง"; }; String STR_SORT_TXT { @@ -512,19 +526,20 @@ String STR_SORT_TXT TEXT [ dutch ] = "Tekst sorteren" ; TEXT [ spanish ] = "Ordenar texto" ; TEXT [ english_us ] = "Sort text" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "排序文字"; TEXT[ russian ] = " "; TEXT[ polish ] = "Sortuj tekst"; - TEXT[ japanese ] = "÷Ă̕בւ"; - TEXT[ chinese_traditional ] = "ƧǤr"; + TEXT[ japanese ] = "テキストの並べ替え"; + TEXT[ chinese_traditional ] = "排序文字"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Tekst sorteren"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "排序文字"; TEXT[ greek ] = " "; - TEXT[ korean ] = "ؽƮ "; + TEXT[ korean ] = "텍스트 정렬"; TEXT[ turkish ] = "Metni srala"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Ordenar texto"; + TEXT[ catalan ] = "Ordena el text"; + TEXT[ thai ] = "เรียงข้อความ"; }; String STR_INSTABLE_UNDO { @@ -541,19 +556,20 @@ String STR_INSTABLE_UNDO TEXT [ dutch ] = "Tabel invoegen" ; TEXT [ spanish ] = "Insertar tabla" ; TEXT [ english_us ] = "Insert Table" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "插入表格"; TEXT[ russian ] = " "; TEXT[ polish ] = "Wstaw tabel"; - TEXT[ japanese ] = "\\̑}"; - TEXT[ chinese_traditional ] = "J"; + TEXT[ japanese ] = "表の挿入"; + TEXT[ chinese_traditional ] = "插入表格"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Tabel invoegen"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "插入表格"; TEXT[ greek ] = " "; - TEXT[ korean ] = "̺ "; + TEXT[ korean ] = "표 삽입"; TEXT[ turkish ] = "Tablo ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar tabla"; + TEXT[ catalan ] = "Insereix una taula"; + TEXT[ thai ] = "แทรกตาราง"; }; String STR_TEXTTOTABLE_UNDO { @@ -570,19 +586,20 @@ String STR_TEXTTOTABLE_UNDO TEXT [ dutch ] = "Tekst naar tabel converteren" ; TEXT [ spanish ] = "Convertir texto en tabla" ; TEXT [ english_us ] = "Convert text -> table" ; - TEXT[ chinese_simplified ] = "תɱ"; - TEXT[ russian ] = " -> "; + TEXT[ chinese_simplified ] = "文字转换成表格"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Konwertuj tekst na tabel"; - TEXT[ japanese ] = "\\ɕϊ"; - TEXT[ chinese_traditional ] = "rഫ"; + TEXT[ japanese ] = "文書を表に変換"; + TEXT[ chinese_traditional ] = "文字轉換成表格"; TEXT[ arabic ] = " -> "; TEXT[ dutch ] = "Tekst naar tabel converteren"; - TEXT[ chinese_simplified ] = "תɱ"; + TEXT[ chinese_simplified ] = "文字转换成表格"; TEXT[ greek ] = " -> "; - TEXT[ korean ] = "ȯ ؽƮ -> ǥ"; + TEXT[ korean ] = "텍스트를 표로 변환"; TEXT[ turkish ] = "Metni tabloya dntr"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Convertir texto en tabla"; + TEXT[ catalan ] = "Converteix text -> taula"; + TEXT[ thai ] = "แปลงข้อความ -> ตาราง"; }; String STR_TABLETOTEXT_UNDO { @@ -594,24 +611,25 @@ String STR_TABLETOTEXT_UNDO TEXT [ portuguese ] = "Converter tabela -> texto" ; TEXT [ finnish ] = "Muunna taulukko tekstiksi" ; TEXT [ danish ] = "Konverter tabel til tekst" ; - TEXT [ french ] = "Convertir tableau en texte" ; + TEXT [ french ] = "Convertir le tableau en texte" ; TEXT [ swedish ] = "Konvertera tabell till text" ; TEXT [ dutch ] = "Tabel naar tekst converteren" ; TEXT [ spanish ] = "Convertir tabla en texto" ; TEXT [ english_us ] = "Convert table to text" ; - TEXT[ chinese_simplified ] = "ת"; - TEXT[ russian ] = " -> "; + TEXT[ chinese_simplified ] = "表格转换成文字"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Konwertuj tabel na tekst"; - TEXT[ japanese ] = "\\ɕϊ"; - TEXT[ chinese_traditional ] = "ഫr"; + TEXT[ japanese ] = "表を文書に変換"; + TEXT[ chinese_traditional ] = "表格轉換成文字"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Tabel naar tekst converteren"; - TEXT[ chinese_simplified ] = "ת"; + TEXT[ chinese_simplified ] = "表格转换成文字"; TEXT[ greek ] = " -> "; - TEXT[ korean ] = "̺ -> ؽƮ ȯ"; + TEXT[ korean ] = "표를 텍스트로 변환"; TEXT[ turkish ] = "Tabloyu metne dntr"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Convertir tabla en texto"; + TEXT[ catalan ] = "Converteix la taula en text"; + TEXT[ thai ] = "แปลงตารางเป็นข้อความ"; }; String STR_COPY_UNDO { @@ -628,19 +646,20 @@ String STR_COPY_UNDO TEXT [ dutch ] = "Kopiren" ; TEXT [ spanish ] = "Copiar" ; TEXT [ english_us ] = "Copy" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "复制"; TEXT[ russian ] = ""; TEXT[ polish ] = "Kopiuj"; - TEXT[ japanese ] = "߰"; - TEXT[ chinese_traditional ] = "ƻs"; + TEXT[ japanese ] = "コピー"; + TEXT[ chinese_traditional ] = "複製"; TEXT[ arabic ] = ""; TEXT[ dutch ] = "Kopiren"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "复制"; TEXT[ greek ] = ""; - TEXT[ korean ] = ""; + TEXT[ korean ] = "복사"; TEXT[ turkish ] = "Kopyala"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Copiar"; + TEXT[ catalan ] = "Copia"; + TEXT[ thai ] = "คัดลอก"; }; String STR_REPLACE_UNDO { @@ -657,19 +676,20 @@ String STR_REPLACE_UNDO TEXT [ dutch ] = "Vervangen" ; TEXT [ spanish ] = "Reemplazar" ; TEXT [ english_us ] = "Replace" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "替换"; TEXT[ russian ] = ""; TEXT[ polish ] = "Zamie"; - TEXT[ japanese ] = "u"; - TEXT[ chinese_traditional ] = "N"; + TEXT[ japanese ] = "置換"; + TEXT[ chinese_traditional ] = "代替"; TEXT[ arabic ] = ""; TEXT[ dutch ] = "Vervangen"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "替换"; TEXT[ greek ] = ""; - TEXT[ korean ] = "ٲٱ"; + TEXT[ korean ] = "바꾸기"; TEXT[ turkish ] = "Deitir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Reemplazar"; + TEXT[ catalan ] = "Reemplaa"; + TEXT[ thai ] = "แทนที่"; }; String STR_INSERT_PAGE_BREAK_UNDO { @@ -681,24 +701,25 @@ String STR_INSERT_PAGE_BREAK_UNDO TEXT [ portuguese ] = "Quebra de pgina fixa" ; TEXT [ finnish ] = "Suora sivunvaihto" ; TEXT [ danish ] = "Hrdt sideskift" ; - TEXT [ french ] = "Saut de page forc" ; + TEXT [ french ] = "Saut de page direct" ; TEXT [ swedish ] = "Hrd sidbrytning" ; TEXT [ dutch ] = "Vast pagina-einde" ; TEXT [ spanish ] = "Salto fijo de pgina" ; TEXT [ english_us ] = "Direct page break" ; - TEXT[ chinese_simplified ] = "ֹҳ"; + TEXT[ chinese_simplified ] = "手工换页"; TEXT[ russian ] = " "; TEXT[ polish ] = "Twarde amanie strony"; - TEXT[ japanese ] = "Cӎw̉߰"; - TEXT[ chinese_traditional ] = "ʴ"; + TEXT[ japanese ] = "任意指定の改ページ"; + TEXT[ chinese_traditional ] = "手動換頁"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Vast pagina-einde"; - TEXT[ chinese_simplified ] = "ֹҳ"; + TEXT[ chinese_simplified ] = "手工换页"; TEXT[ greek ] = " "; - TEXT[ korean ] = " "; + TEXT[ korean ] = "수동 페이지 나누기"; TEXT[ turkish ] = "Sabit sayfa sonu"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Salto fijo de pgina"; + TEXT[ catalan ] = "Salt de pgina directe"; + TEXT[ thai ] = "แบ่งหน้าโดยตรง"; }; String STR_INSERT_COLUMN_BREAK_UNDO { @@ -708,26 +729,27 @@ String STR_INSERT_COLUMN_BREAK_UNDO TEXT [ italian ] = "Interruzione di colonna fissa" ; TEXT [ portuguese_brazilian ] = "Quebra for?ada de coluna" ; TEXT [ portuguese ] = "Quebra de coluna fixa" ; - TEXT [ finnish ] = "Suora sarakevaihto" ; + TEXT [ finnish ] = "Suora sarakkeenvaihto" ; TEXT [ danish ] = "Hrdt spalteskift" ; - TEXT [ french ] = "Saut de colonne forc" ; + TEXT [ french ] = "Saut de colonne direct" ; TEXT [ swedish ] = "Hrd kolumnbrytning" ; TEXT [ dutch ] = "Vast kolomeinde" ; - TEXT [ spanish ] = "Salto de columna fijo" ; + TEXT [ spanish ] = "Salto de columna directo" ; TEXT [ english_us ] = "Direct column break" ; - TEXT[ chinese_simplified ] = "ֹ"; + TEXT[ chinese_simplified ] = "手工换列"; TEXT[ russian ] = " "; TEXT[ polish ] = "Twardy podzia kolumny"; - TEXT[ japanese ] = "Cӎw̉"; - TEXT[ chinese_traditional ] = "ʴ"; + TEXT[ japanese ] = "任意指定の改列"; + TEXT[ chinese_traditional ] = "手動換欄"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Vast kolomeinde"; - TEXT[ chinese_simplified ] = "ֹ"; + TEXT[ chinese_simplified ] = "手工换列"; TEXT[ greek ] = " "; - TEXT[ korean ] = " ٲٱ"; + TEXT[ korean ] = "수동 열 나누기"; TEXT[ turkish ] = "Sabit stun sonu"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Salto de columna fijo"; + TEXT[ catalan ] = "Salt de columna directe"; + TEXT[ thai ] = "แบ่งคอลัมน์โดยตรง"; }; String STR_PLAY_MACRO_UNDO { @@ -744,19 +766,20 @@ String STR_PLAY_MACRO_UNDO TEXT [ dutch ] = "Macro starten" ; TEXT [ spanish ] = "Reproducir macro" ; TEXT [ english_us ] = "Run macro" ; - TEXT[ chinese_simplified ] = "ִк"; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "执行宏"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Wykonaj makro"; - TEXT[ japanese ] = "ϸۂ̎s"; - TEXT[ chinese_traditional ] = "楨"; + TEXT[ japanese ] = "マクロの実行"; + TEXT[ chinese_traditional ] = "執行巨集"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Macro starten"; - TEXT[ chinese_simplified ] = "ִк"; + TEXT[ chinese_simplified ] = "执行宏"; TEXT[ greek ] = " "; - TEXT[ korean ] = "ũ "; + TEXT[ korean ] = "매크로 실행"; TEXT[ turkish ] = "Makroyu altr"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Reproducir macro"; + TEXT[ catalan ] = "Executa la macro"; + TEXT[ thai ] = "ใช้งานมาโคร"; }; String STR_INSERT_ENV_UNDO { @@ -773,19 +796,20 @@ String STR_INSERT_ENV_UNDO Text [ dutch ] = "Envelop invoegen" ; Text [ spanish ] = "Insertar sobre" ; Text [ english_us ] = "Insert Envelope" ; - Text[ chinese_simplified ] = "ŷ"; + Text[ chinese_simplified ] = "插入信封"; Text[ russian ] = " "; Text[ polish ] = "Wstaw kopert"; - Text[ japanese ] = "̑}"; - Text[ chinese_traditional ] = "JH"; + Text[ japanese ] = "封筒の挿入"; + Text[ chinese_traditional ] = "插入信封"; Text[ arabic ] = " "; Text[ dutch ] = "Envelop invoegen"; - Text[ chinese_simplified ] = "ŷ"; + Text[ chinese_simplified ] = "插入信封"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "편지봉투 삽입"; Text[ turkish ] = "Zarf ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar sobre"; + Text[ catalan ] = "Insereix el sobre"; + Text[ thai ] = "แทรกซองจดหมาย"; }; String STR_DRAG_AND_COPY { @@ -800,20 +824,21 @@ String STR_DRAG_AND_COPY Text [ danish ] = "Kopier" ; Text [ portuguese ] = "Copiar" ; Text [ portuguese_brazilian ] = "Kopieren" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "复制"; Text[ russian ] = ""; Text[ polish ] = "Kopiuj"; - Text[ japanese ] = "߰"; - Text[ chinese_traditional ] = "ƻs"; + Text[ japanese ] = "コピーする"; + Text[ chinese_traditional ] = "複製"; Text[ arabic ] = ""; Text[ dutch ] = "Kopiren"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "复制"; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "복사"; Text[ turkish ] = "Kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Copiar"; + Text[ catalan ] = "Copia"; Text[ finnish ] = "Kopioi"; + Text[ thai ] = "คัดลอก"; }; String STR_DRAG_AND_MOVE { @@ -828,20 +853,21 @@ String STR_DRAG_AND_MOVE Text [ danish ] = "Flyt" ; Text [ portuguese ] = "Mover" ; Text [ portuguese_brazilian ] = "Verschieben" ; - Text[ chinese_simplified ] = "ƶ"; + Text[ chinese_simplified ] = "移动"; Text[ russian ] = ""; Text[ polish ] = "Przesu"; - Text[ japanese ] = "ړ"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "移動する"; + Text[ chinese_traditional ] = "移動"; Text[ arabic ] = ""; Text[ dutch ] = "Verplaatsen"; - Text[ chinese_simplified ] = "ƶ"; + Text[ chinese_simplified ] = "移动"; Text[ greek ] = ""; - Text[ korean ] = "̵"; + Text[ korean ] = "이동"; Text[ turkish ] = "Ta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desplazar"; + Text[ catalan ] = "Mou"; Text[ finnish ] = "Siirr"; + Text[ thai ] = "ย้าย"; }; String STR_INSERT_RULER { @@ -855,21 +881,22 @@ String STR_INSERT_RULER Text [ italian ] = "Inserisci ruler" ; Text [ spanish ] = "Insertar regla" ; Text [ french ] = "Insrer une rgle" ; - Text [ dutch ] = "Ruler invoegen" ; - Text[ chinese_simplified ] = ""; + Text [ dutch ] = "Liniaal invoegen" ; + Text[ chinese_simplified ] = "插入标尺"; Text[ russian ] = " "; Text[ polish ] = "Wstaw linijk"; - Text[ japanese ] = "ׂٰ̑}"; - Text[ chinese_traditional ] = "JФ"; + Text[ japanese ] = "ルーラの挿入"; + Text[ chinese_traditional ] = "插入標尺"; Text[ arabic ] = " "; - Text[ dutch ] = "Ruler invoegen"; - Text[ chinese_simplified ] = ""; + Text[ dutch ] = "Liniaal invoegen"; + Text[ chinese_simplified ] = "插入标尺"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "눈금자 삽입"; Text[ turkish ] = "Cetvel ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar regla"; - Text[ finnish ] = "Lis kohdistin"; + Text[ catalan ] = "Insereix el regle"; + Text[ finnish ] = "Lis viivain"; + Text[ thai ] = "แทรกไม้บรรทัด"; }; String STR_INSERT_CHART { @@ -881,23 +908,24 @@ String STR_INSERT_CHART Text [ swedish ] = "Infoga %PRODUCTNAME Chart" ; Text [ danish ] = "Indst %PRODUCTNAME Chart" ; Text [ italian ] = "Inserisci %PRODUCTNAME Chart" ; - Text [ spanish ] = "Insertar %PRODUCTNAME Chart" ; + Text [ spanish ] = "Insertar diagrama de %PRODUCTNAME Chart" ; Text [ french ] = "Insrer un diagramme %PRODUCTNAME Chart" ; Text [ dutch ] = "%PRODUCTNAME Chart invoegen" ; - Text[ chinese_simplified ] = " %PRODUCTNAME ͼ"; + Text[ chinese_simplified ] = "插入 %PRODUCTNAME 图表"; Text[ russian ] = " %PRODUCTNAME Chart"; Text[ polish ] = "Wstaw %PRODUCTNAME Chart"; - Text[ japanese ] = "%PRODUCTNAME Chart ̑}"; - Text[ chinese_traditional ] = "J %PRODUCTNAME Ϫ"; + Text[ japanese ] = "%PRODUCTNAME Chart の挿入"; + Text[ chinese_traditional ] = "插入 %PRODUCTNAME 圖表"; Text[ arabic ] = " %PRODUCTNAME Chart"; Text[ dutch ] = "%PRODUCTNAME Chart invoegen"; - Text[ chinese_simplified ] = " %PRODUCTNAME ͼ"; + Text[ chinese_simplified ] = "插入 %PRODUCTNAME 图表"; Text[ greek ] = " %PRODUCTNAME Chart"; - Text[ korean ] = "%PRODUCTNAMEChart "; + Text[ korean ] = "%PRODUCTNAME Chart 삽입"; Text[ turkish ] = "%PRODUCTNAME Chart ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar %PRODUCTNAME Chart"; - Text[ finnish ] = "Lis tuotteen %PRODUCTNAME kaavio"; + Text[ catalan ] = "Insereix el %PRODUCTNAME Chart"; + Text[ finnish ] = "Lis %PRODUCTNAME-kaavio"; + Text[ thai ] = "แทรกแผนภูมิ %PRODUCTNAME "; }; String STR_INSERTFLY { @@ -914,19 +942,20 @@ String STR_INSERTFLY TEXT [ dutch ] = "Kader invoegen" ; TEXT [ spanish ] = "Insertar marco" ; TEXT [ english_us ] = "Insert frame" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "插入框对象"; TEXT[ russian ] = " "; TEXT[ polish ] = "Wstaw ramk"; - TEXT[ japanese ] = "g̑}"; - TEXT[ chinese_traditional ] = "Jت"; + TEXT[ japanese ] = "枠の挿入"; + TEXT[ chinese_traditional ] = "插入框物件"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Kader invoegen"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "插入框对象"; TEXT[ greek ] = " "; - TEXT[ korean ] = " "; + TEXT[ korean ] = "프레임 삽입"; TEXT[ turkish ] = "ereve ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar marco"; + TEXT[ catalan ] = "Insereix un marc"; + TEXT[ thai ] = "แทรกกรอบ"; }; String STR_DELETEFLY { @@ -941,21 +970,22 @@ String STR_DELETEFLY TEXT [ french ] = "Supprimer le cadre" ; TEXT [ swedish ] = "Radera ram" ; TEXT [ dutch ] = "Kader wissen" ; - TEXT [ spanish ] = "Eliminar marco" ; + TEXT [ spanish ] = "Borrar el marco" ; TEXT [ english_us ] = "Delete frame" ; - TEXT[ chinese_simplified ] = "ɾ"; + TEXT[ chinese_simplified ] = "删除框对象"; TEXT[ russian ] = " "; TEXT[ polish ] = "Usu ramk"; - TEXT[ japanese ] = "g̍폜"; - TEXT[ chinese_traditional ] = "Rت"; + TEXT[ japanese ] = "枠の削除"; + TEXT[ chinese_traditional ] = "刪除框物件"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Kader wissen"; - TEXT[ chinese_simplified ] = "ɾ"; + TEXT[ chinese_simplified ] = "删除框对象"; TEXT[ greek ] = " "; - TEXT[ korean ] = " "; + TEXT[ korean ] = "프레임 삭제"; TEXT[ turkish ] = "ereveyi dzelt"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar marco"; + TEXT[ catalan ] = "Suprimeix el marc"; + TEXT[ thai ] = "ลบกรอบ"; }; String STR_AUTOFORMAT { @@ -970,21 +1000,22 @@ String STR_AUTOFORMAT TEXT [ french ] = "AutoFormat" ; TEXT [ swedish ] = "Autoformat" ; TEXT [ dutch ] = "AutoOpmaak" ; - TEXT [ spanish ] = "AutoFormato" ; + TEXT [ spanish ] = "Formateado automtico" ; TEXT [ english_us ] = "AutoFormat" ; - TEXT[ chinese_simplified ] = "Զʽ"; + TEXT[ chinese_simplified ] = "自动格式"; TEXT[ russian ] = ""; TEXT[ polish ] = "Autoformat"; - TEXT[ japanese ] = "̫ϯ"; - TEXT[ chinese_traditional ] = "۰ʮ榡"; + TEXT[ japanese ] = "オートフォーマット"; + TEXT[ chinese_traditional ] = "自動格式"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "AutoOpmaak"; - TEXT[ chinese_simplified ] = "Զʽ"; + TEXT[ chinese_simplified ] = "自动格式"; TEXT[ greek ] = ""; - TEXT[ korean ] = "ڵ"; + TEXT[ korean ] = "자동 서식"; TEXT[ turkish ] = "Otomatik formatlama"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "AutoFormato"; + TEXT[ catalan ] = "Formatatge automtic"; + TEXT[ thai ] = "รูปแบบอัตโนมัติ"; }; String STR_TABLEHEADLINE { @@ -1001,19 +1032,20 @@ String STR_TABLEHEADLINE TEXT [ dutch ] = "Tabelkop" ; TEXT [ spanish ] = "Encabezado de la tabla" ; TEXT [ english_us ] = "Table heading" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "表格标题"; TEXT[ russian ] = " "; TEXT[ polish ] = "Nagwek tabeli"; - TEXT[ japanese ] = "\\̌o"; - TEXT[ chinese_traditional ] = "D"; + TEXT[ japanese ] = "表の見出し"; + TEXT[ chinese_traditional ] = "表格標題"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Tabelkop"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "表格标题"; TEXT[ greek ] = " "; - TEXT[ korean ] = "ǥ "; + TEXT[ korean ] = "표 제목"; TEXT[ turkish ] = "Tablo bal"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Encabezado de la tabla"; + TEXT[ catalan ] = "Encapalament de la taula"; + TEXT[ thai ] = "หัวข้อตาราง"; }; String STR_REPLACE { @@ -1030,19 +1062,20 @@ String STR_REPLACE TEXT [ dutch ] = "Vervangen" ; TEXT [ spanish ] = "Reemplazar" ; TEXT [ english_us ] = "Replace" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "替换"; TEXT[ russian ] = ""; TEXT[ polish ] = "Zamie"; - TEXT[ japanese ] = "u"; - TEXT[ chinese_traditional ] = "N"; + TEXT[ japanese ] = "置換"; + TEXT[ chinese_traditional ] = "代替"; TEXT[ arabic ] = ""; TEXT[ dutch ] = "Vervangen"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "替换"; TEXT[ greek ] = ""; - TEXT[ korean ] = "ٲٱ"; + TEXT[ korean ] = "바꾸기"; TEXT[ turkish ] = "Deitir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Reemplazar"; + TEXT[ catalan ] = "Reemplaa"; + TEXT[ thai ] = "แทนที่"; }; String STR_INSERTSECTION { @@ -1052,26 +1085,27 @@ String STR_INSERTSECTION TEXT [ italian ] = "Inserisci area" ; TEXT [ portuguese_brazilian ] = "Inserir se??o" ; TEXT [ portuguese ] = "Inserir seco" ; - TEXT [ finnish ] = "Lis osio" ; + TEXT [ finnish ] = "Lis osa" ; TEXT [ danish ] = "Indst omrde" ; TEXT [ french ] = "Insrer une section" ; TEXT [ swedish ] = "Infoga omrde" ; TEXT [ dutch ] = "Bereik invoegen" ; - TEXT [ spanish ] = "Insertar rea" ; + TEXT [ spanish ] = "Insertar una seccin" ; TEXT [ english_us ] = "Insert section" ; - TEXT[ chinese_simplified ] = ""; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "插入区域"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Wstaw obszar"; - TEXT[ japanese ] = "͈͂̑}"; - TEXT[ chinese_traditional ] = "Jϰ"; + TEXT[ japanese ] = "範囲の挿入"; + TEXT[ chinese_traditional ] = "插入區域"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Bereik invoegen"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "插入区域"; TEXT[ greek ] = " "; - TEXT[ korean ] = " "; + TEXT[ korean ] = "구역 삽입"; TEXT[ turkish ] = "Blm ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar rea"; + TEXT[ catalan ] = "Insereix una secci"; + TEXT[ thai ] = "แทรกส่วน"; }; String STR_DELETESECTION { @@ -1081,26 +1115,27 @@ String STR_DELETESECTION TEXT [ italian ] = "Elimina area" ; TEXT [ portuguese_brazilian ] = "Apagar se??o" ; TEXT [ portuguese ] = "Eliminar categoria" ; - TEXT [ finnish ] = "Poista osio" ; + TEXT [ finnish ] = "Poista osa" ; TEXT [ danish ] = "Slet omrde" ; TEXT [ french ] = "Supprimer la section" ; TEXT [ swedish ] = "Radera kategori" ; TEXT [ dutch ] = "Bereik wissen" ; - TEXT [ spanish ] = "Eliminar rea" ; + TEXT [ spanish ] = "Borrar seccin" ; TEXT [ english_us ] = "Delete section" ; - TEXT[ chinese_simplified ] = "ɾ"; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "删除区域"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Usu obszar"; - TEXT[ japanese ] = "͈͂̍폜"; - TEXT[ chinese_traditional ] = "Rϰ"; + TEXT[ japanese ] = "範囲の削除"; + TEXT[ chinese_traditional ] = "刪除區域"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Bereik wissen"; - TEXT[ chinese_simplified ] = "ɾ"; + TEXT[ chinese_simplified ] = "删除区域"; TEXT[ greek ] = " "; - TEXT[ korean ] = " "; + TEXT[ korean ] = "구역 삭제"; TEXT[ turkish ] = "Blm sil"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar rea"; + TEXT[ catalan ] = "Suprimeix una secci"; + TEXT[ thai ] = "ลบส่วน"; }; String STR_CHANGESECTION { @@ -1110,26 +1145,27 @@ String STR_CHANGESECTION TEXT [ italian ] = "Cambia area" ; TEXT [ portuguese_brazilian ] = "Mudar se??o" ; TEXT [ portuguese ] = "Alterar seco" ; - TEXT [ finnish ] = "Muokkaa osiota" ; + TEXT [ finnish ] = "Muokkaa osaa" ; TEXT [ danish ] = "Modificer omrde" ; - TEXT [ french ] = "Modifier section" ; + TEXT [ french ] = "diter la section" ; TEXT [ swedish ] = "ndra omrde" ; TEXT [ dutch ] = "Bereik wijzigen" ; - TEXT [ spanish ] = "Modificar rea" ; + TEXT [ spanish ] = "Modificar la seccin" ; TEXT [ english_us ] = "Modify section" ; - TEXT[ chinese_simplified ] = ""; - TEXT[ russian ] = " "; + TEXT[ chinese_simplified ] = "更改区域"; + TEXT[ russian ] = " "; TEXT[ polish ] = "Zmodyfikuj sekcj"; - TEXT[ japanese ] = "͈͂̕ύX"; - TEXT[ chinese_traditional ] = "ܧϰ"; + TEXT[ japanese ] = "範囲の変更"; + TEXT[ chinese_traditional ] = "變更區域"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Bereik wijzigen"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "更改区域"; TEXT[ greek ] = " "; - TEXT[ korean ] = " "; + TEXT[ korean ] = "구역 변경"; TEXT[ turkish ] = "Blm deitir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Modificar rea"; + TEXT[ catalan ] = "Modifica la secci"; + TEXT[ thai ] = "ดัดแปลงส่วน"; }; String STR_CHANGESECTPASSWD { @@ -1137,27 +1173,28 @@ String STR_CHANGESECTPASSWD TEXT [ English ] = "password protected change" ; Text [ english_us ] = "Change password protection" ; Text [ italian ] = "Cambia protezione password" ; - Text [ spanish ] = "Modificar contrasea" ; + Text [ spanish ] = "Cambiar contrasea" ; Text [ french ] = "Modification du mot de passe" ; Text [ dutch ] = "Wachtwoordbeveiliging wijzigen" ; Text [ swedish ] = "ndra lsenordsskydd" ; Text [ danish ] = "Modificer adgangskodebeskyttelse" ; Text [ portuguese ] = "Alterar proteco da senha" ; Text [ portuguese_brazilian ] = "Pa?wortschutz ?ndern" ; - Text[ chinese_simplified ] = "ı"; + Text[ chinese_simplified ] = "更改保护密码"; Text[ russian ] = " "; Text[ polish ] = "Zmie ochron hasa"; - Text[ japanese ] = "߽ܰޕی̕ύX"; - Text[ chinese_traditional ] = "ܧO@KX"; + Text[ japanese ] = "パスワード保護の変更"; + Text[ chinese_traditional ] = "變更保護密碼"; Text[ arabic ] = " "; Text[ dutch ] = "Wachtwoordbeveiliging wijzigen"; - Text[ chinese_simplified ] = "ı"; + Text[ chinese_simplified ] = "更改保护密码"; Text[ greek ] = " "; - Text[ korean ] = "н ȣ "; + Text[ korean ] = "암호 보안 변경"; Text[ turkish ] = "ifre korumasn deitir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar contrasea"; + Text[ catalan ] = "Canvia la contrasenya"; Text[ finnish ] = "Muuta salasanasuojausta"; + Text[ thai ] = "เปลี่ยนการป้องกันรหัสผ่าน"; }; String STR_CHANGEDEFATTR { @@ -1172,21 +1209,22 @@ String STR_CHANGEDEFATTR TEXT [ french ] = "Changement des valeurs standard" ; TEXT [ swedish ] = "ndra standardvrden" ; TEXT [ dutch ] = "Standaardwaarden wijzigen" ; - TEXT [ spanish ] = "Modificar valores estndar" ; + TEXT [ spanish ] = "Modificar valores predeterminados" ; TEXT [ english_us ] = "Modify default values" ; - TEXT[ chinese_simplified ] = "ıֵ"; + TEXT[ chinese_simplified ] = "更改标准值"; TEXT[ russian ] = " "; TEXT[ polish ] = "Zmie wartoci domylne"; - TEXT[ japanese ] = "Wl̕ύX"; - TEXT[ chinese_traditional ] = "ܧзǭ"; + TEXT[ japanese ] = "標準値の変更"; + TEXT[ chinese_traditional ] = "變更標準值"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Standaardwaarden wijzigen"; - TEXT[ chinese_simplified ] = "ıֵ"; + TEXT[ chinese_simplified ] = "更改标准值"; TEXT[ greek ] = " "; - TEXT[ korean ] = "⺻ "; + TEXT[ korean ] = "기본값 변경"; TEXT[ turkish ] = "Standart deerleri deitir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Modificar valores estndar"; + TEXT[ catalan ] = "Modifica els valors per defecte"; + TEXT[ thai ] = "ดัดแปลงค่าเริ่มต้น"; }; String STR_OUTLINE_LR { @@ -1196,26 +1234,27 @@ String STR_OUTLINE_LR TEXT [ italian ] = "Graduare struttura" ; TEXT [ portuguese_brazilian ] = "Promover vazado" ; TEXT [ portuguese ] = "Escalonar esquema" ; - TEXT [ finnish ] = "Pienenn jsennyksen sisennyst" ; + TEXT [ finnish ] = "Korota jsennystasoa" ; TEXT [ danish ] = "Inddel disposition" ; TEXT [ french ] = "chelonner la structure" ; TEXT [ swedish ] = "Dela in disposition" ; TEXT [ dutch ] = "Overzichtsniveaus bepalen" ; - TEXT [ spanish ] = "Escalonar Esquema" ; + TEXT [ spanish ] = "Escalonar el esquema" ; TEXT [ english_us ] = "Promote Outline" ; - TEXT[ chinese_simplified ] = "ּ"; + TEXT[ chinese_simplified ] = "分级大纲"; TEXT[ russian ] = " "; TEXT[ polish ] = "Poziomy konspektu"; - TEXT[ japanese ] = "ײ݂"; - TEXT[ chinese_traditional ] = "Ťj"; + TEXT[ japanese ] = "アウトラインのレベル"; + TEXT[ chinese_traditional ] = "分級大綱"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Overzichtsniveaus bepalen"; - TEXT[ chinese_simplified ] = "ּ"; + TEXT[ chinese_simplified ] = "分级大纲"; TEXT[ greek ] = " "; - TEXT[ korean ] = "ٴܰ "; + TEXT[ korean ] = "개요 수준 올리기"; TEXT[ turkish ] = "Anahat deitir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Escalonar Esquema"; + TEXT[ catalan ] = "Promou el contorn"; + TEXT[ thai ] = "เลื่อนเค้าร่าง"; }; String STR_OUTLINE_UD { @@ -1232,19 +1271,20 @@ String STR_OUTLINE_UD TEXT [ dutch ] = "Overzicht verplaatsen" ; TEXT [ spanish ] = "Desplazar esquema" ; TEXT [ english_us ] = "Move outline" ; - TEXT[ chinese_simplified ] = "ƶ"; + TEXT[ chinese_simplified ] = "移动大纲"; TEXT[ russian ] = " "; TEXT[ polish ] = "Przesu konspekt"; - TEXT[ japanese ] = "ײ݂̈ړ"; - TEXT[ chinese_traditional ] = "ʤj"; + TEXT[ japanese ] = "アウトラインの移動"; + TEXT[ chinese_traditional ] = "移動大綱"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Overzicht verplaatsen"; - TEXT[ chinese_simplified ] = "ƶ"; + TEXT[ chinese_simplified ] = "移动大纲"; TEXT[ greek ] = " "; - TEXT[ korean ] = "ٴܰ ̵"; + TEXT[ korean ] = "개요 이동"; TEXT[ turkish ] = "Anahat ta"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Desplazar esquema"; + TEXT[ catalan ] = "Mou el contorn"; + TEXT[ thai ] = "ย้ายเค้าร่าง"; }; String STR_INSNUM { @@ -1261,19 +1301,20 @@ String STR_INSNUM TEXT [ dutch ] = "Nummering invoegen" ; TEXT [ spanish ] = "Insertar numeracin" ; TEXT [ english_us ] = "Insert numbering" ; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "插入编号"; TEXT[ russian ] = " "; TEXT[ polish ] = "Wstaw numeracj"; - TEXT[ japanese ] = "ԍt̑}"; - TEXT[ chinese_traditional ] = "Js"; + TEXT[ japanese ] = "番号付けの挿入"; + TEXT[ chinese_traditional ] = "插入編號"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Nummering invoegen"; - TEXT[ chinese_simplified ] = ""; + TEXT[ chinese_simplified ] = "插入编号"; TEXT[ greek ] = " "; - TEXT[ korean ] = "ȣű "; + TEXT[ korean ] = "번호 매기기 삽입"; TEXT[ turkish ] = "Numaralama ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar numeracin"; + TEXT[ catalan ] = "Insereix la numeraci"; + TEXT[ thai ] = "แทรกลำดับตัวเลข"; }; String STR_NUMUPDOWN { @@ -1290,19 +1331,20 @@ String STR_NUMUPDOWN TEXT [ dutch ] = "Nummering indelen" ; TEXT [ spanish ] = "Graduar numeracin" ; TEXT [ english_us ] = "Shift numbering" ; - TEXT[ chinese_simplified ] = "ּ"; + TEXT[ chinese_simplified ] = "分级编号"; TEXT[ russian ] = " "; TEXT[ polish ] = "Poziomy numeracji"; - TEXT[ japanese ] = "ԍt̒iKt"; + TEXT[ japanese ] = "番号付けの段階付け"; TEXT[ language_user1 ] = " "; - TEXT[ chinese_traditional ] = "Žs"; + TEXT[ chinese_traditional ] = "分級編號"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Nummering indelen"; - TEXT[ chinese_simplified ] = "ּ"; + TEXT[ chinese_simplified ] = "分级编号"; TEXT[ greek ] = " "; - TEXT[ korean ] = "ȣű ܰ"; + TEXT[ korean ] = "번호 매기기 단계"; TEXT[ turkish ] = "Numaralamay deitir"; - TEXT[ catalan ] = "Graduar numeracin"; + TEXT[ catalan ] = "Desplaa la numeraci"; + TEXT[ thai ] = "เลื่อนลำดับตัวเลข"; }; String STR_MOVENUM { @@ -1316,21 +1358,22 @@ String STR_MOVENUM Text [ italian ] = "Sposta paragrafi" ; Text [ spanish ] = "Desplazar prrafos" ; Text [ french ] = "Dplacer paragraphes" ; - Text [ dutch ] = "Alineas verplaatsen" ; - Text[ chinese_simplified ] = "ƶ"; + Text [ dutch ] = "Alinea's verplaatsen" ; + Text[ chinese_simplified ] = "移动段落"; Text[ russian ] = " "; Text[ polish ] = "Przesu akapity"; - Text[ japanese ] = "ïړ"; - Text[ chinese_traditional ] = "ʬq"; + Text[ japanese ] = "段落の移動"; + Text[ chinese_traditional ] = "移動段落"; Text[ arabic ] = " "; - Text[ dutch ] = "Alineas verplaatsen"; - Text[ chinese_simplified ] = "ƶ"; + Text[ dutch ] = "Alinea's verplaatsen"; + Text[ chinese_simplified ] = "移动段落"; Text[ greek ] = " "; - Text[ korean ] = "ܶ ̵"; + Text[ korean ] = "단락 이동"; Text[ turkish ] = "Paragraflar ta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desplazar prrafos"; + Text[ catalan ] = "Mou els pargrafs"; Text[ finnish ] = "Siirr kappaleita"; + Text[ thai ] = "ย้ายย่อหน้า"; }; String STR_INSERTDRAW { @@ -1345,20 +1388,21 @@ String STR_INSERTDRAW Text [ danish ] = "Indst tegneobjekt" ; Text [ portuguese ] = "Inserir objecto de desenho" ; Text [ portuguese_brazilian ] = "Zeichenobjekt einf?en" ; - Text[ chinese_simplified ] = "ͼ"; + Text[ chinese_simplified ] = "插入绘图对象"; Text[ russian ] = " "; Text[ polish ] = "Wstaw obiekty graficzne"; - Text[ japanese ] = "`ުĂ̑}"; - Text[ chinese_traditional ] = "JøϪ"; + Text[ japanese ] = "描画オブジェクトの挿入"; + Text[ chinese_traditional ] = "插入繪圖物件"; Text[ arabic ] = " "; Text[ dutch ] = "Tekenobject invoegen"; - Text[ chinese_simplified ] = "ͼ"; + Text[ chinese_simplified ] = "插入绘图对象"; Text[ greek ] = " "; - Text[ korean ] = " ü "; + Text[ korean ] = "그리기 개체 삽입"; Text[ turkish ] = "izim nesnesi ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar objeto de dibujo"; + Text[ catalan ] = "Insereix l'objecte de dibuix"; Text[ finnish ] = "Lis piirrosobjekti"; + Text[ thai ] = "แทรกวัตถุวาดรูป"; }; String STR_NUMORNONUM { @@ -1373,20 +1417,21 @@ String STR_NUMORNONUM Text [ danish ] = "Aktiver/deaktiver nummer" ; Text [ portuguese ] = "Nmero activado/des." ; Text [ portuguese_brazilian ] = "Nummer an/aus" ; - Text[ chinese_simplified ] = "ʾ/"; - Text[ russian ] = "./. "; + Text[ chinese_simplified ] = "显示/隐入编号"; + Text[ russian ] = ""; Text[ polish ] = "Wcz/Wycz numer"; - Text[ japanese ] = "ԍ /"; - Text[ chinese_traditional ] = "/Js"; + Text[ japanese ] = "番号 オン/オフ"; + Text[ chinese_traditional ] = "顯示/隱入編號"; Text[ arabic ] = "/ "; Text[ dutch ] = "Nummer aan/uit"; - Text[ chinese_simplified ] = "ʾ/"; + Text[ chinese_simplified ] = "显示/隐入编号"; Text[ greek ] = " /"; - Text[ korean ] = "ȣ /"; + Text[ korean ] = "번호 적용/해제"; Text[ turkish ] = "Numara ak/kapal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nmero activado/desactivado"; - Text[ finnish ] = "Numerot On/Off"; + Text[ catalan ] = "Nmero activat/desactivat"; + Text[ finnish ] = "Numerot Kytss/poissa kytst"; + Text[ thai ] = "ตัวเลข มี/ไม่มี"; }; String STR_INC_LEFTMARGIN { @@ -1401,20 +1446,21 @@ String STR_INC_LEFTMARGIN Text [ french ] = "Augmenter le retrait" ; Text [ portuguese ] = "Aumentar avano" ; Text [ portuguese_brazilian ] = "Einzug vergr?ern" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "增大缩进"; Text[ russian ] = " "; Text[ polish ] = "Zwiksz wcicie"; - Text[ japanese ] = "Ă̊Ԋůg"; - Text[ chinese_traditional ] = "WjY"; + Text[ japanese ] = "インデントの間隔の拡大"; + Text[ chinese_traditional ] = "增大縮排"; Text[ arabic ] = " "; Text[ dutch ] = "Inspringing vergroten"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "增大缩进"; Text[ greek ] = " "; - Text[ korean ] = "鿩 "; + Text[ korean ] = "들여쓰기"; Text[ turkish ] = "Girintiyi byt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aumentar sangra"; + Text[ catalan ] = "Augmenta el sagnat"; Text[ finnish ] = "Lis sisennyst"; + Text[ thai ] = "เพิ่มระยะเยื้อง"; }; String STR_DEC_LEFTMARGIN { @@ -1425,24 +1471,25 @@ String STR_DEC_LEFTMARGIN Text [ swedish ] = "Minska indrag" ; Text [ danish ] = "Formindsk indrykning" ; Text [ italian ] = "Riduci rientro" ; - Text [ spanish ] = "Disminuir sangra" ; - Text [ french ] = "Diminuer le retrait" ; + Text [ spanish ] = "Reducir la sangra" ; + Text [ french ] = "Rduire le retrait" ; Text [ portuguese ] = "Reduzir avano de pargrafo" ; Text [ portuguese_brazilian ] = "Einzug verringern" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "减少缩进"; Text[ russian ] = " "; Text[ polish ] = "Zmiejsz wcicie"; - Text[ japanese ] = "ĊԊȕk"; - Text[ chinese_traditional ] = "Y"; + Text[ japanese ] = "インデント間隔の縮小"; + Text[ chinese_traditional ] = "減少縮排"; Text[ arabic ] = " "; Text[ dutch ] = "Inspringing verkleinen"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "减少缩进"; Text[ greek ] = " "; - Text[ korean ] = "鿩 "; + Text[ korean ] = "내어쓰기"; Text[ turkish ] = "Girintiyi klt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Disminuir sangra"; + Text[ catalan ] = "Redueix el sagnat"; Text[ finnish ] = "Vhenn sisennyst"; + Text[ thai ] = "ลดระยะเยื้อง"; }; String STR_INSERTLABEL { @@ -1457,20 +1504,21 @@ String STR_INSERTLABEL Text [ french ] = "Insrer une lgende" ; Text [ dutch ] = "Bijschrift invoegen" ; Text [ portuguese ] = "Inserir legenda" ; - Text[ chinese_simplified ] = "ǩ"; + Text[ chinese_simplified ] = "插入标签"; Text[ russian ] = " "; Text[ polish ] = "Wstaw legend"; - Text[ japanese ] = "}\\ԍ̑}"; - Text[ chinese_traditional ] = "J"; + Text[ japanese ] = "図表番号の挿入"; + Text[ chinese_traditional ] = "插入標籤"; Text[ arabic ] = " "; Text[ dutch ] = "Bijschrift invoegen"; - Text[ chinese_simplified ] = "ǩ"; + Text[ chinese_simplified ] = "插入标签"; Text[ greek ] = " "; - Text[ korean ] = "ĸ "; + Text[ korean ] = "캡션 삽입"; Text[ turkish ] = "Etiket ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar etiqueta"; - Text[ finnish ] = "Lis kuvaotsikko"; + Text[ catalan ] = "Insereix una llegenda"; + Text[ finnish ] = "Lis otsikko"; + Text[ thai ] = "แทรกคำบรรยายภาพ"; }; String STR_SETNUMRULESTART { @@ -1485,20 +1533,21 @@ String STR_SETNUMRULESTART Text [ spanish ] = "Reiniciar numeracin" ; Text [ french ] = "Reprendre la numrotation" ; Text [ dutch ] = "Nieuwe nummering" ; - Text[ chinese_simplified ] = "¿ʼ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "重新开始编号"; + Text[ russian ] = " "; Text[ polish ] = "Wcz ponownie numeracj"; - Text[ japanese ] = "ԍtVJn"; - Text[ chinese_traditional ] = "ss"; + Text[ japanese ] = "番号付けを新しく開始"; + Text[ chinese_traditional ] = "重新編號"; Text[ arabic ] = " "; Text[ dutch ] = "Nieuwe nummering"; - Text[ chinese_simplified ] = "¿ʼ"; + Text[ chinese_simplified ] = "重新开始编号"; Text[ greek ] = " "; - Text[ korean ] = "ȣű ٽ "; + Text[ korean ] = "번호 다시 매기기"; Text[ turkish ] = "Numaralamay yeniden balat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reiniciar numeracin"; + Text[ catalan ] = "Reinicia la numeraci"; Text[ finnish ] = "Aloita numerointi uudestaan"; + Text[ thai ] = "เริ่มลำดับตัวเลขใหม่"; }; String STR_CHANGEFTN { @@ -1511,22 +1560,23 @@ String STR_CHANGEFTN Text [ danish ] = "Modificer fodnote" ; Text [ italian ] = "Modifica nota a pi pagina" ; Text [ spanish ] = "Modificar nota al pie" ; - Text [ french ] = "Modifier note de bas de page" ; - Text [ dutch ] = "Voetnoot wijzigingen" ; - Text[ chinese_simplified ] = "ע"; + Text [ french ] = "Modifier la note de bas de page" ; + Text [ dutch ] = "Voetnoot wijzigen" ; + Text[ chinese_simplified ] = "更改注脚"; Text[ russian ] = " "; Text[ polish ] = "Zmodyfikuj przypis dolny"; - Text[ japanese ] = "r̕ύX"; - Text[ chinese_traditional ] = "ܧ}"; + Text[ japanese ] = "脚注の変更"; + Text[ chinese_traditional ] = "變更註腳"; Text[ arabic ] = " "; - Text[ dutch ] = "Voetnoot wijzigingen"; - Text[ chinese_simplified ] = "ע"; + Text[ dutch ] = "Voetnoot wijzigen"; + Text[ chinese_simplified ] = "更改注脚"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "각주 변경"; Text[ turkish ] = "Dipnotu deitir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar nota al pie"; + Text[ catalan ] = "Modifica la nota al peu"; Text[ finnish ] = "Muokkaa alaviitett"; + Text[ thai ] = "ดัดแปลงแก้ไขเชิงอรรถ"; }; String STR_REDLINE { @@ -1542,24 +1592,25 @@ String STR_ACCEPT_REDLINE Text [ swedish ] = "Acceptera ndring" ; Text [ danish ] = "Accepter ndring" ; Text [ italian ] = "Accetta le modifiche" ; - Text [ spanish ] = "Aceptar modificacin" ; + Text [ spanish ] = "Aceptar modificaciones" ; Text [ french ] = "Accepter la modification" ; Text [ dutch ] = "Wijziging accepteren" ; Text [ portuguese ] = "Aceitar modificaes" ; - Text[ chinese_simplified ] = "ܸ"; + Text[ chinese_simplified ] = "接受更改"; Text[ russian ] = " "; Text[ polish ] = "Zaakceptuj zmiany"; - Text[ japanese ] = "ύX"; - Text[ chinese_traditional ] = "ܧ"; + Text[ japanese ] = "変更を受け入れる"; + Text[ chinese_traditional ] = "接受變更"; Text[ arabic ] = " "; Text[ dutch ] = "Wijziging accepteren"; - Text[ chinese_simplified ] = "ܸ"; + Text[ chinese_simplified ] = "接受更改"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "변경 동의"; Text[ turkish ] = "Deiiklikleri kaydet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aceptar modificacin"; + Text[ catalan ] = "Accepta els canvis"; Text[ finnish ] = "Hyvksy muutokset"; + Text[ thai ] = "ยอมรับการเปลี่ยนแปลง"; }; String STR_REJECT_REDLINE { @@ -1574,20 +1625,21 @@ String STR_REJECT_REDLINE Text [ spanish ] = "Rechazar modificacin" ; Text [ french ] = "Rejeter la modification" ; Text [ dutch ] = "Wijziging verwerpen" ; - Text[ chinese_simplified ] = "ܾ"; + Text[ chinese_simplified ] = "拒绝更改"; Text[ russian ] = " "; Text[ polish ] = "Odrzu zmiany"; - Text[ japanese ] = "ύXȂ"; - Text[ chinese_traditional ] = "ڵܧ"; + Text[ japanese ] = "変更を受け入れない"; + Text[ chinese_traditional ] = "拒絕變更"; Text[ arabic ] = " "; Text[ dutch ] = "Wijziging verwerpen"; - Text[ chinese_simplified ] = "ܾ"; + Text[ chinese_simplified ] = "拒绝更改"; Text[ greek ] = " "; - Text[ korean ] = " ź"; + Text[ korean ] = "변경 거부"; Text[ turkish ] = "Deiiklii reddet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Rechazar modificacin"; + Text[ catalan ] = "Rebutja el canvi"; Text[ finnish ] = "Hylk muutos"; + Text[ thai ] = "ปฏิเสธการเปลี่ยนแปลง"; }; String STR_SPLIT_TABLE { @@ -1601,21 +1653,22 @@ String STR_SPLIT_TABLE Text [ italian ] = "Dividi tabella" ; Text [ spanish ] = "Dividir tabla" ; Text [ french ] = "Scinder le tableau" ; - Text [ dutch ] = "Tabel splitsen" ; - Text[ chinese_simplified ] = "ָ"; + Text [ dutch ] = "Tabel opsplitsen" ; + Text[ chinese_simplified ] = "分隔表格"; Text[ russian ] = " "; Text[ polish ] = "Rozdziel tabel"; - Text[ japanese ] = "\\̕"; - Text[ chinese_traditional ] = "}"; + Text[ japanese ] = "表の分割"; + Text[ chinese_traditional ] = "分開表格"; Text[ arabic ] = " "; - Text[ dutch ] = "Tabel splitsen"; - Text[ chinese_simplified ] = "ָ"; + Text[ dutch ] = "Tabel opsplitsen"; + Text[ chinese_simplified ] = "分隔表格"; Text[ greek ] = " "; - Text[ korean ] = "ǥ "; + Text[ korean ] = "표 나누기"; Text[ turkish ] = "Tabloyu bl"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dividir tabla"; + Text[ catalan ] = "Divideix la taula"; Text[ finnish ] = "Jaa taulukko"; + Text[ thai ] = "แยกตาราง"; }; String STR_DONTEXPAND { @@ -1630,20 +1683,21 @@ String STR_DONTEXPAND Text [ spanish ] = "Detener atributo" ; Text [ french ] = "Arrter" ; Text [ dutch ] = "Attribuut stoppen" ; - Text[ chinese_simplified ] = "ֹͣʾ"; + Text[ chinese_simplified ] = "停止显示属性"; Text[ russian ] = " "; Text[ polish ] = "Zatrzymaj atrybuty"; - Text[ japanese ] = "̒~"; - Text[ chinese_traditional ] = "ݩ"; + Text[ japanese ] = "属性の中止"; + Text[ chinese_traditional ] = "停止顯示屬性"; Text[ arabic ] = " "; Text[ dutch ] = "Attribuut stoppen"; - Text[ chinese_simplified ] = "ֹͣʾ"; + Text[ chinese_simplified ] = "停止显示属性"; Text[ greek ] = " "; - Text[ korean ] = "Ӽ "; + Text[ korean ] = "속성 중지"; Text[ turkish ] = "znitelii durdur"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Detener atributo"; + Text[ catalan ] = "Atura l'atribut"; Text[ finnish ] = "Pysyt ominaisuus"; + Text[ thai ] = "หยุดคุณลักษณะ"; }; String STR_AUTOCORRECT { @@ -1655,23 +1709,24 @@ String STR_AUTOCORRECT Text [ swedish ] = "AutoKorrigering" ; Text [ danish ] = "AutoKorrektur" ; Text [ italian ] = "Correzione automatica" ; - Text [ spanish ] = "AutoCorreccin" ; + Text [ spanish ] = "Correccin automtica" ; Text [ french ] = "AutoCorrection" ; Text [ dutch ] = "AutoCorrectie" ; - Text[ chinese_simplified ] = "Զ"; + Text[ chinese_simplified ] = "自动更正"; Text[ russian ] = ""; Text[ polish ] = "Autokorekta"; - Text[ japanese ] = "ĺڸ"; - Text[ chinese_traditional ] = "۰ʮե"; + Text[ japanese ] = "オートコレクト"; + Text[ chinese_traditional ] = "自動校正"; Text[ arabic ] = " "; Text[ dutch ] = "AutoCorrectie"; - Text[ chinese_simplified ] = "Զ"; + Text[ chinese_simplified ] = "自动更正"; Text[ greek ] = ""; - Text[ korean ] = "ڵħ"; + Text[ korean ] = "자동 수정/자동 서식"; Text[ turkish ] = "Otomatik dzeltme"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoCorreccin"; - Text[ finnish ] = "Automaattinen korjaus"; + Text[ catalan ] = "Correcci automtica"; + Text[ finnish ] = "Autom. korjaus"; + Text[ thai ] = "แก้ไขให้ถูกต้องอัตโนมัติ"; }; String STR_MERGE_TABLE { @@ -1685,21 +1740,22 @@ String STR_MERGE_TABLE Text[ spanish ] = "unir tablas"; Text[ italian ] = "Collega tabella"; Text[ danish ] = "Flet tabeller"; - Text[ swedish ] = "Frbind tabeller"; + Text[ swedish ] = "Sammanfoga tabeller"; Text[ polish ] = "Pocz tabele"; Text[ portuguese_brazilian ] = "Merge table"; - Text[ japanese ] = "\\̌"; - Text[ chinese_simplified ] = "ϲ"; - Text[ chinese_traditional ] = "X֪"; + Text[ japanese ] = "表の結合"; + Text[ chinese_simplified ] = "合并表格"; + Text[ chinese_traditional ] = "合併表格"; Text[ arabic ] = " "; Text[ dutch ] = "Tabel verbinden"; - Text[ chinese_simplified ] = "ϲ"; + Text[ chinese_simplified ] = "合并表格"; Text[ greek ] = " "; - Text[ korean ] = "̺ "; + Text[ korean ] = "표 합치기"; Text[ turkish ] = "Tabloyu birletir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "unir tablas"; + Text[ catalan ] = "Fusiona la taula"; Text[ finnish ] = "Yhdist taulukko"; + Text[ thai ] = "ผสานตาราง"; }; String STR_TRANSLITERATE @@ -1708,24 +1764,25 @@ String STR_TRANSLITERATE TEXT [ English ] = "Change case" ; TEXT[ english_us ] = "Case/Characters"; TEXT[ portuguese ] = "Caixa/Caracteres"; - TEXT[ russian ] = "/ "; + TEXT[ russian ] = ""; TEXT[ greek ] = "/"; - TEXT[ dutch ] = "Hoofd-/kleine letters"; + TEXT[ dutch ] = "Hoofdletters/kleine letters"; TEXT[ french ] = "Casse/Caractres"; TEXT[ spanish ] = "Maysculas/minsculas"; TEXT[ italian ] = "Maiuscole/minuscole"; - TEXT[ danish ] = "Change case"; - TEXT[ swedish ] = "Versalknslig"; + TEXT[ danish ] = "Store og sm bogstaver"; + TEXT[ swedish ] = "Bokstver/tecken"; TEXT[ polish ] = "Wielkie i mae litery"; TEXT[ portuguese_brazilian ] = "Change case"; - TEXT[ japanese ] = "啶/"; - TEXT[ korean ] = "/ҹ "; - TEXT[ chinese_simplified ] = "ĸСд"; - TEXT[ chinese_traditional ] = "rjpg"; + TEXT[ japanese ] = "文字種の変換"; + TEXT[ korean ] = "문자 바꾸기"; + TEXT[ chinese_simplified ] = "字母大小写"; + TEXT[ chinese_traditional ] = "字母大小寫"; TEXT[ turkish ] = "Change case"; TEXT[ arabic ] = " "; - TEXT[ catalan ] = "Maysculas/minsculas"; - TEXT[ finnish ] = "Gro-/Kleinschreibung"; + TEXT[ catalan ] = "Majscules/minscules"; + TEXT[ finnish ] = "Muuta kirjainkoko"; + TEXT[ thai ] = "ตัวพิมพ์/ตัวอักขระ"; }; String STR_DELNUM @@ -1741,21 +1798,22 @@ String STR_DELNUM TEXT [ french ] = "Supprimer la numrotation" ; TEXT [ swedish ] = "Radera numrering" ; TEXT [ dutch ] = "Nummering wissen" ; - TEXT [ spanish ] = "Eliminar numeracin" ; + TEXT [ spanish ] = "Borrar numeracin" ; TEXT [ english_us ] = "Delete numbering" ; - TEXT[ chinese_simplified ] = "ɾ"; + TEXT[ chinese_simplified ] = "删除编号"; TEXT[ russian ] = " "; TEXT[ polish ] = "Usu numeracj"; - TEXT[ japanese ] = "ԍt̍폜"; - TEXT[ chinese_traditional ] = "Rs"; + TEXT[ japanese ] = "番号付けの削除"; + TEXT[ chinese_traditional ] = "刪除編號"; TEXT[ arabic ] = " "; TEXT[ dutch ] = "Nummering wissen"; - TEXT[ chinese_simplified ] = "ɾ"; + TEXT[ chinese_simplified ] = "删除编号"; TEXT[ greek ] = " "; - TEXT[ korean ] = "ȣű "; + TEXT[ korean ] = "번호 매기기 삭제"; TEXT[ turkish ] = "Numaralamay sil"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar numeracin"; + TEXT[ catalan ] = "Suprimeix la numeraci"; + TEXT[ thai ] = "ลบลำดับตัวเลข"; }; String STR_DRAWUNDO { @@ -1770,20 +1828,21 @@ String STR_DRAWUNDO Text [ danish ] = "Tegneobjekter" ; Text [ portuguese ] = "Objectos de desenho" ; Text [ portuguese_brazilian ] = "Zeichenobjekte" ; - Text[ chinese_simplified ] = "ͼ"; + Text[ chinese_simplified ] = "绘图对象"; Text[ russian ] = " "; Text[ polish ] = "Obiekty graficzne"; - Text[ japanese ] = "}``ު"; - Text[ chinese_traditional ] = "øϪ"; + Text[ japanese ] = "図形描画オブジェクト"; + Text[ chinese_traditional ] = "繪圖物件"; Text[ arabic ] = " "; Text[ dutch ] = "Tekenobjecten"; - Text[ chinese_simplified ] = "ͼ"; + Text[ chinese_simplified ] = "绘图对象"; Text[ greek ] = " "; - Text[ korean ] = " ü"; + Text[ korean ] = "그리기 개체"; Text[ turkish ] = "izim nesneleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Objetos de dibujo"; + Text[ catalan ] = "Objectes de dibuix"; Text[ finnish ] = "Piirrosobjektit"; + Text[ thai ] = "วาดวัตถุ"; }; String STR_DRAWGROUP { @@ -1798,20 +1857,21 @@ String STR_DRAWGROUP Text [ danish ] = "Grupper tegneobjekter" ; Text [ portuguese ] = "Agrupar objectos de desenho" ; Text [ portuguese_brazilian ] = "Zeichenobjekte gruppieren" ; - Text[ chinese_simplified ] = "ͼ"; + Text[ chinese_simplified ] = "分组绘图对象"; Text[ russian ] = " "; Text[ polish ] = "Grupuj obiekty graficzne"; - Text[ japanese ] = "}``ٰ߉"; - Text[ chinese_traditional ] = "øϪs"; + Text[ japanese ] = "図形描画をグループ化する"; + Text[ chinese_traditional ] = "繪圖物件群組"; Text[ arabic ] = " "; Text[ dutch ] = "Tekenobjecten groeperen"; - Text[ chinese_simplified ] = "ͼ"; + Text[ chinese_simplified ] = "分组绘图对象"; Text[ greek ] = " "; - Text[ korean ] = " ü "; + Text[ korean ] = "그리기 개체 그룹"; Text[ turkish ] = "izim nesnelerini grupla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Agrupar objetos de dibujo"; + Text[ catalan ] = "Agrupa els objectes de dibuix"; Text[ finnish ] = "Ryhmittele piirrosobjektit"; + Text[ thai ] = "จัดกลุ่มวัตถุวาดรูป"; }; String STR_DRAWUNGROUP { @@ -1822,24 +1882,25 @@ String STR_DRAWUNGROUP Text [ spanish ] = "Resolver objeto de grupo" ; Text [ french ] = "Dissocier les objets" ; Text [ dutch ] = "Groepsobject opheffen" ; - Text [ swedish ] = "Uppls gruppobjekt" ; + Text [ swedish ] = "Ls upp gruppobjekt" ; Text [ danish ] = "Ophv gruppeobjekter" ; Text [ portuguese ] = "Desagrupar objectos" ; Text [ portuguese_brazilian ] = "Gruppenobjekt aufl?en" ; - Text[ chinese_simplified ] = "ȡ"; + Text[ chinese_simplified ] = "取消分组对象"; Text[ russian ] = " "; Text[ polish ] = "Rozgrupuj obiekty rysunkowe"; - Text[ japanese ] = "ٰ߉ꂽޭẲ"; - Text[ chinese_traditional ] = "sժ"; + Text[ japanese ] = "グループ化されたオブジュクトの解除"; + Text[ chinese_traditional ] = "取消群組物件"; Text[ arabic ] = " "; Text[ dutch ] = "Groepsobject opheffen"; - Text[ chinese_simplified ] = "ȡ"; + Text[ chinese_simplified ] = "取消分组对象"; Text[ greek ] = " "; - Text[ korean ] = " ü ü"; + Text[ korean ] = "그리기 개체 그룹 해제"; Text[ turkish ] = "Nesne grubunu z"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Resolver objeto de grupo"; + Text[ catalan ] = "Desagrupa els objectes de dibuix"; Text[ finnish ] = "Pura piirrosobjektien ryhmitys"; + Text[ thai ] = "ไม่จัดกลุ่มวัตถุวาดรูป"; }; String STR_DRAWDELETE { @@ -1848,26 +1909,27 @@ String STR_DRAWDELETE Text [ dutch ] = "Tekenobjecten wissen" ; Text [ english_us ] = "Delete drawing objects" ; Text [ italian ] = "Elimina oggetti di disegno" ; - Text [ spanish ] = "Eliminar objetos de dibujo" ; + Text [ spanish ] = "Borrar objetos de dibujo" ; Text [ french ] = "Supprimer des objets de dessin" ; Text [ swedish ] = "Radera ritobjekt" ; Text [ danish ] = "Slet tegneobjekter" ; Text [ portuguese ] = "Eliminar objectos de desenho" ; Text [ portuguese_brazilian ] = "Zeichenobjekte l?chen" ; - Text[ chinese_simplified ] = "ɾͼ"; + Text[ chinese_simplified ] = "删除绘图对象"; Text[ russian ] = " "; Text[ polish ] = "Usu obiekty graficzne"; - Text[ japanese ] = "}``ުĂ"; - Text[ chinese_traditional ] = "RøϪ"; + Text[ japanese ] = "図形描画オブジェクトを解除"; + Text[ chinese_traditional ] = "刪除繪圖物件"; Text[ arabic ] = " "; Text[ dutch ] = "Tekenobjecten wissen"; - Text[ chinese_simplified ] = "ɾͼ"; + Text[ chinese_simplified ] = "删除绘图对象"; Text[ greek ] = " "; - Text[ korean ] = " ü "; + Text[ korean ] = "그리기 개체 삭제"; Text[ turkish ] = "izim nesnelerini sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar objetos de dibujo"; + Text[ catalan ] = "Suprimeix els objectes de dibuix"; Text[ finnish ] = "Poista piirrosobjektit"; + Text[ thai ] = "ลบวัตถุวาดรูป"; }; String STR_REREAD { @@ -1882,20 +1944,21 @@ String STR_REREAD Text [ danish ] = "Erstat grafik" ; Text [ portuguese ] = "Substituir imagem" ; Text [ portuguese_brazilian ] = "Grafik ersetzen" ; - Text[ chinese_simplified ] = "ͼ"; + Text[ chinese_simplified ] = "替换图形"; Text[ russian ] = " "; Text[ polish ] = "Zamie grafik"; - Text[ japanese ] = "}̒u"; - Text[ chinese_traditional ] = "Nϧ"; + Text[ japanese ] = "図の置換"; + Text[ chinese_traditional ] = "代替圖形"; Text[ arabic ] = " "; Text[ dutch ] = "Afbeelding vervangen"; - Text[ chinese_simplified ] = "ͼ"; + Text[ chinese_simplified ] = "替换图形"; Text[ greek ] = " "; - Text[ korean ] = " ٲٱ"; + Text[ korean ] = "그림 바꾸기"; Text[ turkish ] = "Grafii deitirmek"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reemplazar imagen"; + Text[ catalan ] = "Reemplaa la imatge"; Text[ finnish ] = "Korvaa grafiikka"; + Text[ thai ] = "แทนที่กราฟิค"; }; String STR_DELGRF { @@ -1904,26 +1967,27 @@ String STR_DELGRF Text [ dutch ] = "Afbeelding wissen" ; Text [ english_us ] = "Delete graphics" ; Text [ italian ] = "Elimina immagine" ; - Text [ spanish ] = "Eliminar imagen" ; + Text [ spanish ] = "Borrar imagen" ; Text [ french ] = "Supprimer l'image" ; Text [ swedish ] = "Radera grafik" ; Text [ danish ] = "Slet grafik" ; Text [ portuguese ] = "Eliminar imagem" ; Text [ portuguese_brazilian ] = "Grafik l?chen" ; - Text[ chinese_simplified ] = "ɾͼ"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "删除图形"; + Text[ russian ] = " "; Text[ polish ] = "Usu grafik"; - Text[ japanese ] = "}̍폜"; - Text[ chinese_traditional ] = "Rϧ"; + Text[ japanese ] = "図の削除"; + Text[ chinese_traditional ] = "刪除圖形"; Text[ arabic ] = " "; Text[ dutch ] = "Afbeelding wissen"; - Text[ chinese_simplified ] = "ɾͼ"; + Text[ chinese_simplified ] = "删除图形"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "그림 삭제"; Text[ turkish ] = "Grafii sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar imagen"; - Text[ finnish ] = "Poista kuvat"; + Text[ catalan ] = "Suprimeix la imatge"; + Text[ finnish ] = "Poista grafiikka"; + Text[ thai ] = "ลบกราฟิค"; }; String STR_DELOLE { @@ -1931,27 +1995,28 @@ String STR_DELOLE TEXT [ English ] = "Delete Object" ; Text [ english_us ] = "Delete object" ; Text [ italian ] = "Elimina oggetto" ; - Text [ spanish ] = "Eliminar objeto" ; + Text [ spanish ] = "Borrar objeto" ; Text [ french ] = "Supprimer l'objet" ; Text [ dutch ] = "Object wissen" ; Text [ swedish ] = "Radera objekt" ; Text [ danish ] = "Slet objekt" ; Text [ portuguese ] = "Eliminar objecto" ; Text [ portuguese_brazilian ] = "Objekt l?chen" ; - Text[ chinese_simplified ] = "ɾ"; + Text[ chinese_simplified ] = "删除对象"; Text[ russian ] = " "; Text[ polish ] = "Usu obiekt"; - Text[ japanese ] = "ުĂ̍폜"; - Text[ chinese_traditional ] = "R"; + Text[ japanese ] = "オブジェクトの削除"; + Text[ chinese_traditional ] = "刪除物件"; Text[ arabic ] = " "; Text[ dutch ] = "Object wissen"; - Text[ chinese_simplified ] = "ɾ"; + Text[ chinese_simplified ] = "删除对象"; Text[ greek ] = " "; - Text[ korean ] = "ü "; + Text[ korean ] = "개체 삭제"; Text[ turkish ] = "Nesneyi sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar objeto"; + Text[ catalan ] = "Suprimeix l'objecte"; Text[ finnish ] = "Poista objekti"; + Text[ thai ] = "ลบวัตถุ"; }; String STR_TABLE_ATTR { @@ -1966,20 +2031,21 @@ String STR_TABLE_ATTR Text [ danish ] = "Anvend tabelattributter" ; Text [ portuguese ] = "Aplicar atributos da tabela" ; Text [ portuguese_brazilian ] = "Tabellenattribute anwenden" ; - Text[ chinese_simplified ] = "ʹñ"; + Text[ chinese_simplified ] = "使用表格属性"; Text[ russian ] = " "; Text[ polish ] = "Zastosuj atrybuty tabeli"; - Text[ japanese ] = "\\̑̓Kp"; - Text[ chinese_traditional ] = "ϥΪݩ"; + Text[ japanese ] = "表の属性の適用"; + Text[ chinese_traditional ] = "使用表格屬性"; Text[ arabic ] = " "; Text[ dutch ] = "Tabelattributen toepassen"; - Text[ chinese_simplified ] = "ʹñ"; + Text[ chinese_simplified ] = "使用表格属性"; Text[ greek ] = " "; - Text[ korean ] = "ǥ Ӽ "; + Text[ korean ] = "표의 속성 적용"; Text[ turkish ] = "Tablo zniteliklerini kullan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aplicar atributos de la tabla"; + Text[ catalan ] = "Aplica els atributs de la taula"; Text[ finnish ] = "Kyt taulukkomritteit"; + Text[ thai ] = "ใช้คุณลักษณะตาราง"; }; String STR_TABLE_AUTOFMT { @@ -1987,27 +2053,28 @@ String STR_TABLE_AUTOFMT TEXT [ English ] = "Autoformat Table" ; Text [ english_us ] = "AutoFormat Table" ; Text [ italian ] = "Formattazione automatica tabella" ; - Text [ spanish ] = "AutoFormato tabla" ; + Text [ spanish ] = "Formateado automtico tabla" ; Text [ french ] = "AutoFormat de tableau" ; Text [ dutch ] = "AutoOpmaak tabel" ; Text [ swedish ] = "Autoformat Tabell" ; Text [ danish ] = "AutoFormat tabel" ; Text [ portuguese ] = "AutoFormato tabela" ; Text [ portuguese_brazilian ] = "Autoformat Tabelle" ; - Text[ chinese_simplified ] = "Զʽ "; + Text[ chinese_simplified ] = "自动格式 表格"; Text[ russian ] = " "; Text[ polish ] = "Autoformat tabeli"; - Text[ japanese ] = "̫ϯ \\"; - Text[ chinese_traditional ] = "۰ʮ榡 "; + Text[ japanese ] = "オートフォーマット 表"; + Text[ chinese_traditional ] = "自動格式 表格"; Text[ arabic ] = " "; Text[ dutch ] = "AutoOpmaak tabel"; - Text[ chinese_simplified ] = "Զʽ "; + Text[ chinese_simplified ] = "自动格式 表格"; Text[ greek ] = " "; - Text[ korean ] = "ڵ ̺"; + Text[ korean ] = "표 자동 서식"; Text[ turkish ] = "Otomatik formatlama Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoFormato tabla"; + Text[ catalan ] = "Taula de formatatge automtic"; Text[ finnish ] = "Automaattinen taulukon muotoilu"; + Text[ thai ] = "ตารางรูปแบบอัตโนมัติ"; }; String STR_TABLE_INSCOL { @@ -2024,19 +2091,20 @@ String STR_TABLE_INSCOL Text [ dutch ] = "Kolom invoegen" ; Text [ spanish ] = "Insertar columna" ; Text [ english_us ] = "Insert Column" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "插入列"; + Text[ russian ] = " "; Text[ polish ] = "Wstaw kolumn"; - Text[ japanese ] = "̑}"; - Text[ chinese_traditional ] = "J"; + Text[ japanese ] = "列の挿入"; + Text[ chinese_traditional ] = "插入欄"; Text[ arabic ] = " "; Text[ dutch ] = "Kolom invoegen"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "插入列"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "열 삽입"; Text[ turkish ] = "Stunu ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar columna"; + Text[ catalan ] = "Insereix una columna"; + Text[ thai ] = "แทรกคอลัมน์"; }; String STR_TABLE_INSROW { @@ -2053,19 +2121,20 @@ String STR_TABLE_INSROW Text [ dutch ] = "Rij invoegen" ; Text [ spanish ] = "Insertar fila" ; Text [ english_us ] = "Insert Row" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "插入行"; Text[ russian ] = " "; Text[ polish ] = "Wstaw wiersz"; - Text[ japanese ] = "s̑}"; - Text[ chinese_traditional ] = "J"; + Text[ japanese ] = "行の挿入"; + Text[ chinese_traditional ] = "插入行"; Text[ arabic ] = " "; Text[ dutch ] = "Rij invoegen"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "插入行"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "행 삽입"; Text[ turkish ] = "Satr ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar fila"; + Text[ catalan ] = "Insereix una fila"; + Text[ thai ] = "แทรกแถว"; }; String STR_TABLE_DELBOX { @@ -2080,21 +2149,22 @@ String STR_TABLE_DELBOX Text [ french ] = "Supprimer la ligne/colonne" ; Text [ swedish ] = "Radera rad/kolumn" ; Text [ dutch ] = "Rij/Kolom wissen" ; - Text [ spanish ] = "Eliminar fila/columna" ; + Text [ spanish ] = "Borrar fila/columna" ; Text [ english_us ] = "Delete row/column" ; - Text[ chinese_simplified ] = "ɾ/"; + Text[ chinese_simplified ] = "删除行/列"; Text[ russian ] = " /"; Text[ polish ] = "Usu wiersz/kolumn"; - Text[ japanese ] = "s/̍폜"; - Text[ chinese_traditional ] = "RC/"; + Text[ japanese ] = "行/列の削除"; + Text[ chinese_traditional ] = "刪除列/欄"; Text[ arabic ] = " /"; Text[ dutch ] = "Rij/Kolom wissen"; - Text[ chinese_simplified ] = "ɾ/"; + Text[ chinese_simplified ] = "删除行/列"; Text[ greek ] = " /"; - Text[ korean ] = "/ "; + Text[ korean ] = "행/열 삭제"; Text[ turkish ] = "Satr/stunu sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar fila/columna"; + Text[ catalan ] = "Suprimeix la fila/columna"; + Text[ thai ] = "ลบแถว/คอลัมน์"; }; String STR_TABLE_SPLIT { @@ -2111,19 +2181,20 @@ String STR_TABLE_SPLIT Text [ dutch ] = "Cellen splitsen" ; Text [ spanish ] = "Dividir celdas" ; Text [ english_us ] = "Split Cells" ; - Text[ chinese_simplified ] = "ָԪ"; + Text[ chinese_simplified ] = "分隔单元格"; Text[ russian ] = " "; Text[ polish ] = "Podziel komrki"; - Text[ japanese ] = "ق̕"; - Text[ chinese_traditional ] = "}xs"; + Text[ japanese ] = "セルの分割"; + Text[ chinese_traditional ] = "分開儲存格"; Text[ arabic ] = " "; Text[ dutch ] = "Cellen splitsen"; - Text[ chinese_simplified ] = "ָԪ"; + Text[ chinese_simplified ] = "分隔单元格"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "셀 나누기"; Text[ turkish ] = "Hcreyi ayr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dividir celdas"; + Text[ catalan ] = "Divideix les cel.les"; + Text[ thai ] = "แยกเซลล์"; }; String STR_TABLE_MERGE { @@ -2134,24 +2205,25 @@ String STR_TABLE_MERGE Text [ spanish ] = "Unir celdas" ; Text [ french ] = "Fusionner la cellule" ; Text [ dutch ] = "Cel koppelen" ; - Text [ swedish ] = "Frbind cell" ; + Text [ swedish ] = "Sammanfoga celler" ; Text [ danish ] = "Flet celler" ; Text [ portuguese ] = "Unir clulas" ; Text [ portuguese_brazilian ] = "Zelle verbinden" ; - Text[ chinese_simplified ] = "ϲԪ"; + Text[ chinese_simplified ] = "合并单元格"; Text[ russian ] = " "; Text[ polish ] = "Scal komrki"; - Text[ japanese ] = "ق̌"; - Text[ chinese_traditional ] = "Xxs"; + Text[ japanese ] = "セルの結合"; + Text[ chinese_traditional ] = "合併儲存格"; Text[ arabic ] = " "; Text[ dutch ] = "Cel koppelen"; - Text[ chinese_simplified ] = "ϲԪ"; + Text[ chinese_simplified ] = "合并单元格"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "셀 합치기"; Text[ turkish ] = "Hcreyi birletir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Unir celdas"; + Text[ catalan ] = "Fusiona les cel.les"; Text[ finnish ] = "Yhdist solut"; + Text[ thai ] = "ผสานเซลล์"; }; String STR_TABLE_NUMFORMAT { @@ -2166,20 +2238,21 @@ String STR_TABLE_NUMFORMAT Text [ spanish ] = "Formatear celda" ; Text [ french ] = "Formater la cellule" ; Text [ dutch ] = "Cel opmaken" ; - Text[ chinese_simplified ] = "ʽԪ"; + Text[ chinese_simplified ] = "格式化单元格"; Text[ russian ] = " "; Text[ polish ] = "Formatuj komrk"; - Text[ japanese ] = "ق̏ݒ"; - Text[ chinese_traditional ] = "榡xs"; + Text[ japanese ] = "セルの書式設定"; + Text[ chinese_traditional ] = "格式化儲存格"; Text[ arabic ] = " "; Text[ dutch ] = "Cel opmaken"; - Text[ chinese_simplified ] = "ʽԪ"; + Text[ chinese_simplified ] = "格式化单元格"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "셀 서식 설정"; Text[ turkish ] = "Hcreyi formatla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formatear celda"; + Text[ catalan ] = "Formata la cel.la"; Text[ finnish ] = "Muotoile solu"; + Text[ thai ] = "จัดรูปแบบเซลล์"; }; String STR_INSERT_TOX { @@ -2194,20 +2267,21 @@ String STR_INSERT_TOX Text [ spanish ] = "Insertar ndice" ; Text [ french ] = "Insrer un index" ; Text [ dutch ] = "Index invoegen" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "插入目录"; + Text[ russian ] = " "; Text[ polish ] = "Wstaw indeks"; - Text[ japanese ] = "ڎƍ̑}"; - Text[ chinese_traditional ] = "Jؿ"; + Text[ japanese ] = "目次と索引の挿入"; + Text[ chinese_traditional ] = "插入目錄"; Text[ arabic ] = " "; Text[ dutch ] = "Index invoegen"; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "插入目录"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "색인 및 목차 삽입"; Text[ turkish ] = "Dizin ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar ndice"; + Text[ catalan ] = "Insereix l'ndex"; Text[ finnish ] = "Lis hakemisto"; + Text[ thai ] = "แทรกดัชนี"; }; String STR_CLEAR_TOX_RANGE { @@ -2219,23 +2293,24 @@ String STR_CLEAR_TOX_RANGE Text [ swedish ] = "Upphv frteckning" ; Text [ danish ] = "Ophv indeks" ; Text [ italian ] = "Rimuovi indice" ; - Text [ spanish ] = "Eliminar directorio" ; + Text [ spanish ] = "Borrar el directorio" ; Text [ french ] = "Supprimer l'index" ; Text [ dutch ] = "Index verwijderen" ; - Text[ chinese_simplified ] = "ȡ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "取消目录"; + Text[ russian ] = " "; Text[ polish ] = "Usu indeks"; - Text[ japanese ] = "ڎƍ̉"; - Text[ chinese_traditional ] = "ؿ"; + Text[ japanese ] = "目次と索引の解除"; + Text[ chinese_traditional ] = "取消目錄"; Text[ arabic ] = " "; Text[ dutch ] = "Index verwijderen"; - Text[ chinese_simplified ] = "ȡ"; + Text[ chinese_simplified ] = "取消目录"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "색인 및 목차 제거"; Text[ turkish ] = "Dizini kaldr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar directorio"; + Text[ catalan ] = "Elimina l'ndex"; Text[ finnish ] = "Poista hakemisto"; + Text[ thai ] = "เอาดัชนีออก"; }; String STR_TABLE_TBLCPYTBL { @@ -2250,20 +2325,21 @@ String STR_TABLE_TBLCPYTBL Text [ spanish ] = "Copiar tabla" ; Text [ french ] = "Copier le tableau" ; Text [ dutch ] = "Tabel kopiren" ; - Text[ chinese_simplified ] = "Ʊ"; + Text[ chinese_simplified ] = "复制表格"; Text[ russian ] = " "; Text[ polish ] = "Kopiuj tabel"; - Text[ japanese ] = "\\̺߰"; - Text[ chinese_traditional ] = "ƻs"; + Text[ japanese ] = "表のコピー"; + Text[ chinese_traditional ] = "複製表格"; Text[ arabic ] = " "; Text[ dutch ] = "Tabel kopiren"; - Text[ chinese_simplified ] = "Ʊ"; + Text[ chinese_simplified ] = "复制表格"; Text[ greek ] = " "; - Text[ korean ] = "̺ "; + Text[ korean ] = "표 복사"; Text[ turkish ] = "Tabloyu kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Copiar tabla"; + Text[ catalan ] = "Copia la taula"; Text[ finnish ] = "Kopioi taulukko"; + Text[ thai ] = "คัดลอกตาราง"; }; String STR_TABLE_CPYTBL { @@ -2278,20 +2354,21 @@ String STR_TABLE_CPYTBL Text [ spanish ] = "Copiar tabla" ; Text [ french ] = "Copier le tableau" ; Text [ dutch ] = "Tabel kopiren" ; - Text[ chinese_simplified ] = "Ʊ"; + Text[ chinese_simplified ] = "复制表格"; Text[ russian ] = " "; Text[ polish ] = "Kopiuj tabel"; - Text[ japanese ] = "\\̺߰"; - Text[ chinese_traditional ] = "ƻs"; + Text[ japanese ] = "表のコピー"; + Text[ chinese_traditional ] = "複製表格"; Text[ arabic ] = " "; Text[ dutch ] = "Tabel kopiren"; - Text[ chinese_simplified ] = "Ʊ"; + Text[ chinese_simplified ] = "复制表格"; Text[ greek ] = " "; - Text[ korean ] = "ǥ "; + Text[ korean ] = "표 복사"; Text[ turkish ] = "Tabloyu kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Copiar tabla"; + Text[ catalan ] = "Copia la taula"; Text[ finnish ] = "Kopioi taulukko"; + Text[ thai ] = "คัดลอกตาราง"; }; String STR_INS_FROM_SHADOWCRSR { @@ -2304,22 +2381,23 @@ String STR_INS_FROM_SHADOWCRSR Text [ danish ] = "Konfigurer markr" ; Text [ italian ] = "Imposta cursore" ; Text [ spanish ] = "Poner cursor" ; - Text [ french ] = "Mettre le curseur" ; + Text [ french ] = "Dfinir le curseur" ; Text [ dutch ] = "Cursor configureren" ; - Text[ chinese_simplified ] = "λ"; + Text[ chinese_simplified ] = "定位光标"; Text[ russian ] = " "; Text[ polish ] = "Ustaw kursor"; - Text[ japanese ] = "ق̐ݒ"; - Text[ chinese_traditional ] = "w"; + Text[ japanese ] = "カーソルの設定"; + Text[ chinese_traditional ] = "定位游標"; Text[ arabic ] = " "; Text[ dutch ] = "Cursor configureren"; - Text[ chinese_simplified ] = "λ"; + Text[ chinese_simplified ] = "定位光标"; Text[ greek ] = " "; - Text[ korean ] = "Ŀ "; + Text[ korean ] = "커서 설정"; Text[ turkish ] = "mleci ayarla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Poner cursor"; - Text[ finnish ] = "Mrit osoitin"; + Text[ catalan ] = "Defineix el cursor"; + Text[ finnish ] = "Mrit kohdistin"; + Text[ thai ] = "กำหนดเคอร์เซอร์"; }; String STR_UNDO_CHAIN { @@ -2334,20 +2412,21 @@ String STR_UNDO_CHAIN Text [ spanish ] = "Conectar marcos de texto" ; Text [ french ] = "Enchaner les cadres texte" ; Text [ dutch ] = "Tekstkader verbinden" ; - Text[ chinese_simplified ] = "ı"; + Text[ chinese_simplified ] = "链接文本框"; Text[ russian ] = " "; Text[ polish ] = "Pocz ramk tekstow"; - Text[ japanese ] = "÷Ęg̘A"; - Text[ chinese_traditional ] = "sr"; + Text[ japanese ] = "テキスト枠の連結"; + Text[ chinese_traditional ] = "連結文字方塊"; Text[ arabic ] = " "; Text[ dutch ] = "Tekstkader verbinden"; - Text[ chinese_simplified ] = "ı"; + Text[ chinese_simplified ] = "链接文本框"; Text[ greek ] = " "; - Text[ korean ] = "ؽƮ "; + Text[ korean ] = "텍스트 프레임 연결"; Text[ turkish ] = "Metin kutularn bala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Conectar marcos de texto"; + Text[ catalan ] = "Enllaa els marcs de text"; Text[ finnish ] = "Linkit tekstikehykset"; + Text[ thai ] = "เชื่อมโยงกรอบข้อความ"; }; String STR_UNDO_UNCHAIN { @@ -2362,20 +2441,21 @@ String STR_UNDO_UNCHAIN Text [ spanish ] = "Deshacer el vnculo de los marcos de texto." ; Text [ french ] = "Dtacher les cadres texte" ; Text [ dutch ] = "Tekstkaderverbinding verwijderen" ; - Text[ chinese_simplified ] = "ȡı"; + Text[ chinese_simplified ] = "取消文本框的链接"; Text[ russian ] = " "; Text[ polish ] = "Rozcz ramki tekstu"; - Text[ japanese ] = "÷Ęg̘A"; - Text[ chinese_traditional ] = "rs"; + Text[ japanese ] = "テキスト枠の連結解除"; + Text[ chinese_traditional ] = "取消文字方塊的連結"; Text[ arabic ] = " "; Text[ dutch ] = "Tekstkaderverbinding verwijderen"; - Text[ chinese_simplified ] = "ȡı"; + Text[ chinese_simplified ] = "取消文本框的链接"; Text[ greek ] = " "; - Text[ korean ] = "ؽƮ "; + Text[ korean ] = "텍스트 프레임 연결 삭제"; Text[ turkish ] = "Metin kutusu balantlarn z"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Deshacer el vnculo de los marcos de texto."; + Text[ catalan ] = "Desenllaa els marcs de text."; Text[ finnish ] = "Poista tekstikehysten linkki"; + Text[ thai ] = "ไม่เชื่อมโยงกรอบข้อความ"; }; String STR_UNDO_FTNINFO { @@ -2390,20 +2470,21 @@ String STR_UNDO_FTNINFO Text [ spanish ] = "Modificar opciones de nota al pie" ; Text [ french ] = "Modifier les paramtres des notes de bas de page" ; Text [ dutch ] = "Voetnoteninstellingen wijzigen" ; - Text[ chinese_simplified ] = "ע趨"; + Text[ chinese_simplified ] = "更改注脚设定"; Text[ russian ] = " "; Text[ polish ] = "Zmodyfikuj ustawienia przypisw dolnych"; - Text[ japanese ] = "r̐ݒύX"; - Text[ chinese_traditional ] = "ܧ}]w"; + Text[ japanese ] = "脚注の設定変更"; + Text[ chinese_traditional ] = "變更註腳設定"; Text[ arabic ] = " "; Text[ dutch ] = "Voetnoteninstellingen wijzigen"; - Text[ chinese_simplified ] = "ע趨"; + Text[ chinese_simplified ] = "更改注脚设定"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "각주 설정 변경"; Text[ turkish ] = "Dipnot ayarlarn deitir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar opciones de nota al pie"; + Text[ catalan ] = "Modifica les opcions de notes al peu"; Text[ finnish ] = "Muokkaa alaviiteasetuksia"; + Text[ thai ] = "ดัดแปลงแก้ไขตัวเลือกเชิงอรรถ"; }; String STR_UNDO_ENDNOTEINFO { @@ -2415,23 +2496,24 @@ String STR_UNDO_ENDNOTEINFO Text [ swedish ] = "ndra slutnotsinstllningar" ; Text [ danish ] = "Modificer slutnoteindstillinger" ; Text [ italian ] = "Modifica impostazione note di chiusura" ; - Text [ spanish ] = "Modificar configuracin de notas finales" ; + Text [ spanish ] = "Modificar la configuracin de las notas finales" ; Text [ french ] = "Modifier les paramtres des notes de fin" ; Text [ dutch ] = "Eindnootinstellingen wijzigen" ; - Text[ chinese_simplified ] = "βע趨"; + Text[ chinese_simplified ] = "更改尾注设定"; Text[ russian ] = " "; Text[ polish ] = "Zmodyfikuj ustawienia przypisw dolnych"; - Text[ japanese ] = "r̐ݒύX"; - Text[ chinese_traditional ] = "ܧ]w"; + Text[ japanese ] = "文末脚注の設定変更"; + Text[ chinese_traditional ] = "變更尾註設定"; Text[ arabic ] = " "; Text[ dutch ] = "Eindnootinstellingen wijzigen"; - Text[ chinese_simplified ] = "βע趨"; + Text[ chinese_simplified ] = "更改尾注设定"; Text[ greek ] = " "; - Text[ korean ] = "֡ "; + Text[ korean ] = "미주 설정 변경"; Text[ turkish ] = "Sonnot ayarlarn deitir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar configuracin de notas finales"; - Text[ finnish ] = "Muokkaa loppuhuomautuksen asetuksia"; + Text[ catalan ] = "Modifica la configuraci de notes finals"; + Text[ finnish ] = "Muokkaa loppuviiteasetuksia"; + Text[ thai ] = "ดัดแปลงแก้ไขการกำหนดการอ้างอิงท้ายเรื่อง"; }; String STR_UNDO_COMPAREDOC { @@ -2445,21 +2527,22 @@ String STR_UNDO_COMPAREDOC Text [ italian ] = "Confronto documento" ; Text [ spanish ] = "Comparar documento" ; Text [ french ] = "Comparaison de documents" ; - Text [ dutch ] = "Vergelijking van documenten" ; - Text[ chinese_simplified ] = "Ƚĵ"; + Text [ dutch ] = "Documentvergelijking" ; + Text[ chinese_simplified ] = "比较文档"; Text[ russian ] = " "; Text[ polish ] = "Porwnaj dokument"; - Text[ japanese ] = "Ă̔r"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "ドキュメントの比較"; + Text[ chinese_traditional ] = "比較文件"; Text[ arabic ] = " "; - Text[ dutch ] = "Vergelijking van documenten"; - Text[ chinese_simplified ] = "Ƚĵ"; + Text[ dutch ] = "Documentvergelijking"; + Text[ chinese_simplified ] = "比较文档"; Text[ greek ] = " "; - Text[ korean ] = ""; + Text[ korean ] = "문서 비교"; Text[ turkish ] = "Belgeyi karlatr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comparar documento"; + Text[ catalan ] = "Compara el document"; Text[ finnish ] = "Vertaa asiakirjaa"; + Text[ thai ] = "เปรียบเทียบเอกสาร"; }; String STR_UNDO_SETFLYFRMFMT { @@ -2474,20 +2557,21 @@ String STR_UNDO_SETFLYFRMFMT Text [ spanish ] = "Aplicar estilo de marco" ; Text [ french ] = "Utiliser un style de cadre" ; Text [ dutch ] = "Kaderopmaakprofiel toepassen" ; - Text[ chinese_simplified ] = "ʹÿʽ"; + Text[ chinese_simplified ] = "使用框样式"; Text[ russian ] = " "; Text[ polish ] = "Zastosuj styl ramki"; - Text[ japanese ] = "gق̓Kp"; - Text[ chinese_traditional ] = "ϥΤ˦"; + Text[ japanese ] = "枠スタイルの適用"; + Text[ chinese_traditional ] = "使用方塊樣式"; Text[ arabic ] = " "; Text[ dutch ] = "Kaderopmaakprofiel toepassen"; - Text[ chinese_simplified ] = "ʹÿʽ"; + Text[ chinese_simplified ] = "使用框样式"; Text[ greek ] = " "; - Text[ korean ] = " Ÿ "; + Text[ korean ] = "프레임 스타일 적용"; Text[ turkish ] = "ereve biimi uygula"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aplicar estilo de marco"; + Text[ catalan ] = "Aplica l'estil del marc"; Text[ finnish ] = "Kyt kehystyyli"; + Text[ thai ] = "ใช้ลักษณะกรอบ"; }; String STR_UNDO_SETRUBYATTR { @@ -2495,24 +2579,25 @@ String STR_UNDO_SETRUBYATTR Text [ ENGLISH ] = "Set phonetic Symbols" ; Text[ english_us ] = "Ruby Setting"; Text[ portuguese ] = "Atributo Ruby"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Fonetische symbolen invoegen"; Text[ french ] = "Attribut Ruby"; Text[ spanish ] = "Aplicar smbolos fonticos"; Text[ italian ] = "Applica testo Ruby"; - Text[ danish ] = "Set phonetic Symbols"; + Text[ danish ] = "St fonetiske symboler"; Text[ swedish ] = "Stt fonetiska symboler"; Text[ polish ] = "Osad znaki diakrytyczne"; Text[ portuguese_brazilian ] = "Set phonetic Symbols"; - Text[ japanese ] = "ސݒ"; - Text[ korean ] = " ȣ "; - Text[ chinese_simplified ] = "ƴע"; - Text[ chinese_traditional ] = "[WŸ"; + Text[ japanese ] = "ルビ設定"; + Text[ korean ] = "덧말 넣기 설정"; + Text[ chinese_simplified ] = "加上拼音或注音符号"; + Text[ chinese_traditional ] = "加上注音標示"; Text[ turkish ] = "Set phonetic Symbols"; Text[ arabic ] = " "; - Text[ catalan ] = "Aplicar smbolos fonticos"; - Text[ finnish ] = "Phonetische Symbole setzen"; + Text[ catalan ] = "Aplica els smbols fontics"; + Text[ finnish ] = "Ruby-tekstin asetukset"; + Text[ thai ] = "กำหนดตัวพิมพ์ขนาดเล็ก"; }; #102505# String STR_UNDO_TMPAUTOCORR @@ -2521,11 +2606,11 @@ String STR_UNDO_TMPAUTOCORR Text [ English ] = "AutoCorrect" ; Text [ portuguese ] = "AutoCorreco" ; Text [ english_us ] = "AutoCorrect" ; - Text [ portuguese_brazilian ] = "AutoKorrektur" ; + Text [ portuguese_brazilian ] = "AutoCorreo" ; Text [ swedish ] = "AutoKorrigering" ; Text [ danish ] = "AutoKorrektur" ; Text [ italian ] = "Correzione automatica" ; - Text [ spanish ] = "AutoCorreccin" ; + Text [ spanish ] = "Correccin automtica" ; Text [ french ] = "AutoCorrection" ; Text [ dutch ] = "AutoCorrectie" ; Text[ chinese_simplified ] = "自动更正"; @@ -2537,7 +2622,7 @@ String STR_UNDO_TMPAUTOCORR Text[ dutch ] = "AutoCorrectie"; Text[ chinese_simplified ] = "自动更正"; Text[ greek ] = ""; - Text[ korean ] = "자동고침"; + Text[ korean ] = "자동 수정"; Text[ turkish ] = "Otomatik dzeltme"; Text[ language_user1 ] = " "; Text[ catalan ] = "Correcci automtica"; @@ -2557,20 +2642,21 @@ String STR_INSERT_FOOTNOTE Text [ french ] = "Insrer une note de bas de page" ; Text [ dutch ] = "Voetnoot invoegen" ; Text [ portuguese ] = "Inserir nota de rodap" ; - Text[ chinese_simplified ] = "ע"; + Text[ chinese_simplified ] = "插入注脚"; Text[ russian ] = " "; Text[ polish ] = "Wstaw przypis dolny"; - Text[ japanese ] = "ȓ}"; - Text[ chinese_traditional ] = "J}"; + Text[ japanese ] = "脚注の挿入"; + Text[ chinese_traditional ] = "插入註腳"; Text[ arabic ] = " "; Text[ dutch ] = "Voetnoot invoegen"; - Text[ chinese_simplified ] = "ע"; + Text[ chinese_simplified ] = "插入注脚"; Text[ greek ] = " "; - Text[ korean ] = " "; + Text[ korean ] = "각주 삽입"; Text[ turkish ] = "Dipnot ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar nota al pie"; + Text[ catalan ] = "Insereix una nota al peu"; Text[ finnish ] = "Lis alaviite"; + Text[ thai ] = "แทรกเชิงอรรถ"; }; String STR_INSERT_URLBTN { @@ -2579,7 +2665,7 @@ String STR_INSERT_URLBTN Text[ english_us ] = "insert URL button"; Text[ portuguese ] = "Inserir boto URL"; Text[ russian ] = " URL"; - Text[ dutch ] = "URL button invoegen"; + Text[ dutch ] = "URL-knop invoegen"; Text[ french ] = "Insrer un bouton d'URL"; Text[ spanish ] = "Insertar botn URL"; Text[ italian ] = "Inserisci pulsante URL"; @@ -2587,18 +2673,19 @@ String STR_INSERT_URLBTN Text[ swedish ] = "Infoga URL-knapp"; Text[ polish ] = "Wstaw przycisk URL"; Text[ portuguese_brazilian ] = "insert URL button"; - Text[ japanese ] = "URL݂̑}"; - Text[ chinese_simplified ] = " URL ť"; - Text[ chinese_traditional ] = "J URL s"; + Text[ japanese ] = "URLボタンの挿入"; + Text[ chinese_simplified ] = "插入 URL 按钮"; + Text[ chinese_traditional ] = "插入 URL 按鈕"; Text[ arabic ] = " URL"; - Text[ dutch ] = "URL button invoegen"; - Text[ chinese_simplified ] = " URL ť"; + Text[ dutch ] = "URL-knop invoegen"; + Text[ chinese_simplified ] = "插入 URL 按钮"; Text[ greek ] = " URL"; - Text[ korean ] = "URL ư "; + Text[ korean ] = "URL 버튼 삽입"; Text[ turkish ] = "URL dmesi ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar botn URL"; + Text[ catalan ] = "Insereix un bot URL"; Text[ finnish ] = "Lis URL-painike"; + Text[ thai ] = "แทรกปุ่ม URL "; }; String STR_INSERT_URLTXT { @@ -2615,18 +2702,19 @@ String STR_INSERT_URLTXT Text[ swedish ] = "Infoga hyperlnk"; Text[ polish ] = "Wstaw hipercze"; Text[ portuguese_brazilian ] = "insert Hyperlink"; - Text[ japanese ] = "ʲ߰ݸ̑}"; - Text[ chinese_simplified ] = "볬"; - Text[ chinese_traditional ] = "JWs"; + Text[ japanese ] = "ハイパーリンクの挿入"; + Text[ chinese_simplified ] = "插入超链接"; + Text[ chinese_traditional ] = "插入超連結"; Text[ arabic ] = " "; Text[ dutch ] = "Hyperlink invoegen"; - Text[ chinese_simplified ] = "볬"; + Text[ chinese_simplified ] = "插入超链接"; Text[ greek ] = " -"; - Text[ korean ] = "۸ũ "; + Text[ korean ] = "하이퍼링크 삽입"; Text[ turkish ] = "Hyperlink ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar hiperenlace"; + Text[ catalan ] = "Insereix un hiperenlla"; Text[ finnish ] = "Lis hyperlinkki"; + Text[ thai ] = "แทรกการเชื่อมโยงหลายมิติ"; }; String STR_DELETE_INVISIBLECNTNT { @@ -2635,24 +2723,25 @@ String STR_DELETE_INVISIBLECNTNT Text[ english_us ] = "remove invisible content"; Text[ portuguese ] = "eliminar contedo invisvel"; Text[ greek ] = " "; - Text[ dutch ] = "nzichtbare inhoud verwijderen"; + Text[ dutch ] = "Onzichtbare inhoud verwijderen"; Text[ french ] = "supprimer le contenu invisible"; - Text[ spanish ] = "eliminar contenido invisible"; + Text[ spanish ] = "borrar el contenido invisible"; Text[ swedish ] = "ta bort osynligt innehll"; Text[ russian ] = " "; Text[ italian ] = "Rimuovi contenuto nascosto"; Text[ danish ] = "fjern usynlige indhold"; Text[ polish ] = "usu niewidoczn zawarto"; Text[ portuguese_brazilian ] = "remove invisible content"; - Text[ japanese ] = "\\łȂe폜"; - Text[ korean ] = " ʴ "; - Text[ chinese_simplified ] = "ɾ"; - Text[ chinese_traditional ] = "MJe"; + Text[ japanese ] = "表示できない内容を削除する"; + Text[ korean ] = "숨긴 내용 제거"; + Text[ chinese_simplified ] = "删除隐入的内容"; + Text[ chinese_traditional ] = "清除隱入的內容"; Text[ arabic ] = " "; Text[ turkish ] = "Grnmez ierii kaldr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "eliminar contenido invisible"; + Text[ catalan ] = "elimina el contingut invisible"; Text[ finnish ] = "poista nkymtn sislt"; + Text[ thai ] = "เอาเนื้อหาที่มองไม่เห็นออก"; }; String STR_DDEERROR_APP1 @@ -2667,19 +2756,20 @@ String STR_DDEERROR_APP1 TEXT [ danish ] = "Applikationen [" ; TEXT [ french ] = "L'application [" ; TEXT [ swedish ] = "Programmet [" ; - TEXT [ dutch ] = "Applicatie [" ; + TEXT [ dutch ] = "Toepassing [" ; TEXT [ spanish ] = "La aplicacin [" ; TEXT [ english_us ] = "Application [" ; - TEXT[ chinese_simplified ] = "Ӧó ["; - TEXT[ russian ] = " ["; + TEXT[ chinese_simplified ] = "应用程序 ["; + TEXT[ russian ] = " ["; TEXT[ polish ] = "Aplikacja ["; - TEXT[ japanese ] = "ع ["; + TEXT[ japanese ] = "アプリケーション ["; TEXT[ greek ] = " ["; - TEXT[ korean ] = "α ["; - TEXT[ chinese_traditional ] = "{ ["; + TEXT[ korean ] = "응용 프로그램 ["; + TEXT[ chinese_traditional ] = "程式 ["; TEXT[ arabic ] = " ]"; TEXT[ turkish ] = "Uygulama ["; - TEXT[ catalan ] = "La aplicacin ["; + TEXT[ catalan ] = "L'aplicaci ["; + TEXT[ thai ] = "โปรแกรมประยุกต์ ["; }; String STR_DDEERROR_APP2 { @@ -2696,19 +2786,20 @@ String STR_DDEERROR_APP2 TEXT [ dutch ] = "] reageert niet" ; TEXT [ spanish ] = "] no responde" ; TEXT [ english_us ] = "] is not responding." ; - TEXT[ chinese_simplified ] = "] ûлӦ"; - TEXT[ russian ] = "] "; + TEXT[ chinese_simplified ] = "] 没有回应。"; + TEXT[ russian ] = "] "; TEXT[ polish ] = "] nie reaguje"; - TEXT[ japanese ] = "] ̉܂"; - TEXT[ chinese_traditional ] = "] S^C"; + TEXT[ japanese ] = "] からの応答がありません"; + TEXT[ chinese_traditional ] = "] 沒有回應。"; TEXT[ arabic ] = "[ "; TEXT[ dutch ] = "] reageert niet"; - TEXT[ chinese_simplified ] = "] ûлӦ"; + TEXT[ chinese_simplified ] = "] 没有回应。"; TEXT[ greek ] = "] ."; - TEXT[ korean ] = "] ."; + TEXT[ korean ] = "] 으로부터 응답이 없습니다."; TEXT[ turkish ] = "] cevap vermiyor"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "] no responde"; + TEXT[ catalan ] = "] no respon"; + TEXT[ thai ] = "] ไม่ตอบสนอง"; }; String STR_DDEERROR_DATA1 { @@ -2718,23 +2809,24 @@ String STR_DDEERROR_DATA1 TEXT [ italian ] = "Dati per [" ; TEXT [ portuguese_brazilian ] = "Dados para [" ; TEXT [ portuguese ] = "Os dados para [" ; - TEXT [ finnish ] = "Tiedot [" ; + TEXT [ finnish ] = "Tietoja [" ; TEXT [ danish ] = "Dataene til [" ; TEXT [ french ] = "Les donnes pour [" ; TEXT [ swedish ] = "Data till [" ; TEXT [ dutch ] = "Gegevens voor [" ; TEXT [ spanish ] = "Los datos para [" ; TEXT [ english_us ] = "Data for [" ; - TEXT[ chinese_simplified ] = " ["; + TEXT[ chinese_simplified ] = "用于 ["; TEXT[ russian ] = " ["; TEXT[ polish ] = "Danych dla ["; TEXT[ japanese ] = "["; TEXT[ greek ] = " ["; - TEXT[ korean ] = " ["; - TEXT[ chinese_traditional ] = "Ω["; + TEXT[ korean ] = "["; + TEXT[ chinese_traditional ] = "用於["; TEXT[ arabic ] = " ] "; TEXT[ turkish ] = "["; - TEXT[ catalan ] = "Los datos para ["; + TEXT[ catalan ] = "Les dades per a ["; + TEXT[ thai ] = "ข้อมูลสำหรับ ["; }; String STR_DDEERROR_DATA2 { @@ -2744,26 +2836,27 @@ String STR_DDEERROR_DATA2 TEXT [ italian ] = "]" ; TEXT [ portuguese_brazilian ] = "] n?o podem ser obtidos" ; TEXT [ portuguese ] = "] no podem ser determinados." ; - TEXT [ finnish ] = "] ei ole saatavilla" ; + TEXT [ finnish ] = "] eivt ole saatavilla" ; TEXT [ danish ] = "] kan ikke bestemmes" ; TEXT [ french ] = "] ne peuvent pas tre obtenues" ; TEXT [ swedish ] = "] kan inte bestmmas" ; TEXT [ dutch ] = "] onmogelijk" ; TEXT [ spanish ] = "] no pueden ser determinados" ; TEXT [ english_us ] = "] cannot be obtained" ; - TEXT[ chinese_simplified ] = "] ȡ"; - TEXT[ russian ] = "] "; + TEXT[ chinese_simplified ] = "] 的数据无法被读取。"; + TEXT[ russian ] = "] "; TEXT[ polish ] = "] nie mona uzyska"; - TEXT[ japanese ] = "] ް͊mFł܂"; - TEXT[ chinese_traditional ] = "] ƵLkQŪC"; + TEXT[ japanese ] = "] のデータは確認できません"; + TEXT[ chinese_traditional ] = "] 的資料無法被讀取。"; TEXT[ arabic ] = "[ "; TEXT[ dutch ] = "] onmogelijk"; - TEXT[ chinese_simplified ] = "] ȡ"; + TEXT[ chinese_simplified ] = "] 的数据无法被读取。"; TEXT[ greek ] = "] ."; - TEXT[ korean ] = "] "; + TEXT[ korean ] = "] 의 데이터를 확인할 수 없습니다"; TEXT[ turkish ] = "] ile ilgili veriler alnamyor"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "] no pueden ser determinados"; + TEXT[ catalan ] = "] no es poden obtenir"; + TEXT[ thai ] = "] ไม่สามารถได้รับ"; }; String STR_DDEERROR_LINK1 { @@ -2780,16 +2873,17 @@ String STR_DDEERROR_LINK1 TEXT [ dutch ] = "Koppeling naar [" ; TEXT [ spanish ] = "El vnculo con [" ; TEXT [ english_us ] = "Link to [" ; - TEXT[ chinese_simplified ] = " ["; + TEXT[ chinese_simplified ] = "无法建立与 ["; TEXT[ russian ] = " ["; TEXT[ polish ] = "cza do ["; TEXT[ japanese ] = "["; TEXT[ greek ] = " ["; - TEXT[ korean ] = " ["; - TEXT[ chinese_traditional ] = "s ["; + TEXT[ korean ] = "["; + TEXT[ chinese_traditional ] = "連結 ["; TEXT[ arabic ] = " ]"; TEXT[ turkish ] = "["; - TEXT[ catalan ] = "El vnculo con ["; + TEXT[ catalan ] = "L'enlla amb ["; + TEXT[ thai ] = "เชื่อมโยงไปยัง ["; }; String STR_DDEERROR_LINK2 { @@ -2806,21 +2900,40 @@ String STR_DDEERROR_LINK2 TEXT [ dutch ] = "] onmogelijk" ; TEXT [ spanish ] = "] no se puede establecer" ; TEXT [ english_us ] = "] cannot be established" ; - TEXT[ chinese_simplified ] = "]"; - TEXT[ russian ] = "] "; + TEXT[ chinese_simplified ] = "]的链接"; + TEXT[ russian ] = "] "; TEXT[ polish ] = "] nie mona ustanowi"; - TEXT[ japanese ] = "] ւݸ͂܂"; - TEXT[ chinese_traditional ] = "] LkإߡC"; + TEXT[ japanese ] = "] へのリンクはつくれません"; + TEXT[ chinese_traditional ] = "] 無法建立。"; TEXT[ arabic ] = "[ "; TEXT[ dutch ] = "] onmogelijk"; - TEXT[ chinese_simplified ] = "]"; + TEXT[ chinese_simplified ] = "]的链接"; TEXT[ greek ] = "] ."; - TEXT[ korean ] = "] ġҡ."; + TEXT[ korean ] = "] 로의 링크는 만들 수 없습니다"; TEXT[ turkish ] = "] ile ilgili balant oluturulamyor"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "] no se puede establecer"; + TEXT[ catalan ] = "] no es pot establir"; + TEXT[ thai ] = "] ไม่สามารถถูกสร้างได้"; }; + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index c2b2d6000b09..f95c9b16eba4 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtsh1.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: os $ $Date: 2002-09-09 12:21:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,8 @@ #pragma hdrstop +#include <so3/outplace.hxx> + #if STLPORT_VERSION>=321 #include <math.h> // prevent conflict between exception and std::exception #endif @@ -509,9 +511,19 @@ void SwWrtShell::Insert( SvInPlaceObjectRef *pRef, SvGlobalName *pName, BOOL bAc BOOL bDoVerb = TRUE; if ( pName ) { - SvStorageRef aStor = new SvStorage( aEmptyStr ); - xIPObj = &((SvFactory*)SvInPlaceObject::ClassFactory())->CreateAndInit( - *pName,aStor ); + const SotFactory* pFact = SvFactory::Find( *pName ); + if ( pFact ) + { + SvStorageRef aStor = new SvStorage( aEmptyStr ); + xIPObj = &((SvFactory*)SvInPlaceObject::ClassFactory())->CreateAndInit( *pName,aStor ); + } + else + { + SvStorageRef aStor = new SvStorage( FALSE, aEmptyStr ); + String aFileName; + BOOL bOk; + xIPObj = SvOutPlaceObject::InsertObject( NULL, &aStor, bOk, *pName, aFileName ); + } } else { @@ -530,6 +542,7 @@ void SwWrtShell::Insert( SvInPlaceObjectRef *pRef, SvGlobalName *pName, BOOL bAc aServerList.Remove( *SwDocShell::ClassFactory() ); xIPObj = aDlg.Execute( GetWin(), aStor, &aServerList); + bDoVerb = aDlg.IsCreateNew(); } break; diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx index 5bcbaf2efb32..dceb626ef9f5 100644 --- a/sw/source/ui/wrtsh/wrtsh3.cxx +++ b/sw/source/ui/wrtsh/wrtsh3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtsh3.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:42:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,7 +203,11 @@ FASTBOOL SwWrtShell::GoPrevBookmark() void SwWrtShell::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs ) { - GetDoc()->ExecMacro( rMacro, pRet, pArgs ); + // OD 11.02.2003 #100556# - execute macro, if it is allowed. + if ( IsMacroExecAllowed() ) + { + GetDoc()->ExecMacro( rMacro, pRet, pArgs ); + } } |