[Libreoffice-commits] core.git: 2 commits - sw/source
Tor Lillqvist
tml at collabora.com
Tue Oct 22 04:26:38 PDT 2013
sw/source/core/inc/rootfrm.hxx | 2 --
sw/source/core/text/itrform2.cxx | 2 --
sw/source/core/text/porexp.hxx | 6 ------
sw/source/core/text/porfld.hxx | 8 --------
sw/source/core/text/porfly.hxx | 4 ----
sw/source/core/text/porftn.hxx | 6 ------
sw/source/core/text/porglue.hxx | 5 -----
sw/source/core/text/porhyph.hxx | 6 ------
sw/source/core/text/porlay.hxx | 3 ---
sw/source/core/text/porlin.hxx | 8 --------
sw/source/core/text/pormulti.hxx | 2 --
sw/source/core/text/porref.hxx | 8 --------
sw/source/core/text/porrst.hxx | 11 -----------
sw/source/core/text/portab.hxx | 8 --------
sw/source/core/text/portox.hxx | 8 --------
sw/source/core/text/portxt.hxx | 4 ----
16 files changed, 91 deletions(-)
New commits:
commit ad24ad98818fed80980ac5f49b431d0fa66e5eed
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 22 14:16:31 2013 +0300
CLASSIO is dead
Change-Id: Ib08fe1f8faf9d4a527ac84d69eaaa19eb7102a6a
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index ab5a623..1fd8c78 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -859,8 +859,6 @@ public:
// OUTPUT_OPERATOR
};
-//CLASSIO( SwMetaPortion )
-
/*************************************************************************
* virtual SwMetaPortion::Paint()
*************************************************************************/
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index fc99428..4c9e087 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -90,12 +90,6 @@ public:
OUTPUT_OPERATOR
};
-
-CLASSIO( SwExpandPortion )
-CLASSIO( SwBlankPortion )
-CLASSIO( SwPostItsPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index e0df8b4..fb6ff64 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -246,14 +246,6 @@ public:
OUTPUT_OPERATOR
};
-
-CLASSIO( SwHiddenPortion )
-CLASSIO( SwNumberPortion )
-CLASSIO( SwBulletPortion )
-CLASSIO( SwGrfNumPortion )
-CLASSIO( SwCombinedPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 2057b6e..f5fbfa8 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -94,10 +94,6 @@ public:
OUTPUT_OPERATOR
};
-CLASSIO( SwFlyPortion )
-CLASSIO( SwFlyCntPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index a3c80c2..b20e1eb 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -108,12 +108,6 @@ public:
OUTPUT_OPERATOR
};
-CLASSIO( SwFtnPortion )
-CLASSIO( SwFtnNumPortion )
-CLASSIO( SwQuoVadisPortion )
-CLASSIO( SwErgoSumPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index c47d127..f368fbf 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -115,11 +115,6 @@ inline void SwGluePortion::MoveHalfGlue( SwGluePortion *pTarget )
MoveGlue( pTarget, GetPrtGlue() / 2 );
}
-CLASSIO( SwGluePortion )
-CLASSIO( SwFixPortion )
-CLASSIO( SwMarginPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 9da5395..3b7450e 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -103,12 +103,6 @@ public:
OUTPUT_OPERATOR
};
-CLASSIO( SwHyphPortion )
-CLASSIO( SwHyphStrPortion )
-CLASSIO( SwSoftHyphPortion )
-CLASSIO( SwSoftHyphStrPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 8635645..b8e5668 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -399,9 +399,6 @@ inline void SwParaPortion::FormatReset()
inline SwLinePortion *SwLineLayout::GetFirstPortion() const
{ return( pPortion ? pPortion : (SwLinePortion*)this ); }
-CLASSIO( SwLineLayout )
-CLASSIO( SwParaPortion )
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index fb8065c..48329b4 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -31,8 +31,6 @@ class SwTxtFormatInfo;
class SwPortionHandler;
// The portions output operators are virtual methods of the portion.
-// The CLASSIO macro implements the 'levitating' function.
-// In doing so we end up with both benefits: virtual output operators and general utility
#ifdef DBG_UTIL
#define OUTPUT_OPERATOR virtual SvStream &operator<<( SvStream & aOs ) const;
#else
@@ -237,12 +235,6 @@ inline void SwLinePortion::Truncate()
_Truncate();
}
-
-//$ ostream
-#define CLASSIO( class )
-
-CLASSIO( SwLinePortion )
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 104be15..5f48b54 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -253,8 +253,6 @@ inline bool SwMultiPortion::HasBrackets() const
return IsDouble() ? 0 != ((SwDoubleLinePortion*)this)->GetBrackets() : false;
}
-CLASSIO( SwMultiPortion )
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 34d6def..82d0e05 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -54,14 +54,6 @@ public:
OUTPUT_OPERATOR
};
-/*************************************************************************
- * inline - Implementations
- *************************************************************************/
-
-CLASSIO( SwRefPortion )
-CLASSIO( SwIsoRefPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index e613f57..fcc616b 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -165,17 +165,6 @@ public:
virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const;
};
-
-
-/*************************************************************************
- * inline - Implementations
- *************************************************************************/
-
-CLASSIO( SwBreakPortion )
-CLASSIO( SwEndPortion )
-CLASSIO( SwKernPortion )
-CLASSIO( SwArrowPortion )
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 75841be..463c8dd 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -140,14 +140,6 @@ public:
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
};
-
-CLASSIO( SwTabPortion )
-CLASSIO( SwTabLeftPortion )
-CLASSIO( SwTabRightPortion )
-CLASSIO( SwTabCenterPortion )
-CLASSIO( SwTabDecimalPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index 3eeb866..2ae4348 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -55,14 +55,6 @@ public:
OUTPUT_OPERATOR
};
-/*************************************************************************
- * inline - Implementations
- *************************************************************************/
-
-CLASSIO( SwToxPortion )
-CLASSIO( SwIsoToxPortion )
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index d201c74..34750eb 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -99,10 +99,6 @@ class SwFieldFormPortion : public SwTxtPortion
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
};
-
-CLASSIO( SwTxtPortion )
-CLASSIO( SwHolePortion )
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a03153468db0c9c0bdf3bc886dce4d9473016c5b
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 22 12:40:52 2013 +0300
If they are unused drop them then!?
Change-Id: Ia5390025eb8b71296ff019461ace88117bdc4236
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 320dc57..ee71eb6 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -80,10 +80,8 @@ class SwRootFrm: public SwLayoutFrm
sal_Bool bCheckSuperfluous :1; //Leere Seiten suchen?
sal_Bool bIdleFormat :1; //Idle-Formatierer anwerfen?
sal_Bool bBrowseWidthValid :1; //Ist nBrowseWidth gueltig?
- sal_Bool bDummy2 :1; //Unbenutzt
sal_Bool bTurboAllowed :1;
sal_Bool bAssertFlyPages :1; //Ggf. weitere Seiten fuer Flys einfuegen?
- sal_Bool bDummy :1; //Unbenutzt
sal_Bool bIsVirtPageNum :1; //gibt es eine virtuelle Seitennummer ?
sal_Bool bIsNewLayout :1; //Layout geladen oder neu erzeugt.
sal_Bool bCallbackActionEnabled:1; //Keine Action in Benachrichtung erwuenscht
More information about the Libreoffice-commits
mailing list