diff options
author | Johnny_M <klasse@partyheld.de> | 2017-05-12 21:53:36 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-05-12 22:29:20 +0200 |
commit | 566f6d46056742d7d703f41d8b1596405031c5c3 (patch) | |
tree | 708fad58152928a1d27d072ea2c007f529cabe10 /svx | |
parent | ac3fdadbe54ceb3192b85acce169e412dc9aaa32 (diff) |
Translate German comments (rest of svx/)
Additionally to comments, this translates dbg. assertion strings.
Change-Id: Ia35b2a7336f2b5b30da36445274b1ea726f71f39
Reviewed-on: https://gerrit.libreoffice.org/37559
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/filtnav.cxx | 20 | ||||
-rw-r--r-- | svx/source/form/fmexch.cxx | 7 | ||||
-rw-r--r-- | svx/source/form/fmexpl.cxx | 10 | ||||
-rw-r--r-- | svx/source/form/fmmodel.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmobjfac.cxx | 8 | ||||
-rw-r--r-- | svx/source/form/fmpage.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmpgeimp.cxx | 19 | ||||
-rw-r--r-- | svx/source/form/fmshell.cxx | 58 | ||||
-rw-r--r-- | svx/source/form/fmstring.src | 2 | ||||
-rw-r--r-- | svx/source/form/fmundo.cxx | 23 | ||||
-rw-r--r-- | svx/source/form/fmvwimp.cxx | 48 | ||||
-rw-r--r-- | svx/source/form/formcontroller.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/navigatortreemodel.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/tabwin.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/tbxform.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/numfmtsh.cxx | 2 | ||||
-rw-r--r-- | svx/source/xoutdev/_xpoly.cxx | 4 |
18 files changed, 113 insertions, 114 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 4b22fe6d4c3d..a9b9a4ab74f9 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -756,7 +756,7 @@ void DbGridControl::NavigationBar::SetState(DbGridControlNavigationBarState nWhi } break; default: break; } - DBG_ASSERT(pWnd, "kein Fenster"); + DBG_ASSERT(pWnd, "no window"); if (pWnd && (pWnd->IsEnabled() != bAvailable)) // this "pWnd->IsEnabled() != bAvailable" is a little hack : Window::Enable always generates a user // event (ImplGenerateMouseMove) even if nothing happened. This may lead to some unwanted effects, so we @@ -1858,7 +1858,7 @@ void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, bool // If no cursor -> no rows in the browser. if (!m_pSeekCursor) { - DBG_ASSERT(GetRowCount() == 0,"DbGridControl: ohne Cursor darf es keine Rows geben"); + DBG_ASSERT(GetRowCount() == 0,"DbGridControl: without cursor no rows are allowed to be there"); return; } @@ -2882,7 +2882,7 @@ IMPL_LINK_NOARG(DbGridControl, OnDelete, void*, void) void DbGridControl::DeleteSelectedRows() { - DBG_ASSERT(GetSelection(), "keine selection!!!"); + DBG_ASSERT(GetSelection(), "no selection!!!"); if (!m_pSeekCursor) return; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index d0953d49ed5d..124b3d6bd67b 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -62,11 +62,11 @@ #include <functional> #define DROP_ACTION_TIMER_INITIAL_TICKS 10 - // solange dauert es, bis das Scrollen anspringt + // it takes this long for the scrolling to begin #define DROP_ACTION_TIMER_SCROLL_TICKS 3 - // in diesen Intervallen wird jeweils eine Zeile gescrollt + // a line is scrolled in these intervals #define DROP_ACTION_TIMER_TICK_BASE 10 - // das ist die Basis, mit der beide Angaben multipliziert werden (in ms) + // this is the basis for multiplying both figures (in ms) using namespace ::svxform; using namespace ::connectivity; @@ -235,7 +235,7 @@ public: FmFilterCurrentChangedHint(){} }; -// class FmFilterAdapter, Listener an den FilterControls +// class FmFilterAdapter, listener at the FilterControls class FmFilterAdapter : public ::cppu::WeakImplHelper< XFilterControllerListener > { FmFilterModel* m_pModel; @@ -388,7 +388,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event ) if ( !Event.PredicateExpression.isEmpty()) { pFilterItem->SetText( Event.PredicateExpression ); - // UI benachrichtigen + // notify the UI FmFilterTextChangedHint aChangeHint(pFilterItem); m_pModel->Broadcast( aChangeHint ); } @@ -728,7 +728,7 @@ void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, F rItems.insert(rPos, pData); } - // UI benachrichtigen + // notify the UI FmFilterInsertedHint aInsertedHint(pData, nPos); Broadcast( aInsertedHint ); } @@ -921,7 +921,7 @@ void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent) m_pCurrentItems = nullptr; - // UI benachrichtigen + // notify the UI FmFilterCurrentChangedHint aHint; Broadcast( aHint ); } @@ -1379,7 +1379,7 @@ void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry, bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, bool bSelect ) { - if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;) + if (bSelect == IsSelected(pEntry)) // This happens sometimes. I think the basic class errs too much on the side of caution. ;) return true; if (SvTreeListBox::Select(pEntry, bSelect)) @@ -1470,7 +1470,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos) void FmFilterNavigator::Remove(FmFilterData* pItem) { - // der Entry zu den Daten + // the entry for the data SvTreeListEntry* pEntry = FindEntry(pItem); if (pEntry == m_pEditingCurrently) @@ -1570,7 +1570,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) { case CommandEventId::ContextMenu: { - // die Stelle, an der geklickt wurde + // the place where it was clicked Point aWhere; SvTreeListEntry* pClicked = nullptr; if (rEvt.IsMouseEvent()) diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 13eb30bc31e0..82096f99ad93 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -225,7 +225,7 @@ namespace svxform ++loop, ++pAllPaths ) { - // erst mal sammeln wir den Pfad in einem Array ein + // first we collect the path in an array ::std::vector< sal_uInt32 > aCurrentPath; SvTreeListEntry* pCurrentEntry = *loop; @@ -235,10 +235,11 @@ namespace svxform aCurrentPath.push_back(pLoop->GetChildListPos()); pLoop = pTreeBox->GetParent(pLoop); DBG_ASSERT((pLoop != nullptr) || (pRoot == nullptr), "OControlTransferData::buildPathFormat: invalid root or entry !"); - // pLoop == NULL heisst, dass ich am oberen Ende angelangt bin, dann sollte das Ganze abbrechen, was nur bei pRoot == NULL der Fall sein wird + // pLoop == NULL means that I am at the top end, then the whole + // thing should abort, which will only be the case with pRoot == NULL } - // dann koennen wir ihn in die css::uno::Sequence uebertragen + // then we can transfer it into css::uno::Sequence Sequence<sal_uInt32>& rCurrentPath = *pAllPaths; sal_Int32 nDepth = aCurrentPath.size(); diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index a8ec6032a234..481293b29bb2 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -252,10 +252,10 @@ FmFormData::FmFormData(const Reference< XForm >& _rxForm, FmFormData* _pParent) : FmEntryData(_pParent, _rxForm) , m_xForm(_rxForm) { - // Images setzen + // set images m_aNormalImage = Image(RID_SVXBMP_FORM); - // Titel setzen + // set titel if (m_xForm.is()) { Reference< XPropertySet > xSet(m_xForm, UNO_QUERY); @@ -304,11 +304,11 @@ FmControlData::FmControlData(const Reference< XFormComponent >& _rxComponent, Fm m_xFormComponent( _rxComponent ) { - // Images setzen + // set images m_aNormalImage = GetImage(); - // Titel setzen + // set titel Reference< XPropertySet > xSet(m_xFormComponent, UNO_QUERY); if( xSet.is() ) { @@ -460,7 +460,7 @@ void FmControlData::ModelReplaced(const Reference< XFormComponent >& _rxNew) { m_xFormComponent = _rxNew; newObject( m_xFormComponent ); - // Images neu setzen + // set images anew m_aNormalImage = GetImage(); } diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 5038a551b6f1..e0dd072fefb5 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -91,7 +91,7 @@ FmFormModel::~FmFormModel() SetObjectShell(nullptr); ClearUndoBuffer(); - // minimale grenze fuer undos + // minimum limit for undos SetMaxUndoActionCount(1); } diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index a9f0c548bc30..8755138a576d 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -60,7 +60,7 @@ FmFormObjFactory::FmFormObjFactory() SdrObjFactory::InsertMakeObjectHdl(LINK(this, FmFormObjFactory, MakeObject)); - // Konfigurations-css::frame::Controller und NavigationBar registrieren + // register the configuration css::frame::Controller and the NavigationBar SvxFmTbxCtlAbsRec::RegisterControl( SID_FM_RECORD_ABSOLUTE ); SvxFmTbxCtlRecText::RegisterControl( SID_FM_RECORD_TEXT ); SvxFmTbxCtlRecFromText::RegisterControl( SID_FM_RECORD_FROM_TEXT ); @@ -68,7 +68,7 @@ FmFormObjFactory::FmFormObjFactory() SvxFmTbxPrevRec::RegisterControl( SID_FM_RECORD_PREV ); SvxFmTbxNextRec::RegisterControl( SID_FM_RECORD_NEXT ); - // Registrieung von globalen fenstern + // registering global windows FmFieldWinMgr::RegisterChildWindow(); FmPropBrwMgr::RegisterChildWindow(); NavigatorFrameManager::RegisterChildWindow(); @@ -77,7 +77,7 @@ FmFormObjFactory::FmFormObjFactory() FmFilterNavigatorWinMgr::RegisterChildWindow(); #endif - // Interface fuer die Formshell registrieren + // register the interface for the Formshell FmFormShell::RegisterInterface(); ImplSmartRegisterUnoServices(); @@ -89,7 +89,7 @@ FmFormObjFactory::~FmFormObjFactory() { } -// css::form::Form-Objekte erzeugen +// create css::form::Form objects namespace { void lcl_initProperty( FmFormObj* _pObject, const OUString& _rPropName, const Any& _rValue ) diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index bc700454abd2..394dd5a863a0 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -180,7 +180,7 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, OUString aText = ::comphelper::getString(xSet->getPropertyValue(FM_PROP_TARGET_URL)); INetURLObject aUrl(aText); - // testen, ob es ein Protokoll-Typ ist, den ich anzeigen will + // test if it is a protocol type that I want to display INetProtocol aProtocol = aUrl.GetProtocol(); static const INetProtocol s_aQuickHelpSupported[] = { INetProtocol::Ftp, INetProtocol::Http, INetProtocol::File, INetProtocol::Mailto, @@ -197,7 +197,7 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, } if ( !aHelpText.isEmpty() ) { - // Hilfe anzeigen + // display the help tools::Rectangle aItemRect = pObj->GetCurrentBoundRect(); aItemRect = pWindow->LogicToPixel( aItemRect ); Point aPt = pWindow->OutputToScreenPixel( aItemRect.TopLeft() ); diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 5b74fffb0f21..15980afc1579 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -371,7 +371,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() // check whether there is a "standard" form if ( Reference<XNameAccess>(xForms,UNO_QUERY_THROW)->hasElements() ) { - // suche die Standardform + // find the standard form OUString sStandardFormname = SVX_RESSTR(RID_STR_STDFORMNAME); try @@ -453,14 +453,13 @@ Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy Reference< XForm > xForm; - // Wenn Datenbank und CursorSource gesetzt sind, dann wird - // die Form anhand dieser Kriterien gesucht, ansonsten nur aktuelle - // und die StandardForm + // If database and CursorSource are set, the form is searched for using + // these criteria, otherwise only current and the DefaultForm. if (rDatabase.is() && !rCursorSource.isEmpty()) { validateCurForm(); - // erst in der aktuellen form suchen + // first search in the current form xForm = findFormForDataSource( xCurrentForm, rDatabase, rCursorSource, nCommandType ); Reference< css::container::XIndexAccess > xFormsByIndex( getForms(), UNO_QUERY ); @@ -473,7 +472,7 @@ Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy xForm = findFormForDataSource( xToSearch, rDatabase, rCursorSource, nCommandType ); } - // wenn keine css::form gefunden, dann eine neue erzeugen + // If no css::form found, then create a new one if (!xForm.is()) { SdrModel* pModel = m_rPage.GetModel(); @@ -589,13 +588,13 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( if (sLookupName == sFormDataSourceName) { - // jetzt noch ueberpruefen ob CursorSource und Type uebereinstimmen + // now check whether CursorSource and type match OUString aCursorSource = ::comphelper::getString(xFormProps->getPropertyValue(FM_PROP_COMMAND)); sal_Int32 nType = ::comphelper::getINT32(xFormProps->getPropertyValue(FM_PROP_COMMANDTYPE)); if (aCursorSource.isEmpty() || ((nType == nCommandType) && (aCursorSource == _rCursorSource))) // found the form { xResultForm = rForm; - // Ist noch keine Datenquelle gesetzt, wird dieses hier nachgeholt + // if no data source is set yet, it is done here if (aCursorSource.isEmpty()) { xFormProps->setPropertyValue(FM_PROP_COMMAND, makeAny(_rCursorSource)); @@ -640,14 +639,14 @@ OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xForm if (sName.isEmpty() || xNameAcc->hasByName(sName)) { - // setzen eines default Namens ueber die ClassId + // set a default name via the ClassId sal_Int16 nClassId( FormComponentType::CONTROL ); xSet->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId; OUString sDefaultName = FormControlFactory::getDefaultUniqueName_ByComponentType( Reference< XNameAccess >( xControls, UNO_QUERY ), xSet ); - // bei Radiobuttons, die einen Namen haben, diesen nicht ueberschreiben! + // do not overwrite the name of radio buttons that have it! if (sName.isEmpty() || nClassId != css::form::FormComponentType::RADIOBUTTON) { xSet->setPropertyValue(FM_PROP_NAME, makeAny(sDefaultName)); diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 93ff871278cb..63827dd3b7db 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -90,9 +90,9 @@ #include <memory> -// wird fuer Invalidate verwendet -> mitpflegen -// aufsteigend sortieren !!!!!! -sal_uInt16 const ControllerSlotMap[] = // slots des Controllers +// is used for Invalidate -> maintain it as well +// sort ascending !!!!!! +sal_uInt16 const ControllerSlotMap[] = // slots of the controller { SID_FM_CONFIG, SID_FM_PUSHBUTTON, @@ -241,8 +241,8 @@ bool FmFormShell::PrepareClose(bool bUI) if(pWindow) { - // Zunaechst werden die aktuellen Inhalte der Controls gespeichert - // Wenn alles glatt gelaufen ist, werden die modifizierten Datensaetze gespeichert + // First, the current contents of the controls are stored. + // If everything has gone smoothly, the modified records are stored. if ( GetImpl()->getActiveController().is() ) { const svx::ControllerFeatures& rController = GetImpl()->getActiveControllerFeatures(); @@ -284,7 +284,7 @@ void FmFormShell::impl_setDesignMode(bool bDesign) m_nLastSlot = SID_FM_DESIGN_MODE; GetImpl()->SetDesignMode(bDesign); - // mein m_bDesignMode wird auch von der Impl gesetzt ... + // my m_bDesignMode is also set by the Impl ... } else { @@ -303,12 +303,12 @@ bool FmFormShell::HasUIFeature(SfxShellFeature nFeature) const bool bResult = false; if (nFeature & SfxShellFeature::FormShowDatabaseBar) { - // nur wenn auch formulare verfuegbar + // only if forms are also available bResult = !m_bDesignMode && GetImpl()->hasDatabaseBar() && !GetImpl()->isInFilterMode(); } else if (nFeature & SfxShellFeature::FormShowFilterBar) { - // nur wenn auch formulare verfuegbar + // only if forms are also available bResult = !m_bDesignMode && GetImpl()->hasDatabaseBar() && GetImpl()->isInFilterMode(); } else if (nFeature & SfxShellFeature::FormShowFilterNavigator) @@ -352,7 +352,7 @@ void FmFormShell::Execute(SfxRequest &rReq) sal_uInt16 nSlot = rReq.GetSlot(); - // MasterSlot setzen + // set MasterSlot switch( nSlot ) { case SID_FM_PUSHBUTTON: @@ -381,7 +381,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } - // Identifier und Inventor des Uno-Controls setzen + // set the Identifier and Inventor of the Uno control sal_uInt16 nIdentifier = 0; switch( nSlot ) { @@ -514,7 +514,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } break; } - // Individuelle Aktionen + // individual actions switch( nSlot ) { case SID_FM_MORE_CONTROLS: @@ -577,8 +577,8 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_CONVERTTO_SPINBUTTON : case SID_FM_CONVERTTO_NAVIGATIONBAR : GetImpl()->executeControlConversionSlot(FmXFormShell::SlotToIdent(nSlot)); - // nach dem Konvertieren die Selektion neu bestimmern, da sich ja das selektierte Objekt - // geaendert hat + // after the conversion, re-determine the selection, since the + // selected object has changed GetImpl()->SetSelection(GetFormView()->GetMarkedObjectList()); break; case SID_FM_LEAVE_CREATE: @@ -598,7 +598,7 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_PROPERTIES: { - // PropertyBrowser anzeigen + // display the PropertyBrowser const SfxBoolItem* pShowItem = rReq.GetArg<SfxBoolItem>(nSlot); bool bShow = pShowItem == nullptr || pShowItem->GetValue(); @@ -633,7 +633,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } break; case SID_FM_SHOW_FMEXPLORER: { - if (!m_pFormView) // setzen der View Forcieren + if (!m_pFormView) // force setting the view GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_CREATE_SW_DRAWVIEW); GetViewShell()->GetViewFrame()->ChildWindowExecute(rReq); @@ -888,7 +888,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) bool bLayerLocked = false; if (m_pFormView) { - // Ist der css::drawing::Layer gelocked, so müssen die Slots disabled werden. #36897 + // If the css::drawing::Layer is locked, the slots must be disabled. #36897 SdrPageView* pPV = m_pFormView->GetSdrPageView(); if (pPV != nullptr) bLayerLocked = pPV->IsLayerLocked(m_pFormView->GetActiveLayer()); @@ -944,8 +944,8 @@ void FmFormShell::GetState(SfxItemSet &rSet) case SID_FM_CTL_PROPERTIES: { - // der Impl eventuell die Moeglichjkeit geben, ihre an der aktuellen MarkList ausgerichteten Objekte - // auf den neuesten Stand zu bringen + // potentially, give the Impl the opportunity to update its + // current objects which are aligned with the current MarkList if (GetImpl()->IsSelectionUpdatePending()) GetImpl()->ForceUpdateSelection(); @@ -963,8 +963,8 @@ void FmFormShell::GetState(SfxItemSet &rSet) case SID_FM_PROPERTIES: { - // der Impl eventuell die Moeglichjkeit geben, ihre an der aktuellen MarkList ausgerichteten Objekte - // auf den neuesten Stand zu bringen + // potentially, give the Impl the opportunity to update its + // current objects which are aligned with the current MarkList if (GetImpl()->IsSelectionUpdatePending()) GetImpl()->ForceUpdateSelection(); @@ -977,8 +977,8 @@ void FmFormShell::GetState(SfxItemSet &rSet) } } break; case SID_FM_TAB_DIALOG: - // der Impl eventuell die Moeglichjkeit geben, ihre an der aktuellen MarkList ausgerichteten Objekte - // auf den neuesten Stand zu bringen + // potentially, give the Impl the opportunity to update its + // current objects which are aligned with the current MarkList if (GetImpl()->IsSelectionUpdatePending()) GetImpl()->ForceUpdateSelection(); @@ -1204,7 +1204,7 @@ void FmFormShell::SetView( FmFormView* _pView ) void FmFormShell::DetermineForms(bool bInvalidate) { - // Existieren Formulare auf der aktuellen Page + // are there forms on the current page bool bForms = GetImpl()->hasForms(); if (bForms != m_bHasForms) { @@ -1433,17 +1433,17 @@ void FmFormShell::SetDesignMode( bool _bDesignMode ) FmFormModel* pModel = GetFormModel(); if (pModel) - // fuer die Zeit des Uebergangs das Undo-Environment ausschalten, das sichert, dass man dort auch nicht-transiente - // Properties mal eben aendern kann (sollte allerdings mit Vorsicht genossen und beim Rueckschalten des Modes - // auch immer wieder rueckgaegig gemacht werden. Ein Beispiel ist das Setzen der maximalen Text-Laenge durch das - // OEditModel an seinem Control.) + // Switch off the undo environment for the time of the transition. This ensures that + // one can also change non-transient properties there. (It should be done with + // caution, however, and it should always be reversed when one switches the mode back. + // An example is the setting of the maximum text length by the OEditModel on its control.) pModel->GetUndoEnv().Lock(); - // dann die eigentliche Umschaltung + // then the actual switch if ( m_bDesignMode || PrepareClose() ) impl_setDesignMode(!m_bDesignMode ); - // und mein Undo-Environment wieder an + // and my undo environment back on if ( pModel ) pModel->GetUndoEnv().UnLock(); } diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src index a05decfa7634..f2b0f1e2963e 100644 --- a/svx/source/form/fmstring.src +++ b/svx/source/form/fmstring.src @@ -18,7 +18,7 @@ */ #include "svx/fmresids.hrc" -/* Strings fuer Uebersetzung */ +/* Strings for translation */ String RID_ERR_FIELDREQUIRED { Text [ en-US ] = "Input required in field '#'. Please enter a value."; diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index c71a6acddfbc..78e0ed31cd5a 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -391,7 +391,7 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj) if ( !pObj ) return; - // ist das Control noch einer Form zugeordnet + // is the control still assigned to a form Reference< XInterface > xModel(pObj->GetUnoControlModel(), UNO_QUERY); Reference< XFormComponent > xContent(xModel, UNO_QUERY); if (xContent.is() && pObj->GetPage()) @@ -436,7 +436,7 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj) } } - // FormObject zuruecksetzen + // reset FormObject pObj->ClearObjEnv(); } } @@ -469,21 +469,20 @@ void FmXUndoEnvironment::Removed(FmFormObj* pObj) if ( !pObj ) return; - // ist das Control noch einer Form zugeordnet + // is the control still assigned to a form Reference< XFormComponent > xContent(pObj->GetUnoControlModel(), UNO_QUERY); if (xContent.is()) { - // das Object wird aus einer Liste herausgenommen - // existiert ein Vater wird das Object beim beim Vater entfernt und - // am FormObject gemerkt! + // The object is taken out of a list. + // If a father exists, the object is removed at the father and + // noted at the FormObject! - // wird das Object wieder eingefuegt und ein Parent existiert, so wird dieser - // Parent wiederum gesetzt + // If the object is reinserted and a parent exists, this parent is set though. Reference< XIndexContainer > xForm(xContent->getParent(), UNO_QUERY); if (xForm.is()) { Reference< XIndexAccess > xIndexAccess(xForm.get()); - // Feststellen an welcher Position sich das Kind befunden hat + // determine which position the child was at const sal_Int32 nPos = getElementPos(xIndexAccess, xContent); if (nPos >= 0) { @@ -727,7 +726,7 @@ void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); - // neues Object zum lauschen + // new object for listening Reference< XInterface > xIface; evt.Element >>= xIface; OSL_ENSURE(xIface.is(), "FmXUndoEnvironment::elementInserted: invalid container notification!"); @@ -800,7 +799,7 @@ void FmXUndoEnvironment::RemoveForms(const Reference< XNameContainer > & rForms) void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & Element) { - // am Container horchen + // listen at the container Reference< XIndexContainer > xContainer(Element, UNO_QUERY); if (xContainer.is()) { @@ -919,7 +918,7 @@ void FmXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement ) { OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::AddElement: not when I'm already disposed!" ); - // am Container horchen + // listen at the container Reference< XIndexContainer > xContainer( _rxElement, UNO_QUERY ); if ( xContainer.is() ) switchListening( xContainer, true ); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 0a05efbb72ad..ab0c63826f8c 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -346,7 +346,7 @@ void FormViewPageWindowAdapter::setController(const Reference< XForm > & xForm, xEventManager->attach(m_aControllerList.size() - 1, Reference<XInterface>( xController, UNO_QUERY ), makeAny(xController) ); } - // jetzt die Subforms durchgehen + // now go through the subforms sal_uInt32 nLength = xFormCps->getCount(); Reference< XForm > xSubForm; for (sal_uInt32 i = 0; i < nLength; i++) @@ -560,7 +560,7 @@ void FmXFormView::addWindow(const SdrPageWindow& rWindow) PFormViewPageWindowAdapter pAdapter = new FormViewPageWindowAdapter( comphelper::getProcessComponentContext(), rWindow, this ); m_aPageWindowAdapters.push_back( pAdapter ); - // Am ControlContainer horchen um Aenderungen mitzbekommen + // listen at the ControlContainer to notice changes Reference< XContainer > xContainer( xCC, UNO_QUERY ); if ( xContainer.is() ) xContainer->addContainerListener( this ); @@ -570,11 +570,10 @@ void FmXFormView::addWindow(const SdrPageWindow& rWindow) void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC ) { - // Wird gerufen, wenn - // - in den Design-Modus geschaltet wird - // - ein Window geloescht wird, waehrend man im Design-Modus ist - // - der Control-Container fuer ein Window entfernt wird, waehrend - // der aktive Modus eingeschaltet ist. + // Is called if + // - the design mode is being switched to + // - a window is deleted while in the design mode + // - the control container for a window is removed while the active mode is on for ( PageWindowAdapterList::iterator i = m_aPageWindowAdapters.begin(); i != m_aPageWindowAdapters.end(); @@ -1252,12 +1251,12 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor OUString sLabelPostfix; - // nur fuer Textgroesse + // only for text size OutputDevice* pOutDev = nullptr; if (m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) pOutDev = const_cast<OutputDevice*>(m_pView->GetActualOutDev()); else - {// OutDev suchen + {// find OutDev SdrPageView* pPageView = m_pView->GetSdrPageView(); if( pPageView && !pOutDev ) { @@ -1377,7 +1376,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor } } - return pGroup; // und fertig + return pGroup; // and done } catch (const Exception&) { @@ -1403,12 +1402,12 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ OUString sLabelPostfix = _rDesc.szName; - // nur fuer Textgroesse + // only for text size OutputDevice* pOutDev = nullptr; if (m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) pOutDev = const_cast<OutputDevice*>(m_pView->GetActualOutDev()); else - {// OutDev suchen + {// find OutDev SdrPageView* pPageView = m_pView->GetSdrPageView(); if( pPageView && !pOutDev ) { @@ -1565,8 +1564,8 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO MapMode eTargetMode( _rOutDev.GetMapMode() ), eSourceMode( MapUnit::Map100thMM ); - // Textbreite ist mindestens 4cm - // Texthoehe immer halber cm + // text width is at least 4 centimeters + // text height is always half a centimeter ::Size aDefTxtSize(4000, 500); ::Size aDefSize(4000, 500); ::Size aDefImageSize(4000, 4000); @@ -1713,9 +1712,10 @@ void FmXFormView::ObjectRemoveListener::Notify( SfxBroadcaster& /*rBC*/, const S void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject ) { - // wenn das entfernte Objekt in meiner MarkList, die ich mir beim Umschalten in den Alive-Mode gemerkt habe, steht, - // muss ich es jetzt da rausnehmen, da ich sonst beim Zurueckschalten versuche, die Markierung wieder zu setzen - // (interesanterweise geht das nur bei gruppierten Objekten schief (beim Zugriff auf deren ObjList GPF), nicht bei einzelnen) + // if the remote object in my MarkList, which I have memorized when switching to the + // Alive mode, I have to take it out now, because I otherwise try to set the mark + // again when switching back (interestingly, this fails only with grouped objects + // (when accessing their ObjList GPF), not with individual ones) const size_t nCount = m_aMark.GetMarkCount(); for (size_t i = 0; i < nCount; ++i) @@ -1727,8 +1727,8 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject ) m_aMark.DeleteMark(i); return; } - // ich brauche nicht in GroupObjects absteigen : wenn dort unten ein Objekt geloescht wird, dann bleibt der - // Zeiger auf das GroupObject, den ich habe, trotzdem weiter gueltig bleibt ... + // I do not need to descend into GroupObjects: if an object is deleted there, + // then the pointer, which I have, to the GroupObject still remains valid ... } } @@ -1858,13 +1858,13 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) return; } } - // wichtig ist das auf die Objecte der markliste nicht zugegriffen wird - // da diese bereits zerstoert sein koennen + // it is important that the objects of the mark list are not accessed, + // because they can be already destroyed SdrPageView* pCurPageView = m_pView->GetSdrPageView(); SdrObjListIter aPageIter( *pPage ); bool bFound = true; - // gibt es noch alle Objecte + // do all objects still exist const size_t nCount = m_aMark.GetMarkCount(); for (size_t i = 0; i < nCount && bFound; ++i) { @@ -1884,8 +1884,8 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) if (bFound) { - // Das LastObject auswerten - if (nCount) // Objecte jetzt Markieren + // evaluate the LastObject + if (nCount) // now mark the objects { for (size_t i = 0; i < nCount; ++i) { diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index b91499a789b3..2089ae19b6bf 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1648,7 +1648,7 @@ void FormController::focusGained(const FocusEvent& e) // normally, a locked control should not be modified, so probably my bModified must // have been set from a different context, which I would not understand ... #endif - DBG_ASSERT(m_xCurrentControl.is(), "kein CurrentControl gesetzt"); + DBG_ASSERT(m_xCurrentControl.is(), "no CurrentControl set"); // first the control ask if it supports the IFace Reference< XBoundComponent > xBound(m_xCurrentControl, UNO_QUERY); if (!xBound.is() && m_xCurrentControl.is()) @@ -1705,7 +1705,7 @@ void FormController::focusGained(const FocusEvent& e) && ( xControl == m_xCurrentControl ) ) { - DBG_ASSERT(m_xCurrentControl.is(), "Kein CurrentControl selektiert"); + DBG_ASSERT(m_xCurrentControl.is(), "No CurrentControl selected"); return; } @@ -2371,7 +2371,7 @@ void FormController::stopListening() Reference< XControl > FormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,bool _bRemove,bool _bOverWrite) const { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); - DBG_ASSERT( xCtrlModel.is(), "findControl - welches ?!" ); + DBG_ASSERT( xCtrlModel.is(), "findControl - which ?!" ); Reference< XControl >* pControls = _rControls.getArray(); Reference< XControlModel > xModel; diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 9abf30f39812..47481b7e3877 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -833,7 +833,7 @@ namespace svxform if(!m_pFormShell) return; // no shell FmFormView* pFormView = m_pFormShell->GetFormView(); - DBG_ASSERT(pFormView != nullptr, "NavigatorTreeModel::UpdateContent : keine FormView"); + DBG_ASSERT(pFormView != nullptr, "NavigatorTreeModel::UpdateContent : no FormView"); BroadcastMarkedObjects(pFormView->GetMarkedObjectList()); } } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index e789e4ca1b72..307209796edd 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -358,7 +358,7 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x m_pChangeListener->addProperty(FM_PROP_COMMAND); m_pChangeListener->addProperty(FM_PROP_COMMANDTYPE); - // Titel setzen + // set title aTitle = aTitle + " " + aPrefix + " " + OUString(m_aObjectName.getStr()); SetText( aTitle ); } diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 23c97a7c0cbb..43f8ca72016c 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -130,7 +130,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons pWin->SetText(OUString()); - // Enablen/disablen des Fensters + // enabling/disabling of the window pToolBox->EnableItem(nId, bEnable); SfxToolBoxControl::StateChanged( nSID, eState,pState ); } @@ -220,7 +220,7 @@ VclPtr<vcl::Window> SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pParent void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - // Setzen des FixedTextes + // setting the FixedText if (GetSlotId() != SID_FM_RECORD_TOTAL) return; diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 26c5c5c5e33e..72d6f67ad1cc 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -533,7 +533,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, { // precondition: number formater found - DBG_ASSERT( pFormatter != nullptr, "Zahlenformatierer nicht gefunden!" ); + DBG_ASSERT( pFormatter != nullptr, "Number formatter not found!" ); short nSelPos = SELPOS_NONE; diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index a3571abdc914..39d8cfc6aa14 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -431,7 +431,7 @@ tools::Rectangle XPolygon::GetBoundRect() const const Point& XPolygon::operator[]( sal_uInt16 nPos ) const { - DBG_ASSERT(nPos < pImpXPolygon->nPoints, "Ungueltiger Index bei const-Arrayzugriff auf XPolygon"); + DBG_ASSERT(nPos < pImpXPolygon->nPoints, "Invalid index at const array access to XPolygon"); pImpXPolygon->CheckPointDelete(); return pImpXPolygon->pPointAry[nPos]; @@ -443,7 +443,7 @@ Point& XPolygon::operator[]( sal_uInt16 nPos ) if( nPos >= pImpXPolygon->nSize ) { - DBG_ASSERT(pImpXPolygon->nResize, "Ungueltiger Index bei Arrayzugriff auf XPolygon"); + DBG_ASSERT(pImpXPolygon->nResize, "Invalid index at array access to XPolygon"); pImpXPolygon->Resize(nPos + 1, false); } if( nPos >= pImpXPolygon->nPoints ) |