[Libreoffice-commits] .: 3 commits - binfilter/bf_sw writerfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Feb 22 03:48:18 PST 2011
binfilter/bf_sw/source/core/view/sw_viewsh.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx | 2
binfilter/bf_sw/source/ui/app/makefile.mk | 2
binfilter/bf_sw/source/ui/app/sw_docsh.cxx | 14 -
binfilter/bf_sw/source/ui/app/sw_docshdrw.cxx | 2
binfilter/bf_sw/source/ui/app/sw_docshini.cxx | 44 ++---
binfilter/bf_sw/source/ui/app/sw_docstyle.cxx | 114 +++++++--------
binfilter/bf_sw/source/ui/app/sw_swmodule.cxx | 14 -
binfilter/bf_sw/source/ui/inc/wrtsh.hxx | 11 -
writerfilter/source/dmapper/DomainMapper.cxx | 5
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 3
writerfilter/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
22 files changed, 106 insertions(+), 268 deletions(-)
New commits:
commit bc422900c6a0b259f9fac6ad5f8601102fccf2e6
Author: Bálint Dózsa <dozsabalint at gmail.com>
Date: Tue Feb 22 11:46:38 2011 +0000
Remove dead code
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 0e9326b..f3bcf5f 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 ));
}
@@ -3100,7 +3098,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;
@@ -3459,8 +3456,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 d45d60e..1fd0c63 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -800,9 +800,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 1a22aed..f70af75 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -253,7 +253,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 )
@@ -398,7 +397,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 a2e238d..49cb2a8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -80,9 +80,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;
@@ -415,8 +412,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 7dac80e..fa3d2e4 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -175,14 +175,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)
@@ -465,9 +463,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:
@@ -496,16 +491,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;
@@ -515,7 +500,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;
}
@@ -611,7 +595,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 );
@@ -642,18 +625,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 ] =
@@ -670,36 +641,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 ] =
@@ -797,20 +738,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;
@@ -1064,26 +995,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"
/*
@@ -1172,14 +1083,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 48141e9..916e47c 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -113,9 +113,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;
@@ -134,10 +131,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;
@@ -322,14 +315,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 510c846..07fee7f 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -114,8 +114,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())
{
@@ -546,7 +544,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 );
@@ -802,10 +799,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())
@@ -819,7 +812,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
@@ -828,9 +820,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
*/
@@ -941,7 +930,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;
@@ -1018,7 +1006,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 ),
@@ -1026,7 +1013,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 6b39591..4b9325f 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -394,7 +394,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;
@@ -406,7 +405,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;
@@ -425,8 +423,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 )
@@ -446,12 +442,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 9862296..b8b6d33 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 64a5822..b8ba2d2 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -436,7 +436,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:
@@ -541,7 +541,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)
{
@@ -688,7 +687,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;
@@ -1374,8 +1372,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:
commit 4f5eba537fece507c36ea9e3bd1cc08ec882d0b1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 22 09:58:31 2011 +0000
throw out some warnings
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index 9a98c6b..4de43c3 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -469,7 +469,7 @@ bool bInSizeNotify = FALSE;
|*
******************************************************************************/
-/*N*/ void ViewShell::SizeChgNotify(const Size &rSize)
+/*N*/ void ViewShell::SizeChgNotify(const Size &)
/*N*/ {
/*N*/ if ( !pWin )
/*N*/ bDocSizeChgd = TRUE;
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
index ec0cf31..838d734 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
@@ -116,7 +116,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList,
const SvXMLItemMapEntry& rEntry,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap,
- sal_uInt16 nFlags,
+ sal_uInt16 /*nFlags*/,
const SfxItemSet *pSet ) const
{
if( 0 != (rEntry.nMemberId & MID_FLAG_SPECIAL_ITEM_EXPORT) )
diff --git a/binfilter/bf_sw/source/ui/inc/wrtsh.hxx b/binfilter/bf_sw/source/ui/inc/wrtsh.hxx
index a59d10c..cd2de0a 100644
--- a/binfilter/bf_sw/source/ui/inc/wrtsh.hxx
+++ b/binfilter/bf_sw/source/ui/inc/wrtsh.hxx
@@ -209,11 +209,12 @@ private:
BOOL bAdd,
bExt,
bIns;
- ModeStack(ModeStack *pNextMode, BOOL _bIns, BOOL _bExt, BOOL _bAdd):
- pNext(pNextMode),
- bAdd(_bAdd),
- bIns(_bIns),
- bExt(_bExt) {}
+ ModeStack(ModeStack *pNextMode, BOOL _bIns, BOOL _bExt, BOOL _bAdd)
+ : pNext(pNextMode)
+ , bAdd(_bAdd)
+ , bExt(_bExt)
+ , bIns(_bIns)
+ {}
} *pModeStack;
// Cursor bei PageUp / -Down mitnehmen
commit 1f0cdfccc48259f2a8b851bcd5cfc52241e918f4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 22 09:53:55 2011 +0000
mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/ui/app/makefile.mk b/binfilter/bf_sw/source/ui/app/makefile.mk
index ff97658..a14e101 100644
--- a/binfilter/bf_sw/source/ui/app/makefile.mk
+++ b/binfilter/bf_sw/source/ui/app/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
index 6d67478..f4504f3 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
@@ -144,7 +144,7 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_
}
return 0;
}
- String aFileName( rMedium.GetName() );
+ String aLclFileName( rMedium.GetName() );
SwRead pRead = SwIoSystem::GetReader( pFlt->GetUserData() );
if( !pRead )
return 0;
@@ -153,10 +153,10 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_
? SW_STORAGE_READER & pRead->GetReaderType()
: SW_STREAM_READER & pRead->GetReaderType() )
{
- *ppRdr = pPaM ? new SwReader( rMedium, aFileName, *pPaM ) :
+ *ppRdr = pPaM ? new SwReader( rMedium, aLclFileName, *pPaM ) :
pCrsrShell ?
- new SwReader( rMedium, aFileName, *pCrsrShell->GetCrsr() )
- : new SwReader( rMedium, aFileName, pDoc );
+ new SwReader( rMedium, aLclFileName, *pCrsrShell->GetCrsr() )
+ : new SwReader( rMedium, aLclFileName, pDoc );
}
else
return 0;
@@ -186,9 +186,9 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_
if(pSet && SFX_ITEM_SET == pSet->GetItemState(SID_PASSWORD, TRUE, &pItem))
{
DBG_ASSERT(pItem->IsA( TYPE(SfxStringItem) ), "Fehler Parametertype");
- ByteString aPasswd( ((const SfxStringItem *)pItem)->GetValue(),
+ ByteString aLclPasswd( ((const SfxStringItem *)pItem)->GetValue(),
gsl_getSystemTextEncoding() );
- aStor->SetKey( aPasswd );
+ aStor->SetKey( aLclPasswd );
}
// Fuer's Dokument-Einfuegen noch die FF-Version, wenn's der
// eigene Filter ist.
@@ -294,7 +294,7 @@ BOOL SwDocShell::Save()
return false;
}
-BOOL SwDocShell::SaveAs(SvStorage * pStor)
+BOOL SwDocShell::SaveAs(SvStorage*)
{
//only here for virtual reason, will be deleted
//this is a virtual fonction from SfxObjectShell (in sfx)
diff --git a/binfilter/bf_sw/source/ui/app/sw_docshdrw.cxx b/binfilter/bf_sw/source/ui/app/sw_docshdrw.cxx
index 4765bb9..50ea7f4 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docshdrw.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docshdrw.cxx
@@ -71,7 +71,7 @@ namespace binfilter {
/*N*/ PutItem( SvxDashListItem( pDrDoc->GetDashList() ) );
/*N*/ PutItem( SvxLineEndListItem( pDrDoc->GetLineEndList() ) );
/*N*/
-/*N*/ Outliner& rOutliner = pDrDoc->GetDrawOutliner();
+/*N*/ pDrDoc->GetDrawOutliner();
/*N*/ }
/*N*/ else
/*N*/ PutItem( SvxColorTableItem( OFF_APP()->GetStdColorTable() ));
diff --git a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
index 5d0e8c9..bfb5d83 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
@@ -141,10 +141,10 @@ using namespace ::rtl;
*/
/*N*/ if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
/*N*/ {
- SvEmbeddedObject* pObj = this;
+ SvEmbeddedObject* pLclObj = this;
const Size aSz( lA4Width - 2 * lMinBorder, 6 * MM50 );
SwRect aVis( Point( DOCUMENTBORDER, DOCUMENTBORDER ), aSz );
- pObj->SetVisArea( aVis.SVRect() );
+ pLclObj->SetVisArea( aVis.SVRect() );
pDoc->SetBrowseMode( TRUE );
/*N*/ }
// set forbidden characters if necessary
@@ -310,15 +310,15 @@ using namespace ::rtl;
--------------------------------------------------------------------*/
-/*N*/ SwDocShell::SwDocShell(SfxObjectCreateMode eMode) :
-/*N*/ pDoc(0),
-/*N*/ pIo(0),
-/*N*/ pBasePool(0),
-/*N*/ pFontList(0),
-/*N*/ SfxObjectShell ( eMode ),
-/*N*/ pView( 0 ),
-/*N*/ pWrtShell( 0 ),
-/*N*/ nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG)
+/*N*/ SwDocShell::SwDocShell(SfxObjectCreateMode eMode)
+/*N*/ : SfxObjectShell ( eMode )
+/*N*/ , pDoc(0)
+/*N*/ , pIo(0)
+/*N*/ , pBasePool(0)
+/*N*/ , pFontList(0)
+/*N*/ , pView( 0 )
+/*N*/ , pWrtShell( 0 )
+/*N*/ , nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG)
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SwDocShell" );
/*N*/ Init_Impl();
@@ -329,15 +329,15 @@ using namespace ::rtl;
--------------------------------------------------------------------*/
-/*?*/ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ):
-/*?*/ pDoc(pD),
-/*?*/ pIo(0),
-/*?*/ pBasePool(0),
-/*?*/ pFontList(0),
-/*?*/ SfxObjectShell ( eMode ),
-/*?*/ pView( 0 ),
-/*?*/ pWrtShell( 0 ),
-/*?*/ nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG)
+/*?*/ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode )
+/*?*/ : SfxObjectShell ( eMode )
+/*?*/ , pDoc(pD)
+/*?*/ , pIo(0)
+/*?*/ , pBasePool(0)
+/*?*/ , pFontList(0)
+/*?*/ , pView( 0 )
+/*?*/ , pWrtShell( 0 )
+/*?*/ , nUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG)
/*?*/ {
/*?*/ RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SwDocShell" );
/*?*/ Init_Impl();
@@ -486,8 +486,8 @@ using namespace ::rtl;
/*?*/ SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
/*?*/ if(GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
/*?*/ {
-/*?*/ SfxMedium* pMedium = GetMedium();
-/*?*/ SFX_ITEMSET_ARG( pMedium->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
+/*?*/ SfxMedium* pLclMedium = GetMedium();
+/*?*/ SFX_ITEMSET_ARG( pLclMedium->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
/*?*/ nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : ::com::sun::star::document::UpdateDocMode::NO_UPDATE;
/*?*/ }
/*?*/
diff --git a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
index cbb1dbb..679f58c 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
@@ -355,18 +355,17 @@ namespace binfilter {
/*N*/ SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument,
/*N*/ const String& rName,
-/*N*/ SwDocStyleSheetPool& rPool,
+/*N*/ SwDocStyleSheetPool& rInPool,
/*N*/ SfxStyleFamily eFam,
-/*N*/ USHORT nMask) :
+/*N*/ USHORT nInMask) :
/*N*/
-/*N*/ SfxStyleSheetBase( rName, rPool, eFam, nMask ),
-/*N*/ rDoc(rDocument),
+/*N*/ SfxStyleSheetBase( rName, rInPool, eFam, nInMask ),
/*N*/ pCharFmt(0),
-/*N*/ pFrmFmt(0),
/*N*/ pColl(0),
+/*N*/ pFrmFmt(0),
/*N*/ pDesc(0),
/*N*/ pNumRule(0),
-/*N*/ bPhysical(FALSE),
+/*N*/ rDoc(rDocument),
/*N*/ aCoreSet(GetPool().GetPool(),
/*N*/ RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
/*N*/ RES_PARATR_BEGIN, RES_PARATR_END - 1,
@@ -384,22 +383,23 @@ namespace binfilter {
/*N*/ SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE,
/*N*/ SID_PARA_BACKGRND_DESTINATION, SID_ATTR_BRUSH_CHAR,
/*N*/ SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE,
-/*N*/ 0)
+/*N*/ 0),
+/*N*/ bPhysical(FALSE)
/*N*/ {
/*N*/ nHelpId = UCHAR_MAX;
/*N*/ }
-/*N*/ SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) :
-/*N*/ SfxStyleSheetBase(rOrg),
-/*N*/ pCharFmt(rOrg.pCharFmt),
-/*N*/ pFrmFmt(rOrg.pFrmFmt),
-/*N*/ pColl(rOrg.pColl),
-/*N*/ pDesc(rOrg.pDesc),
-/*N*/ pNumRule(rOrg.pNumRule),
-/*N*/ rDoc(rOrg.rDoc),
-/*N*/ bPhysical(rOrg.bPhysical),
-/*N*/ aCoreSet(rOrg.aCoreSet)
+/*N*/ SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg)
+/*N*/ : SfxStyleSheetBase(rOrg)
+/*N*/ , pCharFmt(rOrg.pCharFmt)
+/*N*/ , pColl(rOrg.pColl)
+/*N*/ , pFrmFmt(rOrg.pFrmFmt)
+/*N*/ , pDesc(rOrg.pDesc)
+/*N*/ , pNumRule(rOrg.pNumRule)
+/*N*/ , rDoc(rOrg.rDoc)
+/*N*/ , aCoreSet(rOrg.aCoreSet)
+/*N*/ , bPhysical(rOrg.bPhysical)
/*N*/ {
/*N*/ }
@@ -1025,20 +1025,20 @@ namespace binfilter {
/*N*/ if( pFmt )
/*N*/ nPoolId = pFmt->GetPoolFmtId();
/*N*/
-/*N*/ USHORT nMask = 0;
+/*N*/ USHORT nLclMask = 0;
/*N*/ if( pFmt == rDoc.GetDfltCharFmt() )
-/*N*/ nMask |= SFXSTYLEBIT_READONLY;
+/*N*/ nLclMask |= SFXSTYLEBIT_READONLY;
/*N*/ else if( USER_FMT & nPoolId )
-/*N*/ nMask |= SFXSTYLEBIT_USERDEF;
+/*N*/ nLclMask |= SFXSTYLEBIT_USERDEF;
/*N*/
/*N*/ switch ( COLL_GET_RANGE_BITS & nPoolId )
/*N*/ {
-/*N*/ case COLL_TEXT_BITS: nMask |= SWSTYLEBIT_TEXT; break;
-/*N*/ case COLL_DOC_BITS : nMask |= SWSTYLEBIT_CHAPTER; break;
-/*N*/ case COLL_LISTS_BITS: nMask |= SWSTYLEBIT_LIST; break;
-/*N*/ case COLL_REGISTER_BITS: nMask |= SWSTYLEBIT_IDX; break;
-/*N*/ case COLL_EXTRA_BITS: nMask |= SWSTYLEBIT_EXTRA; break;
-/*N*/ case COLL_HTML_BITS: nMask |= SWSTYLEBIT_HTML; break;
+/*N*/ case COLL_TEXT_BITS: nLclMask |= SWSTYLEBIT_TEXT; break;
+/*N*/ case COLL_DOC_BITS : nLclMask |= SWSTYLEBIT_CHAPTER; break;
+/*N*/ case COLL_LISTS_BITS: nLclMask |= SWSTYLEBIT_LIST; break;
+/*N*/ case COLL_REGISTER_BITS: nLclMask |= SWSTYLEBIT_IDX; break;
+/*N*/ case COLL_EXTRA_BITS: nLclMask |= SWSTYLEBIT_EXTRA; break;
+/*N*/ case COLL_HTML_BITS: nLclMask |= SWSTYLEBIT_HTML; break;
/*N*/ }
/*N*/
/*N*/ if( pFmt )
@@ -1052,10 +1052,10 @@ namespace binfilter {
/*N*/ aHelpFile.Erase();
/*N*/
/*N*/ if( RES_CONDTXTFMTCOLL == pFmt->Which() )
-/*N*/ nMask |= SWSTYLEBIT_CONDCOLL;
+/*N*/ nLclMask |= SWSTYLEBIT_CONDCOLL;
/*N*/ }
/*N*/
-/*N*/ SetMask( nMask );
+/*N*/ SetMask( nLclMask );
/*N*/ }
/*N*/ if( bDeleteInfo && bFillOnlyInfo )
/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }
@@ -1228,20 +1228,20 @@ namespace binfilter {
/*N*/ bOrganizer = bOrg;
/*N*/ }
-/*N*/ SwDocStyleSheetPool::~SwDocStyleSheetPool()
+/*N*/ SwDocStyleSheetPool::~SwDocStyleSheetPool()
/*N*/ {
/*N*/ }
-/*N*/ SfxStyleSheetBase& SwDocStyleSheetPool::Make(
+/*N*/ SfxStyleSheetBase& SwDocStyleSheetPool::Make(
/*N*/ const String& rName,
/*N*/ SfxStyleFamily eFam,
-/*N*/ USHORT nMask,
-/*N*/ USHORT /*nPos*/ )
+/*N*/ USHORT nInMask,
+/*N*/ USHORT /*nPos*/ )
/*N*/ {
/*N*/ aStyleSheet.PresetName(rName);
/*N*/ aStyleSheet.PresetParent(aEmptyStr);
/*N*/ aStyleSheet.PresetFollow(aEmptyStr);
-/*N*/ aStyleSheet.SetMask(nMask) ;
+/*N*/ aStyleSheet.SetMask(nInMask) ;
/*N*/ aStyleSheet.SetFamily(eFam);
/*N*/ aStyleSheet.SetPhysical(TRUE);
/*N*/ aStyleSheet.Create();
@@ -1255,9 +1255,9 @@ namespace binfilter {
/*N*/ SfxStyleSheetIterator* SwDocStyleSheetPool::CreateIterator(
-/*N*/ SfxStyleFamily eFam, USHORT nMask )
+/*N*/ SfxStyleFamily eFam, USHORT nInMask )
/*N*/ {
-/*N*/ return new SwStyleSheetIterator( this, eFam, nMask );
+/*N*/ return new SwStyleSheetIterator( this, eFam, nInMask );
/*N*/ }
@@ -1379,7 +1379,7 @@ namespace binfilter {
/*N*/
/*N*/ SwDoc& rDoc = ((SwDocStyleSheetPool*)pBasePool)->GetDoc();
/*N*/ const USHORT nSrchMask = nMask;
-/*N*/ const BOOL bSearchUsed = SearchUsed();
+/*N*/ const BOOL bLclSearchUsed = SearchUsed();
/*N*/
/*N*/ const BOOL bOrganizer = ((SwDocStyleSheetPool*)pBasePool)->IsOrganizerMode();
/*N*/
@@ -1393,17 +1393,17 @@ namespace binfilter {
/*?*/ if( pFmt->IsDefault() && pFmt != rDoc.GetDfltCharFmt() )
/*?*/ continue;
/*?*/
-/*?*/ const BOOL bUsed = bSearchUsed && (bOrganizer || rDoc.IsUsed(*pFmt));
+/*?*/ const BOOL bUsed = bLclSearchUsed && (bOrganizer || rDoc.IsUsed(*pFmt));
/*?*/ if( !bUsed )
/*?*/ {
/*?*/ // Standard ist keine Benutzervorlage #46181#
/*?*/ const USHORT nId = rDoc.GetDfltCharFmt() == pFmt ?
-/*?*/ RES_POOLCHR_INET_NORMAL :
+/*?*/ static_cast<USHORT>(RES_POOLCHR_INET_NORMAL) :
/*?*/ pFmt->GetPoolFmtId();
/*?*/ if( (nSrchMask & ~SFXSTYLEBIT_USED) == SFXSTYLEBIT_USERDEF
/*?*/ ? !(nId & USER_FMT)
/*?*/ // benutzte gesucht und keine gefunden
-/*?*/ : bSearchUsed )
+/*?*/ : bLclSearchUsed )
/*?*/ continue;
/*?*/
/*?*/ if( rDoc.IsHTMLMode() && !(nId & USER_FMT) &&
@@ -1428,7 +1428,7 @@ namespace binfilter {
/*?*/ {
/*?*/ if( !rDoc.IsHTMLMode() )
/*?*/ AppendStyleList(SwStyleNameMapper::GetChrFmtUINameArray(),
-/*?*/ bSearchUsed, GET_POOLID_CHRFMT, cCHAR);
+/*?*/ bLclSearchUsed, GET_POOLID_CHRFMT, cCHAR);
/*?*/ else
/*?*/ {
/*?*/ aLst.Append( cCHAR, *SwStyleNameMapper::GetChrFmtUINameArray()[
@@ -1441,7 +1441,7 @@ namespace binfilter {
/*?*/ RES_POOLCHR_FOOTNOTE - RES_POOLCHR_BEGIN ] );
/*?*/ }
/*?*/ AppendStyleList(SwStyleNameMapper::GetHTMLChrFmtUINameArray(),
-/*?*/ bSearchUsed, GET_POOLID_CHRFMT, cCHAR);
+/*?*/ bLclSearchUsed, GET_POOLID_CHRFMT, cCHAR);
/*N*/ }
/*N*/ }
@@ -1471,7 +1471,7 @@ namespace binfilter {
/*N*/ continue;
/*N*/
/*N*/ const BOOL bUsed = bOrganizer || rDoc.IsUsed(*pColl);
-/*N*/ if( !(bSearchUsed && bUsed ))
+/*N*/ if( !(bLclSearchUsed && bUsed ))
/*N*/ {
/*N*/ const USHORT nId = pColl->GetPoolFmtId();
/*N*/ switch ( (nSMask & ~SFXSTYLEBIT_USED) )
@@ -1532,7 +1532,7 @@ namespace binfilter {
/*?*/ break;
/*N*/ default:
/*N*/ // benutzte gesucht und keine gefunden
-/*N*/ if( bSearchUsed )
+/*N*/ if( bLclSearchUsed )
/*N*/ continue;
/*N*/ }
/*N*/ }
@@ -1542,19 +1542,19 @@ namespace binfilter {
/*N*/ const BOOL bAll = nSMask == SFXSTYLEBIT_ALL;
/*N*/ if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_TEXT )
/*N*/ AppendStyleList(SwStyleNameMapper::GetTextUINameArray(),
-/*N*/ bSearchUsed, GET_POOLID_TXTCOLL, cPARA );
+/*N*/ bLclSearchUsed, GET_POOLID_TXTCOLL, cPARA );
/*N*/ if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CHAPTER )
/*N*/ AppendStyleList(SwStyleNameMapper::GetDocUINameArray(),
-/*N*/ bSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ;
+/*N*/ bLclSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ;
/*N*/ if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_LIST )
/*N*/ AppendStyleList(SwStyleNameMapper::GetListsUINameArray(),
-/*N*/ bSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ;
+/*N*/ bLclSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ;
/*N*/ if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_IDX )
/*N*/ AppendStyleList(SwStyleNameMapper::GetRegisterUINameArray(),
-/*N*/ bSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ;
+/*N*/ bLclSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ;
/*N*/ if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_EXTRA )
/*N*/ AppendStyleList(SwStyleNameMapper::GetExtraUINameArray(),
-/*N*/ bSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ;
+/*N*/ bLclSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ;
/*N*/ if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CONDCOLL )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP");
@@ -1579,13 +1579,13 @@ namespace binfilter {
/*?*/ continue;
/*?*/
/*?*/ const USHORT nId = pFmt->GetPoolFmtId();
-/*?*/ BOOL bUsed = bSearchUsed && ( bOrganizer || rDoc.IsUsed(*pFmt));
+/*?*/ BOOL bUsed = bLclSearchUsed && ( bOrganizer || rDoc.IsUsed(*pFmt));
/*?*/ if( !bUsed )
/*?*/ {
/*?*/ if( (nSrchMask & ~SFXSTYLEBIT_USED) == SFXSTYLEBIT_USERDEF
/*?*/ ? !(nId & USER_FMT)
/*?*/ // benutzte gesucht und keine gefunden
-/*?*/ : bSearchUsed )
+/*?*/ : bLclSearchUsed )
/*?*/ continue;
/*?*/ }
/*?*/
@@ -1596,7 +1596,7 @@ namespace binfilter {
/*?*/ //
/*?*/ if ( nSrchMask == SFXSTYLEBIT_ALL )
/*?*/ AppendStyleList(SwStyleNameMapper::GetFrmFmtUINameArray(),
-/*?*/ bSearchUsed, GET_POOLID_FRMFMT, cFRAME);
+/*?*/ bLclSearchUsed, GET_POOLID_FRMFMT, cFRAME);
/*N*/ }
/*N*/
/*N*/ if( nSearchFamily == SFX_STYLE_FAMILY_PAGE ||
@@ -1607,13 +1607,13 @@ namespace binfilter {
/*N*/ {
/*N*/ const SwPageDesc& rDesc = rDoc.GetPageDesc(i);
/*N*/ const USHORT nId = rDesc.GetPoolFmtId();
-/*N*/ BOOL bUsed = bSearchUsed && ( bOrganizer || rDoc.IsUsed(rDesc));
+/*N*/ BOOL bUsed = bLclSearchUsed && ( bOrganizer || rDoc.IsUsed(rDesc));
/*N*/ if( !bUsed )
/*N*/ {
/*N*/ if( (nSrchMask & ~SFXSTYLEBIT_USED) == SFXSTYLEBIT_USERDEF
/*N*/ ? !(nId & USER_FMT)
/*N*/ // benutzte gesucht und keine gefunden
-/*N*/ : bSearchUsed )
+/*N*/ : bLclSearchUsed )
/*?*/ continue;
/*N*/ }
/*N*/
@@ -1621,7 +1621,7 @@ namespace binfilter {
/*N*/ }
/*N*/ if ( nSrchMask == SFXSTYLEBIT_ALL )
/*N*/ AppendStyleList(SwStyleNameMapper::GetPageDescUINameArray(),
-/*N*/ bSearchUsed, GET_POOLID_PAGEDESC, cPAGE);
+/*N*/ bLclSearchUsed, GET_POOLID_PAGEDESC, cPAGE);
/*N*/ }
/*N*/
/*N*/ if( nSearchFamily == SFX_STYLE_FAMILY_PSEUDO ||
@@ -1633,13 +1633,13 @@ namespace binfilter {
/*?*/ const SwNumRule& rRule = *rNumTbl[ i ];
/*?*/ if( !rRule.IsAutoRule() )
/*?*/ {
-/*?*/ BOOL bUsed = bSearchUsed && ( bOrganizer || rDoc.IsUsed(rRule) );
+/*?*/ BOOL bUsed = bLclSearchUsed && ( bOrganizer || rDoc.IsUsed(rRule) );
/*?*/ if( !bUsed )
/*?*/ {
/*?*/ if( (nSrchMask & ~SFXSTYLEBIT_USED) == SFXSTYLEBIT_USERDEF
/*?*/ ? !(rRule.GetPoolFmtId() & USER_FMT)
/*?*/ // benutzte gesucht und keine gefunden
-/*?*/ : bSearchUsed )
+/*?*/ : bLclSearchUsed )
/*?*/ continue;
/*?*/ }
/*?*/
@@ -1648,7 +1648,7 @@ namespace binfilter {
/*?*/ }
/*?*/ if ( nSrchMask == SFXSTYLEBIT_ALL )
/*?*/ AppendStyleList(SwStyleNameMapper::GetNumRuleUINameArray(),
-/*?*/ bSearchUsed, GET_POOLID_NUMRULE, cNUMRULE);
+/*?*/ bLclSearchUsed, GET_POOLID_NUMRULE, cNUMRULE);
/*N*/ }
/*N*/
/*N*/ if(aLst.Count() > 0)
diff --git a/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx b/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx
index 46d68ab..4b6345d 100644
--- a/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx
@@ -111,17 +111,17 @@ using namespace ::rtl;
/*N*/ : SwModuleDummy( SFX_APP()->CreateResManager( "bf_sw" ), sal_False, pFact,
/*N*/ pWebFact, pGlobalFact ),
/*N*/ pModuleConfig(0),
-/*N*/ pView(0),
-/*N*/ pChapterNumRules(0),
-/*N*/ pStdFontConfig(0),
+/*N*/ pUsrPref(0),
+/*N*/ pWebUsrPref(0),
/*N*/ pPrtOpt(0),
/*N*/ pWebPrtOpt(0),
-/*N*/ pWebUsrPref(0),
-/*N*/ pUsrPref(0),
+/*N*/ pChapterNumRules(0),
+/*N*/ pStdFontConfig(0),
/*N*/ pDBConfig(0),
-/*N*/ pColorConfig(0),
-/*N*/ pCTLOptions(0),
+/*N*/ pColorConfig(0),
+/*N*/ pCTLOptions(0),
/*N*/ pAttrPool(0),
+/*N*/ pView(0),
/*N*/ bAuthorInitialised(sal_False),
/*N*/ bEmbeddedLoadSave( sal_False )
/*N*/ {
More information about the Libreoffice-commits
mailing list