diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-10-12 13:26:46 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-10-12 13:34:47 +0200 |
| commit | f7a24eff2d40ca30c6f299ab6534393c5c146b95 (patch) | |
| tree | 41639f5f6d1f02968d888051e7aeaedbb397d272 | |
| parent | 2c3759735f53c06ebd75a344cc10a47f20f32f09 (diff) | |
mark lcl_ functions static or rename them if they are not local at all
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html
Change-Id: I231f0b367bf0b513c6c1ce4c4cfdb7c3dc8660d5
190 files changed, 526 insertions, 527 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 6735dfe6299c..cd43e1b4c6bd 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -494,7 +494,7 @@ void clearNativeObjectWrapperVector( void ) GaNativeObjectWrapperVector::get().clear(); } -sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj ) +static sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj ) { NativeObjectWrapperVector &rNativeObjectWrapperVector = GaNativeObjectWrapperVector::get(); sal_uInt32 nIndex = rNativeObjectWrapperVector.size(); @@ -502,7 +502,7 @@ sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj ) return nIndex; } -SbxObject* lcl_getNativeObject( sal_uInt32 nIndex ) +static SbxObject* lcl_getNativeObject( sal_uInt32 nIndex ) { SbxObjectRef xRetObj; NativeObjectWrapperVector &rNativeObjectWrapperVector = GaNativeObjectWrapperVector::get(); @@ -4552,7 +4552,7 @@ typedef std::vector< StarBasicDisposeItem* > DisposeItemVector; static DisposeItemVector GaDisposeItemVector; -DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic ) +static DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic ) { DisposeItemVector::iterator it; for( it = GaDisposeItemVector.begin() ; it != GaDisposeItemVector.end() ; ++it ) @@ -4564,7 +4564,7 @@ DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic ) return GaDisposeItemVector.end(); } -StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic ) +static StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic ) { DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic ); StarBasicDisposeItem* pItem = (it != GaDisposeItemVector.end()) ? *it : NULL; diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 4692ca49d47d..7072c09cb3d7 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -915,7 +915,7 @@ RTLFUNC(FindPropertyObject) -sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, +static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray ) { sal_uIntPtr nFPos = pStrm->Tell(); @@ -1001,7 +1001,7 @@ sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, return pStrm->GetErrorCode() ? sal_False : sal_True; } -sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, +static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray ) { (void)bBinary; @@ -1111,7 +1111,7 @@ sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, // nCurDim = 1...n -sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm, +static sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm, sal_Bool bBinary, short nCurDim, short* pOtherDims, sal_Bool bWrite ) { DBG_ASSERT( nCurDim > 0,"Bad Dim"); diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index 40d8f6982fcb..05a2759af4ef 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -43,8 +43,8 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl:: // for a patch forward declaring these methods below makes sense // but, #FIXME lets really just move the methods to the top -void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ); -void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled ); +static void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ); +static void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled ); SbxVariable* getDefaultProp( SbxVariable* pRef ); @@ -972,7 +972,7 @@ void SbiRuntime::StepREDIMP_ERASE() refVar->SetType( SbxEMPTY ); } -void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ) +static void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ) { sal_uInt16 nSavFlags = refVar->GetFlags(); refVar->ResetFlag( SBX_FIXED ); @@ -981,7 +981,7 @@ void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ) refVar->Clear(); } -void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled ) +static void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled ) { SbxDataType eType = refVar->GetType(); if( eType & SbxARRAY ) diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index a72ab7a52cc5..9afd1b1843c9 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -284,7 +284,7 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLExce // ------------------------------------------------------------------------- -sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::rtl::OUString& rName ) +static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::rtl::OUString& rName ) { Any aAny = xSheets->getByName( rName ); Reference<XSpreadsheet> xSheet; @@ -326,7 +326,7 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r return sal_False; } -sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::OUString& rName ) +static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::OUString& rName ) { sal_Bool bUnnamed = sal_False; diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 3d0f2cbcc956..da8cbe573657 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::util; -void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow ) +static void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_UpdateArea" ); // update rEndCol, rEndRow if any non-empty cell in xUsedRange is right/below @@ -90,7 +90,7 @@ void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol } } -void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnCount, sal_Int32& rRowCount ) +static void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnCount, sal_Int32& rRowCount ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetDataArea" ); Reference<XSheetCellCursor> xCursor = xSheet->createCursor(); @@ -140,7 +140,7 @@ void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnC rRowCount = nEndRow; // first row (headers) is not counted } -CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell ) +static CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetContentOrResultType" ); CellContentType eCellType = xCell->getType(); @@ -160,7 +160,7 @@ CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell ) return eCellType; } -Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow ) +static Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetUsedCell" ); Reference<XCell> xCell = xSheet->getCellByPosition( nDocColumn, nDocRow ); @@ -198,7 +198,7 @@ Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet, sal_Int return xCell; } -bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow ) +static bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_HasTextInColumn" ); // look for any text cell or text result in the column @@ -226,7 +226,7 @@ bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocC return false; } -void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<XNumberFormats>& xFormats, +static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<XNumberFormats>& xFormats, sal_Int32 nDocColumn, sal_Int32 nStartRow, sal_Bool bHasHeaders, ::rtl::OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency ) { @@ -314,7 +314,7 @@ void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<X // ------------------------------------------------------------------------- -void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, +static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, sal_Int32 nStartCol, sal_Int32 nStartRow, sal_Bool bHasHeaders, const ::Date& rNullDate, sal_Int32 nDBRow, sal_Int32 nDBColumn, sal_Int32 nType ) @@ -431,7 +431,7 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, // ------------------------------------------------------------------------- -::rtl::OUString lcl_GetColumnStr( sal_Int32 nColumn ) +static ::rtl::OUString lcl_GetColumnStr( sal_Int32 nColumn ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetColumnStr" ); if ( nColumn < 26 ) diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 1a43828a353c..54f94cfdfc64 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1925,7 +1925,7 @@ struct LanguagePosition_Impl }; typedef std::vector<LanguagePosition_Impl> LanguagePositions_Impl; -void lcl_InsertBreakPosition_Impl( +static void lcl_InsertBreakPosition_Impl( LanguagePositions_Impl& rBreakPositions, sal_uInt16 nInsert, LanguageType eLanguage) { LanguagePositions_Impl::iterator aStart = rBreakPositions.begin(); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 5484fd832fa4..6567e7bbffc5 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1359,7 +1359,7 @@ SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAtt return new OfaLanguagesTabPage(pParent, rAttrSet); } -LanguageType lcl_LangStringToLangType(const OUString& rLang) +static LanguageType lcl_LangStringToLangType(const OUString& rLang) { Locale aLocale; sal_Int32 nSep = rLang.indexOf('-'); @@ -1375,7 +1375,7 @@ LanguageType lcl_LangStringToLangType(const OUString& rLang) return eLangType; } -void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount) +static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount) { SfxViewFrame* pCurrentFrm = SfxViewFrame::Current(); SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index cae53775497a..dab862d7ac71 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -261,7 +261,7 @@ void DicUserData::SetChecked( sal_Bool bVal ) // class BrwString_Impl ------------------------------------------------- -void lcl_SetCheckButton( SvLBoxEntry* pEntry, sal_Bool bCheck ) +static void lcl_SetCheckButton( SvLBoxEntry* pEntry, sal_Bool bCheck ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON)); @@ -566,7 +566,7 @@ public: }; -sal_Int32 lcl_SeqGetIndex( const Sequence< OUString > &rSeq, const OUString &rTxt ) +static sal_Int32 lcl_SeqGetIndex( const Sequence< OUString > &rSeq, const OUString &rTxt ) { sal_Int32 nRes = -1; sal_Int32 nLen = rSeq.getLength(); @@ -644,7 +644,7 @@ ServiceInfo_Impl * SvxLinguData_Impl::GetInfoByImplName( const OUString &rSvcImp //----------------------------------------------------------------------------- -void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& rAdd) +static void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& rAdd) { const Locale* pAdd = rAdd.getConstArray(); Sequence<Locale> aLocToAdd(rAdd.getLength()); @@ -672,7 +672,7 @@ void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& pAllLocales2[nLength++] = pLocToAdd[i]; } -void lcl_MergeDisplayArray( +static void lcl_MergeDisplayArray( SvxLinguData_Impl &rData, const ServiceInfo_Impl &rToAdd ) { @@ -1195,14 +1195,14 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent, //------------------------------------------------------------------------ -Any lcl_Bool2Any(sal_Bool bVal) +static Any lcl_Bool2Any(sal_Bool bVal) { Any aRet(&bVal, ::getBooleanCppuType()); return aRet; } -sal_Bool lcl_Bool2Any(Any& rVal) +static sal_Bool lcl_Bool2Any(Any& rVal) { return *(sal_Bool*)rVal.getValue(); } @@ -2120,7 +2120,7 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) return 0; } -OUString lcl_GetServiceName(sal_uInt8 nType) +static OUString lcl_GetServiceName(sal_uInt8 nType) { switch(nType) { diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index f8a5b0192db9..d818d9199aa0 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -542,7 +542,7 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) return 0; } -OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) +static OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) { OUString sRet; const PropertyValue* pProperties = rProperties.getConstArray(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 0403d1a31199..3f57e56300c9 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2162,7 +2162,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( return aOutNodeList; } -sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeListBox& rTreeLB ) +static sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeListBox& rTreeLB ) { String sGroupName( rGroupName ); sal_uInt16 nRet = 0; @@ -2182,7 +2182,7 @@ sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeListBox& return USHRT_MAX; } -void lcl_insertLeaf( +static void lcl_insertLeaf( OfaTreeOptionsDialog* pDlg, OptionsNode* pNode, OptionsLeaf* pLeaf, const SvTreeListBox& rTreeLB ) { sal_uInt16 nGrpId = lcl_getGroupId( pNode->m_sLabel, rTreeLB ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 646e48b8fdd0..1c6e725ea500 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -152,7 +152,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : SetCurPageId( RID_OFAPAGE_SMARTTAG_OPTIONS ); } -sal_Bool lcl_FindEntry( ListBox& rLB, const String& rEntry, +static sal_Bool lcl_FindEntry( ListBox& rLB, const String& rEntry, CollatorWrapper& rCmpClass ) { sal_uInt16 nCount = rLB.GetEntryCount(); @@ -1342,7 +1342,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) return 0; } -sal_Bool lcl_FindInArray(std::vector<rtl::OUString>& rStrings, const String& rString) +static sal_Bool lcl_FindInArray(std::vector<rtl::OUString>& rStrings, const String& rString) { for(std::vector<rtl::OUString>::iterator i = rStrings.begin(); i != rStrings.end(); ++i) { diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 930e380be207..76feb79d27dc 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -100,16 +100,16 @@ struct SvxBackgroundPage_Impl pLoadTimer(NULL), bIsImportDlgInExecute(sal_False) {} }; -inline sal_uInt8 lcl_PercentToTransparency(long nPercent) +static inline sal_uInt8 lcl_PercentToTransparency(long nPercent) { //0xff must not be returned! return sal_uInt8(nPercent ? (50 + 0xfe * nPercent) / 100 : 0); } -inline sal_uInt8 lcl_TransparencyToPercent(sal_uInt8 nTrans) +static inline sal_uInt8 lcl_TransparencyToPercent(sal_uInt8 nTrans) { return (nTrans * 100 + 127) / 254; } -void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency) +static void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency) { uno::Any aTransparency; aTransparency <<= (sal_Int8)nTransparency; diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 89bd14f69b3d..8a44475b5001 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -75,7 +75,7 @@ static sal_uInt16 pRanges[] = }; // ----------------------------------------------------------------------- -void lcl_SetDecimalDigitsTo1(MetricField& rField) +static void lcl_SetDecimalDigitsTo1(MetricField& rField) { sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) ); rField.SetDecimalDigits(1); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 84de225d2471..2297dd8589f5 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -36,7 +36,7 @@ #define TWIP_TO_INCH 1440 -inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) +static inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) { return static_cast<long>(rMetric.Denormalize( rMetric.GetValue( eUnit ))); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 808c6cb33687..b4ee86b26a48 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -101,14 +101,14 @@ static const sal_Char cSuffix[] = "Suffix"; static const sal_Char cBulletChar[] = "BulletChar"; static const sal_Char cBulletFontName[] = "BulletFontName"; -Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider() +static Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider() { Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); Reference<XDefaultNumberingProvider> xRet = text::DefaultNumberingProvider::create(xContext); return xRet; } -SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& rLevelProps) +static SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& rLevelProps) { const PropertyValue* pValues = rLevelProps.getConstArray(); SvxNumSettings_Impl* pNew = new SvxNumSettings_Impl; @@ -154,7 +154,7 @@ static sal_Char const aNumChar[] = }; // Is one of the masked formats set? -sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) +static sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) { sal_Bool bRet = sal_False; sal_uInt16 nMask = 1; @@ -167,7 +167,7 @@ sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) return bRet; } -Font& lcl_GetDefaultBulletFont() +static Font& lcl_GetDefaultBulletFont() { static sal_Bool bInit = 0; static Font aDefBulletFont( rtl::OUString("StarSymbol"), @@ -2257,7 +2257,7 @@ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit ) return 0; } -sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sal_uInt16 nXStart, +static sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sal_uInt16 nXStart, sal_uInt16 nYStart, sal_uInt16 nDivision) { const SvxBrushItem* pBrushItem = rFmt.GetBrush(); @@ -2279,7 +2279,7 @@ sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sa } -sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, +static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, const SvxNumberFormat& rFmt, sal_uInt16 nXStart, sal_uInt16 nYStart, const Size& rSize) { diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 7a8348f9a44a..91a376cf4e85 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -2291,7 +2291,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) return bRet; } -void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, TriStateBox& rBox) +static void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, TriStateBox& rBox) { sal_uInt16 _nWhich = rSet.GetPool()->GetWhich(nSlotId); SfxItemState eState = rSet.GetItemState(_nWhich, sal_True); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index db448376951d..73c0e0fc58ff 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -354,7 +354,7 @@ static FrmMap aVAsCharHtmlMap[] = {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, VertOrientation::LINE_CENTER, LB_REL_ROW} }; -std::size_t lcl_GetFrmMapCount(const FrmMap* pMap) +static std::size_t lcl_GetFrmMapCount(const FrmMap* pMap) { if( pMap ) { @@ -407,7 +407,7 @@ std::size_t lcl_GetFrmMapCount(const FrmMap* pMap) return 0; } -SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( +static SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( SvxSwFramePosString::StringId eStringId, sal_Bool bVertical, sal_Bool bRTL) { //special handling of STR_FROMLEFT @@ -466,7 +466,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( } // #i22341# - helper method in order to determine all possible // listbox relations in a relation map for a given relation -sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) +static sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) { sal_uLong nLBRelations = 0L; @@ -483,7 +483,7 @@ sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) // #i22341# - helper method on order to determine all possible // listbox relations in a relation map for a given string ID -sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, +static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, const SvxSwFramePosString::StringId _eStrId, const bool _bUseMirrorStr ) { diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 93d83aee0aaa..752a5b0a57cb 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -80,7 +80,7 @@ static sal_uInt16 pSlantRanges[] = 0 }; -void lcl_ConvertRect(basegfx::B2DRange& rRange, const sal_uInt16 nDigits, const MapUnit ePoolUnit, const FieldUnit eDlgUnit) +static void lcl_ConvertRect(basegfx::B2DRange& rRange, const sal_uInt16 nDigits, const MapUnit ePoolUnit, const FieldUnit eDlgUnit) { const basegfx::B2DPoint aTopLeft( (double)MetricField::ConvertValue(basegfx::fround(rRange.getMinX()), nDigits, ePoolUnit, eDlgUnit), @@ -92,7 +92,7 @@ void lcl_ConvertRect(basegfx::B2DRange& rRange, const sal_uInt16 nDigits, const rRange = basegfx::B2DRange(aTopLeft, aBottomRight); } -void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale) +static void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale) { const double fFactor(1.0 / double(aUIScale)); rRange = basegfx::B2DRange(rRange.getMinimum() * fFactor, rRange.getMaximum() * fFactor); diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index c1787138ddbf..0a18b04af516 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -479,7 +479,7 @@ Reference< XResultSetMetaData > ORowSetCache::getMetaData( ) return m_xMetaData; } -Any lcl_getBookmark(ORowSetValue& i_aValue,OCacheSet* i_pCacheSet) +static Any lcl_getBookmark(ORowSetValue& i_aValue,OCacheSet* i_pCacheSet) { switch ( i_aValue.getTypeKind() ) { diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index ac5a6de2cb69..3448e0290913 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -40,7 +40,7 @@ DBG_NAME( EditUndo ) #define NO_UNDO 0xFFFF #define GROUP_NOTFOUND 0xFFFF -void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara ) +static void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara ) { EPaM aEPaM( nPara, 0 ); EditPaM aPaM( pView->GetImpEditEngine()->CreateEditPaM( aEPaM ) ); diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index e63014eb526f..9da932320f15 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star::linguistic2; #define SCRLRANGE 20 // Scroll 1/20 of the width/height, when in QueryDrop -inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiffX, short nDiffY ) +static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiffX, short nDiffY ) { rPoint = pOutDev->LogicToPixel( rPoint ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 3c9990e9d199..0249020c0374 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -77,7 +77,7 @@ using namespace ::com::sun::star; -sal_uInt16 lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem ) +static sal_uInt16 lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem ) { sal_uInt16 nExtra = 0; if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 79edb1ebde9e..5878822991db 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -152,7 +152,7 @@ sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar ) } } -void lcl_DrawRedLines( +static void lcl_DrawRedLines( OutputDevice* pOutDev, long nFontHeight, const Point& rPnt, @@ -238,7 +238,7 @@ void lcl_DrawRedLines( } } -Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin, double nSin, double nCos ) +static Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin, double nSin, double nCos ) { Point aRotatedPos; // Translation... diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f5306703ebca..d6ff77ff698c 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -290,7 +290,7 @@ sal_Bool ImpEditEngine::WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, s return ( rLst.Count() ? sal_True : sal_False ); } -void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex, sal_uInt16 nScriptType ) +static void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex, sal_uInt16 nScriptType ) { sal_uInt16 nAttr = 0; EditCharAttrib* pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr ); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 0cd31ad5274e..cd903fec09f5 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3588,12 +3588,12 @@ sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const } // ----------------------------------------------------------------------- -inline sal_Int8 lcl_PercentToTransparency(long nPercent) +static inline sal_Int8 lcl_PercentToTransparency(long nPercent) { //0xff must not be returned! return sal_Int8(nPercent ? (50 + 0xfe * nPercent) / 100 : 0); } -inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans) +static inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans) { return (sal_Int8)((nTrans * 100 + 127) / 254); } diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 039d3e483557..e01981528b26 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -70,7 +70,7 @@ using namespace ::com::sun::star::style; sal_Int32 SvxNumberType::nRefCount = 0; com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> SvxNumberType::xFormatter = 0; -void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& _xFormatter) +static void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& _xFormatter) { if(!_xFormatter.is()) { diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 41ea8a683838..70ae5fe5eac9 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -932,7 +932,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } // Calculate the relative deviation from the expected height. -sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUnit eProp, sal_Bool bCoreInTwip) +static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUnit eProp, sal_Bool bCoreInTwip) { sal_uInt32 nRet = nHeight; short nDiff = 0; diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 2f727e3dddd5..986a65473c2d 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star; -CharSet lcl_GetDefaultTextEncodingForRTF() +static CharSet lcl_GetDefaultTextEncodingForRTF() { ::com::sun::star::lang::Locale aLocale; diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index c9d47c5bcfb0..9f8c8bd3f47e 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -527,7 +527,7 @@ Model* Binding::getModelImpl( const Model_t& xModel ) const return pModel; } -void lcl_addListenerToNode( Reference<XNode> xNode, +static void lcl_addListenerToNode( Reference<XNode> xNode, Reference<XEventListener> xListener ) { Reference<XEventTarget> xTarget( xNode, UNO_QUERY ); @@ -548,7 +548,7 @@ void lcl_addListenerToNode( Reference<XNode> xNode, } } -void lcl_removeListenerFromNode( Reference<XNode> xNode, +static void lcl_removeListenerFromNode( Reference<XNode> xNode, Reference<XEventListener> xListener ) { Reference<XEventTarget> xTarget( xNode, UNO_QUERY ); @@ -691,7 +691,7 @@ void Binding::bind( bool bForceRebind ) // helper for Binding::valueModified -void lcl_modified( const Binding::XModifyListener_t xListener, +static void lcl_modified( const Binding::XModifyListener_t xListener, const Reference<XInterface> xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -699,7 +699,7 @@ void lcl_modified( const Binding::XModifyListener_t xListener, } // helper for Binding::valueModified -void lcl_listentry( const Binding::XListEntryListener_t xListener, +static void lcl_listentry( const Binding::XListEntryListener_t xListener, const Reference<XInterface> xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -708,7 +708,7 @@ void lcl_listentry( const Binding::XListEntryListener_t xListener, } // helper for Binding::valueModified -void lcl_validate( const Binding::XValidityConstraintListener_t xListener, +static void lcl_validate( const Binding::XValidityConstraintListener_t xListener, const Reference<XInterface> xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -886,7 +886,7 @@ void Binding::clear() } -void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom, +static void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom, Binding::XNameContainer_t& xTo ) { OSL_ENSURE( xFrom.is(), "no source" ); @@ -913,7 +913,7 @@ void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom, * @param bFromSource true: use elements from source * false: use only elements from target */ -void lcl_copyNamespaces( const Binding::XNameContainer_t& xFrom, +static void lcl_copyNamespaces( const Binding::XNameContainer_t& xFrom, Binding::XNameContainer_t& xTo, bool bOverwrite ) { @@ -1132,7 +1132,7 @@ sal_Int32 Binding::getListEntryCount() return maBindingExpression.getNodeList().size(); } -void lcl_getString( const Reference<XNode>& xNode, OUStringBuffer& rBuffer ) +static void lcl_getString( const Reference<XNode>& xNode, OUStringBuffer& rBuffer ) { if( xNode->getNodeType() == NodeType_TEXT_NODE || xNode->getNodeType() == NodeType_ATTRIBUTE_NODE ) @@ -1150,7 +1150,7 @@ void lcl_getString( const Reference<XNode>& xNode, OUStringBuffer& rBuffer ) } } -OUString lcl_getString( const Reference<XNode>& xNode ) +static OUString lcl_getString( const Reference<XNode>& xNode ) { OUStringBuffer aBuffer; lcl_getString( xNode, aBuffer ); diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 31c7169723cd..53e7239f6d4a 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -144,7 +144,7 @@ Model::~Model() throw() mpSubmissions = NULL; } -Model* lcl_getModel( const Reference<XUnoTunnel>& xTunnel ) +static Model* lcl_getModel( const Reference<XUnoTunnel>& xTunnel ) { Model* pModel = NULL; if( xTunnel.is() ) diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index f1e4d53a3c0e..2b162514b286 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -132,7 +132,7 @@ OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode ) } -void lcl_OutPosition( OUStringBuffer& rBuffer, +static void lcl_OutPosition( OUStringBuffer& rBuffer, const Reference<XNode>& xNode ) { OSL_ENSURE( xNode->getParentNode().is(), "need parent" ); @@ -167,7 +167,7 @@ void lcl_OutPosition( OUStringBuffer& rBuffer, } } -void lcl_OutName( OUStringBuffer& rBuffer, +static void lcl_OutName( OUStringBuffer& rBuffer, const Reference<XNode>& xNode ) { rBuffer.insert( 0, xNode->getNodeName() ); @@ -179,7 +179,7 @@ void lcl_OutName( OUStringBuffer& rBuffer, } } -void lcl_OutInstance( OUStringBuffer& rBuffer, +static void lcl_OutInstance( OUStringBuffer& rBuffer, const Reference<XNode>& xNode, Model* pModel ) { @@ -275,7 +275,7 @@ OUString Model::getDefaultBindingExpressionForNode( const XNode_t& xNode ) return getDefaultBindingExpressionForNode( xNode, getEvaluationContext() ); } -bool lcl_isWhitespace( const OUString& rString ) +static bool lcl_isWhitespace( const OUString& rString ) { sal_Int32 nLength = rString.getLength(); const sal_Unicode* pStr = rString.getStr(); @@ -442,7 +442,7 @@ Model::XDocument_t Model::newInstance( const rtl::OUString& sName, return xInstance; } -sal_Int32 lcl_findProp( const PropertyValue* pValues, +static sal_Int32 lcl_findProp( const PropertyValue* pValues, sal_Int32 nLength, const rtl::OUString& rName ) { @@ -519,7 +519,7 @@ void Model::removeInstance( const rtl::OUString& sName ) mpInstances->removeItem( mpInstances->getItem( nPos ) ); } -Reference<XNameContainer> lcl_getModels( +static Reference<XNameContainer> lcl_getModels( const Reference<com::sun::star::frame::XModel>& xComponent ) { Reference<XNameContainer> xRet; @@ -769,7 +769,7 @@ void Model::removeBindingForNode( const XNode_t& ) // determine whether suitable binding is still used } -OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode ) +static OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode ) { ::rtl::OUString sResult; OSL_ENSURE( _rxAttrNode.is(), "lcl_serializeForDisplay( attr ): invalid argument!" ); @@ -791,7 +791,7 @@ OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode ) return sResult; } -OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) +static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) { ::rtl::OUString sResult; @@ -879,7 +879,7 @@ OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) return sResult; } -OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult ) +static OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult ) { // error handling first if( ! xResult.is() ) diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index e5d740126793..39190284f4a6 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -488,7 +488,7 @@ sal_Int64 SAL_CALL Submission::getSomething( } -OUString lcl_message( const OUString& rID, const OUString& rText ) +static OUString lcl_message( const OUString& rID, const OUString& rText ) { OUStringBuffer aMessage; aMessage.append( OUSTRING("XForms submission '") ); diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx index 025bebf59cc8..5458cd177382 100644 --- a/forms/source/xforms/xmlhelper.cxx +++ b/forms/source/xforms/xmlhelper.cxx @@ -43,7 +43,7 @@ using com::sun::star::xml::dom::XDocumentBuilder; // 2: NameChar // 4: NCNameStartChar // 8: NCNameChar -inline sal_uInt8 lcl_getCharClass( sal_Unicode c ) +static inline sal_uInt8 lcl_getCharClass( sal_Unicode c ) { sal_uInt8 nClass = 0; diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 78f8b7f35cf5..79ac152c4b62 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -56,7 +56,7 @@ using namespace com::sun::star::util; using namespace std; -bool lcl_I18nCompareString(const rtl::OUString& rStr1, const rtl::OUString& rStr2) +static bool lcl_I18nCompareString(const rtl::OUString& rStr1, const rtl::OUString& rStr2) { const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper(); return rI18nHelper.CompareString( rStr1, rStr2 ) < 0 ? true : false; diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 167404967933..6598341123ca 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -96,7 +96,7 @@ friend class ScDocument; // for FillInfo friend class ScDocumentIterator; friend class ScAttrIterator; friend class ScHorizontalAttrIterator; -friend void lcl_IterGetNumberFormat( sal_uLong& nFormat, +friend void ScAttrArray_IterGetNumberFormat( sal_uLong& nFormat, const ScAttrArray*& rpArr, SCROW& nAttrEndRow, const ScAttrArray* pNewArr, SCROW nRow, ScDocument* pDoc ); diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 32a54f8202f7..86e46c5723ce 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -130,7 +130,7 @@ struct ScRawToken: private ScRawTokenBase // Friends that use a temporary ScRawToken on the stack (and therefor need // the private dtor) and know what they're doing.. friend class ScTokenArray; - friend sal_uInt16 lcl_ScRawTokenOffset(); + static sal_uInt16 sbyteOffset(); public: union { double nValue; diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index 3c1c0e76b6ed..c376f14e2f53 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -72,7 +72,7 @@ class ScShapeObj :public ScShapeObj_Base ,public ScShapeObj_TextBase { private: -friend ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate ); + friend ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg; // cached pointers to avoid repeated queryAggregation calls: ::com::sun::star::beans::XPropertySet* pShapePropertySet; diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index b7b2260e62bf..d3ea03dbde30 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -899,7 +899,7 @@ bool ScAttrArray::SetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize) return true; } -void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource ) +static void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource ) { const SfxPoolItem* pNewItem; const SfxPoolItem* pOldItem; @@ -986,7 +986,7 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow, // assemble border -bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine, +static bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine, sal_uInt8& rModified, const SvxBorderLine*& rpNew ) { if (rModified == SC_LINE_DONTCARE) @@ -1018,7 +1018,7 @@ bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine, } -void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, +static void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, const ScPatternAttr* pPattern, bool bLeft, SCCOL nDistRight, bool bTop, SCROW nDistBottom ) { @@ -1209,7 +1209,7 @@ void ScAttrArray::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInf } -long lcl_LineSize( const SvxBorderLine& rLine ) +static long lcl_LineSize( const SvxBorderLine& rLine ) { // only one line -> half width, min. 20 // double line -> half line spacing + (per min. 20) diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 3ad9b8b9c8c7..6a29e52e6af8 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -743,7 +743,7 @@ SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const //------------------------------------------------------------------------ -void lcl_SetSpace( String& rStr, const ESelection& rSel ) +static void lcl_SetSpace( String& rStr, const ESelection& rSel ) { // Text durch ein Leerzeichen ersetzen, damit Positionen stimmen: @@ -752,7 +752,7 @@ void lcl_SetSpace( String& rStr, const ESelection& rSel ) rStr.SetChar( rSel.nStartPos, ' ' ); } -bool lcl_ConvertFields(EditEngine& rEng, const String* pCommands) +static bool lcl_ConvertFields(EditEngine& rEng, const String* pCommands) { bool bChange = false; sal_uInt16 nParCnt = rEng.GetParagraphCount(); diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index c4ddb68c86ac..e27339e963cf 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -1986,7 +1986,7 @@ ScDetectiveRefIter::ScDetectiveRefIter( ScFormulaCell* pCell ) aPos = pCell->aPos; } -bool lcl_ScDetectiveRefIter_SkipRef( ScToken* p ) +static bool lcl_ScDetectiveRefIter_SkipRef( ScToken* p ) { ScSingleRefData& rRef1 = p->GetSingleRef(); if ( rRef1.IsColDeleted() || rRef1.IsRowDeleted() || rRef1.IsTabDeleted() diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 16088a6c83d7..809e2ed86266 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -1522,7 +1522,7 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY StartListeningTo( pDocument ); // Listener wie vorher } -void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames) +static void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames) { for (FormulaToken* p = pCode->First(); p; p = pCode->Next()) { diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index b554ff94344f..964f1d4fbe75 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -635,7 +635,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, doubl return nOldWidth; } -sal_uInt16 lcl_GetAttribHeight( const ScPatternAttr& rPattern, sal_uInt16 nFontHeightId ) +static sal_uInt16 lcl_GetAttribHeight( const ScPatternAttr& rPattern, sal_uInt16 nFontHeightId ) { sal_uInt16 nHeight = (sal_uInt16) ((const SvxFontHeightItem&) rPattern.GetItem(nFontHeightId)).GetHeight(); const SvxMarginItem* pMargin = (const SvxMarginItem*) &rPattern.GetItem(ATTR_MARGIN); @@ -1633,7 +1633,7 @@ void ScColumn::CompileColRowNameFormula() } } -void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell ) +static void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell ) { double nValue = 0.0; bool bVal = false; diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index c853c16ee78c..dff64c1f191f 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -882,7 +882,7 @@ void ScColumn::MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction, // Ergebnis in rVal1 -sal_Bool lcl_DoFunction( double& rVal1, double nVal2, sal_uInt16 nFunction ) +static sal_Bool lcl_DoFunction( double& rVal1, double nVal2, sal_uInt16 nFunction ) { sal_Bool bOk = false; switch (nFunction) @@ -905,7 +905,7 @@ sal_Bool lcl_DoFunction( double& rVal1, double nVal2, sal_uInt16 nFunction ) } -void lcl_AddCode( ScTokenArray& rArr, ScFormulaCell* pCell ) +static void lcl_AddCode( ScTokenArray& rArr, ScFormulaCell* pCell ) { rArr.AddOpCode(ocOpen); diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index f7b6b86a5939..e72556f693bf 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -80,7 +80,7 @@ void ScFormatEntry::endRendering() { } -bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16 nRecursion = 0 ) +static bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16 nRecursion = 0 ) { if (pFormula) { @@ -499,7 +499,7 @@ void ScConditionEntry::SetFormula2( const ScTokenArray& rArray ) } } -void lcl_CondUpdateInsertTab( ScTokenArray& rCode, SCTAB nInsTab, SCTAB nPosTab, bool& rChanged, SCTAB nTabs ) +static void lcl_CondUpdateInsertTab( ScTokenArray& rCode, SCTAB nInsTab, SCTAB nPosTab, bool& rChanged, SCTAB nTabs ) { // Insert table: only update absolute table references. // (Similar to ScCompiler::UpdateInsertTab with bIsName=true, result is the same as for named ranges) @@ -595,7 +595,7 @@ void ScConditionEntry::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ) //! als Vergleichsoperator ans TokenArray ??? -bool lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 ) +static bool lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 ) { // verglichen wird nur das nicht-UPN Array diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 2d8808e4b0cb..a71fbad443ad 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -225,7 +225,7 @@ void ScDocumentIterator::GetPos( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ) //------------------------------------------------------------------------ //------------------------------------------------------------------------ -void lcl_IterGetNumberFormat( sal_uLong& nFormat, const ScAttrArray*& rpArr, +void ScAttrArray_IterGetNumberFormat( sal_uLong& nFormat, const ScAttrArray*& rpArr, SCROW& nAttrEndRow, const ScAttrArray* pNewArr, SCROW nRow, ScDocument* pDoc ) { @@ -332,7 +332,7 @@ bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr) --nRow; if ( bCalcAsShown ) { - lcl_IterGetNumberFormat( nNumFormat, pAttrArray, + ScAttrArray_IterGetNumberFormat( nNumFormat, pAttrArray, nAttrEndRow, pCol->pAttrArray, nRow, pDoc ); rValue = pDoc->RoundValueAsShown( rValue, nNumFormat ); } @@ -350,7 +350,7 @@ bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr) bNextValid = true; if ( bCalcAsShown ) { - lcl_IterGetNumberFormat( nNumFormat, pAttrArray, + ScAttrArray_IterGetNumberFormat( nNumFormat, pAttrArray, nAttrEndRow, pCol->pAttrArray, nNextRow, pDoc ); fNextValue = pDoc->RoundValueAsShown( fNextValue, nNumFormat ); } @@ -594,7 +594,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) { const ScAttrArray* pNewAttrArray = ScDBQueryDataIterator::GetAttrArrayByCol(*mpDoc, nTab, nCol); - lcl_IterGetNumberFormat( nNumFormat, pAttrArray, + ScAttrArray_IterGetNumberFormat( nNumFormat, pAttrArray, nAttrEndRow, pNewAttrArray, nRow, mpDoc ); rValue.mfValue = mpDoc->RoundValueAsShown( rValue.mfValue, nNumFormat ); } @@ -1868,7 +1868,7 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr ) if ( bCalcAsShown ) { ScColumn* pCol = &pDoc->maTabs[nCurTab]->aCol[nCurCol]; - lcl_IterGetNumberFormat( nNumFormat, pAttrArray, + ScAttrArray_IterGetNumberFormat( nNumFormat, pAttrArray, nAttrEndRow, pCol->pAttrArray, nCurRow, pDoc ); rValue = pDoc->RoundValueAsShown( rValue, nNumFormat ); } diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index cc8915fbdfe9..3fe7aecd3581 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -679,7 +679,7 @@ SfxItemPool* ScDocumentPool::Clone() const return new SfxItemPool (*this, sal_True); } -SfxItemPresentation lcl_HFPresentation +static SfxItemPresentation lcl_HFPresentation ( const SfxPoolItem& rItem, SfxItemPresentation ePresentation, diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 209ba19b3914..54ce14f3a329 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1654,7 +1654,7 @@ void ScDocument::ResetEmbedded() while result is less than nStopTwips. @return true if advanced at least one row. */ -bool lcl_AddTwipsWhile( long & rTwips, long nStopTwips, SCROW & rPosY, SCROW nEndRow, const ScTable * pTable ) +static bool lcl_AddTwipsWhile( long & rTwips, long nStopTwips, SCROW & rPosY, SCROW nEndRow, const ScTable * pTable ) { SCROW nRow = rPosY; bool bAdded = false; @@ -1779,7 +1779,7 @@ void ScDocument::SetEmbedded( const Rectangle& rRect ) // aus VisArea ( // VisArea auf Zellgrenzen anpassen -void lcl_SnapHor( ScTable* pTable, long& rVal, SCCOL& rStartCol ) +static void lcl_SnapHor( ScTable* pTable, long& rVal, SCCOL& rStartCol ) { SCCOL nCol = 0; long nTwips = (long) (rVal / HMM_PER_TWIPS); @@ -1799,7 +1799,7 @@ void lcl_SnapHor( ScTable* pTable, long& rVal, SCCOL& rStartCol ) rStartCol = nCol; } -void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow ) +static void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow ) { SCROW nRow = 0; long nTwips = (long) (rVal / HMM_PER_TWIPS); diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 9950a42bb2f2..9f5408a97f30 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- -void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xChartDoc, +static void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xChartDoc, rtl::OUString& rRanges, chart::ChartDataRowSource& rDataRowSource, bool& rHasCategories, bool& rFirstCellAsLabel ) { @@ -97,7 +97,7 @@ void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xCh } } -void lcl_SetChartParameters( const uno::Reference< chart2::data::XDataReceiver >& xReceiver, +static void lcl_SetChartParameters( const uno::Reference< chart2::data::XDataReceiver >& xReceiver, const rtl::OUString& rRanges, chart::ChartDataRowSource eDataRowSource, bool bHasCategories, bool bFirstCellAsLabel ) { diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 30e12298e6b3..3715f45a3a0c 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1035,7 +1035,7 @@ void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList ) } -void lcl_GetFirstTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab ) +static void lcl_GetFirstTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab ) { // without ScMarkData, leave start/end unchanged if ( pTabMark ) @@ -1053,7 +1053,7 @@ void lcl_GetFirstTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScM } } -bool lcl_GetNextTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab ) +static bool lcl_GetNextTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab ) { if ( pTabMark ) { @@ -1477,7 +1477,7 @@ void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, bool // (ohne Paint) -void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, +static void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, ScRange& rColRange, bool& rInsCol, bool& rDelCol, ScRange& rRowRange, bool& rInsRow, bool& rDelRow ) { diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 634eeb232ef7..95b030735408 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -265,7 +265,7 @@ void DBConnector::getValue(long nCol, ScDPItemData &rData, short& rNumType) cons } -sal_uInt16 lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplier>& xSource ) +static sal_uInt16 lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplier>& xSource ) { long nRet = sheet::DataPilotFieldOrientation_HIDDEN; if ( xSource.is() ) @@ -809,7 +809,7 @@ const ScRange ScDPObject::GetOutputRangeByType( sal_Int32 nType ) return pOutput->GetOutputRange(nType); } -sal_Bool lcl_HasButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) +static sal_Bool lcl_HasButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) { return ((const ScMergeFlagAttr*)pDoc->GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG ))->HasButton(); } @@ -1324,7 +1324,7 @@ void ScDPObject::GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimensi pOutput->GetMemberResultNames(rNames, nDimension); // used only with table data -> level not needed } -bool lcl_Dequote( const String& rSource, xub_StrLen nStartPos, xub_StrLen& rEndPos, String& rResult ) +static bool lcl_Dequote( const String& rSource, xub_StrLen nStartPos, xub_StrLen& rEndPos, String& rResult ) { // nStartPos has to point to opening quote @@ -1373,7 +1373,7 @@ struct ScGetPivotDataFunctionEntry sheet::GeneralFunction eFunc; }; -bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_StrLen& rEndPos, sheet::GeneralFunction& rFunc ) +static bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_StrLen& rEndPos, sheet::GeneralFunction& rFunc ) { static const ScGetPivotDataFunctionEntry aFunctions[] = { @@ -1437,7 +1437,7 @@ bool lcl_ParseFunction( const String& rList, xub_StrLen nStartPos, xub_StrLen& r return bFound; } -bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatched, +static bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatched, bool bAllowBracket, sheet::GeneralFunction* pFunc ) { sal_Int32 nMatchList = 0; @@ -1870,7 +1870,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb } } -long lcl_FindName( const rtl::OUString& rString, const uno::Reference<container::XNameAccess>& xCollection ) +static long lcl_FindName( const rtl::OUString& rString, const uno::Reference<container::XNameAccess>& xCollection ) { if ( xCollection.is() ) { @@ -1884,7 +1884,7 @@ long lcl_FindName( const rtl::OUString& rString, const uno::Reference<container: return -1; // not found } -sal_uInt16 lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp ) // PIVOT_FUNC mask +static sal_uInt16 lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp ) // PIVOT_FUNC mask { uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDimProp, uno::UNO_QUERY ); if ( xDimProp.is() && xDimSupp.is() ) @@ -1933,7 +1933,7 @@ sal_uInt16 lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimPro return 0; } -sal_uInt16 lcl_CountBits( sal_uInt16 nBits ) +static sal_uInt16 lcl_CountBits( sal_uInt16 nBits ) { if (!nBits) return 0; @@ -1964,7 +1964,7 @@ public: } -void lcl_FillOldFields( +static void lcl_FillOldFields( vector<PivotField>& rFields, const uno::Reference<sheet::XDimensionsSupplier>& xSource, sal_uInt16 nOrient, bool bAddData ) @@ -2151,7 +2151,7 @@ bool ScDPObject::FillOldParam(ScPivotParam& rParam) const return true; } -void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XPropertySet >& xDimProp ) +static void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XPropertySet >& xDimProp ) { uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDimProp, uno::UNO_QUERY ); if (!xDimProp.is() || !xDimSupp.is()) diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 7bf593661610..2abe79f7861a 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -844,7 +844,7 @@ void ScDPOutput::FieldCell( lcl_SetStyleById( pDoc,nTab, nCol,nRow, nCol,nRow, STR_PIVOT_STYLE_FIELDNAME ); } -void lcl_DoFilterButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) +static void lcl_DoFilterButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) { pDoc->SetString( nCol, nRow, nTab, ScGlobal::GetRscString(STR_CELL_FILTER) ); pDoc->ApplyFlagsTab(nCol, nRow, nCol, nRow, nTab, SC_MF_BUTTON); diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 5feec0612cb6..d5fca515c92f 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -71,7 +71,7 @@ using ::std::auto_ptr; #define SC_DPSAVEMODE_YES 1 #define SC_DPSAVEMODE_DONTKNOW 2 -void lcl_SetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp, +static void lcl_SetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp, const rtl::OUString& rName, sal_Bool bValue ) { //! move to ScUnoHelpFunctions? @@ -1067,7 +1067,7 @@ void ScDPSaveData::SetDrillDown(bool bSet) bDrillDown = bSet; } -void lcl_ResetOrient( const uno::Reference<sheet::XDimensionsSupplier>& xSource ) +static void lcl_ResetOrient( const uno::Reference<sheet::XDimensionsSupplier>& xSource ) { sheet::DataPilotFieldOrientation eOrient = sheet::DataPilotFieldOrientation_HIDDEN; diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 4a4a2020d201..3b34126107a6 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -276,7 +276,7 @@ void ScDPInitState::RemoveMember() // ----------------------------------------------------------------------- -void lcl_DumpRow( const String& rType, const String& rName, const ScDPAggData* pAggData, +static void lcl_DumpRow( const String& rType, const String& rName, const ScDPAggData* pAggData, ScDocument* pDoc, ScAddress& rPos ) { SCCOL nCol = rPos.Col(); @@ -292,7 +292,7 @@ void lcl_DumpRow( const String& rType, const String& rName, const ScDPAggData* p rPos.SetRow( nRow + 1 ); } -void lcl_Indent( ScDocument* pDoc, SCROW nStartRow, const ScAddress& rPos ) +static void lcl_Indent( ScDocument* pDoc, SCROW nStartRow, const ScAddress& rPos ) { SCCOL nCol = rPos.Col(); SCTAB nTab = rPos.Tab(); @@ -675,7 +675,7 @@ ScDPRowTotals::~ScDPRowTotals() { } -ScDPAggData* lcl_GetChildTotal( ScDPAggData* pFirst, long nMeasure ) +static ScDPAggData* lcl_GetChildTotal( ScDPAggData* pFirst, long nMeasure ) { OSL_ENSURE( nMeasure >= 0, "GetColTotal: no measure" ); @@ -1859,7 +1859,7 @@ void ScDPDataMember::InitFrom( const ScDPResultDimension* pDim ) const long SC_SUBTOTALPOS_AUTO = -1; // default const long SC_SUBTOTALPOS_SKIP = -2; // don't use -long lcl_GetSubTotalPos( const ScDPSubTotalState& rSubState ) +static long lcl_GetSubTotalPos( const ScDPSubTotalState& rSubState ) { if ( rSubState.nColSubTotalFunc >= 0 && rSubState.nRowSubTotalFunc >= 0 && rSubState.nColSubTotalFunc != rSubState.nRowSubTotalFunc ) diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 542d9911871f..c3c12149d19e 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -101,14 +101,14 @@ SC_SIMPLE_SERVICE_INFO( ScDPMember, "ScDPMember", "com.sun.star.sheet. // ----------------------------------------------------------------------- //! move to a header? -sal_Bool lcl_GetBoolFromAny( const uno::Any& aAny ) +static sal_Bool lcl_GetBoolFromAny( const uno::Any& aAny ) { if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN ) return *(sal_Bool*)aAny.getValue(); return false; } -void lcl_SetBoolInAny( uno::Any& rAny, sal_Bool bValue ) +static void lcl_SetBoolInAny( uno::Any& rAny, sal_Bool bValue ) { rAny.setValue( &bValue, getBooleanCppuType() ); } @@ -218,7 +218,7 @@ long ScDPSource::GetPosition(long nColumn) return 0; } -sal_Bool lcl_TestSubTotal( sal_Bool& rAllowed, long nColumn, long* pArray, long nCount, ScDPSource* pSource ) +static sal_Bool lcl_TestSubTotal( sal_Bool& rAllowed, long nColumn, long* pArray, long nCount, ScDPSource* pSource ) { for (long i=0; i<nCount; i++) if (pArray[i] == nColumn) @@ -252,7 +252,7 @@ sal_Bool ScDPSource::SubTotalAllowed(long nColumn) return bAllowed; } -void lcl_RemoveDim( long nRemove, long* pDims, long& rCount ) +static void lcl_RemoveDim( long nRemove, long* pDims, long& rCount ) { for (long i=0; i<rCount; i++) if ( pDims[i] == nRemove ) @@ -531,7 +531,7 @@ void ScDPSource::disposeData() bResultOverflow = false; } -long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLevel, long nLevels ) +static long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLevel, long nLevels ) { // Calculate the product of the member count for those consecutive levels that // have the "show all" flag, one following level, and the data layout dimension. @@ -592,7 +592,7 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL return nTotal; } -long lcl_GetIndexFromName( const rtl::OUString rName, const uno::Sequence<rtl::OUString>& rElements ) +static long lcl_GetIndexFromName( const rtl::OUString rName, const uno::Sequence<rtl::OUString>& rElements ) { long nCount = rElements.getLength(); const rtl::OUString* pArray = rElements.getConstArray(); diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 6ec0795ddf69..e6c3ad45df53 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -186,13 +186,13 @@ inline void ReverseTwipsToMM( long& nVal ) nVal = HmmToTwips (nVal); } -void lcl_ReverseTwipsToMM( Point& rPoint ) +static void lcl_ReverseTwipsToMM( Point& rPoint ) { ReverseTwipsToMM( rPoint.X() ); ReverseTwipsToMM( rPoint.Y() ); } -void lcl_ReverseTwipsToMM( Rectangle& rRect ) +static void lcl_ReverseTwipsToMM( Rectangle& rRect ) { ReverseTwipsToMM( rRect.Left() ); ReverseTwipsToMM( rRect.Right() ); @@ -1281,7 +1281,7 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& } } -sal_Bool lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const ScRange& rClipRange ) +static sal_Bool lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const ScRange& rClipRange ) { // check if every range of rRangesVector is completely in rClipRange @@ -1302,7 +1302,7 @@ sal_Bool lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, co return sal_True; // everything is fine } -sal_Bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, const ScAddress& rDestPos ) +static sal_Bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, const ScAddress& rDestPos ) { sal_Bool bChanged = false; diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index d0aabfa43272..a7c681e65d94 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -82,7 +82,7 @@ inline const ::editeng::SvxBorderLine* GetNullOrLine( const SvxBoxItem* pBox, Fi // aehnlich wie in output.cxx -void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, +static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, ScDocument* pDoc, RowInfo* pRowInfo, SCCOL nX1, SCROW nY1, SCCOL /* nX2 */, SCROW /* nY2 */, SCTAB nTab, SCsCOL& rStartX, SCsROW& rStartY, SCsCOL& rEndX, SCsROW& rEndY ) diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 399da0a8b326..207295f29c7c 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -929,7 +929,7 @@ void ScPatternAttr::ClearItems( const sal_uInt16* pWhich ) rSet.ClearItem(pWhich[i]); } -SfxStyleSheetBase* lcl_CopyStyleToPool +static SfxStyleSheetBase* lcl_CopyStyleToPool ( SfxStyleSheetBase* pSrcStyle, SfxStyleSheetBasePool* pSrcPool, diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 66eef1d3abfc..020967f57451 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -229,7 +229,7 @@ void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ) //------------------------------------------------------------------------ -void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, sal_uInt16 nFontType, sal_uInt16 nItemId ) +static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, sal_uInt16 nFontType, sal_uInt16 nItemId ) { if ( eLang != LANGUAGE_NONE && eLang != LANGUAGE_DONTKNOW && eLang != LANGUAGE_SYSTEM ) { diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 28c534242f2c..8058e0a8d3c9 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -867,7 +867,7 @@ void ScTable::RemoveSubTotals( ScSubTotalParam& rParam ) // harte Zahlenformate loeschen (fuer Ergebnisformeln) -void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow ) +static void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow ) { const ScPatternAttr* pPattern = pTab->GetPattern( nCol, nRow ); if ( pPattern->GetItemSet().GetItemState( ATTR_VALUE_FORMAT, false ) diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 525970de237d..b1f86e02fb38 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -82,7 +82,7 @@ extern sal_uInt16 nScFillModeMouseModifier; // global.cxx // ----------------------------------------------------------------------- -short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* pMinDigits = NULL ) +static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* pMinDigits = NULL ) { if ( !aValue.Len() ) { @@ -137,7 +137,7 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* pMinDi return 0; } -String lcl_ValueString( sal_Int32 nValue, sal_uInt16 nMinDigits ) +static String lcl_ValueString( sal_Int32 nValue, sal_uInt16 nMinDigits ) { if ( nMinDigits <= 1 ) return String::CreateFromInt32( nValue ); // simple case... diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index ac3b81272a76..6736d74d4591 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -343,7 +343,7 @@ void ScUnoAddInCollection::Initialize() } // ----------------------------------------------------------------------------- -sal_uInt16 lcl_GetCategory( const ::rtl::OUString& rName ) +static sal_uInt16 lcl_GetCategory( const ::rtl::OUString& rName ) { static const sal_Char* aFuncNames[SC_FUNCGROUP_COUNT] = { @@ -689,7 +689,7 @@ inline sal_Bool IsTypeName( const rtl::OUString& rName, const uno::Type& rType ) return rName == rType.getTypeName(); } -sal_Bool lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass>& xClass ) +static sal_Bool lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass>& xClass ) { // this must match with ScUnoAddInCall::SetResult @@ -737,7 +737,7 @@ sal_Bool lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass>& xClas } } -ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdlClass>& xClass ) +static ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdlClass>& xClass ) { if (!xClass.is()) return SC_ADDINARG_NONE; @@ -1019,7 +1019,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& } } -void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAddInFuncData& rFuncData ) +static void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAddInFuncData& rFuncData ) { ::rtl::OUString aCompare = rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData @@ -1035,7 +1035,7 @@ void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAddInFunc } } -const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncData, const ::rtl::OUString& rArgIntName ) +static const ScAddInArgDesc* lcl_FindArgDesc( const ScUnoAddInFuncData& rFuncData, const ::rtl::OUString& rArgIntName ) { long nArgCount = rFuncData.GetArgumentCount(); const ScAddInArgDesc* pArguments = rFuncData.GetArguments(); diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 5850e0197979..f4905c8d9046 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -134,7 +134,7 @@ sal_Unicode_strtol ( const sal_Unicode* p, return is_neg ? -accum : accum; } -const sal_Unicode* lcl_eatWhiteSpace( const sal_Unicode* p ) +static const sal_Unicode* lcl_eatWhiteSpace( const sal_Unicode* p ) { if ( p ) { @@ -339,7 +339,7 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start, TRUE in all other cases, also when there is no index sequence or the input name is not numeric. */ -bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, String& rExternDocName, +static bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, String& rExternDocName, const uno::Sequence< const sheet::ExternalLinkInfo > * pExternalLinks) { // 1-based, sequence starts with an empty element. diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index 8f61428b03f0..c8ec1be7be23 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -152,7 +152,7 @@ void ScAppOptions::SetLRUFuncList( const sal_uInt16* pList, const sal_uInt16 nCo // Config Item containing app options //================================================================== -void lcl_SetLastFunctions( ScAppOptions& rOpt, const Any& rValue ) +static void lcl_SetLastFunctions( ScAppOptions& rOpt, const Any& rValue ) { Sequence<sal_Int32> aSeq; if ( rValue >>= aSeq ) @@ -172,7 +172,7 @@ void lcl_SetLastFunctions( ScAppOptions& rOpt, const Any& rValue ) } } -void lcl_GetLastFunctions( Any& rDest, const ScAppOptions& rOpt ) +static void lcl_GetLastFunctions( Any& rDest, const ScAppOptions& rOpt ) { long nCount = rOpt.GetLRUFuncListCount(); sal_uInt16* pUShorts = rOpt.GetLRUFuncList(); @@ -188,7 +188,7 @@ void lcl_GetLastFunctions( Any& rDest, const ScAppOptions& rOpt ) rDest <<= Sequence<sal_Int32>(0); // empty } -void lcl_SetSortList( const Any& rValue ) +static void lcl_SetSortList( const Any& rValue ) { Sequence<OUString> aSeq; if ( rValue >>= aSeq ) @@ -217,7 +217,7 @@ void lcl_SetSortList( const Any& rValue ) } } -void lcl_GetSortList( Any& rDest ) +static void lcl_GetSortList( Any& rDest ) { const ScUserList* pUserList = ScGlobal::GetUserList(); if (pUserList) diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 31449a74f3c2..65cd99d920ec 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -1973,7 +1973,7 @@ void ScChangeActionContent::PutValueToDoc( } -void lcl_InvalidateReference( ScToken& rTok, const ScBigAddress& rPos ) +static void lcl_InvalidateReference( ScToken& rTok, const ScBigAddress& rPos ) { ScSingleRefData& rRef1 = rTok.GetSingleRef(); if ( rPos.Col() < 0 || MAXCOL < rPos.Col() ) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 5a39f76a446b..c8e317c6a5e7 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -1803,7 +1803,7 @@ void ScCompiler::SetError(sal_uInt16 nError) } -sal_Unicode* lcl_UnicodeStrNCpy( sal_Unicode* pDst, const sal_Unicode* pSrc, xub_StrLen nMax ) +static sal_Unicode* lcl_UnicodeStrNCpy( sal_Unicode* pDst, const sal_Unicode* pSrc, xub_StrLen nMax ) { const sal_Unicode* const pStop = pDst + nMax; while ( *pSrc && pDst < pStop ) @@ -3522,7 +3522,7 @@ void ScCompiler::AutoCorrectParsedSymbol() } } -inline bool lcl_UpperAsciiOrI18n( String& rUpper, const String& rOrg, FormulaGrammar::Grammar eGrammar ) +static inline bool lcl_UpperAsciiOrI18n( String& rUpper, const String& rOrg, FormulaGrammar::Grammar eGrammar ) { if (FormulaGrammar::isODFF( eGrammar )) { @@ -4145,7 +4145,7 @@ bool ScCompiler::HasModifiedRange() //--------------------------------------------------------------------------- template< typename T, typename S > -S lcl_adjval( S& n, T pos, T max, bool bRel ) +static S lcl_adjval( S& n, T pos, T max, bool bRel ) { max++; if( bRel ) diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx index f475d5df6071..2ad21525fd10 100644 --- a/sc/source/core/tool/consoli.cxx +++ b/sc/source/core/tool/consoli.cxx @@ -81,7 +81,7 @@ void ScReferenceList::AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab ) } template< typename T > -void lcl_AddString( String**& pData, T& nCount, const String& rInsert ) +static void lcl_AddString( String**& pData, T& nCount, const String& rInsert ) { String** pOldData = pData; pData = new String*[ nCount+1 ]; @@ -342,7 +342,7 @@ void ScConsData::AddName( const String& rName ) // rCount < 0 <=> Fehler aufgetreten -void lcl_UpdateArray( ScSubTotalFunc eFunc, +static void lcl_UpdateArray( ScSubTotalFunc eFunc, double& rCount, double& rSum, double& rSumSqr, double nVal ) { if (rCount < 0.0) @@ -396,7 +396,7 @@ void lcl_UpdateArray( ScSubTotalFunc eFunc, } } -void lcl_InitArray( ScSubTotalFunc eFunc, +static void lcl_InitArray( ScSubTotalFunc eFunc, double& rCount, double& rSum, double& rSumSqr, double nVal ) { rCount = 1.0; @@ -427,7 +427,7 @@ void lcl_InitArray( ScSubTotalFunc eFunc, } } -double lcl_CalcData( ScSubTotalFunc eFunc, +static double lcl_CalcData( ScSubTotalFunc eFunc, double fCount, double fSum, double fSumSqr) { if (fCount < 0.0) diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 6d73495924ce..a0c9066c802d 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -141,7 +141,7 @@ sal_Bool ScDetectiveFunc::bColorsInitialized = false; //------------------------------------------------------------------------ -sal_Bool lcl_HasThickLine( SdrObject& rObj ) +static sal_Bool lcl_HasThickLine( SdrObject& rObj ) { // thin lines get width 0 -> everything greater 0 is a thick line @@ -386,7 +386,7 @@ Rectangle ScDetectiveFunc::GetDrawRect( SCCOL nCol, SCROW nRow ) const return GetDrawRect( nCol, nRow, nCol, nRow ); } -sal_Bool lcl_IsOtherTab( const basegfx::B2DPolyPolygon& rPolyPolygon ) +static sal_Bool lcl_IsOtherTab( const basegfx::B2DPolyPolygon& rPolyPolygon ) { // test if rPolygon is the line end for "other table" (rectangle) if(1L == rPolyPolygon.count()) diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 6edad4e3620e..76f83170ee3f 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -59,7 +59,7 @@ using sc::TwipsToEvenHMM; //------------------------------------------------------------------------ -sal_uInt16 lcl_GetDefaultTabDist() +static sal_uInt16 lcl_GetDefaultTabDist() { if ( ScOptionsUtil::IsMetricSystem() ) return 709; // 1,25 cm diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index be6525300d5a..870d8211b011 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -569,7 +569,7 @@ void ScTabEditEngine::Init( const ScPatternAttr& rPattern ) // Zahlen aus \sw\source\core\doc\numbers.cxx // -String lcl_GetCharStr( sal_Int32 nNo ) +static String lcl_GetCharStr( sal_Int32 nNo ) { OSL_ENSURE( nNo, "0 ist eine ungueltige Nummer !!" ); String aStr; @@ -589,7 +589,7 @@ String lcl_GetCharStr( sal_Int32 nNo ) return aStr; } -String lcl_GetNumStr( sal_Int32 nNo, SvxNumType eType ) +static String lcl_GetNumStr( sal_Int32 nNo, SvxNumType eType ) { String aTmpStr(rtl::OUString('0')); if( nNo ) diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index db4d30e0673a..3809aa4fee0a 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -346,7 +346,7 @@ void ScInterpreter::ScChoseJump() aCode.Jump( pJump[ nJumpCount ], pJump[ nJumpCount ] ); } -void lcl_AdjustJumpMatrix( ScJumpMatrix* pJumpM, ScMatrixRef& pResMat, SCSIZE nParmCols, SCSIZE nParmRows ) +static void lcl_AdjustJumpMatrix( ScJumpMatrix* pJumpM, ScMatrixRef& pResMat, SCSIZE nParmCols, SCSIZE nParmRows ) { SCSIZE nJumpCols, nJumpRows; SCSIZE nResCols, nResRows; @@ -2146,13 +2146,13 @@ void ScInterpreter::ScType() } -inline bool lcl_FormatHasNegColor( const SvNumberformat* pFormat ) +static inline bool lcl_FormatHasNegColor( const SvNumberformat* pFormat ) { return pFormat && pFormat->GetColor( 1 ); } -inline bool lcl_FormatHasOpenPar( const SvNumberformat* pFormat ) +static inline bool lcl_FormatHasOpenPar( const SvNumberformat* pFormat ) { return pFormat && (pFormat->GetFormatstring().indexOf('(') != -1); } @@ -3184,7 +3184,7 @@ void ScInterpreter::ScValue() //2do: this should be a proper unicode string method -inline bool lcl_ScInterpreter_IsPrintable( sal_Unicode c ) +static inline bool lcl_ScInterpreter_IsPrintable( sal_Unicode c ) { return 0x20 <= c && c != 0x7f; } diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index e359a3de0fab..fc899502d7d4 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2227,7 +2227,7 @@ void ScInterpreter::ScStyle() PushIllegalParameter(); } -ScDdeLink* lcl_GetDdeLink( sfx2::LinkManager* pLinkMgr, +static ScDdeLink* lcl_GetDdeLink( sfx2::LinkManager* pLinkMgr, const String& rA, const String& rT, const String& rI, sal_uInt8 nM ) { sal_uInt16 nCount = pLinkMgr->GetLinks().size(); @@ -2615,7 +2615,7 @@ void ScInterpreter::ScRoman() } -bool lcl_GetArabicValue( sal_Unicode cChar, sal_uInt16& rnValue, bool& rbIsDec ) +static bool lcl_GetArabicValue( sal_Unicode cChar, sal_uInt16& rnValue, bool& rbIsDec ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBase" ); switch( cChar ) diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 933775c90452..c576e32ef772 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -71,12 +71,12 @@ protected: //template< class T > double lcl_IterateInverse( const T& rFunction, double x0, double x1, bool& rConvError ) /** u*w<0.0 fails for values near zero */ -inline bool lcl_HasChangeOfSign( double u, double w ) +static inline bool lcl_HasChangeOfSign( double u, double w ) { return (u < 0.0 && w > 0.0) || (u > 0.0 && w < 0.0); } -double lcl_IterateInverse( const ScDistFunc& rFunction, double fAx, double fBx, bool& rConvError ) +static double lcl_IterateInverse( const ScDistFunc& rFunction, double fAx, double fBx, bool& rConvError ) { rConvError = false; const double fYEps = 1.0E-307; @@ -492,7 +492,7 @@ double ScInterpreter::BinomKoeff(double n, double k) // in math library from http://www.boost.org /** you must ensure fZ>0 Uses a variant of the Lanczos sum with a rational function. */ -double lcl_getLanczosSum(double fZ) +static double lcl_getLanczosSum(double fZ) { const double fNum[13] ={ 23531376880.41075968857200767445163675473, @@ -560,7 +560,7 @@ double lcl_getLanczosSum(double fZ) // The algorithm is based on tgamma in gamma.hpp // in math library from http://www.boost.org /** You must ensure fZ>0; fZ>171.624376956302 will overflow. */ -double lcl_GetGammaHelper(double fZ) +static double lcl_GetGammaHelper(double fZ) { double fGamma = lcl_getLanczosSum(fZ); const double fg = 6.024680040776729583740234375; @@ -578,7 +578,7 @@ double lcl_GetGammaHelper(double fZ) // The algorithm is based on tgamma in gamma.hpp // in math library from http://www.boost.org /** You must ensure fZ>0 */ -double lcl_GetLogGammaHelper(double fZ) +static double lcl_GetLogGammaHelper(double fZ) { const double fg = 6.024680040776729583740234375; double fZgHelp = fZ + fg - 0.5; @@ -907,7 +907,7 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB) I_x(a,b) = ---------------- * result of ContFrac a * Beta(a,b) */ -double lcl_GetBetaHelperContFrac(double fX, double fA, double fB) +static double lcl_GetBetaHelperContFrac(double fX, double fA, double fB) { // like old version double a1, b1, a2, b2, fnorm, apl2m, d2m, d2m1, cfnew, cf; a1 = 1.0; b1 = 1.0; @@ -1676,7 +1676,7 @@ void ScInterpreter::ScPoissonDist() /** Local function used in the calculation of the hypergeometric distribution. */ -void lcl_PutFactorialElements( ::std::vector< double >& cn, double fLower, double fUpper, double fBase ) +static void lcl_PutFactorialElements( ::std::vector< double >& cn, double fLower, double fUpper, double fBase ) { for ( double i = fLower; i <= fUpper; ++i ) { diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index c35cdfd0f836..4eb288cbefd7 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3077,7 +3077,7 @@ void ScInterpreter::ScMissing() #ifndef DISABLE_SCRIPTING -uno::Any lcl_getSheetModule( const uno::Reference<table::XCellRange>& xCellRange, ScDocument* pDok ) +static uno::Any lcl_getSheetModule( const uno::Reference<table::XCellRange>& xCellRange, ScDocument* pDok ) { uno::Reference< sheet::XSheetCellRange > xSheetRange( xCellRange, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xSheetRange->getSpreadsheet(), uno::UNO_QUERY_THROW ); @@ -3107,7 +3107,7 @@ uno::Any lcl_getSheetModule( const uno::Reference<table::XCellRange>& xCellRange return uno::makeAny( xIf ); } -bool +static bool lcl_setVBARange( ScRange& aRange, ScDocument* pDok, SbxVariable* pPar ) { bool bOk = false; diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 0b9eb3bd258f..46fd6fc1649b 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -1135,7 +1135,7 @@ void ScInterpreter::ScMatTrans() For a row or column vector to be replicated the larger matrix dimension is returned, else the smaller dimension. */ -inline SCSIZE lcl_GetMinExtent( SCSIZE n1, SCSIZE n2 ) +static inline SCSIZE lcl_GetMinExtent( SCSIZE n1, SCSIZE n2 ) { if (n1 == 1) return n2; @@ -1148,7 +1148,7 @@ inline SCSIZE lcl_GetMinExtent( SCSIZE n1, SCSIZE n2 ) } template<class _Function> -ScMatrixRef lcl_MatrixCalculation( +static ScMatrixRef lcl_MatrixCalculation( const ScMatrix& rMat1, const ScMatrix& rMat2, ScInterpreter* pInterpreter) { static _Function Op; @@ -1216,7 +1216,7 @@ ScMatrixRef ScInterpreter::MatConcat(const ScMatrixRef& pMat1, const ScMatrixRef // for DATE, TIME, DATETIME -void lcl_GetDiffDateTimeFmtType( short& nFuncFmt, short nFmt1, short nFmt2 ) +static void lcl_GetDiffDateTimeFmtType( short& nFuncFmt, short nFmt1, short nFmt2 ) { if ( nFmt1 != NUMBERFORMAT_UNDEFINED || nFmt2 != NUMBERFORMAT_UNDEFINED ) { diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index b5d9846c80a8..597dcc04e017 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -56,7 +56,7 @@ ScDocument* ScProgress::pInterpretDoc; sal_Bool ScProgress::bIdleWasDisabled = false; -sal_Bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh ) +static sal_Bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh ) { if (pObjSh) { @@ -73,7 +73,7 @@ sal_Bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh ) return false; } -bool lcl_HasControllersLocked( SfxObjectShell& rObjSh ) +static bool lcl_HasControllersLocked( SfxObjectShell& rObjSh ) { uno::Reference<frame::XModel> xModel( rObjSh.GetBaseModel() ); if (xModel.is()) diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index ff350188fab6..6c8e7ca28bf5 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -42,7 +42,7 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -bool lcl_HasErrors( ScDocument* pDoc, const ScRange& rRange ) +static bool lcl_HasErrors( ScDocument* pDoc, const ScRange& rRange ) { // no need to look at empty cells - just use ScCellIterator ScCellIterator aIter( pDoc, rRange ); @@ -56,7 +56,7 @@ bool lcl_HasErrors( ScDocument* pDoc, const ScRange& rRange ) return false; // no error found } -long lcl_DoubleToLong( double fVal ) +static long lcl_DoubleToLong( double fVal ) { double fInt = (fVal >= 0.0) ? ::rtl::math::approxFloor( fVal ) : ::rtl::math::approxCeil( fVal ); @@ -252,7 +252,7 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa //------------------------------------------------------------------------ -double lcl_GetValueFromCell( ScBaseCell& rCell ) +static double lcl_GetValueFromCell( ScBaseCell& rCell ) { //! ScBaseCell member function? diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx index 8593dde47a5f..58a47b9e35d1 100644 --- a/sc/source/core/tool/reffind.cxx +++ b/sc/source/core/tool/reffind.cxx @@ -218,7 +218,7 @@ ScRefFinder::~ScRefFinder() { } -sal_uInt16 lcl_NextFlags( sal_uInt16 nOld ) +static sal_uInt16 lcl_NextFlags( sal_uInt16 nOld ) { sal_uInt16 nNew = nOld & 7; // die drei Abs-Flags nNew = ( nNew - 1 ) & 7; // weiterzaehlen diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx index 38fe766f0bb2..c5487b6485e5 100644 --- a/sc/source/core/tool/refupdat.cxx +++ b/sc/source/core/tool/refupdat.cxx @@ -35,7 +35,7 @@ //------------------------------------------------------------------------ template< typename R, typename S, typename U > -bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask ) +static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask ) { bool bCut = false; if ( rRef >= nStart ) @@ -56,7 +56,7 @@ bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask ) } template< typename R, typename S, typename U > -bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask ) +static bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask ) { bool bCut = false; if ( rRef >= nStart ) @@ -77,7 +77,7 @@ bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask ) } template< typename R, typename S, typename U > -bool lcl_MoveReorder( R& rRef, U nStart, U nEnd, S nDelta ) +static bool lcl_MoveReorder( R& rRef, U nStart, U nEnd, S nDelta ) { if ( rRef >= nStart && rRef <= nEnd ) { @@ -112,7 +112,7 @@ bool lcl_MoveReorder( R& rRef, U nStart, U nEnd, S nDelta ) } template< typename R, typename S, typename U > -bool lcl_MoveItCut( R& rRef, S nDelta, U nMask ) +static bool lcl_MoveItCut( R& rRef, S nDelta, U nMask ) { bool bCut = false; rRef = sal::static_int_cast<R>( rRef + nDelta ); @@ -130,7 +130,7 @@ bool lcl_MoveItCut( R& rRef, S nDelta, U nMask ) } template< typename R, typename S, typename U > -void lcl_MoveItWrap( R& rRef, S nDelta, U nMask ) +static void lcl_MoveItWrap( R& rRef, S nDelta, U nMask ) { rRef = sal::static_int_cast<R>( rRef + nDelta ); if ( rRef < 0 ) @@ -140,7 +140,7 @@ void lcl_MoveItWrap( R& rRef, S nDelta, U nMask ) } template< typename R, typename S, typename U > -bool lcl_MoveRefPart( R& rRef1Val, bool& rRef1Del, bool bDo1, +static bool lcl_MoveRefPart( R& rRef1Val, bool& rRef1Del, bool bDo1, R& rRef2Val, bool& rRef2Del, bool bDo2, U nStart, U nEnd, S nDelta, U nMask ) { @@ -223,7 +223,7 @@ void Expand( R& n1, R& n2, U nStart, S nD ) } -bool lcl_IsWrapBig( sal_Int32 nRef, sal_Int32 nDelta ) +static bool lcl_IsWrapBig( sal_Int32 nRef, sal_Int32 nDelta ) { if ( nRef > 0 && nDelta > 0 ) return nRef + nDelta <= 0; @@ -233,7 +233,7 @@ bool lcl_IsWrapBig( sal_Int32 nRef, sal_Int32 nDelta ) } -bool lcl_MoveBig( sal_Int32& rRef, sal_Int32 nStart, sal_Int32 nDelta ) +static bool lcl_MoveBig( sal_Int32& rRef, sal_Int32 nStart, sal_Int32 nDelta ) { bool bCut = false; if ( rRef >= nStart ) @@ -248,7 +248,7 @@ bool lcl_MoveBig( sal_Int32& rRef, sal_Int32 nStart, sal_Int32 nDelta ) return bCut; } -bool lcl_MoveItCutBig( sal_Int32& rRef, sal_Int32 nDelta ) +static bool lcl_MoveItCutBig( sal_Int32& rRef, sal_Int32 nDelta ) { bool bCut = lcl_IsWrapBig( rRef, nDelta ); rRef += nDelta; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index c7e936753aad..3035954d3a2e 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -298,7 +298,7 @@ bool ScRawToken::IsValidReference() const } -sal_uInt16 lcl_ScRawTokenOffset() +sal_uInt16 ScRawToken::sbyteOffset() { // offset of sbyte in ScRawToken // offsetof(ScRawToken, sbyte) gives a warning with gcc, because ScRawToken is no POD @@ -319,7 +319,7 @@ ScRawToken* ScRawToken::Clone() const } else { - static sal_uInt16 nOffset = lcl_ScRawTokenOffset(); // offset of sbyte + static sal_uInt16 nOffset = sbyteOffset(); // offset of sbyte sal_uInt16 n = nOffset; switch( eType ) @@ -448,14 +448,14 @@ void ScRawToken::Delete() // --- class ScToken -------------------------------------------------------- -ScSingleRefData lcl_ScToken_InitSingleRef() +static ScSingleRefData lcl_ScToken_InitSingleRef() { ScSingleRefData aRef; aRef.InitAddress( ScAddress() ); return aRef; } -ScComplexRefData lcl_ScToken_InitDoubleRef() +static ScComplexRefData lcl_ScToken_InitDoubleRef() { ScComplexRefData aRef; aRef.Ref1 = lcl_ScToken_InitSingleRef(); diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index d0a4a7ea0161..89f0074f865d 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -200,7 +200,7 @@ public: }; // defined in docfunc.cxx ( really this needs a new name ) -script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule ); +static script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule ); ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) : ImportExcel( rImpData, rStrm ) diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 4a891e73c835..56ea86291426 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -422,7 +422,7 @@ static void lcl_WriteSelection( XclExpXmlStream& rStrm, const XclTabViewData& rD XclExpSelection( rData, nPane ).SaveXml( rStrm ); } -OString lcl_GetZoom( sal_uInt16 nZoom ) +static OString lcl_GetZoom( sal_uInt16 nZoom ) { if( nZoom ) return OString::valueOf( (sal_Int32)nZoom ); diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 41eef6610442..7b412f3ddb21 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -971,7 +971,7 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo ) // Groesster Gemeinsamer Teiler nach Euklid (Kettendivision) // Sonderfall: 0 und irgendwas geben 1 -SCROW lcl_GGT( SCROW a, SCROW b ) +static SCROW lcl_GGT( SCROW a, SCROW b ) { if ( !a || !b ) return 1; @@ -987,7 +987,7 @@ SCROW lcl_GGT( SCROW a, SCROW b ) // Kleinstes Gemeinsames Vielfaches: a * b / GGT(a,b) -SCROW lcl_KGV( SCROW a, SCROW b ) +static SCROW lcl_KGV( SCROW a, SCROW b ) { if ( a > b ) // Ueberlauf unwahrscheinlicher machen return (a / lcl_GGT(a,b)) * b; diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx index 28d8d8750704..b56faec22dc0 100644 --- a/sc/source/filter/starcalc/collect.cxx +++ b/sc/source/filter/starcalc/collect.cxx @@ -43,7 +43,7 @@ ScDataObject::~ScDataObject() // Collection //------------------------------------------------------------------------ -void lcl_DeleteScDataObjects( ScDataObject** p, sal_uInt16 nCount ) +static void lcl_DeleteScDataObjects( ScDataObject** p, sal_uInt16 nCount ) { if ( p ) { diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index ad95f71e492b..02d3e2c3a32e 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -338,7 +338,7 @@ static void lcl_ReadChartTypeData(SvStream& rStream, Sc10ChartTypeData& rTypeDat rStream.Read(&rTypeData.Reserved, sizeof(rTypeData.Reserved)); } -double lcl_PascalToDouble(sal_Char* tp6) +static double lcl_PascalToDouble(sal_Char* tp6) { sal_uInt8* pnUnsigned = reinterpret_cast< sal_uInt8* >( tp6 ); // biased exponent @@ -386,7 +386,7 @@ static void lcl_ChangeColor( sal_uInt16 nIndex, Color& rColor ) rColor.SetColor( aCol ); } -String lcl_MakeOldPageStyleFormatName( sal_uInt16 i ) +static String lcl_MakeOldPageStyleFormatName( sal_uInt16 i ) { String aName = ScGlobal::GetRscString( STR_PAGESTYLE ); aName.AppendAscii( " " ); diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 66359f2ddc3a..042fafb96d5e 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -69,7 +69,7 @@ static OString lcl_DateTimeToOString( const DateTime& rDateTime ) //___________________________________________________________________ // local functions -void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime ) +static void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime ) { rStrm.SetSliceSize( 7 ); rStrm << (sal_uInt16) rDateTime.GetYear() @@ -83,7 +83,7 @@ void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime ) // write string and fill rest of <nLength> with zero bytes // <nLength> is without string header -void lcl_WriteFixedString( XclExpStream& rStrm, const XclExpString& rString, sal_Size nLength ) +static void lcl_WriteFixedString( XclExpStream& rStrm, const XclExpString& rString, sal_Size nLength ) { sal_Size nStrBytes = rString.GetBufferSize(); OSL_ENSURE( nLength >= nStrBytes, "lcl_WriteFixedString - String too long" ); @@ -93,13 +93,13 @@ void lcl_WriteFixedString( XclExpStream& rStrm, const XclExpString& rString, sal rStrm.WriteZeroBytes( nLength - nStrBytes ); } -inline void lcl_GenerateGUID( sal_uInt8* pGUID, sal_Bool& rValidGUID ) +static inline void lcl_GenerateGUID( sal_uInt8* pGUID, sal_Bool& rValidGUID ) { rtl_createUuid( pGUID, rValidGUID ? pGUID : NULL, false ); rValidGUID = sal_True; } -inline void lcl_WriteGUID( XclExpStream& rStrm, const sal_uInt8* pGUID ) +static inline void lcl_WriteGUID( XclExpStream& rStrm, const sal_uInt8* pGUID ) { rStrm.SetSliceSize( 16 ); for( sal_Size nIndex = 0; nIndex < 16; nIndex++ ) diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 6b886bfd6602..53be1208c89a 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -678,7 +678,7 @@ void XclObjDropDown::WriteSubRecs( XclExpStream& rStrm ) // --- class XclTxo -------------------------------------------------- -sal_uInt8 lcl_GetHorAlignFromItemSet( const SfxItemSet& rItemSet ) +static sal_uInt8 lcl_GetHorAlignFromItemSet( const SfxItemSet& rItemSet ) { sal_uInt8 nHorAlign = EXC_OBJ_HOR_LEFT; @@ -693,7 +693,7 @@ sal_uInt8 lcl_GetHorAlignFromItemSet( const SfxItemSet& rItemSet ) return nHorAlign; } -sal_uInt8 lcl_GetVerAlignFromItemSet( const SfxItemSet& rItemSet ) +static sal_uInt8 lcl_GetVerAlignFromItemSet( const SfxItemSet& rItemSet ) { sal_uInt8 nVerAlign = EXC_OBJ_VER_TOP; diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 36ff2df44125..6e90d3a1c878 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -78,7 +78,7 @@ void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape // Attempt to find the topmost parent of the group, this is the one we apply // offsets to -uno::Reference< drawing::XShape > lcl_getTopLevelParent( const uno::Reference< drawing::XShape >& rShape ) +static uno::Reference< drawing::XShape > lcl_getTopLevelParent( const uno::Reference< drawing::XShape >& rShape ) { uno::Reference< container::XChild > xChild( rShape, uno::UNO_QUERY ); uno::Reference< drawing::XShape > xParent( xChild->getParent(), uno::UNO_QUERY ); diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 184bd067c91a..6961f37d4f61 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -210,7 +210,7 @@ void ScSheetSaveData::StoreLoadedNamespaces( const SvXMLNamespaceMap& rNamespace } } -bool lcl_NameInHash( const NameSpaceHash& rNameHash, const rtl::OUString& rName ) +static bool lcl_NameInHash( const NameSpaceHash& rNameHash, const rtl::OUString& rName ) { NameSpaceHash::const_iterator aIter = rNameHash.begin(), aEnd = rNameHash.end(); while (aIter != aEnd) diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 98e15c65119e..46d35bf8c35c 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2021,7 +2021,7 @@ void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRo } } -uno::Any lcl_GetEnumerated( uno::Reference<container::XEnumerationAccess> xEnumAccess, sal_Int32 nIndex ) +static uno::Any lcl_GetEnumerated( uno::Reference<container::XEnumerationAccess> xEnumAccess, sal_Int32 nIndex ) { uno::Any aRet; uno::Reference<container::XEnumeration> xEnum( xEnumAccess->createEnumeration() ); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 83ee343e29b7..4d513fe3ce83 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -602,7 +602,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) return false; } -bool lcl_HasValidStream(ScDocument& rDoc) +static bool lcl_HasValidStream(ScDocument& rDoc) { SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); if ( pObjSh->IsDocShared() ) diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 7dc366eec041..ffc45d9f8034 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -284,7 +284,7 @@ Point ScAccessibleCsvControl::implGetAbsPos( const Point& rPos ) const // Ruler ====================================================================== /** Converts a ruler cursor position to API text index. */ -sal_Int32 lcl_GetApiPos( sal_Int32 nRulerPos ) +static sal_Int32 lcl_GetApiPos( sal_Int32 nRulerPos ) { sal_Int32 nApiPos = nRulerPos; sal_Int32 nStart = (nRulerPos - 1) / 10; @@ -298,7 +298,7 @@ sal_Int32 lcl_GetApiPos( sal_Int32 nRulerPos ) } /** Converts an API text index to a ruler cursor position. */ -sal_Int32 lcl_GetRulerPos( sal_Int32 nApiPos ) +static sal_Int32 lcl_GetRulerPos( sal_Int32 nApiPos ) { sal_Int32 nDiv = 10; sal_Int32 nExp = 10; @@ -318,7 +318,7 @@ sal_Int32 lcl_GetRulerPos( sal_Int32 nApiPos ) } /** Expands the sequence's size and returns the base index of the new inserted elements. */ -inline sal_Int32 lcl_ExpandSequence( Sequence< PropertyValue >& rSeq, sal_Int32 nExp ) +static inline sal_Int32 lcl_ExpandSequence( Sequence< PropertyValue >& rSeq, sal_Int32 nExp ) { OSL_ENSURE( nExp > 0, "lcl_ExpandSequence - invalid value" ); rSeq.realloc( rSeq.getLength() + nExp ); @@ -326,14 +326,14 @@ inline sal_Int32 lcl_ExpandSequence( Sequence< PropertyValue >& rSeq, sal_Int32 } /** Fills the property value rVal with the specified name and value from the item. */ -inline void lcl_FillProperty( PropertyValue& rVal, const OUString& rPropName, const SfxPoolItem& rItem, sal_uInt8 nMID ) +static inline void lcl_FillProperty( PropertyValue& rVal, const OUString& rPropName, const SfxPoolItem& rItem, sal_uInt8 nMID ) { rVal.Name = rPropName; rItem.QueryValue( rVal.Value, nMID ); } /** Fills the sequence with all font attributes of rFont. */ -void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const Font& rFont ) +static void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const Font& rFont ) { SvxFontItem aFontItem( rFont.GetFamily(), rFont.GetName(), rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), ATTR_FONT ); SvxFontHeightItem aHeightItem( rFont.GetSize().Height(), 100, ATTR_FONT_HEIGHT ); @@ -885,13 +885,13 @@ sal_Int32 ScAccessibleCsvRuler::implGetLastEqualFormatted( sal_Int32 nApiPos ) // Grid ======================================================================= /** Converts a grid columnm index to an API column index. */ -inline sal_Int32 lcl_GetApiColumn( sal_uInt32 nGridColumn ) +static inline sal_Int32 lcl_GetApiColumn( sal_uInt32 nGridColumn ) { return (nGridColumn != CSV_COLUMN_HEADER) ? static_cast< sal_Int32 >( nGridColumn + 1 ) : 0; } /** Converts an API columnm index to a ScCsvGrid column index. */ -inline sal_uInt32 lcl_GetGridColumn( sal_Int32 nApiColumn ) +static inline sal_uInt32 lcl_GetGridColumn( sal_Int32 nApiColumn ) { return (nApiColumn > 0) ? static_cast< sal_uInt32 >( nApiColumn - 1 ) : CSV_COLUMN_HEADER; } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index a78afe7bd998..b8647d4cab1c 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -658,7 +658,7 @@ void ScDrawTransferObj::SetDrawPersist( const SfxObjectShellRef& rRef ) aDrawPersistRef = rRef; } -void lcl_InitMarks( SdrMarkView& rDest, const SdrMarkView& rSource, SCTAB nTab ) +static void lcl_InitMarks( SdrMarkView& rDest, const SdrMarkView& rSource, SCTAB nTab ) { rDest.ShowSdrPage(rDest.GetModel()->GetPage(nTab)); SdrPageView* pDestPV = rDest.GetSdrPageView(); diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 78fd03e5c3ea..9b92164efb95 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -308,7 +308,7 @@ handle_r1c1: } } -void lcl_Replace( EditView* pView, const String& rNewStr, const ESelection& rOldSel ) +static void lcl_Replace( EditView* pView, const String& rNewStr, const ESelection& rOldSel ) { if ( pView ) { @@ -394,12 +394,12 @@ inline String GetEditText(EditEngine* pEng) return ScEditUtil::GetSpaceDelimitedString(*pEng); } -void lcl_RemoveTabs(rtl::OUString& rStr) +static void lcl_RemoveTabs(rtl::OUString& rStr) { removeChars(rStr, sal_Unicode('\t')); } -void lcl_RemoveLineEnd(rtl::OUString& rStr) +static void lcl_RemoveLineEnd(rtl::OUString& rStr) { rStr = convertLineEnd(rStr, LINEEND_LF); removeChars(rStr, sal_Unicode('\n')); @@ -1237,7 +1237,7 @@ void ScInputHandler::NextFormulaEntry( bool bBack ) pActiveView->ShowCursor(); } -void lcl_CompleteFunction( EditView* pView, const String& rInsert, bool& rParInserted ) +static void lcl_CompleteFunction( EditView* pView, const String& rInsert, bool& rParInserted ) { if (pView) { @@ -1309,7 +1309,7 @@ void ScInputHandler::PasteFunctionData() // Selektion berechnen und als Tip-Hilfe anzeigen // -String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress &rPos ) +static String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress &rPos ) { //! mit ScFormulaDlg::CalcValue zusammenfassen und ans Dokument verschieben !!!! //! (Anfuehrungszeichen bei Strings werden nur hier eingefuegt) @@ -2098,7 +2098,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn return bNewTable; } -void lcl_SetTopSelection( EditView* pEditView, ESelection& rSel ) +static void lcl_SetTopSelection( EditView* pEditView, ESelection& rSel ) { OSL_ENSURE( rSel.nStartPara==0 && rSel.nEndPara==0, "SetTopSelection: Para != 0" ); @@ -2454,7 +2454,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode ) // lcl_IsNumber - true, wenn nur Ziffern (dann keine Autokorrektur) -bool lcl_IsNumber(const String& rString) +static bool lcl_IsNumber(const String& rString) { xub_StrLen nLen = rString.Len(); for (xub_StrLen i=0; i<nLen; i++) @@ -2466,7 +2466,7 @@ bool lcl_IsNumber(const String& rString) return true; } -void lcl_SelectionToEnd( EditView* pView ) +static void lcl_SelectionToEnd( EditView* pView ) { if ( pView ) { diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 37346de866a7..ba20b96abab3 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -159,7 +159,7 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const //================================================================== #define IMAGE(id) pImgMgr->SeekImage(id) -bool lcl_isExperimentalMode() +static bool lcl_isExperimentalMode() { // make inputbar feature on by default, leave the switch for the // moment in case we need to back it out easily @@ -170,7 +170,7 @@ bool lcl_isExperimentalMode() // class ScInputWindow //================================================================== -ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind ) +static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind ) { ScTabViewShell* pViewSh = NULL; SfxDispatcher* pDisp = pBind->GetDispatcher(); @@ -1291,7 +1291,7 @@ void ScMultiTextWnd::StartEditEngine() pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT ); } -void lcl_ExtendEditFontAttribs( SfxItemSet& rSet ) +static void lcl_ExtendEditFontAttribs( SfxItemSet& rSet ) { const SfxPoolItem& rFontItem = rSet.Get( EE_CHAR_FONTINFO ); rSet.Put( rFontItem, EE_CHAR_FONTINFO_CJK ); @@ -1310,7 +1310,7 @@ void lcl_ExtendEditFontAttribs( SfxItemSet& rSet ) rSet.Put( rLangItem, EE_CHAR_LANGUAGE_CTL ); } -void lcl_ModifyRTLDefaults( SfxItemSet& rSet ) +static void lcl_ModifyRTLDefaults( SfxItemSet& rSet ) { rSet.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); @@ -1325,7 +1325,7 @@ void lcl_ModifyRTLDefaults( SfxItemSet& rSet ) rSet.Put( aItem ); } -void lcl_ModifyRTLVisArea( EditView* pEditView ) +static void lcl_ModifyRTLVisArea( EditView* pEditView ) { Rectangle aVisArea = pEditView->GetVisArea(); Size aPaper = pEditView->GetEditEngine()->GetPaperSize(); @@ -2231,7 +2231,7 @@ void ScPosWnd::HideTip() } } -ScNameInputType lcl_GetInputType( const String& rText ) +static ScNameInputType lcl_GetInputType( const String& rText ) { ScNameInputType eRet = SC_NAME_INPUT_BAD_NAME; // the more general error diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 294ac6e64565..2b74872eafb8 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1615,7 +1615,7 @@ void ScModule::SetRefDialog( sal_uInt16 nId, sal_Bool bVis, SfxViewFrame* pViewF } } -SfxChildWindow* lcl_GetChildWinFromAnyView( sal_uInt16 nId ) +static SfxChildWindow* lcl_GetChildWinFromAnyView( sal_uInt16 nId ) { // first try the current view @@ -1747,7 +1747,7 @@ sal_Bool ScModule::IsFormulaMode() return bIsFormula; } -void lcl_MarkedTabs( const ScMarkData& rMark, SCTAB& rStartTab, SCTAB& rEndTab ) +static void lcl_MarkedTabs( const ScMarkData& rMark, SCTAB& rStartTab, SCTAB& rEndTab ) { if (rMark.GetSelectCount() > 1) { @@ -1862,7 +1862,7 @@ void ScModule::AnythingChanged() nIdleCount = 0; } -void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) +static void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) { SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); while ( pFrame ) diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index c514d0f8e179..aefa0fc131a6 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star; // ----------------------------------------------------------------------- -sal_Bool lcl_IsURLButton( SdrObject* pObject ) +static sal_Bool lcl_IsURLButton( SdrObject* pObject ) { sal_Bool bRet = false; @@ -325,9 +325,6 @@ void ScSelectionTransferObj::CreateCellData() OSL_ENSURE( pCellData, "can't create CellData" ); } -//! make static member of ScDrawView -extern void lcl_CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle ); - void ScSelectionTransferObj::CreateDrawData() { OSL_ENSURE( !pDrawData, "CreateDrawData twice" ); @@ -340,7 +337,7 @@ void ScSelectionTransferObj::CreateDrawData() { sal_Bool bAnyOle, bOneOle; const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList(); - lcl_CheckOle( rMarkList, bAnyOle, bOneOle ); + ScDrawView::CheckOle( rMarkList, bAnyOle, bOneOle ); //--------------------------------------------------------- ScDocShellRef aDragShellRef; diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index fbcecb729a91..3ec7926c9840 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -516,7 +516,7 @@ const String& ScCsvGrid::GetColumnTypeName( sal_uInt32 nColIndex ) const return (nTypeIx < maTypeNames.size()) ? maTypeNames[ nTypeIx ] : EMPTY_STRING; } -sal_uInt8 lcl_GetExtColumnType( sal_Int32 nIntType ) +static sal_uInt8 lcl_GetExtColumnType( sal_Int32 nIntType ) { static sal_uInt8 pExtTypes[] = { SC_COL_STANDARD, SC_COL_TEXT, SC_COL_DMY, SC_COL_MDY, SC_COL_YMD, SC_COL_ENGLISH, SC_COL_SKIP }; diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index c3bfdbc98431..346999fde0c4 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -69,7 +69,7 @@ using ::rtl::OUString; // ============================================================================ -void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect ) +static void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect ) { xub_StrLen i; xub_StrLen nCount = comphelper::string::getTokenCount(rList, '\t'); @@ -89,7 +89,7 @@ void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect ) } } -sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList ) +static sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList ) { sal_Unicode c = 0; String aStr = rCombo.GetText(); diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index b40eb3b59142..07049a009bd0 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1184,7 +1184,7 @@ sal_Bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, //================================================================== -sal_Bool lcl_EmptyExcept( ScDocument* pDoc, const ScRange& rRange, const ScRange& rExcept ) +static sal_Bool lcl_EmptyExcept( ScDocument* pDoc, const ScRange& rRange, const ScRange& rExcept ) { ScCellIterator aIter( pDoc, rRange ); ScBaseCell* pCell = aIter.GetFirst(); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 99a65a2d30c7..188259354fb3 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -128,7 +128,7 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) // Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight) -void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange ) +static void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange ) { SCROW nRow = rRange.aStart.Row(); if ( nRow > 0 ) @@ -1008,7 +1008,7 @@ sal_Bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngi } -ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const String& rText, const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) +static ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const String& rText, const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) { ScTokenArray* pCode = new ScTokenArray; pCode->AddStringXML( rText ); @@ -2626,7 +2626,7 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, St } -script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule ) +static script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule ) { script::ModuleInfo sModuleInfo; sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; @@ -3080,7 +3080,7 @@ bool ScDocFunc::SetTabBgColor( //! - Optimale Hoehe fuer Edit-Zellen ist unterschiedlich zwischen Drucker und Bildschirm //! - Optimale Breite braucht Selektion, um evtl. nur selektierte Zellen zu beruecksichtigen -sal_uInt16 lcl_GetOptimalColWidth( ScDocShell& rDocShell, SCCOL nCol, SCTAB nTab, sal_Bool bFormula ) +static sal_uInt16 lcl_GetOptimalColWidth( ScDocShell& rDocShell, SCCOL nCol, SCTAB nTab, sal_Bool bFormula ) { sal_uInt16 nTwips = 0; diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index dfa01e1749a5..c75075cfff87 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -745,7 +745,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) // //--------------------------------------------------------------------- -inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, sal_Bool bIgnore100Sec ) +static inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, sal_Bool bIgnore100Sec ) { return pA && pB && pA->GetActionNumber() == pB->GetActionNumber() && @@ -757,7 +757,7 @@ inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, s // State nicht vergleichen, falls eine alte Aenderung akzeptiert wurde } -bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScDocument* pSearchDoc, const ScChangeAction* pFirstSearchAction, const ScChangeAction* pLastSearchAction, sal_Bool bIgnore100Sec ) +static bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScDocument* pSearchDoc, const ScChangeAction* pFirstSearchAction, const ScChangeAction* pLastSearchAction, sal_Bool bIgnore100Sec ) { if ( !pDoc || !pAction || !pSearchDoc || !pFirstSearchAction || !pLastSearchAction ) { diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 1804c40e53a5..5beb522aa033 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -467,7 +467,7 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource ) } } -rtl::OUString lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea ) +static rtl::OUString lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea ) { rtl::OUString aName; sal_Bool bOk = false; diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 94b978728ac7..47315b3aed52 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -88,7 +88,7 @@ void ScDocShell::SetVisArea( const Rectangle & rVisArea ) SetVisAreaOrSize( rVisArea, sal_True ); } -void lcl_SetTopRight( Rectangle& rRect, const Point& rPos ) +static void lcl_SetTopRight( Rectangle& rRect, const Point& rPos ) { Size aSize = rRect.GetSize(); rRect.Right() = rPos.X(); @@ -239,7 +239,7 @@ SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool() // muessen die SetItems (ATTR_PAGE_HEADERSET, ATTR_PAGE_FOOTERSET) auf den richtigen // Pool umgesetzt werden, bevor der Quell-Pool geloescht wird. -void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool ) +static void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool ) { pStylePool->SetSearchMask(SFX_STYLE_FAMILY_PAGE, 0xffff); SfxStyleSheetBase *pStyle = pStylePool->First(); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 02811e8a6638..c0134fd0fca9 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2429,7 +2429,7 @@ const OUString* ScExternalRefManager::getRealRangeName(sal_uInt16 nFileId, const } template<typename MapContainer> -void lcl_removeByFileId(sal_uInt16 nFileId, MapContainer& rMap) +static void lcl_removeByFileId(sal_uInt16 nFileId, MapContainer& rMap) { typename MapContainer::iterator itr = rMap.find(nFileId); if (itr != rMap.end()) diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index f2b36a474f9a..05521e20ecd8 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -720,7 +720,7 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString, return p; } -void lcl_UnescapeSylk( String & rString, SylkVersion eVersion ) +static void lcl_UnescapeSylk( String & rString, SylkVersion eVersion ) { // Older versions didn't escape the semicolon. // Older versions quoted the string and doubled embedded quotes, but not @@ -863,7 +863,7 @@ static void lcl_WriteString( SvStream& rStrm, String& rString, sal_Unicode cQuot ScImportExport::WriteUnicodeOrByteString( rStrm, rString ); } -inline void lcl_WriteSimpleString( SvStream& rStrm, const String& rString ) +static inline void lcl_WriteSimpleString( SvStream& rStrm, const String& rString ) { ScImportExport::WriteUnicodeOrByteString( rStrm, rString ); } @@ -1218,7 +1218,7 @@ static bool lcl_PutString( } -String lcl_GetFixed( const rtl::OUString& rLine, sal_Int32 nStart, sal_Int32 nNext, +static String lcl_GetFixed( const rtl::OUString& rLine, sal_Int32 nStart, sal_Int32 nNext, bool& rbIsQuoted, bool& rbOverflowCell ) { sal_Int32 nLen = rLine.getLength(); @@ -2274,7 +2274,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get() // Precondition: pStr is guaranteed to be non-NULL and points to a 0-terminated // array. -inline const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode* pStr, +static inline const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c ) { while (*pStr) diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 9d79456a4605..667daf3c14fc 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -39,7 +39,7 @@ //======================================================================== -void lcl_InvalidateOutliner( SfxBindings* pBindings ) +static void lcl_InvalidateOutliner( SfxBindings* pBindings ) { if ( pBindings ) { @@ -56,7 +56,7 @@ void lcl_InvalidateOutliner( SfxBindings* pBindings ) //! PaintWidthHeight zur DocShell verschieben? -void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, +static void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, sal_Bool bColumns, SCCOLROW nStart, SCCOLROW nEnd ) { ScDocument* pDoc = rDocShell.GetDocument(); diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index cbf81037cb10..2d6cadc5e863 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -40,7 +40,7 @@ using namespace formula; // ----------------------------------------------------------------------- -sal_Bool lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const String& rName ) +static sal_Bool lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const String& rName ) { if (pDocSh) { diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index e2d205802f6b..b726936385c9 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -93,7 +93,7 @@ void ScDrawShell::StateDisableItems( SfxItemSet &rSet ) } } -void lcl_setModified( SfxObjectShell* pShell ) +static void lcl_setModified( SfxObjectShell* pShell ) { if ( pShell ) { diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 170804cbb20a..2697d335de14 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -595,7 +595,7 @@ void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) pViewData->GetScDrawView()->InvalidateDrawTextAttrs(); } -void lcl_RemoveFields( OutlinerView& rOutView ) +static void lcl_RemoveFields( OutlinerView& rOutView ) { //! Outliner should have RemoveFields with a selection diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 016f1cd4f1e6..86b7490eb556 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -189,7 +189,7 @@ sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEvent* pInitialKey ) +static sal_Bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEvent* pInitialKey ) { sal_Bool bReturn = false; if ( pObj && pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) ) @@ -701,7 +701,7 @@ void FuDraw::Deactivate() |* \************************************************************************/ -sal_Bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow ) +static sal_Bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow ) { SdrViewEvent aVEvt; MouseEvent aMEvt( rPosPixel, 1, 0, MOUSE_LEFT ); diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 22671a4b6b28..435dbafa0870 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -102,7 +102,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r //------------------------------------------------------------------------ -void lcl_InsertGraphic( const Graphic& rGraphic, +static void lcl_InsertGraphic( const Graphic& rGraphic, const String& rFileName, const String& rFilterName, sal_Bool bAsLink, sal_Bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView ) { @@ -160,7 +160,7 @@ void lcl_InsertGraphic( const Graphic& rGraphic, //------------------------------------------------------------------------ -void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi, +static void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView, const Size& rPrefSize, bool const bLink ) { diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 7a10f57a85ae..2505ada36399 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -57,7 +57,7 @@ //------------------------------------------------------------------ -void lcl_InvalidateAttribs( SfxBindings& rBindings ) +static void lcl_InvalidateAttribs( SfxBindings& rBindings ) { rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT ); rBindings.Invalidate( SID_ATTR_CHAR_POSTURE ); @@ -91,7 +91,7 @@ void lcl_InvalidateAttribs( SfxBindings& rBindings ) rBindings.Invalidate( SID_ALIGN_ANY_JUSTIFIED ); } -void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj ) +static void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj ) { // use hyphenator only if hyphenation attribute is set if ( pObj && ((const SfxBoolItem&)pObj->GetMergedItem(EE_PARA_HYPHENATE)).GetValue() ) { diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index ca3eb42e208a..6574cac15d0b 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -137,6 +137,8 @@ public: SdrEndTextEditKind ScEndTextEdit(); // calls SetDrawTextUndo(0) ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable(); + + static void CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle ); }; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index fa4382304493..8ebb1c3e21ca 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -620,7 +620,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(sal_Bool bFlag, sal_Bool bChil -void lcl_InvalidateWindows() +static void lcl_InvalidateWindows() { TypeId aType(TYPE(ScDocShell)); ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType); @@ -653,7 +653,7 @@ void lcl_InvalidateWindows() } //---------------------------------------------------------------------------- -void lcl_HideAllReferences() +static void lcl_HideAllReferences() { TypeId aScType = TYPE(ScTabViewShell); SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType ); diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index fc3c4c9a4a37..d6a3de22f855 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -98,7 +98,7 @@ ScAutoFmtPreview::~ScAutoFmtPreview() //------------------------------------------------------------------------ -void lcl_SetFontProperties( +static void lcl_SetFontProperties( Font& rFont, const SvxFontItem& rFontItem, const SvxWeightItem& rWeightItem, diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 65423c296c1e..58d20e24611f 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -698,28 +698,28 @@ IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle) return 0; } -void lcl_MoveControlX( Window& rWindow, long nDelta ) +static void lcl_MoveControlX( Window& rWindow, long nDelta ) { Point aPos( rWindow.GetPosPixel() ); aPos.X() += nDelta; rWindow.SetPosPixel( aPos ); } -void lcl_MoveControlY( Window& rWindow, long nDelta ) +static void lcl_MoveControlY( Window& rWindow, long nDelta ) { Point aPos( rWindow.GetPosPixel() ); aPos.Y() += nDelta; rWindow.SetPosPixel( aPos ); } -void lcl_ChangeControlWidth( Window& rWindow, long nDelta ) +static void lcl_ChangeControlWidth( Window& rWindow, long nDelta ) { Size aSize( rWindow.GetSizePixel() ); aSize.Width() += nDelta; rWindow.SetSizePixel( aSize ); } -void lcl_ChangeControlHeight( Window& rWindow, long nDelta ) +static void lcl_ChangeControlHeight( Window& rWindow, long nDelta ) { Size aSize( rWindow.GetSizePixel() ); aSize.Height() += nDelta; diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index d12e5836c5db..9dc57a25d20b 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -292,7 +292,7 @@ void ScRetypePassDlg::ResetTableRows() SetTableData(i, static_cast< SCTAB >( i + nScrollPos )); } -bool lcl_IsInGoodStatus(ScPassHashProtectable* pProtected, ScPasswordHash eDesiredHash) +static bool lcl_IsInGoodStatus(ScPassHashProtectable* pProtected, ScPasswordHash eDesiredHash) { if (!pProtected || !pProtected->isProtected()) // Not protected. diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 8ed768e1f760..b24bffd96e87 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; #define SCSOLVER_SERVICE "com.sun.star.sheet.Solver" -uno::Reference<sheet::XSolver> lcl_CreateSolver( const uno::Reference<uno::XInterface>& xIntFac, +static uno::Reference<sheet::XSolver> lcl_CreateSolver( const uno::Reference<uno::XInterface>& xIntFac, const uno::Reference<uno::XComponentContext>& xCtx ) { uno::Reference<sheet::XSolver> xSolver; diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 759af45e10c6..6d7a655217aa 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -230,7 +230,7 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError ) //---------------------------------------------------------------------------- -sal_Bool lcl_Parse( const String& rString, ScDocument* pDoc, SCTAB nCurTab, +static sal_Bool lcl_Parse( const String& rString, ScDocument* pDoc, SCTAB nCurTab, ScRefAddress& rStart, ScRefAddress& rEnd ) { sal_Bool bRet = false; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 1eac9d3a68fc..aa9cee00238e 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -258,7 +258,7 @@ sal_uLong ScContentTree::GetChildIndex( SvLBoxEntry* pEntry ) const return nChild; } -String lcl_GetDBAreaRange( ScDocument* pDoc, const String& rDBName ) +static String lcl_GetDBAreaRange( ScDocument* pDoc, const String& rDBName ) { String aRet; if (pDoc) @@ -851,7 +851,7 @@ const ScAreaLink* ScContentTree::GetLink( sal_uLong nIndex ) return NULL; } -String lcl_NoteString( const ScPostIt& rNote ) +static String lcl_NoteString( const ScPostIt& rNote ) { String aText = rNote.GetText(); xub_StrLen nAt; @@ -1005,7 +1005,7 @@ sal_Bool ScContentTree::DrawNamesChanged( sal_uInt16 nType ) return !bEqual; } -bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const String& rName, ScRange& rRange ) +static bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const String& rName, ScRange& rRange ) { bool bFound = false; @@ -1040,7 +1040,7 @@ bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const String& rName, ScRa return bFound; } -void lcl_DoDragObject( ScDocShell* pSrcShell, const String& rName, sal_uInt16 nType, Window* pWin ) +static void lcl_DoDragObject( ScDocShell* pSrcShell, const String& rName, sal_uInt16 nType, Window* pWin ) { ScDocument* pSrcDoc = pSrcShell->GetDocument(); ScDrawLayer* pModel = pSrcDoc->GetDrawLayer(); @@ -1078,7 +1078,7 @@ void lcl_DoDragObject( ScDocShell* pSrcShell, const String& rName, sal_uInt16 nT } } -void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, sal_uInt16 nFlags, Window* pWin ) +static void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, sal_uInt16 nFlags, Window* pWin ) { ScMarkData aMark; aMark.SelectTable( rRange.aStart.Tab(), sal_True ); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index bee67f16b152..c67da84b5491 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -74,9 +74,9 @@ using ::rtl::OUString; // globale Funktionen (->am Ende der Datei): -bool lcl_CheckRepeatString( const String& rStr, ScDocument* pDoc, bool bIsRow, ScRange* pRange ); -void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr ); -void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, OUString& rStr ) +static bool lcl_CheckRepeatString( const String& rStr, ScDocument* pDoc, bool bIsRow, ScRange* pRange ); +static void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr ); +static void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, OUString& rStr ) { String aStr; lcl_GetRepeatRangeString(pRange, pDoc, bIsRow, aStr); @@ -698,7 +698,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) // TODO: It might make sense to move these functions to address.?xx. -kohei -bool lcl_CheckOne_OOO( const String& rStr, bool bIsRow, SCCOLROW& rVal ) +static bool lcl_CheckOne_OOO( const String& rStr, bool bIsRow, SCCOLROW& rVal ) { // Zulaessige Syntax fuer rStr: // Row: [$]1-MAXTAB @@ -740,13 +740,13 @@ bool lcl_CheckOne_OOO( const String& rStr, bool bIsRow, SCCOLROW& rVal ) return bStrOk; } -bool lcl_CheckOne_XL_A1( const String& rStr, bool bIsRow, SCCOLROW& rVal ) +static bool lcl_CheckOne_XL_A1( const String& rStr, bool bIsRow, SCCOLROW& rVal ) { // XL A1 style is identical to OOO one for print range formats. return lcl_CheckOne_OOO(rStr, bIsRow, rVal); } -bool lcl_CheckOne_XL_R1C1( const String& rStr, bool bIsRow, SCCOLROW& rVal ) +static bool lcl_CheckOne_XL_R1C1( const String& rStr, bool bIsRow, SCCOLROW& rVal ) { xub_StrLen nLen = rStr.Len(); if (nLen <= 1) @@ -774,7 +774,7 @@ bool lcl_CheckOne_XL_R1C1( const String& rStr, bool bIsRow, SCCOLROW& rVal ) return true; } -bool lcl_CheckRepeatOne( const String& rStr, formula::FormulaGrammar::AddressConvention eConv, bool bIsRow, SCCOLROW& rVal ) +static bool lcl_CheckRepeatOne( const String& rStr, formula::FormulaGrammar::AddressConvention eConv, bool bIsRow, SCCOLROW& rVal ) { switch (eConv) { @@ -792,7 +792,7 @@ bool lcl_CheckRepeatOne( const String& rStr, formula::FormulaGrammar::AddressCon return false; } -bool lcl_CheckRepeatString( const String& rStr, ScDocument* pDoc, bool bIsRow, ScRange* pRange ) +static bool lcl_CheckRepeatString( const String& rStr, ScDocument* pDoc, bool bIsRow, ScRange* pRange ) { // Row: [valid row] rsep [valid row] // Col: [valid col] rsep [valid col] @@ -879,7 +879,7 @@ bool lcl_CheckRepeatString( const String& rStr, ScDocument* pDoc, bool bIsRow, S // ---------------------------------------------------------------------------- -void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr ) +static void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr ) { rStr.Erase(); if (!pRange) diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 19925a2d05c7..0e6075afe1f2 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -67,7 +67,7 @@ ScEditWindow* GetScEditWindow () //======================================================================== -void lcl_GetFieldData( ScHeaderFieldData& rData ) +static void lcl_GetFieldData( ScHeaderFieldData& rData ) { SfxViewShell* pShell = SfxViewShell::Current(); if (pShell) diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 4c6a29b97eb0..50857f9f4976 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -75,12 +75,12 @@ static sal_uInt16 pPageTableRanges[] = 0 }; -sal_Bool lcl_PutVObjModeItem( sal_uInt16 nWhich, +static sal_Bool lcl_PutVObjModeItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const CheckBox& rBtn ); -sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich, +static sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const ListBox& rListBox, @@ -88,7 +88,7 @@ sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich, const SpinField& rEd, sal_uInt16 nValue ); -sal_Bool lcl_PutScaleItem2( sal_uInt16 nWhich, +static sal_Bool lcl_PutScaleItem2( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const ListBox& rListBox, @@ -96,7 +96,7 @@ sal_Bool lcl_PutScaleItem2( sal_uInt16 nWhich, const NumericField& rEd1, const NumericField& rEd2 ); -sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich, +static sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, sal_Bool bIsChecked, @@ -472,7 +472,7 @@ IMPL_LINK_NOARG(ScTablePage, ScaleHdl) // Hilfsfunktionen fuer FillItemSet: //======================================================================== -sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich, +static sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, sal_Bool bIsChecked, @@ -491,7 +491,7 @@ sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich, //------------------------------------------------------------------------ -sal_Bool lcl_PutVObjModeItem( sal_uInt16 nWhich, +static sal_Bool lcl_PutVObjModeItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const CheckBox& rBtn ) @@ -512,7 +512,7 @@ sal_Bool lcl_PutVObjModeItem( sal_uInt16 nWhich, //------------------------------------------------------------------------ -sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich, +static sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const ListBox& rListBox, @@ -534,7 +534,7 @@ sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich, } -sal_Bool lcl_PutScaleItem2( sal_uInt16 nWhich, +static sal_Bool lcl_PutScaleItem2( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const ListBox& rListBox, diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index 28d88c272665..15c376e4dbb3 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.cxx @@ -132,7 +132,7 @@ bool ScAreaLinkSaveCollection::IsEqual( const ScDocument* pDoc ) const return true; } -ScAreaLink* lcl_FindLink( const ::sfx2::SvBaseLinks& rLinks, const ScAreaLinkSaver& rSaver ) +static ScAreaLink* lcl_FindLink( const ::sfx2::SvBaseLinks& rLinks, const ScAreaLinkSaver& rSaver ) { sal_uInt16 nLinkCount = rLinks.size(); for (sal_uInt16 i=0; i<nLinkCount; i++) diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 96a8bee02f70..3fe71b181e82 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -1712,7 +1712,7 @@ sal_Bool ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const return (rTarget.ISA(ScTabViewTarget)); } -ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark ) +static ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark ) { OSL_ENSURE( rMark.IsMultiMarked(), "wrong mark type" ); @@ -2078,7 +2078,7 @@ void ScUndoRemoveMerge::SetCurTab() } /** set only border, for ScRangeList (StarOne) */ -ScRange lcl_TotalRange( const ScRangeList& rRanges ) +static ScRange lcl_TotalRange( const ScRangeList& rRanges ) { ScRange aTotal; if ( !rRanges.empty() ) diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 339b6910dda4..b804f983a0ee 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -1457,7 +1457,7 @@ sal_Bool ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; } -ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDoc, +static ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDoc, const String& rFlt, const String& rOpt, const String& rSrc, const ScRange& rDest ) { diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index c900324e0957..8e4347f25324 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -118,7 +118,7 @@ rtl::OUString ScUndoModifyStyle::GetComment() const return ScGlobal::GetRscString( nId ); } -void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, sal_Bool bRemoved ) +static void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, sal_Bool bRemoved ) { //! move to document or docshell diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 00877a8d203d..f22162cd4f7e 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -311,7 +311,7 @@ void ScUndoDeleteTab::SetChangeTrack() nStartChangeAction = nEndChangeAction = 0; } -SCTAB lcl_GetVisibleTabBefore( ScDocument& rDoc, SCTAB nTab ) +static SCTAB lcl_GetVisibleTabBefore( ScDocument& rDoc, SCTAB nTab ) { while ( nTab > 0 && !rDoc.IsVisible( nTab ) ) --nTab; diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index bb6b37a17af4..fdc3c2f75e6b 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -78,7 +78,7 @@ using namespace ::com::sun::star; // AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs -const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() +static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() { static SfxItemPropertyMapEntry aAutoFormatMap_Impl[] = { @@ -96,7 +96,7 @@ const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() //! Zahlformat (String/Language) ??? (in XNumberFormat nur ReadOnly) //! table::TableBorder ??!? -const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() +static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() { static SfxItemPropertyMapEntry aAutoFieldMap_Impl[] = { @@ -162,7 +162,7 @@ SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "ScAutoFormatsObj", SCAUTOFORMATSOBJ_S //------------------------------------------------------------------------ -bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const rtl::OUString& rName, sal_uInt16& rOutIndex ) +static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const rtl::OUString& rName, sal_uInt16& rOutIndex ) { ScAutoFormat::const_iterator itBeg = rFormats.begin(), itEnd = rFormats.end(); for (ScAutoFormat::const_iterator it = itBeg; it != itEnd; ++it) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index f06da09e5911..a5752a70cb5c 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -156,7 +156,7 @@ public: // Left/Right/Top/BottomBorder are mapped directly to the core items, // not collected/applied to the borders of a range -> ATTR_BORDER can be used directly -const SfxItemPropertySet* lcl_GetCellsPropertySet() +static const SfxItemPropertySet* lcl_GetCellsPropertySet() { static SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] = { @@ -264,7 +264,7 @@ const SfxItemPropertySet* lcl_GetCellsPropertySet() // CellRange enthaelt alle Eintraege von Cells, zusaetzlich eigene Eintraege // mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt). -const SfxItemPropertySet* lcl_GetRangePropertySet() +static const SfxItemPropertySet* lcl_GetRangePropertySet() { static SfxItemPropertyMapEntry aRangePropertyMap_Impl[] = { @@ -374,7 +374,7 @@ const SfxItemPropertySet* lcl_GetRangePropertySet() // Cell enthaelt alle Eintraege von CellRange, zusaetzlich eigene Eintraege // mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt). -const SfxItemPropertySet* lcl_GetCellPropertySet() +static const SfxItemPropertySet* lcl_GetCellPropertySet() { static SfxItemPropertyMapEntry aCellPropertyMap_Impl[] = { @@ -487,7 +487,7 @@ const SfxItemPropertySet* lcl_GetCellPropertySet() // Column und Row enthalten alle Eintraege von CellRange, zusaetzlich eigene Eintraege // mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt). -const SfxItemPropertySet* lcl_GetColumnPropertySet() +static const SfxItemPropertySet* lcl_GetColumnPropertySet() { static SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] = { @@ -599,7 +599,7 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet() return &aColumnPropertySet; } -const SfxItemPropertySet* lcl_GetRowPropertySet() +static const SfxItemPropertySet* lcl_GetRowPropertySet() { static SfxItemPropertyMapEntry aRowPropertyMap_Impl[] = { @@ -712,7 +712,7 @@ const SfxItemPropertySet* lcl_GetRowPropertySet() return &aRowPropertySet; } -const SfxItemPropertySet* lcl_GetSheetPropertySet() +static const SfxItemPropertySet* lcl_GetSheetPropertySet() { static SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] = { @@ -836,7 +836,7 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet() return &aSheetPropertySet; } -const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() { static SfxItemPropertyMapEntry aEditPropertyMap_Impl[] = { @@ -850,7 +850,7 @@ const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() }; return aEditPropertyMap_Impl; } -const SvxItemPropertySet* lcl_GetEditPropertySet() +static const SvxItemPropertySet* lcl_GetEditPropertySet() { static SvxItemPropertySet aEditPropertySet( lcl_GetEditPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool() ); return &aEditPropertySet; @@ -898,7 +898,7 @@ void ScLinkListener::Notify( SvtBroadcaster&, const SfxHint& rHint ) //------------------------------------------------------------------------ -void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& rSource ) +static void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& rSource ) { uno::Reference<beans::XPropertySetInfo> xInfo(rSource.getPropertySetInfo()); if (xInfo.is()) @@ -914,7 +914,7 @@ void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& rSourc } } -SCTAB lcl_FirstTab( const ScRangeList& rRanges ) +static SCTAB lcl_FirstTab( const ScRangeList& rRanges ) { OSL_ENSURE(rRanges.size() >= 1, "was fuer Ranges ?!?!"); const ScRange* pFirst = rRanges[ 0 ]; @@ -924,7 +924,7 @@ SCTAB lcl_FirstTab( const ScRangeList& rRanges ) return 0; // soll nicht sein } -sal_Bool lcl_WholeSheet( const ScRangeList& rRanges ) +static sal_Bool lcl_WholeSheet( const ScRangeList& rRanges ) { if ( rRanges.size() == 1 ) { @@ -938,7 +938,7 @@ sal_Bool lcl_WholeSheet( const ScRangeList& rRanges ) //------------------------------------------------------------------------ -ScSubTotalFunc lcl_SummaryToSubTotal( sheet::GeneralFunction eSummary ) +static ScSubTotalFunc lcl_SummaryToSubTotal( sheet::GeneralFunction eSummary ) { ScSubTotalFunc eSubTotal; switch (eSummary) @@ -1153,7 +1153,7 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r //! move lcl_PutDataArray to docfunc? //! merge loop with ScFunctionAccess::callFunction -sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, +static sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, const uno::Sequence< uno::Sequence<uno::Any> >& aData ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -1269,7 +1269,7 @@ sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, return !bError; } -sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, +static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, const uno::Sequence< uno::Sequence<rtl::OUString> >& aData, const ::rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) { @@ -1356,7 +1356,7 @@ sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, } // used in ScCellRangeObj::getFormulaArray and ScCellObj::GetInputString_Impl -String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, sal_Bool bEnglish ) +static String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, sal_Bool bEnglish ) { rtl::OUString aVal; if ( pDoc ) @@ -1876,7 +1876,7 @@ const SfxItemPropertyMap& ScCellRangesBase::GetItemPropertyMap() return pPropSet->getPropertyMap(); } -void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry, +static void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry, sal_uInt16& rItemWhich ) { // Which-ID des betroffenen Items, auch wenn das Item die Property @@ -2151,7 +2151,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangesBase::getPropertySe return aRef; } -void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rValue, +static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rValue, ScPatternAttr& rPattern, ScDocument* pDoc, sal_uInt16& rFirstItemId, sal_uInt16& rSecondItemId ) { @@ -4350,7 +4350,7 @@ void SAL_CALL ScCellRangesObj::addRangeAddress( const table::CellRangeAddress& r AddRange(aRange, bMergeRanges); } -void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const ScRange& rRange ) +static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const ScRange& rRange ) { sal_uInt16 nCount = rNamedEntries.size(); for ( sal_uInt16 n=nCount; n--; ) @@ -4446,7 +4446,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table:: // XNameContainer -void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const String& rName ) +static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const String& rName ) { sal_uInt16 nCount = rNamedEntries.size(); for ( sal_uInt16 n=nCount; n--; ) @@ -4510,7 +4510,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u } } -sal_Bool lcl_FindRangeByName( const ScRangeList& rRanges, ScDocShell* pDocSh, +static sal_Bool lcl_FindRangeByName( const ScRangeList& rRanges, ScDocShell* pDocSh, const String& rName, size_t& rIndex ) { if (pDocSh) @@ -4530,7 +4530,7 @@ sal_Bool lcl_FindRangeByName( const ScRangeList& rRanges, ScDocShell* pDocSh, return false; // nicht gefunden } -sal_Bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, +static sal_Bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, const ScRangeList& rRanges, ScDocShell* pDocSh, const String& rName, ScRange& rFound ) { @@ -4686,7 +4686,7 @@ uno::Any SAL_CALL ScCellRangesObj::getByName( const rtl::OUString& aName ) return aRet; } -sal_Bool lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries, +static sal_Bool lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries, const ScRange& rRange, String& rName ) { sal_uInt16 nCount = rNamedEntries.size(); diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 275c19a5ec6b..1da873abf233 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -64,7 +64,7 @@ SC_SIMPLE_SERVICE_INFO( ScChartsObj, "ScChartsObj", "com.sun.star.table.TableCha //------------------------------------------------------------------------ -SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const String& rName ) +static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const String& rName ) { if (pDocShell) { diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 0e83f96145bd..9ac4ca544c58 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star; #define SCSAVEVERSION "SaveVersionOnClose" -const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() { static SfxItemPropertyMapEntry aConfigPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 0d5e324d2b8c..7395a88b1a64 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -256,7 +256,7 @@ void ScDataPilotConversion::FillGroupInfo( DataPilotFieldGroupInfo& rInfo, const //------------------------------------------------------------------------ -ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName ) +static ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName ) { if (pDocShell) { @@ -277,7 +277,7 @@ ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const OUString& return NULL; // nicht gefunden } -String lcl_CreatePivotName( ScDocShell* pDocShell ) +static String lcl_CreatePivotName( ScDocShell* pDocShell ) { if (pDocShell) { @@ -289,7 +289,7 @@ String lcl_CreatePivotName( ScDocShell* pDocShell ) return String(); // sollte nicht vorkommen } -sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier& rFieldId ) +static sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier& rFieldId ) { // used for items - nRepeat in identifier can be ignored if ( pDPObj ) @@ -379,7 +379,7 @@ Reference<XDataPilotDescriptor> SAL_CALL ScDataPilotTablesObj::createDataPilotDe return NULL; } -bool lcl_IsDuplicated( const Reference<XPropertySet> xDimProps ) +static bool lcl_IsDuplicated( const Reference<XPropertySet> xDimProps ) { try { @@ -393,7 +393,7 @@ bool lcl_IsDuplicated( const Reference<XPropertySet> xDimProps ) return false; } -OUString lcl_GetOriginalName( const Reference< XNamed > xDim ) +static OUString lcl_GetOriginalName( const Reference< XNamed > xDim ) { Reference< XNamed > xOriginal; @@ -1587,7 +1587,7 @@ ScDataPilotFieldsObj::~ScDataPilotFieldsObj() { } -sal_Int32 lcl_GetFieldCount( const Reference<XDimensionsSupplier>& rSource, const Any& rOrient ) +static sal_Int32 lcl_GetFieldCount( const Reference<XDimensionsSupplier>& rSource, const Any& rOrient ) { if (!rSource.is()) throw RuntimeException(); @@ -1624,7 +1624,7 @@ sal_Int32 lcl_GetFieldCount( const Reference<XDimensionsSupplier>& rSource, cons return nRet; } -sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& rSource, +static sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& rSource, const Any& rOrient, SCSIZE nIndex, ScFieldIdentifier& rFieldId ) { if (!rSource.is()) @@ -1711,7 +1711,7 @@ sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& rSource, return bOk; } -sal_Bool lcl_GetFieldDataByName( ScDPObject* pDPObj, const OUString& rFieldName, ScFieldIdentifier& rFieldId ) +static sal_Bool lcl_GetFieldDataByName( ScDPObject* pDPObj, const OUString& rFieldName, ScFieldIdentifier& rFieldId ) { // "By name" is always the first match. // The name "Data" always refers to the data layout field. diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 76ec00446450..cbff0b43bdb9 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -70,7 +70,7 @@ using namespace com::sun::star; // alles ohne Which-ID, Map nur fuer PropertySetInfo -const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() { // some old property names are for 5.2 compatibility @@ -93,7 +93,7 @@ const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() return aSubTotalPropertyMap_Impl; } -const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap() { static SfxItemPropertyMapEntry aFilterPropertyMap_Impl[] = { @@ -111,7 +111,7 @@ const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap() return aFilterPropertyMap_Impl; } -const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() { static SfxItemPropertyMapEntry aDBRangePropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index a270e4afe3a6..b0c008453b58 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() +static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() { static SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] = { diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 9ca3481f8745..5ec8497aa1cc 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -50,7 +50,7 @@ static const char* cURLDocDataSource = ".uno:DataSourceBrowser/DocumentDataSourc //------------------------------------------------------------------------ -uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxViewShell* pViewShell ) +static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxViewShell* pViewShell ) { if ( pViewShell ) { @@ -256,7 +256,7 @@ void SAL_CALL ScDispatch::dispatch( const util::URL& aURL, throw uno::RuntimeException(); } -void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImportParam& rParam ) +static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImportParam& rParam ) { rEvent.IsEnabled = rParam.bImport; diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 9d5964236895..388145c54b96 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -110,7 +110,7 @@ using namespace com::sun::star; // alles ohne Which-ID, Map nur fuer PropertySetInfo //! umbenennen, sind nicht mehr nur Options -const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() { static SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] = { @@ -162,7 +162,7 @@ const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() //! StandardDecimals als Property und vom NumberFormatter ???????? -const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap() { static SfxItemPropertyMapEntry aColumnsPropertyMap_Impl[] = { @@ -176,7 +176,7 @@ const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap() return aColumnsPropertyMap_Impl; } -const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() { static SfxItemPropertyMapEntry aRowsPropertyMap_Impl[] = { @@ -650,7 +650,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getStyleFamilies() // XRenderable -OutputDevice* lcl_GetRenderDevice( const uno::Sequence<beans::PropertyValue>& rOptions ) +static OutputDevice* lcl_GetRenderDevice( const uno::Sequence<beans::PropertyValue>& rOptions ) { OutputDevice* pRet = NULL; const beans::PropertyValue* pPropArray = rOptions.getConstArray(); @@ -677,7 +677,7 @@ OutputDevice* lcl_GetRenderDevice( const uno::Sequence<beans::PropertyValue>& rO return pRet; } -bool lcl_ParseTarget( const String& rTarget, ScRange& rTargetRange, Rectangle& rTargetRect, +static bool lcl_ParseTarget( const String& rTarget, ScRange& rTargetRange, Rectangle& rTargetRect, bool& rIsSheet, ScDocument* pDoc, SCTAB nSourceTab ) { // test in same order as in SID_CURRENTCELL execute @@ -967,7 +967,7 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount( const uno::Any& aSelection, return nSelectCount; } -sal_Int32 lcl_GetRendererNum( sal_Int32 nSelRenderer, const String& rPagesStr, sal_Int32 nTotalPages ) +static sal_Int32 lcl_GetRendererNum( sal_Int32 nSelRenderer, const String& rPagesStr, sal_Int32 nTotalPages ) { if ( !rPagesStr.Len() ) return nSelRenderer; diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 94c08b5a674d..3e67a6954a05 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -65,7 +65,7 @@ void ScSheetEventsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -sal_Int32 lcl_GetEventFromName( const rtl::OUString& aName ) +static sal_Int32 lcl_GetEventFromName( const rtl::OUString& aName ) { for (sal_Int32 nEvent=0; nEvent<SC_SHEETEVENT_COUNT; ++nEvent) if ( aName == ScSheetEvents::GetEventName(nEvent) ) diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 8b981990be90..171ecb7474bf 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -52,7 +52,7 @@ using namespace ::formula; // Map nur fuer PropertySetInfo -const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() { static SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] = { @@ -79,7 +79,7 @@ SC_SIMPLE_SERVICE_INFO( ScTableValidationObj, "ScTableValidationObj", "com.sun.s //------------------------------------------------------------------------ -sal_Int32 lcl_ConditionModeToOperatorNew( ScConditionMode eMode ) +static sal_Int32 lcl_ConditionModeToOperatorNew( ScConditionMode eMode ) { sal_Int32 eOper = sheet::ConditionOperator2::NONE; switch (eMode) @@ -102,7 +102,7 @@ sal_Int32 lcl_ConditionModeToOperatorNew( ScConditionMode eMode ) return eOper; } -sheet::ConditionOperator lcl_ConditionModeToOperator( ScConditionMode eMode ) +static sheet::ConditionOperator lcl_ConditionModeToOperator( ScConditionMode eMode ) { sheet::ConditionOperator eOper = sheet::ConditionOperator_NONE; switch (eMode) @@ -124,7 +124,7 @@ sheet::ConditionOperator lcl_ConditionModeToOperator( ScConditionMode eMode ) return eOper; } -ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOper ) +static ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOper ) { ScConditionMode eMode = SC_COND_NONE; switch (eOper) @@ -430,7 +430,7 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce // conditional format entries have no real names // -> generate name from index -rtl::OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) +static rtl::OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) { rtl::OUString aRet( RTL_CONSTASCII_USTRINGPARAM( "Entry" ) ); aRet += rtl::OUString::valueOf( nIndex ); diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx index 281282af04d3..1e3c565cbcc5 100644 --- a/sc/source/ui/unoobj/forbiuno.cxx +++ b/sc/source/ui/unoobj/forbiuno.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -rtl::Reference<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh ) +static rtl::Reference<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh ) { rtl::Reference<SvxForbiddenCharactersTable> xRet; if ( pDocSh ) diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index c2f758dae7b8..7cbfcf52f47a 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -153,7 +153,7 @@ void ScTempDocCache::Clear() //! merge this with ScAreaLink::Refresh //! copy directly without a clipboard document? -sal_Bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, +static sal_Bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, ScDocument* pDestDoc, const ScAddress& rDestPos ) { SCTAB nSrcTab = rSrcRange.aStart.Tab(); @@ -349,7 +349,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFunctionAccess ) // XFunctionAccess -sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,const ScCompiler& rCompiler ) +static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,const ScCompiler& rCompiler ) { // function names are always case-insensitive rtl::OUString aUpper = ScGlobal::pCharClass->uppercase(rName); @@ -385,7 +385,7 @@ sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName, return false; // no valid function name } -void lcl_AddRef( ScTokenArray& rArray, long nStartRow, long nColCount, long nRowCount ) +static void lcl_AddRef( ScTokenArray& rArray, long nStartRow, long nColCount, long nRowCount ) { ScComplexRefData aRef; aRef.InitFlags(); diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 4986f514450c..a618287fc5a3 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -60,7 +60,7 @@ using ::std::vector; //------------------------------------------------------------------------ // fuer Sheet- und Area-Links benutzt: -const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() +static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() { static SfxItemPropertyMapEntry aSheetLinkMap_Impl[] = { @@ -591,7 +591,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(u //------------------------------------------------------------------------ -ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, sal_uInt16 nPos ) +static ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, sal_uInt16 nPos ) { if (pDocShell) { @@ -1090,7 +1090,7 @@ void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XNamed -String lcl_BuildDDEName( const String& rAppl, const String& rTopic, const String& rItem ) +static String lcl_BuildDDEName( const String& rAppl, const String& rTopic, const String& rItem ) { // Appl|Topic!Item (wie Excel) String aRet = rAppl; diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index c04b8e95c2f8..da9778931b05 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -56,7 +56,7 @@ using ::com::sun::star::uno::Any; //------------------------------------------------------------------------ -const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() +static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() { static SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = { @@ -69,7 +69,7 @@ const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() return aNamedRangeMap_Impl; } -const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap() +static const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap() { static SfxItemPropertyMapEntry aNamedRangesMap_Impl[] = { @@ -87,7 +87,7 @@ SC_SIMPLE_SERVICE_INFO( ScLabelRangeObj, "ScLabelRangeObj", "com.sun.star.sheet. SC_SIMPLE_SERVICE_INFO( ScLabelRangesObj, "ScLabelRangesObj", "com.sun.star.sheet.LabelRanges" ) SC_SIMPLE_SERVICE_INFO( ScNamedRangesObj, "ScNamedRangesObj", "com.sun.star.sheet.NamedRanges" ) -bool lcl_UserVisibleName(const ScRangeData& rData) +static bool lcl_UserVisibleName(const ScRangeData& rData) { //! als Methode an ScRangeData diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 924d9b049476..297f7c43c42e 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -63,7 +63,7 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -const SvxItemPropertySet* lcl_GetAnnotationPropertySet() +static const SvxItemPropertySet* lcl_GetAnnotationPropertySet() { static SfxItemPropertyMapEntry aAnnotationPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index bb0c5ab1c3a6..d723dac26657 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -60,7 +60,7 @@ DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence< sal_Int8 > *, ScShapeImplementati static ScShapeImplementationIdMap aImplementationIdMap; -const SfxItemPropertyMapEntry* lcl_GetShapeMap() +static const SfxItemPropertyMapEntry* lcl_GetShapeMap() { static SfxItemPropertyMapEntry aShapeMap_Impl[] = { @@ -87,7 +87,7 @@ const SvEventDescription* ScShapeObj::GetSupportedMacroItems() return aMacroDescriptionsImpl; } // #i66550 HLINK_FOR_SHAPES -ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate = false ) +ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate = false ) { if( pShape ) if( SdrObject* pObj = pShape->GetSdrObject() ) @@ -205,7 +205,7 @@ void ScShapeObj::GetShapePropertyState() } } -uno::Reference<lang::XComponent> lcl_GetComponent( const uno::Reference<uno::XAggregation>& xAgg ) +static uno::Reference<lang::XComponent> lcl_GetComponent( const uno::Reference<uno::XAggregation>& xAgg ) { uno::Reference<lang::XComponent> xRet; if ( xAgg.is() ) @@ -213,7 +213,7 @@ uno::Reference<lang::XComponent> lcl_GetComponent( const uno::Reference<uno::XAg return xRet; } -uno::Reference<text::XText> lcl_GetText( const uno::Reference<uno::XAggregation>& xAgg ) +static uno::Reference<text::XText> lcl_GetText( const uno::Reference<uno::XAggregation>& xAgg ) { uno::Reference<text::XText> xRet; if ( xAgg.is() ) @@ -221,7 +221,7 @@ uno::Reference<text::XText> lcl_GetText( const uno::Reference<uno::XAggregation> return xRet; } -uno::Reference<text::XSimpleText> lcl_GetSimpleText( const uno::Reference<uno::XAggregation>& xAgg ) +static uno::Reference<text::XSimpleText> lcl_GetSimpleText( const uno::Reference<uno::XAggregation>& xAgg ) { uno::Reference<text::XSimpleText> xRet; if ( xAgg.is() ) @@ -229,7 +229,7 @@ uno::Reference<text::XSimpleText> lcl_GetSimpleText( const uno::Reference<uno::X return xRet; } -uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<uno::XAggregation>& xAgg ) +static uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<uno::XAggregation>& xAgg ) { uno::Reference<text::XTextRange> xRet; if ( xAgg.is() ) @@ -259,7 +259,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo( return mxPropSetInfo; } -sal_Bool lcl_GetPageNum( SdrPage* pPage, SdrModel& rModel, SCTAB& rNum ) +static sal_Bool lcl_GetPageNum( SdrPage* pPage, SdrModel& rModel, SCTAB& rNum ) { sal_uInt16 nCount = rModel.GetPageCount(); for (sal_uInt16 i=0; i<nCount; i++) @@ -272,7 +272,7 @@ sal_Bool lcl_GetPageNum( SdrPage* pPage, SdrModel& rModel, SCTAB& rNum ) return false; } -sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Point& rCaptionPoint ) +static sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Point& rCaptionPoint ) { sal_Bool bReturn = false; rtl::OUString sType(xShape->getShapeType()); @@ -289,7 +289,7 @@ sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Po return bReturn; } -ScRange lcl_GetAnchorCell( uno::Reference< drawing::XShape >& xShape, ScDocument* pDoc, SCTAB nTab, +static ScRange lcl_GetAnchorCell( uno::Reference< drawing::XShape >& xShape, ScDocument* pDoc, SCTAB nTab, awt::Point& rUnoPoint, awt::Size& rUnoSize, awt::Point& rCaptionPoint ) { ScRange aReturn; @@ -324,7 +324,7 @@ ScRange lcl_GetAnchorCell( uno::Reference< drawing::XShape >& xShape, ScDocument return aReturn; } -awt::Point lcl_GetRelativePos( uno::Reference< drawing::XShape >& xShape, ScDocument* pDoc, SCTAB nTab, ScRange& rRange, +static awt::Point lcl_GetRelativePos( uno::Reference< drawing::XShape >& xShape, ScDocument* pDoc, SCTAB nTab, ScRange& rRange, awt::Size& rUnoSize, awt::Point& rCaptionPoint) { awt::Point aUnoPoint; @@ -645,7 +645,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( aNameString.EqualsAscii( SC_UNONAME_URL) ) { rtl::OUString sHlink; - ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this, true); + ScMacroInfo* pInfo = ScShapeObj_getShapeHyperMacroInfo(this, true); if ( ( aValue >>= sHlink ) && pInfo ) pInfo->SetHlink( sHlink ); } @@ -830,7 +830,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa aNameString.EqualsAscii( SC_UNONAME_URL ) ) { rtl::OUString sHlink; - if ( ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this) ) + if ( ScMacroInfo* pInfo = ScShapeObj_getShapeHyperMacroInfo(this) ) sHlink = pInfo->GetHlink(); aAny <<= sHlink; } @@ -1102,7 +1102,7 @@ void SAL_CALL ScShapeObj::removeEventListener( // XText // (special handling for ScCellFieldObj) -void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet& rSource, const sal_Char* pName ) +static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet& rSource, const sal_Char* pName ) { rtl::OUString aNameStr(rtl::OUString::createFromAscii(pName)); try @@ -1375,7 +1375,7 @@ private: ScMacroInfo* getInfo( sal_Bool bCreate = false ) { - return lcl_getShapeHyperMacroInfo( mpShape, bCreate ); + return ScShapeObj_getShapeHyperMacroInfo( mpShape, bCreate ); } public: diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index e1c860f0060e..a6c9a2497b05 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star; // SfxItemPropertyMapEntry nur fuer GetPropertySetInfo -const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() { static SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index e1be3eaf5db0..360cb68b0c93 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -77,7 +77,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -const SfxItemPropertySet* lcl_GetCellStyleSet() +static const SfxItemPropertySet* lcl_GetCellStyleSet() { static SfxItemPropertyMapEntry aCellStyleMap_Impl[] = { @@ -175,7 +175,7 @@ const SfxItemPropertySet* lcl_GetCellStyleSet() // Map mit allen Seitenattributen, incl. Kopf-/Fusszeilenattribute -const SfxItemPropertySet * lcl_GetPageStyleSet() +static const SfxItemPropertySet * lcl_GetPageStyleSet() { static SfxItemPropertyMapEntry aPageStyleMap_Impl[] = { @@ -295,7 +295,7 @@ const SfxItemPropertySet * lcl_GetPageStyleSet() // Map mit Inhalten des Header-Item-Sets -const SfxItemPropertyMap* lcl_GetHeaderStyleMap() +static const SfxItemPropertyMap* lcl_GetHeaderStyleMap() { static SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] = { @@ -334,7 +334,7 @@ const SfxItemPropertyMap* lcl_GetHeaderStyleMap() // Map mit Inhalten des Footer-Item-Sets -const SfxItemPropertyMap* lcl_GetFooterStyleMap() +static const SfxItemPropertyMap* lcl_GetFooterStyleMap() { static SfxItemPropertyMapEntry aFooterStyleMap_Impl[] = { @@ -421,7 +421,7 @@ struct ScDisplayNameMap String aProgName; }; -const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) +static const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) { if ( nType == SFX_STYLE_FAMILY_PARA ) { @@ -478,7 +478,7 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) #define SC_SUFFIX_USER " (user)" #define SC_SUFFIX_USER_LEN 7 -sal_Bool lcl_EndsWithUser( const String& rString ) +static sal_Bool lcl_EndsWithUser( const String& rString ) { const sal_Unicode *pChar = rString.GetBuffer(); xub_StrLen nLen = rString.Len(); @@ -545,7 +545,7 @@ String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName //------------------------------------------------------------------------ -sal_Bool lcl_AnyTabProtected( ScDocument& rDoc ) +static sal_Bool lcl_AnyTabProtected( ScDocument& rDoc ) { SCTAB nTabCount = rDoc.GetTableCount(); for (SCTAB i=0; i<nTabCount; i++) diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index b300f924c23f..e1701b0de4f3 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -57,7 +57,7 @@ sal_uInt16 nTypeResIds[SC_LINKTARGETTYPE_COUNT] = SCSTR_CONTENT_DBAREA // SC_LINKTARGETTYPE_DBAREA }; -const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() +static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() { static SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = { diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 81d2f97a7949..43476e5f631e 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -60,7 +60,7 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -const SvxItemPropertySet * lcl_GetHdFtPropertySet() +static const SvxItemPropertySet * lcl_GetHdFtPropertySet() { static SfxItemPropertyMapEntry aHdFtPropertyMap_Impl[] = { diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 1929a6014524..fe879a0ca3b1 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star; // ============================================================================ -const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() +static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() { static SfxItemPropertyMapEntry aFormulaParserMap_Impl[] = { @@ -295,7 +295,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFormulaParserObj ) // ============================================================================ -void lcl_ExternalRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rRef ) +static void lcl_ExternalRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rRef ) { rAPI.Column = rRef.nCol; rAPI.Row = rRef.nRow; @@ -314,7 +314,7 @@ void lcl_ExternalRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rAPI.Flags = nFlags; } -void lcl_SingleRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rRef ) +static void lcl_SingleRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rRef ) { rAPI.Column = rRef.nCol; rAPI.Row = rRef.nRow; diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 4ecc009653a8..c28ad1a13bd3 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -86,7 +86,7 @@ using namespace com::sun::star; // alles ohne Which-ID, Map nur fuer PropertySetInfo -const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() +static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() { static SfxItemPropertyMapEntry aViewOptPropertyMap_Impl[] = { @@ -527,7 +527,7 @@ void SAL_CALL ScTabViewObj::release() throw() SfxBaseController::release(); } -void lcl_CallActivate( ScDocShell* pDocSh, SCTAB nTab, sal_Int32 nEvent ) +static void lcl_CallActivate( ScDocShell* pDocSh, SCTAB nTab, sal_Int32 nEvent ) { ScDocument* pDoc = pDocSh->GetDocument(); // when deleting a sheet, nPreviousTab can be invalid @@ -654,7 +654,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScTabViewObj::getImplementationId() // XDocumentView -sal_Bool lcl_TabInRanges( SCTAB nTab, const ScRangeList& rRanges ) +static sal_Bool lcl_TabInRanges( SCTAB nTab, const ScRangeList& rRanges ) { for (size_t i = 0, nCount = rRanges.size(); i < nCount; ++i) { @@ -665,7 +665,7 @@ sal_Bool lcl_TabInRanges( SCTAB nTab, const ScRangeList& rRanges ) return false; } -void lcl_ShowObject( ScTabViewShell& rViewSh, ScDrawView& rDrawView, SdrObject* pSelObj ) +static void lcl_ShowObject( ScTabViewShell& rViewSh, ScDrawView& rDrawView, SdrObject* pSelObj ) { sal_Bool bFound = false; SCTAB nObjectTab = 0; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index b7b53f956392..edb088a907db 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -883,7 +883,7 @@ ScVbaApplication::Calculate() throw( script::BasicErrorException , uno::Runtime xCalculatable->calculateAll(); } -uno::Reference< beans::XPropertySet > lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) +static uno::Reference< beans::XPropertySet > lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) { static uno::Reference< beans::XPropertySet > xPathSettings; if ( !xPathSettings.is() ) diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 753e6552a1ea..974ebfe10061 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -473,7 +473,7 @@ void SAL_CALL ScVbaBorders::setColorIndex( const uno::Any& _colorindex ) throw ( } } -bool +static bool lcl_areAllLineWidthsSame( const table::TableBorder& maTableBorder, bool bIsCell ) { diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 2be56260987b..0cab6650633c 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -68,7 +68,7 @@ ScVbaFont::~ScVbaFont() } -uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) throw ( uno::RuntimeException ) +static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) throw ( uno::RuntimeException ) { uno::Reference< text::XTextRange > xTxtRange( xIf, uno::UNO_QUERY_THROW ); uno::Reference< text::XSimpleText > xTxt( xTxtRange->getText(), uno::UNO_QUERY_THROW ) ; diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 7a722439416e..e26b6296310c 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -32,7 +32,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -ScVbaFormatConditions* +static ScVbaFormatConditions* lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions >& xFormatConditions ) throw ( script::BasicErrorException ) { ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() ); diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index b5e4746fe141..56a92def3a7a 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -61,7 +61,7 @@ static const rtl::OUString BACKCOLOR( RTL_CONSTASCII_USTRINGPARAM( "CellBackColo static const rtl::OUString PATTERN( RTL_CONSTASCII_USTRINGPARAM( "Pattern" ) ); static const rtl::OUString PATTERNCOLOR( RTL_CONSTASCII_USTRINGPARAM( "PatternColor" ) ); -PatternMap lcl_getPatternMap() +static PatternMap lcl_getPatternMap() { PatternMap aPatternMap; aPatternMap.insert( PatternPair( xlPatternAutomatic, 0 ) ); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 62b450486b1b..27f546107c8f 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -189,23 +189,23 @@ const double fExtraWidth = 182.0 / 256.0; // * 1 point = 1/72 inch = 20 twips // * 1 inch = 72 points = 1440 twips // * 1 cm = 567 twips -double lcl_hmmToPoints( double nVal ) { return ( (double)((nVal /1000 ) * 567 ) / 20 ); } +static double lcl_hmmToPoints( double nVal ) { return ( (double)((nVal /1000 ) * 567 ) / 20 ); } static const sal_Int16 supportedIndexTable[] = { excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal }; -sal_uInt16 lcl_pointsToTwips( double nVal ) +static sal_uInt16 lcl_pointsToTwips( double nVal ) { nVal = nVal * static_cast<double>(20); short nTwips = static_cast<short>(nVal); return nTwips; } -double lcl_TwipsToPoints( sal_uInt16 nVal ) +static double lcl_TwipsToPoints( sal_uInt16 nVal ) { double nPoints = nVal; return nPoints / 20; } -double lcl_Round2DecPlaces( double nVal ) +static double lcl_Round2DecPlaces( double nVal ) { nVal = (nVal * (double)100); long tmp = static_cast<long>(nVal); @@ -216,13 +216,13 @@ double lcl_Round2DecPlaces( double nVal ) return nVal; } -uno::Any lcl_makeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any aAny, bool bIsRows, bool bIsColumns ) +static uno::Any lcl_makeRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any aAny, bool bIsRows, bool bIsColumns ) { uno::Reference< table::XCellRange > xCellRange( aAny, uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< excel::XRange >( new ScVbaRange( xParent, xContext, xCellRange, bIsRows, bIsColumns ) ) ); } -uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRanges >& xLocSheetCellRanges, ScDocShell* pDoc ) +static uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRanges >& xLocSheetCellRanges, ScDocShell* pDoc ) { uno::Reference< excel::XRange > xRange; uno::Sequence< table::CellRangeAddress > sAddresses = xLocSheetCellRanges->getRangeAddresses(); @@ -1423,7 +1423,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, return lclGetRangeAddress( xRangeParam ); } -uno::Reference< XCollection > +static uno::Reference< XCollection > lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext, const uno::Reference< table::XCellRange >& xRange ) throw( uno::RuntimeException ) { uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW ); @@ -4198,7 +4198,7 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC } // Helper functions for AutoFilter -ScDBData* lcl_GetDBData_Impl( ScDocShell* pDocShell, sal_Int16 nSheet ) +static ScDBData* lcl_GetDBData_Impl( ScDocShell* pDocShell, sal_Int16 nSheet ) { ScDBData* pRet = NULL; if (pDocShell) @@ -4208,7 +4208,7 @@ ScDBData* lcl_GetDBData_Impl( ScDocShell* pDocShell, sal_Int16 nSheet ) return pRet; } -void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam ) +static void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam ) { if ( pDocShell ) { @@ -4221,7 +4221,7 @@ void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam ) } } -ScQueryParam lcl_GetQueryParam( ScDocShell* pDocShell, sal_Int16 nSheet ) +static ScQueryParam lcl_GetQueryParam( ScDocShell* pDocShell, sal_Int16 nSheet ) { ScDBData* pDBData = lcl_GetDBData_Impl( pDocShell, nSheet ); ScQueryParam aParam; @@ -4232,7 +4232,7 @@ ScQueryParam lcl_GetQueryParam( ScDocShell* pDocShell, sal_Int16 nSheet ) return aParam; } -void lcl_SetAllQueryForField( ScDocShell* pDocShell, SCCOLROW nField, sal_Int16 nSheet ) +static void lcl_SetAllQueryForField( ScDocShell* pDocShell, SCCOLROW nField, sal_Int16 nSheet ) { ScQueryParam aParam = lcl_GetQueryParam( pDocShell, nSheet ); aParam.RemoveEntryByField(nField); @@ -4240,7 +4240,7 @@ void lcl_SetAllQueryForField( ScDocShell* pDocShell, SCCOLROW nField, sal_Int16 } // Modifies sCriteria, and nOp depending on the value of sCriteria -void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField ) +static void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField ) { // #TODO make this more efficient and cycle through // sCriteria1 character by character to pick up <,<>,=, * etc. @@ -5153,7 +5153,7 @@ ScVbaRange::Ungroup( ) throw (script::BasicErrorException, uno::RuntimeExceptio groupUnGroup(true); } -void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, sal_Bool _bMerge = sal_True ) throw ( uno::RuntimeException ) +static void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, sal_Bool _bMerge = sal_True ) throw ( uno::RuntimeException ) { uno::Reference< util::XMergeable > xMergeable( xCellRange, uno::UNO_QUERY_THROW ); xMergeable->merge(_bMerge); @@ -5366,7 +5366,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw return pRangeToUse->SpecialCellsImpl( nType, _oValue ); } -sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::BasicErrorException ) +static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::BasicErrorException ) { sal_Int32 nType = excel::XlSpecialCellsValue::xlNumbers; aType >>= nType; diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 670480cad7af..9b09263a657a 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -44,7 +44,7 @@ ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xMode return xStylesAccess; } -uno::Reference< beans::XPropertySet > +static uno::Reference< beans::XPropertySet > lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) { diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 3a8b8c1a0a7f..2d353b549a87 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -33,7 +33,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; static rtl::OUString SDEFAULTCELLSTYLENAME( RTL_CONSTASCII_USTRINGPARAM("Default") ); -css::uno::Any +static css::uno::Any lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) { uno::Reference< beans::XPropertySet > xStyleProps( aObject, uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 03ce70ab85fd..ce7f8ec8ba37 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -52,14 +52,14 @@ const static rtl::OUString STYPE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TYPE const static rtl::OUString SHOWLIST( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWLIST ) ); const static rtl::OUString ALERTSTYLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRALSTY ) ); -void +static void lcl_setValidationProps( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< beans::XPropertySet >& xProps ) { uno::Reference< beans::XPropertySet > xRangeProps( xRange, uno::UNO_QUERY_THROW ); xRangeProps->setPropertyValue( VALIDATION , uno::makeAny( xProps ) ); } -uno::Reference< beans::XPropertySet > +static uno::Reference< beans::XPropertySet > lcl_getValidationProps( const uno::Reference< table::XCellRange >& xRange ) { uno::Reference< beans::XPropertySet > xProps( xRange, uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index b15d7539cd6c..88abe681d8c4 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -44,7 +44,7 @@ sal_Int32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameIndexHash; -uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) +static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) { return new ScVbaWorkbook( uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel ); } diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index e952d9a2d1cb..1ea357111911 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -73,7 +73,7 @@ typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap; // #FIXME #TODO the implementation of the Sheets collections sucks, // e.g. there is no support for tracking sheets added/removed from the collection -uno::Reference< uno::XInterface > +static uno::Reference< uno::XInterface > lcl_getModulAsUnoObject( const uno::Reference< sheet::XSpreadsheet >& xSheet, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { uno::Reference< uno::XInterface > xRet; diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 4e2291385ef5..89478f5fcd66 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -328,7 +328,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) } } -sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHelper& rDataHelper, +static sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHelper& rDataHelper, SotFormatStringId nFormatId ) { if ( rDataHelper.HasFormat( nFormatId ) ) @@ -393,7 +393,7 @@ void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ) // insert, insert contents -sal_Bool lcl_IsCellPastePossible( const TransferableDataHelper& rData ) +static sal_Bool lcl_IsCellPastePossible( const TransferableDataHelper& rData ) { sal_Bool bPossible = false; if ( ScTransferObj::GetOwnClipboard( NULL ) || ScDrawTransferObj::GetOwnClipboard( NULL ) ) diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 325e71362797..3f120adcdc85 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -71,7 +71,7 @@ using namespace com::sun::star; -bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& rRange ) +static bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& rRange ) { OSL_ENSURE( pData, "lcl_GetTextToColumnsRange: pData is null!" ); @@ -111,7 +111,7 @@ bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& rRange ) return bRet; } -sal_Bool lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam ) +static sal_Bool lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam ) { ScTabViewShell* pTabViewShell = pData->GetViewShell(); ScDBData* pDBData = pTabViewShell->GetDBData(); diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 890b05e98ca9..2272a4ad9b13 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -42,7 +42,7 @@ //================================================================== -String lcl_MetricString( long nTwips, const String& rText ) +static String lcl_MetricString( long nTwips, const String& rText ) { if ( nTwips <= 0 ) return ScGlobal::GetRscString(STR_TIP_HIDE); diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 3d175b752638..05144a4c61fa 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -566,7 +566,7 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord ) // Pivot // -String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber ) +static String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber ) { String aName = rPrefix; aName += String::CreateFromInt32( nNumber ); @@ -1651,7 +1651,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const rtl::OUString& rStri } } -void lcl_MoveToEnd( ScDPSaveDimension& rDim, const String& rItemName ) +static void lcl_MoveToEnd( ScDPSaveDimension& rDim, const String& rItemName ) { ScDPSaveMember* pNewMember = NULL; const ScDPSaveMember* pOldMember = rDim.GetExistingMemberByName( rItemName ); diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 30aaf0d5ad6c..0c48b58b4a38 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -67,7 +67,7 @@ Point aDragStartDiff; // ----------------------------------------------------------------------- -void lcl_CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle ) +void ScDrawView::CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle ) { rAnyOle = rOneOle = false; sal_uLong nCount = rMarkList.GetMarkCount(); @@ -115,7 +115,7 @@ sal_Bool ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos ) sal_Bool bAnyOle, bOneOle; const SdrMarkList& rMarkList = GetMarkedObjectList(); - lcl_CheckOle( rMarkList, bAnyOle, bOneOle ); + CheckOle( rMarkList, bAnyOle, bOneOle ); ScDocShellRef aDragShellRef; if (bAnyOle) @@ -157,7 +157,7 @@ void ScDrawView::DoCopy() { sal_Bool bAnyOle, bOneOle; const SdrMarkList& rMarkList = GetMarkedObjectList(); - lcl_CheckOle( rMarkList, bAnyOle, bOneOle ); + CheckOle( rMarkList, bAnyOle, bOneOle ); // update ScGlobal::pDrawClipDocShellRef ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc( bAnyOle ) ); @@ -193,7 +193,7 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() { sal_Bool bAnyOle, bOneOle; const SdrMarkList& rMarkList = GetMarkedObjectList(); - lcl_CheckOle( rMarkList, bAnyOle, bOneOle ); + CheckOle( rMarkList, bAnyOle, bOneOle ); // update ScGlobal::pDrawClipDocShellRef ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc( bAnyOle ) ); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 04524ecf6020..a9681cbc2bd2 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -134,7 +134,7 @@ void ScEditShell::SetEditView(EditView* pView) SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() ); } -void lcl_RemoveAttribs( EditView& rEditView ) +static void lcl_RemoveAttribs( EditView& rEditView ) { ScEditEngineDefaulter* pEngine = static_cast<ScEditEngineDefaulter*>(rEditView.GetEditEngine()); @@ -622,7 +622,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) pHdl->SetSelIsRef(sal_True); } -void lcl_DisableAll( SfxItemSet& rSet ) // disable all slots +static void lcl_DisableAll( SfxItemSet& rSet ) // disable all slots { SfxWhichIter aIter( rSet ); sal_uInt16 nWhich = aIter.FirstWhich(); @@ -804,7 +804,7 @@ void ScEditShell::GetClipState( SfxItemSet& rSet ) } } -void lcl_InvalidateUnder( SfxBindings& rBindings ) +static void lcl_InvalidateUnder( SfxBindings& rBindings ) { rBindings.Invalidate( SID_ATTR_CHAR_UNDERLINE ); rBindings.Invalidate( SID_ULINE_VAL_NONE ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 3899b2db861a..247ff7385c26 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -343,7 +343,7 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() // ============================================================================ -sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) +static sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) { // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle // mit Origin links oben liegt, enthaelt der Bereich genau die Matrix. @@ -360,7 +360,7 @@ sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) } -void lcl_UnLockComment( ScDrawView* pView, SdrPageView* pPV, SdrModel* pDrDoc, const Point& rPos, ScViewData* pViewData ) +static void lcl_UnLockComment( ScDrawView* pView, SdrPageView* pPV, SdrModel* pDrDoc, const Point& rPos, ScViewData* pViewData ) { if (!pView && !pPV && !pDrDoc && !pViewData) return; @@ -379,7 +379,7 @@ void lcl_UnLockComment( ScDrawView* pView, SdrPageView* pPV, SdrModel* pDrDoc, c } } -sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTAB nTab, ScBaseCell*& rpCell ) +static sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTAB nTab, ScBaseCell*& rpCell ) { sal_Bool bFound = false; do @@ -2664,7 +2664,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) return; } -void lcl_InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent, const MouseEvent& rEvt ) +static void lcl_InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent, const MouseEvent& rEvt ) { rEvent.Modifiers = 0; if ( rEvt.IsShift() ) @@ -2839,7 +2839,7 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) pViewData->GetView()->GetSelEngine()->Command( aDragEvent ); } -void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, Window* pWin ) +static void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, Window* pWin ) { SCCOL nCol = pViewData->GetCurX(); SCROW nRow = pViewData->GetCurY(); @@ -3437,7 +3437,7 @@ bool ScGridWindow::DropScroll( const Point& rMousePos ) return false; } -sal_Bool lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange) +static sal_Bool lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange) { // Testet, ob bei eingeschalteten RedLining, // bei einem Drop ein Scenario betroffen ist. @@ -3467,7 +3467,7 @@ sal_Bool lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRa return bReturn; } -ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const ScRange& rSource ) +static ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const ScRange& rSource ) { SCCOL nCol1 = nPosX; SCCOL nCol2 = nCol1 + ( rSource.aEnd.Col() - rSource.aStart.Col() ); @@ -3867,7 +3867,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) return nRet; } -sal_uLong lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xTransfer, bool bPreferText = false ) +static sal_uLong lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xTransfer, bool bPreferText = false ) { TransferableDataHelper aDataHelper( xTransfer ); @@ -3952,7 +3952,7 @@ sal_uLong lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable> return nFormatId; } -sal_uLong lcl_GetDropLinkId( const uno::Reference<datatransfer::XTransferable>& xTransfer ) +static sal_uLong lcl_GetDropLinkId( const uno::Reference<datatransfer::XTransferable>& xTransfer ) { TransferableDataHelper aDataHelper( xTransfer ); @@ -4818,7 +4818,7 @@ bool ScGridWindow::HitRangeFinder( const Point& rMouse, bool& rCorner, #define SCE_RIGHT 8 #define SCE_ALL 15 -void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, sal_uInt16 nEdges ) +static void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, sal_uInt16 nEdges ) { // der Range ist immer richtigherum @@ -4877,7 +4877,7 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, sal_uInt16 nE pDocSh->PostPaint( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, PAINT_MARKS ); } -void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRange& rNewUn ) +static void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRange& rNewUn ) { // Repaint fuer die Teile des Rahmens in Old, die bei New nicht mehr da sind diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index eee44ec52c15..44901dd90f67 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -75,7 +75,7 @@ //------------------------------------------------------------------------ -void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) +static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) { if ( rRect.Top() < rVisible.Top()-1 ) rRect.Top() = rVisible.Top()-1; if ( rRect.Bottom() > rVisible.Bottom()+1 ) rRect.Bottom() = rVisible.Bottom()+1; @@ -85,7 +85,7 @@ void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) // Wenn's weit daneben liegt, wird lcl_DrawOneFrame erst gar nicht gerufen. } -void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, +static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, const String& rTitle, const Color& rColor, sal_Bool bTextBelow, double nPPTX, double nPPTY, const Fraction& rZoomY, ScDocument* pDoc, ScViewData* pButtonViewData, sal_Bool bLayoutRTL ) @@ -185,7 +185,7 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, pDev->DrawRect( aOuter ); } -void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitPos eWhich, +static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitPos eWhich, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) { ScDocument* pDoc = pViewData->GetDocument(); @@ -262,7 +262,7 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP //------------------------------------------------------------------------ -void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, +static void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, const std::vector<ScHighlightEntry>& rHighlightRanges ) { SCTAB nTab = pViewData->GetTabNo(); diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 233afcd811a7..47677aae231f 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -120,7 +120,7 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl) return 0; } -void lcl_DrawWin( SdrObject* pObject, Window* pWindow, const MapMode& rMap ) +static void lcl_DrawWin( SdrObject* pObject, Window* pWindow, const MapMode& rMap ) { MapMode aOld = pWindow->GetMapMode(); pWindow->SetMapMode( rMap ); @@ -138,7 +138,7 @@ void lcl_DrawWin( SdrObject* pObject, Window* pWindow, const MapMode& rMap ) pWindow->SetMapMode( aOld ); } -MapMode lcl_MoveMapMode( const MapMode& rMap, const Size& rMove ) +static MapMode lcl_MoveMapMode( const MapMode& rMap, const Size& rMove ) { MapMode aNew = rMap; Point aOrigin = aNew.GetOrigin(); diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 66cc41ec8daf..0fd030a3d9b1 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -717,7 +717,7 @@ void ScOutlineWindow::Paint( const Rectangle& /* rRect */ ) /** Increments or decrements a value and wraps at the specified limits. @return true = value wrapped. */ -bool lcl_RotateValue( size_t& rnValue, size_t nMin, size_t nMax, bool bForward ) +static bool lcl_RotateValue( size_t& rnValue, size_t nMin, size_t nMax, bool bForward ) { OSL_ENSURE( nMin <= nMax, "lcl_RotateValue - invalid range" ); OSL_ENSURE( nMax < static_cast< size_t >( -1 ), "lcl_RotateValue - range overflow" ); diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 2ae53056f4a5..1922a087c3a4 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -650,7 +650,7 @@ void ScOutputData::FindRotated() // ---------------------------------------------------------------------------- -sal_uInt16 lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) +static sal_uInt16 lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) { const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab ); const SfxItemSet* pCondSet = pDoc->GetCondResult( nCol, nRow, nTab ); @@ -683,7 +683,7 @@ sal_uInt16 lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTa return nRet; } -const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) +static const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) { const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab ); const SfxItemSet* pCondSet = pDoc->GetCondResult( nCol, nRow, nTab ); @@ -723,7 +723,7 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow // ---------------------------------------------------------------------------- -sal_Bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, +static sal_Bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, SCCOL nX1, SCCOL nX2, sal_Bool bShowProt, sal_Bool bPagebreakMode ) { if ( rFirst.bChanged != rOther.bChanged || @@ -1384,7 +1384,7 @@ void ScOutputData::DrawFrame() // Linie unter der Zelle -const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, +static const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nRotDir, sal_Bool bTopLine ) { @@ -1438,7 +1438,7 @@ const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, } -long lcl_getRotate( ScDocument* pDoc, SCTAB nTab, SCCOL nX, SCROW nY ) +static long lcl_getRotate( ScDocument* pDoc, SCTAB nTab, SCCOL nX, SCROW nY ) { long nRotate = 0; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index de84767a1d23..2bf2721a4e3b 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -820,7 +820,7 @@ double ScOutputData::GetStretch() // output strings // -void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScBaseCell* pCell ) +static void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScBaseCell* pCell ) { vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() ); @@ -866,7 +866,7 @@ void ScOutputData::SetSyntaxColor( Font* pFont, ScBaseCell* pCell ) } } -void lcl_SetEditColor( EditEngine& rEngine, const Color& rColor ) +static void lcl_SetEditColor( EditEngine& rEngine, const Color& rColor ) { ESelection aSel( 0, 0, rEngine.GetParagraphCount(), 0 ); SfxItemSet aSet( rEngine.GetEmptyItemSet() ); @@ -1050,7 +1050,7 @@ inline sal_Bool StringDiffer( const ScPatternAttr*& rpOldPattern, const ScPatter } } -inline void lcl_CreateInterpretProgress( sal_Bool& bProgress, ScDocument* pDoc, +static inline void lcl_CreateInterpretProgress( sal_Bool& bProgress, ScDocument* pDoc, ScFormulaCell* pFCell ) { if ( !bProgress && pFCell->GetDirty() ) @@ -2021,7 +2021,7 @@ ScFieldEditEngine* ScOutputData::CreateOutputEditEngine() return pEngine; } -void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute +static void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute { rEngine.SetUpdateMode( false ); @@ -2033,7 +2033,7 @@ void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute SfxItemSet( *rPara.GetPool(), rPara.GetRanges() ) ); } -sal_Bool lcl_SafeIsValue( ScBaseCell* pCell ) +static sal_Bool lcl_SafeIsValue( ScBaseCell* pCell ) { if (!pCell) return false; @@ -2059,7 +2059,7 @@ sal_Bool lcl_SafeIsValue( ScBaseCell* pCell ) return bRet; } -void lcl_ScaleFonts( EditEngine& rEngine, long nPercent ) +static void lcl_ScaleFonts( EditEngine& rEngine, long nPercent ) { sal_Bool bUpdateMode = rEngine.GetUpdateMode(); if ( bUpdateMode ) @@ -2100,7 +2100,7 @@ void lcl_ScaleFonts( EditEngine& rEngine, long nPercent ) rEngine.SetUpdateMode( sal_True ); } -long lcl_GetEditSize( EditEngine& rEngine, sal_Bool bWidth, sal_Bool bSwap, long nAttrRotate ) +static long lcl_GetEditSize( EditEngine& rEngine, sal_Bool bWidth, sal_Bool bSwap, long nAttrRotate ) { if ( bSwap ) bWidth = !bWidth; diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 1f0ea75504e7..2b9c870d17ef 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -74,7 +74,7 @@ #define SC_PREVIEW_SHADOWSIZE 2 -long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long>& nPages ) +static long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long>& nPages ) { long nDisplayStart = 0; for (SCTAB i=0; i<nTab; i++) @@ -748,7 +748,7 @@ long ScPreview::GetFirstPage(SCTAB nTabP) } -Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab ) +static Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab ) { String aName = pDoc->GetPageStyle( nTab ); ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 8fe962cc07aa..83a575fb2d2d 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -274,7 +274,7 @@ void ScPreviewLocationData::GetDrawRange( sal_uInt16 nPos, Rectangle& rPixelRect } } -ScPreviewLocationEntry* lcl_GetEntryByAddress( const boost::ptr_list<ScPreviewLocationEntry> &rEntries, +static ScPreviewLocationEntry* lcl_GetEntryByAddress( const boost::ptr_list<ScPreviewLocationEntry> &rEntries, const ScAddress& rPos, ScPreviewLocationType eType ) { boost::ptr_list<ScPreviewLocationEntry>::const_iterator it; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 9e028ded5c4d..c6f7b8a891b2 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -172,7 +172,7 @@ size_t ScPageRowEntry::CountVisible() const //------------------------------------------------------------------------ -long lcl_LineTotal(const ::editeng::SvxBorderLine* pLine) +static long lcl_LineTotal(const ::editeng::SvxBorderLine* pLine) { return pLine ? ( pLine->GetOutWidth() + pLine->GetInWidth() + pLine->GetDistance() ) : 0; } @@ -370,7 +370,7 @@ void ScPrintFunc::SetDrawView( FmFormView* pNew ) pDrawView = pNew; } -void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) +static void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) { for (SCSIZE nArrY=1; nArrY+1<rTabInfo.mnArrCount; nArrY++) { @@ -597,7 +597,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr // Drucken // -void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) +static void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) { // nDistance muss vorher unterschiedlich initalisiert sein @@ -1075,7 +1075,7 @@ void ScPrintFunc::SetDateTime( const Date& rDate, const Time& rTime ) aFieldData.aTime = rTime; } -void lcl_DrawGraphic( const Graphic &rGraphic, OutputDevice *pOut, +static void lcl_DrawGraphic( const Graphic &rGraphic, OutputDevice *pOut, const Rectangle &rGrf, const Rectangle &rOut ) { const bool bNotInside = !rOut.IsInside( rGrf ); @@ -1091,7 +1091,7 @@ void lcl_DrawGraphic( const Graphic &rGraphic, OutputDevice *pOut, pOut->Pop(); } -void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevice* pRefDev, +static void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevice* pRefDev, const Rectangle &rOrg, const Rectangle &rOut ) { Size aGrfSize(0,0); @@ -2911,7 +2911,7 @@ void ScPrintFunc::ResetBreaks( SCTAB nTab ) // Breaks fuer Anzeige richt pDoc->UpdatePageBreaks( nTab, NULL ); } -void lcl_SetHidden( ScDocument* pDoc, SCTAB nPrintTab, ScPageRowEntry& rPageRowEntry, +static void lcl_SetHidden( ScDocument* pDoc, SCTAB nPrintTab, ScPageRowEntry& rPageRowEntry, SCCOL nStartCol, const SCCOL* pPageEndX ) { size_t nPagesX = rPageRowEntry.GetPagesX(); diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 71fcf453bd24..c195e6092730 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -468,7 +468,7 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ ) pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } -sal_uInt16 lcl_DocShellNr( ScDocument* pDoc ) +static sal_uInt16 lcl_DocShellNr( ScDocument* pDoc ) { sal_uInt16 nShellCnt = 0; SfxObjectShell* pShell = SfxObjectShell::GetFirst(); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 4322cc9111cf..a9e85e368595 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -208,7 +208,7 @@ void ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt ) //================================================================== -bool lcl_HasColOutline( const ScViewData& rViewData ) +static bool lcl_HasColOutline( const ScViewData& rViewData ) { const ScOutlineTable* pTable = rViewData.GetDocument()->GetOutlineTable(rViewData.GetTabNo()); if (pTable) @@ -220,7 +220,7 @@ bool lcl_HasColOutline( const ScViewData& rViewData ) return false; } -bool lcl_HasRowOutline( const ScViewData& rViewData ) +static bool lcl_HasRowOutline( const ScViewData& rViewData ) { const ScOutlineTable* pTable = rViewData.GetDocument()->GetOutlineTable(rViewData.GetTabNo()); if (pTable) @@ -309,7 +309,7 @@ IMPL_LINK_NOARG(ScTabView, TimerHdl) // --- Resize --------------------------------------------------------------------- -void lcl_SetPosSize( Window& rWindow, const Point& rPos, const Size& rSize, +static void lcl_SetPosSize( Window& rWindow, const Point& rPos, const Size& rSize, long nTotalWidth, bool bLayoutRTL ) { Point aNewPos = rPos; @@ -1400,7 +1400,7 @@ void ScTabView::ScrollLines( long nDeltaX, long nDeltaY ) ScrollY(nDeltaY,WhichV(eWhich)); } -SCROW lcl_LastVisible( ScViewData& rViewData ) +static SCROW lcl_LastVisible( ScViewData& rViewData ) { // wenn am Dokumentende viele Zeilen ausgeblendet sind (welcher Trottel macht sowas?), // soll dadurch nicht auf breite Zeilenkoepfe geschaltet werden @@ -1983,7 +1983,7 @@ Point ScTabView::GetMousePosPixel() return aPos; } -sal_Bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin ) +static sal_Bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin ) { if (pWin) { diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index e8f3fa5e137d..756661c84fc2 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -1067,7 +1067,7 @@ void ScTabView::DeselectAllTables() rBind.Invalidate( FID_TAB_DESELECTALL ); } -bool lcl_FitsInWindow( double fScaleX, double fScaleY, sal_uInt16 nZoom, +static bool lcl_FitsInWindow( double fScaleX, double fScaleY, sal_uInt16 nZoom, long nWindowX, long nWindowY, ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCCOL nFixPosX, SCROW nFixPosY ) diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index ba93fea23743..f31cddc3a6b3 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -666,7 +666,7 @@ void ScTabView::RemoveHintWindow() // find window that should not be over the cursor -Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) +static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) { //! auch Spelling ??? (dann beim Aufruf Membervariable setzen) diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index fe36239421c0..342880ac1ea9 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -358,7 +358,7 @@ long ScTabView::GetScrollBarPos( ScrollBar& rScroll, bool bLayoutRTL ) // UpdateScrollBars - sichtbaren Bereich und Scrollweite der Scrollbars einstellen -long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (komplette) Zellen +static long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (komplette) Zellen { long nOldPos; long nNewPos; @@ -373,7 +373,7 @@ long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (kompl return nNewPos - nOldPos; } -long lcl_GetScrollRange( SCCOLROW nDocEnd, SCCOLROW nPos, SCCOLROW nVis, SCCOLROW nMax, SCCOLROW nStart ) +static long lcl_GetScrollRange( SCCOLROW nDocEnd, SCCOLROW nPos, SCCOLROW nVis, SCCOLROW nMax, SCCOLROW nStart ) { // get the end (positive) of a scroll bar range that always starts at 0 diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 224b2cf4f168..bc0b088181e6 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -83,7 +83,7 @@ using ::std::auto_ptr; /** Try to parse the given range using Calc-style syntax first, then Excel-style if that fails. */ -sal_uInt16 lcl_ParseRange(ScRange& rScRange, const String& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */) +static sal_uInt16 lcl_ParseRange(ScRange& rScRange, const String& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */) { sal_uInt16 nResult = rScRange.Parse(aAddress, pDoc); if ( (nResult & SCA_VALID) ) @@ -94,7 +94,7 @@ sal_uInt16 lcl_ParseRange(ScRange& rScRange, const String& aAddress, ScDocument* /** Try to parse the given address using Calc-style syntax first, then Excel-style if that fails. */ -sal_uInt16 lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */) +static sal_uInt16 lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */) { sal_uInt16 nResult = rScAddress.Parse(aAddress, pDoc); if ( (nResult & SCA_VALID) ) diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 7afb032060b8..595a93f319f0 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1139,7 +1139,7 @@ IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose) // handlers to call UNO listeners: -ScTabViewObj* lcl_GetViewObj( ScTabViewShell& rShell ) +static ScTabViewObj* lcl_GetViewObj( ScTabViewShell& rShell ) { ScTabViewObj* pRet = NULL; SfxViewFrame* pViewFrame = rShell.GetViewFrame(); diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 642e999a9f83..101a956e5895 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -169,7 +169,7 @@ void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const S // wenn CLOOKs: -> mit <editview.hxx> <flditem.hxx>in neue tabvwsh -void lcl_SelectFieldAfterInsert( EditView& rView ) +static void lcl_SelectFieldAfterInsert( EditView& rView ) { ESelection aSel = rView.GetSelection(); if ( aSel.nStartPos == aSel.nEndPos && aSel.nStartPos > 0 ) diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 199a9db69d4b..1f13aa07e68a 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -154,7 +154,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) } } -uno::Reference < embed::XEmbeddedObject > lcl_GetSelectedObj( SdrView* pDrView ) //! Member von ScDrawView? +static uno::Reference < embed::XEmbeddedObject > lcl_GetSelectedObj( SdrView* pDrView ) //! Member von ScDrawView? { uno::Reference < embed::XEmbeddedObject > xRet; if (pDrView) diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index a98936b3978d..cedb1aeb2f2c 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -218,7 +218,7 @@ enum ScAutoSum }; -ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, +static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, ScDirection eDir, SCCOLROW& nExtend ) { ScBaseCell* pCell; @@ -245,7 +245,7 @@ ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, #define SC_AUTOSUM_MAXCOUNT 20 -ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, +static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, SCTAB nTab, ScDirection eDir, SCCOLROW& nExtend ) { sal_uInt16 nCount = 0; @@ -278,7 +278,7 @@ ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, //---------------------------------------------------------------------------- -bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& nRow, +static bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& nRow, SCTAB nTab, SCCOLROW& nExtend, SCROW nMinRow ) { const SCROW nTmp = nRow; @@ -297,7 +297,7 @@ bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& nRow, //---------------------------------------------------------------------------- -bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow, +static bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow, SCTAB nTab, SCCOLROW& nExtend, SCROW nMinCol ) { const SCCOL nTmp = nCol; @@ -316,7 +316,7 @@ bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow, //---------------------------------------------------------------------------- -bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) +static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) { const ScAddress aStart = rRange.aStart; const ScAddress aEnd = rRange.aEnd; @@ -360,7 +360,7 @@ bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeList, co //---------------------------------------------------------------------------- -bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) +static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) { const ScAddress aStart = rRange.aStart; const ScAddress aEnd = rRange.aEnd; diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 5def6996cc0c..08c7625a2dcd 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -783,7 +783,7 @@ sal_Bool ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTran return bRet; } -sal_Bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, +static sal_Bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rTabSelection, sal_uInt16 nMask ) { ScMarkData::const_iterator itr = rTabSelection.begin(), itrEnd = rTabSelection.end(); diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 415e7a2885a9..ebf357328fae 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -67,7 +67,7 @@ using namespace com::sun::star; //================================================================== -void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize ) +static void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize ) { SdrPage* pPage = pData->GetScDrawView()->GetModel()->GetPage( static_cast<sal_uInt16>(pData->GetTabNo()) ); OSL_ENSURE(pPage,"pPage ???"); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index b302d2ba9c66..8b13ebd501d2 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -280,7 +280,7 @@ sal_Bool ScViewFunc::SelectionEditable( bool* pOnlyNotBecauseOfMatrix /* = NULL #define LRU_MAX 10 #endif -sal_Bool lcl_FunctionKnown( sal_uInt16 nOpCode ) +static sal_Bool lcl_FunctionKnown( sal_uInt16 nOpCode ) { const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) @@ -293,7 +293,7 @@ sal_Bool lcl_FunctionKnown( sal_uInt16 nOpCode ) return false; } -sal_Bool lcl_AddFunction( ScAppOptions& rAppOpt, sal_uInt16 nOpCode ) +static sal_Bool lcl_AddFunction( ScAppOptions& rAppOpt, sal_uInt16 nOpCode ) { sal_uInt16 nOldCount = rAppOpt.GetLRUFuncListCount(); sal_uInt16* pOldList = rAppOpt.GetLRUFuncList(); |