diff options
208 files changed, 574 insertions, 641 deletions
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index e094027f9417..00268058745b 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -28,7 +28,7 @@ * ************************************************************************/ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define HID_SD_PRINT_OPTIONS (HID_SD_START + 0) diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index e3329a44af7e..360f32e880bf 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -1,4 +1,5 @@ -/************************************************************************* +/************************************************************************cherex + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -495,75 +496,75 @@ #include "sot/storinfo.hxx" #include "svtools/FilterConfigItem.hxx" -#include "svtools/aeitem.hxx" -#include "svtools/brdcst.hxx" +#include "svl/aeitem.hxx" +#include "svl/brdcst.hxx" #include "svtools/colorcfg.hxx" #include "svtools/colrdlg.hxx" #include "svtools/controldims.hrc" -#include "svtools/ctloptions.hxx" +#include "svl/ctloptions.hxx" #include "svtools/ctrlbox.hxx" #include "svtools/ctrltool.hxx" #include "svtools/ehdl.hxx" -#include "svtools/eitem.hxx" +#include "svl/eitem.hxx" #include "svtools/filedlg.hxx" #include "svtools/filter.hxx" -#include "svtools/flagitem.hxx" +#include "svl/flagitem.hxx" #include "svtools/fltcall.hxx" -#include "svtools/fltrcfg.hxx" -#include "svtools/globalnameitem.hxx" -#include "svtools/hint.hxx" -#include "svtools/historyoptions.hxx" +#include "unotools/fltrcfg.hxx" +#include "svl/globalnameitem.hxx" +#include "svl/hint.hxx" +#include "unotools/historyoptions.hxx" #include "svtools/htmlout.hxx" #include "svtools/imap.hxx" #include "svtools/imapcirc.hxx" #include "svtools/imapobj.hxx" #include "svtools/imappoly.hxx" #include "svtools/imaprect.hxx" -#include "svtools/inethist.hxx" -#include "svtools/intitem.hxx" -#include "svtools/itemiter.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemset.hxx" -#include "svtools/languageoptions.hxx" -#include "svtools/lckbitem.hxx" -#include "svtools/lingucfg.hxx" -#include "svtools/linguprops.hxx" -#include "svtools/listener.hxx" -#include "svtools/lstner.hxx" -#include "svtools/misccfg.hxx" -#include "svtools/pathoptions.hxx" -#include "svtools/poolitem.hxx" +#include "svl/inethist.hxx" +#include "svl/intitem.hxx" +#include "svl/itemiter.hxx" +#include "svl/itempool.hxx" +#include "svl/itemset.hxx" +#include "svl/languageoptions.hxx" +#include "svl/lckbitem.hxx" +#include "unotools/lingucfg.hxx" +#include "unotools/linguprops.hxx" +#include "svl/listener.hxx" +#include "svl/lstner.hxx" +#include "unotools/misccfg.hxx" +#include "unotools/pathoptions.hxx" +#include "svl/poolitem.hxx" #include "svtools/prgsbar.hxx" #include "svtools/printdlg.hxx" -#include "svtools/ptitem.hxx" -#include "svtools/rectitem.hxx" -#include "svtools/saveopt.hxx" +#include "svl/ptitem.hxx" +#include "svl/rectitem.hxx" +#include "unotools/saveopt.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/slstitm.hxx" -#include "svtools/smplhint.hxx" +#include "svl/slstitm.hxx" +#include "svl/smplhint.hxx" #include "svtools/soerr.hxx" -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #include "svtools/sores.hxx" #include "svtools/stdctrl.hxx" -#include "svtools/stritem.hxx" -#include "svtools/style.hrc" -#include "svtools/style.hxx" +#include "svl/stritem.hxx" +#include "svl/style.hrc" +#include "svl/style.hxx" #include "svtools/svmedit.hxx" -#include "svtools/svstdarr.hxx" -#include "svtools/syslocale.hxx" +#include "svl/svstdarr.hxx" +#include "unotools/syslocale.hxx" #include "svtools/tabbar.hxx" #include "svtools/treelist.hxx" -#include "svtools/undo.hxx" +#include "svl/undo.hxx" #include "svtools/unoimap.hxx" -#include "svtools/urihelper.hxx" -#include "svtools/urlbmk.hxx" -#include "svtools/useroptions.hxx" +#include "svl/urihelper.hxx" +#include "svl/urlbmk.hxx" +#include "unotools/useroptions.hxx" #include "svtools/valueset.hxx" -#include "svtools/viewoptions.hxx" -#include "svtools/visitem.hxx" -#include "svtools/whiter.hxx" +#include "unotools/viewoptions.hxx" +#include "svl/visitem.hxx" +#include "svl/whiter.hxx" #include "svtools/wmf.hxx" -#include "svtools/zforlist.hxx" +#include "svl/zforlist.hxx" #include "svx/SpellDialogChildWindow.hxx" @@ -596,7 +597,7 @@ #include "svx/editund2.hxx" #include "svx/editview.hxx" #include "svx/eeitem.hxx" -#include "svx/escherex.hxx" +#include "filter/msfilter/escherex.hxx" #include "svx/escpitem.hxx" #include "svx/extrusionbar.hxx" #include "svx/f3dchild.hxx" @@ -640,8 +641,8 @@ #include "svx/lspcitem.hxx" #include "svx/modctrl.hxx" #include "svx/msdffdef.hxx" -#include "svx/msocximex.hxx" -#include "svx/msoleexp.hxx" +#include "filter/msfilter/msocximex.hxx" +#include "filter/msfilter/msoleexp.hxx" #include "svx/numitem.hxx" #include "svx/obj3d.hxx" #include "svx/objfac3d.hxx" @@ -724,7 +725,7 @@ #include "svx/svxfont.hxx" #include "svx/svxgrahicitem.hxx" #include "svx/svxids.hrc" -#include "svx/svxmsbas.hxx" +#include "filter/msfilter/svxmsbas.hxx" #include "svx/sxciaitm.hxx" #include "svx/sxekitm.hxx" #include "svx/sxelditm.hxx" @@ -862,7 +863,7 @@ #include "vcl/field.hxx" #include "vcl/fixed.hxx" #include "vcl/font.hxx" -#include "vcl/fontcvt.hxx" +#include "unotools/fontcvt.hxx" #include "vcl/gdimtf.hxx" #include "vcl/gfxlink.hxx" #include "vcl/gradient.hxx" diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 5600302c40ff..1972ad1583d3 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -32,9 +32,9 @@ #define _SDATTR_HXX #include <com/sun/star/presentation/FadeEffect.hpp> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/sfx.hrc> #ifndef _SDATTR_HRC diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 7481759cff4c..e4122ca0d4c3 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -42,7 +42,7 @@ #include <sot/storage.hxx> #include <tools/shl.hxx> #include "sddllapi.h" -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/text/WritingMode.hpp> #include <sfx2/module.hxx> #include <vcl/vclevent.hxx> diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx index d71d6371e1d1..794f23e94b8e 100644 --- a/sd/inc/sdundo.hxx +++ b/sd/inc/sdundo.hxx @@ -31,7 +31,7 @@ #ifndef _SD_SDUNDO_HXX #define _SD_SDUNDO_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include "sddllapi.h" class SdDrawDocument; diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index ccd0619a4788..a00828a2690a 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -46,7 +46,7 @@ #include <cppuhelper/implbase7.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/unoipset.hxx> diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index f683492c2110..69ee48e58dd9 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -44,7 +44,7 @@ #include <cppuhelper/implbase5.hxx> #include <cppuhelper/basemutex.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/unoipset.hxx> diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index 5ced88e66dfe..583c74b71109 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -32,7 +32,7 @@ #define _SD_UNDOMANAGER_HXX #include "misc/scopelock.hxx" -#include <svtools/undo.hxx> +#include <svl/undo.hxx> namespace sd { diff --git a/sd/prj/build.lst b/sd/prj/build.lst index ace6165f64f3..bc8bf923f7e5 100644..100755 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,4 +1,4 @@ -sd sd : l10n animations svx stoc uui canvas NULL +sd sd : filter l10n animations svx stoc canvas NULL sd sd usr1 - all sd_mkout NULL sd sd\inc nmake - all sd_inc NULL sd sd\prj get - all sd_prj NULL diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index 306fabf0df7d..67d9cfb1e85e 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -267,7 +267,7 @@ SfxVoidItem TaskPaneShowPanel SID_TASK_PANE ( GroupId = GID_VIEW; ] -interface ViewShellBaseView : View +interface ViewShellBaseView { SID_SWITCH_SHELL [ @@ -380,7 +380,7 @@ interface ViewShellBaseView : View ] } -shell ViewShellBase : SfxViewShell +shell ViewShellBase { import ViewShellBaseView[Automation]; } diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi index 15b6f52ffc01..6d3267aacf81 100644 --- a/sd/sdi/_docsh.sdi +++ b/sd/sdi/_docsh.sdi @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -interface DrawDocument : OfficeDocument +interface DrawDocument { SID_PACKNGO // ole : ?, status : ? [ diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi index 13c979071b5c..159bd05227fc 100644 --- a/sd/sdi/docshell.sdi +++ b/sd/sdi/docshell.sdi @@ -35,7 +35,7 @@ interface ImpressDocument : DrawDocument { } -shell DrawDocShell : SfxObjectShell +shell DrawDocShell { import ImpressDocument[Automation]; } diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi index 86cb36265704..4cd3ef0c905e 100644 --- a/sd/sdi/grdocsh.sdi +++ b/sd/sdi/grdocsh.sdi @@ -35,7 +35,7 @@ interface GraphicDocument : DrawDocument { } -shell GraphicDocShell : SfxObjectShell +shell GraphicDocShell { import GraphicDocument[Automation]; } diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index 8a2c8fd971d7..7eb22a96c770 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -51,6 +51,11 @@ SDI2NAME=$(TARGET2) SIDHRCNAME=SDSLOTS.HRC SVSDI1DEPEND= \ + $(SOLARINCXDIR)$/sfx2/sfx.sdi \ + $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ + $(SOLARINCXDIR)$/svx/svx.sdi \ + $(SOLARINCXDIR)$/svx/svxitems.sdi \ + $(SOLARINCXDIR)$/svx/xoitems.sdi \ sdraw.sdi \ app.sdi \ _docsh.sdi \ @@ -67,11 +72,15 @@ SVSDI1DEPEND= \ ViewShellBase.sdi \ TaskPaneViewShell.sdi \ sdslots.hrc \ - $(SOLARINCXDIR)$/svxslots.ilb \ $(PRJ)$/inc$/app.hrc SVSDI2DEPEND= \ - sdraw.sdi \ + $(SOLARINCXDIR)$/sfx2/sfx.sdi \ + $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ + $(SOLARINCXDIR)$/svx/svx.sdi \ + $(SOLARINCXDIR)$/svx/svxitems.sdi \ + $(SOLARINCXDIR)$/svx/xoitems.sdi \ + sdraw.sdi \ app.sdi \ _docsh.sdi \ grdocsh.sdi \ @@ -85,7 +94,6 @@ SVSDI2DEPEND= \ ViewShellBase.sdi \ TaskPaneViewShell.sdi \ sdslots.hrc \ - $(SOLARINCXDIR)$/svxslots.ilb \ $(PRJ)$/inc$/app.hrc # --- Targets ------------------------------------------------------- diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi index da196204d6ca..db62ca5cdfb3 100644 --- a/sd/sdi/sdgslots.sdi +++ b/sd/sdi/sdgslots.sdi @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -import "svxslots.ilb" - module "2DADF501-1F00-101C-A2E4-00001B4C5CE7" "33A1C840-1F00-101C-A2E4-00001B4C5CE7" @@ -36,10 +34,15 @@ StarDraw [ HelpText( "StarDraw Application" ) SlotIdFile( "sdslots.hrc" ) -TypeLibFile( "sdgslots.tlb" ) ModulePrefix( "Sd" ) ] { + include "sfx2/sfxitems.sdi" + include "sfx2/sfx.sdi" + include "svx/svxitems.sdi" + include "svx/xoitems.sdi" + include "svx/svx.sdi" + item UINT16 TbxImageItem; enum FadeEffect diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi index 83060f6dd36c..208613595b65 100644 --- a/sd/sdi/sdslots.sdi +++ b/sd/sdi/sdslots.sdi @@ -28,8 +28,6 @@ * ************************************************************************/ -import "svxslots.ilb" - module "2DADF501-1F00-101C-A2E4-00001B4C5CE7" "33A1C840-1F00-101C-A2E4-00001B4C5CE7" @@ -37,10 +35,15 @@ StarDraw [ HelpText( "StarDraw Application" ) SlotIdFile( "sdslots.hrc" ) -TypeLibFile( "sdslots.tlb" ) ModulePrefix( "Sd" ) ] { + include "sfx2/sfxitems.sdi" + include "sfx2/sfx.sdi" + include "svx/svxitems.sdi" + include "svx/xoitems.sdi" + include "svx/svx.sdi" + item UINT16 TbxImageItem; enum FadeEffect diff --git a/sd/sdi/svxitems.sdi b/sd/sdi/svxitems.sdi deleted file mode 100644 index 42d036d4e9d8..000000000000 --- a/sd/sdi/svxitems.sdi +++ /dev/null @@ -1,93 +0,0 @@ -enum SvxAdjust -{ - SVX_ADJUST_LEFT, - SVX_ADJUST_RIGHT, - SVX_ADJUST_BLOCK, - SVX_ADJUST_CENTER, - SVX_ADJUST_BLOCKLINE, - SVX_ADJUST_END -} - -item -{ - INT16 Red; - INT16 Green; - INT16 Blue; -} SvxColorItem - -item SvxAdjust SvxAdjustItem; - -item String SvxBoxInfoItem; - -item String SvxBoxItem; -item String SvxBrushItem; -item String SvxCaseMapItem; -item String SvxCharSetColorItem; -item String SvxColumnItem; -item String SvxContourItem; -item String SvxCrossedOutItem; -item String SvxDBDescMgr; -item String SvxDbTypeItem; -item String SvxEscapementItem; -item String SvxFmtBreakItem; -item String SvxFmtSplitItem; -item String SvxFontHeightItem; -item String SvxFontItem; -item String SvxFontListItem; -item String SvxHyphenZoneItem; -item String SvxInFrameItem; -item String SvxKerningItem; -item String SvxLRSpaceItem; -item String SvxLanguageItem; -item String SvxLineSpacingItem; -item String SvxMacroItem; -item String SvxNoHyphenItem; -item String SvxNoLinebreakItem; -item String SvxNumberInfoItem; -item String SvxOpaqueItem; -item String SvxOrphansItem; -item String SvxOverlineItem; -item String SvxPageItem; -item String SvxPageModelItem; -item String SvxPagePosSizeItem; -item String SvxPaperBinItem; -item String SvxParaDlgLimitsItem; -item String SvxPostItAuthorItem; -item String SvxPostItDateItem; -item String SvxPostItTextItem; -item String SvxPostureItem; -item String SvxPrintItem; -item String SvxPropSizeItem; -item String SvxProtectItem; -item String SvxPtrItem; -item String SvxRulerItem; -item String SvxSearchItem; -item String SvxSearchControllerItem; -item String SvxSearchItem; -item String SvxSetItem; -item String SvxShadowedItem; -item String SvxShadowItem; -item String SvxSizeItem; -item String SvxTabStopItem; -item String SvxULSpaceItem; -item String SvxUnderlineItem; -item String SvxWeightItem; -item String SvxWidowsItem; -item String SvxWordLineModeItem; -item String XFillAttrSetItem; -item String XFillBitmapItem; -item String XFillColorItem; -item String XFillGradientItem; -item String XFillHatchItem; -item String XFillStyleItem; -item String XLineAttrSetItem; -item String XLineColorItem; -item String XLineDashItem; -item String XLineEndItem; -item String XLineEndWidthItem; -item String XLineEndCenterItem; -item String XLineStartItem; -item String XLineStartWidthItem; -item String XLineStartCenterItem; -item String XLineStyleItem; -item String XLineWidthItem; diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index cf5d94c420ce..6a732e58a405 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -44,7 +44,7 @@ #include <tools/urlobj.hxx> #include <unotools/streamwrap.hxx> #include <comphelper/processfactory.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/stream.hxx> #include <tools/debug.hxx> diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 563026fdc1ac..59251f62eb6f 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -43,7 +43,7 @@ #include <tools/urlobj.hxx> #include <unotools/streamwrap.hxx> #include <comphelper/processfactory.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/stream.hxx> #include <rtl/uri.hxx> diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index 8d06ae3d0fcd..d5ffdd562a74 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include <tools/urlobj.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include "svx/xtable.hxx" #include <svx/svdopath.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/flditem.hxx> #include <svx/eeitem.hxx> diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index d5cd14a80b65..c86296a90997 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -42,11 +42,8 @@ #include <svx/eeitem.hxx> #include <svx/scriptspaceitem.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> -#ifndef _OFA_MISCCFG_HXX -#include <svtools/misccfg.hxx> -#endif #include <sfx2/printer.hxx> #include <sfx2/topfrm.hxx> #include <sfx2/app.hxx> @@ -57,30 +54,30 @@ #include <svx/eeitem.hxx> #include <svx/editstat.hxx> #include <svx/fontitem.hxx> -#include <svtools/flagitem.hxx> +#include <svl/flagitem.hxx> #include <svx/svdoattr.hxx> #include <svx/svdotext.hxx> #include <svx/bulitem.hxx> #include <svx/numitem.hxx> #include <svx/svditer.hxx> #include <svx/unolingu.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svx/xtable.hxx> #include <com/sun/star/linguistic2/XHyphenator.hpp> #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <svx/outlobj.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <comphelper/extract.hxx> #include <i18npool/mslangid.hxx> #include <unotools/charclass.hxx> #include <comphelper/processfactory.hxx> #ifndef _SVTOOLS_PATHOPTIONS_HXX_ -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif -#include <svtools/lingucfg.hxx> -#include <svtools/linguprops.hxx> +#include <unotools/lingucfg.hxx> +#include <unotools/linguprops.hxx> #include "eetext.hxx" #include "drawdoc.hxx" @@ -262,7 +259,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) } // DefTab und SpellOptions setzen - //OfaMiscCfg* pOfaMiscCfg = SFX_APP()->GetMiscConfig(); // Jetzt am Modul (SD) USHORT nDefTab = pOptions->GetDefTab(); SetDefaultTabulator( nDefTab ); diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 0513e1d02083..e208399d636f 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -49,7 +49,7 @@ #include <vcl/svapp.hxx> #include <svx/eeitem.hxx> #include <svx/langitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/svdpool.hxx> #include <svx/flditem.hxx> diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 6beaee7082eb..9c44f9edc485 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -44,13 +44,13 @@ #include <sfx2/docfile.hxx> #include <sot/storage.hxx> #include <sfx2/app.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <unotools/ucbstreamhelper.hxx> #include <sfx2/fcontnr.hxx> #include <svx/svdopath.hxx> #include <svx/svditer.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/linkmgr.hxx> #include <svx/svdpagv.hxx> #include <svx/svdogrp.hxx> diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 413323d27e97..862c383f043b 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -102,7 +102,7 @@ #include <svx/unolingu.hxx> #include <com/sun/star/linguistic2/XHyphenator.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/outlobj.hxx> #include <sfx2/viewfrm.hxx> #include <svx/langitem.hxx> @@ -119,7 +119,7 @@ #include "shapelist.hxx" #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> using ::rtl::OUString; using namespace ::com::sun::star; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 14e60b3c5807..69d1d0203936 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -54,7 +54,7 @@ #include <basic/basmgr.hxx> #include <svx/pbinitem.hxx> #include <svx/svdundo.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/adjitem.hxx> #include <svx/editobj.hxx> #ifndef _SVX_SRIPTTYPEITEM_HXX diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 3f03640c27fb..047431bec461 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -39,7 +39,7 @@ #include <svx/svdotext.hxx> #include <tools/urlobj.hxx> #include <svx/outlobj.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/xmlcnitm.hxx> #include <svx/svditer.hxx> #include <tools/list.hxx> @@ -60,7 +60,7 @@ // #90477# #include <tools/tenccvt.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> using namespace ::sd; using namespace ::com::sun::star; diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index 9f6bc230359b..e90b55243726 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -37,7 +37,7 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/unoprov.hxx> diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 708ed0b3c8b0..8c156af32038 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -42,14 +42,14 @@ #include <svx/wghtitem.hxx> #include <svx/postitem.hxx> #include <svx/fontitem.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/xfillit0.hxx> #include <svx/xlineit0.hxx> #include <svx/ulspitem.hxx> #include <svx/numitem.hxx> #include <svx/brshitem.hxx> #include <svx/editeng.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/langitem.hxx> #include <svx/charreliefitem.hxx> #ifndef _SVX_EMPHITEM_HXX @@ -64,7 +64,7 @@ #include <svx/bulitem.hxx> #include <svx/lrspitem.hxx> #include <svx/adjitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #define _SDR_POSITIVE #define _SDR_ITEMS @@ -78,7 +78,7 @@ #include "sdmod.hxx" #include "sdpage.hxx" #include "helpids.h" -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 04a8c36263ef..d80881304b17 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -46,8 +46,8 @@ #include <svx/fhgtitem.hxx> #include <svx/svdoattr.hxx> #include <svx/ulspitem.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/itemset.hxx> +#include <svl/smplhint.hxx> +#include <svl/itemset.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbstit.hxx> diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 7223cf193cbd..c3f69a675e10 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -43,13 +43,13 @@ #include <svx/wghtitem.hxx> #include <svx/postitem.hxx> #include <svx/fontitem.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/tstpitem.hxx> #include <svx/lrspitem.hxx> #include <svx/protitem.hxx> #include <svx/chrtitem.hxx> -#include <svtools/globalnameitem.hxx> +#include <svl/globalnameitem.hxx> #include <svx/hlnkitem.hxx> #include <svx/postattr.hxx> #include <svx/editdata.hxx> @@ -96,9 +96,9 @@ #include <svx/drawitem.hxx> // #UndoRedo# -#include <svtools/slstitm.hxx> +#include <svl/slstitm.hxx> -#include <svtools/lckbitem.hxx> +#include <svl/lckbitem.hxx> #define CharSetItem SfxUInt16Item @@ -129,8 +129,8 @@ #define OfaStringListItem SfxStringListItem #define avmedia_MediaItem ::avmedia::MediaItem #include <sfx2/tplpitem.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/rectitem.hxx> +#include <svl/ptitem.hxx> +#include <svl/rectitem.hxx> #include <sfx2/frame.hxx> diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index b843fd06009f..68719b132bb7 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -33,7 +33,7 @@ #include <osl/module.hxx> #include <tools/urlobj.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <svx/xflclit.hxx> diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index ef697cfa9733..cf66d81a0d6c 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -58,10 +58,11 @@ #include <tools/zcodec.hxx> #include <svx/svxenum.hxx> #include <sot/storinfo.hxx> -#include <svx/msoleexp.hxx> +#include <filter/msfilter/msoleexp.hxx> #include <vcl/virdev.hxx> #include <svtools/wmf.hxx> -#include <svx/msdffimp.hxx> +#include <filter/msfilter/msdffimp.hxx> +#include <filter/msfilter/svxmsbas.hxx> #include <svx/flditem.hxx> #include <sfx2/docinf.hxx> @@ -2467,3 +2468,38 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI ExportPPT( SvStorageRef& rS return bStatus; } +extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) +{ + SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) ); + SvxImportMSVBasic aMSVBas( rDocShell, *xDest, FALSE, FALSE ); + aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + + SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) + { + SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) + { + SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) ); + if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) + { + UINT32 nLen = xTemp->GetSize(); + if ( nLen ) + { + char* pTemp = new char[ nLen ]; + if ( pTemp ) + { + xTemp->Seek( STREAM_SEEK_TO_BEGIN ); + xTemp->Read( pTemp, nLen ); + pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ ); + pBas->ObjectOwnsMemory( TRUE ); + return TRUE; + } + } + } + } + } + + return FALSE; +} + diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 2ef66bb9be75..af2c1d5ed6bf 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -38,7 +38,7 @@ #include <sot/storage.hxx> #include <tools/gen.hxx> #include <vcl/graph.hxx> -#include <vcl/fontcvt.hxx> +#include <unotools/fontcvt.hxx> #include <tools/string.hxx> #include "pptexanimations.hxx" #include <pptexsoundcollection.hxx> @@ -85,7 +85,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/style/TabStop.hpp> -#include <svx/msocximex.hxx> +#include <filter/msfilter/msocximex.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index fbb46dc20b0f..361970345430 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -46,7 +46,7 @@ #include <vcl/virdev.hxx> #include <vcl/gradient.hxx> #include <sfx2/app.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> //#ifndef _SVX_XIT_HXX //#include <svx/xit.hxx> //#endif diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index 1ebebe8a5504..577531d9f534 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -30,7 +30,7 @@ #ifndef _PptEscherEX_HXX #define _PptEscherEX_HXX -#include <svx/escherex.hxx> +#include <filter/msfilter/escherex.hxx> // --------------------------------------------------------------------------------------------- // Werte fuer den ULONG im PPT_PST_TextHeaderAtom diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index 78dbb731ef0b..effbe3381cea 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -38,7 +38,7 @@ #include "../ppt/pptanimations.hxx" #endif #include <pptexsoundcollection.hxx> -#include <svx/escherex.hxx> +#include <filter/msfilter/escherex.hxx> #ifdef DBG_ANIM_LOG #include <stdio.h> diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index bb3c114f603f..5ef6123fdddf 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -60,7 +60,7 @@ // -- #include <comphelper/processfactory.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index c2942f6b5b8f..2671452a0a3b 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -42,7 +42,7 @@ #include <vcl/graph.hxx> #include <vcl/virdev.hxx> #include <vcl/image.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <boost/shared_ptr.hpp> diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 6e2a7feb5240..e84d2b429ae3 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -40,7 +40,7 @@ #include <comphelper/processfactory.hxx> #include <osl/file.hxx> #include <tools/fsys.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/FilterConfigItem.hxx> #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> @@ -50,7 +50,7 @@ #include <sfx2/progress.hxx> #include <sfx2/progress.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/svditer.hxx> #include <svtools/imaprect.hxx> #include <svtools/imapcirc.hxx> @@ -75,9 +75,9 @@ #include <svx/flditem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/fcontnr.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> //#ifndef _SVDETC_HXX //#include <svx/svdetc.hxx> //#endif diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index d139940bfa97..2512c99e72d4 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <vcl/gdimtf.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "resltn.hxx" // enum PublishingResolution #include <svtools/colrdlg.hxx> #include <svtools/ehdl.hxx> diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index aec387604488..6d9860740740 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -44,14 +44,14 @@ #include <vcl/fixed.hxx> #include <vcl/combobox.hxx> #include <svtools/svmedit.hxx> -#include <svtools/intitem.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/aeitem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <svtools/valueset.hxx> #include <vcl/graph.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/impgrf.hxx> #include <svtools/colrdlg.hxx> #include <svx/colritem.hxx> @@ -60,8 +60,8 @@ #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> #include <pres.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/pathoptions.hxx> #include "sdresid.hxx" #include "sdattr.hxx" diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index 9ccd845d14e6..14a7f81b4e98 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -32,6 +32,7 @@ #define _PPTATOM_HXX_ #include <svx/msdffdef.hxx> +#include <filter/msfilter/msdffimp.hxx> class SvStream; diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index c495c69a55e8..37277a17c97b 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -35,20 +35,20 @@ #include <unotools/ucbstreamhelper.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/svxids.hrc> -#include <svx/svdfppt.hxx> +#include <filter/msfilter/svdfppt.hxx> #include <svx/svditer.hxx> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> #include <svx/svdograf.hxx> #include <svx/svdlayer.hxx> #include <vcl/msgbox.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/xflclit.hxx> #include <svx/eeitem.hxx> #include <svx/colritem.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/xgrad.hxx> #include <svx/xflgrit.hxx> #include <svx/xbtmpit.hxx> @@ -75,7 +75,7 @@ #include <svx/gallery.hxx> #include <tools/urlobj.hxx> #include <svx/numitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/fhgtitem.hxx> #include <svx/svdopage.hxx> #include <svx/svdomedia.hxx> @@ -88,11 +88,11 @@ #include "../../ui/inc/FrameView.hxx" #include "../../ui/inc/optsitem.hxx" -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include <sfx2/progress.hxx> #include <unotools/localfilehelper.hxx> #include <svx/editstat.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/docfac.hxx> #define MAX_USER_MOVE 2 diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 59d59eece151..0549f8fa85c0 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -31,11 +31,11 @@ #ifndef _SD_PPTIN_HXX #define _SD_PPTIN_HXX -#include <svx/svdfppt.hxx> +#include <filter/msfilter/svdfppt.hxx> #include <svx/msdffdef.hxx> #include <diadef.h> #include <svx/svdtypes.hxx> -#include <svx/msfiltertracer.hxx> +#include <filter/msfilter/msfiltertracer.hxx> #include <com/sun/star/uno/Any.h> #include <boost/shared_ptr.hpp> diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 114f471a3cef..e53a2c406f36 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -34,15 +34,13 @@ #include <com/sun/star/animations/XTimeContainer.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> -#ifndef _SD_PPTANIMATIONS_HXX #include "pptanimations.hxx" -#endif #include <animations.hxx> #ifdef DBG_ANIM_LOG #include <stdio.h> #endif -#include <svx/svdfppt.hxx> +#include <filter/msfilter/svdfppt.hxx> #include <list> diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 3507a71526cf..657d658e22d0 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -39,7 +39,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/progress.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "../ui/inc/DrawDocShell.hxx" #include "../ui/inc/strings.hrc" diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 8c1674dbf789..8dea30f1659a 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -34,16 +34,16 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <osl/module.hxx> -#include <svx/msoleexp.hxx> -#include <svx/svxmsbas.hxx> +#include <filter/msfilter/msoleexp.hxx> +#include <filter/msfilter/svxmsbas.hxx> #include <svx/svxerr.hxx> -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include "sdpptwrp.hxx" #include "ppt/pptin.hxx" #include "drawdoc.hxx" #include <tools/urlobj.hxx> -#include <svx/msfiltertracer.hxx> +#include <filter/msfilter/msfiltertracer.hxx> // -------------- // - Namespaces - @@ -54,7 +54,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; - typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&, Reference< XModel > &, Reference< XStatusIndicator > &, @@ -63,6 +62,8 @@ typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&, typedef sal_Bool ( SAL_CALL *ImportPPT )( const ::rtl::OUString&, Sequence< PropertyValue >*, SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); +typedef BOOL ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& ); + // --------------- // - SdPPTFilter - // --------------- @@ -188,32 +189,13 @@ void SdPPTFilter::PreSaveBasic() SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get(); if( pFilterOptions && pFilterOptions->IsLoadPPointBasicStorage() ) { - SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) ); - SvxImportMSVBasic aMSVBas( (SfxObjectShell&) mrDocShell, *xDest, FALSE, FALSE ); - aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); - - SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); - if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) + ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); + if( pLibrary ) { - SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); - if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) + SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("SaveVBA") )); + if( pSaveVBA ) { - SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) ); - if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) - { - UINT32 nLen = xTemp->GetSize(); - if ( nLen ) - { - char* pTemp = new char[ nLen ]; - if ( pTemp ) - { - xTemp->Seek( STREAM_SEEK_TO_BEGIN ); - xTemp->Read( pTemp, nLen ); - pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ ); - pBas->ObjectOwnsMemory( TRUE ); - } - } - } + pSaveVBA( (SfxObjectShell&) mrDocShell, pBas ); } } } diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 16930a81b055..5fa918db31ef 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -32,10 +32,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <svtools/style.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> -#include <svtools/whiter.hxx> +#include <svl/style.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/whiter.hxx> #include <svx/svdoutl.hxx> #include <svx/xmlcnitm.hxx> diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 6f9e0d7b71da..6aac1c1c3967 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -67,11 +67,11 @@ #include <com/sun/star/io/XActiveDataControl.hpp> #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> // #80365# include necessary for XML progress bar at load time -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> #include <svtools/sfxecode.hxx> #include "sderror.hxx" diff --git a/sd/source/ui/animations/AnimationSchemesPane.cxx b/sd/source/ui/animations/AnimationSchemesPane.cxx index 02a230650583..51ddad2fb97d 100644 --- a/sd/source/ui/animations/AnimationSchemesPane.cxx +++ b/sd/source/ui/animations/AnimationSchemesPane.cxx @@ -49,7 +49,7 @@ #include <svtools/controldims.hrc> #endif #include <svx/gallery.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index ce651b2965be..ea59e0773261 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -53,7 +53,7 @@ #include <svx/svdetc.hxx> #include <svx/svdstr.hrc> #include "sdresid.hxx" -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #include <com/sun/star/presentation/EffectNodeType.hpp> #include "CustomAnimationCreateDialog.hxx" #ifndef _SD_CUSTOMANIMATIONCREATEDIALOG_HRC diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index dc7a27ab5c53..9a1634a7f695 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -52,7 +52,7 @@ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> #endif -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> #include <vcl/menubtn.hxx> diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 13400964c18b..4a235e3cd9af 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -51,7 +51,7 @@ #include <svtools/controldims.hrc> #endif #include <svx/gallery.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include "DrawViewShell.hxx" diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index bbc9bbd539f3..e3076ec22bbe 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -45,11 +45,11 @@ #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> -#include <svtools/style.hxx> -#include <svtools/itempool.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/syslocale.hxx> -#include <svtools/saveopt.hxx> +#include <svl/style.hxx> +#include <svl/itempool.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/syslocale.hxx> +#include <unotools/saveopt.hxx> #include <sfx2/imagemgr.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index ae3c65a2b4d5..2a7ca2df9b0d 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -57,11 +57,11 @@ #include <svx/crsditem.hxx> #include <svtools/langtab.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/securityoptions.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/languageoptions.hxx> -#include <svtools/zforlist.hxx> +#include <svl/slstitm.hxx> +#include <unotools/securityoptions.hxx> +#include <unotools/useroptions.hxx> +#include <svl/languageoptions.hxx> +#include <svl/zforlist.hxx> #include <svtools/svmedit.hxx> #include <linguistic/lngprops.hxx> diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 673e00477d46..b62bba0435ef 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -36,7 +36,7 @@ #ifndef _SV_SALBTYPE_HRC //autogen #include <vcl/salbtype.hxx> #endif -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include "app.hxx" #include "optsitem.hxx" @@ -74,6 +74,10 @@ void SdOptionsItem::Commit() mrParent.Commit( *this ); }; +void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) +{} + + // ----------------------------------------------------------------------------- Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 4796be585d1e..77ef817e4c44 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -29,7 +29,7 @@ ************************************************************************/ #include <sfx2/sfx.hrc> -#include <svtools/style.hrc> +#include <svl/style.hrc> #include "glob.hrc" #include "res_bmp.hrc" diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index c2ab152d950b..7cdec8c9f36b 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -34,7 +34,7 @@ #include <svx/editeng.hxx> #include <svx/svdobj.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #ifndef _FM_FMOBJFAC_HXX #include <svx/fmobjfac.hxx> #endif diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx index 2ef0815aed3c..6b525a0b3f90 100644 --- a/sd/source/ui/app/sddll1.cxx +++ b/sd/source/ui/app/sddll1.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include "sddll.hxx" #include "diactrl.hxx" #include "tbx_ww.hxx" diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 957b1aa0475b..0e68a487b6e2 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -30,8 +30,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <svtools/pathoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <svl/languageoptions.hxx> #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> #endif @@ -39,14 +39,14 @@ #include <vcl/virdev.hxx> #include <sfx2/app.hxx> #include <vcl/status.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/msg.hxx> #include <sfx2/objface.hxx> #include <sfx2/printer.hxx> #include <svx/pszctrl.hxx> #include <svx/zoomctrl.hxx> #include <svx/modctrl.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> #include <svtools/ehdl.hxx> diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 4144b4afb774..65485d9df447 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <svtools/lckbitem.hxx> +#include <svl/lckbitem.hxx> #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include "framework/FrameworkHelper.hxx" #include <svx/dialogs.hrc> @@ -49,7 +49,7 @@ #include <sfx2/docfile.hxx> #include <svx/paperinf.hxx> #include <svx/eeitem.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include "app.hrc" #include "glob.hrc" diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index bbf80e942602..0a4eaf0bbebe 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -33,10 +33,10 @@ #include <svx/eeitem.hxx> #include <svx/flditem.hxx> #include <sfx2/printer.hxx> -#include <svtools/inethist.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/flagitem.hxx> -#include <svtools/useroptions.hxx> +#include <svl/inethist.hxx> +#include <svl/poolitem.hxx> +#include <svl/flagitem.hxx> +#include <unotools/useroptions.hxx> #include <sfx2/bindings.hxx> #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> @@ -85,7 +85,7 @@ #include "sdabstdlg.hxx" #include "tpoption.hrc" #include "prntopts.hrc" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> /** retrieves the page that is currently painted. This will only be the master page if the current drawn view only shows the master page*/ diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 211e3a1fd02e..274a99f830e5 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -36,10 +36,10 @@ #include <svx/editeng.hxx> #include <svx/flditem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include "strings.hrc" #include "sdpopup.hxx" diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index f22af4ad2887..7a57c81178b6 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -49,13 +49,13 @@ #include <svx/svdotext.hxx> #include <svx/outlobj.hxx> #include <sot/storage.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/editobj.hxx> #include <svx/fmglob.hxx> #include <svx/svdouno.hxx> #include <tools/urlobj.hxx> #include <sot/formats.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <svx/outliner.hxx> //#ifndef _SVDETC_HXX //autogen diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 4318f8f9b4ac..269486d56e92 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -35,7 +35,7 @@ #include <sfx2/bindings.hxx> #include <svx/svxids.hrc> #include <svx/grafctrl.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include <sfx2/viewsh.hxx> #ifndef _SFX_IMAGEMGR_HXX #include <sfx2/imagemgr.hxx> diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index ce7f1ff28acc..86f0e4db6e10 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -37,8 +37,8 @@ #include <vcl/menu.hxx> #include <vcl/status.hxx> -#include <svtools/style.hxx> -#include <svtools/stritem.hxx> +#include <svl/style.hxx> +#include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> #include "tmplctrl.hxx" diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index ac3149d4cadf..735af8c95042 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -38,7 +38,7 @@ #include <svx/gallery.hxx> #include <svx/colritem.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <vcl/msgbox.hxx> #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 84d030867abb..9b0e9d118927 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -39,7 +39,7 @@ #include <svx/xoutbmp.hxx> #include <time.h> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index 0acea6b8d033..b0a353c42b2f 100644 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -35,8 +35,8 @@ #undef SD_DLLIMPLEMENTATION #endif -#include <svtools/style.hxx> -#include <svtools/intitem.hxx> +#include <svl/style.hxx> +#include <svl/intitem.hxx> #include <svx/dialogs.hrc> #include <svx/drawitem.hxx> diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 13ad351c7b24..ea89fba79500 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -41,7 +41,7 @@ #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include <sfx2/doctempl.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/objsh.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> @@ -49,7 +49,7 @@ #include <com/sun/star/presentation/FadeEffect.hpp> #include <fadedef.h> #include <sfx2/sfxsids.hrc> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include "DrawDocShell.hxx" #include <vcl/gdimtf.hxx> #include <vcl/wintypes.hxx> @@ -66,7 +66,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XImageManager.hpp> -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #include <tools/urlobj.hxx> #include <osl/file.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 0b394d57702b..a1781ec2d9dc 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -36,7 +36,7 @@ #endif #include <sfx2/docfile.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include "sdpage.hxx" #include "Outliner.hxx" diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 33b3a777b68b..d4a75fb8dd3d 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svtools/dateitem.hxx> +#include <svl/dateitem.hxx> #include "drawdoc.hxx" #include <svx/svdotext.hxx> #include <svtools/svtreebx.hxx> diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 6cee99175fcc..254e3f6dcfa2 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -44,7 +44,7 @@ #include "sdresid.hxx" #include "dlg_char.hxx" #include <svx/svxids.hrc> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> /************************************************************************* |* diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 99fcace44186..19fb96a6e4d9 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -40,12 +40,12 @@ #include <svx/editeng.hxx> #include <svx/eeitem.hxx> #include <svx/flditem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/langitem.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include "strings.hrc" #include "dlgfield.hrc" diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index a7988b850214..dbe0e252f7eb 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -48,11 +48,11 @@ #include <svx/numitem.hxx> #include <svx/dialogs.hrc> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svdmark.hxx> #include "View.hxx" #include <svx/svdobj.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <drawdoc.hxx> #ifndef _SD_SDRESID_HXX @@ -64,7 +64,7 @@ #include "bulmaper.hxx" #include "DrawDocShell.hxx" #include <svx/svxids.hrc> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> namespace sd { diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index bf5eb5da7c39..2145e477e476 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -35,7 +35,7 @@ #undef SD_DLLIMPLEMENTATION #endif -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif @@ -48,7 +48,7 @@ #include "dlgpage.hxx" #include "DrawDocShell.hxx" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/flagsdef.hxx> #include <svx/svxenum.hxx> diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 5a232649251e..fc541e7925e8 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -38,8 +38,8 @@ #include <svx/svxids.hrc> #include <svx/dlgutil.hxx> -#include <svtools/itempool.hxx> -#include <svtools/aeitem.hxx> +#include <svl/itempool.hxx> +#include <svl/aeitem.hxx> #include "dlgsnap.hrc" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 1fea04cf31ab..a4f4e99d2463 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -36,7 +36,7 @@ #include <svx/dialogs.hrc> #include <svx/svdglue.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index cb9ade5336f8..3414f779cad8 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -34,7 +34,7 @@ #ifdef SD_DLLIMPLEMENTATION #undef SD_DLLIMPLEMENTATION #endif -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "strings.hrc" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 6d34834ccab9..f43472d58ace 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -47,8 +47,8 @@ #include <svx/xlineit0.hxx> #include <svx/xenum.hxx> #include <svx/svdobj.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> namespace sd { diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index f251f6964263..db2e69e6038c 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -36,11 +36,11 @@ #include <unotools/localfilehelper.hxx> #include <sfx2/imgmgr.hxx> #include <sfx2/fcontnr.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <svx/svxids.hrc> #include <vcl/menu.hxx> diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 2ebdf316af34..eeefcda29f3d 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -37,9 +37,9 @@ #include <vcl/field.hxx> -#include <svtools/cjkoptions.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <svx/editdata.hxx> #include <svx/dialogs.hrc> diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index d881c45070d3..e624e3b23320 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <comphelper/processfactory.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "sdattr.hxx" #include "present.hxx" diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 748d34a94c6c..b7a65b0d5b6e 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -41,7 +41,7 @@ #include <svx/dialogs.hrc> #include <svx/flstitem.hxx> #include <svx/drawitem.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/tabline.hxx> #include <svx/bulitem.hxx> #include <svx/eeitem.hxx> @@ -49,7 +49,7 @@ #include <vcl/graph.hxx> #include <svx/lrspitem.hxx> #include <svx/numitem.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include "DrawDocShell.hxx" #include "glob.hrc" @@ -59,7 +59,7 @@ #include "enumdlg.hrc" //#include "enumdlg.hxx" #include "bulmaper.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svxgrahicitem.hxx> #include <svx/flagsdef.hxx> #include "drawdoc.hxx" diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 225919f32280..6a74ffaf206f 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -42,7 +42,7 @@ #include "sdresid.hxx" #include "prntopts.hxx" #include "app.hrc" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/request.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index b57474906567..1f97ce8d4cf2 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -36,7 +36,7 @@ #endif -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/new.hxx> #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 9d335b859e31..bd93b07beb9a 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -35,7 +35,7 @@ #include <sot/formats.hxx> #include <sot/storage.hxx> #include <vcl/msgbox.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/svditer.hxx> #include <sfx2/docfile.hxx> #include <svx/svdoole2.hxx> diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 98a4959abdb8..5ce27def13a6 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -40,18 +40,18 @@ #include <svx/svxids.hrc> #include <svx/drawitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/ofaitem.hxx> #include <svx/svxgrahicitem.hxx> #include <svx/svdmodel.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include <svx/dialogs.hrc> #include <svx/svxdlg.hxx> #include <svx/tabline.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/xtable.hxx> #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 2148b33d95d3..80ba0b78c9f9 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -54,10 +54,10 @@ #include <vcl/waitobj.hxx> #include <osl/file.hxx> #include <sfx2/app.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svx/svdpagv.hxx> #include <unotools/localfilehelper.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/colritem.hxx> #include <svx/svdoole2.hxx> #include <sfx2/docfile.hxx> @@ -68,7 +68,7 @@ #include <svx/xtable.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <sfx2/filedlghelper.hxx> #include <svx/drawitem.hxx> #include "View.hxx" diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index b22ad4e32dbd..102c95a9b3e5 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -58,7 +58,7 @@ #include "tpoption.hxx" #include "strings.hrc" #include "app.hrc" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/request.hxx> #define DLGWIN this->GetParent()->GetParent() diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index dc0ea3d63827..e42012d4b75d 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -32,9 +32,9 @@ #include "precompiled_sd.hxx" -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> -#include <svtools/smplhint.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> +#include <svl/smplhint.hxx> #include <svx/svdobj.hxx> #include "unchss.hxx" diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index a62922381155..3917cc02880c 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -374,7 +374,7 @@ BOOL DrawDocShell::CheckPageName (::Window* pWin, String& rName ) { String aDesc( SdResId( STR_WARN_PAGE_EXISTS ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc, RID_SVXDLG_NAME ) : 0; + AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : 0; if( aNameDlg ) { aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE ); diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index c62bc9fcc620..96461168e299 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -51,7 +51,7 @@ #include <svx/outliner.hxx> #endif #include <sfx2/request.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/drawitem.hxx> #include <svx/unolingu.hxx> #include <com/sun/star/i18n/TextConversionOption.hpp> diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 4a4e62f2a106..ce2c38f20afd 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -41,8 +41,8 @@ #endif #include <svx/flstitem.hxx> #include <svx/eeitem.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/flagitem.hxx> +#include <svl/aeitem.hxx> +#include <svl/flagitem.hxx> #include <sot/storage.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> @@ -50,7 +50,7 @@ #include <sfx2/dispatch.hxx> #endif #include <svx/svdotext.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <sfx2/printer.hxx> #include <svtools/ctrltool.hxx> #ifndef _SFX_ECODE_HXX //autogen @@ -63,11 +63,11 @@ #include "unomodel.hxx" #endif -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> -#include <svx/svxmsbas.hxx> -#include <svtools/saveopt.hxx> +//#include <svx/svxmsbas.hxx> +#include <unotools/saveopt.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawView.hpp> #include <comphelper/processfactory.hxx> diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index d6cc2a000b1d..7d18f19f1993 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -44,8 +44,8 @@ #include <sfx2/srchitem.hxx> #include <svx/srchdlg.hxx> #include <svx/flstitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/printer.hxx> #ifndef _SFX_DOCFILE_HXX //autogen #include <sfx2/docfile.hxx> @@ -55,16 +55,16 @@ #include <svx/drawitem.hxx> #include <svx/srchdlg.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/whiter.hxx> -#include <svtools/itempool.hxx> +#include <svl/whiter.hxx> +#include <svl/itempool.hxx> #include <svtools/ctrltool.hxx> #include <svtools/filter.hxx> #ifndef _SO_CLSIDS_HXX #include <sot/clsids.hxx> #endif #include <sfx2/topfrm.hxx> -#include <svtools/cjkoptions.hxx> -#include <svtools/visitem.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/visitem.hxx> #include <svx/svdoutl.hxx> diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index d0d6938a2b21..4ce1bfebf6ee 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -45,7 +45,7 @@ #include "app.hrc" #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <cppuhelper/compbase1.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <comphelper/stl_types.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 3abd76237680..95687ab8a833 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -54,8 +54,8 @@ #include <svx/bulitem.hxx> #include <svx/brshitem.hxx> #include <vcl/graph.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> #include <svx/numitem.hxx> #include <svx/eeitem.hxx> diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 5bb4942b8ea5..e070365eddda 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -37,8 +37,8 @@ #include <svx/svxids.hrc> #include <svx/tabarea.hxx> #include <vcl/msgbox.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> @@ -85,7 +85,6 @@ void FuArea::DoExecute( SfxRequest& rReq ) AbstractSvxAreaTabDialog * pDlg = pFact ? pFact->CreateSvxAreaTabDialog( NULL, &aNewAttr, mpDoc, - RID_SVXDLG_AREA, mpView) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) { diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 64fb3783d78d..fac03893a880 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -38,7 +38,7 @@ #include <sfx2/bindings.hxx> #endif #include <svx/eeitem.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/fontitem.hxx> #include "OutlineViewShell.hxx" #include "DrawViewShell.hxx" @@ -49,8 +49,8 @@ #include <svx/svdoutl.hxx> #include <vcl/msgbox.hxx> #include <sfx2/request.hxx> -#include <svtools/ctloptions.hxx> -#include <svtools/itempool.hxx> +#include <svl/ctloptions.hxx> +#include <svl/itempool.hxx> #ifdef IRIX #include <basic/sbx.hxx> diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index e9654a21bcee..eb738ef0d2fa 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -35,7 +35,7 @@ #include <vcl/waitobj.hxx> #include <svx/svxids.hrc> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 238c047ef70c..de658c401428 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -35,8 +35,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdocirc.hxx> #include <sfx2/request.hxx> -#include <svtools/intitem.hxx> -#include <svtools/aeitem.hxx> +#include <svl/intitem.hxx> +#include <svl/aeitem.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdobj.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index ff95b7b3115b..1e16ac4c332c 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -34,9 +34,9 @@ #include <com/sun/star/presentation/EffectNodeType.hpp> #include "fuconbez.hxx" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/svdopath.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdobj.hxx> #include <sfx2/bindings.hxx> diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index a360effd5469..a9f1445097e4 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -40,7 +40,7 @@ #include <svx/dialmgr.hxx> #include "app.hrc" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnedwit.hxx> #include <svx/xlnedit.hxx> @@ -53,7 +53,7 @@ #include <sfx2/dispatch.hxx> #include <svx/svdopath.hxx> #include <svx/svdocirc.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <svx/adjitem.hxx> #include <svx/xtable.hxx> @@ -73,7 +73,7 @@ // #109583# #include <svx/writingmodeitem.hxx> #include <svx/gallery.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <com/sun/star/uno/Any.hxx> #include "sdresid.hxx" diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index a36b6f508534..d9513f4b5c22 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -40,7 +40,7 @@ #include <svx/dialmgr.hxx> #include "app.hrc" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnedwit.hxx> #include <svx/xlnedit.hxx> @@ -53,7 +53,7 @@ #include <sfx2/dispatch.hxx> #include <svx/svdopath.hxx> #include <svx/svdocirc.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <svx/adjitem.hxx> #include <svx/xtable.hxx> diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 3f9d8151ef4e..28531c7bef47 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -34,7 +34,7 @@ #include "fuconstr.hxx" #include <svx/svxids.hrc> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/svdpagv.hxx> #include <svx/xdef.hxx> #include <svx/xfillit0.hxx> diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index ef98942a581f..512ccdb53623 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -32,11 +32,11 @@ #include "precompiled_sd.hxx" #include "fuconuno.hxx" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/fmglob.hxx> diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 6c6c0c3aaa81..7da8b98ea568 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -76,7 +76,7 @@ #include "sdresid.hxx" #include "drawview.hxx" #include "fusel.hxx" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <vcl/msgbox.hxx> #include "slideshow.hxx" #include <svx/sdrhittesthelper.hxx> diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index d23493de4249..24ed231ea25b 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include "fuediglu.hxx" -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/dialogs.hrc> #include <svx/svdglue.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index eb4ca01ba621..98dbcba52ab2 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -35,7 +35,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #include <svx/globl3d.hxx> #include <svx/svxids.hrc> diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 0babfc9c2d38..42576f8d9d53 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/bootstrap.hxx> #include <vcl/msgbox.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/eeitem.hxx> #include <svx/langitem.hxx> #include <svx/fontitem.hxx> diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 12c94fbf9f8f..578830b37c25 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -44,13 +44,13 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <tools/urlobj.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svtools/sores.hxx> #include <svtools/insdlg.hxx> #include <sfx2/request.hxx> -#include <svtools/globalnameitem.hxx> -#include <svtools/pathoptions.hxx> +#include <svl/globalnameitem.hxx> +#include <unotools/pathoptions.hxx> #include <svx/pfiledlg.hxx> #include <svx/impgrf.hxx> #include <svx/dialogs.hrc> @@ -64,7 +64,7 @@ #include <sot/clsids.hxx> #include <svtools/sfxecode.hxx> #include <svtools/transfer.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <svx/svdobj.hxx> #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 0dea41e10ca9..a6dad3779ab7 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -38,7 +38,7 @@ #ifndef _EDITENG_HXX #include <svx/editeng.hxx> #endif -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <sfx2/request.hxx> #include <sfx2/app.hxx> #include <vcl/msgbox.hxx> @@ -48,7 +48,7 @@ #include <svx/svdoutl.hxx> #include <sfx2/filedlghelper.hxx> #include <sot/formats.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/forbiddencharacterstable.hxx> #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 8e7d6c6b5b86..08fdf2eb24b7 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -38,8 +38,8 @@ #include <svx/tabline.hxx> #include <svx/xenum.hxx> #include <vcl/msgbox.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/request.hxx> #include <svx/xdef.hxx> #include <sfx2/bindings.hxx> @@ -98,7 +98,7 @@ void FuLine::DoExecute( SfxRequest& rReq ) mpView->GetAttributes( *pNewAttr ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,RID_SVXDLG_LINE,pObj,bHasMarked) : 0; + SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,pObj,bHasMarked) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) { mpView->SetAttributes (*(pDlg->GetOutputItemSet ())); diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 6f8373147845..1eb3300d30df 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -140,7 +140,7 @@ void FuLineEnd::DoExecute( SfxRequest& ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc, RID_SVXDLG_NAME ) : 0; + AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc ) : 0; if( pDlg ) { diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 694f1ae6615a..5083023efdde 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -46,7 +46,7 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include "svx/xtable.hxx" #include "strings.hrc" diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 29bc28e91e17..a16e6dbb20dd 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -34,11 +34,11 @@ #include "fuolbull.hxx" #include <vcl/msgbox.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/outliner.hxx> #include <svx/eeitem.hxx> #include <sfx2/request.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/editdata.hxx> #include <svx/svxids.hrc> diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 10653e514697..284b4da2be66 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -40,14 +40,14 @@ #include <svx/svxids.hrc> #include <svx/dialogs.hrc> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif #include <sfx2/request.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/prntypes.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <stlsheet.hxx> #ifndef _SVX_SVDORECT_HXX #include <svx/svdorect.hxx> @@ -59,7 +59,7 @@ #include <svx/frmdiritem.hxx> #include <svx/xbtmpit.hxx> #include <svx/xsetit.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/ulspitem.hxx> #include <svx/lrspitem.hxx> diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index c6b8f9feaab2..936802ff34cb 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -35,7 +35,7 @@ #include "fupoor.hxx" #include <svx/svxids.hrc> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/svdpagv.hxx> #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 6975aa66fba9..7fd48732ccc4 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -35,8 +35,8 @@ #include "fuprlout.hxx" #include <vcl/wrkwin.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/itempool.hxx> +#include <svl/smplhint.hxx> +#include <svl/itempool.hxx> #include <sot/storage.hxx> #include <vcl/msgbox.hxx> #include <svx/svdundo.hxx> diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index b1d43699e27b..d4f6dc71cc88 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -36,9 +36,9 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/outliner.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include "app.hrc" diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index 682dc1b4b719..b61836a74cca 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -139,7 +139,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr, RID_SVXDLG_ZOOM); + pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr); } if( pDlg ) @@ -169,12 +169,11 @@ void FuScale::DoExecute( SfxRequest& rReq ) delete pDlg; - // SvxZoomType eZT = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType (); - switch (((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType ()) + switch (((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetType ()) { case SVX_ZOOM_PERCENT: { - nValue = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetValue (); + nValue = ((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetValue (); mpViewShell->SetZoom( nValue ); diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 4e91ef79dc9a..fe97b7410ee7 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -40,15 +40,15 @@ #include <svx/polysc3d.hxx> #include "drawview.hxx" #include <svtools/imapobj.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <unotools/localfilehelper.hxx> #include <svx/svxids.hrc> #include <svx/xfillit0.hxx> #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/aeitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 6b79046a9bf8..b10f539cf29e 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -33,7 +33,7 @@ #include "fusldlg.hxx" -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 28bb58538d85..9f0214668f82 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include "fusnapln.hxx" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <vcl/msgbox.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index d9ebadd48ac7..e53d6d9d7789 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -42,7 +42,7 @@ #include <svx/bulitem.hxx> #include <svx/svxids.hrc> // fuer SID_OBJECT_SELECT #include <sfx2/bindings.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> #include <svx/eeitem.hxx> diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 86cfb6be3a77..0f94366f1c56 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -39,14 +39,14 @@ #include <tools/urlobj.hxx> #include <vcl/help.hxx> #include <svx/editstat.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/aeitem.hxx> +#include <svl/intitem.hxx> #include <svx/svdotext.hxx> #ifndef _SVDOGROUP_HXX //autogen #include <svx/svdogrp.hxx> #endif #include <svx/flditem.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/svdpagv.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index b5db742f70b4..a5782aadb4c8 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -94,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { - std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView, RID_SVXDLG_CAPTION ) ); + std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) ); const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange ); @@ -114,7 +114,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet,mpView, RID_SVXDLG_TRANSFORM) ); + std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) ); if( pDlg.get() && (pDlg->Execute() == RET_OK) ) { rReq.Done( *( pDlg->GetOutputItemSet() ) ); diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index e94638ecf225..8ab4d8d02a75 100644 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -79,7 +79,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq ) if( !pArgs ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, RID_SVXDLG_TEXT, mpView ); + SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView ); USHORT nResult = pDlg->Execute(); diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index abe492991067..e408b70b755a 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -33,8 +33,8 @@ #include <memory> #include <vcl/svapp.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> #include <svx/unoedsrc.hxx> #include <svx/editdata.hxx> #include <svx/unoforou.hxx> diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index 79e33452959c..5627612aec06 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -31,7 +31,7 @@ #ifndef SD_TOOLS_EVENT_MULTIPLEXER_HXX #define SD_TOOLS_EVENT_MULTIPLEXER_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <set> #include <memory> diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index c919e5f95c91..9956d8dc2af9 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -34,7 +34,7 @@ #include <ViewShellManager.hxx> #include <tools/link.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> class VclWindowEvent; class FmFormShell; diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index c508410045aa..7211a02da6f4 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -34,7 +34,7 @@ #include "drawview.hxx" #include <vcl/image.hxx> #include <vcl/virdev.hxx> -#include <svtools/listener.hxx> +#include <svl/listener.hxx> #include <memory> diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index 23ff29c7f8de..493d2c2e2a19 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -31,7 +31,7 @@ #ifndef SD_VIEW_SHELL_HINT_HXX #define SD_VIEW_SHELL_HINT_HXX -#include <svtools/hint.hxx> +#include <svl/hint.hxx> namespace sd { diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 7b61c37adb45..a6c37a54991a 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -31,8 +31,8 @@ #ifndef SD_OUTPUT_DEVICE_UPDATER_HXX #define SD_OUTPUT_DEVICE_UPDATER_HXX -#include <svtools/lstner.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/lstner.hxx> +#include <svl/ctloptions.hxx> #include "sddllapi.h" #ifndef INCLUDED_VECTOR @@ -65,7 +65,7 @@ class ViewShell; this document is reformatted when the monitored option changes.</p> */ class SD_DLLPUBLIC WindowUpdater - : public SfxListener + : public utl::ConfigurationListener { public: explicit WindowUpdater (void); @@ -116,7 +116,7 @@ public: /** Callback that waits for notifications of a <type>SvtCTLOptions</type> object. */ - virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*, sal_uInt32 nHint); private: /// Options to monitor for changes. diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index b6e1b2dc9fbd..df235a66c71d 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -32,7 +32,7 @@ #define _SD_DIACTRL_HXX #include "dlgctrls.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/bindings.hxx> #include <svx/itemwin.hxx> #include <vcl/fixed.hxx> diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 746df06794ea..80f219ddfc59 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -37,7 +37,7 @@ #include <rtl/ref.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/colorcfg.hxx> #include "fadedef.h" #include "sddllapi.h" diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index c5feb07dcab6..49e98cd36e73 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -31,7 +31,7 @@ #ifndef SD_FU_CONSTRUCT_UNO_CONTROL_HXX #define SD_FU_CONSTRUCT_UNO_CONTROL_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "fuconstr.hxx" namespace sd { diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 7c4b9da4ea95..d14664a5b66b 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -34,11 +34,9 @@ #include "futext.hxx" // header for class SfxItemSet -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <boost/scoped_ptr.hpp> -class SfxItemSet; - namespace sd { class DrawViewShell; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index a67c91948617..a69381d784df 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -85,6 +85,7 @@ public: virtual ~SdOptionsItem(); virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 4fc2c12ad71b..182d2f68ac54 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -40,7 +40,7 @@ #include "sddllapi.h" #include <tools/string.hxx> #include <svtools/svtreebx.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <tools/ref.hxx> #include "sdxfer.hxx" diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 6ad9be896829..59a3a192907b 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -34,7 +34,7 @@ #include <svtools/transfer.hxx> #include <vcl/graph.hxx> #include <sfx2/objsh.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> // ------------------ // - SdTransferable - diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index a29397a363af..a4dc305d6aeb 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -52,7 +52,7 @@ #include <rtl/ref.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/sfxbasemodel.hxx> #include <svx/fmdmod.hxx> diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index f86e9a358cbc..10c4b58fd999 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -41,12 +41,12 @@ #include <vcl/scrbar.hxx> #include <svx/eeitem.hxx> #include "sdresid.hxx" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/fhgtitem.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include <svtools/linguprops.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/linguprops.hxx> +#include <unotools/lingucfg.hxx> #include <svx/fontitem.hxx> #include <svx/editstat.hxx> diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 0317b7530e5c..8890c608f17f 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -35,10 +35,10 @@ #include <i18npool/mslangid.hxx> #include <cppcanvas/vclfactory.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/linguprops.hxx> -#include <svtools/lingucfg.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <unotools/linguprops.hxx> +#include <unotools/lingucfg.hxx> #include <svx/colritem.hxx> #include <svx/editeng.hxx> #include <svx/editstat.hxx> diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 911d31d2518f..3fad355c915a 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -35,7 +35,7 @@ #include "showwindow.hxx" -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 6d5e3e31ad80..f1cb2cf4afb9 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -44,7 +44,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <sfx2/topfrm.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index c0e550f69378..e59f45b71e12 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -46,8 +46,8 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <vos/process.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/urihelper.hxx> +#include <svl/aeitem.hxx> +#include <svl/urihelper.hxx> #include <toolkit/unohlp.hxx> diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 7240e6efa087..96b24913c45e 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -62,8 +62,8 @@ #include <basegfx/tools/canvastools.hxx> #include <vcl/help.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/saveopt.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 8eebe162b942..4d2ecbdef39c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -56,8 +56,8 @@ #include <cppcanvas/spritecanvas.hxx> #include <vcl/help.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/saveopt.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index f91c7337713a..6ace8ebdd370 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -43,7 +43,7 @@ #include <com/sun/star/frame/XFrameActionListener.hpp> #include <cppuhelper/compbase4.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <tools/link.hxx> #include <boost/shared_ptr.hpp> diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 4b48aa60678d..4aa35f91292f 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -88,10 +88,10 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <vcl/msgbox.hxx> -#include <svtools/intitem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/itempool.hxx> -#include <svtools/aeitem.hxx> +#include <svl/intitem.hxx> +#include <svl/whiter.hxx> +#include <svl/itempool.hxx> +#include <svl/aeitem.hxx> #include <com/sun/star/presentation/FadeEffect.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPages.hpp> @@ -905,7 +905,7 @@ void SlotManager::RenameSlide (void) DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( mrSlideSorter.GetActiveWindow(), - aPageName, aDescr, RID_SVXDLG_NAME); + aPageName, aDescr); DBG_ASSERT(aNameDlg, "Dialogdiet fail!"); aNameDlg->SetText( aTitle ); aNameDlg->SetCheckNameHdl( LINK( this, SlotManager, RenameSlideHdl ), true ); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 3cd696e4bb26..e877b41d3738 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -60,7 +60,7 @@ #include "sdresid.hxx" #include "glob.hrc" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/svdpagv.hxx> #include <svx/svdopage.hxx> #include <svx/xlndsit.hxx> @@ -72,10 +72,10 @@ #include <algorithm> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/sdrpagewindow.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #ifndef _SFXITEMPOOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif using namespace std; diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 098d71d1f06a..9ab5a4a175d5 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -50,7 +50,7 @@ #include <vcl/bmpacc.hxx> //#include <vcl/toolbox.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index e2f923424831..1d1d38df82bf 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -57,12 +57,12 @@ #include <svx/svxdlg.hxx> #include <vcl/msgbox.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include "framework/FrameworkHelper.hxx" #include "app.hrc" diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 2eaf13ea470f..abae004cb73a 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -39,8 +39,8 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/whiter.hxx> -#include <svtools/itempool.hxx> +#include <svl/whiter.hxx> +#include <svl/itempool.hxx> #include <svx/svdomedia.hxx> #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <svx/svxdlg.hxx> diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index d2faeb06eb00..b78042e2e9ae 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -61,7 +61,7 @@ #include <sfx2/objface.hxx> #include "sdresid.hxx" #include <vcl/image.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <sfx2/app.hxx> #include "taskpane/TitledControl.hxx" #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index c4dd6537c9ce..c0e605cac79e 100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -47,7 +47,7 @@ #include <vcl/bitmapex.hxx> #include <tools/color.hxx> #include <svx/xdash.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/xlndsit.hxx> #include <svx/xlineit0.hxx> #include <svx/svdobj.hxx> diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 03795e0e2d71..f78bbdfa0308 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -60,8 +60,8 @@ #include "DrawDocShell.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" -#include <svtools/itemset.hxx> -#include <svtools/eitem.hxx> +#include <svl/itemset.hxx> +#include <svl/eitem.hxx> #include "sdresid.hxx" #include "tools/TimerBasedTaskExecution.hxx" #include "pres.hxx" diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 7e0c3b2887c0..cf0992596c64 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -39,7 +39,7 @@ #include <hash_map> #include <set> #include <vector> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <osl/doublecheckedlocking.h> #include <osl/getglobalmutex.hxx> diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 9356dac3f7f9..9b419c9924ec 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -62,12 +62,12 @@ #include "drawview.hxx" #endif #include <vcl/image.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/mnumgr.hxx> -#include <svtools/itemset.hxx> -#include <svtools/eitem.hxx> +#include <svl/itemset.hxx> +#include <svl/eitem.hxx> #include <svx/dlgutil.hxx> #include <svx/svdpagv.hxx> #include <svx/svxids.hrc> @@ -76,7 +76,7 @@ #include "stlpool.hxx" #include "unmovss.hxx" #include <sfx2/request.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> using namespace ::sd::toolpanel::controls; #define MasterPagesSelector diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 71000d263cd7..a59b63a3df10 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -63,10 +63,10 @@ #include <rtl/ustring.h> #include <rtl/logfile.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/window.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <tools/urlobj.hxx> #include <vos/mutex.hxx> #include <svtools/sfxecode.hxx> @@ -83,7 +83,7 @@ #include <svx/impgrf.hxx> #include <svtools/FilterConfigItem.hxx> #include <sot/storage.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <com/sun/star/util/XArchiver.hpp> #include <comphelper/processfactory.hxx> diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index a1a8a4f4dabb..5fedbcd717b3 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -40,8 +40,8 @@ #include <rtl/ustrbuf.hxx> #include <comphelper/stl_types.hxx> #include <vos/mutex.hxx> -#include <svtools/itemprop.hxx> -#include <svtools/style.hxx> +#include <svl/itemprop.hxx> +#include <svl/style.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 15b3b2224b4b..187a62f0dcfe 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -54,7 +54,7 @@ #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/svdmodel.hxx> #include <sdresid.hxx> #include <glob.hrc> @@ -68,7 +68,7 @@ #include <com/sun/star/style/XStyle.hpp> #include <svx/svdorect.hxx> #include <vos/mutex.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index a1d9e0436e98..5d4c76bd9e82 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -39,7 +39,7 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/office/XAnnotationAccess.hpp> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #ifndef _SVX_UNOPAGE_HXX #include <svx/unopage.hxx> diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 0808221582f1..5150afb2d10f 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/drawing/BitmapMode.hpp> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <comphelper/extract.hxx> #include <rtl/uuid.h> diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 9e34bc4e3f39..32f5de8594ba 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -35,8 +35,8 @@ #include <limits.h> #include <vcl/msgbox.hxx> -#include <svtools/whiter.hxx> -#include <svtools/itempool.hxx> +#include <svl/whiter.hxx> +#include <svl/itempool.hxx> #include <sfx2/app.hxx> #include <sfx2/shell.hxx> #include <svx/svxids.hrc> @@ -44,7 +44,7 @@ #include <sfx2/basedlgs.hxx> #include <svx/svdograf.hxx> #include <svx/grfflt.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/grafctrl.hxx> diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index c05c55c0d6de..510d4a6fccca 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -38,8 +38,8 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/request.hxx> #include <sfx2/objface.hxx> -#include <svtools/whiter.hxx> -#include <svtools/itempool.hxx> +#include <svl/whiter.hxx> +#include <svl/itempool.hxx> #include <svx/svdomedia.hxx> #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index ba5836e8f1db..a672ce978233 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -56,8 +56,8 @@ #include <svx/eeitem.hxx> #include <svx/forbiddencharacterstable.hxx> #include <svx/srchdlg.hxx> -#include <svtools/linguprops.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/linguprops.hxx> +#include <unotools/lingucfg.hxx> #include <svx/editeng.hxx> #include <vcl/metric.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx index 797518473ebd..3963c4cb5273 100644 --- a/sd/source/ui/view/PrintManager.cxx +++ b/sd/source/ui/view/PrintManager.cxx @@ -52,7 +52,7 @@ #include <sfx2/progress.hxx> #include <svtools/printdlg.hxx> #include <tools/multisel.hxx> -#include <svtools/misccfg.hxx> +#include <unotools/misccfg.hxx> #include <unotools/localedatawrapper.hxx> #include <svx/prtqry.hxx> #include "WindowUpdater.hxx" @@ -71,7 +71,7 @@ #include "printdlg.hrc" #include "prntopts.hrc" #include "app.hrc" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/paperinf.hxx> #include <svx/xlnclit.hxx> #include "printdialog.hxx" @@ -368,7 +368,7 @@ USHORT PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p if( pPrintOpts ) { - SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig(); + ::utl::MiscCfg aMisc; if( pPrintOpts->GetOptionsPrint().IsDate() ) { @@ -398,9 +398,9 @@ USHORT PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p ePageKind = PK_NOTES; } - pPrintOpts->GetOptionsPrint().SetWarningPrinter( pMisc->IsNotFoundWarning() ); - pPrintOpts->GetOptionsPrint().SetWarningSize( pMisc->IsPaperSizeWarning() ); - pPrintOpts->GetOptionsPrint().SetWarningOrientation( pMisc->IsPaperOrientationWarning() ); + pPrintOpts->GetOptionsPrint().SetWarningPrinter( aMisc.IsNotFoundWarning() ); + pPrintOpts->GetOptionsPrint().SetWarningSize( aMisc.IsPaperSizeWarning() ); + pPrintOpts->GetOptionsPrint().SetWarningOrientation( aMisc.IsPaperOrientationWarning() ); UINT16 nQuality = pPrintOpts->GetOptionsPrint().GetOutputQuality(); ULONG nMode = DRAWMODE_DEFAULT; diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 286132c304c0..487794816270 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -49,7 +49,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/dialogs.hrc> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index bbf1b69ad68a..3e0f6297f8d6 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -90,7 +90,7 @@ #include <sfx2/msg.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <comphelper/processfactory.hxx> #include "fubullet.hxx" diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 3afef14deeed..75b728c7849b 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -60,7 +60,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/imapdlg.hxx> #include <vcl/msgbox.hxx> #include <basic/sbstar.hxx> diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 64e93aee785e..135c6974f64e 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -42,7 +42,7 @@ #endif #include <sfx2/childwin.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <algorithm> @@ -52,7 +52,7 @@ WindowUpdater::WindowUpdater (void) : mpViewShell (NULL), mpDocument (NULL) { - StartListening (maCTLOptions); + maCTLOptions.AddListener(this); } @@ -60,7 +60,7 @@ WindowUpdater::WindowUpdater (void) WindowUpdater::~WindowUpdater (void) throw () { - EndListening (maCTLOptions); + maCTLOptions.RemoveListener(this); } @@ -163,33 +163,29 @@ void WindowUpdater::UpdateWindow (OutputDevice* pDevice) const -void WindowUpdater::Notify (SfxBroadcaster&, const SfxHint& rHint) +void WindowUpdater::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { - const SfxSimpleHint& rSimpleHint = static_cast<const SfxSimpleHint&>(rHint); - if (rSimpleHint.GetId() == SFX_HINT_CTL_SETTINGS_CHANGED) - { - // #110094#-7 - // Clear the master page cache so that master pages will be redrawn. - //if (mpViewShell != NULL) - //{ - // SdView* pView = mpViewShell->GetView(); - // if (pView != NULL) - // pView->ReleaseMasterPagePaintCache (); - //} - // Set the current state at all registered output devices. - tWindowList::iterator aWindowIterator (maWindowList.begin()); - while (aWindowIterator != maWindowList.end()) - Update (*aWindowIterator++); - - // Reformat the document for the modified state to take effect. - if (mpDocument != NULL) - mpDocument->ReformatAllTextObjects(); - - // Invalidate the windows to make the modified state visible. - aWindowIterator = maWindowList.begin(); - while (aWindowIterator != maWindowList.end()) - (*aWindowIterator++)->Invalidate(); - } + // #110094#-7 + // Clear the master page cache so that master pages will be redrawn. + //if (mpViewShell != NULL) + //{ + // SdView* pView = mpViewShell->GetView(); + // if (pView != NULL) + // pView->ReleaseMasterPagePaintCache (); + //} + // Set the current state at all registered output devices. + tWindowList::iterator aWindowIterator (maWindowList.begin()); + while (aWindowIterator != maWindowList.end()) + Update (*aWindowIterator++); + + // Reformat the document for the modified state to take effect. + if (mpDocument != NULL) + mpDocument->ReformatAllTextObjects(); + + // Invalidate the windows to make the modified state visible. + aWindowIterator = maWindowList.begin(); + while (aWindowIterator != maWindowList.end()) + (*aWindowIterator++)->Invalidate(); } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 45a22dd9f56b..dfbd76e4a3b6 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -36,7 +36,7 @@ #endif #include <svx/svdpagv.hxx> #include <sfx2/request.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/outliner.hxx> #ifndef _VIEW3D_HXX //autogen #include <svx/view3d.hxx> @@ -48,12 +48,12 @@ #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> #include <svx/svdorect.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/eeitem.hxx> #include <svx/bulitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/numitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index a638af2638c3..463c7415e853 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -39,10 +39,10 @@ #include <sfx2/objface.hxx> #include <svx/svxids.hrc> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/request.hxx> #include <svx/svdopath.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/svdundo.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 55980ff02050..5a2b458341c9 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -39,14 +39,14 @@ #include <svx/adjitem.hxx> #include <vcl/vclenum.hxx> #include <sfx2/app.hxx> -#include <svtools/whiter.hxx> -#include <svtools/itempool.hxx> -#include <svtools/style.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/whiter.hxx> +#include <svl/itempool.hxx> +#include <svl/style.hxx> +#include <svl/languageoptions.hxx> #include <sfx2/tplpitem.hxx> #include <svx/escpitem.hxx> #include <svx/svdoutl.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/scripttypeitem.hxx> #include <svx/outlobj.hxx> #include <svx/writingmodeitem.hxx> diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 9c2733c933dd..2a29ecbc6d6c 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -46,9 +46,9 @@ #endif #include <vcl/vclenum.hxx> #include <sfx2/app.hxx> -#include <svtools/whiter.hxx> -#include <svtools/itempool.hxx> -#include <svtools/style.hxx> +#include <svl/whiter.hxx> +#include <svl/itempool.hxx> +#include <svl/style.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> @@ -65,14 +65,14 @@ #include <svx/outlobj.hxx> #include <svx/flstitem.hxx> #include <svx/editeng.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SRIPTTYPEITEM_HXX //autogen #include <svx/scripttypeitem.hxx> #endif #include <svx/svdoutl.hxx> #include <svx/writingmodeitem.hxx> #include <svx/frmdiritem.hxx> -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #include "app.hrc" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 27d5f6202369..12b81a01d3ba 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -52,7 +52,7 @@ #include <sfx2/dispatch.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/eeitem.hxx> #include <basic/sbstar.hxx> #include <svx/flditem.hxx> @@ -467,7 +467,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); - AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr, RID_SVXDLG_NAME ); + AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ); DBG_ASSERT(aNameDlg, "Dialogdiet fail!"); aNameDlg->SetText( aTitle ); aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell, RenameSlideHdl ), true ); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 87374cce8c04..54e0f37a1b19 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -51,13 +51,13 @@ #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/rectitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/aeitem.hxx> +#include <svl/eitem.hxx> +#include <svl/rectitem.hxx> +#include <svl/stritem.hxx> #include <svx/svdoole2.hxx> -#include <svtools/itempool.hxx> -#include <svtools/ptitem.hxx> +#include <svl/itempool.hxx> +#include <svl/ptitem.hxx> #include <basic/sbstar.hxx> #include <basic/sberrors.hxx> #include <svx/fmshell.hxx> diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 85706fb9cbb6..52a0a2e6b3cb 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -35,7 +35,7 @@ #include "DrawViewShell.hxx" #include <vcl/msgbox.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> #include <svx/fmglob.hxx> diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 5eda0d648f8b..cc7fd3106fa2 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -46,11 +46,11 @@ #include <svx/svdpagv.hxx> #include <svx/clipfmtitem.hxx> #include <svx/fmshell.hxx> -#include <svtools/eitem.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/visitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/eitem.hxx> +#include <svl/aeitem.hxx> +#include <svl/stritem.hxx> +#include <svl/visitem.hxx> +#include <svl/whiter.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdograf.hxx> #include <svx/unolingu.hxx> @@ -58,11 +58,11 @@ #include <svx/fontworkbar.hxx> // #UndoRedo# -#include <svtools/slstitm.hxx> +#include <svl/slstitm.hxx> #include <sfx2/app.hxx> #include <svtools/insdlg.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <unotools/moduleoptions.hxx> +#include <svl/languageoptions.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index b5644418fdf2..0e39b4a82b33 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -47,10 +47,10 @@ #ifndef _SFX_DISPATCH_HXX //autogen #include <sfx2/dispatch.hxx> #endif -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #ifndef _SVXIDS_HXX #include <svx/svxids.hrc> #endif @@ -60,7 +60,7 @@ #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <sot/storage.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <basic/sbstar.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 3c396db7207d..2eb4282bb6e5 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -42,14 +42,14 @@ #include <svx/zoomitem.hxx> #endif #include <svx/svdpagv.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/ptitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdopath.hxx> #include <sfx2/docfile.hxx> #include <svx/zoomslideritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 9a94cae21983..09e71dc547ac 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -55,7 +55,7 @@ #include <svx/fmshell.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include "app.hrc" #include "strings.hrc" diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index d8dbc451f0c3..e9bad2064c10 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -53,7 +53,7 @@ #endif #include <sfx2/dispatch.hxx> #include <svx/svdoole2.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/svdpagv.hxx> #include <svx/grafctrl.hxx> #include "stlsheet.hxx" @@ -127,7 +127,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName, RID_SVXDLG_OBJECT_NAME); + AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName); OSL_ENSURE(pDlg, "Dialogdiet fail!"); pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl)); @@ -162,7 +162,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription, RID_SVXDLG_OBJECT_TITLE_DESC); + AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription); OSL_ENSURE(pDlg, "Dialogdiet fail!"); if(RET_OK == pDlg->Execute()) diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 9838f185807f..0d90619ff76a 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -36,10 +36,10 @@ #ifndef _SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svtools/aeitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/aeitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/docfile.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 1ae3e4e1c40e..1dbfa7211a76 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -40,10 +40,10 @@ #include "undo/undomanager.hxx" #include <vcl/waitobj.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/editstat.hxx> #include <vcl/msgbox.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> #include <svx/fmshell.hxx> #include <vcl/scrbar.hxx> @@ -51,7 +51,7 @@ #include <svx/svdundo.hxx> #include <svx/svdorect.hxx> #include <svx/svdograf.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/eeitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> @@ -64,11 +64,11 @@ #include <svx/svdouno.hxx> #include <svx/dataaccessdescriptor.hxx> #include <tools/urlobj.hxx> -#include <svtools/slstitm.hxx> +#include <svl/slstitm.hxx> #include <sfx2/ipclient.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <avmedia/mediawindow.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <sfx2/topfrm.hxx> #include <sfx2/docfile.hxx> diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 2b1b7518666c..3783f20a49ef 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -47,9 +47,9 @@ #include <svx/flditem.hxx> #endif #include <sfx2/viewfrm.hxx> -#include <svtools/whiter.hxx> -#include <svtools/eitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/whiter.hxx> +#include <svl/eitem.hxx> +#include <svl/itempool.hxx> #include <sfx2/tplpitem.hxx> #ifndef _BINDING_HXX //autogen #include <sfx2/bindings.hxx> @@ -63,7 +63,7 @@ #include <tools/urlobj.hxx> #include <svx/fmshell.hxx> #include <sfx2/topfrm.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #ifndef SD_FRAME_VIEW #include "FrameView.hxx" diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index f4fa1d027fd9..7952106e34e0 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -32,8 +32,8 @@ #include "precompiled_sd.hxx" #include "DrawViewShell.hxx" -#include <svtools/aeitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/aeitem.hxx> +#include <svl/itemset.hxx> #include <sfx2/request.hxx> #ifndef _SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 703677d05415..4eb0b6671d82 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -34,7 +34,7 @@ #include "DrawViewShell.hxx" #include <svx/xtable.hxx> #include "sdattr.hxx" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/eeitem.hxx> #include <sfx2/request.hxx> #include <svx/svditer.hxx> diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index cdc5fac18912..c21432b27846 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -33,7 +33,7 @@ #include "DrawViewShell.hxx" #include <com/sun/star/embed/EmbedMisc.hpp> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #ifndef _SVXIDS_HRC //autogen #include <svx/svxids.hrc> #endif diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 99fbcb7f2eda..468ea50776f2 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -40,7 +40,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _ZOOMITEM_HXX //autogen #include <svx/zoomitem.hxx> #endif @@ -49,7 +49,7 @@ #include <svx/flditem.hxx> #include <svx/editstat.hxx> #include "optsitem.hxx" -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <sfx2/viewfrm.hxx> #include "Outliner.hxx" diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index d14f6ed9dc34..43a8683cd039 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -55,9 +55,9 @@ #include <svx/svdotext.hxx> #include <sfx2/dispatch.hxx> #include <vcl/scrbar.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/editstat.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <sfx2/tplpitem.hxx> #include <svx/svdorect.hxx> #include <sot/formats.hxx> @@ -67,7 +67,7 @@ #include <svx/unolingu.hxx> #include <comphelper/processfactory.hxx> #include <svx/outlobj.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include <svtools/cliplistener.hxx> #include <sfx2/srchitem.hxx> #include <svx/editobj.hxx> diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 1e5564427ac8..c500a95f2811 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -46,11 +46,11 @@ #include <sfx2/imagemgr.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> -#include <svtools/itempool.hxx> -#include <svtools/style.hxx> +#include <svl/itempool.hxx> +#include <svl/style.hxx> #include <svx/svdorect.hxx> #include <svx/svdundo.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <vcl/msgbox.hxx> #include <svx/adjitem.hxx> #include <svx/tstpitem.hxx> diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 52e098caf7f3..8fc564c358f6 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include "Ruler.hxx" -#include <svtools/ptitem.hxx> +#include <svl/ptitem.hxx> #include <svx/ruler.hxx> #ifndef _SVXIDS_HXX //autogen #include <svx/svxids.hrc> diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 0a17724df1ed..49bbf3149c8b 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -52,8 +52,8 @@ #include <sfx2/childwin.hxx> #include <svx/svdundo.hxx> #include <svx/svdpagv.hxx> -#include <svtools/urlbmk.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <svx/outliner.hxx> #include <svx/xflclit.hxx> #include <svx/dbexch.hrc> @@ -963,7 +963,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n String aTitle( SdResId( STR_TITLE_NAMEGROUP ) ); String aDesc( SdResId( STR_DESC_NAMEGROUP ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc, RID_SVXDLG_NAME ) : 0; + AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc ) : 0; if( pDlg ) { pDlg->SetEditHelpId( HID_SD_NAMEDIALOG_OBJECT ); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 184949f4e683..cbc8758d2b53 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -36,11 +36,11 @@ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <sot/filelist.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #ifndef _EDITDATA_HXX #include <svx/editdata.hxx> #endif -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <svx/xexch.hxx> #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> @@ -55,7 +55,7 @@ #include <svx/svdetc.hxx> #include <svx/svdundo.hxx> #include <sfx2/app.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <sot/clsids.hxx> #ifndef _FM_FMMODEL_HXX #include <svx/fmmodel.hxx> diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 72534b476a73..9d301368418c 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -38,7 +38,7 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> #include <vcl/msgbox.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> #include <svx/xfillit.hxx> #include <svx/svdundo.hxx> diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 0349388577eb..08a39c44d86a 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -59,7 +59,7 @@ #include <svx/fmshell.hxx> #include <sfx2/dispatch.hxx> #include <rtl/ustrbuf.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 38e2b6b88001..86e441939b0e 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -59,11 +59,10 @@ #include <svx/svdpagv.hxx> #include <svx/svdetc.hxx> #include <svx/outliner.hxx> -#include <svtools/misccfg.hxx> #include <svx/editstat.hxx> #include <tools/multisel.hxx> -#include <svtools/intitem.hxx> -#include <svtools/style.hxx> +#include <svl/intitem.hxx> +#include <svl/style.hxx> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> @@ -92,7 +91,7 @@ #include <svx/svxids.hrc> #endif #include <sfx2/request.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <basic/sbstar.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 208d5426c8bd..7effb79a00b1 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -48,7 +48,7 @@ #ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> #endif -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/ruler.hxx> #ifndef _SVXIDS_HXX #include <svx/svxids.hrc> @@ -90,7 +90,7 @@ #include <svx/svdoutl.hxx> // #96090# -#include <svtools/slstitm.hxx> +#include <svl/slstitm.hxx> #include <sfx2/request.hxx> #include "SpellDialogChildWindow.hxx" diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index cf9a516094b7..6b1e6ebf1676 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -171,6 +171,7 @@ SHL2STDLIBS= \ $(VCLLIB) \ $(SOTLIB) \ $(TOOLSLIB) \ + $(UNOTOOLSLIB) \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ @@ -249,7 +250,7 @@ DEF5NAME=$(SHL5TARGET) SHL5STDLIBS = $(ISDLIB) \ $(SVXCORELIB) \ - $(SVXMSFILTERLIB) \ + $(MSFILTERLIB) \ $(SFX2LIB) \ $(SVTOOLLIB) \ $(SOTLIB) \ diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map index ac6b782f3145..62213393408d 100644 --- a/sd/util/sdfilt.map +++ b/sd/util/sdfilt.map @@ -2,7 +2,7 @@ PPTEXPORTER_1_0 { global: ExportPPT; ImportPPT; - + SaveVBA; local: *; }; diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk index cde95f49163a..b6bd1cc2889c 100644 --- a/slideshow/test/makefile.mk +++ b/slideshow/test/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ PRJ=.. PRJNAME=slideshow -PRJINC=$(PRJ)$/source +PRJINC=$(PRJ)$/source TARGET=tests TARGETTYPE=GUI @@ -50,13 +50,14 @@ SHL1OBJS= \ $(SLO)$/views.obj \ $(SLO)$/slidetest.obj \ $(SLO)$/testshape.obj \ - $(SLO)$/testview.obj + $(SLO)$/testview.obj SHL1TARGET= tests SHL1STDLIBS= $(SALLIB) \ $(BASEGFXLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ + $(TESTSHL2LIB) \ $(CPPUNITLIB) \ $(UNOTOOLSLIB) \ $(VCLLIB) @@ -70,7 +71,7 @@ SHL1STDLIBS= $(SALLIB) \ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = export.map +SHL1VERSIONMAP = export.map # END target1 ---------------------------------------------------------- # BEGIN target2 -------------------------------------------------------- @@ -96,9 +97,9 @@ APP2DEF= $(MISC)$/$(TARGET).def #------------------------------- All object files ---------------------------- # do this here, so we get right dependencies -SLOFILES=$(SHL1OBJS) +SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -.INCLUDE : _cppunit.mk +.INCLUDE : _cppunit.mk diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx index 96ed6f07fb90..633ee324359e 100644 --- a/slideshow/test/slidetest.cxx +++ b/slideshow/test/slidetest.cxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <cppuhelper/compbase1.hxx> #include <comphelper/broadcasthelper.hxx> diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index 00f9868bcae4..9482b9d31500 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/make_shared_from_uno.hxx> diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx index 57024438ef43..5f4c44f2a50d 100644 --- a/slideshow/test/testview.cxx +++ b/slideshow/test/testview.cxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/make_shared_from_uno.hxx> diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx index 20a6a06a976a..e53a14e1fa33 100644 --- a/slideshow/test/views.cxx +++ b/slideshow/test/views.cxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <cppuhelper/compbase1.hxx> #include <comphelper/broadcasthelper.hxx> |