diff options
Diffstat (limited to 'sw/source/core/inc')
89 files changed, 1021 insertions, 1021 deletions
diff --git a/sw/source/core/inc/GetMetricVal.hxx b/sw/source/core/inc/GetMetricVal.hxx index 610bd935dc86..6e0df29bae6b 100644 --- a/sw/source/core/inc/GetMetricVal.hxx +++ b/sw/source/core/inc/GetMetricVal.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,18 +30,18 @@ #include <tools/solar.h> -#define CM_1 0 // 1 centimeter or 1/2 inch -#define CM_05 1 // 0.5 centimeter or 1/4 inch -#define CM_01 2 // 0.1 centimeter or 1/20 inch +#define CM_1 0 // 1 centimeter or 1/2 inch +#define CM_05 1 // 0.5 centimeter or 1/4 inch +#define CM_01 2 // 0.1 centimeter or 1/20 inch inline USHORT GetMetricVal( int n ) { #ifdef USE_MEASUREMENT USHORT nVal = MEASURE_METRIC == SvtSysLocale().GetLocaleData().getMeasurementSystemEnum() - ? 567 // 1 cm - : 770; // 1/2 Inch + ? 567 // 1 cm + : 770; // 1/2 Inch #else - USHORT nVal = 567; // 1 cm + USHORT nVal = 567; // 1 cm #endif if( CM_01 == n ) @@ -52,6 +52,6 @@ inline USHORT GetMetricVal( int n ) } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index 415b8e7b6a68..c415313e89f9 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,12 +45,12 @@ namespace sw { namespace mark #endif // IDocumentMarkAccess virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark); - - virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, + + virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, + const rtl::OUString& rName, const rtl::OUString& rType); - virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, + virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, + const rtl::OUString& rName, const rtl::OUString& rType); virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark); @@ -67,13 +67,13 @@ namespace sw { namespace mark virtual void deleteMark(const ::sw::mark::IMark* const pMark); virtual void clearAllMarks(); - // marks + // marks virtual const_iterator_t getMarksBegin() const; virtual const_iterator_t getMarksEnd() const; virtual sal_Int32 getMarksCount() const; virtual const_iterator_t findMark(const ::rtl::OUString& rName) const; - // bookmarks + // bookmarks virtual const_iterator_t getBookmarksBegin() const; virtual const_iterator_t getBookmarksEnd() const; virtual sal_Int32 getBookmarksCount() const; diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx index 0d831d3f0b2a..509d896b0db6 100644 --- a/sw/source/core/inc/SwGrammarMarkUp.hxx +++ b/sw/source/core/inc/SwGrammarMarkUp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,15 +26,15 @@ * ************************************************************************/ -#ifndef _SWGRAMMARMARKUP_HXX -#define _SWGRAMMARMARKUP_HXX +#ifndef _SWGRAMMARMARKUP_HXX +#define _SWGRAMMARMARKUP_HXX #include <wrong.hxx> #include <vector> /* SwGrammarMarkUp extends the functionality of a "normal" SwWrongList by memorizing the start positions of sentences in the paragraph - + The whole class is only a temporary solution without usage of virtual functions. At the end the whole SwWrongList stuff should be reworked and replaced by interfaces to deal with all the different wronglists like diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx index 7830e59e46d8..fd9ce038165a 100644 --- a/sw/source/core/inc/SwPortionHandler.hxx +++ b/sw/source/core/inc/SwPortionHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ class String; * held by the corresponding SwTxtNode. * * The SwPortionHandler can be used with the - * SwTextFrame::VisitPortions(...) method. + * SwTextFrame::VisitPortions(...) method. */ class SwPortionHandler { @@ -94,7 +94,7 @@ public: ) = 0; /** end of paragraph. This method is to be called when all the - * paragraph's portions have been processed. + * paragraph's portions have been processed. */ virtual void Finish() = 0; }; diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index 8d02e47a4e8f..d1da8ec86d0e 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ private: SwXMLTextBlocks &rBlockList; public: // #110680# - SwXMLBlockListExport( + SwXMLBlockListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, - SwXMLTextBlocks & rBlocks, + SwXMLTextBlocks & rBlocks, const rtl::OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); @@ -58,9 +58,9 @@ private: SwXMLTextBlocks &rBlockList; public: // #110680# - SwXMLTextBlockExport( + SwXMLTextBlockExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, - SwXMLTextBlocks & rBlocks, + SwXMLTextBlocks & rBlocks, const rtl::OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 4d37e9b417ee..1cae68bb296b 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public: String &m_rText; // #110680# - SwXMLTextBlockImport( + SwXMLTextBlockImport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, SwXMLTextBlocks &rBlocks, String &rNewText, sal_Bool bNewTextOnly ); diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx index 64c9dbb8c0e9..f05a6e75ddb9 100644 --- a/sw/source/core/inc/SwXMLBlockListContext.hxx +++ b/sw/source/core/inc/SwXMLBlockListContext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,14 +39,14 @@ private: SwXMLBlockListImport & rLocalRef; public: SwXMLBlockListContext( SwXMLBlockListImport& rImport, - sal_uInt16 nPrefix, + sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLBlockListContext ( void ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; @@ -56,9 +56,9 @@ private: SwXMLBlockListImport & rLocalRef; public: SwXMLBlockContext( SwXMLBlockListImport& rImport, - sal_uInt16 nPrefix, + sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLBlockContext ( void ); }; @@ -69,13 +69,13 @@ private: SwXMLTextBlockImport & rLocalRef; public: SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport, - sal_uInt16 nPrefix, + sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLTextBlockDocumentContext ( void ); }; @@ -85,13 +85,13 @@ private: SwXMLTextBlockImport & rLocalRef; public: SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport, - sal_uInt16 nPrefix, + sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLTextBlockBodyContext ( void ); }; @@ -101,13 +101,13 @@ private: SwXMLTextBlockImport & rLocalRef; public: SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport, - sal_uInt16 nPrefix, + sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLTextBlockTextContext ( void ); }; @@ -117,9 +117,9 @@ private: SwXMLTextBlockImport & rLocalRef; public: SwXMLTextBlockParContext( SwXMLTextBlockImport& rImport, - sal_uInt16 nPrefix, + sal_uInt16 nPrefix, const rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void Characters( const ::rtl::OUString& rChars ); ~SwXMLTextBlockParContext ( void ); diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 4e5cfac7544d..12d54899adfe 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,17 +37,17 @@ class SwDoc; class SvxMacroTableDtor; class SwImpBlocks; -#define SWXML_CONVBLOCK 0x0001 -#define SWXML_NOROOTCOMMIT 0x0002 +#define SWXML_CONVBLOCK 0x0001 +#define SWXML_NOROOTCOMMIT 0x0002 class SwXMLTextBlocks : public SwImpBlocks { protected: - BOOL bAutocorrBlock; - BOOL bBlock; + BOOL bAutocorrBlock; + BOOL bBlock; SfxObjectShellRef xDocShellRef; - USHORT nFlags; - String aPackageName; + USHORT nFlags; + String aPackageName; SfxMediumRef xMedium; void ReadInfo(); @@ -58,7 +58,7 @@ protected: public: com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xBlkRoot; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xRoot; - short nCurBlk; + short nCurBlk; SwXMLTextBlocks( const String& rFile ); SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFile ); void AddName( const String&, const String&, const String&, BOOL bOnlyTxt = FALSE ); diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index 931ed54006bf..6e31d3734da6 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index 9031c7a98363..6896a3abd6b8 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,9 +79,9 @@ public: // Dieser darf nicht leer sein! // Gibt es diesen nicht oder gibt es davor nur Leere, dann returne 0 // Das Flag gibt an: - // TRUE: den, vor der normalen Einfuegeposition (TRUE) - // FALSE: den, in den das korrigierte Wort eingfuegt wurde. - // (Muss nicht der gleiche Absatz sein!!!!) + // TRUE: den, vor der normalen Einfuegeposition (TRUE) + // FALSE: den, in den das korrigierte Wort eingfuegt wurde. + // (Muss nicht der gleiche Absatz sein!!!!) virtual const String* GetPrevPara( BOOL bAtNormalPos ); virtual BOOL ChgAutoCorrWord( xub_StrLen& rSttPos, xub_StrLen nEndPos, @@ -89,8 +89,8 @@ public: const String** ppPara ); // wird nach dem austauschen der Zeichen von den Funktionen - // - FnCptlSttWrd - // - FnCptlSttSntnc + // - FnCptlSttWrd + // - FnCptlSttSntnc // gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten // aufgenommen werden. virtual void SaveCpltSttWord( ULONG nFlag, xub_StrLen nPos, @@ -114,7 +114,7 @@ public: cChar(cChr), eLanguage(eLang), bDeleted(FALSE) {} - BOOL IsDeleted() const { return bDeleted; } + BOOL IsDeleted() const { return bDeleted; } void CheckChar( const SwPosition& rPos, sal_Unicode cChar ); BOOL CheckDelChar( const SwPosition& rPos ); }; diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 5bb1bf9cf810..10a6c7b87d20 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index f83cdf6259c7..dd84145f2ff3 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index ad56ed7750ca..e432d5d32434 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _BLINK_HXX -#define _BLINK_HXX +#ifndef _BLINK_HXX +#define _BLINK_HXX class SwLinePortion; class SwRootFrm; @@ -40,8 +40,8 @@ class SwTxtFrm; class SwBlinkPortion { Point aPos; - const SwLinePortion *pPor; - const SwRootFrm *pFrm; + const SwLinePortion *pPor; + const SwRootFrm *pFrm; USHORT nDir; public: SwBlinkPortion( const SwLinePortion* pPortion, USHORT nDirection ) @@ -65,9 +65,9 @@ SV_DECL_PTRARR_SORT_DEL(SwBlinkList, SwBlinkPortionPtr, 0, 10) class SwBlink { - SwBlinkList aList; - AutoTimer aTimer; - BOOL bVisible; + SwBlinkList aList; + AutoTimer aTimer; + BOOL bVisible; public: SwBlink(); ~SwBlink(); diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx index 625011d17382..5694c0b118b1 100644 --- a/sw/source/core/inc/bodyfrm.hxx +++ b/sw/source/core/inc/bodyfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,11 +44,11 @@ protected: public: SwBodyFrm( SwFrmFmt* ); - virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const; + virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const; DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm) }; -#endif //_BODYFRM_HXX +#endif //_BODYFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index b495e987d404..88683ca2e8cc 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star { namespace text { class XTextContent; } } } } -struct SwPosition; // fwd Decl. wg. UI +struct SwPosition; // fwd Decl. wg. UI class SwDoc; namespace sw { namespace mark diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index bd59b54e3530..1cb26b46abfd 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ extern BOOL GetFrmInPage( const SwCntntFrm*, SwWhichPage, SwPosPage, SwPaM* ); class SwCntntFrm: public SwFrm, public SwFlowFrm { - friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ); //ruft MakePrtArea + friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ); //ruft MakePrtArea // --> OD 2007-11-26 #b6614158# // parameter <bObjsInNewUpper>, indicating that objects are existing in @@ -73,32 +73,32 @@ protected: public: virtual ~SwCntntFrm(); - TYPEINFO(); //bereits in Basisklassen drin + TYPEINFO(); //bereits in Basisklassen drin virtual void Cut(); virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); - inline SwCntntNode *GetNode(); + inline SwCntntNode *GetNode(); inline const SwCntntNode *GetNode() const; - USHORT GetSectionLevel(); + USHORT GetSectionLevel(); inline const SwCntntFrm *GetFollow() const; - inline SwCntntFrm *GetFollow(); + inline SwCntntFrm *GetFollow(); SwTxtFrm* FindMaster() const; //Layoutabhaengiges Cursortravelling - virtual BOOL LeftMargin( SwPaM * ) const; - virtual BOOL RightMargin( SwPaM *, BOOL bAPI = FALSE ) const; - virtual BOOL UnitUp( SwPaM *, const SwTwips nOffset = 0, + virtual BOOL LeftMargin( SwPaM * ) const; + virtual BOOL RightMargin( SwPaM *, BOOL bAPI = FALSE ) const; + virtual BOOL UnitUp( SwPaM *, const SwTwips nOffset = 0, BOOL bSetInReadOnly = FALSE ) const; - virtual BOOL UnitDown( SwPaM *, const SwTwips nOffset = 0, + virtual BOOL UnitDown( SwPaM *, const SwTwips nOffset = 0, BOOL bSetInReadOnly = FALSE ) const; - inline BOOL StartNextPage( SwPaM * ) const; - inline BOOL StartPrevPage( SwPaM * ) const; - inline BOOL StartCurrPage( SwPaM * ) const; - inline BOOL EndCurrPage( SwPaM * ) const; - inline BOOL EndNextPage( SwPaM * ) const; - inline BOOL EndPrevPage( SwPaM * ) const; + inline BOOL StartNextPage( SwPaM * ) const; + inline BOOL StartPrevPage( SwPaM * ) const; + inline BOOL StartCurrPage( SwPaM * ) const; + inline BOOL EndCurrPage( SwPaM * ) const; + inline BOOL EndNextPage( SwPaM * ) const; + inline BOOL EndPrevPage( SwPaM * ) const; // nMaxHeight is the required height // bSplit indicates, that the paragraph has to be split diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx index 011daf07fa74..fd8b2b80df10 100644 --- a/sw/source/core/inc/colfrm.hxx +++ b/sw/source/core/inc/colfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,6 +40,6 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm) }; -#endif //_COLFRM_HXX +#endif //_COLFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index ef5f8933a81a..7c3623ce2d29 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx index 141d55d41946..cda2de717990 100644 --- a/sw/source/core/inc/dbg_lay.hxx +++ b/sw/source/core/inc/dbg_lay.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,35 +30,35 @@ #define _DBG_LAY_HXX #define PROT_FILE_INIT 0x00000000 -#define PROT_INIT 0x00000001 -#define PROT_MAKEALL 0x00000002 -#define PROT_MOVE_FWD 0x00000004 -#define PROT_MOVE_BWD 0x00000008 -#define PROT_GROW 0x00000010 -#define PROT_SHRINK 0x00000020 -#define PROT_GROW_TST 0x00000040 -#define PROT_SHRINK_TST 0x00000080 -#define PROT_SIZE 0x00000100 -#define PROT_PRTAREA 0x00000200 -#define PROT_POS 0x00000400 -#define PROT_ADJUSTN 0x00000800 -#define PROT_SECTION 0x00001000 -#define PROT_CUT 0x00002000 -#define PROT_PASTE 0x00004000 -#define PROT_LEAF 0x00008000 -#define PROT_TESTFORMAT 0x00010000 -#define PROT_FRMCHANGES 0x00020000 +#define PROT_INIT 0x00000001 +#define PROT_MAKEALL 0x00000002 +#define PROT_MOVE_FWD 0x00000004 +#define PROT_MOVE_BWD 0x00000008 +#define PROT_GROW 0x00000010 +#define PROT_SHRINK 0x00000020 +#define PROT_GROW_TST 0x00000040 +#define PROT_SHRINK_TST 0x00000080 +#define PROT_SIZE 0x00000100 +#define PROT_PRTAREA 0x00000200 +#define PROT_POS 0x00000400 +#define PROT_ADJUSTN 0x00000800 +#define PROT_SECTION 0x00001000 +#define PROT_CUT 0x00002000 +#define PROT_PASTE 0x00004000 +#define PROT_LEAF 0x00008000 +#define PROT_TESTFORMAT 0x00010000 +#define PROT_FRMCHANGES 0x00020000 #define PROT_SNAPSHOT 0x00040000 -#define ACT_START 1 -#define ACT_END 2 +#define ACT_START 1 +#define ACT_END 2 #define ACT_CREATE_MASTER 3 #define ACT_CREATE_FOLLOW 4 -#define ACT_DEL_MASTER 5 -#define ACT_DEL_FOLLOW 6 -#define ACT_MERGE 7 -#define ACT_NEXT_SECT 8 -#define ACT_PREV_SECT 9 +#define ACT_DEL_MASTER 5 +#define ACT_DEL_FOLLOW 6 +#define ACT_MERGE 7 +#define ACT_NEXT_SECT 8 +#define ACT_PREV_SECT 9 #define SNAP_LOWER 0x00000001 #define SNAP_FLYFRAMES 0x00000002 @@ -99,7 +99,7 @@ public: ~SwEnterLeave() { if( pImpl ) Dtor(); } }; -#define PROTOCOL( pFrm, nFunc, nAct, pPar ) { if( SwProtocol::Record( nFunc ) )\ +#define PROTOCOL( pFrm, nFunc, nAct, pPar ) { if( SwProtocol::Record( nFunc ) )\ SwProtocol::Record( pFrm, nFunc, nAct, pPar ); } #define PROTOCOL_INIT SwProtocol::Init(); #define PROTOCOL_STOP SwProtocol::Stop(); diff --git a/sw/source/core/inc/dbgloop.hxx b/sw/source/core/inc/dbgloop.hxx index da803ac9479b..c15eda62a7de 100644 --- a/sw/source/core/inc/dbgloop.hxx +++ b/sw/source/core/inc/dbgloop.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,8 +35,8 @@ class SvStream; -#define DBG_MAX_STACK 20 // Verschachtelungstiefe -#define DBG_MAX_LOOP 1000 // das Abbruchkriterium +#define DBG_MAX_STACK 20 // Verschachtelungstiefe +#define DBG_MAX_LOOP 1000 // das Abbruchkriterium class DbgLoopStack { @@ -65,8 +65,8 @@ inline void PrintLoopStack( SvStream &rOS ) //$ ostream DbgLoop::aDbgLoopStack.Print( rOS ); } -#define DBG_LOOP DbgLoop aDbgLoop( (const void*)this ); -#define DBG_LOOP_RESET DbgLoop aDbgLoop( 0 ); +#define DBG_LOOP DbgLoop aDbgLoop( (const void*)this ); +#define DBG_LOOP_RESET DbgLoop aDbgLoop( 0 ); #else diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index f89947ee95b6..372e4b82ee63 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -26,19 +26,19 @@ * ************************************************************************/ #ifndef _DFLYOBJ_HXX -#define _DFLYOBJ_HXX +#define _DFLYOBJ_HXX #include <svx/svdovirt.hxx> class SwFlyFrm; class SwFrmFmt; class SdrObjMacroHitRec; -const UINT32 SWGInventor = UINT32('S')*0x00000001+ +const UINT32 SWGInventor = UINT32('S')*0x00000001+ UINT32('W')*0x00000100+ UINT32('G')*0x00010000; const UINT16 SwFlyDrawObjIdentifier = 0x0001; -const UINT16 SwDrawFirst = 0x0001; +const UINT16 SwDrawFirst = 0x0001; //--------------------------------------- //SwFlyDrawObj, Die DrawObjekte fuer Flys. @@ -61,9 +61,9 @@ public: //Damit eine Instanz dieser Klasse beim laden erzeugt werden kann //(per Factory). - virtual UINT32 GetObjInventor() const; - virtual UINT16 GetObjIdentifier() const; - virtual UINT16 GetObjVersion() const; + virtual UINT32 GetObjInventor() const; + virtual UINT16 GetObjIdentifier() const; + virtual UINT16 GetObjVersion() const; }; //--------------------------------------- @@ -97,33 +97,33 @@ public: ~SwVirtFlyDrawObj(); //Ueberladene Methoden der Basisklasse SdrVirtObj - virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const; + virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const; //Wir nehemen die Groessenbehandlung vollstaendig selbst in die Hand. virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetLastBoundRect() const; - virtual void RecalcBoundRect(); - virtual void RecalcSnapRect(); - virtual const Rectangle& GetSnapRect() const; - virtual void SetSnapRect(const Rectangle& rRect); - virtual void NbcSetSnapRect(const Rectangle& rRect); + virtual void RecalcBoundRect(); + virtual void RecalcSnapRect(); + virtual const Rectangle& GetSnapRect() const; + virtual void SetSnapRect(const Rectangle& rRect); + virtual void NbcSetSnapRect(const Rectangle& rRect); virtual const Rectangle& GetLogicRect() const; - virtual void SetLogicRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); + virtual void SetLogicRect(const Rectangle& rRect); + virtual void NbcSetLogicRect(const Rectangle& rRect); virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual void NbcMove (const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, + virtual void NbcMove (const Size& rSiz); + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void Move (const Size& rSiz); - virtual void Resize(const Point& rRef, const Fraction& xFact, + virtual void Move (const Size& rSiz); + virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); const SwFrmFmt *GetFmt() const; SwFrmFmt *GetFmt(); // Get Methoden fuer die Fly Verpointerung - SwFlyFrm* GetFlyFrm() { return pFlyFrm; } - const SwFlyFrm* GetFlyFrm() const { return pFlyFrm; } + SwFlyFrm* GetFlyFrm() { return pFlyFrm; } + const SwFlyFrm* GetFlyFrm() const { return pFlyFrm; } void SetRect() const; diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index 891c6f2b02d7..5902e53ec616 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #ifndef _DOCFLD_HXX #define _DOCFLD_HXX -#include <calc.hxx> // fuer SwHash +#include <calc.hxx> // fuer SwHash class SwTxtFld; class SwIndex; @@ -86,7 +86,7 @@ public: _SetGetExpFld( const SwFlyFrmFmt& rFlyFmt, const SwPosition* pPos = 0 ); BOOL operator==( const _SetGetExpFld& rFld ) const - { return nNode == rFld.nNode && nCntnt == rFld.nCntnt && + { return nNode == rFld.nNode && nCntnt == rFld.nCntnt && ( !CNTNT.pTxtFld || !rFld.CNTNT.pTxtFld || CNTNT.pTxtFld == rFld.CNTNT.pTxtFld ); } BOOL operator<( const _SetGetExpFld& rFld ) const; @@ -145,24 +145,24 @@ void LookString( SwHash** ppTbl, USHORT nSize, const String& rName, // -------- -const int GETFLD_ALL = 3; // veroderte Flags !! -const int GETFLD_CALC = 1; -const int GETFLD_EXPAND = 2; +const int GETFLD_ALL = 3; // veroderte Flags !! +const int GETFLD_CALC = 1; +const int GETFLD_EXPAND = 2; class SwDocUpdtFld { - _SetGetExpFlds* pFldSortLst; // akt. Field-Liste zum Calculieren + _SetGetExpFlds* pFldSortLst; // akt. Field-Liste zum Calculieren SwCalcFldType* aFldTypeTable[ TBLSZ ]; // noch eine weitere Optimierung - wird z.Z. nicht angesprochen! - long nFldUpdtPos; // ab dieser Position mit Update starten - SwCntntNode* pCNode; // der TxtNode zur UpdatePos. + long nFldUpdtPos; // ab dieser Position mit Update starten + SwCntntNode* pCNode; // der TxtNode zur UpdatePos. - ULONG nNodes; // sollte die NodesAnzahl unterschiedlich sein + ULONG nNodes; // sollte die NodesAnzahl unterschiedlich sein BYTE nFldLstGetMode; - BOOL bInUpdateFlds : 1; // zur Zeit laeuft ein UpdateFlds, - BOOL bFldsDirty : 1; // irgendwelche Felder sind ungueltig + BOOL bInUpdateFlds : 1; // zur Zeit laeuft ein UpdateFlds, + BOOL bFldsDirty : 1; // irgendwelche Felder sind ungueltig void _MakeFldList( SwDoc& pDoc, int eGetMode ); void GetBodyNode( const SwTxtFld& , USHORT nFldWhich ); @@ -180,16 +180,16 @@ public: void InsertFldType( const SwFieldType& rType ); void RemoveFldType( const SwFieldType& rType ); - BOOL IsInUpdateFlds() const { return bInUpdateFlds; } - void SetInUpdateFlds( BOOL b ) { bInUpdateFlds = b; } + BOOL IsInUpdateFlds() const { return bInUpdateFlds; } + void SetInUpdateFlds( BOOL b ) { bInUpdateFlds = b; } - BOOL IsFieldsDirty() const { return bFldsDirty; } - void SetFieldsDirty( BOOL b ) { bFldsDirty = b; } + BOOL IsFieldsDirty() const { return bFldsDirty; } + void SetFieldsDirty( BOOL b ) { bFldsDirty = b; } - SwHash** GetFldTypeTable() const { return (SwHash**)aFldTypeTable; } + SwHash** GetFldTypeTable() const { return (SwHash**)aFldTypeTable; } }; -#endif // _DOCFLD_HXX +#endif // _DOCFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index f30d88d2d439..92d9ab90f012 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,12 +52,12 @@ namespace com { namespace sun { namespace star { namespace lang { /*-------------------------------------------------------------------- Beschreibung: Liste aller sortierten Elemente --------------------------------------------------------------------*/ -typedef const _FndBox* _FndBoxPtr; -typedef SwSortElement* SwSortElementPtr; -typedef const SwTableBox* SwMovedBoxPtr; +typedef const _FndBox* _FndBoxPtr; +typedef SwSortElement* SwSortElementPtr; +typedef const SwTableBox* SwMovedBoxPtr; SV_DECL_PTRARR_SORT(SwSortElements, SwSortElementPtr, 0, 1 ) -SV_DECL_PTRARR(SwMovedBoxes, SwMovedBoxPtr, 10, 10 ) +SV_DECL_PTRARR(SwMovedBoxes, SwMovedBoxPtr, 10, 10 ) /*-------------------------------------------------------------------- Beschreibung: Funktionen zum Moven von Boxen @@ -76,21 +76,21 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, struct SwSortElement { - static SwSortOptions* pOptions; - static SwDoc* pDoc; - static const FlatFndBox* pBox; - static CollatorWrapper* pSortCollator; + static SwSortOptions* pOptions; + static SwDoc* pDoc; + static const FlatFndBox* pBox; + static CollatorWrapper* pSortCollator; static ::com::sun::star::lang::Locale* pLocale; - static String* pLastAlgorithm; - static LocaleDataWrapper* pLclData; + static String* pLastAlgorithm; + static LocaleDataWrapper* pLclData; static void Init( SwDoc*, const SwSortOptions& rOpt, FlatFndBox* = 0 ); static void Finit(); virtual ~SwSortElement(); - virtual String GetKey(USHORT nKey ) const = 0; - virtual double GetValue(USHORT nKey ) const; + virtual String GetKey(USHORT nKey ) const = 0; + virtual double GetValue(USHORT nKey ) const; BOOL operator==(const SwSortElement& ); BOOL operator<(const SwSortElement& ); @@ -105,8 +105,8 @@ struct SwSortElement struct SwSortTxtElement : public SwSortElement { // fuer Text - ULONG nOrg; - SwNodeIndex aPos; + ULONG nOrg; + SwNodeIndex aPos; SwSortTxtElement( const SwNodeIndex& rPos ); virtual ~SwSortTxtElement(); @@ -120,13 +120,13 @@ struct SwSortTxtElement : public SwSortElement struct SwSortBoxElement : public SwSortElement { - USHORT nRow; + USHORT nRow; SwSortBoxElement( USHORT nRC ); virtual ~SwSortBoxElement(); virtual String GetKey( USHORT nKey ) const; - virtual double GetValue( USHORT nKey ) const; + virtual double GetValue( USHORT nKey ) const; }; @@ -141,39 +141,39 @@ public: FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox); ~FlatFndBox(); - BOOL IsSymmetric() const { return bSym; } - USHORT GetRows() const { return nRows; } - USHORT GetCols() const { return nCols; } + BOOL IsSymmetric() const { return bSym; } + USHORT GetRows() const { return nRows; } + USHORT GetCols() const { return nCols; } - const _FndBox* GetBox(USHORT nCol, USHORT nRow) const; + const _FndBox* GetBox(USHORT nCol, USHORT nRow) const; - inline BOOL HasItemSets() const; - const SfxItemSet* GetItemSet(USHORT nCol, USHORT nRow) const; + inline BOOL HasItemSets() const; + const SfxItemSet* GetItemSet(USHORT nCol, USHORT nRow) const; private: - BOOL CheckLineSymmetry(const _FndBox& rBox); - BOOL CheckBoxSymmetry(const _FndLine& rLn); - USHORT GetColCount(const _FndBox& rBox); - USHORT GetRowCount(const _FndBox& rBox); - void FillFlat(const _FndBox&, BOOL bLastBox=FALSE); + BOOL CheckLineSymmetry(const _FndBox& rBox); + BOOL CheckBoxSymmetry(const _FndLine& rLn); + USHORT GetColCount(const _FndBox& rBox); + USHORT GetRowCount(const _FndBox& rBox); + void FillFlat(const _FndBox&, BOOL bLastBox=FALSE); - SwDoc* pDoc; - const _FndBox& rBoxRef; - _FndBoxPtr* pArr; - SfxItemSet** ppItemSets; + SwDoc* pDoc; + const _FndBox& rBoxRef; + _FndBoxPtr* pArr; + SfxItemSet** ppItemSets; - USHORT nRows; - USHORT nCols; + USHORT nRows; + USHORT nCols; - USHORT nRow; - USHORT nCol; + USHORT nRow; + USHORT nCol; - BOOL bSym; + BOOL bSym; }; -inline BOOL FlatFndBox::HasItemSets() const { return 0 != ppItemSets; } +inline BOOL FlatFndBox::HasItemSets() const { return 0 != ppItemSets; } #endif // _NDSORT_HXX diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx index a7431ea526f0..86637c7c0f49 100644 --- a/sw/source/core/inc/doctxm.hxx +++ b/sw/source/core/inc/doctxm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,22 +56,22 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection { SwTOXSortTabBases aSortArr; - void UpdateMarks( const SwTOXInternational& rIntl, + void UpdateMarks( const SwTOXInternational& rIntl, const SwTxtNode* pOwnChapterNode ); - void UpdateOutline( const SwTxtNode* pOwnChapterNode ); - void UpdateTemplate( const SwTxtNode* pOwnChapterNode ); - void UpdateCntnt( SwTOXElement eType, + void UpdateOutline( const SwTxtNode* pOwnChapterNode ); + void UpdateTemplate( const SwTxtNode* pOwnChapterNode ); + void UpdateCntnt( SwTOXElement eType, const SwTxtNode* pOwnChapterNode ); - void UpdateTable( const SwTxtNode* pOwnChapterNode ); - void UpdateSequence( const SwTxtNode* pOwnChapterNode ); - void UpdateAuthorities( const SwTOXInternational& rIntl ); - void UpdateAll(); + void UpdateTable( const SwTxtNode* pOwnChapterNode ); + void UpdateSequence( const SwTxtNode* pOwnChapterNode ); + void UpdateAuthorities( const SwTOXInternational& rIntl ); + void UpdateAll(); // Sortiert einfuegen ins Array fuer die Generierung - void InsertSorted(SwTOXSortTabBase* pBase); + void InsertSorted(SwTOXSortTabBase* pBase); // Alpha-Trennzeichen bei der Generierung einfuegen - void InsertAlphaDelimitter( const SwTOXInternational& rIntl ); + void InsertAlphaDelimitter( const SwTOXInternational& rIntl ); // Textrumpf generieren // OD 18.03.2003 #106329# - add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc> @@ -82,7 +82,7 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection const SwPageDesc* _pDefaultPageDesc ); // Seitennummerplatzhalter gegen aktuelle Nummern austauschen - void _UpdatePageNum( SwTxtNode* pNd, + void _UpdatePageNum( SwTxtNode* pNd, const SvUShorts& rNums, const SvPtrarr &rDescs, const SvUShorts* pMainEntryNums, @@ -105,8 +105,8 @@ public: // a table-of-content. Default value: false void Update( const SfxItemSet* pAttr = 0, const bool _bNewTOX = false ); // Formatieren - void UpdatePageNum(); // Seitennummern einfuegen - TYPEINFO(); // fuers rtti + void UpdatePageNum(); // Seitennummern einfuegen + TYPEINFO(); // fuers rtti BOOL SetPosAtStartEnd( SwPosition& rPos, BOOL bAtStart = TRUE ) const; }; @@ -145,6 +145,6 @@ struct SwDefTOXBase_Impl }; -#endif // _DOCTXM_HXX +#endif // _DOCTXM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/drawdev.hxx b/sw/source/core/inc/drawdev.hxx index 5f5be7c02344..49da0d942969 100644 --- a/sw/source/core/inc/drawdev.hxx +++ b/sw/source/core/inc/drawdev.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <vcl/outdev.hxx> /************************************************************************* - * class SwDrawDev + * class SwDrawDev * * Alle Draw-Methoden werden um den Offset *pPos verschoben. *************************************************************************/ @@ -72,7 +72,7 @@ public: }; /************************************************************************* - * SwDrawDev::DrawText + * SwDrawDev::DrawText *************************************************************************/ inline void SwDrawDev::DrawText( const Point& rStart, const String& rTxt, @@ -85,7 +85,7 @@ inline void SwDrawDev::DrawText( const Point& rStart, const String& rTxt, } /************************************************************************* - * SwDrawDev::DrawStretchText + * SwDrawDev::DrawStretchText *************************************************************************/ inline void SwDrawDev::DrawStretchText( const Point& rStart, USHORT nWidth, @@ -98,7 +98,7 @@ inline void SwDrawDev::DrawStretchText( const Point& rStart, USHORT nWidth, } /************************************************************************* - * SwDrawDev::DrawTextArray + * SwDrawDev::DrawTextArray *************************************************************************/ inline void SwDrawDev::DrawTextArray( const Point& rStart, const String& rTxt, @@ -111,7 +111,7 @@ inline void SwDrawDev::DrawTextArray( const Point& rStart, const String& rTxt, } /************************************************************************* - * SwDrawDev::DrawLine + * SwDrawDev::DrawLine *************************************************************************/ inline void SwDrawDev::DrawLine( const Point& rStart, const Point& rEnd ) @@ -123,7 +123,7 @@ inline void SwDrawDev::DrawLine( const Point& rStart, const Point& rEnd ) } /************************************************************************* - * SwDrawDev::DrawRect + * SwDrawDev::DrawRect *************************************************************************/ inline void SwDrawDev::DrawRect( const SwRect& rRect, diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index abc70caa34cb..bcbcf35e43e9 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _DRAWFONT_HXX -#define _DRAWFONT_HXX +#ifndef _DRAWFONT_HXX +#define _DRAWFONT_HXX #include <tools/solar.h> #include <tools/string.hxx> @@ -79,9 +79,9 @@ class SwDrawTextInfo xub_StrLen nNumberOfBlanks; BYTE nCursorBidiLevel; BOOL bBullet : 1; - BOOL bUpper : 1; // Fuer Kapitaelchen: Grossbuchstaben-Flag - BOOL bDrawSpace : 1; // Fuer Kapitaelchen: Unter/Durchstreichung - BOOL bGreyWave : 1; // Graue Wellenlinie beim extended TextInput + BOOL bUpper : 1; // Fuer Kapitaelchen: Grossbuchstaben-Flag + BOOL bDrawSpace : 1; // Fuer Kapitaelchen: Unter/Durchstreichung + BOOL bGreyWave : 1; // Graue Wellenlinie beim extended TextInput BOOL bSpaceStop : 1; // For underlining we need to know, if a portion // is right in front of a hole portion or a // fix margin portion. diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 90df8fd4ccbb..17916c50f6fa 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _DVIEW_HXX -#define _DVIEW_HXX +#define _DVIEW_HXX #include <svx/fmview.hxx> @@ -40,8 +40,8 @@ class SwAnchoredObject; class SwDrawView : public FmFormView { //Fuer den Anker - Point aAnchorPoint; //Ankerposition - SwViewImp &rImp; //Die View gehoert immer zu einer Shell + Point aAnchorPoint; //Ankerposition + SwViewImp &rImp; //Die View gehoert immer zu einer Shell const SwFrm *CalcAnchor(); @@ -104,14 +104,14 @@ public: // Overload to resue edit background color in active text edit view (OutlinerView) virtual void ModelHasChanged(); - virtual void ObjOrderChanged( SdrObject* pObj, ULONG nOldPos, + virtual void ObjOrderChanged( SdrObject* pObj, ULONG nOldPos, ULONG nNewPos ); virtual BOOL TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; virtual void MakeVisible( const Rectangle&, Window &rWin ); virtual void CheckPossibilities(); const SwViewImp &Imp() const { return rImp; } - SwViewImp &Imp() { return rImp; } + SwViewImp &Imp() { return rImp; } //Anker und Xor fuer das Draggen. void ShowDragAnchor(); diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx index e76a3604097a..87b6bfae4759 100644 --- a/sw/source/core/inc/environmentofanchoredobject.hxx +++ b/sw/source/core/inc/environmentofanchoredobject.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx index 19e902c53a37..87f82b0750e0 100644 --- a/sw/source/core/inc/finalthreadmanager.hxx +++ b/sw/source/core/inc/finalthreadmanager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx index 1b4a5fd82968..aa18ceead560 100644 --- a/sw/source/core/inc/flowfrm.hxx +++ b/sw/source/core/inc/flowfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,14 +124,14 @@ protected: SwFlowFrm *pFollow; - BOOL bIsFollow :1; //Ist's ein Follow - BOOL bLockJoin :1; //Join (und damit deleten) verboten wenn TRUE! + BOOL bIsFollow :1; //Ist's ein Follow + BOOL bLockJoin :1; //Join (und damit deleten) verboten wenn TRUE! BOOL bUndersized:1; // wir sind kleiner als gewuenscht - BOOL bFtnAtEnd :1; // For sectionfrms only: footnotes at the end of section - BOOL bEndnAtEnd :1; // " " " : endnotes at the end of section - BOOL bCntntLock :1; // " " " : content locked - BOOL bOwnFtnNum :1; // " " " : special numbering of footnotes - BOOL bFtnLock :1; // " " " : ftn, don't leave this section bwd + BOOL bFtnAtEnd :1; // For sectionfrms only: footnotes at the end of section + BOOL bEndnAtEnd :1; // " " " : endnotes at the end of section + BOOL bCntntLock :1; // " " " : content locked + BOOL bOwnFtnNum :1; // " " " : special numbering of footnotes + BOOL bFtnLock :1; // " " " : ftn, don't leave this section bwd BOOL bFlyLock :1; // Stop positioning of at-character flyframes //Prueft ob Vorwaertsfluss noch Sinn macht Endloswanderschaften (unterbinden) @@ -139,7 +139,7 @@ protected: // --> OD 2005-03-08 #i44049# - method <CalcCntnt(..)> has to check this property. friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow ); // <-- - BOOL IsKeepFwdMoveAllowed(); //Wie oben, Move fuer Keep. + BOOL IsKeepFwdMoveAllowed(); //Wie oben, Move fuer Keep. //Prueft ob ein Obj das Umlauf wuenscht ueberlappt. //eine Null bedeutet, kein Objekt ueberlappt, @@ -159,14 +159,14 @@ protected: public: SwFlowFrm( SwFrm &rFrm ); - const SwFrm *GetFrm() const { return &rThis; } - SwFrm *GetFrm() { return &rThis; } + const SwFrm *GetFrm() const { return &rThis; } + SwFrm *GetFrm() { return &rThis; } - static BOOL IsMoveBwdJump() { return bMoveBwdJump; } + static BOOL IsMoveBwdJump() { return bMoveBwdJump; } static void SetMoveBwdJump( BOOL bNew ){ bMoveBwdJump = bNew; } inline void SetUndersized( const BOOL bNew ) { bUndersized = bNew; } - inline BOOL IsUndersized() const { return bUndersized; } + inline BOOL IsUndersized() const { return bUndersized; } BOOL IsPrevObjMove() const; @@ -174,18 +174,18 @@ public: //neuen Parent Moven. void MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling = 0 ); - BOOL HasFollow() const { return pFollow ? TRUE : FALSE; } - BOOL IsFollow() const { return bIsFollow; } - inline void _SetIsFollow( BOOL bSet ) { bIsFollow = bSet; } - const SwFlowFrm *GetFollow() const { return pFollow; } - SwFlowFrm *GetFollow() { return pFollow; } - BOOL IsAnFollow( const SwFlowFrm *pFlow ) const; - inline void SetFollow( SwFlowFrm *pNew ) { pFollow = pNew; } + BOOL HasFollow() const { return pFollow ? TRUE : FALSE; } + BOOL IsFollow() const { return bIsFollow; } + inline void _SetIsFollow( BOOL bSet ) { bIsFollow = bSet; } + const SwFlowFrm *GetFollow() const { return pFollow; } + SwFlowFrm *GetFollow() { return pFollow; } + BOOL IsAnFollow( const SwFlowFrm *pFlow ) const; + inline void SetFollow( SwFlowFrm *pNew ) { pFollow = pNew; } sal_Bool IsJoinLocked() const { return bLockJoin; } sal_Bool IsAnyJoinLocked() const { return bLockJoin || HasLockedFollow(); } - BOOL IsFtnAtEnd() const { return bFtnAtEnd; } - BOOL IsEndnAtEnd() const { return bEndnAtEnd; } + BOOL IsFtnAtEnd() const { return bFtnAtEnd; } + BOOL IsEndnAtEnd() const { return bEndnAtEnd; } BOOL IsAnyNoteAtEnd() const { return bFtnAtEnd || bEndnAtEnd; } BOOL AreNotesAtEnd() const { return bFtnAtEnd && bEndnAtEnd; } @@ -249,17 +249,17 @@ public: void CheckKeep(); void SetFtnLock( BOOL bNew ){ bFtnLock = bNew; } - BOOL IsFtnLock() const { return bFtnLock; } + BOOL IsFtnLock() const { return bFtnLock; } void SetFlyLock( BOOL bNew ){ bFlyLock = bNew; } BOOL IsFlyLock() const { return bFlyLock; } void SetOwnFtnNum( BOOL bNew ){ bOwnFtnNum = bNew; } - BOOL IsOwnFtnNum() const { return bOwnFtnNum; } + BOOL IsOwnFtnNum() const { return bOwnFtnNum; } void SetCntntLock( BOOL bNew ){ bCntntLock = bNew; } - BOOL IsCntntLocked() const { return bCntntLock; } + BOOL IsCntntLocked() const { return bCntntLock; } //casten einen Frm auf einen FlowFrm - wenns denn einer ist, sonst 0 //Diese Methoden muessen fuer neue Ableitungen geaendert werden! - static SwFlowFrm *CastFlowFrm( SwFrm *pFrm ); + static SwFlowFrm *CastFlowFrm( SwFrm *pFrm ); static const SwFlowFrm *CastFlowFrm( const SwFrm *pFrm ); }; diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 699d90d3816e..0a5cad49bc23 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,8 +63,8 @@ class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject friend void Notify( SwFlyFrm *, SwPageFrm *pOld, const SwRect &rOld, const SwRect* pOldPrt ); - void InitDrawObj( BOOL bNotify ); //Wird von den CToren gerufen. - void FinitDrawObj(); //Wird vom CTor gerufen. + void InitDrawObj( BOOL bNotify ); //Wird von den CToren gerufen. + void FinitDrawObj(); //Wird vom CTor gerufen. void _UpdateAttr( SfxPoolItem*, SfxPoolItem*, BYTE &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); @@ -74,13 +74,13 @@ class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject protected: SwFlyFrm *pPrevLink, // Vorgaenger/Nachfolger fuer Verkettung mit - *pNextLink; // Textfluss + *pNextLink; // Textfluss // OD 2004-05-27 #i26791# - moved to <SwAnchoredObject> // Point aRelPos; //Die Relative Position zum Master private: - BOOL bLocked :1; //Cntnt-gebundene Flys muessen derart blockiert werden + BOOL bLocked :1; //Cntnt-gebundene Flys muessen derart blockiert werden //koennen, dass sie nicht Formatiert werden; :MakeAll //returnt dann sofort. Dies ist bei Seitenwechseln //waehrend der Formatierung notwendig. @@ -88,22 +88,22 @@ private: //sonst der Anker formatiert wird obwohl die Root noch //nicht korrekt an der Shell haengt und weil sonst //initial zuviel Formatiert wuerde. - BOOL bNotifyBack:1; //TRUE wenn am Ende eines MakeAll() der Background + BOOL bNotifyBack:1; //TRUE wenn am Ende eines MakeAll() der Background //vom NotifyDTor benachrichtigt werden muss. protected: - BOOL bInvalid :1; //Pos, PrtArea od. SSize wurden Invalidiert, sie werden + BOOL bInvalid :1; //Pos, PrtArea od. SSize wurden Invalidiert, sie werden //gleich wieder Validiert, denn sie muessen _immer_ //gueltig sein. Damit in LayAction korrekt gearbeitet //werden kann muss hier festgehalten werden, dass sie //invalidiert wurden. Ausnahmen bestaetigen die Regelt! - BOOL bMinHeight:1; //TRUE wenn die vom Attribut vorgegebene Hoehe eine + BOOL bMinHeight:1; //TRUE wenn die vom Attribut vorgegebene Hoehe eine //eine Minimalhoehe ist (der Frm also bei Bedarf //darueberhinaus wachsen kann). - BOOL bHeightClipped :1; //TRUE wenn der Fly nicht die Pos/Size anhand der Attrs - BOOL bWidthClipped :1; //formatieren konnte, weil z.B. nicht genug Raum vorh. + BOOL bHeightClipped :1; //TRUE wenn der Fly nicht die Pos/Size anhand der Attrs + BOOL bWidthClipped :1; //formatieren konnte, weil z.B. nicht genug Raum vorh. //war. - BOOL bFormatHeightOnly :1; //Damit nach einer Anpassung der Breite + BOOL bFormatHeightOnly :1; //Damit nach einer Anpassung der Breite //(CheckClip) nur das Format aufgerufen wird; //nicht aber die Breite anhand der Attribute //wieder bestimmt wird. @@ -123,10 +123,10 @@ protected: virtual void Format( const SwBorderAttrs *pAttrs = 0 ); void MakePrtArea( const SwBorderAttrs &rAttrs ); - void Lock() { bLocked = TRUE; } - void Unlock() { bLocked = FALSE; } + void Lock() { bLocked = TRUE; } + void Unlock() { bLocked = FALSE; } - void SetMinHeight() { bMinHeight = TRUE; } + void SetMinHeight() { bMinHeight = TRUE; } void ResetMinHeight(){ bMinHeight = FALSE; } Size CalcRel( const SwFmtFrmSize &rSz ) const; @@ -156,7 +156,7 @@ public: TYPEINFO(); virtual ~SwFlyFrm(); - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); // erfrage vom Client Informationen virtual BOOL GetInfo( SfxPoolItem& ) const; virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const; @@ -172,14 +172,14 @@ public: SwTwips _Shrink( SwTwips, BOOL bTst ); SwTwips _Grow ( SwTwips, BOOL bTst ); - void _Invalidate( SwPageFrm *pPage = 0 ); + void _Invalidate( SwPageFrm *pPage = 0 ); BOOL FrmSizeChg( const SwFmtFrmSize & ); SwFlyFrm *GetPrevLink() const { return pPrevLink; } SwFlyFrm *GetNextLink() const { return pNextLink; } - static void ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ); + static void ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ); static void UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ); SwFlyFrm *FindChainNeighbour( SwFrmFmt &rFmt, SwFrm *pAnch = 0 ); @@ -194,26 +194,26 @@ public: void Invalidate() const { ((SwFlyFrm*)this)->bInvalid = TRUE; } void Validate() const { ((SwFlyFrm*)this)->bInvalid = FALSE; } - BOOL IsMinHeight() const { return bMinHeight; } - BOOL IsLocked() const { return bLocked; } - BOOL IsAutoPos() const { return bAutoPosition; } + BOOL IsMinHeight() const { return bMinHeight; } + BOOL IsLocked() const { return bLocked; } + BOOL IsAutoPos() const { return bAutoPosition; } BOOL IsFlyInCntFrm() const { return bInCnt; } BOOL IsFlyFreeFrm() const { return bAtCnt || bLayout; } BOOL IsFlyLayFrm() const { return bLayout; } BOOL IsFlyAtCntFrm() const { return bAtCnt; } - BOOL IsNotifyBack() const { return bNotifyBack; } - void SetNotifyBack() { bNotifyBack = TRUE; } - void ResetNotifyBack() { bNotifyBack = FALSE; } + BOOL IsNotifyBack() const { return bNotifyBack; } + void SetNotifyBack() { bNotifyBack = TRUE; } + void ResetNotifyBack() { bNotifyBack = FALSE; } BOOL IsNoShrink() const { return bNoShrink; } void SetNoShrink( BOOL bNew ) { bNoShrink = bNew; } BOOL IsLockDeleteContent() const { return bLockDeleteContent; } void SetLockDeleteContent( BOOL bNew ) { bLockDeleteContent = bNew; } - BOOL IsClipped() const { return bHeightClipped || bWidthClipped; } - BOOL IsHeightClipped() const { return bHeightClipped; } - BOOL IsWidthClipped() const { return bWidthClipped; } + BOOL IsClipped() const { return bHeightClipped || bWidthClipped; } + BOOL IsHeightClipped() const { return bHeightClipped; } + BOOL IsWidthClipped() const { return bWidthClipped; } BOOL IsLowerOf( const SwLayoutFrm* pUpper ) const; inline BOOL IsUpperOf( const SwFlyFrm& _rLower ) const diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index 92ed657729f8..7ec9f1e8631d 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,7 +134,7 @@ public: SwFlyLayFrm( SwFlyFrmFmt*, SwFrm *pAnchor ); SwFlyLayFrm( SwFlyLayFrm& ); - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); }; @@ -162,7 +162,7 @@ public: SwFlyAtCntFrm( SwFlyFrmFmt*, SwFrm *pAnchor ); - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); void SetAbsPos( const Point &rNew ); @@ -188,7 +188,7 @@ class SwFlyInCntFrm : public SwFlyFrm long nLine; //Zeilenhoehe, Ref.Y() - nLine == Zeilenanfang. BOOL bInvalidLayout :1; - BOOL bInvalidCntnt :1; + BOOL bInvalidCntnt :1; protected: virtual void NotifyBackground( SwPageFrm *pPage, @@ -203,7 +203,7 @@ public: virtual ~SwFlyInCntFrm(); virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); void SetRefPoint( const Point& rPoint, const Point &rRelAttr, const Point &rRelPos ); diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index caca5826484a..9df70d757cb2 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class Printer; class OutputDevice; class FontMetric; class SwFntObj; -class SwDrawTextInfo; // DrawText +class SwDrawTextInfo; // DrawText class ViewShell; class SwSubFont; class MapMode; @@ -112,8 +112,8 @@ public: virtual ~SwFntObj(); - inline Font *GetScrFont() { return pScrFont; } - inline Font *GetFont() { return &aFont; } + inline Font *GetScrFont() { return pScrFont; } + inline Font *GetFont() { return &aFont; } inline const Font *GetFont() const { return &aFont; } inline USHORT GetGuessedLeading() const { return nGuessedLeading; } @@ -127,9 +127,9 @@ public: void SetDevFont( const ViewShell *pSh, OutputDevice& rOut ); inline OutputDevice* GetPrt() const { return pPrinter; } - inline USHORT GetZoom() const { return nZoom; } - inline USHORT GetPropWidth() const { return nPropWidth; } - inline BOOL IsSymbol() const { return bSymbol; } + inline USHORT GetZoom() const { return nZoom; } + inline USHORT GetPropWidth() const { return nPropWidth; } + inline BOOL IsSymbol() const { return bSymbol; } void DrawText( SwDrawTextInfo &rInf ); Size GetTextSize( SwDrawTextInfo &rInf ); diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 00f21add8b20..20aaf569b9db 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,9 +29,9 @@ #define _FRAME_HXX #include <svl/svarray.hxx> #include <editeng/borderline.hxx> -#include "swtypes.hxx" // fuer SwTwips +#include "swtypes.hxx" // fuer SwTwips #include "swrect.hxx" -#include "calbck.hxx" // fuer SwClient +#include "calbck.hxx" // fuer SwClient #if OSL_DEBUG_LEVEL > 1 #include <libxml/encoding.h> @@ -73,46 +73,46 @@ class SwAnchoredObject; //sie abgeleitet ist. //Der Frm hat in der Basisklasse einen Member der von den CToren der //einzelnen Frms entsprechend gesetzt werden muss. -#define FRM_ROOT 0x0001 -#define FRM_PAGE 0x0002 -#define FRM_COLUMN 0x0004 -#define FRM_HEADER 0x0008 -#define FRM_FOOTER 0x0010 -#define FRM_FTNCONT 0x0020 -#define FRM_FTN 0x0040 -#define FRM_BODY 0x0080 -#define FRM_FLY 0x0100 -#define FRM_SECTION 0x0200 -#define FRM_UNUSED 0x0400 -#define FRM_TAB 0x0800 -#define FRM_ROW 0x1000 -#define FRM_CELL 0x2000 -#define FRM_TXT 0x4000 -#define FRM_NOTXT 0x8000 +#define FRM_ROOT 0x0001 +#define FRM_PAGE 0x0002 +#define FRM_COLUMN 0x0004 +#define FRM_HEADER 0x0008 +#define FRM_FOOTER 0x0010 +#define FRM_FTNCONT 0x0020 +#define FRM_FTN 0x0040 +#define FRM_BODY 0x0080 +#define FRM_FLY 0x0100 +#define FRM_SECTION 0x0200 +#define FRM_UNUSED 0x0400 +#define FRM_TAB 0x0800 +#define FRM_ROW 0x1000 +#define FRM_CELL 0x2000 +#define FRM_TXT 0x4000 +#define FRM_NOTXT 0x8000 //Fuer den internen Gebrauch ein paar gebraeuchliche Verknuepfungen. -#define FRM_LAYOUT 0x3FFF -#define FRM_CNTNT 0xC000 -#define FRM_FTNBOSS 0x0006 +#define FRM_LAYOUT 0x3FFF +#define FRM_CNTNT 0xC000 +#define FRM_FTNBOSS 0x0006 #define FRM_ACCESSIBLE (FRM_HEADER|FRM_FOOTER|FRM_FTN|FRM_TXT|FRM_ROOT|FRM_FLY|FRM_TAB|FRM_CELL|FRM_PAGE) //Weils so schon ist das ganze als Bitfeld.... -//0000 0000 0000 0001 ROOT -//0000 0000 0000 0010 PAGE -//0000 0000 0000 0100 COLUMN -//0000 0000 0000 1000 HEADER -//0000 0000 0001 0000 FOOTER -//0000 0000 0010 0000 FTNCONT -//0000 0000 0100 0000 FTN -//0000 0000 1000 0000 BODY -//0000 0001 0000 0000 FLY -//0000 0010 0000 0000 SECTION -//0000 0100 0000 0000 UNUSED -//0000 1000 0000 0000 TAB -//0001 0000 0000 0000 ROW -//0010 0000 0000 0000 CELL -//0100 0000 0000 0000 TXT -//1000 0000 0000 0000 NOTXT +//0000 0000 0000 0001 ROOT +//0000 0000 0000 0010 PAGE +//0000 0000 0000 0100 COLUMN +//0000 0000 0000 1000 HEADER +//0000 0000 0001 0000 FOOTER +//0000 0000 0010 0000 FTNCONT +//0000 0000 0100 0000 FTN +//0000 0000 1000 0000 BODY +//0000 0001 0000 0000 FLY +//0000 0010 0000 0000 SECTION +//0000 0100 0000 0000 UNUSED +//0000 1000 0000 0000 TAB +//0001 0000 0000 0000 ROW +//0010 0000 0000 0000 CELL +//0100 0000 0000 0000 TXT +//1000 0000 0000 0000 NOTXT // The type of the frame is internal represented by the 4-bit value nType, // which can expanded to the types above by shifting a bit (0x1 << nType) @@ -235,11 +235,11 @@ extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R; //Fuer GetNextLeaf/GetPrevLeaf. enum MakePageType { - MAKEPAGE_NONE, //Keine Seite bzw. Fussnote anlegen - MAKEPAGE_APPEND, //Nur ggf. Seite anhaengen - MAKEPAGE_INSERT, //Seite ggf. anhaengen oder einfuegen. - MAKEPAGE_FTN, //Fussnote ggf. einfuegen. - MAKEPAGE_NOSECTION // Don't create section frames + MAKEPAGE_NONE, //Keine Seite bzw. Fussnote anlegen + MAKEPAGE_APPEND, //Nur ggf. Seite anhaengen + MAKEPAGE_INSERT, //Seite ggf. anhaengen oder einfuegen. + MAKEPAGE_FTN, //Fussnote ggf. einfuegen. + MAKEPAGE_NOSECTION // Don't create section frames }; // OD 2004-05-06 #i28701# - replaced by new class <SwSortedObjs> @@ -250,7 +250,7 @@ class SwFrm: public SwClient { //Der verkappte Frm friend class SwFlowFrm; - friend class SwLayoutFrm; // Sw3FrameIo: fuer pNext, pPrev + friend class SwLayoutFrm; // Sw3FrameIo: fuer pNext, pPrev friend class SwLooping; // LoopControlling (layouter.cxx) //Hebt die Lower waehrend eines Spaltenumbaus auf. @@ -267,7 +267,7 @@ class SwFrm: public SwClient // Implementiert in text/txtftn.cxx, verhindert Ftn-Oszillation friend void ValidateTxt( SwFrm *pFrm ); -// friend void CalcAnchorAndKeep( SwFlyFrm * ); +// friend void CalcAnchorAndKeep( SwFlyFrm * ); friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ); @@ -354,15 +354,15 @@ class SwFrm: public SwClient SwFrm* _GetIndNext(); void SetDirFlags( BOOL bVert ); - SwFrm( SwFrm & ); //Kopieren ist nicht erlaubt. + SwFrm( SwFrm & ); //Kopieren ist nicht erlaubt. const SwLayoutFrm* ImplGetNextLayoutLeaf( bool bFwd ) const; protected: SwSortedObjs* pDrawObjs; //Hier haengen die DrawObjs, kann 0 sein - SwRect aFrm; //Absolute Dokumentposition und groesse des Frm - SwRect aPrt; //Position der PrtArea rel zum Frm und groesse der PrtArea + SwRect aFrm; //Absolute Dokumentposition und groesse des Frm + SwRect aPrt; //Position der PrtArea rel zum Frm und groesse der PrtArea USHORT bFlag01: 1; USHORT bFlag02: 1; @@ -379,32 +379,32 @@ protected: USHORT bVertical: 1; USHORT nType: 4; //Who am I? - BOOL bValidPos: 1; - BOOL bValidPrtArea: 1; - BOOL bValidSize: 1; - BOOL bValidLineNum: 1; + BOOL bValidPos: 1; + BOOL bValidPrtArea: 1; + BOOL bValidSize: 1; + BOOL bValidLineNum: 1; BOOL bFixSize: 1; BOOL bUnUsed1: 1; - BOOL bCompletePaint: 1; //Frame wird ganz gepaintet wenn TRUE, auch + BOOL bCompletePaint: 1; //Frame wird ganz gepaintet wenn TRUE, auch //wenn der Inhalt nur teilw. veraendert ist; //Bei CntntFrms wird ausschliesslich wenn TRUE //der Border (von Action) gemalt. - BOOL bRetouche: 1; //Der Frame ist fuer Retusche verantwortlich + BOOL bRetouche: 1; //Der Frame ist fuer Retusche verantwortlich //wenn TRUE. public: BOOL bUnUsed2: 1; protected: - BOOL bInfInvalid: 1; //InfoFlags sind Invalid. - BOOL bInfBody: 1; //Frm steht im DokumentBody. - BOOL bInfTab: 1; //Frm steht in einer Tabelle. - BOOL bInfFly: 1; //Frm steht in einem Fly. - BOOL bInfFtn: 1; //Frm steht in einer Fussnote. - BOOL bInfSct: 1; //Frm steht in einem Bereich. - BOOL bColLocked: 1; //Grow/Shrink sperren bei spaltigen Section- + BOOL bInfInvalid: 1; //InfoFlags sind Invalid. + BOOL bInfBody: 1; //Frm steht im DokumentBody. + BOOL bInfTab: 1; //Frm steht in einer Tabelle. + BOOL bInfFly: 1; //Frm steht in einem Fly. + BOOL bInfFtn: 1; //Frm steht in einer Fussnote. + BOOL bInfSct: 1; //Frm steht in einem Bereich. + BOOL bColLocked: 1; //Grow/Shrink sperren bei spaltigen Section- //oder Fly-Frames, wird im Format gesetzt - void ColLock() { bColLocked = TRUE; } - void ColUnlock() { bColLocked = FALSE; } + void ColLock() { bColLocked = TRUE; } + void ColUnlock() { bColLocked = FALSE; } SwPageFrm *InsertPage( SwPageFrm *pSibling, BOOL bFtn ); void PrepareMake(); @@ -425,8 +425,8 @@ protected: virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ) = 0; virtual SwTwips GrowFrm ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ) = 0; - SwModify *GetDep() { return pRegisteredIn; } - const SwModify *GetDep() const { return pRegisteredIn; } + SwModify *GetDep() { return pRegisteredIn; } + const SwModify *GetDep() const { return pRegisteredIn; } SwFrm( SwModify* ); @@ -465,13 +465,13 @@ protected: void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const; public: - TYPEINFO(); //Bereits in Basisklasse Client drin. + TYPEINFO(); //Bereits in Basisklasse Client drin. USHORT GetType() const { return 0x1 << nType; } - static SwCache &GetCache() { return *pCache; } - static SwCache *GetCachePtr() { return pCache; } - static void SetCache( SwCache *pNew ) { pCache = pNew; } + static SwCache &GetCache() { return *pCache; } + static SwCache *GetCachePtr() { return pCache; } + static void SetCache( SwCache *pNew ) { pCache = pNew; } //Aendern die PrtArea-SSize und die FrmSize. SwTwips Shrink( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); @@ -520,7 +520,7 @@ public: void InvalidateObjs( const bool _bInvaPosOnly, const bool _bNoInvaOfAsCharAnchoredObjs = true ); - virtual void PaintBorder( const SwRect&, const SwPageFrm *pPage, + virtual void PaintBorder( const SwRect&, const SwPageFrm *pPage, const SwBorderAttrs & ) const; void PaintBaBo( const SwRect&, const SwPageFrm *pPage = 0, const BOOL bLowerBorder = FALSE ) const; @@ -547,10 +547,10 @@ public: inline void ResetRetouche() const; inline BOOL IsRetouche() const { return bRetouche; } - void SetInfFlags(); //Setzen der InfoFlags + void SetInfFlags(); //Setzen der InfoFlags inline void InvalidateInfFlags() { bInfInvalid = TRUE; } - inline BOOL IsInDocBody() const; //Benutzen die InfoFlags. - inline BOOL IsInFtn() const; //ggf. werden die Flags ermittelt. + inline BOOL IsInDocBody() const; //Benutzen die InfoFlags. + inline BOOL IsInFtn() const; //ggf. werden die Flags ermittelt. inline BOOL IsInTab() const; inline BOOL IsInFly() const; inline BOOL IsInSct() const; @@ -605,14 +605,14 @@ public: //Fussnote einzufuegen (nicht z.B. in wiederholten TabellenHeadlines). BOOL IsFtnAllowed() const; - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); virtual void Format( const SwBorderAttrs *pAttrs = 0 ); virtual void CheckDirection( BOOL bVert ); void ReinitializeFrmSizeAttrFlags(); - const SwAttrSet *GetAttrSet() const; + const SwAttrSet *GetAttrSet() const; inline BOOL HasFixSize() const { return bFixSize; } inline void SetFixSize( BOOL bNew ) { bFixSize = bNew; } @@ -625,32 +625,32 @@ public: static void CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields = TRUE ); //Koennen 0 liefern, einmal const einmal nicht - SwFrm *GetNext() { return pNext; } - SwFrm *GetPrev() { return pPrev; } - SwLayoutFrm *GetUpper() { return pUpper; } - SwRootFrm *FindRootFrm(); - SwPageFrm *FindPageFrm(); - SwFrm *FindColFrm(); - SwRowFrm *FindRowFrm(); - SwFtnBossFrm *FindFtnBossFrm( BOOL bFootnotes = FALSE ); - SwTabFrm *ImplFindTabFrm(); - SwFtnFrm *ImplFindFtnFrm(); - SwFlyFrm *ImplFindFlyFrm(); - SwSectionFrm *ImplFindSctFrm(); - SwFrm *FindFooterOrHeader(); - SwFrm *GetLower(); - const SwFrm *GetNext() const { return pNext; } - const SwFrm *GetPrev() const { return pPrev; } - const SwLayoutFrm *GetUpper() const { return pUpper; } - inline SwTabFrm *FindTabFrm(); - inline SwFtnFrm *FindFtnFrm(); - inline SwFlyFrm *FindFlyFrm(); - inline SwSectionFrm *FindSctFrm(); - inline SwFrm *FindNext(); + SwFrm *GetNext() { return pNext; } + SwFrm *GetPrev() { return pPrev; } + SwLayoutFrm *GetUpper() { return pUpper; } + SwRootFrm *FindRootFrm(); + SwPageFrm *FindPageFrm(); + SwFrm *FindColFrm(); + SwRowFrm *FindRowFrm(); + SwFtnBossFrm *FindFtnBossFrm( BOOL bFootnotes = FALSE ); + SwTabFrm *ImplFindTabFrm(); + SwFtnFrm *ImplFindFtnFrm(); + SwFlyFrm *ImplFindFlyFrm(); + SwSectionFrm *ImplFindSctFrm(); + SwFrm *FindFooterOrHeader(); + SwFrm *GetLower(); + const SwFrm *GetNext() const { return pNext; } + const SwFrm *GetPrev() const { return pPrev; } + const SwLayoutFrm *GetUpper() const { return pUpper; } + inline SwTabFrm *FindTabFrm(); + inline SwFtnFrm *FindFtnFrm(); + inline SwFlyFrm *FindFlyFrm(); + inline SwSectionFrm *FindSctFrm(); + inline SwFrm *FindNext(); // --> OD 2005-12-01 #i27138# - add parameter <_bInSameFtn> inline SwCntntFrm* FindNextCnt( const bool _bInSameFtn = false ); // <-- - inline SwFrm *FindPrev(); + inline SwFrm *FindPrev(); inline const SwPageFrm *FindPageFrm() const; inline const SwRootFrm *FindRootFrm() const; inline const SwFtnBossFrm *FindFtnBossFrm( BOOL bFtn = FALSE ) const; @@ -660,12 +660,12 @@ public: inline const SwFtnFrm *FindFtnFrm() const; inline const SwFlyFrm *FindFlyFrm() const; inline const SwSectionFrm *FindSctFrm() const; - inline const SwFrm *FindNext() const; + inline const SwFrm *FindNext() const; // --> OD 2005-12-01 #i27138# - add parameter <_bInSameFtn> inline const SwCntntFrm* FindNextCnt( const bool _bInSameFtn = false ) const; // <-- - inline const SwFrm *FindPrev() const; - const SwFrm *GetLower() const; + inline const SwFrm *FindPrev() const; + const SwFrm *GetLower() const; /** inline wrapper method for <_FindPrevCnt(..)> @@ -705,8 +705,8 @@ public: { return ( pNext || !IsInSct() ) ? pNext : _GetIndNext(); } const SwFrm* GetIndNext() const { return ((SwFrm*)this)->GetIndNext(); } - USHORT GetPhyPageNum() const; //Seitennummer ohne Offset - USHORT GetVirtPageNum() const; //Seitenummer mit Offset + USHORT GetPhyPageNum() const; //Seitennummer ohne Offset + USHORT GetVirtPageNum() const; //Seitenummer mit Offset BOOL OnRightPage() const { return 0 != GetPhyPageNum() % 2; }; BOOL WannaRightPage() const; @@ -745,9 +745,9 @@ public: void ValidateLineNum() { bValidLineNum = TRUE; } - BOOL GetValidPosFlag() const { return bValidPos; } + BOOL GetValidPosFlag() const { return bValidPos; } BOOL GetValidPrtAreaFlag()const { return bValidPrtArea; } - BOOL GetValidSizeFlag() const { return bValidSize; } + BOOL GetValidSizeFlag() const { return bValidSize; } BOOL GetValidLineNumFlag()const { return bValidLineNum; } BOOL IsValid() const { return bValidPos && bValidSize && bValidPrtArea; } @@ -826,11 +826,11 @@ public: virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; - virtual BOOL GetCrsrOfst( SwPosition *, Point&, + virtual BOOL GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0 ) const; - virtual BOOL GetCharRect( SwRect &, const SwPosition&, + virtual BOOL GetCharRect( SwRect &, const SwPosition&, SwCrsrMoveState* = 0 ) const; - virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const; + virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const; // der "kurze Dienstweg" zwischen den Frames und der Formatierung. // Wer den void* falsch Casted ist selbst schuld! @@ -849,7 +849,7 @@ public: inline BOOL IsFtnContFrm() const; inline BOOL IsFtnFrm() const; inline BOOL IsBodyFrm() const; - inline BOOL IsColBodyFrm() const; // in layfrm.hxx implementiert, BodyFrm unterhalb ColumnFrm + inline BOOL IsColBodyFrm() const; // in layfrm.hxx implementiert, BodyFrm unterhalb ColumnFrm inline BOOL IsPageBodyFrm() const; // in layfrm.hxx implementiert, BodyFrm unterhalb PageFrm inline BOOL IsFlyFrm() const; inline BOOL IsSctFrm() const; @@ -859,20 +859,20 @@ public: inline BOOL IsCntntFrm() const; inline BOOL IsTxtFrm() const; inline BOOL IsNoTxtFrm() const; - inline BOOL IsFlowFrm() const; //Frms deren PrtArea von den Nachbarn + inline BOOL IsFlowFrm() const; //Frms deren PrtArea von den Nachbarn //abhaengen und die halt im Inhaltsfluss //stehen. - inline BOOL IsRetoucheFrm() const; //Frms die Retouchefaehig sind bzw. die + inline BOOL IsRetoucheFrm() const; //Frms die Retouchefaehig sind bzw. die //u.U. hinter sich Retouchieren muessen. inline BOOL IsAccessibleFrm() const; - void PrepareCrsr(); //Die CrsrShell darf. + void PrepareCrsr(); //Die CrsrShell darf. //Ist der Frm (bzw. die Section in der er steht) geschuetzt? //Auch Fly in Fly in ... und Fussnoten BOOL IsProtected() const; - BOOL IsColLocked() const { return bColLocked; } + BOOL IsColLocked() const { return bColLocked; } virtual ~SwFrm(); @@ -928,13 +928,13 @@ public: bool IsCollapse() const; }; -inline BOOL SwFrm::IsInDocBody() const +inline BOOL SwFrm::IsInDocBody() const { if ( bInfInvalid ) ((SwFrm*)this)->SetInfFlags(); return bInfBody; } -inline BOOL SwFrm::IsInFtn() const +inline BOOL SwFrm::IsInFtn() const { if ( bInfInvalid ) ((SwFrm*)this)->SetInfFlags(); diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx index b965dabd816f..de1f5f0d8ef0 100644 --- a/sw/source/core/inc/frminf.hxx +++ b/sw/source/core/inc/frminf.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include "swtypes.hxx" -class SwTxtFrm; // SwTxtFrmInfo -class SwPaM; // SwTxtFrmInfo -class SwTxtCursor; // SwTxtFrmInfo +class SwTxtFrm; // SwTxtFrmInfo +class SwPaM; // SwTxtFrmInfo +class SwTxtCursor; // SwTxtFrmInfo /************************************************************************* - * class SwTxtFrmInfo + * class SwTxtFrmInfo *************************************************************************/ class SwTxtFrmInfo diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index d91d77a5425d..844fbbfe5bc9 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ struct SwFindRowSpanCacheObj; #define MA_FASTCALL #endif -#define WEIT_WECH LONG_MAX - 20000 //Initale Position der Flys. +#define WEIT_WECH LONG_MAX - 20000 //Initale Position der Flys. #define BROWSE_HEIGHT 56700L * 10L //10 Meter //#define BROWSE_HEIGHT 1440L * 45L // 45 inch, maximum size for pdf files @@ -107,7 +107,7 @@ extern BOOL bSetCompletePaintOnInvalidate; //Fuer Tabelleneinstellung per Tastatur. long MA_FASTCALL CalcRowRstHeight( SwLayoutFrm *pRow ); -long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ); //MA_FLY_HEIGHT +long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ); //MA_FLY_HEIGHT //Neue Seite einsetzen SwPageFrm * MA_FASTCALL InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, @@ -138,7 +138,7 @@ BOOL IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm ); const SwFrm * MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage ); // JP 07.05.98: wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm -// gerufen +// gerufen SwFrm* GetFrmOfModify( SwModify const&, USHORT const nFrmType, const Point* = 0, const SwPosition *pPos = 0, const BOOL bCalcFrm = FALSE ); @@ -164,8 +164,8 @@ protected: SwTwips mnFlyAnchorOfst; SwTwips mnFlyAnchorOfstNoWrap; BOOL bHadFollow; - BOOL bInvaKeep; - BOOL bValidSize; + BOOL bInvaKeep; + BOOL bValidSize; protected: // --> OD 2005-07-29 #i49383# bool mbFrmDeleted; @@ -196,7 +196,7 @@ public: ~SwLayNotify(); void SetLowersComplete( BOOL b ) { bLowersComplete = b; } - BOOL IsLowersComplete() { return bLowersComplete; } + BOOL IsLowersComplete() { return bLowersComplete; } }; class SwFlyNotify : public SwLayNotify @@ -251,32 +251,32 @@ public: // the stuff that belongs to it. class SwBorderAttrs : public SwCacheObj { - const SwAttrSet &rAttrSet; + const SwAttrSet &rAttrSet; const SvxULSpaceItem &rUL; // --> OD 2008-12-04 #i96772# SvxLRSpaceItem rLR; // <-- - const SvxBoxItem &rBox; + const SvxBoxItem &rBox; const SvxShadowItem &rShadow; - const Size aFrmSize; //Die FrmSize + const Size aFrmSize; //Die FrmSize - BOOL bBorderDist :1; //Ist's ein Frm der auch ohne Linie + BOOL bBorderDist :1; //Ist's ein Frm der auch ohne Linie //einen Abstand haben kann? //Mit den Folgenden Bools werden die gecache'ten Werte fuer UNgueltig //erklaert - bis sie einmal berechnet wurden. - BOOL bTopLine :1; - BOOL bBottomLine :1; - BOOL bLeftLine :1; - BOOL bRightLine :1; - BOOL bTop :1; - BOOL bBottom :1; - BOOL bLine :1; - - BOOL bIsLine :1; //Umrandung an mind. einer Kante? - - BOOL bCacheGetLine :1; //GetTopLine(), GetBottomLine() cachen? - BOOL bCachedGetTopLine :1; //GetTopLine() gecached? + BOOL bTopLine :1; + BOOL bBottomLine :1; + BOOL bLeftLine :1; + BOOL bRightLine :1; + BOOL bTop :1; + BOOL bBottom :1; + BOOL bLine :1; + + BOOL bIsLine :1; //Umrandung an mind. einer Kante? + + BOOL bCacheGetLine :1; //GetTopLine(), GetBottomLine() cachen? + BOOL bCachedGetTopLine :1; //GetTopLine() gecached? BOOL bCachedGetBottomLine :1; //GetBottomLine() gecached? // OD 21.05.2003 #108789# - booleans indicating, if values <bJoinedWithPrev> // and <bJoinedWithNext> are cached and valid. @@ -343,11 +343,11 @@ public: SwBorderAttrs( const SwModify *pOwner, const SwFrm *pConstructor ); ~SwBorderAttrs(); - inline const SwAttrSet &GetAttrSet() const { return rAttrSet; } - inline const SvxULSpaceItem &GetULSpace() const { return rUL; } - inline const SvxLRSpaceItem &GetLRSpace() const { return rLR; } - inline const SvxBoxItem &GetBox() const { return rBox; } - inline const SvxShadowItem &GetShadow() const { return rShadow; } + inline const SwAttrSet &GetAttrSet() const { return rAttrSet; } + inline const SvxULSpaceItem &GetULSpace() const { return rUL; } + inline const SvxLRSpaceItem &GetLRSpace() const { return rLR; } + inline const SvxBoxItem &GetBox() const { return rBox; } + inline const SvxShadowItem &GetShadow() const { return rShadow; } inline USHORT CalcTopLine() const; inline USHORT CalcBottomLine() const; @@ -360,7 +360,7 @@ public: inline BOOL IsLine() const; - inline const Size &GetSize() const { return aFrmSize; } + inline const Size &GetSize() const { return aFrmSize; } inline BOOL IsBorderDist() const { return bBorderDist; } @@ -371,7 +371,7 @@ public: inline USHORT GetTopLine ( const SwFrm& _rFrm, const SwFrm* _pPrevFrm = 0L ) const; inline USHORT GetBottomLine( const SwFrm& _rFrm ) const; - inline void SetGetCacheLine( BOOL bNew ) const; + inline void SetGetCacheLine( BOOL bNew ) const; // OD 21.05.2003 #108789# - accessors for cached values <bJoinedWithPrev> // and <bJoinedWithPrev> // OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm> @@ -384,7 +384,7 @@ public: class SwBorderAttrAccess : public SwCacheAccess { - const SwFrm *pConstructor; //opt: Zur weitergabe an SwBorderAttrs + const SwFrm *pConstructor; //opt: Zur weitergabe an SwBorderAttrs protected: virtual SwCacheObj *NewObj(); @@ -407,8 +407,8 @@ class SwOrderIter public: SwOrderIter( const SwPageFrm *pPage, BOOL bFlysOnly = TRUE ); - void Current( const SdrObject *pNew ) { pCurrent = pNew; } - const SdrObject *Current() const { return pCurrent; } + void Current( const SdrObject *pNew ) { pCurrent = pNew; } + const SdrObject *Current() const { return pCurrent; } const SdrObject *operator()() const { return pCurrent; } const SdrObject *Top(); const SdrObject *Bottom(); @@ -433,8 +433,8 @@ public: StackHack::bLocked = FALSE; } - static BOOL IsLocked() { return StackHack::bLocked; } - static BYTE Count() { return StackHack::nCnt; } + static BOOL IsLocked() { return StackHack::bLocked; } + static BYTE Count() { return StackHack::nCnt; } }; @@ -457,7 +457,7 @@ inline USHORT SwBorderAttrs::GetBottomLine( const SwFrm& _rFrm ) const const_cast<SwBorderAttrs*>(this)->_GetBottomLine( _rFrm ); return nGetBottomLine; } -inline void SwBorderAttrs::SetGetCacheLine( BOOL bNew ) const +inline void SwBorderAttrs::SetGetCacheLine( BOOL bNew ) const { ((SwBorderAttrs*)this)->bCacheGetLine = bNew; ((SwBorderAttrs*)this)->bCachedGetBottomLine = diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx index 427673fdeb20..c732011dd109 100644 --- a/sw/source/core/inc/ftnboss.hxx +++ b/sw/source/core/inc/ftnboss.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,12 +64,12 @@ class SwFtnBossFrm: public SwLayoutFrm SwTwips nMaxFtnHeight; SwFtnContFrm *MakeFtnCont(); - SwFtnFrm *FindFirstFtn(); + SwFtnFrm *FindFirstFtn(); BYTE _NeighbourhoodAdjustment( const SwFrm* pFrm ) const; protected: - void InsertFtn( SwFtnFrm * ); - static void ResetFtn( const SwFtnFrm *pAssumed ); + void InsertFtn( SwFtnFrm * ); + static void ResetFtn( const SwFtnFrm *pAssumed ); public: inline SwFtnBossFrm( SwFrmFmt* pFmt) : SwLayoutFrm( pFmt ) {} @@ -80,10 +80,10 @@ public: //Fussnotenschnittstelle void AppendFtn( SwCntntFrm *, SwTxtFtn * ); void RemoveFtn( const SwCntntFrm *, const SwTxtFtn *, BOOL bPrep = TRUE ); - static SwFtnFrm *FindFtn( const SwCntntFrm *, const SwTxtFtn * ); + static SwFtnFrm *FindFtn( const SwCntntFrm *, const SwTxtFtn * ); SwFtnContFrm *FindFtnCont(); inline const SwFtnContFrm *FindFtnCont() const; - const SwFtnFrm *FindFirstFtn( SwCntntFrm* ) const; + const SwFtnFrm *FindFirstFtn( SwCntntFrm* ) const; SwFtnContFrm *FindNearestFtnCont( BOOL bDontLeave = FALSE ); void ChangeFtnRef( const SwCntntFrm *pOld, const SwTxtFtn *, @@ -93,7 +93,7 @@ public: //SS damit der Textformatierer Temporaer die Fussnotenhoehe begrenzen //kann. DeadLine in Dokumentkoordinaten. - void SetFtnDeadLine( const SwTwips nDeadLine ); + void SetFtnDeadLine( const SwTwips nDeadLine ); SwTwips GetMaxFtnHeight() const { return nMaxFtnHeight; } //Liefert den Wert, der noch uebrig ist, bis der Body seine minimale @@ -118,8 +118,8 @@ public: SwFtnBossFrm* _pOld, SvPtrarr& _rFtnArr, const sal_Bool _bCollectOnlyPreviousFtns = sal_False ); - void _MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc = FALSE ); - void MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, + void _MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc = FALSE ); + void MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, SwTxtFtn *pAttr ); // Sollte AdjustNeighbourhood gerufen werden (oder Grow/Shrink)? BYTE NeighbourhoodAdjustment( const SwFrm* pFrm ) const @@ -135,6 +135,6 @@ inline const SwFtnContFrm *SwFtnBossFrm::FindFtnCont() const return ((SwFtnBossFrm*)this)->FindFtnCont(); } -#endif //_FTNBOSS_HXX +#endif //_FTNBOSS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index b1543e5c4383..b171dce38c4b 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,10 +62,10 @@ class SwFtnFrm: public SwLayoutFrm // 0 wenn kein Follow vorhanden, // this beim letzten // der Follow sonst. - SwFtnFrm *pFollow; - SwFtnFrm *pMaster; //Der FtnFrm dessen Follow ich bin. - SwCntntFrm *pRef; //In diesem CntntFrm steht die Fussnotenref. - SwTxtFtn *pAttr; //Fussnotenattribut (zum wiedererkennen) + SwFtnFrm *pFollow; + SwFtnFrm *pMaster; //Der FtnFrm dessen Follow ich bin. + SwCntntFrm *pRef; //In diesem CntntFrm steht die Fussnotenref. + SwTxtFtn *pAttr; //Fussnotenattribut (zum wiedererkennen) BOOL bBackMoveLocked : 1; //Absaetze in dieser Fussnote duerfen derzeit //nicht rueckwaerts fliessen. @@ -93,20 +93,20 @@ public: const SwCntntFrm *GetRef() const; SwCntntFrm *GetRef(); #else - const SwCntntFrm *GetRef() const { return pRef; } - SwCntntFrm *GetRef() { return pRef; } + const SwCntntFrm *GetRef() const { return pRef; } + SwCntntFrm *GetRef() { return pRef; } #endif const SwCntntFrm *GetRefFromAttr() const; SwCntntFrm *GetRefFromAttr(); - const SwFtnFrm *GetFollow() const { return pFollow; } - SwFtnFrm *GetFollow() { return pFollow; } + const SwFtnFrm *GetFollow() const { return pFollow; } + SwFtnFrm *GetFollow() { return pFollow; } - const SwFtnFrm *GetMaster() const { return pMaster; } - SwFtnFrm *GetMaster() { return pMaster; } + const SwFtnFrm *GetMaster() const { return pMaster; } + SwFtnFrm *GetMaster() { return pMaster; } - const SwTxtFtn *GetAttr() const { return pAttr; } - SwTxtFtn *GetAttr() { return pAttr; } + const SwTxtFtn *GetAttr() const { return pAttr; } + SwTxtFtn *GetAttr() { return pAttr; } void SetFollow( SwFtnFrm *pNew ) { pFollow = pNew; } void SetMaster( SwFtnFrm *pNew ) { pMaster = pNew; } @@ -114,13 +114,13 @@ public: void InvalidateNxtFtnCnts( SwPageFrm* pPage ); - void LockBackMove() { bBackMoveLocked = TRUE; } + void LockBackMove() { bBackMoveLocked = TRUE; } void UnlockBackMove() { bBackMoveLocked = FALSE;} BOOL IsBackMoveLocked() { return bBackMoveLocked; } // Verhindert, dass der letzte Inhalt den SwFtnFrm mitloescht (Cut()) - inline void ColLock() { bColLocked = TRUE; } - inline void ColUnlock() { bColLocked = FALSE; } + inline void ColLock() { bColLocked = TRUE; } + inline void ColUnlock() { bColLocked = FALSE; } // --> OD 2005-05-18 #i49383# inline void UnlockPosOfLowerObjs() @@ -148,6 +148,6 @@ public: SwCntntFrm* FindLastCntnt(); }; -#endif //_FTNFRM_HXX +#endif //_FTNFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx index 50b41717a3f9..2b1570a1a9e8 100644 --- a/sw/source/core/inc/hffrm.hxx +++ b/sw/source/core/inc/hffrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,9 +42,9 @@ protected: public: SwHeadFootFrm(SwFrmFmt * pFrm, USHORT aType); virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual SwTwips GrowFrm( SwTwips, + virtual SwTwips GrowFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); - virtual SwTwips ShrinkFrm( SwTwips, + virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); }; @@ -64,6 +64,6 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwFooterFrm) }; -#endif //_HFFRM_HXX +#endif //_HFFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/ifinishedthreadlistener.hxx b/sw/source/core/inc/ifinishedthreadlistener.hxx index fbf6099f8456..ecba5e554684 100644 --- a/sw/source/core/inc/ifinishedthreadlistener.hxx +++ b/sw/source/core/inc/ifinishedthreadlistener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/ithreadlistenerowner.hxx b/sw/source/core/inc/ithreadlistenerowner.hxx index 8ba165774ee7..224844465189 100644 --- a/sw/source/core/inc/ithreadlistenerowner.hxx +++ b/sw/source/core/inc/ithreadlistenerowner.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index 2a0a01be4461..65247852f9f6 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ class SfxProgress; class SwLayAction { SwRootFrm *pRoot; - SwViewImp *pImp; //Hier Meldet sich die Action an und ab. + SwViewImp *pImp; //Hier Meldet sich die Action an und ab. //Zur Optimierung, damit die Tabellen etwas besser am Crsr kleben beim //Return/Backspace davor. @@ -74,33 +74,33 @@ class SwLayAction //hier ein. Die Steuerung der InternalAction kann dann geeignet reagieren. USHORT nPreInvaPage; - ULONG nStartTicks; //Startzeitpunkt der Aktion, vergeht zu viel Zeit kann + ULONG nStartTicks; //Startzeitpunkt der Aktion, vergeht zu viel Zeit kann //der WaitCrsr per CheckWaitCrsr() eingeschaltet werden. - USHORT nInputType; //Bei welchem Input soll die Verarbeitung abgebrochen + USHORT nInputType; //Bei welchem Input soll die Verarbeitung abgebrochen //werden? - USHORT nEndPage; //StatBar Steuerung. + USHORT nEndPage; //StatBar Steuerung. USHORT nCheckPageNum; //CheckPageDesc() wurde verzoegert wenn != USHRT_MAX //ab dieser Seite Checken. - BOOL bPaint; //Painten oder nur Formatieren? - BOOL bComplete; //Alles bis zum sichtbaren Bereich Formatieren oder + BOOL bPaint; //Painten oder nur Formatieren? + BOOL bComplete; //Alles bis zum sichtbaren Bereich Formatieren oder //oder nur den sichtbaren Bereich? - BOOL bCalcLayout; //Vollstaendige Reformatierung? - BOOL bAgain; //Zur automatisch wiederholten Action wenn Seiten + BOOL bCalcLayout; //Vollstaendige Reformatierung? + BOOL bAgain; //Zur automatisch wiederholten Action wenn Seiten //geloscht werden. - BOOL bNextCycle; //Wiederaufsetzen bei der ersten Ungueltigen Seite. - BOOL bInput; //Zum Abbrechen der Verarbeitung wenn ein Input anliegt. - BOOL bIdle; //True wenn die Layaction vom Idler ausgeloest wurde. - BOOL bReschedule; //Soll das Reschedule - abhaengig vom Progress - + BOOL bNextCycle; //Wiederaufsetzen bei der ersten Ungueltigen Seite. + BOOL bInput; //Zum Abbrechen der Verarbeitung wenn ein Input anliegt. + BOOL bIdle; //True wenn die Layaction vom Idler ausgeloest wurde. + BOOL bReschedule; //Soll das Reschedule - abhaengig vom Progress - //gerufen werden? BOOL bCheckPages; //CheckPageDescs() ausfuehren oder verzoegern. BOOL bUpdateExpFlds;//Wird gesetzt wenn nach dem Formatierien noch eine //Runde fuer den ExpFld laufen muss. BOOL bBrowseActionStop; //Action fruehzeitig beenden (per bInput) und den //Rest dem Idler ueberlassen. - BOOL bWaitAllowed; //Wartecursor erlaubt? - BOOL bPaintExtraData; //Anzeige von Zeilennumerierung o. ae. eingeschaltet? + BOOL bWaitAllowed; //Wartecursor erlaubt? + BOOL bPaintExtraData; //Anzeige von Zeilennumerierung o. ae. eingeschaltet? BOOL bActionInProgress; // wird in Action() anfangs gesetzt und zum Schluss geloescht // OD 14.04.2003 #106346# - new flag for content formatting on interrupt. @@ -140,52 +140,52 @@ public: ~SwLayAction(); #ifdef _LAYACT_CXX - void SetIdle ( BOOL bNew ) { bIdle = bNew; } - void SetCheckPages ( BOOL bNew ) { bCheckPages = bNew; } - void SetBrowseActionStop(BOOL bNew ) { bBrowseActionStop = bNew; } - void SetNextCycle ( BOOL bNew ) { bNextCycle = bNew; } - - BOOL IsWaitAllowed() const { return bWaitAllowed; } - BOOL IsNextCycle() const { return bNextCycle; } - BOOL IsInput() const { return bInput; } - BOOL IsWait() const { return 0 != pWait; } - BOOL IsPaint() const { return bPaint; } - BOOL IsIdle() const { return bIdle; } - BOOL IsReschedule() const { return bReschedule; } - BOOL IsPaintExtraData() const { return bPaintExtraData;} + void SetIdle ( BOOL bNew ) { bIdle = bNew; } + void SetCheckPages ( BOOL bNew ) { bCheckPages = bNew; } + void SetBrowseActionStop(BOOL bNew ) { bBrowseActionStop = bNew; } + void SetNextCycle ( BOOL bNew ) { bNextCycle = bNew; } + + BOOL IsWaitAllowed() const { return bWaitAllowed; } + BOOL IsNextCycle() const { return bNextCycle; } + BOOL IsInput() const { return bInput; } + BOOL IsWait() const { return 0 != pWait; } + BOOL IsPaint() const { return bPaint; } + BOOL IsIdle() const { return bIdle; } + BOOL IsReschedule() const { return bReschedule; } + BOOL IsPaintExtraData() const { return bPaintExtraData;} BOOL IsStopPrt() const; BOOL IsInterrupt() const { return IsInput() || IsStopPrt(); } - USHORT GetInputType() const { return nInputType; } + USHORT GetInputType() const { return nInputType; } #endif //Einstellen der Action auf das gewuenschte Verhalten. - void SetPaint ( BOOL bNew ) { bPaint = bNew; } - void SetComplete ( BOOL bNew ) { bComplete = bNew; } - void SetStatBar ( BOOL bNew ); - void SetInputType ( USHORT nNew ) { nInputType = nNew; } - void SetCalcLayout ( BOOL bNew ) { bCalcLayout = bNew; } - void SetReschedule ( BOOL bNew ) { bReschedule = bNew; } - void SetWaitAllowed ( BOOL bNew ) { bWaitAllowed = bNew; } - - void SetAgain() { bAgain = TRUE; } - void SetUpdateExpFlds() {bUpdateExpFlds = TRUE; } + void SetPaint ( BOOL bNew ) { bPaint = bNew; } + void SetComplete ( BOOL bNew ) { bComplete = bNew; } + void SetStatBar ( BOOL bNew ); + void SetInputType ( USHORT nNew ) { nInputType = nNew; } + void SetCalcLayout ( BOOL bNew ) { bCalcLayout = bNew; } + void SetReschedule ( BOOL bNew ) { bReschedule = bNew; } + void SetWaitAllowed ( BOOL bNew ) { bWaitAllowed = bNew; } + + void SetAgain() { bAgain = TRUE; } + void SetUpdateExpFlds() {bUpdateExpFlds = TRUE; } void SetProgress(SfxProgress * _pProgress = NULL) { pProgress = _pProgress; } inline void SetCheckPageNum( USHORT nNew ); inline void SetCheckPageNumDirect( USHORT nNew ) { nCheckPageNum = nNew; } - void Action(); //Jetzt gehts loos... - void Reset(); //Zurueck auf CTor-Defaults. + void Action(); //Jetzt gehts loos... + void Reset(); //Zurueck auf CTor-Defaults. - BOOL IsAgain() const { return bAgain; } - BOOL IsComplete() const { return bComplete; } - BOOL IsExpFlds() const { return bUpdateExpFlds; } + BOOL IsAgain() const { return bAgain; } + BOOL IsComplete() const { return bComplete; } + BOOL IsExpFlds() const { return bUpdateExpFlds; } BOOL IsCalcLayout() const { return bCalcLayout; } BOOL IsCheckPages() const { return bCheckPages; } - BOOL IsBrowseActionStop() const { return bBrowseActionStop; } - BOOL IsActionInProgress() const { return bActionInProgress; } + BOOL IsBrowseActionStop() const { return bBrowseActionStop; } + BOOL IsActionInProgress() const { return bActionInProgress; } USHORT GetCheckPageNum() const { return nCheckPageNum; } @@ -204,11 +204,11 @@ class SwLayIdle { SwRootFrm *pRoot; - SwViewImp *pImp; // Hier Meldet sich der Idler an und ab. - SwCntntNode *pCntntNode; // Hier wird die aktuelle Cursorposition - xub_StrLen nTxtPos; // zwischengespeichert. - BOOL bPageValid; // Konnte die Seite alles validiert werden? - BOOL bAllValid; // Konnte alles validiert werden? + SwViewImp *pImp; // Hier Meldet sich der Idler an und ab. + SwCntntNode *pCntntNode; // Hier wird die aktuelle Cursorposition + xub_StrLen nTxtPos; // zwischengespeichert. + BOOL bPageValid; // Konnte die Seite alles validiert werden? + BOOL bAllValid; // Konnte alles validiert werden? #if OSL_DEBUG_LEVEL > 1 BOOL bIndicator; @@ -237,6 +237,6 @@ inline void SwLayAction::SetCheckPageNum( USHORT nNew ) nCheckPageNum = nNew; } -#endif //_LAYACT_HXX +#endif //_LAYACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx index 71a2ec530196..894550be3e29 100644 --- a/sw/source/core/inc/laycache.hxx +++ b/sw/source/core/inc/laycache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index a832464c1f8d..f4684e56f06d 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ protected: virtual void Format( const SwBorderAttrs *pAttrs = 0 ); virtual void MakeAll(); - SwFrm *pLower; + SwFrm *pLower; virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); virtual SwTwips GrowFrm ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); @@ -106,7 +106,7 @@ public: SwLayoutFrm( SwFrmFmt* ); ~SwLayoutFrm(); - virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const; + virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const; const SwFrm *Lower() const { return pLower; } SwFrm *Lower() { return pLower; } const SwCntntFrm *ContainsCntnt() const; @@ -125,8 +125,8 @@ public: BOOL IsAnLower( const SwFrm * ) const; const SwFrmFmt *GetFmt() const { return (const SwFrmFmt*)GetDep(); } - SwFrmFmt *GetFmt() { return (SwFrmFmt*)GetDep(); } - void SetFrmFmt( SwFrmFmt* ); + SwFrmFmt *GetFmt() { return (SwFrmFmt*)GetDep(); } + void SetFrmFmt( SwFrmFmt* ); //Verschieben der Ftns aller Lower - ab dem StartCntnt. //TRUE wenn mindestens eine Ftn verschoben wurde. @@ -207,6 +207,6 @@ inline SwFrm* SwLayoutFrm::GetLastLower() return const_cast<SwFrm*>(static_cast<const SwLayoutFrm*>(this)->GetLastLower()); } -#endif //_LAYFRM_HXX +#endif //_LAYFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index 3c4da1a97046..8e19f9a128bc 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx index 6e4f55e228b7..83a594a748ca 100644 --- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx +++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index ec9b4dcebbb5..da9a4389d56b 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -133,15 +133,15 @@ class SwDataChanged SwDoc* pDoc; ULONG nNode; xub_StrLen nCntnt; - USHORT nType; // Insert/Move/Delete/... (UndoIds) + USHORT nType; // Insert/Move/Delete/... (UndoIds) public: SwDataChanged( const SwPaM& rPam, USHORT nType ); SwDataChanged( SwDoc* pDoc, const SwPosition& rPos, USHORT nType ); ~SwDataChanged(); - ULONG GetNode() const { return nNode; } - xub_StrLen GetCntnt() const { return nCntnt; } + ULONG GetNode() const { return nNode; } + xub_StrLen GetCntnt() const { return nCntnt; } }; @@ -196,8 +196,8 @@ public: int operator<( const _ZSortFly& rCmp ) const { return nOrdNum < rCmp.nOrdNum; } - const SwFrmFmt* GetFmt() const { return pFmt; } - const SwFmtAnchor* GetAnchor() const { return pAnchor; } + const SwFrmFmt* GetFmt() const { return pFmt; } + const SwFmtAnchor* GetAnchor() const { return pAnchor; } }; SV_DECL_VARARR_SORT( _ZSortFlys, _ZSortFly, 0, 10 ) @@ -226,6 +226,6 @@ public: }; -#endif // _MVSAVE_HXX +#endif // _MVSAVE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx index 4b02278e5a40..c74e8b632502 100644 --- a/sw/source/core/inc/node2lay.hxx +++ b/sw/source/core/inc/node2lay.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,10 +46,10 @@ * je nach Aufgabenstellung. * Die Aufgabenstellung wird durch die Wahl des Ctors bestimmt. * 1. Das Einsammeln der UpperFrms, damit spaeter RestoreUpperFrms wird, - * wird von MakeFrms gerufen, wenn es keinen PrevNext gibt, vor/hinter den - * die Frames gehaengt werden koennen. + * wird von MakeFrms gerufen, wenn es keinen PrevNext gibt, vor/hinter den + * die Frames gehaengt werden koennen. * 2. Die Lieferung der Frames hinter/vor die die neuen Frames eines Nodes - * gehaengt werden muessen, ebenfalls von MakeFrms gerufen. + * gehaengt werden muessen, ebenfalls von MakeFrms gerufen. * --------------------------------------------------*/ class SwNode2LayImpl; diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index 66e5ac515a3e..f07009e2ef18 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,8 @@ * ************************************************************************/ -#ifndef _NOTEURL_HXX -#define _NOTEURL_HXX +#ifndef _NOTEURL_HXX +#define _NOTEURL_HXX #include <svl/svarray.hxx> @@ -46,9 +46,9 @@ public: SwURLNote( const String& rURL, const String& rTarget, const SwRect& rRect ) : aURL( rURL ), aTarget( rTarget ), aRect( rRect ) {} - const String& GetURL() const { return aURL; } - const String& GetTarget() const { return aTarget; } - const SwRect& GetRect() const { return aRect; } + const String& GetURL() const { return aURL; } + const String& GetTarget() const { return aTarget; } + const SwRect& GetRect() const { return aRect; } BOOL operator==( const SwURLNote& rSwURLNote ) const { return aRect == rSwURLNote.aRect; } }; diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index 4353b90a52f8..394149a5d85f 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class SwNoTxtFrm: public SwCntntFrm { friend void _FrmFinit(); - short nWeight; // "Wichtigkeit" der Grafik + short nWeight; // "Wichtigkeit" der Grafik const Size& GetSize() const; @@ -63,7 +63,7 @@ public: BOOL GetCrsrOfst(SwPosition* pPos, Point& aPoint, SwCrsrMoveState* = 0) const; - const Size &GetGrfSize() const { return GetSize(); } + const Size &GetGrfSize() const { return GetSize(); } void GetGrfArea( SwRect &rRect, SwRect * = 0, BOOL bMirror = TRUE ) const; BOOL IsTransparent() const; diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx index 551d01f6d10f..6fccce3ef11b 100644 --- a/sw/source/core/inc/objectformatter.hxx +++ b/sw/source/core/inc/objectformatter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index e51a06e76420..b2c11c8b2da6 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 28ec5b7e5bdf..61a4bcdd2d8e 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -67,17 +67,17 @@ class SwPageFrm: public SwFtnBossFrm // OD 2004-05-07 #i28701# - use <SwSortedObjs> SwSortedObjs *pSortedObjs; - SwPageDesc *pDesc; //PageDesc der die Seite beschreibt. + SwPageDesc *pDesc; //PageDesc der die Seite beschreibt. - USHORT nPhyPageNum; //Physikalische Seitennummer. + USHORT nPhyPageNum; //Physikalische Seitennummer. - BOOL bInvalidCntnt :1; - BOOL bInvalidLayout :1; - BOOL bInvalidFlyCntnt :1; - BOOL bInvalidFlyLayout :1; - BOOL bInvalidFlyInCnt :1; - BOOL bFtnPage :1; //Diese Seite ist fuer Dokumentende-Fussnoten. - BOOL bEmptyPage :1; //Dies ist eine explizite Leerseite + BOOL bInvalidCntnt :1; + BOOL bInvalidLayout :1; + BOOL bInvalidFlyCntnt :1; + BOOL bInvalidFlyLayout :1; + BOOL bInvalidFlyInCnt :1; + BOOL bFtnPage :1; //Diese Seite ist fuer Dokumentende-Fussnoten. + BOOL bEmptyPage :1; //Dies ist eine explizite Leerseite BOOL bEndNotePage :1; //'Fussnotenseite' fuer Endnoten BOOL bInvalidSpelling :1; //Das Online-Spelling ist gefordert BOOL bInvalidSmartTags :1; //checking for smarttags is needed // SMARTTAGS @@ -201,7 +201,7 @@ public: //public, damit die ViewShell beim Umschalten vom BrowseMode darauf //zugreifen kann. - void PrepareHeader(); //Kopf-/Fusszeilen anlegen/entfernen. + void PrepareHeader(); //Kopf-/Fusszeilen anlegen/entfernen. void PrepareFooter(); const SwSortedObjs *GetSortedObjs() const { return pSortedObjs; } @@ -222,7 +222,7 @@ public: SwPageDesc *FindPageDesc(); SwCntntFrm *FindLastBodyCntnt(); - inline SwCntntFrm *FindFirstBodyCntnt(); + inline SwCntntFrm *FindFirstBodyCntnt(); inline const SwCntntFrm *FindFirstBodyCntnt() const; inline const SwCntntFrm *FindLastBodyCntnt() const; @@ -231,7 +231,7 @@ public: BOOL IsEmptyPage() const { return bEmptyPage; } //explizite Leerseite. - void UpdateFtnNum(); + void UpdateFtnNum(); //Immer nach dem Paste rufen. Erzeugt die Seitengeb. Rahmen und Formatiert //generischen Inhalt. @@ -270,33 +270,33 @@ public: void RefreshSubsidiary( const SwRect& ) const; //Fussnotenschnittstelle - BOOL IsFtnPage() const { return bFtnPage; } - BOOL IsEndNotePage() const { return bEndNotePage; } - void SetFtnPage( BOOL b ) { bFtnPage = b; } - void SetEndNotePage( BOOL b ) { bEndNotePage = b; } + BOOL IsFtnPage() const { return bFtnPage; } + BOOL IsEndNotePage() const { return bEndNotePage; } + void SetFtnPage( BOOL b ) { bFtnPage = b; } + void SetEndNotePage( BOOL b ) { bEndNotePage = b; } - inline USHORT GetPhyPageNum() const { return nPhyPageNum;} - inline void SetPhyPageNum( USHORT nNum ) { nPhyPageNum = nNum;} - inline void DecrPhyPageNum() { --nPhyPageNum; } - inline void IncrPhyPageNum() { ++nPhyPageNum; } + inline USHORT GetPhyPageNum() const { return nPhyPageNum;} + inline void SetPhyPageNum( USHORT nNum ) { nPhyPageNum = nNum;} + inline void DecrPhyPageNum() { --nPhyPageNum; } + inline void IncrPhyPageNum() { ++nPhyPageNum; } //Validieren, invalidieren und abfragen des Status der Seite. //Layout/Cntnt und jeweils Fly/nicht Fly werden getrennt betrachtet. inline void InvalidateFlyLayout() const; inline void InvalidateFlyCntnt() const; inline void InvalidateFlyInCnt() const; - inline void InvalidateLayout() const; - inline void InvalidateCntnt() const; - inline void InvalidateSpelling() const; + inline void InvalidateLayout() const; + inline void InvalidateCntnt() const; + inline void InvalidateSpelling() const; inline void InvalidateSmartTags() const; - inline void InvalidateAutoCompleteWords() const; + inline void InvalidateAutoCompleteWords() const; inline void InvalidateWordCount() const; inline void ValidateFlyLayout() const; inline void ValidateFlyCntnt() const; inline void ValidateFlyInCnt() const; - inline void ValidateLayout() const; - inline void ValidateCntnt() const; - inline void ValidateSpelling() const; + inline void ValidateLayout() const; + inline void ValidateCntnt() const; + inline void ValidateSpelling() const; inline void ValidateSmartTags() const; // SMARTTAGS inline void ValidateAutoCompleteWords() const; inline void ValidateWordCount() const; @@ -446,11 +446,11 @@ inline const SwCntntFrm *SwPageFrm::FindLastBodyCntnt() const { return ((SwPageFrm*)this)->FindLastBodyCntnt(); } -inline void SwPageFrm::InvalidateFlyLayout() const +inline void SwPageFrm::InvalidateFlyLayout() const { ((SwPageFrm*)this)->bInvalidFlyLayout = TRUE; } -inline void SwPageFrm::InvalidateFlyCntnt() const +inline void SwPageFrm::InvalidateFlyCntnt() const { ((SwPageFrm*)this)->bInvalidFlyCntnt = TRUE; } @@ -458,15 +458,15 @@ inline void SwPageFrm::InvalidateFlyInCnt() const { ((SwPageFrm*)this)->bInvalidFlyInCnt = TRUE; } -inline void SwPageFrm::InvalidateLayout() const +inline void SwPageFrm::InvalidateLayout() const { ((SwPageFrm*)this)->bInvalidLayout = TRUE; } -inline void SwPageFrm::InvalidateCntnt() const +inline void SwPageFrm::InvalidateCntnt() const { ((SwPageFrm*)this)->bInvalidCntnt = TRUE; } -inline void SwPageFrm::InvalidateSpelling() const +inline void SwPageFrm::InvalidateSpelling() const { ((SwPageFrm*)this)->bInvalidSpelling = TRUE; } @@ -475,7 +475,7 @@ inline void SwPageFrm::InvalidateSmartTags() const { ((SwPageFrm*)this)->bInvalidSmartTags = TRUE; } -inline void SwPageFrm::InvalidateAutoCompleteWords() const +inline void SwPageFrm::InvalidateAutoCompleteWords() const { ((SwPageFrm*)this)->bInvalidAutoCmplWrds = TRUE; } @@ -483,11 +483,11 @@ inline void SwPageFrm::InvalidateWordCount() const { ((SwPageFrm*)this)->bInvalidWordCount = TRUE; } -inline void SwPageFrm::ValidateFlyLayout() const +inline void SwPageFrm::ValidateFlyLayout() const { ((SwPageFrm*)this)->bInvalidFlyLayout = FALSE; } -inline void SwPageFrm::ValidateFlyCntnt() const +inline void SwPageFrm::ValidateFlyCntnt() const { ((SwPageFrm*)this)->bInvalidFlyCntnt = FALSE; } @@ -495,15 +495,15 @@ inline void SwPageFrm::ValidateFlyInCnt() const { ((SwPageFrm*)this)->bInvalidFlyInCnt = FALSE; } -inline void SwPageFrm::ValidateLayout() const +inline void SwPageFrm::ValidateLayout() const { ((SwPageFrm*)this)->bInvalidLayout = FALSE; } -inline void SwPageFrm::ValidateCntnt() const +inline void SwPageFrm::ValidateCntnt() const { ((SwPageFrm*)this)->bInvalidCntnt = FALSE; } -inline void SwPageFrm::ValidateSpelling() const +inline void SwPageFrm::ValidateSpelling() const { ((SwPageFrm*)this)->bInvalidSpelling = FALSE; } @@ -540,6 +540,6 @@ inline BOOL SwPageFrm::IsInvalidFly() const -#endif //_PAGEFRM_HXX +#endif //_PAGEFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index 9b4367feb4b0..96118218c8ef 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,11 +85,11 @@ typedef void (SwNodes:: *MvSection)( SwNodeIndex * ) const; struct SwMoveFnCollection { - GoNd fnNd; - GoNds fnNds; - GoDoc fnDoc; + GoNd fnNd; + GoNds fnNds; + GoDoc fnDoc; GoSection fnSections; - CmpOp fnCmpOp; + CmpOp fnCmpOp; GetHint fnGetHint; SearchTxt fnSearch; MvSection fnSection; diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx index 9ef7c2017822..84768311ad91 100644 --- a/sw/source/core/inc/ptqueue.hxx +++ b/sw/source/core/inc/ptqueue.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx index 652e14633061..96eec31b72a8 100644 --- a/sw/source/core/inc/retrievedinputstreamdata.hxx +++ b/sw/source/core/inc/retrievedinputstreamdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx index 29e0fb532bca..eeaae8558a36 100644 --- a/sw/source/core/inc/retrieveinputstream.hxx +++ b/sw/source/core/inc/retrieveinputstream.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx index 8bcd72022345..5c2171c1f1b7 100644 --- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx +++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 266d669e91cf..2d85886f09fc 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,17 +45,17 @@ class SwSelectionList; struct SwPosition; struct SwCrsrMoveState; -#define HACK_TABLEMODE_INIT 0 -#define HACK_TABLEMODE_LOCKLINES 1 -#define HACK_TABLEMODE_PAINTLINES 2 -#define HACK_TABLEMODE_UNLOCKLINES 3 -#define HACK_TABLEMODE_EXIT 4 - -#define INV_SIZE 1 -#define INV_PRTAREA 2 -#define INV_POS 4 -#define INV_TABLE 8 -#define INV_SECTION 16 +#define HACK_TABLEMODE_INIT 0 +#define HACK_TABLEMODE_LOCKLINES 1 +#define HACK_TABLEMODE_PAINTLINES 2 +#define HACK_TABLEMODE_UNLOCKLINES 3 +#define HACK_TABLEMODE_EXIT 4 + +#define INV_SIZE 1 +#define INV_PRTAREA 2 +#define INV_POS 4 +#define INV_TABLE 8 +#define INV_SECTION 16 #define INV_LINENUM 32 #define INV_DIRECTION 64 @@ -70,8 +70,8 @@ class SwRootFrm: public SwLayoutFrm friend inline void SetLastPage( SwPageFrm* ); // Fuer das Anlegen und Zerstoeren des virtuellen Outputdevice-Managers - friend void _FrmInit(); //erzeugt pVout - friend void _FrmFinit(); //loescht pVout + friend void _FrmInit(); //erzeugt pVout + friend void _FrmFinit(); //loescht pVout // PAGES01 std::vector<SwRect> maPageRects;// returns the current rectangle for each page frame @@ -86,20 +86,20 @@ class SwRootFrm: public SwLayoutFrm bool mbNeedGrammarCheck; // true when sth needs to be checked (not necessarily started yet!) - static SwLayVout *pVout; - static BOOL bInPaint; //Schutz gegen doppelte Paints. - static BOOL bNoVirDev; //Bei SystemPaints kein virt. Device - - BOOL bCheckSuperfluous :1; //Leere Seiten suchen? - BOOL bIdleFormat :1; //Idle-Formatierer anwerfen? - BOOL bBrowseWidthValid :1; //Ist nBrowseWidth gueltig? - BOOL bDummy2 :1; //Unbenutzt - BOOL bTurboAllowed :1; - BOOL bAssertFlyPages :1; //Ggf. weitere Seiten fuer Flys einfuegen? - BOOL bDummy :1; //Unbenutzt - BOOL bIsVirtPageNum :1; //gibt es eine virtuelle Seitennummer ? - BOOL bIsNewLayout :1; //Layout geladen oder neu erzeugt. - BOOL bCallbackActionEnabled:1; //Keine Action in Benachrichtung erwuenscht + static SwLayVout *pVout; + static BOOL bInPaint; //Schutz gegen doppelte Paints. + static BOOL bNoVirDev; //Bei SystemPaints kein virt. Device + + BOOL bCheckSuperfluous :1; //Leere Seiten suchen? + BOOL bIdleFormat :1; //Idle-Formatierer anwerfen? + BOOL bBrowseWidthValid :1; //Ist nBrowseWidth gueltig? + BOOL bDummy2 :1; //Unbenutzt + BOOL bTurboAllowed :1; + BOOL bAssertFlyPages :1; //Ggf. weitere Seiten fuer Flys einfuegen? + BOOL bDummy :1; //Unbenutzt + BOOL bIsVirtPageNum :1; //gibt es eine virtuelle Seitennummer ? + BOOL bIsNewLayout :1; //Layout geladen oder neu erzeugt. + BOOL bCallbackActionEnabled:1; //Keine Action in Benachrichtung erwuenscht //siehe dcontact.cxx, ::Changed() //Fuer den BrowseMode. nBrowseWidth ist die Aeussere Kante des am weitesten @@ -148,7 +148,7 @@ class SwRootFrm: public SwLayoutFrm SwDestroyList* pDestroy; - USHORT nPhyPageNums; //Anzahl der Seiten. + USHORT nPhyPageNums; //Anzahl der Seiten. sal_uInt16 nAccessibleShells; // Number of accessible shells void ImplCalcBrowseWidth(); @@ -192,8 +192,8 @@ public: void UnoRestoreAllActions(); const SdrPage* GetDrawPage() const { return pDrawPage; } - SdrPage* GetDrawPage() { return pDrawPage; } - void SetDrawPage( SdrPage* pNew ){ pDrawPage = pNew; } + SdrPage* GetDrawPage() { return pDrawPage; } + void SetDrawPage( SdrPage* pNew ){ pDrawPage = pNew; } virtual BOOL GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0 ) const; @@ -242,20 +242,20 @@ public: void InvalidateAllObjPos(); //Ueberfluessige Seiten entfernen. - void SetSuperfluous() { bCheckSuperfluous = TRUE; } + void SetSuperfluous() { bCheckSuperfluous = TRUE; } BOOL IsSuperfluous() const { return bCheckSuperfluous; } void RemoveSuperfluous(); //abfragen/setzen der aktuellen Seite und der Gesamtzahl der Seiten. //Es wird soweit wie notwendig Formatiert. - USHORT GetCurrPage( const SwPaM* ) const; - USHORT SetCurrPage( SwCursor*, USHORT nPageNum ); - Point GetPagePos( USHORT nPageNum ) const; - USHORT GetPageNum() const { return nPhyPageNums; } - void DecrPhyPageNums() { --nPhyPageNums; } - void IncrPhyPageNums() { ++nPhyPageNums; } - BOOL IsVirtPageNum() const { return bIsVirtPageNum; } - inline void SetVirtPageNum( const BOOL bOf ) const; + USHORT GetCurrPage( const SwPaM* ) const; + USHORT SetCurrPage( SwCursor*, USHORT nPageNum ); + Point GetPagePos( USHORT nPageNum ) const; + USHORT GetPageNum() const { return nPhyPageNums; } + void DecrPhyPageNums() { --nPhyPageNums; } + void IncrPhyPageNums() { ++nPhyPageNums; } + BOOL IsVirtPageNum() const { return bIsVirtPageNum; } + inline void SetVirtPageNum( const BOOL bOf ) const; BOOL IsDummyPage( USHORT nPageNum ) const; // Point rPt: The point that should be used to find the page @@ -281,7 +281,7 @@ public: const SwCntntFrm *GetTurbo() { return pTurbo; } //Fussnotennummern aller Seiten auf den neuesten Stand bringen. - void UpdateFtnNums(); //nur bei Seitenweiser Nummerierung! + void UpdateFtnNums(); //nur bei Seitenweiser Nummerierung! //Alle Fussnoten (nicht etwa die Referenzen) entfernen. void RemoveFtns( SwPageFrm *pPage = 0, BOOL bPageOnly = FALSE, @@ -289,7 +289,7 @@ public: void CheckFtnPageDescs( BOOL bEndNote ); const SwPageFrm *GetLastPage() const { return pLastPage; } - SwPageFrm *GetLastPage() { return pLastPage; } + SwPageFrm *GetLastPage() { return pLastPage; } static BOOL IsInPaint() { return bInPaint; } @@ -304,7 +304,7 @@ public: #endif BOOL IsNewLayout() const { return bIsNewLayout; } - void ResetNewLayout() { bIsNewLayout = FALSE;} + void ResetNewLayout() { bIsNewLayout = FALSE;} // Hier werden leere SwSectionFrms zur Zerstoerung angemeldet // und spaeter zerstoert oder wieder abgemeldet @@ -318,7 +318,7 @@ public: void SetCallbackActionEnabled( BOOL b ) { bCallbackActionEnabled = b; } - BOOL IsCallbackActionEnabled() const { return bCallbackActionEnabled; } + BOOL IsCallbackActionEnabled() const { return bCallbackActionEnabled; } sal_Bool IsAnyShellAccessible() const { return nAccessibleShells > 0; } void AddAccessibleShell() { ++nAccessibleShells; } @@ -361,11 +361,11 @@ inline void SwRootFrm::InvalidateBrowseWidth() ImplInvalidateBrowseWidth(); } -inline void SwRootFrm::SetVirtPageNum( const BOOL bOf) const +inline void SwRootFrm::SetVirtPageNum( const BOOL bOf) const { ((SwRootFrm*)this)->bIsVirtPageNum = bOf; } -#endif //_ROOTFRM_HXX +#endif //_ROOTFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index 659e3ee6c28d..fbf39a2d99ef 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public: ~SwRowFrm(); virtual void Cut(); - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); //Zum Anmelden der Flys nachdem eine Zeile erzeugt _und_ eingefuegt wurde. //Muss vom Erzeuger gerufen werden, denn erst nach dem Konstruieren wird diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index 71eea577f4e3..5b46b8d078fe 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ typedef std::list< xub_StrLen > PositionList; #define SPACING_PRECISION_FACTOR 100 /************************************************************************* - * class SwScanner + * class SwScanner * Hilfsklasse, die beim Spellen die Worte im gewuenschten Bereich * nacheinander zur Verfuegung stellt. *************************************************************************/ @@ -91,7 +91,7 @@ public: }; /************************************************************************* - * class SwScriptInfo + * class SwScriptInfo * * encapsultes information about script changes *************************************************************************/ diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 7cf0b8b43659..16e16c05c558 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ protected: virtual BOOL ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReformat ); virtual void Format( const SwBorderAttrs *pAttrs = 0 ); public: - SwSectionFrm( SwSection & ); //Inhalt wird nicht erzeugt! + SwSectionFrm( SwSection & ); //Inhalt wird nicht erzeugt! SwSectionFrm( SwSectionFrm &, BOOL bMaster );//_Nur_ zum Erzeugen von Master/Follows ~SwSectionFrm(); @@ -70,18 +70,18 @@ public: virtual void Cut(); virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); inline const SwSectionFrm *GetFollow() const; - inline SwSectionFrm *GetFollow(); + inline SwSectionFrm *GetFollow(); SwSectionFrm* FindMaster() const; SwCntntFrm *FindLastCntnt( BYTE nMode = 0 ); inline const SwCntntFrm *FindLastCntnt( BYTE nMode = 0 ) const; inline SwSection* GetSection() { return pSection; } inline const SwSection* GetSection() const { return pSection; } - inline void ColLock() { bColLocked = TRUE; } - inline void ColUnlock() { bColLocked = FALSE; } + inline void ColLock() { bColLocked = TRUE; } + inline void ColUnlock() { bColLocked = FALSE; } void CalcFtnCntnt(); void SimpleFormat(); @@ -91,8 +91,8 @@ public: //Zerlegt den pFrm umgebenden SectionFrm in zwei Teile, //pFrm an den Anfang des 2. Teils BOOL SplitSect( SwFrm* pFrm, BOOL bApres ); - void DelEmpty( BOOL bRemove ); // wie Cut(), Follow-Verkettung wird aber mitgepflegt - BOOL IsToIgnore() const // Keine Groesse, kein Inhalt, muss ignoriert werden + void DelEmpty( BOOL bRemove ); // wie Cut(), Follow-Verkettung wird aber mitgepflegt + BOOL IsToIgnore() const // Keine Groesse, kein Inhalt, muss ignoriert werden { return !Frm().Height() && !ContainsCntnt(); } SwFtnContFrm* ContainsFtnCont( const SwFtnContFrm* pCont = NULL ) const; BOOL Growable() const; @@ -104,7 +104,7 @@ public: // if bCheckFollow is set. BOOL ToMaximize( BOOL bCheckFollow ) const; inline BOOL _ToMaximize() const - { if( !pSection ) return FALSE; return ToMaximize( FALSE ); } + { if( !pSection ) return FALSE; return ToMaximize( FALSE ); } BOOL MoveAllowed( const SwFrm* ) const; BOOL CalcMinDiff( SwTwips& rMinDiff ) const; // Uebergibt man kein bOverSize bzw. FALSE, so ist der Returnwert @@ -146,6 +146,6 @@ inline const SwCntntFrm *SwSectionFrm::FindLastCntnt( BYTE nMode ) const } -#endif //_SECTFRM_HXX +#endif //_SECTFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/setmapvirtdev.hxx b/sw/source/core/inc/setmapvirtdev.hxx index c3b6cdf7fea7..6e4b4ed675ee 100644 --- a/sw/source/core/inc/setmapvirtdev.hxx +++ b/sw/source/core/inc/setmapvirtdev.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/sortedobjs.hxx b/sw/source/core/inc/sortedobjs.hxx index 7afd6ecb5619..e4fe2713c96a 100644 --- a/sw/source/core/inc/sortedobjs.hxx +++ b/sw/source/core/inc/sortedobjs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/sortedobjsimpl.hxx b/sw/source/core/inc/sortedobjsimpl.hxx index 1b23cd194ac9..e46f2266eba4 100644 --- a/sw/source/core/inc/sortedobjsimpl.hxx +++ b/sw/source/core/inc/sortedobjsimpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 4d70cfc75e45..bdc1ccd7af7d 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,15 +45,15 @@ class SwBlockName { friend class SwImpBlocks; friend class Sw2TextBlocks; - USHORT nHashS, nHashL; // Hash-Codes zum Checken - long nPos; // Dateiposition (SW2-Format) + USHORT nHashS, nHashL; // Hash-Codes zum Checken + long nPos; // Dateiposition (SW2-Format) public: - String aShort; // Short name - String aLong; // Long name - String aPackageName; // Package name - BOOL bIsOnlyTxtFlagInit : 1; // ist das Flag gueltig? - BOOL bIsOnlyTxt : 1; // unformatted text - BOOL bInPutMuchBlocks : 1; // put serveral block entries + String aShort; // Short name + String aLong; // Long name + String aPackageName; // Package name + BOOL bIsOnlyTxtFlagInit : 1; // ist das Flag gueltig? + BOOL bIsOnlyTxt : 1; // unformatted text + BOOL bInPutMuchBlocks : 1; // put serveral block entries SwBlockName( const String& rShort, const String& rLong, long n ); SwBlockName( const String& rShort, const String& rLong, const String& rPackageName ); @@ -70,48 +70,48 @@ class SwImpBlocks { friend class SwTextBlocks; protected: - String aFile; // physikalischer Dateiname - String aName; // logischer Name der Datei - String aCur; // aktueller Text - String aShort, aLong; // Kurz- und Langname (PutDoc) + String aFile; // physikalischer Dateiname + String aName; // logischer Name der Datei + String aCur; // aktueller Text + String aShort, aLong; // Kurz- und Langname (PutDoc) String sBaseURL; // base URL - has to be set at the Readers and Writers - SwBlockNames aNames; // Liste aller Bausteine - Date aDateModified; // fuers abgleichen bei den Aktionen + SwBlockNames aNames; // Liste aller Bausteine + Date aDateModified; // fuers abgleichen bei den Aktionen Time aTimeModified; - SwDoc* pDoc; // Austauschdokument - USHORT nCur; // aktueller Index + SwDoc* pDoc; // Austauschdokument + USHORT nCur; // aktueller Index BOOL bReadOnly : 1; - BOOL bInPutMuchBlocks : 1; // put serveral block entries - BOOL bInfoChanged : 1; // any Info of TextBlock is changed + BOOL bInPutMuchBlocks : 1; // put serveral block entries + BOOL bInfoChanged : 1; // any Info of TextBlock is changed SwImpBlocks( const String&, BOOL = FALSE ); virtual ~SwImpBlocks(); static short GetFileType( const String& ); virtual short GetFileType() const = 0; -#define SWBLK_NO_FILE 0 // nicht da -#define SWBLK_NONE 1 // keine TB-Datei -#define SWBLK_SW2 2 // SW2-Datei -#define SWBLK_SW3 3 // SW3-Datei -#define SWBLK_XML 4 // XML Block List - - virtual void ClearDoc(); // Doc-Inhalt loeschen - SwPaM* MakePaM(); // PaM ueber Doc aufspannen +#define SWBLK_NO_FILE 0 // nicht da +#define SWBLK_NONE 1 // keine TB-Datei +#define SWBLK_SW2 2 // SW2-Datei +#define SWBLK_SW3 3 // SW3-Datei +#define SWBLK_XML 4 // XML Block List + + virtual void ClearDoc(); // Doc-Inhalt loeschen + SwPaM* MakePaM(); // PaM ueber Doc aufspannen virtual void AddName( const String&, const String&, BOOL bOnlyTxt = FALSE ); BOOL IsFileChanged() const; void Touch(); public: - static USHORT Hash( const String& ); // Hashcode fuer Blocknamen - USHORT GetCount() const; // Anzahl Textbausteine ermitteln - USHORT GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln - USHORT GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln - const String& GetShortName( USHORT ) const; // Kurzname fuer Index zurueck - const String& GetLongName( USHORT ) const; // Langname fuer Index zurueck - const String& GetPackageName( USHORT ) const; // Langname fuer Index zurueck - - const String& GetFileName() const {return aFile;} // phys. Dateinamen liefern - void SetName( const String& rName ) // logic name + static USHORT Hash( const String& ); // Hashcode fuer Blocknamen + USHORT GetCount() const; // Anzahl Textbausteine ermitteln + USHORT GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln + USHORT GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln + const String& GetShortName( USHORT ) const; // Kurzname fuer Index zurueck + const String& GetLongName( USHORT ) const; // Langname fuer Index zurueck + const String& GetPackageName( USHORT ) const; // Langname fuer Index zurueck + + const String& GetFileName() const {return aFile;} // phys. Dateinamen liefern + void SetName( const String& rName ) // logic name { aName = rName; bInfoChanged = TRUE; } const String & GetName( void ) { return aName; } @@ -162,17 +162,17 @@ class SwSwgReader; class Sw2TextBlocks : public SwImpBlocks { - SvPersistRef refPersist; // Fuer OLE-Objekte - SwSwgReader* pRdr; // Lese-Routinen - SfxMedium* pMed; // der logische Input-Stream - String* pText; // String fuer GetText() - long nDocStart; // Beginn des Doc-Records - long nDocSize; // Laenge des Doc-Records - long nStart; // Beginn des CONTENTS-Records - long nSize; // Laenge des CONTENTS-Records - USHORT nNamedFmts; // benannte Formate - USHORT nColls; // Text-Collections - USHORT nBlks; // Anzahl Elemente im CONTENTS-Record + SvPersistRef refPersist; // Fuer OLE-Objekte + SwSwgReader* pRdr; // Lese-Routinen + SfxMedium* pMed; // der logische Input-Stream + String* pText; // String fuer GetText() + long nDocStart; // Beginn des Doc-Records + long nDocSize; // Laenge des Doc-Records + long nStart; // Beginn des CONTENTS-Records + long nSize; // Laenge des CONTENTS-Records + USHORT nNamedFmts; // benannte Formate + USHORT nColls; // Text-Collections + USHORT nBlks; // Anzahl Elemente im CONTENTS-Record public: Sw2TextBlocks( const String& ); virtual ~Sw2TextBlocks(); @@ -191,7 +191,7 @@ public: virtual ULONG OpenFile( BOOL bReadOnly = TRUE ); virtual void CloseFile(); - void StatLineStartPercent(); // zum Anzeigen des Prozessbars + void StatLineStartPercent(); // zum Anzeigen des Prozessbars }; class Sw3Io; @@ -199,9 +199,9 @@ class Sw3IoImp; class Sw3TextBlocks : public SwImpBlocks { - Sw3Io* pIo3; + Sw3Io* pIo3; Sw3IoImp* pImp; - BOOL bAutocorrBlock; + BOOL bAutocorrBlock; public: Sw3TextBlocks( const String& ); diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 48cc9ef8a284..56e3b20eadd2 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,40 +73,40 @@ SV_DECL_PTRARR_DEL(SwCacheObjArr,SwCacheObj*,1,1) class SwCache : public SwCacheObjArr { - SvUShorts aFreePositions; //Freie Positionen fuer das Insert wenn + SvUShorts aFreePositions; //Freie Positionen fuer das Insert wenn //die Maximalgrenze nicht erreicht ist. //Immer wenn ein Objekt ausgetragen wird, //so wird seine Position hier eingetragen. - SwCacheObj *pRealFirst; //_immer_ der echte LRU-erste - SwCacheObj *pFirst; //der virtuelle erste. + SwCacheObj *pRealFirst; //_immer_ der echte LRU-erste + SwCacheObj *pFirst; //der virtuelle erste. SwCacheObj *pLast; - const USHORT nMax; //Mehr sollen nicht aufgenommen werden, + const USHORT nMax; //Mehr sollen nicht aufgenommen werden, //der Cache kann aber dynamisch um jeweils //nMax vergroessert werden. - USHORT nCurMax; //Mehr werden nicht aufgenommen. + USHORT nCurMax; //Mehr werden nicht aufgenommen. void DeleteObj( SwCacheObj *pObj ); #if OSL_DEBUG_LEVEL > 1 ByteString aName; - long nAppend; //Anzahl der Eintragungen durch Erweiterung. - long nInsertFree; //Anzahl der Eintragungen auf freie Plaetze. - long nReplace; //Anzahl der Ersetzungen durch ein neues Objekt - long nGetSuccess; //Anzahl der Erfolgreichen Get's - long nGetFail; //Anzahl der nicht Erfolgreichen Get's - long nToTop; //Anzahl der Umsortierungen (LRU) - long nDelete; //Anzahl der Loeschungen (von Aussen) - long nGetSeek; //Anzahl der Get's ohne Index - long nAverageSeekCnt; //Anzahl der Seek's fuer alle Get's ohne Index - long nFlushCnt; //Anzahl von Flush-Aufrufen. - long nFlushedObjects; //Anzahl der wg. Flush vernichteten Objekte - long nIncreaseMax; //Anzahl Cache-Erweiterungen - long nDecreaseMax; //Anzahl Cache-Verkleinerungen - - void Check(); //Wird bei swcache.cxx mit DEBUG aktiv! + long nAppend; //Anzahl der Eintragungen durch Erweiterung. + long nInsertFree; //Anzahl der Eintragungen auf freie Plaetze. + long nReplace; //Anzahl der Ersetzungen durch ein neues Objekt + long nGetSuccess; //Anzahl der Erfolgreichen Get's + long nGetFail; //Anzahl der nicht Erfolgreichen Get's + long nToTop; //Anzahl der Umsortierungen (LRU) + long nDelete; //Anzahl der Loeschungen (von Aussen) + long nGetSeek; //Anzahl der Get's ohne Index + long nAverageSeekCnt; //Anzahl der Seek's fuer alle Get's ohne Index + long nFlushCnt; //Anzahl von Flush-Aufrufen. + long nFlushedObjects; //Anzahl der wg. Flush vernichteten Objekte + long nIncreaseMax; //Anzahl Cache-Erweiterungen + long nDecreaseMax; //Anzahl Cache-Verkleinerungen + + void Check(); //Wird bei swcache.cxx mit DEBUG aktiv! #endif public: @@ -130,9 +130,9 @@ public: BOOL Insert( SwCacheObj *pNew ); void Delete( const void *pOwner ); -// void Delete( const void *pOwner, const USHORT nIndex ); +// void Delete( const void *pOwner, const USHORT nIndex ); - void SetLRUOfst( const USHORT nOfst ); //nOfst sagt wieviele unangetastet + void SetLRUOfst( const USHORT nOfst ); //nOfst sagt wieviele unangetastet //bleiben sollen. void ResetLRUOfst() { pFirst = pRealFirst; } @@ -150,9 +150,9 @@ class SwSaveSetLRUOfst SwCache &rCache; public: SwSaveSetLRUOfst( SwCache &rC, const USHORT nOfst ) - : rCache( rC ) { rCache.SetLRUOfst( nOfst ); } + : rCache( rC ) { rCache.SetLRUOfst( nOfst ); } - ~SwSaveSetLRUOfst() { rCache.ResetLRUOfst(); } + ~SwSaveSetLRUOfst() { rCache.ResetLRUOfst(); } }; //Das allgemeine CacheObjekt. Anwender des Cache muessen eine Klasse vom @@ -160,18 +160,18 @@ public: class SwCacheObj { - friend class SwCache; //Der darf alles + friend class SwCache; //Der darf alles - SwCacheObj *pNext; //Fuer die LRU-Verkettung. + SwCacheObj *pNext; //Fuer die LRU-Verkettung. SwCacheObj *pPrev; - USHORT nCachePos; //Position im Cache-Array. + USHORT nCachePos; //Position im Cache-Array. - BYTE nLock; + BYTE nLock; inline SwCacheObj *GetNext() { return pNext; } inline SwCacheObj *GetPrev() { return pPrev; } - inline void SetNext( SwCacheObj *pNew ) { pNext = pNew; } + inline void SetNext( SwCacheObj *pNew ) { pNext = pNew; } inline void SetPrev( SwCacheObj *pNew ) { pPrev = pNew; } inline void SetCachePos( const USHORT nNew ) { nCachePos = nNew; } @@ -189,7 +189,7 @@ public: inline BOOL IsOwner( const void *pNew ) const; inline USHORT GetCachePos() const { return nCachePos; } - inline void Invalidate() { pOwner = 0; } + inline void Invalidate() { pOwner = 0; } inline BOOL IsLocked() const { return 0 != nLock; } @@ -223,7 +223,7 @@ class SwCacheAccess protected: SwCacheObj *pObj; - const void *pOwner; //Kann ggf. in NewObj benutzt werden. + const void *pOwner; //Kann ggf. in NewObj benutzt werden. virtual SwCacheObj *NewObj() = 0; diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index e57b6f7b1a41..beb5f640f178 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ public: virtual ~SwFontObj(); - inline SwFont *GetFont() { return &aSwFont; } + inline SwFont *GetFont() { return &aSwFont; } inline const SwFont *GetFont() const { return &aSwFont; } inline const SfxPoolItem** GetDefault() { return pDefaultArray; } }; diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 9e8d2e15fd5b..898f2fbe0ae5 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,38 +26,38 @@ * ************************************************************************/ #ifndef _SWFONT_HXX -#define _SWFONT_HXX +#define _SWFONT_HXX #include <i18npool/lang.h> #include <tools/color.hxx> #include <tools/stream.hxx> #include <editeng/svxfont.hxx> #include <swtypes.hxx> -#include <drawfont.hxx> // SwDrawTextInfo +#include <drawfont.hxx> // SwDrawTextInfo class SfxItemSet; class SwAttrSet; -class SwDoCapitals; // DoCapitals +class SwDoCapitals; // DoCapitals class SwDrawTextInfo; // _DrawText class SwScriptInfo; // _GetTxtSize class ViewShell; class IDocumentSettingAccess; -const xub_Unicode CH_BLANK = ' '; // ' ' Leerzeichen -const xub_Unicode CH_BREAK = 0x0A; // -const xub_Unicode CH_TAB = '\t'; // \t -const xub_Unicode CH_PAR = 0xB6; // Paragraph -const xub_Unicode CH_BULLET = 0xB7; // mittiger Punkt +const xub_Unicode CH_BLANK = ' '; // ' ' Leerzeichen +const xub_Unicode CH_BREAK = 0x0A; // +const xub_Unicode CH_TAB = '\t'; // \t +const xub_Unicode CH_PAR = 0xB6; // Paragraph +const xub_Unicode CH_BULLET = 0xB7; // mittiger Punkt class SwSubFont : public SvxFont { friend class SwFont; - const void *pMagic; // "MagicNumber" innerhalb des Fontcaches - Size aSize; // Fremde kriegen nur diese Size zu sehen - USHORT nFntIndex; // Index im Fontcache - USHORT nOrgHeight; // Hoehe inkl. Escapement/Proportion - USHORT nOrgAscent; // Ascent inkl. Escapement/Proportion - USHORT nPropWidth; // proportional width + const void *pMagic; // "MagicNumber" innerhalb des Fontcaches + Size aSize; // Fremde kriegen nur diese Size zu sehen + USHORT nFntIndex; // Index im Fontcache + USHORT nOrgHeight; // Hoehe inkl. Escapement/Proportion + USHORT nOrgAscent; // Ascent inkl. Escapement/Proportion + USHORT nPropWidth; // proportional width inline SwSubFont() : aSize(0,0) { pMagic = NULL; nFntIndex = nOrgHeight = nOrgAscent = 0; nPropWidth =100; } @@ -131,30 +131,30 @@ public: class SwFont { // CJK == Chinese, Japanese, Korean // CTL == Complex text layout ( Hebrew, Arabic ) - SwSubFont aSub[SW_SCRIPTS]; // Latin-, CJK- and CTL-font - Color* pBackColor; // background color (i.e. at character styles) - Color aUnderColor; // color of the underlining - Color aOverColor; // color of the overlining - BYTE nToxCnt; // Zaehlt die Schachtelungstiefe der Tox - BYTE nRefCnt; // Zaehlt die Schachtelungstiefe der Refs + SwSubFont aSub[SW_SCRIPTS]; // Latin-, CJK- and CTL-font + Color* pBackColor; // background color (i.e. at character styles) + Color aUnderColor; // color of the underlining + Color aOverColor; // color of the overlining + BYTE nToxCnt; // Zaehlt die Schachtelungstiefe der Tox + BYTE nRefCnt; // Zaehlt die Schachtelungstiefe der Refs BYTE m_nMetaCount; // count META/METAFIELD - BYTE nActual; // actual font (Latin, CJK or CTL) + BYTE nActual; // actual font (Latin, CJK or CTL) // Schalter fuer die Font-Extensions - BOOL bNoHyph :1; // SwTxtNoHyphenHere: keine Trennstelle - BOOL bBlink :1; // blinkender Font + BOOL bNoHyph :1; // SwTxtNoHyphenHere: keine Trennstelle + BOOL bBlink :1; // blinkender Font BOOL bPaintBlank :1; // Blanks nicht mit DrawRect - BOOL bFntChg :1; - BOOL bOrgChg :1; // nOrgHeight/Ascent sind invalid - BOOL bURL :1; - BOOL bPaintWrong :1; // Flag fuer Rechtschreibfehler - BOOL bGreyWave :1; // Fuers extended TextInput: Graue Wellenlinie + BOOL bFntChg :1; + BOOL bOrgChg :1; // nOrgHeight/Ascent sind invalid + BOOL bURL :1; + BOOL bPaintWrong :1; // Flag fuer Rechtschreibfehler + BOOL bGreyWave :1; // Fuers extended TextInput: Graue Wellenlinie BOOL bNoColReplace :1; // Replacement without colormanipulation BOOL operator==( const SwFont &rFnt ) const; protected: - inline SwFont() { pBackColor = NULL; nActual = SW_LATIN; } + inline SwFont() { pBackColor = NULL; nActual = SW_LATIN; } public: SwFont( const SwAttrSet* pSet, const IDocumentSettingAccess* pIDocumentSettingAccess ); @@ -167,7 +167,7 @@ public: SwFont& operator=( const SwFont &rFont ); - inline BYTE GetActual() const { return nActual; } + inline BYTE GetActual() const { return nActual; } inline void SetActual( BYTE nNew ); inline const SvxFont& GetActualFont() const { return aSub[nActual]; } @@ -287,7 +287,7 @@ public: const XubString& GetStyleName() const {return aSub[nActual].GetStyleName();} FontFamily GetFamily() const { return aSub[nActual].GetFamily(); } FontPitch GetPitch() const { return aSub[nActual].GetPitch(); } - rtl_TextEncoding GetCharSet() const { return aSub[nActual].GetCharSet(); } + rtl_TextEncoding GetCharSet() const { return aSub[nActual].GetCharSet(); } long GetHeight() const { return aSub[nActual].GetSize().Height(); } FontWeight GetWeight() const { return aSub[nActual].GetWeight(); } FontEmphasisMark GetEmphasisMark() const @@ -841,7 +841,7 @@ public: /************************************************************************* - * class SvStatistics + * class SvStatistics *************************************************************************/ #if OSL_DEBUG_LEVEL > 1 @@ -882,17 +882,17 @@ inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream if( IsEmpty() ) return; - rOS << "{ SV called:" << '\n'; + rOS << "{ SV called:" << '\n'; if( nGetTextSize ) - rOS << "\tnGetTextSize: " << nGetTextSize << '\n'; if( nDrawText ) - rOS << "\tnDrawText: " << nDrawText << '\n'; if( nGetStretchTextSize ) - rOS << "\tnGetStretchTextSize: " << nGetStretchTextSize << '\n'; if( nDrawStretchText ) - rOS << "\tnDrawStretchText: " << nDrawStretchText << '\n'; if( nChangeFont ) - rOS << "\tnChangeFont: " << nChangeFont << '\n'; if( nGetFontMetric ) - rOS << "\tnGetFontMetric: " << nGetFontMetric << '\n'; rOS << "}" << '\n'; } + rOS << "\tnGetTextSize: " << nGetTextSize << '\n'; if( nDrawText ) + rOS << "\tnDrawText: " << nDrawText << '\n'; if( nGetStretchTextSize ) + rOS << "\tnGetStretchTextSize: " << nGetStretchTextSize << '\n'; if( nDrawStretchText ) + rOS << "\tnDrawStretchText: " << nDrawStretchText << '\n'; if( nChangeFont ) + rOS << "\tnChangeFont: " << nChangeFont << '\n'; if( nGetFontMetric ) + rOS << "\tnGetFontMetric: " << nGetFontMetric << '\n'; rOS << "}" << '\n'; } #else #define SV_STAT(nWhich) -#endif /* DEBUG */ +#endif /* DEBUG */ #endif diff --git a/sw/source/core/inc/swselectionlist.hxx b/sw/source/core/inc/swselectionlist.hxx index a3deb52ce66f..0263d658cccc 100644 --- a/sw/source/core/inc/swselectionlist.hxx +++ b/sw/source/core/inc/swselectionlist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ class SwFrm; /** This class is used as parameter for creation of a block cursor selection - This class will be created by a block cursor. Its responsibility is + This class will be created by a block cursor. Its responsibility is to collect a group of selected text portions which are part of a common context. Definition of context: @@ -95,6 +95,6 @@ public: bool checkContext( const SwFrm* pCheck ); }; -#endif //_SWSELECTIONLIST_HXX +#endif //_SWSELECTIONLIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx index e997e6dadc26..950479f865af 100644 --- a/sw/source/core/inc/swthreadjoiner.hxx +++ b/sw/source/core/inc/swthreadjoiner.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx index 57f8ba4497d2..21db2cccc5e2 100644 --- a/sw/source/core/inc/swthreadmanager.hxx +++ b/sw/source/core/inc/swthreadmanager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 3ec749617aba..fda31c5f3b4e 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,19 +48,19 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm SwTable* pTable; - BOOL bComplete :1; //Eintrage als Repaint ohne das CompletePaint + BOOL bComplete :1; //Eintrage als Repaint ohne das CompletePaint //der Basisklasse gesetzt werden muss. Damit //sollen unertraegliche Tabellen-Repaints //vermieden werden. - BOOL bCalcLowers :1; //Im MakeAll auf jedenfall auch fuer Stabilitaet + BOOL bCalcLowers :1; //Im MakeAll auf jedenfall auch fuer Stabilitaet //des Inhaltes sorgen. - BOOL bLowersFormatted :1;//Kommunikation zwischen MakeAll und Layact - BOOL bLockBackMove :1; //BackMove-Test hat der Master erledigt. - BOOL bResizeHTMLTable :1; //Resize des HTMLTableLayout rufen im MakeAll + BOOL bLowersFormatted :1;//Kommunikation zwischen MakeAll und Layact + BOOL bLockBackMove :1; //BackMove-Test hat der Master erledigt. + BOOL bResizeHTMLTable :1; //Resize des HTMLTableLayout rufen im MakeAll //Zur Optimierung, damit dies nicht im //CntntFrm::Grow gerufen werden muss, denn dann //wird es ggf. fuer jede Zelle gerufen #47483# - BOOL bONECalcLowers :1; //Primaer fuer die StarONE-SS. Beim MakeAll werden + BOOL bONECalcLowers :1; //Primaer fuer die StarONE-SS. Beim MakeAll werden //die Cntnts auf jedenfall per Calc() formatiert. //es finden keine zusaetzlichen Invalidierungen //statt und dieser Weg kann auch kaum garantien @@ -114,21 +114,21 @@ protected: //Aendert nur die Framesize, nicht die PrtArea-SSize virtual SwTwips GrowFrm ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); public: - SwTabFrm( SwTable & ); //Immer nach dem erzeugen _und_ pasten das + SwTabFrm( SwTable & ); //Immer nach dem erzeugen _und_ pasten das //Regist Flys rufen! - SwTabFrm( SwTabFrm & ); //_Nur_ zum erzeugen von Follows + SwTabFrm( SwTabFrm & ); //_Nur_ zum erzeugen von Follows ~SwTabFrm(); - void JoinAndDelFollows(); //Fuer DelFrms des TableNodes! + void JoinAndDelFollows(); //Fuer DelFrms des TableNodes! //Ruft das RegistFlys der Zeilen. void RegistFlys(); inline const SwTabFrm *GetFollow() const; - inline SwTabFrm *GetFollow(); + inline SwTabFrm *GetFollow(); SwTabFrm* FindMaster( bool bFirstMaster = false ) const; - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); virtual BOOL GetInfo( SfxPoolItem &rHnt ) const; virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const; virtual void CheckDirection( BOOL bVert ); @@ -143,18 +143,18 @@ public: inline const SwCntntFrm *FindLastCntnt() const; const SwTable *GetTable() const { return pTable; } - SwTable *GetTable() { return pTable; } + SwTable *GetTable() { return pTable; } BOOL IsComplete() { return bComplete; } void SetComplete() { bComplete = TRUE; } void ResetComplete() { bComplete = FALSE; } - BOOL IsLowersFormatted() const { return bLowersFormatted; } - void SetLowersFormatted( BOOL b ) { bLowersFormatted = b; } + BOOL IsLowersFormatted() const { return bLowersFormatted; } + void SetLowersFormatted( BOOL b ) { bLowersFormatted = b; } - void SetCalcLowers() { bCalcLowers = TRUE; } //Sparsam einsetzen! + void SetCalcLowers() { bCalcLowers = TRUE; } //Sparsam einsetzen! void SetResizeHTMLTable() { bResizeHTMLTable = TRUE; } //dito - void SetONECalcLowers() { bONECalcLowers = TRUE; } + void SetONECalcLowers() { bONECalcLowers = TRUE; } // // Start: New stuff for breaking table rows @@ -231,6 +231,6 @@ inline SwTabFrm *SwTabFrm::GetFollow() return (SwTabFrm*)SwFlowFrm::GetFollow(); } -#endif //_TABFRM_HXX +#endif //_TABFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index d4dae4dc4435..d558c1547e1d 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,7 +105,7 @@ public: const SwTableBox* GetBoxOfPos( const SwTableBox& rBox ); void AddToUndoHistory( const SwCntntNode& rNd ); - USHORT Count() const { return aBoxes.Count(); } + USHORT Count() const { return aBoxes.Count(); } const SwTableBox& GetBox( USHORT nPos, USHORT* pWidth = 0 ) const { // hier wird die EndPos der Spalte benoetigt! @@ -115,11 +115,11 @@ public: return *aBoxes[ nPos ]; } - BOOL IsGetFromTop() const { return bGetFromTop; } - BOOL IsGetValues() const { return bGetValues; } + BOOL IsGetFromTop() const { return bGetFromTop; } + BOOL IsGetValues() const { return bGetValues; } - USHORT GetMode() const { return nMode; } - void SetValues( BOOL bFlag ) { bGetValues = FALSE; nWidth = 0; + USHORT GetMode() const { return nMode; } + void SetValues( BOOL bFlag ) { bGetValues = FALSE; nWidth = 0; bGetFromTop = bFlag; } BOOL Resize( USHORT nOffset, USHORT nWidth ); }; diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx index 5692c7ae3c7f..ddcc5daeb63c 100644 --- a/sw/source/core/inc/textapi.hxx +++ b/sw/source/core/inc/textapi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,20 +41,20 @@ class SwTextAPIEditSource : public SvxEditSource { SwTextAPIEditSource_Impl* pImpl; - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); - explicit SwTextAPIEditSource( const SwTextAPIEditSource& rSource ); + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + virtual void UpdateData(); + explicit SwTextAPIEditSource( const SwTextAPIEditSource& rSource ); public: SwTextAPIEditSource(SwDoc* pDoc); - virtual ~SwTextAPIEditSource(); + virtual ~SwTextAPIEditSource(); - void Dispose(); - void SetText( OutlinerParaObject& rText ); - void SetString( const String& rText ); + void Dispose(); + void SetText( OutlinerParaObject& rText ); + void SetString( const String& rText ); OutlinerParaObject* CreateText(); - String GetText(); + String GetText(); }; class SwTextAPIObject : public SvxUnoText @@ -62,12 +62,12 @@ class SwTextAPIObject : public SvxUnoText SwTextAPIEditSource* pSource; public: SwTextAPIObject( SwTextAPIEditSource* p); - virtual ~SwTextAPIObject() throw(); - void DisposeEditSource() { pSource->Dispose(); } + virtual ~SwTextAPIObject() throw(); + void DisposeEditSource() { pSource->Dispose(); } OutlinerParaObject* CreateText() { return pSource->CreateText(); } - void SetString( const String& rText ) { pSource->SetString( rText ); } - void SetText( OutlinerParaObject& rText ) { pSource->SetText( rText ); } - String GetText() { return pSource->GetText(); } + void SetString( const String& rText ) { pSource->SetString( rText ); } + void SetText( OutlinerParaObject& rText ) { pSource->SetText( rText ); } + String GetText() { return pSource->GetText(); } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx index f6bc5edf8895..8100353bef3c 100644 --- a/sw/source/core/inc/threadlistener.hxx +++ b/sw/source/core/inc/threadlistener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 53ea5f7c689f..326447b3bd5f 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 38ced251596b..32a632110514 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx index 20f942b708a3..9f8001028bba 100644 --- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx +++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/toxhlp.hxx b/sw/source/core/inc/toxhlp.hxx index d3739196ddcd..c6e1c0d3746e 100644 --- a/sw/source/core/inc/toxhlp.hxx +++ b/sw/source/core/inc/toxhlp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index dc65ace860f8..f6459b4b55fd 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -137,15 +137,15 @@ struct SwTOXSortTabBase const ::com::sun::star::lang::Locale* pLocale = NULL ); virtual ~SwTOXSortTabBase() {} - USHORT GetType() const { return nType; } - USHORT GetOptions() const { return nOpt; } + USHORT GetType() const { return nType; } + USHORT GetOptions() const { return nOpt; } - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0) const; - virtual USHORT GetLevel() const = 0; - virtual BOOL operator==( const SwTOXSortTabBase& ); - virtual BOOL operator<( const SwTOXSortTabBase& ); + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0) const; + virtual USHORT GetLevel() const = 0; + virtual BOOL operator==( const SwTOXSortTabBase& ); + virtual BOOL operator<( const SwTOXSortTabBase& ); - virtual String GetURL() const; + virtual String GetURL() const; inline void GetTxt( String&, String& ) const; inline const ::com::sun::star::lang::Locale& GetLocale() const; @@ -189,15 +189,15 @@ struct SwTOXIndex : public SwTOXSortTabBase virtual ~SwTOXIndex() {} - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const; virtual USHORT GetLevel() const; - virtual BOOL operator==( const SwTOXSortTabBase& ); - virtual BOOL operator<( const SwTOXSortTabBase& ); + virtual BOOL operator==( const SwTOXSortTabBase& ); + virtual BOOL operator<( const SwTOXSortTabBase& ); private: virtual void _GetText( String&, String& ); - BYTE nKeyLevel; + BYTE nKeyLevel; }; struct SwTOXCustom : public SwTOXSortTabBase @@ -229,7 +229,7 @@ struct SwTOXContent : public SwTOXSortTabBase const SwTOXInternational& rIntl ); virtual ~SwTOXContent() {} - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const; virtual USHORT GetLevel() const; private: virtual void _GetText( String&, String& ); @@ -241,13 +241,13 @@ struct SwTOXPara : public SwTOXSortTabBase SwTOXPara( const SwCntntNode&, SwTOXElement, USHORT nLevel = FORM_ALPHA_DELIMITTER ); virtual ~SwTOXPara() {} - void SetStartIndex( xub_StrLen nSet) { nStartIndex = nSet;} - void SetEndIndex( xub_StrLen nSet ) { nEndIndex = nSet;} + void SetStartIndex( xub_StrLen nSet) { nStartIndex = nSet;} + void SetEndIndex( xub_StrLen nSet ) { nEndIndex = nSet;} - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const; virtual USHORT GetLevel() const; - virtual String GetURL() const; + virtual String GetURL() const; private: virtual void _GetText( String&, String& ); @@ -262,11 +262,11 @@ struct SwTOXTable : public SwTOXSortTabBase SwTOXTable( const SwCntntNode& rNd ); virtual ~SwTOXTable() {} - void SetLevel(USHORT nSet){nLevel = nSet;} + void SetLevel(USHORT nSet){nLevel = nSet;} virtual USHORT GetLevel() const; - virtual String GetURL() const; + virtual String GetURL() const; private: virtual void _GetText( String&, String& ); @@ -277,7 +277,7 @@ struct SwTOXAuthority : public SwTOXSortTabBase { private: SwFmtFld& m_rField; - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const; virtual void _GetText( String&, String& ); public: @@ -286,8 +286,8 @@ public: SwFmtFld& GetFldFmt() {return m_rField;} - virtual BOOL operator==( const SwTOXSortTabBase& ); - virtual BOOL operator<( const SwTOXSortTabBase& ); + virtual BOOL operator==( const SwTOXSortTabBase& ); + virtual BOOL operator<( const SwTOXSortTabBase& ); virtual USHORT GetLevel() const; }; diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 3ff4c6d47332..475278a0833f 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class SwParaPortion; class WidowsAndOrphans; class SwBodyFrm; class SwTxtFtn; -class SwInterHyphInfo; // Hyphenate() +class SwInterHyphInfo; // Hyphenate() class SwCache; class SwBorderAttrs; class SwFrmFmt; @@ -65,15 +65,15 @@ class SwTxtFrm: public SwCntntFrm friend class SwTxtIter; friend class SwTestFormat; friend class WidowsAndOrphans; - friend class SwTxtFrmLocker; // duerfen Lock()/Unlock() + friend class SwTxtFrmLocker; // duerfen Lock()/Unlock() friend sal_Bool lcl_ChangeOffset( SwTxtFrm* pFrm, USHORT nNew ); - static SwCache *pTxtCache; //Pointer auf den Line-Cache - static long nMinPrtLine; //Diese Linie darf beim Drucken nicht + static SwCache *pTxtCache; //Pointer auf den Line-Cache + static long nMinPrtLine; //Diese Linie darf beim Drucken nicht //unterschritten werden, Hack fuer Tabellenzellen ueber mehrere Seiten - ULONG nAllLines :24;//Anzahl der Zeilen fuer das Paint (inkl. nThisLines) - ULONG nThisLines :8; //Anzahl der Zeilen dieses Frames + ULONG nAllLines :24;//Anzahl der Zeilen fuer das Paint (inkl. nThisLines) + ULONG nThisLines :8; //Anzahl der Zeilen dieses Frames // The x position for flys anchored at this paragraph. // These values are calculated in SwTxtFrm::CalcBaseOfstForFly() @@ -93,9 +93,9 @@ class SwTxtFrm: public SwCntntFrm // <-- - xub_StrLen nOfst; //nOfst gibt den Offset im Cntnt (Anzahl Zeichen) an. + xub_StrLen nOfst; //nOfst gibt den Offset im Cntnt (Anzahl Zeichen) an. - USHORT nCacheIdx; //Index in den Cache, USHRT_MAX wenn definitiv + USHORT nCacheIdx; //Index in den Cache, USHRT_MAX wenn definitiv //kein passendes Objekt im Cache steht. //Teilt den Master ab und erzeugt einen Follow oder passt die @@ -109,7 +109,7 @@ class SwTxtFrm: public SwCntntFrm //entsprechend dem Attribut ein. void CalcLineSpace(); - void InitCtor(); // Wird in beiden Ctoren gerufen + void InitCtor(); // Wird in beiden Ctoren gerufen // Wird nur in Format gerufen: void AdjustFrm( const SwTwips nChgHeight, sal_Bool bHasToFit = sal_False ); @@ -124,17 +124,17 @@ class SwTxtFrm: public SwCntntFrm void FormatAdjust( SwTxtFormatter &rLine, WidowsAndOrphans &rFrmBreak, const xub_StrLen nStrLen, const sal_Bool bDummy ); - sal_Bool bLocked : 1; // im Format? - sal_Bool bFormatted : 1; // nach Format auf sal_True - sal_Bool bWidow : 1; // sind wir ein Widow - sal_Bool bJustWidow : 1; // haben wir soeben Widow angefordert - sal_Bool bEmpty : 1; // sind wir ein leerer Absatz - sal_Bool bInFtnConnect : 1; // Steht gerade im Connect - sal_Bool bFtn : 1; // Hat mindestens eine Fussnote - sal_Bool bRepaint : 1; // TxtFrm: Repaint steht zur Abholung bereit - sal_Bool bBlinkPor : 1; // enthaelt Blink-Portions - sal_Bool bFieldFollow : 1; // beginne mit Feldrest des Masters - sal_Bool bHasAnimation : 1; // enthaelt animierte SwGrfNumPortion + sal_Bool bLocked : 1; // im Format? + sal_Bool bFormatted : 1; // nach Format auf sal_True + sal_Bool bWidow : 1; // sind wir ein Widow + sal_Bool bJustWidow : 1; // haben wir soeben Widow angefordert + sal_Bool bEmpty : 1; // sind wir ein leerer Absatz + sal_Bool bInFtnConnect : 1; // Steht gerade im Connect + sal_Bool bFtn : 1; // Hat mindestens eine Fussnote + sal_Bool bRepaint : 1; // TxtFrm: Repaint steht zur Abholung bereit + sal_Bool bBlinkPor : 1; // enthaelt Blink-Portions + sal_Bool bFieldFollow : 1; // beginne mit Feldrest des Masters + sal_Bool bHasAnimation : 1; // enthaelt animierte SwGrfNumPortion sal_Bool bIsSwapped : 1; // during text formatting we swap the // width and height for vertical formatting // OD 14.03.2003 #i11760# - flag to control, if follow is formatted in @@ -288,7 +288,7 @@ public: // GetKeyCrsrOfst sorgt dafuer, dass der Frame nicht gewechselt wird // (z.B. Wechsel in den zeichengebundenen Frame). - inline sal_Bool GetKeyCrsrOfst(SwPosition *pPos, const Point &rPoint ) const + inline sal_Bool GetKeyCrsrOfst(SwPosition *pPos, const Point &rPoint ) const { return _GetCrsrOfst( pPos, rPoint, sal_False ); } void PaintExtraData( const SwRect & rRect ) const; //Seitennummer usw. @@ -319,10 +319,10 @@ public: // Methoden zur Verwaltung von FolgeFrames SwCntntFrm *SplitFrm( const xub_StrLen nTxtPos ); SwCntntFrm *JoinFrm(); - inline USHORT GetOfst() const { return nOfst; } - void _SetOfst( const USHORT nNewOfst ); - inline void SetOfst ( const USHORT nNewOfst ); - inline void ManipOfst ( const USHORT nNewOfst ){ nOfst = nNewOfst; } + inline USHORT GetOfst() const { return nOfst; } + void _SetOfst( const USHORT nNewOfst ); + inline void SetOfst ( const USHORT nNewOfst ); + inline void ManipOfst ( const USHORT nNewOfst ){ nOfst = nNewOfst; } SwTxtFrm *GetFrmAtPos ( const SwPosition &rPos); inline const SwTxtFrm *GetFrmAtPos ( const SwPosition &rPos) const; // OD 07.10.2003 #110978# - return <reference> instead of <pointer> @@ -379,13 +379,13 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwTxtFrm) // Locking - inline sal_Bool IsLocked() const { return bLocked; } - inline sal_Bool IsFormatted() const { return bFormatted; } + inline sal_Bool IsLocked() const { return bLocked; } + inline sal_Bool IsFormatted() const { return bFormatted; } - inline sal_Bool IsWidow() const { return bWidow; } - inline sal_Bool IsJustWidow() const { return bJustWidow; } - inline sal_Bool IsEmpty() const { return bEmpty; } - inline sal_Bool HasFtn() const { return bFtn; } + inline sal_Bool IsWidow() const { return bWidow; } + inline sal_Bool IsJustWidow() const { return bJustWidow; } + inline sal_Bool IsEmpty() const { return bEmpty; } + inline sal_Bool HasFtn() const { return bFtn; } inline sal_Bool IsInFtnConnect()const { return bInFtnConnect;} inline sal_Bool IsFieldFollow() const { return bFieldFollow;} @@ -409,8 +409,8 @@ public: #endif // Hidden - sal_Bool IsHiddenNow() const; // bHidden && pOut == pPrt - void HideHidden(); // Anhaengsel entfernen wenn Hidden + sal_Bool IsHiddenNow() const; // bHidden && pOut == pPrt + void HideHidden(); // Anhaengsel entfernen wenn Hidden void HideFootnotes( xub_StrLen nStart, xub_StrLen nEnd ); /** method to hide/show objects @@ -451,7 +451,7 @@ public: // Liefert die Resthoehe zurueck inline SwTwips GetRstHeight() const; - inline SwTxtFrm *GetFollow(); + inline SwTxtFrm *GetFollow(); inline const SwTxtFrm *GetFollow() const; // Suche die Seitennummer von ErgoSum und QuoVadis @@ -478,13 +478,13 @@ public: { return HasPara() ? _GetDropRect( rRect ) : sal_False; } static SwCache *GetTxtCache() { return pTxtCache; } - static void SetTxtCache( SwCache *pNew ) { pTxtCache = pNew; } + static void SetTxtCache( SwCache *pNew ) { pTxtCache = pNew; } static long GetMinPrtLine() { return nMinPrtLine; } - static void SetMinPrtLine( long nNew ) { nMinPrtLine = nNew; } + static void SetMinPrtLine( long nNew ) { nMinPrtLine = nNew; } inline USHORT GetCacheIdx() const { return nCacheIdx; } - inline void SetCacheIdx( const USHORT nNew ) { nCacheIdx = nNew; } + inline void SetCacheIdx( const USHORT nNew ) { nCacheIdx = nNew; } //Entfert die Line-Informationen aus dem Cache. void ClearPara(); @@ -534,7 +534,7 @@ public: sal_Bool FillRegister( SwTwips& rRegStart, USHORT& rRegDiff ); - USHORT GetLineCount( USHORT nPos ); //Ermittelt die Zeilenanzahl + USHORT GetLineCount( USHORT nPos ); //Ermittelt die Zeilenanzahl //Fuer die Anzeige der Zeilennummern. ULONG GetAllLines() const { return nAllLines; } @@ -617,7 +617,7 @@ public: }; /************************************************************************* - * class SwTxtFrmLocker + * class SwTxtFrmLocker *************************************************************************/ class SwTxtFrmLocker @@ -632,7 +632,7 @@ public: }; /************************************************************************* - * Inline-Implementierung + * Inline-Implementierung *************************************************************************/ inline const SwParaPortion *SwTxtFrm::GetPara() const @@ -745,8 +745,8 @@ inline void SwTxtFrm::ResetBlinkPor() const class SwLinguStatistik { public: - long nWords; // gepruefte Worte - long nFlushCnt; // zaehlt die Messungen + long nWords; // gepruefte Worte + long nFlushCnt; // zaehlt die Messungen long nWrong; // als falsch erkannt long nAlter; // Alternativvorschlaege diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx index 748ea9334a62..df403278a509 100644 --- a/sw/source/core/inc/txttypes.hxx +++ b/sw/source/core/inc/txttypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,68 +39,68 @@ #define KSHRT_MAX USHRT_MAX // Portiontypen -#define POR_LIN 0x0000 -#define POR_FLYCNT 0x0001 - -#define POR_HOLE 0x0080 -#define POR_TMPEND 0x0081 -#define POR_BRK 0x0082 -#define POR_KERN 0x0083 -#define POR_ARROW 0x0084 -#define POR_MULTI 0x0085 +#define POR_LIN 0x0000 +#define POR_FLYCNT 0x0001 + +#define POR_HOLE 0x0080 +#define POR_TMPEND 0x0081 +#define POR_BRK 0x0082 +#define POR_KERN 0x0083 +#define POR_ARROW 0x0084 +#define POR_MULTI 0x0085 #define POR_HIDDEN_TXT 0x0086 #define POR_CONTROLCHAR 0x0087 -#define POR_TXT 0x8000 -#define POR_LAY 0x8001 -#define POR_PARA 0x8002 -#define POR_URL 0x8003 -#define POR_HNG 0x8004 - -#define POR_DROP 0x8080 -#define POR_TOX 0x8089 -#define POR_ISOTOX 0x808a -#define POR_REF 0x808b -#define POR_ISOREF 0x808c +#define POR_TXT 0x8000 +#define POR_LAY 0x8001 +#define POR_PARA 0x8002 +#define POR_URL 0x8003 +#define POR_HNG 0x8004 + +#define POR_DROP 0x8080 +#define POR_TOX 0x8089 +#define POR_ISOTOX 0x808a +#define POR_REF 0x808b +#define POR_ISOREF 0x808c #define POR_META 0x808d -#define POR_EXP 0xc080 -#define POR_BLANK 0xc081 +#define POR_EXP 0xc080 +#define POR_BLANK 0xc081 #define POR_POSTITS 0xc082 -#define POR_HYPH 0xd080 -#define POR_HYPHSTR 0xd081 -#define POR_SOFTHYPH 0xd082 -#define POR_SOFTHYPHSTR 0xd083 +#define POR_HYPH 0xd080 +#define POR_HYPHSTR 0xd081 +#define POR_SOFTHYPH 0xd082 +#define POR_SOFTHYPHSTR 0xd083 #define POR_SOFTHYPH_COMP 0xd084 -#define POR_FLD 0xe080 -#define POR_HIDDEN 0xe081 -#define POR_QUOVADIS 0xe082 -#define POR_ERGOSUM 0xe083 -#define POR_COMBINED 0xe084 +#define POR_FLD 0xe080 +#define POR_HIDDEN 0xe081 +#define POR_QUOVADIS 0xe082 +#define POR_ERGOSUM 0xe083 +#define POR_COMBINED 0xe084 #define POR_FTN 0xe085 -#define POR_FTNNUM 0xe880 -#define POR_NUMBER 0xe881 -#define POR_BULLET 0xe882 -#define POR_GRFNUM 0xe883 +#define POR_FTNNUM 0xe880 +#define POR_NUMBER 0xe881 +#define POR_BULLET 0xe882 +#define POR_GRFNUM 0xe883 -#define POR_GLUE 0x0480 +#define POR_GLUE 0x0480 -#define POR_MARGIN 0x04c0 +#define POR_MARGIN 0x04c0 -#define POR_FIX 0x06c0 -#define POR_FLY 0x06c1 +#define POR_FIX 0x06c0 +#define POR_FLY 0x06c1 -#define POR_TAB 0x0750 +#define POR_TAB 0x0750 -#define POR_TABRIGHT 0x07d0 -#define POR_TABCENTER 0x07d1 -#define POR_TABDECIMAL 0x07d2 +#define POR_TABRIGHT 0x07d0 +#define POR_TABCENTER 0x07d1 +#define POR_TABDECIMAL 0x07d2 -#define POR_TABLEFT 0x0740 +#define POR_TABLEFT 0x0740 -#endif //_TXTTYPES_HXX +#endif //_TXTTYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx index c0fe45013246..30bf165e9a81 100644 --- a/sw/source/core/inc/undoflystrattr.hxx +++ b/sw/source/core/inc/undoflystrattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h index 09c91e4021b4..7e61c50c22ab 100644 --- a/sw/source/core/inc/unofldmid.h +++ b/sw/source/core/inc/unofldmid.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,24 +39,24 @@ namespace com { namespace sun { namespace star { namespace uno { * ******************************************************************************/ //Abbildung der Properties auf den Descriptor -#define FIELD_PROP_PAR1 10 +#define FIELD_PROP_PAR1 10 #define FIELD_PROP_PAR2 11 #define FIELD_PROP_PAR3 12 #define FIELD_PROP_FORMAT 13 #define FIELD_PROP_SUBTYPE 14 -#define FIELD_PROP_BOOL1 15 -#define FIELD_PROP_BOOL2 16 -#define FIELD_PROP_DATE 17 +#define FIELD_PROP_BOOL1 15 +#define FIELD_PROP_BOOL2 16 +#define FIELD_PROP_DATE 17 #define FIELD_PROP_USHORT1 18 #define FIELD_PROP_USHORT2 19 -#define FIELD_PROP_BYTE1 20 +#define FIELD_PROP_BYTE1 20 #define FIELD_PROP_DOUBLE 21 -#define FIELD_PROP_BOOL3 22 +#define FIELD_PROP_BOOL3 22 #define FIELD_PROP_PAR4 23 #define FIELD_PROP_SHORT1 24 -#define FIELD_PROP_DATE_TIME 25 -#define FIELD_PROP_PROP_SEQ 26 -#define FIELD_PROP_LOCALE 27 +#define FIELD_PROP_DATE_TIME 25 +#define FIELD_PROP_PROP_SEQ 26 +#define FIELD_PROP_LOCALE 27 #define FIELD_PROP_BOOL4 28 #define FIELD_PROP_STRINGS 29 #define FIELD_PROP_PAR5 30 diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 391515bcf267..b7c73f793092 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 5a1bec7803ea..c235c2f61c7d 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -64,40 +64,40 @@ class SwViewImp { friend class ViewShell; - friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus. + friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus. friend class SwLayIdle; // OD 12.12.2002 #103492# - for paint of page preview friend class SwPagePreviewLayout; - ViewShell *pSh; //Falls jemand einen Imp durchreicht und doch + ViewShell *pSh; //Falls jemand einen Imp durchreicht und doch //mal eine ViewShell braucht hier die //Rueckwaertsverkettung. - SwDrawView *pDrawView; //Unsere DrawView - SdrPageView *pSdrPageView; //Genau eine Seite fuer unsere DrawView + SwDrawView *pDrawView; //Unsere DrawView + SdrPageView *pSdrPageView; //Genau eine Seite fuer unsere DrawView - SwPageFrm *pFirstVisPage;//Zeigt immer auf die erste sichtbare Seite. + SwPageFrm *pFirstVisPage;//Zeigt immer auf die erste sichtbare Seite. SwRegionRects *pRegion; //Sammler fuer Paintrects aus der LayAction. - SwLayAction *pLayAct; //Ist gesetzt wenn ein Action-Objekt existiert + SwLayAction *pLayAct; //Ist gesetzt wenn ein Action-Objekt existiert //Wird vom SwLayAction-CTor ein- und vom DTor //ausgetragen. - SwLayIdle *pIdleAct; //Analog zur SwLayAction fuer SwLayIdle. + SwLayIdle *pIdleAct; //Analog zur SwLayAction fuer SwLayIdle. - SwAccessibleMap *pAccMap; // Accessible Wrappers + SwAccessibleMap *pAccMap; // Accessible Wrappers mutable const SdrObject * pSdrObjCached; mutable String sSdrObjCachedComment; - BOOL bFirstPageInvalid :1; //Pointer auf erste Seite ungueltig? + BOOL bFirstPageInvalid :1; //Pointer auf erste Seite ungueltig? //BOOL bResetXorVisibility:1; //StartAction/EndAction - //HMHBOOL bShowHdlPaint :1; //LockPaint/UnlockPaint + //HMHBOOL bShowHdlPaint :1; //LockPaint/UnlockPaint BOOL bResetHdlHiddenPaint:1;// -- "" -- - BOOL bSmoothUpdate :1; //Meber fuer SmoothScroll - BOOL bStopSmooth :1; + BOOL bSmoothUpdate :1; //Meber fuer SmoothScroll + BOOL bStopSmooth :1; BOOL bStopPrt :1; // Stop Printing USHORT nRestoreActions ; //Die Anzahl der zu restaurierenden Actions (UNO) @@ -127,11 +127,11 @@ class SwViewImp */ void ResetStopPrt() { bStopPrt = FALSE; } - void SetFirstVisPage(); //Neue Ermittlung der ersten sichtbaren Seite + void SetFirstVisPage(); //Neue Ermittlung der ersten sichtbaren Seite - void StartAction(); //Henkel Anzeigen und verstecken. - void EndAction(); //gerufen von ViewShell::ImplXXXAction - void LockPaint(); //dito, gerufen von ViewShell::ImplLockPaint + void StartAction(); //Henkel Anzeigen und verstecken. + void EndAction(); //gerufen von ViewShell::ImplXXXAction + void LockPaint(); //dito, gerufen von ViewShell::ImplLockPaint void UnlockPaint(); private: @@ -182,27 +182,27 @@ private: public: SwViewImp( ViewShell * ); ~SwViewImp(); - void Init( const SwViewOption * ); //nur fuer ViewShell::Init() + void Init( const SwViewOption * ); //nur fuer ViewShell::Init() const ViewShell *GetShell() const { return pSh; } - ViewShell *GetShell() { return pSh; } + ViewShell *GetShell() { return pSh; } Color GetRetoucheColor() const; //Verwaltung zur ersten sichtbaren Seite inline const SwPageFrm *GetFirstVisPage() const; - inline SwPageFrm *GetFirstVisPage(); + inline SwPageFrm *GetFirstVisPage(); void SetFirstVisPageInvalid() { bFirstPageInvalid = TRUE; } BOOL AddPaintRect( const SwRect &rRect ); - SwRegionRects *GetRegion() { return pRegion; } + SwRegionRects *GetRegion() { return pRegion; } void DelRegion(); // neues Interface fuer StarView Drawing inline BOOL HasDrawView() const { return 0 != pDrawView; } - SwDrawView* GetDrawView() { return pDrawView; } + SwDrawView* GetDrawView() { return pDrawView; } const SwDrawView* GetDrawView() const { return pDrawView; } - SdrPageView*GetPageView() { return pSdrPageView; } + SdrPageView*GetPageView() { return pSdrPageView; } const SdrPageView*GetPageView() const { return pSdrPageView; } void MakeDrawView(); @@ -231,23 +231,23 @@ public: void NotifySizeChg( const Size &rNewSz ); //SS Fuer die Lay- bzw. IdleAction und verwandtes - BOOL IsAction() const { return pLayAct != 0; } - BOOL IsIdleAction() const { return pIdleAct != 0; } - SwLayAction &GetLayAction() { return *pLayAct; } + BOOL IsAction() const { return pLayAct != 0; } + BOOL IsIdleAction() const { return pIdleAct != 0; } + SwLayAction &GetLayAction() { return *pLayAct; } const SwLayAction &GetLayAction() const { return *pLayAct; } - SwLayIdle &GetIdleAction() { return *pIdleAct;} + SwLayIdle &GetIdleAction() { return *pIdleAct;} const SwLayIdle &GetIdleAction() const { return *pIdleAct;} //Wenn eine Aktion laueft wird diese gebeten zu pruefen ob es //an der zeit ist den WaitCrsr einzuschalten. void CheckWaitCrsr(); - BOOL IsCalcLayoutProgress() const; //Fragt die LayAction wenn vorhanden. + BOOL IsCalcLayoutProgress() const; //Fragt die LayAction wenn vorhanden. //TRUE wenn eine LayAction laeuft, dort wird dann auch das Flag fuer //ExpressionFields gesetzt. BOOL IsUpdateExpFlds(); - void SetRestoreActions(USHORT nSet){nRestoreActions = nSet;} - USHORT GetRestoreActions() const{return nRestoreActions;} + void SetRestoreActions(USHORT nSet){nRestoreActions = nSet;} + USHORT GetRestoreActions() const{return nRestoreActions;} // OD 12.12.2002 #103492# void InitPagePreviewLayout(); diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx index b0d63c2baa9c..c5a50cc37bdb 100644 --- a/sw/source/core/inc/visiturl.hxx +++ b/sw/source/core/inc/visiturl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,8 @@ * ************************************************************************/ -#ifndef _VISITURL_HXX -#define _VISITURL_HXX +#ifndef _VISITURL_HXX +#define _VISITURL_HXX #include <svl/lstner.hxx> diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 1de852514a74..4341af9b3c5c 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -26,8 +26,8 @@ * ************************************************************************/ -#ifndef _WRONG_HXX -#define _WRONG_HXX +#ifndef _WRONG_HXX +#define _WRONG_HXX #include <com/sun/star/container/XStringKeyMap.hpp> |