strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#100000# join from CWS licenseprint

Browse source
This commit is contained in:
Jens-Heiner Rechtien 2003-08-20 14:03:44 +00:00
parent 1c5bcfdc70
commit 95e977c9d4
3 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
svtools/source/dialogs/printdlg.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: printdlg.cxx,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: vg $ $Date: 2003-04-11 17:01:36 $
* last change: $Author: hr $ $Date: 2003-08-20 15:03:44 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -81,6 +81,7 @@
#include <prnsetup.hxx>
#include <printdlg.hxx>
#include <svtdata.hxx>
#include <filedlg.hxx>
#ifndef _PICKERHELPER_HXX
#include "pickerhelper.hxx"
@ -477,9 +478,27 @@ bool PrintDialog::ImplGetFilename()
maFiPrintFile.SetText( aObj.PathToFileName() );
return true;
}
return false;
}
}
// something went awry, lets try the old fashioned dialogue
Window* pDlgParent = IsReallyVisible() ? this : GetParent();
FileDialog aDlg( pDlgParent, WB_STDDIALOG | WB_SAVEAS );
#ifdef WNT
aDlg.AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) );
aDlg.SetDefaultExt( String( RTL_CONSTASCII_USTRINGPARAM( "prn" ) ) );
#elif defined UNX
aDlg.AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "PostScript" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.ps" ) ) );
aDlg.SetDefaultExt( String( RTL_CONSTASCII_USTRINGPARAM( "ps" ) ) );
#endif
if( aDlg.Execute() )
{
String aTargetFile = aDlg.GetPath();
maFiPrintFile.SetText( aTargetFile );
return true;
}
return false;
}

6
vcl/source/gdi/sallayout.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: sallayout.cxx,v $
*
* $Revision: 1.47 $
* $Revision: 1.48 $
*
* last change: $Author: hjs $ $Date: 2003-08-18 15:14:18 $
* last change: $Author: hr $ $Date: 2003-08-20 15:01:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1669,6 +1669,8 @@ int MultiSalLayout::GetNextGlyphs( int nLen, long* pGlyphIdxAry, Point& rPos,
}
}
// #111016# reset to base level font when done
mpLayouts[0]->InitFont();
return 0;
}

6
vcl/win/source/gdi/winlayout.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: winlayout.cxx,v $
*
* $Revision: 1.71 $
* $Revision: 1.72 $
*
* last change: $Author: hdu $ $Date: 2003-07-22 12:05:31 $
* last change: $Author: hr $ $Date: 2003-08-20 15:02:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -647,7 +647,7 @@ int SimpleWinLayout::GetNextGlyphs( int nLen, long* pGlyphs, Point& rPos, int& n
// calculate glyph position relative to layout base
// TODO: avoid for nStart!=0 case by reusing rPos
long nXOffset = 0;
long nXOffset = mnBaseAdv;
for( int i = 0; i < nStart; ++i )
nXOffset += mpGlyphAdvances[ i ];