diff options
| -rw-r--r-- | svx/qa/unit/customshapes.cxx | 2 | ||||
| -rw-r--r-- | svx/qa/unit/svdraw.cxx | 6 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape3d.cxx | 6 | ||||
| -rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx index bcce0ad7b458..bfec1f0141cf 100644 --- a/svx/qa/unit/customshapes.cxx +++ b/svx/qa/unit/customshapes.cxx @@ -223,7 +223,7 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf145700_3D_FrontLightDim) // Read bitmap and test color // The expected values are taken from an image generated by Word - // Without the changed methods the nColorDistance was 476 and 173 respecitively. + // Without the changed methods the nColorDistance was 476 and 173 respectively. SvFileStream aFileStream(aTempFile.GetURL(), StreamMode::READ); vcl::PngImageReader aPNGReader(aFileStream); BitmapEx aBMPEx = aPNGReader.read(); diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx index 275f75507d64..a063ef7d479f 100644 --- a/svx/qa/unit/svdraw.cxx +++ b/svx/qa/unit/svdraw.cxx @@ -398,7 +398,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testFontWorks) assertXPath(pXmlDoc, "//scene", "projectionMode", "Perspective"); assertXPath(pXmlDoc, "//scene/extrude3D[1]/fill", "color", "#ff0000"); assertXPath(pXmlDoc, "//scene/extrude3D[1]/object3Dattributes/material", "color", "#ff0000"); - // ODF default 50% is repesented by Specular Intensity = 2^5. The relationship is not linear. + // ODF default 50% is represented by Specular Intensity = 2^5. The relationship is not linear. assertXPath(pXmlDoc, "//scene/extrude3D[1]/object3Dattributes/material", "specularIntensity", "32"); } @@ -471,11 +471,11 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testMaterialSpecular) CPPUNIT_ASSERT(pXmlDoc); // 3D specular color is derived from properties 'extrusion-specularity' and 'extrusion-first-light - // -level'. 3D specularIntensity is dervied from property 'draw:extrusion-shininess'. Both are + // -level'. 3D specularIntensity is derived from property 'draw:extrusion-shininess'. Both are // object properties, not scene properties. Those were wrong in various forms before the patch. // Specularity = 77% * first-light-level 67% = 0.5159, which corresponds to gray color #848484. assertXPath(pXmlDoc, "(//material)[1]", "specular", "#848484"); - // extrusion-shinines 50% corresponds to 3D specularIntensity 32, use 2^(50/10). + // extrusion-shininess 50% corresponds to 3D specularIntensity 32, use 2^(50/10). assertXPath(pXmlDoc, "(//material)[1]", "specularIntensity", "32"); // extrusion-first-light-level 67% corresponds to gray color #ababab, use 255 * 0.67. assertXPath(pXmlDoc, "(//light)[1]", "color", "#ababab"); diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 0d8078fe6bd3..92ce3437228f 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -783,8 +783,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( // Light Intensity - // For "FirstLight" the 3D-Scene light "1" is regulary used. In case of surface "Matte" - // the light 4 is used instead. For "SecondLight" the 3D-Scene light "2" is regulary used. + // For "FirstLight" the 3D-Scene light "1" is regularly used. In case of surface "Matte" + // the light 4 is used instead. For "SecondLight" the 3D-Scene light "2" is regularly used. // In case first or second light is not harsh, the lights 5 to 8 are used in addition // to get a soft light appearance. // The 3D-Scene light "3" is currently not used. @@ -892,7 +892,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( // ToDo: How to handle fAmbientIntensity larger 1.0 ? Perhaps lighten object color? - // Now set the regulary 3D-scene light attributes. + // Now set the regularly 3D-scene light attributes. Color aAmbientColor(basegfx::BColor(fAmbientIntensity).clamp()); pScene->GetProperties().SetObjectItem(makeSvx3DAmbientcolorItem(aAmbientColor)); diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index a3247cc02666..3e0273c2862c 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -383,7 +383,7 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r case 4: // metal MS Office if (basegfx::fTools::equalZero(fOldSpecularity, 0.0001)) // MS Office uses 80000/65536. That is currently not allowed in ODF. - // But the ODF error will be catched in xmloff. + // But the ODF error will be caught in xmloff. fSpecularity = 80000.0 / 655.36; // interpreted as % break; } |