[Libreoffice-commits] .: automation/source
Takeshi Abe
tabe at kemper.freedesktop.org
Tue Apr 26 17:54:54 PDT 2011
automation/source/server/profiler.hxx | 5 -----
automation/source/server/recorder.cxx | 3 ---
automation/source/server/retstrm.cxx | 2 --
automation/source/server/scmdstrm.cxx | 1 -
automation/source/server/server.cxx | 25 -------------------------
automation/source/server/server.hxx | 5 -----
automation/source/server/statemnt.cxx | 12 ------------
7 files changed, 53 deletions(-)
New commits:
commit 812986702a3db19322a391394de82a75175ae17a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Apr 27 09:49:37 2011 +0900
removed dead code and useless macros
diff --git a/automation/source/server/profiler.hxx b/automation/source/server/profiler.hxx
index 4ae07f8..d6ff79b 100644
--- a/automation/source/server/profiler.hxx
+++ b/automation/source/server/profiler.hxx
@@ -90,10 +90,6 @@ private:
ProfileSnapshot *mpStart;
ProfileSnapshot *mpEnd;
sal_Bool bIsProfileIntervalStarted;
-
-
-
-//
sal_Bool bIsProfilingPerCommand;
sal_Bool bIsPartitioning;
@@ -110,7 +106,6 @@ private:
// Einige Hilfsfunktionen
-// String Hex( sal_uLong nNr );
String Dec( sal_uLong nNr ); // Ergebnis = nNr / 100 mit 2 Dezimalen
String Pad( const String &aS, xub_StrLen nLen ); // F�gt blanks links an den String an
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index addf46b..c63e7c2 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -579,14 +579,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{
// case 1 .. 0xffff:
OSL_TRACE( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
-// sal_Bool bx = ((DockingWindow*)pWin)->IsFloatingMode();
-// break;
}
break;
case WINDOW_FLOATINGWINDOW:
{
OSL_TRACE( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
-// FloatingWindow *pFW = ((FloatingWindow*)pWin);
}
break;
}
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index 690575e..99def01 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -40,7 +40,6 @@ RetStream::RetStream()
{
pSammel = new SvMemoryStream();
pCommStream = new SvCommStream( pSammel );
-// SetCommStream( pCommStream );
}
RetStream::~RetStream()
@@ -123,7 +122,6 @@ void RetStream::Reset ()
delete pSammel;
pSammel = new SvMemoryStream();
pCommStream = new SvCommStream( pSammel );
-// SetCommStream( pCommStream );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index 004b163..186fff7 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -44,7 +44,6 @@ SCmdStream::SCmdStream(SvStream *pIn)
{
pSammel = pIn;
pCommStream = new SvCommStream( pSammel );
-// SetCommStream( pCommStream );
}
SCmdStream::~SCmdStream()
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 975d837..0fdafed 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -32,11 +32,6 @@
// do not use Application Idle but AutoTimer instead
#define TIMERIDLE
-#define NO_JPEG
-
-#ifndef NO_JPEG
-#include <svtools/jpeg.hxx>
-#endif
#include <vcl/timer.hxx>
#include <vcl/wrkwin.hxx>
#include <osl/diagnose.h>
@@ -47,7 +42,6 @@
#include <tools/stream.hxx>
#include <tools/config.hxx>
-#if 1
#include <svtools/ttprops.hxx>
#include <basic/ttstrhlp.hxx>
#include <svl/stritem.hxx>
@@ -57,7 +51,6 @@
#include <vcl/bitmap.hxx>
// Hat keinen Includeschutz
#include <svtools/svtdata.hxx>
-#endif // 1
#include <rtl/textenc.h>
#include <rtl/uri.h>
#include <rtl/uri.hxx>
@@ -341,12 +334,6 @@ void ExtraIdle::Timeout()
case 3:
{
-#if OSL_DEBUG_LEVEL > 1
-#define TT_CODE
-#else
-#define TT_CODE
-#endif
-
#ifdef TT_NO_DECRYPT
String aStr =
""
@@ -377,7 +364,6 @@ void ExtraIdle::Timeout()
;
#endif
-#ifdef TT_CODE
for ( sal_uInt16 i = 0 ; i < aStr.Len() ; i++ )
{
if ( aStr.GetChar(i) < 32 || aStr.GetChar(i) > 126 )
@@ -397,7 +383,6 @@ void ExtraIdle::Timeout()
aStr.SetChar( aStr.Len()-i-1, c );
}
}
-#endif
::svt::OStringTransfer::CopyString( UniString( aStr, RTL_TEXTENCODING_ASCII_US ), StatementList::GetFirstDocFrame() );
@@ -510,16 +495,6 @@ void ExtraIdle::Timeout()
}
aStream.Seek(0);
-#ifndef NO_JPEG
- Graphic aGraphic;
- if ( ImportJPEG( aStream, aGraphic, NULL ) )
- {
- Bitmap *pBmp = new Bitmap( aGraphic.GetBitmap() );
- StatementList::pTTProperties->Img( pBmp );
- delete pBmp;
- }
- else
-#endif
{
::svt::OStringTransfer::CopyString( CUniString("\nSorry! no bitmap"), StatementList::GetFirstDocFrame() );
}
diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx
index b72ad2e..3276f21 100644
--- a/automation/source/server/server.hxx
+++ b/automation/source/server/server.hxx
@@ -61,11 +61,6 @@ public:
static sal_uLong GetPort();
static sal_uInt16 nComm;
-
-#if OSL_DEBUG_LEVEL > 1
-// virtual void DataReceived( CommunicationLink* pCL );
-#endif
-
};
#endif
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 738e4a2..36ea24c 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -127,9 +127,6 @@ Dir *StatementCommand::pDir = NULL;
pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = NULL;
-#define RESET_APPLICATION_TO_BACKING_WINDOW
-
-
#define SET_WINP_CLOSING(pWin) \
pWindowWaitPointer = pWin; \
aWindowWaitUId = pControl->GetUniqueOrHelpId(); \
@@ -2186,11 +2183,9 @@ Window* StatementCommand::GetNextRecoverWin()
pBase = Application::GetNextTopLevelWindow( pBase );
}
-#ifdef RESET_APPLICATION_TO_BACKING_WINDOW
// close the FirstDocFrame last, It will not be closed, but the Document inside will be closed.
if ( IsDocWin( pMyFirstDocFrame ) )
return pMyFirstDocFrame;
-#endif // def RESET_APPLICATION_TO_BACKING_WINDOW
return NULL;
}
@@ -2414,7 +2409,6 @@ sal_Bool StatementCommand::Execute()
|| (pControl->GetType() == WINDOW_WORKWINDOW)
|| (pControl->GetType() == WINDOW_BORDERWINDOW) ) )
{
-#ifdef RESET_APPLICATION_TO_BACKING_WINDOW
// Special handling for last Document; do not close the Frame, only the Document
if ( GetDocWinCount() == 1 && IsDocFrame( pControl ) )
{
@@ -2441,7 +2435,6 @@ sal_Bool StatementCommand::Execute()
}
}
else
-#endif // def RESET_APPLICATION_TO_BACKING_WINDOW
{
REPORT_WIN_CLOSED( pControl, TypeString(pControl->GetType()));
SET_WINP_CLOSING(pControl);
@@ -4577,7 +4570,6 @@ sal_Bool StatementControl::Execute()
//HELPID BACKWARD (No numbers please (remove PARAM_ULONG_1 part)
if ( (nParams & PARAM_ULONG_1) )
{
- //aWantedID = rtl::OString( nLNr1 );
ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) );
}
else if ( (nParams & PARAM_STR_1) )
@@ -6339,10 +6331,6 @@ sal_Bool StatementControl::Execute()
}
}
return bStatementDone;
-
-#define FINISH_NEXT
-#define FINISH_SAME
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list