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

Attached please find the patch for attributeoutputbase.hxx to remove extra lines :) 
From 5fffeca158bd90c63027c88ad0ae84a982749306 Mon Sep 17 00:00:00 2001
From: jonathan aquilina <jaquilina@eagleeyet.net>
Date: Sun, 23 Jan 2011 22:02:04 +0100
Subject: [PATCH] removal of extra lines

---
 sw/source/filter/ww8/attributeoutputbase.hxx |  147 --------------------------
 1 files changed, 0 insertions(+), 147 deletions(-)

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 45a1574..a72db4f 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -31,15 +31,12 @@
 
 #include "fields.hxx"
 #include "WW8TableInfo.hxx"
-
 #include <rtl/textenc.h>
 #include <editeng/svxenum.hxx>
 #include <tools/solar.h>
-
 #include <swtypes.hxx>
 #include <wrtswtbl.hxx>
 #include <fldbas.hxx>
-
 #include <vector>
 
 class Point;
@@ -125,13 +122,10 @@ struct WW8_PdAttrDesc;
 class SwLineNumberInfo;
 class SwNumRule;
 class wwFont;
-
 class String;
-
 class MSWordExportBase;
 
 namespace sw { class Frame; }
-
 namespace msword {
     const BYTE ColumnBreak = 0xE;
     const BYTE PageBreak   = 0xC;
@@ -142,176 +136,115 @@ class AttributeOutputBase
 public:
     /// Export the state of RTL/CJK.
     virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) = 0;
-
     /// Start of the paragraph.
     virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ) = 0;
-
     /// End of the paragraph.
     virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) = 0;
-
     /// Called before we start outputting the attributes.
     virtual void StartParagraphProperties( const SwTxtNode& rNode ) = 0;
-
     /// Called after we end outputting the attributes.
     virtual void EndParagraphProperties() = 0;
-
     /// Empty paragraph.
     virtual void EmptyParagraph() = 0;
-
     /// Start of the text run.
     virtual void StartRun( const SwRedlineData* pRedlineData ) = 0;
-
     /// End of the text run.
     virtual void EndRun() = 0;
-
     /// Called before we start outputting the attributes.
     virtual void StartRunProperties() = 0;
-
     /// Called after we end outputting the attributes.
     virtual void EndRunProperties( const SwRedlineData* pRedlineData ) = 0;
-
     /// Output text (inside a run).
     virtual void RunText( const String& rText, rtl_TextEncoding eCharSet ) = 0;
-
     /// Output text (without markup).
     virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) = 0;
-
     /// Output ruby start.
     virtual void StartRuby( const SwTxtNode& rNode, xub_StrLen nPos, const SwFmtRuby& rRuby ) = 0;
-
     /// Output ruby end.
     virtual void EndRuby() = 0;
-
     /// Output URL start.
     virtual bool StartURL( const String& rUrl, const String& rTarget ) = 0;
-
     /// Output URL end.
     virtual bool EndURL() = 0;
-
     virtual void FieldVanish( const String& rTxt, ww::eField eType ) = 0;
-
     void StartTOX( const SwSection& rSect );
-
     void EndTOX( const SwSection& rSect );
-
     virtual void TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAttr );
-
     /// Output redlining.
     virtual void Redline( const SwRedlineData* pRedline ) = 0;
-
     virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, USHORT nStyle, 
ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t 
pTextNodeInfoInner ) = 0;
-
     /// Output FKP (Formatted disK Page) - necessary for binary formats only.
     /// FIXME having it in AttributeOutputBase is probably a hack, it
     /// should be in WW8AttributeOutput only...
     virtual void OutputFKP() {}
-
     /// Output style.
     virtual void ParagraphStyle( USHORT nStyle ) = 0;
-
     virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 0;
-
     virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 0;
-
     virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 0;
-
     virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 
0;
-
     virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 0;
-
     virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 0;
-
     virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 0;
-
     virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 0;
-
     virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 0;
-
     virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) = 0;
-
     virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) = 0;
-
     virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) 
= 0;
-
     virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) = 0;
-
     virtual void TableRowEnd( sal_uInt32 nDepth ) = 0;
-
     /// Start of the styles table.
     virtual void StartStyles() = 0;
-
     /// End of the styles table.
     virtual void EndStyles( USHORT nNumberOfStyles ) = 0;
-
     /// Write default style.
     virtual void DefaultStyle( USHORT nStyle ) = 0;
-
     /// Start of a style in the styles table.
     virtual void StartStyle( const String& rName, bool bPapFmt,
             USHORT nBase, USHORT nNext, USHORT nWwId, USHORT nId,
             bool bAutoUpdate ) = 0;
-
     /// End of a style in the styles table.
     virtual void EndStyle() = 0;
-
     /// Start of (paragraph or run) properties of a style.
     virtual void StartStyleProperties( bool bParProp, USHORT nStyle ) = 0;
-
     /// End of (paragraph or run) properties of a style.
     virtual void EndStyleProperties( bool bParProp ) = 0;
-
     /// Numbering rule and Id.
     virtual void OutlineNumbering( BYTE nLvl, const SwNumFmt& rNFmt, const SwFmt& rFmt ) = 0;
-
     /// Page break
     /// As a paragraph property - the paragraph should be on the next page.
     virtual void PageBreakBefore( bool bBreak ) = 0;
-
     /// Write a section break
     /// msword::ColumnBreak or msword::PageBreak
     virtual void SectionBreak( BYTE nC, const WW8_SepInfo* pSectionInfo = NULL ) = 0;
-
     /// Start of the section properties.
     virtual void StartSection() = 0;
-
     /// End of the section properties.
     virtual void EndSection() = 0;
-
     /// Protection of forms.
     virtual void SectionFormProtection( bool bProtected ) = 0;
-
     /// Numbering of the lines in the document.
     virtual void SectionLineNumbering( ULONG nRestartNo, const SwLineNumberInfo& rLnNumInfo ) = 0;
-
     /// Has different headers/footers for the title page.
     virtual void SectionTitlePage() = 0;
-
     /// Description of the page borders.
     virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) = 0;
-
     /// Columns populated from right/numbers on the right side?
     virtual void SectionBiDi( bool bBiDi ) = 0;
-
     /// The style of the page numbers.
     ///
     /// nPageRestartNumberr being 0 means no restart.
     virtual void SectionPageNumbering( USHORT nNumType, USHORT nPageRestartNumber ) = 0;
-
     /// The type of breaking.
     virtual void SectionType( BYTE nBreakCode ) = 0;
-
     /// Special header/footer flags, needed for old versions only.
     virtual void SectionWW6HeaderFooterFlags( BYTE /*nHeadFootFlags*/ ) {}
-
     /// Definition of a numbering instance.
     virtual void NumberingDefinition( USHORT nId, const SwNumRule &rRule ) = 0;
-
     /// Start of the abstract numbering definition instance.
     virtual void StartAbstractNumbering( USHORT /*nId*/ ) {}
-
     /// End of the abstract numbering definition instance.
     virtual void EndAbstractNumbering() {}
-
     /// All the numbering level information.
     virtual void NumberingLevel( BYTE nLevel,
         USHORT nStart,
@@ -329,231 +262,157 @@ public:
 protected:
 
     void GetNumberPara( String& rStr, const SwField& rFld );
-
     /// Output frames - the implementation.
     virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) = 0;
-
     /// Sfx item Sfx item RES_CHRATR_CASEMAP
     virtual void CharCaseMap( const SvxCaseMapItem& ) = 0;
-
     /// Sfx item Sfx item RES_CHRATR_COLOR
     virtual void CharColor( const SvxColorItem& ) = 0;
-
     /// Sfx item Sfx item RES_CHRATR_CONTOUR
     virtual void CharContour( const SvxContourItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CROSSEDOUT
     virtual void CharCrossedOut( const SvxCrossedOutItem& ) = 0;
-
     /// Sfx item RES_CHRATR_ESCAPEMENT
     virtual void CharEscapement( const SvxEscapementItem& ) = 0;
-
     /// Sfx item RES_CHRATR_FONT
     virtual void CharFont( const SvxFontItem& ) = 0;
-
     /// Sfx item RES_CHRATR_FONTSIZE
     virtual void CharFontSize( const SvxFontHeightItem& ) = 0;
-
     /// Sfx item RES_CHRATR_KERNING
     virtual void CharKerning( const SvxKerningItem& ) = 0;
-
     /// Sfx item RES_CHRATR_LANGUAGE
     virtual void CharLanguage( const SvxLanguageItem& ) = 0;
-
     /// Sfx item RES_CHRATR_POSTURE
     virtual void CharPosture( const SvxPostureItem& ) = 0;
-
     /// Sfx item RES_CHRATR_SHADOWED
     virtual void CharShadow( const SvxShadowedItem& ) = 0;
-
     /// Sfx item RES_CHRATR_UNDERLINE
     virtual void CharUnderline( const SvxUnderlineItem& ) = 0;
-
     /// Sfx item RES_CHRATR_WEIGHT
     virtual void CharWeight( const SvxWeightItem& ) = 0;
-
     /// Sfx item RES_CHRATR_AUTOKERN
     virtual void CharAutoKern( const SvxAutoKernItem& ) = 0;
-
     /// Sfx item RES_CHRATR_BLINK
     virtual void CharAnimatedText( const SvxBlinkItem& ) = 0;
-
     /// Sfx item RES_CHRATR_BACKGROUND
     virtual void CharBackground( const SvxBrushItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CJK_FONT
     virtual void CharFontCJK( const SvxFontItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CJK_FONTSIZE
     virtual void CharFontSizeCJK( const SvxFontHeightItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CJK_LANGUAGE
     virtual void CharLanguageCJK( const SvxLanguageItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CJK_POSTURE
     virtual void CharPostureCJK( const SvxPostureItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CJK_WEIGHT
     virtual void CharWeightCJK( const SvxWeightItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CTL_FONT
     virtual void CharFontCTL( const SvxFontItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CTL_FONTSIZE
     virtual void CharFontSizeCTL( const SvxFontHeightItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CTL_LANGUAGE
     virtual void CharLanguageCTL( const SvxLanguageItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CTL_POSTURE
     virtual void CharPostureCTL( const SvxPostureItem& ) = 0;
-
     /// Sfx item RES_CHRATR_CTL_WEIGHT
     virtual void CharWeightCTL( const SvxWeightItem& ) = 0;
-
     /// Sfx item RES_CHRATR_ROTATE
     virtual void CharRotate( const SvxCharRotateItem& ) = 0;
-
     /// Sfx item RES_CHRATR_EMPHASIS_MARK
     virtual void CharEmphasisMark( const SvxEmphasisMarkItem& ) = 0;
-
     /// Sfx item RES_CHRATR_TWO_LINES
     virtual void CharTwoLines( const SvxTwoLinesItem& ) = 0;
-
     /// Sfx item RES_CHRATR_SCALEW
     virtual void CharScaleWidth( const SvxCharScaleWidthItem& ) = 0;
-
     /// Sfx item RES_CHRATR_RELIEF
     virtual void CharRelief( const SvxCharReliefItem& ) = 0;
-
     /// Sfx item RES_CHRATR_HIDDEN
     virtual void CharHidden( const SvxCharHiddenItem& ) = 0;
-
     /// Sfx item RES_TXTATR_INETFMT
     virtual void TextINetFormat( const SwFmtINetFmt& ) = 0;
-
     /// Sfx item RES_TXTATR_CHARFMT
     virtual void TextCharFormat( const SwFmtCharFmt& ) = 0;
-
     /// Sfx item RES_TXTATR_FIELD
     void TextField( const SwFmtFld& );
-
     /// Sfx item RES_TXTATR_FLYCNT
     virtual void TextFlyContent( const SwFmtFlyCnt& );
-
     /// Sfx item RES_TXTATR_FTN
     ///
     /// This one is common for both WW8AttributeOutput as well as
     /// DocxAttributeOutput.
     void TextFootnote( const SwFmtFtn& );
-
     /// Sfx item RES_TXTATR_FTN
     virtual void TextFootnote_Impl( const SwFmtFtn& ) = 0;
-
     /// Sfx item RES_PARATR_LINESPACING
     void ParaLineSpacing( const SvxLineSpacingItem& );
-
     /// Count the values in ParaLineSpacing, and pass theme here.
     virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) = 0;
-
     /// Sfx item RES_PARATR_ADJUST
     virtual void ParaAdjust( const SvxAdjustItem& ) = 0;
-
     /// Sfx item RES_PARATR_SPLIT
     virtual void ParaSplit( const SvxFmtSplitItem& ) = 0;
-
     /// Sfx item RES_PARATR_WIDOWS
     virtual void ParaWidows( const SvxWidowsItem& ) = 0;
-
     /// Sfx item RES_PARATR_TABSTOP
     virtual void ParaTabStop( const SvxTabStopItem& ) = 0;
-
     /// Sfx item RES_PARATR_HYPHENZONE
     virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) = 0;
-
     /// Sfx item RES_PARATR_NUMRULE
     void ParaNumRule( const SwNumRuleItem& );
-
     /// Numbering - the implementation.
     virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) = 0;
-
     /// Sfx item RES_PARATR_SCRIPTSPACE
     virtual void ParaScriptSpace( const SfxBoolItem& ) = 0;
-
     /// Sfx item RES_PARATR_HANGINGPUNCTUATION
     void ParaHangingPunctuation( const SfxBoolItem& rHt ) { ParaScriptSpace( rHt ); };
-
     /// Sfx item RES_PARATR_FORBIDDEN_RULES
     void ParaForbiddenRules( const SfxBoolItem& rHt ) { ParaScriptSpace( rHt ); };
-
     /// Sfx item RES_PARATR_VERTALIGN
     virtual void ParaVerticalAlign( const SvxParaVertAlignItem& ) = 0;
-
     /// Sfx item RES_PARATR_SNAPTOGRID
     virtual void ParaSnapToGrid( const SvxParaGridItem& ) = 0;
-
     /// Sfx item RES_FRM_SIZE
     virtual void FormatFrameSize( const SwFmtFrmSize& ) = 0;
-
     /// Sfx item RES_PAPER_BIN
     virtual void FormatPaperBin( const SvxPaperBinItem& ) = 0;
-
     /// Sfx item RES_LR_SPACE
     virtual void FormatLRSpace( const SvxLRSpaceItem& ) = 0;
-
     /// Sfx item RES_UL_SPACE
     virtual void FormatULSpace( const SvxULSpaceItem& ) = 0;
-
     /// Sfx item RES_PAGEDESC
     void FormatPageDescription( const SwFmtPageDesc& );
-
     /// Sfx item RES_BREAK
     void FormatBreak( const SvxFmtBreakItem& );
-
     /// Sfx item RES_SURROUND
     virtual void FormatSurround( const SwFmtSurround& ) = 0;
-
     /// Sfx item RES_VERT_ORIENT
     virtual void FormatVertOrientation( const SwFmtVertOrient& ) = 0;
-
     /// Sfx item RES_HORI_ORIENT
     virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) = 0;
-
     /// Sfx item RES_ANCHOR
     virtual void FormatAnchor( const SwFmtAnchor& ) = 0;
-
     /// Sfx item RES_BACKGROUND
     virtual void FormatBackground( const SvxBrushItem& ) = 0;
-
     /// Sfx item RES_BOX
     virtual void FormatBox( const SvxBoxItem& ) = 0;
-
     /// Sfx item RES_COL
     void FormatColumns( const SwFmtCol& );
-
     virtual void FormatColumns_Impl( USHORT nCols, const SwFmtCol & rCol, bool bEven, SwTwips 
nPageSize ) = 0;
-
     /// Sfx item RES_KEEP
     virtual void FormatKeep( const SvxFmtKeepItem& ) = 0;
-
     /// Sfx item RES_TEXTGRID
     virtual void FormatTextGrid( const SwTextGridItem& ) = 0;
-
     /// Sfx item RES_LINENUMBER
     virtual void FormatLineNumbering( const SwFmtLineNumber& ) = 0;
-
     /// Sfx item RES_FRAMEDIR
     virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) = 0;
-
     /// Write the expanded field
     virtual void WriteExpand( const SwField* pFld ) = 0;
-
     virtual void RefField( const SwField& rFld, const String& rRef ) = 0;
     virtual void HiddenField( const SwField& rFld ) = 0;
     virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd ) = 0;
     virtual void PostitField( const SwField* pFld ) = 0;
     virtual bool DropdownField( const SwField* pFld ) = 0;
-
     virtual bool AnalyzeURL( const String& rUrl, const String& rTarget, String* pLinkURL, String* 
pMark );
 
     ww8::GridColsPtr GetGridCols( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
@@ -561,23 +420,17 @@ protected:
 public:
     AttributeOutputBase() {}
     virtual ~AttributeOutputBase() {}
-
     /// Return the right export class.
     virtual MSWordExportBase& GetExport() = 0;
-
     /// Call the right virtual function according to the type of the item.
     void OutputItem( const SfxPoolItem& rHt );
-
     /// Use OutputItem() on an item set - for styles.
     void OutputStyleItemSet( const SfxItemSet& rSet, BOOL bDeep, BOOL bTestForDefault );
-
     /// Output frames.
     void OutputFlyFrame( const sw::Frame& rFmt );
-
     void GetTablePageSize
     ( ww8::WW8TableNodeInfoInner * pTableTextNodeInfoInner,
       sal_uInt32& rPageSize, bool& rRelBoxSize );
-
 };
 
 #endif // _ATTRIBUTEOUTPUTBASE_HXX_
-- 
1.7.1

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.