[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Thu Sep 8 22:25:28 PDT 2011
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 5
binfilter/bf_sc/source/core/data/sc_documen5.cxx | 22 -
binfilter/bf_sc/source/core/data/sc_documen7.cxx | 16
binfilter/bf_sc/source/core/data/sc_documen8.cxx | 84 -----
binfilter/bf_sc/source/core/data/sc_documen9.cxx | 27 -
binfilter/bf_sc/source/core/data/sc_document.cxx | 98 -----
binfilter/bf_sc/source/core/data/sc_stlsheet.cxx | 8
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx | 37 --
binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx | 6
binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx | 3
binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx | 166 ----------
binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx | 6
binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx | 15
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 8
binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx | 23 -
binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx | 5
binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx | 7
binfilter/bf_sc/source/ui/view/sc_printfun.cxx | 32 -
binfilter/inc/bf_sc/document.hxx | 50 ---
20 files changed, 33 insertions(+), 587 deletions(-)
New commits:
commit 872daba66c4be77c9df9d6fe6a1c501abe087d04
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Sep 8 21:05:58 2011 -0700
Hopefully this is the last of the cleanups for class ScDocument for now.
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index 04ad33e..5a6460b 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -951,7 +951,6 @@ namespace binfilter {
/*N*/ if (VALIDTAB(nDestPos) && pTab[nDestPos])
/*N*/ {
/*N*/ pTab[nDestPos]->DeleteArea( 0,0, MAXCOL,MAXROW, IDF_ALL );
-/*N*/ // ClearDrawPage(nDestPos);
/*N*/ }
/*N*/ else
/*N*/ bValid = FALSE;
@@ -1025,10 +1024,6 @@ namespace binfilter {
/*N*/ pSrcDoc->SetAutoCalc( bOldAutoCalcSrc );
/*N*/ SetAutoCalc( bOldAutoCalc );
/*N*/
-/*N*/ // Drawing kopieren
-/*N*/
-/*N*/ if (bInsertNew)
-/*?*/ TransferDrawPage( pSrcDoc, nSrcPos, nDestPos );
/*N*/ }
/*N*/ if (!bValid)
/*N*/ nRetVal = 0;
diff --git a/binfilter/bf_sc/source/core/data/sc_documen5.cxx b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
index a5ede56..65262f7 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
@@ -253,7 +253,6 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
(ScChartListener*) (pChartListenerCollection->At(nIndex));
ScRangeListRef aRLR( pChartListener->GetRangeList() );
ScRangeListRef aNewRLR( new ScRangeList );
- BOOL bChanged = FALSE;
BOOL bDataChanged = FALSE;
for ( ScRangePtr pR = aRLR->First(); pR; pR = aRLR->Next() )
{
@@ -271,7 +270,6 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
theCol2,theRow2,theTab2 );
if ( eRes != UR_NOTHING )
{
- bChanged = TRUE;
aNewRLR->Append( ScRange(
theCol1, theRow1, theTab1,
theCol2, theRow2, theTab2 ));
@@ -291,10 +289,6 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
else
aNewRLR->Append( *pR );
}
- if ( bChanged )
- {
- DBG_BF_ASSERT(0, "STRIP");
- }
}
}
@@ -306,12 +300,6 @@ BOOL ScDocument::HasData( USHORT nCol, USHORT nRow, USHORT nTab )
return FALSE;
}
-SchMemChart* ScDocument::FindChartData(const String&, BOOL)
-{
- DBG_BF_ASSERT(0, "STRIP");
- return NULL;
-}
-
BOOL lcl_StringInCollection( const StrCollection* pColl, const String& rStr )
{
if ( !pColl )
@@ -424,7 +412,6 @@ void ScDocument::UpdateChartListenerCollection()
}
}
}
- #if 1
BOOL bEnabled = aIPObj->IsEnableSetModified();
if (bEnabled)
aIPObj->EnableSetModified(FALSE);
@@ -433,15 +420,6 @@ void ScDocument::UpdateChartListenerCollection()
//! pChartData got deleted, don't use it anymore
if (bEnabled)
aIPObj->EnableSetModified(TRUE);
- #endif
- if ( bForceSave )
- {
- // the return value of DoSave() was not checked, this is not a good style...
- // due to the suppression of the function DoSave() this stay here just for
- // pro memoria, waiting that all the if is cleaned out
- // the same for DoSaveCompleted()
- DBG_BF_ASSERT(0, "return value of DoSave() and DoSaveComleted was not checked here!");
- }
}
}
}
diff --git a/binfilter/bf_sc/source/core/data/sc_documen7.cxx b/binfilter/bf_sc/source/core/data/sc_documen7.cxx
index a8fa9ff..92956f1 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen7.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen7.cxx
@@ -353,14 +353,14 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkA
/*N*/ if ( bHaveForced )
/*N*/ {
/*?*/ SetForcedFormulas( TRUE );
-/*?*/ if ( bAutoCalc && !IsAutoCalcShellDisabled() && !IsInInterpreter()
-/*?*/ && !IsCalculatingFormulaTree() )
-{DBG_BF_ASSERT(0, "STRIP"); }
-/*?*/ else
+ if ( !( bAutoCalc
+ && !IsAutoCalcShellDisabled()
+ && !IsInInterpreter()
+ && !IsCalculatingFormulaTree()
+ )
+ )
/*?*/ SetForcedFormulaPending( TRUE );
/*N*/ }
-///*N*/ if ( !bWasWaiting )
-///*N*/ Application::LeaveWait();
/*N*/ }
/*N*/ DBG_ASSERT( nFormulaTrackCount==0, "TrackFormulas: nFormulaTrackCount!=0" );
/*N*/ }
@@ -391,13 +391,9 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkA
/*N*/ {
/*?*/ if ( IsAutoCalcShellDisabled() )
/*?*/ SetForcedFormulaPending( TRUE );
-/*?*/ else if ( !IsInInterpreter() )
-DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/data/sc_documen8.cxx b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
index 1b538ee..c9190a6 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen8.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen8.cxx
@@ -204,21 +204,6 @@ namespace binfilter {
//------------------------------------------------------------------------
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
/*N*/ BOOL ScDocument::RemovePageStyleInUse( const String& rStyle )
/*N*/ {
/*N*/ BOOL bWasInUse = FALSE;
@@ -234,7 +219,6 @@ namespace binfilter {
/*N*/ return bWasInUse;
/*N*/ }
-
//------------------------------------------------------------------------
/*M*/ BYTE ScDocument::GetEditTextDirection(USHORT nTab) const
@@ -326,22 +310,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScDocument::UpdateDdeLink( const String&, const String&, const String& )
-/*N*/ {
-/*N*/ // fuer refresh() per StarOne Api
-/*N*/ // ResetValue() fuer einzelnen Link nicht noetig
-/*N*/ //! wenn's mal alles asynchron wird, aber auch hier
-/*N*/
-/*N*/ BOOL bFound = FALSE;
-/*N*/ if (pLinkManager)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ return bFound;
-/*N*/ }
-
-
-
/*N*/ USHORT ScDocument::GetDdeLinkCount() const
/*N*/ {
/*N*/ USHORT nDdeCount = 0;
@@ -437,34 +405,6 @@ namespace binfilter {
/*N*/ return FALSE;
/*N*/ }
-/*N*/ BOOL ScDocument::GetDdeLinkResult(const ScMatrix*, USHORT, USHORT, String&, double&, BOOL&)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return TRUE;
-/*N*/ }
-
-/*N*/ void ScDocument::CreateDdeLink(const String&, const String&, const String&, const BYTE)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ BOOL ScDocument::FindDdeLink(const String&, const String&, const String&, const BYTE, USHORT&)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return FALSE;
-/*N*/ }
-
-/*N*/ BOOL ScDocument::CreateDdeLinkResultDimension(USHORT, USHORT, USHORT, ScMatrix*&)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return FALSE;
-/*N*/ }
-
-void ScDocument::SetDdeLinkResult(ScMatrix*, const USHORT, const USHORT, const String&, const double&, BOOL, BOOL )
-{
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
//------------------------------------------------------------------------
/*N*/ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
@@ -516,34 +456,10 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ USHORT nCount;
/*N*/ rStream >> nCount;
-/*N*/ for (USHORT i=0; i<nCount; i++)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/
-/*N*/ }
-/*N*/ }
-
-
-//------------------------------------------------------------------------
-
-// TimerDelays etc.
-
-// ----------------------------------------------------------------------------
-
-/*N*/ BOOL ScDocument::CheckMacroWarn()
-/*N*/ {
-/*N*/ // The check for macro configuration, macro warning and disabling is now handled
-/*N*/ // in SfxObjectShell::AdjustMacroMode, called by SfxObjectShell::CallBasic.
-/*N*/
-/*N*/ return TRUE;
/*N*/ }
-
-
//------------------------------------------------------------------------
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/data/sc_documen9.cxx b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
index f8974b1..759445f 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen9.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
@@ -83,25 +83,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void ScDocument::TransferDrawPage(ScDocument* pSrcDoc, USHORT nSrcPos, USHORT nDestPos)
-/*N*/ {
-/*N*/ if (pDrawLayer && pSrcDoc->pDrawLayer)
-/*N*/ {
-/*?*/ SdrPage* pOldPage = pSrcDoc->pDrawLayer->GetPage(nSrcPos);
-/*?*/ SdrPage* pNewPage = pDrawLayer->GetPage(nDestPos);
-/*?*/
-/*?*/ if (pOldPage && pNewPage)
-/*?*/ {
-/*?*/ SdrObjListIter aIter( *pOldPage, IM_FLAT );
-/*?*/ SdrObject* pOldObject = aIter.Next();
-/*?*/ while (pOldObject)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/ }
-
-
/*N*/ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
/*N*/ {
/*N*/ if (pDocShell && !pShell)
@@ -345,14 +326,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ BOOL ScDocument::IsPrintEmpty( USHORT, USHORT, USHORT,
-/*N*/ USHORT, USHORT, BOOL,
-/*N*/ ScRange*, Rectangle* ) const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return TRUE;
-/*N*/ }
-
/*N*/ void ScDocument::Clear()
/*N*/ {
/*N*/ for (USHORT i=0; i<=MAXTAB; i++)
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index cc53023..2ae3491 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -265,8 +265,6 @@ namespace binfilter {
/*N*/ URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
/*N*/ if (pDPCollection)
/*?*/ pDPCollection->UpdateReference( URM_INSDEL, aRange, 0,0,1 );
-/*N*/ if (pDetOpList)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ UpdateChartRef( URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
/*N*/ UpdateRefAreaLinks( URM_INSDEL, aRange, 0,0,1 );
/*N*/ if ( pUnoBroadcaster )
@@ -778,16 +776,6 @@ namespace binfilter {
/*N*/ pRefUndoDoc, pUndoOutline );
/*N*/ }
-/*N*/ BOOL ScDocument::CanFitBlock( const ScRange&, const ScRange& )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-/*N*/ void ScDocument::FitBlock( const ScRange&, const ScRange&, BOOL )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void ScDocument::DeleteArea(USHORT nCol1, USHORT nRow1,
/*N*/ USHORT nCol2, USHORT nRow2,
/*N*/ const ScMarkData& rMark, USHORT nDelFlag)
@@ -911,10 +899,6 @@ namespace binfilter {
/*N*/ {
/*N*/ PutInOrder( nCol1, nCol2 );
/*N*/ PutInOrder( nRow1, nRow2 );
-/*N*/ if (!pClipDoc)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ pClipDoc->aDocName = aDocName;
/*N*/ pClipDoc->aClipRange = ScRange( nCol1,nRow1,0, nCol2,nRow2,0 );
@@ -939,52 +923,11 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ pData->SetIndex(nIndex);
/*N*/ }
/*N*/ }
-/*N*/ for (i = 0; i <= MAXTAB; i++)
-/*N*/ if (pTab[i] && pClipDoc->pTab[i])
-/*N*/ if ( bAllTabs || !pMarks || pMarks->GetTableSelect(i) )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/
-/*N*/ if ( pDrawLayer && bIncludeObjects )
-/*N*/ {
-/*N*/ // also copy drawing objects
-/*N*/
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
/*N*/
/*N*/ pClipDoc->bCutMode = bCut;
/*N*/ }
/*N*/ }
-void ScDocument::StartListeningFromClip( USHORT, USHORT, USHORT, USHORT, const ScMarkData&, USHORT )
-{
-}
-
-/*N*/ void ScDocument::BroadcastFromClip( USHORT, USHORT,
-/*N*/ USHORT, USHORT,
-/*N*/ const ScMarkData&, USHORT )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void ScDocument::CopyBlockFromClip( USHORT, USHORT,
-/*N*/ USHORT, USHORT,
-/*N*/ const ScMarkData&,
-/*N*/ short, short,
-/*N*/ const ScCopyBlockFromClipParams* )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void ScDocument::CopyNonFilteredFromClip( USHORT, USHORT,
-/*N*/ USHORT, USHORT,
-/*N*/ const ScMarkData&,
-/*N*/ short, short,
-/*N*/ const ScCopyBlockFromClipParams* )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark,
@@ -1073,7 +1016,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ nXw -= pClipDoc->aClipRange.aEnd.Col();
/*N*/ nYw -= pClipDoc->aClipRange.aEnd.Row(); // only extra value from ExtendMerge
/*N*/ USHORT nDestAddX(0), nDestAddY(0);
-/*N*/ pClipDoc->GetClipArea( nDestAddX, nDestAddY, bIncludeFiltered );
/*N*/ nXw += nDestAddX;
/*N*/ nYw += nDestAddY; // ClipArea, plus ExtendMerge value
/*N*/
@@ -1092,8 +1034,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ USHORT nR1_a = nRow1;
/*N*/ USHORT nC2_a = nC1_a + nXw;
/*N*/ USHORT nR2_a = nR1_a + nYw;
-/*N*/ USHORT nClipStartCol = pClipDoc->aClipRange.aStart.Col();
-/*N*/ USHORT nClipStartRow = pClipDoc->aClipRange.aStart.Row();
/*N*/
/*N*/ ScCopyBlockFromClipParams aCBFCP;
/*N*/ aCBFCP.pRefUndoDoc = pRefUndoDoc;
@@ -1127,12 +1067,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ do
/*N*/ {
-/*N*/ short nDx = ((short)nC1_a) - nClipStartCol;
-/*N*/ short nDy = ((short)nR1_a) - nClipStartRow;
-/*N*/ if ( bIncludeFiltered )
-/*N*/ CopyBlockFromClip( nC1_a, nR1_a, nC2_a, nR2_a, rMark, nDx, nDy, &aCBFCP );
-/*N*/ else
-/*N*/ CopyNonFilteredFromClip( nC1_a, nR1_a, nC2_a, nR2_a, rMark, nDx, nDy, &aCBFCP );
/*N*/ nC1_a = nC2_a + 1;
/*N*/ nC2_a = Min((USHORT)(nC1_a + nXw), nCol2);
/*N*/ }
@@ -1187,10 +1121,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ if ( pClipRangeNames )
/*N*/ delete [] pClipRangeNames;
-/*N*/ // Listener aufbauen nachdem alles inserted wurde
-/*N*/ StartListeningFromClip( nCol1, nRow1, nCol2, nRow2, rMark, nInsFlag );
-/*N*/ // nachdem alle Listener aufgebaut wurden, kann gebroadcastet werden
-/*N*/ BroadcastFromClip( nCol1, nRow1, nCol2, nRow2, rMark, nInsFlag );
+
/*N*/ if (bResetCut)
/*N*/ pClipDoc->bCutMode = FALSE;
/*N*/ SetAutoCalc( bOldAutoCalc );
@@ -1198,10 +1129,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-/*N*/ void ScDocument::GetClipArea(USHORT&, USHORT&, BOOL)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ void ScDocument::PutCell( USHORT nCol, USHORT nRow, USHORT nTab, ScBaseCell* pCell, BOOL bForceTab )
/*N*/ {
@@ -1807,11 +1734,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return bRet;
/*N*/ }
-/*N*/ BOOL ScDocument::GetRowDefault( USHORT, USHORT, USHORT, USHORT&)
-/*N*/ {
-/*N*/ BOOL bRet(FALSE);
-/*N*/ return bRet;
-/*N*/ }
//
// Attribute ----------------------------------------------------------
@@ -1974,9 +1896,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-/*N*/ BOOL ScDocument::IsStyleSheetUsed( const ScStyleSheet&, BOOL ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
/*N*/ BOOL ScDocument::ApplyFlagsTab( USHORT nStartCol, USHORT nStartRow,
/*N*/ USHORT nEndCol, USHORT nEndRow, USHORT nTab, INT16 nFlags )
@@ -1989,11 +1908,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return FALSE;
/*N*/ }
-/*N*/ BOOL ScDocument::RemoveFlagsTab( USHORT, USHORT,
-/*N*/ USHORT, USHORT, USHORT, INT16 )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return FALSE;
-/*N*/ }
/*N*/ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, BOOL bDeep )
/*N*/ {
@@ -2136,13 +2050,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ nMask );
/*N*/ }
-/*N*/ BOOL ScDocument::IsBlockEmpty( USHORT /*nTab*/, USHORT /*nStartCol*/, USHORT /*nStartRow*/,
-/*N*/ USHORT /*nEndCol*/, USHORT /*nEndRow*/ ) const
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return FALSE;
-/*N*/ }
-
/*N*/ void ScDocument::LockTable(USHORT nTab)
/*N*/ {
@@ -2348,9 +2255,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if (pTab[nTab])
/*N*/ bFound = pTab[nTab]->ExtendMerge( nStartCol, nStartRow, rEndCol, rEndRow, bRefresh, bAttrs );
-/*N*/
-/*N*/ if (bRefresh)
-DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ else
/*N*/ OSL_FAIL("ExtendMerge: falscher Bereich");
diff --git a/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx b/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx
index 2dd5d64..5318762 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlsheet.cxx
@@ -235,13 +235,7 @@ namespace binfilter {
/*N*/ {
/*N*/ if ( GetFamily() == SFX_STYLE_FAMILY_PARA )
/*N*/ {
-/*?*/ // Always query the document to let it decide if a rescan is necessary,
-/*?*/ // and store the state.
-/*?*/ ScDocument* pDoc = ((ScStyleSheetPool&)rPool).GetDocument();
-/*?*/ if ( pDoc && pDoc->IsStyleSheetUsed( *this, TRUE ) )
-/*?*/ eUsage = USED;
-/*?*/ else
-/*?*/ eUsage = NOTUSED;
+/*?*/ eUsage = NOTUSED;
/*?*/ return eUsage == USED;
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
index 1683f5d..5565055 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
@@ -1981,7 +1981,7 @@ void ScInterpreter::ScMissing()
/*N*/ String aMacro( pCur->GetExternal() );
/*N*/
/*N*/ SfxObjectShell* pDocSh = pDok->GetDocumentShell();
-/*N*/ if ( !pDocSh || !pDok->CheckMacroWarn() )
+/*N*/ if ( !pDocSh )
/*N*/ {
/*N*/ SetError( errNoValue ); // ohne DocShell kein CallBasic
/*N*/ return;
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx
index 28404bb..6999eff 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx
@@ -137,12 +137,7 @@ void ScXMLDDELinkContext::CreateDDELink()
String sAppl(sApplication);
String sTop(sTopic);
String sIt(sItem);
- GetScImport().GetDocument()->CreateDdeLink(sAppl, sTop, sIt, nMode);
- sal_uInt16 nPos;
- if(GetScImport().GetDocument()->FindDdeLink(sAppl, sTop, sIt, nMode, nPos))
- nPosition = nPos;
- else
- nPosition = -1;
+ nPosition = -1;
DBG_ASSERT(nPosition > -1, "DDE Link not inserted");
}
}
@@ -161,36 +156,6 @@ void ScXMLDDELinkContext::AddRowsToTable(const sal_Int32 nInRows)
void ScXMLDDELinkContext::EndElement()
{
- if (nPosition > -1 && nColumns && nRows)
- {
- ScMatrix* pMatrix;
- if (GetScImport().GetDocument() &&
- GetScImport().GetDocument()->CreateDdeLinkResultDimension(static_cast<USHORT>(nPosition),
- static_cast<USHORT>(nColumns), static_cast<USHORT>(nRows), pMatrix))
- {
- if (pMatrix)
- {
- DBG_ASSERT(static_cast<sal_uInt32>(nColumns * nRows) == aDDELinkTable.size(), "there is a wrong cells count");
- sal_Int32 nCol(0);
- sal_Int32 nRow(-1);
- sal_Int32 nIndex(0);
- for (ScDDELinkCells::iterator aItr = aDDELinkTable.begin(); aItr != aDDELinkTable.end(); ++aItr)
- {
- if (nIndex % nColumns == 0)
- {
- nRow++;
- nCol = 0;
- }
- else
- nCol++;
- String sValue(aItr->sValue);
- GetScImport().GetDocument()->SetDdeLinkResult(pMatrix, static_cast<USHORT>(nCol), static_cast<USHORT>(nRow),
- sValue, aItr->fValue, aItr->bString, aItr->bEmpty);
- nIndex++;
- }
- }
- }
- }
}
ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rInImport,
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx
index 343668d..3100f23 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx
@@ -132,15 +132,13 @@ void ScXMLExportDDELinks::WriteTable(const sal_Int32 nPos)
for(sal_Int32 nColumn = 0; nColumn < nColCount; nColumn++)
{
if (nColumn == 0)
- bPrevEmpty = rExport.GetDocument()->GetDdeLinkResult(pMatrix, static_cast<USHORT>(nColumn), static_cast<USHORT>(nRow),
- sPrevValue, fPrevValue, bPrevString);
+ bPrevEmpty = TRUE;
else
{
double fValue;
String sValue;
sal_Bool bString(sal_True);
- sal_Bool bEmpty = rExport.GetDocument()->GetDdeLinkResult(pMatrix, static_cast<USHORT>(nColumn), static_cast<USHORT>(nRow),
- sValue, fValue, bString);
+ sal_Bool bEmpty = TRUE;
if (CellsEqual(bPrevEmpty, bPrevString, sPrevValue, fPrevValue,
bEmpty, bString, sValue, fValue))
nRepeatColsCount++;
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
index 32397aa..a1bceb8 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
@@ -470,8 +470,7 @@ void ScMyDefaultStyles::FillDefaultStyles(const sal_uInt16 nTable,
for (sal_Int32 i = nLast; i >= 0; i--)
{
if (bRow)
- bResult = pDoc->GetRowDefault(nTable,
- static_cast<sal_uInt16>(i), static_cast<sal_uInt16>(nLastCol), nPos);
+ bResult = FALSE;
else
bResult = pDoc->GetColDefault(nTable,
static_cast<sal_uInt16>(i), static_cast<sal_uInt16>(nLastRow), nPos);
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
index 5271561..5b360b5 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
@@ -140,7 +140,6 @@ namespace binfilter {
/*N*/ return FALSE;
/*N*/
/*N*/ String aNewUrl( ScGlobal::GetAbsDocName( rNewFile, pDocShell ) );
-/*N*/ BOOL bNewUrlName = (aNewUrl != aFileName);
/*N*/
/*N*/ const SfxFilter* pFilter = SFX_APP()->GetFilter( pDocShell->GetFactory(), rNewFilter );
/*N*/ if (!pFilter)
@@ -148,7 +147,6 @@ namespace binfilter {
/*N*/
/*N*/ ScDocument* pDoc = pDocShell->GetDocument();
/*N*/
-/*N*/ BOOL bUndo (pDoc->IsUndoEnabled());
/*N*/ pDoc->SetInLinkUpdate( TRUE );
/*N*/
/*N*/ // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen
@@ -207,7 +205,6 @@ namespace binfilter {
/*N*/ // alte Daten loeschen / neue kopieren
/*N*/
/*N*/ ScAddress aDestPos = aDestArea.aStart;
-/*N*/ USHORT nDestTab = aDestPos.Tab();
/*N*/ ScRange aOldRange = aDestArea;
/*N*/ ScRange aNewRange = aDestArea; // alter Bereich, wenn Datei nicht gefunden o.ae.
/*N*/ if (nWidth && nHeight)
@@ -216,151 +213,15 @@ namespace binfilter {
/*N*/ aNewRange.aEnd.SetRow( aNewRange.aStart.Row() + nHeight - 1 );
/*N*/ }
/*N*/
-/*N*/ BOOL bCanDo = pDoc->CanFitBlock( aOldRange, aNewRange ); //! nach bDoInsert unterscheiden
-/*N*/ if (bCanDo)
-/*N*/ {
-/*N*/ ScDocShellModificator aModificator( *pDocShell );
-/*N*/
-/*N*/ aDestPos.Col();
-/*N*/ aDestPos.Row();
-/*N*/ USHORT nOldEndX = aOldRange.aEnd.Col();
-/*N*/ USHORT nOldEndY = aOldRange.aEnd.Row();
-/*N*/ USHORT nNewEndX = aNewRange.aEnd.Col();
-/*N*/ USHORT nNewEndY = aNewRange.aEnd.Row();
-/*N*/ ScRange aMaxRange( aDestPos,
-/*N*/ ScAddress(Max(nOldEndX,nNewEndX), Max(nOldEndY,nNewEndY), nDestTab) );
-/*N*/
-/*N*/ // Undo initialisieren
-/*N*/
-/*N*/ ScDocument* pUndoDoc = NULL;
-/*N*/ if ( bAddUndo && bUndo )
-/*N*/ {
-/*N*/ pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-/*N*/ if ( bDoInsert )
-/*N*/ {
-/*N*/ if ( nNewEndX != nOldEndX || nNewEndY != nOldEndY ) // Bereich veraendert?
-/*N*/ {
-/*N*/ pUndoDoc->InitUndo( pDoc, 0, pDoc->GetTableCount()-1 );
-/*N*/ pDoc->CopyToDocument( 0,0,0,MAXCOL,MAXROW,MAXTAB,
-/*N*/ IDF_FORMULA, FALSE, pUndoDoc ); // alle Formeln
-/*N*/ }
-/*N*/ else
-/*N*/ pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle
-/*N*/ pDoc->CopyToDocument( aOldRange, IDF_ALL, FALSE, pUndoDoc );
-/*N*/ }
-/*N*/ else // ohne Einfuegen
-/*N*/ {
-/*N*/ pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle
-/*N*/ pDoc->CopyToDocument( aMaxRange, IDF_ALL, FALSE, pUndoDoc );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // Zellen einfuegen / loeschen
-/*N*/ // DeleteAreaTab loescht auch MERGE_FLAG Attribute
-/*N*/
-/*N*/ if (bDoInsert)
-/*N*/ pDoc->FitBlock( aOldRange, aNewRange ); // incl. loeschen
-/*N*/ else
-/*N*/ pDoc->DeleteAreaTab( aMaxRange, IDF_ALL );
-/*N*/
-/*N*/ // Daten kopieren
-/*N*/
-/*N*/ if (nWidth && nHeight)
-/*N*/ {
-/*N*/ ScDocument aClipDoc( SCDOCMODE_CLIP );
-/*N*/ ScRange aNewTokenRange( aNewRange.aStart );
-/*N*/ nStringIx = 0;
-/*N*/ for( nToken = 0; nToken < nTokenCnt; nToken++ )
-/*N*/ {
-/*N*/ String aToken( aTempArea.GetToken( 0, ';', nStringIx ) );
-/*N*/ ScRange aTokenRange;
-/*N*/ if( FindExtRange( aTokenRange, pSrcDoc, aToken ) )
-/*N*/ {
-/*N*/ USHORT nSrcTab = aTokenRange.aStart.Tab();
-/*N*/ ScMarkData aSourceMark;
-/*N*/ aSourceMark.SelectOneTable( nSrcTab ); // selektieren fuer CopyToClip
-/*N*/ aSourceMark.SetMarkArea( aTokenRange );
-/*N*/
-/*N*/ pSrcDoc->CopyToClip( aTokenRange.aStart.Col(), aTokenRange.aStart.Row(),
-/*N*/ aTokenRange.aEnd.Col(), aTokenRange.aEnd.Row(),
-/*N*/ FALSE, &aClipDoc, FALSE, &aSourceMark );
-/*N*/
-/*N*/ if ( aClipDoc.HasAttrib( 0,0,nSrcTab, MAXCOL,MAXROW,nSrcTab,
-/*N*/ HASATTR_MERGED | HASATTR_OVERLAPPED ) )
-/*N*/ {
-/*N*/ //! ResetAttrib am Dokument !!!
-/*N*/
-/*N*/ ScPatternAttr aPattern( pSrcDoc->GetPool() );
-/*N*/ aPattern.GetItemSet().Put( ScMergeAttr() ); // Defaults
-/*N*/ aPattern.GetItemSet().Put( ScMergeFlagAttr() );
-/*N*/ aClipDoc.ApplyPatternAreaTab( 0,0, MAXCOL,MAXROW, nSrcTab, aPattern );
-/*N*/ }
-/*N*/
-/*N*/ aNewTokenRange.aEnd.SetCol( aNewTokenRange.aStart.Col() + (aTokenRange.aEnd.Col() - aTokenRange.aStart.Col()) );
-/*N*/ aNewTokenRange.aEnd.SetRow( aNewTokenRange.aStart.Row() + (aTokenRange.aEnd.Row() - aTokenRange.aStart.Row()) );
-/*N*/ ScMarkData aDestMark;
-/*N*/ aDestMark.SelectOneTable( nDestTab );
-/*N*/ aDestMark.SetMarkArea( aNewTokenRange );
-/*N*/ pDoc->CopyFromClip( aNewTokenRange, aDestMark, IDF_ALL, NULL, &aClipDoc, FALSE );
-/*N*/ aNewTokenRange.aStart.SetRow( aNewTokenRange.aEnd.Row() + 2 );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ String aErr = ScGlobal::GetRscString(STR_LINKERROR);
-/*N*/ pDoc->SetString( aDestPos.Col(), aDestPos.Row(), aDestPos.Tab(), aErr );
-/*N*/ }
-/*N*/
-/*N*/ // Undo eintragen
-/*N*/
-/*N*/ if ( bAddUndo && bUndo)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/ // neue Einstellungen merken
-/*N*/
-/*N*/ if ( bNewUrlName )
-/*N*/ aFileName = aNewUrl;
-/*N*/ if ( rNewFilter != aFilterName )
-/*N*/ aFilterName = rNewFilter;
-/*N*/ if ( rNewArea != aSourceArea )
-/*N*/ aSourceArea = rNewArea;
-/*N*/ if ( aNewOpt != aOptions )
-/*N*/ aOptions = aNewOpt;
-/*N*/
-/*N*/ if ( aNewRange != aDestArea )
-/*N*/ aDestArea = aNewRange;
-/*N*/
-/*N*/ if ( nNewRefresh != GetRefreshDelay() )
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ // CanFitBlock FALSE -> Probleme mit zusammengefassten Zellen
+/*N*/ // oder Tabellengrenze erreicht!
+/*N*/ //! Zellschutz ???
/*N*/
-/*N*/ USHORT nPaintEndX = Max( aOldRange.aEnd.Col(), aNewRange.aEnd.Col() );
-/*N*/ USHORT nPaintEndY = Max( aOldRange.aEnd.Row(), aNewRange.aEnd.Row() );
-/*N*/
-/*N*/ if ( aOldRange.aEnd.Col() != aNewRange.aEnd.Col() )
-/*N*/ nPaintEndX = MAXCOL;
-/*N*/ if ( aOldRange.aEnd.Row() != aNewRange.aEnd.Row() )
-/*N*/ nPaintEndY = MAXROW;
-/*N*/
-/*N*/ if ( !pDocShell->AdjustRowHeight( aDestPos.Row(), nPaintEndY, nDestTab ) )
-/*N*/ pDocShell->PostPaint( aDestPos.Col(),aDestPos.Row(),nDestTab,
-/*N*/ nPaintEndX,nPaintEndY,nDestTab, PAINT_GRID );
-/*N*/ aModificator.SetDocumentModified();
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // CanFitBlock FALSE -> Probleme mit zusammengefassten Zellen
-/*N*/ // oder Tabellengrenze erreicht!
-/*N*/ //! Zellschutz ???
-/*N*/
-/*N*/ //! Link-Dialog muss Default-Parent setzen
-/*N*/ // "kann keine Zeilen einfuegen"
-/*N*/ InfoBox aBox( Application::GetDefDialogParent(),
-/*N*/ ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_2 ) );
-/*N*/ aBox.Execute();
-/*N*/ }
+/*N*/ //! Link-Dialog muss Default-Parent setzen
+/*N*/ // "kann keine Zeilen einfuegen"
+/*N*/ InfoBox aBox( Application::GetDefDialogParent(),
+/*N*/ ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_2 ) );
+/*N*/ aBox.Execute();
/*N*/
/*N*/ // aufraeumen
/*N*/
@@ -368,16 +229,7 @@ namespace binfilter {
/*N*/
/*N*/ pDoc->SetInLinkUpdate( FALSE );
/*N*/
-/*N*/ if (bCanDo)
-/*N*/ {
-/*N*/ // notify Uno objects (for XRefreshListener)
-/*N*/ //! also notify Uno objects if file name was changed!
-/*N*/ ScLinkRefreshedHint aHint;
-/*N*/ aHint.SetAreaLink( aDestPos );
-/*N*/ pDoc->BroadcastUno( aHint );
-/*N*/ }
-/*N*/
-/*N*/ return bCanDo;
+/*N*/ return FALSE;
/*N*/ }
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index adcf41b..0c1864f 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -502,9 +502,7 @@ namespace binfilter {
/*N*/ pDoc->CopyToDocument( aAttribRange, IDF_ATTRIB, FALSE, pAttribDoc );
/*N*/ }
/*N*/
-/*N*/ if ( bDoSize )
-/*N*/ pDoc->FitBlock( aOldDest, aDestTotal );
-/*N*/ else
+/*N*/ if ( !bDoSize )
/*N*/ pDoc->DeleteAreaTab(aOldDest, IDF_ALL); // einfach loeschen
/*N*/ }
/*N*/
@@ -520,7 +518,6 @@ namespace binfilter {
/*N*/
/*N*/ ScRange aNewDest( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
/*N*/ aLocalParam.nCol2, aLocalParam.nRow2, nDestTab );
-/*N*/ pDoc->FitBlock( aDestTotal, aNewDest, FALSE ); // FALSE - nicht loeschen
/*N*/
/*N*/ if ( nFormulaCols )
/*N*/ {
@@ -531,7 +528,6 @@ namespace binfilter {
/*N*/ aLocalParam.nCol2+nFormulaCols, aLocalParam.nRow2, nDestTab );
/*N*/ ScRange aOldForm = aNewForm;
/*N*/ aOldForm.aEnd.SetRow( aOldDest.aEnd.Row() );
-/*N*/ pDoc->FitBlock( aOldForm, aNewForm, FALSE );
/*N*/
/*N*/ ScMarkData aMark;
/*N*/ aMark.SelectOneTable(nDestTab);
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
index 3446428..b42b422 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
@@ -359,14 +359,7 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/
/*M*/ if ( bSuccess && bMoveCells )
/*M*/ {
-/*M*/ ScRange aOld( rParam.nCol1, rParam.nRow1, nTab,
-/*M*/ rParam.nCol2+nFormulaCols, rParam.nRow2, nTab );
-/*M*/ ScRange aNew( rParam.nCol1, rParam.nRow1, nTab,
-/*M*/ nEndCol+nFormulaCols, nEndRow, nTab );
-/*M*/ if (!pDoc->CanFitBlock( aOld, aNew ))
-/*M*/ {
-/*M*/ bSuccess = FALSE;
-/*M*/ }
+/*M*/ bSuccess = FALSE;
/*M*/ }
/*M*/
/*M*/ //
@@ -454,12 +447,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ ScRange aDelRange( rParam.nCol1, rParam.nRow1, nTab,
/*M*/ rParam.nCol2, rParam.nRow2, nTab );
/*M*/ pDoc->DeleteAreaTab( aDelRange, IDF_ALL ); // ohne die Formeln
-/*M*/
-/*M*/ ScRange aOld( rParam.nCol1, rParam.nRow1, nTab,
-/*M*/ rParam.nCol2+nFormulaCols, rParam.nRow2, nTab );
-/*M*/ ScRange aNew( rParam.nCol1, rParam.nRow1, nTab,
-/*M*/ nEndCol+nFormulaCols, nEndRow, nTab );
-/*M*/ pDoc->FitBlock( aOld, aNew, FALSE ); // Formeln nicht loeschen
/*M*/ }
/*M*/ else if ( nEndCol < rParam.nCol2 ) // DeleteArea calls PutInOrder
/*M*/ pDoc->DeleteArea( nEndCol+1, rParam.nRow1, rParam.nCol2, rParam.nRow2,
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index 344ceda..d830bd9 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -1391,18 +1391,12 @@ using namespace ::com::sun::star;
/*?*/ return FALSE;
/*N*/ }
/*N*/
-/*N*/ BOOL bNeedContents = bContents &&
-/*N*/ ( !pDoc->IsBlockEmpty( nTab, nStartCol,nStartRow+1, nStartCol,nEndRow ) ||
-/*N*/ !pDoc->IsBlockEmpty( nTab, nStartCol+1,nStartRow, nEndCol,nEndRow ) );
-/*N*/
-/*N*/ if (bNeedContents && bContents)
-/*?*/ { DBG_BF_ASSERT(0, "STRIP");}
/*N*/ pDoc->DoMerge( nTab, nStartCol,nStartRow, nEndCol,nEndRow );
/*N*/
/*N*/ if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) )
/*N*/ rDocShell.PostPaint( nStartCol, nStartRow, nTab,
/*N*/ nEndCol, nEndRow, nTab, PAINT_GRID );
-/*N*/ if (bNeedContents && bContents)
+/*N*/ if ( bContents )
/*?*/ pDoc->SetDirty( rRange );
/*N*/ aModificator.SetDocumentModified();
/*N*/
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx
index 51e6777..dbc5ef4 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx
@@ -447,26 +447,9 @@ void ScChartObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
void ScChartObj::GetData_Impl( ScRangeListRef& rRanges, BOOL& rColHeaders, BOOL& rRowHeaders ) const
{
- BOOL bFound = FALSE;
- if (pDocShell)
- {
- ScDocument* pDoc = pDocShell->GetDocument();
- SchMemChart* pOld = pDoc->FindChartData(aChartName);
- if (pOld)
- {
- ScChartArray aData(pDoc,*pOld);
- rRanges = aData.GetRangeList();
- rColHeaders = aData.HasColHeaders();
- rRowHeaders = aData.HasRowHeaders();
- bFound = TRUE;
- }
- }
- if (!bFound) // Default
- {
- rRanges = NULL;
- rColHeaders = FALSE;
- rRowHeaders = FALSE;
- }
+ rRanges = NULL;
+ rColHeaders = FALSE;
+ rRowHeaders = FALSE;
}
void ScChartObj::Update_Impl( const ScRangeListRef& rRanges, BOOL bColHeaders, BOOL bRowHeaders )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
index e0f3f41..87cbc63 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
@@ -1722,10 +1722,7 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue(
pDoc->ApplyFlagsTab( aRange.aStart.Col(), aRange.aStart.Row(),
aRange.aEnd.Col(), aRange.aStart.Row(),
aRange.aStart.Tab(), SC_MF_AUTO );
- else if (!bAutoFilter && pDoc)
- pDoc->RemoveFlagsTab(aRange.aStart.Col(), aRange.aStart.Row(),
- aRange.aEnd.Col(), aRange.aStart.Row(),
- aRange.aStart.Tab(), SC_MF_AUTO );
+
ScRange aPaintRange(aRange.aStart, aRange.aEnd);
aPaintRange.aEnd.SetRow(aPaintRange.aStart.Row());
pDocShell->PostPaint(aPaintRange, PAINT_GRID);
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
index fa97ba2..2d980a4 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
@@ -1122,13 +1122,6 @@ void SAL_CALL ScDDELinkObj::setName( const ::rtl::OUString& /*aName*/ ) throw(un
void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException)
{
- SolarMutexGuard aGuard;
- if (pDocShell)
- {
- ScDocument* pDoc = pDocShell->GetDocument();
- pDoc->UpdateDdeLink( aAppl, aTopic, aItem );
- //! Fehler abfragen
- }
}
void SAL_CALL ScDDELinkObj::addRefreshListener(
diff --git a/binfilter/bf_sc/source/ui/view/sc_printfun.cxx b/binfilter/bf_sc/source/ui/view/sc_printfun.cxx
index e0c25a0..9a134c8 100644
--- a/binfilter/bf_sc/source/ui/view/sc_printfun.cxx
+++ b/binfilter/bf_sc/source/ui/view/sc_printfun.cxx
@@ -742,38 +742,26 @@ namespace binfilter {
/*N*/ if (bAreaOk)
/*N*/ {
/*N*/ long nPages = 0;
-/*N*/ USHORT nY;
/*N*/ if (bMultiArea)
/*N*/ {
/*?*/ USHORT nRCount = pDoc->GetPrintRangeCount( nPrintTab );
/*?*/ for (USHORT i=0; i<nRCount; i++)
/*?*/ {
/*?*/ CalcZoom(i);
-/*?*/ if ( aTableParam.bSkipEmpty )
-/*?*/ for (nY=0; nY<nPagesY; nY++)
- {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ else
+/*?*/ if ( !aTableParam.bSkipEmpty )
/*?*/ nPages += ((long) nPagesX) * nPagesY;
-/*?*/ if ( pPageData )
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ }
/*N*/ }
/*N*/ else
/*N*/ {
/*N*/ CalcZoom(RANGENO_NORANGE); // Zoom berechnen
-/*N*/ if ( aTableParam.bSkipEmpty )
-/*?*/ for (nY=0; nY<nPagesY; nY++)
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if ( !aTableParam.bSkipEmpty )
/*N*/ nPages += ((long) nPagesX) * nPagesY;
-/*N*/ if ( pPageData )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ return nPages;
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ // nZoom = 100; // nZoom auf letztem Wert stehenlassen !!!
/*N*/ nPagesX = nPagesY = nTotalY = 0;
/*N*/ return 0;
/*N*/ }
@@ -832,12 +820,6 @@ namespace binfilter {
/*?*/ }
/*?*/
/*?*/ long nPages = 0;
-/*?*/ long nNoteAdd;
-/*?*/ do
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); nNoteAdd=0;
-/*?*/ }
-/*?*/ while (nNoteAdd);
-/*?*/
/*?*/ return nPages;
/*N*/ }
@@ -1026,14 +1008,11 @@ namespace binfilter {
/*N*/ pPageEndY[nTotalY] = i-1;
/*N*/ ++nTotalY;
/*N*/
-/*N*/ if ( !aTableParam.bSkipEmpty ||
-/*N*/ !pDoc->IsPrintEmpty( nPrintTab, nStartCol, nPageStartRow, nEndCol, i-1 ) )
+/*N*/ if ( !aTableParam.bSkipEmpty )
/*N*/ {
/*N*/ pPageRows[nPagesY].SetStartRow( nPageStartRow );
/*N*/ pPageRows[nPagesY].SetEndRow( i-1 );
/*N*/ pPageRows[nPagesY].SetPagesX( nPagesX );
-/*N*/ if (aTableParam.bSkipEmpty)
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ ++nPagesY;
/*N*/ }
/*N*/
@@ -1048,14 +1027,11 @@ namespace binfilter {
/*N*/ pPageEndY[nTotalY] = nEndRow;
/*N*/ ++nTotalY;
/*N*/
-/*N*/ if ( !aTableParam.bSkipEmpty ||
-/*N*/ !pDoc->IsPrintEmpty( nPrintTab, nStartCol, nPageStartRow, nEndCol, nEndRow ) )
+/*N*/ if ( !aTableParam.bSkipEmpty )
/*N*/ {
/*N*/ pPageRows[nPagesY].SetStartRow( nPageStartRow );
/*N*/ pPageRows[nPagesY].SetEndRow( nEndRow );
/*N*/ pPageRows[nPagesY].SetPagesX( nPagesX );
-/*N*/ if (aTableParam.bSkipEmpty)
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ ++nPagesY;
/*N*/ }
/*N*/ }
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index 4d3431d..09865fc 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -509,7 +509,6 @@ public:
const ScRangeListRef& rNewList,
BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd,
Window* pWindow );
- SchMemChart* FindChartData(const String& rName, BOOL bForModify = FALSE);
void MakeTable( USHORT nTab );
@@ -557,7 +556,6 @@ public:
ULONG TransferTab(ScDocument* pSrcDoc, USHORT nSrcPos, USHORT nDestPos,
BOOL bInsertNew = TRUE,
BOOL bResultsOnly = FALSE );
- void TransferDrawPage(ScDocument* pSrcDoc, USHORT nSrcPos, USHORT nDestPos);
void SetVisible( USHORT nTab, BOOL bVisible );
BOOL IsVisible( USHORT nTab ) const;
void SetScenario( USHORT nTab, BOOL bFlag );
@@ -593,19 +591,10 @@ public:
// Fuer StarOne Api:
USHORT GetDdeLinkCount() const;
BOOL GetDdeLinkData( USHORT nPos, String& rAppl, String& rTopic, String& rItem ) const;
- BOOL UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem );
// For XCL/XML Export (nPos is index of DDE links only):
BOOL GetDdeLinkMode(USHORT nPos, USHORT& nMode);
BOOL GetDdeLinkResultDimension( USHORT nPos , USHORT& nCol, USHORT& nRow, ScMatrix*& pMatrix);
- BOOL GetDdeLinkResult(const ScMatrix* pMatrix, USHORT nCol, USHORT nRow, String& rStrValue, double& rDoubValue, BOOL& bIsString);
-
- // For XCL/XML Import (nPos is index of DDE links only):
- void CreateDdeLink(const String& rAppl, const String& rTopic, const String& rItem, const BYTE nMode = SC_DDE_DEFAULT );
- BOOL FindDdeLink(const String& rAppl, const String& rTopic, const String& rItem, const BYTE nMode, USHORT& nPos );
- BOOL CreateDdeLinkResultDimension(USHORT nPos, USHORT nCols, USHORT nRows, ScMatrix*& pMatrix);
- void SetDdeLinkResult(ScMatrix* pMatrix, const USHORT nCol, const USHORT nRow, const String& rStrValue, const double& rDoubValue, BOOL bString, BOOL bEmpty);
-
SfxBindings* GetViewBindings();
SfxObjectShell* GetDocumentShell() const { return pShell; }
@@ -677,15 +666,6 @@ public:
void DoMerge( USHORT nTab, USHORT nStartCol, USHORT nStartRow,
USHORT nEndCol, USHORT nEndRow );
- BOOL IsBlockEmpty( USHORT nTab, USHORT nStartCol, USHORT nStartRow,
- USHORT nEndCol, USHORT nEndRow ) const;
- BOOL IsPrintEmpty( USHORT nTab, USHORT nStartCol, USHORT nStartRow,
- USHORT nEndCol, USHORT nEndRow,
- BOOL bLeftIsEmpty = FALSE,
- ScRange* pLastRange = NULL,
- Rectangle* pLastMM = NULL ) const;
-
-
BOOL HasAttrib( USHORT nCol1, USHORT nRow1, USHORT nTab1,
USHORT nCol2, USHORT nRow2, USHORT nTab2, USHORT nMask );
BOOL HasAttrib( const ScRange& rRange, USHORT nMask );
@@ -761,9 +741,6 @@ public:
/*N*/ BOOL CanInsertRow( const ScRange& rRange ) const;
/*N*/ BOOL CanInsertCol( const ScRange& rRange ) const;
- void FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear = TRUE );
- BOOL CanFitBlock( const ScRange& rOld, const ScRange& rNew );
-
BOOL IsClipOrUndo() const { return bIsClip || bIsUndo; }
BOOL IsUndo() const { return bIsUndo; }
BOOL IsClipboard() const { return bIsClip; }
@@ -778,18 +755,6 @@ public:
BOOL bCut, ScDocument* pClipDoc, BOOL bAllTabs,
const ScMarkData* pMarks = NULL,
BOOL bKeepScenarioFlags = FALSE, BOOL bIncludeObjects = FALSE);
- void CopyBlockFromClip( USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2,
- const ScMarkData& rMark, short nDx, short nDy,
- const ScCopyBlockFromClipParams* pCBFCP );
- void CopyNonFilteredFromClip( USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2,
- const ScMarkData& rMark, short nDx, short nDy,
- const ScCopyBlockFromClipParams* pCBFCP );
- void StartListeningFromClip( USHORT nCol1, USHORT nRow1,
- USHORT nCol2, USHORT nRow2,
- const ScMarkData& rMark, USHORT nInsFlag );
- void BroadcastFromClip( USHORT nCol1, USHORT nRow1,
- USHORT nCol2, USHORT nRow2,
- const ScMarkData& rMark, USHORT nInsFlag );
void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark,
USHORT nInsFlag,
ScDocument* pRefUndoDoc = NULL,
@@ -799,9 +764,6 @@ public:
BOOL bIncludeFiltered = TRUE,
BOOL bSkipAttrForEmpty = FALSE );
- void GetClipArea(USHORT& nClipX, USHORT& nClipY, BOOL bIncludeFiltered);
-
-
void InitUndo( ScDocument* pSrcDoc, USHORT nTab1, USHORT nTab2,
BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE );
@@ -894,16 +856,10 @@ public:
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY );
- BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
-
// Rueckgabe TRUE bei ApplyFlags: Wert geaendert
BOOL ApplyFlagsTab( USHORT nStartCol, USHORT nStartRow,
USHORT nEndCol, USHORT nEndRow,
USHORT nTab, INT16 nFlags );
- BOOL RemoveFlagsTab( USHORT nStartCol, USHORT nStartRow,
- USHORT nEndCol, USHORT nEndRow,
- USHORT nTab, INT16 nFlags );
-
BOOL Solver(USHORT nFCol, USHORT nFRow, USHORT nFTab,
USHORT nVCol, USHORT nVRow, USHORT nVTab,
@@ -911,8 +867,6 @@ public:
void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark );
- //
-
void SetColWidth( USHORT nCol, USHORT nTab, USHORT nNewWidth );
void SetRowHeightRange( USHORT nStartRow, USHORT nEndRow, USHORT nTab,
USHORT nNewHeight );
@@ -967,8 +921,6 @@ public:
// returns whether to export a Default style for this col/row or not
// nDefault is setted to one possition in the current row/col where the Default style is
BOOL GetColDefault( USHORT nTab, USHORT nCol, USHORT nLastRow, USHORT& nDefault);
- BOOL GetRowDefault( USHORT nTab, USHORT nRow, USHORT nLastCol, USHORT& nDefault);
-
BOOL UpdateOutlineCol( USHORT nStartCol, USHORT nEndCol, USHORT nTab, BOOL bShow );
BOOL UpdateOutlineRow( USHORT nStartRow, USHORT nEndRow, USHORT nTab, BOOL bShow );
@@ -1057,8 +1009,6 @@ public:
BOOL GetHasMacroFunc() const { return bHasMacroFunc; }
void SetHasMacroFunc(BOOL bSet) { bHasMacroFunc = bSet; }
- BOOL CheckMacroWarn();
-
// fuer Broadcasting/Listening
void SetNoSetDirty( BOOL bVal ) { bNoSetDirty = bVal; }
BOOL GetNoSetDirty() const { return bNoSetDirty; }
More information about the Libreoffice-commits
mailing list