sd/source/ui/app/sdmod2.cxx | 52 +++++++++++++++++++------------------------ sd/source/ui/app/sdpopup.cxx | 40 +++++++++------------------------ sd/source/ui/app/tbxww.cxx | 27 +++++++++------------- 3 files changed, 45 insertions(+), 74 deletions(-)
New commits: commit 3acd12a1bbffc9dee9cfdcae92df359a2a8753f0 Author: Urs Fässler <u...@bitzgi.ch> Date: Thu Mar 7 14:54:46 2013 +0100 sd/source/ui/app/tbxww.cxx comment translation and cleanup Change-Id: Ie7bc4ce47c088feeeaf55fb7b2590c5e44a3480e diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 9a12aa3..c668976 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -39,12 +39,9 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxControl, TbxImageItem ) -/************************************************************************* -|* -|* Klasse fuer Toolbox -|* -\************************************************************************/ - +/** + * Class for toolbox + */ SdTbxControl::SdTbxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { @@ -59,13 +56,11 @@ SfxPopupWindowType SdTbxControl::GetPopupWindowType() const return( SFX_POPUPWINDOW_ONTIMEOUT ); } -/************************************************************************* -|* -|* Hier wird das Fenster erzeugt -|* Lage der Toolbox mit GetToolBox() abfragbar -|* rItemRect sind die Screen-Koordinaten -|* -\************************************************************************/ +/** + * We create the window here + * You can get the position of the toolbox with GetToolBox() + * rItemRect are screen coordinates + */ SfxPopupWindow* SdTbxControl::CreatePopupWindow() { @@ -140,8 +135,8 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId, if( eState == SFX_ITEM_AVAILABLE ) { TbxImageItem* pItem = PTR_CAST( TbxImageItem, pState ); - // Im StarDesktop kann jetzt auch ein anderes Item ankommen, - // das nicht ausgewertet werden darf + // StarDesktop can also receive another item, + // but it is not allowed to evaluate it if( pItem ) { ToolBox& rTbx = GetToolBox(); @@ -160,7 +155,7 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId, hasBigImages() ); - // !-Operator prueft, ob Image nicht vorhanden ist + // !-operator checks if image is not present if( !!aImage ) { rTbx.SetItemImage( GetId(), aImage ); commit 8d8f62666af44d56339ab3a59b966c61d19075e2 Author: Urs Fässler <u...@bitzgi.ch> Date: Thu Mar 7 14:53:41 2013 +0100 sd/source/ui/app/sdpopup.cxx comment translation and cleanup Change-Id: Ib01cc26d494598def62b34dba52e3c35e9668d10 diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 6922b79..1102547 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -33,12 +33,9 @@ #include "drawdoc.hxx" #include "DrawDocShell.hxx" -/************************************************************************* -|* -|* PopupMenu zum Bearbeiten von Feldbefehlen -|* -\************************************************************************/ - +/* + * Popup menu for editing of field command + */ SdFieldPopup::SdFieldPopup( const SvxFieldData* pInField, LanguageType eLanguage ) : PopupMenu (), pField ( pInField ) @@ -46,22 +43,10 @@ SdFieldPopup::SdFieldPopup( const SvxFieldData* pInField, LanguageType eLanguage Fill( eLanguage ); } -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ - SdFieldPopup::~SdFieldPopup() { } -/************************************************************************* -|* -|* Fill -|* -\************************************************************************/ - void SdFieldPopup::Fill( LanguageType eLanguage ) { sal_uInt16 nID = 1; @@ -80,8 +65,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) else CheckItem( 2 ); - //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXDATEFORMAT_APPDEFAULT, // is not used + //SVXDATEFORMAT_SYSTEM, // is not used InsertItem( nID++, String( SdResId( STR_STANDARD_SMALL ) ), nStyle ); InsertItem( nID++, String( SdResId( STR_STANDARD_BIG ) ), nStyle ); @@ -112,8 +97,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) else CheckItem( 2 ); - //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXTIMEFORMAT_APPDEFAULT, // is not used + //SVXTIMEFORMAT_SYSTEM, // is not used InsertItem( nID++, String( SdResId( STR_STANDARD_NORMAL ) ), nStyle ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); @@ -172,13 +157,10 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) } } -/************************************************************************* -|* -|* Gibt das neue Feld zurueck, gehoert dem Caller. -|* Liefert NULL, wenn sich nichts geaendert hat. -|* -\************************************************************************/ - +/** + * Returns a new field, owned by caller. + * Returns NULL if nothing changed. + */ SvxFieldData* SdFieldPopup::GetField() { SvxFieldData* pNewField = NULL; commit d897f5fb70b791197c3054593381883a91974f08 Author: Urs Fässler <u...@bitzgi.ch> Date: Thu Mar 7 14:52:25 2013 +0100 sd/source/ui/app/sdmod2.cxx comment translation and cleanup Change-Id: I2c88dd4e1eca89819b1344e99c1bf64acfa1156b diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 7e25077..fe5a285 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -142,12 +142,9 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo return pPage; } -/************************************************************************* -|* -|* Link fuer CalcFieldValue des Outliners -|* -\************************************************************************/ - +/** + * Link for CalcFieldValue of Outliners + */ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) { if (pInfo) @@ -296,7 +293,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) { switch ( pURLField->GetFormat() ) { - case SVXURLFORMAT_APPDEFAULT: //!!! einstellbar an App??? + case SVXURLFORMAT_APPDEFAULT: //!!! adjustable at App??? case SVXURLFORMAT_REPR: pInfo->SetRepresentation( pURLField->GetRepresentation() ); break; @@ -383,19 +380,16 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) } - -/************************************************************************* -|* -|* virt. Methoden fuer Optionendialog -|* -\************************************************************************/ +/** + * virtual methods for option dialog + */ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) { ::sd::FrameView* pFrameView = NULL; ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); SdDrawDocument* pDoc = NULL; - // Hier wird der DocType vom Optionsdialog gesetzt (nicht Dokument!) + // Here we set the DocType of the option dialog (not document!) DocumentType eDocType = DOCUMENT_TYPE_IMPRESS; if( nSlot == SID_SD_GRAPHIC_OPTIONS ) eDocType = DOCUMENT_TYPE_DRAW; @@ -404,8 +398,8 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) { pDoc = pDocSh->GetDoc(); - // Wenn der Optionsdialog zum Dokumenttyp identisch ist, - // kann auch die FrameView mit uebergeben werden: + // If the option dialog is identical to the document type, + // we can pass the FrameView too: if( pDoc && eDocType == pDoc->GetDocumentType() ) pFrameView = pDocSh->GetFrameView(); @@ -416,7 +410,7 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) SdOptions* pOptions = GetSdOptions(eDocType); - // Pool hat standardmaessig MapUnit Twips (Baeh!) + // Pool has by default MapUnit Twips (Awgh!) SfxItemPool& rPool = GetPool(); rPool.SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); @@ -496,7 +490,7 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) } else { - // Optionen aus Configdatei holen + // Get options from configuration file pOptions->GetScale( nX, nY ); } @@ -523,7 +517,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); SdDrawDocument* pDoc = NULL; - // Hier wird der DocType vom Optionsdialog gesetzt (nicht Dokument!) + // Here we set the DocType of the option dialog (not document!) DocumentType eDocType = DOCUMENT_TYPE_IMPRESS; if( nSlot == SID_SD_GRAPHIC_OPTIONS ) eDocType = DOCUMENT_TYPE_DRAW; @@ -539,7 +533,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) pViewShell->WriteFrameViewData(); } SdOptions* pOptions = GetSdOptions(eDocType); - // Raster + // Grid if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False, (const SfxPoolItem**) &pItem )) { @@ -572,7 +566,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) bNewDefTab = sal_True; } - // Massstab + // Scale if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_X, sal_False, &pItem ) ) { sal_Int32 nX = ( (SfxInt32Item*) pItem )->GetValue(); @@ -591,7 +585,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) } } - // Contents (Inhalte) + // Contents const SdOptionsContentsItem* pContentsItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_CONTENTS, sal_False, (const SfxPoolItem**) &pContentsItem )) @@ -599,7 +593,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) pContentsItem->SetOptions( pOptions ); } - // Misc (Sonstiges) + // Misc const SdOptionsMiscItem* pMiscItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_MISC, sal_False, (const SfxPoolItem**) &pMiscItem )) @@ -608,7 +602,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) bMiscOptions = sal_True; } - // Fangen/Einrasten + // Snap const SdOptionsSnapItem* pSnapItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SNAP, sal_False, (const SfxPoolItem**) &pSnapItem )) @@ -622,14 +616,14 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, 0 ); - // Drucken + // Print const SdOptionsPrintItem* pPrintItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_PRINT, sal_False, (const SfxPoolItem**) &pPrintItem )) { pPrintItem->SetOptions( pOptions ); - // PrintOptionsSet setzen + // set PrintOptionsSet SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT, pOptions ); SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC ); sal_uInt16 nFlags = 0; @@ -645,7 +639,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) bNewPrintOptions = sal_True; } - // Nur, wenn auch der Dokumenttyp uebereinstimmt... + // Only if also the document type matches... if( pDocSh && pDoc && eDocType == pDoc->GetDocumentType() ) { if( bNewPrintOptions ) @@ -653,7 +647,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) pDocSh->GetPrinter(sal_True)->SetOptions( aPrintSet ); } - // Am Model den DefTab setzen + // set DefTab at Model if( bNewDefTab ) { SdDrawDocument* pDocument = pDocSh->GetDoc(); @@ -698,7 +692,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) pOptions->StoreConfig(); - // Nur, wenn auch der Dokumenttyp uebereinstimmt... + // Only if also the document type matches... if( pDocSh && pDoc && eDocType == pDoc->GetDocumentType() ) { FieldUnit eUIUnit = (FieldUnit) pOptions->GetMetric();
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits