i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed annoying print before page setup aborts print bug

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4105 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2003-07-27 07:36:49 +00:00
parent 27f0ec2d65
commit e59c7b66ea
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/stylededit/StyledEditWindow.cpp
+14 -17
View File
@@ -1036,22 +1036,20 @@ StyledEditWindow::RevertToSaved()
status_t status_t
StyledEditWindow::PageSetup(const char *documentname) StyledEditWindow::PageSetup(const char *documentname)
{ {
status_t result= B_ERROR; status_t result = B_OK;
BPrintJob printJob(documentname); BPrintJob printJob(documentname);
if (fPrintSettings!= NULL) if (fPrintSettings != NULL) {
printJob.SetSettings(fPrintSettings); printJob.SetSettings(fPrintSettings);
//else }
//; ///??
result = printJob.ConfigPage();
result= printJob.ConfigPage(); if (result == B_NO_ERROR) {
fPrintSettings = printJob.Settings();
if (result== B_NO_ERROR){
// delete fPrintSettings;
fPrintSettings= printJob.Settings();
} }
return result; return result;
}/***StyledEditWindow::PageSetup()***/ }/***StyledEditWindow::PageSetup()***/
@@ -1059,17 +1057,16 @@ void
StyledEditWindow::Print(const char *documentname) StyledEditWindow::Print(const char *documentname)
{ {
status_t result = B_OK; status_t result = B_OK;
BPrintJob printJob(documentname);
if (fPrintSettings == NULL) { if (fPrintSettings == NULL) {
result = PageSetup(fTextView->Window()->Title()); result = PageSetup(documentname);
if (result != B_NO_ERROR) { if (result != B_OK) {
return; return;
} }
} else { }
printJob.SetSettings(fPrintSettings);
}
BPrintJob printJob(documentname);
printJob.SetSettings(fPrintSettings);
result = printJob.ConfigJob(); result = printJob.ConfigJob();
if (result != B_OK) { if (result != B_OK) {
return; return;