diff options
-rw-r--r-- | sd/inc/pglink.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/unoidl/UnoDocumentSettings.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unolayer.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopage.hxx | 4 |
6 files changed, 0 insertions, 34 deletions
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx index 359bd302622d..668e59793d2b 100644 --- a/sd/inc/pglink.hxx +++ b/sd/inc/pglink.hxx @@ -29,8 +29,6 @@ #ifndef _PGLINK_HXX #define _PGLINK_HXX -#ifndef SVX_LIGHT - #include <sfx2/lnkbase.hxx> class SdPage; @@ -51,12 +49,6 @@ public: bool Connect() { return 0 != SvBaseLink::GetRealObject(); } }; -#else - -class SdPageLink; - -#endif - #endif // _PGLINK_HXX diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 72bd79398488..a3d9535eace1 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -45,23 +45,15 @@ #include <vcl/svapp.hxx> #include "drawdoc.hxx" -#ifndef SVX_LIGHT #include "DrawDocShell.hxx" -#endif #include "unomodel.hxx" -#ifndef SVX_LIGHT #include "optsitem.hxx" #include <sfx2/printer.hxx> #include "sdattr.hxx" -#endif #include "../inc/ViewShell.hxx" #include "../inc/FrameView.hxx" -#ifndef SVX_LIGHT #include "Outliner.hxx" -#else -#include <svx/svdoutl.hxx> -#endif #include <editeng/editstat.hxx> #include <svx/unoapi.hxx> @@ -176,7 +168,6 @@ enum SdDocumentSettingsPropertyHandles { MAP_LEN("DefaultTabStop"), HANDLE_TABSTOP, &::getCppuType((const sal_Int32*)0), 0, 0 }, { MAP_LEN("PrinterName"), HANDLE_PRINTERNAME, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_LEN("PrinterSetup"), HANDLE_PRINTERJOB, &::getCppuType((const uno::Sequence < sal_Int8 > *)0), 0, MID_PRINTER }, -#ifndef SVX_LIGHT { MAP_LEN("IsPrintPageName"), HANDLE_PRINTPAGENAME, &::getBooleanCppuType(), 0, MID_PRINTER }, { MAP_LEN("IsPrintDate"), HANDLE_PRINTDATE, &::getBooleanCppuType(), 0, MID_PRINTER }, @@ -188,7 +179,6 @@ enum SdDocumentSettingsPropertyHandles { MAP_LEN("IsPrintBookletFront"), HANDLE_PRINTBOOKLETFRONT, &::getBooleanCppuType(), 0, MID_PRINTER }, { MAP_LEN("IsPrintBookletBack"), HANDLE_PRINTBOOKLETBACK, &::getBooleanCppuType(), 0, MID_PRINTER }, { MAP_LEN("PrintQuality"), HANDLE_PRINTQUALITY, &::getCppuType((const sal_Int32*)0), 0, MID_PRINTER }, -#endif { MAP_LEN("ColorTableURL"), HANDLE_COLORTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_LEN("DashTableURL"), HANDLE_DASHTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_LEN("LineEndTableURL"), HANDLE_LINEENDTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 0eff267a13aa..ba9b7a7a5ddc 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -42,9 +42,7 @@ // folgende fuer InsertSdPage() #include <svx/svdlayer.hxx> -#ifndef SVX_LIGHT #include "DrawDocShell.hxx" -#endif #include <drawdoc.hxx> #include <unomodel.hxx> #include "unoprnms.hxx" @@ -268,10 +266,8 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un throw beans::UnknownPropertyException(); } -#ifndef SVX_LIGHT if( pLayerManager->GetDocShell() ) pLayerManager->GetDocShell()->SetModified(); -#endif } uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName ) @@ -343,7 +339,6 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw() } } -#ifndef SVX_LIGHT // Versuch 2. Info von der FrameView besorgen if(pLayerManager->GetDocShell()) { @@ -356,7 +351,6 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw() case LOCKED: return pFrameView->GetLockedLayers().IsSet(pLayer->GetID()); } } -#endif } return sal_False; //TODO: uno::Exception? } @@ -385,7 +379,6 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() } } -#ifndef SVX_LIGHT // Versuch 2. Info von der FrameView besorgen if(pLayerManager->GetDocShell()) { @@ -418,7 +411,6 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() return; } } -#endif } //TODO: uno::Exception? } diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index e904098fa1fa..5032d3cb8f04 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -72,9 +72,7 @@ #include "ViewShell.hxx" #include "unokywds.hxx" #include "unopage.hxx" -#ifndef SVX_LIGHT #include "DrawDocShell.hxx" -#endif #include "helpids.h" #include "glob.hxx" #include "glob.hrc" diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 096af6d322c9..c8304e94aa87 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -73,9 +73,7 @@ #include <svx/svdpool.hxx> #include <svx/svdview.hxx> #include "View.hxx" -#ifndef SVX_LIGHT #include "DrawDocShell.hxx" -#endif #include "ViewShell.hxx" #include "DrawViewShell.hxx" #include "unoobj.hxx" diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index ef2654e7965c..0d80a97a5d86 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -52,10 +52,6 @@ class SvxShape; class SdrObject; struct SfxItemPropertySimpleEntry; -#ifdef SVX_LIGHT -#define SvxFmDrawPage SvxDrawPage -#endif - /*********************************************************************** * * ***********************************************************************/ |