summaryrefslogtreecommitdiff
path: root/dbaccess/source/ext/adabas
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ext/adabas')
-rw-r--r--dbaccess/source/ext/adabas/ANewDb.cxx30
-rw-r--r--dbaccess/source/ext/adabas/ANewDb.hxx18
-rw-r--r--dbaccess/source/ext/adabas/ASQLNameEdit.hxx4
-rw-r--r--dbaccess/source/ext/adabas/ASqlNameEdit.cxx10
-rw-r--r--dbaccess/source/ext/adabas/Acomponentmodule.cxx70
-rw-r--r--dbaccess/source/ext/adabas/Acomponentmodule.hxx52
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.cxx98
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.hrc72
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.hxx136
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.src186
-rw-r--r--dbaccess/source/ext/adabas/Aservices.cxx10
-rw-r--r--dbaccess/source/ext/adabas/Astringconstants.cxx2
-rw-r--r--dbaccess/source/ext/adabas/Astringconstants.hrc16
-rw-r--r--dbaccess/source/ext/adabas/adabasui_resource.hrc72
-rw-r--r--dbaccess/source/ext/adabas/adabasuistrings.cxx2
-rw-r--r--dbaccess/source/ext/adabas/adabasuistrings.hrc2
16 files changed, 390 insertions, 390 deletions
diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx
index 3fc0d952cf40..7db2de70aeb9 100644
--- a/dbaccess/source/ext/adabas/ANewDb.cxx
+++ b/dbaccess/source/ext/adabas/ANewDb.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
@@ -56,13 +56,13 @@ OAdabasCreateDialog::OAdabasCreateDialog(const Reference< XMultiServiceFactory >
:OAdabasCreateDialogBase(_rxORB)
,m_pDialog(NULL)
{
- registerProperty(PROPERTY_CREATECATALOG, PROPERTY_ID_CREATECATALOG, PropertyAttribute::TRANSIENT,&m_xCreateCatalog, ::getCppuType(&m_xCreateCatalog));
- registerProperty(PROPERTY_DATABASENAME, PROPERTY_ID_DATABASENAME, PropertyAttribute::TRANSIENT,&m_sDatabaseName, ::getCppuType(&m_sDatabaseName));
- registerProperty(PROPERTY_CONTROL_USER, PROPERTY_ID_CONTROL_USER, PropertyAttribute::TRANSIENT,&m_sControlUser, ::getCppuType(&m_sControlUser));
- registerProperty(PROPERTY_CONTROL_PASSWORD, PROPERTY_ID_CONTROL_PASSWORD, PropertyAttribute::TRANSIENT,&m_sControlPassword, ::getCppuType(&m_sControlPassword));
- registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT,&m_sUser, ::getCppuType(&m_sUser));
- registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT,&m_sUserPassword, ::getCppuType(&m_sUserPassword));
- registerProperty(PROPERTY_CACHESIZE, PROPERTY_ID_CACHESIZE, PropertyAttribute::TRANSIENT,&m_nCacheSize, ::getCppuType(&m_nCacheSize));
+ registerProperty(PROPERTY_CREATECATALOG, PROPERTY_ID_CREATECATALOG, PropertyAttribute::TRANSIENT,&m_xCreateCatalog, ::getCppuType(&m_xCreateCatalog));
+ registerProperty(PROPERTY_DATABASENAME, PROPERTY_ID_DATABASENAME, PropertyAttribute::TRANSIENT,&m_sDatabaseName, ::getCppuType(&m_sDatabaseName));
+ registerProperty(PROPERTY_CONTROL_USER, PROPERTY_ID_CONTROL_USER, PropertyAttribute::TRANSIENT,&m_sControlUser, ::getCppuType(&m_sControlUser));
+ registerProperty(PROPERTY_CONTROL_PASSWORD, PROPERTY_ID_CONTROL_PASSWORD, PropertyAttribute::TRANSIENT,&m_sControlPassword, ::getCppuType(&m_sControlPassword));
+ registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT,&m_sUser, ::getCppuType(&m_sUser));
+ registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT,&m_sUserPassword, ::getCppuType(&m_sUserPassword));
+ registerProperty(PROPERTY_CACHESIZE, PROPERTY_ID_CACHESIZE, PropertyAttribute::TRANSIENT,&m_nCacheSize, ::getCppuType(&m_nCacheSize));
}
//-------------------------------------------------------------------------
@@ -126,7 +126,7 @@ Reference<XPropertySetInfo> SAL_CALL OAdabasCreateDialog::getPropertySetInfo()
}
//------------------------------------------------------------------------------
-Dialog* OAdabasCreateDialog::createDialog(Window* _pParent)
+Dialog* OAdabasCreateDialog::createDialog(Window* _pParent)
{
if(!m_xCreateCatalog.is())
throw SQLException();
@@ -138,12 +138,12 @@ void OAdabasCreateDialog::executedDialog(sal_Int16 _nExecutionResult)
{
if(m_pDialog && _nExecutionResult == RET_OK)
{ // fill the variables
- m_sDatabaseName = m_pDialog->GetDatabaseName();
- m_sControlUser = m_pDialog->GetControlUser();
- m_sControlPassword = m_pDialog->GetControlPassword();
- m_sUser = m_pDialog->GetUser();
- m_sUserPassword = m_pDialog->GetUserPassword();
- m_nCacheSize = m_pDialog->GetCacheSize();
+ m_sDatabaseName = m_pDialog->GetDatabaseName();
+ m_sControlUser = m_pDialog->GetControlUser();
+ m_sControlPassword = m_pDialog->GetControlPassword();
+ m_sUser = m_pDialog->GetUser();
+ m_sUserPassword = m_pDialog->GetUserPassword();
+ m_nCacheSize = m_pDialog->GetCacheSize();
}
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ext/adabas/ANewDb.hxx b/dbaccess/source/ext/adabas/ANewDb.hxx
index cf725930dd0a..f1f0087be4df 100644
--- a/dbaccess/source/ext/adabas/ANewDb.hxx
+++ b/dbaccess/source/ext/adabas/ANewDb.hxx
@@ -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
@@ -50,12 +50,12 @@ namespace adabasui
protected:
OAdabasNewDbDlg* m_pDialog; // just to avoid a cast
// <properties>
- ::rtl::OUString m_sDatabaseName;
- ::rtl::OUString m_sControlUser;
- ::rtl::OUString m_sControlPassword;
- ::rtl::OUString m_sUser;
- ::rtl::OUString m_sUserPassword;
- sal_Int32 m_nCacheSize;
+ ::rtl::OUString m_sDatabaseName;
+ ::rtl::OUString m_sControlUser;
+ ::rtl::OUString m_sControlPassword;
+ ::rtl::OUString m_sUser;
+ ::rtl::OUString m_sUserPassword;
+ sal_Int32 m_nCacheSize;
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog;
// </properties>
@@ -85,11 +85,11 @@ namespace adabasui
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent);
+ virtual Dialog* createDialog(Window* _pParent);
virtual void executedDialog(sal_Int16 _nExecutionResult);
};
//.........................................................................
-} // namespace adabasui
+} // namespace adabasui
//.........................................................................
#endif // ADABASUI_NEWDB_HXX
diff --git a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx
index be2c27acf9d9..046a3fb9f175 100644
--- a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx
+++ b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx
@@ -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
@@ -44,7 +44,7 @@ namespace adabasui
,public OSQLNameChecker
{
public:
- OSQLNameEdit(Window* _pParent,const ResId& _rRes)
+ OSQLNameEdit(Window* _pParent,const ResId& _rRes)
: Edit(_pParent,_rRes)
{
}
diff --git a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
index 4745568c69e8..ae6071d6ae1a 100644
--- a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
+++ b/dbaccess/source/ext/adabas/ASqlNameEdit.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
@@ -40,14 +40,14 @@ namespace adabasui
);
}
//------------------------------------------------------------------
- sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue,
+ sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue,
const ::rtl::OUString& _sToCheck,
::rtl::OUString& _rsCorrected)
{
sal_Bool bCorrected = sal_False;
- XubString sSavedValue = _sOldValue;
- XubString sText = _sToCheck;
- xub_StrLen nMatch = 0;
+ XubString sSavedValue = _sOldValue;
+ XubString sText = _sToCheck;
+ xub_StrLen nMatch = 0;
for ( xub_StrLen i=nMatch;i < sText.Len(); ++i )
{
if ( !isCharOk( sText.GetBuffer()[i]) )
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
index cab3b7170bc2..943e60d4d96d 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.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
@@ -34,10 +34,10 @@
#include <comphelper/sequence.hxx>
#include <tools/debug.hxx>
-#define ENTER_MOD_METHOD() \
- ::osl::MutexGuard aGuard(s_aMutex); \
+#define ENTER_MOD_METHOD() \
+ ::osl::MutexGuard aGuard(s_aMutex); \
ensureImpl()
-
+
//.........................................................................
namespace COMPMOD_NAMESPACE
{
@@ -56,9 +56,9 @@ namespace COMPMOD_NAMESPACE
*/
class OModuleImpl
{
- ResMgr* m_pRessources;
- sal_Bool m_bInitialized;
- ByteString m_sFilePrefix;
+ ResMgr* m_pRessources;
+ sal_Bool m_bInitialized;
+ ByteString m_sFilePrefix;
public:
/// ctor
@@ -66,8 +66,8 @@ namespace COMPMOD_NAMESPACE
~OModuleImpl();
/// get the manager for the ressources of the module
- ResMgr* getResManager();
- void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
+ ResMgr* getResManager();
+ void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
};
//-------------------------------------------------------------------------
@@ -85,7 +85,7 @@ namespace COMPMOD_NAMESPACE
}
//-------------------------------------------------------------------------
- ResMgr* OModuleImpl::getResManager()
+ ResMgr* OModuleImpl::getResManager()
{
// note that this method is not threadsafe, which counts for the whole class !
if (!m_pRessources && !m_bInitialized)
@@ -95,10 +95,10 @@ namespace COMPMOD_NAMESPACE
ByteString aMgrName = m_sFilePrefix;
m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer());
- DBG_ASSERT(m_pRessources,
+ DBG_ASSERT(m_pRessources,
(ByteString("OModuleImpl::getResManager: could not create the resource manager (file name: ")
- += aMgrName
- += ByteString(")!")).GetBuffer());
+ += aMgrName
+ += ByteString(")!")).GetBuffer());
m_bInitialized = sal_True;
}
@@ -108,12 +108,12 @@ namespace COMPMOD_NAMESPACE
//=========================================================================
//= OModule
//=========================================================================
- ::osl::Mutex OModule::s_aMutex;
- sal_Int32 OModule::s_nClients = 0;
- OModuleImpl* OModule::s_pImpl = NULL;
- ::rtl::OString OModule::s_sResPrefix;
+ ::osl::Mutex OModule::s_aMutex;
+ sal_Int32 OModule::s_nClients = 0;
+ OModuleImpl* OModule::s_pImpl = NULL;
+ ::rtl::OString OModule::s_sResPrefix;
//-------------------------------------------------------------------------
- ResMgr* OModule::getResManager()
+ ResMgr* OModule::getResManager()
{
ENTER_MOD_METHOD();
return s_pImpl->getResManager();
@@ -159,10 +159,10 @@ namespace COMPMOD_NAMESPACE
//- registration helper
//--------------------------------------------------------------------------
- Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL;
- Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL;
- Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL;
- Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL;
+ Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL;
+ Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL;
+ Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL;
+ Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL;
//--------------------------------------------------------------------------
void OModule::registerComponent(
@@ -183,9 +183,9 @@ namespace COMPMOD_NAMESPACE
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::registerComponent : inconsistent state (the pointers (2)) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::registerComponent : inconsistent state !");
sal_Int32 nOldLen = s_pImplementationNames->getLength();
@@ -210,9 +210,9 @@ namespace COMPMOD_NAMESPACE
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::revokeComponent : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::revokeComponent : inconsistent state !");
sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -252,9 +252,9 @@ namespace COMPMOD_NAMESPACE
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::writeComponentInfos : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::writeComponentInfos : inconsistent state !");
sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -301,9 +301,9 @@ namespace COMPMOD_NAMESPACE
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::getComponentFactory : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::getComponentFactory : inconsistent state !");
@@ -337,7 +337,7 @@ namespace COMPMOD_NAMESPACE
//.........................................................................
-} // 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 8ac75326a56e..d0c93c5b0663 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
@@ -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
@@ -76,36 +76,36 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
protected:
// resource administration
- static ::osl::Mutex s_aMutex; /// access safety
- static sal_Int32 s_nClients; /// number of registered clients
- static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered
- static ::rtl::OString s_sResPrefix;
+ static ::osl::Mutex s_aMutex; /// access safety
+ static sal_Int32 s_nClients; /// number of registered clients
+ static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered
+ static ::rtl::OString s_sResPrefix;
// auto registration administration
- static ::com::sun::star::uno::Sequence< ::rtl::OUString >*
+ static ::com::sun::star::uno::Sequence< ::rtl::OUString >*
s_pImplementationNames;
- static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
+ static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
s_pSupportedServices;
- static ::com::sun::star::uno::Sequence< sal_Int64 >*
+ static ::com::sun::star::uno::Sequence< sal_Int64 >*
s_pCreationFunctionPointers;
- static ::com::sun::star::uno::Sequence< sal_Int64 >*
+ static ::com::sun::star::uno::Sequence< sal_Int64 >*
s_pFactoryFunctionPointers;
public:
// cna be set as long as no resource has been accessed ...
- static void setResourceFilePrefix(const ::rtl::OString& _rPrefix);
+ static void setResourceFilePrefix(const ::rtl::OString& _rPrefix);
/// get the vcl res manager of the module
- static ResMgr* getResManager();
+ static ResMgr* getResManager();
/** register a component implementing a service with the given data.
- @param _rImplementationName
+ @param _rImplementationName
the implementation name of the component
- @param _rServiceNames
+ @param _rServiceNames
the services the component supports
- @param _pCreateFunction
+ @param _pCreateFunction
a function for creating an instance of the component
- @param _pFactoryFunction
+ @param _pFactoryFunction
a function for creating a factory for that component
@see revokeComponent
*/
@@ -116,7 +116,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
FactoryInstantiation _pFactoryFunction);
/** revoke the registration for the specified component
- @param _rImplementationName
+ @param _rImplementationName
the implementation name of the component
*/
static void revokeComponent(
@@ -126,9 +126,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
<p>writes the registration information of all components which are currently registered into the
specified registry.<p/>
<p>Usually used from within component_writeInfo.<p/>
- @param _rxServiceManager
+ @param _rxServiceManager
the service manager
- @param _rRootKey
+ @param _rRootKey
the registry key under which the information will be stored
@return
sal_True if the registration of all implementations was successfull, sal_False otherwise
@@ -139,9 +139,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
/** creates a Factory for the component with the given implementation name.
<p>Usually used from within component_getFactory.<p/>
- @param _rxServiceManager
+ @param _rxServiceManager
a pointer to an XMultiServiceFactory interface as got in component_getFactory
- @param _pImplementationName
+ @param _pImplementationName
the implementation name of the component
@return
the XInterface access to a factory for the component
@@ -153,9 +153,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
protected:
/// register a client for the module
- static void registerClient();
+ static void registerClient();
/// revoke a client for the module
- static void revokeClient();
+ static void revokeClient();
private:
/** ensure that the impl class exists
@@ -167,13 +167,13 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
//=========================================================================
//= OModuleResourceClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific ressources
*/
class OModuleResourceClient
{
public:
- OModuleResourceClient() { OModule::registerClient(); }
- ~OModuleResourceClient() { OModule::revokeClient(); }
+ OModuleResourceClient() { OModule::registerClient(); }
+ ~OModuleResourceClient() { OModule::revokeClient(); }
};
//=========================================================================
@@ -272,7 +272,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
}
//.........................................................................
-} // namespace COMPMOD_NAMESPACE
+} // namespace COMPMOD_NAMESPACE
//.........................................................................
#endif // _EXTENSIONS_COMPONENT_MODULE_HXX_
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 5ba64ae9c5c7..d6833f01eaaa 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.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
@@ -69,11 +69,11 @@ namespace adabasui
{
class ODatabaseCreator : public ::osl::Thread
{
- Link m_aTerminateHandler;
- Sequence< PropertyValue> m_aValues;
- Reference<XCreateCatalog> m_xCreateCatalog;
- Reference< XMultiServiceFactory > m_xORB;
- Window* m_pErrorWindow;
+ Link m_aTerminateHandler;
+ Sequence< PropertyValue> m_aValues;
+ Reference<XCreateCatalog> m_xCreateCatalog;
+ Reference< XMultiServiceFactory > m_xORB;
+ Window* m_pErrorWindow;
public:
ODatabaseCreator(const Reference<XCreateCatalog>& _rxCreateCatalog
,Window* _pErrorWindow
@@ -107,7 +107,7 @@ namespace adabasui
catch(Exception&)
{
OSL_ASSERT(0);
- // showError(::dbtools::SQLExceptionInfo(e),this,);
+ // showError(::dbtools::SQLExceptionInfo(e),this,);
}
}
void SAL_CALL ODatabaseCreator::onTerminated()
@@ -120,7 +120,7 @@ DBG_NAME( OAdabasNewDbDlg )
//========================================================================
OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
const Reference<XCreateCatalog>& _rxCreateCatalog,
- const Reference< XMultiServiceFactory >& _rxORB,
+ const Reference< XMultiServiceFactory >& _rxORB,
BOOL _bRestore)
:ModalDialog( pParent, ModuleRes( DLG_ADABAS_NEWDB ))
,m_FT_DATABASENAME( this, ModuleRes( FT_DATABASENAME ) )
@@ -202,8 +202,8 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_ET_SYSUSR.SetText(String::CreateFromAscii("DUMMY"));
m_BMP_SYS.Hide();
m_BMP_DOMAIN.Hide();
- m_ET_RESTORE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_ET_RESTORE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_RESTORE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_RESTORE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_ET_RESTORE.SetMaxTextLen(40);
}
else
@@ -212,24 +212,24 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_ET_RESTORE.Hide();
m_PB_RESTORE.Hide();
- m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_ET_DOMAIN_USR.Enable(FALSE);
}
- m_ET_SYSDEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_ET_TRANSACTIONLOG.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_ET_DATADEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_SYSDEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_TRANSACTIONLOG.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_DATADEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_ET_SYSDEVSPACE.SetMaxTextLen(40);
m_ET_TRANSACTIONLOG.SetMaxTextLen(40);
m_ET_DATADEVSPACE.SetMaxTextLen(40);
- m_NF_TRANSACTIONLOG_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_NF_DATADEVSPACE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_NF_TRANSACTIONLOG_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_NF_DATADEVSPACE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_NF_TRANSACTIONLOG_SIZE.SetMin(10);
m_NF_DATADEVSPACE_SIZE.SetMin(10);
@@ -249,19 +249,19 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_ET_DATABASENAME.SetMaxTextLen( 8 );
- m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
- m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
- m_PB_DOMAINPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
+ m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
+ m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
+ m_PB_DOMAINPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
- m_PB_RESTORE.SetClickHdl( LINK(this,OAdabasNewDbDlg,LoadButtonClickHdl));
+ m_PB_RESTORE.SetClickHdl( LINK(this,OAdabasNewDbDlg,LoadButtonClickHdl));
- m_PB_SYSDEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
- m_PB_TRANSACTIONLOG.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
- m_PB_DATADEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
+ m_PB_SYSDEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
+ m_PB_TRANSACTIONLOG.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
+ m_PB_DATADEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
- m_BMP_CON.SetImage( ModuleRes(UNCHECK_RED) );
- m_BMP_SYS.SetImage( ModuleRes(UNCHECK_RED) );
- m_BMP_DOMAIN.SetImage( ModuleRes(UNCHECK_RED) );
+ m_BMP_CON.SetImage( ModuleRes(UNCHECK_RED) );
+ m_BMP_SYS.SetImage( ModuleRes(UNCHECK_RED) );
+ m_BMP_DOMAIN.SetImage( ModuleRes(UNCHECK_RED) );
static String s_sRoot(RTL_CONSTASCII_USTRINGPARAM("DBROOT"));
static String s_sConfig(RTL_CONSTASCII_USTRINGPARAM("DBCONFIG"));
@@ -344,7 +344,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_PB_OK.SetClickHdl(LINK(this,OAdabasNewDbDlg,ImplOKHdl));
m_PB_OK.Enable(FALSE);
- m_ET_DATABASENAME.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_DATABASENAME.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
}
// -----------------------------------------------------------------------
@@ -378,11 +378,11 @@ IMPL_LINK(OAdabasNewDbDlg, OnNoAccessRights, void*, /*_pArg*/)
// -----------------------------------------------------------------------
IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
{
- m_SYSDEV_File = m_ET_SYSDEVSPACE.GetText();
+ m_SYSDEV_File = m_ET_SYSDEVSPACE.GetText();
m_TRANSDEV_File = m_ET_TRANSACTIONLOG.GetText();
- m_DATADEV_File = m_ET_DATADEVSPACE.GetText();
+ m_DATADEV_File = m_ET_DATADEVSPACE.GetText();
- m_Backup_File = m_ET_RESTORE.GetText();
+ m_Backup_File = m_ET_RESTORE.GetText();
if(m_bRestore)
{
INetURLObject aURL;
@@ -463,36 +463,36 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
sal_Int32 nPos = 0;
Sequence< PropertyValue> aCreateArgs(m_bRestore ? 14 : 12);
- aCreateArgs[nPos].Name = PROPERTY_CONTROL_USER;
+ aCreateArgs[nPos].Name = PROPERTY_CONTROL_USER;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_CONUSR.GetText().ToUpperAscii());
- aCreateArgs[nPos].Name = PROPERTY_CONTROL_PASSWORD;
+ aCreateArgs[nPos].Name = PROPERTY_CONTROL_PASSWORD;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ConPwd);
- aCreateArgs[nPos].Name = PROPERTY_USER;
+ aCreateArgs[nPos].Name = PROPERTY_USER;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_SYSUSR.GetText().ToUpperAscii());
- aCreateArgs[nPos].Name = PROPERTY_PASSWORD;
+ aCreateArgs[nPos].Name = PROPERTY_PASSWORD;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_SysPwd);
- aCreateArgs[nPos].Name = PROPERTY_DOMAINPASSWORD;
+ aCreateArgs[nPos].Name = PROPERTY_DOMAINPASSWORD;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_DomainPwd);
- aCreateArgs[nPos].Name = PROPERTY_CACHESIZE;
+ aCreateArgs[nPos].Name = PROPERTY_CACHESIZE;
aCreateArgs[nPos++].Value <<= ::rtl::OUString::valueOf(sal_Int32(m_NF_CACHE_SIZE.GetValue()*256));
- aCreateArgs[nPos].Name = PROPERTY_DATABASENAME;
+ aCreateArgs[nPos].Name = PROPERTY_DATABASENAME;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_DATABASENAME.GetText().ToUpperAscii());
- aCreateArgs[nPos].Name = PROPERTY_DATADEVSPACE;
+ aCreateArgs[nPos].Name = PROPERTY_DATADEVSPACE;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_DATADEV_File);
- aCreateArgs[nPos].Name = PROPERTY_SYSDEVSPACE;
+ aCreateArgs[nPos].Name = PROPERTY_SYSDEVSPACE;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_SYSDEV_File);
- aCreateArgs[nPos].Name = PROPERTY_TRANSACTION_LOG;
+ aCreateArgs[nPos].Name = PROPERTY_TRANSACTION_LOG;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_TRANSDEV_File);
- aCreateArgs[nPos].Name = PROPERTY_DATADEVSIZE;
+ aCreateArgs[nPos].Name = PROPERTY_DATADEVSIZE;
aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_DATADEVSPACE_SIZE.GetValue()*256);
- aCreateArgs[nPos].Name = PROPERTY_LOGDEVSIZE;
- aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_TRANSACTIONLOG_SIZE.GetValue()*256);
+ aCreateArgs[nPos].Name = PROPERTY_LOGDEVSIZE;
+ aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_TRANSACTIONLOG_SIZE.GetValue()*256);
if(m_bRestore)
{
- aCreateArgs[nPos].Name = PROPERTY_RESTOREDATABASE;
+ aCreateArgs[nPos].Name = PROPERTY_RESTOREDATABASE;
aCreateArgs[nPos++].Value <<= ::cppu::bool2any(sal_True);
- aCreateArgs[nPos].Name = PROPERTY_BACKUPNAME;
+ aCreateArgs[nPos].Name = PROPERTY_BACKUPNAME;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_Backup_File);
}
@@ -574,8 +574,8 @@ IMPL_LINK( OAdabasNewDbDlg, LoadButtonClickHdl, Button *, /*pButton*/ )
//------------------------------------------------------------------------
IMPL_LINK( OAdabasNewDbDlg, ButtonClickHdl, Button *, pButton )
{
- WinBits nBits(WB_3DLOOK|WB_STDMODAL|WB_SAVEAS);
- ::sfx2::FileDialogHelper aFileDlg( static_cast<sal_uInt32>(nBits) ); // new FileDialog( this, nBits );
+ WinBits nBits(WB_3DLOOK|WB_STDMODAL|WB_SAVEAS);
+ ::sfx2::FileDialogHelper aFileDlg( static_cast<sal_uInt32>(nBits) ); // new FileDialog( this, nBits );
String aPath;
if(pButton == &m_PB_SYSDEVSPACE)
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hrc b/dbaccess/source/ext/adabas/AdabasNewDb.hrc
index 30216a30e6b7..e38a808ae645 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.hrc
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.hrc
@@ -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
@@ -29,50 +29,50 @@
#define ADABASUI_ADABASNEWDB_HRC
-#define PB_SYSDEVSPACE 1
-#define PB_TRANSACTIONLOG 2
-#define PB_DATADEVSPACE 3
-#define PB_DOMAINPWD 4
-#define PB_CONPWD 5
-#define PB_SYSPWD 6
-#define PB_OK 7
-#define PB_CANCEL 8
-#define PB_RESTORE 9
+#define PB_SYSDEVSPACE 1
+#define PB_TRANSACTIONLOG 2
+#define PB_DATADEVSPACE 3
+#define PB_DOMAINPWD 4
+#define PB_CONPWD 5
+#define PB_SYSPWD 6
+#define PB_OK 7
+#define PB_CANCEL 8
+#define PB_RESTORE 9
-#define NF_TRANSACTIONLOG_SIZE 1
-#define NF_DATADEVSPACE_SIZE 2
-#define NF_CACHE_SIZE 3
+#define NF_TRANSACTIONLOG_SIZE 1
+#define NF_DATADEVSPACE_SIZE 2
+#define NF_CACHE_SIZE 3
-#define ET_SYSUSR 1
-#define ET_DOMAIN_USR 2
-#define ET_CONUSR 3
-#define ET_SYSDEVSPACE 4
-#define ET_TRANSACTIONLOG 5
-#define ET_DATADEVSPACE 6
-#define ET_RESTORE 7
-#define ET_DATABASENAME 8
+#define ET_SYSUSR 1
+#define ET_DOMAIN_USR 2
+#define ET_CONUSR 3
+#define ET_SYSDEVSPACE 4
+#define ET_TRANSACTIONLOG 5
+#define ET_DATADEVSPACE 6
+#define ET_RESTORE 7
+#define ET_DATABASENAME 8
-#define FT_SYSUSR 1
-#define FT_DOMAIN_USR 2
-#define FT_TRANSACTIONLOG_SIZE 3
-#define FT_DATADEVSPACE_SIZE 4
-#define FT_CONUSR 6
-#define FT_SYSDEVSPACE 7
-#define FT_TRANSACTIONLOG 8
-#define FT_DATADEVSPACE 9
-#define FT_CACHE_SIZE 10
-#define FT_RESTORE 11
-#define FT_DATABASENAME 12
+#define FT_SYSUSR 1
+#define FT_DOMAIN_USR 2
+#define FT_TRANSACTIONLOG_SIZE 3
+#define FT_DATADEVSPACE_SIZE 4
+#define FT_CONUSR 6
+#define FT_SYSDEVSPACE 7
+#define FT_TRANSACTIONLOG 8
+#define FT_DATADEVSPACE 9
+#define FT_CACHE_SIZE 10
+#define FT_RESTORE 11
+#define FT_DATABASENAME 12
#define FL_USER 1
#define FL_DBSETTINGS 2
#define FL_END 3
-#define BMP_CON 1
-#define BMP_SYS 2
-#define BMP_DOMAIN 3
+#define BMP_CON 1
+#define BMP_SYS 2
+#define BMP_DOMAIN 3
-#define STR_BACKUPFILE_LOAD 1
+#define STR_BACKUPFILE_LOAD 1
#endif // ADABASUI_ADABASNEWDB_HRC
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
index 9ab36e88060c..a271c438ddb1 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
@@ -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
@@ -53,76 +53,76 @@ namespace adabasui
class OAdabasNewDbDlg : public ModalDialog
{
private:
- FixedText m_FT_DATABASENAME;
- OSQLNameEdit m_ET_DATABASENAME;
+ FixedText m_FT_DATABASENAME;
+ OSQLNameEdit m_ET_DATABASENAME;
FixedLine m_FL_USER;
- FixedText m_FT_SYSUSR;
- FixedText m_FT_CONUSR;
- FixedText m_FT_DOMAIN_USR;
+ FixedText m_FT_SYSUSR;
+ FixedText m_FT_CONUSR;
+ FixedText m_FT_DOMAIN_USR;
- OSQLNameEdit m_ET_SYSUSR;
- PushButton m_PB_SYSPWD;
- OSQLNameEdit m_ET_CONUSR;
- PushButton m_PB_CONPWD;
- OSQLNameEdit m_ET_DOMAIN_USR;
- PushButton m_PB_DOMAINPWD;
+ OSQLNameEdit m_ET_SYSUSR;
+ PushButton m_PB_SYSPWD;
+ OSQLNameEdit m_ET_CONUSR;
+ PushButton m_PB_CONPWD;
+ OSQLNameEdit m_ET_DOMAIN_USR;
+ PushButton m_PB_DOMAINPWD;
- FixedImage m_BMP_CON;
- FixedImage m_BMP_SYS;
- FixedImage m_BMP_DOMAIN;
+ FixedImage m_BMP_CON;
+ FixedImage m_BMP_SYS;
+ FixedImage m_BMP_DOMAIN;
- FixedText m_FT_RESTORE;
- Edit m_ET_RESTORE;
- PushButton m_PB_RESTORE;
+ FixedText m_FT_RESTORE;
+ Edit m_ET_RESTORE;
+ PushButton m_PB_RESTORE;
FixedLine m_FL_DBSETTINGS;
- FixedText m_FT_SYSDEVSPACE;
- FixedText m_FT_TRANSACTIONLOG;
- FixedText m_FT_DATADEVSPACE;
- Edit m_ET_SYSDEVSPACE;
- PushButton m_PB_SYSDEVSPACE;
- Edit m_ET_TRANSACTIONLOG;
- PushButton m_PB_TRANSACTIONLOG;
- Edit m_ET_DATADEVSPACE;
- PushButton m_PB_DATADEVSPACE;
-
- FixedText m_FT_TRANSACTIONLOG_SIZE;
- NumericField m_NF_TRANSACTIONLOG_SIZE;
- FixedText m_FT_DATADEVSPACE_SIZE;
- NumericField m_NF_DATADEVSPACE_SIZE;
- FixedText m_FT_CACHE_SIZE;
- NumericField m_NF_CACHE_SIZE;
+ FixedText m_FT_SYSDEVSPACE;
+ FixedText m_FT_TRANSACTIONLOG;
+ FixedText m_FT_DATADEVSPACE;
+ Edit m_ET_SYSDEVSPACE;
+ PushButton m_PB_SYSDEVSPACE;
+ Edit m_ET_TRANSACTIONLOG;
+ PushButton m_PB_TRANSACTIONLOG;
+ Edit m_ET_DATADEVSPACE;
+ PushButton m_PB_DATADEVSPACE;
+
+ FixedText m_FT_TRANSACTIONLOG_SIZE;
+ NumericField m_NF_TRANSACTIONLOG_SIZE;
+ FixedText m_FT_DATADEVSPACE_SIZE;
+ NumericField m_NF_DATADEVSPACE_SIZE;
+ FixedText m_FT_CACHE_SIZE;
+ NumericField m_NF_CACHE_SIZE;
FixedLine m_FL_END;
- OKButton m_PB_OK;
- CancelButton m_PB_CANCEL;
-
- String m_SYSDEV_File;
- String m_TRANSDEV_File;
- String m_DATADEV_File;
- String m_Backup_File;
- String m_ConPwd;
- String m_SysPwd;
- String m_DomainPwd;
- String m_DBName;
- String m_sDbWork;
- String m_sDbConfig;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog;
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xORB;
- BOOL m_bRestore;
- INT8 m_nSetBitmap;
-
- ::std::auto_ptr<WaitObject> m_aCreatorWait;
- ::std::auto_ptr<ODatabaseCreator> m_aCreatorThread;
-
- DECL_LINK( LoadButtonClickHdl, Button * );
- DECL_LINK( ButtonClickHdl, Button * );
- DECL_LINK( PwdClickHdl, Button * );
- DECL_LINK( ImplOKHdl, OKButton * );
- DECL_LINK( LoseFocusHdl, Edit * );
- DECL_LINK( TerminateHdl, void * );
+ OKButton m_PB_OK;
+ CancelButton m_PB_CANCEL;
+
+ String m_SYSDEV_File;
+ String m_TRANSDEV_File;
+ String m_DATADEV_File;
+ String m_Backup_File;
+ String m_ConPwd;
+ String m_SysPwd;
+ String m_DomainPwd;
+ String m_DBName;
+ String m_sDbWork;
+ String m_sDbConfig;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog;
+ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xORB;
+ BOOL m_bRestore;
+ INT8 m_nSetBitmap;
+
+ ::std::auto_ptr<WaitObject> m_aCreatorWait;
+ ::std::auto_ptr<ODatabaseCreator> m_aCreatorThread;
+
+ DECL_LINK( LoadButtonClickHdl, Button * );
+ DECL_LINK( ButtonClickHdl, Button * );
+ DECL_LINK( PwdClickHdl, Button * );
+ DECL_LINK( ImplOKHdl, OKButton * );
+ DECL_LINK( LoseFocusHdl, Edit * );
+ DECL_LINK( TerminateHdl, void * );
void CheckBitmaps();
@@ -134,16 +134,16 @@ namespace adabasui
public:
OAdabasNewDbDlg(Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog>& _rxCreateCatalog,
- const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+ const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB,
BOOL _bRestore=FALSE);
virtual ~OAdabasNewDbDlg();
- ::rtl::OUString GetDatabaseName() const { return m_ET_DATABASENAME.GetText(); }
- ::rtl::OUString GetControlUser() const { return m_ET_CONUSR.GetText(); }
- ::rtl::OUString GetControlPassword() const { return m_ConPwd; }
- ::rtl::OUString GetUser() const { return m_ET_SYSUSR.GetText(); }
- ::rtl::OUString GetUserPassword() const { return m_SysPwd; }
- sal_Int32 GetCacheSize() const { return static_cast<sal_Int32>(m_NF_CACHE_SIZE.GetValue()); }
+ ::rtl::OUString GetDatabaseName() const { return m_ET_DATABASENAME.GetText(); }
+ ::rtl::OUString GetControlUser() const { return m_ET_CONUSR.GetText(); }
+ ::rtl::OUString GetControlPassword() const { return m_ConPwd; }
+ ::rtl::OUString GetUser() const { return m_ET_SYSUSR.GetText(); }
+ ::rtl::OUString GetUserPassword() const { return m_SysPwd; }
+ sal_Int32 GetCacheSize() const { return static_cast<sal_Int32>(m_NF_CACHE_SIZE.GetValue()); }
};
}
#endif // adabasui_ADABAS_CREATEDB_HXX
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.src b/dbaccess/source/ext/adabas/AdabasNewDb.src
index 33915b06266b..ae3cd2e2d24c 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.src
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.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
@@ -33,23 +33,23 @@
//==================================================================
// NEWDB Admin
//==================================================================
-#define WIN_X 268
-#define WIN_Y 210
-#define MOVE_Y 21
+#define WIN_X 268
+#define WIN_Y 210
+#define MOVE_Y 21
#define ADJUST_X 45
ModalDialog DLG_ADABAS_NEWDB
{
- Moveable = TRUE ;
- Closeable = TRUE ;
- OutputSize = TRUE ;
- SVLook = TRUE;
- HelpID = HID_DLG_ADABAS_NEWDB ;
- Size = MAP_APPFONT ( WIN_X , WIN_Y + MOVE_Y) ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ OutputSize = TRUE ;
+ SVLook = TRUE;
+ HelpID = HID_DLG_ADABAS_NEWDB ;
+ Size = MAP_APPFONT ( WIN_X , WIN_Y + MOVE_Y) ;
FixedText FT_DATABASENAME
{
- Pos = MAP_APPFONT ( 12 , 6) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 6) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
Text[ en-US ] = "Database ~name";
};
Edit ET_DATABASENAME
@@ -58,50 +58,50 @@ ModalDialog DLG_ADABAS_NEWDB
Pos = MAP_APPFONT ( 77 + ADJUST_X, 5) ;
Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_DBNAME ;
+ HelpID = HID_DLG_ADABAS_DBNAME ;
};
FixedLine FL_USER
{
- Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ;
+ 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 ) ;
+ 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 ) ;
+ 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 ) ;
+ Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
Text[ en-US ] = "~Domain user";
};
Edit ET_SYSUSR
{
- Border = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_SYSUSR ;
+ HelpID = HID_DLG_ADABAS_SYSUSR ;
};
PushButton PB_SYSPWD
{
Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_SYSPWD ;
+ HelpID = HID_DLG_ADABAS_SYSPWD ;
Text[ en-US ] = "P~assword...";
};
@@ -109,87 +109,87 @@ ModalDialog DLG_ADABAS_NEWDB
{
Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 30 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_CONUSR ;
+ HelpID = HID_DLG_ADABAS_CONUSR ;
};
PushButton PB_CONPWD
{
Pos = MAP_APPFONT ( 188 , 30 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_CONPWD ;
+ HelpID = HID_DLG_ADABAS_CONPWD ;
Text[ en-US ] = "~Password...";
};
Edit ET_DOMAIN_USR
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 47 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
- Border = TRUE ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Border = TRUE ;
TabStop = TRUE ;
ReadOnly= TRUE;
- HelpID = HID_DLG_ADABAS_USR ;
+ HelpID = HID_DLG_ADABAS_USR ;
Text = "adabas";
};
PushButton PB_DOMAINPWD
{
Pos = MAP_APPFONT ( 188 , 47 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_DOMAINPWD ;
+ HelpID = HID_DLG_ADABAS_DOMAINPWD ;
Text[ en-US ] = "Passwo~rd...";
};
FixedImage BMP_CON
{
Pos = MAP_APPFONT ( 240 , 27 + MOVE_Y) ;
- Size = MAP_APPFONT ( 20 , 20 ) ;
- HelpID = HID_DLG_ADABAS_CON_PWD ;
+ 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 ;
+ Size = MAP_APPFONT ( 20 , 20 ) ;
+ HelpID = HID_DLG_ADABAS_SYS_PWD ;
};
FixedImage BMP_DOMAIN
{
Pos = MAP_APPFONT ( 240 , 44 + MOVE_Y) ;
- Size = MAP_APPFONT ( 20 , 20 ) ;
- HelpID = HID_DLG_ADABAS_DOMAIN_PWD ;
+ Size = MAP_APPFONT ( 20 , 20 ) ;
+ HelpID = HID_DLG_ADABAS_DOMAIN_PWD ;
};
FixedText FT_RESTORE
{
- Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
Text[ en-US ] = "~Backup file";
};
Edit ET_RESTORE
{
- Border = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_RESTORE ;
+ HelpID = HID_DLG_ADABAS_RESTORE ;
};
PushButton PB_RESTORE
{
Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBRESTORE ;
- Text[ en-US ] = "...";
+ HelpID = HID_DLG_ADABAS_PBRESTORE ;
+ Text[ en-US ] = "...";
};
/* DEVSPACE positions */
FixedLine FL_DBSETTINGS
{
- Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ;
+ Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ;
Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ;
Text[ en-US ] = "Database settings";
};
@@ -217,37 +217,37 @@ ModalDialog DLG_ADABAS_NEWDB
Edit ET_SYSDEVSPACE
{
- Border = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 81 + MOVE_Y) ;
Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_SYSDEVSPACE ;
+ HelpID = HID_DLG_ADABAS_SYSDEVSPACE ;
};
PushButton PB_SYSDEVSPACE
{
- Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ;
- Text[ en-US ] = "...";
+ HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ;
+ Text[ en-US ] = "...";
};
Edit ET_TRANSACTIONLOG
{
- Border = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 97 + MOVE_Y) ;
Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ;
+ HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ;
};
PushButton PB_TRANSACTIONLOG
{
- Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y) ;
+ Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ;
+ HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ;
Text[ en-US ] = "...";
};
@@ -255,18 +255,18 @@ ModalDialog DLG_ADABAS_NEWDB
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 114 + MOVE_Y) ;
Size = MAP_APPFONT ( 161 - ADJUST_X, 12) ;
- Border = TRUE ;
+ Border = TRUE ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_DATADEVSPACE ;
+ HelpID = HID_DLG_ADABAS_DATADEVSPACE ;
};
PushButton PB_DATADEVSPACE
{
- Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ;
+ HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ;
Text[ en-US ] = "...";
};
/* DEVSPACE sizes */
@@ -280,11 +280,11 @@ ModalDialog DLG_ADABAS_NEWDB
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 131 + MOVE_Y) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
StrictFormat = TRUE;
- HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ;
+ HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ;
};
FixedText FT_DATADEVSPACE_SIZE
{
@@ -296,11 +296,11 @@ StrictFormat = TRUE;
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 148 + MOVE_Y) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
StrictFormat = TRUE;
- HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ;
+ HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ;
};
FixedText FT_CACHE_SIZE
{
@@ -312,11 +312,11 @@ StrictFormat = TRUE;
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 165 + MOVE_Y) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
StrictFormat = TRUE;
- HelpID = HID_DLG_ADABAS_CACHE_SIZE ;
+ HelpID = HID_DLG_ADABAS_CACHE_SIZE ;
};
FixedLine FL_END
{
@@ -325,21 +325,21 @@ StrictFormat = TRUE;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
+ Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
+ Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
};
String STR_BACKUPFILE_LOAD
{
- Text[ en-US ] = "Backup file information";
+ Text[ en-US ] = "Backup file information";
};
Text[ en-US ] = "Create New Adabas D Database";
@@ -348,42 +348,42 @@ StrictFormat = TRUE;
Image CHECK_GREEN
{
ImageBitmap = Bitmap { File = "nu07.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
Image UNCHECK_RED
{
ImageBitmap = Bitmap { File = "nu08.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
Image DEFAULT_BLUE
{
ImageBitmap = Bitmap { File = "nu09.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
/* Fehlermeldungen beim Erstellen einer Adabas DB */
String STR_ADABAS_NO_PARAM_SET
{
- Text[ en-US ] = "No entry could be written in the configuration file.";
+ Text[ en-US ] = "No entry could be written in the configuration file.";
};
String STR_ADABAS_NO_DB_CREATED
{
- Text[ en-US ] = "An error occurred as the DB files were being created.";
+ Text[ en-US ] = "An error occurred as the DB files were being created.";
};
String STR_ADABAS_NO_SYSTEM_TABLES
{
- Text[ en-US ] = "An error occurred as the system tables were being created.";
+ 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.";
+ Text[ en-US ] = "The backup file entered does not exist.";
};
InfoBox INFO_STR_MAX_FILE_LENGTH
{
- Message[ en-US ] = "The fully qualified file cannot be longer than \'#\' characters.";
+ Message[ en-US ] = "The fully qualified file cannot be longer than \'#\' characters.";
};
String STR_NO_SAME_USER
diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx
index 62f7f87d183d..b530783cc4cb 100644
--- a/dbaccess/source/ext/adabas/Aservices.cxx
+++ b/dbaccess/source/ext/adabas/Aservices.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
@@ -60,8 +60,8 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui()
extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment **
+ const sal_Char **ppEnvTypeName,
+ uno_Environment **
)
{
createRegistryInfo_adabasui();
@@ -74,8 +74,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
void* pRegistryKey
)
{
- if (pRegistryKey)
- try
+ if (pRegistryKey)
+ try
{
return OModule::writeComponentInfos(
static_cast<XMultiServiceFactory*>(pServiceManager),
diff --git a/dbaccess/source/ext/adabas/Astringconstants.cxx b/dbaccess/source/ext/adabas/Astringconstants.cxx
index 6fe34c212a00..4375af2eec1a 100644
--- a/dbaccess/source/ext/adabas/Astringconstants.cxx
+++ b/dbaccess/source/ext/adabas/Astringconstants.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
diff --git a/dbaccess/source/ext/adabas/Astringconstants.hrc b/dbaccess/source/ext/adabas/Astringconstants.hrc
index 49697f556024..2a1bed02f850 100644
--- a/dbaccess/source/ext/adabas/Astringconstants.hrc
+++ b/dbaccess/source/ext/adabas/Astringconstants.hrc
@@ -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
@@ -62,13 +62,13 @@ struct _ConstAsciiString_
//= property ids
//============================================================
-#define PROPERTY_ID_CREATECATALOG 3
-#define PROPERTY_ID_DATABASENAME 4
-#define PROPERTY_ID_CONTROL_USER 5
-#define PROPERTY_ID_CONTROL_PASSWORD 6
-#define PROPERTY_ID_USER 7
-#define PROPERTY_ID_PASSWORD 8
-#define PROPERTY_ID_CACHESIZE 9
+#define PROPERTY_ID_CREATECATALOG 3
+#define PROPERTY_ID_DATABASENAME 4
+#define PROPERTY_ID_CONTROL_USER 5
+#define PROPERTY_ID_CONTROL_PASSWORD 6
+#define PROPERTY_ID_USER 7
+#define PROPERTY_ID_PASSWORD 8
+#define PROPERTY_ID_CACHESIZE 9
//============================================================
//= property names
diff --git a/dbaccess/source/ext/adabas/adabasui_resource.hrc b/dbaccess/source/ext/adabas/adabasui_resource.hrc
index b0b0e63e91c7..922a897bdbd2 100644
--- a/dbaccess/source/ext/adabas/adabasui_resource.hrc
+++ b/dbaccess/source/ext/adabas/adabasui_resource.hrc
@@ -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
@@ -32,60 +32,60 @@
#include <svl/solar.hrc>
#endif
-#define RID_DIALOG_START RID_DB_EXTENSIONS_START
-#define RID_PAGE_START RID_DB_EXTENSIONS_START
-#define RID_ERRORBOX_START RID_DB_EXTENSIONS_START
-#define RID_QUERYBOX_START RID_DB_EXTENSIONS_START
-#define RID_TOOLBOX_START RID_DB_EXTENSIONS_START
-#define RID_BITMAP_START RID_DB_EXTENSIONS_START
-#define RID_IMAGE_START RID_DB_EXTENSIONS_START
-#define RID_IMAGELIST_START RID_DB_EXTENSIONS_START
-#define RID_MENU_START RID_DB_EXTENSIONS_START
-#define RID_STRING_START RID_DB_EXTENSIONS_START
-#define RID_UNTYPED_START RID_DB_EXTENSIONS_START
-#define RID_WARN_START RID_DB_EXTENSIONS_START
+#define RID_DIALOG_START RID_DB_EXTENSIONS_START
+#define RID_PAGE_START RID_DB_EXTENSIONS_START
+#define RID_ERRORBOX_START RID_DB_EXTENSIONS_START
+#define RID_QUERYBOX_START RID_DB_EXTENSIONS_START
+#define RID_TOOLBOX_START RID_DB_EXTENSIONS_START
+#define RID_BITMAP_START RID_DB_EXTENSIONS_START
+#define RID_IMAGE_START RID_DB_EXTENSIONS_START
+#define RID_IMAGELIST_START RID_DB_EXTENSIONS_START
+#define RID_MENU_START RID_DB_EXTENSIONS_START
+#define RID_STRING_START RID_DB_EXTENSIONS_START
+#define RID_UNTYPED_START RID_DB_EXTENSIONS_START
+#define RID_WARN_START RID_DB_EXTENSIONS_START
//========================================================================
// dialog ids
-#define DLG_ADABAS_NEWDB RID_DIALOG_START + 0
+#define DLG_ADABAS_NEWDB RID_DIALOG_START + 0
//========================================================================
// images
-#define CHECK_GREEN RID_IMAGE_START + 0
-#define UNCHECK_RED RID_IMAGE_START + 1
-#define DEFAULT_BLUE RID_IMAGE_START + 2
+#define CHECK_GREEN RID_IMAGE_START + 0
+#define UNCHECK_RED RID_IMAGE_START + 1
+#define DEFAULT_BLUE RID_IMAGE_START + 2
//========================================================================
// warning boxes
-#define INFO_STR_MAX_FILE_LENGTH RID_WARN_START + 0
+#define INFO_STR_MAX_FILE_LENGTH RID_WARN_START + 0
//========================================================================
// strings
-#define STR_ADABAS_NO_BACKUP_FILE RID_STRING_START + 0
+#define STR_ADABAS_NO_BACKUP_FILE RID_STRING_START + 0
//
-#define STR_NO_SAME_USER RID_STRING_START + 2
-#define STR_DEVSPACE_NO_FILE RID_STRING_START + 3
-#define STR_NO_PERMISSION RID_STRING_START + 4
-#define STR_FILE_OR_DIR_UNKNOWN RID_STRING_START + 5
-#define STR_STAT_WARNING RID_STRING_START + 6
+#define STR_NO_SAME_USER RID_STRING_START + 2
+#define STR_DEVSPACE_NO_FILE RID_STRING_START + 3
+#define STR_NO_PERMISSION RID_STRING_START + 4
+#define STR_FILE_OR_DIR_UNKNOWN RID_STRING_START + 5
+#define STR_STAT_WARNING RID_STRING_START + 6
//
-#define STR_ADABAS_NO_PARAM_SET RID_STRING_START + 8
+#define STR_ADABAS_NO_PARAM_SET RID_STRING_START + 8
//
//
-#define STR_ADABAS_NO_DB_CREATED RID_STRING_START + 11
-#define STR_ADABAS_NO_SYSTEM_TABLES RID_STRING_START + 12
-#define STR_ERROR_IN_ADABAS_INSTALLATION RID_STRING_START + 13
-#define STR_ADABAS_CREATEFILES RID_STRING_START + 14
-#define STR_ADABAS_CREATEPARAM_FILE RID_STRING_START + 15
-#define STR_ADABAS_START_DATABASE RID_STRING_START + 16
-#define STR_ADABAS_DB_EXISTS RID_STRING_START + 17
-#define STR_ADABAS_NO_DEFAULTNAME RID_STRING_START + 18
-#define STR_ADABAS_NO_ACCESSRIGHTS RID_STRING_START + 19
-#define STR_ADABAS_CANNOT_CONVERT RID_STRING_START + 20
-#define STR_ADABAS_PASSWORD_ILLEGAL RID_STRING_START + 21
+#define STR_ADABAS_NO_DB_CREATED RID_STRING_START + 11
+#define STR_ADABAS_NO_SYSTEM_TABLES RID_STRING_START + 12
+#define STR_ERROR_IN_ADABAS_INSTALLATION RID_STRING_START + 13
+#define STR_ADABAS_CREATEFILES RID_STRING_START + 14
+#define STR_ADABAS_CREATEPARAM_FILE RID_STRING_START + 15
+#define STR_ADABAS_START_DATABASE RID_STRING_START + 16
+#define STR_ADABAS_DB_EXISTS RID_STRING_START + 17
+#define STR_ADABAS_NO_DEFAULTNAME RID_STRING_START + 18
+#define STR_ADABAS_NO_ACCESSRIGHTS RID_STRING_START + 19
+#define STR_ADABAS_CANNOT_CONVERT RID_STRING_START + 20
+#define STR_ADABAS_PASSWORD_ILLEGAL RID_STRING_START + 21
#endif // _ADABASUI_RESOURCE_HRC_
diff --git a/dbaccess/source/ext/adabas/adabasuistrings.cxx b/dbaccess/source/ext/adabas/adabasuistrings.cxx
index cf1edccedc07..ec71721e7363 100644
--- a/dbaccess/source/ext/adabas/adabasuistrings.cxx
+++ b/dbaccess/source/ext/adabas/adabasuistrings.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
diff --git a/dbaccess/source/ext/adabas/adabasuistrings.hrc b/dbaccess/source/ext/adabas/adabasuistrings.hrc
index 7ee5fd19275c..6ef536e99380 100644
--- a/dbaccess/source/ext/adabas/adabasuistrings.hrc
+++ b/dbaccess/source/ext/adabas/adabasuistrings.hrc
@@ -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