diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
commit | 4749f353739e8702bbbe162c02dd70e535f0b5e5 (patch) | |
tree | f951a579dfef5acd439a9d94fda28e859b879f02 | |
parent | 2c033bd486337d968dc57f48b31ed54e1afe248d (diff) |
CWS-TOOLING: integrate CWS sb93
-rw-r--r-- | comphelper/qa/complex/sequenceoutputstream/makefile.mk | 4 | ||||
-rw-r--r-- | sot/qa/complex/olesimplestorage/makefile.mk | 4 | ||||
-rw-r--r-- | svtools/qa/complex/passwordcontainer/makefile.mk | 4 | ||||
-rwxr-xr-x | toolkit/qa/complex/toolkit/interface_tests/makefile.mk | 4 | ||||
-rwxr-xr-x | toolkit/qa/complex/toolkit/makefile.mk | 4 | ||||
-rw-r--r-- | toolkit/qa/complex/xunitconversion/makefile.mk | 4 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 18 | ||||
-rw-r--r-- | toolkit/src2xml/include.lst | 1 | ||||
-rw-r--r-- | tools/inc/tools/string.hxx | 48 | ||||
-rw-r--r-- | unotools/qa/complex/tempfile/makefile.mk | 4 | ||||
-rwxr-xr-x | vcl/qa/complex/memCheck/makefile.mk | 4 | ||||
-rw-r--r-- | vcl/qa/complex/persistent_window_states/makefile.mk | 4 |
12 files changed, 55 insertions, 48 deletions
diff --git a/comphelper/qa/complex/sequenceoutputstream/makefile.mk b/comphelper/qa/complex/sequenceoutputstream/makefile.mk index 8e755a695664..69e78936cf0a 100644 --- a/comphelper/qa/complex/sequenceoutputstream/makefile.mk +++ b/comphelper/qa/complex/sequenceoutputstream/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.48.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/sequenceoutputstream #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ SequenceOutputStreamUnitTest.java\ diff --git a/sot/qa/complex/olesimplestorage/makefile.mk b/sot/qa/complex/olesimplestorage/makefile.mk index 83e840e4f972..baee53428854 100644 --- a/sot/qa/complex/olesimplestorage/makefile.mk +++ b/sot/qa/complex/olesimplestorage/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.10.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/olesimplestorage #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ OLESimpleStorageUnitTest.java\ diff --git a/svtools/qa/complex/passwordcontainer/makefile.mk b/svtools/qa/complex/passwordcontainer/makefile.mk index 91418656e797..4ce811bd3616 100644 --- a/svtools/qa/complex/passwordcontainer/makefile.mk +++ b/svtools/qa/complex/passwordcontainer/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.38.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/passwordcontainer #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ PasswordContainerUnitTest.java\ diff --git a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk b/toolkit/qa/complex/toolkit/interface_tests/makefile.mk index ac4a91bf3b0d..8c9cb27ecd04 100755 --- a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk +++ b/toolkit/qa/complex/toolkit/interface_tests/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.42.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/toolkit$/interface_tests #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = _XAccessibleComponent.java \ _XAccessibleContext.java \ _XAccessibleExtendedComponent.java \ diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk index 408ee2afd4a1..b375d1d5b238 100755 --- a/toolkit/qa/complex/toolkit/makefile.mk +++ b/toolkit/qa/complex/toolkit/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.42.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/toolkit #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = CheckAccessibleStatusBar.java CheckAccessibleStatusBarItem.java CheckAsyncCallback.java CallbackClass.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) SUBDIRS = interface_tests diff --git a/toolkit/qa/complex/xunitconversion/makefile.mk b/toolkit/qa/complex/xunitconversion/makefile.mk index 4ea2593a817d..a8be7a6ffb42 100644 --- a/toolkit/qa/complex/xunitconversion/makefile.mk +++ b/toolkit/qa/complex/xunitconversion/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.26.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/xunitconversion #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = XUnitConversionTest.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) SUBDIRS = diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index af7a8e46dfd7..72c24f4b25bd 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unocontrol.cxx,v $ - * $Revision: 1.54 $ + * $Revision: 1.54.42.1 $ * * This file is part of OpenOffice.org. * @@ -395,12 +395,18 @@ void UnoControl::disposeAccessibleContext() void UnoControl::dispose( ) throw(RuntimeException) { - ::osl::MutexGuard aGuard( GetMutex() ); - - if( getPeer().is() && mbDisposePeer ) + Reference< XWindowPeer > xPeer; + { + ::osl::MutexGuard aGuard( GetMutex() ); + if( mbDisposePeer ) + { + xPeer = mxPeer; + } + setPeer( NULL ); + } + if( xPeer.is() ) { - getPeer()->dispose(); - setPeer( NULL); + xPeer->dispose(); } // dispose and release our AccessibleContext diff --git a/toolkit/src2xml/include.lst b/toolkit/src2xml/include.lst index 27981912677a..7b35ccc73c73 100644 --- a/toolkit/src2xml/include.lst +++ b/toolkit/src2xml/include.lst @@ -21,7 +21,6 @@ ../../icu/unxlngi6.pro/inc ../../idl/inc ../../idl/unxlngi6.pro/inc -../../jut/unxlngi6.pro/inc ../../nas/unxlngi6.pro/inc ../../odk/inc ../../sal/qa/inc diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index d5eda17301c2..7b1b93e0868d 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: string.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.38.1 $ * * This file is part of OpenOffice.org. * @@ -176,6 +176,18 @@ private: TOOLS_DLLPRIVATE void ImplStringConvert( rtl_TextEncoding, rtl_TextEncoding, BOOL); + ByteString( const int* pDummy ); // not implemented: to prevent ByteString( NULL ) + ByteString(int); // not implemented; to detect misuses + // of ByteString(sal_Char); + void Assign(int); // not implemented; to detect misuses of + // Assign(sal_Char) + void operator =(int); // not implemented; to detect misuses + // of operator =(sal_Char) + void Append(int); // not implemented; to detect misuses of + // Append(char) + void operator +=(int); // not implemented; to detect misuses + // of operator +=(sal_Char) + public: ByteString(); ByteString( const ByteString& rStr ); @@ -183,10 +195,7 @@ public: ByteString( const rtl::OString& rStr ); ByteString( const sal_Char* pCharStr ); ByteString( const sal_Char* pCharStr, xub_StrLen nLen ); - ByteString( const int* pDummy ); // not implemented: to prevent ByteString( NULL ) ByteString( sal_Char c ); - ByteString(int); // not implemented; to detect misuses - // of ByteString(sal_Char); ByteString( const UniString& rUniStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); @@ -221,8 +230,6 @@ public: ByteString& Assign( const sal_Char* pCharStr ); ByteString& Assign( const sal_Char* pCharStr, xub_StrLen nLen ); ByteString& Assign( sal_Char c ); - void Assign(int); // not implemented; to detect misuses of - // Assign(sal_Char) ByteString& operator =( const ByteString& rStr ) { return Assign( rStr ); } ByteString& operator =( const rtl::OString& rStr ) @@ -231,23 +238,17 @@ public: { return Assign( pCharStr ); } ByteString& operator =( const sal_Char c ) { return Assign( c ); } - void operator =(int); // not implemented; to detect misuses - // of operator =(sal_Char) ByteString& Append( const ByteString& rStr ); ByteString& Append( const sal_Char* pCharStr ); ByteString& Append( const sal_Char* pCharStr, xub_StrLen nLen ); ByteString& Append( char c ); - void Append(int); // not implemented; to detect misuses of - // Append(char) ByteString& operator +=( const ByteString& rStr ) { return Append( rStr ); } ByteString& operator +=( const sal_Char* pCharStr ) { return Append( pCharStr ); } ByteString& operator +=( sal_Char c ) { return Append( c ); } - void operator +=(int); // not implemented; to detect misuses - // of operator +=(sal_Char) void SetChar( xub_StrLen nIndex, sal_Char c ); sal_Char GetChar( xub_StrLen nIndex ) const @@ -467,6 +468,18 @@ private: TOOLS_DLLPRIVATE inline void ImplCopyData(); TOOLS_DLLPRIVATE inline sal_Unicode * ImplCopyStringData(sal_Unicode *); + UniString( const int* pDummy ); // not implemented: to prevent UniString( NULL ) + UniString(int); // not implemented; to detect misuses of + // UniString(sal_Unicode) + void Assign(int); // not implemented; to detect misuses of + // Assign(sal_Unicode) + void operator =(int); // not implemented; to detect misuses + // of operator =(sal_Unicode) + void Append(int); // not implemented; to detect misuses of + // Append(sal_Unicode) + void operator +=(int); // not implemented; to detect misuses + // of operator +=(sal_Unicode) + public: UniString(); UniString( const ResId& rResId ); @@ -475,10 +488,7 @@ public: UniString( const rtl::OUString& rStr ); UniString( const sal_Unicode* pCharStr ); UniString( const sal_Unicode* pCharStr, xub_StrLen nLen ); - UniString( const int* pDummy ); // not implemented: to prevent UniString( NULL ) UniString( sal_Unicode c ); - UniString(int); // not implemented; to detect misuses of - // UniString(sal_Unicode) UniString(char c); // ...but allow "UniString('a')" UniString( const ByteString& rByteStr, rtl_TextEncoding eTextEncoding, @@ -519,8 +529,6 @@ public: UniString& Assign( const sal_Unicode* pCharStr ); UniString& Assign( const sal_Unicode* pCharStr, xub_StrLen nLen ); UniString& Assign( sal_Unicode c ); - void Assign(int); // not implemented; to detect misuses of - // Assign(sal_Unicode) inline UniString & Assign(char c) // ...but allow "Assign('a')" { return Assign(static_cast< sal_Unicode >(c)); } UniString& AssignAscii( const sal_Char* pAsciiStr ); @@ -533,8 +541,6 @@ public: { return Assign( pCharStr ); } UniString& operator =( sal_Unicode c ) { return Assign( c ); } - void operator =(int); // not implemented; to detect misuses - // of operator =(sal_Unicode) inline UniString & operator =(char c) // ...but allow "= 'a'" { return operator =(static_cast< sal_Unicode >(c)); } @@ -542,8 +548,6 @@ public: UniString& Append( const sal_Unicode* pCharStr ); UniString& Append( const sal_Unicode* pCharStr, xub_StrLen nLen ); UniString& Append( sal_Unicode c ); - void Append(int); // not implemented; to detect misuses of - // Append(sal_Unicode) inline UniString & Append(char c) // ...but allow "Append('a')" { return Append(static_cast< sal_Unicode >(c)); } UniString& AppendAscii( const sal_Char* pAsciiStr ); @@ -554,8 +558,6 @@ public: { return Append( pCharStr ); } UniString& operator +=( sal_Unicode c ) { return Append( c ); } - void operator +=(int); // not implemented; to detect misuses - // of operator +=(sal_Unicode) inline UniString & operator +=(char c) // ...but allow "+= 'a'" { return operator +=(static_cast< sal_Unicode >(c)); } diff --git a/unotools/qa/complex/tempfile/makefile.mk b/unotools/qa/complex/tempfile/makefile.mk index 5fbc0fe27f85..0a8f51e7e71b 100644 --- a/unotools/qa/complex/tempfile/makefile.mk +++ b/unotools/qa/complex/tempfile/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.20.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/tempfile #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ TempFileUnitTest.java\ diff --git a/vcl/qa/complex/memCheck/makefile.mk b/vcl/qa/complex/memCheck/makefile.mk index 035d96910a96..5b1837540c51 100755 --- a/vcl/qa/complex/memCheck/makefile.mk +++ b/vcl/qa/complex/memCheck/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.124.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/memCheck #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = CheckMemoryUsage.java #----- make a jar from compiled files ------------------------------ diff --git a/vcl/qa/complex/persistent_window_states/makefile.mk b/vcl/qa/complex/persistent_window_states/makefile.mk index 36315261df81..1be4474651e9 100644 --- a/vcl/qa/complex/persistent_window_states/makefile.mk +++ b/vcl/qa/complex/persistent_window_states/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.124.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = complex$/persistent_window_states #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = PersistentWindowTest.java DocumentHandle.java #----- make a jar from compiled files ------------------------------ |