[Libreoffice-commits] .: binfilter/bf_sch binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Aug 30 06:32:55 PDT 2011
binfilter/bf_sch/source/ui/app/sch_schlib.cxx | 78 ------
binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx | 24 -
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 4
binfilter/bf_sw/source/core/doc/sw_docchart.cxx | 221 ------------------
binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx | 269 ----------------------
binfilter/bf_sw/source/core/inc/layact.hxx | 1
binfilter/bf_sw/source/core/inc/swcache.hxx | 14 -
binfilter/bf_sw/source/core/layout/sw_layact.cxx | 16 -
binfilter/inc/bf_sch/schdll.hxx | 16 -
binfilter/inc/bf_sw/crsrsh.hxx | 3
binfilter/inc/bf_sw/swtable.hxx | 8
binfilter/inc/bf_sw/tblsel.hxx | 3
12 files changed, 657 deletions(-)
New commits:
commit f2188a360187f0f6f2eba095e2c1fb2cadf0a6bd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 12:59:45 2011 +0100
callcatcher: strip further
diff --git a/binfilter/bf_sch/source/ui/app/sch_schlib.cxx b/binfilter/bf_sch/source/ui/app/sch_schlib.cxx
index c233d5e..57963b4 100644
--- a/binfilter/bf_sch/source/ui/app/sch_schlib.cxx
+++ b/binfilter/bf_sch/source/ui/app/sch_schlib.cxx
@@ -171,84 +171,6 @@ extern "C" { static void SAL_CALL thisModule() {} }
/*************************************************************************
|*
-|*
-|*
-\************************************************************************/
-
-/*N*/ void SchDLL::GetDefaultForColumnText( const SchMemChart& rMemChart, sal_Int32 nCol, String& aResult )
-/*N*/ {
-/*N*/ void (__LOADONCALLAPI*fp)( const SchMemChart&, sal_Int32, String& );
-/*N*/
-/*N*/ fp = (void (__LOADONCALLAPI*)( const SchMemChart&, sal_Int32, String& ))GetFuncSch("SchGetDefaultForColumnText");
-/*N*/
-/*N*/ if( fp )
-/*N*/ {
-/*N*/ fp( rMemChart, nCol, aResult );
-/*N*/ }
-/*N*/ }
-
-/*N*/ void SchDLL::GetDefaultForRowText( const SchMemChart& rMemChart, sal_Int32 nRow, String& aResult )
-/*N*/ {
-/*N*/ void (__LOADONCALLAPI*fp)( const SchMemChart&, sal_Int32, String& );
-/*N*/
-/*N*/ fp = (void (__LOADONCALLAPI*)( const SchMemChart&, sal_Int32, String& ))GetFuncSch("SchGetDefaultForRowText");
-/*N*/
-/*N*/ if( fp )
-/*N*/ {
-/*N*/ fp( rMemChart, nRow, aResult );
-/*N*/ }
-/*N*/ }
-
-/*N*/ void SchDLL::ConvertChartRangeForWriter( SchMemChart& rMemChart,
-/*N*/ BOOL bOldToNew )
-/*N*/ {
-/*N*/ void (__LOADONCALLAPI* fp )( SchMemChart&, BOOL )
-/*N*/ = (void (__LOADONCALLAPI*)( SchMemChart&, BOOL ))
-/*N*/ GetFuncSch("SchConvertChartRangeForWriter");
-/*N*/ if( fp )
-/*N*/ fp( rMemChart, bOldToNew );
-/*N*/ }
-
-/*N*/ void SchDLL::MemChartInsertCols( SchMemChart& rMemChart,
-/*N*/ short nAtCol, short nCount)
-/*N*/ {
-/*N*/ void (__LOADONCALLAPI* fp )( SchMemChart&, short, short )
-/*N*/ = (void (__LOADONCALLAPI*)( SchMemChart&, short, short ))
-/*N*/ GetFuncSch("SchMemChartInsertCols");
-/*N*/ if( fp )
-/*N*/ fp( rMemChart, nAtCol, nCount );
-/*N*/ }
-/*?*/ void SchDLL::MemChartRemoveCols( SchMemChart& rMemChart,
-/*?*/ short nAtCol, short nCount)
-/*?*/ {
-/*?*/ void (__LOADONCALLAPI* fp )( SchMemChart&, short, short )
-/*?*/ = (void (__LOADONCALLAPI*)( SchMemChart&, short, short ))
-/*?*/ GetFuncSch("SchMemChartRemoveCols");
-/*?*/ if( fp )
-/*?*/ fp( rMemChart, nAtCol, nCount );
-/*?*/ }
-
-/*N*/ void SchDLL::MemChartInsertRows( SchMemChart& rMemChart,
-/*N*/ short nAtRow, short nCount )
-/*N*/ {
-/*N*/ void (__LOADONCALLAPI* fp )( SchMemChart&, short, short )
-/*N*/ = (void (__LOADONCALLAPI*)( SchMemChart&, short, short ))
-/*N*/ GetFuncSch("SchMemChartInsertRows");
-/*N*/ if( fp )
-/*N*/ fp( rMemChart, nAtRow, nCount );
-/*N*/ }
-/*?*/ void SchDLL::MemChartRemoveRows( SchMemChart& rMemChart,
-/*?*/ short nAtRow, short nCount )
-/*?*/ {
-/*?*/ void (__LOADONCALLAPI* fp )( SchMemChart&, short, short )
-/*?*/ = (void (__LOADONCALLAPI*)( SchMemChart&, short, short ))
-/*?*/ GetFuncSch("SchMemChartRemoveRows");
-/*?*/ if( fp )
-/*?*/ fp( rMemChart, nAtRow, nCount );
-/*?*/ }
-
-/*************************************************************************
-|*
|* Lade Module von aussen
|*
\************************************************************************/
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
index 2873762..840f59b 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
@@ -461,30 +461,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* SwCache::SetLRUOfst()
-|*
-|*************************************************************************/
-
-
-/*N*/ void SwCache::SetLRUOfst( const USHORT nOfst )
-/*N*/ {
-/*N*/ if ( !pRealFirst || ((Count() - aFreePositions.Count()) < nOfst) )
-/*N*/ return;
-/*N*/
-/*N*/ CHECK;
-/*N*/ pFirst = pRealFirst;
-/*N*/ for ( USHORT i = 0; i < Count() && i < nOfst; ++i )
-/*N*/ {
-/*N*/ if ( pFirst->GetNext() && pFirst->GetNext()->GetNext() )
-/*N*/ pFirst = pFirst->GetNext();
-/*N*/ else
-/*N*/ break;
-/*N*/ }
-/*N*/ CHECK;
-/*N*/ }
-
-/*************************************************************************
-|*
|* SwCacheObj::SwCacheObj()
|*
|*************************************************************************/
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 31b2657..4eda951 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -270,10 +270,6 @@ using namespace ::com::sun::star::util;
/*N*/ pUnoCrsr ? TRUE : FALSE;
/*N*/ }
-// gebe den TabellenCrsr zurueck
-/*N*/ const SwPaM* SwCrsrShell::GetTblCrs() const { return pTblCrsr; }
-/*N*/ SwPaM* SwCrsrShell::GetTblCrs() { return pTblCrsr; }
-
// Abfrage, ob ueberhaupt eine Selektion existiert, sprich der akt. Cursor
// aufgespannt oder nicht der einzigste ist.
diff --git a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
index ec7ab2d..1d510f3 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
@@ -56,227 +56,6 @@
#include <cellatr.hxx>
namespace binfilter {
-
-/*N*/ SchMemChart *SwTable::UpdateData( SchMemChart* pData,
-/*N*/ const String* pSelection ) const
-/*N*/ {
-/*N*/ SwCalc aCalc( *GetFrmFmt()->GetDoc() );
-/*N*/ SwTblCalcPara aCalcPara( aCalc, *this );
-/*N*/ String sSelection, sRowColInfo;
-/*N*/ BOOL bSetChartRange = TRUE;
-/*N*/
-/*N*/ // worauf bezieht sich das Chart?
-/*N*/ if( pData && pData->SomeData1().Len() )
-/*N*/ {
-/*?*/ sSelection = pData->SomeData1();
-/*?*/ sRowColInfo = pData->SomeData2();
-/*N*/ }
-/*N*/ else if( pData && pData->GetChartRange().maRanges.size() )
-/*N*/ {
-/*?*/ SchDLL::ConvertChartRangeForWriter( *pData, FALSE );
-/*?*/ sSelection = pData->SomeData1();
-/*?*/ sRowColInfo = pData->SomeData2();
-/*?*/ bSetChartRange = FALSE;
-/*N*/ }
-/*N*/ else if( pSelection )
-/*N*/ {
-/*?*/ sSelection = *pSelection;
-/*?*/ sRowColInfo.AssignAscii( RTL_CONSTASCII_STRINGPARAM("11") );
-/*N*/ }
-/*N*/
-/*N*/ SwChartLines aLines1;
-/*N*/ if( !IsTblComplexForChart( sSelection, &aLines1 ))
-/*N*/ {
-/*N*/ USHORT nLines = aLines1.Count(), nBoxes = aLines1[0]->Count();
-/*N*/
-/*N*/ if( !pData )
-/*N*/ {
-/*N*/ //JP 08.02.99: als default wird mit Spalten/Zeilenueberschrift
-/*N*/ // eingefuegt, deshalb das -1
-/*?*/ pData = SchDLL::NewMemChart( nBoxes-1, nLines-1 );
-/*?*/ pData->SetSubTitle( aEmptyStr );
-/*?*/ pData->SetXAxisTitle( aEmptyStr );
-/*?*/ pData->SetYAxisTitle( aEmptyStr );
-/*?*/ pData->SetZAxisTitle( aEmptyStr );
-/*N*/ }
-/*N*/
-/*N*/ USHORT nRowStt = 0, nColStt = 0;
-/*N*/ if( sRowColInfo.Len() )
-/*N*/ {
-/*?*/ if( '1' == sRowColInfo.GetChar( 0 ))
-/*?*/ ++nRowStt;
-/*?*/ if( '1' == sRowColInfo.GetChar( 1 ))
-/*?*/ ++nColStt;
-/*N*/ }
-/*N*/
-/*N*/ if( (nBoxes - nColStt) > pData->GetColCount() )
-/*N*/ SchDLL::MemChartInsertCols( *pData, 0, (nBoxes - nColStt) - pData->GetColCount() );
-/*N*/ else if( (nBoxes - nColStt) < pData->GetColCount() )
-/*?*/ SchDLL::MemChartRemoveCols( *pData, 0, pData->GetColCount() - (nBoxes - nColStt) );
-/*N*/
-/*N*/ if( (nLines - nRowStt) > pData->GetRowCount() )
-/*N*/ SchDLL::MemChartInsertRows( *pData, 0, (nLines - nRowStt) - pData->GetRowCount() );
-/*N*/ else if( (nLines - nRowStt) < pData->GetRowCount() )
-/*?*/ SchDLL::MemChartRemoveRows( *pData, 0, pData->GetRowCount() - (nLines - nRowStt) );
-/*N*/
-/*N*/
-/*N*/ OSL_ENSURE( pData->GetRowCount() >= (nLines - nRowStt ) &&
-/*N*/ pData->GetColCount() >= (nBoxes - nColStt ),
-/*N*/ "Die Struktur fuers Chart ist zu klein,\n"
-/*N*/ "es wird irgendwo in den Speicher geschrieben!" );
-/*N*/
-/*N*/ // Row-Texte setzen
-/*N*/ USHORT n;
-/*N*/ if( nRowStt )
-/*?*/ for( n = nColStt; n < nBoxes; ++n )
-/*?*/ {
-/*?*/ const SwTableBox *pBox = (*aLines1[ 0 ])[ n ];
-/*?*/ OSL_ENSURE( pBox->GetSttNd(), "Box without SttIdx" );
-/*?*/ SwNodeIndex aIdx( *pBox->GetSttNd(), 1 );
-/*?*/ const SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
-/*?*/ if( !pTNd )
-/*?*/ pTNd = aIdx.GetNodes().GoNextSection( &aIdx, TRUE, FALSE )
-/*?*/ ->GetTxtNode();
-/*?*/
-/*?*/ pData->SetColText( n - nColStt, pTNd->GetExpandTxt() );
-/*?*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ String aText;
-/*N*/ for( n = nColStt; n < nBoxes; ++n )
-/*N*/ {
-/*N*/ SchDLL::GetDefaultForColumnText( *pData, n - nColStt, aText );
-/*N*/ pData->SetColText( n - nColStt, aText );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // Col-Texte setzen
-/*N*/ if( nColStt )
-/*N*/ for( n = nRowStt; n < nLines; ++n )
-/*N*/ {
-/*N*/ const SwTableBox *pBox = (*aLines1[ n ])[ 0 ];
-/*N*/ OSL_ENSURE( pBox->GetSttNd(), "Box without SttIdx" );
-/*N*/ SwNodeIndex aIdx( *pBox->GetSttNd(), 1 );
-/*N*/ const SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
-/*N*/ if( !pTNd )
-/*N*/ pTNd = aIdx.GetNodes().GoNextSection( &aIdx, TRUE, FALSE )
-/*N*/ ->GetTxtNode();
-/*N*/
-/*N*/ pData->SetRowText( n - nRowStt, pTNd->GetExpandTxt() );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ String aText;
-/*N*/ for( n = nRowStt; n < nLines; ++n )
-/*N*/ {
-/*N*/ SchDLL::GetDefaultForRowText( *pData, n - nRowStt, aText );
-/*N*/ pData->SetRowText( n - nRowStt, aText );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // und dann fehlen nur noch die Daten
-/*N*/ const SwTblBoxNumFormat& rDfltNumFmt = *(SwTblBoxNumFormat*)
-/*N*/ GetDfltAttr( RES_BOXATR_FORMAT );
-/*N*/ pData->SetNumberFormatter( GetFrmFmt()->GetDoc()->GetNumberFormatter());
-/*N*/
-/*N*/ int bFirstRow = TRUE;
-/*N*/ for( n = nRowStt; n < nLines; ++n )
-/*N*/ {
-/*N*/ for( USHORT i = nColStt; i < nBoxes; ++i )
-/*N*/ {
-/*N*/ const SwTableBox* pBox = (*aLines1[ n ])[ i ];
-/*N*/ OSL_ENSURE( pBox->GetSttNd(), "Box without SttIdx" );
-/*N*/ SwNodeIndex aIdx( *pBox->GetSttNd(), 1 );
-/*N*/ const SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
-/*N*/ if( !pTNd )
-/*?*/ pTNd = aIdx.GetNodes().GoNextSection( &aIdx, TRUE, FALSE )
-/*?*/ ->GetTxtNode();
-/*N*/
-/*N*/ pData->SetData( short( i - nColStt ),
-/*N*/ short( n - nRowStt ),
-/*N*/ pTNd->GetTxt().Len()
-/*N*/ ? pBox->GetValue( aCalcPara )
-/*N*/ : DBL_MIN );
-/*N*/
-/*N*/ if( i == nColStt || bFirstRow )
-/*N*/ {
-/*N*/ // first box of row set the numberformat
-/*N*/ const SwTblBoxNumFormat& rNumFmt = pBox->GetFrmFmt()->
-/*N*/ GetTblBoxNumFmt();
-/*N*/ if( rNumFmt != rDfltNumFmt )
-/*N*/ {
-/*?*/ pData->SetNumFormatIdCol( i, rNumFmt.GetValue() );
-/*?*/ if( bFirstRow )
-/*?*/ pData->SetNumFormatIdRow( n, rNumFmt.GetValue() );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ bFirstRow = FALSE;
-/*N*/ }
-/*N*/ }
-/*N*/ else if( pData )
-/*N*/ {
-/*?*/ if( pData->GetColCount() )
-/*?*/ SchDLL::MemChartRemoveCols( *pData, 0, pData->GetColCount() );
-/*?*/ if( pData->GetRowCount() )
-/*?*/ SchDLL::MemChartRemoveRows( *pData, 0, pData->GetRowCount() );
-/*N*/ }
-/*N*/ else
-/*?*/ bSetChartRange = FALSE;
-/*N*/
-/*N*/ if( bSetChartRange )
-/*N*/ {
-/*N*/ // convert the selection string to the SchartRanges
-/*N*/ pData->SomeData1() = sSelection;
-/*N*/ pData->SomeData2() = sRowColInfo;
-/*N*/ SchDLL::ConvertChartRangeForWriter( *pData, TRUE );
-/*N*/ }
-/*N*/
-/*N*/ return pData;
-/*N*/ }
-
-/*N*/ BOOL SwTable::IsTblComplexForChart( const String& rSelection,
-/*N*/ SwChartLines* pGetCLines ) const
-/*N*/ {
-/*N*/ const SwTableBox* pSttBox, *pEndBox;
-/*N*/ if( 2 < rSelection.Len() )
-/*N*/ {
-/*N*/ // spitze Klammern am Anfang & Ende enfernen
-/*?*/ String sBox( rSelection );
-/*?*/ if( '<' == sBox.GetChar( 0 ) ) sBox.Erase( 0, 1 );
-/*?*/ if( '>' == sBox.GetChar( sBox.Len()-1 ) ) sBox.Erase( sBox.Len()-1 );
-/*?*/
-/*?*/ xub_StrLen nTrenner = sBox.Search( ':' );
-/*?*/ OSL_ENSURE( STRING_NOTFOUND != nTrenner, "keine gueltige Selektion" );
-/*?*/
-/*?*/ pSttBox = GetTblBox( sBox.Copy( 0, nTrenner ));
-/*?*/ pEndBox = GetTblBox( sBox.Copy( nTrenner+1 ));
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ const SwTableLines* pLns = &GetTabLines();
-/*N*/ pSttBox = (*pLns)[ 0 ]->GetTabBoxes()[ 0 ];
-/*N*/ while( !pSttBox->GetSttNd() )
-/*N*/ // bis zur Content Box!
-/*?*/ pSttBox = pSttBox->GetTabLines()[ 0 ]->GetTabBoxes()[ 0 ];
-/*N*/
-/*N*/ const SwTableBoxes* pBoxes = &(*pLns)[ pLns->Count()-1 ]->GetTabBoxes();
-/*N*/ pEndBox = (*pBoxes)[ pBoxes->Count()-1 ];
-/*N*/ while( !pEndBox->GetSttNd() )
-/*N*/ {
-/*N*/ // bis zur Content Box!
-/*?*/ pLns = &pEndBox->GetTabLines();
-/*?*/ pBoxes = &(*pLns)[ pLns->Count()-1 ]->GetTabBoxes();
-/*?*/ pEndBox = (*pBoxes)[ pBoxes->Count()-1 ];
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ return !pSttBox || !pEndBox || !::binfilter::ChkChartSel( *pSttBox->GetSttNd(),
-/*N*/ *pEndBox->GetSttNd(), pGetCLines );
-/*N*/ }
-
-
-
/*N*/ IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, EMPTYARG )
/*N*/ {
/*N*/ return 0;
diff --git a/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx b/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx
index f9616fe..36198fa 100644
--- a/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx
+++ b/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx
@@ -247,275 +247,6 @@ namespace binfilter {
/*N*/ OSL_ENSURE( nLoopMax, "das Layout der Tabelle wurde nicht valide!" );
/*N*/ }
-
-
-/*N*/ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
-/*N*/ SwChartLines* pGetCLines )
-/*N*/ {
-/*N*/ const SwTableNode* pTNd = rSttNd.FindTableNode();
-/*N*/ if( !pTNd )
-/*N*/ return FALSE;
-/*N*/
-/*N*/ Point aNullPos;
-/*N*/ SwNodeIndex aIdx( rSttNd );
-/*N*/ const SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
-/*N*/ if( !pCNd )
-/*N*/ pCNd = aIdx.GetNodes().GoNextSection( &aIdx, FALSE, FALSE );
-/*N*/
-/*N*/ // #109394# if table is invisible, return
-/*N*/ // (layout needed for forming table selection further down, so we can't
-/*N*/ // continue with invisible tables)
-/*N*/ if( pCNd->GetFrm() == NULL )
-/*N*/ return FALSE;
-/*N*/
-/*N*/ const SwLayoutFrm *pStart = pCNd ? pCNd->GetFrm( &aNullPos )->GetUpper() : 0;
-/*N*/ OSL_ENSURE( pStart, "ohne Frame geht gar nichts" );
-/*N*/
-/*N*/ aIdx = rEndNd;
-/*N*/ pCNd = aIdx.GetNode().GetCntntNode();
-/*N*/ if( !pCNd )
-/*N*/ pCNd = aIdx.GetNodes().GoNextSection( &aIdx, FALSE, FALSE );
-/*N*/
-/*N*/ const SwLayoutFrm *pEnd = pCNd ? pCNd->GetFrm( &aNullPos )->GetUpper() : 0;
-/*N*/ OSL_ENSURE( pEnd, "ohne Frame geht gar nichts" );
-/*N*/
-/*N*/
-/*N*/ //Muss ein HeadlineRepeat beachtet werden?
-/*N*/ const BOOL bRepeat = pTNd->GetTable().IsHeadlineRepeat();
-/*N*/
-/*N*/ BOOL bTblIsValid, bValidChartSel;
-/*N*/ int nLoopMax = 100; //JP 28.06.99: max 100 loops - Bug 67292
-/*N*/ do {
-/*N*/ bTblIsValid = TRUE;
-/*N*/ bValidChartSel = TRUE;
-/*N*/
-/*N*/ USHORT nRowCells = USHRT_MAX;
-/*N*/
-/*N*/ //Zuerst lassen wir uns die Tabellen und die Rechtecke heraussuchen.
-/*N*/ SwSelUnions aUnions;
-/*N*/ ::binfilter::MakeSelUnions( aUnions, pStart, pEnd, TBLSEARCH_NO_UNION_CORRECT );
-/*N*/
-/*N*/ //Jetzt zu jedem Eintrag die Boxen herausfischen und uebertragen.
- USHORT i=0;
-/*N*/ for( i = 0; i < aUnions.Count() && bTblIsValid &&
-/*N*/ bValidChartSel; ++i )
-/*N*/ {
-/*N*/ SwSelUnion *pUnion = aUnions[i];
-/*N*/ const SwTabFrm *pTable = pUnion->GetTable();
-/*N*/
-/*N*/ SWRECTFN( pTable )
-/*N*/ #ifdef BIDI
-/*N*/ sal_Bool bRTL = pTable->IsRightToLeft();
-/*N*/ #endif
-/*N*/
-/*N*/ if( !pTable->IsValid() && nLoopMax )
-/*N*/ {
-/*N*/ bTblIsValid = FALSE;
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ _Sort_CellFrms aCellFrms;
-/*N*/
-/*N*/ const SwLayoutFrm *pRow = (const SwLayoutFrm*)pTable->Lower();
-/*N*/ //Wenn die Row eine wiederholte Headline ist wird sie nicht
-/*N*/ //beachtet.
-/*N*/ if( bRepeat && pTable->IsFollow() )
-/*N*/ pRow = (const SwLayoutFrm*)pRow->GetNext();
-/*N*/
-/*N*/ while( pRow && bTblIsValid && bValidChartSel )
-/*N*/ {
-/*N*/ if( !pRow->IsValid() && nLoopMax )
-/*N*/ {
-/*N*/ bTblIsValid = FALSE;
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ if( pRow->Frm().IsOver( pUnion->GetUnion() ) )
-/*N*/ {
-/*N*/ const SwLayoutFrm *pCell = pRow->FirstCell();
-/*N*/
-/*N*/ while( bValidChartSel && bTblIsValid && pCell &&
-/*N*/ pRow->IsAnLower( pCell ) )
-/*N*/ {
-/*N*/ if( !pCell->IsValid() && nLoopMax )
-/*N*/ {
-/*N*/ bTblIsValid = FALSE;
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Celle" );
-/*N*/ const SwRect& rUnion = pUnion->GetUnion(),
-/*N*/ & rFrmRect = pCell->Frm();
-/*N*/
-/*N*/ const long nUnionRight = rUnion.Right();
-/*N*/ const long nUnionBottom = rUnion.Bottom();
-/*N*/ const long nFrmRight = rFrmRect.Right();
-/*N*/ const long nFrmBottom = rFrmRect.Bottom();
-/*N*/
-/*N*/ // liegt das FrmRect ausserhalb der Union, kann es
-/*N*/ // ignoriert werden.
-/*N*/
-/*N*/ const long nXFuzzy = bVert ? 0 : 20;
-/*N*/ const long nYFuzzy = bVert ? 20 : 0;
-/*N*/
-/*N*/ if( !( rUnion.Top() + nYFuzzy > nFrmBottom ||
-/*N*/ nUnionBottom < rFrmRect.Top() + nYFuzzy ||
-/*N*/ rUnion.Left() + nXFuzzy > nFrmRight ||
-/*N*/ nUnionRight < rFrmRect.Left() + nXFuzzy ))
-/*N*/ {
-/*N*/ // ok, rUnion is _not_ completely outside of rFrmRect
-/*N*/
-/*N*/ // wenn es aber nicht komplett in der Union liegt,
-/*N*/ // dann ist es fuers Chart eine ungueltige
-/*N*/ // Selektion.
-/*N*/ if( rUnion.Left() <= rFrmRect.Left() + nXFuzzy &&
-/*N*/ rFrmRect.Left() <= nUnionRight &&
-/*N*/ rUnion.Left() <= nFrmRight &&
-/*N*/ nFrmRight <= nUnionRight + nXFuzzy &&
-/*N*/ rUnion.Top() <= rFrmRect.Top() + nYFuzzy &&
-/*N*/ rFrmRect.Top() <= nUnionBottom &&
-/*N*/ rUnion.Top() <= nFrmBottom &&
-/*N*/ nFrmBottom <= nUnionBottom+ nYFuzzy )
-/*N*/
-/*N*/ aCellFrms.Insert(
-/*N*/ _Sort_CellFrm( *(SwCellFrm*)pCell ),
-/*N*/ aCellFrms.Count() );
-/*N*/ else
-/*N*/ {
-/*N*/ bValidChartSel = FALSE;
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ if ( pCell->GetNext() )
-/*N*/ {
-/*N*/ pCell = (const SwLayoutFrm*)pCell->GetNext();
-/*N*/ if ( pCell->Lower()->IsRowFrm() )
-/*N*/ pCell = pCell->FirstCell();
-/*N*/ }
-/*N*/ else
-/*N*/ pCell = ::binfilter::lcl_FindNextCellFrm( pCell );
-/*N*/ }
-/*N*/ }
-/*N*/ pRow = (const SwLayoutFrm*)pRow->GetNext();
-/*N*/ }
-/*N*/
-/*N*/ if( !bValidChartSel )
-/*N*/ break;
-/*N*/
-/*N*/ // alle Zellen der (Teil-)Tabelle zusammen. Dann teste mal ob
-/*N*/ // all huebsch nebeneinander liegen.
-/*N*/ USHORT n, nEnd, nCellCnt = 0;
-/*N*/ long nYPos = LONG_MAX, nXPos(0), nHeight(0);
-/*N*/
-/*N*/ for( n = 0, nEnd = aCellFrms.Count(); n < nEnd; ++n )
-/*N*/ {
-/*N*/ const _Sort_CellFrm& rCF = aCellFrms[ n ];
-/*N*/ if( (rCF.pFrm->Frm().*fnRect->fnGetTop)() != nYPos )
-/*N*/ {
-/*N*/ // neue Zeile
-/*N*/ if( n )
-/*N*/ {
-/*N*/ if( USHRT_MAX == nRowCells ) // 1. Zeilenwechsel
-/*N*/ nRowCells = nCellCnt;
-/*N*/ else if( nRowCells != nCellCnt )
-/*N*/ {
-/*N*/ bValidChartSel = FALSE;
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ nCellCnt = 1;
-/*N*/ nYPos = (rCF.pFrm->Frm().*fnRect->fnGetTop)();
-/*N*/ nHeight = (rCF.pFrm->Frm().*fnRect->fnGetHeight)();
-/*N*/
-/*N*/ #ifdef BIDI
-/*N*/ nXPos = bRTL ?
-/*N*/ (rCF.pFrm->Frm().*fnRect->fnGetLeft)() :
-/*N*/ (rCF.pFrm->Frm().*fnRect->fnGetRight)();
-/*N*/ }
-/*N*/ else if( nXPos == ( bRTL ?
-/*N*/ (rCF.pFrm->Frm().*fnRect->fnGetRight)() :
-/*N*/ (rCF.pFrm->Frm().*fnRect->fnGetLeft)() ) &&
-/*N*/ nHeight == (rCF.pFrm->Frm().*fnRect->fnGetHeight)() )
-/*N*/ {
-/*N*/ nXPos += ( bRTL ? (-1) : 1 ) *
-/*N*/ (rCF.pFrm->Frm().*fnRect->fnGetWidth)();
-/*N*/ ++nCellCnt;
-/*N*/ }
-/*N*/
-/*N*/ #else
-/*N*/ nXPos = (rCF.pFrm->Frm().*fnRect->fnGetRight)();
-/*N*/ }
-/*N*/ else if( nXPos == (rCF.pFrm->Frm().*fnRect->fnGetLeft)() &&
-/*N*/ nHeight == (rCF.pFrm->Frm().*fnRect->fnGetHeight)() )
-/*N*/ {
-/*N*/ nXPos += (rCF.pFrm->Frm().*fnRect->fnGetWidth)();
-/*N*/ ++nCellCnt;
-/*N*/ }
-/*N*/ #endif
-/*N*/ else
-/*N*/ {
-/*N*/ bValidChartSel = FALSE;
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ if( bValidChartSel )
-/*N*/ {
-/*N*/ if( USHRT_MAX == nRowCells )
-/*N*/ nRowCells = nCellCnt;
-/*N*/ else if( nRowCells != nCellCnt )
-/*N*/ bValidChartSel = FALSE;
-/*N*/ }
-/*N*/
-/*N*/ if( bValidChartSel && pGetCLines )
-/*N*/ {
-/*N*/ nYPos = LONG_MAX;
-/*N*/ SwChartBoxes* pBoxes;
-/*N*/ for( n = 0, nEnd = aCellFrms.Count(); n < nEnd; ++n )
-/*N*/ {
-/*N*/ const _Sort_CellFrm& rCF = aCellFrms[ n ];
-/*N*/ if( (rCF.pFrm->Frm().*fnRect->fnGetTop)() != nYPos )
-/*N*/ {
-/*N*/ pBoxes = new SwChartBoxes( 255 < nRowCells
-/*N*/ ? 255 : (BYTE)nRowCells);
-/*N*/ pGetCLines->C40_INSERT( SwChartBoxes, pBoxes, pGetCLines->Count() );
-/*N*/ nYPos = (rCF.pFrm->Frm().*fnRect->fnGetTop)();
-/*N*/ }
-/*N*/ SwTableBoxPtr pBox = (SwTableBox*)rCF.pFrm->GetTabBox();
-/*N*/ pBoxes->Insert( pBox, pBoxes->Count() );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( bTblIsValid )
-/*N*/ break;
-/*N*/
-/*N*/ // ansonsten das Layout der Tabelle kurz "kalkulieren" lassen
-/*N*/ // und nochmals neu aufsetzen
-/*N*/ SwTabFrm *pTable = aUnions[0]->GetTable();
-/*N*/ for( i = 0; i < aUnions.Count(); ++i )
-/*N*/ {
-/*N*/ if( pTable->IsValid() )
-/*N*/ pTable->InvalidatePos();
-/*N*/ pTable->SetONECalcLowers();
-/*N*/ pTable->Calc();
-/*N*/ pTable->SetCompletePaint();
-/*N*/ if( 0 == (pTable = pTable->GetFollow()) )
-/*N*/ break;
-/*N*/ }
-/*N*/ --nLoopMax;
-/*N*/ if( pGetCLines )
-/*N*/ pGetCLines->DeleteAndDestroy( 0, pGetCLines->Count() );
-/*N*/ } while( TRUE );
-/*N*/
-/*N*/ OSL_ENSURE( nLoopMax, "das Layout der Tabelle wurde nicht valide!" );
-/*N*/
-/*N*/ if( !bValidChartSel && pGetCLines )
-/*N*/ pGetCLines->DeleteAndDestroy( 0, pGetCLines->Count() );
-/*N*/
-/*N*/ return bValidChartSel;
-/*N*/ }
-
-
/*N*/ BOOL IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell )
/*N*/ {
/*N*/ #ifdef VERTICAL_LAYOUT
diff --git a/binfilter/bf_sw/source/core/inc/layact.hxx b/binfilter/bf_sw/source/core/inc/layact.hxx
index 81c1a0c..aa0ee34 100644
--- a/binfilter/bf_sw/source/core/inc/layact.hxx
+++ b/binfilter/bf_sw/source/core/inc/layact.hxx
@@ -186,7 +186,6 @@ public:
inline void SetCheckPageNumDirect( USHORT nNew ) { nCheckPageNum = nNew; }
void Action(); //Jetzt gehts loos...
- void Reset(); //Zurueck auf CTor-Defaults.
BOOL IsAgain() const { return bAgain; }
BOOL IsComplete() const { return bComplete; }
diff --git a/binfilter/bf_sw/source/core/inc/swcache.hxx b/binfilter/bf_sw/source/core/inc/swcache.hxx
index e6268b9..544cd61 100644
--- a/binfilter/bf_sw/source/core/inc/swcache.hxx
+++ b/binfilter/bf_sw/source/core/inc/swcache.hxx
@@ -133,10 +133,7 @@ public:
BOOL Insert( SwCacheObj *pNew );
void Delete( const void *pOwner );
-// void Delete( const void *pOwner, const USHORT nIndex );
- void SetLRUOfst( const USHORT nOfst ); //nOfst sagt wieviele unangetastet
- //bleiben sollen.
void ResetLRUOfst() { pFirst = pRealFirst; }
inline void IncreaseMax( const USHORT nAdd );
@@ -147,17 +144,6 @@ public:
inline SwCacheObj *Next( SwCacheObj *pCacheObj);
};
-//Cache-Manipulation auf die sichere Art.
-class SwSaveSetLRUOfst
-{
- SwCache &rCache;
-public:
- SwSaveSetLRUOfst( SwCache &rC, const USHORT nOfst )
- : rCache( rC ) { rCache.SetLRUOfst( nOfst ); }
-
- ~SwSaveSetLRUOfst() { rCache.ResetLRUOfst(); }
-};
-
//Das allgemeine CacheObjekt. Anwender des Cache muessen eine Klasse vom
//CacheObjekt ableiten und dort die Nutzdaten unterbringen.
diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
index 36fbdf3..1005a60 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
@@ -425,22 +425,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* SwLayAction::Reset()
-|*
-|*************************************************************************/
-/*N*/ void SwLayAction::Reset()
-/*N*/ {
-/*N*/ pOptTab = 0;
-/*N*/ nStartTicks = Ticks();
-/*N*/ nInputType = 0;
-/*N*/ nEndPage = nPreInvaPage = nCheckPageNum = USHRT_MAX;
-/*N*/ bPaint = bComplete = bWaitAllowed = bCheckPages = TRUE;
-/*N*/ bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule =
-/*N*/ bUpdateExpFlds = bBrowseActionStop = FALSE;
-/*N*/ }
-
-/*************************************************************************
-|*
|* SwLayAction::RemoveEmptyBrowserPages()
|*
|*************************************************************************/
diff --git a/binfilter/inc/bf_sch/schdll.hxx b/binfilter/inc/bf_sch/schdll.hxx
index cb4714a..30d3592 100644
--- a/binfilter/inc/bf_sch/schdll.hxx
+++ b/binfilter/inc/bf_sch/schdll.hxx
@@ -85,22 +85,6 @@ public:
static SchMemChart* GetChartData( SvInPlaceObjectRef aIPObj );
static SchMemChart* NewMemChart( short nCols, short nRows );
-
- static void GetDefaultForColumnText( const SchMemChart& rMemChart, sal_Int32 nCol, String& aResult );
- static void GetDefaultForRowText( const SchMemChart& rMemChart, sal_Int32 nRow, String& aResult );
-
- static void ConvertChartRangeForWriter( SchMemChart& rMemChart,
- BOOL bOldToNew );
-
- static void MemChartInsertCols( SchMemChart& rMemChart,
- short nAtCol, short nCount);
- static void MemChartRemoveCols( SchMemChart& rMemChart,
- short nAtCol, short nCount);
-
- static void MemChartInsertRows( SchMemChart& rMemChart,
- short nAtRow, short nCount);
- static void MemChartRemoveRows( SchMemChart& rMemChart,
- short nAtRow, short nCount);
};
/*-------------------------------------------------------------------------
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index 3325ba5..cc31bb6 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -306,9 +306,6 @@ public:
*/
const SwRect &GetCharRect() const { return aCharRect; }
- const SwPaM* GetTblCrs() const;
- SwPaM* GetTblCrs();
-
// ist der Crsr in einer Tabelle und ist die Selection ueber
// zwei Spalten
bool IsTableMode() const { return 0 != pTblCrsr; }
diff --git a/binfilter/inc/bf_sw/swtable.hxx b/binfilter/inc/bf_sw/swtable.hxx
index 40ef913..f3c0e06 100644
--- a/binfilter/inc/bf_sw/swtable.hxx
+++ b/binfilter/inc/bf_sw/swtable.hxx
@@ -159,10 +159,6 @@ public:
// returnt TRUE wenn sich in der Tabelle Verschachtelungen befinden
BOOL IsTblComplex() const;
- //returnt TRUE wenn die Tabelle oder Selektion ausgeglichen ist
- BOOL IsTblComplexForChart( const String& rSel,
- SwChartLines* pGetCLines = 0 ) const;
-
// suche alle Inhaltstragenden-Boxen der Grundline in der diese Box
// steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen
//JP 31.01.97: bToTop = TRUE -> hoch bis zur Grundline,
@@ -184,10 +180,6 @@ public:
const SwServerObject* GetObject() const { return &refObj; }
SwServerObject* GetObject() { return &refObj; }
- //Daten fuer das Chart fuellen.
- SchMemChart *UpdateData( SchMemChart *pData,
- const String* pSelection = 0 ) const;
-
TblChgMode GetTblChgMode() const { return eTblChgMode; }
void SetTblChgMode( TblChgMode eMode ) { eTblChgMode = eMode; }
diff --git a/binfilter/inc/bf_sw/tblsel.hxx b/binfilter/inc/bf_sw/tblsel.hxx
index cdf0afa..490f121 100644
--- a/binfilter/inc/bf_sw/tblsel.hxx
+++ b/binfilter/inc/bf_sw/tblsel.hxx
@@ -80,9 +80,6 @@ BOOL GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
SV_DECL_PTRARR( SwChartBoxes, SwTableBoxPtr, 16, 16)
SV_DECL_PTRARR_DEL( SwChartLines, SwChartBoxes*, 25, 50)
-BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
- SwChartLines* pGetCLines = 0 );
-
// teste ob die Celle in die SSelection gehoert
// (wurde eine Funktion, damit GetTblSel() und MakeTblCrsr() immer
// das "gleiche Verstaendnis" fuer die Selektion haben)
More information about the Libreoffice-commits
mailing list