mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:datamembershadow in xmloff

Browse Source 
Change-Id: Ibea23b1757be1ec007f48261130aad74ce750cfc
Reviewed-on: https://gerrit.libreoffice.org/30925
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2016-11-17 10:23:00 +02:00
parent c1e0dffbe2
commit f4e24dd79c
5 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/xmloff/xmlimp.hxx
View File

@@ -206,9 +206,9 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper8<
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList);
void Characters(const OUString& aChars); void Characters(const OUString& aChars);
protected:
css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
protected:
bool mbIsFormsSupported; bool mbIsFormsSupported;
bool mbIsTableShapeSupported; bool mbIsTableShapeSupported;
bool mbIsGraphicLoadOnDemandSupported; bool mbIsGraphicLoadOnDemandSupported;

3
xmloff/inc/txtvfldi.hxx
View File

@@ -234,11 +234,8 @@ protected:
/*** import text input fields (<text:text-input>) */ /*** import text input fields (<text:text-input>) */
class XMLTextInputFieldImportContext : public XMLVarFieldImportContext class XMLTextInputFieldImportContext : public XMLVarFieldImportContext
{ {
const OUString sPropertyContent;
public: public:
XMLTextInputFieldImportContext( XMLTextInputFieldImportContext(
SvXMLImport& rImport, /// XML Import SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper XMLTextImportHelper& rHlp, /// Text import helper

12
xmloff/source/draw/ximp3dobject.cxx
View File

@@ -193,7 +193,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
uno::Reference< drawing::XShapes >& rShapes) uno::Reference< drawing::XShapes >& rShapes)
: SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ),
maCenter(0.0, 0.0, 0.0), maCenter(0.0, 0.0, 0.0),
maSize(5000.0, 5000.0, 5000.0), maSphereSize(5000.0, 5000.0, 5000.0),
mbCenterUsed(false), mbCenterUsed(false),
mbSizeUsed(false) mbSizeUsed(false)
{ {
@@ -225,9 +225,9 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
::basegfx::B3DVector aNewVec; ::basegfx::B3DVector aNewVec;
SvXMLUnitConverter::convertB3DVector(aNewVec, sValue); SvXMLUnitConverter::convertB3DVector(aNewVec, sValue);
if(aNewVec != maSize) if(aNewVec != maSphereSize)
{ {
maSize = aNewVec; maSphereSize = aNewVec;
mbSizeUsed = true; mbSizeUsed = true;
} }
break; break;
@@ -262,9 +262,9 @@ void SdXML3DSphereObjectShapeContext::StartElement(const uno::Reference< xml::sa
aPosition3D.PositionY = maCenter.getY(); aPosition3D.PositionY = maCenter.getY();
aPosition3D.PositionZ = maCenter.getZ(); aPosition3D.PositionZ = maCenter.getZ();
aDirection3D.DirectionX = maSize.getX(); aDirection3D.DirectionX = maSphereSize.getX();
aDirection3D.DirectionY = maSize.getY(); aDirection3D.DirectionY = maSphereSize.getY();
aDirection3D.DirectionZ = maSize.getZ(); aDirection3D.DirectionZ = maSphereSize.getZ();
xPropSet->setPropertyValue("D3DPosition", uno::Any(aPosition3D)); xPropSet->setPropertyValue("D3DPosition", uno::Any(aPosition3D));
xPropSet->setPropertyValue("D3DSize", uno::Any(aDirection3D)); xPropSet->setPropertyValue("D3DSize", uno::Any(aDirection3D));

2
xmloff/source/draw/ximp3dobject.hxx
View File

@@ -76,7 +76,7 @@ public:
class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext
{ {
::basegfx::B3DVector maCenter; ::basegfx::B3DVector maCenter;
::basegfx::B3DVector maSize; ::basegfx::B3DVector maSphereSize;
bool mbCenterUsed; bool mbCenterUsed;
bool mbSizeUsed; bool mbSizeUsed;

3
xmloff/source/text/txtvfldi.cxx
View File

@@ -586,8 +586,7 @@ XMLTextInputFieldImportContext::XMLTextInputFieldImportContext(
true, true, true, true, true, true,
false, false, false, false,
false, false, false, false, false, false,
false), false)
sPropertyContent(sAPI_content)
{ {
bValid = true; // always valid bValid = true; // always valid
} }