From 7244b6bb5d8b6d109061ac693bb979821ce49b00 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 8 Jan 2010 18:32:51 +0100 Subject: #i107450#: build all other modules with new editeng lib --- sd/source/core/anminfo.cxx | 4 +- sd/source/core/drawdoc.cxx | 20 +-- sd/source/core/drawdoc2.cxx | 10 +- sd/source/core/drawdoc4.cxx | 56 +++---- sd/source/core/sdpage.cxx | 24 +-- sd/source/core/sdpage2.cxx | 6 +- sd/source/core/sdpage_animations.cxx | 2 +- sd/source/core/stlfamily.cxx | 3 +- sd/source/core/stlpool.cxx | 42 ++--- sd/source/core/stlsheet.cxx | 18 +- sd/source/core/text/textapi.cxx | 6 +- sd/source/core/typemap.cxx | 40 ++--- sd/source/filter/eppt/eppt.cxx | 4 +- sd/source/filter/eppt/epptso.cxx | 8 +- sd/source/filter/eppt/pptexanimations.cxx | 4 +- sd/source/filter/grf/sdgrffilter.cxx | 7 +- sd/source/filter/html/htmlex.cxx | 25 ++- sd/source/filter/html/pubdlg.cxx | 3 +- sd/source/filter/html/sdhtmlfilter.cxx | 1 - sd/source/filter/ppt/pptin.cxx | 24 +-- sd/source/filter/ppt/pptinanimations.cxx | 4 +- sd/source/filter/xml/sdtransform.cxx | 8 +- .../accessibility/AccessibleOutlineEditSource.cxx | 2 +- sd/source/ui/animations/CustomAnimationDialog.cxx | 2 +- sd/source/ui/annotations/annotationmanager.cxx | 20 +-- sd/source/ui/annotations/annotationwindow.cxx | 46 ++--- sd/source/ui/annotations/annotationwindow.hxx | 2 +- sd/source/ui/app/sddll.cxx | 186 +-------------------- sd/source/ui/app/sddll2.cxx | 6 +- sd/source/ui/app/sdmod1.cxx | 10 +- sd/source/ui/app/sdmod2.cxx | 10 +- sd/source/ui/app/sdpopup.cxx | 6 +- sd/source/ui/app/sdxfer.cxx | 10 +- sd/source/ui/dlg/LayerDialogContent.cxx | 2 +- sd/source/ui/dlg/celltempl.cxx | 8 +- sd/source/ui/dlg/dlgchar.cxx | 2 +- sd/source/ui/dlg/dlgfield.cxx | 8 +- sd/source/ui/dlg/dlgolbul.cxx | 6 +- sd/source/ui/dlg/dlgpage.cxx | 2 +- sd/source/ui/dlg/filedlg.cxx | 7 +- sd/source/ui/dlg/headerfooterdlg.cxx | 8 +- sd/source/ui/dlg/paragr.cxx | 4 +- sd/source/ui/dlg/prltempl.cxx | 12 +- sd/source/ui/dlg/tabtempl.cxx | 2 +- sd/source/ui/dlg/tpaction.cxx | 4 +- sd/source/ui/docshell/docshel3.cxx | 4 +- sd/source/ui/docshell/docshel4.cxx | 4 +- sd/source/ui/docshell/docshell.cxx | 4 +- sd/source/ui/func/bulmaper.cxx | 24 +-- sd/source/ui/func/fubullet.cxx | 4 +- sd/source/ui/func/fuchar.cxx | 4 +- sd/source/ui/func/fuconcs.cxx | 4 +- sd/source/ui/func/fuconrec.cxx | 4 +- sd/source/ui/func/fudraw.cxx | 4 +- sd/source/ui/func/fuexpand.cxx | 4 +- sd/source/ui/func/fuformatpaintbrush.cxx | 6 +- sd/source/ui/func/fuhhconv.cxx | 6 +- sd/source/ui/func/fuinsert.cxx | 5 +- sd/source/ui/func/fuinsfil.cxx | 6 +- sd/source/ui/func/fumorph.cxx | 2 +- sd/source/ui/func/fuoaprms.cxx | 2 +- sd/source/ui/func/fuolbull.cxx | 6 +- sd/source/ui/func/fuoltext.cxx | 6 +- sd/source/ui/func/fuoutl.cxx | 2 +- sd/source/ui/func/fupage.cxx | 20 +-- sd/source/ui/func/fuparagr.cxx | 6 +- sd/source/ui/func/fupoor.cxx | 2 +- sd/source/ui/func/fuprlout.cxx | 2 +- sd/source/ui/func/fuprobjs.cxx | 2 +- sd/source/ui/func/fusel.cxx | 4 +- sd/source/ui/func/fuspell.cxx | 2 +- sd/source/ui/func/fusumry.cxx | 4 +- sd/source/ui/func/futempl.cxx | 12 +- sd/source/ui/func/futext.cxx | 17 +- sd/source/ui/func/futhes.cxx | 6 +- sd/source/ui/func/outlinfo.cxx | 6 +- sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 6 +- sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 8 +- sd/source/ui/inc/OutlineView.hxx | 2 +- sd/source/ui/inc/futext.hxx | 2 +- sd/source/ui/inc/slideshow.hxx | 2 +- sd/source/ui/inc/unomodel.hxx | 2 +- sd/source/ui/inc/unosrch.hxx | 4 +- sd/source/ui/notes/EditWindow.cxx | 12 +- sd/source/ui/notes/EditWindow.hxx | 2 +- sd/source/ui/presenter/PresenterTextView.cxx | 12 +- sd/source/ui/slideshow/slideshow.cxx | 3 +- sd/source/ui/table/TableDesignPane.cxx | 19 +-- sd/source/ui/table/tablefunction.cxx | 6 +- sd/source/ui/tools/PreviewRenderer.cxx | 4 +- sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2 +- sd/source/ui/unoidl/sddetect.cxx | 12 +- sd/source/ui/unoidl/unocpres.cxx | 5 +- sd/source/ui/unoidl/unolayer.cxx | 5 +- sd/source/ui/unoidl/unomodel.cxx | 15 +- sd/source/ui/unoidl/unoobj.cxx | 9 +- sd/source/ui/unoidl/unoobj.hxx | 2 +- sd/source/ui/unoidl/unopage.cxx | 19 +-- sd/source/ui/unoidl/unopback.cxx | 7 +- sd/source/ui/unoidl/unopback.hxx | 2 +- sd/source/ui/unoidl/unopool.cxx | 2 +- sd/source/ui/unoidl/unosrch.cxx | 2 +- sd/source/ui/view/Outliner.cxx | 18 +- sd/source/ui/view/PrintManager.cxx | 4 +- sd/source/ui/view/drawview.cxx | 8 +- sd/source/ui/view/drtxtob.cxx | 17 +- sd/source/ui/view/drtxtob1.cxx | 43 ++--- sd/source/ui/view/drviews1.cxx | 2 +- sd/source/ui/view/drviews2.cxx | 6 +- sd/source/ui/view/drviews3.cxx | 10 +- sd/source/ui/view/drviews4.cxx | 8 +- sd/source/ui/view/drviews5.cxx | 4 +- sd/source/ui/view/drviews7.cxx | 6 +- sd/source/ui/view/drviewsa.cxx | 2 +- sd/source/ui/view/drviewsb.cxx | 4 +- sd/source/ui/view/drviewse.cxx | 6 +- sd/source/ui/view/drviewsf.cxx | 4 +- sd/source/ui/view/drviewsi.cxx | 4 +- sd/source/ui/view/drviewsj.cxx | 4 +- sd/source/ui/view/outlnvs2.cxx | 6 +- sd/source/ui/view/outlnvsh.cxx | 12 +- sd/source/ui/view/outlview.cxx | 32 ++-- sd/source/ui/view/sdview.cxx | 6 +- sd/source/ui/view/sdview2.cxx | 4 +- sd/source/ui/view/sdview3.cxx | 18 +- sd/source/ui/view/sdview4.cxx | 7 +- sd/source/ui/view/sdwindow.cxx | 9 +- sd/source/ui/view/viewshe2.cxx | 2 +- sd/source/ui/view/viewshe3.cxx | 4 +- 129 files changed, 528 insertions(+), 756 deletions(-) (limited to 'sd/source') diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index d5ffdd562a74..776cb023b82a 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -35,8 +35,8 @@ #include "svx/xtable.hxx" #include #include -#include -#include +#include +#include #include "anminfo.hxx" #include "glob.hxx" diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index af7890cfa0d9..be016c06b864 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -35,12 +35,12 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include @@ -51,23 +51,23 @@ #include #include "Outliner.hxx" #include "app.hxx" -#include -#include -#include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index e208399d636f..9642a5609b8e 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -40,21 +40,21 @@ #ifndef SD_OUTLINE_HXX #include "Outliner.hxx" #endif -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include -#include +#include #include #include // SVX_RESSTR diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index a8a8369d0482..b11b1100ff69 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -39,47 +39,47 @@ #include #include "Outliner.hxx" #include -#include +#include #include "../ui/inc/DrawDocShell.hxx" -#include +#include #include #include -#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include // SVX_RESSTR -#include +#include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef _SVX_EMPHITEM_HXX -#include +#include #endif -#include -#include +#include +#include #include #include #include @@ -89,7 +89,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,16 +97,16 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include -#include -#include +#include +#include #include "sdresid.hxx" #include "drawdoc.hxx" diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 69d1d0203936..0c335deec8ff 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -37,34 +37,34 @@ #include #include "eetext.hxx" -#include +#include #include -#include +#include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include -#include -#include +#include +#include #ifndef _SVX_SRIPTTYPEITEM_HXX -#include +#include #endif #include -#include +#include #include -#include +#include #include "../ui/inc/DrawDocShell.hxx" #include "Outliner.hxx" diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 047431bec461..3dfa84d8121e 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -32,15 +32,15 @@ #include "precompiled_sd.hxx" #include #include -#include +#include #ifndef _SVXLINK_HXX #include #endif #include #include -#include +#include #include -#include +#include #include #include diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index 4d5486f4c36d..a0d2042a5da6 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "CustomAnimationCloner.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index e90b55243726..b2c508fa2038 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -33,6 +33,7 @@ #include #include +#include #include #include @@ -198,7 +199,7 @@ OUString SAL_CALL SdStyleFamily::getImplementationName() throw(RuntimeException) sal_Bool SAL_CALL SdStyleFamily::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } // ---------------------------------------------------------- diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 8c156af32038..f47752132b96 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -32,38 +32,38 @@ #include "precompiled_sd.hxx" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #ifndef _SVX_EMPHITEM_HXX -#include +#include #endif #include -#include +#include #include #include "eetext.hxx" #include // fuer RGB_Color -#include -#include -#include +#include +#include +#include #include #define _SDR_POSITIVE diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index de37c667020c..6a5dfd80aa91 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -38,21 +38,21 @@ #include #include #include - +#include #include #include "eetext.hxx" -#include -#include +#include +#include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -965,7 +965,7 @@ OUString SAL_CALL SdStyleSheet::getImplementationName() throw(RuntimeException) sal_Bool SAL_CALL SdStyleSheet::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } // -------------------------------------------------------------------- @@ -1249,7 +1249,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro return aAny; // Hole Wert aus ItemSet - aAny = GetStylePropertySet().getPropertyValue( pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(),pEntry, aSet ); } if( *pEntry->pType != aAny.getValueType() ) @@ -1436,7 +1436,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t SfxItemPool& rMyPool = GetPool().GetPool(); SfxItemSet aSet( rMyPool, pEntry->nWID, pEntry->nWID); aSet.Put( rMyPool.GetDefaultItem( pEntry->nWID ) ); - aRet = GetStylePropertySet().getPropertyValue( pEntry, aSet ); + aRet = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(), pEntry, aSet ); } return aRet; } diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index e967ccb939af..89b3024d3cbc 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -37,9 +37,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "Outliner.hxx" #include diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 93842800ec2e..16989c2b3f65 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -32,43 +32,43 @@ #include "precompiled_sd.hxx" #include "eetext.hxx" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include "sdattr.hxx" #include - +#include #include #include #include diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index cf66d81a0d6c..7e601955d39d 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -56,14 +56,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #define PPT_TRANSITION_TYPE_NONE 0 diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 361970345430..7bd77835e534 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -50,7 +50,7 @@ //#ifndef _SVX_XIT_HXX //#include //#endif -#include +#include #include #include #include @@ -103,10 +103,10 @@ #include #include #include -#include +#include /* -#include -#include +#include +#include #include */ #include diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 66340cd8898a..7545ce443e17 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -75,8 +75,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 5ef6123fdddf..7108a0666dce 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -67,7 +67,6 @@ #include #include #include -#include #include // -- @@ -211,7 +210,7 @@ sal_Bool SdGRFFilter::Import() { Graphic aGraphic; const String aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); - GraphicFilter* pGraphicFilter = GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); const USHORT nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); sal_Bool bRet = sal_False; @@ -313,7 +312,7 @@ sal_Bool SdGRFFilter::Export() { uno::Reference< lang::XComponent > xSource( pPage->getUnoPage(), uno::UNO_QUERY ); SfxItemSet* pSet = mrMedium.GetItemSet(); - GraphicFilter* pGraphicFilter = GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); if ( pSet && pGraphicFilter && xSource.is() ) { const String aTypeName( mrMedium.GetFilter()->GetTypeName() ); @@ -481,7 +480,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su // populate filter dialog filter list and select default filter to match graphic mime type - GraphicFilter& rGF = *GetGrfFilter(); + GraphicFilter& rGF = *GraphicFilter::GetGraphicFilter(); Reference xFltMgr(xFP, UNO_QUERY); OUString aDefaultFormatName; USHORT nCount = rGF.GetExportFormatCount(); diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index e84d2b429ae3..1a17964f7234 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -57,8 +57,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -66,28 +66,23 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #define _SVSTDARR_USHORTS #include -//#ifndef _SVDETC_HXX -//#include -//#endif -#include +#include #include -#include // FillFilter() #include // INetURLObject #include #include -#include #include #include #include "comphelper/anytostring.hxx" diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 6d9860740740..bc331d044c71 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -52,9 +52,8 @@ #include #include #include -#include #include -#include +#include #include #include #include diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index 100f5c6c8cca..a0c1bba2ac68 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 37277a17c97b..3eed0d787591 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include +#include #include #include @@ -46,19 +46,19 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -74,9 +74,9 @@ #include "anminfo.hxx" #include #include -#include +#include #include -#include +#include #include #include #include @@ -91,7 +91,7 @@ #include #include #include -#include +#include #include #include #define MAX_USER_MOVE 2 diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 1dabd27800d8..99e7cc912089 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -71,8 +71,8 @@ #include #include -#include -#include +#include +#include #include #include #include "pptin.hxx" diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 5fa918db31ef..231afe4b7579 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -38,12 +38,12 @@ #include #include -#include +#include #include #include -#include -#include -#include +#include +#include +#include #include "drawdoc.hxx" #include "glob.hxx" diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index 2b9e977b073f..537ce22638ef 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include +#include #include #ifndef SD_ACCESSIBILITY_ACCESSIBLE_OUTLINE_EDIT_SOURCE_HXX diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 9a1634a7f695..214f29664683 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -72,7 +72,7 @@ #include #endif #include -#include +#include #include #include diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 9e650d0da43c..cc64ede7109a 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -41,7 +41,7 @@ #include #include #include - +#include #include #include @@ -60,15 +60,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 2a7ca2df9b0d..737a51bbed9f 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -30,32 +30,32 @@ #include "precompiled_sd.hxx" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include //EditEngine flags -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include //EditEngine flags +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index bdfe36c4ebf2..cbe6b675f044 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -44,7 +44,7 @@ #include #include -#include +#include class OutlinerView; class Outliner; diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 7cdec8c9f36b..a19202524a8e 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -30,18 +30,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include +#include -#include +#include #include #include -#ifndef _FM_FMOBJFAC_HXX #include -#endif #include #include - #include "sddll.hxx" #include "DrawDocShell.hxx" #include "GraphicDocShell.hxx" @@ -56,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -156,181 +152,3 @@ void SdDLL::Exit() (*ppShlPtr) = NULL; } -/* -ULONG SdDLL::DetectFilter(SfxMedium& rMedium, const SfxFilter** ppFilter, - SfxFilterFlags nMust, SfxFilterFlags nDont) -{ - ULONG nReturn = ERRCODE_ABORT; // Erkennung fehlgeschlagen, Filter ungueltig - BOOL bStorage = FALSE; - - if( *ppFilter && (*ppFilter)->GetFilterFlags() & SFX_FILTER_PACKED ) - { - uno::Reference< lang::XMultiServiceFactory > xSMgr( ::comphelper::getProcessServiceFactory() ); - uno::Reference< util::XArchiver > xPacker( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.util.Archiver" ) ), uno::UNO_QUERY ); - if( xPacker.is() ) - { - // extract extra data - OUString aPath( rMedium.GetOrigURL() ); - OUString aExtraData( xPacker->getExtraData( aPath ) ); - const OUString aSig1= OUString::createFromAscii( "private:" ); - String aTmp; - aTmp += sal_Unicode( '?' ); - aTmp += String::CreateFromAscii("simpress"); - const OUString aSig2( aTmp ); - INT32 nIndex1 = aExtraData.indexOf( aSig1 ); - INT32 nIndex2 = aExtraData.indexOf( aSig2 ); - if( nIndex1 == 0 && nIndex2 != -1 ) - return ERRCODE_NONE; - } - } - else if (rMedium.GetError() == SVSTREAM_OK) - { - if ( rMedium.IsStorage() ) - { - bStorage = TRUE; - SotStorageRef xStorage = rMedium.GetStorage(); - if ( !xStorage.Is() ) - return ULONG_MAX; - - if( SvtModuleOptions().IsImpress() ) - { - // Erkennung ueber contained streams (PowerPoint 97-Filter) - String aStreamName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "PowerPoint Document" ) ); - if ( xStorage->IsContained( aStreamName ) && xStorage->IsStream( aStreamName ) ) - { - String aFileName(rMedium.GetName()); - aFileName.ToUpperAscii(); - - if( aFileName.SearchAscii( ".POT" ) == STRING_NOTFOUND ) - *ppFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97); - else - *ppFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97Template ); - - return ERRCODE_NONE; - } - } - - const SfxFilter* pFilter = *ppFilter; - if ( *ppFilter ) - { - if ( (*ppFilter)->GetFormat() == xStorage->GetFormat() ) - pFilter = *ppFilter; - } - - if( !pFilter && SvtModuleOptions().IsImpress() ) - { - SfxFilterMatcher aMatcher( String::CreateFromAscii("simpress") ); - pFilter = aMatcher.GetFilter4ClipBoardId( xStorage->GetFormat() ); - if ( pFilter ) - *ppFilter = pFilter; - } - - if( !pFilter && SvtModuleOptions().IsDraw() ) - { - SfxFilterMatcher aMatcher( String::CreateFromAscii("sdraw") ); - pFilter = aMatcher.GetFilter4ClipBoardId( xStorage->GetFormat() ); - if ( pFilter ) - *ppFilter = pFilter; - } - - if ( pFilter && - ( pFilter->GetFilterFlags() & nMust ) == nMust && - ( pFilter->GetFilterFlags() & nDont ) == 0 ) - { - *ppFilter = pFilter; - nReturn = ERRCODE_NONE; - } - else - { - *ppFilter = NULL; - nReturn = ERRCODE_NONE; - } - } - - String aFileName( rMedium.GetName() ); - aFileName.ToUpperAscii(); - - if ( nReturn == ERRCODE_ABORT ) - { - if( bStorage ) // aber keine Clipboard-Id #55337# - { - *ppFilter = NULL; - } - else - { - // Vektorgraphik? - SvStream* pStm = rMedium.GetInStream(); - - if( !pStm ) - nReturn = ERRCODE_IO_GENERAL; - else - { - pStm->Seek( STREAM_SEEK_TO_BEGIN ); - - const String aFileName( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); - GraphicDescriptor aDesc( *pStm, &aFileName ); - GraphicFilter* pGrfFilter = GetGrfFilter(); - - if( !aDesc.Detect( FALSE ) ) - { - if( SvtModuleOptions().IsImpress() ) - { - *ppFilter = NULL; - nReturn = ERRCODE_ABORT; - INetURLObject aURL( aFileName ); - if( aURL.getExtension().equalsIgnoreAsciiCaseAscii( "cgm" ) ) - { - sal_uInt8 n8; - pStm->Seek( STREAM_SEEK_TO_BEGIN ); - *pStm >> n8; - if ( ( n8 & 0xf0 ) == 0 ) // we are supporting binary cgm format only, so - { // this is a small test to exclude cgm text - const String aName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "CGM - Computer Graphics Metafile" ) ); - SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") ); - *ppFilter = aMatch.GetFilter4FilterName( aName ); - nReturn = ERRCODE_NONE; - } - } - } - } - else - { - if( SvtModuleOptions().IsDraw() ) - { - String aShortName( aDesc.GetImportFormatShortName( aDesc.GetFileFormat() ) ); - const String aName( pGrfFilter->GetImportFormatTypeName( pGrfFilter->GetImportFormatNumberForShortName( aShortName ) ) ); - - if ( *ppFilter && aShortName.EqualsIgnoreCaseAscii( "PCD" ) ) // there is a multiple pcd selection possible - { - sal_Int32 nBase = 2; // default Base0 - String aFilterTypeName( (*ppFilter)->GetRealTypeName() ); - if ( aFilterTypeName.CompareToAscii( "pcd_Photo_CD_Base4" ) == COMPARE_EQUAL ) - nBase = 1; - else if ( aFilterTypeName.CompareToAscii( "pcd_Photo_CD_Base16" ) == COMPARE_EQUAL ) - nBase = 0; - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Import/PCD" ) ); - FilterConfigItem aFilterConfigItem( aFilterConfigPath ); - aFilterConfigItem.WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ), nBase ); - } - - SfxFilterMatcher aMatch( String::CreateFromAscii("draw") ); - *ppFilter = aMatch.GetFilter4FilterName( aName ); - nReturn = ERRCODE_NONE; - } - else - { - nReturn = ERRCODE_ABORT; - *ppFilter = NULL; - } - } - } - } - } - } - else - { - nReturn = rMedium.GetError(); - } - - return nReturn; -} */ diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index c222e5f3cb44..9d65c0a70bbd 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -33,12 +33,12 @@ -#include +#include #include "eetext.hxx" #include -#include +#include -#include +#include #include #include #include diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 65485d9df447..5d6b88cb5814 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -39,16 +39,16 @@ #include -#include -#include +#include +#include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include "app.hrc" diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 0a4eaf0bbebe..48e18c7cf055 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -30,8 +30,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include -#include +#include +#include #include #include #include @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 274a99f830e5..9454ac3d33c3 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -32,10 +32,10 @@ #include "precompiled_sd.hxx" -#include +#include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 7a57c81178b6..9fd9050160ef 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -39,24 +39,24 @@ #ifndef _UNTOOLS_TEMPFILE_HXX #include #endif -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include -#include +#include #include #include #include #include #include -#include +#include //#ifndef _SVDETC_HXX //autogen //#include diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index 735af8c95042..505636e5c00d 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index b0a353c42b2f..2e520d57564a 100644 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -40,10 +40,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 254e3f6dcfa2..99885895e325 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -37,7 +37,7 @@ #include -#include +#include #include #include diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 19fb96a6e4d9..ba42c4923550 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -37,14 +37,14 @@ -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include #include "strings.hrc" diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index dbe0e252f7eb..a1d623970b16 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -42,10 +42,10 @@ #endif #include #include -#include -#include +#include +#include -#include +#include #include #include diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index 2145e477e476..e5cac2ad2f04 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -50,7 +50,7 @@ #include "DrawDocShell.hxx" #include #include -#include +#include /************************************************************************* |* diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 224f0098a9d9..009edbe52639 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -50,14 +50,11 @@ #include #include #include - -#include - #include #include "filedlg.hxx" #include "sdresid.hxx" #include "strings.hrc" - +#include //----------------------------------------------------------------------------- @@ -352,7 +349,7 @@ SdExportFileDialog::SdExportFileDialog(BOOL bHaveCheckbox) : { // setup filter const String aHTMLFilter( SdResId( STR_EXPORT_HTML_NAME ) ); - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); const USHORT nFilterCount = pFilter->GetExportFormatCount(); // add HTML filter diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index fd8719d60927..2e924e6d2b29 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -38,12 +38,12 @@ #ifndef _SVX_DIALOGS_HRC #include #endif -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #ifndef _SD_SDRESID_HXX diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index eeefcda29f3d..319e031166b3 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -41,9 +41,9 @@ #include #include -#include +#include #include -#include +#include #include #include "eetext.hxx" diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index b7a65b0d5b6e..7f666f8270cf 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -39,16 +39,16 @@ #include "eetext.hxx" #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 5ce27def13a6..bfc84f0e54b7 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -35,7 +35,7 @@ #undef SD_DLLIMPLEMENTATION #endif -#include +#include #include diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 80ba0b78c9f9..c008dc4fdcd4 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -35,7 +35,7 @@ #undef SD_DLLIMPLEMENTATION #endif - +#include #include #include #include @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 0ec5c672e7b6..a8bac6d4eb3c 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -48,12 +48,12 @@ #include #include #ifdef _OUTLINER_HXX -#include +#include #endif #include #include #include -#include +#include #include diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index ce2c38f20afd..cb57c463d865 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -39,8 +39,8 @@ #ifndef _SVXIDS_HRC #include #endif -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 839c5938adbc..1367eeb6f215 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -43,7 +43,7 @@ #endif #include #include -#include +#include #include #include #include @@ -51,7 +51,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 95687ab8a833..f7fc58f70058 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -41,23 +41,23 @@ //-> Fonts & Items #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include //<- Fonts & Items -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include "bulmaper.hxx" diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index fac03893a880..ac0ba744e964 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -37,9 +37,9 @@ #ifndef _BINDING_HXX //autogen #include #endif -#include +#include #include -#include +#include #include "OutlineViewShell.hxx" #include "DrawViewShell.hxx" #include "Window.hxx" diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 903cc53e51db..b37761e859db 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -36,9 +36,9 @@ #include -#include +#include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index a9f1445097e4..434408d85c3a 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -71,7 +71,7 @@ #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" // #109583# -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index d9513f4b5c22..28684dca8cac 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include // #88751# @@ -67,7 +67,7 @@ #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" // #109583# -#include +#include #include #include diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 7da8b98ea568..f96c9cfd7d67 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -32,10 +32,10 @@ #include "precompiled_sd.hxx" #include -#include +#include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index d71456a7409a..b8cf0c3dbf0b 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include "app.hrc" @@ -56,7 +56,7 @@ #include "optsitem.hxx" #include "sdmod.hxx" #include -#include +#include namespace sd { diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 98dbcba52ab2..90ecad5d157a 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -40,9 +40,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #define _SD_DLL // fuer SD_MOD() #include "sdmod.hxx" diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 42576f8d9d53..f1a0b31ee92d 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -39,9 +39,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include "drawdoc.hxx" diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 578830b37c25..b98acd7c24e8 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -70,7 +69,7 @@ #include #include #ifndef _EDITENG_HXX //autogen -#include +#include #endif #include #include @@ -187,7 +186,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) } else { - SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GetGrfFilter()->GetLastError().nStreamError ); + SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); } } } diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index a6dad3779ab7..aea5c75fb949 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -34,9 +34,9 @@ #include "fuinsfil.hxx" #include #include -#include +#include #ifndef _EDITENG_HXX -#include +#include #endif #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 83851db28cae..a0ae873ab80f 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include "View.hxx" diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 5083023efdde..0b7904444926 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -36,7 +36,7 @@ #include "sdattr.hxx" #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index a16e6dbb20dd..1cdd41c58ce6 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -35,12 +35,12 @@ #include "fuolbull.hxx" #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include "OutlineView.hxx" #include "OutlineViewShell.hxx" diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index ff033914db47..286d4ed6533a 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -35,9 +35,9 @@ #include "fuoltext.hxx" #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index eac60c2867cd..9a7851730693 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -34,7 +34,7 @@ #include "fuoutl.hxx" -#include +#include #include "OutlineView.hxx" #include "OutlineViewShell.hxx" #ifndef SD_WINDOW_SHELL_HXX diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 284b4da2be66..10c8d69552dd 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -55,21 +55,21 @@ #ifndef _SVX_SVDUNDO_HXX #include #endif -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include "glob.hrc" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index a43378457812..fe11e0a26a3e 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -33,7 +33,7 @@ #include "fuparagr.hxx" -#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #include "app.hrc" diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 936802ff34cb..ba6fd311b8bb 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -74,7 +74,7 @@ #include // #98533# -#include +#include using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 7fd48732ccc4..9f0c29dbf5f8 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -66,7 +66,7 @@ #include "sdresid.hxx" #include "drawview.hxx" #include "eetext.hxx" -#include +#include #include "sdabstdlg.hxx" namespace sd diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index d4f6dc71cc88..0bd334b7687c 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -37,7 +37,7 @@ #include #endif #include -#include +#include #include diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index fe97b7410ee7..5b87e6f59782 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -53,8 +53,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx index 1b7211c9212a..81c8cbb9f1c2 100644 --- a/sd/source/ui/func/fuspell.cxx +++ b/sd/source/ui/func/fuspell.cxx @@ -34,7 +34,7 @@ #include "fuspell.hxx" -#include +#include #include #include diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 0e9e6970d76d..cbb8175f1ec0 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -33,11 +33,11 @@ #include "fusumry.hxx" -#include +#include #include #include #include -#include +#include #include "strings.hrc" diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index e53d6d9d7789..e3880f1ea846 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -38,18 +38,18 @@ #include "futempl.hxx" -#include -#include +#include +#include #include // fuer SID_OBJECT_SELECT #include #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 864fe286a517..c588680c1b02 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -33,38 +33,37 @@ #include "futext.hxx" -#include +#include +#include #include #include #include #include -#include +#include #include #include #include -#ifndef _SVDOGROUP_HXX //autogen #include -#endif -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include #include -#include +#include #include // #104122# -#include +#include #include -#include +#include #include "sdresid.hxx" #include "app.hrc" diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 47e5adfa3a18..0c7ceeab98d1 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -35,16 +35,16 @@ #include "futhes.hxx" #include -#include +#include #include #include #include -#include +#include #include #include #include -#include +#include #include #include "app.hrc" #include "strings.hrc" diff --git a/sd/source/ui/func/outlinfo.cxx b/sd/source/ui/func/outlinfo.cxx index 48ad73307a55..39bf23562853 100644 --- a/sd/source/ui/func/outlinfo.cxx +++ b/sd/source/ui/func/outlinfo.cxx @@ -32,10 +32,10 @@ #include "precompiled_sd.hxx" #include -#include +#include #include #include -#include +#include #include "drawdoc.hxx" #include "outlinfo.hxx" #include @@ -52,7 +52,7 @@ #ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ #include #endif -#include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index e371da534b67..707a5a520eab 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -31,9 +31,9 @@ #ifndef SD_ACCESSIBILITY_ACCESSIBLE_DOCUMENT_VIEW_BASE_HXX #define SD_ACCESSIBILITY_ACCESSIBLE_DOCUMENT_VIEW_BASE_HXX -#include -#include -#include +#include +#include +#include #include "AccessibleViewForwarder.hxx" #include "AccessiblePageShape.hxx" #include diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index e408b70b755a..fbfb3de4cb56 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -35,10 +35,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include class OutlinerView; class SdrOutliner; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 03b017c2c646..ae1dc80fff13 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -32,7 +32,7 @@ #define SD_OUTLINE_VIEW_HXX #include -#include +#include #include "View.hxx" class SdPage; diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index f0f1956dbb6c..65b69f938f78 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -32,7 +32,7 @@ #define SD_FU_TEXT_HXX #ifndef _EDITDATA_HXX -#include +#include #endif #include "fuconstr.hxx" #include diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 32e1891e5226..51222bd2e707 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index a4dc305d6aeb..d86d5cbde3cc 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -56,7 +56,7 @@ #include #include -#include +#include #include diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index b437ea82033c..6b8ef792cd9a 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include class SdrObject; class SvxItemPropertySet; diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index 10c4b58fd999..93b1a59471b7 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -36,19 +36,19 @@ #include "sdmod.hxx" #include #include -#include -#include +#include +#include #include -#include +#include #include "sdresid.hxx" #include -#include +#include #include #include #include #include -#include -#include +#include +#include #define SCROLL_LINE 24 diff --git a/sd/source/ui/notes/EditWindow.hxx b/sd/source/ui/notes/EditWindow.hxx index bc33541e6eba..01bf243aceee 100755 --- a/sd/source/ui/notes/EditWindow.hxx +++ b/sd/source/ui/notes/EditWindow.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include class EditEngine; diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 8890c608f17f..b6946883aa32 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -39,12 +39,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 1396cc7f753c..2096034ef278 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -278,7 +279,7 @@ OUString SAL_CALL SlideShow::getImplementationName( ) throw(RuntimeException) sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames( ) ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames( ) ); } // -------------------------------------------------------------------- diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 9ab5a4a175d5..954063a7f972 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -33,36 +33,27 @@ #include "sddll.hxx" -//#include #include #include #include #include #include -//#include #include - -//#include - #include - #include -//#include - #include - #include #include #include #include #include - +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "TableDesignPane.hxx" diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 1d1d38df82bf..b2006dbc4ba2 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -46,12 +46,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 770ca7fabf6c..527724b313ba 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 7a24893c3bc5..b741e70a75ee 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -70,7 +70,7 @@ #else #include #endif -#include +#include #include #define MAP_LEN(x) x, sizeof(x)-1 diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index a59b63a3df10..befa9ccb2f17 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -40,9 +40,7 @@ #include #include #include -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include -#endif #include #include #include @@ -52,15 +50,10 @@ #include #include #include - - #include - -#ifndef _TOOLKIT_UNOHLP_HXX #include -#endif #include - +#include #include #include #include @@ -80,7 +73,6 @@ #include #include #include -#include #include #include #include @@ -378,7 +370,7 @@ SdFilterDetect::~SdFilterDetect() const String aFileName( aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); GraphicDescriptor aDesc( *pStm, &aFileName ); - GraphicFilter* pGrfFilter = GetGrfFilter(); + GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter(); if( !aDesc.Detect( FALSE ) ) { pFilter = 0; diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 7a197f08f1d6..2b69ae456af2 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -36,6 +36,7 @@ #include #include #include +#include #include "unohelp.hxx" #include "unomodel.hxx" @@ -84,7 +85,7 @@ OUString SAL_CALL SdXCustomPresentation::getImplementationName() sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNames() @@ -305,7 +306,7 @@ OUString SAL_CALL SdXCustomPresentationAccess::getImplementationName() sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServiceNames() diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index a5b8e47419a0..67d91afbc17b 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -39,6 +39,7 @@ #include #include #include +#include // folgende fuer InsertSdPage() #include @@ -182,7 +183,7 @@ OUString SAL_CALL SdLayer::getImplementationName() sal_Bool SAL_CALL SdLayer::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames() @@ -523,7 +524,7 @@ OUString SAL_CALL SdLayerManager::getImplementationName() sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames() diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 252c9d6806c0..4ac3e02ecc73 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -43,19 +43,20 @@ #include #include +#include #include #include #include -#include +#include #include #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -66,12 +67,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include // #99870# Support creation of GraphicObjectResolver and EmbeddedObjectResolver #include @@ -2988,7 +2989,7 @@ OUString SAL_CALL SdDocLinkTargets::getImplementationName() sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getSupportedServiceNames() diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index af6fbb25e0a3..b3cba2aeadee 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -58,10 +58,11 @@ #include #include #include -#include +#include #include "CustomAnimationPreset.hxx" #include "Outliner.hxx" #include "sdresid.hxx" +#include #include "anminfo.hxx" #include "unohelp.hxx" @@ -957,7 +958,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SdXShape::getSupportedServiceNames() t { uno::Sequence< OUString > aSeq( mpShape->_getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.presentation.Shape", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.presentation.Shape", "com.sun.star.document.LinkTarget" ); SdrObject* pObj = mpShape->GetSdrObject(); @@ -967,10 +968,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SdXShape::getSupportedServiceNames() t switch( nInventor ) { case OBJ_TITLETEXT: - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.TitleTextShape" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.TitleTextShape" ); break; case OBJ_OUTLINETEXT: - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.OutlinerShape" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.OutlinerShape" ); break; } } diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 417e13bbdb60..3308bd0e1564 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -40,7 +40,7 @@ #include #include -#include +#include #include diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 53b970f58e24..fc6c8d869046 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -44,23 +44,17 @@ #include #include #include -#ifndef _TOOLKIT_UNOIFACE_HXX #include -#endif #include #include #include #include -#ifndef _SVX_SVXIDS_HRC #include -#endif #include #include #include #include -#ifndef _SD_PAGE_HXX //autogen #include -#endif #include #include #include @@ -71,6 +65,7 @@ #include #include #include +#include #include #include @@ -1432,7 +1427,7 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() throw(uno::RuntimeException) { Sequence< OUString > aSeq( SvxFmDrawPage::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.drawing.GenericDrawPage", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.drawing.GenericDrawPage", "com.sun.star.document.LinkTarget", "com.sun.star.document.LinkTargetSupplier"); return aSeq; @@ -1972,7 +1967,7 @@ OUString SAL_CALL SdPageLinkTargets::getImplementationName() sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() @@ -2204,10 +2199,10 @@ Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno:: throwIfDisposed(); Sequence< OUString > aSeq( SdGenericDrawPage::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.DrawPage" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.DrawPage" ); if( mbIsImpressDocument ) - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.DrawPage" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.DrawPage" ); return aSeq; } @@ -2792,10 +2787,10 @@ Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno throwIfDisposed(); Sequence< OUString > aSeq( SdGenericDrawPage::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.MasterPage" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.MasterPage" ); if( SvxFmDrawPage::mpPage && ((SdPage*)SvxFmDrawPage::mpPage)->GetPageKind() == PK_HANDOUT ) - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.HandoutMasterPage" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.HandoutMasterPage" ); return aSeq; } diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index b0707d11f11f..953054dbfed1 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -43,6 +43,7 @@ #include #include #include +#include #include "unopback.hxx" #include "unohelp.hxx" @@ -212,7 +213,7 @@ OUString SAL_CALL SdUnoPageBackground::getImplementationName() sal_Bool SAL_CALL SdUnoPageBackground::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdUnoPageBackground::getSupportedServiceNames() @@ -332,7 +333,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert aSet.Put( rPool.GetDefaultItem( pEntry->nWID ) ); // Hole Wert aus ItemSet - aAny = mpPropSet->getPropertyValue( pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); } } else @@ -460,7 +461,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aProp SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); aSet.Put( rPool.GetDefaultItem( pEntry->nWID ) ); - aAny = mpPropSet->getPropertyValue( pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); } } return aAny; diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index eace69d82c9c..54ed0b5c43d5 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index 403b28e6a71b..1b1287e5cd03 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include #include -#include +#include #include #include "drawdoc.hxx" diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 293176993937..1cc68a92f5a9 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 491543f49e5e..d35c63115527 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -34,31 +34,29 @@ #include "Outliner.hxx" #include #include -#include -#include -#include +#include +#include +#include #include -#ifndef _DLGUTIL_HXX #include -#endif #include #include #include #include #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include #include @@ -80,6 +78,8 @@ #include "SpellDialogChildWindow.hxx" #include "ToolBarManager.hxx" #include "framework/FrameworkHelper.hxx" +#include +#include using ::rtl::OUString; using namespace ::com::sun::star; diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx index 3963c4cb5273..0e6980a89e91 100644 --- a/sd/source/ui/view/PrintManager.cxx +++ b/sd/source/ui/view/PrintManager.cxx @@ -37,7 +37,7 @@ #include "PrintManager.hxx" -#include +#include #include "optsitem.hxx" #include "sdattr.hxx" #include "sdpage.hxx" @@ -72,7 +72,7 @@ #include "prntopts.hrc" #include "app.hrc" #include -#include +#include #include #include "printdialog.hxx" diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index dfbd76e4a3b6..9a25410af7eb 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #ifndef _VIEW3D_HXX //autogen #include #endif @@ -49,10 +49,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 5a2b458341c9..2a11c726402c 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -33,10 +33,11 @@ #include "TextObjectBar.hxx" +#include -#include -#include -#include +#include +#include +#include #include #include #include @@ -44,13 +45,13 @@ #include #include #include -#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 2a29ecbc6d6c..1ebda2ff9851 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -33,17 +33,12 @@ #include "TextObjectBar.hxx" +#include -#include -#ifndef _ULSPITEM_HXX -#include -#endif -#ifndef _LSPCITEM_HXX -#include -#endif -#ifndef _ADJITEM_HXX -#include -#endif +#include +#include +#include +#include #include #include #include @@ -53,25 +48,23 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include -#ifndef _SVX_SRIPTTYPEITEM_HXX //autogen -#include -#endif +#include #include -#include -#include +#include +#include #include diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 1c5d8bead561..4cca96e9567f 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include "misc.hxx" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 12b81a01d3ba..3f3c7e30bc04 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -44,7 +44,7 @@ #include #endif #ifndef _EDITDATA_HXX -#include +#include #endif #include #include @@ -53,9 +53,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 54e0f37a1b19..5e1130fa7236 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -34,11 +34,11 @@ #include "DrawViewShell.hxx" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #ifndef _SVX_RULERITEM_HXX #include diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 52a0a2e6b3cb..5cbd9f306985 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -39,9 +39,9 @@ #include #include #include -#include +#include #ifndef _FLDITEM_HXX -#include +#include #endif #ifndef _SVXIDS_HRC #include @@ -50,7 +50,7 @@ #ifndef _GLOBL3D_HXX #include #endif -#include +#include #ifndef _SFX_CLIENTSH_HXX #include #endif @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 3f8973fbcd64..0cdc3edebb5d 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -33,7 +33,7 @@ #include "DrawViewShell.hxx" #include "PresentationViewShell.hxx" -#include +#include #ifndef _SVXIDS_HXX #include #endif @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include "AccessibleDrawDocumentView.hxx" diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index cc7fd3106fa2..c81c409688ae 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -36,9 +36,9 @@ #include #include #include -#include +#include #ifndef _FLDITEM_HXX -#include +#include #endif #ifndef _SVXIDS_HXX #include @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 2eb4282bb6e5..9a3e598cf102 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -35,7 +35,7 @@ #include #include #ifndef _SVX_SIZEITEM -#include +#include #endif #include #ifndef _SVX_ZOOMITEM diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 09e71dc547ac..6ec89931c24b 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -41,9 +41,9 @@ #include #include #include -#include +#include #ifndef _FLDITEM_HXX -#include +#include #endif #include #include diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 1dbfa7211a76..d44c74838893 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -41,7 +41,7 @@ #include "undo/undomanager.hxx" #include #include -#include +#include #include #include #include @@ -52,12 +52,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 3783f20a49ef..0e0d68a8780d 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -42,9 +42,9 @@ #include #endif #include -#include +#include #ifndef _FLDITEM_HXX -#include +#include #endif #include #include diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 4eb0b6671d82..fa13e5317b6f 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -35,10 +35,10 @@ #include #include "sdattr.hxx" #include -#include +#include #include #include -#include +#include #include #ifndef _SVXIDS_HRC #include diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index c21432b27846..f86dbe94c8f1 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -40,9 +40,9 @@ #ifndef _GLOBL3D_HXX //autogen #include #endif -#include +#include #ifndef _FLDITEM_HXX -#include +#include #endif #include #include diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 468ea50776f2..b6f9902562dc 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -45,9 +45,9 @@ #include #endif #include -#include -#include -#include +#include +#include +#include #include "optsitem.hxx" #include diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 5ea8ab7a2c0e..c6f2dabc116b 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -45,8 +45,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include #include @@ -64,13 +64,13 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include "fubullet.hxx" #include "optsitem.hxx" diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index c500a95f2811..bd273fa5180b 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -33,14 +33,14 @@ #include "OutlineView.hxx" #include -#include +#include #include #include #include #include "eetext.hxx" -#include -#include -#include +#include +#include +#include #include #include #include @@ -52,21 +52,21 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include // #97766# -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include "DrawDocShell.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 020f2a1ffec5..d59277d0bf23 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -34,11 +34,11 @@ #include #include "View.hxx" -#include +#include #include #include #include -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 49bbf3149c8b..7d660bc16a0b 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -54,11 +54,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index cbc8758d2b53..de8bbfa41d55 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -37,16 +37,14 @@ #include #include #include -#ifndef _EDITDATA_HXX -#include -#endif +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -57,21 +55,17 @@ #include #include #include -#ifndef _FM_FMMODEL_HXX #include -#endif #include -#include -#ifndef _EDITENG_HXX //autogen -#include -#endif +#include +#include #include #include #include #include #include #include - +#include #include #include "DrawDocShell.hxx" diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 9d301368418c..1662b0f5c4ad 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -46,15 +46,12 @@ #include #include #include -#ifndef _IMPGRF_HXX -#include -#endif #include #include #include #include #include - +#include #include "app.hrc" #include "Window.hxx" #include "DrawDocShell.hxx" @@ -367,7 +364,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) aURL = INetURLObject( aURLStr ); } - GraphicFilter* pGraphicFilter = GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; aCurrentDropFile = aURL.GetMainURL( INetURLObject::NO_DECODE ); diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index e3c3ab3a7e95..cabbbfdc8d49 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -36,10 +36,11 @@ #include #include +#include -#include +#include -#include +#include #include "app.hrc" #include "helpids.h" @@ -49,12 +50,8 @@ #include "FrameView.hxx" #include "OutlineViewShell.hxx" #include "drawdoc.hxx" -#ifndef SD_ACCESSIBILITY_ACCESSIBLE_DRAW_DOCUMENT_VIEW_HXX #include "AccessibleDrawDocumentView.hxx" -#endif -#ifndef SD_WINDOW_UPDATER_HXX #include "WindowUpdater.hxx" -#endif namespace sd { diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 08a39c44d86a..42c7997e878c 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 86e441939b0e..1dda76cb3e9a 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -58,8 +58,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include -- cgit