mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:staticmethods

Browse Source 
Change-Id: Iea68c4e466dd8e1cb7164959a680e5e52542166b
This commit is contained in:
Noel Grandin 2015-04-23 15:34:44 +02:00
parent 0c58017468
commit d3b5038cbb
28 changed files with 121 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compilerplugins/clang/staticmethods.cxx
View File

@ -159,7 +159,8 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
|| fqn == "connectivity::mozab::ProfileAccess::isProfileLocked"
|| startsWith(fqn, "SbxDecimal::")
|| fqn == "SbiDllMgr::Call" || fqn == "SbiDllMgr::FreeDll"
|| fqn == "SfxApplication::InitializeDde" || fqn == "SfxApplication::RemoveDdeTopic") {
|| fqn == "SfxApplication::InitializeDde" || fqn == "SfxApplication::RemoveDdeTopic"
|| fqn == "ScannerManager::ReleaseData") {
return true;
}
// debugging stuff
@ -185,7 +186,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
return true;
}
loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false);
loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false );
}

8
filter/source/config/cache/filtercache.hxx vendored
View File

@ -836,7 +836,7 @@ class FilterCache : public BaseLock
/** TODO */
void impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xSet ,
static void impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xSet ,
EItemType eType ,
const CacheItem& aValue)
throw(css::uno::Exception);
@ -852,7 +852,7 @@ class FilterCache : public BaseLock
/** TODO */
void impl_flushByList(const css::uno::Reference< css::container::XNameAccess >& xSet ,
static void impl_flushByList(const css::uno::Reference< css::container::XNameAccess >& xSet ,
EItemType eType ,
const CacheItemList& rCache,
const OUStringList& lItems)
@ -917,14 +917,14 @@ class FilterCache : public BaseLock
/** TODO */
void impl_interpretDataVal4Type(const OUString& sValue,
static void impl_interpretDataVal4Type(const OUString& sValue,
sal_Int32 nProp ,
CacheItem& rItem );
/** TODO */
void impl_interpretDataVal4Filter(const OUString& sValue,
static void impl_interpretDataVal4Filter(const OUString& sValue,
sal_Int32 nProp ,
CacheItem& rItem );

10
filter/source/graphicfilter/icgm/class2.cxx
View File

@ -148,7 +148,7 @@ void CGM::ImplDoClass2()
aTempLineBundle.eLineType = (LineType)ImplGetI( pElement->nIndexPrecision );
aTempLineBundle.nLineWidth = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
aTempLineBundle.SetColor( ImplGetBitmapColor() );
pElement->InsertBundle( pElement->aLineList, aTempLineBundle );
CGMElements::InsertBundle( pElement->aLineList, aTempLineBundle );
}
break;
case 0x0c : /*Marker Representation*/
@ -158,7 +158,7 @@ void CGM::ImplDoClass2()
aTempMarkerBundle.eMarkerType = (MarkerType)ImplGetI( pElement->nIndexPrecision );
aTempMarkerBundle.nMarkerSize = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
aTempMarkerBundle.SetColor( ImplGetBitmapColor() );
pElement->InsertBundle( pElement->aMarkerList, aTempMarkerBundle );
CGMElements::InsertBundle( pElement->aMarkerList, aTempMarkerBundle );
}
break;
case 0x0d : /*Text Representation*/
@ -170,7 +170,7 @@ void CGM::ImplDoClass2()
aTempTextBundle.nCharacterSpacing = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
aTempTextBundle.nCharacterExpansion = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
aTempTextBundle.SetColor( ImplGetBitmapColor() );
pElement->InsertBundle( pElement->aTextList, aTempTextBundle );
CGMElements::InsertBundle( pElement->aTextList, aTempTextBundle );
}
break;
case 0x0e : /*Fill Representation*/
@ -181,7 +181,7 @@ void CGM::ImplDoClass2()
aTempFillBundle.SetColor( ImplGetBitmapColor() );
aTempFillBundle.nFillPatternIndex = ImplGetI( pElement->nIndexPrecision );
aTempFillBundle.nFillHatchIndex = ImplGetI( pElement->nIndexPrecision );
pElement->InsertBundle( pElement->aFillList, aTempFillBundle );
CGMElements::InsertBundle( pElement->aFillList, aTempFillBundle );
}
break;
case 0x0f : /*Edge Representation*/
@ -191,7 +191,7 @@ void CGM::ImplDoClass2()
aTempEdgeBundle.eEdgeType = (EdgeType)ImplGetI( pElement->nIndexPrecision );
aTempEdgeBundle.nEdgeWidth = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
aTempEdgeBundle.SetColor( ImplGetBitmapColor() );
pElement->InsertBundle( pElement->aEdgeList, aTempEdgeBundle );
CGMElements::InsertBundle( pElement->aEdgeList, aTempEdgeBundle );
}
break;
case 0x10 : /*Interior Style Specification Mode */break; // NS

10
filter/source/graphicfilter/icgm/class5.cxx
View File

@ -30,7 +30,7 @@ void CGM::ImplDoClass5()
switch ( mnElementID )
{
case 0x01 : /*Line Bundle Index*/
pElement->pLineBundle = static_cast<LineBundle*>(pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aLineList, pElement->aLineBundle ));
pElement->pLineBundle = static_cast<LineBundle*>(CGMElements::GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aLineList, pElement->aLineBundle ));
break;
case 0x02 : /*Line Type*/
{
@ -69,7 +69,7 @@ void CGM::ImplDoClass5()
}
break;
case 0x05 : /*Marker Bundle Index*/
pElement->pMarkerBundle = static_cast<MarkerBundle*>(pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aMarkerList, pElement->aMarkerBundle ));
pElement->pMarkerBundle = static_cast<MarkerBundle*>(CGMElements::GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aMarkerList, pElement->aMarkerBundle ));
break;
case 0x06 : /*Marker Type*/
{
@ -106,7 +106,7 @@ void CGM::ImplDoClass5()
}
break;
case 0x09 : /*Text Bundle Index*/
pElement->pTextBundle = static_cast<TextBundle*>(pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aTextList, pElement->aTextBundle ));
pElement->pTextBundle = static_cast<TextBundle*>(CGMElements::GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aTextList, pElement->aTextBundle ));
break;
case 0x0a : /*Text Font Index*/
{
@ -211,7 +211,7 @@ void CGM::ImplDoClass5()
pElement->nAlternateCharacterSetIndex = ImplGetI( pElement->nIndexPrecision );
break;
case 0x15 : /*Fill Bundle Index*/
pElement->pFillBundle = static_cast<FillBundle*>(pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aFillList, pElement->aFillBundle ));
pElement->pFillBundle = static_cast<FillBundle*>(CGMElements::GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aFillList, pElement->aFillBundle ));
break;
case 0x16 : /*Fill Interior Style*/
{
@ -246,7 +246,7 @@ void CGM::ImplDoClass5()
}
break;
case 0x1a : /*Edge Bundle Index*/
pElement->pEdgeBundle = static_cast<EdgeBundle*>(pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aEdgeList, pElement->aEdgeBundle ));
pElement->pEdgeBundle = static_cast<EdgeBundle*>(CGMElements::GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aEdgeList, pElement->aEdgeBundle ));
break;
case 0x1b : /*Edge Type*/
{

6
filter/source/graphicfilter/icgm/elements.hxx
View File

@ -130,11 +130,11 @@ class CGMElements
~CGMElements();
CGMElements& operator=( CGMElements& );
void Init();
Bundle* GetBundleIndex( long nIndex, BundleList&, Bundle& );
static Bundle* GetBundleIndex( long nIndex, BundleList&, Bundle& );
static Bundle* GetBundle( BundleList& rList, long nIndex );
Bundle* InsertBundle( BundleList&, Bundle& );
static Bundle* InsertBundle( BundleList&, Bundle& );
static void DeleteAllBundles( BundleList& );
void CopyAllBundles( BundleList& Source, BundleList& Dest );
static void CopyAllBundles( BundleList& Source, BundleList& Dest );
};
#endif

2
filter/source/msfilter/eschesdo.hxx
View File

@ -155,7 +155,7 @@ protected:
EscherSolverContainer& rSolver,
ImplEESdrPageType ePageType, const bool bOOxmlExport = false ); // returns ShapeID
void ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt );
static void ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt );
bool ImplGetText( ImplEESdrObject& rObj );
void ImplWriteAdditionalText(
ImplEESdrObject& rObj,

16
filter/source/msfilter/msdffimp.cxx
View File

@ -218,7 +218,7 @@ void DffPropertyReader::SetDefaultPropSet( SvStream& rStCtrl, sal_uInt32 nOffsDg
ReadDffRecordHeader( rStCtrl, aRecHd );
if ( aRecHd.nRecType == DFF_msofbtDggContainer )
{
if ( rManager.SeekToRec( rStCtrl, DFF_msofbtOPT, aRecHd.GetRecEndFilePos() ) )
if ( SvxMSDffManager::SeekToRec( rStCtrl, DFF_msofbtOPT, aRecHd.GetRecEndFilePos() ) )
{
const_cast<DffPropertyReader*>(this)->pDefaultPropSet = new DffPropSet;
ReadDffPropSet( rStCtrl, *pDefaultPropSet );
@ -242,7 +242,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const
{
DffRecordHeader aRecHd;
ReadDffRecordHeader( rIn, aRecHd );
if ( rManager.SeekToRec( rIn, DFF_msofbtOPT, aRecHd.GetRecEndFilePos() ) )
if ( SvxMSDffManager::SeekToRec( rIn, DFF_msofbtOPT, aRecHd.GetRecEndFilePos() ) )
{
rIn |= (DffPropertyReader&)*this;
}
@ -350,7 +350,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const
}
sal_Int32 DffPropertyReader::Fix16ToAngle( sal_Int32 nContent ) const
sal_Int32 DffPropertyReader::Fix16ToAngle( sal_Int32 nContent )
{
sal_Int32 nAngle = 0;
if ( nContent )
@ -1321,7 +1321,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
bool bOK = const_cast<SvxMSDffManager&>(rManager).GetBLIP( GetPropertyValue( DFF_Prop_fillBlip ), aGraf, NULL );
// then try directly from stream (i.e. Excel chart hatches/bitmaps)
if ( !bOK )
bOK = SeekToContent( DFF_Prop_fillBlip, rIn ) && rManager.GetBLIPDirect( rIn, aGraf, NULL );
bOK = SeekToContent( DFF_Prop_fillBlip, rIn ) && SvxMSDffManager::GetBLIPDirect( rIn, aGraf, NULL );
if ( bOK )
{
if ( eMSO_FillType == mso_fillPattern )
@ -3233,7 +3233,7 @@ bool SvxMSDffManager::SeekToShape( SvStream& rSt, void* /* pClientData */, sal_u
return bRet;
}
bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd, sal_uLong nSkipCount ) const
bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd, sal_uLong nSkipCount )
{
bool bRet = false;
sal_uLong nFPosMerk = rSt.Tell(); // store FilePos to restore it later if necessary
@ -6286,7 +6286,7 @@ bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* pVisA
/* access to a BLIP at runtime (with correctly positioned stream)
---------------------------------
******************************************************************************/
bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea ) const
bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea )
{
sal_uLong nOldPos = rBLIPStream.Tell();
@ -6472,7 +6472,7 @@ bool SvxMSDffManager::ReadCommonRecordHeader(SvStream& rSt,
}
bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDatLen,
char*& rpBuff, sal_uInt32& rBuffLen ) const
char*& rpBuff, sal_uInt32& rBuffLen )
{
if( nDatLen )
{
@ -6484,7 +6484,7 @@ bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDatLen,
}
bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLen,
char*& rpBuff, sal_uInt32& rBuffLen ) const
char*& rpBuff, sal_uInt32& rBuffLen )
{
if( nDatLen )
{

2
filter/source/msfilter/mstoolbar.cxx
View File

@ -483,7 +483,7 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
aProp.Name = "CommandURL";
ooo::vba::MacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true );
if ( aMacroInf.mbFound )
aProp.Value = helper.createCommandFromMacro( aMacroInf.msResolvedMacro );
aProp.Value = CustomToolBarImportHelper::createCommandFromMacro( aMacroInf.msResolvedMacro );
else
aProp.Value <<= OUString( "UnResolvedMacro[" ).concat( extraInfo.getOnAction() ).concat( OUString( "]" ) );
sControlData.push_back( aProp );

49
filter/source/msfilter/svdfppt.cxx
View File

@ -241,7 +241,7 @@ SvStream& ReadPptExOleObjAtom( SvStream& rIn, PptExOleObjAtom& rAtom )
return rIn;
}
Size PptDocumentAtom::GetPageSize(const Size& rSiz) const
Size PptDocumentAtom::GetPageSize(const Size& rSiz)
{
return rSiz;
}
@ -2178,7 +2178,7 @@ PptSlidePersistList* SdrPowerPointImport::GetPageList(PptPageKind ePageKind) con
return NULL;
}
SdrOutliner* SdrPowerPointImport::GetDrawOutliner( SdrTextObj* pSdrText ) const
SdrOutliner* SdrPowerPointImport::GetDrawOutliner( SdrTextObj* pSdrText )
{
if ( !pSdrText )
return NULL;
@ -3169,7 +3169,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
const DffRecordHeader* pListHd = rMan.aDocRecManager.GetRecordHeader( PPT_PST_List, SEEK_FROM_BEGINNING );
if( pListHd )
pListHd->SeekToContent( rSt );
if ( pListHd && rMan.SeekToContentOfProgTag( 9, rSt, *pListHd, aContentDataHd ) )
if ( pListHd && SdrPowerPointImport::SeekToContentOfProgTag( 9, rSt, *pListHd, aContentDataHd ) )
{
while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aContentDataHd.GetRecEndFilePos() ) )
{
@ -3187,7 +3187,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
{
rSt.ReadUInt16( nType );
Graphic aGraphic;
if ( rMan.GetBLIPDirect( rSt, aGraphic, NULL ) )
if ( SvxMSDffManager::GetBLIPDirect( rSt, aGraphic, NULL ) )
{
sal_uInt32 nInstance = aBuGraAtomHd.nRecInstance;
PPTBuGraEntry* pBuGra = new PPTBuGraEntry( aGraphic, nInstance );
@ -3247,7 +3247,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
}
}
if ( pHd && rMan.SeekToContentOfProgTag( 9, rSt, *pHd, aContentDataHd ) )
if ( pHd && SdrPowerPointImport::SeekToContentOfProgTag( 9, rSt, *pHd, aContentDataHd ) )
{ // get the extended paragraph styles on mainmaster ( graphical bullets, num ruling ... )
while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aContentDataHd.GetRecEndFilePos() ) )
{
@ -4486,7 +4486,7 @@ PPTTextRulerInterpreter::PPTTextRulerInterpreter( PPTTextRulerInterpreter& rRule
mpImplRuler->nRefCount++;
}
PPTTextRulerInterpreter::PPTTextRulerInterpreter( sal_uInt32 nFileOfs, SdrPowerPointImport& rMan, DffRecordHeader& rHeader, SvStream& rIn ) :
PPTTextRulerInterpreter::PPTTextRulerInterpreter( sal_uInt32 nFileOfs, DffRecordHeader& rHeader, SvStream& rIn ) :
mpImplRuler ( new PPTRuler() )
{
if ( nFileOfs != 0xffffffff )
@ -4501,7 +4501,7 @@ PPTTextRulerInterpreter::PPTTextRulerInterpreter( sal_uInt32 nFileOfs, SdrPowerP
else
{
rHeader.SeekToContent( rIn );
if ( rMan.SeekToRec( rIn, PPT_PST_TextRulerAtom, rHeader.GetRecEndFilePos(), &rHd ) )
if ( SvxMSDffManager::SeekToRec( rIn, PPT_PST_TextRulerAtom, rHeader.GetRecEndFilePos(), &rHd ) )
nFileOfs++;
}
if ( nFileOfs )
@ -4820,13 +4820,13 @@ void StyleTextProp9::Read( SvStream& rIn )
rIn.ReadUInt16( mfBidi );
}
PPTStyleTextPropReader::PPTStyleTextPropReader( SvStream& rIn, SdrPowerPointImport& rMan, const DffRecordHeader& rTextHeader,
PPTStyleTextPropReader::PPTStyleTextPropReader( SvStream& rIn, const DffRecordHeader& rTextHeader,
PPTTextRulerInterpreter& rRuler, const DffRecordHeader& rExtParaHd, sal_uInt32 nInstance )
{
Init(rIn, rMan, rTextHeader, rRuler, rExtParaHd, nInstance);
Init(rIn, rTextHeader, rRuler, rExtParaHd, nInstance);
}
void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport& rMan, const DffRecordHeader& rTextHeader,
void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, const DffRecordHeader& rTextHeader,
const OUString& aString, PPTTextRulerInterpreter& rRuler,
sal_uInt32& nCharCount, bool& bTextPropAtom )
{
@ -4838,7 +4838,7 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport&
DffRecordHeader aTextHd2;
rTextHeader.SeekToContent( rIn );
if ( rMan.SeekToRec( rIn, PPT_PST_StyleTextPropAtom, rTextHeader.GetRecEndFilePos(), &aTextHd2 ) )
if ( SvxMSDffManager::SeekToRec( rIn, PPT_PST_StyleTextPropAtom, rTextHeader.GetRecEndFilePos(), &aTextHd2 ) )
bTextPropAtom = true;
while ( nCharAnzRead <= nStringLen )
{
@ -5072,7 +5072,7 @@ void PPTStyleTextPropReader::ReadCharProps( SvStream& rIn, PPTCharPropSet& aChar
}
}
void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, const DffRecordHeader& rTextHeader,
void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHeader,
PPTTextRulerInterpreter& rRuler, const DffRecordHeader& rExtParaHd, sal_uInt32 nInstance )
{
sal_uInt32 nMerk = rIn.Tell();
@ -5163,7 +5163,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
// no chars, but potentially char/para props?
sal_uInt32 nCharCount;
bool bTextPropAtom = false;
ReadParaProps( rIn, rMan, rTextHeader, aString, rRuler, nCharCount, bTextPropAtom );
ReadParaProps( rIn, rTextHeader, aString, rRuler, nCharCount, bTextPropAtom );
if ( bTextPropAtom )
{
@ -5188,7 +5188,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
sal_uInt32 nCharCount;
bool bTextPropAtom = false;
ReadParaProps( rIn, rMan, rTextHeader, aString, rRuler, nCharCount, bTextPropAtom );
ReadParaProps( rIn, rTextHeader, aString, rRuler, nCharCount, bTextPropAtom );
bool bEmptyParaPossible = true;
sal_uInt32 nCharAnzRead = 0;
@ -6371,14 +6371,14 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
sal_uInt32 nOldPos = rIn.Tell();
DffRecordHeader& aClientDataContainerHd = *rSdrPowerPointImport.maShapeRecords.Current();
DffRecordHeader aPlaceHolderAtomHd;
if ( rSdrPowerPointImport.SeekToRec( rIn, PPT_PST_OEPlaceholderAtom, aClientDataContainerHd.GetRecEndFilePos(), &aPlaceHolderAtomHd ) )
if ( SvxMSDffManager::SeekToRec( rIn, PPT_PST_OEPlaceholderAtom, aClientDataContainerHd.GetRecEndFilePos(), &aPlaceHolderAtomHd ) )
{
mpImplTextObj->mpPlaceHolderAtom = new PptOEPlaceholderAtom;
ReadPptOEPlaceholderAtom( rIn, *( mpImplTextObj->mpPlaceHolderAtom ) );
}
rIn.Seek( nOldPos );
DffRecordHeader aProgTagHd;
if ( rSdrPowerPointImport.SeekToContentOfProgTag( 9, rIn, aClientDataContainerHd, aProgTagHd ) )
if ( SdrPowerPointImport::SeekToContentOfProgTag( 9, rIn, aClientDataContainerHd, aProgTagHd ) )
{
ReadDffRecordHeader( rIn, aExtParaHd );
}
@ -6400,12 +6400,12 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
// the ClientTextBoxHd for a
// equivalent one
DffRecordHeader aTextHd;
if ( rSdrPowerPointImport.SeekToRec( rIn, PPT_PST_OutlineTextRefAtom, aClientTextBoxHd.GetRecEndFilePos(), &aTextHd ) )
if ( SvxMSDffManager::SeekToRec( rIn, PPT_PST_OutlineTextRefAtom, aClientTextBoxHd.GetRecEndFilePos(), &aTextHd ) )
{
sal_uInt32 nRefNum;
rIn.ReadUInt32( nRefNum );
if ( rSdrPowerPointImport.SeekToRec( rIn, PPT_PST_TextRulerAtom, aClientTextBoxHd.GetRecEndFilePos() ) )
if ( SvxMSDffManager::SeekToRec( rIn, PPT_PST_TextRulerAtom, aClientTextBoxHd.GetRecEndFilePos() ) )
nTextRulerAtomOfs = rIn.Tell();
else
nTextRulerAtomOfs = 0xffffffff;
@ -6518,7 +6518,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
if ( bStatus )
{
if ( rSdrPowerPointImport.SeekToRec( rIn, PPT_PST_TextHeaderAtom, aClientTextBoxHd.GetRecEndFilePos(), &aTextHd ) )
if ( SvxMSDffManager::SeekToRec( rIn, PPT_PST_TextHeaderAtom, aClientTextBoxHd.GetRecEndFilePos(), &aTextHd ) )
{
// TextHeaderAtom is always the first Atom
sal_uInt16 nInstance;
@ -6532,14 +6532,13 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
if ( rSdrPowerPointImport.SeekToRec2( PPT_PST_TextBytesAtom,
PPT_PST_TextCharsAtom,
aClientTextBoxHd.GetRecEndFilePos() )
|| rSdrPowerPointImport.SeekToRec( rIn,
|| SvxMSDffManager::SeekToRec( rIn,
PPT_PST_StyleTextPropAtom,
aClientTextBoxHd.GetRecEndFilePos() ) )
{
PPTTextRulerInterpreter aTextRulerInterpreter( nTextRulerAtomOfs, rSdrPowerPointImport,
aClientTextBoxHd, rIn );
PPTTextRulerInterpreter aTextRulerInterpreter( nTextRulerAtomOfs, aClientTextBoxHd, rIn );
PPTStyleTextPropReader aStyleTextPropReader( rIn, rSdrPowerPointImport, aClientTextBoxHd,
PPTStyleTextPropReader aStyleTextPropReader( rIn, aClientTextBoxHd,
aTextRulerInterpreter, aExtParaHd, nInstance );
sal_uInt32 nParagraphs = mpImplTextObj->mnParagraphCount = aStyleTextPropReader.aParaPropList.size();
if ( nParagraphs )
@ -6547,7 +6546,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
// the language settings will be merged into the list of PPTCharPropSet
DffRecordHeader aTextSpecInfoHd;
PPTTextSpecInfoAtomInterpreter aTextSpecInfoAtomInterpreter;
if ( rSdrPowerPointImport.SeekToRec( rIn, PPT_PST_TextSpecInfoAtom,
if ( SvxMSDffManager::SeekToRec( rIn, PPT_PST_TextSpecInfoAtom,
aClientTextBoxHd.GetRecEndFilePos(), &aTextSpecInfoHd ) )
{
if ( aTextSpecInfoAtomInterpreter.Read( rIn, aTextSpecInfoHd, PPT_PST_TextSpecInfoAtom,
@ -6732,7 +6731,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
case PPT_PST_InteractiveInfo :
{
DffRecordHeader aHdInteractiveInfoAtom;
if ( rSdrPowerPointImport.SeekToRec( rIn, PPT_PST_InteractiveInfoAtom, aTextHd.GetRecEndFilePos(), &aHdInteractiveInfoAtom ) )
if ( SvxMSDffManager::SeekToRec( rIn, PPT_PST_InteractiveInfoAtom, aTextHd.GetRecEndFilePos(), &aHdInteractiveInfoAtom ) )
{
PptInteractiveInfoAtom aInteractiveInfoAtom;
ReadPptInteractiveInfoAtom( rIn, aInteractiveInfoAtom );

2
filter/source/svg/gfxtypes.hxx
View File

@ -21,7 +21,7 @@ namespace svgi
struct ARGBColor
{
double toDoubleColor( sal_uInt8 val ) const { return val/255.0; }
static double toDoubleColor( sal_uInt8 val ) { return val/255.0; }
ARGBColor() : a(1.0), r(0.0), g(0.0), b(0.0)
{}

12
filter/source/svg/svgfilter.hxx
View File

@ -250,7 +250,7 @@ private:
bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
bool implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
Reference< XWriter > implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
static Reference< XWriter > implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
bool implGetPagePropSet( const Reference< XDrawPage > & rxPage );
bool implGenerateMetaData();
@ -282,18 +282,18 @@ private:
bool implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape );
bool implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage );
OUString implGetClassFromShape( const Reference< XShape >& rxShape );
static OUString implGetClassFromShape( const Reference< XShape >& rxShape );
void implRegisterInterface( const Reference< XInterface >& rxIf );
const OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf );
OUString implGetInterfaceName( const Reference< XInterface >& rxIf );
static OUString implGetInterfaceName( const Reference< XInterface >& rxIf );
bool implLookForFirstVisiblePage();
Any implSafeGetPagePropSet( const OUString & sPropertyName,
static Any implSafeGetPagePropSet( const OUString & sPropertyName,
const Reference< XPropertySet > & rxPropSet,
const Reference< XPropertySetInfo > & rxPropSetInfo );
DECL_LINK( CalcFieldHdl, EditFieldInfo* );
bool isStreamGZip(css::uno::Reference<css::io::XInputStream> xInput);
bool isStreamSvg(css::uno::Reference<css::io::XInputStream> xInput);
static bool isStreamGZip(css::uno::Reference<css::io::XInputStream> xInput);
static bool isStreamSvg(css::uno::Reference<css::io::XInputStream> xInput);
protected:

22
filter/source/svg/svgreader.cxx
View File

@ -302,7 +302,7 @@ struct AnnotatingVisitor
}
}
OUString getStyleName( const char* sPrefix, sal_Int32 nId )
static OUString getStyleName( const char* sPrefix, sal_Int32 nId )
{
return OUString::createFromAscii(sPrefix)+OUString::number(nId);
}
@ -391,14 +391,14 @@ struct AnnotatingVisitor
rGradient.maStops.erase(rGradient.maStops.begin()+2,rGradient.maStops.end());
}
sal_Int8 toByteColor( double val )
static sal_Int8 toByteColor( double val )
{
// TODO(Q3): duplicated from vcl::unotools
return sal::static_int_cast<sal_Int8>(
basegfx::fround(val*255.0));
}
OUString getOdfColor( const ARGBColor& rColor )
static OUString getOdfColor( const ARGBColor& rColor )
{
// TODO(Q3): duplicated from pdfimport
OUStringBuffer aBuf( 7 );
@ -422,7 +422,7 @@ struct AnnotatingVisitor
return aBuf.makeStringAndClear();
}
OUString getOdfAlign( TextAlign eAlign )
static OUString getOdfAlign( TextAlign eAlign )
{
static const char aStart[] = "start";
static const char aEnd[] = "end";
@ -1070,7 +1070,7 @@ struct AnnotatingVisitor
while( nIndex != -1 );
}
void parseFontStyle( State& io_rInitialState,
static void parseFontStyle( State& io_rInitialState,
const OUString& rValue,
const char* sValue )
{
@ -1078,7 +1078,7 @@ struct AnnotatingVisitor
io_rInitialState.maFontStyle = rValue;
}
void parseFontVariant( State& io_rInitialState,
static void parseFontVariant( State& io_rInitialState,
const OUString& rValue,
const char* sValue )
{
@ -1086,7 +1086,7 @@ struct AnnotatingVisitor
io_rInitialState.maFontVariant = rValue;
}
void parseTextAlign( State& io_rInitialState,
static void parseTextAlign( State& io_rInitialState,
const char* sValue )
{
if( strcmp(sValue,"start") == 0 )
@ -1570,10 +1570,10 @@ struct ShapeWritingVisitor
}
}
void push()
static void push()
{}
void pop()
static void pop()
{}
void writeBinaryData( rtl::Reference<SvXMLAttributeList>& xAttrs,
@ -1823,8 +1823,8 @@ struct OfficeStylesWritingVisitor
return;
}
void push() {}
void pop() {}
static void push() {}
static void pop() {}
State maCurrState;
StateMap& mrStateMap;

6
filter/source/svg/svgwriter.hxx
View File

@ -103,7 +103,7 @@ private:
SVGAttributeWriter();
double ImplRound( double fVal, sal_Int32 nDecs = 3 );
static double ImplRound( double fVal, sal_Int32 nDecs = 3 );
public:
@ -349,8 +349,8 @@ private:
void ImplWriteGradientEx( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, sal_uInt32 nWriteFlags);
void ImplWriteGradientLinear( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient );
void ImplWriteGradientStop( const Color& rColor, double fOffset );
Color ImplGetColorWithIntensity( const Color& rColor, sal_uInt16 nIntensity );
Color ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset );
static Color ImplGetColorWithIntensity( const Color& rColor, sal_uInt16 nIntensity );
static Color ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset );
void ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, const Gradient& rGradient, sal_uInt32 nWriteFlags );
void ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, bool bApplyMapping = true );
void ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor, bool bApplyMapping );

4
filter/source/xsltdialog/typedetectionexport.hxx
View File

@ -33,8 +33,8 @@ public:
void doExport(com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > xOS, const XMLFilterVector& rFilters );
private:
void addProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue );
void addLocaleProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue );
static void addProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue );
static void addLocaleProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue );
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
};

2
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
View File

@ -1552,7 +1552,7 @@ void XMLFilterListBox::changeEntry( const filter_info_impl* pInfo )
OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo ) const
OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo )
{
OUString aEntryStr( pInfo->maFilterName + "\t");
if ( !pInfo->maExportService.isEmpty() )

2
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
View File

@ -65,7 +65,7 @@ private:
DECL_LINK( TabBoxScrollHdl_Impl, SvTabListBox* );
DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
OUString getEntryString( const filter_info_impl* pInfo ) const;
static OUString getEntryString( const filter_info_impl* pInfo );
public:
XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl);

2
filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
View File

@ -58,7 +58,7 @@ public:
private:
void SetURL( SvtURLBox *rURLBox, const OUString& rURL );
OUString GetURL( SvtURLBox* rURLBox );
static OUString GetURL( SvtURLBox* rURLBox );
OUString sInstPath;
};

2
filter/source/xsltdialog/xmlfiltertestdialog.hxx
View File

@ -54,7 +54,7 @@ private:
com::sun::star::uno::Reference< com::sun::star::lang::XComponent > getFrontMostDocument( const OUString& rServiceName );
void import( const OUString& rURL );
void displayXMLFile( const OUString& rURL );
static void displayXMLFile( const OUString& rURL );
void doExport( com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp );
private:

8
include/filter/msfilter/escherex.hxx
View File

@ -578,7 +578,7 @@ struct MSFILTER_DLLPUBLIC EscherConnectorListEntry
maPointB ( rPB ),
mXConnectToB( rSB ) {}
sal_uInt32 GetClosestPoint( const Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
static sal_uInt32 GetClosestPoint( const Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
};
struct MSFILTER_DLLPUBLIC EscherExContainer
@ -782,7 +782,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
bool bHasComplexData;
sal_uInt32 ImplGetColor( const sal_uInt32 rColor, bool bSwap = true );
static sal_uInt32 ImplGetColor( const sal_uInt32 rColor, bool bSwap = true );
void ImplCreateGraphicAttributes(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
sal_uInt32 nBlibId,
@ -1272,8 +1272,8 @@ public:
virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect);
sal_uInt32 GetColor( const sal_uInt32 nColor, bool bSwap = true );
sal_uInt32 GetColor( const Color& rColor, bool bSwap = true );
static sal_uInt32 GetColor( const sal_uInt32 nColor, bool bSwap = true );
static sal_uInt32 GetColor( const Color& rColor, bool bSwap = true );
// ...Sdr... implemented in eschesdo.cxx

18
include/filter/msfilter/msdffimp.hxx
View File

@ -88,7 +88,7 @@ public:
explicit DffPropertyReader( const SvxMSDffManager& rManager );
~DffPropertyReader();
sal_Int32 Fix16ToAngle( sal_Int32 nAngle ) const;
static sal_Int32 Fix16ToAngle( sal_Int32 nAngle );
#ifdef DBG_CUSTOMSHAPE
void ReadPropSet( SvStream& rIn, void* pClientData, sal_uInt32 nShapeType = 0 ) const;
@ -482,17 +482,17 @@ protected :
const Rectangle& rVisArea );
// the following methods need to be overridden for Excel imports
bool ProcessClientAnchor( SvStream& rStData,
static bool ProcessClientAnchor( SvStream& rStData,
sal_uInt32 nDatLen,
char*& rpBuff,
sal_uInt32& rBuffLen ) const;
sal_uInt32& rBuffLen );
virtual void ProcessClientAnchor2( SvStream& rStData,
DffRecordHeader& rHd,
void* pData, DffObjData& );
bool ProcessClientData( SvStream& rStData,
static bool ProcessClientData( SvStream& rStData,
sal_uInt32 nDatLen,
char*& rpBuff,
sal_uInt32& rBuffLen ) const;
sal_uInt32& rBuffLen );
virtual SdrObject* ProcessObj( SvStream& rSt,
DffObjData& rData,
void* pData,
@ -534,11 +534,11 @@ public:
virtual bool SeekToShape( SvStream& rSt,
void* pClientData,
sal_uInt32 nId ) const;
bool SeekToRec( SvStream& rSt,
static bool SeekToRec( SvStream& rSt,
sal_uInt16 nRecId,
sal_uLong nMaxFilePos,
DffRecordHeader* pRecHd = NULL,
sal_uLong nSkipCount = 0 ) const;
sal_uLong nSkipCount = 0 );
bool SeekToRec2( sal_uInt16 nRecId1,
sal_uInt16 nRecId2,
sal_uLong nMaxFilePos,
@ -639,7 +639,7 @@ public:
@return true if successful, false otherwise
*/
bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = NULL ) const;
static bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = NULL );
bool GetShape(sal_uLong nId, SdrObject*& rpData, SvxMSDffImportData& rData);
@ -721,7 +721,7 @@ public:
@param rSolver contains necessary data that is collected during the
import of each shape
*/
void SolveSolver( const SvxMSDffSolverContainer& rSolver );
static void SolveSolver( const SvxMSDffSolverContainer& rSolver );
static bool SetPropValue(
const ::com::sun::star::uno::Any& rAny,

8
include/filter/msfilter/mstoolbar.hxx
View File

@ -47,7 +47,7 @@ class MSFILTER_DLLPUBLIC CustomToolBarImportHelper
css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp;
css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
SfxObjectShell& mrDocSh;
void ScaleImage( css::uno::Reference< css::graphic::XGraphic >& xGraphic, long nNewSize );
static void ScaleImage( css::uno::Reference< css::graphic::XGraphic >& xGraphic, long nNewSize );
public:
CustomToolBarImportHelper( SfxObjectShell& rDocSh, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr );
@ -56,7 +56,7 @@ public:
css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager() { return m_xAppCfgMgr;}
css::uno::Any createCommandFromMacro( const OUString& sCmd );
static css::uno::Any createCommandFromMacro( const OUString& sCmd );
void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const OUString& sString );
void applyIcons();
@ -71,7 +71,7 @@ class MSFILTER_DLLPUBLIC TBBase
friend class Indent;
static int nIndent; // num spaces to indent before printing
protected:
void indent_printf(FILE* fp, const char* format, ... );
static void indent_printf(FILE* fp, const char* format, ... );
sal_uInt32 nOffSet; // usually for debug we can store the offset in the stream to this record
public:
TBBase() : nOffSet( 0 ) {}
@ -95,7 +95,7 @@ public:
TBBase::nIndent = TBBase::nIndent + 2;
}
~Indent() { TBBase::nIndent = TBBase::nIndent - 2; }
void init() { TBBase::nIndent = 0; }
static void init() { TBBase::nIndent = 0; }
};

14
include/filter/msfilter/svdfppt.hxx
View File

@ -187,7 +187,7 @@ struct MSFILTER_DLLPUBLIC PptDocumentAtom
public:
Size GetPageSize( const Size& rSiz ) const;
static Size GetPageSize( const Size& rSiz );
Size GetSlidesPageSize() const { return GetPageSize( aSlidesPageSize ); }
Size GetNotesPageSize() const { return GetPageSize( aNotesPageSize ); }
@ -496,7 +496,7 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry
OUString pPlaceholder[ 4 ];
sal_uInt32 nAtom;
sal_uInt32 GetMaskForInstance( sal_uInt32 nInstance );
static sal_uInt32 GetMaskForInstance( sal_uInt32 nInstance );
sal_uInt32 IsToDisplay( sal_uInt32 nInstance );
sal_uInt32 NeedToImportInstance(
const sal_uInt32 nInstance,
@ -560,7 +560,7 @@ protected:
bool SeekToAktPage(DffRecordHeader* pRecHd=NULL) const;
bool SeekToDocument(DffRecordHeader* pRecHd=NULL) const;
bool SeekToContentOfProgTag(
static bool SeekToContentOfProgTag(
sal_Int32 nVersion,
SvStream& rSt,
const DffRecordHeader& rProgTagBinaryDataHd,
@ -593,7 +593,7 @@ protected:
sal_uInt32 GetAktPageId();
sal_uInt32 GetMasterPageId(sal_uInt16 nPageNum, PptPageKind ePageKind) const;
sal_uInt32 GetNotesPageId(sal_uInt16 nPageNum ) const;
SdrOutliner* GetDrawOutliner( SdrTextObj* pSdrText ) const;
static SdrOutliner* GetDrawOutliner( SdrTextObj* pSdrText );
void SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOptions );
void ApplyTextAnchorAttributes( PPTTextObj& rTextObj, SfxItemSet& rSet ) const;
@ -1014,7 +1014,6 @@ struct PPTTextRulerInterpreter
PPTTextRulerInterpreter( PPTTextRulerInterpreter& rRuler );
PPTTextRulerInterpreter(
sal_uInt32 nFileOfs,
SdrPowerPointImport&,
DffRecordHeader& rHd,
SvStream& rIn
);
@ -1077,7 +1076,6 @@ struct PPTStyleTextPropReader
PPTStyleTextPropReader(
SvStream& rIn,
SdrPowerPointImport&,
const DffRecordHeader& rClientTextBoxHd,
PPTTextRulerInterpreter& rInterpreter,
const DffRecordHeader& rExtParaHd,
@ -1087,7 +1085,6 @@ struct PPTStyleTextPropReader
void Init(
SvStream& rIn,
SdrPowerPointImport&,
const DffRecordHeader& rClientTextBoxHd,
PPTTextRulerInterpreter& rInterpreter,
const DffRecordHeader& rExtParaHd,
@ -1095,14 +1092,13 @@ struct PPTStyleTextPropReader
);
void ReadParaProps(
SvStream& rIn,
SdrPowerPointImport& rMan,
const DffRecordHeader& rTextHeader,
const OUString& aString,
PPTTextRulerInterpreter& rRuler,
sal_uInt32& nCharCount,
bool& bTextPropAtom
);
void ReadCharProps(
static void ReadCharProps(
SvStream& rIn,
PPTCharPropSet& aCharPropSet,
const OUString& aString,

2
sd/source/filter/eppt/eppt.cxx
View File

@ -1221,7 +1221,7 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su
{
if ( ImplGetPropertyValue( rXPropSet, OUString( "FillColor" ) ) )
{
nFillColor = mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) );
nFillColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) );
nFillBackColor = nFillColor ^ 0xffffff;
}
} // PASSTHROUGH INTENDED

8
sd/source/filter/eppt/epptso.cxx
View File

@ -844,7 +844,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
case ::com::sun::star::drawing::FillStyle_SOLID :
{
if ( PropValue::GetPropertyValue( aAny, mXPropSet, OUString( "FillColor" ) ) )
nBackgroundColor = mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) );
nBackgroundColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) );
}
break;
case ::com::sun::star::drawing::FillStyle_NONE :
@ -867,7 +867,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
case ::com::sun::star::drawing::FillStyle_SOLID :
{
if ( PropValue::GetPropertyValue( aAny, mXBackgroundPropSet, OUString( "FillColor" ) ) )
nBackgroundColor = mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) );
nBackgroundColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) );
}
break;
default:
@ -902,7 +902,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
if ( PropValue::GetPropertyValue( aAny, aPropSetOfNextShape,
OUString( "FillColor" ), true ) )
{
if ( nCharColor == mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) ) )
if ( nCharColor == EscherEx::GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) ) )
{
nCharAttr |= 0x200;
}
@ -1891,7 +1891,7 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
if ( bDimHide )
nAfterEffect |= 2;
if ( ImplGetPropertyValue( OUString( "DimColor" ) ) )
nDimColor = mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) ) | 0xfe000000;
nDimColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) ) | 0xfe000000;
rSt.WriteUInt32( nDimColor ).WriteUInt32( nFlags ).WriteUInt32( nSoundRef ).WriteUInt32( nDelayTime )
.WriteUInt16( nOrder ) // order of build ( 1.. )

4
svgio/inc/svgio/svgreader/svgtextnode.hxx
View File

@ -43,10 +43,10 @@ namespace svgio
const SvgNode& rCandidate,
drawinglayer::primitive2d::Primitive2DSequence& rTarget,
SvgTextPosition& rSvgTextPosition) const;
void addTextPrimitives(
static void addTextPrimitives(
const SvgNode& rCandidate,
drawinglayer::primitive2d::Primitive2DSequence& rTarget,
drawinglayer::primitive2d::Primitive2DSequence& rSource) const;
drawinglayer::primitive2d::Primitive2DSequence& rSource);
public:
SvgTextNode(

2
svgio/source/svgreader/svgtextnode.cxx
View File

@ -89,7 +89,7 @@ namespace svgio
void SvgTextNode::addTextPrimitives(
const SvgNode& rCandidate,
drawinglayer::primitive2d::Primitive2DSequence& rTarget,
drawinglayer::primitive2d::Primitive2DSequence& rSource) const
drawinglayer::primitive2d::Primitive2DSequence& rSource)
{
if(rSource.hasElements())
{

4
svx/source/tbxctrls/tbcontrl.cxx
View File

@ -160,9 +160,9 @@ private:
void ReleaseFocus();
static Color TestColorsVisible(const Color &FontCol, const Color &BackCol);
void UserDrawEntry(const UserDrawEvent& rUDEvt, const OUString &rStyleName);
static void UserDrawEntry(const UserDrawEvent& rUDEvt, const OUString &rStyleName);
void SetupEntry(sal_uInt16 nItem, const Rectangle& rRect, OutputDevice *pDevice, const OUString &rStyleName, bool bIsNotSelected);
bool AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight);
static bool AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight);
DECL_LINK( MenuSelectHdl, Menu * );
};

2
ucb/source/ucp/gio/gio_content.hxx
View File

@ -101,7 +101,7 @@ private:
void destroy( bool bDeletePhysical ) throw( com::sun::star::uno::Exception );
void copyData( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn,
static void copyData( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn,
com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOut );
com::sun::star::uno::Sequence< com::sun::star::uno::Any >