diff options
Diffstat (limited to 'dbaccess/source/ext/adabas')
| -rw-r--r-- | dbaccess/source/ext/adabas/ANewDb.cxx | 18 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/ANewDb.hxx | 9 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/ASQLNameEdit.hxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/ASqlNameEdit.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/Acomponentmodule.cxx | 22 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/Acomponentmodule.hxx | 18 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/AdabasNewDb.cxx | 64 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/AdabasNewDb.hxx | 18 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/AdabasNewDb.src | 82 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/Aservices.cxx | 12 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/Astringconstants.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/adabasuistrings.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ext/adabas/makefile.mk | 100 |
13 files changed, 85 insertions, 274 deletions
diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx index 1b2f5a50e588..38311fde9076 100644 --- a/dbaccess/source/ext/adabas/ANewDb.cxx +++ b/dbaccess/source/ext/adabas/ANewDb.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,24 +26,12 @@ * ************************************************************************/ -#ifndef ADABASUI_NEWDB_HXX #include "ANewDb.hxx" -#endif -#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> -#endif -#ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> -#endif -#ifndef adabasui_ADABAS_CREATEDB_HXX #include "AdabasNewDb.hxx" -#endif -#ifndef adabasui_SHARED_DBUSTRINGS_HRC #include "adabasuistrings.hrc" -#endif -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif using namespace adabasui; using namespace dbtools; @@ -98,7 +87,7 @@ Reference< XInterface > SAL_CALL OAdabasCreateDialog::Create(const Reference< XM //------------------------------------------------------------------------- ::rtl::OUString OAdabasCreateDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.adabasui.AdabasCreateDialog"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.adabasui.AdabasCreateDialog")); } //------------------------------------------------------------------------- @@ -111,7 +100,7 @@ Reference< XInterface > SAL_CALL OAdabasCreateDialog::Create(const Reference< XM ::comphelper::StringSequence OAdabasCreateDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.AdabasCreationDialog"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdabasCreationDialog")); return aSupported; } @@ -159,3 +148,4 @@ void OAdabasCreateDialog::executedDialog(sal_Int16 _nExecutionResult) } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/ANewDb.hxx b/dbaccess/source/ext/adabas/ANewDb.hxx index 46de53c1fcaf..cf725930dd0a 100644 --- a/dbaccess/source/ext/adabas/ANewDb.hxx +++ b/dbaccess/source/ext/adabas/ANewDb.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,15 +30,9 @@ #ifndef ADABASUI_NEWDB_HXX #define ADABASUI_NEWDB_HXX -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include <svtools/genericunodialog.hxx> -#endif -#ifndef _EXTENSIONS_COMPONENT_MODULE_HXX_ #include "Acomponentmodule.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCREATECATALOG_HPP_ #include <com/sun/star/sdbcx/XCreateCatalog.hpp> -#endif @@ -98,3 +93,5 @@ namespace adabasui //......................................................................... #endif // ADABASUI_NEWDB_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx index e434eff9ee64..be2c27acf9d9 100644 --- a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx +++ b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,12 +29,8 @@ #ifndef ADABASUI_SQLNAMEEDIT_HXX #define ADABASUI_SQLNAMEEDIT_HXX -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _SV_COMBOBOX_HXX #include <vcl/combobox.hxx> -#endif namespace adabasui { @@ -59,3 +56,4 @@ namespace adabasui #endif // DBAUI_SQLNAMEEDIT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx index e0fd807982e6..4745568c69e8 100644 --- a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx +++ b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,7 @@ * ************************************************************************/ -#ifndef ADABASUI_SQLNAMEEDIT_HXX #include "ASQLNameEdit.hxx" -#endif namespace adabasui { //------------------------------------------------------------------ @@ -78,3 +77,4 @@ namespace adabasui } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx index 4a0661fff228..6f153937fe2f 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,22 +27,12 @@ ************************************************************************/ -#ifndef _EXTENSIONS_COMPONENT_MODULE_HXX_ #include "Acomponentmodule.hxx" -#endif -#ifndef _TOOLS_RESMGR_HXX #include <tools/resmgr.hxx> -#endif -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> -#endif -#ifndef _TOOLS_DEBUG_HXX -#include <tools/debug.hxx> -#endif +#include <osl/diagnose.h> #define ENTER_MOD_METHOD() \ ::osl::MutexGuard aGuard(s_aMutex); \ @@ -99,12 +90,12 @@ namespace COMPMOD_NAMESPACE // note that this method is not threadsafe, which counts for the whole class ! if (!m_pRessources && !m_bInitialized) { - DBG_ASSERT(m_sFilePrefix.Len(), "OModuleImpl::getResManager: no resource file prefix!"); + OSL_ENSURE(m_sFilePrefix.Len(), "OModuleImpl::getResManager: no resource file prefix!"); // create a manager with a fixed prefix ByteString aMgrName = m_sFilePrefix; m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer()); - DBG_ASSERT(m_pRessources, + OSL_ENSURE(m_pRessources, (ByteString("OModuleImpl::getResManager: could not create the resource manager (file name: ") += aMgrName += ByteString(")!")).GetBuffer()); @@ -214,7 +205,7 @@ namespace COMPMOD_NAMESPACE { if (!s_pImplementationNames) { - OSL_ASSERT("OModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?"); + OSL_FAIL("OModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?"); return; } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, @@ -257,7 +248,7 @@ namespace COMPMOD_NAMESPACE if (!s_pImplementationNames) { - OSL_ASSERT("OModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?"); + OSL_FAIL("OModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?"); return NULL; } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, @@ -301,3 +292,4 @@ namespace COMPMOD_NAMESPACE } // namespace COMPMOD_NAMESPACE //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx index 380b9571509f..7625ca26e810 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,30 +37,14 @@ which should be used as namespace for the classes defined herein.</p> */ -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _TOOLS_RESID_HXX #include <tools/resid.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include <com/sun/star/registry/XRegistryKey.hpp> -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> -#endif -#ifndef _RTL_STRING_HXX_ #include <rtl/string.hxx> -#endif class ResMgr; @@ -277,3 +262,4 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService #endif // _EXTENSIONS_COMPONENT_MODULE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx index 4bbc9d12cca7..0438e4ae00dd 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,95 +26,39 @@ * ************************************************************************/ -#ifndef adabasui_ADABAS_CREATEDB_HXX #include "AdabasNewDb.hxx" -#endif -#ifndef adabasui_ADABASNEWDB_HRC #include "AdabasNewDb.hrc" -#endif -#ifndef _VOS_PROCESS_HXX_ -#include <vos/process.hxx> -#endif -#ifndef _OSL_PROCESS_H_ #include <osl/process.h> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _PASSWD_HXX //autogen #include <sfx2/passwd.hxx> -#endif -#ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> -#endif -#ifndef _STREAM_HXX #include <tools/stream.hxx> -#endif -#ifndef _BIGINT_HXX #include <tools/bigint.hxx> -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef _EXTENSIONS_COMPONENT_MODULE_HXX_ #include "Acomponentmodule.hxx" -#endif -#ifndef _UNOTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif -#ifndef _ADABASUI_RESOURCE_HRC_ #include "adabasui_resource.hrc" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> -#endif -#ifndef _SV_WAITOBJ_HXX #include <vcl/waitobj.hxx> -#endif -#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <unotools/pathoptions.hxx> -#endif -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> -#endif -#ifndef _UNOTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBC_SQLEXCEPTION_HPP_ #include <com/sun/star/sdbc/SQLException.hpp> -#endif -#ifndef _UNOTOOLS_UCBHELPER_HXX #include <unotools/ucbhelper.hxx> -#endif -#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> -#endif -#ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> -#endif #include "adabasuistrings.hrc" -#ifndef _THREAD_HXX_ #include <osl/thread.hxx> -#endif -#ifndef _OSL_FILE_HXX_ #include <osl/file.hxx> -#endif using namespace adabasui; using namespace ucbhelper; using namespace utl; -using namespace vos; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbcx; @@ -162,7 +107,6 @@ namespace adabasui catch(Exception&) { OSL_ASSERT(0); - // showError(::dbtools::SQLExceptionInfo(e),this,); } } void SAL_CALL ODatabaseCreator::onTerminated() @@ -271,8 +215,6 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_ET_DOMAIN_USR.Enable(sal_False); - // m_ET_SYSUSR.setUpperCase(); - // m_ET_CONUSR.setUpperCase(); } @@ -304,7 +246,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_NF_DATADEVSPACE_SIZE.SetDecimalDigits(0); m_NF_CACHE_SIZE.SetDecimalDigits(0); - m_ET_DATABASENAME.SetMaxTextLen( 8 ); //98292 + m_ET_DATABASENAME.SetMaxTextLen( 8 ); m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); @@ -803,3 +745,5 @@ sal_Bool OAdabasNewDbDlg::fillEnvironmentVariable(const ::rtl::OUString& _sVaria return bError; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx index 89db7be31eb4..224c175ccd3f 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,31 +30,15 @@ #define ADABASUI_ADABAS_CREATEDB_HXX -#ifndef _SV_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCREATECATALOG_HPP_ #include <com/sun/star/sdbcx/XCreateCatalog.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> -#endif #include <memory> #include "ASQLNameEdit.hxx" @@ -163,3 +148,4 @@ namespace adabasui } #endif // adabasui_ADABAS_CREATEDB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.src b/dbaccess/source/ext/adabas/AdabasNewDb.src index 33915b06266b..efe5879cef80 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.src +++ b/dbaccess/source/ext/adabas/AdabasNewDb.src @@ -51,7 +51,8 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 12 , 6) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "Database ~name"; -}; + }; + Edit ET_DATABASENAME { Border = TRUE ; @@ -66,26 +67,28 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ; Text[ en-US ] = "User settings"; -}; + }; FixedText FT_CONUSR { Pos = MAP_APPFONT ( 12 , 31 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Control user"; -}; + }; + FixedText FT_SYSUSR { Pos = MAP_APPFONT ( 12 , 14 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Administrator"; -}; + }; + FixedText FT_DOMAIN_USR { Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Domain user"; -}; + }; Edit ET_SYSUSR { @@ -103,7 +106,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_SYSPWD ; Text[ en-US ] = "P~assword..."; -}; + }; Edit ET_CONUSR { @@ -121,7 +124,8 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_CONPWD ; Text[ en-US ] = "~Password..."; -}; + }; + Edit ET_DOMAIN_USR { Pos = MAP_APPFONT ( 77 + ADJUST_X, 47 + MOVE_Y) ; @@ -140,7 +144,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_DOMAINPWD ; Text[ en-US ] = "Passwo~rd..."; -}; + }; FixedImage BMP_CON { @@ -148,12 +152,14 @@ ModalDialog DLG_ADABAS_NEWDB Size = MAP_APPFONT ( 20 , 20 ) ; HelpID = HID_DLG_ADABAS_CON_PWD ; }; + FixedImage BMP_SYS { Pos = MAP_APPFONT ( 240 , 11 + MOVE_Y) ; Size = MAP_APPFONT ( 20 , 20 ) ; HelpID = HID_DLG_ADABAS_SYS_PWD ; }; + FixedImage BMP_DOMAIN { Pos = MAP_APPFONT ( 240 , 44 + MOVE_Y) ; @@ -166,7 +172,7 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Backup file"; -}; + }; Edit ET_RESTORE { @@ -184,7 +190,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_PBRESTORE ; Text[ en-US ] = "..."; -}; + }; /* DEVSPACE positions */ FixedLine FL_DBSETTINGS @@ -192,28 +198,28 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ; Text[ en-US ] = "Database settings"; -}; + }; FixedText FT_SYSDEVSPACE { Pos = MAP_APPFONT ( 12 , 83 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "S~YSDEVSPACE"; -}; + }; FixedText FT_TRANSACTIONLOG { Pos = MAP_APPFONT ( 12 , 99 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "TRANSACTI~ONLOG"; -}; + }; FixedText FT_DATADEVSPACE { Pos = MAP_APPFONT ( 12 , 116 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "DATAD~EVSPACE"; -}; + }; Edit ET_SYSDEVSPACE { @@ -231,7 +237,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ; Text[ en-US ] = "..."; -}; + }; Edit ET_TRANSACTIONLOG { @@ -249,7 +255,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ; Text[ en-US ] = "..."; -}; + }; Edit ET_DATADEVSPACE { @@ -260,7 +266,6 @@ ModalDialog DLG_ADABAS_NEWDB HelpID = HID_DLG_ADABAS_DATADEVSPACE ; }; - PushButton PB_DATADEVSPACE { Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ; @@ -268,14 +273,16 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ; Text[ en-US ] = "..."; -}; + }; + /* DEVSPACE sizes */ FixedText FT_TRANSACTIONLOG_SIZE { Pos = MAP_APPFONT ( 12 , 133 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "Transaction ~file (MB)"; -}; + }; + NumericField NF_TRANSACTIONLOG_SIZE { Pos = MAP_APPFONT ( 77 + ADJUST_X, 131 + MOVE_Y) ; @@ -283,15 +290,17 @@ ModalDialog DLG_ADABAS_NEWDB Border = TRUE ; TabStop = TRUE ; Spin = TRUE ; -StrictFormat = TRUE; + StrictFormat = TRUE; HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ; }; + FixedText FT_DATADEVSPACE_SIZE { Pos = MAP_APPFONT ( 12 , 150 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "Data~base size (MB)"; -}; + }; + NumericField NF_DATADEVSPACE_SIZE { Pos = MAP_APPFONT ( 77 + ADJUST_X, 148 + MOVE_Y) ; @@ -299,15 +308,17 @@ StrictFormat = TRUE; Border = TRUE ; TabStop = TRUE ; Spin = TRUE ; -StrictFormat = TRUE; + StrictFormat = TRUE; HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ; }; + FixedText FT_CACHE_SIZE { Pos = MAP_APPFONT ( 12 , 167 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "Data ~buffer size (MB)"; -}; + }; + NumericField NF_CACHE_SIZE { Pos = MAP_APPFONT ( 77 + ADJUST_X, 165 + MOVE_Y) ; @@ -315,14 +326,16 @@ StrictFormat = TRUE; Border = TRUE ; TabStop = TRUE ; Spin = TRUE ; -StrictFormat = TRUE; + StrictFormat = TRUE; HelpID = HID_DLG_ADABAS_CACHE_SIZE ; }; + FixedLine FL_END { Pos = MAP_APPFONT ( 0 , WIN_Y - 24 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X , 1 ) ; }; + OKButton PB_OK { Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ; @@ -330,6 +343,7 @@ StrictFormat = TRUE; TabStop = TRUE ; DefButton = TRUE ; }; + CancelButton PB_CANCEL { Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ; @@ -340,26 +354,29 @@ StrictFormat = TRUE; String STR_BACKUPFILE_LOAD { Text[ en-US ] = "Backup file information"; -}; + }; Text[ en-US ] = "Create New Adabas D Database"; }; Image CHECK_GREEN { - ImageBitmap = Bitmap { File = "nu07.bmp"; }; + ImageBitmap = Bitmap { File = "nu07.png"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; + Image UNCHECK_RED { - ImageBitmap = Bitmap { File = "nu08.bmp"; }; + ImageBitmap = Bitmap { File = "nu08.png"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; + Image DEFAULT_BLUE { - ImageBitmap = Bitmap { File = "nu09.bmp"; }; + ImageBitmap = Bitmap { File = "nu09.png"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; + /* Fehlermeldungen beim Erstellen einer Adabas DB */ String STR_ADABAS_NO_PARAM_SET @@ -376,6 +393,7 @@ String STR_ADABAS_NO_SYSTEM_TABLES { Text[ en-US ] = "An error occurred as the system tables were being created."; }; + String STR_ADABAS_NO_BACKUP_FILE { Text[ en-US ] = "The backup file entered does not exist."; @@ -390,10 +408,12 @@ String STR_NO_SAME_USER { Text[ en-US ] = "The administrator and the control user cannot have the same name!"; }; + String STR_DEVSPACE_NO_FILE { Text[ en-US ] = "No name has been entered for the $name$ file!"; }; + String STR_NO_PERMISSION { Text[ en-US ] = "You have to have administrator rights to create a new database!"; @@ -423,11 +443,12 @@ String STR_ADABAS_CREATEPARAM_FILE { Text [ en-US ] = "Creating database configuration file." ; }; + String STR_ADABAS_START_DATABASE { Text [ en-US ] = "Starting database for the first time." ; - }; + String STR_ADABAS_DB_EXISTS { Text[ en-US ] = "The name entered already exists."; @@ -445,11 +466,10 @@ String STR_ADABAS_NO_ACCESSRIGHTS String STR_ADABAS_CANNOT_CONVERT { - Text[ en-US ] = "The current database need to be converted. Please insert control user and password."; + Text[ en-US ] = "The current database need to be converted. Please insert control user and password."; }; String STR_ADABAS_PASSWORD_ILLEGAL { Text[ en-US ] = "Spaces are not permitted in the password. Please enter a new password."; }; - diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx index b1c24bd295a5..eb83f464b473 100644 --- a/dbaccess/source/ext/adabas/Aservices.cxx +++ b/dbaccess/source/ext/adabas/Aservices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,15 +26,9 @@ * ************************************************************************/ -#ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _EXTENSIONS_COMPONENT_MODULE_HXX_ #include "Acomponentmodule.hxx" -#endif /********************************************************************************************/ @@ -63,8 +58,7 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui() //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL -component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** ) @@ -91,3 +85,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( xRet->acquire(); return xRet.get(); }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/Astringconstants.cxx b/dbaccess/source/ext/adabas/Astringconstants.cxx index bede25514524..6fe34c212a00 100644 --- a/dbaccess/source/ext/adabas/Astringconstants.cxx +++ b/dbaccess/source/ext/adabas/Astringconstants.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_GENERAL, "01000"); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/adabasuistrings.cxx b/dbaccess/source/ext/adabas/adabasuistrings.cxx index c1dae127c868..cf1edccedc07 100644 --- a/dbaccess/source/ext/adabas/adabasuistrings.cxx +++ b/dbaccess/source/ext/adabas/adabasuistrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,7 @@ * ************************************************************************/ -#ifndef ADABASUI_SHARED_DBUSTRINGS_HRC #include "adabasuistrings.hrc" -#endif namespace adabasui { @@ -35,3 +34,4 @@ namespace adabasui } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/makefile.mk b/dbaccess/source/ext/adabas/makefile.mk deleted file mode 100644 index 8dbbe7abc3ff..000000000000 --- a/dbaccess/source/ext/adabas/makefile.mk +++ /dev/null @@ -1,100 +0,0 @@ -#************************************************************************* -# -# 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 -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=dbaccess -TARGET=adabasui -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ---------------------------------- -.INCLUDE : settings.mk - -# --- resource ----------------------------------------------------- -SRS1NAME=$(TARGET) -SRC1FILES = \ - AdabasNewDb.src - -# --- defines ------------------------------------------------------ -CDEFS+=-DCOMPMOD_NAMESPACE=adabasui - -# --- Files ------------------------------------- -SLOFILES=\ - $(SLO)$/ASqlNameEdit.obj \ - $(SLO)$/AdabasNewDb.obj \ - $(SLO)$/ANewDb.obj \ - $(SLO)$/adabasuistrings.obj \ - $(SLO)$/Aservices.obj \ - $(SLO)$/Acomponentmodule.obj - -# --- Library ----------------------------------- -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS=\ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(DBTOOLSLIB) \ - $(UNOTOOLSLIB) \ - $(SVTOOLLIB) \ - $(TOOLSLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(UCBHELPERLIB) \ - $(SFXLIB) \ - $(TKLIB) \ - $(COMPHELPERLIB) - -SHL1IMPLIB=i$(SHL1TARGET) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(SLB)$/$(TARGET).lib -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=$(TARGET).dxp -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -# --- .res file ---------------------------------------------------------- -RES1FILELIST=\ - $(SRS)$/$(SRS1NAME).srs - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES=$(RES1FILELIST) - - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/adabasui.component - -$(MISC)/adabasui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - adabasui.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt adabasui.component |