tkr33: merged in DEV300_m74

1 files changed, 9 insertions, 18 deletions

diff --git a/basic/source/app/printer.hxx b/basic/source/app/printer.hxx
index d6db8154c57f..505835278234 100644
--- a/basic/source/app/printer.hxx
+++ b/basic/source/app/printer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printer.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,31 +28,25 @@
 #ifndef _BASICPRN_HXX
 #define _BASICPRN_HXX
 
-#ifndef _PRINT_HXX //autogen
-#include <vcl/print.hxx>
-#endif
+#include "vcl/print.hxx"
+#include "vcl/oldprintadaptor.hxx"
 
-class PrintingDialog;
+class BasicPrinter
+{
+    boost::shared_ptr<Printer>                      mpPrinter;
+    boost::shared_ptr<vcl::OldStylePrintAdaptor>    mpListener;
 
-class BasicPrinter : public Printer {
     short nLine;                        // aktuelle Zeile
     short nPage;                        // aktuelle Seite
     short nLines;                       // Zeilen pro Seite
     short nYoff;                        // Zeilenabstand in Points
     String aFile;                       // Dateiname
-    PrintingDialog* pDlg;               // Druck-Dialog
+
     void Header();                      // Seitenkopf drucken
+    void StartPage();
 public:
     BasicPrinter();
     void Print( const String& rFile, const String& rText, BasicFrame *pFrame );
-    DECL_LINK( Abort, void * );
-    DECL_LINK( StartPrintHdl, Printer * );
-    DECL_LINK( EndPrintHdl, Printer * );
-    DECL_LINK( PrintPageHdl, Printer * );
-#if defined( PM20 )
-    // StarView-Bug, bald wieder zu entfernen:
-    virtual void SetPageQueueSize( USHORT ) {}
-#endif
 };
 
 #endif