diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:58:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:58:47 +0000 |
| commit | 068b1ab51aa0d1b52c9fe9192e16747ad500313d (patch) | |
| tree | 708647bf9a18f47b4ab73728f5a4281f64db94f5 /svx/source/inc | |
| parent | 0a1d35684506ce94fa7efc04a6a3e03338fc3385 (diff) | |
INTEGRATION: CWS dba23c (1.32.32); FILE MERGED
2007/07/19 05:59:23 fs 1.32.32.1: during #i79679#: properly collect the search contexts
Diffstat (limited to 'svx/source/inc')
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 670c3cb91575..38dcda1bb4be 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -4,9 +4,9 @@ * * $RCSfile: fmshimp.hxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: rt $ $Date: 2007-07-24 12:02:02 $ + * last change: $Author: hr $ $Date: 2007-07-31 13:58:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,7 +105,9 @@ #ifndef _SVDMARK_HXX #include <svx/svdmark.hxx> #endif - +#ifndef _FMSEARCH_HXX +#include <svx/fmsearch.hxx> +#endif #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif @@ -130,9 +132,6 @@ #ifndef _SVX_FMTOOLS_HXX #include "fmtools.hxx" #endif -#ifndef _FMSEARCH_HXX -#include <svx/fmsearch.hxx> -#endif #ifndef _FMSRCCF_HXX_ #include "fmsrccfg.hxx" #endif @@ -178,6 +177,7 @@ #include <queue> #include <set> +#include <vector> SV_DECL_PTRARR(SdrObjArray, SdrObject*, 32, 16) // SV_DECL_OBJARR(FmFormArray, ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>, 32, 16); @@ -289,7 +289,7 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE Timer m_aMarkTimer; SdrObjArray m_arrSearchedControls; // We enable a permanent cursor for the grid we found a searched text, it's disabled in the next "found" event. - FmFormArray m_arrSearchContexts; + FmFormArray m_aSearchForms; SvUShorts m_arrInvalidSlots; SvBytes m_arrInvalidSlots_Flags; @@ -471,8 +471,13 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> GetControlFromModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xModel); // liefert das Control, welches das angegebene Model hat - void CollectFormContexts(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xStartingPoint, const UniString& strCurrentLevelPrefix, UniString& strNames); - // sammelt in strNames die Namen aller Formulare, fuegt die entsprechenden XFormRefs in m_arrSearchContexts ein + + // sammelt in strNames die Namen aller Formulare + static void impl_collectFormSearchContexts_nothrow( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxStartingPoint, + const ::rtl::OUString& _rCurrentLevelPrefix, + FmFormArray& _out_rForms, + ::std::vector< String >& _out_rNames ); public: // methode fuer nicht designmode (alive mode) |