Finished cleaning up of IDocumentDeviceAccess methods in SwDoc.

Moved all SwDoc::getPrintData and SwDoc::setPrintData calls to their
appropriate interface methods (SwDoc::getIDocumentDeviceAccess::").

Change-Id: I5671b365238abae6d94f125fb7a99481d81392f9

6 files changed, 7 insertions, 19 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 06da4a972211..7add4209face 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -679,8 +679,6 @@ public:
     // IDocumentDeviceAccess
     const IDocumentDeviceAccess* getIDocumentDeviceAccessConst() const;
     IDocumentDeviceAccess* getIDocumentDeviceAccess();
-    virtual const SwPrintData & getPrintData() const;
-    virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData);
 
     // IDocumentMarkAccess
     IDocumentMarkAccess* getIDocumentMarkAccess();
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 6892ff7415e6..3e01688afedc 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -254,16 +254,6 @@ IDocumentDeviceAccess* SwDoc::getIDocumentDeviceAccess()
     return m_DeviceAccess.get();
 }
 
-const SwPrintData & SwDoc::getPrintData() const
-{
-    return getIDocumentDeviceAccessConst()->getPrintData();
-}
-
-void SwDoc::setPrintData(/*[in]*/ const SwPrintData& rPrtData)
-{
-    getIDocumentDeviceAccess()->setPrintData( rPrtData );
-}
-
 
 /* Implementations the next Interface here */
 
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 5a2603dbf13a..759adf389df7 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -124,7 +124,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
         pDoc->set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION,
                   !aAsian.IsKerningWesternTextOnly());
         pDoc->setCharacterCompressionType(static_cast<SwCharCompressType>(aAsian.GetCharDistanceCompression()));
-        pDoc->setPrintData(*SW_MOD()->GetPrtOptions(bWeb));
+        pDoc->getIDocumentDeviceAccess()->setPrintData(*SW_MOD()->GetPrtOptions(bWeb));
 
         SubInitNew();
 
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index ff8d78ce1dfc..d34154d1e908 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -816,7 +816,7 @@ void SwXDocumentSettings::_postSetValues ()
         // #i86352# the printer is also used as container for options by sfx
         // when setting a printer it should have decent default options
         SfxItemSet aOptions( mpPrinter->GetOptions() );
-        SwPrintData aPrtData( mpDoc->getPrintData() );
+        SwPrintData aPrtData( mpDoc->getIDocumentDeviceAccessConst()->getPrintData() );
         SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, aPrtData);
         aOptions.Put(aAddPrinterItem);
         mpPrinter->SetOptions( aOptions );
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index b6807286cb36..b0cfa31bacab 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -292,7 +292,7 @@ void SwXPrintSettings::_preSetValues ()
         {
             if (!mpDoc)
                 throw IllegalArgumentException ();
-            mpPrtOpt = const_cast< SwPrintData * >(&mpDoc->getPrintData());
+            mpPrtOpt = const_cast< SwPrintData * >(&mpDoc->getIDocumentDeviceAccessConst()->getPrintData());
         }
         break;
     }
@@ -451,7 +451,7 @@ void SwXPrintSettings::_preGetValues ()
         {
             if (!mpDoc)
                 throw IllegalArgumentException ();
-            mpPrtOpt = const_cast< SwPrintData * >(&mpDoc->getPrintData());
+            mpPrtOpt = const_cast< SwPrintData * >(&mpDoc->getIDocumentDeviceAccessConst()->getPrintData());
         }
         break;
     }
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 328ce37c8421..e8478824ee90 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -164,7 +164,7 @@ static SwPrintUIOptions * lcl_GetPrintUIOptions(
     const bool bHasPostIts      = sw_GetPostIts( pDocShell->GetDoc(), 0 );
 
     // get default values to use in dialog from documents SwPrintData
-    const SwPrintData &rPrintData = pDocShell->GetDoc()->getPrintData();
+    const SwPrintData &rPrintData = pDocShell->GetDoc()->getIDocumentDeviceAccessConst()->getPrintData();
 
     // Get current page number
     sal_uInt16 nCurrentPage = 1;
@@ -2448,7 +2448,7 @@ static void lcl_SavePrintUIOptionsToDocumentPrintData(
     const SwPrintUIOptions &rPrintUIOptions,
     bool bIsPDFEXport )
 {
-    SwPrintData aDocPrintData( rDoc.getPrintData() );
+    SwPrintData aDocPrintData( rDoc.getIDocumentDeviceAccessConst()->getPrintData() );
 
     aDocPrintData.SetPrintGraphic( rPrintUIOptions.IsPrintGraphics() );
     aDocPrintData.SetPrintTable( rPrintUIOptions.IsPrintTables() );
@@ -2469,7 +2469,7 @@ static void lcl_SavePrintUIOptionsToDocumentPrintData(
     aDocPrintData.SetPrintHiddenText( rPrintUIOptions.IsPrintHiddenText() );
     aDocPrintData.SetPrintTextPlaceholder( rPrintUIOptions.IsPrintTextPlaceholders() );
 
-    rDoc.setPrintData( aDocPrintData );
+    rDoc.getIDocumentDeviceAccess()->setPrintData( aDocPrintData );
 }
 
 sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(