diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:57:00 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:57:00 +0000 |
commit | 69d476fdbbd6604d7e9654f86325a5fa27f3b3c4 (patch) | |
tree | 30cb753c504ccd7aa95e6750430b672c842c8589 /svx/source/dialog | |
parent | e841946ead9425d9f71fdb81add50e65064b78cf (diff) |
INTEGRATION: CWS dba23c (1.30.34); FILE MERGED
2007/07/19 06:00:52 fs 1.30.34.1: during #i79679#: signature of CreateFmSearchDialog changed
Diffstat (limited to 'svx/source/dialog')
-rw-r--r-- | svx/source/dialog/dlgfact.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/dialog/dlgfact.hxx b/svx/source/dialog/dlgfact.hxx index 5fc53b5ab4dc..9b1996fcbfd8 100644 --- a/svx/source/dialog/dlgfact.hxx +++ b/svx/source/dialog/dlgfact.hxx @@ -4,9 +4,9 @@ * * $RCSfile: dlgfact.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: hr $ $Date: 2007-06-27 17:02:03 $ + * last change: $Author: hr $ $Date: 2007-07-31 13:57:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -762,10 +762,9 @@ public: sal_uInt32 nResId); virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog const String& strInitialText, - const String& strContexts, + const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, - const Link& lnkContextSupplier, - FMSEARCH_MODE eMode = SM_ALLOWSCHEDULE); + const Link& lnkContextSupplier); virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss const Graphic& rGraphic, RECT_POINT eLightSource, |