[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_starmath binfilter/bf_svx binfilter/bf_sw binfilter/inc
Michael Meeks
mmeeks at kemper.freedesktop.org
Wed Oct 27 09:03:04 PDT 2010
binfilter/bf_sc/source/ui/app/sc_sclib.cxx | 17 ++---
binfilter/bf_starmath/source/starmath_mathml.cxx | 20 ++----
binfilter/bf_svx/source/unodraw/svx_unoprov.cxx | 48 +++++++--------
binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx | 40 +++++-------
binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx | 1
binfilter/bf_sw/source/core/inc/drawfont.hxx | 4 -
binfilter/bf_sw/source/core/txtnode/sw_thints.cxx | 18 +----
binfilter/bf_sw/source/core/txtnode/sw_txtatr2.cxx | 8 +-
binfilter/inc/bf_sc/scdll.hxx | 4 -
binfilter/inc/bf_sd/sddll.hxx | 4 -
binfilter/inc/bf_sfx2/fcontnr.hxx | 2
binfilter/inc/bf_sfx2/objsh.hxx | 24 +++----
binfilter/inc/bf_starmath/node.hxx | 4 -
binfilter/inc/bf_starmath/smdll0.hxx | 7 --
binfilter/inc/bf_svx/outliner.hxx | 4 -
binfilter/inc/bf_sw/hints.hxx | 10 +--
binfilter/inc/bf_sw/swdll.hxx | 4 -
binfilter/inc/bf_sw/swrect.hxx | 6 -
binfilter/inc/bf_sw/txtatr.hxx | 10 +--
binfilter/inc/bf_xmloff/ProgressBarHelper.hxx | 18 ++---
binfilter/inc/bf_xmloff/txtparae.hxx | 66 ++++++++++-----------
21 files changed, 148 insertions(+), 171 deletions(-)
New commits:
commit 7b3077c098699655effc343cd2887ce83a263c76
Author: John LeMoyne Castle <jlc at mail2lee.com>
Date: Mon Oct 25 20:56:01 2010 -0600
Correct declarations to reduce shadows member warnings
diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
index 1d3dc24..2356c2a 100644
--- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
@@ -93,13 +93,14 @@ static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ class ScLibOptions : public ::utl::ConfigItem
/*N*/ {
-/*N*/ BOOL bWK3Flag;
+/*N*/ BOOL bWK3Flag;
/*N*/
/*N*/ public:
-/*N*/ ScLibOptions();
-/*N*/ BOOL GetWK3Flag() const { return bWK3Flag; }
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- virtual void Commit();
+/*N*/ ScLibOptions();
+/*N*/ BOOL GetWK3Flag() const { return bWK3Flag; }
+
+ virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Commit();
/*N*/ };
@@ -110,8 +111,8 @@ void ScLibOptions::Commit() {}
#define ENTRYSTR_WK3 "WK3"
/*N*/ ScLibOptions::ScLibOptions() :
-/*N*/ ConfigItem( ::rtl::OUString::createFromAscii( CFGPATH_LIBFILTER ) ),
-/*N*/ bWK3Flag( FALSE )
+/*N*/ ConfigItem( ::rtl::OUString::createFromAscii( CFGPATH_LIBFILTER ) ),
+/*N*/ bWK3Flag( FALSE )
/*N*/ {
/*N*/ ::com::sun::star::uno::Sequence<rtl::OUString> aNames(1);
/*N*/ aNames[0] = ::rtl::OUString::createFromAscii( ENTRYSTR_WK3 );
@@ -532,8 +533,6 @@ BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
/*N*/ pFilterLotus
/*N*/ };
/*N*/
-/*N*/ const UINT16 nByteMask = 0xFF;
-/*N*/
/*N*/ // suchen Sie jetzt!
/*N*/ // ... realisiert ueber 'Mustererkennung'
/*N*/
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx b/binfilter/bf_starmath/source/starmath_mathml.cxx
index e3da6d0..135b5b6 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -593,9 +593,8 @@ sal_Int64 SAL_CALL SmXMLImport::getSomething( const uno::Sequence< sal_Int8 >&
rId ) throw(uno::RuntimeException)
{
if( rId.getLength() == 16 &&
- 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
- rId.getConstArray(), 16 ) )
- return (sal_Int64)this;
+ ! rtl_compareMemory( getUnoTunnelId().getConstArray(),rId.getConstArray(), 16 ) )
+ return (sal_Int64)this;
return SvXMLImport::getSomething( rId );
}
@@ -604,9 +603,8 @@ sal_Int64 SAL_CALL SmXMLExport::getSomething( const uno::Sequence< sal_Int8 >&
rId ) throw(uno::RuntimeException)
{
if( rId.getLength() == 16 &&
- 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
- rId.getConstArray(), 16 ) )
- return (sal_Int64)this;
+ ! rtl_compareMemory( getUnoTunnelId().getConstArray(),rId.getConstArray(), 16 ) )
+ return (sal_Int64)this;
return SvXMLExport::getSomething( rId );
}
@@ -615,13 +613,13 @@ sal_Int64 SAL_CALL SmXMLExport::getSomething( const uno::Sequence< sal_Int8 >&
void SmXMLImport::endDocument(void)
throw(xml::sax::SAXException, uno::RuntimeException)
{
- //Set the resulted tree into the SmDocShell where it belongs
+ //Set the result tree into the SmDocShell where it belongs
SmNode *pTree;
if (pTree = GetTree())
{
- uno::Reference <frame::XModel> xModel = GetModel();
+ uno::Reference <frame::XModel> xFrmModel = GetModel();
uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
+ xTunnel = uno::Reference <lang::XUnoTunnel> (xFrmModel, uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
(xTunnel->getSomething(SmModel::getUnoTunnelId()));
@@ -649,9 +647,9 @@ void SmXMLImport::endDocument(void)
SmParser &rParser = pDocShell->GetParser();
BOOL bVal = rParser.IsImportSymbolNames();
rParser.SetImportSymbolNames( TRUE );
- SmNode *pTree = rParser.Parse( aText );
+ SmNode *pTmp = rParser.Parse( aText );
aText = rParser.GetText();
- delete pTree;
+ delete pTmp;
rParser.SetImportSymbolNames( bVal );
pDocShell->SetText( aText );
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
index 8de840b..52391dd 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
@@ -72,7 +72,7 @@ SfxItemPropertyMap* ImplGetSvxShapePropertyMap()
AUTOSHAPE_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aShapePropertyMap_Impl;
@@ -96,7 +96,7 @@ SfxItemPropertyMap* ImplGetSvxTextShapePropertyMap()
AUTOSHAPE_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aTextShapePropertyMap_Impl;
@@ -120,7 +120,7 @@ SfxItemPropertyMap* ImplGetSvxConnectorPropertyMap()
FONTWORK_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aConnectorPropertyMap_Impl;
@@ -144,7 +144,7 @@ SfxItemPropertyMap* ImplGetSvxDimensioningPropertyMap()
FONTWORK_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aDimensioningPropertyMap_Impl;
@@ -169,7 +169,7 @@ SfxItemPropertyMap* ImplGetSvxCirclePropertyMap()
AUTOSHAPE_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aCirclePropertyMap_Impl;
@@ -195,7 +195,7 @@ SfxItemPropertyMap* ImplGetSvxPolyPolygonPropertyMap()
AUTOSHAPE_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aPolyPolygonPropertyMap_Impl;
@@ -221,7 +221,7 @@ SfxItemPropertyMap* ImplGetSvxPolyPolygonBezierPropertyMap()
AUTOSHAPE_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aPolyPolygonBezierPropertyMap_Impl;
@@ -244,7 +244,7 @@ SfxItemPropertyMap* ImplGetSvxGraphicObjectPropertyMap()
{ MAP_CHAR_LEN("IsMirrored"), OWN_ATTR_MIRRORED , &::getCppuBooleanType(), 0, 0},
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aGraphicObjectPropertyMap_Impl;
@@ -262,7 +262,7 @@ SfxItemPropertyMap* ImplGetSvx3DSceneObjectPropertyMap()
MISC_OBJ_PROPERTIES
LINKTARGET_PROPERTIES
SHADOW_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return a3DSceneObjectPropertyMap_Impl;
@@ -283,7 +283,7 @@ SfxItemPropertyMap* ImplGetSvx3DCubeObjectPropertyMap()
SHADOW_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return a3DCubeObjectPropertyMap_Impl;
@@ -304,7 +304,7 @@ SfxItemPropertyMap* ImplGetSvx3DSphereObjectPropertyMap()
SHADOW_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return a3DSphereObjectPropertyMap_Impl;
}
@@ -329,7 +329,7 @@ SfxItemPropertyMap* ImplGetSvx3DLatheObjectPropertyMap()
SHADOW_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return a3DLatheObjectPropertyMap_Impl;
@@ -355,7 +355,7 @@ SfxItemPropertyMap* ImplGetSvx3DExtrudeObjectPropertyMap()
SHADOW_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return a3DExtrudeObjectPropertyMap_Impl;
@@ -376,7 +376,7 @@ SfxItemPropertyMap* ImplGetSvx3DPolygonObjectPropertyMap()
SHADOW_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return a3DPolygonObjectPropertyMap_Impl;
@@ -419,7 +419,7 @@ SfxItemPropertyMap* ImplGetSvxAllPropertyMap()
AUTOSHAPE_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aAllPropertyMap_Impl;
@@ -432,7 +432,7 @@ SfxItemPropertyMap* ImplGetSvxGroupPropertyMap()
SHAPE_DESCRIPTOR_PROPERTIES
MISC_OBJ_PROPERTIES
LINKTARGET_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aGroupPropertyMap_Impl;
@@ -459,7 +459,7 @@ SfxItemPropertyMap* ImplGetSvxOle2PropertyMap()
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
{ MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 },
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aOle2PropertyMap_Impl;
@@ -484,7 +484,7 @@ SfxItemPropertyMap* ImplGetSvxPluginPropertyMap()
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
{ MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 },
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aPluginPropertyMap_Impl;
@@ -512,7 +512,7 @@ SfxItemPropertyMap* ImplGetSvxFramePropertyMap()
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
{ MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 },
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aFramePropertyMap_Impl;
@@ -539,7 +539,7 @@ SfxItemPropertyMap* ImplGetSvxAppletPropertyMap()
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
{ MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 },
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aAppletPropertyMap_Impl;
@@ -581,7 +581,7 @@ SfxItemPropertyMap* ImplGetSvxControlShapePropertyMap()
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aControlPropertyMap_Impl;
@@ -601,7 +601,7 @@ SfxItemPropertyMap* ImplGetSvxPageShapePropertyMap()
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0},
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0},
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aPageShapePropertyMap_Impl;
@@ -635,7 +635,7 @@ SfxItemPropertyMap* ImplGetSvxCaptionPropertyMap()
FONTWORK_PROPERTIES
{ MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aCaptionPropertyMap_Impl;
@@ -655,7 +655,7 @@ comphelper::PropertyMapEntry* ImplGetSvxDrawingDefaultsPropertyMap()
SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS
MISC_3D_OBJ_PROPERTIES
SPECIAL_3DBACKSCALE_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aSvxDrawingDefaultsPropertyMap_Impl;
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
index cef7612..0de6210 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
@@ -73,8 +73,8 @@ sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetSt
* class SvxShapeGroup *
***********************************************************************/
-SvxShapeGroup::SvxShapeGroup( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw() :
- SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_GROUP) ),
+SvxShapeGroup::SvxShapeGroup( SdrObject* pSdrObj, SvxDrawPage* pDrawPage ) throw() :
+ SvxShape( pSdrObj, aSvxMapProvider.GetMap(SVXMAP_GROUP) ),
pPage( pDrawPage )
{
if( pPage )
@@ -155,8 +155,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId()
return aId;
}
-// ::com::sun::star::drawing::XShape
-
//----------------------------------------------------------------------
OUString SAL_CALL SvxShapeGroup::getShapeType()
throw( uno::RuntimeException )
@@ -357,8 +355,8 @@ uno::Sequence< OUString > SAL_CALL SvxShapeGroup::getSupportedServiceNames()
* *
***********************************************************************/
-SvxShapeConnector::SvxShapeConnector( SdrObject* pObj ) throw() :
- SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONNECTOR) )
+SvxShapeConnector::SvxShapeConnector( SdrObject* pSdrObj ) throw() :
+ SvxShapeText( pSdrObj, aSvxMapProvider.GetMap(SVXMAP_CONNECTOR) )
{
}
@@ -524,8 +522,8 @@ uno::Sequence< OUString > SAL_CALL SvxShapeConnector::getSupportedServiceNames()
***********************************************************************/
-SvxShapeControl::SvxShapeControl( SdrObject* pObj ) throw() :
- SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONTROL) )
+SvxShapeControl::SvxShapeControl( SdrObject* pSdrObj ) throw() :
+ SvxShapeText( pSdrObj, aSvxMapProvider.GetMap(SVXMAP_CONTROL) )
{
setShapeKind( OBJ_UNO );
}
@@ -934,8 +932,8 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const ::rtl::OUString& aP
***********************************************************************/
//----------------------------------------------------------------------
-SvxShapeDimensioning::SvxShapeDimensioning( SdrObject* pObj ) throw()
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_DIMENSIONING) )
+SvxShapeDimensioning::SvxShapeDimensioning( SdrObject* pSdrObj ) throw()
+: SvxShapeText( pSdrObj, aSvxMapProvider.GetMap(SVXMAP_DIMENSIONING) )
{
}
@@ -955,8 +953,8 @@ uno::Sequence< OUString > SAL_CALL SvxShapeDimensioning::getSupportedServiceName
***********************************************************************/
//----------------------------------------------------------------------
-SvxShapeCircle::SvxShapeCircle( SdrObject* pObj ) throw()
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CIRCLE) )
+SvxShapeCircle::SvxShapeCircle( SdrObject* pSdrObj ) throw()
+: SvxShapeText( pSdrObj, aSvxMapProvider.GetMap(SVXMAP_CIRCLE) )
{
}
@@ -979,9 +977,9 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCircle::getSupportedServiceNames() th
#include "svdopath.hxx"
namespace binfilter {//STRIP009
//----------------------------------------------------------------------
-SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind eNew )
+SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pSdrObj , drawing::PolygonKind eNew )
throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException)
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGON) ),
+: SvxShapeText( pSdrObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGON) ),
ePolygonKind( eNew )
{
}
@@ -994,8 +992,6 @@ SvxShapePolyPolygon::~SvxShapePolyPolygon() throw()
void SAL_CALL ImplSvxPolyPolygonToPointSequenceSequence( const drawing::PointSequenceSequence* pOuterSequence, XPolyPolygon& rNewPolyPolygon ) throw()
{
// Koordinaten in das PolyPolygon packen
- sal_Int32 nOuterSequenceCount = pOuterSequence->getLength();
-
// Zeiger auf innere sequences holen
const drawing::PointSequence* pInnerSequence = pOuterSequence->getConstArray();
const drawing::PointSequence* pInnerSeqEnd = pInnerSequence + pOuterSequence->getLength();
@@ -1236,8 +1232,8 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygon::getSupportedServiceNames
#include <com/sun/star/drawing/FlagSequence.hpp>
namespace binfilter {//STRIP009
//----------------------------------------------------------------------
-SvxShapePolyPolygonBezier::SvxShapePolyPolygonBezier( SdrObject* pObj , drawing::PolygonKind eNew ) throw()
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGONBEZIER) ),
+SvxShapePolyPolygonBezier::SvxShapePolyPolygonBezier( SdrObject* pSdrObj , drawing::PolygonKind eNew ) throw()
+: SvxShapeText( pSdrObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGONBEZIER) ),
ePolygonKind( eNew )
{
}
@@ -1523,8 +1519,8 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic
#include "toolkit/unohlp.hxx"
namespace binfilter {//STRIP009
//----------------------------------------------------------------------
-SvxGraphicObject::SvxGraphicObject( SdrObject* pObj ) throw()
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_GRAPHICOBJECT) )
+SvxGraphicObject::SvxGraphicObject( SdrObject* pSdrObj ) throw()
+: SvxShapeText( pSdrObj, aSvxMapProvider.GetMap(SVXMAP_GRAPHICOBJECT) )
{
}
@@ -1776,8 +1772,8 @@ void SvxConvertXPolygonToPolyPolygonBezier( const XPolygon& rPolygon, drawing::P
///////////////////////////////////////////////////////////////////////
-SvxShapeCaption::SvxShapeCaption( SdrObject* pObj ) throw()
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CAPTION) )
+SvxShapeCaption::SvxShapeCaption( SdrObject* pSdrObj ) throw()
+: SvxShapeText( pSdrObj, aSvxMapProvider.GetMap(SVXMAP_CAPTION) )
{
}
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
index be6bd87..7e97ca1 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
@@ -41,7 +41,6 @@
#include <vcl/svapp.hxx>
#include "svdmodel.hxx"
-
#include "shapeimpl.hxx"
#include "unoshprp.hxx"
diff --git a/binfilter/bf_sw/source/core/inc/drawfont.hxx b/binfilter/bf_sw/source/core/inc/drawfont.hxx
index 2265a99..0d10c17 100644
--- a/binfilter/bf_sw/source/core/inc/drawfont.hxx
+++ b/binfilter/bf_sw/source/core/inc/drawfont.hxx
@@ -701,9 +701,9 @@ public:
#endif
}
- void SetUnderFnt( SwUnderlineFont* pFnt )
+ void SetUnderFnt( SwUnderlineFont* pFntIn )
{
- pUnderFnt = pFnt;
+ pUnderFnt = pFntIn;
#ifdef DBG_UTIL
bSpec = TRUE;
#endif
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
index 8515ab8..c2d2c1b 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#ifdef _MSC_VER
#pragma hdrstop
#endif
@@ -283,7 +282,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ return (pNew && Insert( pNew, nMode )) ? pNew : 0;
/*N*/ }
-
// uebernehme den Pointer auf das Text-Attribut
/*N*/ BOOL SwTxtNode::Insert( SwTxtAttr *pAttr, USHORT nMode )
@@ -484,7 +482,9 @@ using namespace ::com::sun::star::i18n;
/*N*/ }
/*N*/ }
/*N*/ else
+/*N*/ {
/*N*/ ASSERT( *pAttr->GetEnd() <= Len(), "EndIdx hinter Len!" );
+/*N*/ }
/*N*/
/*N*/ if ( !pSwpHints )
/*N*/ pSwpHints = new SwpHints();
@@ -503,7 +503,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ return TRUE;
/*N*/ }
-
/*************************************************************************
* SwTxtNode::Delete()
*************************************************************************/
@@ -595,7 +594,6 @@ using namespace ::com::sun::star::i18n;
* SwTxtNode::DelSoftHyph()
*************************************************************************/
-
// setze diese Attribute am TextNode. Wird der gesamte Bereich umspannt,
// dann setze sie nur im AutoAttrSet (SwCntntNode:: SetAttr)
/*N*/ BOOL SwTxtNode::SetAttr( const SfxItemSet& rSet, xub_StrLen nStt,
@@ -941,7 +939,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ return rSet.Count() ? TRUE : FALSE;
/*N*/ }
-
/*N*/ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd )
/*N*/ {
/*N*/ SfxItemSet aThisSet( GetDoc()->GetAttrPool(), aCharFmtSetRange );
@@ -1063,7 +1060,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ return bOldVis != bNewVis;
/*N*/ }
-
/*************************************************************************
* SwpHints::Resort()
*************************************************************************/
@@ -1092,7 +1088,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ return FALSE;
/*N*/ }
-
/*************************************************************************
* SwpHints::ClearDummies()
*************************************************************************/
@@ -1377,7 +1372,6 @@ using namespace ::com::sun::star::i18n;
* identischen Bereich mit einem inneren Attribut bekaeme.
*/
-
/*************************************************************************
* SwpHints::Insert()
*************************************************************************/
@@ -1495,6 +1489,8 @@ using namespace ::com::sun::star::i18n;
/*N*/ {
/*N*/ //search for a refernce with the same name
/*N*/ SwTxtAttr* pHt;
+ // redefinition of *pHtEnd shadows declaration at top of method
+ // usage within if stmt does NOT match usage above, also used again below switch/case...
/*N*/ xub_StrLen *pHtEnd, *pHintEnd;
/*N*/ for( USHORT n = 0, nEnd = Count(); n < nEnd; ++n )
/*N*/ if( RES_TXTATR_REFMARK == (pHt = GetHt( n ))->Which() &&
@@ -1904,8 +1900,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ DeleteAtPos( nPos );
/*N*/ }
-
-
/*N*/ #ifdef VERTICAL_LAYOUT
/*N*/ USHORT SwTxtNode::GetLang( const xub_StrLen nBegin, const xub_StrLen nLen,
/*N*/ USHORT nScript ) const
@@ -1984,7 +1978,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ return nRet;
/*N*/ }
-
/*N*/ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr )
/*N*/ {
/*N*/ sal_Unicode cRet = CH_TXTATR_BREAKWORD;
@@ -2008,7 +2001,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ return cRet;
/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_txtatr2.cxx b/binfilter/bf_sw/source/core/txtnode/sw_txtatr2.cxx
index 5f7d1e8..89f5f1a 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_txtatr2.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_txtatr2.cxx
@@ -58,8 +58,8 @@ namespace binfilter {
*************************************************************************/
/*N*/ SwTxtCharFmt::SwTxtCharFmt( const SwFmtCharFmt& rAttr,
-/*N*/ xub_StrLen nStart, xub_StrLen nEnd )
-/*N*/ : SwTxtAttrEnd( rAttr, nStart, nEnd ),
+/*N*/ xub_StrLen nStartIn, xub_StrLen nEndIn )
+/*N*/ : SwTxtAttrEnd( rAttr, nStartIn, nEndIn ),
/*N*/ pMyTxtNd( 0 )
/*N*/ {
/*N*/ ((SwFmtCharFmt&)rAttr).pTxtAttr = this;
@@ -104,8 +104,8 @@ namespace binfilter {
*************************************************************************/
/*N*/ SwTxtINetFmt::SwTxtINetFmt( const SwFmtINetFmt& rAttr,
-/*N*/ xub_StrLen nStart, xub_StrLen nEnd )
-/*N*/ : SwTxtAttrEnd( rAttr, nStart, nEnd ),
+/*N*/ xub_StrLen nStartIn, xub_StrLen nEndIn )
+/*N*/ : SwTxtAttrEnd( rAttr, nStartIn, nEndIn ),
/*N*/ SwClient( 0 ),
/*N*/ pMyTxtNd( 0 )
/*N*/ {
diff --git a/binfilter/inc/bf_sc/scdll.hxx b/binfilter/inc/bf_sc/scdll.hxx
index 2994cd3..1b9586c 100644
--- a/binfilter/inc/bf_sc/scdll.hxx
+++ b/binfilter/inc/bf_sc/scdll.hxx
@@ -90,8 +90,8 @@ public:
// 'p' + SfxObjectShell-subclass + 'Factory'
SotFactory* pScDocShellFactory;
- ScModuleDummy( ResMgr *pResMgr, BOOL bDummy, SfxObjectFactory* pFact )
- : SfxModule(pResMgr, bDummy, pFact, NULL),
+ ScModuleDummy( ResMgr *pResMgrIn, BOOL bDummyIn, SfxObjectFactory* pFact )
+ : SfxModule(pResMgrIn, bDummyIn, pFact, NULL),
pScDocShellFactory(pFact)
{}
diff --git a/binfilter/inc/bf_sd/sddll.hxx b/binfilter/inc/bf_sd/sddll.hxx
index dcb9195..4840839 100644
--- a/binfilter/inc/bf_sd/sddll.hxx
+++ b/binfilter/inc/bf_sd/sddll.hxx
@@ -86,9 +86,9 @@ public:
SotFactory* pSdDrawDocShellFactory;
SotFactory* pSdGraphicDocShellFactory;
- SdModuleDummy(ResMgr* pResMgr, BOOL bDummy,
+ SdModuleDummy(ResMgr* pResMgrIn, BOOL bDummyIn,
SotFactory* pDrawObjFact, SotFactory* pGraphicObjFact)
- : SfxModule(pResMgr, bDummy,
+ : SfxModule(pResMgrIn, bDummyIn,
// Der erste Factory-Pointer muss gueltig sein!
(SfxObjectFactory*) (pDrawObjFact ? pDrawObjFact : pGraphicObjFact),
(SfxObjectFactory*) (pDrawObjFact ? pGraphicObjFact : pDrawObjFact),
diff --git a/binfilter/inc/bf_sfx2/fcontnr.hxx b/binfilter/inc/bf_sfx2/fcontnr.hxx
index acd91b5..c1ae11d 100644
--- a/binfilter/inc/bf_sfx2/fcontnr.hxx
+++ b/binfilter/inc/bf_sfx2/fcontnr.hxx
@@ -59,7 +59,7 @@ public:
{ (void)pPool; return new SfxRefItem( *this ); }
virtual int operator==( const SfxPoolItem& rL) const
{ return ((SfxRefItem&)rL).aRef == aRef; }
- SfxRefItem( USHORT nWhich, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhich )
+ SfxRefItem( USHORT nWhichIn, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichIn )
{ aRef = rValue; }
const SvRefBaseRef& GetValue() const { return aRef; }
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index 7c35e26..fd625ae 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -36,10 +36,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/script/XLibraryContainer.hpp>
-//________________________________________________________________________________________________________________
-// include something else
-//________________________________________________________________________________________________________________
-
#if _SOLAR__PRIVATE
#include <vcl/timer.hxx>
#endif
@@ -55,6 +51,7 @@
#include <bf_sfx2/shell.hxx>
#include <com/sun/star/frame/XModel.hpp>
+
namespace binfilter {
class SvLinkSource;
}
@@ -119,10 +116,6 @@ typedef sal_uInt32 SfxObjectShellFlags;
#define SFX_LOADED_IMAGES 2
#define SFX_LOADED_ALL 3
-//--------------------------------------------------------------------
-
-#define SEQUENCE ::com::sun::star::uno::Sequence
-#define OUSTRING ::rtl::OUString
//--------------------------------------------------------------------
@@ -321,8 +314,8 @@ public:
// Contents
virtual SfxStyleSheetBasePool* GetStyleSheetPool();
- void SetStyleSheetPool( SfxStyleSheetBasePool *pPool ) {
- pStyleSheetPool = pPool; }
+ void SetStyleSheetPool( SfxStyleSheetBasePool *pPoolIn ) {
+ pStyleSheetPool = pPoolIn; }
//determine the position of the "Automatic" filter in the stylist
void SetAutoStyleFilterIndex(sal_uInt16 nSet);
@@ -383,10 +376,13 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetBaseModel();
// Nur uebergangsweise fuer die Applikationen !!!
- virtual SEQUENCE< OUSTRING > GetEventNames();
+//--------------------------------------------------------------------
+
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
#if _SOLAR__PRIVATE
- static SEQUENCE< OUSTRING > GetEventNames_Impl();
+ static ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames_Impl();
+
void InitBasicManager_Impl( SvStorage *pStor, const String* pName = NULL );
SfxObjectShell_Impl* Get_Impl() { return pImp; }
const SfxObjectShell_Impl* Get_Impl() const { return pImp; }
@@ -468,9 +464,9 @@ public:
SfxPoolItem( 0 ),
pObjSh( pObjShell )
{}
- SfxObjectShellItem( sal_uInt16 nWhich,
+ SfxObjectShellItem( sal_uInt16 nWhichIn,
SfxObjectShell *pObjShell ):
- SfxPoolItem( nWhich ),
+ SfxPoolItem( nWhichIn ),
pObjSh( pObjShell )
{}
diff --git a/binfilter/inc/bf_starmath/node.hxx b/binfilter/inc/bf_starmath/node.hxx
index 7fe6692..18d6293 100644
--- a/binfilter/inc/bf_starmath/node.hxx
+++ b/binfilter/inc/bf_starmath/node.hxx
@@ -321,8 +321,8 @@ public:
class SmSpecialNode : public SmTextNode
{
protected:
- SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDesc)
- : SmTextNode(eNodeType, rNodeToken, nFontDesc)
+ SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDescIn)
+ : SmTextNode(eNodeType, rNodeToken, nFontDescIn)
{}
public:
diff --git a/binfilter/inc/bf_starmath/smdll0.hxx b/binfilter/inc/bf_starmath/smdll0.hxx
index 5cd133f..2a6924b 100644
--- a/binfilter/inc/bf_starmath/smdll0.hxx
+++ b/binfilter/inc/bf_starmath/smdll0.hxx
@@ -62,11 +62,8 @@ public:
// 'p' + SfxObjectShell-subclass + 'Factory'
SotFactory *pSmDocShellFactory;
- SmModuleDummy(ResMgr *pResMgr,
- BOOL bDummy,
- SotFactory *pObjFact) :
- SfxModule(pResMgr, bDummy, (SfxObjectFactory*) pObjFact, NULL),
- pSmDocShellFactory(pObjFact)
+ SmModuleDummy(ResMgr *pResMgrIn, BOOL bDummyIn, SotFactory *pObjFact) :
+ SfxModule(pResMgrIn, bDummyIn, (SfxObjectFactory*) pObjFact, NULL), pSmDocShellFactory(pObjFact)
{
}
diff --git a/binfilter/inc/bf_svx/outliner.hxx b/binfilter/inc/bf_svx/outliner.hxx
index cbb9158..20ee2bb 100644
--- a/binfilter/inc/bf_svx/outliner.hxx
+++ b/binfilter/inc/bf_svx/outliner.hxx
@@ -260,11 +260,11 @@ public:
USHORT nTextStart;
USHORT nTextLen;
+ const SvxFont& rFont;
+
USHORT nPara;
xub_StrLen nIndex;
- const SvxFont& rFont;
-
const sal_Int32* pDXArray;
// #101498# BiDi level needs to be transported, too.
diff --git a/binfilter/inc/bf_sw/hints.hxx b/binfilter/inc/bf_sw/hints.hxx
index 55de14e..8038aaa 100644
--- a/binfilter/inc/bf_sw/hints.hxx
+++ b/binfilter/inc/bf_sw/hints.hxx
@@ -203,17 +203,19 @@ public:
// wo es sich geaendert hat
const SwAttrSet* GetTheChgdSet() const { return pTheChgdSet; }
- SfxItemState GetItemState( USHORT nWhich, BOOL bSrchInParent = TRUE,
+ SfxItemState GetItemState( USHORT nWhichIn, BOOL bSrchInParent = TRUE,
const SfxPoolItem **ppItem = 0 ) const
- { return pChgSet->GetItemState( nWhich, bSrchInParent, ppItem ); }
+ { return pChgSet->GetItemState( nWhichIn, bSrchInParent, ppItem ); }
USHORT Count() const { return pChgSet->Count(); }
- void ClearItem( USHORT nWhich = 0 )
+ void ClearItem( USHORT nWhichIn = 0 )
+ {
#ifndef DBG_UTIL
- { pChgSet->ClearItem( nWhich ); }
+ pChgSet->ClearItem( nWhichIn );
#else
;
#endif
+ }
};
class SwCondCollCondChg: public SwMsgPoolItem
diff --git a/binfilter/inc/bf_sw/swdll.hxx b/binfilter/inc/bf_sw/swdll.hxx
index 2d5d28c..aeb341e 100644
--- a/binfilter/inc/bf_sw/swdll.hxx
+++ b/binfilter/inc/bf_sw/swdll.hxx
@@ -101,11 +101,11 @@ public:
SotFactory* pSwWebDocShellFactory;
SotFactory* pSwGlobalDocShellFactory;
- SwModuleDummy( ResMgr *pResMgr, BOOL bDummy,
+ SwModuleDummy( ResMgr *pResMgrIn, BOOL bDummyIn,
SotFactory* pWebFact,
SotFactory* pFact,
SotFactory* pGlobalFact )
- : SfxModule(pResMgr, bDummy,
+ : SfxModule(pResMgrIn, bDummyIn,
(SfxObjectFactory*)pFact,
(SfxObjectFactory*)pWebFact,
(SfxObjectFactory*)pGlobalFact, 0L),
diff --git a/binfilter/inc/bf_sw/swrect.hxx b/binfilter/inc/bf_sw/swrect.hxx
index a791146..76462c0 100644
--- a/binfilter/inc/bf_sw/swrect.hxx
+++ b/binfilter/inc/bf_sw/swrect.hxx
@@ -376,11 +376,11 @@ inline SwRect::SwRect( const Point& rLT, const Point& rRB ) :
nHeight( rRB.Y() - rLT.Y() + 1 )
{
}
-inline SwRect::SwRect( long X, long Y, long Width, long Height ) :
+inline SwRect::SwRect( long X, long Y, long WidthIn, long HeightIn ) :
nX( X ),
nY( Y ),
- nWidth ( Width ),
- nHeight( Height )
+ nWidth ( WidthIn ),
+ nHeight( HeightIn )
{
}
diff --git a/binfilter/inc/bf_sw/txtatr.hxx b/binfilter/inc/bf_sw/txtatr.hxx
index a69aaff..98d128d 100644
--- a/binfilter/inc/bf_sw/txtatr.hxx
+++ b/binfilter/inc/bf_sw/txtatr.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -63,23 +63,22 @@ public:
// ATT_HARDBLANK ******************************
-
// ATT_XNLCONTAINERITEM ******************************
-
// ******************************
class SwTxtRuby : public SwTxtAttrEnd, public SwClient
{
public:
- SwTxtRuby( const SwFmtRuby& rAttr, xub_StrLen nStart, xub_StrLen nEnd ): SwTxtAttrEnd( (SfxPoolItem &)rAttr, nStart, nEnd ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 SwTxtRuby( const SwFmtRuby& rAttr, xub_StrLen nStart, xub_StrLen nEnd );
+ SwTxtRuby( const SwFmtRuby& rAttr, xub_StrLen nStartIn, xub_StrLen nEndIn ):
+ SwTxtAttrEnd( (SfxPoolItem &)rAttr, nStartIn, nEndIn )
+ { DBG_BF_ASSERT(0, "STRIP"); };
};
// ******************************
-
// --------------- Inline Implementierungen ------------------------
inline const SwTxtNode& SwTxtCharFmt::GetTxtNode() const
@@ -88,6 +87,5 @@ inline const SwTxtNode& SwTxtCharFmt::GetTxtNode() const
return *pMyTxtNd;
}
-
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_xmloff/ProgressBarHelper.hxx b/binfilter/inc/bf_xmloff/ProgressBarHelper.hxx
index b5b7bc5..15f12ee 100644
--- a/binfilter/inc/bf_xmloff/ProgressBarHelper.hxx
+++ b/binfilter/inc/bf_xmloff/ProgressBarHelper.hxx
@@ -39,16 +39,16 @@ namespace binfilter {
class ProgressBarHelper
{
::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator > xStatusIndicator;
- sal_Int32 nRange;
- sal_Int32 nReference;
- sal_Int32 nValue;
- double fOldPercent;
- sal_Bool bStrict;
+ sal_Int32 nRange;
+ sal_Int32 nReference;
+ sal_Int32 nValue;
+ double fOldPercent;
+ sal_Bool bStrict;
// #96469#; if the value goes over the Range the progressbar starts again
- sal_Bool bRepeat;
+ sal_Bool bRepeat;
#ifdef DBG_UTIL
- sal_Bool bFailure;
+ sal_Bool bFailure;
#endif
public:
ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xStatusIndicator,
@@ -56,8 +56,8 @@ public:
~ProgressBarHelper();
void SetText(::rtl::OUString& rText) { if (xStatusIndicator.is()) xStatusIndicator->setText(rText); }
- void SetRange(sal_Int32 nValue) { nRange = nValue; }
- void SetReference(sal_Int32 nValue) { nReference = nValue; }
+ void SetRange(sal_Int32 nValueIn) { nRange = nValueIn; }
+ void SetReference(sal_Int32 nValueIn) { nReference = nValueIn; }
void SetValue(sal_Int32 nValue);
void SetRepeat(sal_Bool bValue) { bRepeat = bValue; }
inline void Increment(sal_Int32 nInc = 1) { SetValue( nValue+nInc ); }
diff --git a/binfilter/inc/bf_xmloff/txtparae.hxx b/binfilter/inc/bf_xmloff/txtparae.hxx
index db2fcda..1910119 100644
--- a/binfilter/inc/bf_xmloff/txtparae.hxx
+++ b/binfilter/inc/bf_xmloff/txtparae.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,6 @@ class XMLRedlineExport;
struct XMLPropertyState;
class MultiPropertySetHelper;
-
namespace xmloff { class OFormLayerXMLExport; }
class XMLTextParagraphExport : public XMLStyleExport
@@ -195,9 +194,6 @@ protected:
SinglePropertySetInfoCache aCharStyleNamesPropInfoCache;
-// SvXMLExport& GetExport() { return rExport; }
-// const SvXMLExport& GetExport() const { return rExport; }
-
UniReference < SvXMLExportPropertyMapper > GetParaPropMapper() const
{
return xParaPropMapper;
@@ -441,7 +437,7 @@ protected:
::com::sun::star::uno::Reference <
::com::sun::star::text::XTextSection > & rOldSection,
MultiPropertySetHelper& rPropSetHelper,
- sal_Int16 nTextSectionId,
+ sal_Int16 nTextSectionId,
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rNewContent,
const XMLTextNumRuleInfo& rOldList,
@@ -506,10 +502,10 @@ public:
/// export the (text field) declarations for a particular XText
void exportTextDeclarations(
- const ::com::sun::star::uno::Reference <
+ const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText );
- /// true: export only those declarations that are used;
+ /// true: export only those declarations that are used;
/// false: export all declarations
void exportUsedDeclarations( sal_Bool bOnlyUsed );
@@ -519,7 +515,7 @@ public:
/// Export the list of change information (enclosed by <tracked-changes>)
/// (or the necessary automatic styles)
- void exportTrackedChanges(const ::com::sun::star::uno::Reference <
+ void exportTrackedChanges(const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText,
sal_Bool bAutoStyle );
@@ -529,11 +525,11 @@ public:
/// be exported seperately via the exportTrackedChanges(sal_Bool,
/// Reference<XText>) method.
void recordTrackedChangesForXText(
- const ::com::sun::star::uno::Reference <
+ const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText );
- /// Stop recording tracked changes.
- /// This is the same as calling recordTrackedChanges(...) with an
+ /// Stop recording tracked changes.
+ /// This is the same as calling recordTrackedChanges(...) with an
/// empty reference.
void recordTrackedChangesNoXText();
@@ -546,10 +542,10 @@ public:
void collectTextAutoStyles(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText,
- sal_Bool bProgress = sal_False,
+ sal_Bool bProgressIn = sal_False,
sal_Bool bExportParagraph = sal_True )
{
- exportText( rText, sal_True, bProgress, bExportParagraph );
+ exportText( rText, sal_True, bProgressIn, bExportParagraph );
}
void collectTextAutoStyles(
@@ -557,32 +553,36 @@ public:
::com::sun::star::text::XText > & rText,
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextSection > & rBaseSection,
- sal_Bool bProgress = sal_False,
+ sal_Bool bProgressIn = sal_False,
sal_Bool bExportParagraph = sal_True )
{
- exportText( rText, rBaseSection, sal_True, bProgress, bExportParagraph );
+ exportText( rText, rBaseSection, sal_True, bProgressIn, bExportParagraph );
}
// This method prepares the collection of auto styles for frames
// that are bound to a frame.
- void collectFramesBoundToFrameAutoStyles( sal_Bool bProgress = sal_False )
+ void collectFramesBoundToFrameAutoStyles( sal_Bool bProgressIn = sal_False )
{
+ // unused
+ bProgressIn;
collectFrames( sal_True );
}
+
// This method prepares the collection of auto styles for frames
// that are bound to a frame and it collects auto styles
// for frames bound to a page.
- void collectFramesBoundToPageOrFrameAutoStyles( sal_Bool bProgress = sal_False )
+ void collectFramesBoundToPageOrFrameAutoStyles( sal_Bool bProgressIn = sal_False )
{
collectFrames( sal_False );
- exportPageFrames( sal_True, bProgress );
+ exportPageFrames( sal_True, bProgressIn );
}
+
void collectFramesBoundToFrameAutoStyles(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextFrame >& rParentTxtFrame,
- sal_Bool bProgress = sal_False )
+ sal_Bool bProgressIn = sal_False )
{
- exportFrameFrames( sal_True, bProgress, &rParentTxtFrame );
+ exportFrameFrames( sal_True, bProgressIn, &rParentTxtFrame );
}
// This method exports all automatic styles that have been collected.
@@ -596,10 +596,10 @@ public:
void exportText(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText,
- sal_Bool bProgress = sal_False,
+ sal_Bool bProgressIn = sal_False,
sal_Bool bExportParagraph = sal_True)
{
- exportText( rText, sal_False, bProgress, bExportParagraph );
+ exportText( rText, sal_False, bProgressIn, bExportParagraph );
}
void exportText(
@@ -607,22 +607,22 @@ public:
::com::sun::star::text::XText > & rText,
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextSection > & rBaseSection,
- sal_Bool bProgress = sal_False,
+ sal_Bool bProgressIn = sal_False,
sal_Bool bExportParagraph = sal_True)
{
- exportText( rText, rBaseSection, sal_False, bProgress, bExportParagraph );
+ exportText( rText, rBaseSection, sal_False, bProgressIn, bExportParagraph );
}
- void exportFramesBoundToPage( sal_Bool bProgress = sal_False )
+ void exportFramesBoundToPage( sal_Bool bProgressIn = sal_False )
{
- exportPageFrames( sal_False, bProgress );
+ exportPageFrames( sal_False, bProgressIn );
}
void exportFramesBoundToFrame(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextFrame >& rParentTxtFrame,
- sal_Bool bProgress = sal_False )
+ sal_Bool bProgressIn = sal_False )
{
- exportFrameFrames( sal_False, bProgress, &rParentTxtFrame );
+ exportFrameFrames( sal_False, bProgressIn, &rParentTxtFrame );
}
inline const XMLTextListAutoStylePool& GetListAutoStylePool() const;
@@ -645,8 +645,8 @@ public:
* The reason this method is located here is tha it needs to access the
* XMLSectionExport, which is only available here.
*/
- void PreventExportOfControlsInMuteSections(
- const ::com::sun::star::uno::Reference<
+ void PreventExportOfControlsInMuteSections(
+ const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess> & rShapes,
UniReference<xmloff::OFormLayerXMLExport> xFormExport );
@@ -662,11 +662,11 @@ inline const XMLTextListAutoStylePool&
inline void XMLTextParagraphExport::exportTextFrame(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bProgress,
+ sal_Bool bAutoStyles, sal_Bool bProgressIn,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet)
{
- exportAnyTextFrame( rTextContent, FT_TEXT, bAutoStyles, bProgress,
+ exportAnyTextFrame( rTextContent, FT_TEXT, bAutoStyles, bProgressIn,
pRangePropSet );
}
More information about the Libreoffice-commits
mailing list