diff options
33 files changed, 271 insertions, 271 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 85e872aef232..6fcf6f8f3064 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -19,9 +19,9 @@ -// + // Global header -// + #include <limits.h> @@ -56,9 +56,9 @@ #include <svl/intitem.hxx> -// + // Project-local header -// + #include <com/sun/star/beans/PropertyState.hpp> @@ -79,9 +79,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; -// + // AccessibleEditableTextPara implementation -// + namespace accessibility @@ -1346,7 +1346,7 @@ namespace accessibility pNewValues[i] = pPairs[pIndices[i]]; } delete[] pIndices; - // + return aNewValues; } return aRes; diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx index 6fe585065c87..fe71634ed514 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.cxx +++ b/editeng/source/accessibility/AccessibleHyperlink.cxx @@ -31,9 +31,9 @@ using namespace ::com::sun::star; -// + // AccessibleHyperlink implementation -// + namespace accessibility diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index 39f4a561e5b4..85dd45bb2ea8 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -19,9 +19,9 @@ -// + // Global header -// + #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -30,9 +30,9 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -// + // Project-local header -// + #include <editeng/unoedhlp.hxx> diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 540e551e5519..a671dabb3c6d 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -19,9 +19,9 @@ -// + // Global header -// + #include <limits.h> @@ -39,9 +39,9 @@ #include <com/sun/star/accessibility/AccessibleTextType.hpp> -// + // Project-local header -// + #include <editeng/editdata.hxx> @@ -79,9 +79,9 @@ namespace accessibility }; sal_Unicode cNewLine(0x0a); - // + // Static Helper - // + ESelection MakeSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex, sal_Int32 nEndPara, sal_Int32 nEndIndex ) @@ -97,9 +97,9 @@ namespace accessibility } - // + // AccessibleStaticTextBase_Impl declaration - // + @@ -209,9 +209,9 @@ namespace accessibility }; - // + // AccessibleStaticTextBase_Impl implementation - // + AccessibleStaticTextBase_Impl::AccessibleStaticTextBase_Impl() : @@ -493,9 +493,9 @@ namespace accessibility return sal_False; } - // + // AccessibleStaticTextBase implementation - // + SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx index 566e8bd0ad19..e98f77e86de5 100644 --- a/editeng/source/accessibility/AccessibleStringWrap.cxx +++ b/editeng/source/accessibility/AccessibleStringWrap.cxx @@ -26,9 +26,9 @@ #include <editeng/AccessibleStringWrap.hxx> -// + // AccessibleStringWrap implementation -// + AccessibleStringWrap::AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText ) : diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index b764d47d8efc..ceab005ef821 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -48,9 +48,9 @@ #include "editattr.hxx" -// ------------------------------------------------------------------------- + // class EditCharAttrib -// ------------------------------------------------------------------------- + EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE ) : nStart(nS), nEnd(nE), bFeature(false), bEdge(false) { @@ -69,9 +69,9 @@ void EditCharAttrib::SetFont( SvxFont&, OutputDevice* ) } -// ------------------------------------------------------------------------- + // class EditCharAttribFont -// ------------------------------------------------------------------------- + EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -88,9 +88,9 @@ void EditCharAttribFont::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetCharSet( rAttr.GetCharSet() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribItalic -// ------------------------------------------------------------------------- + EditCharAttribItalic::EditCharAttribItalic( const SvxPostureItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -102,9 +102,9 @@ void EditCharAttribItalic::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetItalic( ((const SvxPostureItem*)GetItem())->GetPosture() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribWeight -// ------------------------------------------------------------------------- + EditCharAttribWeight::EditCharAttribWeight( const SvxWeightItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -116,9 +116,9 @@ void EditCharAttribWeight::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetWeight( (FontWeight)((const SvxWeightItem*)GetItem())->GetValue() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribUnderline -// ------------------------------------------------------------------------- + EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -132,9 +132,9 @@ void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev ) pOutDev->SetTextLineColor( ((const SvxUnderlineItem*)GetItem())->GetColor() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribOverline -// ------------------------------------------------------------------------- + EditCharAttribOverline::EditCharAttribOverline( const SvxOverlineItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -148,9 +148,9 @@ void EditCharAttribOverline::SetFont( SvxFont& rFont, OutputDevice* pOutDev ) pOutDev->SetOverlineColor( ((const SvxOverlineItem*)GetItem())->GetColor() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribFontHeight -// ------------------------------------------------------------------------- + EditCharAttribFontHeight::EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -163,9 +163,9 @@ void EditCharAttribFontHeight::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetSize( Size( rFont.GetSize().Width(), ((const SvxFontHeightItem*)GetItem())->GetHeight() ) ); } -// ------------------------------------------------------------------------- + // class EditCharAttribFontWidth -// ------------------------------------------------------------------------- + EditCharAttribFontWidth::EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -177,9 +177,9 @@ void EditCharAttribFontWidth::SetFont( SvxFont& /*rFont*/, OutputDevice* ) // must be calculated outside, because f(device)... } -// ------------------------------------------------------------------------- + // class EditCharAttribStrikeout -// ------------------------------------------------------------------------- + EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -191,9 +191,9 @@ void EditCharAttribStrikeout::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetStrikeout( (FontStrikeout)((const SvxCrossedOutItem*)GetItem())->GetValue() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribCaseMap -// ------------------------------------------------------------------------- + EditCharAttribCaseMap::EditCharAttribCaseMap( const SvxCaseMapItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -205,9 +205,9 @@ void EditCharAttribCaseMap::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetCaseMap( ((const SvxCaseMapItem*)GetItem())->GetCaseMap() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribColor -// ------------------------------------------------------------------------- + EditCharAttribColor::EditCharAttribColor( const SvxColorItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -219,9 +219,9 @@ void EditCharAttribColor::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetColor( ((const SvxColorItem*)GetItem())->GetValue() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribLanguage -// ------------------------------------------------------------------------- + EditCharAttribLanguage::EditCharAttribLanguage( const SvxLanguageItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -233,9 +233,9 @@ void EditCharAttribLanguage::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetLanguage( ((const SvxLanguageItem*)GetItem())->GetLanguage() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribShadow -// ------------------------------------------------------------------------- + EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -247,9 +247,9 @@ void EditCharAttribShadow::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetShadow( ((const SvxShadowedItem*)GetItem())->GetValue() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribEscapement -// ------------------------------------------------------------------------- + EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -269,9 +269,9 @@ void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetEscapement( nEsc ); } -// ------------------------------------------------------------------------- + // class EditCharAttribOutline -// ------------------------------------------------------------------------- + EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -283,9 +283,9 @@ void EditCharAttribOutline::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetOutline( ((const SvxContourItem*)GetItem())->GetValue() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribTab -// ------------------------------------------------------------------------- + EditCharAttribTab::EditCharAttribTab( const SfxVoidItem& rAttr, sal_uInt16 nPos ) : EditCharAttrib( rAttr, nPos, nPos+1 ) { @@ -296,9 +296,9 @@ void EditCharAttribTab::SetFont( SvxFont&, OutputDevice* ) { } -// ------------------------------------------------------------------------- + // class EditCharAttribLineBreak -// ------------------------------------------------------------------------- + EditCharAttribLineBreak::EditCharAttribLineBreak( const SfxVoidItem& rAttr, sal_uInt16 nPos ) : EditCharAttrib( rAttr, nPos, nPos+1 ) { @@ -309,9 +309,9 @@ void EditCharAttribLineBreak::SetFont( SvxFont&, OutputDevice* ) { } -// ------------------------------------------------------------------------- + // class EditCharAttribField -// ------------------------------------------------------------------------- + EditCharAttribField::EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16 nPos ) : EditCharAttrib( rAttr, nPos, nPos+1 ) { @@ -380,9 +380,9 @@ bool EditCharAttribField::operator == ( const EditCharAttribField& rAttr ) const return true; } -// ------------------------------------------------------------------------- + // class EditCharAttribPairKerning -// ------------------------------------------------------------------------- + EditCharAttribPairKerning::EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -394,9 +394,9 @@ void EditCharAttribPairKerning::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetKerning( ((const SvxAutoKernItem*)GetItem())->GetValue() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribKerning -// ------------------------------------------------------------------------- + EditCharAttribKerning::EditCharAttribKerning( const SvxKerningItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -408,9 +408,9 @@ void EditCharAttribKerning::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetFixKerning( ((const SvxKerningItem*)GetItem())->GetValue() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribWordLineMode -// ------------------------------------------------------------------------- + EditCharAttribWordLineMode::EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -422,9 +422,9 @@ void EditCharAttribWordLineMode::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetWordLineMode( ((const SvxWordLineModeItem*)GetItem())->GetValue() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribEmphasisMark -// ------------------------------------------------------------------------- + EditCharAttribEmphasisMark::EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { @@ -436,9 +436,9 @@ void EditCharAttribEmphasisMark::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetEmphasisMark( ((const SvxEmphasisMarkItem*)GetItem())->GetEmphasisMark() ); } -// ------------------------------------------------------------------------- + // class EditCharAttribRelief -// ------------------------------------------------------------------------- + EditCharAttribRelief::EditCharAttribRelief( const SvxCharReliefItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) : EditCharAttrib( rAttr, _nStart, _nEnd ) { diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index 035efdae77d2..871adccd4a1c 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -57,9 +57,9 @@ class SvxCaseMapItem; // => To determine the DefMetric simply use GetMetric(0) #define DEF_METRIC 0 -// ------------------------------------------------------------------------- + // class EditCharAttrib -// ------------------------------------------------------------------------- + // bFeature: Attribute must not expand/shrink, length is always 1 // bEdge: Attribute will not expand, if you want to expand just on the edge class EditCharAttrib : private boost::noncopyable @@ -143,9 +143,9 @@ inline void EditCharAttrib::Collaps( sal_uInt16 nDiff ) nEnd = nEnd - nDiff; } -// ------------------------------------------------------------------------- + // class EditCharAttribFont -// ------------------------------------------------------------------------- + class EditCharAttribFont: public EditCharAttrib { public: @@ -154,9 +154,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribWeight -// ------------------------------------------------------------------------- + class EditCharAttribWeight : public EditCharAttrib { public: @@ -164,9 +164,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribItalic -// ------------------------------------------------------------------------- + class EditCharAttribItalic : public EditCharAttrib { public: @@ -175,9 +175,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribShadow -// ------------------------------------------------------------------------- + class EditCharAttribShadow : public EditCharAttrib { public: @@ -186,9 +186,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribEscapement -// ------------------------------------------------------------------------- + class EditCharAttribEscapement : public EditCharAttrib { public: @@ -197,9 +197,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribOutline -// ------------------------------------------------------------------------- + class EditCharAttribOutline : public EditCharAttrib { public: @@ -208,9 +208,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribStrikeout -// ------------------------------------------------------------------------- + class EditCharAttribStrikeout : public EditCharAttrib { public: @@ -219,9 +219,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribCaseMap -// ------------------------------------------------------------------------- + class EditCharAttribCaseMap : public EditCharAttrib { public: @@ -230,9 +230,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribUnderline -// ------------------------------------------------------------------------- + class EditCharAttribUnderline : public EditCharAttrib { public: @@ -241,9 +241,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribOverline -// ------------------------------------------------------------------------- + class EditCharAttribOverline : public EditCharAttrib { public: @@ -252,9 +252,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribEmphasisMark -// ------------------------------------------------------------------------- + class EditCharAttribEmphasisMark : public EditCharAttrib { public: @@ -263,9 +263,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribRelief -// ------------------------------------------------------------------------- + class EditCharAttribRelief : public EditCharAttrib { public: @@ -274,9 +274,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribFontHeight -// ------------------------------------------------------------------------- + class EditCharAttribFontHeight : public EditCharAttrib { public: @@ -285,9 +285,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribFontWidth -// ------------------------------------------------------------------------- + class EditCharAttribFontWidth : public EditCharAttrib { public: @@ -296,9 +296,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribColor -// ------------------------------------------------------------------------- + class EditCharAttribColor : public EditCharAttrib { public: @@ -307,9 +307,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribLanguage -// ------------------------------------------------------------------------- + class EditCharAttribLanguage : public EditCharAttrib { public: @@ -318,9 +318,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribTab -// ------------------------------------------------------------------------- + class EditCharAttribTab : public EditCharAttrib { public: @@ -329,9 +329,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribLineBreak -// ------------------------------------------------------------------------- + class EditCharAttribLineBreak : public EditCharAttrib { public: @@ -340,9 +340,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribField -// ------------------------------------------------------------------------- + class EditCharAttribField: public EditCharAttrib { OUString aFieldValue; @@ -370,9 +370,9 @@ public: void Reset(); }; -// ------------------------------------------------------------------------- + // class EditCharAttribPairKerning -// ------------------------------------------------------------------------- + class EditCharAttribPairKerning : public EditCharAttrib { public: @@ -381,9 +381,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribKerning -// ------------------------------------------------------------------------- + class EditCharAttribKerning : public EditCharAttrib { public: @@ -392,9 +392,9 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- + // class EditCharAttribWordLineMode -// ------------------------------------------------------------------------- + class EditCharAttribWordLineMode: public EditCharAttrib { public: diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 0478e343fef8..86a9548911b7 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -68,7 +68,7 @@ using namespace ::com::sun::star; -// ------------------------------------------------------------ + sal_uInt16 GetScriptItemId( sal_uInt16 nItemId, short nScriptType ) { @@ -157,7 +157,7 @@ sal_Bool IsScriptItemValid( sal_uInt16 nItemId, short nScriptType ) } -// ------------------------------------------------------------ + // Should later be moved to TOOLS/STRING (Current: 303) // for Grep: WS_TARGET diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index aa317f5f9a38..1d793f0427e9 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -128,9 +128,9 @@ public: void AppendCharAttrib(EditCharAttrib* pNew); }; -// ---------------------------------------------------------------------- + // class SvxColorList -// ---------------------------------------------------------------------- + class SvxColorList { @@ -148,9 +148,9 @@ public: SvxColorItem* GetObject( sal_Int32 nIndex ); }; -// ---------------------------------------------------------------------- + // class ItemList -// ---------------------------------------------------------------------- + class ItemList { @@ -168,9 +168,9 @@ public: void Clear() { aItemPool.clear(); }; }; -// ------------------------------------------------------------------------- + // class ContentAttribs -// ------------------------------------------------------------------------- + class ContentAttribs { private: @@ -193,9 +193,9 @@ public: bool HasItem( sal_uInt16 nWhich ) const; }; -// ------------------------------------------------------------------------- + // class CharAttribList -// ------------------------------------------------------------------------- + class CharAttribList { public: @@ -250,9 +250,9 @@ public: #endif }; -// ------------------------------------------------------------------------- + // class ContentNode -// ------------------------------------------------------------------------- + class ContentNode : boost::noncopyable { private: @@ -306,9 +306,9 @@ public: sal_Unicode GetChar(sal_Int32 nPos) const; }; -// ------------------------------------------------------------------------- + // class EditPaM -// ------------------------------------------------------------------------- + class EditPaM { private: @@ -349,9 +349,9 @@ public: #define CHAR_PUNCTUATIONLEFT 0x02 #define CHAR_PUNCTUATIONRIGHT 0x04 -// ------------------------------------------------------------------------- + // struct ExtraPortionInfos -// ------------------------------------------------------------------------- + struct ExtraPortionInfo { long nOrgWidth; @@ -376,9 +376,9 @@ struct ExtraPortionInfo }; -// ------------------------------------------------------------------------- + // class TextPortion -// ------------------------------------------------------------------------- + class TextPortion { private: @@ -444,9 +444,9 @@ public: void SetExtraInfos( ExtraPortionInfo* p ) { delete pExtraInfos; pExtraInfos = p; } }; -// ------------------------------------------------------------------------- + // class TextPortionList -// ------------------------------------------------------------------------- + class TextPortionList { typedef boost::ptr_vector<TextPortion> PortionsType; @@ -473,9 +473,9 @@ public: class ParaPortion; -// ------------------------------------------------------------------------ + // class EditLine -// ------------------------------------------------------------------------- + class EditLine { public: @@ -561,9 +561,9 @@ public: }; -// ------------------------------------------------------------------------- + // class LineList -// ------------------------------------------------------------------------- + class EditLineList { typedef boost::ptr_vector<EditLine> LinesType; @@ -584,9 +584,9 @@ public: void Insert(sal_Int32 nPos, EditLine* p); }; -// ------------------------------------------------------------------------- + // class ParaPortion -// ------------------------------------------------------------------------- + class ParaPortion { friend class ImpEditEngine; // to adjust the height @@ -655,9 +655,9 @@ public: #endif }; -// ------------------------------------------------------------------------- + // class ParaPortionList -// ------------------------------------------------------------------------- + class ParaPortionList { mutable sal_Int32 nLastCache; @@ -689,9 +689,9 @@ public: #endif }; -// ------------------------------------------------------------------------- + // class EditSelection -// ------------------------------------------------------------------------- + class EditSelection { private: @@ -723,9 +723,9 @@ public: sal_Bool operator != ( const EditSelection& r ) const { return !( r == *this ); } }; -// ------------------------------------------------------------------------- + // class DeletedNodeInfo -// ------------------------------------------------------------------------- + class DeletedNodeInfo { private: @@ -743,9 +743,9 @@ public: sal_Int32 GetPosition() const { return nInvalidParagraph; } }; -// ------------------------------------------------------------------------- + // class EditDoc -// ------------------------------------------------------------------------- + class EditDoc { private: @@ -841,9 +841,9 @@ inline EditCharAttrib* GetAttrib(CharAttribList::AttribsType& rAttribs, sal_Int3 bool CheckOrderedList(const CharAttribList::AttribsType& rAttribs, bool bStart); -// ------------------------------------------------------------------------- + // class EditEngineItemPool -// ------------------------------------------------------------------------- + class EditEngineItemPool : public SfxItemPool { public: diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 06c6d84091dd..2d8694009c38 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1124,7 +1124,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, W { // if the bullet is still visible just do not paint it from // now on and that will be all. Otherwise continue as usual. - // ... + sal_Int32 nPara = pImpEditEngine->GetEditDoc().GetPos( pNode ); SfxBoolItem aBulletState( (const SfxBoolItem&) pImpEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE ) ); @@ -2421,9 +2421,9 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara ) return pImpEditEngine->CreateTransferable( aSel ); } -// ===================================================================== + // ====================== Virtual Methods ======================== -// ===================================================================== + void EditEngine::DrawingText( const Point&, const OUString&, sal_Int32, sal_Int32, const sal_Int32*, const SvxFont&, sal_Int32, sal_Int32, sal_uInt8, const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, bool, @@ -2568,9 +2568,9 @@ void EditEngine::FieldSelected( const SvxFieldItem&, sal_Int32, sal_Int32 ) { } -// ===================================================================== + // ====================== Static Methods ======================= -// ===================================================================== + SfxItemPool* EditEngine::CreatePool( bool bPersistentRefCounts ) { SfxItemPool* pPool = new EditEngineItemPool( bPersistentRefCounts ); diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx index 1ef2fddd997d..d9b93ff4155a 100644 --- a/editeng/source/editeng/editsel.cxx +++ b/editeng/source/editeng/editsel.cxx @@ -25,9 +25,9 @@ #include <impedit.hxx> #include <editeng/editview.hxx> -// ---------------------------------------------------------------------- + // class EditSelFunctionSet -// ---------------------------------------------------------------------- + EditSelFunctionSet::EditSelFunctionSet() { pCurView = NULL; @@ -79,9 +79,9 @@ void EditSelFunctionSet::DeselectAll() pCurView->pImpEditView->DeselectAll(); } -// ---------------------------------------------------------------------- + // class EditSelectionEngine -// ---------------------------------------------------------------------- + EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (Window*)0 ) { SetSelectionMode( RANGE_SELECTION ); diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx index 37fd7b713a0d..1541878b4282 100644 --- a/editeng/source/editeng/editundo.hxx +++ b/editeng/source/editeng/editundo.hxx @@ -27,9 +27,9 @@ class EditEngine; class EditView; -// ----------------------------------------------------------------------- + // EditUndoDelContent -// ------------------------------------------------------------------------ + class EditUndoDelContent : public EditUndo { private: @@ -46,9 +46,9 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- + // EditUndoConnectParas -// ------------------------------------------------------------------------ + class EditUndoConnectParas : public EditUndo { private: @@ -75,9 +75,9 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- + // EditUndoSplitPara -// ------------------------------------------------------------------------ + class EditUndoSplitPara : public EditUndo { private: @@ -92,9 +92,9 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- + // EditUndoInsertChars -// ------------------------------------------------------------------------ + class EditUndoInsertChars : public EditUndo { private: @@ -113,9 +113,9 @@ public: virtual bool Merge( SfxUndoAction *pNextAction ); }; -// ----------------------------------------------------------------------- + // EditUndoRemoveChars -// ------------------------------------------------------------------------ + class EditUndoRemoveChars : public EditUndo { private: @@ -132,9 +132,9 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- + // EditUndoInsertFeature -// ------------------------------------------------------------------------ + class EditUndoInsertFeature : public EditUndo { private: @@ -149,9 +149,9 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- + // EditUndoMoveParagraphs -// ------------------------------------------------------------------------ + class EditUndoMoveParagraphs: public EditUndo { private: @@ -166,9 +166,9 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- + // EditUndoSetStyleSheet -// ------------------------------------------------------------------------ + class EditUndoSetStyleSheet: public EditUndo { private: @@ -190,9 +190,9 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- + // EditUndoSetParaAttribs -// ------------------------------------------------------------------------ + class EditUndoSetParaAttribs: public EditUndo { private: @@ -208,9 +208,9 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- + // EditUndoSetAttribs -// ------------------------------------------------------------------------ + class EditUndoSetAttribs: public EditUndo { private: @@ -245,9 +245,9 @@ public: void AppendContentInfo(ContentAttribsInfo* pNew); }; -// ----------------------------------------------------------------------- + // EditUndoTransliteration -// ------------------------------------------------------------------------ + class EditUndoTransliteration: public EditUndo { private: @@ -270,9 +270,9 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- + // EditUndoMarkSelection -// ------------------------------------------------------------------------ + class EditUndoMarkSelection: public EditUndo { private: diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 637a1c597374..7e697b87b640 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -111,9 +111,9 @@ LanguageType EditView::CheckLanguage( if (!xSpell.is()) return nLang; - // + // build list of languages to check - // + LanguageType aLangList[4]; const AllSettings& rSettings = Application::GetSettings(); SvtLinguOptions aLinguOpt; @@ -154,9 +154,9 @@ LanguageType EditView::CheckLanguage( } -// ---------------------------------------------------------------------- + // class EditView -// ---------------------------------------------------------------------- + EditView::EditView( EditEngine* pEng, Window* pWindow ) { pImpEditView = new ImpEditView( this, pEng, pWindow ); @@ -761,7 +761,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) // Are there any replace suggestions? OUString aSelected( GetSelected() ); - // + // restrict the maximal number of suggestions displayed // in the context menu. // Note: That could of course be done by clipping the @@ -776,7 +776,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) PropertyValue &rVal = aPropVals.getArray()[0]; rVal.Name = OUString( UPN_MAX_NUMBER_OF_SUGGESTIONS ); rVal.Value <<= (sal_Int16) 7; - // + // Are there any replace suggestions? Reference< linguistic2::XSpellAlternatives > xSpellAlt = xSpeller->spell( aSelected, PIMPEE->GetLanguage( aPaM2 ), aPropVals ); diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 5c9b840c2750..f44ec437ba66 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -581,7 +581,7 @@ bool WrongList::DbgIsBuggy() const return bError; } -////////////////////////////////////////////////////////////////////// + EdtAutoCorrDoc::EdtAutoCorrDoc( EditEngine* pE, ContentNode* pN, sal_uInt16 nCrsr, sal_Unicode cIns) : diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index d44c937d1adf..62b463c75f67 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -337,9 +337,9 @@ void EditHTMLParser::NextToken( int nToken ) case HTML_COLGROUP_ON: case HTML_COLGROUP_OFF: break; - case HTML_FONT_ON: // ... + case HTML_FONT_ON: break; - case HTML_FONT_OFF: // ... + case HTML_FONT_OFF: break; case HTML_TITLE_ON: diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index ceef4f501eee..ccb72f0820e3 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -66,7 +66,7 @@ static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, shor // class ImpEditView -// ---------------------------------------------------------------------- + ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) : aOutArea( Point(), pEng->GetPaperSize() ) { diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index c251ba2f7e4a..6c98f3e18773 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -201,9 +201,9 @@ public: EditView* GetView() { return pView; } }; -// ---------------------------------------------------------------------- + // class ImpEditView -// --------------------------------------------------------------------- + class ImpEditView : public vcl::unohelper::DragAndDropClient { friend class EditView; @@ -375,9 +375,9 @@ public: sal_uInt16 GetInvalidateMore() const { return (sal_uInt16)nInvMore; } }; -// ---------------------------------------------------------------------- + // ImpEditEngine -// ---------------------------------------------------------------------- + class ImpEditEngine : public SfxListener, boost::noncopyable { @@ -388,9 +388,9 @@ class ImpEditEngine : public SfxListener, boost::noncopyable private: - // ================================================================ + // Data ... - // ================================================================ + // Document Specific data ... ParaPortionList aParaPortionList; // Formatting @@ -501,9 +501,9 @@ private: bool bFirstWordCapitalization:1; // specifies if auto-correction should capitalize the first word or not bool mbLastTryMerge:1; - // ================================================================ + // Methods... - // ================================================================ + void CursorMoved( ContentNode* pPrevNode ); void ParaAttribsChanged( ContentNode* pNode ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 1672f8fe7bde..68474fc3b82c 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -687,9 +687,9 @@ const SfxItemSet& ImpEditEngine::GetEmptyItemSet() return *pEmptyItemSet; } -// ---------------------------------------------------------------------- + // MISC -// ---------------------------------------------------------------------- + void ImpEditEngine::CursorMoved( ContentNode* pPrevNode ) { // Delete empty attributes, but only if paragraph is not empty! @@ -730,9 +730,9 @@ void ImpEditEngine::ParaAttribsChanged( ContentNode* pNode ) CalcHeight( pNextPortion ); } -// ---------------------------------------------------------------------- + // Cursor movements -// ---------------------------------------------------------------------- + EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pEditView ) { @@ -1881,9 +1881,9 @@ void ImpEditEngine::InitWritingDirections( sal_Int32 nPara ) OUString aText = pParaPortion->GetNode()->GetString(); - // + // Bidi functions from icu 2.0 - // + UErrorCode nError = U_ZERO_ERROR; UBiDi* pBidi = ubidi_openSized( aText.getLength(), 0, &nError ); nError = U_ZERO_ERROR; @@ -2029,9 +2029,9 @@ SvxCellVerJustify ImpEditEngine::GetVerJustification( sal_Int32 nPara ) const return static_cast<SvxCellVerJustify>(rItem.GetEnumValue()); } -// ---------------------------------------------------------------------- + // Text changes -// ---------------------------------------------------------------------- + void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars, EditUndoRemoveChars* pCurUndo ) { @@ -2967,9 +2967,9 @@ EditPaM ImpEditEngine::InsertLineBreak(const EditSelection& aCurSel) return aPaM; } -// ---------------------------------------------------------------------- + // Helper functions -// ---------------------------------------------------------------------- + Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, sal_uInt16 nFlags ) { OSL_ENSURE( GetUpdateMode(), "Must not be reached when Update=FALSE: PaMtoEditCursor" ); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 6539762a47cb..51e2e47f7675 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -276,9 +276,9 @@ static bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh ) // For Ka } -// ---------------------------------------------------------------------- + // class ImpEditEngine -// ---------------------------------------------------------------------- + void ImpEditEngine::UpdateViews( EditView* pCurView ) { if ( !GetUpdateMode() || IsFormatting() || aInvalidRect.IsEmpty() ) diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 4c3dbd865147..9201c71bb869 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1551,7 +1551,7 @@ void ImpEditEngine::Convert( EditView* pEditView, pConvInfo = new ConvInfo; pConvInfo->bMultipleDoc = bMultipleDoc; pConvInfo->aConvStart = CreateEPaM( aCurSel.Min() ); - // + // if it is not just a selection and we are about to begin // with the current conversion for the very first time // we need to find the start of the current (initial) @@ -1571,7 +1571,7 @@ void ImpEditEngine::Convert( EditView* pEditView, pConvInfo->aConvStart.nIndex = editeng::HangulHanjaConversion::IsChinese( nSrcLang ) ? 0 : aWordStartPaM.GetIndex(); } - // + pConvInfo->aConvContinue = pConvInfo->aConvStart; bool bIsStart = false; @@ -1590,7 +1590,7 @@ void ImpEditEngine::Convert( EditView* pEditView, nOptions, bIsInteractive, bIsStart, pEditView ); - // + //!! optimization does not work since when update mode is false //!! the object is 'lying' about it portions, paragraphs, //!! EndPaM... later on. diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index e124f6fd8d58..307d0e8fc974 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::linguistic2; -////////////////////////////////////////////////////////////////////// + TextConvWrapper::TextConvWrapper( Window* pWindow, const Reference< XComponentContext >& rxContext, @@ -583,6 +583,6 @@ bool TextConvWrapper::HasRubySupport() const return false; } -////////////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 03fc0dae51b7..432f204e295f 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -367,9 +367,9 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const && ( *pField == *pOtherFld ) ); } -// ================================================================= + // The following are the derivatives of SvxFieldData ... -// ================================================================= + SV_IMPL_PERSIST1( SvxDateField, SvxFieldData ); @@ -607,9 +607,9 @@ MetaAction* SvxURLField::createBeginComment() const 2*aURL.getLength() ); } -// ================================================================= + // The fields that were removed from Calc: -// ================================================================= + SV_IMPL_PERSIST1( SvxPageField, SvxFieldData ); @@ -1165,7 +1165,7 @@ SvClassManager& SvxFieldItem::GetClassManager() return *pClassMgr; } -/////////////////////////////////////////////////////////////////////// + SV_IMPL_PERSIST1( SvxHeaderField, SvxFieldData ); @@ -1189,7 +1189,7 @@ void SvxHeaderField::Save( SvPersistStream & /*rStm*/ ) { } -/////////////////////////////////////////////////////////////////////// + SV_IMPL_PERSIST1( SvxFooterField, SvxFieldData ); SvxFooterField::SvxFooterField() {} @@ -1212,7 +1212,7 @@ void SvxFooterField::Save( SvPersistStream & /*rStm*/ ) { } -/////////////////////////////////////////////////////////////////////// + SV_IMPL_PERSIST1( SvxDateTimeField, SvxFieldData ); diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 2455257bf0b4..269e80b2a61b 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -44,10 +44,10 @@ #define HHC HangulHanjaConversion -//............................................................................. + namespace editeng { -//............................................................................. + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::i18n; diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 53b8883b990b..43ca90b621af 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -42,9 +42,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; -// ====================================================================== + // ====================== Simple pass-through ======================= -// ====================================================================== + void Outliner::SetUpdateMode( bool bUpdate ) { diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx index f1e87edaf6fc..1eabd482664c 100644 --- a/editeng/source/outliner/outlobj.cxx +++ b/editeng/source/outliner/outlobj.cxx @@ -32,7 +32,7 @@ #include <vcl/bitmap.hxx> #include <tools/stream.hxx> -////////////////////////////////////////////////////////////////////////////// + class ImplOutlinerParaObject { @@ -76,7 +76,7 @@ public: } }; -////////////////////////////////////////////////////////////////////////////// + void OutlinerParaObject::ImplMakeUnique() { diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index db5424a9f8b6..70952bfa84e1 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -110,7 +110,7 @@ public: -// ------------------------------------- + class OLUndoExpand : public EditUndo diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index a91124df185a..18c11b4a56ca 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1186,9 +1186,9 @@ void OutlinerView::RemoveAttribs( bool bRemoveParaAttribs, sal_uInt16 nWhich, bo -// ====================================================================== + // ====================== Simple pass-through ======================= -// ====================================================================== + void OutlinerView::InsertText( const OUString& rNew, bool bSelect ) @@ -1443,9 +1443,9 @@ Selection OutlinerView::GetSurroundingTextSelection() const } -// ====================================================================== + // ===== some code for thesaurus sub menu within context menu -// ====================================================================== + namespace { diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 36d091b58859..8643b7fce359 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -19,9 +19,9 @@ -// + // Global header -// + #include <limits.h> @@ -34,9 +34,9 @@ #include <com/sun/star/uno/Reference.hxx> -// + // Project-local header -// + #include "editeng/unoedprx.hxx" #include <editeng/unotext.hxx> diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 5df53090fd73..12a80a4c2fa6 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -216,9 +216,9 @@ inline Time setTime( util::DateTime& rDate ) return Time( rDate.Hours, rDate.Minutes, rDate.Seconds, rDate.NanoSeconds ); } -// ==================================================================== + // class SvxUnoTextField -// ==================================================================== + namespace { class theSvxUnoTextFieldUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextFieldUnoTunnelId> {}; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 9b23877677d5..39505da286f7 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -130,9 +130,9 @@ const SfxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSfxPropertySet() return &aTextCursorSfxPropertySet; } -// ==================================================================== + // helper for Item/Property conversion -// ==================================================================== + void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw() { @@ -203,9 +203,9 @@ void CheckSelection( struct ESelection& rSel, SvxEditSource *pEdit ) throw() CheckSelection( rSel, pEdit->GetTextForwarder() ); } -// ==================================================================== + // class SvxUnoTextRangeBase -// ==================================================================== + UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextRangeBase ); @@ -1551,9 +1551,9 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< } } -// ==================================================================== + // class SvxUnoTextRange -// ==================================================================== + uno::Reference< uno::XInterface > SvxUnoTextRange_NewInstance() { @@ -1674,9 +1674,9 @@ OUString SAL_CALL SvxUnoTextRange::getImplementationName() return OUString("SvxUnoTextRange"); } -// ==================================================================== + // class SvxUnoText -// ==================================================================== + SvxUnoTextBase::SvxUnoTextBase() throw() : SvxUnoTextRangeBase( NULL ) diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 5b4cd88f43e5..e21df7778449 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -37,9 +37,9 @@ using namespace ::com::sun::star; if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \ return uno::makeAny(uno::Reference< xint >(this)) -// ==================================================================== + // SvxUnoTextContentEnumeration -// ==================================================================== + SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText ) throw() : mrText( _rText ) @@ -95,9 +95,9 @@ uno::Any SvxUnoTextContentEnumeration::nextElement(void) throw( container::NoSuc return uno::makeAny( xRef ); } -// ==================================================================== + // class SvxUnoTextContent -// ==================================================================== + SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextBase& rText, sal_Int32 nPara ) throw() : SvxUnoTextRangeBase(rText) @@ -381,9 +381,9 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames() return aSeq; } -// ==================================================================== + // class SvxUnoTextRangeEnumeration -// ==================================================================== + SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_Int32 nPara ) throw() : mxParentText( const_cast<SvxUnoTextBase*>(&rText) ), @@ -461,9 +461,9 @@ uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement() return uno::makeAny( xRange ); } -// ==================================================================== + // class SvxUnoTextCursor -// ==================================================================== + uno::Reference< uno::XInterface > SvxUnoTextCursor_NewInstance() { diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index bc7842774788..91a1a86c4cae 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -58,11 +58,11 @@ using namespace com::sun::star::xml::sax; using namespace ::rtl; using namespace cppu; -/////////////////////////////////////////////////////////////////////// + class SvxEditEngineSourceImpl; -/////////////////////////////////////////////////////////////////////// + class SvxEditEngineSourceImpl { @@ -83,7 +83,7 @@ public: SvxTextForwarder* GetTextForwarder(); }; -/////////////////////////////////////////////////////////////////////// + @@ -340,7 +340,7 @@ void SAL_CALL SvxSimpleUnoModel::removeEventListener( const ::com::sun::star::un { } -/////////////////////////////////////////////////////////////////////// + class SvxXMLTextExportComponent : public SvXMLExport { @@ -364,7 +364,7 @@ private: ESelection maSelection; }; -/////////////////////////////////////////////////////////////////////// + SvxXMLTextExportComponent::SvxXMLTextExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index d18961fb2d0d..bfa422ab70c3 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -52,7 +52,7 @@ using namespace cppu; using namespace xmloff::token; -/////////////////////////////////////////////////////////////////////// + class SvxXMLTextImportContext : public SvXMLImportContext { @@ -68,7 +68,7 @@ private: const uno::Reference< XText > mxText; }; -/////////////////////////////////////////////////////////////////////// + SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, const uno::Reference< XText >& xText ) : SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText ) @@ -103,7 +103,7 @@ SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPre return pContext; } -/////////////////////////////////////////////////////////////////////// + class SvxXMLXTextImportComponent : public SvXMLImport { |