diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:08 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:08 +0200 |
commit | 258f905e8c6b1853884f730ab0e36a544bfd7b76 (patch) | |
tree | 812254806beb1a7af7271469e7148b667b2d96de /sc/source/ui/inc/filtdlg.hxx | |
parent | bc212c565cdc252d2a01e5221a75868b3f01d230 (diff) |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit aa08e6374f2a8f11105d84c3d651696be34ef78b (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:24 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit eb4914f043304ba7d164733509794104c7ea5b33
Merge: 5ada805 0815e6f
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:00 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit 0815e6f3086d4513fb1dfed2a0ff8e83a3589afc (tag: refs/tags/ooo/OOO330_m7, tag: refs/tags/ooo/OOO330_m6)
Merge: 51cfacc 1d0dc69
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Aug 26 13:52:56 2010 +0200
CWS-TOOLING: integrate CWS calc58
commit 51cfacc73ee6162c82dbb735448f5321a2a57269
Merge: 1f33e95 8676b47
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 12:49:35 2010 +0200
CWS-TOOLING: integrate CWS mib18
commit 1d0dc690de7aa8ef1fd93d26578251248fd66d9a
Author: Thomas Benisch <tbe@openoffice.org>
Date: Fri Aug 20 13:23:46 2010 +0200
calc58: #i113948# office crashes after resizing chart
chart2/source/model/main/ChartModel.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit db48b114e54b6ceaebd4d77fbb0de1d41a0d69ca
Author: Thomas Benisch <tbe@openoffice.org>
Date: Fri Aug 20 13:03:55 2010 +0200
calc58: #i113946# undo does not work for deleting shapes
.../controller/main/ChartController_Tools.cxx | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
commit 3fa83707418cb221c94dcbe32864e5555b618159
Author: Eike Rathke [er] <eike.rathke@oracle.com>
Date: Thu Aug 19 17:12:37 2010 +0200
calc58: #i113879# add ScMatrix::CloneIfConst() and regard only temporary matrices created by the interpreter as mutable
sc/inc/scmatrix.hxx | 11 ++++++++++-
sc/source/core/tool/interpr4.cxx | 7 ++++++-
sc/source/core/tool/interpr5.cxx | 21 +++++++++++++--------
sc/source/core/tool/scmatrix.cxx | 5 +++++
4 files changed, 34 insertions(+), 10 deletions(-)
commit baac8ebc6989a5771b5d1903e5e8f4014ecafeac
Author: Eike Rathke [er] <eike.rathke@oracle.com>
Date: Wed Aug 18 18:56:10 2010 +0200
calc58: #i113739# make N return 0 for all strings again
sc/source/core/tool/interpr1.cxx | 23 +++++++----------------
sc/source/core/tool/interpr4.cxx | 6 ++++++
2 files changed, 13 insertions(+), 16 deletions(-)
commit ac9660fc7e47b2a7eecdb0c749ee46f592a70635
Author: Eike Rathke [er] <eike.rathke@oracle.com>
Date: Wed Aug 18 16:52:22 2010 +0200
calc58: #i113820# make TEXT treat string results and inline strings identical to referenced cell text
sc/source/core/tool/interpr1.cxx | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
commit 8676b47d16a1670a4d6ebbc610e8a00abd2367f7
Merge: 6423ab8 1f33e95
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 11:29:46 2010 +0200
mib18: rebase to OOO330m4
commit 6423ab81e71f7090d61e81b8992878ce7de43f27
Merge: 6e0de89 772dd5e
Author: Andreas Bregas <ab@openoffice.org>
Date: Wed Aug 11 08:28:57 2010 +0200
mib18: Merge
commit 772dd5e59b0b28c3e24cac6ae52ea0141b39c240
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 20:18:10 2010 +0200
mib18: adjusted service name to match VBA symbol
sc/source/ui/vba/vbaglobals.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9725c306fd4502fc6de7d4acf5c302427310a20d
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 18:14:58 2010 +0200
mib18: #163259# implementation of global symbol Excel
sc/source/ui/vba/vbaglobals.cxx | 9 +++++++++
sc/source/ui/vba/vbaglobals.hxx | 1 +
2 files changed, 10 insertions(+), 0 deletions(-)
commit ff7c55aff1293fb51c8ab268d0f478480b0c5685
Merge: 80722e0 6e0de89
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 16:57:47 2010 +0200
heads merged
commit 80722e0f75ad7d3204f39a580df2f48412e001c3
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 16:55:52 2010 +0200
mib18: #163120# adding the entrypoint for symbol Debug
sc/source/ui/vba/vbaglobals.cxx | 19 +++++++++++++++++++
sc/source/ui/vba/vbaglobals.hxx | 2 +-
2 files changed, 20 insertions(+), 1 deletions(-)
commit 6e0de8945fbfbee500e0fc9bfa26aaa67abeafa4
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 11:52:54 2010 +0200
mib18: #163243# enable regular expressions in VBA symbol Range.Find
sc/source/ui/vba/vbarange.cxx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
commit d0093c4e1b54648d1e09c16b389519fdf2564f6e
Author: Daniel Rentz <dr@openoffice.org>
Date: Tue Aug 10 10:27:30 2010 +0200
mib18: #163246# add VBA symbol Worksheet.ProtectScenarios
sc/source/ui/vba/vbaworksheet.cxx | 10 ++++++++--
sc/source/ui/vba/vbaworksheet.hxx | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
commit b9876f93ddc6eaa0e5cf4aaf62cd19d3a08776c4
Author: Michael E. Bohn <mbn@openoffice.org>
Date: Tue Aug 10 06:57:53 2010 +0200
mib18: #163148# creation og basic modules in library Standard during Workbooks.add
sc/source/ui/vba/vbaworkbooks.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 80e4fe02a80b90182180c409d2f4f803562e02b8
Merge: 36f7091 81cec49
Author: Andreas Bregas <ab@openoffice.org>
Date: Fri Aug 6 09:39:35 2010 +0200
mib18: Merge
commit 81cec496df67c85bb1b64ef7d15c9f73987882a0
Author: Daniel Rentz <dr@openoffice.org>
Date: Thu Aug 5 15:43:06 2010 +0200
mib18: #162503# do not create a new Worksheet object in Workbook.ActiveSheet but return existing object supporting VBA module access
sc/source/ui/vba/vbaworkbook.cxx | 19 +++++++++++--------
sc/source/ui/vba/vbaworksheets.cxx | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
commit 36f709143ffc8056ece58e93e155a6dab9831cd9
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 18:13:02 2010 +0200
mib18: #162938# add VBA symbol Worksheet.AutoFilterMode
sc/source/ui/vba/vbaworksheet.cxx | 37 ++++++++++++++++++++++++++++++++++++-
sc/source/ui/vba/vbaworksheet.hxx | 5 +++++
2 files changed, 41 insertions(+), 1 deletions(-)
commit c650f967f769e4da07f669f60e1f7a636d7e9614
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 16:00:21 2010 +0200
mib18: #163200# full rework of VBA symbols Application.Intersect and Application.Union
sc/source/ui/vba/makefile.mk | 92 +++---
sc/source/ui/vba/vbaapplication.cxx | 599 ++++++++++++++---------------------
2 files changed, 281 insertions(+), 410 deletions(-)
commit 5fa3d6e55b2ab5aac185c10293f8c6a1b7264e63
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:59:00 2010 +0200
mib18: #163198# VBA Names collection must return VBA Name objects
sc/source/ui/vba/vbanames.cxx | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
commit 783c57ec2174b11b06ec29ecb1ae6b9b87996bf6
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:58:00 2010 +0200
mib18: #163195# set correct parent for range returned by VBA ActiveCell symbol
sc/source/ui/vba/vbaapplication.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 32876274fc8fae906bdb52e76059ddedadfa8572
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:56:54 2010 +0200
mib18: #162937# extract all integer and floating values from an 'Any' for Boolean parameters
sc/source/ui/vba/vbarange.cxx | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
commit faa445a0730322e8522999ffb30fdde97bb9b9b9
Author: Daniel Rentz <dr@openoffice.org>
Date: Wed Aug 4 09:54:13 2010 +0200
mib18: #162039# clear covered cells when merging via VBA MergeCells symbol
sc/source/ui/vba/vbarange.cxx | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
Notes
Notes:
split repo tag: calc_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sc/source/ui/inc/filtdlg.hxx')
-rw-r--r-- | sc/source/ui/inc/filtdlg.hxx | 220 |
1 files changed, 110 insertions, 110 deletions
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 31e0e3a5d4b1..2e5cd9762e03 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.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 @@ -56,37 +56,37 @@ class TypedScStrCollection; // Gemeinsame Resource-Objekte: #define _COMMON_FILTER_RSCOBJS \ - CheckBox aBtnCase; \ - CheckBox aBtnRegExp; \ - CheckBox aBtnHeader; \ - CheckBox aBtnUnique; \ - CheckBox aBtnCopyResult; \ - ListBox aLbCopyArea; \ - formula::RefEdit aEdCopyArea; \ - formula::RefButton aRbCopyArea; \ - CheckBox aBtnDestPers; \ - FixedText aFtDbAreaLabel; \ - FixedInfo aFtDbArea; \ - const String aStrUndefined; \ - const String aStrNoName; \ - const String aStrNone; + CheckBox aBtnCase; \ + CheckBox aBtnRegExp; \ + CheckBox aBtnHeader; \ + CheckBox aBtnUnique; \ + CheckBox aBtnCopyResult; \ + ListBox aLbCopyArea; \ + formula::RefEdit aEdCopyArea; \ + formula::RefButton aRbCopyArea; \ + CheckBox aBtnDestPers; \ + FixedText aFtDbAreaLabel; \ + FixedInfo aFtDbArea; \ + const String aStrUndefined; \ + const String aStrNoName; \ + const String aStrNone; #define _INIT_COMMON_FILTER_RSCOBJS \ - aBtnCase ( this, ScResId( BTN_CASE ) ), \ - aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \ - aBtnHeader ( this, ScResId( BTN_HEADER ) ), \ - aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \ - aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \ - aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \ + aBtnCase ( this, ScResId( BTN_CASE ) ), \ + aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \ + aBtnHeader ( this, ScResId( BTN_HEADER ) ), \ + aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \ + aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \ + aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \ aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ), \ - aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \ - aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \ - aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \ - aFtDbArea ( this, ScResId( FT_DBAREA ) ), \ - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), \ - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), \ - aStrNone ( ScResId( SCSTR_NONE ) ), + aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \ + aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \ + aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \ + aFtDbArea ( this, ScResId( FT_DBAREA ) ), \ + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), \ + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), \ + aStrNone ( ScResId( SCSTR_NONE ) ), //============================================================================ @@ -94,46 +94,46 @@ class ScFilterDlg : public ScAnyRefDlg { public: ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet& rArgSet ); ~ScFilterDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); - virtual BOOL Close(); - void SliderMoved(); - USHORT GetSliderPos(); - void RefreshEditRow( USHORT nOffset ); + virtual BOOL Close(); + void SliderMoved(); + USHORT GetSliderPos(); + void RefreshEditRow( USHORT nOffset ); private: FixedLine aFlCriteria; //---------------------------- - ListBox aLbConnect1; - ListBox aLbField1; - ListBox aLbCond1; - ComboBox aEdVal1; + ListBox aLbConnect1; + ListBox aLbField1; + ListBox aLbCond1; + ComboBox aEdVal1; //---------------------------- - ListBox aLbConnect2; - ListBox aLbField2; - ListBox aLbCond2; - ComboBox aEdVal2; + ListBox aLbConnect2; + ListBox aLbField2; + ListBox aLbCond2; + ComboBox aEdVal2; //---------------------------- - ListBox aLbConnect3; - ListBox aLbField3; - ListBox aLbCond3; - ComboBox aEdVal3; + ListBox aLbConnect3; + ListBox aLbField3; + ListBox aLbCond3; + ComboBox aEdVal3; //---------------------------- - ListBox aLbConnect4; - ListBox aLbField4; - ListBox aLbCond4; - ComboBox aEdVal4; + ListBox aLbConnect4; + ListBox aLbField4; + ListBox aLbCond4; + ComboBox aEdVal4; //---------------------------- - FixedText aFtConnect; - FixedText aFtField; - FixedText aFtCond; - FixedText aFtVal; + FixedText aFtConnect; + FixedText aFtField; + FixedText aFtCond; + FixedText aFtVal; FixedLine aFlSeparator; ScrollBar aScrollBar; @@ -146,56 +146,56 @@ private: _COMMON_FILTER_RSCOBJS - const String aStrEmpty; - const String aStrNotEmpty; - const String aStrRow; - const String aStrColumn; + const String aStrEmpty; + const String aStrNotEmpty; + const String aStrRow; + const String aStrColumn; - ScFilterOptionsMgr* pOptionsMgr; + ScFilterOptionsMgr* pOptionsMgr; - const USHORT nWhichQuery; - const ScQueryParam theQueryData; - ScQueryItem* pOutItem; - ScViewData* pViewData; - ScDocument* pDoc; - SCTAB nSrcTab; + const USHORT nWhichQuery; + const ScQueryParam theQueryData; + ScQueryItem* pOutItem; + ScViewData* pViewData; + ScDocument* pDoc; + SCTAB nSrcTab; - ComboBox* aValueEdArr[4]; - ListBox* aFieldLbArr[4]; - ListBox* aCondLbArr[4]; - ListBox* aConnLbArr[4]; + ComboBox* aValueEdArr[4]; + ListBox* aFieldLbArr[4]; + ListBox* aCondLbArr[4]; + ListBox* aConnLbArr[4]; bool mbHasDates[MAXQUERY]; BOOL bRefreshExceptQuery[MAXQUERY]; - USHORT nFieldCount; - BOOL bRefInputMode; + USHORT nFieldCount; + BOOL bRefInputMode; - TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; - USHORT nHeaderPos[MAXCOLCOUNT]; + TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; + USHORT nHeaderPos[MAXCOLCOUNT]; // Hack: RefInput-Kontrolle - Timer* pTimer; + Timer* pTimer; #ifdef _FILTDLG_CXX private: - void Init ( const SfxItemSet& rArgSet ); - void FillFieldLists (); - void FillAreaList (); - void UpdateValueList ( USHORT nList ); - void UpdateHdrInValueList( USHORT nList ); - void ClearValueList ( USHORT nList ); - USHORT GetFieldSelPos ( SCCOL nField ); - ScQueryItem* GetOutputItem (); + void Init ( const SfxItemSet& rArgSet ); + void FillFieldLists (); + void FillAreaList (); + void UpdateValueList ( USHORT nList ); + void UpdateHdrInValueList( USHORT nList ); + void ClearValueList ( USHORT nList ); + USHORT GetFieldSelPos ( SCCOL nField ); + ScQueryItem* GetOutputItem (); // Handler: - DECL_LINK( LbSelectHdl, ListBox* ); + DECL_LINK( LbSelectHdl, ListBox* ); DECL_LINK( ValModifyHdl, ComboBox* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK( CheckBoxHdl, CheckBox* ); + DECL_LINK( EndDlgHdl, Button* ); DECL_LINK( MoreClickHdl, MoreButton* ); DECL_LINK( ScrollHdl, ScrollBar* ); // Hack: RefInput-Kontrolle - DECL_LINK( TimeOutHdl, Timer* ); + DECL_LINK( TimeOutHdl, Timer* ); #endif }; @@ -205,21 +205,21 @@ class ScSpecialFilterDlg : public ScAnyRefDlg { public: ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet& rArgSet ); ~ScSpecialFilterDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL Close(); private: - ListBox aLbFilterArea; - FixedText aFtFilterArea; - formula::RefEdit aEdFilterArea; - formula::RefButton aRbFilterArea; + ListBox aLbFilterArea; + FixedText aFtFilterArea; + formula::RefEdit aEdFilterArea; + formula::RefButton aRbFilterArea; FixedLine aFlOptions; @@ -230,34 +230,34 @@ private: HelpButton aBtnHelp; MoreButton aBtnMore; - ScFilterOptionsMgr* pOptionsMgr; + ScFilterOptionsMgr* pOptionsMgr; - const USHORT nWhichQuery; - const ScQueryParam theQueryData; - ScQueryItem* pOutItem; - ScViewData* pViewData; - ScDocument* pDoc; + const USHORT nWhichQuery; + const ScQueryParam theQueryData; + ScQueryItem* pOutItem; + ScViewData* pViewData; + ScDocument* pDoc; - formula::RefEdit* pRefInputEdit; - BOOL bRefInputMode; + formula::RefEdit* pRefInputEdit; + BOOL bRefInputMode; // Hack: RefInput-Kontrolle - Timer* pTimer; + Timer* pTimer; #ifdef _SFILTDLG_CXX private: - void Init( const SfxItemSet& rArgSet ); - ScQueryItem* GetOutputItem( const ScQueryParam& rParam, + void Init( const SfxItemSet& rArgSet ); + ScQueryItem* GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ); // Handler DECL_LINK( FilterAreaSelHdl, ListBox* ); DECL_LINK( FilterAreaModHdl, formula::RefEdit* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK( EndDlgHdl, Button* ); DECL_LINK( ScrollHdl, ScrollBar* ); // Hack: RefInput-Kontrolle - DECL_LINK( TimeOutHdl, Timer* ); + DECL_LINK( TimeOutHdl, Timer* ); #endif }; |