[Libreoffice-commits] .: 6 commits - basegfx/inc dtrans/test svl/inc svl/source svtools/source tools/bootstrp tools/source unotools/inc unotools/source vcl/os2
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sat Jan 29 06:42:31 PST 2011
basegfx/inc/basegfx/tuple/b2ituple.hxx | 14 --------
dtrans/test/win32/dnd/dndTest.cxx | 14 +-------
svl/inc/svl/sfontitm.hxx | 27 ----------------
svl/source/misc/strmadpt.cxx | 1
svl/source/svdde/ddeml1.cxx | 2 -
svl/source/svdde/ddemldeb.cxx | 2 -
svtools/source/contnr/svimpbox.cxx | 13 --------
svtools/source/misc/acceleratorexecute.cxx | 42 -------------------------
tools/bootstrp/command.cxx | 47 -----------------------------
tools/source/stream/stream.cxx | 7 ----
unotools/inc/unotools/inetoptions.hxx | 6 ---
unotools/source/ucbhelper/ucblockbytes.cxx | 34 --------------------
vcl/os2/source/gdi/salgdi3.cxx | 2 -
13 files changed, 2 insertions(+), 209 deletions(-)
New commits:
commit 18a459d404517588c09471838ce4b90b394ff344
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 23:16:21 2011 +0100
Remove OV_DEBUG.
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 4aa8587..5bd60c9 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2513,19 +2513,6 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
bKeyUsed = FALSE;
break;
-
-#ifdef OV_DEBUG
- case KEY_F9:
- MakeVisible( pCursor );
- break;
- case KEY_F10:
- pView->RemoveSelection();
- break;
- case KEY_DELETE:
- pView->RemoveEntry( pCursor );
- break;
-#endif
-
case KEY_ADD:
if( pCursor )
{
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index bae49d0..09e3afb 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -41,13 +41,6 @@
#include "boost/static_assert.hpp"
-/*
-#if defined( DBG_UTIL ) && (OSL_DEBUG_LEVEL > 1)
-// prueft Synchronisation des Buffers nach allen Read, Write, Seek
-#define OV_DEBUG
-#endif
-*/
-
#include <tools/solar.h>
#if defined(BLC)
commit 1e05c5e6c9be32e67e499e61257de1d35776d3f1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 22:52:22 2011 +0100
cppcheck: remove unused variable aBuf.
diff --git a/svl/source/svdde/ddemldeb.cxx b/svl/source/svdde/ddemldeb.cxx
index a5e0d73..418a33c 100644
--- a/svl/source/svdde/ddemldeb.cxx
+++ b/svl/source/svdde/ddemldeb.cxx
@@ -52,7 +52,6 @@ void ImpAddHSZ( HSZ hszString, String& rStr )
void ImpWriteDdeStatus(char* aFilename, char* pAppContext)
{
- char aBuf[ 128 ];
USHORT nCtr;
HWND* pAppPtr;
ImpHCONV* pConvPtr;
@@ -187,7 +186,6 @@ void ImpWriteDdeStatus(char* aFilename, char* pAppContext)
void ImpWriteDdeData(char* aFilename, DDESTRUCT* pData)
{
- char aBuf[ 128 ];
USHORT nCtr;
SvFileStream aStrm(aFilename, STREAM_READWRITE );
aStrm.Seek( STREAM_SEEK_TO_END );
commit 49ac29e457de1bab3ae43291f384c1918a83756c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 22:47:32 2011 +0100
cppcheck: remove unused variables.
diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx
index 751abc4..f170516 100644
--- a/vcl/os2/source/gdi/salgdi3.cxx
+++ b/vcl/os2/source/gdi/salgdi3.cxx
@@ -991,8 +991,6 @@ void Os2SalGraphics::GetDevFontList( ImplDevFontList* pList )
HMODULE hMod;
ULONG ObjNum, Offset, rc;
CHAR Buff[2*_MAX_PATH];
- char drive[_MAX_DRIVE], dir[_MAX_DIR];
- char fname[_MAX_FNAME], ext[_MAX_EXT];
// get module handle (and name)
rc = DosQueryModFromEIP( &hMod, &ObjNum, sizeof( Buff), Buff,
&Offset, (ULONG)ImplSalGetUniString);
commit 44b15a9542cd759e501781a6c03b4340a73d79f3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 22:30:43 2011 +0100
cppcheck: remove unused variable pTrans.
diff --git a/svl/source/svdde/ddeml1.cxx b/svl/source/svdde/ddeml1.cxx
index 5663ca7..a21f742 100644
--- a/svl/source/svdde/ddeml1.cxx
+++ b/svl/source/svdde/ddeml1.cxx
@@ -2580,8 +2580,6 @@ MRESULT ImpDdeMgr::DdeUnadvise( ImpWndProcParams* pParams )
if( nTransId )
{
////WRITELOG("DdeUnadvise:Transaction found")
- Transaction* pTrans = pTransTable;
- pTrans += (USHORT)nTransId;
ImpHCONV* pConv = pConvTable;
pConv += (USHORT)hConv;
nClosedTransactions = 1;
commit aadecb3676cd1bae6d72c758bc9c5ed57ab11307
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 21:46:13 2011 +0100
Remove unused variable errMsg and dead code.
diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx
index d5ccd14..57b5ecf 100644
--- a/dtrans/test/win32/dnd/dndTest.cxx
+++ b/dtrans/test/win32/dnd/dndTest.cxx
@@ -64,20 +64,13 @@ using namespace com::sun::star::datatransfer::dnd;
using namespace com::sun::star::datatransfer::dnd::DNDConstants;
using namespace rtl;
-// defined in atlwindow.hxx
-// #define WM_SOURCE_INIT WM_APP+100
-// #define WM_SOURCE_STARTDRAG WM_APP+101
#define WM_CREATE_MTA_WND
HRESULT doTest();
DWORD WINAPI MTAFunc( void* threadData);
Reference< XMultiServiceFactory > MultiServiceFactory;
-//int APIENTRY WinMain(HINSTANCE hInstance,
-// HINSTANCE hPrevInstance,
-// LPSTR lpCmdLine,
-// int nCmdShow)
-//int _tmain( int argc, TCHAR *argv[ ], TCHAR *envp[ ] )
+
int main( int argc, char *argv[ ], char *envp[ ] )
{
HRESULT hr;
@@ -93,8 +86,6 @@ int main( int argc, char *argv[ ], char *envp[ ] )
if( FAILED(hr=doTest()))
{
_com_error err( hr);
- const TCHAR * errMsg= err.ErrorMessage();
-// MessageBox( NULL, errMsg, "Test failed", MB_ICONERROR);
}
@@ -160,8 +151,7 @@ DWORD WINAPI MTAFunc( void* threadData)
RECT pos={0, 406, 300, 605};
AWindow win(_T("DnD, full MTA"), GetCurrentThreadId(), pos, false, true);
-// ThreadData data= *( ThreadData*)pParams;
-// SetEvent(data.evtThreadReady);
+
while( GetMessage(&msg, (HWND)NULL, 0, 0) )
{
switch( msg.message)
commit 110393a97d6e0626e43da60500d23d1d47742210
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jan 28 20:38:43 2011 +0100
Remove double line spacing and unused code.
diff --git a/basegfx/inc/basegfx/tuple/b2ituple.hxx b/basegfx/inc/basegfx/tuple/b2ituple.hxx
index 2611d38..4f91270 100644
--- a/basegfx/inc/basegfx/tuple/b2ituple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2ituple.hxx
@@ -202,37 +202,23 @@ namespace basegfx
// external operators
//////////////////////////////////////////////////////////////////////////
-
class B2DTuple;
B2ITuple minimum(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
B2ITuple maximum(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
B2ITuple absolute(const B2ITuple& rTup);
-
B2DTuple interpolate(const B2ITuple& rOld1, const B2ITuple& rOld2, double t);
-
B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2);
-
B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2, const B2ITuple& rOld3);
B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
B2ITuple operator-(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
B2ITuple operator/(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
B2ITuple operator*(const B2ITuple& rTupA, const B2ITuple& rTupB);
-
B2ITuple operator*(const B2ITuple& rTup, sal_Int32 t);
-
B2ITuple operator*(sal_Int32 t, const B2ITuple& rTup);
-
B2ITuple operator/(const B2ITuple& rTup, sal_Int32 t);
-
B2ITuple operator/(sal_Int32 t, const B2ITuple& rTup);
-
} // end of namespace basegfx
#endif /* _BGFX_TUPLE_B2ITUPLE_HXX */
diff --git a/svl/inc/svl/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx
index 0fc74e4..41de2e7 100644
--- a/svl/inc/svl/sfontitm.hxx
+++ b/svl/inc/svl/sfontitm.hxx
@@ -68,26 +68,20 @@ public:
virtual int operator ==(const SfxPoolItem & rItem) const;
virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
-
virtual SvStream & Store(SvStream & rStream, USHORT) const;
virtual SfxPoolItem * Clone(SfxItemPool * = 0) const
{ return new SfxFontItem(*this); }
sal_Bool hasFont() const { return m_bHasFont; }
-
sal_Bool hasColor() const { return m_bHasColor; }
-
sal_Bool hasFillColor() const { return m_bHasFillColor; }
const XubString & getName() const { return m_aName; }
-
const XubString & getStyleName() const { return m_aStyleName; }
const Size & getSize() const { return m_aSize; }
-
const Color & getColor() const { return m_aColor; }
-
const Color & getFillColor() const { return m_aFillColor; }
rtl_TextEncoding getCharSet() const { return m_nCharSet; }
@@ -95,51 +89,30 @@ public:
LanguageType getLanguage() const { return m_nLanguage; }
sal_Int16 getFamily() const { return m_nFamily; }
-
sal_Int16 getPitch() const { return m_nPitch; }
-
sal_Int16 getWeight() const { return m_nWeight; }
-
sal_Int16 getWidthType() const { return m_nWidthType; }
-
sal_Int16 getItalic() const { return m_nItalic; }
-
sal_Int16 getUnderline() const { return m_nUnderline; }
-
sal_Int16 getStrikeout() const { return m_nStrikeout; }
-
sal_Int16 getOrientation() const { return m_nOrientation; }
-
sal_Bool getWordLine() const { return m_bWordLine; }
-
sal_Bool getOutline() const { return m_bOutline; }
-
sal_Bool getShadow() const { return m_bShadow; }
-
sal_Bool getKerning() const { return m_bKerning; }
inline void setFont(sal_Int16 nTheFamily, const XubString & rTheName,
const XubString & rTheStyleName, sal_Int16 nThePitch,
rtl_TextEncoding nTheCharSet);
-
inline void setWeight(sal_Int16 nTheWeight);
-
inline void setItalic(sal_Int16 nTheItalic);
-
inline void setHeight(sal_Int32 nHeight);
-
inline void setColor(const Color & rTheColor);
-
inline void setFillColor(const Color & rTheFillColor);
-
inline void setUnderline(sal_Int16 nTheUnderline);
-
inline void setStrikeout(sal_Int16 nTheStrikeout);
-
inline void setOutline(sal_Bool bTheOutline);
-
inline void setShadow(sal_Bool bTheShadow);
-
inline void setLanguage(LanguageType nTheLanguage);
};
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 8910092..af14adb 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -96,7 +96,6 @@ public:
inline bool isEOF() const;
bool addMark(sal_uInt32 nPosition);
-
bool removeMark(sal_uInt32 nPosition);
inline sal_uInt32 getReadPosition() const;
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 81261f9..5d073db 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -32,25 +32,15 @@
//===============================================
// includes
-
#include <com/sun/star/frame/XModuleManager.hpp>
-
#include <com/sun/star/frame/XDesktop.hpp>
-
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
-
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-
#include <com/sun/star/awt/XTopWindow.hpp>
-
#include <com/sun/star/awt/KeyModifier.hpp>
-
#include <com/sun/star/uno/Sequence.hxx>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <com/sun/star/lang/DisposedException.hpp>
#include <toolkit/helper/vclunohelper.hxx>
@@ -73,7 +63,6 @@ namespace svt
class SVT_DLLPRIVATE AsyncAccelExec
{
public:
-
//---------------------------------------
/** creates a new instance of this class, which can be used
one times only!
@@ -87,7 +76,6 @@ class SVT_DLLPRIVATE AsyncAccelExec
void execAsync();
private:
-
//---------------------------------------
/** @short allow creation of instances of this class
by using our factory only!
@@ -98,7 +86,6 @@ class SVT_DLLPRIVATE AsyncAccelExec
DECL_DLLPRIVATE_LINK(impl_ts_asyncCallback, void*);
private:
-
::vcl::EventPoster m_aAsyncCallback;
css::uno::Reference< css::frame::XDispatch > m_xDispatch;
css::util::URL m_aURL;
@@ -328,91 +315,62 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
{
case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfLine" ) );
-
case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfLine" ) );
-
case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfPara" ) );
-
case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfPara" ) );
-
case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfWord" ) );
-
case com::sun::star::awt::Key::DELETE_WORD_FORWARD:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfWord" ) );
-
case com::sun::star::awt::Key::INSERT_LINEBREAK:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertLinebreak" ) );
-
case com::sun::star::awt::Key::INSERT_PARAGRAPH:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPara" ) );
-
case com::sun::star::awt::Key::MOVE_WORD_BACKWARD:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToPrevWord" ) );
-
case com::sun::star::awt::Key::MOVE_WORD_FORWARD:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToNextWord" ) );
-
case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfLine" ) );
-
case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfLine" ) );
-
case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfPara" ) );
-
case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfPara" ) );
-
case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfDoc" ) );
-
case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfDoc" ) );
-
case com::sun::star::awt::Key::SELECT_BACKWARD:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharLeftSel" ) );
-
case com::sun::star::awt::Key::SELECT_FORWARD:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharRightSel" ) );
-
case com::sun::star::awt::Key::SELECT_WORD_BACKWARD:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordLeftSel" ) );
-
case com::sun::star::awt::Key::SELECT_WORD_FORWARD:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordRightSel" ) );
-
case com::sun::star::awt::Key::SELECT_WORD:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectWord" ) );
-
case com::sun::star::awt::Key::SELECT_LINE:
return rtl::OUString();
-
case com::sun::star::awt::Key::SELECT_PARAGRAPH:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectText" ) );
-
case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfLineSel" ) );
-
case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfLineSel" ) );
-
case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfParaSel" ) );
-
case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfParaSel" ) );
-
case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfDocumentSel" ) );
-
case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfDocumentSel" ) );
-
case com::sun::star::awt::Key::SELECT_ALL:
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectAll" ) );
default:
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
index 89ee094..08321c4 100644
--- a/tools/bootstrp/command.cxx
+++ b/tools/bootstrp/command.cxx
@@ -124,7 +124,6 @@ CommandLine::CommandLine(const char *CommandString, BOOL bWrite)
{
CommandBuffer = new char [1];
if (CommandBuffer == NULL) {
- //cout << "Error: nospace" << endl;
exit(0);
}
nArgc = 0;
@@ -150,7 +149,6 @@ CommandLine::CommandLine(const CommandLine& CCommandLine, BOOL bWrite)
{
CommandBuffer = new char [1];
if (CommandBuffer == NULL) {
- //cout << "Error: nospace" << endl;
exit(0);
}
nArgc = 0;
@@ -175,7 +173,6 @@ CommandLine::~CommandLine()
{
delete [] CommandBuffer;
delete [] ComShell;
- //for (int i = 0; ppArgv[i] != '\0'; i++) {
for (int i = 0; ppArgv[i] != 0; i++) {
delete [] ppArgv[i];
}
@@ -218,13 +215,6 @@ CommandLine& CommandLine::operator=(const char *CommandString)
void CommandLine::Print()
/*****************************************************************************/
{
- //cout << "******* start print *******" << endl;
- //cout << "nArgc = " << nArgc << endl;
- //cout << "CommandBuffer = " << CommandBuffer << endl;
- for (int i = 0; ppArgv[i] != NULL; i++) {
- //cout << "ppArgv[" << i << "] = " << ppArgv[i] << endl;
- }
- //cout << "******** end print ********" << endl;
}
/*****************************************************************************/
@@ -246,11 +236,9 @@ void CommandLine::BuildCommand(const char *CommandString)
}
// delete old memory and get some new memory for CommandBuffer
-
delete [] CommandBuffer;
CommandBuffer = new char [strlen(ComShell)+strlen(WorkString)+1];
if (CommandBuffer == NULL) {
- //cout << "Error: nospace" << endl;
exit(0);
}
strcpy (CommandBuffer, ComShell);
@@ -262,14 +250,12 @@ void CommandLine::BuildCommand(const char *CommandString)
Strtokens(CommandString);
// delete the space for the old CommandLine
-
for (int i = 0; ppArgv[i] != 0; i++) {
delete [] ppArgv[i];
}
delete [] ppArgv;
/* get space for the new command line */
-
ppArgv = (char **) new char * [nArgc+1];
if (ppArgv == NULL) {
//cout << "Error: no space" << endl;
@@ -277,30 +263,23 @@ void CommandLine::BuildCommand(const char *CommandString)
}
// flush the white space
-
while ( isspace(*CommandString) )
CommandString++;
index = 0;
// start the loop to build all the individual tokens
-
while (*CommandString != '\0') {
-
pos = 0;
// copy the token until white space is found
-
while ( !isspace(*CommandString) && *CommandString != '\0') {
-
buffer[pos++] = *CommandString++;
-
}
buffer[pos] = '\0';
// get space for the individual tokens
-
ppArgv[index] = (char *) new char [strlen(buffer)+1];
if (ppArgv[index] == NULL) {
//cout << "Error: nospace" << endl;
@@ -308,14 +287,11 @@ void CommandLine::BuildCommand(const char *CommandString)
}
// copy the token
-
strcpy (ppArgv[index++], buffer);
// flush while space
-
while ( isspace(*CommandString) )
CommandString++;
-
}
// finish by setting the las pointer to NULL
@@ -333,17 +309,13 @@ void CommandLine::Strtokens(const char *CommandString)
temp = CommandString;
/* bypass white space */
-
while (isspace(*temp)) temp++;
for (count=0; *temp != '\0'; count++) {
-
/* continue until white space of string terminator is found */
-
while ((!isspace(*temp)) && (*temp != '\0')) temp++;
/* bypass white space */
-
while (isspace(*temp)) temp++;
}
@@ -447,26 +419,15 @@ CCommand::operator int()
#elif defined OS2
nRet = _spawnv( P_WAIT, ppArgv[0], ppArgv );
#elif defined UNX
- //fprintf( stderr, "CComand : operator (int) not implemented\n");
- // **** Unix Implementierung ***************
pid_t pid;
if (( pid = fork()) < 0 )
- {
DBG_ASSERT( FALSE, "fork error" );
- }
else if ( pid == 0 )
- {
if ( execv( ppArgv[0], (char * const *) ppArgv ) < 0 )
- {
DBG_ASSERT( FALSE, "execv failed" );
- }
- }
- //fprintf( stderr, "parent: %s %s\n", ppArgv[0] , ppArgv[1] );
if ( (nRet = waitpid( pid, NULL, 0 ) < 0) )
- {
DBG_ASSERT( FALSE, "wait error" );
- }
#endif
switch ( errno )
@@ -628,8 +589,6 @@ CCommandd::operator int()
aStartupInfo.lpTitle = NULL;
aStartupInfo.dwX = 100;
aStartupInfo.dwY = 100;
- //aStartupInfo.dwXSize = 400;
- //aStartupInfo.dwYSize = 400;
aStartupInfo.dwXCountChars = 40;
aStartupInfo.dwYCountChars = 40;
@@ -637,15 +596,9 @@ CCommandd::operator int()
aStartupInfo.dwFillAttribute = FOREGROUND_RED | BACKGROUND_RED |
BACKGROUND_BLUE | BACKGROUND_GREEN;
-// aStartupInfo.dwFlags = STARTF_USESTDHANDLES;
- //aStartupInfo.wShowWindow = SW_NORMAL; //SW_SHOWDEFAULT;
- //aStartupInfo.wShowWindow = SW_HIDE; //SW_SHOWNOACTIVATE;
aStartupInfo.wShowWindow = SW_SHOWNOACTIVATE;
aStartupInfo.cbReserved2 = NULL;
aStartupInfo.lpReserved2 = NULL;
- //aStartupInfo.hStdInput = stdin;
- //aStartupInfo.hStdOutput = stdout;
- //aStartupInfo.hStdError = stderr;
if ( nFlag & COMMAND_EXECUTE_HIDDEN )
{
diff --git a/unotools/inc/unotools/inetoptions.hxx b/unotools/inc/unotools/inetoptions.hxx
index f5d4933..99949bc 100644
--- a/unotools/inc/unotools/inetoptions.hxx
+++ b/unotools/inc/unotools/inetoptions.hxx
@@ -76,27 +76,21 @@ public:
enum ProxyType { NONE, AUTOMATIC, MANUAL };
rtl::OUString GetProxyNoProxy() const;
-
sal_Int32 GetProxyType() const;
rtl::OUString GetProxyFtpName() const;
-
sal_Int32 GetProxyFtpPort() const;
rtl::OUString GetProxyHttpName() const;
-
sal_Int32 GetProxyHttpPort() const;
void SetProxyNoProxy(rtl::OUString const & rValue, bool bFlush = false);
-
void SetProxyType(ProxyType eValue, bool bFlush = false);
void SetProxyFtpName(rtl::OUString const & rValue, bool bFlush = false);
-
void SetProxyFtpPort(sal_Int32 nValue, bool bFlush = false);
void SetProxyHttpName(rtl::OUString const & rValue, bool bFlush = false);
-
void SetProxyHttpPort(sal_Int32 nValue, bool bFlush = false);
void flush();
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 69de4bf..5d68756 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -118,7 +118,6 @@ class UcbStreamer_Impl : public ::cppu::WeakImplHelper2< XActiveDataStreamer, XA
UcbLockBytesRef m_xLockBytes;
public:
-
UcbStreamer_Impl( UcbLockBytes* pLockBytes )
: m_xLockBytes( pLockBytes )
{}
@@ -170,7 +169,6 @@ public:
, m_xProgressHandler( rxProgressHandler )
{}
-
virtual Reference<XInteractionHandler> SAL_CALL getInteractionHandler() throw (RuntimeException)
{ return m_xInteractionHandler; }
@@ -259,7 +257,6 @@ class Moderator
// returns. This would imply that these class must be refcounted !!!
public:
-
Moderator(
Reference < XContent >& xContent,
Reference < XInteractionHandler >& xInteract,
@@ -300,7 +297,6 @@ public:
: public salhelper::Condition
{
public:
-
ConditionRes(osl::Mutex& aMutex,Moderator& aModerator)
: salhelper::Condition(aMutex),
m_aModerator(aModerator)
@@ -308,13 +304,11 @@ public:
}
protected:
-
bool applies() const {
return m_aModerator.m_aResultType != NORESULT;
}
private:
-
Moderator& m_aModerator;
};
@@ -325,10 +319,8 @@ public:
sal_Int32 ioErrorCode;
};
-
Result getResult(const sal_uInt32 milliSec);
-
enum ReplyType {
NOREPLY,
EXIT,
@@ -336,12 +328,10 @@ public:
REQUESTHANDLED
};
-
class ConditionRep
: public salhelper::Condition
{
public:
-
ConditionRep(osl::Mutex& aMutex,Moderator& aModerator)
: salhelper::Condition(aMutex),
m_aModerator(aModerator)
@@ -349,40 +339,30 @@ public:
}
protected:
-
bool applies() const {
return m_aModerator.m_aReplyType != NOREPLY;
}
private:
-
Moderator& m_aModerator;
};
void setReply(ReplyType);
-
void handle( const Reference<XInteractionRequest >& Request );
-
void push( const Any& Status );
-
void update( const Any& Status );
-
void pop( );
void setStream(const Reference< XStream >& aStream);
-
void setInputStream(const Reference<XInputStream> &rxInputStream);
protected:
-
virtual void SAL_CALL run();
-
virtual void SAL_CALL onTerminated();
private:
-
osl::Mutex m_aMutex;
friend class ConditionRes;
@@ -433,7 +413,6 @@ public:
private:
-
Moderator& m_aModerator;
osl::Mutex m_aMutex;
@@ -441,7 +420,6 @@ private:
};
-
class ModeratorsActiveDataSink
: public ::cppu::WeakImplHelper1<XActiveDataSink>
{
@@ -473,7 +451,6 @@ public:
private:
-
Moderator& m_aModerator;
osl::Mutex m_aMutex;
Reference<XInputStream> m_xStream;
@@ -557,7 +534,6 @@ class ModeratorsProgressHandler
: public ::cppu::WeakImplHelper1<XProgressHandler>
{
public:
-
ModeratorsProgressHandler(Moderator &theModerator);
~ModeratorsProgressHandler();
@@ -574,7 +550,6 @@ public:
private:
-
Moderator& m_aModerator;
};
@@ -611,8 +586,6 @@ void SAL_CALL ModeratorsProgressHandler::pop( )
}
-
-
ModeratorsInteractionHandler::ModeratorsInteractionHandler(
Moderator &aModerator)
: m_aModerator(aModerator)
@@ -776,7 +749,6 @@ void Moderator::handle( const Reference<XInteractionRequest >& Request )
}
-
void Moderator::push( const Any& Status )
{
{
@@ -866,7 +838,6 @@ void Moderator::setInputStream(const Reference<XInputStream> &rxInputStream)
}
-
void SAL_CALL Moderator::run()
{
ResultType aResultType;
@@ -908,8 +879,6 @@ void SAL_CALL Moderator::run()
}
}
-
-
void SAL_CALL Moderator::onTerminated()
{
{
@@ -918,12 +887,10 @@ void SAL_CALL Moderator::onTerminated()
delete this;
}
-
/**
Function for opening UCB contents synchronously,
but with handled timeout;
*/
-
static sal_Bool _UCBOpenContentSync(
UcbLockBytesRef xLockBytes,
Reference < XContent > xContent,
@@ -1271,7 +1238,6 @@ static sal_Bool _UCBOpenContentSync(
return ( bAborted || bException );
}
-
//----------------------------------------------------------------------------
UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler )
: m_xInputStream (NULL)
More information about the Libreoffice-commits
mailing list