summaryrefslogtreecommitdiff
path: root/dbaccess/source/filter/migration/cfgimport.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:02:56 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:02:56 +0200
commitfdc4da32a09265b19470ab09db998ea28936106e (patch)
tree960b32cda2755f988d0d34e568f1019ad2bce0d2 /dbaccess/source/filter/migration/cfgimport.hxx
parentaa20084bd041208841d5ad3ca50b1e963eb5986e (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit e082905e4ce8c9018a2a38035e212eb45e9f70b1 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:14 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 35131d5a73dd02924bf4b404c55d0dbeb324db1f Author: Lionel Elie Mamane <lionel@mamane.lu> Date: Sat Jan 15 05:39:40 2011 +0100 i#116187: report left/right page margin setting ignored on Unix 64 bit (cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a) Signed-off-by: Michael Meeks <michael.meeks@novell.com> reportdesign/source/ui/report/ReportController.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit ae3903b548d8d05807cc7f3a029495388de5e302 Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:24:43 2011 -0500 Remove the Registration... menu item which we don't want. (fdo#33112) dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit c71822d4eb36b43cdb08c25d207cae5e3c1660cd Author: Noel Power <noel.power@novell.com> Date: Wed Jan 12 11:09:51 2011 +0000 fix for fdo#32742# reportdesign/source/ui/inspection/metadata.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 66d25b635de422a4a811710cb3289266d9a11a84 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:35 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: base_libreoffice-3.3.0.4
Diffstat (limited to 'dbaccess/source/filter/migration/cfgimport.hxx')
-rw-r--r--dbaccess/source/filter/migration/cfgimport.hxx116
1 files changed, 58 insertions, 58 deletions
diff --git a/dbaccess/source/filter/migration/cfgimport.hxx b/dbaccess/source/filter/migration/cfgimport.hxx
index fcccadae42b0..dc558731e0e3 100644
--- a/dbaccess/source/filter/migration/cfgimport.hxx
+++ b/dbaccess/source/filter/migration/cfgimport.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
@@ -52,37 +52,37 @@ 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;
+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;
+ 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;
+ ::rtl::OUString m_sCurrentDataSourceName;
+ ::rtl::OUString m_sBookmarkName;
+ ::rtl::OUString m_sDocumentLocation;
- TElementStack m_aStack;
- TDataSourceSettings m_aDataSourceSettings;
- sal_Bool m_bPropertyMayBeVoid;
+ TElementStack m_aStack;
+ TDataSourceSettings m_aDataSourceSettings;
+ sal_Bool m_bPropertyMayBeVoid;
/** convert the old configuration settings into new database documents.
*/
@@ -92,9 +92,9 @@ private:
void setProperties(sal_Int16 _eType);
protected:
- virtual ~OCfgImport() throw();
+ virtual ~OCfgImport() throw();
public:
-
+
OCfgImport( const Reference< XMultiServiceFactory >& _rxMSF );
@@ -109,88 +109,88 @@ public:
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()
+ virtual void SAL_CALL startLayer()
throw(::com::sun::star::lang::WrappedTargetException);
- virtual void SAL_CALL endLayer()
- throw(
+ 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,
+ 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(
+ const rtl::OUString& aName,
+ sal_Int16 aAttributes)
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL addOrReplaceNodeFromTemplate(
+ virtual void SAL_CALL addOrReplaceNodeFromTemplate(
const rtl::OUString& aName,
const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate,
- sal_Int16 aAttributes )
+ sal_Int16 aAttributes )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL endNode()
- throw(
+ 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(
+ 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(
+ virtual void SAL_CALL overrideProperty(
const rtl::OUString& aName,
sal_Int16 aAttributes,
const Type& aType,
- sal_Bool bClear )
- throw(
+ sal_Bool bClear )
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL setPropertyValue(
- const Any& aValue )
- throw(
+ 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(
+ virtual void SAL_CALL setPropertyValueForLocale(
const Any& aValue,
- const rtl::OUString& aLocale )
- throw(
+ const rtl::OUString& aLocale )
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL endProperty()
- throw(
+ virtual void SAL_CALL endProperty()
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL addProperty(
+ virtual void SAL_CALL addProperty(
const rtl::OUString& aName,
sal_Int16 aAttributes,
const Type& aType )
- throw(
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL addPropertyWithValue(
+ virtual void SAL_CALL addPropertyWithValue(
const rtl::OUString& aName,
sal_Int16 aAttributes,
- const Any& aValue )
- throw(
+ const Any& aValue )
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
};