vcl117: #i115056# clean up functions no longer used

3 files changed, 11 insertions, 9 deletions

diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index 04f47d16bba8..1f3eba2610fd 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -318,7 +318,12 @@ public:
     BOOL                        Setup( Window* pWindow = NULL );
     BOOL                        SetPrinterProps( const Printer* pPrinter );
 
-    void                        SetPrinterOptions( const PrinterOptions& rOptions ) { *mpPrinterOptions = rOptions; }
+    // SetPrinterOptions is used internally only now
+    // in earlier times it was used only to set the options loaded directly from the configuration
+    // in SfxPrinter::InitJob, this is now handled internally
+    // should the need arise to set the printer options outside vcl, also a method would have to be devised
+    // to not override these again internally
+    SAL_DLLPRIVATE void         SetPrinterOptions( const PrinterOptions& rOptions );
     const PrinterOptions&       GetPrinterOptions() const { return( *mpPrinterOptions ); }
 
     BOOL                        SetOrientation( Orientation eOrient );
@@ -354,10 +359,6 @@ public:
 
     BOOL                        IsPrinting() const { return mbPrinting; }
 
-    void                        SetPrintFile( const XubString& rFileName ) { maPrintFile = rFileName; }
-    const XubString&            GetPrintFile() const { return maPrintFile; }
-    void                        EnablePrintFile( BOOL bEnable ) { mbPrintFile = bEnable; }
-    BOOL                        IsPrintFileEnabled() const { return mbPrintFile; }
     BOOL                        AbortJob();
     const XubString&            GetCurJobName() const { return maJobName; }
     USHORT                      GetCurPage() const { return mnCurPage; }
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index cafaf5cad6eb..78456992340f 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -230,6 +230,11 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile )
     return bSuccess;
 }
 
+void Printer::SetPrinterOptions( const PrinterOptions& i_rOptions )
+{
+    *mpPrinterOptions = i_rOptions;
+}
+
 // -------------
 // - QueueInfo -
 // -------------
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index afb510b05a17..0effb7e3ca44 100755
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -533,10 +533,6 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
         pSingleValue->Value >>= bSinglePrintJobs;
     }
 
-    // remark: currently it is still possible to use EnablePrintFile and
-    // SetPrintFileName to redirect printout into file
-    // it can be argued that those methods should be removed in favor
-    // of only using the LocalFileName property
     beans::PropertyValue* pFileValue = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LocalFileName" ) ) );
     if( pFileValue )
     {