Skip to content

C
core
Kaydet (Commit) 558c6c11 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

writerfilter: make RTFParserState members private, part 5 

Change-Id: Iecab0f89283d182eb51329bb8e8281bedd57950c
Reviewed-on: https://gerrit.libreoffice.org/72558
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst 26c29168
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 35 deletions
writerfilter/source/rtftok/rtfdispatchdestination.cxx
Dosyayı görüntüle @ 558c6c11
......@@ -362,7 +362,7 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
case RTF_DPTXBXTEXT:
{
bool bPictureFrame = false;
for (auto& rProperty : m_aStates.top().aShape.getProperties())
for (auto& rProperty : m_aStates.top().getShape().getProperties())
{
if (rProperty.first == "shapeType"
&& rProperty.second == OUString::number(ESCHER_ShpInst_PictureFrame))
......@@ -383,11 +383,11 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
if (nKeyword == RTF_SHPTXT)
{
if (!m_aStates.top().getCurrentBuffer())
m_pSdrImport->resolve(m_aStates.top().aShape, false,
m_pSdrImport->resolve(m_aStates.top().getShape(), false,
RTFSdrImport::SHAPE);
else
{
auto pValue = new RTFValue(m_aStates.top().aShape);
auto pValue = new RTFValue(m_aStates.top().getShape());
m_aStates.top().getCurrentBuffer()->push_back(
Buf_t(BUFFER_STARTSHAPE, pValue, nullptr));
}
......
writerfilter/source/rtftok/rtfdispatchflag.cxx
Dosyayı görüntüle @ 558c6c11
......@@ -847,10 +847,10 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
// Noop, this is the default in Writer.
break;
case RTF_PNGBLIP:
m_aStates.top().aPicture.eStyle = RTFBmpStyle::PNG;
m_aStates.top().getPicture().eStyle = RTFBmpStyle::PNG;
break;
case RTF_JPEGBLIP:
m_aStates.top().aPicture.eStyle = RTFBmpStyle::JPEG;
m_aStates.top().getPicture().eStyle = RTFBmpStyle::JPEG;
break;
case RTF_POSYT:
m_aStates.top().getFrame().setSprm(NS_ooxml::LN_CT_FramePr_yAlign,
......@@ -1107,13 +1107,13 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
}
break;
case RTF_SHPBXPAGE:
m_aStates.top().aShape.setHoriOrientRelation(text::RelOrientation::PAGE_FRAME);
m_aStates.top().aShape.setHoriOrientRelationToken(
m_aStates.top().getShape().setHoriOrientRelation(text::RelOrientation::PAGE_FRAME);
m_aStates.top().getShape().setHoriOrientRelationToken(
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromH_page);
break;
case RTF_SHPBYPAGE:
m_aStates.top().aShape.setVertOrientRelation(text::RelOrientation::PAGE_FRAME);
m_aStates.top().aShape.setVertOrientRelationToken(
m_aStates.top().getShape().setVertOrientRelation(text::RelOrientation::PAGE_FRAME);
m_aStates.top().getShape().setVertOrientRelationToken(
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_page);
break;
case RTF_DPLINEHOLLOW:
......
writerfilter/source/rtftok/rtfdispatchvalue.cxx
Dosyayı görüntüle @ 558c6c11
......@@ -758,34 +758,34 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
// Ignore this for now, the exporter always emits it with a zero parameter.
break;
case RTF_PICSCALEX:
m_aStates.top().aPicture.nScaleX = nParam;
m_aStates.top().getPicture().nScaleX = nParam;
break;
case RTF_PICSCALEY:
m_aStates.top().aPicture.nScaleY = nParam;
m_aStates.top().getPicture().nScaleY = nParam;
break;
case RTF_PICW:
m_aStates.top().aPicture.nWidth = nParam;
m_aStates.top().getPicture().nWidth = nParam;
break;
case RTF_PICH:
m_aStates.top().aPicture.nHeight = nParam;
m_aStates.top().getPicture().nHeight = nParam;
break;
case RTF_PICWGOAL:
m_aStates.top().aPicture.nGoalWidth = convertTwipToMm100(nParam);
m_aStates.top().getPicture().nGoalWidth = convertTwipToMm100(nParam);
break;
case RTF_PICHGOAL:
m_aStates.top().aPicture.nGoalHeight = convertTwipToMm100(nParam);
m_aStates.top().getPicture().nGoalHeight = convertTwipToMm100(nParam);
break;
case RTF_PICCROPL:
m_aStates.top().aPicture.nCropL = convertTwipToMm100(nParam);
m_aStates.top().getPicture().nCropL = convertTwipToMm100(nParam);
break;
case RTF_PICCROPR:
m_aStates.top().aPicture.nCropR = convertTwipToMm100(nParam);
m_aStates.top().getPicture().nCropR = convertTwipToMm100(nParam);
break;
case RTF_PICCROPT:
m_aStates.top().aPicture.nCropT = convertTwipToMm100(nParam);
m_aStates.top().getPicture().nCropT = convertTwipToMm100(nParam);
break;
case RTF_PICCROPB:
m_aStates.top().aPicture.nCropB = convertTwipToMm100(nParam);
m_aStates.top().getPicture().nCropB = convertTwipToMm100(nParam);
break;
case RTF_SHPWRK:
{
......@@ -822,23 +822,23 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
switch (nParam)
{
case 1:
m_aStates.top().aShape.setWrap(text::WrapTextMode_NONE);
m_aStates.top().getShape().setWrap(text::WrapTextMode_NONE);
break;
case 2:
m_aStates.top().aShape.setWrap(text::WrapTextMode_PARALLEL);
m_aStates.top().getShape().setWrap(text::WrapTextMode_PARALLEL);
break;
case 3:
m_aStates.top().aShape.setWrap(text::WrapTextMode_THROUGH);
m_aStates.top().getShape().setWrap(text::WrapTextMode_THROUGH);
m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_WrapType_wrapNone,
new RTFValue());
break;
case 4:
m_aStates.top().aShape.setWrap(text::WrapTextMode_PARALLEL);
m_aStates.top().getShape().setWrap(text::WrapTextMode_PARALLEL);
m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_WrapType_wrapTight,
new RTFValue());
break;
case 5:
m_aStates.top().aShape.setWrap(text::WrapTextMode_THROUGH);
m_aStates.top().getShape().setWrap(text::WrapTextMode_THROUGH);
break;
}
}
......@@ -1060,19 +1060,19 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
}
break;
case RTF_SHPLEFT:
m_aStates.top().aShape.setLeft(convertTwipToMm100(nParam));
m_aStates.top().getShape().setLeft(convertTwipToMm100(nParam));
break;
case RTF_SHPTOP:
m_aStates.top().aShape.setTop(convertTwipToMm100(nParam));
m_aStates.top().getShape().setTop(convertTwipToMm100(nParam));
break;
case RTF_SHPRIGHT:
m_aStates.top().aShape.setRight(convertTwipToMm100(nParam));
m_aStates.top().getShape().setRight(convertTwipToMm100(nParam));
break;
case RTF_SHPBOTTOM:
m_aStates.top().aShape.setBottom(convertTwipToMm100(nParam));
m_aStates.top().getShape().setBottom(convertTwipToMm100(nParam));
break;
case RTF_SHPZ:
m_aStates.top().aShape.setZ(nParam);
m_aStates.top().getShape().setZ(nParam);
break;
case RTF_FFTYPE:
switch (nParam)
......@@ -1195,7 +1195,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
case RTF_FLYANCHOR:
break;
case RTF_WMETAFILE:
m_aStates.top().aPicture.eWMetafile = nParam;
m_aStates.top().getPicture().eWMetafile = nParam;
break;
case RTF_SB:
putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_spacing,
......@@ -1383,7 +1383,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
break;
case RTF_SHPFBLWTXT:
// Shape is below text -> send it to the background.
m_aStates.top().aShape.setInBackground(nParam != 0);
m_aStates.top().getShape().setInBackground(nParam != 0);
break;
case RTF_CLPADB:
case RTF_CLPADL:
......@@ -1577,7 +1577,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
}
break;
case RTF_DIBITMAP:
m_aStates.top().aPicture.eStyle = RTFBmpStyle::DIBITMAP;
m_aStates.top().getPicture().eStyle = RTFBmpStyle::DIBITMAP;
break;
case RTF_TRWWIDTHA:
m_aStates.top().setTableRowWidthAfter(nParam);
......
writerfilter/source/rtftok/rtfdocumentimpl.hxx
Dosyayı görüntüle @ 558c6c11
......@@ -481,6 +481,8 @@ public:
RunType getRunType() const { return m_eRunType; }
RTFFrame& getFrame() { return m_aFrame; }
RTFDrawingObject& getDrawingObject() { return m_aDrawingObject; }
RTFShape& getShape() { return m_aShape; }
RTFPicture& getPicture() { return m_aPicture; }
RTFDocumentImpl* m_pDocumentImpl;
RTFInternalState nInternalState;
......@@ -529,10 +531,9 @@ public:
/// If aLevelNumbers should be read at all.
bool bLevelNumbersValid;
RTFPicture aPicture;
RTFShape aShape;
private:
RTFPicture m_aPicture;
RTFShape m_aShape;
RTFDrawingObject m_aDrawingObject;
RTFFrame m_aFrame;
......
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