diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-07 13:50:28 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-07 13:50:28 +0100 |
commit | cbcec4a8a16a62438238b41470eba33ed5dfc780 (patch) | |
tree | 20e665e343ecabdb5ffe01545b348a5d1e9af350 /svx/source/form | |
parent | dba34c: #i110039# 'Form Design' now known as 'Database Form' (diff) | |
parent | dba34b: merged DEV300m96 (diff) | |
download | core-cbcec4a8a16a62438238b41470eba33ed5dfc780.tar.gz core-cbcec4a8a16a62438238b41470eba33ed5dfc780.zip |
dba34c: pulled/merged latest changes from CWS dba34b
Diffstat (limited to 'svx/source/form')
33 files changed, 56 insertions, 89 deletions
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 7b00319cb164..e1f069be96a6 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" #include "stringlistresource.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/dialmgr.hxx> diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 7c23c0a2020d..c6df77774c77 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -31,7 +31,7 @@ #include "svx/databaselocationinput.hxx" #include "svx/dialmgr.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" /** === begin UNO includes === **/ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 9412c715b2b5..aecb4f295efa 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -32,12 +32,12 @@ #include "fmservs.hxx" #include "datanavi.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" #include <svx/svxids.hrc> #include <tools/rcid.h> #include <tools/diagnose_ex.h> -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" #include <svx/dialmgr.hxx> #include <svx/fmshell.hxx> #include <svtools/miscopt.hxx> diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 5d81bf13ac26..3dac7faf3a90 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -27,7 +27,7 @@ #include "datanavi.hrc" #include "globlmn.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9d1b65208fdf..3b910652a96b 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -34,7 +34,7 @@ #include "fmhelp.hrc" #include "fmitems.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "gridcell.hxx" /** === begin UNO includes === **/ diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src index feaba66729db..3d9eff3de4e8 100644 --- a/svx/source/form/filtnav.src +++ b/svx/source/form/filtnav.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" Menu RID_FM_FILTER_MENU @@ -60,30 +60,3 @@ Menu RID_FM_FILTER_MENU }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index bcc275896410..6768acfbe1f2 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -31,7 +31,7 @@ #include "fmhelp.hrc" #include "fmprop.hrc" #include "fmPropBrw.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmpgeimp.hxx" diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index c50dcb398928..1481a1846a36 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -33,7 +33,7 @@ #include <svl/itempool.hxx> #ifndef _SVX_DBEXCH_HRC -#include <dbexch.hrc> +#include <svx/dbexch.hrc> #endif #include <sot/formats.hxx> #include <svtools/svtreebx.hxx> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index c27b5b69d075..039c3361491d 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #ifndef _SVX_FMEXPL_HRC #include "fmexpl.hrc" @@ -54,7 +54,7 @@ #include "fmprop.hrc" #endif #include <svx/dialmgr.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdouno.hxx> #include <fmundo.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index b5bdd50239e7..8d6866f0ecdb 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmexpl.hrc" #include "globlmn.hrc" #include <svx/svxcommands.h> diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index ba2fba4f40f3..a3a4038e4ab8 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -31,7 +31,7 @@ #include "fmprop.hrc" #include "fmvwimp.hxx" #include "fmpgeimp.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmview.hxx" #include "svx/fmglob.hxx" #include "svx/fmpage.hxx" diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index ca96a9957ba7..1c7da93dfd95 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -33,7 +33,7 @@ #include "fmservs.hxx" #ifndef _FM_FMOBJFAC_HXX -#include "fmobjfac.hxx" +#include "svx/fmobjfac.hxx" #endif #ifndef _FM_FMGLOB_HXX @@ -56,7 +56,7 @@ #include <tools/resid.hxx> #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 94c6e80dcc07..d7721edafec5 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -44,7 +44,7 @@ #ifndef SVX_LIGHT #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #endif #include <tools/shl.hxx> @@ -61,7 +61,7 @@ #include <sfx2/objsh.hxx> #endif #endif -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdview.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index a582d97d8d15..90f12f411447 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include "fmpgeimp.hxx" #include "fmundo.hxx" #include "svx/fmtools.hxx" @@ -36,8 +36,8 @@ #include "fmservs.hxx" #include "fmobj.hxx" #include "formcontrolfactory.hxx" -#include "svditer.hxx" -#include "fmresids.hrc" +#include "svx/svditer.hxx" +#include "svx/fmresids.hrc" #include "svx/dbtoolsclient.hxx" #include "treevisitor.hxx" diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index cb376a1b4acd..f9e7bf65e05e 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -64,7 +64,7 @@ #include <sfx2/objsh.hxx> #include <svx/svdobj.hxx> #include <svx/fmpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmobj.hxx" #ifndef _SVX_SVXIDS_HRC @@ -72,7 +72,7 @@ #endif #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include "fmexch.hxx" #include <svx/fmglob.hxx> @@ -288,7 +288,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView) } //------------------------------------------------------------------------ -sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing) +sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool /*bForBrowsing*/) { if ( GetImpl()->didPrepareClose() ) // we already did a PrepareClose for the current modifications of the current form @@ -320,10 +320,6 @@ sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing) if ( bModified && bUI ) { QueryBox aQry(NULL, SVX_RES(RID_QRY_SAVEMODIFIED)); - if (bForBrowsing) - aQry.AddButton(SVX_RES(RID_STR_NEW_TASK), RET_NEWTASK, - BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON); - switch (aQry.Execute()) { case RET_NO: diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index e627624d8102..7a705dfa4aa5 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -33,7 +33,7 @@ #include "fmpgeimp.hxx" #include "svx/fmtools.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmtextcontrolshell.hxx" @@ -42,7 +42,7 @@ #include "fmvwimp.hxx" #include "formtoolbars.hxx" #include "gridcols.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "svx/dialmgr.hxx" #include "svx/dialogs.hrc" #include "svx/fmglob.hxx" diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 243b45e099fb..dc396feec29f 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <svl/filerec.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index ee870f0c29b0..56957490150d 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -29,10 +29,10 @@ #include "precompiled_svx.hxx" #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include "svx/fmtools.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/wldcrd.hxx> @@ -63,7 +63,7 @@ #include "fmprop.hrc" #endif #include "fmservs.hxx" -#include "fmsrcimp.hxx" +#include "svx/fmsrcimp.hxx" #include <svx/fmsearch.hxx> #include <comphelper/numbers.hxx> diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src index 8e3df1a8cdf5..91b5d28203a0 100644 --- a/svx/source/form/fmstring.src +++ b/svx/source/form/fmstring.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" /* Strings fuer Uebersetzung */ String RID_ERR_CONTEXT_ADDFORM { diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index c10bdfe14ec5..d758b5622e0b 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -44,7 +44,7 @@ //#include "tabstpge.hxx" #endif -#include "flagsdef.hxx" +#include "svx/flagsdef.hxx" #include <svl/intitem.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 320baea302b7..19ca20dd7983 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmtextcontroldialogs.hxx" #include "fmtextcontrolfeature.hxx" #include "fmtextcontrolshell.hxx" diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index e6559850ea5d..e63325f710e9 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -31,10 +31,10 @@ #include "fmundo.hxx" #include "fmpgeimp.hxx" #include "svx/dbtoolsclient.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmobj.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmglob.hxx" #include "svx/dialmgr.hxx" #include "svx/fmmodel.hxx" diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 22681d511b82..f9980284993d 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -50,7 +50,7 @@ #include <basic/sbx.hxx> #include "fmitems.hxx" #include "fmobj.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpagv.hxx> #include <svx/svdogrp.hxx> #include <svx/fmview.hxx> @@ -76,7 +76,7 @@ #include <vcl/stdtext.hxx> #include <svx/fmglob.hxx> #include <svx/sdrpagewindow.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -139,9 +139,7 @@ void FmFormView::Init() const SfxPoolItem *pItem=0; if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - Sequence< PropertyValue > aSeq; - ( ((SfxUnoAnyItem*)pItem)->GetValue() ) >>= aSeq; - ::comphelper::NamedValueCollection aComponentData( aSeq ); + ::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() ); bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode ); } } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 2bf00300a5a5..8e0f6b2a261a 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -32,15 +32,15 @@ #include "fmobj.hxx" #include "fmpgeimp.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "svx/fmtools.hxx" #include "fmundo.hxx" #include "fmvwimp.hxx" #include "formcontrolfactory.hxx" -#include "sdrpaintwindow.hxx" -#include "svditer.hxx" +#include "svx/sdrpaintwindow.hxx" +#include "svx/svditer.hxx" #include "svx/dataaccessdescriptor.hxx" #include "svx/dialmgr.hxx" #include "svx/fmglob.hxx" @@ -51,7 +51,7 @@ #include "svx/sdrpagewindow.hxx" #include "svx/svdogrp.hxx" #include "svx/svdpagv.hxx" -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" /** === begin UNO includes === **/ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index feb160482665..857bdc1b2647 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -31,7 +31,7 @@ #include "formcontrolfactory.hxx" #include "fmcontrollayout.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "svx/dialmgr.hxx" #include "svx/svdouno.hxx" diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index f43233ae08ba..7087e3d6793f 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -36,7 +36,7 @@ #include "formcontrolling.hxx" #include "fmprop.hrc" #include "svx/dialmgr.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "svx/fmtools.hxx" #include "fmurl.hxx" diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index f7e2419aae7d..287f60a277a7 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <sfx2/sfxsids.hrc> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index ff60597d70fe..78bbc7a533d9 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -32,12 +32,12 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/svdpagv.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmhelp.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmshimp.hxx" #include "fmservs.hxx" #include "fmundo.hxx" @@ -57,7 +57,7 @@ #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svxdlg.hxx> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 24a7d2c5d3d7..2065295006e9 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -32,7 +32,7 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/fmglob.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdogrp.hxx> #include <svx/svdpagv.hxx> @@ -42,7 +42,7 @@ #include "fmhelp.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmshimp.hxx" #include "fmobj.hxx" #include <sfx2/objsh.hxx> diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index 4b187bbb2b7d..a63db6e96d62 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "sqlparserclient.hxx" -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" //........................................................................ namespace svxform diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index bce51d8d43f5..37c102cb1954 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -61,7 +61,7 @@ #endif #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include <svx/dialmgr.hxx> #include <tools/shl.hxx> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index f275fd9efd72..fb13eddd15f0 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -45,11 +45,11 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif -#include "tbxctl.hxx" -#include "tbxdraw.hxx" +#include "svx/tbxctl.hxx" +#include "svx/tbxdraw.hxx" #include "tbxform.hxx" #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include "fmitems.hxx" #ifndef _SVX_FMHELP_HRC diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index f465e9d88dad..c12bb313f862 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -38,7 +38,7 @@ #include <editeng/shdditem.hxx> #include <editeng/postitem.hxx> #ifndef _SVX_CLIPBOARDCTL_HXX_ -#include "clipfmtitem.hxx" +#include "svx/clipfmtitem.hxx" #endif #include <editeng/fhgtitem.hxx> #include "editeng/fontitem.hxx" |