Skip to content

C
core
Kaydet (Commit) c2703b63 authored tarafından Luboš Luňák's avatar Luboš Luňák
Dosyalara gözat
Seçenekler

remove non-sensical /*static*/ comments 

They are presumably meant to say the functions are class-static,
but at the function definition it's pretty confusing (looks like file-static).

Change-Id: I28c69244c9eb7aa3f20f07d8784f3704dc6a57bf
üst a69f31a3
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
oox/source/core/binarycodec.cxx
Dosyayı görüntüle @ c2703b63
...@@ -108,7 +108,7 @@ sal_uInt16 lclGetHash( const sal_uInt8* pnPassData, sal_Int32 nBufferSize ) ...@@ -108,7 +108,7 @@ sal_uInt16 lclGetHash( const sal_uInt8* pnPassData, sal_Int32 nBufferSize )
// ============================================================================ // ============================================================================
/*static*/ sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement ) sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement )
{ {
sal_Int32 nPasswordHash = rAttribs.getIntegerHex( nElement, 0 ); sal_Int32 nPasswordHash = rAttribs.getIntegerHex( nElement, 0 );
OSL_ENSURE( (0 <= nPasswordHash) && (nPasswordHash <= SAL_MAX_UINT16), "CodecHelper::getPasswordHash - invalid password hash" ); OSL_ENSURE( (0 <= nPasswordHash) && (nPasswordHash <= SAL_MAX_UINT16), "CodecHelper::getPasswordHash - invalid password hash" );
......
oox/source/drawingml/chart/objectformatter.cxx
Dosyayı görüntüle @ c2703b63
...@@ -1132,7 +1132,7 @@ void ObjectFormatter::convertAutomaticFill( PropertySet& rPropSet, ObjectType eO ...@@ -1132,7 +1132,7 @@ void ObjectFormatter::convertAutomaticFill( PropertySet& rPropSet, ObjectType eO
pFormat->convertAutomaticFill( rPropSet, nSeriesIdx ); pFormat->convertAutomaticFill( rPropSet, nSeriesIdx );
} }
/*static*/ bool ObjectFormatter::isAutomaticFill( const ModelRef< Shape >& rxShapeProp ) bool ObjectFormatter::isAutomaticFill( const ModelRef< Shape >& rxShapeProp )
{ {
return !rxShapeProp || !rxShapeProp->getFillProperties().moFillType.has(); return !rxShapeProp || !rxShapeProp->getFillProperties().moFillType.has();
} }
......
oox/source/drawingml/color.cxx
Dosyayı görüntüle @ c2703b63
...@@ -217,7 +217,7 @@ Color::~Color() ...@@ -217,7 +217,7 @@ Color::~Color()
{ {
} }
/*static*/ sal_Int32 Color::getDmlPresetColor( sal_Int32 nToken, sal_Int32 nDefaultRgb ) sal_Int32 Color::getDmlPresetColor( sal_Int32 nToken, sal_Int32 nDefaultRgb )
{ {
/* Do not pass nDefaultRgb to ContainerHelper::getVectorElement(), to be /* Do not pass nDefaultRgb to ContainerHelper::getVectorElement(), to be
able to catch the existing vector entries without corresponding XML able to catch the existing vector entries without corresponding XML
...@@ -226,7 +226,7 @@ Color::~Color() ...@@ -226,7 +226,7 @@ Color::~Color()
return (nRgbValue >= 0) ? nRgbValue : nDefaultRgb; return (nRgbValue >= 0) ? nRgbValue : nDefaultRgb;
} }
/*static*/ sal_Int32 Color::getVmlPresetColor( sal_Int32 nToken, sal_Int32 nDefaultRgb ) sal_Int32 Color::getVmlPresetColor( sal_Int32 nToken, sal_Int32 nDefaultRgb )
{ {
/* Do not pass nDefaultRgb to ContainerHelper::getVectorElement(), to be /* Do not pass nDefaultRgb to ContainerHelper::getVectorElement(), to be
able to catch the existing vector entries without corresponding XML able to catch the existing vector entries without corresponding XML
......
oox/source/drawingml/fillpropertiesgroupcontext.cxx
Dosyayı görüntüle @ c2703b63
...@@ -272,7 +272,7 @@ Reference< XFastContextHandler > FillPropertiesContext::createFastChildContext( ...@@ -272,7 +272,7 @@ Reference< XFastContextHandler > FillPropertiesContext::createFastChildContext(
return createFillContext( *this, nElement, rxAttribs, mrFillProps ); return createFillContext( *this, nElement, rxAttribs, mrFillProps );
} }
/*static*/ Reference< XFastContextHandler > FillPropertiesContext::createFillContext( Reference< XFastContextHandler > FillPropertiesContext::createFillContext(
ContextHandler& rParent, sal_Int32 nElement, ContextHandler& rParent, sal_Int32 nElement,
const Reference< XFastAttributeList >& rxAttribs, FillProperties& rFillProps ) const Reference< XFastAttributeList >& rxAttribs, FillProperties& rFillProps )
{ {
......
oox/source/helper/propertymap.cxx
Dosyayı görüntüle @ c2703b63
...@@ -203,7 +203,7 @@ PropertyMap::PropertyMap() : ...@@ -203,7 +203,7 @@ PropertyMap::PropertyMap() :
{ {
} }
/*static*/ const OUString& PropertyMap::getPropertyName( sal_Int32 nPropId ) const OUString& PropertyMap::getPropertyName( sal_Int32 nPropId )
{ {
OSL_ENSURE( (0 <= nPropId) && (nPropId < PROP_COUNT), "PropertyMap::getPropertyName - invalid property identifier" ); OSL_ENSURE( (0 <= nPropId) && (nPropId < PROP_COUNT), "PropertyMap::getPropertyName - invalid property identifier" );
return StaticPropertyNameVector::get()[ nPropId ]; return StaticPropertyNameVector::get()[ nPropId ];
......
oox/source/helper/textinputstream.cxx
Dosyayı görüntüle @ c2703b63
...@@ -184,7 +184,7 @@ OUString TextInputStream::readToChar( sal_Unicode cChar, bool bIncludeChar ) ...@@ -184,7 +184,7 @@ OUString TextInputStream::readToChar( sal_Unicode cChar, bool bIncludeChar )
return OUString(); return OUString();
} }
/*static*/ Reference< XTextInputStream2 > TextInputStream::createXTextInputStream( Reference< XTextInputStream2 > TextInputStream::createXTextInputStream(
const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc ) const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc )
{ {
Reference< XTextInputStream2 > xTextStrm; Reference< XTextInputStream2 > xTextStrm;
......
oox/source/ole/olehelper.cxx
Dosyayı görüntüle @ c2703b63
...@@ -247,7 +247,7 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight, ...@@ -247,7 +247,7 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight,
// ============================================================================ // ============================================================================
/*static*/ sal_Int32 OleHelper::decodeOleColor( sal_Int32 OleHelper::decodeOleColor(
const GraphicHelper& rGraphicHelper, sal_uInt32 nOleColor, bool bDefaultColorBgr ) const GraphicHelper& rGraphicHelper, sal_uInt32 nOleColor, bool bDefaultColorBgr )
{ {
static const sal_Int32 spnSystemColors[] = static const sal_Int32 spnSystemColors[] =
...@@ -279,12 +279,12 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight, ...@@ -279,12 +279,12 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight,
return API_RGB_BLACK; return API_RGB_BLACK;
} }
/*static*/ sal_uInt32 OleHelper::encodeOleColor( sal_Int32 nRgbColor ) sal_uInt32 OleHelper::encodeOleColor( sal_Int32 nRgbColor )
{ {
return OLE_COLORTYPE_BGR | lclSwapRedBlue( static_cast< sal_uInt32 >( nRgbColor & 0xFFFFFF ) ); return OLE_COLORTYPE_BGR | lclSwapRedBlue( static_cast< sal_uInt32 >( nRgbColor & 0xFFFFFF ) );
} }
/*static*/ OUString OleHelper::importGuid( BinaryInputStream& rInStrm ) OUString OleHelper::importGuid( BinaryInputStream& rInStrm )
{ {
OUStringBuffer aBuffer; OUStringBuffer aBuffer;
aBuffer.append( sal_Unicode( '{' ) ); aBuffer.append( sal_Unicode( '{' ) );
...@@ -303,7 +303,7 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight, ...@@ -303,7 +303,7 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight,
return aBuffer.makeStringAndClear(); return aBuffer.makeStringAndClear();
} }
/*static*/ bool OleHelper::importStdFont( StdFontInfo& orFontInfo, BinaryInputStream& rInStrm, bool bWithGuid ) bool OleHelper::importStdFont( StdFontInfo& orFontInfo, BinaryInputStream& rInStrm, bool bWithGuid )
{ {
if( bWithGuid ) if( bWithGuid )
{ {
...@@ -321,7 +321,7 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight, ...@@ -321,7 +321,7 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight,
return !rInStrm.isEof() && (nVersion <= 1); return !rInStrm.isEof() && (nVersion <= 1);
} }
/*static*/ bool OleHelper::importStdPic( StreamDataSequence& orGraphicData, BinaryInputStream& rInStrm, bool bWithGuid ) bool OleHelper::importStdPic( StreamDataSequence& orGraphicData, BinaryInputStream& rInStrm, bool bWithGuid )
{ {
if( bWithGuid ) if( bWithGuid )
{ {
......
oox/source/ole/vbacontrol.cxx
Dosyayı görüntüle @ c2703b63
...@@ -716,7 +716,7 @@ void VbaFormControl::moveEmbeddedToAbsoluteParent() ...@@ -716,7 +716,7 @@ void VbaFormControl::moveEmbeddedToAbsoluteParent()
} }
} }
/*static*/ bool VbaFormControl::compareByTabIndex( const VbaFormControlRef& rxLeft, const VbaFormControlRef& rxRight ) bool VbaFormControl::compareByTabIndex( const VbaFormControlRef& rxLeft, const VbaFormControlRef& rxRight )
{ {
// sort controls without model to the end // sort controls without model to the end
sal_Int32 nLeftTabIndex = rxLeft->mxSiteModel.get() ? rxLeft->mxSiteModel->getTabIndex() : SAL_MAX_INT32; sal_Int32 nLeftTabIndex = rxLeft->mxSiteModel.get() ? rxLeft->mxSiteModel->getTabIndex() : SAL_MAX_INT32;
......
oox/source/ole/vbahelper.cxx
Dosyayı görüntüle @ c2703b63
...@@ -30,7 +30,7 @@ using namespace ::com::sun::star::uno; ...@@ -30,7 +30,7 @@ using namespace ::com::sun::star::uno;
// ============================================================================ // ============================================================================
/*static*/ bool VbaHelper::readDirRecord( sal_uInt16& rnRecId, StreamDataSequence& rRecData, BinaryInputStream& rInStrm ) bool VbaHelper::readDirRecord( sal_uInt16& rnRecId, StreamDataSequence& rRecData, BinaryInputStream& rInStrm )
{ {
// read the record header // read the record header
sal_Int32 nRecSize; sal_Int32 nRecSize;
...@@ -45,7 +45,7 @@ using namespace ::com::sun::star::uno; ...@@ -45,7 +45,7 @@ using namespace ::com::sun::star::uno;
return !rInStrm.isEof() && (rInStrm.readData( rRecData, nRecSize ) == nRecSize); return !rInStrm.isEof() && (rInStrm.readData( rRecData, nRecSize ) == nRecSize);
} }
/*static*/ bool VbaHelper::extractKeyValue( OUString& rKey, OUString& rValue, const OUString& rKeyValue ) bool VbaHelper::extractKeyValue( OUString& rKey, OUString& rValue, const OUString& rKeyValue )
{ {
sal_Int32 nEqSignPos = rKeyValue.indexOf( '=' ); sal_Int32 nEqSignPos = rKeyValue.indexOf( '=' );
if( nEqSignPos > 0 ) if( nEqSignPos > 0 )
......
oox/source/vml/vmlformatting.cxx
Dosyayı görüntüle @ c2703b63
...@@ -62,7 +62,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r ...@@ -62,7 +62,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
/*static*/ bool ConversionHelper::separatePair( OUString& orValue1, OUString& orValue2, bool ConversionHelper::separatePair( OUString& orValue1, OUString& orValue2,
const OUString& rValue, sal_Unicode cSep ) const OUString& rValue, sal_Unicode cSep )
{ {
sal_Int32 nSepPos = rValue.indexOf( cSep ); sal_Int32 nSepPos = rValue.indexOf( cSep );
...@@ -78,14 +78,14 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r ...@@ -78,14 +78,14 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
return !orValue1.isEmpty() && !orValue2.isEmpty(); return !orValue1.isEmpty() && !orValue2.isEmpty();
} }
/*static*/ bool ConversionHelper::decodeBool( const OUString& rValue ) bool ConversionHelper::decodeBool( const OUString& rValue )
{ {
sal_Int32 nToken = AttributeConversion::decodeToken( rValue ); sal_Int32 nToken = AttributeConversion::decodeToken( rValue );
// anything else than 't' or 'true' is considered to be false, as specified // anything else than 't' or 'true' is considered to be false, as specified
return (nToken == XML_t) || (nToken == XML_true); return (nToken == XML_t) || (nToken == XML_true);
} }
/*static*/ double ConversionHelper::decodePercent( const OUString& rValue, double fDefValue ) double ConversionHelper::decodePercent( const OUString& rValue, double fDefValue )
{ {
if( rValue.isEmpty() ) if( rValue.isEmpty() )
return fDefValue; return fDefValue;
...@@ -108,7 +108,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r ...@@ -108,7 +108,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
return fDefValue; return fDefValue;
} }
/*static*/ sal_Int64 ConversionHelper::decodeMeasureToEmu( const GraphicHelper& rGraphicHelper, sal_Int64 ConversionHelper::decodeMeasureToEmu( const GraphicHelper& rGraphicHelper,
const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel ) const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel )
{ {
// default for missing values is 0 // default for missing values is 0
...@@ -168,13 +168,13 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r ...@@ -168,13 +168,13 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
return static_cast< sal_Int64 >( fValue + 0.5 ); return static_cast< sal_Int64 >( fValue + 0.5 );
} }
/*static*/ sal_Int32 ConversionHelper::decodeMeasureToHmm( const GraphicHelper& rGraphicHelper, sal_Int32 ConversionHelper::decodeMeasureToHmm( const GraphicHelper& rGraphicHelper,
const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel ) const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel )
{ {
return ::oox::drawingml::convertEmuToHmm( decodeMeasureToEmu( rGraphicHelper, rValue, nRefValue, bPixelX, bDefaultAsPixel ) ); return ::oox::drawingml::convertEmuToHmm( decodeMeasureToEmu( rGraphicHelper, rValue, nRefValue, bPixelX, bDefaultAsPixel ) );
} }
/*static*/ Color ConversionHelper::decodeColor( const GraphicHelper& rGraphicHelper, Color ConversionHelper::decodeColor( const GraphicHelper& rGraphicHelper,
const OptValue< OUString >& roVmlColor, const OptValue< double >& roVmlOpacity, const OptValue< OUString >& roVmlColor, const OptValue< double >& roVmlOpacity,
sal_Int32 nDefaultRgb, sal_Int32 nPrimaryRgb ) sal_Int32 nDefaultRgb, sal_Int32 nPrimaryRgb )
{ {
...@@ -266,7 +266,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r ...@@ -266,7 +266,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
return aDmlColor; return aDmlColor;
} }
/*static*/ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& rPointLists, ::std::vector< ::std::vector< PolygonFlags > >& rFlagLists, const OUString& rPath ) void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& rPointLists, ::std::vector< ::std::vector< PolygonFlags > >& rFlagLists, const OUString& rPath )
{ {
::std::vector< sal_Int32 > aCoordList; ::std::vector< sal_Int32 > aCoordList;
Point aCurrentPoint; Point aCurrentPoint;
......
oox/source/vml/vmlshapecontext.cxx
Dosyayı görüntüle @ c2703b63
...@@ -232,7 +232,7 @@ ShapeContextBase::ShapeContextBase( ContextHandler2Helper& rParent ) : ...@@ -232,7 +232,7 @@ ShapeContextBase::ShapeContextBase( ContextHandler2Helper& rParent ) :
{ {
} }
/*static*/ ContextHandlerRef ShapeContextBase::createShapeContext( ContextHandler2Helper& rParent, ContextHandlerRef ShapeContextBase::createShapeContext( ContextHandler2Helper& rParent,
ShapeContainer& rShapes, sal_Int32 nElement, const AttributeList& rAttribs ) ShapeContainer& rShapes, sal_Int32 nElement, const AttributeList& rAttribs )
{ {
switch( nElement ) switch( nElement )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment