[Libreoffice-commits] core.git: 3 commits - bin/find-german-comments sd/source
Michael Meeks
michael.meeks at collabora.com
Thu Oct 9 09:44:57 PDT 2014
bin/find-german-comments | 2 -
sd/source/ui/docshell/docshel4.cxx | 49 ++++++++++++++++------------------
sd/source/ui/func/fuolbull.cxx | 4 +-
sd/source/ui/inc/OutlineViewShell.hxx | 2 -
sd/source/ui/view/drviews9.cxx | 5 +--
5 files changed, 30 insertions(+), 32 deletions(-)
New commits:
commit 1a09af69f484f275f7d8012e88678514db81d831
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Thu Oct 9 17:42:14 2014 +0100
Remove 'sd' from the comment scanning list.
Change-Id: I3fe9bea58c9b4005336bafcf3b779d18c89df971
diff --git a/bin/find-german-comments b/bin/find-german-comments
index 2288bcc..3100f2d 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -305,7 +305,7 @@ class Parser:
"scaddins" : 0, #
"sccomp" : 1,
"scripting" : 1,
- "sd" : 0, #
+ "sd" : 1,
"sdext" : 1,
"sfx2" : 0, #
"shell" : 1,
commit 1958ca235be05912497747b9916f22258f5716d4
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Oct 9 17:32:40 2014 +0100
German comment translation.
Change-Id: I479da454235a7cfc084ae1517ab9ffa07580ab0c
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 87f4cfd..7ad69b8 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -912,7 +912,7 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark)
mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->
GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
- // Die aktuelle ViewShell hat sich geaendert!
+ // The current ViewShell changed
pDrViewSh = (DrawViewShell*) mpViewShell;
}
@@ -954,12 +954,11 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark)
if (pObj)
{
- // Objekt einblenden und selektieren
+ // Show and select object
pDrViewSh->MakeVisible(pObj->GetLogicRect(),
*pDrViewSh->GetActiveWindow());
- bUnMark = pDrViewSh->GetView()->IsObjMarked(pObj);
-
+ bUnMark = pDrViewSh->GetView()->IsObjMarked(pObj);
}
}
}
@@ -1017,7 +1016,7 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->
GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
- // Die aktuelle ViewShell hat sich geaendert!
+ // The current ViewShell changed
pDrViewSh = (DrawViewShell*) mpViewShell;
}
@@ -1059,7 +1058,7 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
if (pObj)
{
- // Objekt einblenden und selektieren
+ // Show and select object
pDrViewSh->MakeVisible(pObj->GetLogicRect(),
*pDrViewSh->GetActiveWindow());
bool bUnMark = pDrViewSh->GetView()->IsObjMarked(pObj);
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index c4776f5..d0790da 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -352,7 +352,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u
if( pItem == NULL )
pItem = (SvxNumBulletItem*) aNewAttr.GetPool()->GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET);
- //DBG_ASSERT( pItem, "Kein EE_PARA_NUMBULLET im Pool! [CL]" );
+ //DBG_ASSERT( pItem, "No EE_PARA_NUMBULLET in the Pool!" );
aNewAttr.Put(*pItem, EE_PARA_NUMBULLET);
@@ -375,7 +375,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u
return pTmpItem;
}
- //DBG_ASSERT(eState == SfxItemState::SET, "kein Item gefunden!")
+ //DBG_ASSERT(eState == SfxItemState::SET, "No item found");
}
return pTmpItem;
}
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index ebb795c..b35833f 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -157,7 +157,7 @@ public:
private:
void ShowSlideShow(SfxRequest& rReq);
OutlineView* pOlView;
- SdPage* pLastPage; // Zur performanten Aufbereitung der Preview
+ SdPage* pLastPage; // For efficient processing of the preview
TransferableClipboardListener* pClipEvtLstnr;
bool bPastePossible;
bool mbInitialized;
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 5049e21..f41a51a 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -96,8 +96,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder();
aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder();
- // Falls Grafik zu gross, wird die Grafik
- // in die Seite eingepasst
+ // If the image is too large we make it fit into the page
if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) &&
aSize.Height() && aPageSize.Height() )
{
commit c78d5fae8111aec075b9336dc2324b0747e598ab
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Thu Oct 9 17:40:59 2014 +0100
German comment translation.
Change-Id: I98526bfd6f69d95d5c309e67c397bc85fb8817ab
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 3be0607..87f4cfd 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -847,8 +847,8 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
return (bFound);
}
-//If object is marked , return true , else return false .
-bool DrawDocShell::IsMarked( SdrObject* pObject )
+// If object is marked return true else return false.
+bool DrawDocShell::IsMarked( SdrObject* pObject )
{
bool bisMarked =false;
@@ -863,7 +863,7 @@ bool DrawDocShell::IsMarked( SdrObject* pObject )
return bisMarked;
}
-//If object is marked , return true , else return false .
+// If object is marked return true else return false.
bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark)
{
OSL_TRACE("GotoBookmark %s",
@@ -879,14 +879,14 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark)
if( rBookmark.startsWith("#") )
aBookmark = rBookmark.copy( 1 );
- // Ist das Bookmark eine Seite?
+ // Is the bookmark a page ?
bool bIsMasterPage;
sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage );
SdrObject* pObj = NULL;
if (nPgNum == SDRPAGE_NOTFOUND)
{
- // Ist das Bookmark ein Objekt?
+ // Is the bookmark an object ?
pObj = mpDoc->GetObj(aBookmark);
if (pObj)
@@ -897,17 +897,16 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark)
if (nPgNum != SDRPAGE_NOTFOUND)
{
- /**********************************************************
- * Zur Seite springen
- **********************************************************/
-
+ /********************
+ * Skip to the page *
+ ********************/
SdPage* pPage = (SdPage*) mpDoc->GetPage(nPgNum);
PageKind eNewPageKind = pPage->GetPageKind();
if (eNewPageKind != pDrViewSh->GetPageKind())
{
- // Arbeitsbereich wechseln
+ // change workspace
GetFrameView()->SetPageKind(eNewPageKind);
( ( mpViewShell && mpViewShell->GetViewFrame() ) ?
mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->
@@ -926,7 +925,7 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark)
if (eNewEditMode != pDrViewSh->GetEditMode())
{
- // EditMode setzen
+ // set EditMode
pDrViewSh->ChangeEditMode(eNewEditMode, false);
}
@@ -967,7 +966,8 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark)
return ( bUnMark);
}
-//realize multi-selection of objects
+
+// realize multi-selection of objects
bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
{
OSL_TRACE("GotoBookmark %s",
@@ -983,14 +983,14 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
if( rBookmark.startsWith("#") )
aBookmark = rBookmark.copy( 1 );
- // Ist das Bookmark eine Seite?
+ // is the bookmark a page ?
bool bIsMasterPage;
sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage );
SdrObject* pObj = NULL;
if (nPgNum == SDRPAGE_NOTFOUND)
{
- // Ist das Bookmark ein Objekt?
+ // is the bookmark an object ?
pObj = mpDoc->GetObj(aBookmark);
if (pObj)
@@ -1001,9 +1001,9 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
if (nPgNum != SDRPAGE_NOTFOUND)
{
- /**********************************************************
- * Zur Seite springen
- **********************************************************/
+ /********************
+ * Skip to the page *
+ ********************/
bFound = true;
SdPage* pPage = (SdPage*) mpDoc->GetPage(nPgNum);
@@ -1011,7 +1011,7 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
if (eNewPageKind != pDrViewSh->GetPageKind())
{
- // Arbeitsbereich wechseln
+ // change workspace
GetFrameView()->SetPageKind(eNewPageKind);
( ( mpViewShell && mpViewShell->GetViewFrame() ) ?
mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->
@@ -1030,7 +1030,7 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
if (eNewEditMode != pDrViewSh->GetEditMode())
{
- // EditMode setzen
+ // set EditMode
pDrViewSh->ChangeEditMode(eNewEditMode, false);
}
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 027cf54..5049e21 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -428,7 +428,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
#endif
break;
- // einstellungen fuer liniendash
+ // configuration for line-dash
case SID_DASH :
if (pArgs)
if (pArgs->Count () == 7)
More information about the Libreoffice-commits
mailing list