[Libreoffice-commits] core.git: sd/source
Urs Fässler
urs at bitzgi.ch
Wed Mar 13 13:41:19 PDT 2013
sd/source/ui/dlg/gluectrl.cxx | 2
sd/source/ui/func/fuconbez.cxx | 2
sd/source/ui/func/fuediglu.cxx | 8 -
sd/source/ui/slideshow/showwin.cxx | 40 -----
sd/source/ui/slideshow/slideshowimpl.cxx | 27 +--
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 4
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 18 +-
sd/source/ui/unoidl/DrawController.cxx | 2
sd/source/ui/unoidl/sddetect.cxx | 2
sd/source/ui/unoidl/unolayer.cxx | 16 +-
sd/source/ui/unoidl/unomodel.cxx | 70 ++++------
sd/source/ui/unoidl/unoobj.cxx | 10 -
sd/source/ui/unoidl/unopage.cxx | 2
sd/source/ui/unoidl/unopback.cxx | 2
14 files changed, 84 insertions(+), 121 deletions(-)
New commits:
commit f4a37ca9584d7b8fcbd7aaa80162edcfde3cd4ed
Author: Urs Fässler <urs at bitzgi.ch>
Date: Wed Mar 13 20:30:06 2013 +0100
several translations and fixes for translations
Change-Id: I47ca71d578f3e0b1e2c3499f0785d986ed4f583e
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 04584e9..b1f760e 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -59,7 +59,7 @@ static sal_uInt16 aEscDirArray[] =
SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item )
/**
- * Constructor for clue point escape direction Listbox
+ * Constructor for glue point escape direction Listbox
*/
GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame ) :
ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) ),
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 4ee9ca3..67727bc 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -118,7 +118,7 @@ sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
{
- // insert clue point
+ // insert glue point
mpView->BegInsObjPoint(aMDPos, rMEvt.IsMod1());
}
else
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 8a98b58..e796e9d 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -121,12 +121,12 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
}
else if (eHit == SDRHIT_MARKEDOBJECT && mpView->IsInsGluePointMode())
{
- // insert clue points
+ // insert glue points
mpView->BegInsGluePoint(aMDPos);
}
else if (eHit == SDRHIT_MARKEDOBJECT && rMEvt.IsMod1())
{
- // select clue points
+ // select glue points
if (!rMEvt.IsShift())
mpView->UnmarkAllGluePoints();
@@ -139,7 +139,7 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
}
else if (eHit == SDRHIT_GLUEPOINT)
{
- // select clue points
+ // select glue points
if (!rMEvt.IsShift())
mpView->UnmarkAllGluePoints();
@@ -181,7 +181,7 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
}
else if (mpView->AreObjectsMarked())
{
- // select clue point
+ // select glue point
if (!rMEvt.IsShift())
mpView->UnmarkAllGluePoints();
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index b00d4c3..13542df 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -64,7 +64,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, ::
aMap.SetMapUnit(MAP_100TH_MM);
SetMapMode(aMap);
- // HelpId setzen
+ // set HelpId
SetHelpId( HID_SD_WIN_PRESENTATION );
SetUniqueId( HID_SD_WIN_PRESENTATION );
@@ -85,11 +85,6 @@ ShowWindow::~ShowWindow(void)
maMouseTimer.Stop();
}
-/*************************************************************************
-|*
-|* Keyboard event
-|*
-\************************************************************************/
void ShowWindow::KeyInput(const KeyEvent& rKEvt)
{
@@ -173,11 +168,6 @@ void ShowWindow::KeyInput(const KeyEvent& rKEvt)
mpViewShell->SetActiveWindow( this );
}
-/*************************************************************************
-|*
-|* MouseButtonDown event
-|*
-\************************************************************************/
void ShowWindow::MouseButtonDown(const MouseEvent& /*rMEvt*/)
{
@@ -191,11 +181,6 @@ void ShowWindow::MouseButtonDown(const MouseEvent& /*rMEvt*/)
}
}
-/*************************************************************************
-|*
-|* MouseMove event
-|*
-\************************************************************************/
void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/)
{
@@ -238,11 +223,6 @@ void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/)
mpViewShell->SetActiveWindow( this );
}
-/*************************************************************************
-|*
-|* MouseButtonUp event
-|*
-\************************************************************************/
void ShowWindow::MouseButtonUp(const MouseEvent& rMEvt)
{
@@ -266,12 +246,9 @@ void ShowWindow::MouseButtonUp(const MouseEvent& rMEvt)
}
}
-/*************************************************************************
-|*
-|* Paint-Event: wenn FuSlideShow noch erreichbar ist, weiterleiten
-|*
-\************************************************************************/
-
+/**
+ * if FuSlideShow is still available, forward it
+ */
void ShowWindow::Paint(const Rectangle& rRect)
{
if( (meShowWindowMode == SHOWWINDOWMODE_NORMAL) || (meShowWindowMode == SHOWWINDOWMODE_PREVIEW) )
@@ -304,11 +281,6 @@ void ShowWindow::Paint(const Rectangle& rRect)
}
}
-/*************************************************************************
-|*
-|* Notify
-|*
-\************************************************************************/
long ShowWindow::Notify(NotifyEvent& rNEvt)
{
@@ -324,7 +296,7 @@ long ShowWindow::Notify(NotifyEvent& rNEvt)
void ShowWindow::GetFocus()
{
- // Basisklasse
+ // base class
Window::GetFocus();
}
@@ -647,7 +619,7 @@ IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl)
if( mbMouseCursorHidden )
{
// not enough mouse movements since first recording so
- // cancle show mouse pointer for now
+ // cancel show mouse pointer for now
mnFirstMouseMove = 0;
}
else
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 6b7c14a..15d2cc5 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -99,13 +99,11 @@ extern String getUiNameFromPageApiNameImpl( const OUString& rApiName );
namespace sd
{
-///////////////////////////////////////////////////////////////////////
-
-// Slots, welche im Sfx verwaltet werden und in der SlideShow disabled
-// werden sollen (muss in Reihenfolge der SIDs geordnet sein)
+/** Slots, which will be disabled in the slide show and are managed by Sfx.
+ Have to be sorted in the order of the SIDs */
static sal_uInt16 const pAllowed[] =
{
- SID_OPENDOC , // 5501 // damit interne Spruenge klappen
+ SID_OPENDOC , // 5501 ///< that internally jumps work
SID_JUMPTOMARK , // 5598
SID_OPENHYPERLINK , // 6676
SID_NAVIGATOR , // 10366
@@ -118,11 +116,6 @@ static sal_uInt16 const pAllowed[] =
SID_NAVIGATOR_OBJECT // 27293
};
-///////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////
-// AnimationSlideController
-///////////////////////////////////////////////////////////////////////
class AnimationSlideController
{
@@ -502,9 +495,9 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow
}
}
-///////////////////////////////////////////////////////////////////////
-// class SlideshowImpl
-///////////////////////////////////////////////////////////////////////
+
+
+
SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, ::Window* pParentWindow )
: SlideshowImplBase( m_aMutex )
@@ -669,7 +662,7 @@ void SAL_CALL SlideshowImpl::disposing()
mxListenerProxy.clear();
mpSlideController.reset();
- // der DrawView das Praesentationfenster wegnehmen und ihr dafuer ihre alten Fenster wiedergeben
+ // take DrawView from presentation window, but give the old window back
if( mpShowWindow && mpView )
mpView->DeleteWindowFromPaintView( mpShowWindow );
@@ -711,7 +704,7 @@ void SAL_CALL SlideshowImpl::disposing()
mnChildMask = 0UL;
}
- // aktuelle Fenster wieder einblenden
+ // show current window again
if( mpViewShell && !mpViewShell->ISA(PresentationViewShell))
{
if( meAnimationMode == ANIMATIONMODE_SHOW )
@@ -924,7 +917,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
( (meAnimationMode != ANIMATIONMODE_SHOW) ||
SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage() );
- // sollen Zeiten gestoppt werden?
+ // times should be measured?
if( mbRehearseTimings )
{
maPresSettings.mbEndless = sal_False;
@@ -2481,7 +2474,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
{
sal_Int32 nFirstSlide = 0;
- // normale Praesentation
+ // normal presentation
if( eMode == AnimationSlideController::FROM )
{
if( rPresSlide.Len() )
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index a0ea086..322b201 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -687,7 +687,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet)
{
if (rSet.GetItemState(SID_RELOAD) != SFX_ITEM_UNKNOWN)
{
- // "Letzte Version" vom SFx en/disablen lassen
+ // let SFx en-/disable "last version"
SfxViewFrame* pSlideViewFrame = SfxViewFrame::Current();
DBG_ASSERT(pSlideViewFrame!=NULL,
"SlideSorterController::GetCtrlState: ViewFrame not found");
@@ -695,7 +695,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet)
{
pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet);
}
- else // MI sagt: kein MDIFrame --> disablen
+ else // MI says: no MDIFrame --> disable
{
rSet.DisableItem(SID_RELOAD);
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 4817f42..a3f2ba7 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -311,7 +311,7 @@ void SlotManager::FuPermanent (SfxRequest& rRequest)
pShell->SetOldFunction(pShell->GetCurrentFunction());
}
- //! das ist nur bis das ENUM-Slots sind
+ //! that's only until ENUM-Slots ?are
// Invalidate( SID_OBJECT_SELECT );
}
@@ -427,14 +427,14 @@ void SlotManager::ExecCtrl (SfxRequest& rRequest)
{
case SID_RELOAD:
{
- // Undo-Manager leeren
+ // empty Undo-Manager
mrSlideSorter.GetModel().GetDocument()->GetDocSh()->ClearUndoBuffer();
- // Normale Weiterleitung an ViewFrame zur Ausfuehrung
+ // normal forwarding to ViewFrame for execution
if (pViewShell != NULL)
pViewShell->GetViewFrame()->ExecuteSlot(rRequest);
- // Muss sofort beendet werden
+ // has to be finished right away
return;
}
@@ -486,7 +486,7 @@ void SlotManager::ExecCtrl (SfxRequest& rRequest)
void SlotManager::GetAttrState (SfxItemSet& rSet)
{
- // Iteratate over all items.
+ // Iterate over all items.
SfxWhichIter aIter (rSet);
sal_uInt16 nWhich = aIter.FirstWhich();
while (nWhich)
@@ -556,7 +556,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
}
else
{
- // 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 )
{
@@ -600,7 +600,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
rSet.DisableItem (SID_SUMMARY_PAGE);
}
- // Starten der Praesentation moeglich?
+ // starting of presentation possible?
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) )
{
@@ -694,7 +694,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
if (rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE
|| rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE)
{
- // Keine eigenen Clipboard-Daten?
+ // no own clipboard data?
if ( !pTransferClip || !pTransferClip->GetDocShell() )
{
rSet.DisableItem(SID_PASTE);
@@ -811,7 +811,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
void SlotManager::GetStatusBarState (SfxItemSet& rSet)
{
- // Seitenanzeige und Layout
+ // page view and layout
SdPage* pPage = NULL;
SdPage* pFirstPage = NULL;
sal_uInt16 nFirstPage;
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index b7fd00f..2208478 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 a3af46b..a25f151 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 b5a904b..16d37b1 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 a49f9d4..037a2cd 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 856f64f..73946fc 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 d1eac4a..5625097 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 ebd5c76..9fdc628 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 );
}
}
More information about the Libreoffice-commits
mailing list