diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:56:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:56:06 +0000 |
| commit | 3b1f00ebfc5591f52c12a9de425e680968e1f6e6 (patch) | |
| tree | 2e7eaac48726b3736827e716e84a194f36d143ab /svx/inc/svx/svxdlg.hxx | |
| parent | 304114c206e4b643a0be165458801d9191c8afc3 (diff) | |
INTEGRATION: CWS dba23c (1.4.34); FILE MERGED
2007/07/19 05:57:13 fs 1.4.34.1: during #i79679#: signature of CreateFmSearchDialog changed
Diffstat (limited to 'svx/inc/svx/svxdlg.hxx')
| -rw-r--r-- | svx/inc/svx/svxdlg.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 221cdd8e24..2b0ae5396f 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -4,9 +4,9 @@ * * $RCSfile: svxdlg.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2007-06-26 13:49:32 $ + * last change: $Author: hr $ $Date: 2007-07-31 13:56:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,7 +51,6 @@ using namespace svx; #ifndef _COM_SUN_STAR_CONTAINER_XNAMEREPLACE_HPP_ #include <com/sun/star/container/XNameReplace.hpp> //add for SvxMacroAssignDlg #endif -#include <svx/fmsearch.hxx> //add for FmSearchDialog #ifndef INCLUDED_SVXDLLAPI_H #include "svx/svxdllapi.h" #endif @@ -482,10 +481,9 @@ public: sal_uInt32 nResId)=0; 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)=0; + const Link& lnkContextSupplier)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss const Graphic& rGraphic, RECT_POINT eLightSource, |