5 files changed, 2 insertions, 68 deletions
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index b9beb12bfeff..9b144b3c20b6 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -119,7 +119,6 @@ public:
     SfxObjectShell*     GetObjShell() const { return _pObjShell; }
 };
 
-class PrintDialog;
 class Printer;
 class SfxPrintingHint : public SfxHint
 {
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index f1df0f0aa547..f5cc509dbf0a 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -32,7 +32,7 @@
 #ifndef _MENU_HXX //autogen //wg. MENU_APPEND !!!!
 #include <vcl/menu.hxx>
 #endif
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <tools/link.hxx>
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index ad83bb4a7418..3cf84cf6139e 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -33,7 +33,7 @@
 #include <sfx2/shell.hxx>
 #include <sfx2/imgdef.hxx>
 #include <sal/types.h>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 
 class ImageList;
 
diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx
index a96033835a84..11f07ea9e7db 100644
--- a/sfx2/inc/sfx2/printer.hxx
+++ b/sfx2/inc/sfx2/printer.hxx
@@ -34,60 +34,11 @@
 #include <vcl/print.hxx>
 #endif
 
-class SfxFont;
 class SfxTabPage;
 class SfxItemSet;
 
 struct SfxPrinter_Impl;
 
-#define SFX_RANGE_NOTSET    ((USHORT)0xFFFF)
-
-// class SfxFontSizeInfo -------------------------------------------------
-
-class SfxFontSizeInfo
-{
-private:
-    static USHORT           pStaticSizes[];
-    Size*                   pSizes;
-    USHORT                  nSizes;
-    BOOL                    bScalable;
-
-public:
-    SfxFontSizeInfo( const SfxFont& rFont, const OutputDevice& rDevice );
-    ~SfxFontSizeInfo();
-
-    BOOL                    HasSize(const Size &rSize) const;
-    BOOL                    IsScalable() const { return bScalable; }
-
-    USHORT                  SizeCount() const { return nSizes; }
-    const Size&             GetSize( USHORT nNo ) const
-                            { return pSizes[nNo]; }
-};
-
-// class SfxFont ---------------------------------------------------------
-
-class SFX2_DLLPUBLIC SfxFont
-{
-private:
-    String                  aName;
-    FontFamily              eFamily;
-    FontPitch               ePitch;
-    CharSet                 eCharSet;
-
-    SfxFont&                operator=(const SfxFont& rFont); // not implemented
-
-public:
-    SfxFont( const FontFamily eFam,
-             const String& aName,
-             const FontPitch eFontPitch = PITCH_DONTKNOW,
-             const CharSet eFontCharSet = RTL_TEXTENCODING_DONTKNOW );
-    // ZugriffsMethoden:
-    inline const String&    GetName() const { return aName; }
-    inline FontFamily       GetFamily() const { return eFamily; }
-    inline FontPitch        GetPitch() const { return ePitch; }
-    inline CharSet          GetCharSet() const { return eCharSet; }
-};
-
 // class SfxPrinter ------------------------------------------------------
 
 class SFX2_DLLPUBLIC SfxPrinter : public Printer
@@ -125,19 +76,8 @@ public:
     const SfxItemSet&       GetOptions() const { return *pOptions; }
     void                    SetOptions( const SfxItemSet &rNewOptions );
 
-    void                    EnableRange( USHORT nRange );
-    void                    DisableRange( USHORT nRange );
-    BOOL                    IsRangeEnabled( USHORT nRange ) const;
-
     BOOL                    IsKnown() const { return bKnown; }
     BOOL                    IsOriginal() const { return bKnown; }
-
-        using OutputDevice::GetFont;
-    USHORT                  GetFontCount();
-    const SfxFont*          GetFont( USHORT nNo ) const;
-    const SfxFont*          GetFontByName( const String &rFontName );
-
-    BOOL                    InitJob( Window* pUIParent, BOOL bAskAboutTransparentObjects );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index b58a9e7bdf73..70e7b08319e5 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -59,7 +59,6 @@ class SfxItemPool;
 class SfxTabPage;
 class SfxPrintMonitor;
 class SfxFrameSetDescriptor;
-class PrintDialog;
 class Printer;
 class SfxPrinter;
 class SfxProgress;
@@ -239,13 +238,9 @@ public:
     void                        AdjustVisArea(const Rectangle& rRect);
 
     // Printing Interface
-    virtual void                PreparePrint( PrintDialog *pPrintDialog = 0 );
-    virtual ErrCode             DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI );
-    virtual USHORT              Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 );
     virtual SfxPrinter*         GetPrinter( BOOL bCreate = FALSE );
     virtual USHORT              SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=FALSE );
     virtual SfxTabPage*         CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
-    virtual PrintDialog*        CreatePrintDialog( Window *pParent );
     void                        LockPrinter( BOOL bLock = TRUE );
     BOOL                        IsPrinterLocked() const;
     virtual JobSetup            GetJobSetup() const;