summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Knorr (astron) <heinzlesspam@gmail.com>2012-02-02 11:40:51 +0100
committerStefan Knorr (astron) <heinzlesspam@gmail.com>2012-02-15 14:35:05 +0100
commitb181c48f8faf2d16d88aa56c6c17b8efb2aec642 (patch)
tree7a7110ea34c9817475175f7c6ac2f4bb31ea8afc
parent335b38d831558ce786f726b4b6a014d2a312cf29 (diff)
Fix some translation oversights
At least some of the things corrected, also (c) myself.
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx2
-rw-r--r--svx/source/svdraw/svdcrtv.cxx8
-rw-r--r--svx/source/svdraw/svddrgmt.cxx6
-rw-r--r--svx/source/svdraw/svdedtv1.cxx23
-rw-r--r--svx/source/svdraw/svdedtv2.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx3
-rw-r--r--svx/source/svdraw/svdfmtf.cxx4
-rw-r--r--svx/source/svdraw/svdglue.cxx2
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
-rw-r--r--svx/source/svdraw/svdibrow.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdmrkv.cxx7
-rw-r--r--svx/source/svdraw/svdmrkv1.cxx2
-rw-r--r--svx/source/svdraw/svdoashp.cxx6
-rw-r--r--svx/source/svdraw/svdograf.cxx4
-rw-r--r--svx/source/svdraw/svdomeas.cxx2
-rw-r--r--svx/source/svdraw/svdoole2.cxx2
-rw-r--r--svx/source/svdraw/svdorect.cxx2
-rw-r--r--svx/source/svdraw/svdotext.cxx2
-rw-r--r--svx/source/svdraw/svdotxdr.cxx2
-rw-r--r--svx/source/svdraw/svdpage.cxx14
-rw-r--r--svx/source/svdraw/svdstr.src2
-rw-r--r--svx/source/svdraw/svdtext.cxx2
-rw-r--r--svx/source/svdraw/svdundo.cxx2
-rw-r--r--svx/source/svdraw/svdview.cxx2
26 files changed, 51 insertions, 60 deletions
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 2952ee89d6a9..9a4bcac9af51 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -179,13 +179,13 @@ void SdrPageWindow::PrePaint()
void SdrPageWindow::PrepareRedraw(const Region& rReg)
{
- // evtl. give OC the chance to do ProcessDisplay preparations
+ // give OC the chance to do ProcessDisplay preparations
if(HasObjectContact())
{
GetObjectContact().PrepareProcessDisplay();
}
- // remember eventually changed RedrawArea at PaintWindow for usage with
+ // if necessary, remember changed RedrawArea at PaintWindow for usage with
// overlay and PreRenderDevice stuff
GetPaintWindow().SetRedrawRegion(rReg);
}
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 16dbfbfb6fd5..a71d98b45df7 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -369,7 +369,7 @@ SdrItemPool::~SdrItemPool()
}
}
- // split pools before detroying
+ // split pools before destroying
SetSecondaryPool(NULL);
}
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 593d7e744b81..3d113eda2d74 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -179,7 +179,7 @@ void ImpSdrCreateViewExtraData::CreateAndShowOverlay(const SdrCreateView& rView,
void ImpSdrCreateViewExtraData::HideOverlay()
{
- // the clear() call at the list removes all objects from the
+ // the clear() call of the list removes all objects from the
// OverlayManager and deletes them.
maObjects.clear();
}
@@ -449,7 +449,7 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c
Point aPnt(rPnt);
if (nAktInvent!=SdrInventor || (nAktIdent!=sal_uInt16(OBJ_EDGE) &&
nAktIdent!=sal_uInt16(OBJ_FREELINE) &&
- nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand!
+ nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // no snapping for Edge and Freehand
aPnt=GetSnapPos(aPnt,pCreatePV);
}
if (pAktCreate!=NULL)
@@ -468,7 +468,7 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c
if (HAS_BASE(SdrCaptionObj,pAktCreate))
{
SfxItemSet aSet(pMod->GetItemPool());
- aSet.Put(XFillColorItem(String(),Color(COL_WHITE))); // Falls einer auf Solid umschaltet
+ aSet.Put(XFillColorItem(String(),Color(COL_WHITE))); // in case someone turns on Solid
aSet.Put(XFillStyleItem(XFILL_NONE));
pAktCreate->SetMergedItemSet(aSet);
@@ -671,7 +671,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
if(bDidInsert)
{
- // delete object, it's content is cloned and inserted
+ // delete object, its content is cloned and inserted
SdrObject::Free( pObjMerk );
pObjMerk = 0L;
bRet = sal_False;
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 84de9bf7903a..3bb89c9a1980 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -335,7 +335,7 @@ void SdrDragMethod::createSdrDragEntries()
void SdrDragMethod::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify)
{
- // add full obejct drag; Clone() at the object has to work
+ // add full object drag; Clone() at the object has to work
// for this
addSdrDragEntry(new SdrDragEntrySdrObject(rOriginal, rObjectContact, bModify));
}
@@ -379,7 +379,7 @@ void SdrDragMethod::createSdrDragEntries_SolidDrag()
if(!bSuppressFullDrag)
{
- // add full obejct drag; Clone() at the object has to work
+ // add full object drag; Clone() at the object has to work
// for this
createSdrDragEntryForSdrObject(*pCandidate, rOC, true);
}
@@ -2475,7 +2475,7 @@ bool SdrDragMirror::BeginSdrDrag()
nWink=NormAngle360(GetAngle(aDif));
if (!getSdrDragView().IsMirrorAllowed(false,false) && !b45)
- return false; // free choice of axis angle not alowed
+ return false; // free choice of axis angle not allowed
if (!getSdrDragView().IsMirrorAllowed(true,false) && !b90)
return false; // 45 degrees not allowed either
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 66305b265564..b9b5795f1340 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -67,12 +67,12 @@
void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy)
{
- DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() mit leerem Rect mach keinen Sinn");
+ DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense.");
if (rRect.IsEmpty()) return;
sal_uIntPtr nAnz=GetMarkedObjectCount();
if (nAnz==0) return;
Rectangle aR0(GetMarkedObjRect());
- DBG_ASSERT(!aR0.IsEmpty(),"SetMarkedObjRect(): GetMarkedObjRect() ist leer");
+ DBG_ASSERT(!aR0.IsEmpty(),"SetMarkedObjRect(): GetMarkedObjRect() is empty.");
if (aR0.IsEmpty()) return;
long x0=aR0.Left();
long y0=aR0.Top();
@@ -290,7 +290,7 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, long nWink, bool bCopy)
if( bUndo )
{
- // extra undo actions for changed connector which now may hold its layed out path (SJ)
+ // extra undo actions for changed connector which now may hold its laid out path (SJ)
std::vector< SdrUndoAction* > vConnectorUndoActions( CreateConnectorUndo( *pO ) );
AddUndoActions( vConnectorUndoActions );
@@ -350,7 +350,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
if( bUndo )
{
- // extra undo actions for changed connector which now may hold its layed out path (SJ)
+ // extra undo actions for changed connector which now may hold its laid out path (SJ)
std::vector< SdrUndoAction* > vConnectorUndoActions( CreateConnectorUndo( *pO ) );
AddUndoActions( vConnectorUndoActions );
@@ -583,7 +583,7 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPol
}
else if(pO->IsPolyObj())
{
- // e. g. for the mesurement object
+ // e. g. for the measurement object
sal_uInt32 nPtAnz(pO->GetPointCount());
XPolygon aXP((sal_uInt16)nPtAnz);
sal_uInt32 nPtNum;
@@ -599,7 +599,7 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPol
for(nPtNum = 0L; nPtNum < nPtAnz; nPtNum++)
{
// broadcasting could be optimized here, but for the
- // current two points of the measurement object, it's fine
+ // current two points of the measurement object it's fine
pO->SetPoint(aXP[(sal_uInt16)nPtNum],nPtNum);
}
}
@@ -873,7 +873,6 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr)
for(sal_uInt32 a(0); a < nMarkAnz; a++)
{
// #80277# merging was done wrong in the prev version
- //const SfxItemSet& rSet = GetMarkedObjectByIndex()->GetItemSet();
const SfxItemSet& rSet = GetMarkedObjectByIndex(a)->GetMergedItemSet();
SfxWhichIter aIter(rSet);
sal_uInt16 nWhich(aIter.FirstWhich());
@@ -917,7 +916,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
if(bHasEEFeatureItems)
{
String aMessage;
- aMessage.AppendAscii("SdrEditView::SetAttrToMarked(): Das setzen von EE_FEATURE-Items an der SdrView macht keinen Sinn! Es fuehrt nur zu Overhead und nicht mehr lesbaren Dokumenten.");
+ aMessage.AppendAscii("SdrEditView::SetAttrToMarked(): Setting EE_FEATURE items at the SdrView does not make sense! It only leads to overhead and unreadable documents.");
InfoBox(NULL, aMessage).Execute();
}
}
@@ -1009,7 +1008,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
// new geometry undo
if(bPossibleGeomChange && bUndo)
{
- // save position and size of obect, too
+ // save position and size of object, too
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
}
@@ -1163,13 +1162,12 @@ sal_Bool SdrEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll
}
}
-SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(sal_Bool& rOk) const
+SfxStyleSheet* SdrEditView::GetStyleSheet() const
{
if (GetMarkedObjectCount()!=0) {
- //rOk=sal_True;
return GetStyleSheetFromMarked();
} else {
- return SdrMarkView::GetStyleSheet(); // SdrMarkView::GetStyleSheet(rOk);
+ return SdrMarkView::GetStyleSheet();
}
}
@@ -1711,7 +1709,6 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_B
pObj->TakeObjInfo(aInfo);
if (aInfo.bMoveAllowed && !pObj->IsMoveProtect())
{
- // SdrPageView* pPV=pM->GetPageView();
long nXMov=0;
long nYMov=0;
Rectangle aObjRect(bBoundRects?pObj->GetCurrentBoundRect():pObj->GetSnapRect());
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 66e18cd29dbc..4fd186a518e5 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -443,7 +443,6 @@ void SdrEditView::ReverseOrderOfMarked()
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
if (nMarkAnz>0)
{
- //sal_Bool bNeedBundle=sal_False;
sal_Bool bChg=sal_False;
bool bUndo = IsUndoEnabled();
@@ -1616,7 +1615,6 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines)
{
- //sal_uInt32 nCnt(0);
// temporary MarkList
SdrMarkList aRemoveMerker;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 408ca0eba3e1..af12afa4dcc1 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -932,7 +932,6 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
pWin->DrawPixel(aRect.TopRight());
pWin->DrawPixel(aRect.BottomLeft());
pWin->DrawPixel(aRect.BottomRight());
- //pWin->DrawRect(aRect);
}
// and now the Outliner itself
if (!bTextEditDontDelete) delete pTEOutliner;
@@ -1407,7 +1406,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
if(bHasEEFeatureItems)
{
String aMessage;
- aMessage.AppendAscii("SdrObjEditView::SetAttributes(): Setting EE_FEATURE items at the SdrView doesn't make sense! It only leads to verhead and unreadable documents.");
+ aMessage.AppendAscii("SdrObjEditView::SetAttributes(): Setting EE_FEATURE items at the SdrView does not make sense! It only leads to overhead and unreadable documents.");
InfoBox(NULL, aMessage).Execute();
}
}
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 4aaa35b48274..d62255cadac9 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -116,7 +116,7 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
sal_Bool bError = sal_False;
- // setup some global scale parameter
+ // setup some global scale parameters
// fScaleX, fScaleY, aScaleX, aScaleY, bMov, bSize
fScaleX = fScaleY = 1.0;
Size aMtfSize( pMtf->GetPrefSize() );
@@ -235,7 +235,7 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
}
nActionsToReport = 0;
- // insert all objects cached in aTmpList zwischengespeicherten Objekte now into rOL from nInsPos
+ // insert all objects cached in aTmpList now into rOL from nInsPos
if (nInsPos>rOL.GetObjCount()) nInsPos=rOL.GetObjCount();
SdrInsertReason aReason(SDRREASON_VIEWCALL);
for (sal_uIntPtr i=0; i<nAnz; i++)
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 69bd69cf064a..55e92a5961c4 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -83,7 +83,7 @@ Point SdrGluePoint::GetAbsolutePos(const SdrObject& rObj) const
}
}
aPt+=aOfs;
- // Now limit to the BoundRect ofthe object
+ // Now limit to the BoundRect of the object
if (aPt.X()<aBound.Left ()) aPt.X()=aBound.Left ();
if (aPt.X()>aBound.Right ()) aPt.X()=aBound.Right ();
if (aPt.Y()<aBound.Top ()) aPt.Y()=aBound.Top ();
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 910d91b6b739..6ac8941b6af7 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1823,14 +1823,12 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
// take care of old handle
const sal_uIntPtr nOldHdlNum(mnFocusIndex);
SdrHdl* pOld = GetHdl(nOldHdlNum);
- //SDOsal_Bool bRefresh(sal_False);
if(pOld)
{
// switch off old handle
mnFocusIndex = CONTAINER_ENTRY_NOTFOUND;
pOld->Touch();
- //SDObRefresh = sal_True;
}
// allocate pointer array for sorted handle list
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 4d36c7e4ca91..25934ef621b5 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -421,7 +421,7 @@ void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
if (BegChangeEntry(nPos)) bAusgewertet = true;
} else if (nKeyCode==KEY_ESCAPE) {
// ...
- } else if (rKEvt.GetKeyCode().GetModifier()==KEY_SHIFT+KEY_MOD1+KEY_MOD2) { // Strg
+ } else if (rKEvt.GetKeyCode().GetModifier()==KEY_SHIFT+KEY_MOD1+KEY_MOD2) { // Ctrl
if (nKeyCode==KEY_SHIFT+KEY_MOD1+KEY_MOD2+KEY_W) {
bWhichesButNames=!bWhichesButNames;
SetDirty();
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 27ac271bfa0e..eeed2c54740f 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1707,7 +1707,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
bMPgNumsDirty=sal_True;
if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg));
} else {
- OSL_FAIL("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden");
+ OSL_FAIL("SdrModel::Merge(): MasterPage not found in SourceModel.");
}
}
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 1aaa66b22ae1..3729c02b5f7e 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -71,7 +71,7 @@ class ImplMarkingOverlay
// The OverlayObjects
::sdr::overlay::OverlayObjectList maObjects;
- // The remembered second position in logical coodinates
+ // The remembered second position in logical coordinates
basegfx::B2DPoint maSecondPosition;
// bitfield
@@ -137,7 +137,6 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
void SdrMarkView::ImpClearVars()
{
eDragMode=SDRDRAG_MOVE;
- //HMHbHdlShown=sal_False;
bRefHdlShownOnly=sal_False;
eEditMode=SDREDITMODE_EDIT;
eEditMode0=SDREDITMODE_EDIT;
@@ -1215,7 +1214,7 @@ sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
if (pObj->IsMarkProtect() ||
(!bDesignMode && pObj->IsUnoObj()))
{
- // objekt not selectable or
+ // object not selectable or
// SdrUnoObj not in DesignMode
return sal_False;
}
@@ -1408,7 +1407,7 @@ sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
if (TryToFindMarkedObject(pObj)==CONTAINER_ENTRY_NOTFOUND) {
pFndObj=pObj;
} else {
- // TODO: for performance reasons set no to Top or Btm, if necessary
+ // TODO: for performance reasons set on to Top or Btm, if necessary
}
}
if (bPrev) no++;
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 43ea99ff250f..7094f8e8f828 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -153,7 +153,7 @@ sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmar
}
else
{
- return sal_False; // Fehlerfall!
+ return sal_False; // error case!
}
}
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 141322f7e064..aac2cf8ee53f 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -298,21 +298,21 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
aTempSet.Put(SdrShadowXDistItem(0L));
aTempSet.Put(SdrShadowYDistItem(0L));
- // line color and transparence like shadow
+ // line color and transparency like shadow
if(bLineUsed)
{
aTempSet.Put(XLineColorItem(String(), aShadowColor));
aTempSet.Put(XLineTransparenceItem(nShadowTransparence));
}
- // fill color and transparence like shadow
+ // fill color and transparency like shadow
if(bSolidFillUsed)
{
aTempSet.Put(XFillColorItem(String(), aShadowColor));
aTempSet.Put(XFillTransparenceItem(nShadowTransparence));
}
- // gradient and transparence like shadow
+ // gradient and transparency like shadow
if(bGradientFillUsed)
{
XGradient aGradient(((XFillGradientItem&)(rOriginalSet.Get(XATTR_FILLGRADIENT))).GetGradientValue());
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 26606b7d2db5..23f81dffadc1 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -462,8 +462,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
if( SDRGRAFOBJ_TRANSFORMATTR_NONE != nTransformFlags &&
GRAPHIC_NONE != eType )
{
- // actually transform the graphic only in this case. On the
- // other hand, cropping will always happen
+ // Actually transform the graphic only in this case.
+ // Cropping always happens, though.
aActAttr = aGrafInfo;
if( bMirror )
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 6535b11c1b02..ec6aafdef7db 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -390,7 +390,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
bool bPfeileAussen = false;
const SfxItemSet& rSet = GetObjectItemSet();
- sal_Int32 nLineWdt = ((XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); // Strichstaerke
+ sal_Int32 nLineWdt = ((XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); // line width
rPol.nLineWdt2 = (nLineWdt + 1) / 2;
nArrow1Wdt = ((const XLineStartWidthItem&)(rSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 8e7c3fefee3f..d99a4b1209ff 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1787,7 +1787,7 @@ void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect)
if ( xObjRef.is() && IsChart() )
{
- //#i103460# charts do not necessaryly have an own size within ODF files,
+ //#i103460# charts do not necessarily have an own size within ODF files,
//for this case they need to use the size settings from the surrounding frame,
//which is made available with this method as there is no other way
xObjRef.SetDefaultSizeForChart( Size( rRect.GetWidth(), rRect.GetHeight() ) );
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index fa1b1299dec3..01bc247a8651 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -186,7 +186,7 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed =bNoTextFrame;
rInfo.bMirror90Allowed =bNoTextFrame;
- // allow transparence
+ // allow transparency
rInfo.bTransparenceAllowed = sal_True;
// gradient depends on fillstyle
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index d92b4f05e362..7df368f3acdc 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -962,7 +962,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
long nDiv=aSiz.Width();
if (Abs(nXDiff)<=2*nXKorr) {
if (nMul>nDiv) nDiv+=(nMul-nDiv)/2; // but only add half of what we calculated,
- else nMul+=(nDiv-nMul)/2; // because the EE calculates wrongly later on
+ else nMul+=(nDiv-nMul)/2; // because the EditEngine calculates wrongly later on
}
nX=nX*nMul/nDiv;
if (bNoStretching) nY=nX;
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 972c1f56ee43..d91e886ce0d8 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -147,7 +147,7 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const
}
}
}
- if (!ISA(SdrObjCustomShape)) // not justifying for CustomShapes to be able to detect if a shape has to be mirrored
+ if (!ISA(SdrObjCustomShape)) // not justifying when in CustomShapes, to be able to detect if a shape has to be mirrored
ImpJustifyRect(aTmpRect);
return aTmpRect;
}
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 36d63a2948cc..81ecfa5ead88 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -452,15 +452,15 @@ SdrObject* SdrObjList::RemoveObject(sal_uIntPtr nObjNum)
SdrObject* pObj=maList[nObjNum];
RemoveObjectFromContainer(nObjNum);
- DBG_ASSERT(pObj!=NULL,"Object zum Removen nicht gefunden");
+ DBG_ASSERT(pObj!=NULL,"Object to remove not found.");
if(pObj)
{
// flushViewObjectContacts() clears the VOC's and those invalidate
pObj->GetViewContact().flushViewObjectContacts(true);
- DBG_ASSERT(pObj->IsInserted(),"ZObjekt hat keinen Inserted-Status");
+ DBG_ASSERT(pObj->IsInserted(),"ZObjekt does not have the status Inserted.");
if (pModel!=NULL) {
- // Hier muss ein anderer Broadcast her!
+ // TODO: We need a different broadcast here.
if (pObj->GetPage()!=NULL) {
SdrHint aHint(*pObj);
aHint.SetKind(HINT_OBJREMOVED);
@@ -468,10 +468,10 @@ SdrObject* SdrObjList::RemoveObject(sal_uIntPtr nObjNum)
}
pModel->SetChanged();
}
- pObj->SetInserted(sal_False); // Ruft u.a. den UserCall
+ pObj->SetInserted(sal_False); // calls, among other things, the UserCall
pObj->SetObjList(NULL);
pObj->SetPage(NULL);
- if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird
+ if (!bObjOrdNumsDirty) { // optimization for the case that the last object is removed
if (nObjNum!=sal_uIntPtr(nAnz-1)) {
bObjOrdNumsDirty=sal_True;
}
@@ -481,7 +481,7 @@ SdrObject* SdrObjList::RemoveObject(sal_uIntPtr nObjNum)
if(pOwnerObj && !GetObjCount())
{
// empty group created; it needs to be repainted since it's
- // visualisation changes
+ // visualization changes
pOwnerObj->ActionChanged();
}
}
@@ -1392,7 +1392,7 @@ SdrPage& SdrPage::operator=(const SdrPage& rSrcPage)
pPage = this;
// copy all the local parameters to make this instance
- // a valid copy od source page before copying and inserting
+ // a valid copy of source page before copying and inserting
// the contained objects
mbMaster = rSrcPage.mbMaster;
mbSwappingLocked = rSrcPage.mbSwappingLocked;
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index f21f1dd8386b..6dfe076d0ef6 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -545,7 +545,7 @@ String STR_ObjNameSingulPlural
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
-// Neu ab 537: Namen fuer 3D-Objekte
+// New in 537: names for 3D objects
String STR_ObjNameSingulCube3d
{
Text [ en-US ] = "3D cube";
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 8fc43ee8036f..b8977afdd451 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -169,7 +169,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
if (bSetHgtItem)
{
- // Und nun noch das Rahmenattribut korregieren
+ // Now correct the frame attribute
nOldFontHgt=BigMulDiv(nOldFontHgt,aMetricFactor.GetNumerator(),aMetricFactor.GetDenominator());
SetObjectItem(SvxFontHeightItem(nOldFontHgt, 100, EE_CHAR_FONTHEIGHT));
}
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 481e4dacc7b9..48c4180a2e36 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -250,7 +250,7 @@ void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr,
GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat );
}
-// common call method for evtl. page change when UNDO/REDO is triggered
+// common call method for possible change of the page when UNDO/REDO is triggered
void SdrUndoObj::ImpShowPageOfThisObject()
{
if(pObj && pObj->IsInserted() && pObj->GetPage() && pObj->GetModel())
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index f9c97d7d4978..e7ffe85f2a09 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1062,7 +1062,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
sal_Bool bMarkHit=eHit==SDRHIT_MARKEDOBJECT;
SdrHdl* pHdl=aVEvt.pHdl;
- // now check the pointers for draggingNun die Pointer fuer Dragging checken
+ // now check the pointers for dragging
if (pHdl!=NULL || bMarkHit) {
SdrHdlKind eHdl= pHdl!=NULL ? pHdl->GetKind() : HDL_MOVE;
sal_Bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl();