summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/inc/queryfilter.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/ui/inc/queryfilter.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
Notes: split repo tag: base_libreoffice-3.3.0.4
Diffstat (limited to 'dbaccess/source/ui/inc/queryfilter.hxx')
-rw-r--r--dbaccess/source/ui/inc/queryfilter.hxx70
1 files changed, 35 insertions, 35 deletions
diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx
index bfb10cae1924..0a72392ae920 100644
--- a/dbaccess/source/ui/inc/queryfilter.hxx
+++ b/dbaccess/source/ui/inc/queryfilter.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
@@ -78,56 +78,56 @@ namespace com
//==================================================================
namespace dbaui
{
- class DlgFilterCrit :public ModalDialog
+ class DlgFilterCrit :public ModalDialog
,public ::svxform::OParseContextClient
{
private:
- ListBox aLB_WHEREFIELD1;
- ListBox aLB_WHERECOMP1;
- Edit aET_WHEREVALUE1;
- ListBox aLB_WHERECOND2;
- ListBox aLB_WHEREFIELD2;
- ListBox aLB_WHERECOMP2;
- Edit aET_WHEREVALUE2;
- ListBox aLB_WHERECOND3;
- ListBox aLB_WHEREFIELD3;
- ListBox aLB_WHERECOMP3;
- Edit aET_WHEREVALUE3;
- FixedText aFT_WHEREFIELD;
- FixedText aFT_WHERECOMP;
- FixedText aFT_WHEREVALUE;
- FixedText aFT_WHEREOPER;
+ ListBox aLB_WHEREFIELD1;
+ ListBox aLB_WHERECOMP1;
+ Edit aET_WHEREVALUE1;
+ ListBox aLB_WHERECOND2;
+ ListBox aLB_WHEREFIELD2;
+ ListBox aLB_WHERECOMP2;
+ Edit aET_WHEREVALUE2;
+ ListBox aLB_WHERECOND3;
+ ListBox aLB_WHEREFIELD3;
+ ListBox aLB_WHERECOMP3;
+ Edit aET_WHEREVALUE3;
+ FixedText aFT_WHEREFIELD;
+ FixedText aFT_WHERECOMP;
+ FixedText aFT_WHEREVALUE;
+ FixedText aFT_WHEREOPER;
FixedLine aFL_FIELDS;
- OKButton aBT_OK;
- CancelButton aBT_CANCEL;
- HelpButton aBT_HELP;
- String aSTR_NOENTRY;
- String aSTR_COMPARE_OPERATORS;
+ OKButton aBT_OK;
+ CancelButton aBT_CANCEL;
+ HelpButton aBT_HELP;
+ String aSTR_NOENTRY;
+ String aSTR_COMPARE_OPERATORS;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData;
- ::dbtools::OPredicateInputController m_aPredicateInput;
+ ::dbtools::OPredicateInputController m_aPredicateInput;
- void SelectField( ListBox& rBox, const String& rField );
+ void SelectField( ListBox& rBox, const String& rField );
DECL_LINK( ListSelectHdl, ListBox * );
DECL_LINK( ListSelectCompHdl, ListBox * );
- void SetLine( USHORT nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,sal_Bool _bOr );
- void EnableLines();
- sal_Int32 GetOSQLPredicateType( const String& _rSelectedPredicate ) const;
- USHORT GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const;
- sal_Bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const;
- void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues);
+ void SetLine( USHORT nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,sal_Bool _bOr );
+ void EnableLines();
+ sal_Int32 GetOSQLPredicateType( const String& _rSelectedPredicate ) const;
+ USHORT GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const;
+ sal_Bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const;
+ void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues);
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getMatchingColumn( const Edit& _rValueInput ) const;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getColumn( const ::rtl::OUString& _rFieldName ) const;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const ::rtl::OUString& _rFieldName ) const;
public:
- DlgFilterCrit( Window * pParent,
+ DlgFilterCrit( Window * pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer,