diff options
-rw-r--r-- | sw/inc/charatr.hxx | 14 | ||||
-rw-r--r-- | sw/inc/format.hxx | 6 | ||||
-rw-r--r-- | sw/inc/hintids.hxx | 5 | ||||
-rw-r--r-- | sw/inc/swatrset.hxx | 11 | ||||
-rw-r--r-- | sw/inc/txatbase.hxx | 15 | ||||
-rw-r--r-- | sw/inc/txtatr.hxx | 8 | ||||
-rw-r--r-- | sw/source/core/bastyp/init.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/txtnode/fmtatr2.cxx | 121 | ||||
-rw-r--r-- | sw/source/core/txtnode/thints.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/txtnode/txtatr2.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/utlui/attrdesc.cxx | 29 |
11 files changed, 58 insertions, 187 deletions
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index d2069e4fc101..a98a499e115b 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: charatr.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-11-02 17:26:48 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,9 +126,9 @@ inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(BOOL bInP) const { return (const SvxLanguageItem&)Get( RES_CHRATR_CTL_LANGUAGE,bInP); } inline const SvxEscapementItem &SwAttrSet::GetEscapement(BOOL bInP) const { return (const SvxEscapementItem&)Get( RES_CHRATR_ESCAPEMENT,bInP); } -inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(BOOL bInP) const +inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(BOOL bInP) const { return (const SvxCaseMapItem&)Get( RES_CHRATR_CASEMAP,bInP); } -inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(BOOL bInP) const +inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(BOOL bInP) const { return (const SvxNoHyphenItem&)Get( RES_CHRATR_NOHYPHEN,bInP); } inline const SvxBlinkItem &SwAttrSet::GetBlink(BOOL bInP) const { return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); } @@ -136,8 +136,8 @@ inline const SvxBrushItem &SwAttrSet::GetChrBackground( BOOL bInP ) const { return (const SvxBrushItem&)Get( RES_CHRATR_BACKGROUND, bInP ); } inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( BOOL bInP ) const { return (const SvxEmphasisMarkItem&)Get( RES_CHRATR_EMPHASIS_MARK, bInP ); } -inline const SwFmt2Lines &SwAttrSet::Get2Lines( BOOL bInP ) const - { return (const SwFmt2Lines&)Get( RES_CHRATR_TWO_LINES, bInP ); } +inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( BOOL bInP ) const + { return (const SvxTwoLinesItem&)Get( RES_CHRATR_TWO_LINES, bInP ); } /****************************************************************************** * Implementierung der Charakter-Attribut Methoden vom SwFmt @@ -186,7 +186,7 @@ inline const SvxBrushItem &SwFmt::GetChrBackground(BOOL bInP) const { return aSet.GetChrBackground(bInP); } inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( BOOL bInP ) const { return aSet.GetEmphasisMark(bInP); } -inline const SwFmt2Lines &SwFmt::Get2Lines( BOOL bInP ) const +inline const SvxTwoLinesItem &SwFmt::Get2Lines( BOOL bInP ) const { return aSet.Get2Lines(bInP); } #endif diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 827371b1fbee..dd8a9afaed33 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -2,9 +2,9 @@ * * $RCSfile: format.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-11-02 17:26:48 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -243,7 +243,7 @@ public: inline const SfxBoolItem &GetWritingDirection( BOOL = TRUE ) const; inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const; - inline const SwFmt2Lines &Get2Lines( BOOL = TRUE ) const; + inline const SvxTwoLinesItem &Get2Lines( BOOL = TRUE ) const; // Frame-Attribute - impl. steht im frmatr.hxx, // fuer LINUX, SINIX, HPUX auch in gcc_outl.cxx diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 48049ed85440..e814d8130d58 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -2,9 +2,9 @@ * * $RCSfile: hintids.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jp $ $Date: 2000-11-15 14:13:59 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -444,6 +444,7 @@ BOOL IsInRange( const USHORT* pRange, const USHORT nId ); #define ITEMID_NOLINEBREAK RES_CHRATR_NOLINEBREAK #define ITEMID_WORDLINEMODE RES_CHRATR_WORDLINEMODE #define ITEMID_EMPHASISMARK RES_CHRATR_EMPHASIS_MARK +#define ITEMID_TWOLINES RES_CHRATR_TWO_LINES //Defines fuer die ehemaligen FrmAttribute, die jetzt in frmitems.hxx //von svx zu finden sind. diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index af71ca036e83..fa4fd0637a3f 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swatrset.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-11-02 17:26:48 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,7 @@ class SvxCaseMapItem; class SvxNoHyphenItem; class SvxBlinkItem; class SvxEmphasisMarkItem; -class SwFmt2Lines; +class SvxTwoLinesItem; // Frame-Attribute class SwFmtFillOrder; @@ -271,7 +271,7 @@ public: inline const SvxWeightItem &GetCTLWeight( BOOL = TRUE ) const; inline const SfxBoolItem &GetWritingDirection( BOOL = TRUE ) const; inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const; - inline const SwFmt2Lines &Get2Lines( BOOL = TRUE ) const; + inline const SvxTwoLinesItem &Get2Lines( BOOL = TRUE ) const; // Frame-Attribute - impl. steht im frmatr.hxx inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; @@ -344,6 +344,9 @@ public: /************************************************************************* $Log: not supported by cvs2svn $ + Revision 1.3 2000/11/02 17:26:48 jp + TwoLines as char and not as text attribute + Revision 1.2 2000/10/30 12:49:30 jp new: EmphasisItem diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index cc2d0b765d29..73ccd6c9ee5c 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -2,9 +2,9 @@ * * $RCSfile: txatbase.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jp $ $Date: 2000-11-06 10:46:50 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,7 +92,7 @@ class SvxColorItem; class SvxCharSetColorItem; class SvXMLAttrContainerItem; class SwFmtRuby; -class SwFmt2Lines; +class SvxTwoLinesItem; class SvxEmphasisMarkItem; class SwFmtCharFmt; class SwFmtINetFmt; @@ -195,7 +195,7 @@ public: inline const SwFmtINetFmt &GetINetFmt() const; inline const SvXMLAttrContainerItem &GetXMLAttrContainer() const; inline const SwFmtRuby &GetRuby() const; - inline const SwFmt2Lines &Get2Lines() const; + inline const SvxTwoLinesItem &Get2Lines() const; inline const SvxEmphasisMarkItem &GetEmphasisMark() const; private: @@ -426,11 +426,11 @@ inline const SwFmtRuby& SwTxtAttr::GetRuby() const "Falsche Abfrage" ); return (const SwFmtRuby&)*pAttr; } -inline const SwFmt2Lines& SwTxtAttr::Get2Lines() const +inline const SvxTwoLinesItem& SwTxtAttr::Get2Lines() const { ASSERT( pAttr && pAttr->Which() == RES_CHRATR_TWO_LINES, "Falsche Abfrage" ); - return (const SwFmt2Lines&)*pAttr; + return (const SvxTwoLinesItem&)*pAttr; } inline const SvxEmphasisMarkItem& SwTxtAttr::GetEmphasisMark() const @@ -442,6 +442,9 @@ inline const SvxEmphasisMarkItem& SwTxtAttr::GetEmphasisMark() const /************************************************************************* $Log: not supported by cvs2svn $ + Revision 1.5 2000/11/06 10:46:50 jp + new flags for the SwTxtAttr + Revision 1.4 2000/11/02 17:26:48 jp TwoLines as char and not as text attribute diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index 3e3d8015bf00..846d1ca9a63d 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: txtatr.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2000-10-30 12:49:30 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ class SwCharSetCol; class SwImplPrev; class SwFmtRuby; class SwCharFmt; -class SwFmt2Lines; +class SvxTwoLinesItem; // ATT_FONT *********************************************************** @@ -458,7 +458,7 @@ public: class SwTxt2Lines : public SwTxtAttrEnd { public: - SwTxt2Lines( const SwFmt2Lines& rAttr, + SwTxt2Lines( const SvxTwoLinesItem& rAttr, xub_StrLen nStart, xub_StrLen nEnd ); }; diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 14e6ab41b55c..51bc6a90a5aa 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -2,9 +2,9 @@ * * $RCSfile: init.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jp $ $Date: 2000-11-09 18:33:08 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:30:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -166,6 +166,9 @@ #ifndef _SVX_EMPHITEM_HXX //autogen #include <svx/emphitem.hxx> #endif +#ifndef _SVX_TWOLINESITEM_HXX +#include <svx/twolinesitem.hxx> +#endif #ifndef _SVX_CMAPITEM_HXX //autogen #include <svx/cmapitem.hxx> #endif @@ -257,9 +260,6 @@ #ifndef _FMTRUBY_HXX #include <fmtruby.hxx> #endif -#ifndef _FMT2LINES_HXX -#include <fmt2lines.hxx> -#endif #ifndef _EDITSH_HXX #include <editsh.hxx> #endif @@ -674,7 +674,7 @@ void _InitCore() aAttrTab[ RES_CHRATR_EMPHASIS_MARK - POOLATTR_BEGIN ] = new SvxEmphasisMarkItem(); - aAttrTab[ RES_CHRATR_TWO_LINES - POOLATTR_BEGIN ] = new SwFmt2Lines( FALSE ); + aAttrTab[ RES_CHRATR_TWO_LINES - POOLATTR_BEGIN ] = new SvxTwoLinesItem( FALSE ); // CharakterAttr - Dummies aAttrTab[ RES_CHRATR_DUMMY1 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_CHRATR_DUMMY1 ); diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 7b8f6941f5a9..6395ce0f33e8 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtatr2.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: os $ $Date: 2000-11-08 11:11:12 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:31:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,9 +87,6 @@ #ifndef _TXTATR_HXX //autogen #include <txtatr.hxx> #endif -#ifndef _FMT2LINES_HXX -#include <fmt2lines.hxx> -#endif #ifndef _FMTRUBY_HXX #include <fmtruby.hxx> #endif @@ -402,120 +399,6 @@ BOOL SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId ) } - - -/************************************************************************* -|* class SwFmt2Lines -*************************************************************************/ - -SwFmt2Lines::SwFmt2Lines( sal_Bool bFlag, sal_Unicode nStartBracket, - sal_Unicode nEndBracket ) - : SfxPoolItem( RES_CHRATR_TWO_LINES ), - bOn( bFlag ), cStartBracket( nStartBracket ), cEndBracket( nEndBracket ) -{ -} - -SwFmt2Lines::SwFmt2Lines( const SwFmt2Lines& rAttr ) - : SfxPoolItem( RES_CHRATR_TWO_LINES ), - bOn( rAttr.bOn ), cStartBracket( rAttr.cStartBracket ), - cEndBracket( rAttr.cEndBracket ) -{ -} - -SwFmt2Lines::~SwFmt2Lines() -{ -} - -int SwFmt2Lines::operator==( const SfxPoolItem& rAttr ) const -{ - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); - return bOn == ((SwFmt2Lines&)rAttr).bOn && - cStartBracket == ((SwFmt2Lines&)rAttr).cStartBracket && - cEndBracket == ((SwFmt2Lines&)rAttr).cEndBracket; -} - -SfxPoolItem* SwFmt2Lines::Clone( SfxItemPool* ) const -{ - return new SwFmt2Lines( *this ); -} - -BOOL SwFmt2Lines::QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId ) const -{ - BOOL bRet = TRUE; - XubString sVal; - switch( nMemberId ) - { -/* case MID_URL_URL: - sVal = aURL; - break; - case MID_URL_TARGET: - sVal = aTargetFrame; - break; - case MID_URL_HYPERLINKNAME: - sVal = aName; - break; - case MID_URL_VISITED_FMT: - sVal = SwXStyleFamilies::GetProgrammaticName( aVisitedFmt, - SFX_STYLE_FAMILY_CHAR ); - break; - case MID_URL_UNVISITED_FMT: - sVal = SwXStyleFamilies::GetProgrammaticName( aINetFmt, - SFX_STYLE_FAMILY_CHAR ); - break; -*/ - default: - bRet = FALSE; - break; - } - rVal <<= OUString(sVal); - return bRet; -} - -BOOL SwFmt2Lines::PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId ) -{ - BOOL bRet; - if( rVal.getValueType() == ::getCppuType((rtl::OUString*)0) ) - { - bRet = TRUE; - - XubString sVal = *(rtl::OUString*)rVal.getValue(); - switch( nMemberId ) - { -/* case MID_URL_URL: - aURL = sVal; - break; - case MID_URL_TARGET: - aTargetFrame = sVal; - break; - case MID_URL_HYPERLINKNAME: - aName = sVal; - break; - case MID_URL_VISITED_FMT: - aVisitedFmt = SwXStyleFamilies::GetUIName( sVal, - SFX_STYLE_FAMILY_CHAR ); - nVisitedId = USHRT_MAX; - break; - case MID_URL_UNVISITED_FMT: - aINetFmt = SwXStyleFamilies::GetUIName( sVal, - SFX_STYLE_FAMILY_CHAR ); - nINetId = USHRT_MAX; - break; -*/ default: - bRet = FALSE; - break; - } - } - else - bRet = FALSE; - return bRet; -} - - - - - /************************************************************************* |* class SwFmtRuby *************************************************************************/ diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index e5f1d23905f0..f00a15551d55 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -2,9 +2,9 @@ * * $RCSfile: thints.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: jp $ $Date: 2000-11-06 18:55:06 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:31:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,6 +90,9 @@ #ifndef _SVX_EMPHITEM_HXX //autogen #include <svx/emphitem.hxx> #endif +#ifndef _SVX_TWOLINESITEM_HXX +#include <svx/twolinesitem.hxx> +#endif #ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HDL_ #include <com/sun/star/text/ScriptType.hdl> #endif @@ -151,9 +154,6 @@ #ifndef _FMTRUBY_HXX #include <fmtruby.hxx> #endif -#ifndef _FMT2LINES_HXX -#include <fmt2lines.hxx> -#endif #ifndef _BREAKIT_HXX #include <breakit.hxx> #endif @@ -334,7 +334,7 @@ SwTxtAttr* SwTxtNode::MakeTxtAttr( const SfxPoolItem& rAttr, pNew = new SwTxtBackground( (SvxBrushItem&)rNew, nStt, nEnd ); break; case RES_CHRATR_TWO_LINES: - pNew = new SwTxt2Lines( (SwFmt2Lines&)rNew, nStt, nEnd ); + pNew = new SwTxt2Lines( (SvxTwoLinesItem&)rNew, nStt, nEnd ); break; case RES_TXTATR_REFMARK: pNew = nStt == nEnd diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index 84577afdb395..94c0b1f2d657 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtatr2.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: jp $ $Date: 2000-11-13 12:29:03 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:31:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,6 +101,9 @@ #ifndef _SVX_EMPHITEM_HXX //autogen #include <svx/emphitem.hxx> #endif +#ifndef _SVX_TWOLINESITEM_HXX +#include <svx/twolinesitem.hxx> +#endif #ifndef _TXTINET_HXX //autogen #include <txtinet.hxx> @@ -144,9 +147,6 @@ #ifndef _FMTRUBY_HXX #include <fmtruby.hxx> #endif -#ifndef _FMT2LINES_HXX -#include <fmt2lines.hxx> -#endif TYPEINIT1(SwTxtINetFmt,SwClient); TYPEINIT1(SwTxtRuby,SwClient); @@ -768,7 +768,7 @@ SwCharFmt* SwTxtRuby::GetCharFmt() // ****************************** -SwTxt2Lines::SwTxt2Lines( const SwFmt2Lines& rAttr, +SwTxt2Lines::SwTxt2Lines( const SvxTwoLinesItem& rAttr, xub_StrLen nStart, xub_StrLen nEnd ) : SwTxtAttrEnd( rAttr, nStart, nEnd ) { diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 42d2317485a1..1fbe6ec5df4d 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: attrdesc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2000-10-23 11:58:25 $ + * last change: $Author: jp $ $Date: 2000-11-16 21:30:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,9 +124,6 @@ #ifndef _FMTRUBY_HXX #include <fmtruby.hxx> #endif -#ifndef _FMT2LINES_HXX -#include <fmt2lines.hxx> -#endif #ifndef _SWATRSET_HXX #include <swatrset.hxx> #endif @@ -269,25 +266,6 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwFmt2Lines::GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - String &rText, const International* pIntl ) const -{ - switch ( ePres ) - { - case SFX_ITEM_PRESENTATION_NONE: - rText.Erase(); - break; - case SFX_ITEM_PRESENTATION_NAMELESS: - case SFX_ITEM_PRESENTATION_COMPLETE: - { - rText = aEmptyStr; - return ePres; - } - } - return SFX_ITEM_PRESENTATION_NONE; -} - SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const International* pIntl ) const @@ -1279,6 +1257,9 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation( /************************************************************************* $Log: not supported by cvs2svn $ + Revision 1.2 2000/10/23 11:58:25 jp + new attributes Ruby and 2Lines + Revision 1.1.1.1 2000/09/18 17:14:49 hr initial import |