diff options
author | Urs Fässler <urs@bitzgi.ch> | 2013-03-13 20:30:06 +0100 |
---|---|---|
committer | Urs Fässler <urs@bitzgi.ch> | 2013-03-13 21:42:27 +0100 |
commit | f4a37ca9584d7b8fcbd7aaa80162edcfde3cd4ed (patch) | |
tree | 940328c5e6dcdefe3e730e1f2cbf0211dffa5bd5 /sd/source/ui/unoidl | |
parent | 10af6b399c3d3342a03a3031cf42779bc0d38c87 (diff) |
several translations and fixes for translations
Change-Id: I47ca71d578f3e0b1e2c3499f0785d986ed4f583e
Diffstat (limited to 'sd/source/ui/unoidl')
-rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/sddetect.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unolayer.cxx | 16 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 70 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopback.cxx | 2 |
7 files changed, 51 insertions, 53 deletions
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index b7fd00fa02fa..22084783bf54 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -438,7 +438,7 @@ void DrawController::FireSelectionChangeListener() throw() Reference< XInterface > xSource( (XWeak*)this ); const lang::EventObject aEvent( xSource ); - // Ueber alle Listener iterieren und Events senden + // iterate over all listeners and send events OInterfaceIteratorHelper aIt( *pLC); while( aIt.hasMoreElements() ) { diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index a3af46b115be..a25f1518c14e 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -375,7 +375,7 @@ SdFilterDetect::~SdFilterDetect() } else { - // Vektorgraphik? + // vector graphic? pStm->Seek( STREAM_SEEK_TO_BEGIN ); const String aFileName( aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index b5a904bcfd9d..16d37b1253a2 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -309,7 +309,7 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw() { if(pLayer&&pLayerManager) { - // Versuch 1. ist eine beliebige Seite geoeffnet? + // Try 1. is an arbitrary page open? ::sd::View *pView = pLayerManager->GetView(); SdrPageView* pSdrPageView = NULL; if(pView) @@ -326,7 +326,7 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw() } } - // Versuch 2. Info von der FrameView besorgen + // Try 2. get info from FrameView if(pLayerManager->GetDocShell()) { ::sd::FrameView *pFrameView = pLayerManager->GetDocShell()->GetFrameView(); @@ -346,7 +346,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() { if(pLayer&&pLayerManager) { - // Versuch 1. ist eine beliebige Seite geoeffnet? + // Try 1. is an arbitrary page open? ::sd::View *pView = pLayerManager->GetView(); SdrPageView* pSdrPageView = NULL; if(pView) @@ -366,7 +366,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() } } - // Versuch 2. Info von der FrameView besorgen + // Try 2. get info from FrameView if(pLayerManager->GetDocShell()) { ::sd::FrameView *pFrameView = pLayerManager->GetDocShell()->GetFrameView(); @@ -527,7 +527,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal sal_Int32 nLayer = nLayerCnt - 2 + 1; String aLayerName; - // Ueberpruefung auf schon vorhandene Namen + // Test for existing names while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) ) { aLayerName = String(SdResId(STR_LAYER)); @@ -718,8 +718,10 @@ sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException) return getCount() > 0; } -/** Falls an den Layern was geaendert wurde sorgt diese Methode dafuer, das - die Aenderungen auch in der sdbcx::View sichtbar gemacht werden */ +/** + * If something was changed at the layers, this methods takes care that the + * changes are made visible in sdbcx::View. + */ void SdLayerManager::UpdateLayerView( sal_Bool modify ) const throw() { if(mpModel->mpDocShell) diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index a49f9d44496b..037a2cd7cc59 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -185,7 +185,7 @@ const sal_Int32 WID_MODEL_FONTS = 13; const SvxItemPropertySet* ImplGetDrawModelPropertySet() { - // Achtung: Der erste Parameter MUSS sortiert vorliegen !!! + // Attention: the first parameter HAS TO BE sorted!!! const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] = { { MAP_CHAR_LEN("BuildId"), WID_MODEL_BUILDID, &::getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, @@ -424,15 +424,15 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { const SfxSimpleHint* pSfxHint = PTR_CAST(SfxSimpleHint, &rHint ); - // ist unser SdDrawDocument gerade gestorben? + // did our SdDrawDocument just died? if(pSfxHint && pSfxHint->GetId() == SFX_HINT_DYING) { - // yup, also schnell ein neues erfragen + // yes, so we ask for a new one if( mpDocShell ) { SdDrawDocument *pNewDoc = mpDocShell->GetDoc(); - // ist ueberhaupt ein neues da? + // is there a new one? if( pNewDoc != mpDoc ) { mpDoc = pNewDoc; @@ -469,7 +469,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate } else { - // Hier wird die Seite ermittelt, hinter der eingefuegt werden soll + // here we determine the page after which we should insert SdPage* pPreviousStandardPage = mpDoc->GetSdPage( Min( (sal_uInt16)(nPageCount - 1), nPage ), PK_STANDARD ); SetOfByte aVisibleLayers = pPreviousStandardPage->TRG_GetMasterPageVisibleLayers(); sal_Bool bIsPageBack = aVisibleLayers.IsSet( aBckgrnd ); @@ -478,11 +478,9 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate // AutoLayouts must be ready mpDoc->StopWorkStartupDelay(); - /************************************************************** - * Es wird stets zuerst eine Standardseite und dann eine - * Notizseite erzeugt. Es ist sichergestellt, dass auf eine - * Standardseite stets die zugehoerige Notizseite folgt. - **************************************************************/ + /* First we create a standard page and then a notes page. It is + guaranteed, that after a standard page the corresponding notes page + follows. */ sal_uInt16 nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2; SdPage* pPreviousNotesPage = (SdPage*) mpDoc->GetPage( nStandardPageNum - 1 ); @@ -491,7 +489,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate String aNotesPageName; /************************************************************** - * Standardpage + * standard page **************************************************************/ if( bDuplicate ) pStandardPage = (SdPage*) pPreviousStandardPage->Clone(); @@ -506,12 +504,12 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate pStandardPage->SetOrientation( pPreviousStandardPage->GetOrientation() ); pStandardPage->SetName(aStandardPageName); - // Seite hinter aktueller Seite einfuegen + // insert page after current page mpDoc->InsertPage(pStandardPage, nStandardPageNum); if( !bDuplicate ) { - // MasterPage der aktuellen Seite verwenden + // use MasterPage of the current page pStandardPage->TRG_SetMasterPage(pPreviousStandardPage->TRG_GetMasterPage()); pStandardPage->SetLayoutName( pPreviousStandardPage->GetLayoutName() ); pStandardPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True ); @@ -524,7 +522,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate pStandardPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); /************************************************************** - * Notespage + * notes page **************************************************************/ SdPage* pNotesPage = NULL; @@ -542,12 +540,12 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate pNotesPage->SetName(aNotesPageName); pNotesPage->SetPageKind(PK_NOTES); - // Seite hinter aktueller Seite einfuegen + // insert page after current page mpDoc->InsertPage(pNotesPage, nNotesPageNum); if( !bDuplicate ) { - // MasterPage der aktuellen Seite verwenden + // use MasterPage of the current page pNotesPage->TRG_SetMasterPage(pPreviousNotesPage->TRG_GetMasterPage()); pNotesPage->SetLayoutName( pPreviousNotesPage->GetLayoutName() ); pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True ); @@ -685,7 +683,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( con if( NULL == mpDoc ) throw lang::DisposedException(); - // pPage von xPage besorgen und dann die Id (nPos )ermitteln + // get pPage from xPage and determine the Id (nPos ) afterwards SvxDrawPage* pSvxPage = SvxDrawPage::getImplementation( xPage ); if( pSvxPage ) { @@ -2457,10 +2455,10 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasElements() // XDrawPages -/****************************************************************************** -* Erzeugt eine neue Seite mit Model an der angegebennen Position und gibt die * -* dazugehoerige SdDrawPage zurueck. * -******************************************************************************/ +/** + * Creates a new page with model at the specified position. + * @returns corresponding SdDrawPage + */ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException) { @@ -2482,11 +2480,11 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByInde return xDrawPage; } -/****************************************************************************** -* Entfernt die angegebenne SdDrawPage aus dem Model und aus der internen * -* Liste. Dies funktioniert nur, wenn mindestens eine *normale* Seite im Model * -* nach dem entfernen dieser Seite vorhanden ist. * -******************************************************************************/ +/** + * Removes the specified SdDrawPage from the model and the internal list. It + * only works, if there is at least one *normal* page in the model after + * removing this page. + */ void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) throw(uno::RuntimeException) { @@ -2500,7 +2498,7 @@ void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPag sal_uInt16 nPageCount = rDoc.GetSdPageCount( PK_STANDARD ); if( nPageCount > 1 ) { - // pPage von xPage besorgen und dann die Id (nPos )ermitteln + // get pPage from xPage and determine the Id (nPos ) afterwards SdDrawPage* pSvxPage = SdDrawPage::getImplementation( xPage ); if( pSvxPage ) { @@ -2617,10 +2615,10 @@ sal_Int32 SAL_CALL SdMasterPagesAccess::getCount() return mpModel->mpDoc->GetMasterSdPageCount(PK_STANDARD); } -/****************************************************************************** -* Liefert ein drawing::XDrawPage Interface fuer den Zugriff auf die Masterpage and der * -* angegebennen Position im Model. * -******************************************************************************/ +/** + * Provides a drawing::XDrawPage interface for accessing the Masterpage at the + * specified position in the model. + */ uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2751,11 +2749,11 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn return( xDrawPage ); } -/****************************************************************************** -* Entfernt die angegebenne SdMasterPage aus dem Model und aus der internen * -* Liste. Dies funktioniert nur, wenn keine *normale* Seite im Model diese * -* Seite als Masterpage benutzt. * -******************************************************************************/ +/** + * Removes the specified SdMasterPage from the model and the internal list. It + * only works, if there is no *normal* page using this page as MasterPage in + * the model. + */ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) throw(uno::RuntimeException) { diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 856f64f6c301..73946fc36f37 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -284,11 +284,9 @@ const SvEventDescription* ImplGetSupportedMacroItems() return aMacroDescriptionsImpl; } -/************************************************************************* -|* -|* Vergleichsfkt. fuer QSort -|* -\************************************************************************/ +/** + * compare function for QSort + */ struct SortStruct { SdrObject* pObj; @@ -911,7 +909,7 @@ bool SdXShape::IsEmptyPresObj() const throw() SdrObject* pObj = mpShape->GetSdrObject(); if( (pObj != NULL) && pObj->IsEmptyPresObj() ) { - // check if the object is in edit, than its temporarely not empty + // check if the object is in edit, than its temporarily not empty SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj ); if( pTextObj == 0 ) return true; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index d1eac4a138d1..5625097ea2db 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1445,7 +1445,7 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj ) pShape->SetShapeType( aShapeType ); } - // SdXShape aggregiert SvxShape + // SdXShape aggregates SvxShape new SdXShape( SvxShape::getImplementation( xShape ), GetModel() ); return xShape; } diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index ebd5c7602cd2..9fdc6283c2d3 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -307,7 +307,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert if( !aSet.Count() ) aSet.Put( rPool.GetDefaultItem( pEntry->nWID ) ); - // Hole Wert aus ItemSet + // get value from ItemSet aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); } } |