Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi,
Translated German comments in libs-core/svx/source/customshapes.
Made a few other fixes (removed out commented code) along the way.

You can commit the patch under the terms of MPL 1.1 / GPLv3+ / LGPLv3+
triple license.

/Albert
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 2dfdb50..b36a7ab 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -462,7 +462,6 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
             const rtl::OUString        sMirroredY                      ( 
RTL_CONSTASCII_USTRINGPARAM( "MirroredY" ) );
             const rtl::OUString        sSwitched                       ( 
RTL_CONSTASCII_USTRINGPARAM( "Switched" ) );
             const rtl::OUString        sPolar                          ( 
RTL_CONSTASCII_USTRINGPARAM( "Polar" ) );
-//                     const rtl::OUString     sMap                            ( 
RTL_CONSTASCII_USTRINGPARAM( "Map" ) );
             const rtl::OUString        sRefX                           ( 
RTL_CONSTASCII_USTRINGPARAM( "RefX" ) );
             const rtl::OUString        sRefY                           ( 
RTL_CONSTASCII_USTRINGPARAM( "RefY" ) );
             const rtl::OUString        sRefAngle                       ( 
RTL_CONSTASCII_USTRINGPARAM( "RefAngle" ) );
@@ -2141,7 +2140,6 @@ SdrObject* EnhancedCustomShape2d::CreateObject( sal_Bool 
bLineGeometryNeededOnly
     {
         pRet = new SdrRectObj( aLogicRect );
 // SJ: not setting model, so we save a lot of broadcasting and the model is not modified any longer
-//             pRet->SetModel( pCustomShapeObj->GetModel() );
         pRet->SetMergedItemSet( *this );
     }
     if ( !pRet )
@@ -2161,14 +2159,6 @@ void EnhancedCustomShape2d::ApplyGluePoints( SdrObject* pObj )
 
             aGluePoint.SetPos( GetPoint( seqGluePoints[ i ], sal_True, sal_True ) );
             aGluePoint.SetPercent( sal_False );
-
-//                     const Point& rPoint = GetPoint( seqGluePoints[ i ], sal_True, sal_True );
-//                     double fXRel = rPoint.X();
-//                     double fYRel = rPoint.Y();
-//                     fXRel = aLogicRect.GetWidth() == 0 ? 0.0 : fXRel / aLogicRect.GetWidth() * 
10000;
-//                     fYRel = aLogicRect.GetHeight() == 0 ? 0.0 : fYRel / aLogicRect.GetHeight() 
* 10000;
-//                     aGluePoint.SetPos( Point( (sal_Int32)fXRel, (sal_Int32)fYRel ) );
-//                     aGluePoint.SetPercent( sal_True );
             aGluePoint.SetAlign( SDRVERTALIGN_TOP | SDRHORZALIGN_LEFT );
             aGluePoint.SetEscDir( SDRESC_SMART );
             SdrGluePointList* pList = pObj->ForceGluePointList();
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx 
b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 6593e75..8276e78 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -346,8 +346,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
         if ( pAny )
             *pAny >>= eProjectionMode;
         ProjectionType eProjectionType( eProjectionMode == drawing::ProjectionMode_PARALLEL ? 
PR_PARALLEL : PR_PERSPECTIVE );
-
-        // pShape2d Umwandeln in Szene mit 3D Objekt
+        // pShape2d Convert in scenes which include 3D Objects
         E3dDefaultAttributes a3DDefaultAttr;
         a3DDefaultAttr.SetDefaultLatheCharacterMode( TRUE );
         a3DDefaultAttr.SetDefaultExtrudeCharacterMode( TRUE );
@@ -508,7 +507,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             // then we can change the return value
             pRet = pScene;
 
-            // Kameraeinstellungen, Perspektive ...
+            // Camera settings, Perspective ...
             Camera3D& rCamera = (Camera3D&)pScene->GetCamera();
             const basegfx::B3DRange& rVolume = pScene->GetBoundVolume();
             pScene->NbcSetSnapRect( aSnapRect );
@@ -713,14 +712,6 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* 
pCustomS
     drawing::Direction3D aRotationCenterDefault( 0, 0, 0 );    // default seems to be wrong, a 
fractional size of shape has to be used!!
     drawing::Direction3D aRotationCenter( GetDirection3D( rGeometryItem, sRotationCenter, 
aRotationCenterDefault ) );
 
-    // double XCenterInGUnits = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationCenterX, 0 );
-    // double YCenterInGUnits = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationCenterY, 0 );
-
-    // sal_Int32 nRotationXAxisInProz = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAxisX, 100 
);
-    // sal_Int32 nRotationYAxisInProz = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAxisY, 0 );
-    // sal_Int32 nRotationZAxisInProz = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAxisZ, 0 );
-
-
     double fXRotate, fYRotate;
     GetRotateAngle( rGeometryItem, fXRotate, fYRotate );
     double fZRotate = - ((SdrObjCustomShape*)pCustomShape)->GetObjectRotation() * F_PI180;
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx 
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 23cfd5b..957f24c 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -260,7 +260,6 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
             Font aFont;
             aFont.SetHeight( rFWData.nSingleLineHeight );
             aFont.SetAlign( ALIGN_TOP );
-    //         aFont.SetAlign( )
 
             aFont.SetName( rFontItem.GetFamilyName() );
             aFont.SetFamily( rFontItem.GetFamily() );
@@ -797,8 +796,6 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd
     if ( rFWData.vTextAreas.size() )
     {
         pRet = new SdrObjGroup();
-// SJ: not setting model, so we save a lot of broadcasting and the model is not modified any longer
-//             pRet->SetModel( pCustomShape->GetModel() );
         std::vector< FWTextArea >::const_iterator aTextAreaIter = rFWData.vTextAreas.begin();
         std::vector< FWTextArea >::const_iterator aTextAreaIEnd = rFWData.vTextAreas.end();
         while ( aTextAreaIter != aTextAreaIEnd )
@@ -816,8 +813,6 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd
                     while( aOutlineIter != aOutlineIEnd )
                     {
                         SdrObject* pPathObj = new SdrPathObj( OBJ_POLY, 
aOutlineIter->getB2DPolyPolygon() );
-    // SJ: not setting model, so we save a lot of broadcasting and the model is not modified any 
longer
-    //                                 pPathObj->SetModel( pCustomShape->GetModel() );
                         ((SdrObjGroup*)pRet)->GetSubList()->NbcInsertObject( pPathObj );
                         ++aOutlineIter;
                     }
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx 
b/svx/source/customshapes/tbxcustomshapes.cxx
index 4175542..49ff258 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -108,7 +108,7 @@ SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBo
 
 /*************************************************************************
 |*
-|* Benachrichtigung, wenn sich der Applikationsstatus geaendert hat
+|* Notification when the application status has changed
 |*
 \************************************************************************/
 
@@ -120,7 +120,7 @@ void SvxTbxCtlCustomShapes::StateChanged( USHORT nSID, SfxItemState eState,
 
 /*************************************************************************
 |*
-|* Wenn man ein PopupWindow erzeugen will
+|* when one wants to create a popup window
 |*
 \************************************************************************/
 
@@ -131,9 +131,9 @@ SfxPopupWindowType SvxTbxCtlCustomShapes::GetPopupWindowType() const
 
 /*************************************************************************
 |*
-|* Hier wird das Fenster erzeugt
-|* Lage der Toolbox mit GetToolBox() abfragbar
-|* rItemRect sind die Screen-Koordinaten
+|* Here is the window created
+|* The location of the Toolbox is queried through GetToolBox()
+|* rItemRect are the screen coordinates
 |*
 \************************************************************************/
 
@@ -157,7 +157,7 @@ void SvxTbxCtlCustomShapes::Select( BOOL /*bMod1*/ )
 
 ::sal_Bool SAL_CALL SvxTbxCtlCustomShapes::opensSubToolbar() throw 
(::com::sun::star::uno::RuntimeException)
 {
-    // We control a sub-toolbar therefor, we have to return true.
+    // We control a sub-toolbar therefore we have to return true.
     return sal_True;
 }
 

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.