summaryrefslogtreecommitdiff
path: root/xmloff/source/text/txtparai.cxx
diff options
context:
space:
mode:
authorAlexander O. Anisimov <alenyashka@gmail.com>2010-11-09 01:42:14 +0500
committerCaolán McNamara <caolanm@redhat.com>2010-11-09 11:50:47 +0000
commitdec234ba07197fcfde9bf4e240549ffaa3ba00b4 (patch)
tree590b035fe0575a06214b2a520887074963332a1e /xmloff/source/text/txtparai.cxx
parent9569c88f3ba13115e6af4fca17805ef2fc8716e3 (diff)
Clean up the code
* Remove bogus comments * Refresh comments containing a reference to the bug tracker * Remove the comments such as "// add by zhaojianwei"
Diffstat (limited to 'xmloff/source/text/txtparai.cxx')
-rw-r--r--xmloff/source/text/txtparai.cxx46
1 files changed, 20 insertions, 26 deletions
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index ecf5ca7f4f29..eec002e08f4e 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1753,11 +1753,10 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
new XMLTextFrameContext( rImport, nPrefix,
rLocalName, xAttrList,
TextContentAnchorType_AS_CHARACTER );
- // --> OD 2004-08-24 #i33242# - remove check for text content.
+ // Remove check for text content. (#i33242#)
// Check for text content is done on the processing of the hint
if( TextContentAnchorType_AT_CHARACTER ==
pTextFrameContext->GetAnchorType() )
- // <--
{
rHints.Insert( new XMLTextFrameHint_Impl(
pTextFrameContext, xAnchorPos ),
@@ -1906,15 +1905,14 @@ XMLParaContext::XMLParaContext(
m_bHaveAbout(false),
nOutlineLevel( IsXMLToken( rLName, XML_H ) ? 1 : -1 ),
pHints( 0 ),
- // --> OD 2007-07-25 #i73509#
+ // Lost outline numbering in master document (#i73509#)
mbOutlineLevelAttrFound( sal_False ),
- // <--
bIgnoreLeadingSpace( sal_True ),
bHeading( bHead ),
bIsListHeader( false ),
bIsRestart (false),
- nStartValue(0)
- ,nStarFontsConvFlags( 0 )
+ nStartValue(0),
+ nStarFontsConvFlags( 0 )
{
const SvXMLTokenMap& rTokenMap =
GetImport().GetTextImport()->GetTextPAttrTokenMap();
@@ -1972,9 +1970,8 @@ XMLParaContext::XMLParaContext(
nTmp = 127;
nOutlineLevel = (sal_Int8)nTmp;
}
- // --> OD 2007-07-25 #i73509#
+ // Lost outline numbering in master document (#i73509#)
mbOutlineLevelAttrFound = sal_True;
- // <--
}
break;
case XML_TOK_TEXT_P_IS_LIST_HEADER:
@@ -2077,15 +2074,14 @@ XMLParaContext::~XMLParaContext()
OUString const sCellParaStyleName(xTxtImport->GetCellParaStyleDefault());
if( sCellParaStyleName.getLength() > 0 )
{
- // --> OD 2007-08-16 #i80724#
- // suppress handling of outline and list attributes,
- // because of side effects of method <SetStyleAndAttrs(..)>
+ /* Suppress handling of outline and list attributes,
+ because of side effects of method <SetStyleAndAttrs(..)> (#i80724#)
+ */
xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor,
sCellParaStyleName,
sal_True,
sal_False, -1, // suppress outline handling
sal_False ); // suppress list attributes handling
- // <--
}
// #103445# for headings without style name, find the proper style
@@ -2093,13 +2089,12 @@ XMLParaContext::~XMLParaContext()
xTxtImport->FindOutlineStyleName( sStyleName, nOutlineLevel );
// set style and hard attributes at the previous paragraph
- // --> OD 2007-07-25 #i73509# - add paramter <mbOutlineLevelAttrFound>
+ // Add paramter <mbOutlineLevelAttrFound> (#i73509#)
sStyleName = xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor,
sStyleName,
sal_True,
mbOutlineLevelAttrFound,
bHeading ? nOutlineLevel : -1 );
- // <--
// handle list style header
if (bHeading && (bIsListHeader || bIsRestart))
@@ -2214,21 +2209,23 @@ XMLParaContext::~XMLParaContext()
{
const XMLTextFrameHint_Impl *pFHint =
(const XMLTextFrameHint_Impl *)pHint;
- // --> OD 2004-08-24 #i33242# - check for text content
+ // Check for text content (#i33242#)
Reference < XTextContent > xTextContent =
pFHint->GetTextContent();
if ( xTextContent.is() )
{
- // OD 2004-04-20 #i26791#
+ /* Core impl. of the unification of drawing objects and
+ Writer fly frames (#i26791#)
+ */
Reference<XTextRange> xRange(xAttrCursor, UNO_QUERY);
if ( pFHint->IsBoundAtChar() )
{
xTextContent->attach( xRange );
}
}
- // <--
- // --> OD 2004-08-24 #i33242# - consider, that hint can
- // also contain a shape - e.g. drawing object of type 'Text'.
+ /* Consider, that hint can also contain a shape -
+ e.g. drawing object of type 'Text'. (#i33242#)
+ */
else
{
Reference < XShape > xShape = pFHint->GetShape();
@@ -2254,16 +2251,16 @@ XMLParaContext::~XMLParaContext()
}
}
}
- // <--
}
break;
- // --> DVO, OD 2004-07-14 #i26791#
+ /* Core impl. of the unification of drawing objects and
+ Writer fly frames (#i26791#)
+ */
case XML_HINT_DRAW:
{
const XMLDrawHint_Impl *pDHint =
static_cast<const XMLDrawHint_Impl*>(pHint);
- // --> OD 2004-08-24 #i33242# - improvement: hint directly
- // provides the shape.
+ // Improvement: hint directly provides the shape. (#i33242#)
Reference < XShape > xShape = pDHint->GetShape();
if ( xShape.is() )
{
@@ -2285,11 +2282,8 @@ XMLParaContext::~XMLParaContext()
xPropSet->setPropertyValue(sTextRange, aPos);
}
}
- // <--
}
break;
- // <--
-
default:
DBG_ASSERT( !this, "What's this" );
break;