diff options
Diffstat (limited to 'sc/source/ui')
130 files changed, 557 insertions, 461 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 4dbc47524276..12350449ac3a 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -34,7 +34,7 @@ #include "AccessibleCell.hxx" #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "AccessibleText.hxx" @@ -61,7 +61,7 @@ #include <com/sun/star/accessibility/XAccessibleTable.hpp> #include <rtl/uuid.h> #include <tools/debug.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <comphelper/sequence.hxx> #include <float.h> diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 19cbc028bee0..8f758e63b6a9 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <tools/debug.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <rtl/uuid.h> #include <comphelper/sequence.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 8d141f0fe753..743c16dc1cd3 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -53,9 +53,9 @@ #endif #include <comphelper/sequence.hxx> #include "scitems.hxx" -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/langitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/langitem.hxx> #include "csvcontrol.hxx" #include "csvruler.hxx" #include "csvgrid.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 6228fd8a041b..21aa9cd44072 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -32,7 +32,7 @@ #include "precompiled_sc.hxx" #include "AccessibleEditObject.hxx" #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "unoguard.hxx" #include "AccessibleText.hxx" #include "editsrc.hxx" @@ -51,8 +51,8 @@ #include <rtl/uuid.h> #include <tools/debug.hxx> #include <svx/AccessibleTextHelper.hxx> -#include <svx/editview.hxx> -#include <svx/editeng.hxx> +#include <editeng/editview.hxx> +#include <editeng/editeng.hxx> #include <svx/svdmodel.hxx> using namespace ::com::sun::star; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index 0c663af87fd1..efff12bf5ae0 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -40,9 +40,9 @@ #include "docpool.hxx" #include "tools/gen.hxx" -#include "svx/unoedsrc.hxx" -#include "svx/editdata.hxx" -#include "svx/outliner.hxx" +#include "editeng/unoedsrc.hxx" +#include "editeng/editdata.hxx" +#include "editeng/outliner.hxx" #include "vcl/unohelp.hxx" #include "dpcontrol.hxx" diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 960e58760512..8ffe0d2973b7 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -56,7 +56,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <svl/style.hxx> #include <svl/itempool.hxx> -#include <svx/editobj.hxx> +#include <editeng/editobj.hxx> #include <toolkit/helper/convert.hxx> #include <algorithm> diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 0cb20b22ffb8..24a6ad3aa11b 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #endif #include <com/sun/star/accessibility/AccessibleEventId.hpp> -#include <svx/editobj.hxx> +#include <editeng/editobj.hxx> #include <svx/AccessibleTextHelper.hxx> #include <rtl/uuid.h> #include <unotools/accessiblestatesethelper.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 692472fe635a..e2e917a6a53a 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <tools/gen.hxx> #include "AccessibleText.hxx" #include "editsrc.hxx" @@ -43,7 +43,7 @@ #include "document.hxx" #include <svx/AccessibleTextHelper.hxx> #include <unotools/accessiblestatesethelper.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <vcl/window.hxx> #include <toolkit/helper/convert.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index fabd1fc932cc..a6163d4aebc1 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <tools/gen.hxx> #include "AccessibleText.hxx" #include "editsrc.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index fd01269729db..5243522edbd7 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -32,7 +32,7 @@ #include "precompiled_sc.hxx" #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <memory> @@ -48,12 +48,12 @@ #include "unoguard.hxx" #include "patattr.hxx" #include "inputwin.hxx" -#include <svx/unofored.hxx> -#include <svx/editview.hxx> -#include <svx/unoedhlp.hxx> +#include <editeng/unofored.hxx> +#include <editeng/editview.hxx> +#include <editeng/unoedhlp.hxx> #include <vcl/virdev.hxx> -#include <svx/editobj.hxx> -#include <svx/adjitem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/adjitem.hxx> #include <svx/svdmodel.hxx> #include <svx/algitem.hxx> diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 88b3d42996f6..a32bb78a5e2d 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -76,10 +76,10 @@ #include "scitems.hxx" // #108584# -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> // #108584# -#include <svx/fhgtitem.hxx> +#include <editeng/fhgtitem.hxx> #include <vcl/svapp.hxx> using namespace com::sun::star; diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index c6901707d2c3..c3e48ea3d379 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -34,24 +34,24 @@ //------------------------------------------------------------------ #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> -#include <svx/acorrcfg.hxx> +#include <editeng/acorrcfg.hxx> #include <svx/algitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/brshitem.hxx> #include <svtools/colorcfg.hxx> -#include <svx/colritem.hxx> -#include <svx/editobj.hxx> -#include <svx/editstat.hxx> -#include <svx/editview.hxx> -#include <svx/escpitem.hxx> -#include <svx/forbiddencharacterstable.hxx> -#include <svx/langitem.hxx> -#include <svx/svxacorr.hxx> -#include <svx/unolingu.hxx> -#include <svx/wghtitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editstat.hxx> +#include <editeng/editview.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/forbiddencharacterstable.hxx> +#include <editeng/langitem.hxx> +#include <editeng/svxacorr.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/wghtitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index a5b481d3174a..febf82e42109 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -34,22 +34,22 @@ #include <algorithm> #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> -#include <svx/adjitem.hxx> -#include <svx/editview.hxx> -#include <svx/editstat.hxx> -#include <svx/frmdiritem.hxx> -#include <svx/lspcitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/editview.hxx> +#include <editeng/editstat.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/lspcitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/event.hxx> #include <sfx2/imgmgr.hxx> #include <stdlib.h> // qsort -#include <svx/scriptspaceitem.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/scriptspaceitem.hxx> +#include <editeng/scripttypeitem.hxx> #include <vcl/cursor.hxx> #include <vcl/help.hxx> #include <svl/stritem.hxx> @@ -73,7 +73,7 @@ #include "rangeutl.hxx" #include "docfunc.hxx" #include "funcdesc.hxx" -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include "AccessibleEditObject.hxx" #include "AccessibleText.hxx" diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 2be737d9a717..ad30b02cc530 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -33,7 +33,7 @@ -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifndef _FM_FMOBJFAC_HXX @@ -96,7 +96,7 @@ #include <svx/selctrl.hxx> #include <svx/insctrl.hxx> #include <svx/zoomctrl.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <svx/modctrl.hxx> #include <svx/pszctrl.hxx> #include <svx/fntctl.hxx> diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index b9d8682c412b..fce37e578ee0 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -41,10 +41,10 @@ #include "scitems.hxx" #include <sfx2/app.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/flditem.hxx> -#include <svx/outliner.hxx> +#include <editeng/flditem.hxx> +#include <editeng/outliner.hxx> #include <basic/sbstar.hxx> #include <sfx2/sfxdlg.hxx> @@ -63,7 +63,7 @@ #include <sfx2/request.hxx> #include <sfx2/macrconf.hxx> #include <sfx2/printer.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <svtools/colorcfg.hxx> #include <svl/whiter.hxx> diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 7e0b43bdd156..50ff8f7674dd 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -35,7 +35,7 @@ //------------------------------------------------------------------ -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <unotools/lingucfg.hxx> #include <i18npool/mslangid.hxx> #include <com/sun/star/i18n/ScriptType.hpp> diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index c37fced30109..be758fc2e3f3 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -36,7 +36,7 @@ #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -63,8 +63,8 @@ #include "scmod.hxx" // for InitDocShell -#include <svx/paperinf.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/paperinf.hxx> +#include <editeng/sizeitem.hxx> #include <svx/algitem.hxx> #include <svl/intitem.hxx> #include <svl/zforlist.hxx> diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index 1a36b8ca5125..71979e734d0f 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -35,7 +35,7 @@ #include <svx/svxids.hrc> #include "sc.hrc" #include "scitems.hxx" - +#include <editeng/memberids.hrc> #define ITEMID_DBTYPE 0 @@ -67,24 +67,24 @@ #include <svl/stritem.hxx> #include <svl/slstitm.hxx> #include <sfx2/objitem.hxx> -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #include <svx/hlnkitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/postattr.hxx> -#include <svx/postitem.hxx> +#include <editeng/postitem.hxx> #include <sfx2/tplpitem.hxx> #include <svx/zoomitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/colritem.hxx> -#include <svx/boxitem.hxx> -#include <svx/bolnitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/bolnitem.hxx> #include <svl/ptitem.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #include <svx/algitem.hxx> #include <svx/clipfmtitem.hxx> -#include <svx/udlnitem.hxx> +#include <editeng/udlnitem.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnedit.hxx> #include <svx/xfillit0.hxx> @@ -107,14 +107,14 @@ #include <svx/xftshcit.hxx> #include <svx/xftshxy.hxx> #include <svx/xftsfit.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <svx/grafctrl.hxx> -#include <svx/shdditem.hxx> -#include <svx/shaditem.hxx> -#include <svx/cntritem.hxx> -#include <svx/crsditem.hxx> -#include <svx/brkitem.hxx> -#include <svx/charreliefitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/brkitem.hxx> +#include <editeng/charreliefitem.hxx> #include <svx/rotmodit.hxx> #include <svx/drawitem.hxx> #include <svl/ilstitem.hxx> diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 4ae240edb222..426bc6de01e2 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -33,7 +33,7 @@ -#include <svx/editobj.hxx> +#include <editeng/editobj.hxx> #include "userlist.hxx" #include "uiitems.hxx" diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 05bcf624a1b3..7954113222c2 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -54,7 +54,7 @@ #include <svx/svxdlg.hxx> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 #include <svx/flagsdef.hxx> //CHINA001 -#include <svx/flstitem.hxx> //CHINA001 +#include <editeng/flstitem.hxx> //CHINA001 #include <sfx2/app.hxx> //CHINA001 #if !LAYOUT_SFX_TABDIALOG_BROKEN diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index e33ecde514a4..4c0a26a377fe 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -46,12 +46,12 @@ // *** edit engine *** #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/colritem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/fontitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/fontitem.hxx> #include <svl/itemset.hxx> #include "editutil.hxx" // *** edit engine *** diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 603a9a3a5eea..007c24de3764 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -45,6 +45,7 @@ #include "dbcolect.hxx" #include "viewdata.hxx" #include "document.hxx" +#include "queryparam.hxx" #define _FOPTMGR_CXX #include "foptmgr.hxx" diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index fc745318b105..a7e1ca1d49bb 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -39,7 +39,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/sfxsids.hrc> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> @@ -130,7 +130,7 @@ void __EXPORT ScAreaLink::DataChanged( const String&, if (bInCreate) return; - SvxLinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); + sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); if (pLinkManager!=NULL) { String aFile; diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index e292187c80c9..09e13286e17a 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -36,11 +36,11 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> -#include <svx/editobj.hxx> -#include <svx/linkmgr.hxx> +#include <editeng/editobj.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/svdundo.hxx> #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> @@ -4551,7 +4551,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, ScDocument* pDoc = rDocShell.GetDocument(); BOOL bUndo (pDoc->IsUndoEnabled()); - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); // #i52120# if other area links exist at the same start position, // remove them first (file format specifies only one link definition diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 17cb07ca0a49..3e3c317c74cd 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -35,8 +35,8 @@ #include "scitems.hxx" -#include <svx/eeitem.hxx> -#include <svx/svxenum.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/svxenum.hxx> #include <svx/algitem.hxx> @@ -62,7 +62,7 @@ #include <sfx2/sfx.hrc> #include <sfx2/topfrm.hxx> #include <sfx2/objface.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <unotools/fltrcfg.hxx> #include <svl/documentlockfile.hxx> #include <svl/sharecontrolfile.hxx> diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 386ac8528cec..9f5af0f6dd19 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -40,7 +40,7 @@ #include "scitems.hxx" #include <tools/gen.hxx> #include <svtools/ctrltool.hxx> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/drawitem.hxx> #include <sfx2/printer.hxx> #include <svl/smplhint.hxx> @@ -48,9 +48,9 @@ #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> #include <vcl/svapp.hxx> -#include <svx/asiancfg.hxx> -#include <svx/forbiddencharacterstable.hxx> -#include <svx/unolingu.hxx> +#include <svl/asiancfg.hxx> +#include <editeng/forbiddencharacterstable.hxx> +#include <editeng/unolingu.hxx> #include <rtl/logfile.hxx> #include <comphelper/processfactory.hxx> diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 1416c57f1165..7a5f822a7b81 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -40,11 +40,11 @@ #include "scitems.hxx" #include "rangelst.hxx" -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/pageitem.hxx> -#include <svx/paperinf.hxx> +#include <editeng/paperinf.hxx> #include <svx/postattr.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #include <unotools/misccfg.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 3ab36ce131ad..f70a9569d699 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star; #include "scitems.hxx" #include <sfx2/fcontnr.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index e3f1f6904af4..5a81e181d168 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -40,7 +40,7 @@ #include <svx/pageitem.hxx> #include <vcl/virdev.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #endif // INCLUDE --------------------------------------------------------------- @@ -367,7 +367,7 @@ BOOL __EXPORT ScDocShell::Insert( SfxObjectShell &rSource, void ScDocShell::UpdateLinks() { - SvxLinkManager* pLinkManager = aDocument.GetLinkManager(); + sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager(); ScStrCollection aNames; // nicht mehr benutzte Links raus @@ -438,7 +438,7 @@ void ScDocShell::UpdateLinks() BOOL ScDocShell::ReloadTabLinks() { - SvxLinkManager* pLinkManager = aDocument.GetLinkManager(); + sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager(); BOOL bAny = FALSE; USHORT nCount = pLinkManager->GetLinks().Count(); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index e18ef20d96b9..e42368123a82 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -61,7 +61,7 @@ #include "svl/stritem.hxx" #include "svl/urihelper.hxx" #include "svl/zformat.hxx" -#include "svx/linkmgr.hxx" +#include "sfx2/linkmgr.hxx" #include "tools/urlobj.hxx" #include "unotools/ucbhelper.hxx" @@ -1061,8 +1061,11 @@ void ScExternalRefLink::DataChanged(const String& /*rMimeType*/, const Any& /*rV else { // The source document has changed. + ScDocShell* pDocShell = ScDocShell::GetViewData()->GetDocShell(); + ScDocShellModificator aMod(*pDocShell); pMgr->switchSrcFile(mnFileId, aFile, aFilter); maFilterName = aFilter; + aMod.SetDocumentModified(); } } @@ -1994,7 +1997,7 @@ void ScExternalRefManager::maybeLinkExternalFile(sal_uInt16 nFileId) String aFilter, aOptions; ScDocumentLoader::GetFilterName(*pFileName, aFilter, aOptions, true, false); - SvxLinkManager* pLinkMgr = mpDoc->GetLinkManager(); + sfx2::LinkManager* pLinkMgr = mpDoc->GetLinkManager(); ScExternalRefLink* pLink = new ScExternalRefLink(mpDoc, nFileId, aFilter); DBG_ASSERT(pFileName, "ScExternalRefManager::insertExternalFileLink: file name pointer is NULL"); pLinkMgr->InsertFileLink(*pLink, OBJECT_CLIENT_FILE, *pFileName, &aFilter); diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index aeb4b6604e67..93e23948a13b 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -36,7 +36,7 @@ #include <sot/formats.hxx> #include <sfx2/app.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include "servobj.hxx" #include "docsh.hxx" #include "impex.hxx" diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index c86c7591cd36..dcfb6bf1dc62 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -47,7 +47,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <tools/urlobj.hxx> #include <unotools/transliterationwrapper.hxx> @@ -146,7 +146,7 @@ void __EXPORT ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl ) void __EXPORT ScTableLink::DataChanged( const String&, const ::com::sun::star::uno::Any& ) { - SvxLinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); + sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); if (pLinkManager!=NULL) { String aFile; diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index e4d39e21d7be..d01171972dd5 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -34,10 +34,10 @@ //------------------------------------------------------------------ -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/fontwork.hxx> //CHINA001 #include <svx/labdlg.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/tabarea.hxx> #include <svx/tabline.hxx> //CHINA001 #include <svx/transfrm.hxx> diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index e53fea436d12..62e8d57a3f11 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -36,10 +36,10 @@ #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/fontwork.hxx> //#include <svx/labdlg.hxx> CHINA001 -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/tabarea.hxx> #include <svx/tabline.hxx> //CHINA001 #include <svx/transfrm.hxx> diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index ad36ad72e796..371277920343 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -35,8 +35,8 @@ #include <com/sun/star/embed/EmbedMisc.hpp> #include "scitems.hxx" -#include <svx/eeitem.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/sizeitem.hxx> #include <svx/svdpagv.hxx> #include <svx/xdef.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 5d8e4cb1ca33..2f58a968da66 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -35,7 +35,7 @@ //------------------------------------------------------------------ -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 8987c9194cb2..aaad25c251b6 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -35,10 +35,10 @@ //------------------------------------------------------------------ -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/fontwork.hxx> //CHINA001 #include <svx/labdlg.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/tabarea.hxx> #include <svx/tabline.hxx> //CHINA001 #include <svx/transfrm.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 908eba68cee5..6919ca748b20 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -37,26 +37,26 @@ #include "scitems.hxx" -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/clipfmtitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/crsditem.hxx> -#include <svx/editeng.hxx> -#include <svx/escpitem.hxx> -#include <svx/flditem.hxx> -#include <svx/fontitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/flditem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/hlnkitem.hxx> -#include <svx/lspcitem.hxx> +#include <editeng/lspcitem.hxx> #include <svx/svdoutl.hxx> -#include <svx/outlobj.hxx> -#include <svx/postitem.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/shdditem.hxx> -#include <svx/srchitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/postitem.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/shdditem.hxx> +#include <svl/srchitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objface.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index a1d85b1dc13a..55ccf8c1111e 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -36,15 +36,15 @@ //------------------------------------------------------------------------ #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svxdlg.hxx> -#include <svx/brkitem.hxx> -#include <svx/hyznitem.hxx> -#include <svx/orphitem.hxx> -#include <svx/outliner.hxx> -#include <svx/spltitem.hxx> -#include <svx/widwitem.hxx> +#include <editeng/brkitem.hxx> +#include <editeng/hyznitem.hxx> +#include <editeng/orphitem.hxx> +#include <editeng/outliner.hxx> +#include <editeng/spltitem.hxx> +#include <editeng/widwitem.hxx> #include <sot/exchange.hxx> #include <vcl/msgbox.hxx> #include <svtools/transfer.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 3389c362901b..69c6d8c59a38 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -32,14 +32,14 @@ #include "precompiled_sc.hxx" #include "scitems.hxx" -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/drawitem.hxx> #include <svx/fontwork.hxx> -#include <svx/frmdiritem.hxx> -#include <svx/outlobj.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdocapt.hxx> #include <svx/xtextit.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 0398d5a63b43..ccc1679c091c 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -32,20 +32,20 @@ #include "precompiled_sc.hxx" #include "fuconcustomshape.hxx" -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <svx/gallery.hxx> #include <sfx2/request.hxx> #include <svx/fmmodel.hxx> #include <svl/itempool.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdtagitm.hxx> #include "fuconuno.hxx" #include "tabvwsh.hxx" #include "sc.hrc" #include "drawview.hxx" -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <math.h> diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index a62890f7a51c..a6f1cbafd22a 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -36,7 +36,7 @@ #include "sc.hrc" #include "drawview.hxx" -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> // #98185# Create default drawing objects via keyboard #include <svx/svdopath.hxx> #include <svx/svdocapt.hxx> diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index aea0c7a1b804..5f56cd6d2987 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svx/outliner.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdotext.hxx> #include <svx/svdouno.hxx> #include <sfx2/dispatch.hxx> diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index fadb8270b6a6..8bbf00135fb0 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -33,8 +33,8 @@ //------------------------------------------------------------------------ -#include <svx/editeng.hxx> // EditEngine::IsSimpleCharInput -#include <svx/outlobj.hxx> +#include <editeng/editeng.hxx> // EditEngine::IsSimpleCharInput +#include <editeng/outlobj.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> #include <svx/svdouno.hxx> diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 35d46f234182..3ba147efa092 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -31,8 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svx/impgrf.hxx> -#include <svx/opengrf.hxx> +#include <sfx2/opengrf.hxx> #include <svx/svdograf.hxx> #include <svx/svdomedia.hxx> #include <svx/svdpage.hxx> @@ -273,7 +272,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, bAsLink = ((const SfxBoolItem*)pItem)->GetValue(); Graphic aGraphic; - int nError = ::LoadGraphic( aFileName, aFilterName, aGraphic, ::GetGrfFilter() ); + int nError = GraphicFilter::LoadGraphic( aFileName, aFilterName, aGraphic, GraphicFilter::GetGraphicFilter() ); if ( nError == GRFILTER_OK ) { lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, TRUE, pViewSh, pWindow, pView ); diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 23aefe17c71b..b186d67b59cf 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx> diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 79c466f9f2c3..11f0b36ceb23 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -35,8 +35,8 @@ #include <com/sun/star/embed/EmbedStates.hpp> -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <svx/svdoole2.hxx> #include <svx/svdotext.hxx> #include <sfx2/dispatch.hxx> @@ -44,7 +44,7 @@ #include <svx/svdouno.hxx> #include <svx/svdomedia.hxx> #include <svx/svdpagv.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdocapt.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index 7c096fd51d71..1173eebf4c0a 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -39,7 +39,7 @@ #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> #include <sfx2/dispatch.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include "fusel.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index a96ce6c18980..a0a6391b24f9 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -33,17 +33,17 @@ #include <svx/svddef.hxx> #include <svx/svdoutl.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/sdtaaitm.hxx> #include <svx/sdtacitm.hxx> #include <svx/svdotext.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/svdocapt.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svx/svxids.hrc> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include "futext.hxx" diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 2152abfd4f8b..1a55a171642c 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -31,16 +31,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svx/editeng.hxx> -#include <svx/outlobj.hxx> +#include <editeng/editeng.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> #include <svx/svdview.hxx> -#include <svx/editobj.hxx> +#include <editeng/editobj.hxx> #include <vcl/cursor.hxx> #include <sfx2/objsh.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include "global.hxx" #include "drwlayer.hxx" diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index c9da807019c9..b7327c613d9c 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -35,10 +35,10 @@ //------------------------------------------------------------------ -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/fontwork.hxx> //CHINA001 #include <svx/labdlg.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/tabarea.hxx> #include <svx/tabline.hxx> //CHINA001 #include <svx/transfrm.hxx> diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index feda9d1657f1..353d51c0f738 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -35,7 +35,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index ed57d453ef7b..577f9016c37d 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -37,7 +37,7 @@ #include "viewdata.hxx" #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <unotools/accessiblerelationsethelper.hxx> -#include <svx/AccessibleStaticTextBase.hxx> +#include <editeng/AccessibleStaticTextBase.hxx> #include <comphelper/uno3.hxx> class ScTabViewShell; diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index d7fc64c75562..1b0c49300cf9 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -41,7 +41,7 @@ #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> -#include <svx/AccessibleStaticTextBase.hxx> +#include <editeng/AccessibleStaticTextBase.hxx> #include <comphelper/uno3.hxx> #include "AccessibleContextBase.hxx" diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index 1335541087ea..f1c28966c7f5 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -33,7 +33,7 @@ #define _SC_ACCESSIBLEPAGEHEADER_HXX #include "AccessibleContextBase.hxx" -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> class ScPreviewShell; class EditTextObject; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 15a3c23c64b8..4dc548233b68 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -35,7 +35,7 @@ #ifndef _SC_ACCESSIBLE_CONTEXT_BASE_HXX #include "AccessibleContextBase.hxx" #endif -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> class EditTextObject; namespace accessibility diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index a1138e869d3b..2badcbe486f4 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -34,7 +34,7 @@ #include "textuno.hxx" #include "global.hxx" #include "viewdata.hxx" -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <memory> diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx index a0903a59abaa..e855e9328fa2 100644 --- a/sc/source/ui/inc/editsh.hxx +++ b/sc/source/ui/inc/editsh.hxx @@ -36,7 +36,7 @@ #include <tools/link.hxx> #include "shellids.hxx" -#include <svx/editview.hxx> +#include <editeng/editview.hxx> class EditView; class ScViewData; diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 2ed7b6d7c807..45845a08c843 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -35,7 +35,7 @@ #include "address.hxx" #include <tools/fract.hxx> #include <tools/gen.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> class ScDocument; class ScTabView; diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 44514766601d..27ead9f0ffce 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -32,7 +32,7 @@ #define SC_MSGPOOL_HXX #include "scitems.hxx" -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svl/itempool.hxx> diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 4009f06417dc..2896df74d818 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -53,8 +53,8 @@ #ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> #endif -#include "global.hxx" // -> ScQueryParam #include "address.hxx" +#include "queryparam.hxx" //------------------------------------------------------------------ diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx index def589536317..349fd8651b35 100644 --- a/sc/source/ui/inc/selectionstate.hxx +++ b/sc/source/ui/inc/selectionstate.hxx @@ -31,7 +31,7 @@ #ifndef SC_SELECTIONSTATE_HXX #define SC_SELECTIONSTATE_HXX -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include "rangelst.hxx" // ============================================================================ diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index eede290aa8db..da358ed6e321 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -31,9 +31,10 @@ #ifndef SC_TABVWSH_HXX #define SC_TABVWSH_HXX +#include <svtools/htmlcfg.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfac.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include "scdllapi.h" #include "dbfunc.hxx" // -> tabview #include "target.hxx" @@ -106,6 +107,7 @@ private: static USHORT nInsCellsCtrlState; static USHORT nInsObjCtrlState; + SvxHtmlOptions aHTMLOpt; ObjectSelectionType eCurOST; USHORT nDrawSfxId; USHORT nCtrlSfxId; @@ -198,6 +200,7 @@ private: DECL_LINK( SimpleRefAborted, String* ); DECL_LINK( SimpleRefChange, String* ); DECL_LINK( FormControlActivated, FmFormShell* ); + DECL_LINK( HtmlOptionsHdl, void * ); protected: virtual void Activate(BOOL bMDI); diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx index d9b21fd2f0d4..ef9be4e0a4cc 100644 --- a/sc/source/ui/inc/ui_pch.hxx +++ b/sc/source/ui/inc/ui_pch.hxx @@ -239,7 +239,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/animate.hxx> #include <vcl/graph.h> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svtools/stdctrl.hxx> #include <sfx2/basedlgs.hxx> #include <conditio.hxx> @@ -248,7 +248,7 @@ #include <uiitems.hxx> #include <svx/svdmodel.hxx> #include <vcl/gdiobj.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <svx/pageitem.hxx> #include <anyrefdg.hxx> #include <basic/sbxcore.hxx> @@ -304,10 +304,9 @@ #include <drawview.hxx> #include <svx/view3d.hxx> #include <svx/def3d.hxx> -#include <goodies/vector3d.hxx> #include <vcl/floatwin.hxx> #include <basic/sbxobj.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <svx/xtextit0.hxx> #include <svx/svdtrans.hxx> #include <svl/style.hxx> @@ -324,11 +323,11 @@ #include <fupoor.hxx> #include <docpool.hxx> #include <vcl/button.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/svdorect.hxx> #include <svl/whiter.hxx> #include <stlpool.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <inputhdl.hxx> #include <svx/svdpage.hxx> diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index bfa1603adb80..23e266bded17 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -34,6 +34,7 @@ #include "scdllapi.h" #include "conditio.hxx" #include "sortparam.hxx" +#include "queryparam.hxx" #include "paramisc.hxx" #include <svl/poolitem.hxx> diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 3e92fc5fd5fa..40d9073e2e0a 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -36,6 +36,7 @@ #include "rangelst.hxx" // ScRangeListRef #include "markdata.hxx" #include "sortparam.hxx" +#include "queryparam.hxx" #include "pivot.hxx" class ScDocShell; diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index fb29b6d673ca..50d3b567e625 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -37,16 +37,16 @@ #include "scitems.hxx" #include <svx/algitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/colritem.hxx> -#include <svx/crsditem.hxx> -#include <svx/fontitem.hxx> -#include <svx/postitem.hxx> -#include <svx/shdditem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/wghtitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/wghtitem.hxx> #include <sfx2/topfrm.hxx> #include <vcl/svapp.hxx> #include <svl/zforlist.hxx> diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 32c49cf2a3ad..77af32aa50d9 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -39,16 +39,16 @@ #include "scitems.hxx" #include <svx/algitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/colritem.hxx> -#include <svx/crsditem.hxx> -#include <svx/fontitem.hxx> -#include <svx/postitem.hxx> -#include <svx/shdditem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/wghtitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/wghtitem.hxx> #include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <comphelper/processfactory.hxx> diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index a12ad4992bff..ece28457aebe 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -42,7 +42,7 @@ #include <svx/svxids.hrc> //CHINA001 #include <svx/chardlg.hxx> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> //CHINA001 #include <svx/paragrph.hxx> //CHINA001 #include <svx/tabstpge.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 8198e6adb0f4..2425faa0cb06 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -39,7 +39,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/svdxcgv.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <sfx2/docfile.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/help.hxx> @@ -830,7 +830,7 @@ void ScContentTree::GetLinkNames() if (!pDoc) return; - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); DBG_ASSERT(pLinkManager, "kein LinkManager am Dokument?"); const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); USHORT nCount = rLinks.Count(); @@ -851,7 +851,7 @@ const ScAreaLink* ScContentTree::GetLink( ULONG nIndex ) return NULL; ULONG nFound = 0; - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); DBG_ASSERT(pLinkManager, "kein LinkManager am Dokument?"); const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); USHORT nCount = rLinks.Count(); diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index e55c8405fc34..eaf832349256 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -39,13 +39,13 @@ #define _TPHFEDIT_CXX #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> //CHINA001 #include <svx/chardlg.hxx> -#include <svx/editobj.hxx> -#include <svx/editstat.hxx> -#include <svx/editview.hxx> -#include <svx/flditem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editstat.hxx> +#include <editeng/editview.hxx> +#include <editeng/flditem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index e54dbfbca605..4bcfb8f3cdad 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -37,15 +37,15 @@ #define _TPHFEDIT_CXX #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> //CHINA001 #include <svx/chardlg.hxx> -#include <svx/editobj.hxx> -#include <svx/editstat.hxx> -#include <svx/editview.hxx> -#include <svx/flditem.hxx> -#include <svx/adjitem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editstat.hxx> +#include <editeng/editview.hxx> +#include <editeng/flditem.hxx> +#include <editeng/adjitem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index ea94566b918f..401139efedbc 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -61,7 +61,7 @@ #include <svx/svxids.hrc> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 #include <svl/intitem.hxx> //CHINA001 -#include <svx/flstitem.hxx> //CHINA001 +#include <editeng/flstitem.hxx> //CHINA001 #include <svl/aeitem.hxx> //CHINA001 #include <svx/flagsdef.hxx> //CHINA001 //================================================================== diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index a1ca8b9dabeb..d390c4448106 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.cxx @@ -37,7 +37,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <tools/debug.hxx> #include "areasave.hxx" @@ -100,7 +100,7 @@ void ScAreaLinkSaver::InsertNewLink( ScDocument* pDoc ) const { // (see ScUndoRemoveAreaLink::Undo) - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); if ( pLinkManager && pObjSh ) @@ -140,7 +140,7 @@ BOOL ScAreaLinkSaveCollection::IsEqual( const ScDocument* pDoc ) const // IsEqual can be checked in sequence. // Neither ref-update nor removing links will change the order. - SvxLinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager(); + sfx2::LinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager(); if (pLinkManager) { USHORT nPos = 0; @@ -186,7 +186,7 @@ void ScAreaLinkSaveCollection::Restore( ScDocument* pDoc ) const // Entries from the save collection must be searched via source data, as the order // of links changes if deleted entries are re-added to the link manager (always at the end). - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); if (pLinkManager) { const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); @@ -208,7 +208,7 @@ ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocum { ScAreaLinkSaveCollection* pColl = NULL; - SvxLinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager(); + sfx2::LinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager(); if (pLinkManager) { const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 200db8673cd2..09e8f452c1c6 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -45,6 +45,7 @@ #include "undodraw.hxx" #include "dbcolect.hxx" #include "attrib.hxx" +#include "queryparam.hxx" #include "globstr.hrc" // STATIC DATA ----------------------------------------------------------- diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 8cc45d41a2e6..56f7147287fa 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -40,7 +40,7 @@ #include "scitems.hxx" #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> -#include <svx/boxitem.hxx> +#include <editeng/boxitem.hxx> #include <sfx2/app.hxx> #include "undoblk.hxx" diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 4a94827ed1ec..4e3a5d9d9f08 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -34,9 +34,9 @@ // INCLUDE ------------------------------------------------------------------- #include "scitems.hxx" -#include <svx/boxitem.hxx> -#include <svx/srchitem.hxx> -#include <svx/linkmgr.hxx> +#include <editeng/boxitem.hxx> +#include <svl/srchitem.hxx> +#include <sfx2/linkmgr.hxx> #include <sfx2/bindings.hxx> #include <vcl/virdev.hxx> #include <sfx2/app.hxx> @@ -1755,7 +1755,7 @@ BOOL __EXPORT ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const //---------------------------------------------------------------------------- -ScAreaLink* lcl_FindAreaLink( SvxLinkManager* pLinkManager, const String& rDoc, +ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDoc, const String& rFlt, const String& rOpt, const String& rSrc, const ScRange& rDest ) { @@ -1819,7 +1819,7 @@ String __EXPORT ScUndoInsertAreaLink::GetComment() const void __EXPORT ScUndoInsertAreaLink::Undo() { ScDocument* pDoc = pDocShell->GetDocument(); - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aDocName, aFltName, aOptions, aAreaName, aRange ); @@ -1835,7 +1835,7 @@ void __EXPORT ScUndoInsertAreaLink::Undo() void __EXPORT ScUndoInsertAreaLink::Redo() { ScDocument* pDoc = pDocShell->GetDocument(); - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions, aAreaName, aRange.aStart, nRefreshDelay ); @@ -1909,7 +1909,7 @@ String __EXPORT ScUndoRemoveAreaLink::GetComment() const void __EXPORT ScUndoRemoveAreaLink::Undo() { ScDocument* pDoc = pDocShell->GetDocument(); - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions, aAreaName, aRange.aStart, nRefreshDelay ); @@ -1928,7 +1928,7 @@ void __EXPORT ScUndoRemoveAreaLink::Undo() void __EXPORT ScUndoRemoveAreaLink::Redo() { ScDocument* pDoc = pDocShell->GetDocument(); - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aDocName, aFltName, aOptions, aAreaName, aRange ); @@ -2074,7 +2074,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const void __EXPORT ScUndoUpdateAreaLink::Undo() { ScDocument* pDoc = pDocShell->GetDocument(); - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aNewDoc, aNewFlt, aNewOpt, aNewArea, aNewRange ); if (pLink) @@ -2093,7 +2093,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo() void __EXPORT ScUndoUpdateAreaLink::Redo() { ScDocument* pDoc = pDocShell->GetDocument(); - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aOldDoc, aOldFlt, aOldOpt, aOldArea, aOldRange ); if (pLink) diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 87f83ce7a932..dcb632a6bf2e 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -32,9 +32,9 @@ #include "precompiled_sc.hxx" #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/editobj.hxx> +#include <editeng/editobj.hxx> #include <svl/zforlist.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index e4b9ef8a8765..7d4131374767 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -34,6 +34,7 @@ #include "scitems.hxx" +#include <editeng/memberids.hrc> #include <tools/debug.hxx> #include <tools/shl.hxx> #include <svl/poolitem.hxx> diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 1d41ec3836a4..4d45802c07af 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -33,21 +33,21 @@ #include "scitems.hxx" -#include <svx/eeitem.hxx> - +#include <editeng/eeitem.hxx> +#include <svx/svdpool.hxx> #include <svx/algitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/editeng.hxx> -#include <svx/flditem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/flditem.hxx> #include <svx/fmdpage.hxx> -#include <svx/langitem.hxx> -#include <svx/linkmgr.hxx> -#include <svx/srchitem.hxx> +#include <editeng/langitem.hxx> +#include <sfx2/linkmgr.hxx> +#include <svl/srchitem.hxx> #include <svx/unomid.hxx> -#include <svx/unoprnms.hxx> -#include <svx/unotext.hxx> +#include <editeng/unoprnms.hxx> +#include <editeng/unotext.hxx> #include <svx/svdpage.hxx> #include <sfx2/bindings.hxx> #include <svl/zforlist.hxx> @@ -794,7 +794,7 @@ const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() } const SvxItemPropertySet* lcl_GetEditPropertySet() { - static SvxItemPropertySet aEditPropertySet( lcl_GetEditPropertyMap() ); + static SvxItemPropertySet aEditPropertySet( lcl_GetEditPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool() ); return &aEditPropertySet; } @@ -7681,7 +7681,7 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr // Update immer, auch wenn der Link schon da war //! Update nur fuer die betroffene Tabelle??? - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); USHORT nCount = pLinkManager->GetLinks().Count(); for ( USHORT i=0; i<nCount; i++ ) { diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 07ed8709ab01..9febe948e79e 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2935,6 +2935,9 @@ void ScChart2DataSequence::BuildDataCache() ::std::list<sal_Int32>::const_iterator itr = aHiddenValues.begin(), itrEnd = aHiddenValues.end(); for (;itr != itrEnd; ++itr, ++pArr) *pArr = *itr; + + // Clear the data series cache when the array is re-built. + m_aMixedDataCache.realloc(0); } void ScChart2DataSequence::RebuildDataCache() @@ -3127,7 +3130,6 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint if ( m_bGotDataChangedHint && m_pDocument ) { m_aDataArray.clear(); - m_aDataArray.clear(); lang::EventObject aEvent; aEvent.Source.set((cppu::OWeakObject*)this); @@ -3302,19 +3304,24 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw uno::RuntimeException(); BuildDataCache(); - sal_Int32 nCount = m_aDataArray.size(); - uno::Sequence<uno::Any> aSeq(nCount); - uno::Any* pArr = aSeq.getArray(); - ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end(); - for (; itr != itrEnd; ++itr, ++pArr) + + if (!m_aMixedDataCache.getLength()) { - if (itr->mbIsValue) - *pArr <<= itr->mfValue; - else - *pArr <<= itr->maString; - } + // Build a cache for the 1st time... - return aSeq; + sal_Int32 nCount = m_aDataArray.size(); + m_aMixedDataCache.realloc(nCount); + uno::Any* pArr = m_aMixedDataCache.getArray(); + ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end(); + for (; itr != itrEnd; ++itr, ++pArr) + { + if (itr->mbIsValue) + *pArr <<= itr->mfValue; + else + *pArr <<= itr->maString; + } + } + return m_aMixedDataCache; } // XNumericalDataSequence -------------------------------------------------- diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 3df667faad8c..83d2563fa907 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -32,7 +32,7 @@ #include "precompiled_sc.hxx" - +#include <editeng/memberids.hrc> #include <svl/smplhint.hxx> #include <svl/itemprop.hxx> #include <svx/unomid.hxx> diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index 476409fa5113..6a9415125694 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -34,14 +34,14 @@ #include "editsrc.hxx" #include "scitems.hxx" -#include <svx/eeitem.hxx> -#include <svx/unofored.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/unofored.hxx> #include <svx/svdpage.hxx> #include <svx/svditer.hxx> #include <svx/svdocapt.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> - +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> +#include <editeng/outliner.hxx> #include "textuno.hxx" #include "editutil.hxx" #include "docsh.hxx" diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 8fd4bba512eb..3ccc6c76059b 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -33,11 +33,11 @@ #include <svl/smplhint.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/editeng.hxx> -#include <svx/editobj.hxx> -#include <svx/flditem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editobj.hxx> +#include <editeng/flditem.hxx> #include <rtl/uuid.h> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx index d8dc43d86071..6f7352e5b7b3 100644 --- a/sc/source/ui/unoobj/forbiuno.cxx +++ b/sc/source/ui/unoobj/forbiuno.cxx @@ -33,7 +33,7 @@ -#include <svx/forbiddencharacterstable.hxx> +#include <editeng/forbiddencharacterstable.hxx> #include "forbiuno.hxx" #include "docsh.hxx" diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index ddb5dc3b0496..7aadfa44388f 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -34,7 +34,7 @@ #include <svl/smplhint.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include "linkuno.hxx" #include "miscuno.hxx" @@ -131,7 +131,7 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const { if (pDocShell) { - SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); USHORT nCount = pLinkManager->GetLinks().Count(); for (USHORT i=0; i<nCount; i++) { @@ -304,7 +304,7 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) ScTableLink* pLink = GetLink_Impl(); if (pLink) { - // pLink->Refresh mit neuem Dateinamen bringt SvxLinkManager durcheinander + // pLink->Refresh mit neuem Dateinamen bringt sfx2::LinkManager durcheinander // darum per Hand die Tabellen umsetzen und Link per UpdateLinks neu erzeugen String aNewStr(ScGlobal::GetAbsDocName( String(rNewName), pDocShell )); @@ -605,7 +605,7 @@ ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, USHORT nPos ) { if (pDocShell) { - SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); USHORT nTotalCount = pLinkManager->GetLinks().Count(); USHORT nAreaCount = 0; for (USHORT i=0; i<nTotalCount; i++) @@ -678,7 +678,7 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr //! Undo fuer Loeschen //! Undo zusammenfassen - SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); pLinkManager->Remove( pLink ); pLink = NULL; // bei Remove geloescht @@ -1004,7 +1004,7 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Runti { //! SetAddUndo oder so - SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); pLinkManager->Remove( pLink ); } } @@ -1026,7 +1026,7 @@ sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException) INT32 nAreaCount = 0; if (pDocShell) { - SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); USHORT nTotalCount = pLinkManager->GetLinks().Count(); for (USHORT i=0; i<nTotalCount; i++) { diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 8477d1f17779..795dc3590954 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -34,8 +34,9 @@ #include "rangelst.hxx" -#include <svx/unotext.hxx> - +#include <editeng/unotext.hxx> +#include <svx/svdpool.hxx> +#include <svx/svdobj.hxx> #include "notesuno.hxx" #include "textuno.hxx" #include "cellsuno.hxx" // getParent @@ -52,7 +53,7 @@ #include "undocell.hxx" #include "unoguard.hxx" #include "userdat.hxx" -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/unoshape.hxx> #include <svx/svdocapt.hxx> #include <svx/svditer.hxx> @@ -70,7 +71,7 @@ const SvxItemPropertySet* lcl_GetAnnotationPropertySet() { {0,0,0,0,0,0} }; - static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl ); + static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aAnnotationPropertySet_Impl; } diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 1f51bc1646af..374453925677 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -36,7 +36,7 @@ #include <tools/debug.hxx> #include <svtools/unoimap.hxx> #include <svx/unofill.hxx> -#include <svx/unonrule.hxx> +#include <editeng/unonrule.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include "servuno.hxx" @@ -60,9 +60,65 @@ // #100263# Support creation of GraphicObjectResolver and EmbeddedObjectResolver #include <svx/xmleohlp.hxx> #include <svx/xmlgrhlp.hxx> +#include <sfx2/docfile.hxx> +#include <sfx2/docfilt.hxx> +#include <com/sun/star/script/ScriptEventDescriptor.hpp> +#include <com/sun/star/document/XCodeNameQuery.hpp> +#include <com/sun/star/drawing/XDrawPagesSupplier.hpp> +#include <com/sun/star/form/XFormsSupplier.hpp> +#include <svx/unomod.hxx> using namespace ::com::sun::star; +class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery > +{ +ScDocShell* mpDocShell; +public: + ScVbaCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell ) {} + // XCodeNameQuery + rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) + { + rtl::OUString sCodeName; + if ( mpDocShell ) + { + OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject"); + // need to find the page ( and index ) for this control + uno::Reference< drawing::XDrawPagesSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW ); + sal_Int32 nLen = xIndex->getCount(); + bool bMatched = false; + uno::Sequence< script::ScriptEventDescriptor > aFakeEvents; + for ( sal_Int32 index = 0; index < nLen; ++index ) + { + try + { + uno::Reference< form::XFormsSupplier > xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW ); + // get the www-standard container + uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW ); + sal_Int32 nCntrls = xFormControls->getCount(); + for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex ) + { + uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW ); + bMatched = ( xControl == xIf ); + if ( bMatched ) + { + String sName; + mpDocShell->GetDocument()->GetCodeName( static_cast<SCTAB>( index ), sName ); + sCodeName = sName; + } + } + } + catch( uno::Exception& ) {} + if ( bMatched ) + break; + } + } + // Probably should throw here ( if !bMatched ) + return sCodeName; + } + +}; //------------------------------------------------------------------------ // @@ -119,6 +175,7 @@ static const ProvNamesId_Type __FAR_DATA aProvNamesId[] = { SC_SERVICENAME_CHDATAPROV, SC_SERVICE_CHDATAPROV }, { SC_SERVICENAME_FORMULAPARS, SC_SERVICE_FORMULAPARS }, { SC_SERVICENAME_OPCODEMAPPER, SC_SERVICE_OPCODEMAPPER }, + { "ooo.vba.VBACodeNameProvider", SC_SERVICE_VBACODENAMEPROVIDER }, // case-correct versions of the service names (#i102468#) { "com.sun.star.text.textfield.URL", SC_SERVICE_URLFIELD }, @@ -180,7 +237,8 @@ static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] = "", // SC_SERVICE_SHEETDOCSET "", // SC_SERVICE_CHDATAPROV "", // SC_SERVICE_FORMULAPARS - "" // SC_SERVICE_OPCODEMAPPER + "", // SC_SERVICE_OPCODEMAPPER + "", // SC_SERVICE_VBACODENAMEPROVIDER }; @@ -383,9 +441,23 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( ScCompiler* pComp = new ScCompiler(pDoc,aAddress); pComp->SetGrammar( pDoc->GetGrammar() ); xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp)))); + break; + } + case SC_SERVICE_VBACODENAMEPROVIDER: + { + // Only create the excel faking service for excel docs + const SfxFilter *pFilt = pDocShell->GetMedium()->GetFilter(); + if ( pFilt && pFilt->IsAlienFormat() ) + { + // application/vnd.ms-excel is the mime type for Excel + static const rtl::OUString sExcelMimeType( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.ms-excel" ) ); + if ( sExcelMimeType.equals( pFilt->GetMimeType() ) ) + xRet.set(static_cast<document::XCodeNameQuery*>(new ScVbaCodeNameProvider( pDocShell ))); + } + break; } - break; } + return xRet; } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 8a5b92d0bd8c..2530b4a27840 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -38,7 +38,7 @@ #include <svtools/unoimap.hxx> #include <svx/svdobj.hxx> #include <svx/unoshape.hxx> -#include <svx/unofield.hxx> +#include <editeng/unofield.hxx> #include <svx/shapepropertynotifier.hxx> #include <toolkit/helper/convert.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 14b271c16cb7..439274fa0262 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -34,7 +34,7 @@ #include "scitems.hxx" -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <osl/mutex.hxx> #include <rtl/uuid.h> diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 941f586a73c9..0368c83fc2bf 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -34,14 +34,15 @@ #include "scitems.hxx" +#include <editeng/memberids.hrc> #include <svx/algitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/langitem.hxx> -#include <svx/numitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/numitem.hxx> #include <svx/pageitem.hxx> -#include <svx/pbinitem.hxx> +#include <editeng/pbinitem.hxx> #include <svx/unomid.hxx> -#include <svx/unonrule.hxx> +#include <editeng/unonrule.hxx> #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> #include <vcl/virdev.hxx> diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index a9e6a799e010..145a613cb2cb 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -34,21 +34,21 @@ #include "scitems.hxx" -#include <svx/eeitem.hxx> - - -#include <svx/editeng.hxx> -#include <svx/editobj.hxx> -#include <svx/flditem.hxx> +#include <editeng/eeitem.hxx> +#include <svx/svdpool.hxx> +#include <svx/svdobj.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editobj.hxx> +#include <editeng/flditem.hxx> #include <svx/unomid.hxx> -#include <svx/unoprnms.hxx> -#include <svx/unofored.hxx> +#include <editeng/unoprnms.hxx> +#include <editeng/unofored.hxx> #include <rtl/uuid.h> #include <vcl/virdev.hxx> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> - +#include <editeng/unoipset.hxx> #include "textuno.hxx" #include "fielduno.hxx" #include "servuno.hxx" @@ -100,7 +100,7 @@ const SvxItemPropertySet * lcl_GetHdFtPropertySet() } bTwipsSet = TRUE; } - static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl ); + static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aHdFtPropertySet_Impl; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 0883c24a14f0..ff2f5d41ccbe 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -32,7 +32,7 @@ #include "precompiled_sc.hxx" - +#include <editeng/outliner.hxx> #include <svx/fmdpage.hxx> #include <svx/svditer.hxx> #include <svx/svdmark.hxx> diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index f6c58c23f79a..ad438bfafd52 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -121,7 +121,7 @@ #include <ooo/vba/excel/XlSearchDirection.hpp> #include <scitems.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <cellsuno.hxx> #include <dbcolect.hxx> #include "docfunc.hxx" diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 3f09fd0e2ff4..2ab7062ddfc2 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -36,7 +36,7 @@ //------------------------------------------------------------------ #include "scitems.hxx" -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index e9116b19c87b..5fa0c4632218 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -49,7 +49,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <svx/clipfmtitem.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include "cellsh.hxx" #include "sc.hrc" diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 6bdf172b9fb5..2e810232aa22 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -65,7 +65,7 @@ #include <svx/svxdlg.hxx> #include <sot/formats.hxx> #include <svx/postattr.hxx> -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #include <svx/clipfmtitem.hxx> #include <sfx2/passwd.hxx> #include <svx/hlnkitem.hxx> diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index ef68bbc9bd0c..91320f3b23d9 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -44,8 +44,8 @@ #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> -#include <svx/outlobj.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/writingmodeitem.hxx> #include <svx/sdrpaintwindow.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index b0f2197ad826..dcf47a71afab 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -36,25 +36,25 @@ //------------------------------------------------------------------ #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/clipfmtitem.hxx> #include <svx/svxdlg.hxx> -#include <svx/cntritem.hxx> +#include <editeng/cntritem.hxx> //CHINA001 #include <svx/chardlg.hxx> -#include <svx/crsditem.hxx> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> -#include <svx/escpitem.hxx> -#include <svx/flditem.hxx> -#include <svx/fontitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/flditem.hxx> +#include <editeng/fontitem.hxx> #include <svx/hlnkitem.hxx> -#include <svx/postitem.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/shdditem.hxx> -#include <svx/srchitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/shdditem.hxx> +#include <svl/srchitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/wghtitem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/bindings.hxx> #include <sfx2/msg.hxx> diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index fb83ed5624d6..d386371fd5ca 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -54,7 +54,7 @@ //------------------------------------------------------------------ #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> @@ -67,24 +67,24 @@ #include <svl/stritem.hxx> #include <svl/zformat.hxx> #include <svl/languageoptions.hxx> -#include <svx/boxitem.hxx> -#include <svx/langitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/langitem.hxx> #include <svx/numinf.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/templdlg.hxx> #include <sfx2/tplpitem.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <svx/algitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/bolnitem.hxx> -#include <svx/colritem.hxx> -#include <svx/brshitem.hxx> -#include <svx/frmdiritem.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/bolnitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/scripttypeitem.hxx> #include <svtools/colorcfg.hxx> -#include <svx/shaditem.hxx> +#include <editeng/shaditem.hxx> #include "formatsh.hxx" #include "sc.hrc" diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 7f78461aedb0..768332b4644d 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -34,14 +34,14 @@ #include "scitems.hxx" #include <memory> //auto_ptr -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/algitem.hxx> #include <svx/dbexch.hrc> -#include <svx/editview.hxx> -#include <svx/editstat.hxx> -#include <svx/flditem.hxx> +#include <editeng/editview.hxx> +#include <editeng/editstat.hxx> +#include <editeng/flditem.hxx> #include <svx/svdetc.hxx> -#include <svx/editobj.hxx> +#include <editeng/editobj.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> @@ -58,7 +58,7 @@ #include <sot/clsids.hxx> #include <svx/svdview.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) -#include <svx/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) +#include <editeng/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) #include <svx/svditer.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index fbff54b1408f..6455b38dbd14 100755 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -32,12 +32,12 @@ #include "precompiled_sc.hxx" #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdoutl.hxx> #include <svx/svdotext.hxx> #include <svx/svdpagv.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #include <sfx2/bindings.hxx> #include <svl/ptitem.hxx> diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 7719dfcc5474..f3b8603e3b64 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -36,14 +36,14 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svtools/colorcfg.hxx> -#include <svx/colritem.hxx> -#include <svx/editview.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/editview.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/scripttypeitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> @@ -74,6 +74,7 @@ #include "inputopt.hxx" #include "fillinfo.hxx" #include "dpcontrol.hxx" +#include "queryparam.hxx" #include "sc.hrc" #include <vcl/virdev.hxx> diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index f3d5b2781607..069598fe46a1 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -33,11 +33,11 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx> #include <svtools/imapobj.hxx> diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 9d2da303988c..22a10777a1ff 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -36,13 +36,13 @@ #include <com/sun/star/embed/EmbedMisc.hpp> #include "scitems.hxx" -#include <svx/boxitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/editdata.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/editdata.hxx> #include <svtools/colorcfg.hxx> #include <svx/rotmodit.hxx> -#include <svx/shaditem.hxx> -#include <svx/svxfont.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/svxfont.hxx> #include <svx/svdoole2.hxx> #include <tools/poly.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 700c32e4698f..f4b9fed280d2 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -37,24 +37,24 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/algitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <svtools/colorcfg.hxx> -#include <svx/colritem.hxx> -#include <svx/editobj.hxx> -#include <svx/editstat.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/forbiddencharacterstable.hxx> -#include <svx/frmdiritem.hxx> -#include <svx/langitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editstat.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/forbiddencharacterstable.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/langitem.hxx> #include <svx/rotmodit.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/unolingu.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/unolingu.hxx> #include <svl/zforlist.hxx> #include <vcl/svapp.hxx> #include <vcl/metric.hxx> diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index ffc1112667f2..8f4bc6381679 100755 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -35,7 +35,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/svdoutl.hxx> diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index 3ab72f37ac35..88f4307f9821 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -36,7 +36,7 @@ //------------------------------------------------------------------ #include "scitems.hxx" -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index 2039934a6e45..3be2187cf24e 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -36,7 +36,7 @@ //------------------------------------------------------------------ #include "scitems.hxx" -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 31121f35aa1b..4bedae499a21 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -36,12 +36,12 @@ // INCLUDE --------------------------------------------------------------- #include <tools/pstm.hxx> #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svtools/colorcfg.hxx> #include <svx/fmview.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #include <svx/svdpagv.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> @@ -68,9 +68,9 @@ #include "AccessibleDocumentPagePreview.hxx" #include <vcl/lineinfo.hxx> #include <svx/algitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/sizeitem.hxx> #include "attrib.hxx" #include "pagepar.hxx" #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index ebe58f5a0efc..97122976db6c 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -36,11 +36,11 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> -#include <svx/sizeitem.hxx> -#include <svx/srchitem.hxx> +#include <editeng/sizeitem.hxx> +#include <svl/srchitem.hxx> #include <svx/zoomslideritem.hxx> #include <svx/svdview.hxx> //CHINA001 #include <svx/zoom.hxx> diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 9c8b1f1d4ce6..5a4510a92da2 100755 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -34,25 +34,25 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "printfun.hxx" #include <svx/svxids.hrc> -#include <svx/adjitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/brshitem.hxx> #include <svtools/colorcfg.hxx> -#include <svx/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS +#include <editeng/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS #include <svx/fmview.hxx> -#include <svx/frmdiritem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/paperinf.hxx> -#include <svx/pbinitem.hxx> -#include <svx/shaditem.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/paperinf.hxx> +#include <editeng/pbinitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/sizeitem.hxx> #include <svx/svdpagv.hxx> -#include <svx/ulspitem.hxx> +#include <editeng/ulspitem.hxx> #include <sfx2/app.hxx> #include <sfx2/printer.hxx> #include <sfx2/progress.hxx> diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx index a3cdad1f046f..bf1fc61c4415 100644 --- a/sc/source/ui/view/selectionstate.cxx +++ b/sc/source/ui/view/selectionstate.cxx @@ -32,7 +32,7 @@ #include "precompiled_sc.hxx" #include "selectionstate.hxx" -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include "viewdata.hxx" // ============================================================================ diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index e2d02348fbcb..a06ee443b36b 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -36,9 +36,9 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <svx/svxids.hrc> -#include <svx/editstat.hxx> -#include <svx/editview.hxx> -#include <svx/unolingu.hxx> +#include <editeng/editstat.hxx> +#include <editeng/editview.hxx> +#include <editeng/unolingu.hxx> #include "selectionstate.hxx" #include "spelleng.hxx" diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 40b9ff5dbea7..41635da391c8 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -36,12 +36,12 @@ #include <memory> #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/langitem.hxx> -#include <svx/editobj.hxx> -#include <svx/editview.hxx> +#include <editeng/langitem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editview.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 2caaae9146fb..b23561dade98 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -36,7 +36,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <vcl/timer.hxx> diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index a19760e4c277..2ee726908cdb 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -38,11 +38,11 @@ // INCLUDE --------------------------------------------------------------- #include <rangelst.hxx> #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/editview.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/editview.hxx> #include <svx/fmshell.hxx> #include <svx/svdoole2.hxx> #include <sfx2/bindings.hxx> diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 75e961d5eeec..bdfe58be4bbc 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -36,7 +36,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/fmshell.hxx> diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 4c73d14d51be..c3d20f967779 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -39,9 +39,11 @@ #include "scitems.hxx" #include <svx/galbrws.hxx> #include <svx/imapdlg.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/templdlg.hxx> #include <sfx2/objface.hxx> +#include <sfx2/viewfrm.hxx> +#include <sfx2/bindings.hxx> #include <sfx2/app.hxx> #include <avmedia/mediaplayer.hxx> @@ -109,4 +111,9 @@ SFX_IMPL_VIEWFACTORY( ScTabViewShell, ScResId(STR_NONAME) ) //------------------------------------------------------------------ - +IMPL_LINK( ScTabViewShell, HtmlOptionsHdl, void*, EMPTYARG ) +{ + // Invalidierung, falls blinkender Text erlaubt/verboten wurde + GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE); + return 0; +} diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index c2812fdc4446..c43050997d72 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -36,7 +36,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> //CHINA001 #include <svx/zoom.hxx> diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 359c34ec3685..1f494bc90fa1 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -37,15 +37,15 @@ #include <sfx2/topfrm.hxx> #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> -#include <svx/boxitem.hxx> +#include <editeng/boxitem.hxx> #include <svx/fmshell.hxx> -#include <svx/sizeitem.hxx> -#include <svx/boxitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/boxitem.hxx> #include <svx/prtqry.hxx> #include <sfx2/request.hxx> #include <sfx2/printer.hxx> diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index 2acbeed257fa..6c62cc5b675c 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -36,7 +36,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/boxitem.hxx> +#include <editeng/boxitem.hxx> #include "tabvwsh.hxx" #include "document.hxx" diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 63f876cccf34..2021a27ef559 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -41,9 +41,9 @@ #include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <svl/zformat.hxx> -#include <svx/boxitem.hxx> +#include <editeng/boxitem.hxx> #include <svx/numinf.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/zoomslideritem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 72ffe6d5ab10..e7ada810799f 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -57,7 +57,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdouno.hxx> #include <svx/svdview.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/fontworkbar.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 9866a5aa0a0a..563d36bec2a5 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -34,13 +34,13 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "scitems.hxx" -#include <svx/editview.hxx> -#include <svx/flditem.hxx> +#include <editeng/editview.hxx> +#include <editeng/flditem.hxx> #include <svx/hlnkitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index c23eb73e1f59..02bd7fdb6ed6 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -36,18 +36,18 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/viewfrm.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/algitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <svtools/colorcfg.hxx> -#include <svx/editview.hxx> -#include <svx/editstat.hxx> -#include <svx/outliner.hxx> -#include <svx/unolingu.hxx> +#include <editeng/editview.hxx> +#include <editeng/editstat.hxx> +#include <editeng/outliner.hxx> +#include <editeng/unolingu.hxx> #include <vcl/svapp.hxx> #include <rtl/math.hxx> diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 4c1bcc9e35fe..dbe9b840a345 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -36,15 +36,15 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> #define _SVSTDARR_STRINGS -#include <svx/boxitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/srchitem.hxx> -#include <svx/linkmgr.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/scripttypeitem.hxx> +#include <svl/srchitem.hxx> +#include <sfx2/linkmgr.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> @@ -2408,7 +2408,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, if (bLink) { - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); SfxMedium* pMed = pSrcShell->GetMedium(); String aFileName = pMed->GetName(); diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index b57653af5f9b..b274cd65ddbf 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -36,17 +36,16 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/editobj.hxx> -#include <svx/editstat.hxx> -#include <svx/editview.hxx> -#include <svx/flditem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editstat.hxx> +#include <editeng/editview.hxx> +#include <editeng/flditem.hxx> #include <svx/hlnkitem.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <svx/svxerr.hxx> -#include <svx/impgrf.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> @@ -676,7 +675,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) USHORT nFilterFormat; Graphic aGraphic; - GraphicFilter* pGraphicFilter = ::GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); // GraphicProgress aGraphicProgress(&aGraphicFilter); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index a3e695e7a3f8..5d71b93a9f35 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -38,15 +38,15 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> #include <svx/algitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/editobj.hxx> -#include <svx/editview.hxx> -#include <svx/langitem.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editview.hxx> +#include <editeng/langitem.hxx> +#include <editeng/scripttypeitem.hxx> #include <sfx2/bindings.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index cc51c48f67ed..e327ff32bbc8 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -39,10 +39,9 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/dispatch.hxx> -#include <svx/charmap.hxx> -#include <svx/fontitem.hxx> -#include <svx/langitem.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/scripttypeitem.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svl/cjkoptions.hxx> |