Hy Miklos,
Thank you for the help.
Here is the correction patch
Regards,
Balint Dozsa
2011/2/13 Miklos Vajna <vmik...@frugalware.org>
> On Sat, Feb 12, 2011 at 11:34:52AM +0100, Bálint Dózsa <
> dozsabal...@gmail.com> wrote:
> > void DomainMapperTableHandler::startTable(unsigned int nRows,
> > - unsigned int /*nDepth*/,
> > + unsigned int,
>
> The nDepth is a useful info here, so we know the second parameter is a
> depth of something. Please do not remove. (This problem is there in your
> patch at multiple places.)
>
> Thanks.
>
> _______________________________________________
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
From 3918138dfc5ea094e603dc46c4421c82ce66f935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1lint=20D=C3=B3zsa?= <dozsabal...@gmail.com>
Date: Sun, 13 Feb 2011 09:05:06 +0100
Subject: [PATCH] Remove dead code
---
writerfilter/source/dmapper/DomainMapper.cxx | 5 -
.../source/dmapper/DomainMapperTableHandler.cxx | 3 -
.../source/dmapper/DomainMapperTableManager.cxx | 2 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 5 -
writerfilter/source/dmapper/FontTable.hxx | 4 -
writerfilter/source/dmapper/GraphicImport.cxx | 91 --------------------
writerfilter/source/dmapper/NumberingManager.cxx | 1 -
writerfilter/source/dmapper/PropertyIds.cxx | 15 ---
writerfilter/source/dmapper/PropertyMap.cxx | 14 ---
writerfilter/source/dmapper/PropertyMap.hxx | 10 --
writerfilter/source/dmapper/SettingsTable.cxx | 7 +-
writerfilter/source/dmapper/StyleSheetTable.cxx | 6 +-
writerfilter/source/dmapper/ThemeTable.cxx | 6 +-
13 files changed, 4 insertions(+), 165 deletions(-)
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 8584268..3d61400 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2146,8 +2146,6 @@ void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmTyp
}
const FontEntry::Pointer_t pFontEntry(pFontTable->getFontEntry(sal_uInt32(nIntValue)));
rContext->Insert(eFontName, true, uno::makeAny( pFontEntry->sFontName ));
- // rContext->Insert(eFontStyle, uno::makeAny( pFontEntry-> ));
- // rContext->Insert(eFontFamily, uno::makeAny( pFontEntry-> ));
rContext->Insert(eFontCharSet, true, uno::makeAny( (sal_Int16)pFontEntry->nTextEncoding ));
rContext->Insert(eFontPitch, true, uno::makeAny( pFontEntry->nPitchRequest ));
}
@@ -3088,7 +3086,6 @@ void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmTyp
}
}
break;
- //break;
case NS_ooxml::LN_EG_HdrFtrReferences_headerReference: // header reference - not needed
case NS_ooxml::LN_EG_HdrFtrReferences_footerReference: // footer reference - not needed
break;
@@ -3448,8 +3445,6 @@ void DomainMapper::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
dmapper_logger->startElement("table");
dmapper_logger->attribute("id", (*QNameToString::Instance())(name));
#endif
-
- // printf ( "DomainMapper::table(0x%.4x)\n", (unsigned int)name);
m_pImpl->SetAnyTableImport(true);
switch(name)
{
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index dedcd36..0f9a870 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -801,9 +801,6 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
#endif
//add a new 'row' of properties
-// if( m_pCellProperties.size() <= sal::static_int_cast< sal_uInt32, sal_Int32>(m_nRowIndex) )
-// m_pCellProperties.push_back( RowProperties_t() );
-// m_pCellProperties[m_nRowIndex].push_back( pProps );
m_pCellSeq = CellSequencePointer_t(new CellSequence_t(2));
if (!start.get())
return;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index b5509e8..1ed6ba6 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -256,7 +256,6 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
{
TablePropertyMapPtr pPropMap( new TablePropertyMap );
const sal_Int16 HORI_LEFT_TOP = 0;
- /*const sal_Int16 HORI_RIGHT_TOP = 1;*/ // currently not used below
const sal_Int16 VERT_TOP_RIGHT = 2;
bool bInsertCellProps = true;
switch ( nIntValue )
@@ -403,7 +402,6 @@ void DomainMapperTableManager::endOfRowAction()
if( m_nTableWidth > 0)
{
TablePropertyMapPtr pPropMap( new TablePropertyMap );
-// pPropMap->Insert( PROP_WIDTH, false, uno::makeAny( m_nTableWidth ));
pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, m_nTableWidth );
insertTableProps(pPropMap);
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 4810d7c..43eb39f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -79,9 +79,6 @@ namespace dmapper {
using namespace com::sun::star;
-//#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
-//sal_Int32 lcl_convertToMM100(sal_Int32 _t);
-
struct _PageMar
{
sal_Int32 top;
@@ -413,8 +410,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > appendTextSectionAfter(
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xBefore );
-// void appendTextSection();
-
FIB& GetFIB() {return m_aFIB;}
// push the new properties onto the stack and make it the 'current' property map
void PushProperties(ContextType eId);
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 7708a79..4a729da 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -79,10 +79,6 @@ public:
// Table
virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
- // BinaryObj
-// virtual void data(const sal_Int8* buf, size_t len,
-// writerfilter::Reference<Properties>::Pointer_t ref);
-
// Stream
virtual void startSectionGroup();
virtual void endSectionGroup();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 8f7fdce..5c6809d 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -183,14 +183,12 @@ void XInputStreamHelper::closeInput( ) throw (io::NotConnectedException, io::IO
struct GraphicBorderLine
{
sal_Int32 nLineWidth;
-// sal_Int32 nLineType;
sal_Int32 nLineColor;
sal_Int32 nLineDistance;
bool bHasShadow;
GraphicBorderLine() :
nLineWidth(0)
-// ,nLineType(0)
,nLineColor(0)
,nLineDistance(0)
,bHasShadow(false)
@@ -476,9 +474,6 @@ void GraphicImport::attribute(Id nName, Value & val)
case NS_rtf::LN_CPROPS:break;// unknown - ignored
//metafilepict
case NS_rtf::LN_MM:
-// according to the documentation 99 or 98 are provided - but they are not!
-// m_pImpl->bIsBitmap = 99 == nIntValue ? true : false;
-// m_pImpl->bIsTiff = 98 == nIntValue ? true : false;
break; //mapmode
case NS_rtf::LN_XEXT:
@@ -507,16 +502,6 @@ void GraphicImport::attribute(Id nName, Value & val)
{
-// rBLIPStream.SeekRel( nSkip + 20 );
-// // read in size of metafile in EMUS
-// rBLIPStream >> aMtfSize100.Width() >> aMtfSize100.Height();
-// // scale to 1/100mm
-// aMtfSize100.Width() /= 360, aMtfSize100.Height() /= 360;
-// if ( pVisArea ) // seem that we currently are skipping the visarea position
-// *pVisArea = Rectangle( Point(), aMtfSize100 );
-// // skip rest of header
-// nSkip = 6;
-// bMtfBLIP = bZCodecCompression = TRUE;
}
break;
@@ -526,7 +511,6 @@ void GraphicImport::attribute(Id nName, Value & val)
case 0x6E0 : break;// One byte tag then PNG data
case 0x7A8 : m_pImpl->bIsBitmap = true;
-// nSkip += 1; // One byte tag then DIB data
break;
}
@@ -622,7 +606,6 @@ void GraphicImport::attribute(Id nName, Value & val)
break;
case NS_rtf::LN_BRCTYPE: // 0x175a
//graphic borders don't support different line types
- //m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineType = nIntValue;
break;
case NS_rtf::LN_ICO: // 0x175b
m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineColor = ConversionHelper::ConvertColor( nIntValue );
@@ -653,18 +636,6 @@ void GraphicImport::attribute(Id nName, Value & val)
break;//bottom position
case NS_rtf::LN_FHDR:
case NS_rtf::LN_XAlign:
-/*
- static const SwHoriOrient aHoriOriTab[ nCntXAlign ] =
- {
- HORI_NONE, // From left position
- HORI_LEFT, // left
- HORI_CENTER, // centered
- HORI_RIGHT, // right
- // --> OD 2004-12-06 #i36649#
- // - inside -> HORI_LEFT and outside -> HORI_RIGHT
- HORI_LEFT, // inside
- HORI_RIGHT // outside
-*/
if( nIntValue < 6 && nIntValue > 0 )
{
static const sal_Int16 aHoriOrientTab[ 6 ] =
@@ -681,36 +652,6 @@ void GraphicImport::attribute(Id nName, Value & val)
}
break;
case NS_rtf::LN_YAlign:
-/*
- static const SwVertOrient aVertOriTab[ nCntYAlign ] =
- {
- VERT_NONE, // From Top position
- VERT_TOP, // top
- VERT_CENTER, // centered
- VERT_BOTTOM, // bottom
- VERT_LINE_TOP, // inside (obscure)
- VERT_LINE_BOTTOM // outside (obscure)
- };
- // CMC,OD 24.11.2003 #i22673# - to-line vertical alignment
- static const SwVertOrient aToLineVertOriTab[ nCntYAlign ] =
- {
- VERT_NONE, // below
- VERT_LINE_BOTTOM, // top
- VERT_LINE_CENTER, // centered
- VERT_LINE_TOP, // bottom
- VERT_LINE_BOTTOM, // inside (obscure)
- VERT_LINE_TOP // outside (obscure)
- };
- if ( eVertRel == REL_VERT_LINE ) //m_pImpl->nVertRelation == text::RelOrientation::TEXT_LINE
- {
- eVertOri = aToLineVertOriTab[ nYAlign ];
- }
- else
- {
- eVertOri = aVertOriTab[ nYAlign ];
- }
-
-*/
if( nIntValue < 6 && nIntValue > 0)
{
static const sal_Int16 aVertOrientTab[ 6 ] =
@@ -808,20 +749,10 @@ void GraphicImport::attribute(Id nName, Value & val)
case NS_rtf::LN_FBELOWTEXT:
case NS_rtf::LN_FANCHORLOCK:
case NS_rtf::LN_CTXBX:
-// {
-// sal_Int32 nValue1 = val.getInt();
-// nValue1++;
-// }
break;
case NS_rtf::LN_shptxt:
//todo: text content
break;
- /* case NS_rtf::LN_CH = 10421;
- case NS_rtf::LN_UNUSED0_5 = 10422;
- case NS_rtf::LN_FLT = 10423;
- case NS_rtf::LN_shpLeft = 10424;
- case NS_rtf::LN_shpTop = 10425;
- break;*/
case NS_rtf::LN_dffheader: break;
case NS_ooxml::LN_CT_PositiveSize2D_cx:// 90407;
case NS_ooxml::LN_CT_PositiveSize2D_cy:// 90408;
@@ -1076,26 +1007,6 @@ void GraphicImport::ProcessShapeOptions(Value& val)
case NS_dff::LN_shppibName/*261*/:
break; // rtf:shppibName
case NS_dff::LN_shppibFlags/*262*/: // rtf:shppibFlags
- /*
- * // MSOBLIPFLAGS ñ flags for pictures
- typedef enum
- {
- msoblipflagDefault = 0,
- msoblipflagComment = 0, // Blip name is a comment
- msoblipflagFile, // Blip name is a file name
- msoblipflagURL, // Blip name is a full URL
- msoblipflagType = 3, // Mask to extract type
- // Or the following flags with any of the above.
- msoblipflagDontSave = 4, // A "dont" is the depression in the metal
- // body work of an automobile caused when a
- // cyclist violently thrusts his or her nose
- // at it, thus a DontSave is another name for
- // a cycle lane.
- msoblipflagDoNotSave = 4, // For those who prefer English
- msoblipflagLinkToFile = 8,
- };
- *
- * */
break;
case NS_dff::LN_shppictureContrast/*264*/: // rtf:shppictureContrast docu: "1<<16"
/*
@@ -1184,14 +1095,12 @@ void GraphicImport::ProcessShapeOptions(Value& val)
msolineDashDotGEL, // dash short dash
msolineLongDashDotGEL, // long dash short dash
msolineLongDashDotDotGEL // long dash short dash short dash*/
- //m_pImpl->aBorders[nCurrentBorderLine].nLineType = nIntValue;
break;
case NS_dff::LN_shpfNoLineDrawDash /*511*/:
break; // rtf:shpfNoLineDrawDash
case NS_dff::LN_shpwzDescription /*897*/: //alternative text
m_pImpl->sAlternativeText = val.getString();
break;
-// case NS_dff::LN_shppihlShape /*898*/:
case NS_dff::LN_shppWrapPolygonVertices/*899*/:
break; // rtf:shppWrapPolygonVertices
case NS_dff::LN_shpdxWrapDistLeft /*900*/: // contains a twip/635 value
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 15a3cc2..5c8b280 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -653,7 +653,6 @@ void ListsManager::attribute( Id nName, Value& rVal )
pCurrentLvl->SetBulletChar( rVal.getString() );
}
break;
-// case NS_rtf::LN_ISTD: break;
case NS_rtf::LN_ISTARTAT:
case NS_rtf::LN_NFC:
case NS_rtf::LN_JC:
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index add98f9..4026609 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -116,9 +116,6 @@ const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const
case PROP_CHAR_ROTATION: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRotation")); break;
case PROP_CHAR_ROTATION_IS_FIT_TO_LINE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharRotationIsFitToLine")); break;
case PROP_CHAR_FLASH: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharFlash")); break;
-// case PROP_CHAR_: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Char")); break;
-// case PROP_CHAR_: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Char")); break;
-// case PROP_CHAR_: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Char")); break;
case PROP_PARA_STYLE_NAME: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName")); break;
case PROP_PARA_ADJUST: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAdjust")); break;
@@ -137,10 +134,6 @@ const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const
case PROP_PARA_WIDOWS: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaWidows")); break;
case PROP_PARA_ORPHANS: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaOrphans")); break;
case PROP_PARA_LINE_NUMBER_START_VALUE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberStartValue")); break;
-// case PROP_PARA_: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Para")); break;
-// case PROP_PARA_: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Para")); break;
-// case PROP_PARA_: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Para")); break;
-// case PROP_PARA_: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Para")); break;
case PROP_NUMBERING_LEVEL: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingLevel")); break;
case PROP_NUMBERING_RULES: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingRules")); break;
case PROP_NUMBERING_TYPE: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType")); break;
@@ -325,14 +318,6 @@ const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const
case PROP_HELP: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Help")); break;
case PROP_HEADING_STYLE_NAME: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName")); break;
case PROP_FRM_DIRECTION: sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FRMDirection")); break;
-// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
-// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
-// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
-// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
-// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
-// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
-// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
-// case : sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
}
::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt =
m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName ));
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 4dd378b..4b1be82 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -118,8 +118,6 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues()
-----------------------------------------------------------------------*/
void PropertyMap::Insert( PropertyIds eId, bool bIsTextProperty, const uno::Any& rAny, bool bOverwrite )
{
-// const ::rtl::OUString& rInsert = PropertyNameSupplier::
-// GetPropertyNameSupplier().GetName(eId);
PropertyMap::iterator aElement = find(PropertyDefinition( eId, bIsTextProperty ) );
if( aElement != end())
{
@@ -563,7 +561,6 @@ uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties(
nColSum = 0;
for( sal_Int32 nCol = 0; nCol <= m_nColumnCount; ++nCol)
{
- //nColSum : nRefValue == (nAbsColWidth + colDist /2) : nRelColWidth;
pColumn[nCol].LeftMargin = nCol ? m_aColDistance[nCol - 1 ] / 2 : 0;
pColumn[nCol].RightMargin = nCol == m_nColumnCount ? 0 : m_aColDistance[nCol] / 2;
pColumn[nCol].Width = sal_Int32((double( m_aColWidth[nCol] + pColumn[nCol].RightMargin + pColumn[nCol].LeftMargin ) + 0.5 ) * fRel );
@@ -823,10 +820,6 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
if(m_nBreakType == 0)
{
//todo: insert a section or access the already inserted section
- //-->debug
-// ::rtl::OUString sSelection = m_xStartingRange->getString();
-// sSelection.getLength();
- //-->debug
uno::Reference< beans::XPropertySet > xSection =
rDM_Impl.appendTextSectionAfter( m_xStartingRange );
if( m_nColumnCount > 0 && xSection.is())
@@ -840,7 +833,6 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
if( m_nDzaGutter > 0 )
{
//todo: iGutterPos from DocProperties are missing
- // if( m_iGutterPos > 0 ) m_nTopMargin += m_nDzaGutter; else
if( m_bGutterRTL )
m_nRightMargin += m_nDzaGutter;
else
@@ -849,9 +841,6 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
operator[]( PropertyDefinition( PROP_LEFT_MARGIN, false )) = uno::makeAny( m_nLeftMargin );
operator[]( PropertyDefinition( PROP_RIGHT_MARGIN, false )) = uno::makeAny( m_nRightMargin );
-// if( iGutterPos && fRTLGutter )
-// m_nTopMargin += nGutter
-
/*** if headers/footers are available then the top/bottom margins of the
header/footer are copied to the top/bottom margin of the page
*/
@@ -962,7 +951,6 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
try
{
-// if( m_xStartingRange.is() )
{
//now apply this break at the first paragraph of this section
uno::Reference< beans::XPropertySet > xRangeProperties;
@@ -1043,7 +1031,6 @@ void SectionPropertyMap::SetFirstPaperBin( sal_Int32 nSet )
-----------------------------------------------------------------------*/
StyleSheetPropertyMap::StyleSheetPropertyMap() :
-// mnCT_Spacing_after( 0 ),
mnCT_Spacing_line( 0 ),
mnCT_Spacing_lineRule( 0 ),
mbCT_TrPrBase_tblHeader( false ),
@@ -1051,7 +1038,6 @@ StyleSheetPropertyMap::StyleSheetPropertyMap() :
mnCT_TcPrBase_vAlign( 0 ),
mnCT_TblWidth_w( 0 ),
mnCT_TblWidth_type( 0 ),
-// mbCT_Spacing_afterSet( false ),
mbCT_Spacing_lineSet( false ),
mbCT_Spacing_lineRuleSet( false ),
mbCT_TrPrBase_tblHeaderSet( false ),
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 084041b..fdf5464 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -397,7 +397,6 @@ class StyleSheetPropertyMap : public PropertyMap, public ParagraphProperties
{
//special table style properties
-// sal_Int32 mnCT_Spacing_after;
sal_Int32 mnCT_Spacing_line;
sal_Int32 mnCT_Spacing_lineRule;
@@ -409,7 +408,6 @@ class StyleSheetPropertyMap : public PropertyMap, public ParagraphProperties
sal_Int32 mnCT_TblWidth_w;
sal_Int32 mnCT_TblWidth_type;
-// bool mbCT_Spacing_afterSet;
bool mbCT_Spacing_lineSet;
bool mbCT_Spacing_lineRuleSet;
@@ -428,8 +426,6 @@ public:
explicit StyleSheetPropertyMap();
~StyleSheetPropertyMap();
-// void SetCT_Spacing_after( sal_Int32 nSet )
-// {mnCT_Spacing_after = nSet; mbCT_Spacing_afterSet = true; }
void SetCT_Spacing_line( sal_Int32 nSet )
{mnCT_Spacing_line = nSet; mbCT_Spacing_lineSet = true; }
void SetCT_Spacing_lineRule( sal_Int32 nSet )
@@ -449,12 +445,6 @@ public:
void SetCT_TblWidth_type( sal_Int32 nSet )
{mnCT_TblWidth_type = nSet; mbCT_TblWidth_typeSet = true; }
-// bool GetCT_Spacing_after( sal_Int32& rToFill) const
-// {
-// if( mbCT_Spacing_afterSet )
-// rToFill = mnCT_Spacing_after;
-// return mbCT_Spacing_afterSet;
-// }
bool GetCT_Spacing_line( sal_Int32& rToFill) const
{
if( mbCT_Spacing_lineSet )
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 2a31a8f..d1792ac 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -100,7 +100,7 @@ struct SettingsTable_Impl
SettingsTable::SettingsTable(DomainMapper& rDMapper, const uno::Reference< lang::XMultiServiceFactory > xTextFactory) :
m_pImpl( new SettingsTable_Impl(rDMapper, xTextFactory) )
{
- // printf("SettingsTable::SettingsTable()\n");
+
}
SettingsTable::~SettingsTable()
@@ -121,7 +121,7 @@ void SettingsTable::attribute(Id nName, Value & val)
(void)nIntValue;
::rtl::OUString sValue = val.getString();
(void)sValue;
- //printf ( "SettingsTable::attribute(0x%.4x, 0x%.4x) [%s]\n", (unsigned int)Name, (unsigned int)nIntValue, ::rtl::OUStringToOString(sValue, RTL_TEXTENCODING_DONTKNOW).getStr());
+
#if 0 //no values known, yet
switch(Name)
@@ -152,8 +152,6 @@ void SettingsTable::sprm(Sprm& rSprm)
(void)nIntValue;
rtl::OUString sStringValue = pValue->getString();
- //printf ( "SettingsTable::sprm(0x%.4x, 0x%.4x) [%s]\n", (unsigned int)nSprmId, (unsigned int)nIntValue, ::rtl::OUStringToOString(sStringValue, RTL_TEXTENCODING_DONTKNOW).getStr());
-
switch(nSprmId)
{
case NS_ooxml::LN_CT_Settings_zoom: // 92469;
@@ -224,7 +222,6 @@ void SettingsTable::sprm(Sprm& rSprm)
void SettingsTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
{
- // printf ( "SettingsTable::entry\n");
ref->resolve(*this);
}
//returns default TabStop in 1/100th mm
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 14e984e..3999683 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -444,7 +444,7 @@ void StyleSheetTable::attribute(Id Name, Value & val)
int nIntValue = val.getInt();
(void)nIntValue;
::rtl::OUString sValue = val.getString();
-// printf ( "StyleSheetTable::attribute(0x%.4x, 0x%.4x) [%s]\n", (unsigned int)Name, (unsigned int)nIntValue, ::rtl::OUStringToOString(sValue, RTL_TEXTENCODING_DONTKNOW).getStr());
+
switch(Name)
{
case NS_rtf::LN_ISTD:
@@ -550,7 +550,6 @@ void StyleSheetTable::sprm(Sprm & rSprm)
sal_Int32 nIntValue = pValue.get() ? pValue->getInt() : 0;
(void)nIntValue;
rtl::OUString sStringValue = pValue.get() ? pValue->getString() : rtl::OUString();
- //printf ( "StyleSheetTable::sprm(0x%.4x, 0x%.4x) [%s]\n", (unsigned int)nSprmId, (unsigned int)nIntValue, ::rtl::OUStringToOString(sStringValue, RTL_TEXTENCODING_DONTKNOW).getStr());
switch(nSprmId)
{
@@ -698,7 +697,6 @@ void StyleSheetTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Po
#endif
//create a new style entry
- // printf("StyleSheetTable::entry(...)\n");
OSL_ENSURE( !m_pImpl->m_pCurrentEntry, "current entry has to be NULL here");
StyleSheetEntryPtr pNewEntry( new StyleSheetEntry );
m_pImpl->m_pCurrentEntry = pNewEntry;
@@ -1392,8 +1390,6 @@ void StyleSheetTable::applyDefaults(bool bParaProperties)
{
uno::Reference< style::XStyle > xStyle( xDocFactory->createInstance(
rPropNameSupplier.GetName( PROP_SERVICE_CHAR_STYLE )), uno::UNO_QUERY_THROW);
- //uno::Reference< container::XNamed >xNamed( xStyle, uno::UNO_QUERY_THROW );
- //xNamed->setName( sListLabel );
uno::Reference< beans::XPropertySet > xStyleProps(xStyle, uno::UNO_QUERY_THROW );
PropertyValueVector_t::const_iterator aCharPropIter = rCharProperties.begin();
while( aCharPropIter != rCharProperties.end())
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 7bdacaa..9292080 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -54,7 +54,7 @@ struct ThemeTable_Impl
ThemeTable::ThemeTable() :
m_pImpl( new ThemeTable_Impl )
{
- // printf("ThemeTable::ThemeTable()\n");
+
}
ThemeTable::~ThemeTable()
@@ -69,9 +69,7 @@ void ThemeTable::attribute(Id Name, Value & val)
dmapper_logger->attribute("name", (*QNameToString::Instance())(Name));
dmapper_logger->attribute("value", val.toString());
#endif
- // int nIntValue = val.getInt();
::rtl::OUString sValue = val.getString();
- // printf ( "ThemeTable::attribute(0x%.4x, 0x%.4x) [%s]\n", (unsigned int)Name, (unsigned int)nIntValue, ::rtl::OUStringToOString(sValue, RTL_TEXTENCODING_DONTKNOW).getStr());
switch(Name)
{
case NS_ooxml::LN_CT_TextFont_typeface:
@@ -105,8 +103,6 @@ void ThemeTable::sprm(Sprm& rSprm)
(void)nIntValue;
rtl::OUString sStringValue = pValue->getString();
- // printf ( "ThemeTable::sprm(0x%.4x, 0x%.4x) [%s]\n", (unsigned int)nSprmId, (unsigned int)nIntValue, ::rtl::OUStringToOString(sStringValue, RTL_TEXTENCODING_DONTKNOW).getStr());
-
switch(nSprmId)
{
case NS_ooxml::LN_CT_BaseStyles_fontScheme:
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
