Kaydet (Commit) bccefa4b authored tarafından Daniel Sikeler's avatar Daniel Sikeler Kaydeden (comit) Caolán McNamara

fdo#39468 translated german comments

also translated some error messages

Change-Id: I22ef6b6cc01ba310d1ca694c7fcbf0d968a2fdf8
Reviewed-on: https://gerrit.libreoffice.org/14432Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c796fba8
...@@ -120,34 +120,34 @@ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdr ...@@ -120,34 +120,34 @@ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdr
switch( pSdrHint->GetKind() ) switch( pSdrHint->GetKind() )
{ {
// case HINT_LAYERCHG: // Layerdefinition geaendert // case HINT_LAYERCHG: // layer definition changed
// case HINT_LAYERORDERCHG: // Layerreihenfolge geaendert (Insert/Remove/ChangePos) // case HINT_LAYERORDERCHG: // layer order changed (Insert/Remove/ChangePos)
// case HINT_LAYERSETCHG: // Layerset geaendert // case HINT_LAYERSETCHG: // layer set changed
// case HINT_LAYERSETORDERCHG: // Layersetreihenfolge geaendert (Insert/Remove/ChangePos) // case HINT_LAYERSETORDERCHG: // layer set order changed (Insert/Remove/ChangePos)
// #115423# // #115423#
// case HINT_PAGECHG: // Page geaendert // case HINT_PAGECHG: // page changed
// aEvent.EventName = "PageModified"; // aEvent.EventName = "PageModified";
// pPage = pSdrHint->GetPage(); // pPage = pSdrHint->GetPage();
// break; // 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"; aEvent.EventName = "PageOrderModified";
pPage = pSdrHint->GetPage(); pPage = pSdrHint->GetPage();
break; break;
case HINT_OBJCHG: // Objekt geaendert case HINT_OBJCHG: // object changed
aEvent.EventName = "ShapeModified"; aEvent.EventName = "ShapeModified";
pObj = pSdrHint->GetObject(); pObj = pSdrHint->GetObject();
break; break;
case HINT_OBJINSERTED: // Neues Zeichenobjekt eingefuegt case HINT_OBJINSERTED: // add new draw object
aEvent.EventName = "ShapeInserted"; aEvent.EventName = "ShapeInserted";
pObj = pSdrHint->GetObject(); pObj = pSdrHint->GetObject();
break; break;
case HINT_OBJREMOVED: // Zeichenobjekt aus Liste entfernt case HINT_OBJREMOVED: // removed draw object from list
aEvent.EventName = "ShapeRemoved"; aEvent.EventName = "ShapeRemoved";
pObj = pSdrHint->GetObject(); pObj = pSdrHint->GetObject();
break; break;
// HINT_DEFAULTTABCHG, // Default Tabulatorweite geaendert // HINT_DEFAULTTABCHG, // default tab width changed
// HINT_DEFFONTHGTCHG, // Default FontHeight geaendert // HINT_DEFFONTHGTCHG, // default FontHeight changed
// HINT_SWITCHTOPAGE, // #94278# UNDO/REDO at an object evtl. on another page // HINT_SWITCHTOPAGE, // #94278# UNDO/REDO at an object evtl. on another page
// HINT_OBJLISTCLEAR // Is called before an SdrObjList will be cleared // HINT_OBJLISTCLEAR // Is called before an SdrObjList will be cleared
default: default:
...@@ -649,8 +649,8 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements() ...@@ -649,8 +649,8 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements()
// XDrawPages // XDrawPages
// Erzeugt eine neue Seite mit Model an der angegebennen Position und gibt die // create a new page with model at given position
// dazugehoerige SdDrawPage zurueck. // and return corresponding SdDrawPage
uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex ) uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
throw(uno::RuntimeException, std::exception) throw(uno::RuntimeException, std::exception)
{ {
...@@ -682,7 +682,7 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra ...@@ -682,7 +682,7 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra
sal_uInt16 nPageCount = mrModel.mpDoc->GetPageCount(); sal_uInt16 nPageCount = mrModel.mpDoc->GetPageCount();
if( nPageCount > 1 ) 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 ); SvxDrawPage* pSvxPage = SvxDrawPage::getImplementation( xPage );
if( pSvxPage ) if( pSvxPage )
{ {
......
...@@ -66,14 +66,14 @@ SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw() ...@@ -66,14 +66,14 @@ SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw()
, mpPage( pInPage ) , mpPage( pInPage )
, mpModel( 0 ) , mpModel( 0 )
{ {
// Am Broadcaster anmelden // register at broadcaster
if( mpPage ) if( mpPage )
mpModel = mpPage->GetModel(); mpModel = mpPage->GetModel();
if( mpModel ) if( mpModel )
StartListening( *mpModel ); StartListening( *mpModel );
// Erzeugen der (hidden) View // create (hidden) view
mpView = new SdrView( mpModel ); mpView = new SdrView( mpModel );
if( mpView ) if( mpView )
mpView->SetDesignMode(true); mpView->SetDesignMode(true);
...@@ -390,12 +390,12 @@ namespace ...@@ -390,12 +390,12 @@ namespace
} }
} }
// ACHTUNG: _SelectObjectsInView selektiert die ::com::sun::star::drawing::Shapes nur in der angegebennen // ATTENTION: _SelectObjectsInView selects the ::com::sun::star::drawing::Shapes
// SdrPageView. Dies muss nicht die sichtbare SdrPageView sein. // only in the given SdrPageView. It hasn't to be the visible SdrPageView.
void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw () void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw ()
{ {
DBG_ASSERT(pPageView,"SdrPageView ist NULL! [CL]"); DBG_ASSERT(pPageView,"SdrPageView is NULL! [CL]");
DBG_ASSERT(mpView, "SdrView ist NULL! [CL]"); DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
if(pPageView!=NULL && mpView!=NULL) if(pPageView!=NULL && mpView!=NULL)
{ {
...@@ -412,12 +412,12 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS ...@@ -412,12 +412,12 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS
} }
} }
// ACHTUNG: _SelectObjectInView selektiert das Shape *nur* in der angegebennen // ATTENTION: _SelectObjectInView selects the shape only in the given SdrPageView.
// SdrPageView. Dies muss nicht die sichtbare SdrPageView sein. // It hasn't to be the visible SdrPageView.
void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw() void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw()
{ {
DBG_ASSERT(pPageView,"SdrPageView ist NULL! [CL]"); DBG_ASSERT(pPageView,"SdrPageView is NULL! [CL]");
DBG_ASSERT(mpView, "SdrView ist NULL! [CL]"); DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
if(pPageView!=NULL && mpView != NULL) if(pPageView!=NULL && mpView != NULL)
{ {
...@@ -434,8 +434,8 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< ...@@ -434,8 +434,8 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference<
if( (mpModel == 0) || (mpPage == 0) ) if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException(); throw lang::DisposedException();
DBG_ASSERT(mpPage,"SdrPage ist NULL! [CL]"); DBG_ASSERT(mpPage,"SdrPage is NULL! [CL]");
DBG_ASSERT(mpView, "SdrView ist NULL! [CL]"); DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
Reference< ::com::sun::star::drawing::XShapeGroup > xShapeGroup; Reference< ::com::sun::star::drawing::XShapeGroup > xShapeGroup;
if(mpPage==NULL||mpView==NULL||!xShapes.is()) if(mpPage==NULL||mpView==NULL||!xShapes.is())
...@@ -472,8 +472,8 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr ...@@ -472,8 +472,8 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr
if( (mpModel == 0) || (mpPage == 0) ) if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException(); throw lang::DisposedException();
DBG_ASSERT(mpPage,"SdrPage ist NULL! [CL]"); DBG_ASSERT(mpPage,"SdrPage is NULL! [CL]");
DBG_ASSERT(mpView, "SdrView ist NULL! [CL]"); DBG_ASSERT(mpView, "SdrView is NULL! [CL]");
if(mpPage==NULL||mpView==NULL||!aGroup.is()) if(mpPage==NULL||mpView==NULL||!aGroup.is())
return; return;
...@@ -512,7 +512,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS ...@@ -512,7 +512,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS
if( pNewObj->ISA(E3dPolyScene)) if( pNewObj->ISA(E3dPolyScene))
{ {
// Szene initialisieren // initialise scene
E3dScene* pScene = static_cast<E3dScene*>(pNewObj); E3dScene* pScene = static_cast<E3dScene*>(pNewObj);
double fW = (double)aSize.Width; double fW = (double)aSize.Width;
...@@ -630,7 +630,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 ...@@ -630,7 +630,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
case E3D_POLYGONOBJ_ID : case E3D_POLYGONOBJ_ID :
pRet = new Svx3DPolygonObject( pObj ); pRet = new Svx3DPolygonObject( pObj );
break; break;
default: // unbekanntes 3D-Objekt auf der Page default: // unknown 3D-object on page
pRet = new SvxShape( pObj ); pRet = new SvxShape( pObj );
break; break;
} }
...@@ -782,14 +782,14 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 ...@@ -782,14 +782,14 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
case OBJ_OPENGL: case OBJ_OPENGL:
pRet = new SvxOpenGLObject( pObj ); pRet = new SvxOpenGLObject( pObj );
break; break;
default: // unbekanntes 2D-Objekt auf der Page default: // unknown 2D-object on page
OSL_FAIL("Nicht implementierter Starone-Shape erzeugt! [CL]"); OSL_FAIL("Not implemented Starone-Shape created! [CL]");
pRet = new SvxShapeText( pObj ); pRet = new SvxShapeText( pObj );
break; break;
} }
break; break;
} }
default: // Unbekannter Inventor default: // unknown inventor
{ {
OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::_CreateShape()"); OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::_CreateShape()");
break; break;
...@@ -805,9 +805,9 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 ...@@ -805,9 +805,9 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
switch(nObjId) switch(nObjId)
{ {
case OBJ_CCUT: // Kreisabschnitt case OBJ_CCUT: // segment of circle
case OBJ_CARC: // Kreisbogen case OBJ_CARC: // arc of circle
case OBJ_SECT: // Kreissektor case OBJ_SECT: // sector
nObjId = OBJ_CIRC; nObjId = OBJ_CIRC;
break; break;
......
...@@ -1024,16 +1024,16 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c ...@@ -1024,16 +1024,16 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c
{ {
basegfx::B2DPolyPolygon aRetval; basegfx::B2DPolyPolygon aRetval;
// Zeiger auf innere sequences holen // get pointer to internal sequences
const drawing::PointSequence* pInnerSequence = pOuterSequence->getConstArray(); const drawing::PointSequence* pInnerSequence = pOuterSequence->getConstArray();
const drawing::PointSequence* pInnerSeqEnd = pInnerSequence + pOuterSequence->getLength(); const drawing::PointSequence* pInnerSeqEnd = pInnerSequence + pOuterSequence->getLength();
for(;pInnerSequence != pInnerSeqEnd; ++pInnerSequence) for(;pInnerSequence != pInnerSeqEnd; ++pInnerSequence)
{ {
// Neues Polygon vorbereiten // prepare new polygon
basegfx::B2DPolygon aNewPolygon; basegfx::B2DPolygon aNewPolygon;
// Zeiger auf Arrays holen // get pointer to arrays
const awt::Point* pArray = pInnerSequence->getConstArray(); const awt::Point* pArray = pInnerSequence->getConstArray();
const awt::Point* pArrayEnd = pArray + pInnerSequence->getLength(); const awt::Point* pArrayEnd = pArray + pInnerSequence->getLength();
...@@ -1045,7 +1045,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c ...@@ -1045,7 +1045,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c
// check for closed state flag // check for closed state flag
basegfx::tools::checkClosed(aNewPolygon); basegfx::tools::checkClosed(aNewPolygon);
// Neues Teilpolygon einfuegen // add new subpolygon
aRetval.append(aNewPolygon); aRetval.append(aNewPolygon);
} }
...@@ -1091,11 +1091,10 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx ...@@ -1091,11 +1091,10 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx
{ {
drawing::PointSequence* pSequence = (drawing::PointSequence*)rValue.getValue(); drawing::PointSequence* pSequence = (drawing::PointSequence*)rValue.getValue();
// Neues Polygon vorbereiten // prepare new polygon
basegfx::B2DPolygon aNewPolygon; basegfx::B2DPolygon aNewPolygon;
// Zeiger auf Arrays holen // get pointer to arrays
// Zeiger auf Arrays holen
const awt::Point* pArray = pSequence->getConstArray(); const awt::Point* pArray = pSequence->getConstArray();
const awt::Point* pArrayEnd = pArray + pSequence->getLength(); const awt::Point* pArrayEnd = pArray + pSequence->getLength();
...@@ -1107,7 +1106,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx ...@@ -1107,7 +1106,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx
// check for closed state flag // check for closed state flag
basegfx::tools::checkClosed(aNewPolygon); basegfx::tools::checkClosed(aNewPolygon);
// Polygon setzen // set polygon
SetPolygon(basegfx::B2DPolyPolygon(aNewPolygon)); SetPolygon(basegfx::B2DPolyPolygon(aNewPolygon));
return true; return true;
} }
...@@ -1125,12 +1124,12 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo ...@@ -1125,12 +1124,12 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo
if( (sal_uInt32)rRetval.getLength() != rPolyPoly.count() ) if( (sal_uInt32)rRetval.getLength() != rPolyPoly.count() )
rRetval.realloc( rPolyPoly.count() ); rRetval.realloc( rPolyPoly.count() );
// Zeiger auf aeussere Arrays holen // get pointer to external arrays
drawing::PointSequence* pOuterSequence = rRetval.getArray(); drawing::PointSequence* pOuterSequence = rRetval.getArray();
for(sal_uInt32 a(0L); a < rPolyPoly.count(); a++) for(sal_uInt32 a(0L); a < rPolyPoly.count(); a++)
{ {
// Einzelpolygon holen // get single polygon
const basegfx::B2DPolygon aPoly(rPolyPoly.getB2DPolygon(a)); const basegfx::B2DPolygon aPoly(rPolyPoly.getB2DPolygon(a));
// #i75974# take closed stae into account, the API polygon still uses the old closed definition // #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 ...@@ -1139,10 +1138,10 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo
const sal_uInt32 nPointCount(aPoly.count()); const sal_uInt32 nPointCount(aPoly.count());
const bool bIsClosed(aPoly.isClosed()); const bool bIsClosed(aPoly.isClosed());
// Platz in Arrays schaffen // create space in arrays
pOuterSequence->realloc(bIsClosed ? nPointCount + 1 : nPointCount); pOuterSequence->realloc(bIsClosed ? nPointCount + 1 : nPointCount);
// Pointer auf arrays holen // get pointer to arrays
awt::Point* pInnerSequence = pOuterSequence->getArray(); awt::Point* pInnerSequence = pOuterSequence->getArray();
for(sal_uInt32 b(0L); b < nPointCount; b++) for(sal_uInt32 b(0L); b < nPointCount; b++)
...@@ -1170,7 +1169,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx ...@@ -1170,7 +1169,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
{ {
case OWN_ATTR_VALUE_POLYPOLYGON: 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(); const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
drawing::PointSequenceSequence aRetval( rPolyPoly.count() ); drawing::PointSequenceSequence aRetval( rPolyPoly.count() );
...@@ -1195,7 +1194,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx ...@@ -1195,7 +1194,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
} }
case OWN_ATTR_VALUE_POLYGON: 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(); const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
sal_Int32 nCount = 0; sal_Int32 nCount = 0;
...@@ -1206,10 +1205,10 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx ...@@ -1206,10 +1205,10 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
if( nCount > 0 ) if( nCount > 0 )
{ {
// Einzelpolygon holen // get single polygon
const basegfx::B2DPolygon aPoly(rPolyPoly.getB2DPolygon(0L)); const basegfx::B2DPolygon aPoly(rPolyPoly.getB2DPolygon(0L));
// Pointer auf arrays holen // get pointer to arrays
awt::Point* pSequence = aRetval.getArray(); awt::Point* pSequence = aRetval.getArray();
for(sal_Int32 b=0;b<nCount;b++) for(sal_Int32 b=0;b<nCount;b++)
...@@ -1331,7 +1330,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con ...@@ -1331,7 +1330,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
{ {
case OWN_ATTR_VALUE_POLYPOLYGONBEZIER: 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(); const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
drawing::PolyPolygonBezierCoords aRetval; drawing::PolyPolygonBezierCoords aRetval;
basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier(rPolyPoly, aRetval); basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier(rPolyPoly, aRetval);
...@@ -1341,7 +1340,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con ...@@ -1341,7 +1340,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
} }
case OWN_ATTR_BASE_GEOMETRY: 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::B2DPolyPolygon aNewPolyPolygon;
basegfx::B2DHomMatrix aNewHomogenMatrix; basegfx::B2DHomMatrix aNewHomogenMatrix;
mpObj.get()->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon); mpObj.get()->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);
...@@ -1448,11 +1447,11 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte ...@@ -1448,11 +1447,11 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
} }
else else
{ {
// Bitmap in das Objekt packen // pack bitmap in the object
Reference< awt::XBitmap > xBmp( rValue, UNO_QUERY ); Reference< awt::XBitmap > xBmp( rValue, UNO_QUERY );
if( xBmp.is() ) if( xBmp.is() )
{ {
// Bitmap einsetzen // apply bitmap
Graphic aGraphic(VCLUnoHelper::GetBitmap( xBmp )); Graphic aGraphic(VCLUnoHelper::GetBitmap( xBmp ));
static_cast<SdrGrafObj*>(mpObj.get())->SetGraphic(aGraphic); static_cast<SdrGrafObj*>(mpObj.get())->SetGraphic(aGraphic);
bOk = true; bOk = true;
...@@ -1578,7 +1577,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte ...@@ -1578,7 +1577,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte
if(rGraphic.GetType() != GRAPHIC_GDIMETAFILE) 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()) ); Reference< ::com::sun::star::awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap(static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphic().GetBitmapEx()) );
rValue <<= xBitmap; rValue <<= xBitmap;
} }
...@@ -1767,7 +1766,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s ...@@ -1767,7 +1766,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s
{ {
MirrorPoint(aPol[i],aRef1,aRef2); MirrorPoint(aPol[i],aRef1,aRef2);
} }
// Polygon wenden und etwas schieben // turn and move polygon
Polygon aPol0(aPol); Polygon aPol0(aPol);
aPol[0]=aPol0[1]; aPol[0]=aPol0[1];
aPol[1]=aPol0[0]; aPol[1]=aPol0[0];
...@@ -1789,7 +1788,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s ...@@ -1789,7 +1788,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s
{ {
MirrorPoint(aPol[i],aRef1,aRef2); MirrorPoint(aPol[i],aRef1,aRef2);
} }
// Polygon wenden und etwas schieben // turn and move polygon
Polygon aPol0(aPol); Polygon aPol0(aPol);
aPol[0]=aPol0[1]; aPol[0]=aPol0[1];
aPol[1]=aPol0[0]; aPol[1]=aPol0[0];
......
This diff is collapsed.
...@@ -387,9 +387,9 @@ void SvxShape::impl_initFromSdrObject() ...@@ -387,9 +387,9 @@ void SvxShape::impl_initFromSdrObject()
switch(mpImpl->mnObjId) switch(mpImpl->mnObjId)
{ {
case OBJ_CCUT: // Kreisabschnitt case OBJ_CCUT: // segment of circle
case OBJ_CARC: // Kreisbogen case OBJ_CARC: // arc of circle
case OBJ_SECT: // Kreissektor case OBJ_SECT: // sector
mpImpl->mnObjId = OBJ_CIRC; mpImpl->mnObjId = OBJ_CIRC;
break; break;
...@@ -616,22 +616,22 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& ...@@ -616,22 +616,22 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet&
uno::Any* pUsrAny = rPropSet.GetUsrAnyForID(aSrcIt->nWID); uno::Any* pUsrAny = rPropSet.GetUsrAnyForID(aSrcIt->nWID);
if(pUsrAny) if(pUsrAny)
{ {
// Aequivalenten Eintrag in pDst suchen // search for equivalent entry in pDst
const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( aSrcIt->sName ); const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( aSrcIt->sName );
if(pEntry) if(pEntry)
{ {
// entry found // entry found
if(pEntry->nWID >= OWN_ATTR_VALUE_START && pEntry->nWID <= OWN_ATTR_VALUE_END) if(pEntry->nWID >= OWN_ATTR_VALUE_START && pEntry->nWID <= OWN_ATTR_VALUE_END)
{ {
// Special ID im PropertySet, kann nur direkt am // special ID in PropertySet, can only be set
// Objekt gesetzt werden+ // directly at the object
xSet->setPropertyValue( aSrcIt->sName, *pUsrAny); xSet->setPropertyValue( aSrcIt->sName, *pUsrAny);
} }
else else
{ {
if(SfxItemPool::IsWhich(pEntry->nWID)) if(SfxItemPool::IsWhich(pEntry->nWID))
rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID)); rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
// setzen // set
SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet); SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet);
} }
} }
...@@ -1166,7 +1166,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run ...@@ -1166,7 +1166,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run
Point aLocalPos( Position.X, Position.Y ); Point aLocalPos( Position.X, Position.Y );
ForceMetricToItemPoolMetric(aLocalPos); ForceMetricToItemPoolMetric(aLocalPos);
// Position ist absolut, relativ zum Anker stellen // Position is absolut, so recalc to position relativ to anchor
if( mpModel->IsWriter() ) if( mpModel->IsWriter() )
aLocalPos += mpObj->GetAnchorPos(); aLocalPos += mpObj->GetAnchorPos();
...@@ -1711,14 +1711,14 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const ...@@ -1711,14 +1711,14 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
{ {
if(bIsNotPersist) if(bIsNotPersist)
{ {
// Not-Persistent Attribute, hole diese extra // not-persistent attribute, get those extra
mpObj->TakeNotPersistAttr(*pSet, false); mpObj->TakeNotPersistAttr(*pSet, false);
} }
} }
if( pSet->GetItemState( pMap->nWID ) != SfxItemState::SET ) if( pSet->GetItemState( pMap->nWID ) != SfxItemState::SET )
{ {
// Default aus ItemPool holen // get default from ItemPool
if(SfxItemPool::IsWhich(pMap->nWID)) if(SfxItemPool::IsWhich(pMap->nWID))
pSet->Put(mpModel->GetItemPool().GetDefaultItem(pMap->nWID)); pSet->Put(mpModel->GetItemPool().GetDefaultItem(pMap->nWID));
} }
...@@ -1731,7 +1731,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const ...@@ -1731,7 +1731,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
if(bIsNotPersist) if(bIsNotPersist)
{ {
// Not-Persist Attribute extra setzen // set not-persistent attribute extra
mpObj->ApplyNotPersistAttr( *pSet ); mpObj->ApplyNotPersistAttr( *pSet );
delete pSet; delete pSet;
} }
...@@ -1789,14 +1789,14 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) ...@@ -1789,14 +1789,14 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
{ {
if(pMap->nWID >= SDRATTR_NOTPERSIST_FIRST && pMap->nWID <= SDRATTR_NOTPERSIST_LAST) 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); mpObj->TakeNotPersistAttr(aSet, false);
} }
} }
if(!aSet.Count()) if(!aSet.Count())
{ {
// Default aus ItemPool holen // get default from ItemPool
if(SfxItemPool::IsWhich(pMap->nWID)) if(SfxItemPool::IsWhich(pMap->nWID))
aSet.Put(mpModel->GetItemPool().GetDefaultItem(pMap->nWID)); aSet.Put(mpModel->GetItemPool().GetDefaultItem(pMap->nWID));
} }
...@@ -1987,16 +1987,16 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE ...@@ -1987,16 +1987,16 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
drawing::CircleKind eKind; drawing::CircleKind eKind;
switch(mpObj->GetObjIdentifier()) switch(mpObj->GetObjIdentifier())
{ {
case OBJ_CIRC: // Kreis, Ellipse case OBJ_CIRC: // circle, ellipse
eKind = drawing::CircleKind_FULL; eKind = drawing::CircleKind_FULL;
break; break;
case OBJ_CCUT: // Kreisabschnitt case OBJ_CCUT: // segment of circle
eKind = drawing::CircleKind_CUT; eKind = drawing::CircleKind_CUT;
break; break;
case OBJ_CARC: // Kreisbogen case OBJ_CARC: // arc of circle
eKind = drawing::CircleKind_ARC; eKind = drawing::CircleKind_ARC;
break; break;
case OBJ_SECT: // Kreissektor case OBJ_SECT: // sector
eKind = drawing::CircleKind_SECTION; eKind = drawing::CircleKind_SECTION;
break; break;
} }
...@@ -2006,7 +2006,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE ...@@ -2006,7 +2006,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
} }
default: default:
{ {
// Hole Wert aus ItemSet // get value form ItemSet
aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ); aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet );
if( pMap->aType != aAny.getValueType() ) if( pMap->aType != aAny.getValueType() )
...@@ -3079,7 +3079,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) ...@@ -3079,7 +3079,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
return getPropertyValue( aPropertyName ); return getPropertyValue( aPropertyName );
} }
// Default aus ItemPool holen // get default from ItemPool
if(!SfxItemPool::IsWhich(pMap->nWID)) if(!SfxItemPool::IsWhich(pMap->nWID))
throw beans::UnknownPropertyException(); throw beans::UnknownPropertyException();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment