#84560# handling of SID_PRINTDOCDIRECT changed

3 files changed, 13 insertions, 60 deletions

diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 49ccbadff421..49378c4fd6c8 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: view.hrc,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: pb $ $Date: 2001-06-28 13:42:02 $
+ *  last change: $Author: os $ $Date: 2001-07-30 11:15:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,7 @@
 
 #define STR_NODEFPRINTER                    (RID_SFX_VIEW_START+ 0)
 #define STR_PRINTER_NOTAVAIL                (RID_SFX_VIEW_START+ 1)
-#define STR_PRINTER_NOTDEFAULT              (RID_SFX_VIEW_START+ 2)
+
 
 #define STR_PRINT_OPTIONS                   (RID_SFX_VIEW_START+ 6)
 #define STR_PRINT_OPTIONS_TITLE             (RID_SFX_VIEW_START+ 7)
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index 8e6d71c68a2e..ef1475c63f5a 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: view.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:19:13 $
+ *  last change: $Author: os $ $Date: 2001-07-30 11:15:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -146,31 +146,6 @@ String STR_PRINTER_NOTAVAIL
     TEXT[ language_user1 ] = " ";
     TEXT[ catalan ] = "Este documento se ha formateado para la impresora $1, pero esta no est� disponible.\n�Desea usar la impresora predeterminada $2?";
 };
-String STR_PRINTER_NOTDEFAULT
-{
-    TEXT = "Das Dokument wurde f�r den Drucker $1 formatiert, dieses ist aber nicht der Standardrucker.\nSoll der Standarddrucker $2 verwendet werden?" ;
-    TEXT [ ENGLISH ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?" ;
-    TEXT[ english_us ] = "This document was formatted for the printer $1, but that printer is not the default printer.\nDo you want to use the default printer $2 anyway?";
-    TEXT[ portuguese ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-    TEXT[ russian ] = "���� �������� �������������� ��� �������� $1. �� ������ ������� �� �������� ��������� �� ���������.\n������������ ������� �� ��������� $2?";
-    TEXT[ greek ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-    TEXT[ dutch ] = "Het document werd geformatteerd voor printer $1. Deze printer is echter geen standaarprinter.\nGebruik standaardprinter $2?";
-    TEXT[ french ] = "Ce document a �t� format� pour l'imprimante $1 qui n'est pas l'imprimante par d�faut.\nUtiliser l'imprimante par d�faut $2 ?";
-    TEXT[ spanish ] = "Este documento se ha formateado para la impresora $1, pero esta no est� disponible.\n�Desea usar la impresora predeterminada $2?";
-    TEXT[ finnish ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-    TEXT[ italian ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-    TEXT[ danish ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-    TEXT[ swedish ] = "Dokumentet formaterades f�r skrivaren $1 men detta �r inte standardskrivaren.\nSka standardskrivaren $2 anv�ndas?";
-    TEXT[ polish ] = "Dokument ten sformatowano do wydrukowania na drukarce $1, nie jest to jednak drukarka domy�lna.\nU�y� drukarki domy�lnej $2?";
-    TEXT[ portuguese_brazilian ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-    TEXT[ japanese ] = "�����޷���Ă������ $1 �p�ɏ����ݒ肳��܂������A����������͕W��������ł͂���܂���B\n�W������� $2 ���g�p���܂����B";
-    TEXT[ korean ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-    TEXT[ chinese_simplified ] = "����ĵ��ĸ�ʽ�����ڴ�ӡ�� $1 �����ⲻ��һ����׼��ӡ����\n��Ҫʹ�ñ�׼��ӡ�� $2 ?";
-    TEXT[ chinese_traditional ] = "�o�Ӥ�󪺮榡�O�Ω� $1 �A�����O�@�ӼзǦL�����C\n�n�ϥμзǦL���� $2 ?";
-    TEXT[ turkish ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-    TEXT[ arabic ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-    TEXT[ catalan ] = "This document was previously formatted for the printer $1, but that printer is not the default printer.\nUse default printer $2?";
-};
 String STR_MENU_NEWMAIL
 {
     Text = "N~eue Nachricht" ;
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index f1bc85ce60d5..147994a036b0 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewprn.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-27 16:23:44 $
+ *  last change: $Author: os $ $Date: 2001-07-30 11:15:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,11 +81,6 @@
 #include <svtools/prnsetup.hxx>
 #endif
 #endif
-#if SUPD<613//MUSTINI
-#ifndef _SFXINIMGR_HXX //autogen
-#include <svtools/iniman.hxx>
-#endif
-#endif
 #ifndef _SFXFLAGITEM_HXX //autogen
 #include <svtools/flagitem.hxx>
 #endif
@@ -111,9 +106,6 @@
 #include "sfxresid.hxx"
 #include "request.hxx"
 #include "objsh.hxx"
-#if SUPD<613//MUSTINI
-#include "inimgr.hxx"
-#endif
 #include "sfxtypes.hxx"
 #include "docinf.hxx"
 #include "event.hxx"
@@ -645,26 +637,17 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
         //! ??? if( nPaperBin != USE_DEFAULT_PAPERBIN )
         //! ???     pPrn->SetPaperBin(nPaperBin);
 
-            // Drucker nicht vorhanden? (bei SID_PRINTDOC wurde schon gefragt)
         if ( SID_PRINTDOCDIRECT == nId )
         {
-            if ( !pPrinter->IsOriginal() && bWarn && !UseStandardPrinter_Impl( NULL, pPrinter ) )
+            //redirect slot to call the print dialog if the document's printer
+            //is available but not system default
+            if( pPrinter->IsOriginal() &&
+                pPrinter->GetName() != Printer::GetDefaultPrinterName() )
             {
-                rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+                rReq.SetSlot(SID_PRINTDOC);
+                ExecPrint_Impl( rReq );
                 return;
             }
-
-            if( pPrinter->GetName() != Printer::GetDefaultPrinterName() )
-            {
-                Printer* pDefPrinter = new Printer();
-                String aTmp( SfxResId( STR_PRINTER_NOTDEFAULT ) );
-                aTmp.SearchAndReplace( String::CreateFromAscii("$1"), pPrinter->GetName() );
-                aTmp.SearchAndReplace( String::CreateFromAscii("$2"), pDefPrinter->GetName() );
-                QueryBox aBox( GetWindow(), WB_YES_NO, aTmp );
-                if( RET_OK == aBox.Execute() )
-                    pPrinter->SetPrinterProps( pPrinter );
-                delete pDefPrinter;
-            }
         }
 
         if( bCollate )
@@ -676,12 +659,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
         // unter Windows mu\s das so, weil sonst kein Querdruck funkt,
         // unter OS/2 sollte man das nutzen - Apps kommen aber nicht klar
         // WP: 07.12.95: SV macht das jetzt richtig
-#if SUPD<613//MUSTINI
-        SfxIniManager *pIniMgr = SFX_INIMANAGER();
-        String aPages( pIniMgr->Get(SFX_KEY_PAGEQUEUESIZE) );
-#else
         String aPages;
-#endif
         pPrinter->SetPageQueueSize( aPages.Len() ? (int) aPages.ToInt32() : 1 );
 
         SfxObjectShell *pObjSh = GetObjectShell();