SwFmt2Lines moved to SVX and renamed

4 files changed, 20 insertions, 137 deletions

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 )
 {