[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Oct 1 06:35:50 PDT 2011
binfilter/bf_sc/source/core/data/sc_documen3.cxx | 9
binfilter/bf_sc/source/core/data/sc_document.cxx | 4
binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx | 26 -
binfilter/bf_sc/source/core/tool/sc_ddelink.cxx | 2
binfilter/bf_sc/source/core/tool/sc_detfunc.cxx | 47 --
binfilter/bf_sc/source/core/tool/sc_docoptio.cxx | 4
binfilter/bf_sc/source/core/tool/sc_editutil.cxx | 11
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx | 11
binfilter/bf_sc/source/core/tool/sc_printopt.cxx | 24 -
binfilter/bf_sc/source/core/tool/sc_progress.cxx | 63 +-
binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx | 1
binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx | 445 ---------------------
binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx | 9
binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx | 77 ---
binfilter/inc/bf_sc/dbcolect.hxx | 6
binfilter/inc/bf_sc/detfunc.hxx | 2
binfilter/inc/bf_sc/document.hxx | 4
17 files changed, 79 insertions(+), 666 deletions(-)
New commits:
commit d6f49ab273c7f559d5c89abe38c0c1e3f0e5c239
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Oct 1 06:35:38 2011 -0700
Some more cleanup
ScDBCollection::GetDBAtArea() is always NULL
thus ScDocument::GetDBAtArea() is always NULL
thus I could delete a lot of code.
ScDetectiveFunc::InsertObject() does nothing; so don't call it.
ScDBCollection::UpdateReference() also does nothing so don't call it.
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index 95d033b..c28f5c3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -133,14 +133,6 @@ using namespace ::com::sun::star;
/*N*/ return NULL;
/*N*/ }
-/*N*/ ScDBData* ScDocument::GetDBAtArea(USHORT nTab, USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2) const
-/*N*/ {
-/*N*/ if (pDBCollection)
-/*N*/ return pDBCollection->GetDBAtArea(nTab, nCol1, nRow1, nCol2, nRow2);
-/*N*/ else
-/*N*/ return NULL;
-/*N*/ }
-
/*N*/ ScDPCollection* ScDocument::GetDPCollection()
/*N*/ {
/*N*/ if (!pDPCollection)
@@ -434,7 +426,6 @@ using namespace ::com::sun::star;
/*N*/ ScRange aRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
/*N*/ xColNameRanges->UpdateReference( eUpdateRefMode, this, aRange, nDx, nDy, nDz );
/*N*/ xRowNameRanges->UpdateReference( eUpdateRefMode, this, aRange, nDx, nDy, nDz );
-/*N*/ pDBCollection->UpdateReference( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, nDy, nDz );
/*N*/ pRangeName->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz );
/*N*/ if (pPivotCollection)
/*N*/ pPivotCollection->UpdateReference( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, nDy, nDz );
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 5adafe7..26643cd 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -257,8 +257,6 @@ namespace binfilter {
/*N*/ ScRange aRange( 0,0,nPos, MAXCOL,MAXROW,MAXTAB );
/*N*/ xColNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,1 );
/*N*/ xRowNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,1 );
-/*N*/ pDBCollection->UpdateReference(
-/*N*/ URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
/*N*/ if (pPivotCollection)
/*N*/ pPivotCollection->UpdateReference(
/*N*/ URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
@@ -318,8 +316,6 @@ namespace binfilter {
/*N*/ aRange.aEnd.SetTab( MAXTAB );
/*N*/ xColNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,-1 );
/*N*/ xRowNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,-1 );
-/*N*/ pDBCollection->UpdateReference(
-/*N*/ URM_INSDEL, 0,0,nTab, MAXCOL,MAXROW,MAXTAB, 0,0,-1 );
/*N*/ if (pPivotCollection)
/*N*/ pPivotCollection->UpdateReference(
/*N*/ URM_INSDEL, 0,0,nTab, MAXCOL,MAXROW,MAXTAB, 0,0,-1 );
diff --git a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
index 7331957..5290b58 100644
--- a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
@@ -734,19 +734,6 @@ namespace binfilter {
/*N*/ if (pItems)
/*N*/ {
/*N*/ ScGlobal::GetRscString( STR_DB_NONAME );
-/*N*/
-/*N*/ for (USHORT i = 0; i < nCount; i++)
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden
-/*N*/ }
-
-/*N*/ ScDBData* ScDBCollection::GetDBAtArea(USHORT /*nTab*/, USHORT /*nCol1*/, USHORT /*nRow1*/, USHORT /*nCol2*/, USHORT /*nRow2*/) const
-/*N*/ {
-/*N*/ ScDBData* pNoNameData = NULL;
-/*N*/ if (pItems)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden
/*N*/ }
@@ -778,19 +765,6 @@ namespace binfilter {
/*N*/ return bSuccess;
/*N*/ }
-/*N*/ void ScDBCollection::UpdateReference(UpdateRefMode /*eUpdateRefMode*/,
-/*N*/ USHORT /*nCol1*/, USHORT /*nRow1*/, USHORT /*nTab1*/,
-/*N*/ USHORT /*nCol2*/, USHORT /*nRow2*/, USHORT /*nTab2*/,
-/*N*/ short /*nDx*/, short /*nDy*/, short /*nDz*/ )
-/*N*/ {
-/*N*/ for (USHORT i=0; i<nCount; i++)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
-
-
/*N*/ ScDBData* ScDBCollection::FindIndex(USHORT nIndex)
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
index 023da0a..54190ef 100644
--- a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
@@ -103,7 +103,7 @@ namespace binfilter {
/*N*/ void ScDdeLink::DataChanged( const String& /*rMimeType*/,
/*N*/ const ::com::sun::star::uno::Any & /*rValue*/ )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
index bd3d917..0ab387b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
@@ -400,9 +400,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Leve
/*N*/ SdrPage* pPage = pModel->GetPage(nTab);
/*N*/
/*N*/ BOOL bArea = ( nRefStartCol != nRefEndCol || nRefStartRow != nRefEndRow );
-/*N*/ if (bArea && !bFromOtherTab)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ Point aStartPos = GetDrawPos( nRefStartCol, nRefStartRow, TRUE );
/*N*/ Point aEndPos = GetDrawPos( nCol, nRow, TRUE );
@@ -1346,24 +1343,25 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Leve
/*N*/ return ( bDeleted || nInsCount != 0 );
/*N*/ }
-/*N*/ SdrObject* ScDetectiveFunc::ShowCommentUser( USHORT nCol, USHORT nRow, const String& rUserText,
-/*N*/ const Rectangle& /*rVisible*/, BOOL /*bLeft*/, BOOL bForce,
-/*N*/ SdrPage* pDestPage )
-/*N*/ {
-/*N*/ ScDrawLayer* pModel = pDoc->GetDrawLayer();
-/*N*/ if (!pModel && !pDestPage)
-/*N*/ return NULL;
-/*N*/
-/*N*/ SdrObject* pObject = NULL;
-/*N*/ ScPostIt aNote;
-/*N*/ BOOL bFound = pDoc->GetNote( nCol, nRow, nTab, aNote );
-/*N*/ if ( bFound || bForce || rUserText.Len() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/ return pObject;
-/*N*/ }
+SdrObject* ScDetectiveFunc::ShowCommentUser(
+ USHORT nCol,
+ USHORT nRow,
+ const String& /* rUserText */,
+ const Rectangle& /* rVisible */,
+ BOOL /* bLeft */,
+ BOOL /* bForce */,
+ SdrPage* pDestPage
+)
+{
+ ScDrawLayer* pModel = pDoc->GetDrawLayer();
+ if (!pModel && !pDestPage)
+ return NULL;
+
+ ScPostIt aNote;
+ pDoc->GetNote( nCol, nRow, nTab, aNote );
+
+ return NULL;
+}
/*N*/ SdrObject* ScDetectiveFunc::ShowComment( USHORT nCol, USHORT nRow, BOOL bForce, SdrPage* pDestPage )
/*N*/ {
@@ -1610,13 +1608,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Leve
/*N*/ return eType;
/*N*/ }
-/*N*/ void ScDetectiveFunc::InsertObject( ScDetectiveObjType /*eType*/,
-/*N*/ const ScAddress& /*rPosition*/, const ScRange& /*rSource*/,
-/*N*/ BOOL /*bRedLine*/ )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
// static
/*N*/ ColorData ScDetectiveFunc::GetArrowColor()
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
index 994d097..ed62441 100644
--- a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
@@ -359,13 +359,13 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
/*N*/ IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK()
/*N*/ return 0;
/*N*/ }
/*N*/ IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK()
/*N*/ return 0;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
index d7be513..294467d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
@@ -334,11 +334,6 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
//------------------------------------------------------------------------
-
-
-
-
-//------------------------------------------------------------------------
// Feldbefehle fuer Kopf- und Fusszeilen
//------------------------------------------------------------------------
@@ -357,22 +352,16 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
/*N*/ {
/*?*/ case SVX_CHARS_UPPER_LETTER:
/*?*/ case SVX_CHARS_LOWER_LETTER:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ break;
/*?*/
/*?*/ case SVX_ROMAN_UPPER:
/*?*/ case SVX_ROMAN_LOWER:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ break;
/*?*/
/*?*/ case SVX_NUMBER_NONE:
/*?*/ aTmpStr.Erase();
/*?*/ break;
/*?*/
-/*?*/ // CHAR_SPECIAL:
-/*?*/ // ????
-/*?*/
-/*?*/ // case ARABIC: ist jetzt default
/*N*/ default:
/*N*/ aTmpStr = String::CreateFromInt32( nNo );
/*N*/ break;
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
index 5565055..a66a644 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
@@ -2470,12 +2470,11 @@ void ScInterpreter::ScCalcTeam()
static BOOL bShown = FALSE;
if( !bShown )
{
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ String aTeam( RTL_CONSTASCII_USTRINGPARAM( "Ballach, Nebel, Rentz, Rathke, Marmion" ) );
-/*N*/ if ( (GetByte() == 1) && ::rtl::math::approxEqual( GetDouble(), 1996) )
-/*N*/ /*?*/ aTeam.AppendAscii( " (a word with 'B': -Olk, -Nietsch, -Daeumling)" );
-/*N*/ /*?*/ PushString( aTeam );
-/*N*/ /*?*/ bShown = TRUE;
+ String aTeam( RTL_CONSTASCII_USTRINGPARAM( "Ballach, Nebel, Rentz, Rathke, Marmion" ) );
+ if ( (GetByte() == 1) && ::rtl::math::approxEqual( GetDouble(), 1996) )
+ aTeam.AppendAscii( " (a word with 'B': -Olk, -Nietsch, -Daeumling)" );
+ PushString( aTeam );
+ bShown = TRUE;
}
else
PushInt( 42 );
diff --git a/binfilter/bf_sc/source/core/tool/sc_printopt.cxx b/binfilter/bf_sc/source/core/tool/sc_printopt.cxx
index 4461b4f..9d8cf03 100644
--- a/binfilter/bf_sc/source/core/tool/sc_printopt.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_printopt.cxx
@@ -40,9 +40,6 @@ using ::rtl::OUString;
// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
/*N*/ ScPrintOptions::ScPrintOptions()
/*N*/ {
/*N*/ SetDefaults();
@@ -65,17 +62,6 @@ using ::rtl::OUString;
/*N*/ }
-
-
-// -----------------------------------------------------------------------
-
-
-
-
-
-
-
-
// -----------------------------------------------------------------------
#define CFGPATH_PRINT "Office.Calc/Print"
@@ -85,11 +71,11 @@ using ::rtl::OUString;
#define SCPRINTOPT_COUNT 2
-/*N*/ ScPrintCfg::ScPrintCfg() :
-/*N*/ ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_PRINT )) )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+ScPrintCfg::ScPrintCfg() :
+ ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_PRINT )) )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // CONSTRUCTOR
+}
void ScPrintCfg::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& /*aPropertyNames*/ )
diff --git a/binfilter/bf_sc/source/core/tool/sc_progress.cxx b/binfilter/bf_sc/source/core/tool/sc_progress.cxx
index e9925c8..20d0edd 100644
--- a/binfilter/bf_sc/source/core/tool/sc_progress.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_progress.cxx
@@ -61,33 +61,35 @@ BOOL ScProgress::bIdleWasDisabled = FALSE;
/*N*/ ULONG nRange, BOOL bAllDocs, BOOL bWait )
/*N*/ {
/*N*/
-/*N*/ if ( pGlobalProgress || SfxProgress::GetActiveProgress( NULL ) )
+/*N*/ if ( !(pGlobalProgress || SfxProgress::GetActiveProgress( NULL ) ) )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if ( SFX_APP()->IsDowning() )
-/*N*/ {
-/*N*/ // kommt vor z.B. beim Speichern des Clipboard-Inhalts als OLE beim Beenden
-/*N*/ // Dann wuerde ein SfxProgress wild im Speicher rummuellen
-/*N*/ //! Soll das so sein ???
+/*N*/ if ( SFX_APP()->IsDowning() )
+/*N*/ {
+/*N*/ // kommt vor z.B. beim Speichern des Clipboard-Inhalts als OLE beim Beenden
+/*N*/ // Dann wuerde ein SfxProgress wild im Speicher rummuellen
+/*N*/ //! Soll das so sein ???
/*N*/
-/*N*/ pProgress = NULL;
-/*N*/ }
-/*N*/ else if ( pObjSh && ( pObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ||
-/*N*/ pObjSh->GetProgress() ) )
-/*N*/ {
-/*N*/ // #62808# no own progress for embedded objects,
-/*N*/ // #73633# no second progress if the document already has one
+/*N*/ pProgress = NULL;
+/*N*/ }
+/*N*/ else if ( pObjSh
+ && ( pObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED
+ || pObjSh->GetProgress()
+ )
+ )
+/*N*/ {
+/*N*/ // #62808# no own progress for embedded objects,
+/*N*/ // #73633# no second progress if the document already has one
/*N*/
-/*N*/ pProgress = NULL;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ pProgress = new SfxProgress( pObjSh, rText, nRange, bAllDocs, bWait );
-/*N*/ pGlobalProgress = pProgress;
-/*N*/ nGlobalRange = nRange;
-/*N*/ nGlobalPercent = 0;
-/*N*/ bGlobalNoUserBreak = TRUE;
+/*N*/ pProgress = NULL;
+/*N*/ }
+/*N*/ else
+/*N*/ {
+/*N*/ pProgress = new SfxProgress( pObjSh, rText, nRange, bAllDocs, bWait );
+/*N*/ pGlobalProgress = pProgress;
+/*N*/ nGlobalRange = nRange;
+/*N*/ nGlobalPercent = 0;
+/*N*/ bGlobalNoUserBreak = TRUE;
+ }
/*N*/ }
/*N*/ }
@@ -111,19 +113,6 @@ BOOL ScProgress::bIdleWasDisabled = FALSE;
/*N*/ }
-// static
-
-
-
-// static
-
-
-
-// static
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx
index 5752cb5..91c7cc8 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx
@@ -705,7 +705,6 @@ void ScXMLTableRowCellContext::SetDetectiveObj( const table::CellAddress& rPosit
{
ScAddress aScAddress;
ScUnoConversion::FillScAddress( aScAddress, rPosition );
- aDetFunc.InsertObject( aItr->eObjType, aScAddress, aItr->aSourceRange, aItr->bHasError );
uno::Reference<container::XIndexAccess> xShapesIndex (xShapes, uno::UNO_QUERY);
if (xShapesIndex.is())
{
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index e911f97..c6302e8 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -270,445 +270,30 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScDBDocFunc::Sort( USHORT nTab, const ScSortParam& rSortParam,
-/*N*/ BOOL bRecord, BOOL bPaint, BOOL )
+/*N*/ BOOL ScDBDocFunc::Sort( USHORT /* nTab */, const ScSortParam& /* rSortParam */,
+/*N*/ BOOL /* bRecord */, BOOL /* bPaint */, BOOL )
/*N*/ {
-/*N*/ ScDocShellModificator aModificator( rDocShell );
-/*N*/
-/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ if (bRecord && !pDoc->IsUndoEnabled())
-/*N*/ bRecord = FALSE;
-/*N*/
-/*N*/ ScDBData* pDBData = pDoc->GetDBAtArea( nTab, rSortParam.nCol1, rSortParam.nRow1,
-/*N*/ rSortParam.nCol2, rSortParam.nRow2 );
-/*N*/ if (!pDBData)
-/*N*/ {
-/*N*/ OSL_FAIL( "Sort: keine DBData" );
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/
-/*N*/ ScDBData* pDestData = NULL;
-/*N*/ ScRange aOldDest;
-/*N*/ BOOL bCopy = !rSortParam.bInplace;
-/*N*/ if ( bCopy && rSortParam.nDestCol == rSortParam.nCol1 &&
-/*N*/ rSortParam.nDestRow == rSortParam.nRow1 && rSortParam.nDestTab == nTab )
-/*N*/ bCopy = FALSE;
-/*N*/ ScSortParam aLocalParam( rSortParam );
-/*N*/
-/*N*/ ScEditableTester aTester( pDoc, nTab, aLocalParam.nCol1,aLocalParam.nRow1,
-/*N*/ aLocalParam.nCol2,aLocalParam.nRow2 );
-/*N*/ if (!aTester.IsEditable())
-/*N*/ {
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/
-/*N*/ if ( aLocalParam.bIncludePattern && pDoc->HasAttrib(
-/*N*/ aLocalParam.nCol1, aLocalParam.nRow1, nTab,
-/*N*/ aLocalParam.nCol2, aLocalParam.nRow2, nTab,
-/*N*/ HASATTR_MERGED | HASATTR_OVERLAPPED ) )
-/*N*/ {
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/
-/*N*/
-/*N*/ // ausfuehren
-/*N*/
-/*N*/ WaitObject aWait( rDocShell.GetDialogParent() );
-/*N*/
-/*N*/ BOOL bRepeatQuery = FALSE; // bestehenden Filter wiederholen?
-/*N*/ ScQueryParam aQueryParam;
-/*N*/ pDBData->GetQueryParam( aQueryParam );
-/*N*/ if ( aQueryParam.GetEntry(0).bDoQuery )
-/*N*/ bRepeatQuery = TRUE;
-/*N*/
-/*N*/ if (bRepeatQuery && bCopy)
-/*N*/ {
-/*N*/ if ( aQueryParam.bInplace ||
-/*N*/ aQueryParam.nDestCol != rSortParam.nDestCol ||
-/*N*/ aQueryParam.nDestRow != rSortParam.nDestRow ||
-/*N*/ aQueryParam.nDestTab != rSortParam.nDestTab ) // Query auf selben Zielbereich?
-/*N*/ bRepeatQuery = FALSE;
-/*N*/ }
-/*N*/
-/*N*/ if ( bCopy )
-/*N*/ {
-/*N*/ if (pDestData)
-/*N*/ pDoc->DeleteAreaTab(aOldDest, IDF_CONTENTS); // Zielbereich vorher loeschen
-/*N*/ }
-/*N*/
-/*N*/ BOOL bSave = TRUE;
-/*N*/ if (bCopy)
-/*N*/ {
-/*N*/ ScSortParam aOldSortParam;
-/*N*/ pDBData->GetSortParam( aOldSortParam );
-/*N*/ if ( aOldSortParam.bDoSort[0] && aOldSortParam.bInplace ) // Inplace-Sortierung gemerkt?
-/*N*/ {
-/*N*/ bSave = FALSE;
-/*N*/ aOldSortParam.nDestCol = rSortParam.nDestCol;
-/*N*/ aOldSortParam.nDestRow = rSortParam.nDestRow;
-/*N*/ aOldSortParam.nDestTab = rSortParam.nDestTab;
-/*N*/ pDBData->SetSortParam( aOldSortParam ); // dann nur DestPos merken
-/*N*/ }
-/*N*/ }
-/*N*/ if (bSave) // Parameter merken
-/*N*/ {
-/*N*/ pDBData->SetSortParam( rSortParam );
-/*N*/ pDBData->SetHeader( rSortParam.bHasHeader ); //! ???
-/*N*/ pDBData->SetByRow( rSortParam.bByRow ); //! ???
-/*N*/ }
-/*N*/
-/*N*/ if (bCopy) // neuen DB-Bereich merken
-/*N*/ {
-/*N*/ // Tabelle umschalten von aussen (View)
-/*N*/ //! SetCursor ??!?!
-/*N*/
-/*N*/ ScRange aDestPos( aLocalParam.nCol1, aLocalParam.nRow1, nTab,
-/*N*/ aLocalParam.nCol2, aLocalParam.nRow2, nTab );
-/*N*/ ScDBData* pNewData;
-/*N*/ if (pDestData)
-/*N*/ pNewData = pDestData; // Bereich vorhanden -> anpassen
-/*N*/ else // Bereich ab Cursor/Markierung wird angelegt
-/*N*/ pNewData = rDocShell.GetDBData(aDestPos, SC_DB_MAKE, TRUE );
-/*N*/ if (pNewData)
-/*N*/ {
-/*N*/ pNewData->SetArea( nTab,
-/*N*/ aLocalParam.nCol1,aLocalParam.nRow1,
-/*N*/ aLocalParam.nCol2,aLocalParam.nRow2 );
-/*N*/ pNewData->SetSortParam( aLocalParam );
-/*N*/ pNewData->SetHeader( aLocalParam.bHasHeader ); //! ???
-/*N*/ pNewData->SetByRow( aLocalParam.bByRow );
-/*N*/ }
-/*N*/ else
-/*N*/ OSL_FAIL("Zielbereich nicht da");
-/*N*/ }
-/*N*/
-/*N*/ ScRange aDirtyRange( aLocalParam.nCol1, aLocalParam.nRow1, nTab,
-/*N*/ aLocalParam.nCol2, aLocalParam.nRow2, nTab );
-/*N*/ pDoc->SetDirty( aDirtyRange );
-/*N*/
-/*N*/ if (bPaint)
-/*N*/ {
-/*N*/ USHORT nPaint = PAINT_GRID;
-/*N*/ USHORT nStartX = aLocalParam.nCol1;
-/*N*/ USHORT nStartY = aLocalParam.nRow1;
-/*N*/ USHORT nEndX = aLocalParam.nCol2;
-/*N*/ USHORT nEndY = aLocalParam.nRow2;
-/*N*/ if ( bRepeatQuery )
-/*N*/ {
-/*N*/ nPaint |= PAINT_LEFT;
-/*N*/ nStartX = 0;
-/*N*/ nEndX = MAXCOL;
-/*N*/ }
-/*N*/ if (pDestData)
-/*N*/ {
-/*N*/ if ( nEndX < aOldDest.aEnd.Col() )
-/*N*/ nEndX = aOldDest.aEnd.Col();
-/*N*/ if ( nEndY < aOldDest.aEnd.Row() )
-/*N*/ nEndY = aOldDest.aEnd.Row();
-/*N*/ }
-/*N*/ rDocShell.PostPaint( nStartX, nStartY, nTab, nEndX, nEndY, nTab, nPaint );
-/*N*/ }
-/*N*/
-/*N*/ // AdjustRowHeight( aLocalParam.nRow1, aLocalParam.nRow2, bPaint );
-/*N*/ rDocShell.AdjustRowHeight( aLocalParam.nRow1, aLocalParam.nRow2, nTab );
-/*N*/
-/*N*/ aModificator.SetDocumentModified();
-/*N*/
-/*N*/ return TRUE;
+ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ OSL_FAIL( "Sort: keine DBData" );
+/*N*/ return FALSE;
/*N*/ }
-/*N*/ BOOL ScDBDocFunc::Query( USHORT nTab, const ScQueryParam& rQueryParam,
-/*N*/ const ScRange* pAdvSource, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScDBDocFunc::Query( USHORT /* nTab */, const ScQueryParam& /* rQueryParam */,
+/*N*/ const ScRange* /* pAdvSource */, BOOL /* bRecord */, BOOL /* bApi */ )
/*N*/ {
-/*N*/ ScDocShellModificator aModificator( rDocShell );
-/*N*/
-/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ if (bRecord && !pDoc->IsUndoEnabled())
-/*N*/ bRecord = FALSE;
-/*N*/ ScDBData* pDBData = pDoc->GetDBAtArea( nTab, rQueryParam.nCol1, rQueryParam.nRow1,
-/*N*/ rQueryParam.nCol2, rQueryParam.nRow2 );
-/*N*/ if (!pDBData)
-/*N*/ {
-/*N*/ OSL_FAIL( "Query: keine DBData" );
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/
-/*N*/ // Wechsel von Inplace auf nicht-Inplace, dann erst Inplace aufheben:
-/*N*/ // (nur, wenn im Dialog "Persistent" ausgewaehlt ist)
-/*N*/
-/*N*/ if ( !rQueryParam.bInplace && pDBData->HasQueryParam() && rQueryParam.bDestPers )
-/*N*/ {
-/*N*/ ScQueryParam aOldQuery;
-/*N*/ pDBData->GetQueryParam(aOldQuery);
-/*N*/ if (aOldQuery.bInplace)
-/*N*/ {
-/*N*/ // alte Filterung aufheben
-/*N*/
-/*N*/ USHORT nEC = aOldQuery.GetEntryCount();
-/*N*/ for (USHORT i=0; i<nEC; i++)
-/*N*/ aOldQuery.GetEntry(i).bDoQuery = FALSE;
-/*N*/ aOldQuery.bDuplicate = TRUE;
-/*N*/ Query( nTab, aOldQuery, NULL, bRecord, bApi );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ ScQueryParam aLocalParam( rQueryParam ); // fuer Paint / Zielbereich
-/*N*/ BOOL bCopy = !rQueryParam.bInplace; // kopiert wird in Table::Query
-/*N*/ ScDBData* pDestData = NULL; // Bereich, in den kopiert wird
-/*N*/ BOOL bDoSize = FALSE; // Zielgroesse anpassen (einf./loeschen)
-/*N*/ USHORT nFormulaCols = 0; // nur bei bDoSize
-/*N*/ BOOL bKeepFmt = FALSE;
-/*N*/ ScRange aOldDest;
-/*N*/ ScRange aDestTotal;
-/*N*/ if ( bCopy && rQueryParam.nDestCol == rQueryParam.nCol1 &&
-/*N*/ rQueryParam.nDestRow == rQueryParam.nRow1 && rQueryParam.nDestTab == nTab )
-/*N*/ bCopy = FALSE;
-/*N*/ USHORT nDestTab = nTab;
-/*N*/
-/*N*/ // ausfuehren
-/*N*/
-/*N*/ WaitObject aWait( rDocShell.GetDialogParent() );
-/*N*/
-/*N*/ ScSubTotalParam aSubTotalParam;
-/*N*/ if (rQueryParam.GetEntry(0).bDoQuery) // nicht beim Aufheben
-/*N*/ pDBData->GetSubTotalParam( aSubTotalParam ); // Teilergebnisse vorhanden?
-/*N*/
-/*N*/ ScDocument* pAttribDoc = NULL;
-/*N*/ ScRange aAttribRange;
-/*N*/ if (pDestData) // Zielbereich loeschen
-/*N*/ {
-/*N*/ if ( bKeepFmt )
-/*N*/ {
-/*N*/ // kleinere der End-Spalten, Header+1 Zeile
-/*N*/ aAttribRange = aOldDest;
-/*N*/ if ( aAttribRange.aEnd.Col() > aDestTotal.aEnd.Col() )
-/*N*/ aAttribRange.aEnd.SetCol( aDestTotal.aEnd.Col() );
-/*N*/ aAttribRange.aEnd.SetRow( aAttribRange.aStart.Row() +
-/*N*/ ( aLocalParam.bHasHeader ? 1 : 0 ) );
-/*N*/
-/*N*/ // auch fuer aufgefuellte Formeln
-/*N*/ aAttribRange.aEnd.SetCol( aAttribRange.aEnd.Col() + nFormulaCols );
-/*N*/
-/*N*/ pAttribDoc = new ScDocument( SCDOCMODE_UNDO );
-/*N*/ pAttribDoc->InitUndo( pDoc, nDestTab, nDestTab, FALSE, TRUE );
-/*N*/ pDoc->CopyToDocument( aAttribRange, IDF_ATTRIB, FALSE, pAttribDoc );
-/*N*/ }
-/*N*/
-/*N*/ if ( !bDoSize )
-/*N*/ pDoc->DeleteAreaTab(aOldDest, IDF_ALL); // einfach loeschen
-/*N*/ }
-/*N*/
-/*N*/ // Filtern am Dokument ausfuehren
-/*N*/ if (bCopy)
-/*N*/ {
-/*N*/ aLocalParam.nRow2 = aLocalParam.nRow1;
-/*N*/
-/*N*/ if ( bDoSize )
-/*N*/ {
-/*N*/ // auf wirklichen Ergebnis-Bereich anpassen
-/*N*/ // (das hier ist immer eine Verkleinerung)
-/*N*/
-/*N*/ ScRange aNewDest( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
-/*N*/ aLocalParam.nCol2, aLocalParam.nRow2, nDestTab );
-/*N*/
-/*N*/ if ( nFormulaCols )
-/*N*/ {
-/*N*/ // Formeln ausfuellen
-/*N*/ //! Undo (Query und Repeat) !!!
-/*N*/
-/*N*/ ScRange aNewForm( aLocalParam.nCol2+1, aLocalParam.nRow1, nDestTab,
-/*N*/ aLocalParam.nCol2+nFormulaCols, aLocalParam.nRow2, nDestTab );
-/*N*/ ScRange aOldForm = aNewForm;
-/*N*/ aOldForm.aEnd.SetRow( aOldDest.aEnd.Row() );
-/*N*/
-/*N*/ ScMarkData aMark;
-/*N*/ aMark.SelectOneTable(nDestTab);
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if ( pAttribDoc ) // gemerkte Attribute zurueckkopieren
-/*N*/ {
-/*N*/ // Header
-/*N*/ if (aLocalParam.bHasHeader)
-/*N*/ {
-/*N*/ ScRange aHdrRange = aAttribRange;
-/*N*/ aHdrRange.aEnd.SetRow( aHdrRange.aStart.Row() );
-/*N*/ pAttribDoc->CopyToDocument( aHdrRange, IDF_ATTRIB, FALSE, pDoc );
-/*N*/ }
-/*N*/
-/*N*/ // Daten
-/*N*/ USHORT nAttrEndCol = aAttribRange.aEnd.Col();
-/*N*/ USHORT nAttrRow = aAttribRange.aStart.Row() + ( aLocalParam.bHasHeader ? 1 : 0 );
-/*N*/ for (USHORT nCol = aAttribRange.aStart.Col(); nCol<=nAttrEndCol; nCol++)
-/*N*/ {
-/*N*/ const ScPatternAttr* pSrcPattern = pAttribDoc->GetPattern(
-/*N*/ nCol, nAttrRow, nDestTab );
-/*N*/ DBG_ASSERT(pSrcPattern,"Pattern ist 0");
-/*N*/ if (pSrcPattern)
-/*N*/ pDoc->ApplyPatternAreaTab( nCol, nAttrRow, nCol, aLocalParam.nRow2,
-/*N*/ nDestTab, *pSrcPattern );
-/*N*/ const ScStyleSheet* pStyle = pSrcPattern->GetStyleSheet();
-/*N*/ if (pStyle)
-/*N*/ pDoc->ApplyStyleAreaTab( nCol, nAttrRow, nCol, aLocalParam.nRow2,
-/*N*/ nDestTab, *pStyle );
-/*N*/ }
-/*N*/
-/*N*/ delete pAttribDoc;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // speichern: Inplace immer, sonst je nach Einstellung
-/*N*/ // alter Inplace-Filter ist ggf. schon aufgehoben
-/*N*/
-/*N*/ BOOL bSave = rQueryParam.bInplace || rQueryParam.bDestPers;
-/*N*/ if (bSave) // merken
-/*N*/ {
-/*N*/ pDBData->SetQueryParam( rQueryParam );
-/*N*/ pDBData->SetHeader( rQueryParam.bHasHeader ); //! ???
-/*N*/ pDBData->SetAdvancedQuerySource( pAdvSource ); // after SetQueryParam
-/*N*/ }
-/*N*/
-/*N*/ if (bCopy) // neuen DB-Bereich merken
-/*N*/ {
-/*N*/ // selektieren wird hinterher von aussen (dbfunc)
-/*N*/ // momentan ueber DB-Bereich an der Zielposition, darum muss dort
-/*N*/ // auf jeden Fall ein Bereich angelegt werden.
-/*N*/
-/*N*/ ScDBData* pNewData;
-/*N*/ if (pDestData)
-/*N*/ pNewData = pDestData; // Bereich vorhanden -> anpassen (immer!)
-/*N*/ else // Bereich anlegen
-/*N*/ pNewData = rDocShell.GetDBData(
-/*N*/ ScRange( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
-/*N*/ aLocalParam.nCol2, aLocalParam.nRow2, nDestTab ),
-/*N*/ SC_DB_MAKE, TRUE );
-/*N*/
-/*N*/ if (pNewData)
-/*N*/ {
-/*N*/ pNewData->SetArea( nDestTab, aLocalParam.nCol1, aLocalParam.nRow1,
-/*N*/ aLocalParam.nCol2, aLocalParam.nRow2 );
-/*N*/
-/*N*/ // Query-Param wird am Ziel nicht mehr eingestellt, fuehrt nur zu Verwirrung
-/*N*/ // und Verwechslung mit dem Query-Param am Quellbereich (#37187#)
-/*N*/ }
-/*N*/ else
-/*N*/ OSL_FAIL("Zielbereich nicht da");
-/*N*/ }
-/*N*/
-/*N*/ if (!bCopy)
-/*N*/ pDoc->UpdatePageBreaks( nTab );
-/*N*/
-/*N*/ ScRange aDirtyRange( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
-/*N*/ aLocalParam.nCol2, aLocalParam.nRow2, nDestTab );
-/*N*/ pDoc->SetDirty( aDirtyRange );
-/*N*/
-/*N*/ if (bCopy)
-/*N*/ {
-/*N*/ USHORT nEndX = aLocalParam.nCol2;
-/*N*/ USHORT nEndY = aLocalParam.nRow2;
-/*N*/ if (pDestData)
-/*N*/ {
-/*N*/ if ( aOldDest.aEnd.Col() > nEndX )
-/*N*/ nEndX = aOldDest.aEnd.Col();
-/*N*/ if ( aOldDest.aEnd.Row() > nEndY )
-/*N*/ nEndY = aOldDest.aEnd.Row();
-/*N*/ }
-/*N*/ if (bDoSize)
-/*N*/ nEndY = MAXROW;
-/*N*/ rDocShell.PostPaint( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
-/*N*/ nEndX, nEndY, nDestTab, PAINT_GRID );
-/*N*/ }
-/*N*/ else
-/*N*/ rDocShell.PostPaint( 0, rQueryParam.nRow1, nTab, MAXCOL, MAXROW, nTab,
-/*N*/ PAINT_GRID | PAINT_LEFT );
-/*N*/ aModificator.SetDocumentModified();
-/*N*/
-/*N*/ return TRUE;
+ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ OSL_FAIL( "Query: keine DBData" );
+/*N*/ return FALSE;
/*N*/ }
-/*N*/ BOOL ScDBDocFunc::DoSubTotals( USHORT nTab, const ScSubTotalParam& rParam,
-/*N*/ const ScSortParam* /*pForceNewSort*/, BOOL bRecord, BOOL )
+/*N*/ BOOL ScDBDocFunc::DoSubTotals( USHORT /* nTab */, const ScSubTotalParam& /* rParam */,
+/*N*/ const ScSortParam* /*pForceNewSort*/, BOOL /* bRecord */, BOOL )
/*N*/ {
-/*N*/ //! auch fuer ScDBFunc::DoSubTotals benutzen!
-/*N*/ // dann bleibt aussen:
-/*N*/ // - neuen Bereich (aus DBData) markieren
-/*N*/ // - SelectionChanged (?)
-/*N*/
-/*N*/ BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen
-/*N*/ BOOL bRet = FALSE;
-/*N*/
-/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ if (bRecord && !pDoc->IsUndoEnabled())
-/*N*/ bRecord = FALSE;
-/*N*/ ScDBData* pDBData = pDoc->GetDBAtArea( nTab, rParam.nCol1, rParam.nRow1,
-/*N*/ rParam.nCol2, rParam.nRow2 );
-/*N*/ if (!pDBData)
-/*N*/ {
-/*N*/ OSL_FAIL( "SubTotals: keine DBData" );
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/
-/*N*/ ScEditableTester aTester( pDoc, nTab, 0,rParam.nRow1+1, MAXCOL,MAXROW );
-/*N*/ if (!aTester.IsEditable())
-/*N*/ {
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/
-/*N*/ if (pDoc->HasAttrib( rParam.nCol1, rParam.nRow1+1, nTab,
-/*N*/ rParam.nCol2, rParam.nRow2, nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ))
-/*N*/ {
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/
-/*N*/ BOOL bOk = TRUE;
-/*N*/
-/*N*/ if (bOk)
-/*N*/ {
-/*N*/ WaitObject aWait( rDocShell.GetDialogParent() );
-/*N*/ ScDocShellModificator aModificator( rDocShell );
-/*N*/
-/*N*/ ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert
-/*N*/ ScDocument* pUndoDoc = NULL;
-/*N*/ USHORT nTabCount = 0; // fuer Referenz-Undo
-/*N*/
-/*N*/ if (bRecord) // alte Daten sichern
-/*N*/ {
-/*N*/ BOOL bOldFilter = bDo && rParam.bDoSort;
-/*N*/
-/*N*/ nTabCount = pDoc->GetTableCount();
-/*N*/ pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-/*N*/ ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
-/*N*/ if (!pTable)
-/*N*/ pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter );
-/*N*/
-/*N*/ // Datenbereich sichern - incl. Filter-Ergebnis
-/*N*/ pDoc->CopyToDocument( 0,rParam.nRow1+1,nTab, MAXCOL,rParam.nRow2,nTab,
-/*N*/ IDF_ALL, FALSE, pUndoDoc );
-/*N*/
-/*N*/ // alle Formeln wegen Referenzen
-/*N*/ pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
-/*N*/ IDF_FORMULA, FALSE, pUndoDoc );
-/*N*/ }
-/*N*/
-/*N*/ /* ScOutlineTable* pOut = */ pDoc->GetOutlineTable( nTab );
-/*N*/
-/*N*/ BOOL bSuccess = TRUE;
-/*N*/ ScRange aDirtyRange( aNewParam.nCol1, aNewParam.nRow1, nTab,
-/*N*/ aNewParam.nCol2, aNewParam.nRow2, nTab );
-/*N*/ pDoc->SetDirty( aDirtyRange );
-/*N*/
-/*N*/ pDBData->SetSubTotalParam( aNewParam );
-/*N*/ pDBData->SetArea( nTab, aNewParam.nCol1,aNewParam.nRow1, aNewParam.nCol2,aNewParam.nRow2 );
-/*N*/
-/*N*/ rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab,
-/*N*/ PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE );
-/*N*/ aModificator.SetDocumentModified();
-/*N*/
-/*N*/ bRet = bSuccess;
-/*N*/ }
-/*N*/ return bRet;
+ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ OSL_FAIL( "SubTotals: keine DBData" );
+/*N*/ return FALSE;
/*N*/ }
/*N*/ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
index 301ca6c..bb716d9 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
@@ -98,13 +98,8 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ ScDBData* pDBData = 0;
/*M*/ if ( !bAddrInsert )
/*M*/ {
-/*M*/ pDBData = pDoc->GetDBAtArea( nTab, rParam.nCol1, rParam.nRow1,
-/*M*/ rParam.nCol2, rParam.nRow2 );
-/*M*/ if (!pDBData)
-/*M*/ {
-/*M*/ OSL_FAIL( "DoImport: no DBData" );
-/*M*/ return FALSE;
-/*M*/ }
+/*M*/ OSL_FAIL( "DoImport: no DBData" );
+/*M*/ return FALSE;
/*M*/ }
/*M*/
/*M*/ Window* pWaitWin = rDocShell.GetDialogParent();
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
index 0eeeb2e..5356814 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
@@ -161,77 +161,20 @@ namespace binfilter {
/*N*/ // fuer "unbenannt" (GetDataArea) kann neben dem Cursor legen, also muss auch ein
/*N*/ // benannter DB-Bereich dort gesucht werden.
/*N*/
-/*N*/ ScDBData* pData = aDocument.GetDBAtArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow );
+/*N*/ ScDBData* pData = NULL;
/*N*/
/*N*/ BOOL bSelected = ( bForceMark || rMarked.aStart != rMarked.aEnd );
/*N*/
-/*N*/ BOOL bUseThis = FALSE;
-/*N*/ if (pData)
-/*N*/ {
-/*N*/ // Bereich nehmen, wenn nichts anderes markiert
-/*N*/
-/*N*/ USHORT nDummy;
-/*N*/ USHORT nOldCol1;
-/*N*/ USHORT nOldRow1;
-/*N*/ USHORT nOldCol2;
-/*N*/ USHORT nOldRow2;
-/*N*/ pData->GetArea( nDummy, nOldCol1,nOldRow1, nOldCol2,nOldRow2 );
-/*N*/ BOOL bIsNoName = ( pData->GetName() == ScGlobal::GetRscString( STR_DB_NONAME ) );
-/*N*/
-/*N*/ if (!bSelected)
-/*N*/ {
-/*N*/ bUseThis = TRUE;
-/*N*/ if ( bIsNoName && eMode == SC_DB_MAKE )
-/*N*/ {
-/*N*/ // wenn nichts markiert, "unbenannt" auf zusammenhaengenden Bereich anpassen
-/*N*/ nStartCol = nCol;
-/*N*/ nStartRow = nRow;
-/*N*/ nEndCol = nStartCol;
-/*N*/ nEndRow = nStartRow;
-/*N*/ aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE );
-/*N*/ if ( nOldCol1 != nStartCol || nOldCol2 != nEndCol || nOldRow1 != nStartRow )
-/*N*/ bUseThis = FALSE; // passt gar nicht
-/*N*/ else if ( nOldRow2 != nEndRow )
-/*N*/ {
-/*N*/ // Bereich auf neue End-Zeile erweitern
-/*N*/ pData->SetArea( nTab, nOldCol1,nOldRow1, nOldCol2,nEndRow );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ if ( nOldCol1 == nStartCol && nOldRow1 == nStartRow &&
-/*N*/ nOldCol2 == nEndCol && nOldRow2 == nEndRow ) // genau markiert?
-/*N*/ bUseThis = TRUE;
-/*N*/ else
-/*N*/ bUseThis = FALSE; // immer Markierung nehmen (Bug 11964)
-/*N*/ }
-/*N*/
-/*N*/ // fuer Import nie "unbenannt" nehmen
-/*N*/
-/*N*/ if ( bUseThis && eMode == SC_DB_IMPORT && bIsNoName )
-/*N*/ bUseThis = FALSE;
-/*N*/ }
-/*N*/
-/*N*/ if ( bUseThis )
-/*N*/ {
-/*N*/ pData->GetArea( nStartTab, nStartCol,nStartRow, nEndCol,nEndRow );
-/*N*/ nEndTab = nStartTab;
-/*N*/ }
-/*N*/ else if ( eMode == SC_DB_OLD )
+/*N*/ if ( eMode == SC_DB_OLD )
/*N*/ {
/*N*/ pData = NULL; // nichts gefunden
/*N*/ nStartCol = nEndCol = nCol;
/*N*/ nStartRow = nEndRow = nRow;
/*N*/ nStartTab = nEndTab = nTab;
-/*N*/ // bMark = FALSE; // nichts zu markieren
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ if ( bSelected )
-/*N*/ {
-/*N*/ }
-/*N*/ else
+/*N*/ if ( !bSelected )
/*N*/ { // zusammenhaengender Bereich
/*N*/ nStartCol = nCol;
/*N*/ nStartRow = nRow;
@@ -336,19 +279,7 @@ namespace binfilter {
/*N*/ String lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea )
/*N*/ {
/*N*/ String aName;
-/*N*/ BOOL bOk = FALSE;
-/*N*/ ScDBData* pData = pDoc->GetDBAtArea( pArea->nTab, pArea->nColStart, pArea->nRowStart,
-/*N*/ pArea->nColEnd, pArea->nRowEnd );
-/*N*/ if (pData)
-/*N*/ {
-/*N*/ pData->GetName( aName );
-/*N*/ if ( aName != ScGlobal::GetRscString( STR_DB_NONAME ) )
-/*N*/ bOk = TRUE;
-/*N*/ }
-/*N*/
-/*N*/ if (!bOk)
-/*N*/ pDoc->GetName( pArea->nTab, aName );
-/*N*/
+/*N*/ pDoc->GetName( pArea->nTab, aName );
/*N*/ return aName;
/*N*/ }
diff --git a/binfilter/inc/bf_sc/dbcolect.hxx b/binfilter/inc/bf_sc/dbcolect.hxx
index 56e8378..9f2f077 100644
--- a/binfilter/inc/bf_sc/dbcolect.hxx
+++ b/binfilter/inc/bf_sc/dbcolect.hxx
@@ -217,18 +217,12 @@ public:
ScDBData* operator[]( const USHORT nIndex) const {return (ScDBData*)At(nIndex);}
virtual short Compare(DataObject* pKey1, DataObject* pKey2) const;
ScDBData* GetDBAtCursor(USHORT nCol, USHORT nRow, USHORT nTab, BOOL bStartOnly) const;
- ScDBData* GetDBAtArea(USHORT nTab, USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2) const;
BOOL Load( SvStream& rStream );
BOOL Store( SvStream& ) const {return FALSE;}
BOOL SearchName( const String& rName, USHORT& rIndex ) const;
- void UpdateReference(UpdateRefMode eUpdateRefMode,
- USHORT nCol1, USHORT nRow1, USHORT nTab1,
- USHORT nCol2, USHORT nRow2, USHORT nTab2,
- short nDx, short nDy, short nDz );
-
ScDBData* FindIndex(USHORT nIndex);
USHORT GetEntryIndex() { return nEntryIndex; }
void SetEntryIndex(USHORT nInd) { nEntryIndex = nInd; }
diff --git a/binfilter/inc/bf_sc/detfunc.hxx b/binfilter/inc/bf_sc/detfunc.hxx
index 187033f..79c22f9 100644
--- a/binfilter/inc/bf_sc/detfunc.hxx
+++ b/binfilter/inc/bf_sc/detfunc.hxx
@@ -142,8 +142,6 @@ public:
ScDetectiveObjType GetDetectiveObjectType( SdrObject* pObject,
ScAddress& rPosition, ScRange& rSource, BOOL& rRedLine );
- void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition,
- const ScRange& rSource, BOOL bRedLine );
static ColorData GetArrowColor();
static ColorData GetErrorColor();
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index 2db2110..f9fa60d 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -497,14 +497,10 @@ public:
ScDBCollection* GetDBCollection() const;
ScDBData* GetDBAtCursor(USHORT nCol, USHORT nRow, USHORT nTab,
BOOL bStartOnly = FALSE) const;
- ScDBData* GetDBAtArea(USHORT nTab, USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2) const;
-
ScDPCollection* GetDPCollection();
-
-
void UpdateChartArea( const String& rChartName,
const ScRangeListRef& rNewList,
BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd,
More information about the Libreoffice-commits
mailing list