diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/cellsuno.hxx | 4 | ||||
-rw-r--r-- | sc/inc/conditio.hxx | 2 | ||||
-rw-r--r-- | sc/inc/datauno.hxx | 2 | ||||
-rw-r--r-- | sc/inc/detdata.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dispuno.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dptabres.hxx | 2 | ||||
-rw-r--r-- | sc/inc/linkuno.hxx | 2 | ||||
-rw-r--r-- | sc/inc/validat.hxx | 3 | ||||
-rw-r--r-- | sc/inc/viewuno.hxx | 12 | ||||
-rw-r--r-- | sc/source/core/inc/adiasync.hxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/addinlis.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/adiasync.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/autoform.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/htmlpars.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/rtfparse.hxx | 2 | ||||
-rw-r--r-- | sc/workben/result.hxx | 2 |
16 files changed, 24 insertions, 25 deletions
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index b2e6097bdcd6..8d1708715699 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -127,11 +127,11 @@ public: typedef ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >* XModifyListenerPtr; -SV_DECL_PTRARR_DEL( XModifyListenerArr_Impl, XModifyListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XModifyListenerArr_Impl, XModifyListenerPtr, 4 ) class ScNamedEntry; typedef ScNamedEntry* ScNamedEntryPtr; -SV_DECL_PTRARR_DEL( ScNamedEntryArr_Impl, ScNamedEntryPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( ScNamedEntryArr_Impl, ScNamedEntryPtr, 4 ) // ScCellRangesBase - base class for ScCellRangesObj (with access by index) diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index f541e247e7d8..8d84e4cdeb7b 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -271,7 +271,7 @@ public: typedef ScConditionalFormat* ScConditionalFormatPtr; SV_DECL_PTRARR_SORT(ScConditionalFormats_Impl, ScConditionalFormatPtr, - SC_COND_GROW, SC_COND_GROW) + SC_COND_GROW) class ScConditionalFormatList : public ScConditionalFormats_Impl { diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 732dd80edd99..79283f05af79 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -71,7 +71,7 @@ struct ScSortParam; typedef ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >* XDBRefreshListenerPtr; -SV_DECL_PTRARR_DEL( XDBRefreshListenerArr_Impl, XDBRefreshListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XDBRefreshListenerArr_Impl, XDBRefreshListenerPtr, 4 ) class ScDataUnoConversion { diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 9dc87fa7f57e..811dde8cd217 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -80,7 +80,7 @@ public: typedef ScDetOpData* ScDetOpDataPtr; -SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW, SC_DETOP_GROW) +SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW) class ScDetOpList : public ScDetOpArr_Impl { diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index 4b29605cfc3f..8577d37be7bd 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -46,7 +46,7 @@ class ScTabViewShell; typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >* XStatusListenerPtr; -SV_DECL_PTRARR_DEL( XStatusListenerArr_Impl, XStatusListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XStatusListenerArr_Impl, XStatusListenerPtr, 4 ) class ScDispatchProviderInterceptor : public cppu::WeakImplHelper2< diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index d901d7473008..6864e147cc4c 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -497,7 +497,7 @@ public: //! replace PtrArr with 32-bit array ???? typedef ScDPDataMember* ScDPDataMemberPtr; -SV_DECL_PTRARR_DEL(ScDPDataMembers, ScDPDataMemberPtr, SC_DP_RES_GROW, SC_DP_RES_GROW) +SV_DECL_PTRARR_DEL(ScDPDataMembers, ScDPDataMemberPtr, SC_DP_RES_GROW) // result dimension contains only members diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index ea28415edda3..9be4cecba81c 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -62,7 +62,7 @@ class ScTableLink; typedef ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >* XRefreshListenerPtr; -SV_DECL_PTRARR_DEL( XRefreshListenerArr_Impl, XRefreshListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XRefreshListenerArr_Impl, XRefreshListenerPtr, 4 ) diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index e2a1f3a6cdcc..13e4aedd8e82 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -182,8 +182,7 @@ private: typedef ScValidationData* ScValidationDataPtr; -SV_DECL_PTRARR_SORT(ScValidationEntries_Impl, ScValidationDataPtr, - SC_COND_GROW, SC_COND_GROW) +SV_DECL_PTRARR_SORT(ScValidationEntries_Impl, ScValidationDataPtr, SC_COND_GROW) class ScValidationDataList : public ScValidationEntries_Impl { diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index b062fd86a89c..723cf8926996 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -60,27 +60,27 @@ class ScPreviewShell; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >* XRangeSelectionListenerPtr; -SV_DECL_PTRARR_DEL( XRangeSelectionListenerArr_Impl, XRangeSelectionListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XRangeSelectionListenerArr_Impl, XRangeSelectionListenerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionChangeListener >* XRangeSelectionChangeListenerPtr; -SV_DECL_PTRARR_DEL( XRangeSelectionChangeListenerArr_Impl, XRangeSelectionChangeListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XRangeSelectionChangeListenerArr_Impl, XRangeSelectionChangeListenerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >* XSelectionChangeListenerPtr; -SV_DECL_PTRARR_DEL( XSelectionChangeListenerArr_Impl, XSelectionChangeListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XSelectionChangeListenerArr_Impl, XSelectionChangeListenerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >* XViewPropertyChangeListenerPtr; -SV_DECL_PTRARR_DEL( XViewPropertyChangeListenerArr_Impl, XViewPropertyChangeListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XViewPropertyChangeListenerArr_Impl, XViewPropertyChangeListenerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEnhancedMouseClickHandler >* XMouseClickHandlerPtr; -SV_DECL_PTRARR_DEL( XMouseClickHandlerArr_Impl, XMouseClickHandlerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XMouseClickHandlerArr_Impl, XMouseClickHandlerPtr, 4 ) typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XActivationEventListener >* XActivationEventListenerPtr; -SV_DECL_PTRARR_DEL( XActivationEventListenerArr_Impl, XActivationEventListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( XActivationEventListenerArr_Impl, XActivationEventListenerPtr, 4 ) // ScViewPaneBase not derived from OWeakObject diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx index 061c5077137b..4d47d3d5cf09 100644 --- a/sc/source/core/inc/adiasync.hxx +++ b/sc/source/core/inc/adiasync.hxx @@ -41,12 +41,12 @@ void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData ); class ScAddInAsync; typedef ScAddInAsync* ScAddInAsyncPtr; -SV_DECL_PTRARR_SORT( ScAddInAsyncs, ScAddInAsyncPtr, 4, 4 ) +SV_DECL_PTRARR_SORT( ScAddInAsyncs, ScAddInAsyncPtr, 4 ) extern ScAddInAsyncs theAddInAsyncTbl; // in adiasync.cxx class ScDocument; typedef ScDocument* ScAddInDocPtr; -SV_DECL_PTRARR_SORT( ScAddInDocs, ScAddInDocPtr, 1, 1 ) +SV_DECL_PTRARR_SORT( ScAddInDocs, ScAddInDocPtr, 1 ) class String; diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx index 273ec7883407..42b74070df1d 100644 --- a/sc/source/core/tool/addinlis.cxx +++ b/sc/source/core/tool/addinlis.cxx @@ -59,7 +59,7 @@ ScAddInListener* ScAddInListener::CreateListener( ScAddInListener::ScAddInListener( uno::Reference<sheet::XVolatileResult> xVR, ScDocument* pDoc ) : xVolRes( xVR ) { - pDocs = new ScAddInDocs( 1, 1 ); + pDocs = new ScAddInDocs( 1 ); pDocs->Insert( pDoc ); } diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx index 2ff728dc06af..e7b21a8fa306 100644 --- a/sc/source/core/tool/adiasync.cxx +++ b/sc/source/core/tool/adiasync.cxx @@ -74,7 +74,7 @@ ScAddInAsync::ScAddInAsync( sal_uLong nHandleP, sal_uInt16 nIndex, ScDocument* p nHandle( nHandleP ), bValid( false ) { - pDocs = new ScAddInDocs( 1, 1 ); + pDocs = new ScAddInDocs( 1 ); pDocs->Insert( pDoc ); pFuncData = (FuncData*)ScGlobal::GetFuncCollection()->At(nIndex); eType = pFuncData->GetAsyncType(); diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index d6c3a682b033..ee03c4a53241 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -1044,7 +1044,7 @@ sal_Bool ScAutoFormat::Load() OSL_FAIL( "Der Header enthaelt mehr/neuere Daten" ); rStream.Seek( nPos + nCnt ); } - rStream.SetStreamCharSet( GetSOLoadTextEncoding( nChrSet, nFileVers ) ); + rStream.SetStreamCharSet( GetSOLoadTextEncoding( nChrSet ) ); rStream.SetVersion( nFileVers ); } @@ -1134,7 +1134,7 @@ sal_Bool ScAutoFormat::Save() rStream << nVal << (sal_uInt8)2 // Anzahl von Zeichen des Headers incl. diesem << (sal_uInt8)::GetSOStoreTextEncoding( - osl_getThreadTextEncoding(), sal::static_int_cast<sal_uInt16>(rStream.GetVersion()) ); + osl_getThreadTextEncoding() ); ScAfVersions::Write(rStream); // Item-Versionen bRet = (rStream.GetError() == 0); diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 4c3ea8ecf6e3..b8846c46e10d 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -108,7 +108,7 @@ public: // ============================================================================ -SV_DECL_VARARR_SORT( ScHTMLColOffset, sal_uLong, 16, 4) +SV_DECL_VARARR_SORT( ScHTMLColOffset, sal_uLong, 16 ) struct ScHTMLTableStackEntry { diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index 77c82bb788ce..4d62d4d7dc26 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -46,7 +46,7 @@ struct ScRTFCellDefault }; // deswegen ULONG, typedef bringt's auch nicht :-( -SV_DECL_VARARR_SORT( ScRTFColTwips, sal_uLong, 16, 4) +SV_DECL_VARARR_SORT( ScRTFColTwips, sal_uLong, 16 ) #else // SC_RTFPARSE_CXX diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx index b0c31da16e9d..0a9912584787 100644 --- a/sc/workben/result.hxx +++ b/sc/workben/result.hxx @@ -41,7 +41,7 @@ //class XResultListenerRef; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >* XResultListenerPtr; -SV_DECL_PTRARR_DEL( XResultListenerArr_Impl, XResultListenerPtr, 4, 4 ); +SV_DECL_PTRARR_DEL( XResultListenerArr_Impl, XResultListenerPtr, 4 ); class ScAddInResult : public cppu::WeakImplHelper1< |