diff options
Diffstat (limited to 'basic')
-rw-r--r-- | basic/inc/ttmsg.hrc | 7 | ||||
-rw-r--r-- | basic/source/app/app.cxx | 67 | ||||
-rw-r--r-- | basic/source/app/svtmsg.src | 26 | ||||
-rw-r--r-- | basic/source/app/ttmsg.src | 26 |
4 files changed, 89 insertions, 37 deletions
diff --git a/basic/inc/ttmsg.hrc b/basic/inc/ttmsg.hrc index d81acf9c9ac3..0af6bb1111e4 100644 --- a/basic/inc/ttmsg.hrc +++ b/basic/inc/ttmsg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: ttmsg.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: gh $ $Date: 2000-12-06 16:13:42 $ + * last change: $Author: gh $ $Date: 2000-12-14 17:11:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,9 +99,8 @@ #define S_UNKNOWN_METHOD ( TT_START + 22 ) #define S_INCLUDE_FILE_WARNINGS_DETECTED ( TT_START + 23 ) #define S_NO_INCLUDE_FILE_WARNINGS_DETECTED ( TT_START + 24 ) -#define S_UNPACKING_STORAGE_FAILED ( TT_START + 25 ) -// Stings +// Strings /* diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index 00544aaf3ad5..5a542102414a 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: ab $ $Date: 2000-12-11 09:32:27 $ + * last change: $Author: gh $ $Date: 2000-12-14 17:11:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,12 +119,17 @@ #include <comphelper/processfactory.hxx> #endif +#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HDL_ +#include <com/sun/star/beans/PropertyValue.hdl> +#endif #include <cppuhelper/servicefactory.hxx> #include <com/sun/star/registry/XImplementationRegistration.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/XContentProviderManager.hpp> #include <com/sun/star/ucb/ContentProviderServiceInfo2.hpp> +#include <ucbhelper/content.hxx> + using namespace comphelper; using namespace ucb; using namespace cppu; @@ -133,6 +138,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::ucb; +using namespace com::sun::star::beans; #endif /* _USE_UNO */ @@ -168,9 +174,10 @@ Reference< XContentProviderManager > InitializeUCB( void ) Reference< XImplementationRegistration > xIR( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) ), UNO_QUERY ); + xIR->registerImplementation( OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), - OUString::createFromAscii(SAL_MODULENAME( "ucb1" )), - Reference< XSimpleRegistry >() ); + OUString::createFromAscii(SAL_MODULENAME( "ucb1" )), + Reference< XSimpleRegistry >() ); xIR->registerImplementation( OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), OUString::createFromAscii(SAL_MODULENAME( "ucpfile1" )), Reference< XSimpleRegistry >() ); @@ -178,10 +185,31 @@ Reference< XContentProviderManager > InitializeUCB( void ) OUString::createFromAscii(SAL_MODULENAME( "fileacc" )), Reference< XSimpleRegistry >() ); +/* // Packages + xIR->registerImplementation( OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + OUString::createFromAscii(SAL_MODULENAME( "ucppkg1" )), + Reference< XSimpleRegistry >() ); + xIR->registerImplementation( OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + OUString::createFromAscii(SAL_MODULENAME( "package2" )), + Reference< XSimpleRegistry >() ); + xIR->registerImplementation( OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + OUString::createFromAscii(SAL_MODULENAME( "rdbtdp" )), + Reference< XSimpleRegistry >() ); + xIR->registerImplementation( OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + OUString::createFromAscii(SAL_MODULENAME( "cfgmgr2" )), + Reference< XSimpleRegistry >() ); + xIR->registerImplementation( OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + OUString::createFromAscii(SAL_MODULENAME( "tcv" )), + Reference< XSimpleRegistry >() ); + xIR->registerImplementation( OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + OUString::createFromAscii(SAL_MODULENAME( "sax" )), + Reference< XSimpleRegistry >() ); +*/ + // i18n xIR->registerImplementation( OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), - OUString::createFromAscii(SVLIBRARY( "int" )), - Reference< XSimpleRegistry >() ); + OUString::createFromAscii(SVLIBRARY( "int" )), + Reference< XSimpleRegistry >() ); ////////////////////////////////////////////////////////////////////// // Bootstrap readonly service factory again @@ -192,7 +220,19 @@ Reference< XContentProviderManager > InitializeUCB( void ) // set global factory setProcessServiceFactory( xSMgr ); +/* // Create simple ConfigManager + Sequence< Any > aConfArgs(3); + aConfArgs[0] <<= PropertyValue( OUString::createFromAscii("servertype"), 0, makeAny( OUString::createFromAscii("local") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); + aConfArgs[1] <<= PropertyValue( OUString::createFromAscii("sourcepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); + aConfArgs[2] <<= PropertyValue( OUString::createFromAscii("updatepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); + + Reference< XContentProvider > xConfProvider + ( xSMgr->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), aConfArgs), UNO_QUERY ); + +*/ // Create unconfigured Ucb: +/* Sequence< Any > aArgs(1); + aArgs[1] = makeAny ( xConfProvider );*/ Sequence< Any > aArgs; ucb::ContentBroker::initialize( xSMgr, aArgs ); xUcb = ucb::ContentBroker::get()->getContentProviderManagerInterface(); @@ -201,6 +241,18 @@ Reference< XContentProviderManager > InitializeUCB( void ) ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ), UNO_QUERY ); xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True ); + +/* Reference< XContentProvider > xPackageProvider + ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.PackageContentProvider" ) ), UNO_QUERY ); + xUcb->registerContentProvider( xPackageProvider, OUString::createFromAscii( "vnd.sun.star.pkg" ), sal_True ); + */ + +#ifdef DEBUG + ucb::Content aTester( OUString::createFromAscii("file:///x:/gh"),com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >()); + BOOL bFolder = aTester.isFolder(); +#endif + + } catch( Exception & rEx) { @@ -272,7 +324,6 @@ void BasicApp::Main( ) pFrame->Show(); - SetDefModalDialogParent( pFrame ); SetSystemWindowMode( SYSTEMWINDOW_MODE_DIALOG ); PostUserEvent( LINK( this, BasicApp, LateInit ) ); @@ -408,6 +459,7 @@ BasicFrame::BasicFrame() : WorkWindow( NULL, , pExecutionStatus( NULL ) { + Application::SetDefDialogParent( this ); pBasic = TTBasic::CreateMyBasic(); // depending on what was linked to the executable bInBreak = FALSE; bDisas = FALSE; @@ -838,6 +890,7 @@ BOOL BasicFrame::Close() delete GetWindow( WINDOW_OVERLAP )->GetWindow( WINDOW_FIRSTOVERLAP )->GetWindow( WINDOW_CLIENT ); } + Application::SetDefDialogParent( NULL ); WorkWindow::Close(); return TRUE; diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src index 891d261f7030..7ce583f60b22 100644 --- a/basic/source/app/svtmsg.src +++ b/basic/source/app/svtmsg.src @@ -2,9 +2,9 @@ * * $RCSfile: svtmsg.src,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2000-12-07 15:36:02 $ + * last change: $Author: gh $ $Date: 2000-12-14 17:11:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1328,3 +1328,25 @@ String S_UNKNOWN_TYPE Text[ arabic ] = "Unknown object type ($Arg1) from UId"; Text[ turkish ] = "Unknown object type ($Arg1) from UId"; }; +String S_UNPACKING_STORAGE_FAILED +{ + Text = "Entpacken der Storage \"($Arg1)\" nach \"($Arg2)\" ist fehlgeschlagen"; + Text[ english_us ] = "Unpacking storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ portuguese ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ russian ] = " \"($Arg1)\" \"($Arg2)\" ."; + Text[ greek ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ dutch ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ french ] = "La dcompression du stockage \"($Arg1)\" vers \"($Arg2)\" a chou."; + Text[ spanish ] = "No se pudo descomprimir storage \"($Arg1)\" a \"($Arg2)\""; + Text[ italian ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ danish ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ swedish ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ polish ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ portuguese_brazilian ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ japanese ] = "Lu \"($Arg1)\" \"($Arg2)\" ɒoł܂łB"; + Text[ korean ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ chinese_simplified ] = "ѹļ \"($Arg1)\" \"($Arg2)\" ûгɹ"; + Text[ chinese_traditional ] = "Yɮ \"($Arg1)\" \"($Arg2)\" ѡC"; + Text[ turkish ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; + Text[ arabic ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; +}; diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src index b227386400c7..e47221192146 100644 --- a/basic/source/app/ttmsg.src +++ b/basic/source/app/ttmsg.src @@ -2,9 +2,9 @@ * * $RCSfile: ttmsg.src,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: kz $ $Date: 2000-12-11 22:40:21 $ + * last change: $Author: gh $ $Date: 2000-12-14 17:11:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -623,28 +623,6 @@ String S_UNKNOWN_METHOD Text[ arabic ] = "Unknown method '($Arg1)' to ($Arg2)"; Text[ turkish ] = "Unknown method on object :($Arg1).($Arg2)"; }; -String S_UNPACKING_STORAGE_FAILED -{ - Text = "Entpacken der Storage \"($Arg1)\" nach \"($Arg2)\" ist fehlgeschlagen"; - Text[ english_us ] = "Unpacking storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ portuguese ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ russian ] = " \"($Arg1)\" \"($Arg2)\" ."; - Text[ greek ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ dutch ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ french ] = "La dcompression du stockage \"($Arg1)\" vers \"($Arg2)\" a chou."; - Text[ spanish ] = "No se pudo descomprimir storage \"($Arg1)\" a \"($Arg2)\""; - Text[ italian ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ danish ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ swedish ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ polish ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ portuguese_brazilian ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ japanese ] = "Lu \"($Arg1)\" \"($Arg2)\" ɒoł܂łB"; - Text[ korean ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ chinese_simplified ] = "ѹļ \"($Arg1)\" \"($Arg2)\" ûгɹ"; - Text[ chinese_traditional ] = "Yɮ \"($Arg1)\" \"($Arg2)\" ѡC"; - Text[ turkish ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; - Text[ arabic ] = "Unpacking Storage \"($Arg1)\" to \"($Arg2)\" failed"; -}; /* String { |