[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Sep 10 13:03:04 PDT 2011
binfilter/bf_sc/source/ui/app/sc_sclib.cxx | 12 ---
binfilter/bf_sc/source/ui/app/sc_scmod.cxx | 52 ++-------------
binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx | 9 +-
binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx | 22 ------
binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx | 13 ---
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 70 --------------------
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 22 ------
binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx | 5 -
binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx | 27 -------
binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx | 59 -----------------
binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx | 21 ------
binfilter/bf_sc/source/ui/docshell/sc_impex.cxx | 71 +++++++--------------
binfilter/bf_sc/source/ui/inc/docsh.hxx | 13 ---
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx | 17 +----
binfilter/inc/bf_sc/scmod.hxx | 1
17 files changed, 54 insertions(+), 364 deletions(-)
New commits:
commit dd253b5037f2d43d3b8adafb8db34702c9a2a901
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Sep 10 13:00:22 2011 -0700
Cleanup of misc ui classes
diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
index ae1f2c5..d53c5c5 100644
--- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
@@ -269,12 +269,6 @@ SfxModule* ScModuleDummy::Load()
/*N*/ return ( nEndFlag == 0x0d );
/*N*/ }
-BOOL lcl_IsAnyXMLFilter( const SfxFilter* /*pFilter*/ )
-{
- DBG_BF_ASSERT(0, "STRIP");
- return FALSE;
-}
-
/*N*/ ULONG ScDLL::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter,
/*N*/ SfxFilterFlags /*nMust*/, SfxFilterFlags /*nDont*/ )
/*N*/ {
@@ -374,10 +368,8 @@ BOOL lcl_IsAnyXMLFilter( const SfxFilter* /*pFilter*/ )
/*?*/ ULONG nStorageFormat = pStorage->GetFormat();
/*?*/ if ( nStorageFormat == 0 || nStorageFormat == SOT_FORMATSTR_ID_STARCALC_60 )
/*?*/ {
-/*?*/ // if XML template is set, don't modify
-/*?*/ if (!lcl_IsAnyXMLFilter(*ppFilter))
-/*?*/ *ppFilter = SFX_APP()->GetFilter( ScDocShell::Factory(),
-/*?*/ String::CreateFromAscii(pFilterXML) );
+/*?*/ *ppFilter = SFX_APP()->GetFilter( ScDocShell::Factory(),
+/*?*/ String::CreateFromAscii(pFilterXML) );
/*?*/ return ERRCODE_NONE;
/*?*/ }
/*?*/ }
diff --git a/binfilter/bf_sc/source/ui/app/sc_scmod.cxx b/binfilter/bf_sc/source/ui/app/sc_scmod.cxx
index 5331191..fafdac5 100644
--- a/binfilter/bf_sc/source/ui/app/sc_scmod.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_scmod.cxx
@@ -157,7 +157,6 @@ static USHORT nIdleCount = 0;
/*N*/ DELETEZ( pFormEditData );
/*N*/
/*N*/ delete pErrorHdl;
-/*N*/ // delete pSvxErrorHdl;
/*N*/
/*N*/ ScGlobal::Clear(); // ruft auch ScDocumentPool::DeleteVersionMaps();
/*N*/
@@ -176,13 +175,6 @@ static USHORT nIdleCount = 0;
/*N*/ // ConfigItems must be removed before ConfigManager
/*N*/ DeleteCfg();
/*N*/ }
-/*N*/ else if ( nHintId == SFX_HINT_COLORS_CHANGED || nHintId == SFX_HINT_ACCESSIBILITY_CHANGED )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if ( nHintId == SFX_HINT_CTL_SETTINGS_CHANGED )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
@@ -267,11 +259,6 @@ static USHORT nIdleCount = 0;
#endif
-/*N*/ void ScModule::RecentFunctionsChanged()
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void ScModule::SetAppOptions( const ScAppOptions& /*rOpt*/ )
/*N*/ {
/*N*/ if ( !pAppCfg )
@@ -372,37 +359,18 @@ static USHORT nIdleCount = 0;
/*N*/ return 0;
/*N*/ }
/*N*/
-/*N*/ BOOL bMore = FALSE;
-/*N*/ ScDocShell* pDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
-/*N*/ if ( pDocSh )
-/*N*/ {
-/*?*/ ScDocument* pDoc = pDocSh->GetDocument();
-/*?*/ if ( pDoc->IsLoadingDone() )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*N*/ }
-/*N*/
/*N*/ ULONG nOldTime = aIdleTimer.GetTimeout();
/*N*/ ULONG nNewTime = nOldTime;
-/*N*/ if ( bMore )
-/*N*/ {
-/*?*/ nNewTime = SC_IDLE_MIN;
-/*?*/ nIdleCount = 0;
-/*N*/ }
+
+/*N*/ if ( nIdleCount < SC_IDLE_COUNT )
+/*N*/ ++nIdleCount;
/*N*/ else
/*N*/ {
-/*N*/ // SC_IDLE_COUNT mal mit initialem Timeout, dann hochzaehlen
-/*N*/
-/*N*/ if ( nIdleCount < SC_IDLE_COUNT )
-/*N*/ ++nIdleCount;
-/*N*/ else
-/*N*/ {
-/*N*/ nNewTime += SC_IDLE_STEP;
-/*N*/ if ( nNewTime > SC_IDLE_MAX )
-/*N*/ nNewTime = SC_IDLE_MAX;
-/*N*/ }
+/*N*/ nNewTime += SC_IDLE_STEP;
+/*N*/ if ( nNewTime > SC_IDLE_MAX )
+/*N*/ nNewTime = SC_IDLE_MAX;
/*N*/ }
+
/*N*/ if ( nNewTime != nOldTime )
/*N*/ aIdleTimer.SetTimeout( nNewTime );
/*N*/
@@ -412,14 +380,14 @@ static USHORT nIdleCount = 0;
IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG )
{
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK()
return 0;
}
/*N*/ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, EMPTYARG )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK()
+ return 0;
/*N*/ }
}
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
index b8098d5..10fda4a 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
@@ -86,7 +86,7 @@ namespace binfilter {
/*N*/ void ScAreaLink::DataChanged( const String&,
/*N*/ const ::com::sun::star::uno::Any& )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // Virtual Method
/*N*/ }
@@ -174,9 +174,7 @@ namespace binfilter {
/*N*/ // correct source range name list for web query import
/*N*/ String aTempArea;
/*N*/
-/*N*/ if( rNewFilter == ScDocShell::GetWebQueryFilterName() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if( !(rNewFilter == ScDocShell::GetWebQueryFilterName()) )
/*N*/ aTempArea = rNewArea;
/*N*/
/*N*/ // find total size of source area
@@ -233,7 +231,8 @@ namespace binfilter {
/*N*/ IMPL_LINK( ScAreaLink, RefreshHdl, ScAreaLink*, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return 0;
+ DBG_BF_ASSERT(0, "STRIP"); // IMP_LINK() function
+ return 0;
/*N*/ }
}
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index 0c1864f..85ae8e5 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -264,8 +264,6 @@ namespace binfilter {
/*N*/ PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE );
/*N*/ bDone = TRUE;
/*N*/ }
-/*N*/ else if (!bApi) // "Keine Operationen auszufuehren"
-/*N*/ rDocShell.ErrorMessage(STR_MSSG_REPEATDB_0);
/*N*/ }
/*N*/
/*N*/ return bDone;
@@ -301,8 +299,6 @@ namespace binfilter {
/*N*/ aLocalParam.nCol2,aLocalParam.nRow2 );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
-/*N*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*N*/ return FALSE;
/*N*/ }
/*N*/
@@ -311,9 +307,6 @@ namespace binfilter {
/*N*/ aLocalParam.nCol2, aLocalParam.nRow2, nTab,
/*N*/ HASATTR_MERGED | HASATTR_OVERLAPPED ) )
/*N*/ {
-/*N*/ // Merge-Attribute wuerden beim Sortieren durcheinanderkommen
-/*N*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(STR_SORT_ERR_MERGED);
/*N*/ return FALSE;
/*N*/ }
/*N*/
@@ -660,16 +653,12 @@ namespace binfilter {
/*N*/ ScEditableTester aTester( pDoc, nTab, 0,rParam.nRow1+1, MAXCOL,MAXROW );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
-/*N*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*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*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen
/*N*/ return FALSE;
/*N*/ }
/*N*/
@@ -710,14 +699,6 @@ namespace binfilter {
/*N*/ aNewParam.nCol2, aNewParam.nRow2, nTab );
/*N*/ pDoc->SetDirty( aDirtyRange );
/*N*/
-/*N*/ if (!bSuccess)
-/*N*/ {
-/*N*/ // "Kann keine Zeilen einfuegen"
-/*N*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(STR_MSSG_DOSUBTOTALS_2);
-/*N*/ }
-/*N*/
-/*N*/ // merken
/*N*/ pDBData->SetSubTotalParam( aNewParam );
/*N*/ pDBData->SetArea( nTab, aNewParam.nCol1,aNewParam.nRow1, aNewParam.nCol2,aNewParam.nRow2 );
/*N*/
@@ -841,9 +822,6 @@ namespace binfilter {
/*N*/ if (bDone)
/*N*/ aModificator.SetDocumentModified();
/*N*/
-/*N*/ if ( nErrId && !bApi )
-/*N*/ rDocShell.ErrorMessage( nErrId );
-/*N*/
/*N*/ return bDone;
/*N*/ }
}
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
index b42b422..d101d55 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
@@ -290,9 +290,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ // progress bar
/*M*/
/*M*/ ++nInserted;
-/*M*/ if (!(nInserted & 15))
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
/*M*/ }
/*M*/ else // past the end of the spreadsheet
/*M*/ {
@@ -490,16 +487,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ aNewMark, IDF_CONTENTS );
/*M*/ }
/*M*/
-/*M*/ if( !bAddrInsert ) // update database range
-/*M*/ {
-/*M*/ DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/
-/*M*/ if (bRecord)
-/*M*/ {
-/*M*/ DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/
/*M*/ pDoc->SetDirty();
/*M*/ rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
/*M*/ aModificator.SetDocumentModified();
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index d830bd9..0ef3814 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -339,8 +339,6 @@ using namespace ::com::sun::star;
/*N*/ ScEditableTester aTester( pDoc, rMark );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
-/*N*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*N*/ return FALSE;
/*N*/ }
/*N*/
@@ -375,32 +373,15 @@ using namespace ::com::sun::star;
/*N*/ if (pDoc->HasAttrib( aMarkRange, HASATTR_PAINTEXT ))
/*N*/ nExtFlags |= SC_PF_LINES;
/*N*/
-/*N*/
-/*N*/ if (bObjects)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/
-/*N*/ //! HideAllCursors(); // falls Zusammenfassung aufgehoben wird
/*N*/ if (bSimple)
/*N*/ pDoc->DeleteArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
/*N*/ aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(),
/*N*/ aMultiMark, nFlags );
-/*N*/ else
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ if (!AdjustRowHeight( aExtendedRange ))
/*N*/ rDocShell.PostPaint( aExtendedRange, PAINT_GRID, nExtFlags );
-/*N*/ else if (nExtFlags & SC_PF_LINES)
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/
-/*N*/ // rDocShell.UpdateOle(GetViewData()); //! an der View?
/*N*/ aModificator.SetDocumentModified();
-/*N*/ //! CellContentChanged();
-/*N*/ //! ShowAllCursors();
/*N*/
/*N*/ return TRUE;
/*N*/ }
@@ -418,8 +399,6 @@ using namespace ::com::sun::star;
/*N*/ ScEditableTester aTester( pDoc, rPos.Tab(), rPos.Col(),rPos.Row(), rPos.Col(),rPos.Row() );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
-/*N*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*N*/ return FALSE;
/*N*/ }
/*N*/
@@ -454,8 +433,6 @@ using namespace ::com::sun::star;
/*N*/ ScEditableTester aTester( pDoc, rPos.Tab(), rPos.Col(),rPos.Row(), rPos.Col(),rPos.Row() );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
-/*N*/ if (!bApi)
-/*?*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*N*/ pNewCell->Delete();
/*N*/ return FALSE;
/*N*/ }
@@ -675,8 +652,6 @@ using namespace ::com::sun::star;
/*N*/ ScEditableTester aTester( pDoc, rPos.Tab(), rPos.Col(),rPos.Row(), rPos.Col(),rPos.Row() );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
-/*?*/ if (!bApi)
-/*?*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*?*/ return FALSE;
/*N*/ }
/*N*/
@@ -718,8 +693,6 @@ using namespace ::com::sun::star;
/*N*/ if ( !pDoc->IsSelectionEditable( rMark, &bOnlyNotBecauseOfMatrix )
/*N*/ && !bOnlyNotBecauseOfMatrix )
/*N*/ {
-/*?*/ if (!bApi)
-/*?*/ rDocShell.ErrorMessage(STR_PROTECTIONERR);
/*?*/ return FALSE;
/*N*/ }
/*N*/
@@ -763,8 +736,6 @@ using namespace ::com::sun::star;
/*N*/ if ( !pDoc->IsSelectionEditable( rMark, &bOnlyNotBecauseOfMatrix )
/*N*/ && !bOnlyNotBecauseOfMatrix )
/*N*/ {
-/*?*/ if (!bApi)
-/*?*/ rDocShell.ErrorMessage(STR_PROTECTIONERR);
/*?*/ return FALSE;
/*N*/ }
/*N*/
@@ -787,8 +758,6 @@ using namespace ::com::sun::star;
/*N*/ USHORT nExtFlags = 0;
/*N*/ if (!AdjustRowHeight( aMultiRange ))
/*N*/ rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags );
-/*N*/ else if (nExtFlags & SC_PF_LINES)
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ aModificator.SetDocumentModified();
/*N*/
@@ -821,8 +790,6 @@ using namespace ::com::sun::star;
/*N*/ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
/*N*/ bSuccess = TRUE;
/*N*/ }
-/*N*/ else if (!bApi)
-/*?*/ rDocShell.ErrorMessage(STR_TABINSERT_ERROR);
/*N*/
/*N*/ return bSuccess;
/*N*/ }
@@ -835,8 +802,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if ( !pDoc->IsDocEditable() )
/*N*/ {
-/*N*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(STR_PROTECTIONERR);
/*N*/ return FALSE;
/*N*/ }
/*N*/
@@ -854,8 +819,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if (nVisCount <= 1)
/*N*/ {
-/*N*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung?
/*N*/ return FALSE;
/*N*/ }
/*N*/ }
@@ -878,8 +841,6 @@ using namespace ::com::sun::star;
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
/*N*/ if ( !pDoc->IsDocEditable() )
/*N*/ {
-/*?*/ if (!bApi)
-/*?*/ rDocShell.ErrorMessage(STR_PROTECTIONERR);
/*?*/ return FALSE;
/*N*/ }
/*N*/
@@ -934,18 +895,11 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if ( !rDocShell.IsEditable() )
/*N*/ {
-/*?*/ if (!bApi)
-/*?*/ rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung?
/*?*/ return FALSE;
/*N*/ }
/*N*/
/*N*/ BOOL bSuccess = FALSE;
-/*N*/
/*N*/ BOOL bFormula = FALSE;
-/*N*/ if ( eMode == SC_SIZE_OPTIMAL )
-/*N*/ {
-/*N*/ //! Option "Formeln anzeigen" - woher nehmen?
-/*N*/ }
/*N*/
/*N*/ ScOutlineTable* pUndoTab = NULL;
/*N*/
@@ -1059,9 +1013,7 @@ using namespace ::com::sun::star;
/*N*/ return FALSE; // kein Umbruch gesetzt
/*N*/
/*?*/ nFlags &= ~CR_MANUALBREAK;
-/*?*/ if (bColumn)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*?*/ else
+/*?*/ if ( !bColumn )
/*?*/ pDoc->SetRowFlags( nPos, nTab, nFlags );
/*?*/ pDoc->UpdatePageBreaks( nTab );
/*?*/
@@ -1127,9 +1079,6 @@ using namespace ::com::sun::star;
/*N*/ else if (!bApi)
/*N*/ {
/*N*/ // different password was set before
-/*N*/
-/*N*/ //! rDocShell.ErrorMessage(...);
-/*N*/
/*N*/ InfoBox aBox( rDocShell.GetDialogParent(), String( ScResId( SCSTR_WRONGPASSWORD ) ) );
/*N*/ aBox.Execute();
/*N*/ }
@@ -1158,8 +1107,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ else if (!bApi)
/*N*/ {
-/*N*/ //! rDocShell.ErrorMessage(...);
-/*N*/
/*N*/ InfoBox aBox( rDocShell.GetDialogParent(), String( ScResId( SCSTR_WRONGPASSWORD ) ) );
/*N*/ aBox.Execute();
/*N*/ }
@@ -1177,8 +1124,6 @@ using namespace ::com::sun::star;
/*N*/ ScEditableTester aTester( pDoc, rMark );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
-/*?*/ if (!bApi)
-/*?*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*?*/ return FALSE;
/*N*/ }
/*N*/
@@ -1202,8 +1147,6 @@ using namespace ::com::sun::star;
/*N*/ ScEditableTester aTester( pDoc, rMark );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
-/*N*/ if (!bApi)
-/*N*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*N*/ return FALSE;
/*N*/ }
/*N*/
@@ -1281,8 +1224,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ aModificator.SetDocumentModified();
/*N*/ }
-/*N*/ else if (!bApi)
-/*N*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*N*/
/*N*/ return bSuccess;
/*N*/ }
@@ -1339,8 +1280,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ bSuccess = TRUE;
/*N*/ }
-/*N*/ else if (!bApi)
-/*N*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*N*/
/*N*/ return bSuccess;
/*N*/ }
@@ -1371,8 +1310,6 @@ using namespace ::com::sun::star;
/*N*/ ScEditableTester aTester( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
-/*?*/ if (!bApi)
-/*?*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*?*/ return FALSE;
/*N*/ }
/*N*/
@@ -1385,9 +1322,6 @@ using namespace ::com::sun::star;
/*N*/ if ( pDoc->HasAttrib( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
/*N*/ HASATTR_MERGED | HASATTR_OVERLAPPED ) )
/*N*/ {
-/*?*/ // "Zusammenfassen nicht verschachteln !"
-/*?*/ if (!bApi)
-/*?*/ rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0);
/*?*/ return FALSE;
/*N*/ }
/*N*/
@@ -1640,8 +1574,6 @@ using namespace ::com::sun::star;
/*N*/ aModificator.SetDocumentModified();
/*N*/ bDone = TRUE;
/*N*/ }
-/*N*/ else if (!bApi)
-/*?*/ rDocShell.ErrorMessage(aTester.GetMessageId());
/*N*/ }
/*N*/ return bDone;
/*N*/ }
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 94ffa08..e3ffccd 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -399,7 +399,6 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ void ScDocShell::AfterXMLLoading(sal_Bool /*bRet*/)
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
aDocument.SetInsertingFromOtherDoc( FALSE );
aDocument.SetImportingXML( FALSE );
@@ -476,18 +475,6 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ break;
/*N*/ }
/*N*/ }
-/*N*/ else if (rHint.ISA(SfxStyleSheetHint)) // Vorlagen geaendert
-/*N*/ NotifyStyle((const SfxStyleSheetHint&) rHint);
-/*N*/ else if (rHint.ISA(ScAutoStyleHint))
-/*N*/ {
-/*?*/ //! direct call for AutoStyles
-/*?*/
-/*?*/ // this is called synchronously from ScInterpreter::ScStyle,
-/*?*/ // modifying the document must be asynchronous
-/*?*/ // (handled by AddInitial)
-/*?*/
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
// Inhalte fuer Organizer laden
@@ -719,8 +706,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/ if ( bSetRowHeights )
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ FinishedLoading( SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES );
/*N*/
@@ -829,7 +814,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ , SfxListener()
/*N*/ , __SCDOCSHELL_INIT
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
//------------------------------------------------------------------
@@ -925,12 +909,10 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ else
/*N*/ {
/*N*/ SetDocumentModifiedPending( FALSE );
-/*N*/ aDocument.InvalidateStyleSheetUsage();
+/*N*/ aDocument.InvalidateStyleSheetUsage();
/*N*/ aDocument.InvalidateTableArea();
-/*N*/ aDocument.InvalidateLastTableOpParams();
+/*N*/ aDocument.InvalidateLastTableOpParams();
/*N*/ aDocument.Broadcast( SC_HINT_DATACHANGED, BCA_BRDCST_ALWAYS, NULL );
-/*N*/ if ( aDocument.IsForcedFormulaPending() && aDocument.GetAutoCalc() )
-/*?*/ { DBG_BF_ASSERT(0, "STRIP");}
/*N*/ PostDataChanged();
/*N*/
/*N*/ // Detective AutoUpdate:
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx
index 4bda1c7..92e34aa 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx
@@ -145,11 +145,6 @@ using namespace ::com::sun::star;
/*?*/ new SvxForbiddenCharactersTable( aDocument.GetServiceManager() );
/*?*/
/*?*/ aLocales.getConstArray();
-/*?*/ for (sal_Int32 i = 0; i < aLocales.getLength(); i++)
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
/*?*/ aDocument.SetForbiddenCharacters( xForbiddenTable );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
index 4e8c336..47b200d 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
@@ -78,11 +78,6 @@ namespace binfilter {
#define SC_PREVIEW_SIZE_Y 12400
-/*N*/ void ScDocShell::DoRecalc( BOOL /*bApi*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void ScDocShell::DoHardRecalc( BOOL /*bApi*/ )
/*N*/ {
/*N*/ aDocument.CalcAll();
@@ -91,24 +86,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
-/*N*/ {
-/*N*/ USHORT nId = rHint.GetHint();
-/*N*/ const SfxStyleSheetBase* pStyle = rHint.GetStyleSheet();
-/*N*/ if (!pStyle)
-/*N*/ return;
-/*N*/
-/*N*/ if ( pStyle->GetFamily() == SFX_STYLE_FAMILY_PAGE )
-/*N*/ {
-/*N*/ if ( nId == SFX_STYLESHEET_MODIFIED )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // alles andere geht ueber Slots...
-/*N*/ }
-
// wie in printfun.cxx
#define ZOOM_MIN 10
@@ -134,10 +111,6 @@ namespace binfilter {
/*?*/ if (!aPrintFunc.UpdatePages()) // setzt Umbrueche auf allen Tabs
/*?*/ bWarn = TRUE;
/*?*/
-/*?*/ if (bWarn && !bApi)
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*N*/ }
/*N*/
/*N*/ aModificator.SetDocumentModified();
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
index e5b748f..98059dd 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
@@ -137,13 +137,6 @@ namespace binfilter {
// ehemalige viewfunc/dbfunc Methoden
//
-/*N*/ void ScDocShell::ErrorMessage( USHORT /*nGlobStrId*/ )
-/*N*/ {
-/*N*/ //! StopMarking an der (aktiven) View?
-/*N*/
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ BOOL ScDocShell::IsEditable() const
/*N*/ {
/*N*/ // import into read-only document is possible - must be extended if other filters use api
@@ -151,12 +144,6 @@ namespace binfilter {
/*N*/ return !IsReadOnly() || aDocument.IsImportingXML();
/*N*/ }
-/*N*/ void ScDocShell::DBAreaDeleted( USHORT /*nTab*/, USHORT /*nX1*/, USHORT /*nY1*/, USHORT /*nX2*/, USHORT /*nY2*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
/*N*/ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, BOOL bForceMark )
/*N*/ {
/*N*/ USHORT nCol = rMarked.aStart.Col();
@@ -175,8 +162,6 @@ namespace binfilter {
/*N*/ // benannter DB-Bereich dort gesucht werden.
/*N*/
/*N*/ ScDBData* pData = aDocument.GetDBAtArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow );
-/*N*/ if (!pData)
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ BOOL bSelected = ( bForceMark || rMarked.aStart != rMarked.aEnd );
/*N*/
@@ -271,7 +256,6 @@ namespace binfilter {
/*N*/ USHORT nOldY2;
/*N*/ USHORT nOldTab;
/*N*/ pNoNameData->GetArea( nOldTab, nOldX1, nOldY1, nOldX2, nOldY2 );
-/*N*/ DBAreaDeleted( nOldTab, nOldX1, nOldY1, nOldX2, nOldY2 );
/*N*/
/*N*/ pNoNameData->SetSortParam( ScSortParam() ); // Parameter zuruecksetzen
/*N*/ pNoNameData->SetQueryParam( ScQueryParam() );
@@ -310,11 +294,6 @@ namespace binfilter {
/*N*/ TRUE, bHasHeader );
/*N*/ pColl->Insert( pNoNameData );
/*N*/
-/*N*/ if ( pUndoColl )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ // neuen Bereich am Sba anmelden nicht mehr noetig
/*N*/
/*N*/ // "Import1" etc am Navigator bekanntmachen
@@ -441,15 +420,6 @@ namespace binfilter {
/*N*/ rParam.nCol+nColSize-1, rParam.nRow+nRowSize-1 );
/*N*/ if (rParam.bByCol) ++aDestArea.nColEnd;
/*N*/ if (rParam.bByRow) ++aDestArea.nRowEnd;
-/*N*/
-/*N*/ if (rParam.bReferenceData)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ if (pDestData) // Zielbereich loeschen / anpassen
@@ -508,11 +478,7 @@ namespace binfilter {
/*N*/ nSrcTab = nEndTab; // gefunden
/*N*/ }
/*N*/ }
-/*N*/ if (nSrcTab <= MAXTAB)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if ( !(nSrcTab <= MAXTAB) )
/*N*/ {
/*N*/ InfoBox aBox(GetDialogParent(),
/*N*/ ScGlobal::GetRscString( STR_SCENARIO_NOTFOUND ) );
@@ -523,30 +489,11 @@ namespace binfilter {
/*N*/ OSL_FAIL( "UseScenario auf Szenario-Blatt" );
/*N*/ }
-/*N*/ void ScDocShell::ModifyScenario( USHORT /*nTab*/, const String& /*rName*/, const String& /*rComment*/,
-/*N*/ const Color& /*rColor*/, USHORT /*nFlags*/ )
-/*N*/ {
-/*?*/ // Undo
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ USHORT ScDocShell::MakeScenario( USHORT /*nTab*/, const String& /*rName*/, const String& /*rComment*/,
-/*N*/ const Color& /*rColor*/, USHORT /*nFlags*/,
-/*N*/ ScMarkData& /*rMark*/, BOOL /*bRecord*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-/*N*/ BOOL ScDocShell::MoveTable( USHORT /*nSrcTab*/, USHORT /*nDestTab*/, BOOL /*bCopy*/, BOOL /*bRecord*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return TRUE;
-/*N*/ }
-
/*N*/ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScDBData*, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return 0;
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK()
+ return 0;
/*N*/ }
}
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx
index 1fa91ad..59c16b4 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx
@@ -175,10 +175,6 @@ namespace binfilter {
/*N*/
/*N*/ SvInPlaceObject::SetVisArea( aArea );
/*N*/
-/*N*/ if (aDocument.IsEmbedded())
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
//
@@ -195,12 +191,6 @@ namespace binfilter {
// muessen die SetItems (ATTR_PAGE_HEADERSET, ATTR_PAGE_FOOTERSET) auf den richtigen
// Pool umgesetzt werden, bevor der Quell-Pool geloescht wird.
-/*N*/ void lcl_AdjustPool( SfxStyleSheetBasePool* /*pStylePool*/ )
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
/*N*/ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles )
/*N*/ {
/*N*/ // similar to LoadStyles, but with selectable behavior for XStyleLoader::loadStylesFromURL call
@@ -260,7 +250,6 @@ namespace binfilter {
/*N*/ // follow is never used
/*N*/ }
/*N*/
-/*N*/ lcl_AdjustPool( GetStyleSheetPool() ); // adjust SetItems
/*N*/ UpdateAllRowHeights();
/*N*/ PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT ); // Paint
/*N*/
@@ -279,16 +268,6 @@ namespace binfilter {
/*N*/ // nicht mehr benutzte Links raus
/*N*/
/*N*/ nCount = pLinkManager->GetLinks().Count();
-/*N*/ for (i=nCount; i>0; )
-/*N*/ {
-/*?*/ --i;
-/*?*/ ::binfilter::SvBaseLink* pBase = *pLinkManager->GetLinks()[i];
-/*?*/ if (pBase->ISA(ScTableLink))
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*N*/ }
-/*N*/
/*N*/
/*N*/ // neue Links eintragen
/*N*/
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
index dfd5cc0..2009c07 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
@@ -121,45 +121,34 @@ namespace binfilter {
// static
-/*N*/ BOOL ScImportExport::ImportStream( SvStream& rStrm, ULONG nFmt )
-/*N*/ {
-/*N*/ if( nFmt == FORMAT_STRING )
-/*N*/ {
-/*N*/ if( ExtText2Doc( rStrm ) ) // pExtOptions auswerten
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ if( nFmt == SOT_FORMATSTR_ID_SYLK )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return TRUE;
-/*N*/ }
-/*N*/ if( nFmt == SOT_FORMATSTR_ID_DIF )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return TRUE;
-/*N*/ }
-/*N*/ if( nFmt == FORMAT_RTF )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return TRUE;
-/*N*/ }
-/*N*/ if( nFmt == SOT_FORMATSTR_ID_LINK )
-/*N*/ return TRUE; // Link-Import?
-/*N*/ if ( nFmt == SOT_FORMATSTR_ID_HTML )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return TRUE;
-/*N*/ }
-/*N*/ if ( nFmt == SOT_FORMATSTR_ID_HTML_SIMPLE )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ return TRUE;
-/*N*/ }
-/*N*/
-/*N*/ return FALSE;
-/*N*/ }
+BOOL ScImportExport::ImportStream( SvStream& rStrm, ULONG nFmt )
+{
+ if( nFmt == FORMAT_STRING )
+ {
+ if( ExtText2Doc( rStrm ) ) // pExtOptions auswerten
+ return TRUE;
+ }
+
+ if( nFmt == SOT_FORMATSTR_ID_SYLK )
+ return TRUE;
+
+ if( nFmt == SOT_FORMATSTR_ID_DIF )
+ return TRUE;
+ if( nFmt == FORMAT_RTF )
+ return TRUE;
+ if( nFmt == SOT_FORMATSTR_ID_LINK )
+ return TRUE; // Link-Import?
+
+ if ( nFmt == SOT_FORMATSTR_ID_HTML )
+ return TRUE;
+
+ if ( nFmt == SOT_FORMATSTR_ID_HTML_SIMPLE )
+ return TRUE;
+
+ return FALSE;
+}
//static
@@ -433,8 +422,6 @@ enum DoubledQuoteMode
/*N*/ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
/*N*/ {
-/*N*/ if (!pExtOptions)
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ ULONG nOldPos = rStrm.Tell();
/*N*/ rStrm.Seek( STREAM_SEEK_TO_END );
@@ -499,11 +486,7 @@ enum DoubledQuoteMode
/*N*/
/*N*/ aLine.Len();
/*N*/ USHORT nCol = nStartCol;
-/*N*/ if ( bFixed ) // Feste Satzlaenge
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else // Nach Trennzeichen suchen
+/*N*/ if ( !bFixed ) // Feste Satzlaenge
/*N*/ {
/*N*/ USHORT nSourceCol = 0;
/*N*/ USHORT nInfoStart = 0;
diff --git a/binfilter/bf_sc/source/ui/inc/docsh.hxx b/binfilter/bf_sc/source/ui/inc/docsh.hxx
index c38f95c..f79720b 100644
--- a/binfilter/bf_sc/source/ui/inc/docsh.hxx
+++ b/binfilter/bf_sc/source/ui/inc/docsh.hxx
@@ -192,28 +192,17 @@ public:
void PageStyleModified( const String& rStyleName, BOOL bApi );
- void NotifyStyle( const SfxStyleSheetHint& rHint );
-
Window* GetDialogParent();
- void ErrorMessage( USHORT nGlobStrId );
BOOL IsEditable() const;
BOOL AdjustRowHeight( USHORT nStartRow, USHORT nEndRow, USHORT nTab );
void DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE );
void UseScenario( USHORT nTab, const String& rName, BOOL bRecord = TRUE );
- USHORT MakeScenario( USHORT nTab, const String& rName, const String& rComment,
- const Color& rColor, USHORT nFlags,
- ScMarkData& rMark, BOOL bRecord = TRUE );
- void ModifyScenario( USHORT nTab, const String& rName, const String& rComment,
- const Color& rColor, USHORT nFlags );
- BOOL MoveTable( USHORT nSrcTab, USHORT nDestTab, BOOL bCopy, BOOL bRecord );
-
- void DoRecalc( BOOL bApi );
+
void DoHardRecalc( BOOL bApi );
- void DBAreaDeleted( USHORT nTab, USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2 );
ScDBData* GetDBData( const ScRange& rMarked, ScGetDBMode eMode, BOOL bForceMark );
void UpdateLinks(); // Link-Eintraege aktuallisieren
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
index 417c1da..7c946e3 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
@@ -628,8 +628,6 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds(
aNewOpts.SetLRUFuncList(pFuncs, nCount);
pScMod->SetAppOptions(aNewOpts);
- pScMod->RecentFunctionsChanged(); // update function list child window
-
delete[] pFuncs;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index 87c78f1..3f98fc2 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -7127,8 +7127,6 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const ::rtl::OUString& aScena
pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
aComment = String( aScenarioComment );
-
- pDocSh->ModifyScenario( nTab, aName, aComment, aColor, nFlags );
}
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
index 266f139..a1e9860 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
@@ -550,9 +550,7 @@ void SAL_CALL ScModelObj::unlockControllers() throw (::com::sun::star::uno::Runt
void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- if (pDocShell)
- pDocShell->DoRecalc(TRUE);
- else
+ if (!pDocShell)
OSL_FAIL("keine DocShell"); //! Exception oder so?
}
@@ -1338,7 +1336,7 @@ void SAL_CALL ScTableSheetsObj::moveByName( const ::rtl::OUString& aName, sal_In
String aNamStr = aName;
USHORT nSource;
if ( pDocShell->GetDocument()->GetTable( aNamStr, nSource ) )
- bDone = pDocShell->MoveTable( nSource, nDestination, FALSE, TRUE );
+ bDone = TRUE;
}
if (!bDone)
throw uno::RuntimeException(); // no other exceptions specified
@@ -1357,12 +1355,8 @@ void SAL_CALL ScTableSheetsObj::copyByName( const ::rtl::OUString& aName,
USHORT nSource;
if ( pDocShell->GetDocument()->GetTable( aNamStr, nSource ) )
{
- bDone = pDocShell->MoveTable( nSource, nDestination, TRUE, TRUE );
- if (bDone)
- {
- ScDocFunc aFunc(*pDocShell);
- bDone = aFunc.RenameTable( nDestination, aNewStr, TRUE, TRUE );
- }
+ ScDocFunc aFunc(*pDocShell);
+ bDone = aFunc.RenameTable( nDestination, aNewStr, TRUE, TRUE );
}
}
if (!bDone)
@@ -2381,9 +2375,6 @@ void SAL_CALL ScScenariosObj::addNewByName( const ::rtl::OUString& aName,
String aCommStr = aComment;
Color aColor( COL_LIGHTGRAY ); // Default
- USHORT nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY;
-
- pDocShell->MakeScenario( nTab, aNameStr, aCommStr, aColor, nFlags, aMarkData );
}
}
diff --git a/binfilter/inc/bf_sc/scmod.hxx b/binfilter/inc/bf_sc/scmod.hxx
index 21b4b70..68fa407 100644
--- a/binfilter/inc/bf_sc/scmod.hxx
+++ b/binfilter/inc/bf_sc/scmod.hxx
@@ -158,7 +158,6 @@ public:
void SetAppOptions ( const ScAppOptions& rOpt );
void SetInputOptions ( const ScInputOptions& rOpt );
void SetPrintOptions ( const ScPrintOptions& rOpt );
- void RecentFunctionsChanged();
static void GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang,
BOOL& rAutoSpell, BOOL& rHideAuto );
More information about the Libreoffice-commits
mailing list