[Libreoffice-commits] core.git: svx/source
Daniel Sikeler
d.sikeler94 at gmail.com
Thu Feb 12 01:51:07 PST 2015
svx/source/unodraw/unomod.cxx | 28 ++++++++---------
svx/source/unodraw/unopage.cxx | 44 +++++++++++++--------------
svx/source/unodraw/unoshap2.cxx | 45 +++++++++++++---------------
svx/source/unodraw/unoshap3.cxx | 64 ++++++++++++++++++++--------------------
svx/source/unodraw/unoshape.cxx | 38 +++++++++++------------
5 files changed, 109 insertions(+), 110 deletions(-)
New commits:
commit bccefa4b0bdb899a51793dbbe0ae8fb4a39b8f59
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Mon Feb 9 14:03:31 2015 +0100
fdo#39468 translated german comments
also translated some error messages
Change-Id: I22ef6b6cc01ba310d1ca694c7fcbf0d968a2fdf8
Reviewed-on: https://gerrit.libreoffice.org/14432
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 94f0fb0..6e40acf 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -120,34 +120,34 @@ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdr
switch( pSdrHint->GetKind() )
{
-// case HINT_LAYERCHG: // Layerdefinition geaendert
-// case HINT_LAYERORDERCHG: // Layerreihenfolge geaendert (Insert/Remove/ChangePos)
-// case HINT_LAYERSETCHG: // Layerset geaendert
-// case HINT_LAYERSETORDERCHG: // Layersetreihenfolge geaendert (Insert/Remove/ChangePos)
+// case HINT_LAYERCHG: // layer definition changed
+// case HINT_LAYERORDERCHG: // layer order changed (Insert/Remove/ChangePos)
+// case HINT_LAYERSETCHG: // layer set changed
+// case HINT_LAYERSETORDERCHG: // layer set order changed (Insert/Remove/ChangePos)
// #115423#
-// case HINT_PAGECHG: // Page geaendert
+// case HINT_PAGECHG: // page changed
// aEvent.EventName = "PageModified";
// pPage = pSdrHint->GetPage();
// break;
- case HINT_PAGEORDERCHG: // Reihenfolge der Seiten (Zeichenseiten oder Masterpages) geaendert (Insert/Remove/ChangePos)
+ case HINT_PAGEORDERCHG: // draw or master page order changed (Insert/Remove/ChangePos)
aEvent.EventName = "PageOrderModified";
pPage = pSdrHint->GetPage();
break;
- case HINT_OBJCHG: // Objekt geaendert
+ case HINT_OBJCHG: // object changed
aEvent.EventName = "ShapeModified";
pObj = pSdrHint->GetObject();
break;
- case HINT_OBJINSERTED: // Neues Zeichenobjekt eingefuegt
+ case HINT_OBJINSERTED: // add new draw object
aEvent.EventName = "ShapeInserted";
pObj = pSdrHint->GetObject();
break;
- case HINT_OBJREMOVED: // Zeichenobjekt aus Liste entfernt
+ case HINT_OBJREMOVED: // removed draw object from list
aEvent.EventName = "ShapeRemoved";
pObj = pSdrHint->GetObject();
break;
-// HINT_DEFAULTTABCHG, // Default Tabulatorweite geaendert
-// HINT_DEFFONTHGTCHG, // Default FontHeight geaendert
+// HINT_DEFAULTTABCHG, // default tab width changed
+// HINT_DEFFONTHGTCHG, // default FontHeight changed
// HINT_SWITCHTOPAGE, // #94278# UNDO/REDO at an object evtl. on another page
// HINT_OBJLISTCLEAR // Is called before an SdrObjList will be cleared
default:
@@ -649,8 +649,8 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements()
// XDrawPages
-// Erzeugt eine neue Seite mit Model an der angegebennen Position und gibt die
-// dazugehoerige SdDrawPage zurueck.
+// create a new page with model at given position
+// and return corresponding SdDrawPage
uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
throw(uno::RuntimeException, std::exception)
{
@@ -682,7 +682,7 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra
sal_uInt16 nPageCount = mrModel.mpDoc->GetPageCount();
if( nPageCount > 1 )
{
- // pPage von xPage besorgen und dann die Id (nPos )ermitteln
+ // get pPage from xPage and get Id (nPos)
SvxDrawPage* pSvxPage = SvxDrawPage::getImplementation( xPage );
if( pSvxPage )
{
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index f7e0e50..4d75251 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -66,14 +66,14 @@ SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw()
, mpPage( pInPage )
, mpModel( 0 )
{
- // Am Broadcaster anmelden
+ // register at broadcaster
if( mpPage )
mpModel = mpPage->GetModel();
if( mpModel )
StartListening( *mpModel );
- // Erzeugen der (hidden) View
+ // create (hidden) view
mpView = new SdrView( mpModel );
if( mpView )
mpView->SetDesignMode(true);
@@ -390,12 +390,12 @@ namespace
}
}
-// ACHTUNG: _SelectObjectsInView selektiert die ::com::sun::star::drawing::Shapes nur in der angegebennen
-// SdrPageView. Dies muss nicht die sichtbare SdrPageView sein.
+// ATTENTION: _SelectObjectsInView selects the ::com::sun::star::drawing::Shapes
+// only in the given SdrPageView. It hasn't to be the visible SdrPageView.
void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw ()
{
- DBG_ASSERT(pPageView,"SdrPageView ist NULL! [CL]");
- DBG_ASSERT(mpView, "SdrView ist NULL! [CL]");
+ DBG_ASSERT(pPageView,"SdrPageView is NULL! [CL]");
+ DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
if(pPageView!=NULL && mpView!=NULL)
{
@@ -412,12 +412,12 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS
}
}
-// ACHTUNG: _SelectObjectInView selektiert das Shape *nur* in der angegebennen
-// SdrPageView. Dies muss nicht die sichtbare SdrPageView sein.
+// ATTENTION: _SelectObjectInView selects the shape only in the given SdrPageView.
+// It hasn't to be the visible SdrPageView.
void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw()
{
- DBG_ASSERT(pPageView,"SdrPageView ist NULL! [CL]");
- DBG_ASSERT(mpView, "SdrView ist NULL! [CL]");
+ DBG_ASSERT(pPageView,"SdrPageView is NULL! [CL]");
+ DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
if(pPageView!=NULL && mpView != NULL)
{
@@ -434,8 +434,8 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference<
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
- DBG_ASSERT(mpPage,"SdrPage ist NULL! [CL]");
- DBG_ASSERT(mpView, "SdrView ist NULL! [CL]");
+ DBG_ASSERT(mpPage,"SdrPage is NULL! [CL]");
+ DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
Reference< ::com::sun::star::drawing::XShapeGroup > xShapeGroup;
if(mpPage==NULL||mpView==NULL||!xShapes.is())
@@ -472,8 +472,8 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
- DBG_ASSERT(mpPage,"SdrPage ist NULL! [CL]");
- DBG_ASSERT(mpView, "SdrView ist NULL! [CL]");
+ DBG_ASSERT(mpPage,"SdrPage is NULL! [CL]");
+ DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
if(mpPage==NULL||mpView==NULL||!aGroup.is())
return;
@@ -512,7 +512,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS
if( pNewObj->ISA(E3dPolyScene))
{
- // Szene initialisieren
+ // initialise scene
E3dScene* pScene = static_cast<E3dScene*>(pNewObj);
double fW = (double)aSize.Width;
@@ -630,7 +630,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
case E3D_POLYGONOBJ_ID :
pRet = new Svx3DPolygonObject( pObj );
break;
- default: // unbekanntes 3D-Objekt auf der Page
+ default: // unknown 3D-object on page
pRet = new SvxShape( pObj );
break;
}
@@ -782,14 +782,14 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
case OBJ_OPENGL:
pRet = new SvxOpenGLObject( pObj );
break;
- default: // unbekanntes 2D-Objekt auf der Page
- OSL_FAIL("Nicht implementierter Starone-Shape erzeugt! [CL]");
+ default: // unknown 2D-object on page
+ OSL_FAIL("Not implemented Starone-Shape created! [CL]");
pRet = new SvxShapeText( pObj );
break;
}
break;
}
- default: // Unbekannter Inventor
+ default: // unknown inventor
{
OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::_CreateShape()");
break;
@@ -805,9 +805,9 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
switch(nObjId)
{
- case OBJ_CCUT: // Kreisabschnitt
- case OBJ_CARC: // Kreisbogen
- case OBJ_SECT: // Kreissektor
+ case OBJ_CCUT: // segment of circle
+ case OBJ_CARC: // arc of circle
+ case OBJ_SECT: // sector
nObjId = OBJ_CIRC;
break;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 935a1ee..a6851f5 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1024,16 +1024,16 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c
{
basegfx::B2DPolyPolygon aRetval;
- // Zeiger auf innere sequences holen
+ // get pointer to internal sequences
const drawing::PointSequence* pInnerSequence = pOuterSequence->getConstArray();
const drawing::PointSequence* pInnerSeqEnd = pInnerSequence + pOuterSequence->getLength();
for(;pInnerSequence != pInnerSeqEnd; ++pInnerSequence)
{
- // Neues Polygon vorbereiten
+ // prepare new polygon
basegfx::B2DPolygon aNewPolygon;
- // Zeiger auf Arrays holen
+ // get pointer to arrays
const awt::Point* pArray = pInnerSequence->getConstArray();
const awt::Point* pArrayEnd = pArray + pInnerSequence->getLength();
@@ -1045,7 +1045,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c
// check for closed state flag
basegfx::tools::checkClosed(aNewPolygon);
- // Neues Teilpolygon einfuegen
+ // add new subpolygon
aRetval.append(aNewPolygon);
}
@@ -1091,11 +1091,10 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx
{
drawing::PointSequence* pSequence = (drawing::PointSequence*)rValue.getValue();
- // Neues Polygon vorbereiten
+ // prepare new polygon
basegfx::B2DPolygon aNewPolygon;
- // Zeiger auf Arrays holen
- // Zeiger auf Arrays holen
+ // get pointer to arrays
const awt::Point* pArray = pSequence->getConstArray();
const awt::Point* pArrayEnd = pArray + pSequence->getLength();
@@ -1107,7 +1106,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx
// check for closed state flag
basegfx::tools::checkClosed(aNewPolygon);
- // Polygon setzen
+ // set polygon
SetPolygon(basegfx::B2DPolyPolygon(aNewPolygon));
return true;
}
@@ -1125,12 +1124,12 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo
if( (sal_uInt32)rRetval.getLength() != rPolyPoly.count() )
rRetval.realloc( rPolyPoly.count() );
- // Zeiger auf aeussere Arrays holen
+ // get pointer to external arrays
drawing::PointSequence* pOuterSequence = rRetval.getArray();
for(sal_uInt32 a(0L); a < rPolyPoly.count(); a++)
{
- // Einzelpolygon holen
+ // get single polygon
const basegfx::B2DPolygon aPoly(rPolyPoly.getB2DPolygon(a));
// #i75974# take closed stae into account, the API polygon still uses the old closed definition
@@ -1139,10 +1138,10 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo
const sal_uInt32 nPointCount(aPoly.count());
const bool bIsClosed(aPoly.isClosed());
- // Platz in Arrays schaffen
+ // create space in arrays
pOuterSequence->realloc(bIsClosed ? nPointCount + 1 : nPointCount);
- // Pointer auf arrays holen
+ // get pointer to arrays
awt::Point* pInnerSequence = pOuterSequence->getArray();
for(sal_uInt32 b(0L); b < nPointCount; b++)
@@ -1170,7 +1169,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
{
case OWN_ATTR_VALUE_POLYPOLYGON:
{
- // tools::PolyPolygon in eine struct tools::PolyPolygon packen
+ // pack a tools::PolyPolygon in a struct tools::PolyPolygon
const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
drawing::PointSequenceSequence aRetval( rPolyPoly.count() );
@@ -1195,7 +1194,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
}
case OWN_ATTR_VALUE_POLYGON:
{
- // tools::PolyPolygon in eine struct tools::PolyPolygon packen
+ // pack a tools::PolyPolygon in a struct tools::PolyPolygon
const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
sal_Int32 nCount = 0;
@@ -1206,10 +1205,10 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
if( nCount > 0 )
{
- // Einzelpolygon holen
+ // get single polygon
const basegfx::B2DPolygon aPoly(rPolyPoly.getB2DPolygon(0L));
- // Pointer auf arrays holen
+ // get pointer to arrays
awt::Point* pSequence = aRetval.getArray();
for(sal_Int32 b=0;b<nCount;b++)
@@ -1331,7 +1330,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
{
case OWN_ATTR_VALUE_POLYPOLYGONBEZIER:
{
- // tools::PolyPolygon in eine struct tools::PolyPolygon packen
+ // pack a tools::PolyPolygon in a struct tools::PolyPolygon
const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
drawing::PolyPolygonBezierCoords aRetval;
basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier(rPolyPoly, aRetval);
@@ -1341,7 +1340,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
}
case OWN_ATTR_BASE_GEOMETRY:
{
- // tools::PolyPolygon in eine struct tools::PolyPolygon packen
+ // pack a tools::PolyPolygon in a struct tools::PolyPolygon
basegfx::B2DPolyPolygon aNewPolyPolygon;
basegfx::B2DHomMatrix aNewHomogenMatrix;
mpObj.get()->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);
@@ -1448,11 +1447,11 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
}
else
{
- // Bitmap in das Objekt packen
+ // pack bitmap in the object
Reference< awt::XBitmap > xBmp( rValue, UNO_QUERY );
if( xBmp.is() )
{
- // Bitmap einsetzen
+ // apply bitmap
Graphic aGraphic(VCLUnoHelper::GetBitmap( xBmp ));
static_cast<SdrGrafObj*>(mpObj.get())->SetGraphic(aGraphic);
bOk = true;
@@ -1578,7 +1577,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte
if(rGraphic.GetType() != GRAPHIC_GDIMETAFILE)
{
- // Objekt in eine Bitmap packen
+ // pack object in a bitmap
Reference< ::com::sun::star::awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap(static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphic().GetBitmapEx()) );
rValue <<= xBitmap;
}
@@ -1767,7 +1766,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s
{
MirrorPoint(aPol[i],aRef1,aRef2);
}
- // Polygon wenden und etwas schieben
+ // turn and move polygon
Polygon aPol0(aPol);
aPol[0]=aPol0[1];
aPol[1]=aPol0[0];
@@ -1789,7 +1788,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s
{
MirrorPoint(aPol[i],aRef1,aRef2);
}
- // Polygon wenden und etwas schieben
+ // turn and move polygon
Polygon aPol0(aPol);
aPol[0]=aPol0[1];
aPol[1]=aPol0[0];
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index fa6fc5f..56ec526 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -310,7 +310,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformationsmatrix in das Objekt packen
+ // pach transformation matrix to the object
if( ConvertHomogenMatrixToObject( static_cast< E3dObject* >( mpObj.get() ), rValue ) )
return true;
break;
@@ -427,7 +427,7 @@ bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItem
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Objekt in eine homogene 4x4 Matrix packen
+ // pach object to a homogeneous 4x4 matrix
ConvertObjectToHomogenMatric( static_cast< E3dObject* >( mpObj.get() ), rValue );
break;
}
@@ -491,14 +491,14 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformationsmatrix in das Objekt packen
+ // pack transformationmatrix to the object
if( ConvertHomogenMatrixToObject( static_cast< E3dObject* >( mpObj.get() ), rValue ) )
return true;
break;
}
case OWN_ATTR_3D_VALUE_POSITION:
{
- // Position in das Objekt packen
+ // pack position to the object
drawing::Position3D aUnoPos;
if( rValue >>= aUnoPos )
{
@@ -510,7 +510,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem
}
case OWN_ATTR_3D_VALUE_SIZE:
{
- // Groesse in das Objekt packen
+ // pack size to the object
drawing::Direction3D aDirection;
if( rValue >>= aDirection )
{
@@ -523,7 +523,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem
case OWN_ATTR_3D_VALUE_POS_IS_CENTER:
{
bool bNew = false;
- // sal_Bool bPosIsCenter in das Objekt packen
+ // pack sal_Bool bPosIsCenter to the object
if( rValue >>= bNew )
{
static_cast< E3dCubeObj* >( mpObj.get() )->SetPosIsCenter(bNew);
@@ -546,13 +546,13 @@ bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItem
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformation in eine homogene Matrix packen
+ // pack transformation to a homogeneous matrix
ConvertObjectToHomogenMatric( static_cast< E3dObject* >( mpObj.get() ), rValue );
break;
}
case OWN_ATTR_3D_VALUE_POSITION:
{
- // Position packen
+ // pack position
const basegfx::B3DPoint& rPos = static_cast<E3dCubeObj*>(mpObj.get())->GetCubePos();
drawing::Position3D aPos;
@@ -565,7 +565,7 @@ bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItem
}
case OWN_ATTR_3D_VALUE_SIZE:
{
- // Groesse packen
+ // pack size
const basegfx::B3DVector& rSize = static_cast<E3dCubeObj*>(mpObj.get())->GetCubeSize();
drawing::Direction3D aDir;
@@ -615,7 +615,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformationsmatrix in das Objekt packen
+ // pack transformation matrix to the object
if( ConvertHomogenMatrixToObject( static_cast< E3dObject* >( mpObj.get() ), rValue ) )
return true;
break;
@@ -623,7 +623,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt
case OWN_ATTR_3D_VALUE_POSITION:
{
- // Position in das Objekt packen
+ // pack position to the object
drawing::Position3D aUnoPos;
if( rValue >>= aUnoPos )
{
@@ -636,7 +636,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt
case OWN_ATTR_3D_VALUE_SIZE:
{
- // Groesse in das Objekt packen
+ // pack size to the object
drawing::Direction3D aDir;
if( rValue >>= aDir )
{
@@ -661,13 +661,13 @@ bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxIt
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformation in eine homogene Matrix packen
+ // pack transformation to a homogeneous matrix
ConvertObjectToHomogenMatric( static_cast< E3dObject* >( mpObj.get() ), rValue );
break;
}
case OWN_ATTR_3D_VALUE_POSITION:
{
- // Position packen
+ // pack position
const basegfx::B3DPoint& rPos = static_cast<E3dSphereObj*>(mpObj.get())->Center();
drawing::Position3D aPos;
@@ -680,7 +680,7 @@ bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxIt
}
case OWN_ATTR_3D_VALUE_SIZE:
{
- // Groesse packen
+ // pack size
const basegfx::B3DVector& rSize = static_cast<E3dSphereObj*>(mpObj.get())->Size();
drawing::Direction3D aDir;
@@ -813,14 +813,14 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformationsmatrix in das Objekt packen
+ // pack transformation matrix to the object
if( ConvertHomogenMatrixToObject( static_cast< E3dObject* >( mpObj.get() ), rValue ) )
return true;
break;
}
case OWN_ATTR_3D_VALUE_POLYPOLYGON3D:
{
- // Polygondefinition in das Objekt packen
+ // pack polygon definition to the object
basegfx::B3DPolyPolygon aNewB3DPolyPolygon;
// #i101520# Probably imported
@@ -831,7 +831,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte
// item here and re-set after setting the polygon.
const sal_uInt32 nPrevVerticalSegs(static_cast<E3dLatheObj*>(mpObj.get())->GetVerticalSegments());
- // Polygon setzen
+ // set polygon
const basegfx::B3DHomMatrix aIdentity;
const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(aNewB3DPolyPolygon, aIdentity));
static_cast<E3dLatheObj*>(mpObj.get())->SetPolyPoly2D(aB2DPolyPolygon);
@@ -860,7 +860,7 @@ bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxIte
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformation in eine homogene Matrix packen
+ // pack transformation to a homogeneous matrix
drawing::HomogenMatrix aHomMat;
basegfx::B3DHomMatrix aMat = static_cast<E3dObject*>(mpObj.get())->GetTransform();
@@ -927,7 +927,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformationsmatrix in das Objekt packen
+ // pack transformation matrix to the object
if( ConvertHomogenMatrixToObject( static_cast< E3dObject* >( mpObj.get() ), rValue ) )
return true;
break;
@@ -935,13 +935,13 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI
case OWN_ATTR_3D_VALUE_POLYPOLYGON3D:
{
- // Polygondefinition in das Objekt packen
+ // pack polygon definition to the object
basegfx::B3DPolyPolygon aNewB3DPolyPolygon;
// #i101520# Probably imported
if( PolyPolygonShape3D_to_B3dPolyPolygon( rValue, aNewB3DPolyPolygon, true ) )
{
- // Polygon setzen
+ // set polygon
const basegfx::B3DHomMatrix aIdentity;
const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(aNewB3DPolyPolygon, aIdentity));
static_cast<E3dExtrudeObj*>(mpObj.get())->SetExtrudePolygon(aB2DPolyPolygon);
@@ -964,7 +964,7 @@ bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxI
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformation in eine homogene Matrix packen
+ // pack transformation to a homogeneous matrix
drawing::HomogenMatrix aHomMat;
basegfx::B3DHomMatrix aMat = static_cast<E3dObject*>(mpObj.get())->GetTransform();
@@ -992,7 +992,7 @@ bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxI
case OWN_ATTR_3D_VALUE_POLYPOLYGON3D:
{
- // Polygondefinition packen
+ // pack polygon definition
const basegfx::B2DPolyPolygon& rPolyPoly = static_cast<E3dExtrudeObj*>(mpObj.get())->GetExtrudePolygon();
const basegfx::B3DPolyPolygon aB3DPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPoly));
@@ -1032,7 +1032,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // Transformationsmatrix in das Objekt packen
+ // pack transformation matrix to the object
if( ConvertHomogenMatrixToObject( static_cast< E3dObject* >( mpObj.get() ), rValue ) )
return true;
break;
@@ -1040,13 +1040,13 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI
case OWN_ATTR_3D_VALUE_POLYPOLYGON3D:
{
- // Polygondefinition in das Objekt packen
+ // pack polygon definition to the object
basegfx::B3DPolyPolygon aNewB3DPolyPolygon;
// #i101520# Direct API data (e.g. from chart)
if( PolyPolygonShape3D_to_B3dPolyPolygon( rValue, aNewB3DPolyPolygon, false ) )
{
- // Polygon setzen
+ // set polygon
static_cast<E3dPolygonObj*>(mpObj.get())->SetPolyPolygon3D(aNewB3DPolyPolygon);
return true;
}
@@ -1054,13 +1054,13 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI
}
case OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D:
{
- // Normalendefinition in das Objekt packen
+ // pack perpendicular definition to the object
basegfx::B3DPolyPolygon aNewB3DPolyPolygon;
// #i101520# Direct API data (e.g. from chart)
if( PolyPolygonShape3D_to_B3dPolyPolygon( rValue, aNewB3DPolyPolygon, false ) )
{
- // Polygon setzen
+ // set polygon
static_cast<E3dPolygonObj*>(mpObj.get())->SetPolyNormals3D(aNewB3DPolyPolygon);
return true;
}
@@ -1068,13 +1068,13 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI
}
case OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D:
{
- // Texturdefinition in das Objekt packen
+ // pack texture definition to the object
basegfx::B3DPolyPolygon aNewB3DPolyPolygon;
// #i101520# Direct API data (e.g. from chart)
if( PolyPolygonShape3D_to_B3dPolyPolygon( rValue, aNewB3DPolyPolygon, false ) )
{
- // Polygon setzen
+ // set polygon
const basegfx::B3DHomMatrix aIdentity;
const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(aNewB3DPolyPolygon, aIdentity));
static_cast<E3dPolygonObj*>(mpObj.get())->SetPolyTexture2D(aB2DPolyPolygon);
@@ -1124,7 +1124,7 @@ bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxI
case OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D:
{
- // Texturdefinition packen
+ // pack texture definition
const basegfx::B2DPolyPolygon& rPolyPoly = static_cast<E3dPolygonObj*>(mpObj.get())->GetPolyTexture2D();
const basegfx::B3DPolyPolygon aB3DPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPoly));
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 098063a..5f98802 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -387,9 +387,9 @@ void SvxShape::impl_initFromSdrObject()
switch(mpImpl->mnObjId)
{
- case OBJ_CCUT: // Kreisabschnitt
- case OBJ_CARC: // Kreisbogen
- case OBJ_SECT: // Kreissektor
+ case OBJ_CCUT: // segment of circle
+ case OBJ_CARC: // arc of circle
+ case OBJ_SECT: // sector
mpImpl->mnObjId = OBJ_CIRC;
break;
@@ -616,22 +616,22 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet&
uno::Any* pUsrAny = rPropSet.GetUsrAnyForID(aSrcIt->nWID);
if(pUsrAny)
{
- // Aequivalenten Eintrag in pDst suchen
+ // search for equivalent entry in pDst
const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( aSrcIt->sName );
if(pEntry)
{
// entry found
if(pEntry->nWID >= OWN_ATTR_VALUE_START && pEntry->nWID <= OWN_ATTR_VALUE_END)
{
- // Special ID im PropertySet, kann nur direkt am
- // Objekt gesetzt werden+
+ // special ID in PropertySet, can only be set
+ // directly at the object
xSet->setPropertyValue( aSrcIt->sName, *pUsrAny);
}
else
{
if(SfxItemPool::IsWhich(pEntry->nWID))
rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
- // setzen
+ // set
SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet);
}
}
@@ -1166,7 +1166,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run
Point aLocalPos( Position.X, Position.Y );
ForceMetricToItemPoolMetric(aLocalPos);
- // Position ist absolut, relativ zum Anker stellen
+ // Position is absolut, so recalc to position relativ to anchor
if( mpModel->IsWriter() )
aLocalPos += mpObj->GetAnchorPos();
@@ -1711,14 +1711,14 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
{
if(bIsNotPersist)
{
- // Not-Persistent Attribute, hole diese extra
+ // not-persistent attribute, get those extra
mpObj->TakeNotPersistAttr(*pSet, false);
}
}
if( pSet->GetItemState( pMap->nWID ) != SfxItemState::SET )
{
- // Default aus ItemPool holen
+ // get default from ItemPool
if(SfxItemPool::IsWhich(pMap->nWID))
pSet->Put(mpModel->GetItemPool().GetDefaultItem(pMap->nWID));
}
@@ -1731,7 +1731,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
if(bIsNotPersist)
{
- // Not-Persist Attribute extra setzen
+ // set not-persistent attribute extra
mpObj->ApplyNotPersistAttr( *pSet );
delete pSet;
}
@@ -1789,14 +1789,14 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
{
if(pMap->nWID >= SDRATTR_NOTPERSIST_FIRST && pMap->nWID <= SDRATTR_NOTPERSIST_LAST)
{
- // Not-Persistent Attribute, hole diese extra
+ // not-persistent attribute, get those extra
mpObj->TakeNotPersistAttr(aSet, false);
}
}
if(!aSet.Count())
{
- // Default aus ItemPool holen
+ // get default from ItemPool
if(SfxItemPool::IsWhich(pMap->nWID))
aSet.Put(mpModel->GetItemPool().GetDefaultItem(pMap->nWID));
}
@@ -1987,16 +1987,16 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
drawing::CircleKind eKind;
switch(mpObj->GetObjIdentifier())
{
- case OBJ_CIRC: // Kreis, Ellipse
+ case OBJ_CIRC: // circle, ellipse
eKind = drawing::CircleKind_FULL;
break;
- case OBJ_CCUT: // Kreisabschnitt
+ case OBJ_CCUT: // segment of circle
eKind = drawing::CircleKind_CUT;
break;
- case OBJ_CARC: // Kreisbogen
+ case OBJ_CARC: // arc of circle
eKind = drawing::CircleKind_ARC;
break;
- case OBJ_SECT: // Kreissektor
+ case OBJ_SECT: // sector
eKind = drawing::CircleKind_SECTION;
break;
}
@@ -2006,7 +2006,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
}
default:
{
- // Hole Wert aus ItemSet
+ // get value form ItemSet
aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet );
if( pMap->aType != aAny.getValueType() )
@@ -3079,7 +3079,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
return getPropertyValue( aPropertyName );
}
- // Default aus ItemPool holen
+ // get default from ItemPool
if(!SfxItemPool::IsWhich(pMap->nWID))
throw beans::UnknownPropertyException();
More information about the Libreoffice-commits
mailing list