diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:06:19 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:06:19 +0200 |
commit | cdda6341027eb807f9cdeca704011fe3968fe3e3 (patch) | |
tree | fd07b7561c849218420a898a9fd853bcc6121332 /extensions/workben | |
parent | b52ec9a4fa9b8eb93a181fac3613f1de7d1d0825 (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 0038bc6128921ad380912b18634212681578abfd (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:42 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit d7771bc638587e49ea7225312933c73cfc041439
Author: bjoern.michaelsen@canonical.com <Bjoern Michaelsen>
Date: Mon Feb 7 17:18:01 2011 +0100
lp#696527: enable human icon theme in LibreOffice
(cherry picked from commit cfa7e88f5959a8b3b729107d61351410be80f49b)
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
(cherry picked from commit c1d45fdb7f6380a0e6640a336cd790027e903b4f)
Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
cui/source/options/optgdlg.src | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 474fbc4e896114f138061af9002b88cd675c8f01
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:23 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit 94a2ea07194893531b93b78c2903d96bbc5526ce
Author: Petr Mladek <pmladek@suse.cz>
Date: Sun Feb 6 18:22:35 2011 +0100
add Ukrainian also into packinfo_office.txt
setup_native/source/packinfo/packinfo_office.txt | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
commit e6e8d8ebbe2ef54704a467cf4930494fdf3be6ff
Author: Petr Mladek <pmladek@suse.cz>
Date: Sun Feb 6 18:06:37 2011 +0100
add Occitan also into packinfo_office.txt
build fails witout it
setup_native/source/packinfo/packinfo_office.txt | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
commit 7754d67735a8e698d2b7106cae4c6e35eaf3b75b
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Thu Feb 3 17:28:59 2011 +0100
New mimetype icons for LibreOffice
Update from design team, source svg is
http://wiki.documentfoundation.org/cgi_img_auth.php/d/d4/LibreOffice_Initial_Icons-pre_final.svg
setup_native/source/win32/nsis/ooosetup.ico | Bin 2238 -> 26918 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
commit adbc618d68569d5b63d1ec87c5d7a9d7f5ba5761
Author: Caolán McNamara <caolanm@redhat.com>
Date: Sun Jan 30 20:38:00 2011 +0000
Resolves: rhbz#673819 crash on changing position of drawing object in header
The header/footer objects are cunning wrappers to pretend to some parts
of the drawing stuff that there are multiple objects, while in reality
there is only one. So call HasText actually gets a totally different
object from the cast :-(
Signed-off-by: David Tardon <dtardon@redhat.com>
cui/source/tabpages/swpossizetabpage.cxx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
commit 13519789cd6c9f86067251c5566f29a96bdaac44
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 3 00:37:15 2011 +0100
another s/OpenOffice.org/LibreOffice/ in nsplugin
extensions/source/nsplugin/source/nsplugin_oo.rc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit c0c2964c3ad1a42a5cd3548b9fcdd1c256c077bf
Author: Andras Timar <timar@fsf.hu>
Date: Sat Jan 29 12:32:52 2011 +0100
Added Occitan dictionary
.../source/packinfo/spellchecker_selection.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit eacd19b0e2eeba91aa1b2387d93e99996c0efae2
Author: Andras Timar <timar@fsf.hu>
Date: Sat Jan 29 11:14:10 2011 +0100
Added Ukrainian dictionaries
.../source/packinfo/spellchecker_selection.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit ecf859006048314ef1c4a4202a642e74a443ebce
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Feb 1 14:26:46 2011 +0200
Fix overflow problem in the custom action for UI language de-selection
In the _all_ installer we have slightly over 100 LibreOffice UI
languages. The code in the custom action that de-selects UI languages
based on the Windows UI language(s) and the user's locale had a limit
of 100.
The consequence was that a few of the alphabetically last LibreOffice
UI languages: Ukrainan, Urdu, Uzbek, Venda and Xhosa, were not
de-selected even if none of those languages was used by the user or
Windows, and thus got installed in a "quick" install and also in a
"custom" install unless the person running the installer noticed.
Reported by aseques_ on IRC, no bug filed yet.
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
.../source/win32/customactions/sellang/sellang.cxx | 217 ++++++++++----------
1 files changed, 104 insertions(+), 113 deletions(-)
commit a73c1cff1b27dbef84f0d85d594f9628bb48a827
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Wed Jan 26 19:52:02 2011 +0100
Revert "Initial LibO mimetype icon design"
This reverts commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333.
setup_native/source/win32/nsis/ooosetup.ico | Bin 26918 -> 2238 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
commit 88a6c07dc231ed3508ffe81ec624a753f4c49e75
Author: Alexander Thurgood <alex.thurgood@gmail.com>
Date: Wed Jan 26 18:10:16 2011 +0100
Fix window focus for langpack installation on Mac fdo# 33056
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
.../scripts/osx_install_languagepack.applescript | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Tue Jan 18 10:26:56 2011 +0100
Initial LibO mimetype icon design
As per http://luxate.blogspot.com/2011/01/libreoffice-initial-icons-milestone.html
updating the LibO mimetype and app icons (and the installer icon, for coherence).
setup_native/source/win32/nsis/ooosetup.ico | Bin 2238 -> 26918 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
commit f7d7948cbe9e38e2e219f6024c0add130a5f6480
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Fri Jan 14 11:53:12 2011 -0500
Remove pesky on-line registration menu entry. (fdo#33112)
.../uiconfig/sbibliography/menubar/menubar.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit 3097feb2f56b19a1b10b167f5c5869e2c7920be9
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit 1b83f908126d09ef6e0015eb531bbd8c4cf57034
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:06 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: components_libreoffice-3.3.1.1
split repo tag: components_libreoffice-3.3.1.2
Diffstat (limited to 'extensions/workben')
-rw-r--r-- | extensions/workben/pythonautotest.cxx | 86 | ||||
-rw-r--r-- | extensions/workben/pythontest.cxx | 30 | ||||
-rw-r--r-- | extensions/workben/testcomponent.cxx | 30 | ||||
-rw-r--r-- | extensions/workben/testframecontrol.cxx | 86 | ||||
-rw-r--r-- | extensions/workben/testpgp.cxx | 4 | ||||
-rw-r--r-- | extensions/workben/testresource.cxx | 2 | ||||
-rw-r--r-- | extensions/workben/testresource.src | 4 |
7 files changed, 121 insertions, 121 deletions
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index aab403885835..1b44b17ef392 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,34 +63,34 @@ class MyPythonRoot : { public: MyPythonRoot() { m_iTestValue = 15; } - BOOL queryInterface( Uik aUik, XInterfaceRef & rOut ); - void acquire() { OWeakObject::acquire(); } - void release() { OWeakObject::release(); } - void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } + BOOL queryInterface( Uik aUik, XInterfaceRef & rOut ); + void acquire() { OWeakObject::acquire(); } + void release() { OWeakObject::release(); } + void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } public: - XIntrospectionAccessRef getIntrospection(void) const THROWS( (UsrSystemException) ) + XIntrospectionAccessRef getIntrospection(void) const THROWS( (UsrSystemException) ) { return XIntrospectionAccessRef(); } - UsrAny invoke( const UString& FunctionName, + UsrAny invoke( const UString& FunctionName, const Sequence< UsrAny >& Params, Sequence< INT16 >& OutParamIndex, Sequence< UsrAny >& OutParam) - THROWS( ( IllegalArgumentException, + THROWS( ( IllegalArgumentException, CannotConvertException, InvocationTargetException, UsrSystemException) ); - void setValue(const UString& PropertyName, const UsrAny& Value) - THROWS( ( UnknownPropertyException, + void setValue(const UString& PropertyName, const UsrAny& Value) + THROWS( ( UnknownPropertyException, CannotConvertException, InvocationTargetException, UsrSystemException) ); - UsrAny getValue(const UString& PropertyName) - THROWS( ( UnknownPropertyException, + UsrAny getValue(const UString& PropertyName) + THROWS( ( UnknownPropertyException, UsrSystemException) ); - BOOL hasMethod(const UString& Name) const THROWS( (UsrSystemException) ); - BOOL hasProperty(const UString& Name) const THROWS( (UsrSystemException) ); + BOOL hasMethod(const UString& Name) const THROWS( (UsrSystemException) ); + BOOL hasProperty(const UString& Name) const THROWS( (UsrSystemException) ); void getTestValueViaInout( int &inout ) @@ -125,11 +125,11 @@ BOOL MyPythonRoot::queryInterface( Uik aUik, XInterfaceRef &rOut ) } -UsrAny MyPythonRoot::invoke( const UString& FunctionName, +UsrAny MyPythonRoot::invoke( const UString& FunctionName, const Sequence< UsrAny >& Params, Sequence< INT16 >& OutParamIndex, Sequence< UsrAny >& OutParam) - THROWS( ( IllegalArgumentException, + THROWS( ( IllegalArgumentException, CannotConvertException, InvocationTargetException, UsrSystemException) ) @@ -152,8 +152,8 @@ UsrAny MyPythonRoot::invoke( const UString& FunctionName, return UsrAny(); } -void MyPythonRoot::setValue(const UString& PropertyName, const UsrAny& Value) - THROWS( ( UnknownPropertyException, +void MyPythonRoot::setValue(const UString& PropertyName, const UsrAny& Value) + THROWS( ( UnknownPropertyException, CannotConvertException, InvocationTargetException, UsrSystemException) ) @@ -166,8 +166,8 @@ void MyPythonRoot::setValue(const UString& PropertyName, const UsrAny& Value) } } -UsrAny MyPythonRoot::getValue(const UString& PropertyName) - THROWS( ( UnknownPropertyException, +UsrAny MyPythonRoot::getValue(const UString& PropertyName) + THROWS( ( UnknownPropertyException, UsrSystemException) ) { UsrAny aRet; @@ -183,7 +183,7 @@ UsrAny MyPythonRoot::getValue(const UString& PropertyName) } -BOOL MyPythonRoot::hasMethod(const UString& Name) const THROWS( (UsrSystemException) ) +BOOL MyPythonRoot::hasMethod(const UString& Name) const THROWS( (UsrSystemException) ) { if( L"printTestValue" == Name ) { return TRUE; @@ -198,7 +198,7 @@ BOOL MyPythonRoot::hasMethod(const UString& Name) const THROWS( (UsrSyst } -BOOL MyPythonRoot::hasProperty(const UString& Name) const THROWS( (UsrSystemException) ) +BOOL MyPythonRoot::hasProperty(const UString& Name) const THROWS( (UsrSystemException) ) { if( L"TestValue" == Name ) { return TRUE; @@ -237,10 +237,10 @@ public: } } - BOOL queryInterface( Uik aUik, XInterfaceRef & rOut ); - void acquire() { OWeakObject::acquire(); } - void release() { OWeakObject::release(); } - void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } + BOOL queryInterface( Uik aUik, XInterfaceRef & rOut ); + void acquire() { OWeakObject::acquire(); } + void release() { OWeakObject::release(); } + void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } void attach( XDebuggingRef *p ) @@ -331,7 +331,7 @@ void checkInvokation( const XInvokationRef &xInvoke ) any = (*pRef)->invoke( L"count" , seq , Sequence<INT16>(), Sequence<UsrAny>() ); int nOldSize = any.getINT32(); - any = (*pRef)->invoke( L"append" , seq , Sequence<INT16>(), Sequence<UsrAny>() ); + any = (*pRef)->invoke( L"append" , seq , Sequence<INT16>(), Sequence<UsrAny>() ); any = (*pRef)->invoke( L"count" , seq , Sequence<INT16>(), Sequence<UsrAny>() ); OSL_ASSERT( nOldSize + 1 == any.getINT32() ); @@ -343,32 +343,32 @@ class PythonCodeLibrary : public OWeakObject { - BOOL queryInterface( Uik aUik, XInterfaceRef & rOut ); - void acquire() { OWeakObject::acquire(); } - void release() { OWeakObject::release(); } - void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } + BOOL queryInterface( Uik aUik, XInterfaceRef & rOut ); + void acquire() { OWeakObject::acquire(); } + void release() { OWeakObject::release(); } + void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } - virtual BOOL isFunction(const UString& FunctionName) THROWS( (UsrSystemException) ) + virtual BOOL isFunction(const UString& FunctionName) THROWS( (UsrSystemException) ) { return FALSE; } - virtual BOOL isValidPath(const UString& PathName) THROWS( (UsrSystemException) ) + virtual BOOL isValidPath(const UString& PathName) THROWS( (UsrSystemException) ) { return FALSE; } - virtual Sequence< UString > getModuleNames(void) THROWS( (UsrSystemException) ) + virtual Sequence< UString > getModuleNames(void) THROWS( (UsrSystemException) ) { return Sequence<UString> (); } - virtual UString getModuleSource(const UString& ModulName) THROWS( (UsrSystemException) ) + virtual UString getModuleSource(const UString& ModulName) THROWS( (UsrSystemException) ) { if( ModulName == L"testmodul" ) { return UString( L"def testmethod():\n" - L" return 42\n"); + L" return 42\n"); } return UString(); } @@ -430,7 +430,7 @@ int __LOADONCALLAPI main (int argc, char **argv) // execute a simple script - xEngine->run( L"nIntTest = 5\n" + xEngine->run( L"nIntTest = 5\n" L"list = [2,3,4]\n" , XInterfaceRef(), Sequence<UsrAny> () ); /**** @@ -457,9 +457,9 @@ int __LOADONCALLAPI main (int argc, char **argv) // call a python method ! { xEngine->run( L"def foo():\n" - L" return 'this is foo'\n" , XInterfaceRef() , Sequence<UsrAny> () ); - OSL_ASSERT( xInvoke->hasMethod( L"foo" ) ); - UsrAny any = xInvoke->invoke( L"foo" , + L" return 'this is foo'\n" , XInterfaceRef() , Sequence<UsrAny> () ); + OSL_ASSERT( xInvoke->hasMethod( L"foo" ) ); + UsrAny any = xInvoke->invoke( L"foo" , Sequence<UsrAny>(), Sequence<INT16>() , Sequence<UsrAny> () ); @@ -556,7 +556,7 @@ int __LOADONCALLAPI main (int argc, char **argv) XLibraryAccessRef xLibrary( ( XLibraryAccess * ) new PythonCodeLibrary , USR_QUERY ); xEngine->setLibraryAccess( xLibrary ); - xEngine->run( L"import testmodul\n" + xEngine->run( L"import testmodul\n" L"x = testmodul.testmethod()\n" , XInterfaceRef() , Sequence<UsrAny>() ); UsrAny any = xInvoke->getValue( L"x" ); OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); @@ -566,7 +566,7 @@ int __LOADONCALLAPI main (int argc, char **argv) // check other imports { // Check, if the libraries are available at run time - xEngine->run( L"import math\n" + xEngine->run( L"import math\n" L"dMathTest = math.exp(0)\n" , XInterfaceRef() , Sequence<UsrAny> () ); OSL_ASSERT( xInvoke->hasProperty( L"dMathTest" ) ); @@ -578,7 +578,7 @@ int __LOADONCALLAPI main (int argc, char **argv) // Test connection to root object ! { - xEngine->run( L"x = stardiv.root.TestValue\n" + xEngine->run( L"x = stardiv.root.TestValue\n" L"y = stardiv.inout(5)\n" L"stardiv.root.getTestValueViaInout(y)\n" L"z = y.value\n" , XInterfaceRef() , Sequence<UsrAny> () ); diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index dfb3fa3e0019..85a99532a698 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,10 +86,10 @@ public: } } - BOOL queryInterface( Uik aUik, XInterfaceRef & rOut ); - void acquire() { OWeakObject::acquire(); } - void release() { OWeakObject::release(); } - void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } + BOOL queryInterface( Uik aUik, XInterfaceRef & rOut ); + void acquire() { OWeakObject::acquire(); } + void release() { OWeakObject::release(); } + void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } void attach( XDebuggingRef *p , XEngineRef *pEngine , XInvokationRef *pInvokation ) @@ -152,10 +152,10 @@ protected: osl::Condition m_aDebugCondition; XDebuggingRef *m_pDebuggingRef; - XEngineRef *m_pEngineRef; + XEngineRef *m_pEngineRef; XInvokationRef *m_pInvokationRef; int m_bIsRunning; - int m_bIsTerminating; // The listeners ignore everything when set + int m_bIsTerminating; // The listeners ignore everything when set }; @@ -205,13 +205,13 @@ void CmdDebugger::cmdLine() } else if( ! strncmp( pcLine , "sbp" , 3 ) ){ if( m_bIsRunning ) { - (*m_pDebuggingRef)->setBreakPoint( UString( L"<string>" ), + (*m_pDebuggingRef)->setBreakPoint( UString( L"<string>" ), atoi(&pcLine[3]) , TRUE ); } } else if( ! strncmp( pcLine , "rbp" , 3 ) ){ if( m_bIsRunning ) { - (*m_pDebuggingRef)->setBreakPoint( UString( L"<string>" ), + (*m_pDebuggingRef)->setBreakPoint( UString( L"<string>" ), atoi(&pcLine[3]) , FALSE ); } } @@ -319,7 +319,7 @@ void CmdDebugger::cmdLine() " dump Variable : dv varname [CallStack]\n" " set Variable : sv varname value [CallStack]\n" "globals via XInvokation Interface :\n" - " dump Global vars : id\n" + " dump Global vars : id\n" " dump Variable : idv varname\n" " set Variable : isv varname value\n" "ContextInformation : ci\n" @@ -352,8 +352,8 @@ void CmdDebugger::dumpIntrospectionToStream( const XIntrospectionAccessRef &ref, iMax = seqProp.getLen(); Property *aProp = seqProp.getArray(); for( i = 0; i < iMax ; i ++ ) { - fprintf( f, " %s %s\n" , USTRING_TO_PCHAR( aProp[i].Type->getName() ), - USTRING_TO_PCHAR( aProp[i].Name ) ); + fprintf( f, " %s %s\n" , USTRING_TO_PCHAR( aProp[i].Type->getName() ), + USTRING_TO_PCHAR( aProp[i].Name ) ); } } @@ -369,7 +369,7 @@ void CmdDebugger::dumpVarToStream( const char *pc , const UsrAny &aValue, FILE * fprintf( f, "ENUM %s : %d\n", pc , aValue.getEnumAsINT32() ); } else if( TypeClass_STRING == type ) { - fprintf( f, "STRING %s : %s\n" , pc , USTRING_TO_PCHAR( aValue.getString()) ); + fprintf( f, "STRING %s : %s\n" , pc , USTRING_TO_PCHAR( aValue.getString()) ); } else if( TypeClass_BOOLEAN == type ) { fprintf( f, "BOOL %s : %d\n", pc , aValue.getBOOL() ); @@ -387,7 +387,7 @@ void CmdDebugger::dumpVarToStream( const char *pc , const UsrAny &aValue, FILE * fprintf( f, "UINT16 %s : %d\n", pc , (INT32) aValue.getUINT16() ); } else if( TypeClass_UNSIGNED_BYTE == type ) { - fprintf( f, "Byte %s : %d\n", pc , (INT32) aValue.getBYTE() ); + fprintf( f, "Byte %s : %d\n", pc , (INT32) aValue.getBYTE() ); } else if( TypeClass_UNSIGNED_INT == type ) { fprintf( f, "UINT32 %s : %d\n", pc , aValue.getUINT32() ); @@ -519,7 +519,7 @@ int __LOADONCALLAPI main (int argc, char **argv) if( argc >1 && ! strcmp( argv[1] , "1" ) ) { fprintf( stderr, "one thread only\n" ); - Script = UString( L"print 'Hello World'\n" ); + Script = UString( L"print 'Hello World'\n" ); xEngine->runAsync( Script , XInterfaceRef(), args , XEngineListenerRef() ); } else if( argc >1 && ! strcmp( argv[1] , "2" ) ) { diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 705d451da5be..e32a53769830 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ int __LOADONCALLAPI main (int argc, char **argv) #endif // create service manager -// XMultiServiceFactoryRef xSMgr = getProcessServiceManager(); +// XMultiServiceFactoryRef xSMgr = getProcessServiceManager(); XMultiServiceFactoryRef xSMgr = createRegistryServiceManager(); OSL_ASSERT( xSMgr.is() ); registerUsrServices( xSMgr ); @@ -81,18 +81,18 @@ int __LOADONCALLAPI main (int argc, char **argv) XImplementationRegistrationRef xReg; XSimpleRegistryRef xSimpleReg; - try { + try { // Create registration service XInterfaceRef x = xSMgr->createInstance( UString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) ); x->queryInterface( XImplementationRegistration::getSmartUik() , xReg ); -/* x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" ); +/* x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" ); OSL_ASSERT( x.is() ); x->queryInterface( XSimpleRegistry::getSmartUik() , xSimpleReg ); OSL_ASSERT( xSimpleReg.is() ); xSimpleReg->open( L"testcomp.rdb" , FALSE , TRUE ); -*/ } +*/ } catch( Exception& e ) { printf( "%s\n" , OWStringToOString( e.getName() , CHARSET_SYSTEM ).getStr() ); exit(1); @@ -165,15 +165,15 @@ int __LOADONCALLAPI main (int argc, char **argv) XInterfaceRef x = xSMgr->createInstance( OStringToOWString( argv[1] , CHARSET_SYSTEM ) ); if( ! x.is() ) { printf( "Couldn't instantiate service !\n" ); - exit( 1 ); + exit( 1 ); } // do the test - try { + try { nNewHandle = xTest->test( OStringToOWString( argv[1] , CHARSET_SYSTEM ) , x , nHandle ); } catch ( Exception& e ) { - printf( "testcomponent : uncaught exception %s\n" , + printf( "testcomponent : uncaught exception %s\n" , OWStringToOString( e.getName(), CHARSET_SYSTEM ).getStr() ); exit(1); } @@ -181,25 +181,25 @@ int __LOADONCALLAPI main (int argc, char **argv) printf( "testcomponent : uncaught unknown exception\n" ); exit(1); } - - + + // print errors and warning Sequence<UString> seqErrors = xTest->getErrors(); Sequence<UString> seqWarnings = xTest->getWarnings(); if( seqWarnings.getLen() > nWarningCount ) { printf( "Warnings during test %d!\n" , nHandle ); for( ; nWarningCount < seqWarnings.getLen() ; nWarningCount ++ ) { - printf( "Warning\n%s\n---------\n" , + printf( "Warning\n%s\n---------\n" , OWStringToOString( seqWarnings.getArray()[nWarningCount], CHARSET_SYSTEM ).getStr() ); - } + } } if( seqErrors.getLen() > nErrorCount ) { printf( "Errors during test %d!\n" , nHandle ); for( ; nErrorCount < seqErrors.getLen() ; nErrorCount ++ ) { - printf( "%s\n" , - OWStringToOString( + printf( "%s\n" , + OWStringToOString( seqErrors.getArray()[nErrorCount], CHARSET_SYSTEM ).getStr() ); } } @@ -211,7 +211,7 @@ int __LOADONCALLAPI main (int argc, char **argv) printf( "Test passed !\n" ); } else { - printf( "Test failed !\n" ); + printf( "Test failed !\n" ); } XComponentRef rComp( xSMgr , USR_QUERY ); diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx index 11025e604648..ba5d53de11c3 100644 --- a/extensions/workben/testframecontrol.cxx +++ b/extensions/workben/testframecontrol.cxx @@ -58,41 +58,41 @@ class Listener_Impl public: SMART_UNO_DECLARATION( Listener_Impl, UsrObject ); - virtual BOOL queryInterface( Uik aUik, XInterfaceRef& rOut ); + virtual BOOL queryInterface( Uik aUik, XInterfaceRef& rOut ); // XMouseListener - virtual void mousePressed( const VclMouseEvent& evt ); - virtual void mouseReleased( const VclMouseEvent& evt ); - virtual void mouseEntered( const VclMouseEvent& evt ); - virtual void mouseExited( const VclMouseEvent& evt ); + virtual void mousePressed( const VclMouseEvent& evt ); + virtual void mouseReleased( const VclMouseEvent& evt ); + virtual void mouseEntered( const VclMouseEvent& evt ); + virtual void mouseExited( const VclMouseEvent& evt ); // XMouseMotionListener - virtual void mouseDragged( const VclMouseEvent& evt ); - virtual void mouseMoved( const VclMouseEvent& evt ); + virtual void mouseDragged( const VclMouseEvent& evt ); + virtual void mouseMoved( const VclMouseEvent& evt ); // XKeyListener - virtual void keyPressed( const VclKeyEvent& evt ); - virtual void keyReleased( const VclKeyEvent& evt ); + virtual void keyPressed( const VclKeyEvent& evt ); + virtual void keyReleased( const VclKeyEvent& evt ); // XFocusListener - virtual void focusGained( const FocusEvent& evt ); - virtual void focusLost( const FocusEvent& evt ); + virtual void focusGained( const FocusEvent& evt ); + virtual void focusLost( const FocusEvent& evt ); // XWindowListener - virtual void windowResized( const WindowEvent& evt ); - virtual void windowMoved( const WindowEvent& evt ); - virtual void windowShown( const EventObject& evt ); - virtual void windowHidden( const EventObject& evt ); + virtual void windowResized( const WindowEvent& evt ); + virtual void windowMoved( const WindowEvent& evt ); + virtual void windowShown( const EventObject& evt ); + virtual void windowHidden( const EventObject& evt ); // XPaintListener - virtual void windowPaint( const PaintEvent& evt ); + virtual void windowPaint( const PaintEvent& evt ); // XEventListener - virtual void disposing( const EventObject& evt ); + virtual void disposing( const EventObject& evt ); public: - void addAllListeners( const XControlRef& xControl ); - void removeAllListeners( const XControlRef& xControl ); + void addAllListeners( const XControlRef& xControl ); + void removeAllListeners( const XControlRef& xControl ); }; //-------------------------------------------------------------------------------------------------- @@ -153,28 +153,28 @@ BOOL Listener_Impl::queryInterface( Uik aUik, XInterfaceRef& rOut ) //-------------------------------------------------------------------------------------------------- // XMouseListener -void Listener_Impl::mousePressed( const VclMouseEvent& evt ) {} -void Listener_Impl::mouseReleased( const VclMouseEvent& evt ) {} -void Listener_Impl::mouseEntered( const VclMouseEvent& evt ) {} -void Listener_Impl::mouseExited( const VclMouseEvent& evt ) {} +void Listener_Impl::mousePressed( const VclMouseEvent& evt ) {} +void Listener_Impl::mouseReleased( const VclMouseEvent& evt ) {} +void Listener_Impl::mouseEntered( const VclMouseEvent& evt ) {} +void Listener_Impl::mouseExited( const VclMouseEvent& evt ) {} // XMouseMotionListener -void Listener_Impl::mouseDragged( const VclMouseEvent& evt ) {} -void Listener_Impl::mouseMoved( const VclMouseEvent& evt ) {} +void Listener_Impl::mouseDragged( const VclMouseEvent& evt ) {} +void Listener_Impl::mouseMoved( const VclMouseEvent& evt ) {} // XKeyListener -void Listener_Impl::keyPressed( const VclKeyEvent& evt ) {} -void Listener_Impl::keyReleased( const VclKeyEvent& evt ) {} +void Listener_Impl::keyPressed( const VclKeyEvent& evt ) {} +void Listener_Impl::keyReleased( const VclKeyEvent& evt ) {} // XFocusListener -void Listener_Impl::focusGained( const FocusEvent& evt ) {} -void Listener_Impl::focusLost( const FocusEvent& evt ) {} +void Listener_Impl::focusGained( const FocusEvent& evt ) {} +void Listener_Impl::focusLost( const FocusEvent& evt ) {} // XWindowListener -void Listener_Impl::windowResized( const WindowEvent& evt ) {} -void Listener_Impl::windowMoved( const WindowEvent& evt ) {} -void Listener_Impl::windowShown( const EventObject& evt ) {} -void Listener_Impl::windowHidden( const EventObject& evt ) {} +void Listener_Impl::windowResized( const WindowEvent& evt ) {} +void Listener_Impl::windowMoved( const WindowEvent& evt ) {} +void Listener_Impl::windowShown( const EventObject& evt ) {} +void Listener_Impl::windowHidden( const EventObject& evt ) {} // XPaintListener void Listener_Impl::windowPaint( const PaintEvent& evt ) @@ -193,7 +193,7 @@ void Listener_Impl::windowPaint( const PaintEvent& evt ) } // XEventListener -void Listener_Impl::disposing( const EventObject& evt ) {} +void Listener_Impl::disposing( const EventObject& evt ) {} //================================================================================================== @@ -205,17 +205,17 @@ public: virtual void ShowStatusText( const XubString& rText ); public: - FrameControlApplication() {} + FrameControlApplication() {} private: - void init(); - void deinit(); + void init(); + void deinit(); private: - Listener_Impl* _pListener; - XControlRef _xControl; + Listener_Impl* _pListener; + XControlRef _xControl; - WorkWindow* _pWorkWin; + WorkWindow* _pWorkWin; }; FrameControlApplication g_App; @@ -281,7 +281,7 @@ void FrameControlApplication::deinit() { _pListener->removeAllListeners( _xControl ); - _xControl->dispose(); // disposing event should occur + _xControl->dispose(); // disposing event should occur _pListener->release(); _pListener = NULL; @@ -296,8 +296,8 @@ void FrameControlApplication::deinit() //-------------------------------------------------------------------------------------------------- void FrameControlApplication::Main() { -// void TestErrcodes(); -// TestErrcodes(); +// void TestErrcodes(); +// TestErrcodes(); EnterMultiThread(); SetAppName( "RadioActiveControl-Demo" ); diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx index 6027a68e4d70..1a7902c618db 100644 --- a/extensions/workben/testpgp.cxx +++ b/extensions/workben/testpgp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -737,7 +737,7 @@ int SAL_CALL main (int argc, char **argv) printf ("Error: no PGPEncoder interface.\n"); exit (4); } - + DataSource_Impl *source = new DataSource_Impl (fd); source->setBuffer (buffer); diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx index 069f33c631b7..73852cfc12e0 100644 --- a/extensions/workben/testresource.cxx +++ b/extensions/workben/testresource.cxx @@ -43,7 +43,7 @@ using namespace usr; class MyApp : public Application { public: - void Main(); + void Main(); }; MyApp aMyApp; diff --git a/extensions/workben/testresource.src b/extensions/workben/testresource.src index d74ed571e5ca..5a9fc3a8a607 100644 --- a/extensions/workben/testresource.src +++ b/extensions/workben/testresource.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,4 +27,4 @@ String 1000 { Text = "Hello"; -}; +}; |