From be88027c327b5f09d134f235db100ec54afdc30d Mon Sep 17 00:00:00 2001 From: Oliver Günther Date: Thu, 9 Aug 2012 14:47:19 +0200 Subject: fdo#39468: Translate German comments in toolkit,unotools, & xmloff Also checked the following with bin/find-german-comments (all false positives): - sysui - xml2cmp - udm - ucb Change-Id: I2c72f973f5cecf56d70b5419e56338170dd55a2e --- toolkit/inc/toolkit/awt/vclxgraphics.hxx | 3 +- toolkit/inc/toolkit/awt/vclxprinter.hxx | 2 +- toolkit/inc/toolkit/controls/stdtabcontroller.hxx | 2 +- toolkit/inc/toolkit/helper/property.hxx | 4 +-- toolkit/source/awt/vclxcontainer.cxx | 15 ++++----- toolkit/source/awt/vclxwindow.cxx | 19 ++++++------ toolkit/source/awt/vclxwindows.cxx | 16 +++++----- toolkit/source/controls/stdtabcontroller.cxx | 34 ++++++++++----------- toolkit/source/controls/stdtabcontrollermodel.cxx | 17 +++++------ toolkit/source/controls/unocontrol.cxx | 28 ++++++++--------- toolkit/source/controls/unocontrolbase.cxx | 2 +- toolkit/source/controls/unocontrolcontainer.cxx | 16 +++++----- toolkit/source/controls/unocontrolmodel.cxx | 37 +++++++++++------------ toolkit/source/controls/unocontrols.cxx | 15 ++++----- toolkit/source/helper/unowrapper.cxx | 8 ++--- 15 files changed, 108 insertions(+), 110 deletions(-) (limited to 'toolkit') diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx index 1feea0be2e0b..a63723d6915c 100644 --- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx +++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx @@ -61,7 +61,8 @@ class VCLXGraphics : public ::com::sun::star::awt::XGraphics, public ::cppu::OWeakObject { private: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben + // used to return same reference on each call to getDevice() + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; OutputDevice* mpOutputDevice; Font maFont; diff --git a/toolkit/inc/toolkit/awt/vclxprinter.hxx b/toolkit/inc/toolkit/awt/vclxprinter.hxx index 0e962c8c1c4c..6671f83f2487 100644 --- a/toolkit/inc/toolkit/awt/vclxprinter.hxx +++ b/toolkit/inc/toolkit/awt/vclxprinter.hxx @@ -34,7 +34,7 @@ #include "vcl/oldprintadaptor.hxx" -// Fuer den Drucker relevante Properties: +// relevant properties for the printer: /* sal_Bool Horizontal sal_uInt16 CopyCount; diff --git a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx index de6420e53365..dd54c9521b47 100644 --- a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx +++ b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx @@ -45,7 +45,7 @@ private: protected: ::osl::Mutex& GetMutex() { return maMutex; } sal_Bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, sal_Bool bPeerComponent ) const; - // wenn rModels kuerzer als rControls ist, werden nur die rModels entsprechenden Elemente geliefert und die korrespondierenden Elemente aus rControls entfernt + // if sequence length of rModels is less than rControls, return only the matching elements in rModels sequence and remove corresponding elements from rControls void ImplActivateControl( sal_Bool bFirst ) const; public: diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx index dd4bdd1f7d40..a44db628a346 100644 --- a/toolkit/inc/toolkit/helper/property.hxx +++ b/toolkit/inc/toolkit/helper/property.hxx @@ -55,7 +55,7 @@ namespace rtl { #define BASEPROPERTY_LINECOLOR 5 // sal_Int32 #define BASEPROPERTY_BORDER 6 // sal_Int16 #define BASEPROPERTY_ALIGN 7 // sal_Int16 -#define BASEPROPERTY_FONTDESCRIPTOR 8 // ::com::sun::star::awt::FontDescriptor, war mal Font, aber nie gespeichert... +#define BASEPROPERTY_FONTDESCRIPTOR 8 // ::com::sun::star::awt::FontDescriptor #define BASEPROPERTY_DROPDOWN 9 // sal_Bool #define BASEPROPERTY_MULTILINE 10 // sal_Bool #define BASEPROPERTY_STRINGITEMLIST 11 // UStringSequence @@ -213,7 +213,7 @@ namespace rtl { #define BASEPROPERTY_USE_GRID_LINES 160 -// Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen. +// These properties are not bound, they are always extracted from the BASEPROPERTY_FONTDESCRIPTOR property #define BASEPROPERTY_FONTDESCRIPTORPART_START 1000 #define BASEPROPERTY_FONTDESCRIPTORPART_NAME 1000 // ::rtl::OUString, not bound #define BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME 1001 // ::rtl::OUString, not bound diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index a245b9e9ebc6..fd52b3d71d74 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -90,7 +90,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref { SolarMutexGuard aGuard; - // Bei allen Children das Container-Interface abfragen... + // Request container interface from all children ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aSeq; Window* pWindow = GetWindow(); if ( pWindow ) @@ -144,11 +144,11 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s { // ::com::sun::star::style::TabStop Window* pWin = VCLUnoHelper::GetWindow( pComps[n] ); - // NULL kann vorkommen, wenn die ::com::sun::star::uno::Sequence vom TabController kommt und eine Peer fehlt! + // May be NULL if a ::com::sun::star::uno::Sequence is originated from TabController and is missing a peer! if ( pWin ) { - // Reihenfolge der Fenster vor der Manipulation des Styles, - // weil z.B. der RadioButton in StateChanged das PREV-Window beruecksichtigt. + // Order windows before manipulating their style, because elements such as the + // RadioButton considers the PREV-window in StateChanged. if ( pPrevWin ) pWin->SetZOrder( pPrevWin, WINDOW_ZORDER_BEHIND ); @@ -190,13 +190,14 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun: if ( pWin ) { Window* pSortBehind = pPrevWin; - // #57096# Alle Radios hintereinander sortieren... + // #57096# Sort all radios consecutively sal_Bool bNewPrevWin = sal_True; if ( pWin->GetType() == WINDOW_RADIOBUTTON ) { if ( pPrevRadio ) { - bNewPrevWin = ( pPrevWin == pPrevRadio ); // Radio-Button wurde vor das PreWin sortiert.... + // This RadioButton was sorted before PrevWin + bNewPrevWin = ( pPrevWin == pPrevRadio ); pSortBehind = pPrevRadio; } pPrevRadio = pWin; @@ -213,7 +214,7 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun: nStyle &= (~WB_GROUP); pWin->SetStyle( nStyle ); - // Ein WB_GROUP hinter die Gruppe, falls keine Gruppe mehr folgt. + // Add WB_GROUP after the last group if ( n == ( nCount - 1 ) ) { Window* pBehindLast = pWin->GetWindow( WINDOW_NEXT ); diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index a2092ea0dcb4..ef78d265ef40 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -349,7 +349,7 @@ Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() //==================================================================== //==================================================================== -// Mit Out-Parameter besser als Rueckgabewert, wegen Ref-Objekt... +// Uses an out-parameter instead of return value, due to the object reference void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, Window* pWindow ) { @@ -650,7 +650,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) Window* pNext = Application::GetFocusWindow(); if ( pNext ) { - // Bei zusammengesetzten Controls interessiert sich keiner fuer das Innenleben: + // Don't care about internals if this control is compound Window* pNextC = pNext; while ( pNextC && !pNextC->IsCompoundControl() ) pNextC = pNextC->GetParent(); @@ -962,7 +962,7 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException) if ( GetWindow() ) { OutputDevice* pOutDev = GetOutputDevice(); - SetWindow( NULL ); // Damit ggf. Handler abgemeldet werden (virtuell). + SetWindow( NULL ); // so that handlers are logged off, if necessary (virtual) SetOutputDevice( pOutDev ); DestroyOutputDevice(); } @@ -1671,7 +1671,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: pWindow->SetPaintTransparent( sal_False ); default: ; } - pWindow->Invalidate(); // Falls das Control nicht drauf reagiert + pWindow->Invalidate(); // Invalidate if control does not respond to it } } break; @@ -2177,9 +2177,8 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: { SolarMutexGuard aGuard; - // Diese Methode sollte nur fuer Componenten gerufen werden, die zwar - // ueber das ::com::sun::star::awt::Toolkit erzeugt werden koennen, aber fuer die es - // kein Interface gibt. + // Use this method only for those components which can be created through + // ::com::sun::star::awt::Toolkit , but do not have an interface Size aSz; if ( GetWindow() ) @@ -2315,9 +2314,9 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno: pWindow->SetPosPixel( aPos ); - // Erstmal ein Update auf den Parent, damit nicht beim Update - // auf dieses Fenster noch ein Paint vom Parent abgearbeitet wird, - // wo dann ggf. dieses Fenster sofort wieder gehidet wird. + // Update parent first to avoid painting the parent upon the update + // of this window, as it may otherwise cause the parent + // to hide this window again if( pWindow->GetParent() ) pWindow->GetParent()->Update(); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index b40562d83702..586d3a6b1f23 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1810,7 +1810,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) sal_Bool bDropDown = ( pListBox->GetStyle() & WB_DROPDOWN ) ? sal_True : sal_False; if ( bDropDown && !IsSynthesizingVCLEvent() && maActionListeners.getLength() ) { - // Bei DropDown den ActionListener rufen... + // Call ActionListener on DropDown event ::com::sun::star::awt::ActionEvent aEvent; aEvent.Source = (::cppu::OWeakObject*)this; aEvent.ActionCommand = pListBox->GetSelectEntry(); @@ -2051,7 +2051,7 @@ void VCLXListBox::ImplCallItemListeners() aEvent.Source = (::cppu::OWeakObject*)this; aEvent.Highlighted = sal_False; - // Bei Mehrfachselektion 0xFFFF, sonst die ID + // Set to 0xFFFF on multiple selection, selected entry ID otherwise aEvent.Selected = (pListBox->GetSelectEntryCount() == 1 ) ? pListBox->GetSelectEntryPos() : 0xFFFF; maItemListeners.itemStateChanged( aEvent ); @@ -4498,7 +4498,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) aEvent.Source = (::cppu::OWeakObject*)this; aEvent.Highlighted = sal_False; - // Bei Mehrfachselektion 0xFFFF, sonst die ID + // Set to 0xFFFF on multiple selection, selected entry ID otherwise aEvent.Selected = pComboBox->GetEntryPos( pComboBox->GetText() ); maItemListeners.itemStateChanged( aEvent ); @@ -5505,8 +5505,9 @@ void VCLXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); if ( pNumericFormatter ) { - // z.B. 105, 2 Digits => 1,05 - // ein float 1,05 muss also eine 105 einstellen... + // shift long value using decimal digits + // (e.g., input 105 using 2 digits returns 1,05) + // Thus, to set a value of 1,05, insert 105 and 2 digits pNumericFormatter->SetValue( (long)ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() ) ); @@ -6100,8 +6101,9 @@ void VCLXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter(); if ( pCurrencyFormatter ) { - // z.B. 105, 2 Digits => 1,05 - // ein float 1,05 muss also eine 105 einstellen... + // shift long value using decimal digits + // (e.g., input 105 using 2 digits returns 1,05) + // Thus, to set a value of 1,05, insert 105 and 2 digits pCurrencyFormatter->SetValue( ImplCalcLongValue( Value, pCurrencyFormatter->GetDecimalDigits() ) ); diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 7a3e09dbb705..fcf33553c9e4 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -67,7 +67,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence( { sal_Bool bOK = sal_True; - // nur die wirklich geforderten Controls + // Get only the requested controls sal_Int32 nModels = rModels.getLength(); if (nModels != rControls.getLength()) { @@ -106,7 +106,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence( for ( sal_uInt32 n = 0; bOK && ( n < nCtrls ); n++ ) { - // Zum Model passendes Control suchen + // Get the matching control for this model Reference< XControl > xCtrl(pControls[n]); if ( xCtrl.is() ) { @@ -118,7 +118,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence( // TabStop-Property if ( pTabs ) { - // opt: String fuer TabStop als Konstante + // opt: Constant String for TabStop name static const ::rtl::OUString aTabStopName( "Tabstop" ); Reference< XPropertySet > xPSet( xCtrl->getModel(), UNO_QUERY ); @@ -140,7 +140,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence( void StdTabController::ImplActivateControl( sal_Bool bFirst ) const { - // HACK wegen #53688#, muss auf ein Interface abgebildet werden, wenn Controls Remote liegen koennen. + // HACK due to bug #53688#, map controls onto an interface if remote controls may occur Reference< XTabController > xTabController(const_cast< ::cppu::OWeakObject* >(static_cast< const ::cppu::OWeakObject* >(this)), UNO_QUERY); Sequence< Reference< XControl > > aCtrls = xTabController->getControls(); const Reference< XControl > * pControls = aCtrls.getConstArray(); @@ -228,7 +228,7 @@ Sequence< Reference< XControl > > StdTabController::getControls( ) throw(Runtim for ( sal_uInt32 n = 0; n < nCtrls; n++ ) { Reference< XControlModel > xCtrlModel = pModels[n]; - // Zum Model passendes Control suchen + // Search matching Control for this Model Reference< XControl > xCtrl = FindControl( xCtrls, xCtrlModel ); aSeq.getArray()[n] = xCtrl; } @@ -247,13 +247,12 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException) Sequence< Reference< XControlModel > > aSeq = mxModel->getControlModels(); Sequence< Reference< XWindow > > aCompSeq; - // vieleicht erhalte ich hier einen TabController, - // der schneller die Liste meiner Controls ermittelt + // This may return a TabController, which returns desired list of controls faster Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); Sequence< Reference< XControl > > aControls = xTabController->getControls(); - // #58317# Es sind ggf. noch nicht alle Controls fuer die Models im Container, - // dann kommt spaeter nochmal ein autoTabOrder... + // #58317# Some Models may be missing from the Container. Plus there is a + // autoTabOrder call later on. if( !ImplCreateComponentSequence( aControls, aSeq, aCompSeq, NULL, sal_False ) ) return; @@ -306,7 +305,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - // Am Container die Tab-Reihenfolge aktivieren... + // Activate tab order for the control container Reference< XControl > xC( mxControlContainer, UNO_QUERY ); Reference< XVclContainerPeer > xVclContainerPeer; @@ -315,22 +314,21 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) if ( !xC.is() || !xVclContainerPeer.is() ) return; - // vieleicht erhalte ich hier einen TabController, - // der schneller die Liste meiner Controls ermittelt + // This may return a TabController, which returns desired list of controls faster Reference< XTabController > xTabController(static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY); - // Flache Liste besorgen... + // Get a flattened list of controls sequences Sequence< Reference< XControlModel > > aModels = mxModel->getControlModels(); Sequence< Reference< XWindow > > aCompSeq; Sequence< Any> aTabSeq; - // DG: Aus Optimierungsgruenden werden die Controls mittels getControls() geholt, - // dieses hoert sich zwar wiedersinning an, fuehrt aber im konkreten Fall (Forms) zu sichtbaren - // Geschwindigkeitsvorteilen + // DG: For the sake of optimization, retrieve Controls from getControls(), + // this may sound counterproductive, but leads to performance improvements + // in practical scenarios (Forms) Sequence< Reference< XControl > > aControls = xTabController->getControls(); - // #58317# Es sind ggf. noch nicht alle Controls fuer die Models im Container, - // dann kommt spaeter nochmal ein activateTabOrder... + // #58317# Some Models may be missing from the Container. Plus there is a + // autoTabOrder call later on. if( !ImplCreateComponentSequence( aControls, aModels, aCompSeq, &aTabSeq, sal_True ) ) return; diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index b59f1cbfeed1..344daaef67b4 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -212,7 +212,7 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star aSeq.getArray()[n] = xI; } - // Falls bereits mehr drinsteht als diese Version kennt: + // Skip remainder if more data exists than this version recognizes xMark->jumpToMark( nDataBeginMark ); InStream->skipBytes( nDataLen ); xMark->deleteMark(nDataBeginMark); @@ -274,11 +274,9 @@ void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::c { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - // Die Controls stehen eventuel flach in der Liste und werden jetzt gruppiert. - // Verschachtelte Gruppen sind erstmal nicht moeglich... - // Das erste Element der Gruppe welches auch schon in der flachen Liste - // stand bestimmt die Position der Gruppe. - + // The controls might occur as a flat list and will be grouped. + // Nested groups are not possible. + // The first element of a group determines its position. UnoControlModelEntry* pNewEntry = new UnoControlModelEntry; pNewEntry->bGroup = sal_True; pNewEntry->pGroup = new UnoControlModelEntryList; @@ -293,7 +291,7 @@ void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::c if ( !pEntry->bGroup ) { sal_uInt32 nPos = ImplGetControlPos( *pEntry->pxControl, maControls ); - // Eigentlich sollten alle Controls vorher in der flachen Liste stehen + // At the beginning, all Controls should be in a flattened list DBG_ASSERT( nPos != CONTROLPOS_NOTFOUND, "setGroup - Element not found" ); if ( nPos != CONTROLPOS_NOTFOUND ) { @@ -314,9 +312,8 @@ sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno:: { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - // erstmal nur eine Ebene... - // Das Model und die Impl-Methoden arbeiten zwar rekursiv, aber das wird - // erstmal nich nach aussen gegeben. + // Start with only one group layer, even though Model and Impl-methods + // work recursively, this is not presented to the outside. sal_Int32 nGroups = 0; size_t nEntries = maControls.size(); diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index ef5ecb727b08..2f2c7c979911 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -208,7 +208,7 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE if ( !xCompatiblePeer.is() ) { - // Peer unsichtbar erzeugen... + // Create the pair as invisible sal_Bool bVis = maComponentInfos.bVisible; if( bVis ) maComponentInfos.bVisible = sal_False; @@ -349,7 +349,7 @@ Reference< XWindow > UnoControl::getParentPeer() const void UnoControl::updateFromModel() { - // Alle standard Properties werden ausgelesen und in das Peer uebertragen + // Read default properties and hand over to peer if( getPeer().is() ) { Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY ); @@ -414,7 +414,7 @@ void UnoControl::dispose( ) throw(RuntimeException) maPaintListeners.disposeAndClear( aDisposeEvent ); maModeChangeListeners.disposeAndClear( aDisposeEvent ); - // Model wieder freigeben + // release Model again setModel( Reference< XControlModel > () ); setContext( Reference< XInterface > () ); } @@ -569,9 +569,9 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent if ( nPType && ( nLen > 1 ) && DoesDependOnOthers( nPType ) ) { - // Properties die von anderen abhaengen erst hinterher einstellen, - // weil sie von anderen Properties abhaengig sind, die aber erst spaeter - // eingestellt werden, z.B. VALUE nach VALUEMIN/MAX. + // Add properties with dependencies on other properties last + // since they're dependent on properties added later (such as + // VALUE dependency on VALUEMIN/MAX) aPeerPropertiesToSet.push_back(PropertyValue(pEvents->PropertyName, 0, pEvents->NewValue, PropertyState_DIRECT_VALUE)); } else @@ -661,7 +661,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent // I have no other idea than locking the SolarMutex here .... // I really hate the fact that VCL is not theadsafe .... - // Funktioniert beim Container nicht! + // Doesn't work for Container! getPeer()->dispose(); mxPeer.clear(); mxVclWindowPeer = NULL; @@ -699,7 +699,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent void UnoControl::disposing( const EventObject& rEvt ) throw(RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); - // bei "Multible Inheritance" nicht unterschiedliche Typen vergleichen. + // do not compare differing types in case of multible inheritance if ( maAccessibleContext.get() == rEvt.Source ) { @@ -817,7 +817,7 @@ void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - // Visible status ist Sache der View + // Visible status is handled by View maComponentInfos.bVisible = bVisible; xWindow = xWindow.query( getPeer() ); } @@ -831,7 +831,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - // Enable status ist Sache der View + // Enable status is handled by View maComponentInfos.bEnable = bEnable; xWindow = xWindow.query( getPeer() ); } @@ -1141,13 +1141,13 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer Reference< XControlContainer > xC; aAny >>= xC; if( xC.is() ) - // Es ist ein Container + // It's a container eType = WindowClass_CONTAINER; else eType = WindowClass_SIMPLE; } else - { // Nur richtig, wenn es sich um ein Top Window handelt + { // This is only correct for Top Window if( rParentPeer.is() ) { if ( !xToolkit.is() ) @@ -1308,7 +1308,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer } } - // Ableitungen die Moeglichkeit geben die Attribute zu manipulieren + // Allow derivates to manipulate attributes PrepareWindowDescriptor(aDescr); // create the peer @@ -1343,7 +1343,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer setPosSize( aComponentInfos.nX, aComponentInfos.nY, aComponentInfos.nWidth, aComponentInfos.nHeight, aComponentInfos.nFlags ); if( aComponentInfos.bVisible && !bDesignMode ) - // Erst nach dem setzen der Daten anzeigen + // Show only after setting the data xWindow->setVisible( aComponentInfos.bVisible ); if( !aComponentInfos.bEnable ) diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 1de88494be63..12b2b14ed7d7 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -90,7 +90,7 @@ void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequenc void UnoControlBase::ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ) { - // Model ggf. schon abgemeldet, aber ein Event schlaegt noch zu... + // Model might be logged off already but an event still fires if ( mxModel.is() ) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY ); diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 136426440dd9..e5b656a2df11 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -445,8 +445,8 @@ void UnoControlContainer::dispose( ) throw(uno::RuntimeException) lang::EventObject aDisposeEvent; aDisposeEvent.Source = static_cast< uno::XAggregation* >( this ); - // DG: zuerst der Welt mitteilen, dass der Container wegfliegt. Dieses ist um einiges - // schneller wenn die Welt sowohl an den Controls als auch am Container horcht + // Notify listeners about disposal of this Container (This is much faster if they + // listen on the controls and the container). maDisposeListeners.disposeAndClear( aDisposeEvent ); maCListeners.disposeAndClear( aDisposeEvent ); @@ -458,12 +458,12 @@ void UnoControlContainer::dispose( ) throw(uno::RuntimeException) for( ; pCtrls < pCtrlsEnd; ++pCtrls ) { removingControl( *pCtrls ); - // Control wegwerfen + // Delete control (*pCtrls)->dispose(); } - // alle Strukturen entfernen + // Delete all structures DELETEZ( mpControls ); mpControls = new UnoControlHolderList; @@ -601,7 +601,7 @@ void UnoControlContainer::setStatusText( const ::rtl::OUString& rStatusText ) th { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - // In der Parenthierarchie nach unten gehen + // Descend the parent hierarchy uno::Reference< awt::XControlContainer > xContainer( mxContext, uno::UNO_QUERY ); if( xContainer.is() ) xContainer->setStatusText( rStatusText ); @@ -771,10 +771,10 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT sal_Bool bVis = maComponentInfos.bVisible; if( bVis ) UnoControl::setVisible( sal_False ); - // eigenes Peer erzeugen + // Create a new peer UnoControl::createPeer( rxToolkit, rParent ); - // alle Peers der Children erzeugen + // Create all children's peers if ( !mbCreatingCompatiblePeer ) { // Evaluate "Step" property @@ -823,7 +823,7 @@ void UnoControlContainer::setVisible( sal_Bool bVisible ) throw(uno::RuntimeExce UnoControl::setVisible( bVisible ); if( !mxContext.is() && bVisible ) - // Es ist ein TopWindow, also automatisch anzeigen + // This is a Topwindow, thus show it automatically createPeer( uno::Reference< awt::XToolkit > (), uno::Reference< awt::XWindowPeer > () ); } diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 9b2490300927..a0c0230d50ba 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -129,8 +129,8 @@ UnoControlModel::UnoControlModel( const Reference< XMultiServiceFactory >& i_fac ,maDisposeListeners( *this ) ,maContext( i_factory ) { - // Die Properties muessen vom Model in die Tabelle gestopft werden, - // nur vorhandene Properties sind gueltige Properties, auch wenn VOID. + // Insert properties from Model into table, + // only existing properties are valid, even if they're VOID } UnoControlModel::UnoControlModel( const UnoControlModel& rModel ) @@ -560,8 +560,8 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: sal_uInt32 nProps = aProps.size(); - // FontProperty wegen fehlender Unterscheidung zwischen 5.0 / 5.1 - // immer im alten Format mitspeichern. + // Save FontProperty always in the old format (due to missing distinction + // between 5.0 and 5.1) OutStream->writeLong( (long) ( aProps.find( BASEPROPERTY_FONTDESCRIPTOR ) != aProps.end() ) ? ( nProps + 3 ) : nProps ); for ( std::set::const_iterator it = aProps.begin(); it != aProps.end(); ++it ) { @@ -702,8 +702,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: if ( aProps.find( BASEPROPERTY_FONTDESCRIPTOR ) != aProps.end() ) { const ::com::sun::star::uno::Any* pProp = &maData[ BASEPROPERTY_FONTDESCRIPTOR ]; - // Solange wir keinen 5.0-Export haben, muss das alte - // Format mit rausgeschrieben werden... + // Until 5.0 export arrives, write old format.. ::com::sun::star::awt::FontDescriptor aFD; (*pProp) >>= aFD; @@ -770,11 +769,10 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> aValues( nProps ); sal_Bool bInvalidEntries = sal_False; - // Dummerweise kein Mark fuer den gesamten Block, es koennen also - // nur Properties geaendert werden, es koennen aber nicht spaeter mal Daten - // fuer das Model hinter den Properties geschrieben werden. + // Unfortunately, there's no mark for the whole block, thus only properties may be changed. + // No data for the model may be added following the properties - // Fuer den Import der alten ::com::sun::star::awt::FontDescriptor-Teile + // Used for import of old parts in ::com::sun::star::awt::FontDescriptor ::com::sun::star::awt::FontDescriptor* pFD = NULL; sal_uInt32 i; @@ -893,11 +891,11 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } else { - // Altes Geraffel aus 5.0 + // Old trash from 5.0 if ( nPropId == BASEPROPERTY_FONT_TYPE ) { - // Sonst ist es nur die redundante Info fuer alte Versionen - // Daten werden durch MarkableStream geskippt. + // Redundant information for older versions + // is skipped by MarkableStream if ( nVersion < 2 ) { if ( !pFD ) @@ -920,12 +918,13 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: if ( !pFD ) { pFD = new ::com::sun::star::awt::FontDescriptor; - if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // wegen den Defaults... + if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // due to defaults... maData[BASEPROPERTY_FONTDESCRIPTOR] >>= *pFD; } pFD->Width = (sal_Int16)InStream->readLong(); pFD->Height = (sal_Int16)InStream->readLong(); - InStream->readShort(); // ::com::sun::star::awt::FontWidth ignorieren - wurde mal falsch geschrieben und wird nicht gebraucht. + InStream->readShort(); // ignore ::com::sun::star::awt::FontWidth - it was + // misspelled and is no longer needed pFD->CharacterWidth = ::com::sun::star::awt::FontWidth::DONTKNOW; } } @@ -936,7 +935,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: if ( !pFD ) { pFD = new ::com::sun::star::awt::FontDescriptor; - if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // wegen den Defaults... + if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // due to defaults... maData[BASEPROPERTY_FONTDESCRIPTOR] >>= *pFD; } pFD->Weight = VCLUnoHelper::ConvertFontWeight( (FontWeight) InStream->readShort() ); @@ -973,7 +972,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: bInvalidEntries = sal_True; } - // Falls bereits mehr drinsteht als diese Version kennt: + // Skip rest of input if there is more data in stream than this version can handle xMark->jumpToMark( nPropDataBeginMark ); InStream->skipBytes( nPropDataLen ); xMark->deleteMark(nPropDataBeginMark); @@ -1177,7 +1176,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) { - // Fehlt: Die gefakten Einzelproperties des FontDescriptors... + // Missing: the fake solo properties of the FontDescriptor ImplPropertyTable::const_iterator it = maData.find( nPropId ); const ::com::sun::star::uno::Any* pProp = it == maData.end() ? NULL : &(it->second); @@ -1353,7 +1352,7 @@ void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< aGuard.clear(); // same as a few lines above - // FD-Propertie nicht in das Array mergen, weil sortiert... + // Don't merge FD property into array, as it is sorted if ( pFD.get() ) { ::com::sun::star::uno::Any aValue; diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index f0aeec8f9129..9d7c9424dd7a 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -2911,7 +2911,8 @@ void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemLis { if( getPeer().is() && maItemListeners.getLength() == 1 ) { - uno::Reference < awt::XComboBox > xComboBox( getPeer(), uno::UNO_QUERY ); // MT: Mal alles so umstellen, schoener als Ref anlegen und query rufen + // This call is prettier than creating a Ref and calling query + uno::Reference < awt::XComboBox > xComboBox( getPeer(), uno::UNO_QUERY ); xComboBox->removeItemListener( &maItemListeners ); } maItemListeners.removeInterface( l ); @@ -3020,15 +3021,15 @@ void UnoComboBoxControl::addItems( const uno::Sequence< ::rtl::OUString>& aItems nPos = (sal_uInt16) nOldLen; sal_uInt16 n; - // Items vor der Einfuege-Position + // items before the insert position for ( n = 0; n < nPos; n++ ) pNewData[n] = pOldData[n]; - // Neue Items + // New items for ( n = 0; n < nNewItems; n++ ) pNewData[nPos+n] = aItems.getConstArray()[n]; - // Rest der alten Items + // remainder of old items for ( n = nPos; n < nOldLen; n++ ) pNewData[nNewItems+n] = pOldData[n]; @@ -3055,11 +3056,11 @@ void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(u ::rtl::OUString* pOldData = aSeq.getArray(); sal_uInt16 n; - // Items vor der Entfern-Position + // items before the deletion position for ( n = 0; n < nPos; n++ ) pNewData[n] = pOldData[n]; - // Rest der Items + // remainder of old items for ( n = nPos; n < (nOldLen-nCount); n++ ) pNewData[n] = pOldData[n+nCount]; @@ -4105,7 +4106,7 @@ void UnoPatternFieldControl::ImplSetPeerProperty( const ::rtl::OUString& rPropNa sal_uInt16 nType = GetPropertyId( rPropName ); if ( ( nType == BASEPROPERTY_TEXT ) || ( nType == BASEPROPERTY_EDITMASK ) || ( nType == BASEPROPERTY_LITERALMASK ) ) { - // Die Masken koennen nicht nacheinander gesetzt werden. + // These masks cannot be set consecutively ::rtl::OUString Text = ImplGetPropertyValue_UString( BASEPROPERTY_TEXT ); ::rtl::OUString EditMask = ImplGetPropertyValue_UString( BASEPROPERTY_EDITMASK ); ::rtl::OUString LiteralMask = ImplGetPropertyValue_UString( BASEPROPERTY_LITERALMASK ); diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 81476ed37d5a..1712622011f1 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -215,10 +215,10 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev ) } -// MT: Wurde im Window-CTOR gerufen, damit Container-Listener -// vom Parent reagieren, aber hat sowieso nicht richtig funktioniert, -// weil im Window-CTOR das Interface noch nicht da ist! -// => Nur Listener rufen, wenn ueber das ::com::sun::star::awt::Toolkit erzeugt +// It was once called in the Window-CTOR to make listeners of the Container +// to react. This didn't really work, as the interface within the Window-CTOR +// was not ready. +// => Call only the listener, when created through ::com::sun::star::awt::Toolkit /* void ImplSmartWindowCreated( Window* pNewWindow ) -- cgit