diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:56 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:56 +0200 |
commit | fdc4da32a09265b19470ab09db998ea28936106e (patch) | |
tree | 960b32cda2755f988d0d34e568f1019ad2bce0d2 /dbaccess/source/ui/inc/DExport.hxx | |
parent | aa20084bd041208841d5ad3ca50b1e963eb5986e (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/ui/inc/DExport.hxx')
-rw-r--r-- | dbaccess/source/ui/inc/DExport.hxx | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 4a96c8176825..fde1711272a7 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.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 @@ -46,7 +46,7 @@ #include "IUpdateHelper.hxx" #include "WTypeSelect.hxx" -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace awt{ struct FontDescriptor; } @@ -69,26 +69,26 @@ namespace dbaui { public: DECLARE_STL_MAP(::rtl::OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns); - typedef ::std::vector<TColumns::const_iterator> TColumnVector; - typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > TPositions; + typedef ::std::vector<TColumns::const_iterator> TColumnVector; + typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > TPositions; protected: - TPositions m_vColumns; // Welche Spalten "ubernommen werden sollen - ::std::vector<sal_Int32> m_vColumnTypes; // FeldTypen f"ur schnelleren Zugriff - ::std::vector<sal_Int32> m_vColumnSize; - ::std::vector<sal_Int16> m_vNumberFormat; - ::com::sun::star::lang::Locale m_aLocale; - - TColumns m_aDestColumns; // container for new created columns - TColumnVector m_vDestVector; - - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; // dest table - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables; // container - SharedConnection m_xConnection; // dest conn - + TPositions m_vColumns; // Welche Spalten "ubernommen werden sollen + ::std::vector<sal_Int32> m_vColumnTypes; // FeldTypen f"ur schnelleren Zugriff + ::std::vector<sal_Int32> m_vColumnSize; + ::std::vector<sal_Int16> m_vNumberFormat; + ::com::sun::star::lang::Locale m_aLocale; + + TColumns m_aDestColumns; // container for new created columns + TColumnVector m_vDestVector; + + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; // dest table + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables; // container + SharedConnection m_xConnection; // dest conn + ::boost::shared_ptr<IUpdateHelper> m_pUpdateHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; // - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; // + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; ::com::sun::star::util::Date m_aNullDate; @@ -96,49 +96,49 @@ namespace dbaui SvStream& m_rInputStream; //dyf add 2006/06/01 //for save the selected tablename - ::rtl::OUString m_sDefaultTableName; + ::rtl::OUString m_sDefaultTableName; //dyf add end - String m_sTextToken; // Zellen Inhalt - String m_sNumToken; /// SDNUM value - String m_sValToken; /// SDVAL value - TOTypeInfoSP m_pTypeInfo; // contains the default type + String m_sTextToken; // Zellen Inhalt + String m_sNumToken; /// SDNUM value + String m_sValToken; /// SDVAL value + TOTypeInfoSP m_pTypeInfo; // contains the default type const TColumnVector* m_pColumnList; const OTypeInfoMap* m_pInfoMap; - sal_Int32 m_nColumnPos; // aktuelle Spaltenposition - sal_Int32 m_nRows; // Anzahl der Zeilen die durchsucht werden sollen - sal_Int32 m_nRowCount; // current count of rows - rtl_TextEncoding m_nDefToken; // Sprache - sal_Bool m_bError; // Fehler und Abbruchstatus - sal_Bool m_bInTbl; // Ist gesetzt, wenn der Parser sich in der RTF Tabelle befindet - sal_Bool m_bHead; // ist true, wenn die Kopfzeile noch nicht gelesen wurde - sal_Bool m_bDontAskAgain;// Falls beim Einf"ugen ein Fehler auftritt, soll die Fehlermeldung nicht - sal_Bool m_bIsAutoIncrement; // if PKey is set by user - sal_Bool m_bFoundTable; // set to true when a table was found - sal_Bool m_bCheckOnly; + sal_Int32 m_nColumnPos; // aktuelle Spaltenposition + sal_Int32 m_nRows; // Anzahl der Zeilen die durchsucht werden sollen + sal_Int32 m_nRowCount; // current count of rows + rtl_TextEncoding m_nDefToken; // Sprache + sal_Bool m_bError; // Fehler und Abbruchstatus + sal_Bool m_bInTbl; // Ist gesetzt, wenn der Parser sich in der RTF Tabelle befindet + sal_Bool m_bHead; // ist true, wenn die Kopfzeile noch nicht gelesen wurde + sal_Bool m_bDontAskAgain;// Falls beim Einf"ugen ein Fehler auftritt, soll die Fehlermeldung nicht + sal_Bool m_bIsAutoIncrement; // if PKey is set by user + sal_Bool m_bFoundTable; // set to true when a table was found + sal_Bool m_bCheckOnly; bool m_bAppendFirstLine; - virtual sal_Bool CreateTable(int nToken) = 0; + virtual sal_Bool CreateTable(int nToken) = 0; virtual TypeSelectionPageFactory getTypeSelectionPageFactory() = 0; - void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); - sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); + void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); + sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); void adjustFormat(); void eraseTokens(); - void insertValueIntoColumn(); - sal_Bool createRowSet(); - void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e); + void insertValueIntoColumn(); + sal_Bool createRowSet(); + void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e); void ensureFormatter(); /** executeWizard calls a wizard to create/append data - @param _sTableName the tablename - @param _aTextColor the text color of the new created table - @param _rFont the font of the new table + @param _sTableName the tablename + @param _aTextColor the text color of the new created table + @param _rFont the font of the new table - @return true when an error occurs + @return true when an error occurs */ - sal_Bool executeWizard( const ::rtl::OUString& _sTableName, + sal_Bool executeWizard( const ::rtl::OUString& _sTableName, const ::com::sun::star::uno::Any& _aTextColor, const ::com::sun::star::awt::FontDescriptor& _rFont); @@ -165,11 +165,11 @@ namespace dbaui SvStream& _rInputStream ); - void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); - + void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); + //dyf add 20070601 inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; } - //dyf add end + //dyf add end virtual void release() = 0; |