summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-01-24 12:24:32 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-01-24 15:43:22 +0100
commit8be66091da0f1a08d986573676bea5b64dca286c (patch)
tree5851d095ec2ada0a0751fda214b8cd076d12b729 /sc/source
parent0bcfeed0001ccb03c7697bff72edbb58946f5c41 (diff)
Remove DEBUG_CHANGETRACK.
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/core/tool/chgtrack.cxx196
-rw-r--r--sc/source/ui/docshell/docsh3.cxx23
2 files changed, 0 insertions, 219 deletions
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index a0cc38007615..084f8b62ed61 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -72,30 +72,6 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry, nMemPoolChangeActionLinkEntry
#define SC_CHGTRACK_FILEFORMAT_FIRST 0x0001
#define SC_CHGTRACK_FILEFORMAT 0x0001
-// --- ScChangeActionLinkEntry ---------------------------------------------
-
-#if DEBUG_CHANGETRACK
-String ScChangeActionLinkEntry::ToString() const
-{
- String aReturn;
- if ( pAction )
- {
- aReturn = String::CreateFromInt64( static_cast< sal_Int64 >( pAction->GetActionNumber() ) );
- }
- else if ( pLink && pLink->pAction )
- {
- aReturn = String::CreateFromAscii( "*" );
- aReturn += String::CreateFromInt64( static_cast< sal_Int64 >( pLink->pAction->GetActionNumber() ) );
- }
- else
- {
- aReturn = String::CreateFromAscii( "-" );
- }
-
- return aReturn;
-}
-#endif // DEBUG_CHANGETRACK
-
// --- ScChangeAction ------------------------------------------------------
ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScRange& rRange )
@@ -651,148 +627,6 @@ void ScChangeAction::AddDependent( ULONG nActionNumber,
}
}
-
-#if DEBUG_CHANGETRACK
-String ScChangeAction::ToString( ScDocument* pDoc ) const
-{
- String aReturn;
-
- String aNumber = String::CreateFromInt64( static_cast< sal_Int64 >( GetActionNumber() ) );
-
- String aActionState;
- ScChangeActionState eActionState = GetState();
- switch ( eActionState )
- {
- case SC_CAS_VIRGIN:
- {
- aActionState = String::CreateFromAscii( " " );
- }
- break;
- case SC_CAS_ACCEPTED:
- {
- aActionState = String::CreateFromAscii( "+" );
- }
- break;
- case SC_CAS_REJECTED:
- {
- aActionState = String::CreateFromAscii( "-" );
- }
- break;
- }
-
- String aRejectAction;
- if ( IsRejecting() )
- {
- aRejectAction += 'r';
- aRejectAction += String::CreateFromInt64( static_cast< sal_Int64 >( GetRejectAction() ) );
- }
-
- String aReference;
- GetRefString( aReference, pDoc, TRUE );
-
- String aAuthor = GetUser();
-
- DateTime aDT = GetDateTime();
- String aDate = ScGlobal::pLocaleData->getDate( aDT );
- aDate += ' ';
- aDate += ScGlobal::pLocaleData->getTime( aDT, FALSE, FALSE );
-
- String aDescription;
- GetDescription( aDescription, pDoc );
-
- String aLinkAny;
- const ScChangeActionLinkEntry* pLinkA = pLinkAny;
- while ( pLinkA )
- {
- if ( !aLinkAny.Len() )
- {
- aLinkAny = String::CreateFromAscii( "(Any:" );
- }
- aLinkAny += String::CreateFromAscii( " ->" );
- aLinkAny += pLinkA->ToString();
- pLinkA = pLinkA->GetNext();
- }
- if ( aLinkAny.Len() )
- {
- aLinkAny += ')';
- }
-
- String aLinkDeletedIn;
- const ScChangeActionLinkEntry* pLinkDI = pLinkDeletedIn;
- while ( pLinkDI )
- {
- if ( !aLinkDeletedIn.Len() )
- {
- aLinkDeletedIn = String::CreateFromAscii( "(DeletedIn:" );
- }
- aLinkDeletedIn += String::CreateFromAscii( " ->" );
- aLinkDeletedIn += pLinkDI->ToString();
- pLinkDI = pLinkDI->GetNext();
- }
- if ( aLinkDeletedIn.Len() )
- {
- aLinkDeletedIn += ')';
- }
-
- String aLinkDeleted;
- const ScChangeActionLinkEntry* pLinkD = pLinkDeleted;
- while ( pLinkD )
- {
- if ( !aLinkDeleted.Len() )
- {
- aLinkDeleted = String::CreateFromAscii( "(Deleted:" );
- }
- aLinkDeleted += String::CreateFromAscii( " ->" );
- aLinkDeleted += pLinkD->ToString();
- pLinkD = pLinkD->GetNext();
- }
- if ( aLinkDeleted.Len() )
- {
- aLinkDeleted += ')';
- }
-
- String aLinkDependent;
- const ScChangeActionLinkEntry* pLinkDp = pLinkDependent;
- while ( pLinkDp )
- {
- if ( !aLinkDependent.Len() )
- {
- aLinkDependent = String::CreateFromAscii( "(Dependent:" );
- }
- aLinkDependent += String::CreateFromAscii( " ->" );
- aLinkDependent += pLinkDp->ToString();
- pLinkDp = pLinkDp->GetNext();
- }
- if ( aLinkDependent.Len() )
- {
- aLinkDependent += ')';
- }
-
- aReturn += aNumber;
- aReturn += aActionState;
- aReturn += aRejectAction;
- aReturn += String::CreateFromAscii( ": " );
- aReturn += aReference;
- aReturn += ' ';
- aReturn += aAuthor;
- aReturn += ' ';
- aReturn += aDate;
- aReturn += ' ';
- aReturn += aDescription;
- aReturn += ' ';
- aReturn += aLinkAny;
- aReturn += ' ';
- aReturn += aLinkDeletedIn;
- aReturn += ' ';
- aReturn += aLinkDeleted;
- aReturn += ' ';
- aReturn += aLinkDependent;
-
- return aReturn;
-}
-#endif // DEBUG_CHANGETRACK
-
-
// --- ScChangeActionIns ---------------------------------------------------
ScChangeActionIns::ScChangeActionIns( const ScRange& rRange )
@@ -4810,34 +4644,4 @@ void ScChangeTrack::MergeActionState( ScChangeAction* pAct, const ScChangeAction
}
}
-#if DEBUG_CHANGETRACK
-String ScChangeTrack::ToString() const
-{
- String aReturn;
-
- aReturn += String::CreateFromAscii( "============================================================\n" );
-
- const ScChangeAction* pGenerated = GetFirstGenerated();
- while ( pGenerated )
- {
- aReturn += pGenerated->ToString( pDoc );
- aReturn += '\n';
- pGenerated = pGenerated->GetNext();
- }
-
- aReturn += String::CreateFromAscii( "------------------------------------------------------------\n" );
-
- const ScChangeAction* pAction = GetFirst();
- while ( pAction )
- {
- aReturn += pAction->ToString( pDoc );
- aReturn += '\n';
- pAction = pAction->GetNext();
- }
- aReturn += String::CreateFromAscii( "============================================================\n" );
-
- return aReturn;
-}
-#endif // DEBUG_CHANGETRACK
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 133a5d889468..f3c7ae9a1033 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -80,11 +80,6 @@
#include "conflictsdlg.hxx"
#include "globstr.hrc"
-#if DEBUG_CHANGETRACK
-#include <stdio.h>
-#endif // DEBUG_CHANGETRACK
-
-
//------------------------------------------------------------------
//
@@ -1219,15 +1214,6 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
return false;
}
-#if DEBUG_CHANGETRACK
- ::rtl::OUString aMessage(RTL_CONSTASCII_USTRINGPARAM( "\nbefore merge:\n" ));
- aMessage += pThisTrack->ToString();
- ::rtl::OString aMsg = ::rtl::OUStringToOString( aMessage, RTL_TEXTENCODING_UTF8 );
- OSL_ENSURE( false, aMsg.getStr() );
- //fprintf( stdout, "%s ", aMsg.getStr() );
- //fflush( stdout );
-#endif // DEBUG_CHANGETRACK
-
// reset show changes
ScChangeViewSettings aChangeViewSet;
aChangeViewSet.SetShowChanges( FALSE );
@@ -1396,15 +1382,6 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
aInfoBox.Execute();
}
-#if DEBUG_CHANGETRACK
- aMessage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\nafter merge:\n" ));
- aMessage += pThisTrack->ToString();
- aMsg = ::rtl::OUStringToOString( aMessage, RTL_TEXTENCODING_UTF8 );
- OSL_ENSURE( false, aMsg.getStr() );
- //fprintf( stdout, "%s ", aMsg.getStr() );
- //fflush( stdout );
-#endif // DEBUG_CHANGETRACK
-
return ( pThisAction != NULL );
}