diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:39 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:39 +0200 |
commit | 38d077596d93bb547b5b5d4209328787f53c5a20 (patch) | |
tree | 4eafd01032528bcac3508c6accfa7a3a5cc270b6 /dbaccess/source/ui/inc/TableDesignView.hxx | |
parent | 7302529f5102a9b9e02f66bbd5a1201a486de8e6 (diff) |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 79a72f2305cadc82947c92ba4fbba3fe5536b9ae (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:23 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit da0499fda565b1f105c96b3a386670c0ad0a2c2b
Merge: 5eb7688 2ee0e40
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:33:59 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 2ee0e40b14191b4933e87cd85cee82d9ace2c800 (tag: refs/tags/ooo/OOO330_m7)
Merge: 4022fd7 f391dff
Author: Kurt Zenker <kz@openoffice.org>
Date: Fri Sep 3 14:39:55 2010 +0200
CWS-TOOLING: integrate CWS fs33a
commit f391dff52596dca6d1944f115a8e166ccea48f1f
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Thu Sep 2 10:54:17 2010 +0200
fs33a: #i113583# use the categorie column as well to build table
.../source/filter/xml/xmlExportDocumentHandler.cxx | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
commit 9bac46bf7bebcadfdbf4ee03a1e64650c950e036
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Wed Sep 1 13:09:46 2010 +0200
dba33h: #i114246# use correct table name
dbaccess/source/core/api/KeySet.cxx | 31 +++++++++++++++++++++++++------
dbaccess/source/core/api/KeySet.hxx | 1 -
2 files changed, 25 insertions(+), 7 deletions(-)
commit bf76cc893df69ecb3408e4fcf1321c171a039c57
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Fri Aug 27 13:19:56 2010 +0200
fs33a: reverting the fix for i112671. No string changes allowed in this phase.
.../source/ext/macromigration/macromigration.src | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 5521d0e17eccd263a154ad11066f07e1575eb806
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Tue Aug 24 15:36:19 2010 +0200
fs33a: #i113631# use m_sUpdateTableName
dbaccess/source/core/api/KeySet.cxx | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
commit 8fe8d81132d3b307e318afc1720dafe4b8fc8b3f
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Tue Aug 24 15:00:36 2010 +0200
fs33a: #i113744# check length of value
dbaccess/source/core/api/KeySet.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 54b57355495353aadd18c1846dec503c3d474b05
Author: Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
Date: Tue Aug 24 14:32:12 2010 +0200
fs33a: #i113583# handle column names from complex descriptions
.../source/core/dataaccess/documentdefinition.cxx | 17 ++--
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 27 +++++-
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 95 ++++++++++++++++++--
.../source/filter/xml/xmlExportDocumentHandler.cxx | 28 +++++-
4 files changed, 143 insertions(+), 24 deletions(-)
commit adaa62d63307602bfb940d42a8ad7d960d3fc0b2
Merge: 2fbec17 4022fd7
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Tue Aug 10 14:53:21 2010 +0200
merging in latest changes from OOO330(m3)
commit 2fbec17c655c59232ba4b9f3ea3665507ba99d53
Merge: 8c9b117 5c75695
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Tue Jul 6 15:24:32 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit 5c756956da3e5b218f63022430527bc3780afbcf
Author: Frank Schoenheit [fs] <frank.schoenheit@sun.com>
Date: Wed Jun 23 13:31:43 2010 +0200
fs33a: #i112617# fixed typo (thanks sophie)
.../source/ext/macromigration/macromigration.src | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Notes
Notes:
split repo tag: base_OOO_BUILD_3_2_98_1
Diffstat (limited to 'dbaccess/source/ui/inc/TableDesignView.hxx')
-rw-r--r-- | dbaccess/source/ui/inc/TableDesignView.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 6be89d0d7b93..80bf6dc48aed 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -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,10 +33,10 @@ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ +#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ #include <com/sun/star/frame/XController.hpp> #endif -#ifndef _SV_SPLIT_HXX +#ifndef _SV_SPLIT_HXX #include <vcl/split.hxx> #endif #ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX @@ -51,9 +51,9 @@ namespace dbaui //================================================================== class OTableBorderWindow : public Window { - Splitter m_aHorzSplitter; - OTableFieldDescWin* m_pFieldDescWin; - OTableEditorCtrl* m_pEditorCtrl; + Splitter m_aHorzSplitter; + OTableFieldDescWin* m_pFieldDescWin; + OTableEditorCtrl* m_pEditorCtrl; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); void ArrangeChilds( long nSplitPos ,Rectangle& rRect); @@ -67,8 +67,8 @@ namespace dbaui virtual void Resize(); virtual void GetFocus(); - OTableEditorCtrl* GetEditorCtrl() const { return m_pEditorCtrl; } - OTableFieldDescWin* GetDescWin() const { return m_pFieldDescWin; } + OTableEditorCtrl* GetEditorCtrl() const { return m_pEditorCtrl; } + OTableFieldDescWin* GetDescWin() const { return m_pFieldDescWin; } }; //================================================================== class OTableDesignView : public ODataView @@ -81,33 +81,33 @@ namespace dbaui NONE }; private: - ::com::sun::star::lang::Locale m_aLocale; - OTableBorderWindow* m_pWin; - OTableController& m_rController; - ChildFocusState m_eChildFocus; + ::com::sun::star::lang::Locale m_aLocale; + OTableBorderWindow* m_pWin; + OTableController& m_rController; + ChildFocusState m_eChildFocus; IClipboardTest* getActiveChild() const; protected: - + // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect); public: - OTableDesignView( Window* pParent, + OTableDesignView( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&, OTableController& _rController); virtual ~OTableDesignView(); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void GetFocus(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void GetFocus(); - OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } - OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } - OTableController& getController() const { return m_rController; } + OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } + OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } + OTableController& getController() const { return m_rController; } - ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} + ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} // IClipboardTest virtual sal_Bool isCutAllowed(); |