[Libreoffice-commits] .: 2 commits - binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Mon Oct 3 20:37:29 PDT 2011
binfilter/bf_sc/source/core/data/sc_column.cxx | 50 -----
binfilter/bf_sc/source/core/data/sc_column3.cxx | 220 +++++++++++-----------
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 30 ---
binfilter/bf_sc/source/core/data/sc_document.cxx | 24 --
binfilter/bf_sc/source/core/data/sc_dpobject.cxx | 10 -
binfilter/bf_sc/source/core/data/sc_dpshttab.cxx | 19 -
binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx | 37 ---
binfilter/bf_sc/source/core/data/sc_globalx.cxx | 1
binfilter/bf_sc/source/core/data/sc_olinetab.cxx | 2
binfilter/bf_sc/source/core/data/sc_stlpool.cxx | 13 -
binfilter/bf_sc/source/core/data/sc_table1.cxx | 18 -
binfilter/bf_sc/source/core/data/sc_validat.cxx | 5
binfilter/bf_sc/source/core/inc/interpre.hxx | 1
binfilter/bf_sc/source/core/tool/sc_collect.cxx | 2
binfilter/bf_sc/source/core/tool/sc_detfunc.cxx | 7
binfilter/bf_sc/source/core/tool/sc_interpr2.cxx | 3
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx | 16 -
binfilter/bf_sc/source/core/tool/sc_unitconv.cxx | 10 -
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 4
binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx | 1
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 14 -
binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx | 13 -
binfilter/inc/bf_sc/column.hxx | 4
binfilter/inc/bf_sc/document.hxx | 6
binfilter/inc/bf_sc/dpobject.hxx | 4
binfilter/inc/bf_sc/dpshttab.hxx | 20 +-
binfilter/inc/bf_sc/dptabsrc.hxx | 19 +
binfilter/inc/bf_sc/stlpool.hxx | 2
binfilter/inc/bf_sc/validat.hxx | 2
29 files changed, 164 insertions(+), 393 deletions(-)
New commits:
commit e2ce76b46b913ed3a675bc5c418ba1723f7a09e2
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Oct 3 20:37:14 2011 -0700
The last of the easy DBG_BF_ASSERT() in bf_sc
diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
index a4f6a4b..5de448a 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
@@ -170,11 +170,6 @@ using namespace ::com::sun::star;
/*N*/ delete pServDesc;
/*N*/ }
-/*N*/ DataObject* ScDPObject::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
/*N*/ void ScDPObject::SetAlive(BOOL bSet)
/*N*/ {
/*N*/ bAlive = bSet;
@@ -765,11 +760,6 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ {
/*N*/ }
-/*N*/ DataObject* ScDPCollection::Clone() const
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
/*N*/ BOOL ScDPCollection::LoadNew( SvStream& rStream )
/*N*/ {
/*N*/ BOOL bSuccess = TRUE;
diff --git a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
index d3396c0..04894cd 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
@@ -107,10 +107,6 @@ namespace binfilter {
/*M*/ delete[] pSpecial;
/*N*/ }
-/*N*/ void ScSheetDPData::DisposeData()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ long ScSheetDPData::GetColumnCount()
/*N*/ {
/*N*/ return pImpl->nColCount;
@@ -181,10 +177,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ UINT32 ScSheetDPData::GetNumberFormat(long)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
/*N*/ BOOL ScSheetDPData::getIsDataLayoutDimension(long nColumn)
/*N*/ {
/*N*/ return ( nColumn == pImpl->nColCount );
@@ -202,17 +194,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScSheetDPData::GetNextRow( const ScDPTableIteratorParam& )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
-
-
-
-
-
}
diff --git a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
index f756881..f4e178d 100644
--- a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
@@ -291,10 +291,6 @@ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResult
return uno::Sequence< uno::Sequence<sheet::DataResult> >(0);
}
-/*?*/ void SAL_CALL ScDPSource::refresh() throw(uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
/*?*/ void SAL_CALL ScDPSource::addRefreshListener( const uno::Reference<util::XRefreshListener >& )
/*?*/ throw(uno::RuntimeException)
/*?*/ {
@@ -359,11 +355,6 @@ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResult
// XPropertySet
-/*?*/ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo()
-/*?*/ throw(uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Reference<beans::XPropertySetInfo>(0);
-/*?*/ }
-
/*N*/ void SAL_CALL ScDPSource::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue )
/*N*/ throw(beans::UnknownPropertyException, beans::PropertyVetoException,
/*N*/ lang::IllegalArgumentException, lang::WrappedTargetException,
@@ -604,29 +595,15 @@ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResult
-/*?*/ uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() throw(uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Reference<util::XCloneable>(0);
-/*?*/ }
-
-
// XPropertySet
-/*?*/ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetInfo()
-/*?*/ throw(uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Reference<beans::XPropertySetInfo>(0);
-/*?*/ }
-
/*N*/ void SAL_CALL ScDPDimension::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue )
/*N*/ throw(beans::UnknownPropertyException, beans::PropertyVetoException,
/*N*/ lang::IllegalArgumentException, lang::WrappedTargetException,
/*N*/ uno::RuntimeException)
/*N*/ {
/*N*/ String aNameStr = aPropertyName;
-/*N*/ if ( aNameStr.EqualsAscii( SC_UNO_POSITION ) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_USEDHIER ) )
+/*N*/ if ( aNameStr.EqualsAscii( SC_UNO_USEDHIER ) )
/*N*/ {
/*?*/ INT32 nInt;
/*?*/ aValue >>= nInt;
@@ -643,7 +620,7 @@ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResult
/*N*/ if (aValue >>= eEnum)
/*N*/ setFunction( eEnum );
/*N*/ }
-/*N*/ else
+/*N*/ if ( !aNameStr.EqualsAscii( SC_UNO_POSITION ) )
/*N*/ {
/*N*/ OSL_FAIL("unknown property");
/*N*/ //! THROW( UnknownPropertyException() );
@@ -672,8 +649,6 @@ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResult
/*N*/ }
/*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_ISDATALA ) ) // read-only properties
/*N*/ lcl_SetBoolInAny( aRet, getIsDataLayoutDimension() );
-/*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_NUMBERFO ) )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_ORIGINAL ) )
/*N*/ {
/*N*/ uno::Reference<container::XNamed> xOriginal;
@@ -681,7 +656,7 @@ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResult
/*?*/ xOriginal = pSource->GetDimensionsObject()->getByIndex(nSourceDim);
/*N*/ aRet <<= xOriginal;
/*N*/ }
-/*N*/ else
+/*N*/ else if ( !aNameStr.EqualsAscii( SC_UNO_NUMBERFO ) )
/*N*/ {
/*N*/ OSL_FAIL("unknown property");
/*N*/ //! THROW( UnknownPropertyException() );
@@ -1123,14 +1098,12 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
/*N*/ {
/*N*/ uno::Any aRet;
/*N*/ String aNameStr = aPropertyName;
-/*N*/ if ( aNameStr.EqualsAscii( SC_UNO_SHOWEMPT ) )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_SUBTOTAL ) )
+/*N*/ if ( aNameStr.EqualsAscii( SC_UNO_SUBTOTAL ) )
/*N*/ {
/*N*/ uno::Sequence<sheet::GeneralFunction> aSeq = getSubTotals(); //! avoid extra copy?
/*N*/ aRet <<= aSeq;
/*N*/ }
-/*N*/ else
+/*N*/ if ( !aNameStr.EqualsAscii( SC_UNO_SHOWEMPT ) )
/*N*/ {
/*N*/ OSL_FAIL("unknown property");
/*N*/ //! THROW( UnknownPropertyException() );
diff --git a/binfilter/bf_sc/source/core/data/sc_globalx.cxx b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
index a67ac03..c7c06ca 100644
--- a/binfilter/bf_sc/source/core/data/sc_globalx.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
@@ -106,7 +106,6 @@ namespace binfilter {
/*N*/ do
/*?*/ {
/*?*/ ::rtl::OUString aId( xContentAccess->queryContentIdentifierString() );
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*?*/ while ( xResultSet->next() );
/*?*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
index 0e62b52..dab15b2 100644
--- a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
@@ -434,8 +434,6 @@ namespace binfilter {
/*?*/ for ( USHORT i=nEntryStart; i<=nEntryEnd && bAllHidden; i++ )
/*?*/ if ( ( pHiddenFlags[i] & CR_HIDDEN ) == 0 )
/*?*/ bAllHidden = FALSE;
-/*?*/
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
index fc60896..4040eb9 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
@@ -136,19 +136,6 @@ namespace binfilter {
/*N*/ }
//------------------------------------------------------------------------
-
-/*N*/ SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
//
// Standard-Vorlagen
//
diff --git a/binfilter/bf_sc/source/core/data/sc_validat.cxx b/binfilter/bf_sc/source/core/data/sc_validat.cxx
index 022f15a..5bbd926 100644
--- a/binfilter/bf_sc/source/core/data/sc_validat.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_validat.cxx
@@ -190,11 +190,6 @@ namespace binfilter {
/*N*/ return bShowError;
/*N*/ }
-/*N*/ BOOL ScValidationData::IsDataValid( ScBaseCell* /*pCell*/, const ScAddress& /*rPos*/ ) const
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
//------------------------------------------------------------------------
/*N*/ ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList)
diff --git a/binfilter/bf_sc/source/core/inc/interpre.hxx b/binfilter/bf_sc/source/core/inc/interpre.hxx
index e052221..3be3010 100644
--- a/binfilter/bf_sc/source/core/inc/interpre.hxx
+++ b/binfilter/bf_sc/source/core/inc/interpre.hxx
@@ -430,7 +430,6 @@ void ScCalcTeam();
void ScAnswer();
void ScTTT();
void ScSpewFunc();
-void ScGame(){DBG_BF_ASSERT(0, "STRIP");}
//----------------Funktionen in interpr2.cxx---------------
double GetDate(INT16 nYear, INT16 nMonth, INT16 nDay);
diff --git a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
index 0ab387b..a5a5f56 100644
--- a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
@@ -1317,11 +1317,8 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Leve
/*N*/ DrawCircle( nCol, nRow, aData );
/*N*/ ++nInsCount;
/*N*/ }
-/*N*/ if ( !pData->IsDataValid( pCell, ScAddress( nCol, nCellRow, nTab ) ) )
-/*N*/ {
-/*N*/ DrawCircle( nCol, nCellRow, aData );
-/*N*/ ++nInsCount;
-/*N*/ }
+/*N*/ DrawCircle( nCol, nCellRow, aData );
+/*N*/ ++nInsCount;
/*N*/ nNextRow = nCellRow + 1;
/*N*/ pCell = aCellIter.GetNext();
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
index 4ecc74d..34d42b1 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
@@ -2962,7 +2962,7 @@ void ScInterpreter::ScTTT()
case ocLogInv : ScLogNormInv(); break;
case ocBetaDist : ScBetaDist(); break;
case ocBetaInv : ScBetaInv(); break;
-/*N*/ case ocExternal : ScExternal(); break;
+ case ocExternal : ScExternal(); break;
case ocTableOp : ScTableOp(); break;
// case ocErrCell : ScErrCell(); break;
case ocStop : break;
@@ -2971,16 +2971,16 @@ void ScInterpreter::ScTTT()
case ocStyle : ScStyle(); break;
case ocDde : ScDde(); break;
case ocBase : ScBase(); break;
-/*N*/ case ocDecimal : ScDecimal(); break;
-/*N*/ case ocConvert : ScConvert(); break;
+ case ocDecimal : ScDecimal(); break;
+ case ocConvert : ScConvert(); break;
case ocRoman : ScRoman(); break;
case ocArabic : ScArabic(); break;
case ocAnswer : ScAnswer(); break;
case ocTeam : ScCalcTeam(); break;
case ocTTT : ScTTT(); break;
case ocSpew : ScSpewFunc(); break;
- case ocGame : ScGame(); break;
-/*N*/ default : SetError(errUnknownOpCode); PushInt(0); break;
+ case ocGame : break;
+ default : SetError(errUnknownOpCode); PushInt(0); break;
/*N*/ }
/*N*/
/*N*/ // aeussere Funktion bestimmt das Format eines Ausdrucks
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index bbfbdd4..76a8bd8 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -6893,43 +6893,43 @@ void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress&,
table::TableOrientation )
throw(uno::RuntimeException)
{
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
}
void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress&,
table::TableOrientation )
throw(uno::RuntimeException)
{
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
}
void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& )
throw(uno::RuntimeException)
{
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
}
void SAL_CALL ScTableSheetObj::clearOutline() throw(uno::RuntimeException)
{
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
}
void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& )
throw(uno::RuntimeException)
{
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
}
void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& )
throw(uno::RuntimeException)
{
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
}
void SAL_CALL ScTableSheetObj::showLevel( sal_Int16, table::TableOrientation )
throw(uno::RuntimeException)
{
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
}
// XProtectable
diff --git a/binfilter/inc/bf_sc/dpobject.hxx b/binfilter/inc/bf_sc/dpobject.hxx
index 2d0f103..c07014f 100644
--- a/binfilter/inc/bf_sc/dpobject.hxx
+++ b/binfilter/inc/bf_sc/dpobject.hxx
@@ -104,7 +104,7 @@ public:
ScDPObject(const ScDPObject& r);
virtual ~ScDPObject();
- virtual DataObject* Clone() const;
+ virtual DataObject* Clone() const { return NULL; } // DBG_BF_ASSERT
void SetAlive(BOOL bSet);
@@ -159,7 +159,7 @@ public:
ScDPCollection(const ScDPCollection& r);
virtual ~ScDPCollection();
- virtual DataObject* Clone() const;
+ virtual DataObject* Clone() const { return NULL; } // DBG_BF_ASSERT
ScDPObject* operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);}
diff --git a/binfilter/inc/bf_sc/dpshttab.hxx b/binfilter/inc/bf_sc/dpshttab.hxx
index 7dc5724..f1b1300 100644
--- a/binfilter/inc/bf_sc/dpshttab.hxx
+++ b/binfilter/inc/bf_sc/dpshttab.hxx
@@ -60,16 +60,16 @@ public:
ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc );
virtual ~ScSheetDPData();
- virtual long GetColumnCount();
- virtual String getDimensionName(long nColumn);
- virtual BOOL getIsDataLayoutDimension(long nColumn);
- virtual BOOL IsDateDimension(long nDim);
- virtual UINT32 GetNumberFormat(long nDim);
- virtual void DisposeData();
- virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty );
-
- virtual void ResetIterator();
- virtual BOOL GetNextRow( const ScDPTableIteratorParam& rParam );
+ virtual long GetColumnCount();
+ virtual String getDimensionName(long nColumn);
+ virtual BOOL getIsDataLayoutDimension(long nColumn);
+ virtual BOOL IsDateDimension(long nDim);
+ virtual UINT32 GetNumberFormat(long /*nDim*/) { return 0; } // DBG_BF_ASSERT
+ virtual void DisposeData() {} // DBG_BF_ASSERT
+ virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty );
+
+ virtual void ResetIterator();
+ virtual BOOL GetNextRow( const ScDPTableIteratorParam& /*rParam*/ ) { return FALSE; } // DBG_BF_ASSERT
};
diff --git a/binfilter/inc/bf_sc/dptabsrc.hxx b/binfilter/inc/bf_sc/dptabsrc.hxx
index 4347d66..d01bc54 100644
--- a/binfilter/inc/bf_sc/dptabsrc.hxx
+++ b/binfilter/inc/bf_sc/dptabsrc.hxx
@@ -155,7 +155,7 @@ public:
throw(::com::sun::star::uno::RuntimeException);
// XRefreshable
- virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException) {} // DBG_BF_ASSERT
virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XRefreshListener >& l )
throw(::com::sun::star::uno::RuntimeException);
@@ -164,9 +164,9 @@ public:
throw(::com::sun::star::uno::RuntimeException);
// XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
- SAL_CALL getPropertySetInfo( )
- throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() // DBG_BF_ASSERT
+ throw(::com::sun::star::uno::RuntimeException)
+ { return ::com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo>(0); }
virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
@@ -300,13 +300,14 @@ public:
getHierarchies() throw(::com::sun::star::uno::RuntimeException);
// XCloneable
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL
- createClone() throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() // DBG_BF_ASSERT
+ throw(::com::sun::star::uno::RuntimeException)
+ { return ::com::sun::star::uno::Reference<com::sun::star::util::XCloneable>(0); }
// XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
- SAL_CALL getPropertySetInfo( )
- throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() // DBG_BF_ASSERT
+ throw(::com::sun::star::uno::RuntimeException)
+ { return com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo>(0); }
virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
diff --git a/binfilter/inc/bf_sc/stlpool.hxx b/binfilter/inc/bf_sc/stlpool.hxx
index bfa8930..6b35632 100644
--- a/binfilter/inc/bf_sc/stlpool.hxx
+++ b/binfilter/inc/bf_sc/stlpool.hxx
@@ -68,7 +68,7 @@ protected:
virtual SfxStyleSheetBase* Create( const String& rName,
SfxStyleFamily eFamily,
USHORT nMask);
- virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle );
+ virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle ) { return NULL; } // DBG_BF_ASSERT
private:
SfxStyleSheetBase* pActualStyleSheet;
diff --git a/binfilter/inc/bf_sc/validat.hxx b/binfilter/inc/bf_sc/validat.hxx
index 4566515..c0f45c2 100644
--- a/binfilter/inc/bf_sc/validat.hxx
+++ b/binfilter/inc/bf_sc/validat.hxx
@@ -110,8 +110,6 @@ public:
ScValidationMode GetDataMode() const { return eDataMode; }
- BOOL IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const;
-
// TRUE -> Abbruch
BOOL IsEmpty() const;
commit 9d96d8667be6d1e6048a29bc9ea314bc469a7f73
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Oct 3 06:30:49 2011 -0700
Cleanup of classes ScColumn & ScDocument
diff --git a/binfilter/bf_sc/source/core/data/sc_column.cxx b/binfilter/bf_sc/source/core/data/sc_column.cxx
index 265d4cf..78e8cb0 100644
--- a/binfilter/bf_sc/source/core/data/sc_column.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_column.cxx
@@ -968,56 +968,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ void ScColumn::UpdateReference( UpdateRefMode eUpdateRefMode, USHORT nCol1, USHORT nRow1, USHORT nTab1,
-/*N*/ USHORT nCol2, USHORT nRow2, USHORT nTab2, short /*nDx*/, short /*nDy*/, short /*nDz*/,
-/*N*/ ScDocument* /*pUndoDoc*/ )
-/*N*/ {
-/*N*/ if (pItems)
-/*N*/ {
-/*N*/ ScRange aRange( ScAddress( nCol1, nRow1, nTab1 ),
-/*N*/ ScAddress( nCol2, nRow2, nTab2 ) );
-/*N*/ if ( !(eUpdateRefMode == URM_COPY && nRow1 == nRow2) )
-/*N*/ {
-/*?*/ // #90279# For performance reasons two loop bodies instead of
-/*?*/ // testing for update mode in each iteration.
-/*?*/ // Anyways, this is still a bottleneck on large arrays with few
-/*?*/ // formulas cells.
-/*?*/ if ( eUpdateRefMode == URM_COPY )
-/*?*/ {
-/*?*/ USHORT i;
-/*?*/ Search( nRow1, i );
-/*?*/ for ( ; i < nCount; i++ )
-/*?*/ {
-/*?*/ USHORT nRow = pItems[i].nRow;
-/*?*/ if ( nRow > nRow2 )
-/*?*/ break;
-/*?*/ ScBaseCell* pCell = pItems[i].pCell;
-/*?*/ if( pCell->GetCellType() == CELLTYPE_FORMULA)
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ USHORT i = 0;
-/*?*/ for ( ; i < nCount; i++ )
-/*?*/ {
-/*?*/ ScBaseCell* pCell = pItems[i].pCell;
-/*?*/ if( pCell->GetCellType() == CELLTYPE_FORMULA)
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-
-
-
-
/*N*/ void ScColumn::UpdateInsertTab( USHORT nTable)
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_column3.cxx b/binfilter/bf_sc/source/core/data/sc_column3.cxx
index 7241ee3..b70bee6 100644
--- a/binfilter/bf_sc/source/core/data/sc_column3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_column3.cxx
@@ -538,113 +538,119 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
// Formelzellen werden jetzt schon hier kopiert,
// Notizen muessen aber evtl. noch geloescht werden
-/*N*/ ScBaseCell* ScColumn::CloneCell(USHORT nIndex, USHORT nFlags,
-/*N*/ ScDocument* pDestDoc, const ScAddress& /*rDestPos*/)
-/*N*/ {
-/*N*/ ScBaseCell* pNew = 0;
-/*N*/ ScBaseCell* pSource = pItems[nIndex].pCell;
-/*N*/ switch (pSource->GetCellType())
-/*N*/ {
-/*?*/ case CELLTYPE_NOTE:
-/*?*/ if (nFlags & IDF_NOTE)
-/*?*/ pNew = new ScNoteCell(*(ScNoteCell*)pSource);
-/*?*/ break;
-/*?*/ case CELLTYPE_EDIT:
-/*?*/ if (nFlags & IDF_STRING)
-/*?*/ pNew = new ScEditCell( *(ScEditCell*)pSource, pDestDoc );
-/*?*/ break;
-/*N*/ case CELLTYPE_STRING:
-/*N*/ if (nFlags & IDF_STRING)
-/*N*/ pNew = new ScStringCell(*(ScStringCell*)pSource);
-/*N*/ break;
-/*N*/ case CELLTYPE_VALUE:
-/*N*/ {
-/*N*/ BOOL bDoIns = FALSE;
-/*N*/ USHORT nMask = nFlags & ( IDF_DATETIME | IDF_VALUE );
-/*N*/ if ( nMask == (IDF_DATETIME | IDF_VALUE) )
-/*N*/ bDoIns = TRUE;
-/*N*/ else if ( nMask )
-/*N*/ {
-/*?*/ ULONG nNumIndex = (ULONG)((SfxUInt32Item*) GetAttr(
-/*?*/ pItems[nIndex].nRow, ATTR_VALUE_FORMAT ))->GetValue();
-/*?*/ short nTyp = pDocument->GetFormatTable()->GetType(nNumIndex);
-/*?*/ if (nTyp == NUMBERFORMAT_DATE || nTyp == NUMBERFORMAT_TIME || nTyp == NUMBERFORMAT_DATETIME)
-/*?*/ bDoIns = (nFlags & IDF_DATETIME)!=0;
-/*?*/ else
-/*?*/ bDoIns = (nFlags & IDF_VALUE)!=0;
-/*N*/ }
-/*N*/ if (bDoIns)
-/*N*/ pNew = new ScValueCell(*(ScValueCell*)pSource);
-/*N*/ }
-/*N*/ break;
-/*?*/ case CELLTYPE_FORMULA:
-/*?*/ {
-/*?*/ ScFormulaCell* pForm = (ScFormulaCell*)pSource;
-/*?*/ if (nFlags & IDF_FORMULA)
-/*?*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else if ( (nFlags & (IDF_VALUE | IDF_DATETIME | IDF_STRING)) &&
-/*?*/ !pDestDoc->IsUndo() )
-/*?*/ {
-/*?*/ // #48491# ins Undo-Dokument immer nur die Original-Zelle kopieren,
-/*?*/ // aus Formeln keine Value/String-Zellen erzeugen
-/*?*/
-/*?*/ USHORT nErr = pForm->GetErrCode();
-/*?*/ if ( nErr )
-/*?*/ {
-/*?*/ // Fehler werden immer mit "Zahlen" kopiert
-/*?*/ // (Das ist hiermit willkuerlich so festgelegt)
-/*?*/
-/*?*/ }
-/*?*/ else if ( pForm->IsValue() )
-/*?*/ {
-/*?*/ BOOL bDoIns = FALSE;
-/*?*/ USHORT nMask = nFlags & ( IDF_DATETIME | IDF_VALUE );
-/*?*/ if ( nMask == (IDF_DATETIME | IDF_VALUE) )
-/*?*/ bDoIns = TRUE;
-/*?*/ else if ( nMask )
-/*?*/ {
-/*?*/ ULONG nNumIndex = (ULONG)((SfxUInt32Item*) GetAttr(
-/*?*/ pItems[nIndex].nRow, ATTR_VALUE_FORMAT ))->GetValue();
-/*?*/ short nTyp = pDocument->GetFormatTable()->GetType(nNumIndex);
-/*?*/ if (nTyp == NUMBERFORMAT_DATE || nTyp == NUMBERFORMAT_TIME || nTyp == NUMBERFORMAT_DATETIME)
-/*?*/ bDoIns = (nFlags & IDF_DATETIME)!=0;
-/*?*/ else
-/*?*/ bDoIns = (nFlags & IDF_VALUE)!=0;
-/*?*/ }
-/*?*/
-/*?*/ if (bDoIns)
-/*?*/ {
-/*?*/ double nVal = pForm->GetValue();
-/*?*/ pNew = new ScValueCell(nVal);
-/*?*/ }
-/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ if (nFlags & IDF_STRING)
-/*?*/ {
-/*?*/ String aString;
-/*?*/ pForm->GetString(aString);
-/*?*/ if ( aString.Len() )
-/*?*/ pNew = new ScStringCell(aString);
-/*?*/ // #33224# LeerStrings nicht kopieren
-/*?*/ }
-/*?*/ }
-/*?*/ if ( pNew && pSource->GetNotePtr() && ( nFlags & IDF_NOTE ) )
-/*?*/ pNew->SetNote(*pSource->GetNotePtr());
-/*?*/ }
-/*?*/ }
-/*?*/ break;
-/*?*/ default:
-/*?*/ break;
-/*N*/ }
-/*N*/
-/*N*/ if ( !pNew && pSource->GetNotePtr() && ( nFlags & IDF_NOTE ) )
-/*?*/ pNew = new ScNoteCell(*pSource->GetNotePtr());
-/*N*/
-/*N*/ return pNew;
-/*N*/ }
+ScBaseCell* ScColumn::CloneCell(
+ USHORT nIndex,
+ USHORT nFlags,
+ ScDocument* pDestDoc,
+ const ScAddress& /*rDestPos*/
+)
+{
+ ScBaseCell* pNew = 0;
+ ScBaseCell* pSource = pItems[nIndex].pCell;
+ switch (pSource->GetCellType())
+ {
+ case CELLTYPE_NOTE:
+ if (nFlags & IDF_NOTE)
+ pNew = new ScNoteCell(*(ScNoteCell*)pSource);
+ break;
+ case CELLTYPE_EDIT:
+ if (nFlags & IDF_STRING)
+ pNew = new ScEditCell( *(ScEditCell*)pSource, pDestDoc );
+ break;
+ case CELLTYPE_STRING:
+ if (nFlags & IDF_STRING)
+ pNew = new ScStringCell(*(ScStringCell*)pSource);
+ break;
+ case CELLTYPE_VALUE:
+ {
+ BOOL bDoIns = FALSE;
+ USHORT nMask = nFlags & ( IDF_DATETIME | IDF_VALUE );
+ if ( nMask == (IDF_DATETIME | IDF_VALUE) )
+ bDoIns = TRUE;
+ else if ( nMask )
+ {
+ ULONG nNumIndex = (ULONG)((SfxUInt32Item*) GetAttr(
+ pItems[nIndex].nRow, ATTR_VALUE_FORMAT ))->GetValue();
+ short nTyp = pDocument->GetFormatTable()->GetType(nNumIndex);
+ if ( nTyp == NUMBERFORMAT_DATE
+ || nTyp == NUMBERFORMAT_TIME
+ || nTyp == NUMBERFORMAT_DATETIME
+ )
+ bDoIns = (nFlags & IDF_DATETIME)!=0;
+ else
+ bDoIns = (nFlags & IDF_VALUE)!=0;
+ }
+ if (bDoIns)
+ pNew = new ScValueCell(*(ScValueCell*)pSource);
+ }
+ break;
+ case CELLTYPE_FORMULA:
+ {
+ ScFormulaCell* pForm = (ScFormulaCell*)pSource;
+ if ( !( nFlags & IDF_FORMULA ) )
+ {
+ if ( (nFlags & (IDF_VALUE | IDF_DATETIME | IDF_STRING))
+ && !pDestDoc->IsUndo()
+ )
+ {
+ // #48491# ins Undo-Dokument immer nur die Original-Zelle kopieren,
+ // aus Formeln keine Value/String-Zellen erzeugen
+
+ USHORT nErr = pForm->GetErrCode();
+ if ( !nErr )
+ {
+ if ( pForm->IsValue() )
+ {
+ BOOL bDoIns = FALSE;
+ USHORT nMask = nFlags & ( IDF_DATETIME | IDF_VALUE );
+ if ( nMask == (IDF_DATETIME | IDF_VALUE) )
+ bDoIns = TRUE;
+ else if ( nMask )
+ {
+ ULONG nNumIndex = (ULONG)((SfxUInt32Item*) GetAttr(
+ pItems[nIndex].nRow, ATTR_VALUE_FORMAT ))->GetValue();
+ short nTyp = pDocument->GetFormatTable()->GetType(nNumIndex);
+ if ( nTyp == NUMBERFORMAT_DATE
+ || nTyp == NUMBERFORMAT_TIME
+ || nTyp == NUMBERFORMAT_DATETIME
+ )
+ bDoIns = (nFlags & IDF_DATETIME)!=0;
+ else
+ bDoIns = (nFlags & IDF_VALUE)!=0;
+ }
+
+ if (bDoIns)
+ {
+ double nVal = pForm->GetValue();
+ pNew = new ScValueCell(nVal);
+ }
+ }
+ else
+ {
+ if (nFlags & IDF_STRING)
+ {
+ String aString;
+ pForm->GetString(aString);
+ if ( aString.Len() )
+ pNew = new ScStringCell(aString);
+ }
+ }
+ }
+ if ( pNew && pSource->GetNotePtr() && ( nFlags & IDF_NOTE ) )
+ pNew->SetNote(*pSource->GetNotePtr());
+ }
+ }
+ }
+ break;
+ default:
+ break;
+ }
+
+ if ( !pNew && pSource->GetNotePtr() && ( nFlags & IDF_NOTE ) )
+ pNew = new ScNoteCell(*pSource->GetNotePtr());
+
+ return pNew;
+}
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index 5a6460b..cbfb02d 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -352,11 +352,11 @@ namespace binfilter {
/*N*/ }
-/*N*/ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
+IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK()
+ return 0;
+}
/*N*/ ScDocument::~ScDocument()
@@ -509,13 +509,6 @@ namespace binfilter {
/*N*/ USHORT nOldBufSize = rStream.GetBufferSize();
/*N*/ rStream.SetBufferSize( 32768 );
/*N*/
-/*N*/ // Progress-Bar
-/*N*/
-/*N*/ // ULONG nCurPos = rStream.Tell();
-/*N*/ // ULONG nEndPos = rStream.Seek( STREAM_SEEK_TO_END );
-/*N*/ // rStream.Seek( nCurPos );
-/*N*/ // ScProgress aProgress( NULL, ScGlobal::GetRscString(STR_LOAD_DOC), nEndPos - nCurPos );
-/*N*/
/*N*/ BOOL bError = FALSE;
/*N*/ USHORT nVersion = 0;
/*N*/ USHORT nVerMaxRow = MAXROW_30; // 8191, wenn in der Datei nichts steht
@@ -822,19 +815,6 @@ namespace binfilter {
/*N*/ SetAutoFilterFlags();
/*N*/ if (pDrawLayer)
/*N*/ UpdateAllCharts();
-/*N*/ #ifdef DBG_UTIL
-/*N*/ //2do: wg. #62107
-/*N*/ // ChartListenerCollection speichern/laden, damit nach dem Laden das Update
-/*N*/ // hier einmal eingespart werden kann und somit nicht mehr alle Charts
-/*N*/ // angefasst werden muessen. Die ChartListenerCollection muss dann zum Master
-/*N*/ // der Referenzen werden.
-/*N*/ // static BOOL bShown = 0;
-/*N*/ // if ( !bShown && SOFFICE_FILEFORMAT_NOW > SOFFICE_FILEFORMAT_50 )
-/*N*/ // {
-/*N*/ // bShown = 1;
-/*N*/ // DBG_ERRORFILE( "bei inkompatiblem FileFormat ChartListenerCollection speichern!" );
-/*N*/ // }
-/*N*/ #endif
/*N*/ UpdateChartListenerCollection();
/*N*/ if (pDrawLayer)
/*N*/ RefreshNoteFlags();
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index f2d43b7..5fa6c2d 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -436,17 +436,6 @@ namespace binfilter {
/*N*/ }
-// zusammenhaengender Bereich
-
-void ScDocument::GetDataArea( USHORT, USHORT&, USHORT&, USHORT&, USHORT&, BOOL )
-{
- DBG_BF_ASSERT(0, "STRIP");
-}
-
-
-
-
-
/*N*/ BOOL ScDocument::CanInsertRow( const ScRange& rRange ) const
/*N*/ {
@@ -1171,13 +1160,6 @@ void ScDocument::GetDataArea( USHORT, USHORT&, USHORT&, USHORT&, USHORT&, BOOL )
/*N*/ }
-void ScDocument::GetValue( USHORT, USHORT, USHORT, double& rValue )
-{
- DBG_BF_ASSERT(0, "STRIP");
- rValue = 0.0;
-}
-
-
/*N*/ double ScDocument::GetValue( const ScAddress& rPos )
/*N*/ {
/*N*/ USHORT nTab = rPos.Tab();
@@ -1324,12 +1306,6 @@ void ScDocument::GetValue( USHORT, USHORT, USHORT, double& rValue )
/*N*/ }
-void ScDocument::SetDirty( const ScRange& )
-{
- DBG_BF_ASSERT(0, "STRIP");
-}
-
-
/*N*/ void ScDocument::SetTableOpDirty( const ScRange& rRange )
/*N*/ {
/*N*/ BOOL bOldAutoCalc = GetAutoCalc();
diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx b/binfilter/bf_sc/source/core/data/sc_table1.cxx
index 2a5f2ff..adc9fa4 100644
--- a/binfilter/bf_sc/source/core/data/sc_table1.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx
@@ -504,29 +504,13 @@ extern BOOL bIsOlk, bOderSo;
/*N*/ USHORT nCol2, USHORT nRow2, USHORT nTab2, short nDx, short nDy, short nDz,
/*N*/ ScDocument* pUndoDoc, BOOL /*bIncludeDraw*/ )
/*N*/ {
-/*N*/ USHORT i;
-/*N*/ USHORT iMax;
-/*N*/ if ( eUpdateRefMode == URM_COPY )
-/*N*/ {
-/*N*/ i = nCol1;
-/*N*/ iMax = nCol2;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ i = 0;
-/*N*/ iMax = MAXCOL;
-/*N*/ }
-/*N*/ for ( ; i<=iMax; i++)
-/*N*/ aCol[i].UpdateReference( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2,
-/*N*/ nDx, nDy, nDz, pUndoDoc );
-/*N*/
/*N*/ if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // print ranges: only within the table
/*N*/ {
/*?*/ USHORT nSTab,nETab,nSCol,nSRow,nECol,nERow;
/*?*/ BOOL bRecalcPages = FALSE;
/*?*/
/*?*/ if ( pPrintRanges && nPrintRangeCount )
-/*?*/ for ( i=0; i<nPrintRangeCount; i++ )
+/*?*/ for ( USHORT i=0; i<nPrintRangeCount; i++ )
/*?*/ {
/*?*/ nSTab = nETab = pPrintRanges[i].aStart.Tab();
/*?*/ nSCol = pPrintRanges[i].aStart.Col();
diff --git a/binfilter/bf_sc/source/core/tool/sc_collect.cxx b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
index 773e5ba..94b47bd 100644
--- a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
@@ -299,7 +299,7 @@ namespace binfilter {
/*N*/ {
/*N*/ if ( pDoc->HasValueData( nCol, nRow, nTab ) )
/*N*/ {
-/*?*/ pDoc->GetValue( nCol, nRow, nTab, nValue );
+ nValue = 0.0;
/*?*/ if (bAllStrings)
/*?*/ pDoc->GetString( nCol, nRow, nTab, aStrValue );
/*?*/ nStrType = 0;
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
index 1d5e4a4..e585be3 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
@@ -1447,7 +1447,6 @@ void ScInterpreter::ScBackSolver()
{
i++;
pValue->SetValue(xn);
- pDok->SetDirty( aVRange );
pFormula->Interpret();
bError = ( pFormula->GetErrCode() != 0 );
fn = pFormula->GetValue();
@@ -1494,7 +1493,6 @@ void ScInterpreter::ScBackSolver()
if ( bRet )
{
pValue->SetValue( nX );
- pDok->SetDirty( aVRange );
pFormula->Interpret();
if ( fabs( pFormula->GetValue() - nVal ) > fabs( fn ) )
nX = nBestX;
@@ -1513,7 +1511,6 @@ void ScInterpreter::ScBackSolver()
}
else
pValue->SetValue(nSaveVal);
- pDok->SetDirty( aVRange );
pFormula->Interpret();
if (!bRet)
SetError(NOVALUE);
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
index a66a644..4ecc74d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
@@ -2385,12 +2385,6 @@ void ScInterpreter::ScColRowNameAuto()
nStartCol = aRefData.Ref2.nCol = aRefData.Ref1.nCol;
nStartRow = aRefData.Ref2.nRow = aRefData.Ref1.nRow;
aRefData.Ref2.nTab = aRefData.Ref1.nTab;
- pDok->GetDataArea( (USHORT) aRefData.Ref1.nTab,
- (USHORT&) aRefData.Ref1.nCol,
- (USHORT&) aRefData.Ref1.nRow,
- (USHORT&) aRefData.Ref2.nCol,
- (USHORT&) aRefData.Ref2.nRow,
- TRUE );
// DataArea im Ursprung begrenzen
aRefData.Ref1.nCol = nStartCol;
aRefData.Ref1.nRow = nStartRow;
diff --git a/binfilter/bf_sc/source/core/tool/sc_unitconv.cxx b/binfilter/bf_sc/source/core/tool/sc_unitconv.cxx
index e8b16eb..0d8c3e2 100644
--- a/binfilter/bf_sc/source/core/tool/sc_unitconv.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_unitconv.cxx
@@ -76,20 +76,10 @@ using ::rtl::OUString;
/*N*/ void ScUnitConverterData::BuildIndexString( String& rStr,
/*N*/ const String& rFromUnit, const String& rToUnit )
/*N*/ {
-/*N*/ #if 1
/*N*/ // case sensitive
/*N*/ rStr = rFromUnit;
/*N*/ rStr += cDelim;
/*N*/ rStr += rToUnit;
-/*N*/ #else
-/*N*/ // not case sensitive
-/*N*/ rStr = rFromUnit;
-/*N*/ String aTo( rToUnit );
-/*N*/ ScGlobal::pCharClass->toUpper( rStr );
-/*N*/ ScGlobal::pCharClass->toUpper( aTo );
-/*N*/ rStr += cDelim;
-/*N*/ rStr += aTo;
-/*N*/ #endif
/*N*/ }
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index ecbdfa3..e35c515 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -1293,7 +1293,7 @@ using namespace ::com::sun::star;
/*N*/ return DIR_LEFT;
/*N*/ }
-/*N*/ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL /*bRecord*/, BOOL )
+/*N*/ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL /*bContents*/, BOOL /*bRecord*/, BOOL )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
@@ -1327,8 +1327,6 @@ using namespace ::com::sun::star;
/*N*/ if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) )
/*N*/ rDocShell.PostPaint( nStartCol, nStartRow, nTab,
/*N*/ nEndCol, nEndRow, nTab, PAINT_GRID );
-/*N*/ if ( bContents )
-/*?*/ pDoc->SetDirty( rRange );
/*N*/ aModificator.SetDocumentModified();
/*N*/
/*N*/ return TRUE;
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
index a815be1..a34dca6 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
@@ -177,7 +177,6 @@ namespace binfilter {
/*N*/ nStartRow = nRow;
/*N*/ nEndCol = nStartCol;
/*N*/ nEndRow = nStartRow;
-/*N*/ aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE );
/*N*/ }
/*N*/
/*N*/ BOOL bHasHeader = FALSE;
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
index e5fbd2e..24a286a 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
@@ -127,9 +127,6 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeExcep
USHORT nEndRow = aLclRange.aEnd.Row();
USHORT nTab = aLclRange.aStart.Tab();
- pDocSh->GetDocument()->GetDataArea(
- nTab, nStartCol, nStartRow, nEndCol, nEndRow, TRUE );
-
ScRange aNew( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab );
SetNewRange( aNew );
}
@@ -315,13 +312,8 @@ void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException)
{
USHORT nStartCol = aLclRange.aStart.Col();
USHORT nStartRow = aLclRange.aStart.Row();
- USHORT nEndCol = aLclRange.aEnd.Col();
- USHORT nEndRow = aLclRange.aEnd.Row();
USHORT nTab = aLclRange.aStart.Tab();
- pDocSh->GetDocument()->GetDataArea(
- nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE );
-
ScRange aNew( nStartCol, nStartRow, nTab );
SetNewRange( aNew );
}
@@ -341,15 +333,10 @@ void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException)
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
- USHORT nStartCol = aLclRange.aStart.Col();
- USHORT nStartRow = aLclRange.aStart.Row();
USHORT nEndCol = aLclRange.aEnd.Col();
USHORT nEndRow = aLclRange.aEnd.Row();
USHORT nTab = aLclRange.aStart.Tab();
- pDocSh->GetDocument()->GetDataArea(
- nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE );
-
ScRange aNew( nEndCol, nEndRow, nTab );
SetNewRange( aNew );
}
diff --git a/binfilter/inc/bf_sc/column.hxx b/binfilter/inc/bf_sc/column.hxx
index 0114eb4..ca9208e 100644
--- a/binfilter/inc/bf_sc/column.hxx
+++ b/binfilter/inc/bf_sc/column.hxx
@@ -226,10 +226,6 @@ public:
void ResetChanged( USHORT nStartRow, USHORT nEndRow );
- void UpdateReference( UpdateRefMode eUpdateRefMode, USHORT nCol1, USHORT nRow1, USHORT nTab1,
- USHORT nCol2, USHORT nRow2, USHORT nTab2,
- short nDx, short nDy, short nDz,
- ScDocument* pUndoDoc = NULL );
void UpdateInsertTab( USHORT nTable);
void UpdateInsertTabOnlyCells( USHORT nTable);
void UpdateDeleteTab( USHORT nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL );
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index dc5f8a0..9580249 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -626,7 +626,6 @@ public:
void GetString( USHORT nCol, USHORT nRow, USHORT nTab, String& rString );
void GetInputString( USHORT nCol, USHORT nRow, USHORT nTab, String& rString );
double GetValue( const ScAddress& );
- void GetValue( USHORT nCol, USHORT nRow, USHORT nTab, double& rValue );
void GetNumberFormat( USHORT nCol, USHORT nRow, USHORT nTab,
sal_uInt32& rFormat );
ULONG GetNumberFormat( const ScAddress& ) const;
@@ -669,8 +668,7 @@ public:
void ResetChanged( const ScRange& rRange );
void SetDirty();
- void SetDirty( const ScRange& );
- void SetTableOpDirty( const ScRange& ); // for Interpreter TableOp
+ void SetTableOpDirty( const ScRange& ); // for Interpreter TableOp
void CalcAll();
void CalcAfterLoad();
void CompileXML();
@@ -689,8 +687,6 @@ public:
USHORT GetErrCode( const ScAddress& ) const;
- void GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
- USHORT& rEndCol, USHORT& rEndRow, BOOL bIncludeOld );
BOOL GetCellArea( USHORT nTab, USHORT& rEndCol, USHORT& rEndRow ) const;
BOOL GetTableArea( USHORT nTab, USHORT& rEndCol, USHORT& rEndRow ) const;
BOOL GetPrintArea( USHORT nTab, USHORT& rEndCol, USHORT& rEndRow,
More information about the Libreoffice-commits
mailing list