summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/docxattributeoutput.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.hxx')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx86
1 files changed, 43 insertions, 43 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 8763530a6aff..b7ce59d29db5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -155,7 +155,7 @@ public:
virtual void EmptyParagraph() SAL_OVERRIDE;
/// Called in order to output section breaks.
- virtual void SectionBreaks(const SwTxtNode& rNode) SAL_OVERRIDE;
+ virtual void SectionBreaks(const SwTextNode& rNode) SAL_OVERRIDE;
/// Called before we start outputting the attributes.
virtual void StartParagraphProperties() SAL_OVERRIDE;
@@ -188,7 +188,7 @@ public:
virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
/// Output ruby start.
- virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) SAL_OVERRIDE;
+ virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) SAL_OVERRIDE;
/// Output ruby end.
virtual void EndRuby() SAL_OVERRIDE;
@@ -199,7 +199,7 @@ public:
/// Output URL end.
virtual bool EndURL(bool) SAL_OVERRIDE;
- virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) SAL_OVERRIDE;
+ virtual void FieldVanish( const OUString& rText, ww::eField eType ) SAL_OVERRIDE;
/// Output redlining.
///
@@ -222,7 +222,7 @@ public:
virtual bool IsFlyProcessingPostponed() SAL_OVERRIDE;
virtual void ResetFlyProcessingFlag() SAL_OVERRIDE;
- virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
+ virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
/// Output style.
virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE;
@@ -282,7 +282,7 @@ public:
virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
/// Numbering rule and Id.
- virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ) SAL_OVERRIDE;
+ virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat &rNFormat, const SwFormat &rFormat ) SAL_OVERRIDE;
/// Page break
/// As a paragraph property - the paragraph should be on the next page.
@@ -308,7 +308,7 @@ public:
virtual void SectionTitlePage() SAL_OVERRIDE;
/// Description of the page borders.
- virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) SAL_OVERRIDE;
+ virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) SAL_OVERRIDE;
/// Columns populated from right/numbers on the right side?
virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE;
@@ -365,7 +365,7 @@ public:
const OUString &rNumberingString,
const SvxBrushItem* pBrush = 0 ) SAL_OVERRIDE;
- void WriteField_Impl( const SwField* pFld, ww::eField eType, const OUString& rFldCmd, sal_uInt8 nMode );
+ void WriteField_Impl( const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode );
void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark );
void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds );
@@ -407,13 +407,13 @@ private:
/// replacement graphics, set the first as 0, and pass the remaining three.
///
/// @see WriteOLE2Obj()
- void FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt = 0, SwOLENode* pOLENode = 0, const SdrObject* pSdrObj = 0);
+ void FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat = 0, SwOLENode* pOLENode = 0, const SdrObject* pSdrObj = 0);
void WriteSrcRect( const SdrObject* pSdrObj );
- void WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrmFmt* pFlyFrmFmt);
+ void WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat);
bool WriteOLEChart( const SdrObject* pSdrObj, const Size& rSize );
bool WriteOLEMath( const SdrObject* pSdrObj, const SwOLENode& rNode, const Size& rSize );
- bool PostponeOLE( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrmFmt* pFlyFrmFmt );
- void WriteOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrmFmt* rFlyFrmFmt );
+ bool PostponeOLE( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat );
+ void WriteOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* rFlyFrameFormat );
/// checks whether the current component is a diagram
static bool IsDiagram (const SdrObject* sdrObject);
@@ -427,8 +427,8 @@ private:
void EndTableRow( );
void EndTable();
void SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_t pInner, sal_Int32 nCell, sal_uInt32 nRow);
- void PopulateFrameProperties(const SwFrmFmt* pFrmFmt, const Size& rSize);
- static bool TextBoxIsFramePr(const SwFrmFmt& rFrmFmt);
+ void PopulateFrameProperties(const SwFrameFormat* pFrameFormat, const Size& rSize);
+ static bool TextBoxIsFramePr(const SwFrameFormat& rFrameFormat);
/// End cell, row, and even the entire table if necessary.
void FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph = false );
@@ -449,7 +449,7 @@ private:
protected:
/// Output frames - the implementation.
- virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) SAL_OVERRIDE;
+ virtual void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_CASEMAP
virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) SAL_OVERRIDE;
@@ -560,13 +560,13 @@ protected:
virtual void CharHighlight( const SvxBrushItem& rHighlight ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_INETFMT
- virtual void TextINetFormat( const SwFmtINetFmt& ) SAL_OVERRIDE;
+ virtual void TextINetFormat( const SwFormatINetFormat& ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_CHARFMT
- virtual void TextCharFormat( const SwFmtCharFmt& ) SAL_OVERRIDE;
+ virtual void TextCharFormat( const SwFormatCharFormat& ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_FTN
- virtual void TextFootnote_Impl( const SwFmtFtn& ) SAL_OVERRIDE;
+ virtual void TextFootnote_Impl( const SwFormatFootnote& ) SAL_OVERRIDE;
/// Output the footnote/endnote reference (if there's one to output).
void FootnoteEndnoteReference();
@@ -578,7 +578,7 @@ protected:
virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SPLIT
- virtual void ParaSplit( const SvxFmtSplitItem& rSplit ) SAL_OVERRIDE;
+ virtual void ParaSplit( const SvxFormatSplitItem& rSplit ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_WIDOWS
virtual void ParaWidows( const SvxWidowsItem& rWidows ) SAL_OVERRIDE;
@@ -590,7 +590,7 @@ protected:
virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_NUMRULE
- virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
+ virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SCRIPTSPACE
virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE;
@@ -608,7 +608,7 @@ protected:
virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE;
/// Sfx item RES_FRM_SIZE
- virtual void FormatFrameSize( const SwFmtFrmSize& ) SAL_OVERRIDE;
+ virtual void FormatFrameSize( const SwFormatFrmSize& ) SAL_OVERRIDE;
/// Sfx item RES_PAPER_BIN
virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE;
@@ -620,16 +620,16 @@ protected:
virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) SAL_OVERRIDE;
/// Sfx item RES_SURROUND
- virtual void FormatSurround( const SwFmtSurround& ) SAL_OVERRIDE;
+ virtual void FormatSurround( const SwFormatSurround& ) SAL_OVERRIDE;
/// Sfx item RES_VERT_ORIENT
- virtual void FormatVertOrientation( const SwFmtVertOrient& ) SAL_OVERRIDE;
+ virtual void FormatVertOrientation( const SwFormatVertOrient& ) SAL_OVERRIDE;
/// Sfx item RES_HORI_ORIENT
- virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) SAL_OVERRIDE;
+ virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) SAL_OVERRIDE;
/// Sfx item RES_ANCHOR
- virtual void FormatAnchor( const SwFmtAnchor& ) SAL_OVERRIDE;
+ virtual void FormatAnchor( const SwFormatAnchor& ) SAL_OVERRIDE;
/// Sfx item RES_BACKGROUND
virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE;
@@ -644,16 +644,16 @@ protected:
virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE;
/// Sfx item RES_COL
- virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
+ virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
/// Sfx item RES_KEEP
- virtual void FormatKeep( const SvxFmtKeepItem& ) SAL_OVERRIDE;
+ virtual void FormatKeep( const SvxFormatKeepItem& ) SAL_OVERRIDE;
/// Sfx item RES_TEXTGRID
virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE;
/// Sfx item RES_LINENUMBER
- virtual void FormatLineNumbering( const SwFmtLineNumber& ) SAL_OVERRIDE;
+ virtual void FormatLineNumbering( const SwFormatLineNumber& ) SAL_OVERRIDE;
/// Sfx item RES_FRAMEDIR
virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE;
@@ -668,14 +668,14 @@ protected:
virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE;
/// Write the expanded field
- virtual void WriteExpand( const SwField* pFld ) SAL_OVERRIDE;
+ virtual void WriteExpand( const SwField* pField ) SAL_OVERRIDE;
- virtual void RefField( const SwField& rFld, const OUString& rRef ) SAL_OVERRIDE;
- virtual void HiddenField( const SwField& rFld ) SAL_OVERRIDE;
- virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
- virtual void PostitField( const SwField* pFld ) SAL_OVERRIDE;
- virtual bool DropdownField( const SwField* pFld ) SAL_OVERRIDE;
- virtual bool PlaceholderField( const SwField* pFld ) SAL_OVERRIDE;
+ virtual void RefField( const SwField& rField, const OUString& rRef ) SAL_OVERRIDE;
+ virtual void HiddenField( const SwField& rField ) SAL_OVERRIDE;
+ virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
+ virtual void PostitField( const SwField* pField ) SAL_OVERRIDE;
+ virtual bool DropdownField( const SwField* pField ) SAL_OVERRIDE;
+ virtual bool PlaceholderField( const SwField* pField ) SAL_OVERRIDE;
virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE;
@@ -822,29 +822,29 @@ private:
struct PostponedGraphic
{
- PostponedGraphic( const SwGrfNode* n, Size s, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode, const SdrObject* sObj )
- : grfNode( n ), size( s ), mOLEFrmFmt( pOLEFrmFmt ), mOLENode( pOLENode ), pSdrObj(sObj) {};
+ PostponedGraphic( const SwGrfNode* n, Size s, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* sObj )
+ : grfNode( n ), size( s ), mOLEFrameFormat( pOLEFrameFormat ), mOLENode( pOLENode ), pSdrObj(sObj) {};
const SwGrfNode* grfNode;
Size size;
- const SwFlyFrmFmt* mOLEFrmFmt;
+ const SwFlyFrameFormat* mOLEFrameFormat;
SwOLENode* mOLENode;
const SdrObject* pSdrObj;
};
std::unique_ptr< std::list<PostponedGraphic> > m_pPostponedGraphic;
struct PostponedDiagram
{
- PostponedDiagram( const SdrObject* o, const SwFrmFmt* frm ) : object( o ), frame( frm ) {};
+ PostponedDiagram( const SdrObject* o, const SwFrameFormat* frm ) : object( o ), frame( frm ) {};
const SdrObject* object;
- const SwFrmFmt* frame;
+ const SwFrameFormat* frame;
};
std::unique_ptr< std::list<PostponedDiagram> > m_pPostponedDiagrams;
struct PostponedDrawing
{
- PostponedDrawing( const SdrObject* sdrObj, const SwFrmFmt* frm, const Point* pt ) : object( sdrObj ), frame( frm ), point( pt ) {};
+ PostponedDrawing( const SdrObject* sdrObj, const SwFrameFormat* frm, const Point* pt ) : object( sdrObj ), frame( frm ), point( pt ) {};
const SdrObject* object;
- const SwFrmFmt* frame;
+ const SwFrameFormat* frame;
const Point* point;
};
std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedVMLDrawings;
@@ -853,10 +853,10 @@ private:
struct PostponedOLE
{
- PostponedOLE( SwOLENode* rObject, const Size& rSize, const SwFlyFrmFmt* rFrame ) : object( rObject ), size( rSize ), frame( rFrame ) {};
+ PostponedOLE( SwOLENode* rObject, const Size& rSize, const SwFlyFrameFormat* rFrame ) : object( rObject ), size( rSize ), frame( rFrame ) {};
SwOLENode* object;
const Size size;
- const SwFlyFrmFmt* frame;
+ const SwFlyFrameFormat* frame;
};
std::unique_ptr< std::list<PostponedOLE> > m_pPostponedOLEs;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 12:14:55 +0000