summaryrefslogtreecommitdiffstats
path: root/dbaccess/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/filter')
-rw-r--r--dbaccess/source/filter/migration/cfgimport.cxx1180
-rw-r--r--dbaccess/source/filter/migration/cfgimport.hxx202
-rw-r--r--dbaccess/source/filter/migration/cfgservices.cxx111
-rw-r--r--dbaccess/source/filter/migration/makefile.mk73
-rw-r--r--dbaccess/source/filter/xml/dbaxml.component49
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx2
-rw-r--r--dbaccess/source/filter/xml/makefile.mk8
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlExport.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlservices.cxx22
11 files changed, 61 insertions, 1592 deletions
diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx
deleted file mode 100644
index 819c15ece69d..000000000000
--- a/dbaccess/source/filter/migration/cfgimport.cxx
+++ /dev/null
@@ -1,1180 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
- /*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
-
-#include "cfgimport.hxx"
-
-#include "cfg_reghelper.hxx"
-#include <vcl/svapp.hxx>
-#include <com/sun/star/uno/XNamingService.hpp>
-#include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
-#include <com/sun/star/sdb/XDocumentDataSource.hpp>
-#include <tools/urlobj.hxx>
-#include <unotools/pathoptions.hxx>
-#include <com/sun/star/frame/XComponentLoader.hpp>
-#include "cfgstrings.hrc"
-#include <unotools/ucbhelper.hxx>
-#include <comphelper/types.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <sfx2/docfilt.hxx>
-#include <comphelper/streamsection.hxx>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XObjectInputStream.hpp>
-#include <comphelper/basicio.hxx>
-#include <comphelper/seqstream.hxx>
-#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
-#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/frame/XLoadable.hpp>
-#include <com/sun/star/document/XTypeDetection.hpp>
-#include <com/sun/star/document/XEventsSupplier.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/form/FormComponentType.hpp>
-#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/form/XFormsSupplier.hpp>
-#include <tools/debug.hxx>
-
-
-extern "C" void SAL_CALL createRegistryInfo_OCfgImport( )
-{
- static ::dbacfg::OMultiInstanceAutoRegistration< ::dbacfg::OCfgImport > aAutoRegistration;
-}
-
-#define DATASOURCES 1
-#define DATASOURCE 2
-#define DATASOURCESETTINGS 3
-#define TABLES 4
-#define QUERIES 5
-#define BOOKMARKS 6
-#define DATASOURCESETTING 7
-#define BOOKMARK 8
-#define QUERY 9
-#define TABLE 10
-#define DATASETTINGS 11
-#define COLUMNS 12
-#define COLUMN 13
-#define NO_PROP 14
-#define LOGINTIMEOUT 15
-
-//--------------------------------------------------------------------------
-using namespace dbacfg;
-// {
- using namespace ::com::sun::star::util;
- using namespace ::com::sun::star::sdb;
- using namespace ::com::sun::star::sdbcx;
- using namespace ::com::sun::star::frame;
- using namespace ::com::sun::star::document;
- using namespace ::com::sun::star::io;
- using namespace ::com::sun::star::form;
- using namespace ::com::sun::star::drawing;
- using namespace ::com::sun::star::container;
- using namespace ::com::sun::star::beans;
- using namespace ::com::sun::star::task;
- using namespace ::com::sun::star::configuration::backend;
- using namespace ::utl;
- using namespace ::comphelper;
-
- void LoadTableWindows(const Reference< XObjectInputStream>& _rxIn,Sequence<PropertyValue>& _rViewProps);
- void LoadTableWindowData(const Reference<XObjectInputStream>& _rxIn,PropertyValue* _pValue);
- void LoadTableFields(const Reference< XObjectInputStream>& _rxIn,Sequence<PropertyValue>& _rViewProps);
- void LoadTableFieldDesc(const Reference< XObjectInputStream>& _rxIn,PropertyValue& _rProperty);
- sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const ::rtl::OUString& _sDocumentLocation);
-// -------------
-// - OCfgImport -
-// -------------
-DBG_NAME(OCfgImport)
-
-OCfgImport::OCfgImport( const Reference< XMultiServiceFactory >& _rxMSF )
- :m_xORB( _rxMSF )
- ,m_bPropertyMayBeVoid(sal_True)
-{
- DBG_CTOR(OCfgImport,NULL);
-
-}
-
-// -----------------------------------------------------------------------------
-
-OCfgImport::~OCfgImport() throw()
-{
-
- DBG_DTOR(OCfgImport,NULL);
-}
-// -----------------------------------------------------------------------------
-IMPLEMENT_SERVICE_INFO1_STATIC( OCfgImport, "com.sun.star.comp.sdb.DataSourceMigration", "com.sun.star.sdb.DataSourceMigration")
-// -----------------------------------------------------------------------------
-// XInitialization
-void SAL_CALL OCfgImport::initialize( const Sequence< Any >& _aArguments ) throw(Exception, RuntimeException)
-{
- const Any* pIter = _aArguments.getConstArray();
- const Any* pEnd = pIter + _aArguments.getLength();
- Sequence<NamedValue> aOldConfigValues;
- NamedValue aValue;
- for(;pIter != pEnd;++pIter)
- {
- *pIter >>= aValue;
- if ( aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OldConfiguration")) && (aValue.Value >>= aOldConfigValues) )
- {
- const NamedValue* configValues = aOldConfigValues.getConstArray();
- const NamedValue* configValuesEnd = configValues + aOldConfigValues.getLength();
- for(;configValues != configValuesEnd;++configValues)
- {
- if ( configValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("org.openoffice.Office.DataAccess")) )
- {
- configValues->Value >>= m_xLayer;
- break;
- }
- }
- break;
- }
- }
-}
-// -----------------------------------------------------------------------------
-
-void LoadTableWindows(const Reference< XObjectInputStream>& _rxIn,Sequence<PropertyValue>& _rViewProps)
-{
- try
- {
- OStreamSection aSection(_rxIn.get());
-
- sal_Int32 nCount = 0;
- _rxIn >> nCount;
- if ( nCount > 0 )
- {
- PropertyValue *pViewIter = _rViewProps.getArray();
- PropertyValue *pEnd = pViewIter + _rViewProps.getLength();
- const static ::rtl::OUString s_sTables(RTL_CONSTASCII_USTRINGPARAM("Tables"));
- for (; pViewIter != pEnd && pViewIter->Name != s_sTables; ++pViewIter)
- ;
-
- if ( pViewIter == pEnd )
- {
- sal_Int32 nLen = _rViewProps.getLength();
- _rViewProps.realloc( nLen + 1 );
- pViewIter = _rViewProps.getArray() + nLen;
- pViewIter->Name = s_sTables;
- }
-
- Sequence<PropertyValue> aTables(nCount);
- PropertyValue *pIter = aTables.getArray();
-
-
- for(sal_Int32 i=0;i<nCount;++i,++pIter)
- {
- pIter->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Table")) + ::rtl::OUString::valueOf(i+1);
- LoadTableWindowData(_rxIn,pIter);
- }
- }
- }
- catch(Exception&)
- {
- }
-}
-// -----------------------------------------------------------------------------
-void LoadTableWindowData(const Reference<XObjectInputStream>& _rxIn,PropertyValue* _pValue)
-{
- ::rtl::OUString sComposedName,aTableName,aWinName;
- sal_Int32 nX,nY,nWidth,nHeight;
- sal_Bool bShowAll;
-
- OStreamSection aSection(_rxIn.get());
- _rxIn >> sComposedName;
- _rxIn >> aTableName;
- _rxIn >> aWinName;
- _rxIn >> nX;
- _rxIn >> nY;
- _rxIn >> nWidth;
- _rxIn >> nHeight;
- _rxIn >> bShowAll;
-
- Sequence<PropertyValue> aWindow(8);
- sal_Int32 nPos = 0;
- aWindow[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComposedName"));
- aWindow[nPos++].Value <<= sComposedName;
- aWindow[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableName"));
- aWindow[nPos++].Value <<= aTableName;
- aWindow[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WindowName"));
- aWindow[nPos++].Value <<= aWinName;
- aWindow[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WindowTop"));
- aWindow[nPos++].Value <<= nY;
- aWindow[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WindowLeft"));
- aWindow[nPos++].Value <<= nX;
- aWindow[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WindowWidth"));
- aWindow[nPos++].Value <<= nWidth;
- aWindow[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WindowHeight"));
- aWindow[nPos++].Value <<= nHeight;
- aWindow[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowAll"));
- aWindow[nPos++].Value <<= bShowAll;
-
- _pValue->Value <<= aWindow;
-}
-// -----------------------------------------------------------------------------
-void LoadTableFields(const Reference< XObjectInputStream>& _rxIn,Sequence<PropertyValue>& _rViewProps)
-{
- LoadTableWindows(_rxIn,_rViewProps);
- OStreamSection aSection(_rxIn.get());
- PropertyValue *pIter = NULL;
- try
- {
- sal_Int32 nSplitPos,nVisibleRows;
- // some data
- _rxIn >> nSplitPos;
- _rxIn >> nVisibleRows;
-
- sal_Int32 nCount = 0;
- _rxIn >> nCount;
-
- sal_Int32 nLen = _rViewProps.getLength();
- _rViewProps.realloc( nLen + 2 + (nCount != 0 ? 1 : 0) );
- pIter = _rViewProps.getArray() + nLen;
-
- if ( nCount != 0 )
- {
- pIter->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Fields"));
-
- Sequence<PropertyValue> aFields(nCount);
- PropertyValue *pFieldsIter = aFields.getArray();
- // the fielddata
- for(sal_Int32 j=0;j<nCount;++j)
- {
- if ( aSection.available() )
- {
- pFieldsIter->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Field")) + ::rtl::OUString::valueOf(j+1);
- LoadTableFieldDesc(_rxIn,*pFieldsIter++);
- }
- }
- pIter->Value <<= aFields;
- ++pIter;
- }
-
- pIter->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SplitterPosition"));
- pIter->Value <<= nSplitPos;
- ++pIter;
- pIter->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleRows"));
- pIter->Value <<= nVisibleRows;
- }
- catch(Exception&)
- {
- }
-}
-// -----------------------------------------------------------------------------
-void LoadTableFieldDesc(const Reference< XObjectInputStream>& _rxIn,PropertyValue& _rProperty)
-{
- ::rtl::OUString aTableName;
- ::rtl::OUString aAliasName; // table range
- ::rtl::OUString aFieldName; // column
- ::rtl::OUString aFieldAlias; // column alias
- ::rtl::OUString aDatabaseName; // qualifier or catalog
- ::rtl::OUString aFunctionName; // contains the function name if eFunctionType != FKT_NONE
-
- sal_Int32 eDataType;
- sal_Int32 eFunctionType;
- sal_Int32 eFieldType;
- sal_Int32 eOrderDir;
- sal_Int32 nColWidth;
- sal_Bool bGroupBy;
- sal_Bool bVisible;
-
- OStreamSection aSection(_rxIn.get());
- _rxIn >> aTableName;
- _rxIn >> aAliasName;
- _rxIn >> aFieldName;
- _rxIn >> aFieldAlias;
- _rxIn >> aDatabaseName;
- _rxIn >> aFunctionName;
- _rxIn >> eDataType;
- _rxIn >> eFunctionType;
- _rxIn >> eFieldType;
- _rxIn >> eOrderDir;
- _rxIn >> nColWidth;
- _rxIn >> bGroupBy;
- _rxIn >> bVisible;
-
- Sequence<PropertyValue> aFieldDesc(13);
- sal_Int32 nPos = 0;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AliasName"));
- aFieldDesc[nPos++].Value <<= aAliasName;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableName"));
- aFieldDesc[nPos++].Value <<= aTableName;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldName"));
- aFieldDesc[nPos++].Value <<= aFieldName;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldAlias"));
- aFieldDesc[nPos++].Value <<= aFieldAlias;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseName"));
- aFieldDesc[nPos++].Value <<= aDatabaseName;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FunctionName"));
- aFieldDesc[nPos++].Value <<= aFunctionName;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataType"));
- aFieldDesc[nPos++].Value <<= eDataType;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FunctionType"));
- aFieldDesc[nPos++].Value <<= (sal_Int32)eFunctionType;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldType"));
- aFieldDesc[nPos++].Value <<= (sal_Int32)eFieldType;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OrderDir"));
- aFieldDesc[nPos++].Value <<= (sal_Int32)eOrderDir;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColWidth"));
- aFieldDesc[nPos++].Value <<= nColWidth;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GroupBy"));
- aFieldDesc[nPos++].Value <<= bGroupBy;
- aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Visible"));
- aFieldDesc[nPos++].Value <<= bVisible;
-
- _rProperty.Value <<= aFieldDesc;
-}
-// -----------------------------------------------------------------------------
-void closeDocument(const Reference< XModel >& _xDocument)
-{
- Reference< XCloseable > xCloseable( _xDocument, UNO_QUERY );
- if ( xCloseable.is() )
- {
- try
- {
- xCloseable->close( sal_True );
- }
- catch( Exception& )
- {
- }
- }
-}
-// -----------------------------------------------------------------------------
-sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const ::rtl::OUString& _sDocumentLocation)
-{
- sal_Bool bReport = sal_False;
- try
- {
- Reference< XModel > xDocument(_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"))),UNO_QUERY);
- if ( xDocument.is() )
- {
- Reference< XLoadable > xLoadable( xDocument, UNO_QUERY );
- if ( xLoadable.is() )
- {
- Sequence< PropertyValue > aMedDescr(4);
- sal_Int32 nPos = 0;
- aMedDescr[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
- aMedDescr[nPos++].Value <<= sal_False;
- aMedDescr[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
- aMedDescr[nPos++].Value <<= sal_False;
- aMedDescr[nPos].Name = PROPERTY_URL;
- aMedDescr[nPos++].Value <<= _sDocumentLocation;
- aMedDescr[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
- aMedDescr[nPos++].Value <<= sal_True;
- Reference< XTypeDetection > xTypeDetection(_xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),UNO_QUERY );
-
- if ( !xTypeDetection.is() )
- throw RuntimeException(); // TODO
-
- // get TypeName
- ::rtl::OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aMedDescr, sal_True );
- const PropertyValue* pIter = aMedDescr.getConstArray();
- const PropertyValue* pEnd = pIter + aMedDescr.getLength();
- for( ; pIter != pEnd && !pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ); ++pIter)
- ;
- if ( aTypeName.getLength() && pIter == pEnd )
- {
- Reference<XNameAccess> xNameAccess( xTypeDetection, UNO_QUERY );
- if ( xNameAccess.is() && xNameAccess->hasByName( aTypeName ) )
- {
- Sequence<PropertyValue> aTypes;
- xNameAccess->getByName(aTypeName) >>= aTypes;
- const PropertyValue* types = aTypes.getConstArray();
- const PropertyValue* typesEnd = types + aTypes.getLength();
- for( ; types != typesEnd && !types->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferredFilter" ) ) ; ++types)
- ;
- if ( types != typesEnd )
- {
- sal_Int32 nLen = aMedDescr.getLength();
- aMedDescr.realloc(nLen+1);
- aMedDescr[nLen].Value = types->Value;
- aMedDescr[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
- }
- }
- }
- try
- {
- xLoadable->load(aMedDescr);
-
- Reference< XEventsSupplier> xEventsSup(xDocument,UNO_QUERY);
- Reference< XNameReplace> xEvents = xEventsSup.is() ? xEventsSup->getEvents() : Reference< XNameReplace>();
- static const ::rtl::OUString s_sOnNew = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnNew"));
- if ( xEvents.is() && xEvents->hasByName(s_sOnNew) )
- {
- Sequence<PropertyValue> aEventDesc;
- if ( (xEvents->getByName(s_sOnNew) >>= aEventDesc ) && aEventDesc.getLength() )
- {
- ::rtl::OUString sScript;
- const PropertyValue* events = aEventDesc.getConstArray();
- const PropertyValue* eventsEnd = events + aEventDesc.getLength();
- for( ; events != eventsEnd && !events->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Script" ) ) ; ++events)
- ;
- if ( events != eventsEnd && (events->Value >>= sScript) )
- bReport = sScript.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("service:com.sun.star.wizards.report.CallReportWizard?fill"));
- }
- }
- if ( !bReport )
- {
- sal_Bool bForm = sal_False;
- Reference< XDrawPageSupplier> xDrawPageSup(xDocument,UNO_QUERY);
- Reference< XFormsSupplier> xFormsSup(xDrawPageSup.is() ? xDrawPageSup->getDrawPage() : Reference< XDrawPage>(),UNO_QUERY);
- Reference< XNameContainer> xForms(xFormsSup.is() ? xFormsSup->getForms() : Reference< XNameContainer>(),UNO_QUERY);
- Sequence< ::rtl::OUString> aSeq = xForms.is() ? xForms->getElementNames() : Sequence< ::rtl::OUString>();
- const ::rtl::OUString* elementNames = aSeq.getConstArray();
- const ::rtl::OUString* elementNamesEnd = elementNames + aSeq.getLength();
- for(;elementNames != elementNamesEnd && !bForm;++elementNames)
- {
- Reference< XNameContainer> xControls(xForms->getByName(*elementNames),UNO_QUERY);
- Sequence< ::rtl::OUString> aControlSeq = xControls.is() ? xControls->getElementNames() : Sequence< ::rtl::OUString>();
- const ::rtl::OUString* pControlIter = aControlSeq.getConstArray();
- const ::rtl::OUString* pControlEnd = pControlIter + aControlSeq.getLength();
- for(;pControlIter != pControlEnd && !bForm;++pControlIter)
- {
- Reference<XPropertySet> xProp(xControls->getByName(*pControlIter),UNO_QUERY);
- sal_Int16 nClassId = 0;
- const static ::rtl::OUString s_sClassId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId"));
- if ( xProp.is()
- && xProp->getPropertySetInfo().is()
- && xProp->getPropertySetInfo()->hasPropertyByName(s_sClassId)
- && (xProp->getPropertyValue(s_sClassId) >>= nClassId) )
- {
- bForm = nClassId != FormComponentType::HIDDENCONTROL;
- }
- }
- }
- bReport = !bForm;
- }
- }
- catch( Exception& )
- {
- closeDocument(xDocument);
- }
- }
- closeDocument(xDocument);
- }
- }
- catch(Exception)
- {
- OSL_ENSURE(0,"isDocumentReport: catched exception!");
- }
- return bReport;
-}
-// -----------------------------------------------------------------------------
-void OCfgImport::createDataSource(const ::rtl::OUString& _sName)
-{
- SvtPathOptions aPathOptions;
- const String& rsWorkPath = aPathOptions.GetWorkPath();
-
- ::rtl::OUString sExtension;
- static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
- const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
- OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!");
- if ( pFilter )
- {
- String aRet = pFilter->GetDefaultExtension();
- while( aRet.SearchAndReplaceAscii( "*.", String() ) != STRING_NOTFOUND ) ;
- sExtension = aRet;
- }
- // then look for which of the settings are stored in the configuration
- ::rtl::OUString sFileName;
- try
- {
- m_xModel.set(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"))),UNO_QUERY);
-
- if ( !m_xModel.is() )
- return;
-
- Reference<XOfficeDatabaseDocument> xOfficeDoc(m_xModel,UNO_QUERY);
- if ( xOfficeDoc.is() )
- m_xCurrentDS.set(xOfficeDoc->getDataSource(),UNO_QUERY);
-
-
- INetURLObject aURL(rsWorkPath,INetURLObject::WAS_ENCODED);
- aURL.insertName(_sName,false,INetURLObject::LAST_SEGMENT,true,INetURLObject::ENCODE_ALL);
- aURL.setExtension(sExtension);
-
- sFileName = aURL.GetMainURL(INetURLObject::NO_DECODE);
-
- sal_Int32 i = 0;
- // create unique name
- while ( UCBContentHelper::IsDocument(sFileName) )
- {
- sFileName = _sName + ::rtl::OUString::valueOf(++i);
- aURL.setName(sFileName,INetURLObject::LAST_SEGMENT,true,INetURLObject::ENCODE_ALL);
- aURL.setExtension(sExtension);
- sFileName = aURL.GetMainURL(INetURLObject::NO_DECODE);
- }
-
- Sequence< PropertyValue > aArgs(1);
- aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ) );
- aArgs[0].Value <<= sFileName;
-
- Reference< XLoadable > xLoad( m_xModel, UNO_QUERY_THROW );
- xLoad->load( aArgs );
- m_xModel->attachResource( sFileName, Sequence< PropertyValue >() );
- }
- catch(Exception&)
- {
- OSL_ENSURE(0,"Exception: convert");
- UCBContentHelper::Kill(sFileName);
- }
-}
-// -----------------------------------------------------------------------------
-void OCfgImport::createObject(sal_Bool _bQuery ,const ::rtl::OUString& _sName)
-{
- if ( !m_xCurrentObject.is() )
- {
- Sequence< Any > aArguments(1);
- PropertyValue aValue;
- // set as folder
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
- aValue.Value <<= _sName;
- aArguments[0] <<= aValue;
- m_xCurrentObject.set(m_xORB->createInstanceWithArguments(_bQuery ? SERVICE_SDB_COMMAND_DEFINITION : SERVICE_SDB_TABLEDEFINITION ,aArguments ),UNO_QUERY);
- }
-}
-// -----------------------------------------------------------------------------
-void OCfgImport::setProperties(sal_Int16 _eType)
-{
- if ( m_aValues[_eType].getLength() )
- {
- OSL_ENSURE(m_aProperties[_eType].getLength() == m_aValues[_eType].getLength(),"Count is not equal!");
- try
- {
- Reference< XMultiPropertySet > xFormMultiSet;
- if ( _eType == COLUMN )
- xFormMultiSet.set(m_xCurrentColumn,UNO_QUERY);
- else if ( _eType == TABLE || _eType == QUERY )
- xFormMultiSet.set(m_xCurrentObject,UNO_QUERY);
- else if ( _eType == DATASOURCE )
- xFormMultiSet.set(m_xCurrentDS,UNO_QUERY);
-
- if ( xFormMultiSet.is() )
- xFormMultiSet->setPropertyValues(m_aProperties[_eType], m_aValues[_eType]);
- }
- catch(const Exception& e)
- {
- throw WrappedTargetException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property could not be set.")),*this,makeAny(e));
- }
- m_aValues[_eType] = Sequence< Any>();
- m_aProperties[_eType] = Sequence< ::rtl::OUString>();
- }
-}
-// -----------------------------------------------------------------------------
-Any SAL_CALL OCfgImport::execute( const Sequence< NamedValue >& /*Arguments*/ ) throw (IllegalArgumentException, Exception, RuntimeException)
-{
- m_xLayer->readData(this);
- return Any();
-}
-// -----------------------------------------------------------------------------
-// XLayerHandler
-void SAL_CALL OCfgImport::startLayer()
- throw(WrappedTargetException)
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::endLayer()
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::overrideNode(
- const ::rtl::OUString& aName,
- sal_Int16 aAttributes,
- sal_Bool /*bClear*/)
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
- addOrReplaceNode(aName,aAttributes);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::addOrReplaceNode(
- const ::rtl::OUString& aName,
- sal_Int16 /*aAttributes*/)
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
- if ( !m_aStack.empty() )
- {
- switch(m_aStack.top().second)
- {
- case DATASOURCES:
- m_sCurrentDataSourceName = aName;
- if ( m_sCurrentDataSourceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bibliography")) )
- {
- Reference< XNameAccess > xDatabaseContext(m_xORB->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY);
- if ( xDatabaseContext.is() && xDatabaseContext->hasByName(m_sCurrentDataSourceName) )
- {
- m_xCurrentDS.set(xDatabaseContext->getByName(m_sCurrentDataSourceName),UNO_QUERY);
- Reference<XDocumentDataSource> xDocumentDataSource(m_xCurrentDS,UNO_QUERY);
- if ( xDocumentDataSource.is() )
- m_xModel.set(xDocumentDataSource->getDatabaseDocument(),UNO_QUERY);
- }
- }
- if ( !m_xCurrentDS.is() )
- createDataSource(m_sCurrentDataSourceName);
-
- m_aStack.push(TElementStack::value_type(aName,DATASOURCE));
- break;
- case DATASOURCESETTINGS:
- {
- PropertyValue aValue;
- aValue.Name = aName;
- m_aDataSourceSettings.push_back(aValue);
- m_aStack.push(TElementStack::value_type(aName,DATASOURCESETTING));
- }
- break;
- case TABLES:
- m_aStack.push(TElementStack::value_type(aName,TABLE));
- createObject(sal_False,aName);
- break;
- case QUERIES:
- m_aStack.push(TElementStack::value_type(aName,QUERY));
- createObject(sal_True,aName);
- break;
- case COLUMNS:
- if ( !m_xCurrentColumn.is() )
- {
- Reference<XColumnsSupplier> xSupplier(m_xCurrentObject,UNO_QUERY);
- if ( xSupplier.is() )
- {
- Reference<XDataDescriptorFactory> xFact(xSupplier->getColumns(),UNO_QUERY);
-
- m_xCurrentColumn = ( xFact.is() ? xFact->createDataDescriptor() : Reference<XPropertySet>());
- if ( m_xCurrentColumn.is() )
- m_xCurrentColumn->setPropertyValue(PROPERTY_NAME,makeAny(aName));
- }
- }
- m_aStack.push(TElementStack::value_type(aName,COLUMN));
- break;
- case BOOKMARKS:
- m_aStack.push(TElementStack::value_type(aName,BOOKMARK));
- break;
- }
- }
- if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataSources")) )
- m_aStack.push(TElementStack::value_type(aName,DATASOURCES));
- else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataSourceSettings")) )
- m_aStack.push(TElementStack::value_type(aName,DATASOURCESETTINGS));
- else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Tables")) )
- m_aStack.push(TElementStack::value_type(aName,TABLES));
- else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Queries")) )
- m_aStack.push(TElementStack::value_type(aName,QUERIES));
- else if ( aName == CONFIGKEY_DBLINK_BOOKMARKS )
- m_aStack.push(TElementStack::value_type(aName,BOOKMARKS));
- else if ( aName == CONFIGKEY_SETTINGS )
- m_aStack.push(TElementStack::value_type(aName,DATASETTINGS));
- else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Font")) )
- m_aStack.push(TElementStack::value_type(aName,DATASETTINGS));
- else if ( aName == CONFIGKEY_QRYDESCR_COLUMNS )
- m_aStack.push(TElementStack::value_type(aName,COLUMNS));
- else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Font")) )
- m_aStack.push(TElementStack::value_type(aName,DATASETTINGS));
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::addOrReplaceNodeFromTemplate(
- const ::rtl::OUString& /*aName*/,
- const TemplateIdentifier& /*aTemplate*/,
- sal_Int16 /*aAttributes*/ )
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::endNode()
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
- if ( !m_aStack.empty() )
- {
- sal_Int16 nElementType = m_aStack.top().second;
- ::rtl::OUString sName = m_aStack.top().first;
- m_aStack.pop();
-
- switch(nElementType)
- {
- case DATASOURCE:
- {
- setProperties(nElementType);
- Reference<XStorable> xStr(m_xModel,UNO_QUERY);
- if ( xStr.is() )
- {
- xStr->store();
- xStr = NULL;
- }
- // register the new datbase document
-
- if ( !m_sCurrentDataSourceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bibliography")) )
- {
- // create unique name
- Reference< XNameAccess > xDatabaseContext(m_xORB->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY);
- if ( xDatabaseContext.is() )
- {
- sal_Int32 i = 0;
- ::rtl::OUString sDataSourceName = m_sCurrentDataSourceName;
- while ( xDatabaseContext->hasByName( sDataSourceName ) )
- {
- sDataSourceName = m_sCurrentDataSourceName + ::rtl::OUString::valueOf(++i);
- }
- Reference< XNamingService>(xDatabaseContext,UNO_QUERY)->registerObject(sDataSourceName,m_xCurrentDS);
- }
- }
- ::comphelper::disposeComponent(m_xModel);
- m_xCurrentDS = NULL;
- }
- break;
- case DATASOURCESETTINGS:
- OSL_ENSURE(m_xCurrentDS.is(),"Data Source is NULL!");
- {
- PropertyValue* pSettings = m_aDataSourceSettings.empty() ? NULL : &m_aDataSourceSettings[0];
- m_xCurrentDS->setPropertyValue(PROPERTY_INFO,makeAny(Sequence< PropertyValue >(pSettings, m_aDataSourceSettings.size())));
- }
- break;
- case TABLE:
- {
- setProperties(nElementType);
- Reference<XTablesSupplier> xSupplier(m_xCurrentDS,UNO_QUERY);
- Reference<XNameContainer> xTables(xSupplier->getTables(),UNO_QUERY);
- ::rtl::OUString sTableName;
- m_xCurrentObject->getPropertyValue(PROPERTY_NAME) >>= sTableName;
- if ( !xTables->hasByName( sTableName ) )
- xTables->insertByName( sTableName, makeAny( m_xCurrentObject ) );
- m_xCurrentObject = NULL;
- }
- break;
- case QUERY:
- {
- setProperties(nElementType);
- Reference<XQueryDefinitionsSupplier> xQueriesSupplier(m_xCurrentDS,UNO_QUERY);
- Reference<XNameContainer> xQueries(xQueriesSupplier->getQueryDefinitions(),UNO_QUERY);
- xQueries->insertByName(sName,makeAny(m_xCurrentObject));
- m_xCurrentObject = NULL;
- }
- break;
- case BOOKMARK:
- try
- {
- if ( !UCBContentHelper::IsDocument(m_sDocumentLocation) )
- break;
-
- sal_Bool bForm = sal_True;
- bForm = !isDocumentReport(m_xORB,m_sDocumentLocation);
- Reference<XNameAccess> xNames;
- if ( bForm )
- {
- Reference<XFormDocumentsSupplier> xSup(m_xModel,UNO_QUERY);
- if ( xSup.is() )
- xNames = xSup->getFormDocuments();
- }
- else
- {
- Reference<XReportDocumentsSupplier> xSup(m_xModel,UNO_QUERY);
- if ( xSup.is() )
- xNames = xSup->getReportDocuments();
- }
-
- if ( xNames.is() && m_sBookmarkName.getLength() )
- {
- ::rtl::OUString sServiceName(SERVICE_SDB_DOCUMENTDEFINITION);
- Sequence< Any > aArguments(3);
- PropertyValue aValue;
- // set as folder
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
- aValue.Value <<= m_sBookmarkName;
- aArguments[0] <<= aValue;
- //parent
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent"));
- aValue.Value <<= xNames;
- aArguments[1] <<= aValue;
-
- aValue.Name = PROPERTY_URL;
- aValue.Value <<= m_sDocumentLocation;
- aArguments[2] <<= aValue;
-
- Reference<XMultiServiceFactory> xORB(xNames,UNO_QUERY);
- if ( xORB.is() )
- {
- Reference<XInterface> xComponent = xORB->createInstanceWithArguments(SERVICE_SDB_DOCUMENTDEFINITION,aArguments);
- Reference<XNameContainer> xNameContainer(xNames,UNO_QUERY);
- if ( xNameContainer.is() )
- xNameContainer->insertByName(m_sBookmarkName,makeAny(xComponent));
- }
- }
- }
- catch(Exception&)
- {
- OSL_ENSURE(0,"convertLinks: Exception catched!");
- }
- m_sBookmarkName = ::rtl::OUString();
- m_sDocumentLocation = ::rtl::OUString();
- break;
- case COLUMN:
- if ( m_xCurrentColumn.is() )
- {
- setProperties(nElementType);
- Reference<XColumnsSupplier> xSupplier(m_xCurrentObject,UNO_QUERY);
- Reference<XAppend> xAppend(xSupplier->getColumns(),UNO_QUERY);
- if ( xAppend.is() )
- xAppend->appendByDescriptor(m_xCurrentColumn);
- m_xCurrentColumn = NULL;
- }
- break;
- }
- }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::dropNode(
- const ::rtl::OUString& /*aName*/ )
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::overrideProperty(
- const ::rtl::OUString& aName,
- sal_Int16 /*aAttributes*/,
- const Type& /*aType*/,
- sal_Bool /*bClear*/ )
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
- m_bPropertyMayBeVoid = sal_True;
- if ( !m_aStack.empty() )
- {
- switch(m_aStack.top().second)
- {
- case DATASOURCE:
- {
- m_bPropertyMayBeVoid = sal_False;
- ::rtl::OUString sProp;
- if ( aName == CONFIGKEY_DBLINK_CONNECTURL )
- sProp = PROPERTY_URL;
- else if ( aName == CONFIGKEY_DBLINK_USER )
- sProp = PROPERTY_USER;
- else if ( aName == CONFIGKEY_DBLINK_TABLEFILTER )
- sProp = PROPERTY_TABLEFILTER;
- else if ( aName == CONFIGKEY_DBLINK_TABLETYEFILTER )
- sProp = PROPERTY_TABLETYPEFILTER;
- else if ( aName == CONFIGKEY_DBLINK_PASSWORDREQUIRED )
- sProp = PROPERTY_ISPASSWORDREQUIRED;
- else if ( aName == CONFIGKEY_DBLINK_SUPPRESSVERSIONCL )
- sProp = PROPERTY_SUPPRESSVERSIONCL;
- else if ( aName == CONFIGKEY_LAYOUTINFORMATION )
- sProp = PROPERTY_LAYOUTINFORMATION;
-
- if ( sProp.getLength() )
- {
- if ( m_aProperties.find(m_aStack.top().second) == m_aProperties.end() )
- m_aProperties.insert(::std::map< sal_Int16 ,Sequence< ::rtl::OUString> >::value_type(m_aStack.top().second,Sequence< ::rtl::OUString>()));
- sal_Int32 nPos = m_aProperties[m_aStack.top().second].getLength();
- m_aProperties[m_aStack.top().second].realloc(nPos+1);
- m_aProperties[m_aStack.top().second][nPos] = sProp;
- }
- else if ( aName == CONFIGKEY_DBLINK_LOGINTIMEOUT )
- m_aStack.push(TElementStack::value_type(aName,LOGINTIMEOUT));
- else
- m_aStack.push(TElementStack::value_type(aName,NO_PROP));
- }
- break;
- case QUERY:
- {
- m_bPropertyMayBeVoid = sal_False;
- ::rtl::OUString sProp;
- if ( aName == CONFIGKEY_QRYDESCR_COMMAND )
- sProp = PROPERTY_COMMAND;
- else if ( aName == CONFIGKEY_QRYDESCR_ESCAPE_PROCESSING )
- sProp = PROPERTY_ESCAPE_PROCESSING;
- else if ( aName == CONFIGKEY_QRYDESCR_UPDATE_TABLENAME )
- sProp = PROPERTY_UPDATE_TABLENAME;
- else if ( aName == CONFIGKEY_QRYDESCR_UPDATE_SCHEMANAME )
- sProp = PROPERTY_UPDATE_SCHEMANAME;
- else if ( aName == CONFIGKEY_QRYDESCR_UPDATE_CATALOGNAME )
- sProp = PROPERTY_UPDATE_CATALOGNAME;
- else if ( aName == CONFIGKEY_LAYOUTINFORMATION )
- sProp = PROPERTY_LAYOUTINFORMATION;
-
- if ( sProp.getLength() )
- {
- if ( m_aProperties.find(m_aStack.top().second) == m_aProperties.end() )
- m_aProperties.insert(::std::map< sal_Int16 ,Sequence< ::rtl::OUString> >::value_type(m_aStack.top().second,Sequence< ::rtl::OUString>()));
- sal_Int32 nPos = m_aProperties[m_aStack.top().second].getLength();
- m_aProperties[m_aStack.top().second].realloc(nPos+1);
- m_aProperties[m_aStack.top().second][nPos] = sProp;
- }
- else
- m_aStack.push(TElementStack::value_type(aName,NO_PROP));
- }
- break;
- case DATASETTINGS:
- {
- m_bPropertyMayBeVoid = sal_False;
- ::rtl::OUString sProp;
- if ( aName == CONFIGKEY_DEFSET_FILTER ) sProp = PROPERTY_FILTER;
- else if ( aName == CONFIGKEY_DEFSET_FONT_NAME ) sProp = PROPERTY_FONTNAME;
- else if ( aName == CONFIGKEY_DEFSET_ORDER ) sProp = PROPERTY_ORDER;
- else if ( aName == CONFIGKEY_DEFSET_APPLYFILTER ) sProp = PROPERTY_APPLYFILTER;
- else if ( aName == CONFIGKEY_DEFSET_ROW_HEIGHT ) { m_bPropertyMayBeVoid = true; sProp = PROPERTY_ROW_HEIGHT; }
- else if ( aName == CONFIGKEY_DEFSET_TEXTCOLOR ) { m_bPropertyMayBeVoid = true; sProp = PROPERTY_TEXTCOLOR; }
- else if ( aName == CONFIGKEY_DEFSET_FONT_UNDERLINECOLOR ) { m_bPropertyMayBeVoid = true; sProp = PROPERTY_TEXTLINECOLOR; }
- else if ( aName == CONFIGKEY_DEFSET_FONT_CHARACTEREMPHASIS ) sProp = PROPERTY_TEXTEMPHASIS;
- else if ( aName == CONFIGKEY_DEFSET_FONT_CHARACTERRELIEF ) sProp = PROPERTY_TEXTRELIEF;
- // font
- else if ( aName == CONFIGKEY_DEFSET_FONT_HEIGHT ) sProp = PROPERTY_FONTHEIGHT;
- else if ( aName == CONFIGKEY_DEFSET_FONT_WIDTH ) sProp = PROPERTY_FONTWIDTH;
- else if ( aName == CONFIGKEY_DEFSET_FONT_STYLENAME ) sProp = PROPERTY_FONTSTYLENAME;
- else if ( aName == CONFIGKEY_DEFSET_FONT_FAMILY ) sProp = PROPERTY_FONTFAMILY;
- else if ( aName == CONFIGKEY_DEFSET_FONT_CHARSET ) sProp = PROPERTY_FONTCHARSET;
- else if ( aName == CONFIGKEY_DEFSET_FONT_PITCH ) sProp = PROPERTY_FONTPITCH;
- else if ( aName == CONFIGKEY_DEFSET_FONT_CHARACTERWIDTH ) sProp = PROPERTY_FONTCHARWIDTH;
- else if ( aName == CONFIGKEY_DEFSET_FONT_WEIGHT ) sProp = PROPERTY_FONTWEIGHT;
- else if ( aName == CONFIGKEY_DEFSET_FONT_UNDERLINE ) sProp = PROPERTY_FONTUNDERLINE;
- else if ( aName == CONFIGKEY_DEFSET_FONT_STRIKEOUT ) sProp = PROPERTY_FONTSTRIKEOUT;
- else if ( aName == CONFIGKEY_DEFSET_FONT_ORIENTATION ) sProp = PROPERTY_FONTORIENTATION;
- else if ( aName == CONFIGKEY_DEFSET_FONT_KERNING ) sProp = PROPERTY_FONTKERNING;
- else if ( aName == CONFIGKEY_DEFSET_FONT_WORDLINEMODE ) sProp = PROPERTY_FONTWORDLINEMODE;
- else if ( aName == CONFIGKEY_DEFSET_FONT_TYPE ) sProp = PROPERTY_FONTTYPE;
- else if ( aName == CONFIGKEY_DEFSET_FONT_SLANT ) sProp = PROPERTY_FONTSLANT;
-
- if ( sProp.getLength() )
- {
- if ( m_aProperties.find(m_aStack.top().second) == m_aProperties.end() )
- m_aProperties.insert(::std::map< sal_Int16 ,Sequence< ::rtl::OUString> >::value_type(m_aStack.top().second,Sequence< ::rtl::OUString>()));
- sal_Int32 nPos = m_aProperties[m_aStack.top().second].getLength();
- m_aProperties[m_aStack.top().second].realloc(nPos+1);
- m_aProperties[m_aStack.top().second][nPos] = sProp;
- }
- else
- m_aStack.push(TElementStack::value_type(aName,NO_PROP));
- }
- break;
- case COLUMN:
- {
- ::rtl::OUString sProp;
- m_bPropertyMayBeVoid = sal_False;
- if ( aName == CONFIGKEY_COLUMN_ALIGNMENT ) {
- m_bPropertyMayBeVoid = true;
- sProp = PROPERTY_ALIGN;
- } else if ( aName == CONFIGKEY_COLUMN_WIDTH ) {
- m_bPropertyMayBeVoid = true;
- sProp = PROPERTY_WIDTH;
- } else if ( aName == CONFIGKEY_COLUMN_RELPOSITION ) {
- m_bPropertyMayBeVoid = true;
- sProp = PROPERTY_RELATIVEPOSITION;
- } else if ( aName == CONFIGKEY_COLUMN_HIDDEN ) {
- sProp = PROPERTY_HIDDEN;
- } else if ( aName == CONFIGKEY_COLUMN_HELPTEXT ) {
- m_bPropertyMayBeVoid = true;
- sProp = PROPERTY_HELPTEXT;
- } else if ( aName == CONFIGKEY_COLUMN_CONTROLDEFAULT ) {
- m_bPropertyMayBeVoid = true;
- sProp = PROPERTY_CONTROLDEFAULT;
- } else if ( aName == CONFIGKEY_COLUMN_NUMBERFORMAT ) {
- m_bPropertyMayBeVoid = true;
- sProp = PROPERTY_NUMBERFORMAT;
- }
-
-
- if ( sProp.getLength() )
- {
- if ( m_aProperties.find(m_aStack.top().second) == m_aProperties.end() )
- m_aProperties.insert(::std::map< sal_Int16 ,Sequence< ::rtl::OUString> >::value_type(m_aStack.top().second,Sequence< ::rtl::OUString>()));
- sal_Int32 nPos = m_aProperties[m_aStack.top().second].getLength();
- m_aProperties[m_aStack.top().second].realloc(nPos+1);
- m_aProperties[m_aStack.top().second][nPos] = sProp;
- }
- else
- m_aStack.push(TElementStack::value_type(aName,NO_PROP));
- }
- break;
- case BOOKMARK:
- break;
- }
- }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::setPropertyValue(
- const Any& aValue )
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
- if ( !m_aStack.empty() )
- {
- switch(m_aStack.top().second)
- {
- case LOGINTIMEOUT:
- {
- Reference< ::com::sun::star::sdbc::XDataSource> xDataSource(m_xCurrentDS,UNO_QUERY);
- sal_Int32 nTimeOut = 0;
- aValue >>= nTimeOut;
- if ( xDataSource.is() && nTimeOut >= 0 )
- xDataSource->setLoginTimeout(nTimeOut);
- m_aStack.pop();
- }
- break;
- case DATASOURCESETTING:
- OSL_ENSURE(!m_aDataSourceSettings.empty(),"Settings are emtpy!");
- if ( aValue.hasValue() )
- m_aDataSourceSettings.rbegin()->Value = aValue;
- else
- m_aDataSourceSettings.pop_back();
- break;
- case BOOKMARK:
- aValue >>= m_sDocumentLocation;
- break;
- case NO_PROP:
- m_aStack.pop();
- break;
- default:
- OSL_ENSURE(m_aProperties[m_aStack.top().second].getLength(),"Properties are zero!");
- if ( m_aProperties[m_aStack.top().second].getLength() )
- {
- if ( m_aProperties[m_aStack.top().second][m_aProperties[m_aStack.top().second].getLength()-1] != PROPERTY_LAYOUTINFORMATION )
- {
- if ( !m_bPropertyMayBeVoid && !aValue.hasValue() )
- {
- m_aProperties[m_aStack.top().second].realloc(m_aProperties[m_aStack.top().second].getLength()-1);
- }
- else
- {
- if ( m_aValues.find(m_aStack.top().second) == m_aValues.end() )
- m_aValues.insert(::std::map< sal_Int16 ,Sequence< Any> >::value_type(m_aStack.top().second,Sequence< Any>()));
- sal_Int32 nPos = m_aValues[m_aStack.top().second].getLength();
- m_aValues[m_aStack.top().second].realloc(nPos+1);
- m_aValues[m_aStack.top().second][nPos] = aValue;
- }
- }
- else
- {
- try
- {
- Sequence< sal_Int8 > aInputSequence;
- aValue >>= aInputSequence;
- if ( m_aValues.find(m_aStack.top().second) == m_aValues.end() )
- m_aValues.insert(::std::map< sal_Int16 ,Sequence< Any> >::value_type(m_aStack.top().second,Sequence< Any>()));
- sal_Int32 nPos = m_aValues[m_aStack.top().second].getLength();
- m_aValues[m_aStack.top().second].realloc(nPos+1);
- Sequence< PropertyValue > aLayout;
- if ( aInputSequence.getLength() )
- {
- Reference< XInputStream> xInStreamHelper = new SequenceInputStream(aInputSequence);; // used for wrapping sequence to xinput
- Reference< XObjectInputStream> xInStream = Reference< XObjectInputStream >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectInputStream"))),UNO_QUERY);
- Reference< XInputStream> xMarkInStream = Reference< XInputStream >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream"))),UNO_QUERY);
- Reference< XActiveDataSink >(xMarkInStream,UNO_QUERY)->setInputStream(xInStreamHelper);
- Reference< XActiveDataSink > xInDataSource(xInStream, UNO_QUERY);
- OSL_ENSURE(xInDataSource.is(),"Couldn't create com.sun.star.io.ObjectInputStream!");
- xInDataSource->setInputStream(xMarkInStream);
-
- if ( DATASOURCE == m_aStack.top().second )
- LoadTableWindows(xInStream,aLayout);
- else if ( QUERY == m_aStack.top().second )
- LoadTableFields(xInStream,aLayout);
- }
- m_aValues[m_aStack.top().second][nPos] <<= aLayout;
- }
- catch(const Exception& e)
- {
- throw WrappedTargetException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property could not be set.")),*this,makeAny(e));
- }
- }
- }
- break;
- }
- }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::setPropertyValueForLocale(
- const Any& /*aValue*/,
- const ::rtl::OUString& /*aLocale*/ )
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::endProperty()
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::addProperty(
- const rtl::OUString& /*aName*/,
- sal_Int16 /*aAttributes*/,
- const Type& /*aType*/ )
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL OCfgImport::addPropertyWithValue(
- const rtl::OUString& /*aName*/,
- sal_Int16 /*aAttributes*/,
- const Any& /*aValue*/ )
- throw(
- MalformedDataException,
- WrappedTargetException )
-{
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// }// dbacfg
-// -----------------------------------------------------------------------------
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/migration/cfgimport.hxx b/dbaccess/source/filter/migration/cfgimport.hxx
deleted file mode 100644
index fcccadae42b0..000000000000
--- a/dbaccess/source/filter/migration/cfgimport.hxx
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef CFG_CFGIMPORT_HXX
-#define CFG_CFGIMPORT_HXX
-
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/task/XJob.hpp>
-#include <osl/diagnose.h>
-#include "apitools.hxx"
-#include <comphelper/stl_types.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-
-#include <memory>
-#include <stack>
-
-namespace dbacfg
-{
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-
-typedef ::cppu::WeakImplHelper4 < ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::lang::XInitialization
- , ::com::sun::star::task::XJob
- , ::com::sun::star::configuration::backend::XLayerHandler
- > OCfgImport_COMPBASE;
-// -------------
-// - OCfgImport -
-// -------------
-class OCfgImport : public OCfgImport_COMPBASE
-{
-private:
- typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType;
- typedef ::std::stack< TElementType > TElementStack;
- typedef ::std::vector< PropertyValue > TDataSourceSettings;
-
- Reference< XMultiServiceFactory > m_xORB;
- Reference< XMultiServiceFactory > m_xOldORB;
- Reference< ::com::sun::star::configuration::backend::XLayer> m_xLayer;
- Reference<XPropertySet> m_xCurrentDS;
- Reference<XModel> m_xModel;
- Reference<XPropertySet> m_xCurrentObject; /// can either be a query or a table
- Reference<XPropertySet> m_xCurrentColumn;
- ::std::map< sal_Int16 ,Sequence< ::rtl::OUString> > m_aProperties;
- ::std::map< sal_Int16 ,Sequence< Any> > m_aValues;
- ::rtl::OUString m_sCurrentDataSourceName;
- ::rtl::OUString m_sBookmarkName;
- ::rtl::OUString m_sDocumentLocation;
-
- TElementStack m_aStack;
- TDataSourceSettings m_aDataSourceSettings;
- sal_Bool m_bPropertyMayBeVoid;
-
- /** convert the old configuration settings into new database documents.
- */
- void convert();
- void createDataSource(const ::rtl::OUString& _sName);
- void createObject(sal_Bool _bQuery ,const ::rtl::OUString& _sName);
- void setProperties(sal_Int16 _eType);
-
-protected:
- virtual ~OCfgImport() throw();
-public:
-
- OCfgImport( const Reference< XMultiServiceFactory >& _rxMSF );
-
-
- // XServiceInfo
- DECLARE_SERVICE_INFO_STATIC( );
-
- inline Reference< XMultiServiceFactory > getORB() const { return m_xORB; }
-
- // lang::XInitialization
- virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException);
- // task::XJob
- virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
- // XLayerHandler
- virtual void SAL_CALL startLayer()
- throw(::com::sun::star::lang::WrappedTargetException);
-
- virtual void SAL_CALL endLayer()
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL overrideNode(
- const rtl::OUString& aName,
- sal_Int16 aAttributes,
- sal_Bool bClear)
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL addOrReplaceNode(
- const rtl::OUString& aName,
- sal_Int16 aAttributes)
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL addOrReplaceNodeFromTemplate(
- const rtl::OUString& aName,
- const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate,
- sal_Int16 aAttributes )
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL endNode()
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL dropNode(
- const rtl::OUString& aName )
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL overrideProperty(
- const rtl::OUString& aName,
- sal_Int16 aAttributes,
- const Type& aType,
- sal_Bool bClear )
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL setPropertyValue(
- const Any& aValue )
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL setPropertyValueForLocale(
- const Any& aValue,
- const rtl::OUString& aLocale )
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL endProperty()
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL addProperty(
- const rtl::OUString& aName,
- sal_Int16 aAttributes,
- const Type& aType )
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-
- virtual void SAL_CALL addPropertyWithValue(
- const rtl::OUString& aName,
- sal_Int16 aAttributes,
- const Any& aValue )
- throw(
- ::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException );
-};
-// -----------------------------------------------------------------------------
-} // dbacfg
-// -----------------------------------------------------------------------------
-#endif // CFG_CFGIMPORT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/migration/cfgservices.cxx b/dbaccess/source/filter/migration/cfgservices.cxx
deleted file mode 100644
index a5c256488ebc..000000000000
--- a/dbaccess/source/filter/migration/cfgservices.cxx
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
-
-#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
-#include "cfg_reghelper.hxx"
-
-
-/********************************************************************************************/
-
-using namespace ::dbacfg;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-//***************************************************************************************
-//
-// registry functions
-extern "C" void SAL_CALL createRegistryInfo_OCfgImport();
-
-//***************************************************************************************
-extern "C" void SAL_CALL createRegistryInfo_dbacfg()
-{
- static sal_Bool bInit = sal_False;
- if (!bInit)
- {
- createRegistryInfo_OCfgImport();
- bInit = sal_True;
- }
-}
-
-//---------------------------------------------------------------------------------------
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment **
- )
-{
- createRegistryInfo_dbacfg();
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(
- void* pServiceManager,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- return ::dbacfg::OModuleRegistration::writeComponentInfos(
- static_cast<XMultiServiceFactory*>(pServiceManager),
- static_cast<XRegistryKey*>(pRegistryKey));
- }
- catch (InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "DBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
-extern "C" void* SAL_CALL component_getFactory(
- const sal_Char* pImplementationName,
- void* pServiceManager,
- void* /*pRegistryKey*/)
-{
- Reference< XInterface > xRet;
- if (pServiceManager && pImplementationName)
- {
- xRet = ::dbacfg::OModuleRegistration::getComponentFactory(
- ::rtl::OUString::createFromAscii(pImplementationName),
- static_cast< XMultiServiceFactory* >(pServiceManager));
- }
-
- if (xRet.is())
- xRet->acquire();
- return xRet.get();
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/migration/makefile.mk b/dbaccess/source/filter/migration/makefile.mk
deleted file mode 100644
index 9d4b95035a2a..000000000000
--- a/dbaccess/source/filter/migration/makefile.mk
+++ /dev/null
@@ -1,73 +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=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=dbaccess
-TARGET=dbacfg
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-SLOFILES= $(SLO)$/cfgimport.obj \
- $(SLO)$/cfgservices.obj
-
-# --- Library -----------------------------------
-LIB1TARGET=$(SLB)$/dba_cfg.lib
-LIB1FILES=\
- $(SLB)$/cfgshared.lib \
- $(SLB)$/$(TARGET).lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS=\
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SFXLIB) \
- $(SVLLIB) \
- $(SALLIB)
-
-
-SHL1DEPN=
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB= i$(SHL1TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/dbaccess/source/filter/xml/dbaxml.component b/dbaccess/source/filter/xml/dbaxml.component
new file mode 100644
index 000000000000..23b3a5c1a776
--- /dev/null
+++ b/dbaccess/source/filter/xml/dbaxml.component
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdb.DBExportFilter">
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.sdb.DBFilter">
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.sdb.XMLFullExporter">
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.sdb.XMLSettingsExporter">
+ <service name="com.sun.star.document.ExportFilter"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.dbflt.DBContentLoader2">
+ <service name="com.sun.star.frame.FrameLoader"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.dbflt.DBTypeDetection">
+ <service name="com.sun.star.document.ExtendedTypeDetection"/>
+ </implementation>
+</component>
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 1f3fb6e22f61..1c7bd7cafadd 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -247,7 +247,7 @@ private:
::comphelper::ComponentContext m_aContext;
Reference< XFrameLoader > m_xMySelf;
::rtl::OUString m_sCurrentURL;
- ULONG m_nStartWizard;
+ sal_uLong m_nStartWizard;
DECL_LINK( OnStartTableWizard, void* );
public:
diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk
index 3f3b0219512b..33ff074b8012 100644
--- a/dbaccess/source/filter/xml/makefile.mk
+++ b/dbaccess/source/filter/xml/makefile.mk
@@ -111,3 +111,11 @@ DEF1NAME=$(SHL1TARGET)
# --- Targets ----------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/dbaxml.component
+
+$(MISC)/dbaxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ dbaxml.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt dbaxml.component
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index a645c22ae075..bfd267e140bc 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -1284,7 +1284,7 @@ void ODBExport::_ExportAutoStyles()
}
}
// -----------------------------------------------------------------------------
-void ODBExport::_ExportStyles(BOOL bUsed)
+void ODBExport::_ExportStyles(sal_Bool bUsed)
{
SvXMLExport::_ExportStyles(bUsed);
}
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 7e957cf554a0..8dc662f85705 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -169,7 +169,7 @@ private:
ODBExport();
protected:
- virtual void _ExportStyles( BOOL bUsed );
+ virtual void _ExportStyles( sal_Bool bUsed );
virtual void _ExportAutoStyles();
virtual void _ExportContent();
virtual void _ExportMasterStyles();
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 2e9f86cd1c5e..5814c969eb92 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -451,7 +451,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY);
SfxMediumRef pMedium = new SfxMedium(
- sFileName, ( STREAM_READ | STREAM_NOCREATE ), FALSE, 0 );
+ sFileName, ( STREAM_READ | STREAM_NOCREATE ), sal_False, 0 );
uno::Reference< embed::XStorage > xStorage;
try
{
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 95464c7d6896..a70c1d9c4981 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -79,28 +79,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(
- void* pServiceManager,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- writeDBLoaderInfo2(pRegistryKey);
- return ::dbaxml::OModuleRegistration::writeComponentInfos(
- static_cast<XMultiServiceFactory*>(pServiceManager),
- static_cast<XRegistryKey*>(pRegistryKey));
- }
- catch (InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "DBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
generated by cgit (git 2.34.1) at 2024-09-03 17:26:08 +0000