summaryrefslogtreecommitdiff
path: root/svtools/source/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source/dialogs')
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx6
-rw-r--r--svtools/source/dialogs/colctrl.cxx100
-rw-r--r--svtools/source/dialogs/colrdlg.cxx30
-rw-r--r--svtools/source/dialogs/filedlg.cxx12
-rw-r--r--svtools/source/dialogs/filedlg2.cxx140
-rw-r--r--svtools/source/dialogs/filedlg2.hxx30
-rw-r--r--svtools/source/dialogs/insdlg.cxx8
-rw-r--r--svtools/source/dialogs/mcvmath.cxx32
-rw-r--r--svtools/source/dialogs/mcvmath.hxx16
-rw-r--r--svtools/source/dialogs/printdlg.cxx796
-rw-r--r--svtools/source/dialogs/printdlg.hrc74
-rw-r--r--svtools/source/dialogs/printdlg.src349
-rw-r--r--svtools/source/dialogs/prnsetup.cxx14
-rw-r--r--svtools/source/dialogs/property.cxx206
-rw-r--r--svtools/source/dialogs/wizdlg.cxx52
15 files changed, 323 insertions, 1542 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index bfcdfe98ea5a..27d1d1a6b239 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -41,7 +41,7 @@
#include <vcl/waitobj.hxx>
#include <vcl/msgbox.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
#include <comphelper/interaction.hxx>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/awt/XWindow.hpp>
@@ -590,9 +590,9 @@ void AssignmentPersistentData::Commit()
for (sal_Int32 column=0; column<2; ++column)
{
// the label
- m_pImpl->pFieldLabels[row * 2 + column] = new FixedText(&m_aFieldsFrame, SvtResId((USHORT)(FT_FIELD_BASE + row * 2 + column)));
+ m_pImpl->pFieldLabels[row * 2 + column] = new FixedText(&m_aFieldsFrame, SvtResId((sal_uInt16)(FT_FIELD_BASE + row * 2 + column)));
// the listbox
- m_pImpl->pFields[row * 2 + column] = new ListBox(&m_aFieldsFrame, SvtResId((USHORT)(LB_FIELD_BASE + row * 2 + column)));
+ m_pImpl->pFields[row * 2 + column] = new ListBox(&m_aFieldsFrame, SvtResId((sal_uInt16)(LB_FIELD_BASE + row * 2 + column)));
m_pImpl->pFields[row * 2 + column]->SetDropDownLineCount(15);
m_pImpl->pFields[row * 2 + column]->SetSelectHdl(LINK(this, AddressBookSourceDialog, OnFieldSelect));
diff --git a/svtools/source/dialogs/colctrl.cxx b/svtools/source/dialogs/colctrl.cxx
index 4456fe2f1268..2aa1b5b10675 100644
--- a/svtools/source/dialogs/colctrl.cxx
+++ b/svtools/source/dialogs/colctrl.cxx
@@ -85,19 +85,19 @@ void SvColorControl::CreateBitmap()
if( pWriteAccess )
{
- USHORT nX = (USHORT) aSize.Width();
- USHORT nY = (USHORT) aSize.Height();
+ sal_uInt16 nX = (sal_uInt16) aSize.Width();
+ sal_uInt16 nY = (sal_uInt16) aSize.Height();
- UINT16 nHue, nSat;
+ sal_uInt16 nHue, nSat;
ColorHSB aColHSB( 0, 0, mnLuminance );
- for( USHORT i = 0; i < nY; i++ )
+ for( sal_uInt16 i = 0; i < nY; i++ )
{
- nSat = (UINT16) FRound( 100 - ( 100.0 * i + 0.5 ) / nY );
+ nSat = (sal_uInt16) FRound( 100 - ( 100.0 * i + 0.5 ) / nY );
- for( USHORT j = 0; j < nX; j++ )
+ for( sal_uInt16 j = 0; j < nX; j++ )
{
- nHue = (UINT16) FRound( ( 360.0 * j + 0.5 ) / nX );
+ nHue = (sal_uInt16) FRound( ( 360.0 * j + 0.5 ) / nX );
aColHSB.SetHue( nHue );
aColHSB.SetSat( nSat );
@@ -161,7 +161,7 @@ void SvColorControl::MouseButtonDown( const MouseEvent& rMEvt )
{
if( rMEvt.IsLeft() && !rMEvt.IsShift() )
{
- //ShowPointer( FALSE );
+ //ShowPointer( sal_False );
CaptureMouse();
ShowPosition( rMEvt.GetPosPixel() );
Modify();
@@ -171,7 +171,7 @@ void SvColorControl::MouseButtonDown( const MouseEvent& rMEvt )
// -----------------------------------------------------------------------
void SvColorControl::MouseButtonUp( const MouseEvent& )
{
- //ShowPointer( TRUE );
+ //ShowPointer( sal_True );
if( IsMouseCaptured() )
ReleaseMouse();
}
@@ -219,16 +219,16 @@ void SvColorControl::Modify()
}
// -----------------------------------------------------------------------
-void SvColorControl::SetColor( const ColorHSB& rCol, BOOL bSetColor )
+void SvColorControl::SetColor( const ColorHSB& rCol, sal_Bool bSetColor )
{
if( bSetColor )
maColor = rCol.GetRGB();
if( mpBitmap )
{
- USHORT nX = (USHORT) mpBitmap->GetSizePixel().Width();
- USHORT nY = (USHORT) mpBitmap->GetSizePixel().Height();
- INT16 nZ = rCol.GetBri();
+ sal_uInt16 nX = (sal_uInt16) mpBitmap->GetSizePixel().Width();
+ sal_uInt16 nY = (sal_uInt16) mpBitmap->GetSizePixel().Height();
+ sal_Int16 nZ = rCol.GetBri();
SetLuminance( nZ );
nX = rCol.GetHue() * nX / 360; // Farbe
@@ -245,7 +245,7 @@ void SvColorControl::SetColor( const Color& rCol )
if( mpBitmap )
{
ColorHSB aColHsb( rCol );
- SetColor( aColHsb, FALSE );
+ SetColor( aColHsb, sal_False );
}
}
@@ -332,7 +332,7 @@ void ColorPreviewControl::SetColor( const Color& rCol )
// -----------------------------------------------------------------------
ColorMixingControl::ColorMixingControl( Window* pParent, WinBits nStyle,
- USHORT nRows, USHORT nColumns ) :
+ sal_uInt16 nRows, sal_uInt16 nColumns ) :
ValueSet ( pParent, nStyle ),
mnRows ( nRows ),
mnColumns ( nColumns )
@@ -342,7 +342,7 @@ ColorMixingControl::ColorMixingControl( Window* pParent, WinBits nStyle,
// -----------------------------------------------------------------------
ColorMixingControl::ColorMixingControl( Window* pParent, const ResId& rResId,
- USHORT nRows, USHORT nColumns ) :
+ sal_uInt16 nRows, sal_uInt16 nColumns ) :
ValueSet ( pParent, rResId ),
mnRows ( nRows ),
mnColumns ( nColumns )
@@ -363,7 +363,7 @@ void ColorMixingControl::Initialize()
Color aColor;
String aStr;
- for( USHORT i = 1; i <= mnRows * mnColumns; i++ )
+ for( sal_uInt16 i = 1; i <= mnRows * mnColumns; i++ )
{
InsertItem( i, aColor, aStr );
}
@@ -386,30 +386,30 @@ void ColorMixingControl::Initialize()
}
// -----------------------------------------------------------------------
-Color ColorMixingControl::CalcDifferenceColor( USHORT nCol1, USHORT nCol2,
- USHORT nSteps )
+Color ColorMixingControl::CalcDifferenceColor( sal_uInt16 nCol1, sal_uInt16 nCol2,
+ sal_uInt16 nSteps )
{
// Die Berechnung ist noch etwas ungenau, daher sollte besser mit floats
// gearbeitet werden... (muss !!!)
Color aColor( GetItemColor( nCol1 ) );
Color aColor2( GetItemColor( nCol2 ) );
- aColor.SetRed( (UINT8) ( ( aColor2.GetRed() - aColor.GetRed() ) / nSteps ) );
- aColor.SetGreen( (UINT8) ( ( aColor2.GetGreen() - aColor.GetGreen() ) / nSteps ) );
- aColor.SetBlue( (UINT8) ( ( aColor2.GetBlue() - aColor.GetBlue() ) / nSteps ) );
+ aColor.SetRed( (sal_uInt8) ( ( aColor2.GetRed() - aColor.GetRed() ) / nSteps ) );
+ aColor.SetGreen( (sal_uInt8) ( ( aColor2.GetGreen() - aColor.GetGreen() ) / nSteps ) );
+ aColor.SetBlue( (sal_uInt8) ( ( aColor2.GetBlue() - aColor.GetBlue() ) / nSteps ) );
return( aColor );
}
// -----------------------------------------------------------------------
-void ColorMixingControl::FillRow( USHORT nRow )
+void ColorMixingControl::FillRow( sal_uInt16 nRow )
{
- USHORT nCol1 = nRow * mnColumns + 1;
- USHORT nCol2 = ( nRow + 1 ) * mnColumns;
+ sal_uInt16 nCol1 = nRow * mnColumns + 1;
+ sal_uInt16 nCol2 = ( nRow + 1 ) * mnColumns;
Color aColor( GetItemColor( nCol1 ) );
Color aDiffColor( CalcDifferenceColor( nCol1, nCol2, mnColumns - 1 ) );
- for( USHORT i = nCol1 + 1; i < nCol2; i++ )
+ for( sal_uInt16 i = nCol1 + 1; i < nCol2; i++ )
{
aColor.SetRed( aColor.GetRed() + aDiffColor.GetRed() );
aColor.SetGreen( aColor.GetGreen() + aDiffColor.GetGreen() );
@@ -421,14 +421,14 @@ void ColorMixingControl::FillRow( USHORT nRow )
}
// -----------------------------------------------------------------------
-void ColorMixingControl::FillColumn( USHORT nColumn )
+void ColorMixingControl::FillColumn( sal_uInt16 nColumn )
{
- USHORT nCol1 = nColumn + 1;
- USHORT nCol2 = nColumn + ( mnRows - 1 ) * mnColumns + 1;
+ sal_uInt16 nCol1 = nColumn + 1;
+ sal_uInt16 nCol2 = nColumn + ( mnRows - 1 ) * mnColumns + 1;
Color aColor( GetItemColor( nCol1 ) );
Color aDiffColor( CalcDifferenceColor( nCol1, nCol2, mnRows - 1 ) );
- for( USHORT i = nCol1 + mnColumns; i < nCol2; i = i + mnColumns )
+ for( sal_uInt16 i = nCol1 + mnColumns; i < nCol2; i = i + mnColumns )
{
aColor.SetRed( aColor.GetRed() + aDiffColor.GetRed() );
aColor.SetGreen( aColor.GetGreen() + aDiffColor.GetGreen() );
@@ -440,13 +440,13 @@ void ColorMixingControl::FillColumn( USHORT nColumn )
}
// -----------------------------------------------------------------------
-void ColorMixingControl::SetRows( USHORT nRows )
+void ColorMixingControl::SetRows( sal_uInt16 nRows )
{
mnRows = nRows;
}
// -----------------------------------------------------------------------
-void ColorMixingControl::SetColumns( USHORT nColumns )
+void ColorMixingControl::SetColumns( sal_uInt16 nColumns )
{
mnColumns = nColumns;
}
@@ -457,8 +457,8 @@ void ColorMixingControl::SetColor( CMCPosition ePos, const Color& rCol )
if( rCol != maColor[ ePos ] )
{
maColor[ ePos ] = rCol;
- USHORT nPos = 0;
- USHORT nColumn = 0;
+ sal_uInt16 nPos = 0;
+ sal_uInt16 nColumn = 0;
String aStr( GetRGBString( rCol ) );
switch( ePos )
@@ -489,7 +489,7 @@ void ColorMixingControl::SetColor( CMCPosition ePos, const Color& rCol )
SetItemText( nPos, aStr );
FillColumn( nColumn );
- for( USHORT i = 0; i < mnRows; i++ )
+ for( sal_uInt16 i = 0; i < mnRows; i++ )
FillRow( i );
}
}
@@ -509,7 +509,7 @@ String ColorMixingControl::GetRGBString( const Color& rColor )
CMCPosition ColorMixingControl::GetCMCPosition() const
{
CMCPosition ePos = CMC_OTHER;
- USHORT nPos = GetSelectItemId();
+ sal_uInt16 nPos = GetSelectItemId();
if( nPos == 1 )
ePos = CMC_TOPLEFT;
@@ -543,8 +543,8 @@ CMCPosition ColorMixingControl::GetCMCPosition() const
ColorHSB::ColorHSB( const Color& rColor )
{
- UINT8 c[3];
- UINT8 cMax, cMin;
+ sal_uInt8 c[3];
+ sal_uInt8 cMax, cMin;
c[0] = rColor.GetRed();
c[1] = rColor.GetGreen();
@@ -565,7 +565,7 @@ ColorHSB::ColorHSB( const Color& rColor )
if( c[2] < cMin )
cMin = c[2];
- UINT8 cDelta = cMax - cMin;
+ sal_uInt8 cDelta = cMax - cMin;
// Saturation = max - min / max
if( mnBri > 0 )
@@ -597,7 +597,7 @@ ColorHSB::ColorHSB( const Color& rColor )
if( dHue < 0.0 )
dHue += 360.0;
- mnHue = (UINT16) dHue;
+ mnHue = (sal_uInt16) dHue;
}
}
@@ -612,8 +612,8 @@ ColorHSB::ColorHSB( const Color& rColor )
Color ColorHSB::GetRGB() const
{
- UINT8 cR,cG,cB;
- UINT8 nB = (UINT8) ( mnBri * 255 / 100 );
+ sal_uInt8 cR,cG,cB;
+ sal_uInt8 nB = (sal_uInt8) ( mnBri * 255 / 100 );
if( mnSat == 0 )
{
@@ -625,20 +625,20 @@ Color ColorHSB::GetRGB() const
{
double dH = mnHue;
double f;
- UINT16 n;
+ sal_uInt16 n;
if( dH == 360.0 )
dH = 0.0;
dH /= 60.0;
- n = (UINT16) dH;
+ n = (sal_uInt16) dH;
f = dH - n;
// #107375# Doing the calculation completely in floating
// point, the former optimization gave sometimes negative
// results for c and was pointless anyway
- UINT8 a = static_cast<UINT8>( nB * ( 100.0 - mnSat ) / 100.0 );
- UINT8 b = static_cast<UINT8>( nB * ( 100.0 - mnSat * f ) / 100.0 );
- UINT8 c = static_cast<UINT8>( nB * ( 100.0 - mnSat * ( 1.0 - f ) ) / 100.0 );
+ sal_uInt8 a = static_cast<sal_uInt8>( nB * ( 100.0 - mnSat ) / 100.0 );
+ sal_uInt8 b = static_cast<sal_uInt8>( nB * ( 100.0 - mnSat * f ) / 100.0 );
+ sal_uInt8 c = static_cast<sal_uInt8>( nB * ( 100.0 - mnSat * ( 1.0 - f ) ) / 100.0 );
switch( n )
{
@@ -678,11 +678,11 @@ ColorCMYK::ColorCMYK( const Color& rColor )
Color ColorCMYK::GetRGB() const
{
int nTmp = Max( 0, 255 - ( mnCyan + mnKey ) );
- UINT8 cR = (UINT8) nTmp;
+ sal_uInt8 cR = (sal_uInt8) nTmp;
nTmp = Max( 0, 255 - ( mnMagenta + mnKey ) );
- UINT8 cG = (UINT8) nTmp;
+ sal_uInt8 cG = (sal_uInt8) nTmp;
nTmp = Max( 0, 255 - ( mnYellow + mnKey ) );
- UINT8 cB = (UINT8) nTmp;
+ sal_uInt8 cB = (sal_uInt8) nTmp;
return( Color( cR, cG, cB ) );
}
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index a52cc4b0834c..fa494b05b2ab 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -160,7 +160,7 @@ const Color& SvColorDialog::GetColor() const
// -----------------------------------------------------------------------
IMPL_LINK( SvColorDialog, ColorModifyHdl, void *, p )
{
- UINT16 n = 0x00; // 1 == RGB, 2 == CMYK, 4 == HSB
+ sal_uInt16 n = 0x00; // 1 == RGB, 2 == CMYK, 4 == HSB
if( p == &maCtlColor )
{
@@ -173,19 +173,19 @@ IMPL_LINK( SvColorDialog, ColorModifyHdl, void *, p )
}
else if( p == &maNumRed )
{
- maColor.SetRed( (UINT8)maNumRed.GetValue() );
+ maColor.SetRed( (sal_uInt8)maNumRed.GetValue() );
maCtlColor.SetColor( maColor );
n = 6;
}
else if( p == &maNumGreen )
{
- maColor.SetGreen( (UINT8)maNumGreen.GetValue() );
+ maColor.SetGreen( (sal_uInt8)maNumGreen.GetValue() );
maCtlColor.SetColor( maColor );
n = 6;
}
else if( p == &maNumBlue )
{
- maColor.SetBlue( (UINT8)maNumBlue.GetValue() );
+ maColor.SetBlue( (sal_uInt8)maNumBlue.GetValue() );
maCtlColor.SetColor( maColor );
n = 6;
}
@@ -194,9 +194,9 @@ IMPL_LINK( SvColorDialog, ColorModifyHdl, void *, p )
p == &maNumLuminance )
{
- ColorHSB aColorHSB( (UINT16) maNumHue.GetValue(),
- (UINT16) maNumSaturation.GetValue(),
- (UINT16) maNumLuminance.GetValue() );
+ ColorHSB aColorHSB( (sal_uInt16) maNumHue.GetValue(),
+ (sal_uInt16) maNumSaturation.GetValue(),
+ (sal_uInt16) maNumLuminance.GetValue() );
maCtlColor.SetColor( aColorHSB );
maColor = maCtlColor.GetColor();
n = 3;
@@ -211,10 +211,10 @@ IMPL_LINK( SvColorDialog, ColorModifyHdl, void *, p )
long aYellow = (long) ( (double)maNumYellow.GetValue() * 255.0 / 100.0 + 0.5 );
long aKey = (long) ( (double)maNumKey.GetValue() * 255.0 / 100.0 + 0.5 );
- ColorCMYK aColorCMYK( (UINT16) aCyan,
- (UINT16) aMagenta,
- (UINT16) aYellow,
- (UINT16) aKey );
+ ColorCMYK aColorCMYK( (sal_uInt16) aCyan,
+ (sal_uInt16) aMagenta,
+ (sal_uInt16) aYellow,
+ (sal_uInt16) aKey );
maColor = aColorCMYK.GetRGB();
maCtlColor.SetColor( maColor );
n = 5;
@@ -274,7 +274,7 @@ IMPL_LINK( SvColorDialog, ClickBtnHdl, void *, p )
}
else if( p == &maBtn2 )
{
- USHORT nPos = maColMixCtrl.GetSelectItemId();
+ sal_uInt16 nPos = maColMixCtrl.GetSelectItemId();
maColor = maColMixCtrl.GetItemColor( nPos );
maCtlColor.SetColor( maColor );
ColorModifyHdl( &maCtlColor );
@@ -286,7 +286,7 @@ IMPL_LINK( SvColorDialog, ClickBtnHdl, void *, p )
// -----------------------------------------------------------------------
IMPL_LINK( SvColorDialog, ClickMixCtrlHdl, void *, EMPTYARG )
{
- USHORT nPos = maColMixCtrl.GetSelectItemId();
+ sal_uInt16 nPos = maColMixCtrl.GetSelectItemId();
CMCPosition ePos = maColMixCtrl.GetCMCPosition();
if( ePos != CMC_OTHER )
@@ -304,12 +304,12 @@ IMPL_LINK( SvColorDialog, ClickMixCtrlHdl, void *, EMPTYARG )
// -----------------------------------------------------------------------
IMPL_LINK( SvColorDialog, SelectMixCtrlHdl, void *, EMPTYARG )
{
- //USHORT nPos = maColMixCtrl.GetSelectItemId();
+ //sal_uInt16 nPos = maColMixCtrl.GetSelectItemId();
//maFtRGB.SetText( maColMixCtrl.GetItemText( nPos ) );
CMCPosition ePos = maColMixCtrl.GetCMCPosition();
if( ePos == CMC_OTHER )
- maBtn1.Enable( FALSE );
+ maBtn1.Enable( sal_False );
else
maBtn1.Enable();
diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx
index de465b34e1c6..d0f86867686a 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -31,7 +31,7 @@
#include <svtools/filedlg.hxx>
#include <filedlg2.hxx>
-PathDialog::PathDialog( Window* _pParent, WinBits nStyle, BOOL bCreateDir ) :
+PathDialog::PathDialog( Window* _pParent, WinBits nStyle, sal_Bool bCreateDir ) :
ModalDialog( _pParent, WB_STDMODAL | nStyle )
{
pImpFileDlg = new ImpSvFileDlg;
@@ -70,7 +70,7 @@ long PathDialog::OK()
if( aOKHdlLink.IsSet() )
return aOKHdlLink.Call( this );
else
- return TRUE;
+ return sal_True;
}
@@ -80,7 +80,7 @@ FileDialog::FileDialog( Window* _pParent, WinBits nStyle ) :
// Dadurch dass hier bei VCL nicht der CTOR mit ResType verwendet wird,
// wurde im PathDialog-CTOR leider ein ImpPathDialog angelegt...
// So zwar scheisse, aber der Dialog ist eh' nur ein Hack:
- pImpFileDlg->CreateDialog( this, nStyle, WINDOW_FILEDIALOG, FALSE );
+ pImpFileDlg->CreateDialog( this, nStyle, WINDOW_FILEDIALOG, sal_False );
}
FileDialog::~FileDialog()
@@ -122,17 +122,17 @@ void FileDialog::FilterSelect()
aFilterHdlLink.Call( this );
}
-USHORT FileDialog::GetFilterCount() const
+sal_uInt16 FileDialog::GetFilterCount() const
{
return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterCount();
}
-UniString FileDialog::GetFilterName( USHORT nPos ) const
+UniString FileDialog::GetFilterName( sal_uInt16 nPos ) const
{
return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterName( nPos );
}
-UniString FileDialog::GetFilterType( USHORT nPos ) const
+UniString FileDialog::GetFilterType( sal_uInt16 nPos ) const
{
return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterType( nPos );
}
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index a2c68270ed81..6e6fd4fd2e84 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -73,9 +73,9 @@ DECLARE_LIST( UniStringList, UniString* )
p->Show();
-inline BOOL IsPrintable( sal_Unicode c )
+inline sal_Bool IsPrintable( sal_Unicode c )
{
- return c >= 32 && c != 127 ? TRUE : FALSE;
+ return c >= 32 && c != 127 ? sal_True : sal_False;
}
long
@@ -88,10 +88,10 @@ KbdListBox::PreNotify( NotifyEvent& rNEvt )
if ( IsPrintable ( cCharCode ) )
{
- USHORT nCurrentPos = GetSelectEntryPos();
- USHORT nEntries = GetEntryCount();
+ sal_uInt16 nCurrentPos = GetSelectEntryPos();
+ sal_uInt16 nEntries = GetEntryCount();
- for ( USHORT i = 1; i < nEntries; i++ )
+ for ( sal_uInt16 i = 1; i < nEntries; i++ )
{
UniString aEntry = GetEntry ( (i + nCurrentPos) % nEntries );
aEntry.EraseLeadingChars( ' ' );
@@ -116,7 +116,7 @@ KbdListBox::PreNotify( NotifyEvent& rNEvt )
return ListBox::PreNotify ( rNEvt );
}
-ImpPathDialog::ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreateDir )
+ImpPathDialog::ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, sal_Bool bCreateDir )
{
pSvPathDialog = pDlg;
nDirCount = 0;
@@ -287,14 +287,14 @@ IMPL_LINK( ImpPathDialog, SelectHdl, ListBox *, p )
UniString aEntry( pDirList->GetSelectEntry() );
aEntry.EraseLeadingChars( ' ' );
- USHORT nPos = aEntry.Search( '/' );
+ sal_uInt16 nPos = aEntry.Search( '/' );
aEntry.Erase( nPos );
// build the absolute path to the selected item
DirEntry aNewPath;
aNewPath.ToAbs();
- USHORT nCurPos = pDirList->GetSelectEntryPos();
+ sal_uInt16 nCurPos = pDirList->GetSelectEntryPos();
// Wird nach oben gewechselt
if( nCurPos < nDirCount )
@@ -321,7 +321,7 @@ IMPL_LINK( ImpPathDialog, ClickHdl, Button*, pBtn )
// Ja, dann kompletten Pfad mit Filenamen merken und Dialog beenden
aPath = aFile;
aPath.ToAbs();
- GetPathDialog()->EndDialog( TRUE );
+ GetPathDialog()->EndDialog( sal_True );
}
else
{
@@ -338,7 +338,7 @@ IMPL_LINK( ImpPathDialog, ClickHdl, Button*, pBtn )
else
if ( pBtn == pCancelBtn )
{
- GetPathDialog()->EndDialog( FALSE );
+ GetPathDialog()->EndDialog( sal_False );
}
else
if ( pBtn == pHomeBtn )
@@ -380,7 +380,7 @@ IMPL_LINK( ImpPathDialog, DblClickHdl, ListBox*, pBox )
UniString aEntry( pBox->GetSelectEntry() );
aEntry.EraseLeadingChars( ' ' );
- USHORT nPos = aEntry.Search( '/' );
+ sal_uInt16 nPos = aEntry.Search( '/' );
aEntry.Erase( nPos );
// build the absolute path to the selected item
@@ -388,7 +388,7 @@ IMPL_LINK( ImpPathDialog, DblClickHdl, ListBox*, pBox )
aNewPath.ToAbs();
if( pBox == pDirList )
{
- USHORT nCurPos = pDirList->GetSelectEntryPos();
+ sal_uInt16 nCurPos = pDirList->GetSelectEntryPos();
// Wenn es schon das aktuelle ist, dann mache nichts
if( nCurPos == nDirCount-1 )
@@ -409,22 +409,22 @@ IMPL_LINK( ImpPathDialog, DblClickHdl, ListBox*, pBox )
{
// Neuen Pfad setzen und Listboxen updaten
aPath = aNewPath;
- if( !aPath.SetCWD( TRUE ) )
+ if( !aPath.SetCWD( sal_True ) )
{
ErrorBox aBox( GetPathDialog(),
WB_OK_CANCEL | WB_DEF_OK,
UniString( SvtResId( STR_FILEDLG_CANTCHDIR ) ) );
if( aBox.Execute() == RET_CANCEL )
- GetPathDialog()->EndDialog( FALSE );
+ GetPathDialog()->EndDialog( sal_False );
}
- UpdateEntries( TRUE );
+ UpdateEntries( sal_True );
}
pSvPathDialog->LeaveWait();
return 0;
}
-void ImpPathDialog::UpdateEntries( const BOOL )
+void ImpPathDialog::UpdateEntries( const sal_Bool )
{
UniString aTabString;
DirEntry aTmpPath;
@@ -432,10 +432,10 @@ void ImpPathDialog::UpdateEntries( const BOOL )
nDirCount = aTmpPath.Level();
- pDirList->SetUpdateMode( FALSE );
+ pDirList->SetUpdateMode( sal_False );
pDirList->Clear();
- for( USHORT i = nDirCount; i > 0; i-- )
+ for( sal_uInt16 i = nDirCount; i > 0; i-- )
{
UniString aName( aTabString );
aName += aTmpPath[i-1].GetName();
@@ -449,11 +449,11 @@ void ImpPathDialog::UpdateEntries( const BOOL )
Dir aDir( aCurrent, FSYS_KIND_DIR|FSYS_KIND_FILE );
- USHORT nEntries = aDir.Count();
+ sal_uInt16 nEntries = aDir.Count();
if( nEntries )
{
UniStringList aSortDirList;
- for ( USHORT n = 0; n < nEntries; n++ )
+ for ( sal_uInt16 n = 0; n < nEntries; n++ )
{
DirEntry& rEntry = aDir[n];
UniString aName( rEntry.GetName() );
@@ -461,7 +461,7 @@ void ImpPathDialog::UpdateEntries( const BOOL )
{
if( FileStat( rEntry ).GetKind() & FSYS_KIND_DIR )
{
- ULONG l = 0;
+ sal_uLong l = 0;
if( xCollator.is() )
{
for( l = 0; l < aSortDirList.Count(); l++ )
@@ -473,7 +473,7 @@ void ImpPathDialog::UpdateEntries( const BOOL )
}
}
- for( ULONG l = 0; l < aSortDirList.Count(); l++ )
+ for( sal_uLong l = 0; l < aSortDirList.Count(); l++ )
{
UniString aEntryStr( aTabString );
aEntryStr += *aSortDirList.GetObject(l);
@@ -491,7 +491,7 @@ void ImpPathDialog::UpdateDirs( const DirEntry& rTmpPath )
pDirList->SetTopEntry( nDirCount > 1
? nDirCount - 2
: nDirCount - 1 );
- pDirList->SetUpdateMode( TRUE );
+ pDirList->SetUpdateMode( sal_True );
pDirList->Invalidate();
pDirList->Update();
@@ -502,10 +502,10 @@ void ImpPathDialog::UpdateDirs( const DirEntry& rTmpPath )
pEdit->SetText( aDirName );
}
-BOOL ImpPathDialog::IsFileOk( const DirEntry& rDirEntry )
+sal_Bool ImpPathDialog::IsFileOk( const DirEntry& rDirEntry )
{
if( FileStat( rDirEntry ).GetKind() & (FSYS_KIND_WILD | FSYS_KIND_DEV) )
- return FALSE;
+ return sal_False;
else
{
// Datei vorhanden ?
@@ -519,7 +519,7 @@ BOOL ImpPathDialog::IsFileOk( const DirEntry& rDirEntry )
if( aQuery.Execute() == RET_YES )
rDirEntry.MakeDir();
else
- return FALSE;
+ return sal_False;
}
if( !FileStat( rDirEntry ).IsKind( FSYS_KIND_DIR ) )
{
@@ -529,7 +529,7 @@ BOOL ImpPathDialog::IsFileOk( const DirEntry& rDirEntry )
aBoxText.AppendAscii( "]" );
InfoBox aBox( GetPathDialog(), aBoxText );
aBox.Execute();
- return FALSE;
+ return sal_False;
}
}
return GetPathDialog()->OK() != 0;
@@ -539,8 +539,8 @@ BOOL ImpPathDialog::IsFileOk( const DirEntry& rDirEntry )
void ImpPathDialog::PreExecute()
{
// Neues Verzeichnis setzen und Listboxen updaten
- aPath.SetCWD( TRUE );
- UpdateEntries( TRUE );
+ aPath.SetCWD( sal_True );
+ UpdateEntries( sal_True );
// Zusaetzliche Buttons anordnen
Point aPos;
@@ -563,8 +563,8 @@ void ImpPathDialog::PreExecute()
long nMaxWidth = 0;
// Maximale Breite ermitteln
- USHORT nChilds = GetPathDialog()->GetChildCount();
- USHORT n;
+ sal_uInt16 nChilds = GetPathDialog()->GetChildCount();
+ sal_uInt16 n;
for ( n = nOwnChilds; n < nChilds; n++ )
{
Window* pChild = GetPathDialog()->GetChild( n );
@@ -624,11 +624,11 @@ void ImpPathDialog::PreExecute()
DirEntry aTmpDirEntry;
Dir aDir( aTmpDirEntry, FSYS_KIND_BLOCK );
- USHORT nCount = aDir.Count(), i;
+ sal_uInt16 nCount = aDir.Count(), i;
for( i = 0; i < nCount; ++i )
{
DirEntry& rEntry = aDir[i];
- UniString aStr = rEntry.GetFull( FSYS_STYLE_HOST, FALSE );
+ UniString aStr = rEntry.GetFull( FSYS_STYLE_HOST, sal_False );
UniString aVolume = rEntry.GetVolume() ;
aStr.ToUpperAscii();
@@ -674,8 +674,8 @@ void ImpPathDialog::SetPath( UniString const & rPath )
// Neue Maske und neues Verzeichnis setzen, und Listboxen updaten
pEdit->SetText( rPath );
- aFile.SetCWD( TRUE );
- UpdateEntries( TRUE );
+ aFile.SetCWD( sal_True );
+ UpdateEntries( sal_True );
pSvPathDialog->LeaveWait();
}
@@ -697,7 +697,7 @@ UniString ImpPathDialog::GetPath() const
ImpFileDialog::ImpFileDialog( PathDialog* pDlg, WinBits nWinBits, RESOURCE_TYPE nType ) :
- ImpPathDialog( pDlg, nType, FALSE )
+ ImpPathDialog( pDlg, nType, sal_False )
{
bOpen = (nWinBits & WB_SAVEAS) == 0;
@@ -838,7 +838,7 @@ IMPL_LINK( ImpFileDialog, DblClickHdl, ListBox *, pBox )
UniString aEntry( pBox->GetSelectEntry() );
aEntry.EraseLeadingChars( ' ' );
- USHORT nPos = aEntry.Search( '/' );
+ sal_uInt16 nPos = aEntry.Search( '/' );
aEntry.Erase( nPos );
// build the absolute path to the selected item
@@ -848,7 +848,7 @@ IMPL_LINK( ImpFileDialog, DblClickHdl, ListBox *, pBox )
if( ( pDirList != pFileList ) && ( pBox == pDirList ) )
{
// SVLOOK
- USHORT nCurPos = pDirList->GetSelectEntryPos();
+ sal_uInt16 nCurPos = pDirList->GetSelectEntryPos();
// Wenn es schon das aktuelle ist, dann mache nichts
if( nCurPos == nDirCount-1 )
@@ -877,7 +877,7 @@ IMPL_LINK( ImpFileDialog, DblClickHdl, ListBox *, pBox )
{
// dann kompletten Pfad mit Filenamen merken und Dialog beenden
aPath = aNewPath;
- GetFileDialog()->EndDialog( TRUE );
+ GetFileDialog()->EndDialog( sal_True );
}
}
@@ -890,23 +890,23 @@ IMPL_LINK( ImpFileDialog, DblClickHdl, ListBox *, pBox )
{
// Neuen Pfad setzen und Listboxen updaten
aPath = aNewPath;
- if( !aPath.SetCWD( TRUE ) )
+ if( !aPath.SetCWD( sal_True ) )
{
if( ErrorBox( GetFileDialog(), WB_OK_CANCEL|WB_DEF_OK,
UniString( SvtResId( STR_FILEDLG_CANTCHDIR ) ) ).Execute() == RET_CANCEL )
{
- GetFileDialog()->EndDialog( FALSE );
+ GetFileDialog()->EndDialog( sal_False );
}
}
- UpdateEntries( TRUE );
+ UpdateEntries( sal_True );
GetFileDialog()->FileSelect();
}
if( pBox == pTypeList )
{
// Neue Maske setzen, und Listboxen updaten
- USHORT nCurPos = pTypeList->GetSelectEntryPos();
- if( nCurPos+1 > (USHORT)aFilterList.Count() )
+ sal_uInt16 nCurPos = pTypeList->GetSelectEntryPos();
+ if( nCurPos+1 > (sal_uInt16)aFilterList.Count() )
aMask = UniString::CreateFromAscii( ALLFILES );
else
{
@@ -918,7 +918,7 @@ IMPL_LINK( ImpFileDialog, DblClickHdl, ListBox *, pBox )
}
pEdit->SetText( aMask() );
- UpdateEntries( FALSE );
+ UpdateEntries( sal_False );
GetFileDialog()->FilterSelect();
}
@@ -939,7 +939,7 @@ IMPL_LINK( ImpFileDialog, ClickHdl, Button*, pBtn )
// Ja, dann kompletten Pfad mit Filenamen merken und Dialog beenden
aPath = aFile;
aPath.ToAbs();
- GetFileDialog()->EndDialog( TRUE );
+ GetFileDialog()->EndDialog( sal_True );
}
else
{
@@ -954,19 +954,19 @@ IMPL_LINK( ImpFileDialog, ClickHdl, Button*, pBtn )
// Neue Maske und neues Verzeichnis setzen, und Listboxen updaten
pEdit->SetText( aMask() );
- aFile.SetCWD( TRUE );
- UpdateEntries( TRUE );
+ aFile.SetCWD( sal_True );
+ UpdateEntries( sal_True );
GetFileDialog()->LeaveWait();
}
}
else if( pBtn == pCancelBtn )
- GetFileDialog()->EndDialog( FALSE );
+ GetFileDialog()->EndDialog( sal_False );
return 0;
}
-void ImpFileDialog::UpdateEntries( const BOOL bWithDirs )
+void ImpFileDialog::UpdateEntries( const sal_Bool bWithDirs )
{
GetFileDialog()->EnterWait();
@@ -977,16 +977,16 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs )
if( pFileList )
{
- pFileList->SetUpdateMode( FALSE );
+ pFileList->SetUpdateMode( sal_False );
pFileList->Clear();
}
if( bWithDirs && (pDirList != pFileList) )
{
- pDirList->SetUpdateMode( FALSE );
+ pDirList->SetUpdateMode( sal_False );
pDirList->Clear();
- for( USHORT i = nDirCount; i > 0; i-- )
+ for( sal_uInt16 i = nDirCount; i > 0; i-- )
{
UniString aEntryStr( aTabString );
aEntryStr += aTmpPath[i-1].GetName();
@@ -1005,10 +1005,10 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs )
DirEntry aCurrent;
aCurrent.ToAbs();
Dir aDir( aCurrent, FSYS_KIND_DIR|FSYS_KIND_FILE );
- USHORT nEntries = aDir.Count();
+ sal_uInt16 nEntries = aDir.Count();
// TempMask, weil Vergleich case-sensitiv
- BOOL bMatchCase = FALSE; //aCurrent.IsCaseSensitive();
+ sal_Bool bMatchCase = sal_False; //aCurrent.IsCaseSensitive();
UniString aWildCard( aMask.GetWildCard() );
if ( !bMatchCase )
aWildCard.ToLowerAscii();
@@ -1016,7 +1016,7 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs )
if ( nEntries )
{
UniStringList aSortDirList;
- for ( USHORT n = 0; n < nEntries; n++ )
+ for ( sal_uInt16 n = 0; n < nEntries; n++ )
{
DirEntry& rEntry = aDir[n];
UniString aName( rEntry.GetName() );
@@ -1045,7 +1045,7 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs )
}
else
{
- ULONG l = 0;
+ sal_uLong l = 0;
if( xCollator.is() )
{
for( l = 0; l < aSortDirList.Count(); l++ )
@@ -1057,7 +1057,7 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs )
}
}
}
- for( ULONG l = 0; l < aSortDirList.Count(); l++ )
+ for( sal_uLong l = 0; l < aSortDirList.Count(); l++ )
{
UniString aEntryStr( aTabString );
aEntryStr += *aSortDirList.GetObject(l);
@@ -1075,7 +1075,7 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs )
pFileList->SelectEntryPos( 1 );
else
pFileList->SetNoSelection();
- pFileList->SetUpdateMode( TRUE );
+ pFileList->SetUpdateMode( sal_True );
pFileList->Invalidate();
pFileList->Update();
}
@@ -1094,14 +1094,14 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs )
GetFileDialog()->LeaveWait();
}
-BOOL ImpFileDialog::IsFileOk( const DirEntry& rDirEntry )
+sal_Bool ImpFileDialog::IsFileOk( const DirEntry& rDirEntry )
{
if( FileStat( rDirEntry ).GetKind() & (FSYS_KIND_WILD | FSYS_KIND_DEV) )
- return FALSE;
+ return sal_False;
if( FileStat( rDirEntry ).GetKind() & FSYS_KIND_DIR )
{
if( pFileList )
- return FALSE;
+ return sal_False;
}
else if( bOpen )
{
@@ -1115,7 +1115,7 @@ BOOL ImpFileDialog::IsFileOk( const DirEntry& rDirEntry )
InfoBox aBox( GetFileDialog(),
aErrorString );
aBox.Execute();
- return FALSE;
+ return sal_False;
}
}
else
@@ -1131,7 +1131,7 @@ BOOL ImpFileDialog::IsFileOk( const DirEntry& rDirEntry )
WinBits( WB_YES_NO | WB_DEF_NO ),
aQueryString );
if( aBox.Execute() != RET_YES )
- return FALSE;
+ return sal_False;
}
}
return GetFileDialog()->OK() != 0;
@@ -1160,9 +1160,9 @@ void ImpFileDialog::SetPath( UniString const & rPath )
pEdit->SetText( rPath );
}
- aFile.SetCWD( TRUE );
+ aFile.SetCWD( sal_True );
- UpdateEntries( TRUE );
+ UpdateEntries( sal_True );
GetFileDialog()->LeaveWait();
}
@@ -1223,7 +1223,7 @@ void ImpFileDialog::SetCurFilter( const UniString& rFilter )
pItem = aFilterList.Next();
if( pItem )
- pTypeList->SelectEntryPos( (USHORT)aFilterList.GetCurPos() );
+ pTypeList->SelectEntryPos( (sal_uInt16)aFilterList.GetCurPos() );
else
pTypeList->SetNoSelection();
}
@@ -1254,7 +1254,7 @@ void ImpFileDialog::PreExecute()
if( pTypeList )
{
- USHORT nCurType = pTypeList->GetSelectEntryPos();
+ sal_uInt16 nCurType = pTypeList->GetSelectEntryPos();
if( nCurType < aFilterList.Count() )
{
UniString aFilterListMask = aFilterList.GetObject( nCurType )->aMask;
@@ -1294,7 +1294,7 @@ UniString ImpFileDialog::ExtendFileName( DirEntry aEntry ) const
UniString aPostfix; // hier kommt die ausgesuchte Extension herein
// ist ein Filter mit Extension gesetzt?
- USHORT nChosenFilterPos = pTypeList->GetSelectEntryPos();
+ sal_uInt16 nChosenFilterPos = pTypeList->GetSelectEntryPos();
if( nChosenFilterPos != LISTBOX_ENTRY_NOTFOUND )
{
UniString aExtensionMask = GetFileDialog()->GetFilterType( nChosenFilterPos );
@@ -1347,7 +1347,7 @@ UniString ImpFileDialog::ExtendFileName( DirEntry aEntry ) const
}
-void ImpSvFileDlg::CreateDialog( PathDialog* pSvDlg, WinBits nStyle, RESOURCE_TYPE nType, BOOL bCreate )
+void ImpSvFileDlg::CreateDialog( PathDialog* pSvDlg, WinBits nStyle, RESOURCE_TYPE nType, sal_Bool bCreate )
{
delete pDlg;
if ( nType == WINDOW_PATHDIALOG )
diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index 4d32565a2775..36214db27d33 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.hxx
@@ -91,10 +91,10 @@ private:
PushButton* pHomeBtn;
PushButton* pNewDirBtn;
- USHORT nOwnChilds;
+ sal_uInt16 nOwnChilds;
DirEntry aPath; // aktuell angewaehlter Pfad
- USHORT nDirCount; // Anzahl der Verzeichnis-
+ sal_uInt16 nDirCount; // Anzahl der Verzeichnis-
// Verschachtelungen
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator >
@@ -102,10 +102,10 @@ private:
protected:
- virtual void UpdateEntries( const BOOL bWithDirs );
+ virtual void UpdateEntries( const sal_Bool bWithDirs );
void UpdateDirs( const DirEntry& rTmpPath );
- BOOL IsFileOk( const DirEntry& rDirEntry );
+ sal_Bool IsFileOk( const DirEntry& rDirEntry );
void InitControls();
DECL_LINK( SelectHdl, ListBox * );
@@ -113,7 +113,7 @@ protected:
DECL_LINK( ClickHdl, Button * );
public:
- ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreateDir );
+ ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, sal_Bool bCreateDir );
virtual ~ImpPathDialog();
virtual void SetPath( const String& rPath );
@@ -142,9 +142,9 @@ private:
WildCard aMask; // aktuelle Maske
ImpFilterList aFilterList; // Filterliste
- USHORT nCurFilter; // aktueller Filter
+ sal_uInt16 nCurFilter; // aktueller Filter
- BOOL bOpen; // TRUE = Open; FALSE = SAVEAS
+ sal_Bool bOpen; // sal_True = Open; sal_False = SAVEAS
protected:
void InitControls();
@@ -155,8 +155,8 @@ protected:
DECL_LINK( DblClickHdl, ListBox * );
DECL_LINK( ClickHdl, Button * );
- virtual void UpdateEntries( const BOOL bWithDirs );
- BOOL IsFileOk( const DirEntry& rDirEntry );
+ virtual void UpdateEntries( const sal_Bool bWithDirs );
+ sal_Bool IsFileOk( const DirEntry& rDirEntry );
public:
ImpFileDialog( PathDialog* pDlg, WinBits nStyle, RESOURCE_TYPE nType );
@@ -168,9 +168,9 @@ public:
void SetCurFilter( const String& rFilter );
String GetCurFilter() const;
- USHORT GetFilterCount() const { return (USHORT)aFilterList.Count(); }
- inline String GetFilterName( USHORT nPos ) const;
- inline String GetFilterType( USHORT nPos ) const;
+ sal_uInt16 GetFilterCount() const { return (sal_uInt16)aFilterList.Count(); }
+ inline String GetFilterName( sal_uInt16 nPos ) const;
+ inline String GetFilterType( sal_uInt16 nPos ) const;
virtual void SetPath( const String& rPath );
virtual void SetPath( const Edit& rEdit );
@@ -181,7 +181,7 @@ public:
FileDialog* GetFileDialog() const { return (FileDialog*)GetPathDialog(); }
};
-inline String ImpFileDialog::GetFilterName( USHORT nPos ) const
+inline String ImpFileDialog::GetFilterName( sal_uInt16 nPos ) const
{
String aName;
ImpFilterItem* pItem = aFilterList.GetObject( nPos );
@@ -190,7 +190,7 @@ inline String ImpFileDialog::GetFilterName( USHORT nPos ) const
return aName;
}
-inline String ImpFileDialog::GetFilterType( USHORT nPos ) const
+inline String ImpFileDialog::GetFilterType( sal_uInt16 nPos ) const
{
String aFilterMask;
ImpFilterItem* pItem = aFilterList.GetObject( nPos );
@@ -209,7 +209,7 @@ public:
~ImpSvFileDlg() { delete pDlg; }
ImpPathDialog* GetDialog() const { return pDlg; }
- void CreateDialog( PathDialog* pCreateFrom, WinBits nStyle, RESOURCE_TYPE nType, BOOL bCreate );
+ void CreateDialog( PathDialog* pCreateFrom, WinBits nStyle, RESOURCE_TYPE nType, sal_Bool bCreate );
void SetOkButtonText( const String& rText ) { pDlg->SetOkButtonText( rText ); } // ihr habts ja nicht anders gewollt
void SetCancelButtonText( const String& rText ) { pDlg->SetCancelButtonText( rText ); }
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 0dd30ebdab89..605f9ed5db07 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -77,7 +77,7 @@ PRV_SV_IMPL_OWNER_LIST( SvObjectServerList, SvObjectServer )
*************************************************************************/
const SvObjectServer * SvObjectServerList::Get( const String & rHumanName ) const
{
- for( ULONG i = 0; i < Count(); i++ )
+ for( sal_uLong i = 0; i < Count(); i++ )
{
if( rHumanName == GetObject( i ).GetHumanName() )
return &GetObject( i );
@@ -92,7 +92,7 @@ const SvObjectServer * SvObjectServerList::Get( const String & rHumanName ) cons
*************************************************************************/
const SvObjectServer * SvObjectServerList::Get( const SvGlobalName & rName ) const
{
- for( ULONG i = 0; i < Count(); i++ )
+ for( sal_uLong i = 0; i < Count(); i++ )
{
if( rName == GetObject( i ).GetClassName() )
return &GetObject( i );
@@ -238,7 +238,7 @@ String SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId )
struct SotResourcePair
{
SotFormatStringId mnSotId;
- USHORT mnResId;
+ sal_uInt16 mnResId;
};
static const SotResourcePair aSotResourcePairs[] =
@@ -312,7 +312,7 @@ String SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId )
};
String aUIName;
- USHORT nResId = 0;
+ sal_uInt16 nResId = 0;
for( sal_uInt32 i = 0, nCount = sizeof( aSotResourcePairs ) / sizeof( aSotResourcePairs[ 0 ] ); ( i < nCount ) && !nResId; i++ )
{
diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx
index d07c41acba04..d98493114fd3 100644
--- a/svtools/source/dialogs/mcvmath.cxx
+++ b/svtools/source/dialogs/mcvmath.cxx
@@ -99,11 +99,11 @@ FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb )
|*
**************************************************************************/
-USHORT ImpSqrt( ULONG nRadi )
+sal_uInt16 ImpSqrt( sal_uLong nRadi )
{
- register ULONG inf = 1;
- register ULONG sup = nRadi;
- register ULONG sqr;
+ register sal_uLong inf = 1;
+ register sal_uLong sup = nRadi;
+ register sal_uLong sqr;
if ( !nRadi )
return 0;
@@ -118,7 +118,7 @@ USHORT ImpSqrt( ULONG nRadi )
sqr = (nRadi/sqr + sqr) >> 1; // 2 Newton-Iterationen reichen fuer
sqr = (nRadi/sqr + sqr) >> 1; // +- 1 Digit
- return sal::static_int_cast< USHORT >(sqr);
+ return sal::static_int_cast< sal_uInt16 >(sqr);
}
/**************************************************************************
@@ -133,7 +133,7 @@ USHORT ImpSqrt( ULONG nRadi )
// e**(i*nPhi), Einheit nPhi: 2**16 == 360 Grad
-FixCpx ImpExPI( USHORT nPhi )
+FixCpx ImpExPI( sal_uInt16 nPhi )
{
short i;
FixCpx aIter(1L); // e**(0*i)
@@ -165,10 +165,10 @@ FixCpx ImpExPI( USHORT nPhi )
// use for x*x+y*y==1 only
-static USHORT ImpATanx2( const Fix& rX, const Fix& rY )
+static sal_uInt16 ImpATanx2( const Fix& rX, const Fix& rY )
{
- USHORT phi0 = 0; // result angel higher part
- USHORT phi = 0; // dito lower part
+ sal_uInt16 phi0 = 0; // result angel higher part
+ sal_uInt16 phi = 0; // dito lower part
long x = rX.x;
long y = rY.x;
long z;
@@ -177,7 +177,7 @@ static USHORT ImpATanx2( const Fix& rX, const Fix& rY )
FixCpx aTry;
FixCpx aInc;
FixCpx aIter(1L);
- BOOL Small = FALSE;
+ sal_Bool Small = sal_False;
if ( (x==0) && (y==0) )
return 0;
@@ -225,7 +225,7 @@ static USHORT ImpATanx2( const Fix& rX, const Fix& rY )
phi += (1<<i);
if ( i > 11 )
- Small=TRUE;
+ Small=sal_True;
}
}
}
@@ -243,9 +243,9 @@ static USHORT ImpATanx2( const Fix& rX, const Fix& rY )
|*
**************************************************************************/
-USHORT ImpATan2( const short x, const short y )
+sal_uInt16 ImpATan2( const short x, const short y )
{
- Fix rRad = ImpSqrt(ULONG(long(x)*x+long(y)*y));
+ Fix rRad = ImpSqrt(sal_uLong(long(x)*x+long(y)*y));
if ( !rRad.x )
return 0;
@@ -267,9 +267,9 @@ USHORT ImpATan2( const short x, const short y )
|*
**************************************************************************/
-void ImpCartToPolar( const short x, const short y, Fix& rRad, USHORT& rPhi )
+void ImpCartToPolar( const short x, const short y, Fix& rRad, sal_uInt16& rPhi )
{
- rRad = Fix( ImpSqrt( ULONG( long(x)*x+long(y)*y ) ) );
+ rRad = Fix( ImpSqrt( sal_uLong( long(x)*x+long(y)*y ) ) );
if ( !rRad.x )
rPhi=0;
@@ -294,7 +294,7 @@ void ImpCartToPolar( const short x, const short y, Fix& rRad, USHORT& rPhi )
|*
**************************************************************************/
-void ImpPolarToCart( const Fix& rR, const USHORT Phi, short& rX, short& rY )
+void ImpPolarToCart( const Fix& rR, const sal_uInt16 Phi, short& rX, short& rY )
{
FixCpx fc = ImpExPI( Phi ); // calculate sin() & cos()
fc.GetReal().MultBig( rR );
diff --git a/svtools/source/dialogs/mcvmath.hxx b/svtools/source/dialogs/mcvmath.hxx
index 67d54fd80cf0..7708a8f1c89a 100644
--- a/svtools/source/dialogs/mcvmath.hxx
+++ b/svtools/source/dialogs/mcvmath.hxx
@@ -83,7 +83,7 @@ public:
Fix() { x=0; }
Fix( int i ) { x=(long(i)<<FIX_POST); }
Fix( short l ) { x=(long(l)<<FIX_POST); }
- Fix( USHORT l ) { x=(long(l)<<FIX_POST); }
+ Fix( sal_uInt16 l ) { x=(long(l)<<FIX_POST); }
Fix( long l ) { x=(l<<FIX_POST); }
Fix( long Z, long N ) { x=(Z<<FIX_POST)/N; }
@@ -101,8 +101,8 @@ public:
void DivBig( const Fix& a )
{ x=((x<<FIX_P3)/a.x)<<FIX_P2; }
- friend BOOL operator> ( const Fix& a, const Fix& b ) { return a.x > b.x; }
- friend BOOL operator< ( const Fix& a, const Fix& b ) { return a.x < b.x; }
+ friend sal_Bool operator> ( const Fix& a, const Fix& b ) { return a.x > b.x; }
+ friend sal_Bool operator< ( const Fix& a, const Fix& b ) { return a.x < b.x; }
operator long() const { return (x+FIX_ADD) >> FIX_POST; }
operator double() const { return double(x)/(1<<FIX_POST); }
@@ -218,11 +218,11 @@ inline FixCpx operator/ ( const FixCpx& a, const FixCpx& b )
Fix ImpMultBig2( const Fix& a, const Fix& b );
FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb );
-void ImpCartToPolar( const short x, const short y, Fix& rRad, USHORT& rPhi );
-void ImpPolarToCart( const Fix& rR, const USHORT Phi, short& rX, short& rY );
+void ImpCartToPolar( const short x, const short y, Fix& rRad, sal_uInt16& rPhi );
+void ImpPolarToCart( const Fix& rR, const sal_uInt16 Phi, short& rX, short& rY );
-USHORT ImpSqrt( ULONG nRadi );
-USHORT ImpATan2( const short x, const short y );
-FixCpx ImpExPI( USHORT nPhi );
+sal_uInt16 ImpSqrt( sal_uLong nRadi );
+sal_uInt16 ImpATan2( const short x, const short y );
+FixCpx ImpExPI( sal_uInt16 nPhi );
#endif // _MCVMATH_HXX
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
deleted file mode 100644
index 1ae01bb96603..000000000000
--- a/svtools/source/dialogs/printdlg.cxx
+++ /dev/null
@@ -1,796 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/print.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/jobset.hxx>
-#include <tools/urlobj.hxx>
-#include "printdlg.hrc"
-#include <svtools/controldims.hrc>
-#include <svtools/prnsetup.hxx>
-#include <svtools/printdlg.hxx>
-#include <svtools/svtdata.hxx>
-#include <svtools/filedlg.hxx>
-#include "svl/pickerhelper.hxx"
-#include <svtools/helpid.hrc>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
-
-using rtl::OUString;
-using namespace com::sun::star;
-
-struct SvtPrinterImpl
-{
- Printer* m_pTempPrinter;
- sal_Bool m_bHelpDisabled;
- PrintSheetRange m_eSheetRange;
-
- SvtPrinterImpl() :
- m_pTempPrinter( NULL ), m_bHelpDisabled( sal_False ), m_eSheetRange( PRINTSHEETS_ALL ) {}
- ~SvtPrinterImpl() { delete m_pTempPrinter; }
-};
-
-#define TEMPPRINTER() mpPrinterImpl->m_pTempPrinter
-
-// =======================================================================
-
-PrintDialog::PrintDialog( Window* pWindow, bool bWithSheetsAndCells ) :
- ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRINTDLG ) ),
- maFlPrinter ( this, SvtResId( FL_PRINTER ) ),
- maFtName ( this, SvtResId( FT_NAME ) ),
- maLbName ( this, SvtResId( LB_NAMES ) ),
- maBtnProperties ( this, SvtResId( BTN_PROPERTIES ) ),
- maFtStatus ( this, SvtResId( FT_STATUS ) ),
- maFiStatus ( this, SvtResId( FI_STATUS ) ),
- maFtType ( this, SvtResId( FT_TYPE ) ),
- maFiType ( this, SvtResId( FI_TYPE ) ),
- maFtLocation ( this, SvtResId( FT_LOCATION ) ),
- maFiLocation ( this, SvtResId( FI_LOCATION ) ),
- maFtComment ( this, SvtResId( FT_COMMENT ) ),
- maFiComment ( this, SvtResId( FI_COMMENT ) ),
- maCbxFilePrint ( this, SvtResId( CBX_FILEPRINT ) ),
- maFiPrintFile ( this, SvtResId( FI_PRINTFILE ) ),
- maFiFaxNo ( this, SvtResId( FI_FAXNO ) ),
- maEdtFaxNo ( this, SvtResId( EDT_FAXNO ) ),
- maFlPrint ( this, SvtResId( FL_PRINT ) ),
- maRbtAllSheets ( this, SvtResId( RBT_ALL_SHEETS ) ),
- maRbtSelectedSheets ( this, SvtResId( RBT_SELECTED_SHEETS ) ),
- maRbtSelectedCells ( this, SvtResId( RBT_SELECTED_CELLS ) ),
- maFlPrintRange ( this, SvtResId( FL_PRINTRANGE ) ),
- maRbtAll ( this, SvtResId( RBT_ALL ) ),
- maRbtPages ( this, SvtResId( RBT_PAGES ) ),
- maRbtSelection ( this, SvtResId( RBT_SELECTION ) ),
- maEdtPages ( this, SvtResId( EDT_PAGES ) ),
- maFlSepCopiesRange ( this, SvtResId( FL_SEPCOPIESRANGE ) ),
- maFlCopies ( this, SvtResId( FL_COPIES ) ),
- maFtCopies ( this, SvtResId( FT_COPIES ) ),
- maNumCopies ( this, SvtResId( NUM_COPIES ) ),
- maImgCollate ( this, SvtResId( IMG_COLLATE ) ),
- maImgNotCollate ( this, SvtResId( IMG_NOT_COLLATE ) ),
- maCbxCollate ( this, SvtResId( CBX_COLLATE ) ),
- maFlSepButtonLine ( this, SvtResId( FL_SEPBUTTONLINE ) ),
- maBtnOptions ( this, SvtResId( BTN_OPTIONS ) ),
- maBtnOK ( this, SvtResId( BTN_OK ) ),
- maBtnCancel ( this, SvtResId( BTN_CANCEL ) ),
- maBtnHelp ( this, SvtResId( BTN_HELP ) ),
- mbWithSheetsAndCells( bWithSheetsAndCells ),
- maAllFilterStr ( SvtResId( STR_ALLFILTER ) )
-
-{
- FreeResource();
-
- mpPrinter = NULL;
- mpPrinterImpl = new SvtPrinterImpl;
- mnCopyCount = 1;
- mnFirstPage = 0;
- mnLastPage = 0;
- mnMinPage = 1;
- mnMaxPage = 65535;
- meCheckRange = PRINTDIALOG_ALL;
- mbAll = TRUE;
- mbSelection = FALSE;
- mbFromTo = FALSE;
- mbRange = FALSE;
- mbCollate = TRUE;
- mbCollateCheck = TRUE;
- mbOptions = FALSE;
-
- maStatusTimer.SetTimeout( IMPL_PRINTDLG_STATUS_UPDATE );
- maStatusTimer.SetTimeoutHdl( LINK( this, PrintDialog, ImplStatusHdl ) );
- maBtnProperties.SetClickHdl( LINK( this, PrintDialog, ImplPropertiesHdl ) );
- maLbName.SetSelectHdl( LINK( this, PrintDialog, ImplChangePrinterHdl ) );
-
- maFiPrintFile.SetStyle( maFiPrintFile.GetStyle() | WB_PATHELLIPSIS );
-
- Link aLink( LINK( this, PrintDialog, ImplModifyControlHdl ) );
- maCbxFilePrint.SetClickHdl( aLink );
- maRbtAll.SetClickHdl( aLink );
- maRbtPages.SetClickHdl( aLink );
- maRbtSelection.SetClickHdl( aLink );
- maEdtPages.SetModifyHdl( aLink );
- maNumCopies.SetModifyHdl( aLink );
- maCbxCollate.SetClickHdl( aLink );
- maBtnOptions.SetClickHdl( aLink );
- maEdtFaxNo.SetModifyHdl( aLink );
- maBtnOK.SetClickHdl( aLink );
-
- maRbtAll.Check();
- ImplSetImages();
-
- maBtnProperties.SetAccessibleRelationMemberOf(&maFlPrinter);
- maEdtPages.SetAccessibleRelationLabeledBy(&maRbtPages);
- maEdtPages.SetAccessibleRelationLabeledBy( &maRbtPages );
- maEdtPages.SetAccessibleName(maRbtPages.GetText());
-}
-
-// -----------------------------------------------------------------------
-
-PrintDialog::~PrintDialog()
-{
- ImplFreePrnDlgListBox( &maLbName, FALSE );
- delete mpPrinterImpl;
-}
-
-// -----------------------------------------------------------------------
-
-void PrintDialog::ImplSetImages()
-{
- if( ! GetSettings().GetStyleSettings().GetHighContrastMode() )
- {
- maImgCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_COLLATE ) ), BMP_COLOR_NORMAL );
- maImgNotCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE ) ), BMP_COLOR_NORMAL );
- }
- else
- {
- maImgCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_COLLATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
- maImgNotCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
- }
-}
-
-// -----------------------------------------------------------------------
-
-void PrintDialog::ImplSetInfo()
-{
- const QueueInfo* pInfo = Printer::GetQueueInfo( maLbName.GetSelectEntry(), true );
- if ( pInfo )
- {
- maFiType.SetText( pInfo->GetDriver() );
- maFiLocation.SetText( pInfo->GetLocation() );
- maFiComment.SetText( pInfo->GetComment() );
- maFiStatus.SetText( ImplPrnDlgGetStatusText( *pInfo ) );
- }
- else
- {
- XubString aTempStr;
- maFiType.SetText( aTempStr );
- maFiLocation.SetText( aTempStr );
- maFiComment.SetText( aTempStr );
- maFiStatus.SetText( aTempStr );
- }
-
-#ifdef UNX
- if( pInfo && pInfo->GetLocation().EqualsAscii( "fax_queue" ) )
- {
- maFiPrintFile.Show( FALSE );
- maCbxFilePrint.Show( FALSE );
- maFiFaxNo.Show( TRUE );
- maEdtFaxNo.Show( TRUE );
- Printer* pPrinter = TEMPPRINTER() ? TEMPPRINTER() : mpPrinter;
- maEdtFaxNo.SetText( pPrinter->GetJobValue( String::CreateFromAscii( "FAX#" ) ) );
-
- Size aFTSize = maFiFaxNo.GetSizePixel();
- long nTextWidth = maFiFaxNo.GetCtrlTextWidth( maFiFaxNo.GetText() ) + 10;
- if ( aFTSize.Width() < nTextWidth )
- {
- long nDelta = nTextWidth - aFTSize.Width();
- aFTSize.Width() = aFTSize.Width() + nDelta;
- maFiFaxNo.SetSizePixel( aFTSize );
- Size aEdtSize = maEdtFaxNo.GetSizePixel();
- aEdtSize.Width() = aEdtSize.Width() - nDelta;
- Point aEdtPos = maEdtFaxNo.GetPosPixel();
- aEdtPos.X() = aEdtPos.X() + nDelta;
- maEdtFaxNo.SetPosSizePixel( aEdtPos, aEdtSize );
- }
- }
- else
-#endif
- {
- maFiPrintFile.Show( TRUE );
- maCbxFilePrint.Show( TRUE );
- maFiFaxNo.Show( FALSE );
- maEdtFaxNo.Show( FALSE );
- }
-
-}
-
-// -----------------------------------------------------------------------
-
-void PrintDialog::ImplCheckOK()
-{
- // Ueberprueft, ob der OK-Button enabled ist
- BOOL bEnable = TRUE;
-
- if ( bEnable && maRbtPages.IsChecked() )
- bEnable = maEdtPages.GetText().Len() > 0;
-
- if ( bEnable )
- {
- if ( TEMPPRINTER() )
- bEnable = TEMPPRINTER()->IsValid();
- else
- bEnable = mpPrinter->IsValid();
- }
-
- maBtnOK.Enable( bEnable );
-}
-
-// -----------------------------------------------------------------------
-
-void PrintDialog::ImplInitControls()
-{
- // Alles
- if ( mbAll )
- {
- maRbtAll.Enable();
- if( meCheckRange == PRINTDIALOG_ALL )
- maRbtAll.Check( TRUE );
- }
- else
- maRbtAll.Enable( FALSE );
-
- // Selektion
- if ( mbSelection )
- {
- maRbtSelection.Enable();
- if ( meCheckRange == PRINTDIALOG_SELECTION )
- maRbtSelection.Check( TRUE );
- }
- else
- maRbtSelection.Enable( FALSE );
-
- // Seiten
- if ( mbRange )
- {
- maRbtPages.Enable();
- maEdtPages.Show();
- maEdtPages.SetText( maRangeText );
-
- if( ( meCheckRange == PRINTDIALOG_FROMTO ) ||
- ( meCheckRange == PRINTDIALOG_RANGE ) )
- {
- maRbtPages.Check( TRUE );
- maEdtPages.Enable();
- }
- else
- maEdtPages.Enable( FALSE );
- }
- else
- {
- maRbtPages.Enable( FALSE );
- maEdtPages.Hide();
- }
-
- // Anzahl Kopien
- maNumCopies.SetValue( mnCopyCount );
-
- // Sortierung
- maCbxCollate.Enable( mbCollate );
- maCbxCollate.Check( mbCollateCheck );
-
- // Zusaetze-Button
- if ( mbOptions )
- maBtnOptions.Show();
-
- if ( !mbWithSheetsAndCells )
- {
- Size aMarginSize =
- LogicToPixel( Size( RSC_SP_CTRL_GROUP_X, RSC_SP_CTRL_GROUP_Y ), MAP_APPFONT );
- long nTempPos = maImgCollate.GetPosPixel().Y() +
- maImgCollate.GetSizePixel().Height() + aMarginSize.Height();
- long nDelta1 = maFlPrintRange.GetPosPixel().Y() - maFlPrint.GetPosPixel().Y();
- long nDelta2 = maFlSepButtonLine.GetPosPixel().Y() - nTempPos;
-
- maFlPrint.Hide();
- maRbtAllSheets.Hide();
- maRbtSelectedSheets.Hide();
- maRbtSelectedCells.Hide();
- maRbtSelection.Show();
-
- Size aNewSize = GetSizePixel();
- aNewSize.Height() -= nDelta2;
- SetSizePixel( aNewSize );
- aNewSize = maFlSepCopiesRange.GetSizePixel();
- aNewSize.Height() -= nDelta2;
- maFlSepCopiesRange.SetSizePixel( aNewSize );
-
- long nDelta = nDelta1;
- Window* pControls[] = { &maFlPrintRange, &maRbtAll,
- &maRbtPages, &maEdtPages, &maRbtSelection, NULL,
- &maFlSepButtonLine, &maBtnOptions, &maBtnOK,
- &maBtnCancel, &maBtnHelp };
- Window** pCtrl = pControls;
- const sal_Int32 nCount = sizeof( pControls ) / sizeof( pControls[0] );
- for ( sal_Int32 i = 0; i < nCount; ++i, ++pCtrl )
- {
- if ( NULL == *pCtrl )
- {
- nDelta = nDelta2;
- continue;
- }
- Point aNewPos = (*pCtrl)->GetPosPixel();
- aNewPos.Y() -= nDelta;
- (*pCtrl)->SetPosPixel( aNewPos );
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
-void PrintDialog::ImplFillDialogData()
-{
- if ( maRbtAll.IsChecked() )
- meCheckRange = PRINTDIALOG_ALL;
- else if( maRbtSelection.IsChecked() )
- meCheckRange = PRINTDIALOG_SELECTION;
- else
- {
- meCheckRange = PRINTDIALOG_RANGE;
- maRangeText = maEdtPages.GetText();
- }
-
- mnCopyCount = (USHORT) maNumCopies.GetValue();
- mbCollateCheck = maCbxCollate.IsChecked();
-
- // In Datei drucken
- if ( maCbxFilePrint.IsChecked() )
- mpPrinter->SetPrintFile( maFiPrintFile.GetText() );
- mpPrinter->EnablePrintFile( maCbxFilePrint.IsChecked() );
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( PrintDialog, ImplStatusHdl, Timer*, EMPTYARG )
-{
- QueueInfo aInfo;
- ImplPrnDlgUpdateQueueInfo( &maLbName, aInfo );
- maFiStatus.SetText( ImplPrnDlgGetStatusText( aInfo ) );
-
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( PrintDialog, ImplPropertiesHdl, void*, EMPTYARG )
-{
- if ( !TEMPPRINTER() )
- TEMPPRINTER() = new Printer( mpPrinter->GetJobSetup() );
- TEMPPRINTER()->Setup( this );
-
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( PrintDialog, ImplChangePrinterHdl, void*, EMPTYARG )
-{
- TEMPPRINTER() = ImplPrnDlgListBoxSelect( &maLbName, &maBtnProperties,
- mpPrinter, TEMPPRINTER() );
- ImplSetInfo();
- ImplCheckOK(); // Check if "OK" button can be enabled now!
-
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-bool PrintDialog::ImplGetFilename()
-{
- uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
- static ::rtl::OUString aOldFile;
- if( xFactory.is() )
- {
- uno::Sequence< uno::Any > aTempl( 1 );
- aTempl.getArray()[0] <<= ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION;
- uno::Reference< ui::dialogs::XFilePicker > xFilePicker(
- xFactory->createInstanceWithArguments(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ),
- aTempl ), uno::UNO_QUERY );
- DBG_ASSERT( xFilePicker.is(), "could not get FilePicker service" );
-
- uno::Reference< ui::dialogs::XFilterManager > xFilterMgr( xFilePicker, uno::UNO_QUERY );
- if( xFilePicker.is() && xFilterMgr.is() )
- {
- try
- {
-#ifdef UNX
- // add PostScript and PDF
- Printer* pPrinter = TEMPPRINTER() ? TEMPPRINTER() : mpPrinter;
- bool bPS = true, bPDF = true;
- if( pPrinter )
- {
- if( pPrinter->GetCapabilities( PRINTER_CAPABILITIES_PDF ) )
- bPS = false;
- else
- bPDF = false;
- }
- if( bPS )
- xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PostScript" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.ps" ) ) );
- if( bPDF )
- xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Portable Document Format" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.pdf" ) ) );
-#elif defined WNT
- xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.PRN" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) );
-#endif
- // add arbitrary files
- xFilterMgr->appendFilter( maAllFilterStr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) );
- }
- catch( lang::IllegalArgumentException rExc )
- {
- DBG_ERRORFILE( "caught IllegalArgumentException when registering filter\n" );
- }
-
- if( aOldFile.getLength() )
- {
- INetURLObject aUrl( aOldFile, INET_PROT_FILE );
- xFilePicker->setDefaultName( aUrl.GetLastName() );
- aUrl.CutLastName();
- xFilePicker->setDisplayDirectory( aUrl.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
- }
-
- if( xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK )
- {
- uno::Sequence< ::rtl::OUString > aPathSeq( xFilePicker->getFiles() );
- INetURLObject aObj( aPathSeq[0] );
- maFiPrintFile.SetText( aOldFile = 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( aOldFile.getLength() )
- aDlg.SetPath( aOldFile );
-
- if( aDlg.Execute() )
- {
- String aTargetFile = aDlg.GetPath();
- maFiPrintFile.SetText( aOldFile = aTargetFile );
- return true;
- }
-
- return false;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( PrintDialog, ImplModifyControlHdl, void*, p )
-{
- // Radiobuttons (Umfang)
- if ( !p || (p == &maRbtAll) || (p == &maRbtPages) || (p == &maRbtSelection) )
- {
- BOOL bCheck = maRbtPages.IsChecked();
- maEdtPages.Enable( bCheck );
- if ( p == &maRbtPages )
- maEdtPages.GrabFocus();
- ImplCheckOK();
- }
-
- // Edit-Felder (Seiten)
- if ( p == &maEdtPages )
- ImplCheckOK();
-
- if( p == &maEdtFaxNo )
- {
- Printer* pPrinter = TEMPPRINTER() ? TEMPPRINTER() : mpPrinter;
- pPrinter->SetJobValue( String::CreateFromAscii( "FAX#" ), maEdtFaxNo.GetText() );
- }
-
- // Anzahl Kopien
- BOOL bNumCopies = FALSE;
-
- if ( !p || p == &maNumCopies )
- {
- if ( p )
- bNumCopies = TRUE;
- //BOOL bCopies = maNumCopies.GetValue() > 1;
- maCbxCollate.Enable( mbCollate );
-
- /*if ( !bCopies )
- maCbxCollate.Check( FALSE );
- else*/
- if ( mbCollateCheck )
- maCbxCollate.Check( TRUE );
- }
-
- // Sortieren
- if ( !p || p == &maCbxCollate || bNumCopies )
- {
- BOOL bCheck = maCbxCollate.IsChecked();
-
- if ( !bNumCopies )
- mbCollateCheck = maCbxCollate.IsChecked();
-
- if( bCheck )
- {
- maImgCollate.Show();
- maImgNotCollate.Hide();
- }
- else
- {
- maImgCollate.Hide();
- maImgNotCollate.Show();
- }
- }
-
- // Zus"atze
- if ( p == &maBtnOptions )
- ClickOptionsHdl();
-
- if( p == &maBtnOK )
- {
- EndDialog( maCbxFilePrint.IsChecked() ? ImplGetFilename() : TRUE );
- }
-
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-long PrintDialog::ClickOptionsHdl()
-{
- if ( maOptionsHdlLink.IsSet() )
- return maOptionsHdlLink.Call( this );
- else
- return TRUE;
-}
-
-// -----------------------------------------------------------------------
-
-long PrintDialog::OK()
-{
- if ( maOKHdlLink.IsSet() )
- return maOKHdlLink.Call( this );
- else
- return TRUE;
-}
-
-// -----------------------------------------------------------------------
-
-void PrintDialog::EnableSheetRange( bool bEnable, PrintSheetRange eRange )
-{
- if ( mbWithSheetsAndCells )
- {
- switch ( eRange )
- {
- case PRINTSHEETS_ALL :
- maRbtAllSheets.Enable( bEnable != false );
- break;
- case PRINTSHEETS_SELECTED_SHEETS :
- maRbtSelectedSheets.Enable( bEnable != false );
- break;
- case PRINTSHEETS_SELECTED_CELLS :
- maRbtSelectedCells.Enable( bEnable != false );
- break;
- default:
- DBG_ERRORFILE( "PrintDialog::EnableSheetRange(): invalid range" );
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
-bool PrintDialog::IsSheetRangeEnabled( PrintSheetRange eRange ) const
-{
- if ( !mbWithSheetsAndCells )
- return false;
-
- bool bRet = false;
- switch ( eRange )
- {
- case PRINTSHEETS_ALL :
- bRet = maRbtAllSheets.IsEnabled() != FALSE;
- break;
- case PRINTSHEETS_SELECTED_SHEETS :
- bRet = maRbtSelectedSheets.IsEnabled() != FALSE;
- break;
- case PRINTSHEETS_SELECTED_CELLS :
- bRet = maRbtSelectedCells.IsEnabled() != FALSE;
- break;
- default:
- DBG_ERRORFILE( "PrintDialog::IsSheetRangeEnabled(): invalid range" );
- }
- return bRet;
-}
-
-// -----------------------------------------------------------------------
-
-void PrintDialog::CheckSheetRange( PrintSheetRange eRange )
-{
- if ( mbWithSheetsAndCells )
- {
- switch ( eRange )
- {
- case PRINTSHEETS_ALL :
- maRbtAllSheets.Check();
- break;
- case PRINTSHEETS_SELECTED_SHEETS :
- maRbtSelectedSheets.Check();
- break;
- case PRINTSHEETS_SELECTED_CELLS :
- maRbtSelectedCells.Check();
- break;
- default:
- DBG_ERRORFILE( "PrintDialog::CheckSheetRange(): invalid range" );
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
-PrintSheetRange PrintDialog::GetCheckedSheetRange() const
-{
- PrintSheetRange eRange = PRINTSHEETS_ALL;
- if ( mbWithSheetsAndCells )
- {
- if ( maRbtSelectedSheets.IsChecked() )
- eRange = PRINTSHEETS_SELECTED_SHEETS;
- else if ( maRbtSelectedCells.IsChecked() )
- eRange = PRINTSHEETS_SELECTED_CELLS;
- }
- return eRange;
-}
-
-// -----------------------------------------------------------------------
-
-bool PrintDialog::IsSheetRangeChecked( PrintSheetRange eRange ) const
-{
- if ( !mbWithSheetsAndCells )
- return false;
-
- bool bRet = false;
- switch ( eRange )
- {
- case PRINTSHEETS_ALL :
- bRet = maRbtAllSheets.IsChecked() != FALSE;
- break;
- case PRINTSHEETS_SELECTED_SHEETS :
- bRet = maRbtSelectedSheets.IsChecked() != FALSE;
- break;
- case PRINTSHEETS_SELECTED_CELLS :
- bRet = maRbtSelectedCells.IsChecked() != FALSE;
- break;
- default:
- DBG_ERRORFILE( "PrintDialog::IsSheetRangeChecked(): invalid range" );
- }
- return bRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PrintDialog::Notify( NotifyEvent& rNEvt )
-{
- if ( (rNEvt.GetType() == EVENT_GETFOCUS) && IsReallyVisible() )
- ImplStatusHdl( &maStatusTimer );
- else if ( rNEvt.GetType() == EVENT_KEYINPUT )
- {
- if ( rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_F1 && mpPrinterImpl->m_bHelpDisabled )
- return 1; // do nothing
- }
-
- return ModalDialog::Notify( rNEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void PrintDialog::DataChanged( const DataChangedEvent& rDCEvt )
-{
- if ( rDCEvt.GetType() == DATACHANGED_PRINTER )
- {
- TEMPPRINTER() = ImplPrnDlgUpdatePrinter( mpPrinter, TEMPPRINTER() );
- Printer* pPrn;
- if ( TEMPPRINTER() )
- pPrn = TEMPPRINTER();
- else
- pPrn = mpPrinter;
- ImplFillPrnDlgListBox( pPrn, &maLbName, &maBtnProperties );
- ImplSetInfo();
- ImplCheckOK();
- }
- else if ( rDCEvt.GetType() == DATACHANGED_SETTINGS )
- ImplSetImages();
-
- ModalDialog::DataChanged( rDCEvt );
-}
-
-// -----------------------------------------------------------------------
-
-short PrintDialog::Execute()
-{
- if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
- {
- DBG_ERRORFILE( "PrinterSetupDialog::Execute() - No Printer or printer is printing" );
- return FALSE;
- }
-
- // check if the printer brings up its own dialog
- // in that case leave the work to that dialog
- if( mpPrinter->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) )
- return TRUE;
-
- Printer::updatePrinters();
-
- // Controls initialisieren
- ImplFillPrnDlgListBox( mpPrinter, &maLbName, &maBtnProperties );
- ImplSetInfo();
- maStatusTimer.Start();
- ImplInitControls();
- maNumCopies.GrabFocus();
- maNumCopies.SetSelection( Selection( 0, maNumCopies.GetText().Len() ) );
- ImplModifyControlHdl( NULL );
-
- // Dialog starten
- short nRet = ModalDialog::Execute();
-
- // Wenn Dialog mit OK beendet wurde, dann die Daten updaten
- if( nRet == TRUE )
- {
- if ( TEMPPRINTER() )
- mpPrinter->SetPrinterProps( TEMPPRINTER() );
- ImplFillDialogData();
- }
-
- maStatusTimer.Stop();
-
- return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-void PrintDialog::DisableHelp()
-{
- mpPrinterImpl->m_bHelpDisabled = sal_True;
- maBtnHelp.Disable();
-}
-
diff --git a/svtools/source/dialogs/printdlg.hrc b/svtools/source/dialogs/printdlg.hrc
deleted file mode 100644
index 83b7b0b28c82..000000000000
--- a/svtools/source/dialogs/printdlg.hrc
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <svtools/svtools.hrc>
-
-#define FL_PRINTER 1
-#define LB_NAMES 2
-#define BTN_PROPERTIES 3
-#define FT_NAME 4
-#define FT_STATUS 5
-#define FI_STATUS 6
-#define FT_TYPE 7
-#define FI_TYPE 8
-#define FT_LOCATION 9
-#define FI_LOCATION 10
-#define FT_COMMENT 11
-#define FI_COMMENT 12
-#define CBX_FILEPRINT 13
-#define FI_PRINTFILE 14
-#define FI_FAXNO 15
-#define EDT_FAXNO 16
-
-#define FL_PRINT 20
-#define RBT_ALL_SHEETS 21
-#define RBT_SELECTED_SHEETS 22
-#define RBT_SELECTED_CELLS 23
-
-#define FL_PRINTRANGE 30
-#define RBT_ALL 31
-#define RBT_PAGES 32
-#define EDT_PAGES 33
-#define RBT_SELECTION 34
-
-#define FL_SEPCOPIESRANGE 35
-
-#define FL_COPIES 40
-#define FT_COPIES 41
-#define NUM_COPIES 42
-#define CBX_COLLATE 43
-#define IMG_COLLATE 44
-#define IMG_NOT_COLLATE 45
-
-#define FL_SEPBUTTONLINE 50
-#define BTN_OK 51
-#define BTN_CANCEL 52
-#define BTN_HELP 53
-#define BTN_OPTIONS 54
-
-#define STR_ALLFILTER 10
-
diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src
deleted file mode 100644
index 80c6e465d49a..000000000000
--- a/svtools/source/dialogs/printdlg.src
+++ /dev/null
@@ -1,349 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "printdlg.hrc"
-
-#define IMAGE_MAGENTA_MASK Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }
-
-ModalDialog DLG_SVT_PRNDLG_PRINTDLG
-{
- HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG";
- SVLook = TRUE ;
- OutputSize = TRUE ;
- Moveable = TRUE ;
- Size = MAP_APPFONT ( 265 , 210 ) ;
- Text [ en-US ] = "Print" ;
- FixedLine FL_PRINTER
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 253 , 8 ) ;
- Text [ en-US ] = "Printer" ;
- };
- FixedText FT_NAME
- {
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
- Text [ en-US ] = "~Name" ;
- };
- ListBox LB_NAMES
- {
- HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 60 , 13 ) ;
- Size = MAP_APPFONT ( 130 , 80 ) ;
- DropDown = TRUE ;
- Sort = TRUE ;
- };
- PushButton BTN_PROPERTIES
- {
- HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES";
- Pos = MAP_APPFONT ( 193 , 12 ) ;
- Size = MAP_APPFONT ( 60 , 14 ) ;
- Text [ en-US ] = "Propert~ies..." ;
- };
- FixedText FT_STATUS
- {
- Pos = MAP_APPFONT ( 12 , 29 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text [ en-US ] = "Status" ;
- };
- FixedText FI_STATUS
- {
- Pos = MAP_APPFONT ( 60 , 29 ) ;
- Size = MAP_APPFONT ( 193 , 8 ) ;
- };
- FixedText FT_TYPE
- {
- Pos = MAP_APPFONT ( 12 , 40 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text [ en-US ] = "Type" ;
- };
- FixedText FI_TYPE
- {
- Pos = MAP_APPFONT ( 60 , 40 ) ;
- Size = MAP_APPFONT ( 193 , 8 ) ;
- };
- FixedText FT_LOCATION
- {
- Pos = MAP_APPFONT ( 12 , 51 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text [ en-US ] = "Location" ;
- };
- FixedText FI_LOCATION
- {
- Pos = MAP_APPFONT ( 60 , 51 ) ;
- Size = MAP_APPFONT ( 193 , 8 ) ;
- };
- FixedText FT_COMMENT
- {
- Pos = MAP_APPFONT ( 12 , 62 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text [ en-US ] = "Comment" ;
- };
- FixedText FI_COMMENT
- {
- Pos = MAP_APPFONT ( 60 , 62 ) ;
- Size = MAP_APPFONT ( 193 , 8 ) ;
- };
- FixedText FI_FAXNO
- {
- Pos = MAP_APPFONT ( 12 , 75 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text [ en-US ] = "Fax number";
- };
- Edit EDT_FAXNO
- {
- HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO";
- Border = TRUE;
- Pos = MAP_APPFONT ( 60 , 73 );
- Size = MAP_APPFONT ( 188 , 12 );
- };
- CheckBox CBX_FILEPRINT
- {
- HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT";
- Pos = MAP_APPFONT ( 12 , 73 ) ;
- Size = MAP_APPFONT ( 75 , 10 ) ;
- Text [ en-US ] = "Print to file" ;
- };
- FixedText FI_PRINTFILE
- {
- Pos = MAP_APPFONT ( 90 , 74 ) ;
- Size = MAP_APPFONT ( 163 , 8 ) ;
- };
- /*!!!
- PushButton BTN_BROWSE
- {
- HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_BROWSE";
- Pos = MAP_APPFONT ( 234 , 75 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- Text = "~..." ;
- Hide = TRUE ;
- };
- */
- FixedLine FL_PRINT
- {
- Pos = MAP_APPFONT ( 6 , 91 ) ;
- Size = MAP_APPFONT ( 117 , 8 ) ;
- Text [ en-US ] = "Print" ;
- };
- RadioButton RBT_ALL_SHEETS
- {
- HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS";
- Pos = MAP_APPFONT ( 12 , 102 ) ;
- Size = MAP_APPFONT ( 105 , 10 ) ;
- Text [ en-US ] = "All sheets" ;
- };
- RadioButton RBT_SELECTED_SHEETS
- {
- HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS";
- Pos = MAP_APPFONT ( 12 , 115 ) ;
- Size = MAP_APPFONT ( 105 , 10 ) ;
- Text [ en-US ] = "Selected sheets" ;
- };
- RadioButton RBT_SELECTED_CELLS
- {
- HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS";
- Pos = MAP_APPFONT ( 12 , 128 ) ;
- Size = MAP_APPFONT ( 105 , 10 ) ;
- Text [ en-US ] = "Selected cells" ;
- };
- FixedLine FL_PRINTRANGE
- {
- Pos = MAP_APPFONT ( 6 , 141 ) ;
- Size = MAP_APPFONT ( 117 , 8 ) ;
- Text [ en-US ] = "Print range" ;
- };
- RadioButton RBT_ALL
- {
- HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL";
- Pos = MAP_APPFONT ( 12 , 152 ) ;
- Size = MAP_APPFONT ( 105 , 10 ) ;
- Text [ en-US ] = "All pages" ;
- };
- RadioButton RBT_PAGES
- {
- HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES";
- Pos = MAP_APPFONT ( 12 , 165 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- Text [ en-US ] = "Pages" ;
- };
- Edit EDT_PAGES
- {
- HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 65 , 164 ) ;
- Size = MAP_APPFONT ( 52 , 12 ) ;
- };
- RadioButton RBT_SELECTION
- {
- HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 179 ) ;
- Size = MAP_APPFONT ( 105 , 10 ) ;
- Text [ en-US ] = "Selection" ;
- };
- FixedLine FL_SEPCOPIESRANGE
- {
- Pos = MAP_APPFONT( 126, 102 );
- Size = MAP_APPFONT( 1, 74 );
- Vert = TRUE;
- };
- FixedLine FL_COPIES
- {
- Pos = MAP_APPFONT ( 129 , 91 ) ;
- Size = MAP_APPFONT ( 130 , 8 ) ;
- Text [ en-US ] = "Copies" ;
- };
- FixedText FT_COPIES
- {
- Pos = MAP_APPFONT ( 135 , 104 ) ;
- Size = MAP_APPFONT ( 63 , 8 ) ;
- Text [ en-US ] = "Number of copies" ;
- };
- NumericField NUM_COPIES
- {
- HelpID = "svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 201 , 102 ) ;
- Size = MAP_APPFONT ( 33 , 12 ) ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 9999 ;
- StrictFormat = TRUE ;
- First = 1 ;
- Last = 9999 ;
- };
- CheckBox CBX_COLLATE
- {
- HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE";
- Pos = MAP_APPFONT ( 201 , 123 ) ;
- Size = MAP_APPFONT ( 60 , 10 ) ;
- Text [ en-US ] = "Co~llate" ;
- };
- FixedImage IMG_COLLATE
- {
- Pos = MAP_APPFONT ( 132 , 117 ) ;
- Size = MAP_APPFONT ( 67 , 22 ) ;
- Hide = TRUE ;
- };
- FixedImage IMG_NOT_COLLATE
- {
- Pos = MAP_APPFONT ( 132 , 117 ) ;
- Size = MAP_APPFONT ( 67 , 22 ) ;
- Hide = TRUE ;
- };
- FixedLine FL_SEPBUTTONLINE
- {
- Pos = MAP_APPFONT( 0, 179 );
- Size = MAP_APPFONT( 265, 8 );
- };
- PushButton BTN_OPTIONS
- {
- HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 , 190 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Options..." ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 100 , 190 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 153 , 190 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 209 , 190 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- String STR_ALLFILTER
- {
- Text [ en-US ] = "<All>";
- };
-};
-
-Image RID_IMG_PRNDLG_COLLATE
-{
- ImageBitmap = Bitmap { File = "collate.bmp" ; };
- MaskColor = IMAGE_MAGENTA_MASK ;
-};
-
-Image RID_IMG_PRNDLG_NOCOLLATE
-{
- ImageBitmap = Bitmap { File = "ncollate.bmp" ; };
- MaskColor = IMAGE_MAGENTA_MASK ;
-};
-
-Image RID_IMG_PRNDLG_COLLATE_HC
-{
- ImageBitmap = Bitmap { File = "collate_h.bmp" ; };
- MaskColor = IMAGE_MAGENTA_MASK ;
-};
-
-Image RID_IMG_PRNDLG_NOCOLLATE_HC
-{
- ImageBitmap = Bitmap { File = "ncollate_h.bmp" ; };
- MaskColor = IMAGE_MAGENTA_MASK ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index ceef2a88642b..12a71a706b60 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -61,7 +61,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter,
// -----------------------------------------------------------------------
-void ImplFreePrnDlgListBox( ListBox* pBox, BOOL bClear )
+void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear )
{
if ( bClear )
pBox->Clear();
@@ -149,7 +149,7 @@ static void ImplPrnDlgAddString( XubString& rStr, const XubString& rAddStr )
// -----------------------------------------------------------------------
-static void ImplPrnDlgAddResString( XubString& rStr, USHORT nResId )
+static void ImplPrnDlgAddResString( XubString& rStr, sal_uInt16 nResId )
{
SvtResId aResId( nResId );
XubString aAddStr( aResId );
@@ -161,7 +161,7 @@ static void ImplPrnDlgAddResString( XubString& rStr, USHORT nResId )
XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
{
XubString aStr;
- ULONG nStatus = rInfo.GetStatus();
+ sal_uLong nStatus = rInfo.GetStatus();
// Default-Printer
if ( rInfo.GetPrinterName().Len() &&
@@ -221,7 +221,7 @@ XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_POWER_SAVE );
// Anzahl Jobs
- ULONG nJobs = rInfo.GetJobs();
+ sal_uLong nJobs = rInfo.GetJobs();
if ( nJobs && (nJobs != QUEUE_JOBS_DONTKNOW) )
{
XubString aJobStr( SvtResId( STR_SVT_PRNDLG_JOBCOUNT ) );
@@ -273,7 +273,7 @@ PrinterSetupDialog::PrinterSetupDialog( Window* pWindow ) :
PrinterSetupDialog::~PrinterSetupDialog()
{
- ImplFreePrnDlgListBox( &maLbName, FALSE );
+ ImplFreePrnDlgListBox( &maLbName, sal_False );
delete mpTempPrinter;
}
@@ -378,7 +378,7 @@ short PrinterSetupDialog::Execute()
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
{
DBG_ERRORFILE( "PrinterSetupDialog::Execute() - No Printer or printer is printing" );
- return FALSE;
+ return sal_False;
}
Printer::updatePrinters();
@@ -391,7 +391,7 @@ short PrinterSetupDialog::Execute()
short nRet = ModalDialog::Execute();
// Wenn Dialog mit OK beendet wurde, dann die Daten updaten
- if ( nRet == TRUE )
+ if ( nRet == sal_True )
{
if ( mpTempPrinter )
mpPrinter->SetPrinterProps( mpTempPrinter );
diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx
index 3b081ce2f520..140d00d39bb1 100644
--- a/svtools/source/dialogs/property.cxx
+++ b/svtools/source/dialogs/property.cxx
@@ -108,7 +108,7 @@ void SvXPropertyEdit::SetCtrSize(const Size& rSize)
aEdit.SetSizePixel(aSize);
}
-void SvXPropertyEdit::SetLocked(BOOL bLocked)
+void SvXPropertyEdit::SetLocked(sal_Bool bLocked)
{
if(bLocked)
Disable();
@@ -126,9 +126,9 @@ String SvXPropertyEdit::GetProperty() const
return aEdit.GetText();
}
-BOOL SvXPropertyEdit::HasList()
+sal_Bool SvXPropertyEdit::HasList()
{
- return FALSE;
+ return sal_False;
};
@@ -136,7 +136,7 @@ void SvXPropertyEdit::ClearList()
{
return;
}
-void SvXPropertyEdit::InsertEntry( const String&,USHORT )
+void SvXPropertyEdit::InsertEntry( const String&,sal_uInt16 )
{
return;
}
@@ -236,7 +236,7 @@ void SvXPropertyListBox::SetCtrSize(const Size& rSize)
aListBox.SetSizePixel(aSize);
}
-void SvXPropertyListBox::SetLocked(BOOL bLocked)
+void SvXPropertyListBox::SetLocked(sal_Bool bLocked)
{
if(bLocked)
Disable();
@@ -254,9 +254,9 @@ String SvXPropertyListBox::GetProperty()const
return aListBox.GetSelectEntry();
}
-BOOL SvXPropertyListBox::HasList()
+sal_Bool SvXPropertyListBox::HasList()
{
- return TRUE;
+ return sal_True;
}
@@ -265,7 +265,7 @@ void SvXPropertyListBox::ClearList()
aListBox.Clear();
}
-void SvXPropertyListBox::InsertEntry( const String& rString,USHORT nPos)
+void SvXPropertyListBox::InsertEntry( const String& rString,sal_uInt16 nPos)
{
aListBox.InsertEntry(rString,nPos);
}
@@ -345,7 +345,7 @@ SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, const ResId& rResId)
aComboBox.Show();
}
-void SvXPropertyComboBox::SetLocked(BOOL bLocked)
+void SvXPropertyComboBox::SetLocked(sal_Bool bLocked)
{
if(bLocked)
Disable();
@@ -384,9 +384,9 @@ String SvXPropertyComboBox::GetProperty() const
return aComboBox.GetText();
}
-BOOL SvXPropertyComboBox::HasList()
+sal_Bool SvXPropertyComboBox::HasList()
{
- return TRUE;
+ return sal_True;
}
void SvXPropertyComboBox::ClearList()
@@ -394,7 +394,7 @@ void SvXPropertyComboBox::ClearList()
aComboBox.Clear();
}
-void SvXPropertyComboBox::InsertEntry( const String& rString,USHORT nPos)
+void SvXPropertyComboBox::InsertEntry( const String& rString,sal_uInt16 nPos)
{
aComboBox.InsertEntry(rString,nPos);
}
@@ -446,11 +446,11 @@ SvPropertyLine::SvPropertyLine( Window* pParent,WinBits nWinStyle)
aName(this,WB_BORDER),
pSvXPropertyControl(NULL),
aXButton(this,WB_BORDER),
- bIsLocked(FALSE),
- bIsHyperlink(FALSE)
+ bIsLocked(sal_False),
+ bIsHyperlink(sal_False)
{
- bNeedsRepaint = TRUE;
- bHasXButton = FALSE;
+ bNeedsRepaint = sal_True;
+ bHasXButton = sal_False;
aXButton.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "..." ) ) );
aName.Show();
aXButton.Show();
@@ -465,11 +465,11 @@ SvPropertyLine::SvPropertyLine( Window* pParent,const ResId& rResId )
aName (this,WB_BORDER),
pSvXPropertyControl(NULL),
aXButton (this,WB_BORDER),
- bIsLocked(FALSE),
- bIsHyperlink(FALSE)
+ bIsLocked(sal_False),
+ bIsHyperlink(sal_False)
{
- bNeedsRepaint = TRUE;
- bHasXButton = FALSE;
+ bNeedsRepaint = sal_True;
+ bHasXButton = sal_False;
eKindOfCtr = KOC_UNDEFINED;
aXButton.SetText( XubString( RTL_CONSTASCII_USTRINGPARAM( "..." ) ) );
aName.Show();
@@ -504,11 +504,11 @@ void SvPropertyLine::Resize()
aName.SetPosPixel(aPos);
aName.SetSizePixel(aSize);
- USHORT nXButtonWidth=0;
+ sal_uInt16 nXButtonWidth=0;
if(bHasXButton)
{
- nXButtonWidth=(USHORT)aSize.Height();
+ nXButtonWidth=(sal_uInt16)aSize.Height();
}
a2Size.Width()=a2Size.Width()-nXButtonWidth;
@@ -530,12 +530,12 @@ void SvPropertyLine::Resize()
}
}
-void SvPropertyLine::SetNeedsRepaint(BOOL bFlag)
+void SvPropertyLine::SetNeedsRepaint(sal_Bool bFlag)
{
bNeedsRepaint=bFlag;
}
-BOOL SvPropertyLine::NeedsRepaint()
+sal_Bool SvPropertyLine::NeedsRepaint()
{
return bNeedsRepaint;
}
@@ -563,22 +563,22 @@ eKindOfControl SvPropertyLine::GetKindOfControl()
void SvPropertyLine::ShowXButton()
{
- bHasXButton=TRUE;
+ bHasXButton=sal_True;
aXButton.Show();
Resize();
}
void SvPropertyLine::HideXButton()
{
- bHasXButton=FALSE;
+ bHasXButton=sal_False;
aXButton.Hide();
Resize();
}
-BOOL SvPropertyLine::IsVisibleXButton()
+sal_Bool SvPropertyLine::IsVisibleXButton()
{
return bHasXButton;
}
-void SvPropertyLine::ShowAsHyperLink(BOOL nFlag)
+void SvPropertyLine::ShowAsHyperLink(sal_Bool nFlag)
{
bIsHyperlink=nFlag;
if(nFlag)
@@ -595,24 +595,24 @@ void SvPropertyLine::ShowAsHyperLink(BOOL nFlag)
}
}
-BOOL SvPropertyLine::IsShownAsHyperlink()
+sal_Bool SvPropertyLine::IsShownAsHyperlink()
{
return bIsHyperlink;
}
-void SvPropertyLine::Locked(BOOL nFlag)
+void SvPropertyLine::Locked(sal_Bool nFlag)
{
bIsLocked=nFlag;
if(pSvXPropertyControl!=NULL)
pSvXPropertyControl->SetLocked(nFlag);
}
-BOOL SvPropertyLine::IsLineLocked()
+sal_Bool SvPropertyLine::IsLineLocked()
{
return bIsLocked;
}
-void SvPropertyLine::SetNameWidth(USHORT nWidth)
+void SvPropertyLine::SetNameWidth(sal_uInt16 nWidth)
{
nNameWidth=nWidth;
Resize();
@@ -687,7 +687,7 @@ SvListBoxForProperties::SvListBoxForProperties( Window* pParent, WinBits nWinSty
nTheNameSize=0;
ListBox aListBox(this,WB_DROPDOWN);
aListBox.SetPosSizePixel(Point(0,0),Size(100,100));
- nRowHeight=(USHORT)aListBox.GetSizePixel().Height();
+ nRowHeight=(sal_uInt16)aListBox.GetSizePixel().Height();
Wallpaper aWall = aPlayGround.GetBackground();
aWall.SetColor( Color( COL_TRANSPARENT ) );
aPlayGround.SetBackground( aWall );
@@ -709,7 +709,7 @@ SvListBoxForProperties::SvListBoxForProperties( Window* pParent, const ResId& rR
nYOffset=0;
ListBox aListBox(this,WB_DROPDOWN);
aListBox.SetPosSizePixel(Point(0,0),Size(100,100));
- nRowHeight=(USHORT)aListBox.GetSizePixel().Height();
+ nRowHeight=(sal_uInt16)aListBox.GetSizePixel().Height();
Wallpaper aWall = aPlayGround.GetBackground();
aWall.SetColor( Color( COL_TRANSPARENT ) );
aPlayGround.SetBackground( aWall );
@@ -727,7 +727,7 @@ SvListBoxForProperties::~SvListBoxForProperties()
void SvListBoxForProperties::Clear()
{
- for(USHORT i=0;i<PLineArray.Count();i++)
+ for(sal_uInt16 i=0;i<PLineArray.Count();i++)
{
SvPropertyLine* pPropLine=PLineArray[i];
@@ -773,19 +773,19 @@ void SvListBoxForProperties::SetController( SvPropertyDataControl *pPDC)
pPropDataControl=pPDC;
}
-USHORT SvListBoxForProperties::CalcVisibleLines()
+sal_uInt16 SvListBoxForProperties::CalcVisibleLines()
{
Size aSize=aPlayGround.GetOutputSizePixel();
- USHORT nResult=0;
+ sal_uInt16 nResult=0;
if(nRowHeight!=0)
- nResult=(USHORT) aSize.Height()/nRowHeight;
+ nResult=(sal_uInt16) aSize.Height()/nRowHeight;
return nResult;
}
void SvListBoxForProperties::UpdateVScroll()
{
- USHORT nLines=CalcVisibleLines();
+ sal_uInt16 nLines=CalcVisibleLines();
aVScroll.SetPageSize(nLines-1);
aVScroll.SetVisibleSize(nLines-1);
aVScroll.SetRange(Range(0,PLineArray.Count()-1));
@@ -795,7 +795,7 @@ void SvListBoxForProperties::UpdateVScroll()
}
else
{
- BOOL bFlag=aVScroll.IsVisible();
+ sal_Bool bFlag=aVScroll.IsVisible();
aVScroll.Show();
if(!bFlag)Resize();
}
@@ -807,7 +807,7 @@ void SvListBoxForProperties::UpdatePosNSize()
{
Point aPos(0,nYOffset);
- for(USHORT i=0; i<PLineArray.Count();i++)
+ for(sal_uInt16 i=0; i<PLineArray.Count();i++)
{
if((PLineArray[i])->NeedsRepaint())
{
@@ -819,7 +819,7 @@ void SvListBoxForProperties::UpdatePosNSize()
(PLineArray[i])->Invalidate();
(PLineArray[i])->Update();
(PLineArray[i])->Show();
- (PLineArray[i])->SetNeedsRepaint(FALSE);
+ (PLineArray[i])->SetNeedsRepaint(sal_False);
}
else
{
@@ -846,21 +846,21 @@ void SvListBoxForProperties::UpdatePlayGround()
long nLines=aVScroll.GetPageSize();
long nDelta=aVScroll.GetDelta();
- USHORT nStart,nEnd;
+ sal_uInt16 nStart,nEnd;
Size aSize=aPlayGround.GetOutputSizePixel();
Point aPEnd;
aPEnd.X()=aSize.Width();
if(nDelta>0)
{
- nStart=(USHORT)(nThumbPos+nLines+1-nDelta);
- nEnd=(USHORT)(nThumbPos+nLines);
+ nStart=(sal_uInt16)(nThumbPos+nLines+1-nDelta);
+ nEnd=(sal_uInt16)(nThumbPos+nLines);
aPos.Y()=(nLines+1-nDelta)*nRowHeight;
}
else
{
- nStart=(USHORT)nThumbPos;
- nEnd=(USHORT)(nThumbPos-nDelta);
+ nStart=(sal_uInt16)nThumbPos;
+ nEnd=(sal_uInt16)(nThumbPos-nDelta);
aPEnd.Y()=(nThumbPos-nDelta)*nRowHeight;;
}
@@ -870,7 +870,7 @@ void SvListBoxForProperties::UpdatePlayGround()
aPlayGround.Scroll(0,nDelta,SCROLL_CHILDREN);
- for(USHORT i=nStart; i<=nEnd;i++)
+ for(sal_uInt16 i=nStart; i<=nEnd;i++)
{
(PLineArray[i])->SetPosSizePixel(aPos,aSize);
(PLineArray[i])->SetNameWidth(nTheNameSize+2*FRAME_OFFSET);
@@ -889,18 +889,18 @@ void SvListBoxForProperties::UpdateAll()
void SvListBoxForProperties::DisableUpdate()
{
- bUpdate=FALSE;
+ bUpdate=sal_False;
}
void SvListBoxForProperties::EnableUpdate()
{
- bUpdate=TRUE;
+ bUpdate=sal_True;
UpdateAll();
}
void SvListBoxForProperties::SetPropertyValue( const String & rEntryName, const String & rValue )
{
- USHORT i, iEnd = PLineArray.Count();
+ sal_uInt16 i, iEnd = PLineArray.Count();
for( i = 0 ; i < iEnd ; i++ )
{
SvPropertyLine* pPropLine = PLineArray[ i ];
@@ -912,14 +912,14 @@ void SvListBoxForProperties::SetPropertyValue( const String & rEntryName, const
}
}
-USHORT SvListBoxForProperties::AppendEntry( const SvPropertyData& aPropData)
+sal_uInt16 SvListBoxForProperties::AppendEntry( const SvPropertyData& aPropData)
{
return InsertEntry(aPropData);
}
-USHORT SvListBoxForProperties::InsertEntry( const SvPropertyData& aPropData, USHORT nPos)
+sal_uInt16 SvListBoxForProperties::InsertEntry( const SvPropertyData& aPropData, sal_uInt16 nPos)
{
- USHORT nInsPos=nPos;
+ sal_uInt16 nInsPos=nPos;
SvPropertyLine* pPropLine=new SvPropertyLine(&aPlayGround,WB_TABSTOP | WB_DIALOGCONTROL);
if(nPos==LISTBOX_APPEND)
@@ -938,7 +938,7 @@ USHORT SvListBoxForProperties::InsertEntry( const SvPropertyData& aPropData, USH
return nInsPos;
}
-void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHORT nPos)
+void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, sal_uInt16 nPos)
{
if(nPos<PLineArray.Count())
{
@@ -993,7 +993,7 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR
if(pSvXPCtr->HasList())
{
- for(USHORT i=0;i<aPropData.theValues.Count();i++)
+ for(sal_uInt16 i=0;i<aPropData.theValues.Count();i++)
{
pSvXPCtr->InsertEntry(*(aPropData.theValues[i]));
}
@@ -1002,7 +1002,7 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR
pPropLine->SetName(aPropData.aName);
- USHORT nTextWidth=(USHORT)aPlayGround.GetTextWidth(aPropData.aName);
+ sal_uInt16 nTextWidth=(sal_uInt16)aPlayGround.GetTextWidth(aPropData.aName);
if ( nTheNameSize < nTextWidth )
nTheNameSize = nTextWidth;
@@ -1022,21 +1022,21 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR
}
}
-USHORT SvListBoxForProperties::GetFirstVisibleEntry()
+sal_uInt16 SvListBoxForProperties::GetFirstVisibleEntry()
{
return 0;
}
-void SvListBoxForProperties::SetFirstVisibleEntry(USHORT)
+void SvListBoxForProperties::SetFirstVisibleEntry(sal_uInt16)
{
return;
}
-void SvListBoxForProperties::SetSelectedEntry(USHORT)
+void SvListBoxForProperties::SetSelectedEntry(sal_uInt16)
{
return;
}
-USHORT SvListBoxForProperties::GetSelectedEntry()
+sal_uInt16 SvListBoxForProperties::GetSelectedEntry()
{
return 0;
}
@@ -1047,7 +1047,7 @@ IMPL_LINK( SvListBoxForProperties, ScrollHdl, ScrollBar*, pSB )
{
long nDelta=aVScroll.GetDelta();
nYOffset=-aVScroll.GetThumbPos()*nRowHeight;
- //aPlayGround.SetUpdateMode(FALSE);
+ //aPlayGround.SetUpdateMode(sal_False);
long nThumbPos=aVScroll.GetThumbPos();
long nLines=aVScroll.GetPageSize();
@@ -1058,14 +1058,14 @@ IMPL_LINK( SvListBoxForProperties, ScrollHdl, ScrollBar*, pSB )
{
if(i>=nThumbPos && i<=nThumbPos+nLines)
{
- (PLineArray[sal::static_int_cast< USHORT >(i)])->
- SetNeedsRepaint(TRUE);
+ (PLineArray[sal::static_int_cast< sal_uInt16 >(i)])->
+ SetNeedsRepaint(sal_True);
}
else
{
- (PLineArray[sal::static_int_cast< USHORT >(i)])->Hide();
- (PLineArray[sal::static_int_cast< USHORT >(i)])->
- SetNeedsRepaint(FALSE);
+ (PLineArray[sal::static_int_cast< sal_uInt16 >(i)])->Hide();
+ (PLineArray[sal::static_int_cast< sal_uInt16 >(i)])->
+ SetNeedsRepaint(sal_False);
}
}
}
@@ -1186,9 +1186,9 @@ SvPropertyBox::~SvPropertyBox()
void SvPropertyBox::ClearAll()
{
- USHORT nCount=aTabControl.GetPageCount();
+ sal_uInt16 nCount=aTabControl.GetPageCount();
- for(USHORT i=nCount;i>=1;i--)
+ for(sal_uInt16 i=nCount;i>=1;i--)
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(i);
@@ -1207,10 +1207,10 @@ void SvPropertyBox::Resize()
aTabControl.SetPosSizePixel(aPos,aSize);
- USHORT nCount=aTabControl.GetPageCount();
+ sal_uInt16 nCount=aTabControl.GetPageCount();
aSize=aTabControl.GetTabPageSizePixel();
- for(USHORT i=1;i<=nCount;i++)
+ for(sal_uInt16 i=1;i<=nCount;i++)
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(i);
@@ -1220,9 +1220,9 @@ void SvPropertyBox::Resize()
}
-USHORT SvPropertyBox::AppendPage( const String & rText )
+sal_uInt16 SvPropertyBox::AppendPage( const String & rText )
{
- USHORT nId=aTabControl.GetPageCount()+1;
+ sal_uInt16 nId=aTabControl.GetPageCount()+1;
aTabControl.InsertPage( nId,rText);
SvTabPageForProperties* pPage=new SvTabPageForProperties(&aTabControl);
pPage->SetSizePixel(aTabControl.GetTabPageSizePixel());
@@ -1232,17 +1232,17 @@ USHORT SvPropertyBox::AppendPage( const String & rText )
return nId;
}
-void SvPropertyBox::SetPage( USHORT nId)
+void SvPropertyBox::SetPage( sal_uInt16 nId)
{
aTabControl.SetCurPageId(nId);
}
-USHORT SvPropertyBox::GetCurPage()
+sal_uInt16 SvPropertyBox::GetCurPage()
{
return aTabControl.GetCurPageId();
}
-USHORT SvPropertyBox::CalcVisibleLines()
+sal_uInt16 SvPropertyBox::CalcVisibleLines()
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(aTabControl.GetCurPageId());
@@ -1265,9 +1265,9 @@ void SvPropertyBox::DisableUpdate()
void SvPropertyBox::SetController(SvPropertyDataControl *pDataCtr)
{
pThePropDataCtr=pDataCtr;
- USHORT nCount=aTabControl.GetPageCount();
+ sal_uInt16 nCount=aTabControl.GetPageCount();
- for(USHORT i=1;i<=nCount;i++)
+ for(sal_uInt16 i=1;i<=nCount;i++)
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(i);
@@ -1277,21 +1277,21 @@ void SvPropertyBox::SetController(SvPropertyDataControl *pDataCtr)
}
-USHORT SvPropertyBox::InsertEntry( const SvPropertyData& rData, USHORT nPos)
+sal_uInt16 SvPropertyBox::InsertEntry( const SvPropertyData& rData, sal_uInt16 nPos)
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(aTabControl.GetCurPageId());
return pPage->GetTheListBox()->InsertEntry(rData,nPos);
}
-void SvPropertyBox::ChangeEntry( const SvPropertyData& rData, USHORT nPos)
+void SvPropertyBox::ChangeEntry( const SvPropertyData& rData, sal_uInt16 nPos)
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(aTabControl.GetCurPageId());
pPage->GetTheListBox()->ChangeEntry(rData,nPos);
}
-USHORT SvPropertyBox::AppendEntry( const SvPropertyData& rData)
+sal_uInt16 SvPropertyBox::AppendEntry( const SvPropertyData& rData)
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(aTabControl.GetCurPageId());
@@ -1305,26 +1305,26 @@ void SvPropertyBox::SetPropertyValue( const String & rEntryName, const String &
pPage->GetTheListBox()->SetPropertyValue( rEntryName, rValue );
}
-void SvPropertyBox::SetFirstVisibleEntry(USHORT nPos)
+void SvPropertyBox::SetFirstVisibleEntry(sal_uInt16 nPos)
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(aTabControl.GetCurPageId());
pPage->GetTheListBox()->SetFirstVisibleEntry(nPos);
}
-USHORT SvPropertyBox::GetFirstVisibleEntry()
+sal_uInt16 SvPropertyBox::GetFirstVisibleEntry()
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(aTabControl.GetCurPageId());
return pPage->GetTheListBox()->GetFirstVisibleEntry();
}
-void SvPropertyBox::SetSelectedEntry(USHORT nPos)
+void SvPropertyBox::SetSelectedEntry(sal_uInt16 nPos)
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(aTabControl.GetCurPageId());
pPage->GetTheListBox()->SetSelectedEntry(nPos);
}
-USHORT SvPropertyBox::GetSelectedEntry()
+sal_uInt16 SvPropertyBox::GetSelectedEntry()
{
SvTabPageForProperties* pPage=(SvTabPageForProperties*)
aTabControl.GetTabPage(aTabControl.GetCurPageId());
@@ -1411,7 +1411,7 @@ void SvBasicPropertyDataControl::SetTheCorrectProperty(const String& aString)
aCorrectProperty=aString;
}
-void SvBasicPropertyDataControl::SetIsCorrect(BOOL nFlag)
+void SvBasicPropertyDataControl::SetIsCorrect(sal_Bool nFlag)
{
bCorrectness=nFlag;
}
@@ -1451,15 +1451,15 @@ ScPropertyDlg::ScPropertyDlg( Window* pParent) :
aPropListBox.SetController(&aBaProDatCtr);
- USHORT nPageId=aPropListBox.AppendPage("YabbaDabbaDo");
+ sal_uInt16 nPageId=aPropListBox.AppendPage("YabbaDabbaDo");
aPropListBox.SetPage(nPageId);
aProperty.eKind=KOC_EDIT;
aProperty.aName=aString;
- aProperty.aName+=String((USHORT)++nCount);
+ aProperty.aName+=String((sal_uInt16)++nCount);
aProperty.aValue=sizeof ComboBox;
- aProperty.bHasVisibleXButton=FALSE;
- aProperty.bIsHyperLink=FALSE;
- aProperty.bIsLocked=FALSE;
+ aProperty.bHasVisibleXButton=sal_False;
+ aProperty.bIsHyperLink=sal_False;
+ aProperty.bIsLocked=sal_False;
aProperty.pDataPtr=NULL;
aProperty.pControl=NULL;
aProperty.theValues.Insert(new String("1"),aProperty.theValues.Count());
@@ -1467,16 +1467,16 @@ ScPropertyDlg::ScPropertyDlg( Window* pParent) :
aProperty.theValues.Insert(new String("3"),aProperty.theValues.Count());
aProperty.theValues.Insert(new String("4"),aProperty.theValues.Count());
aPropListBox.InsertEntry(aProperty);
- aProperty.bHasVisibleXButton=TRUE;
+ aProperty.bHasVisibleXButton=sal_True;
aProperty.aName=aString;
- aProperty.aName+=String((USHORT)++nCount);
+ aProperty.aName+=String((sal_uInt16)++nCount);
aProperty.aValue="42";
aProperty.eKind=KOC_LISTBOX;
aPropListBox.InsertEntry(aProperty);
aProperty.aName=aString;
- aProperty.aName+=String((USHORT)++nCount);
+ aProperty.aName+=String((sal_uInt16)++nCount);
aProperty.eKind=KOC_COMBOBOX;
- aProperty.bHasVisibleXButton=FALSE;
+ aProperty.bHasVisibleXButton=sal_False;
aPropListBox.InsertEntry(aProperty);
}
@@ -1494,19 +1494,19 @@ IMPL_LINK( ScPropertyDlg, ModifiedHdl, ListBox*, pLB )
{
String aString("Don't know ");
aProperty.aName=aString;
- aProperty.aName+=String((USHORT)++nCount);
+ aProperty.aName+=String((sal_uInt16)++nCount);
if(nCount>20)
{
String aStr("Yabba ");
aStr+=aPropListBox.GetCurPage();
- USHORT nPageId=aPropListBox.AppendPage(aStr);
+ sal_uInt16 nPageId=aPropListBox.AppendPage(aStr);
aPropListBox.SetPage(nPageId);
nCount=0;
}
aProperty.eKind=(eKindOfControl)(aKindOfListBox.GetSelectEntryPos()+1);
- aProperty.bHasVisibleXButton=FALSE;
- if((nCount % 5)==0) aProperty.bHasVisibleXButton=TRUE;
+ aProperty.bHasVisibleXButton=sal_False;
+ if((nCount % 5)==0) aProperty.bHasVisibleXButton=sal_True;
aPropListBox.InsertEntry(aProperty);
}
return 0;
@@ -1518,7 +1518,7 @@ IMPL_LINK( ScPropertyDlg, RowModifiedHdl, SvBasicPropertyDataControl* ,pProCtr)
{
aModAnswer.SetText(aBaProDatCtr.GetProperty());
aModAnswer.Invalidate();
- aBaProDatCtr.SetIsCorrect(TRUE);
+ aBaProDatCtr.SetIsCorrect(sal_True);
}
return 0;
}
@@ -1529,7 +1529,7 @@ IMPL_LINK( ScPropertyDlg, CommitHdl, SvBasicPropertyDataControl*,pProCtr)
{
aCommitAnswer.SetText(aBaProDatCtr.GetProperty());
aCommitAnswer.Invalidate();
- aBaProDatCtr.SetIsCorrect(TRUE);
+ aBaProDatCtr.SetIsCorrect(sal_True);
}
return 0;
}
@@ -1540,7 +1540,7 @@ IMPL_LINK( ScPropertyDlg, ClickHdl, SvBasicPropertyDataControl*,pProCtr)
{
aClickAnswer.SetText(aBaProDatCtr.GetName());
aClickAnswer.Invalidate();
- aBaProDatCtr.SetIsCorrect(TRUE);
+ aBaProDatCtr.SetIsCorrect(sal_True);
}
return 0;
}
@@ -1551,7 +1551,7 @@ IMPL_LINK( ScPropertyDlg, SelectHdl, SvBasicPropertyDataControl*,pProCtr)
{
aSelectAnswer.SetText(aBaProDatCtr.GetName());
aSelectAnswer.Invalidate();
- aBaProDatCtr.SetIsCorrect(TRUE);
+ aBaProDatCtr.SetIsCorrect(sal_True);
}
return 0;
}
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index f06b4f53ce7c..8787e39b1284 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -203,7 +203,7 @@ void WizardDialog::ImplPosCtrls()
long nViewWidth = 0;
long nViewHeight = 0;
long nDlgHeight = nOffY;
- USHORT nViewPosFlags = WINDOW_POSSIZE_POS;
+ sal_uInt16 nViewPosFlags = WINDOW_POSSIZE_POS;
if ( meViewAlign == WINDOWALIGN_TOP )
{
nViewOffX = WIZARDDIALOG_VIEW_DLGOFFSET_X;
@@ -338,9 +338,9 @@ void WizardDialog::ImplShowTabPage( TabPage* pTabPage )
// -----------------------------------------------------------------------
-TabPage* WizardDialog::ImplGetPage( USHORT nLevel ) const
+TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel ) const
{
- USHORT nTempLevel = 0;
+ sal_uInt16 nTempLevel = 0;
ImplWizPageData* pPageData = mpFirstPage;
while ( pPageData )
{
@@ -447,7 +447,7 @@ long WizardDialog::Notify( NotifyEvent& rNEvt )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
KeyCode aKeyCode = pKEvt->GetKeyCode();
- USHORT nKeyCode = aKeyCode.GetCode();
+ sal_uInt16 nKeyCode = aKeyCode.GetCode();
if ( aKeyCode.IsMod1() )
{
@@ -458,11 +458,11 @@ long WizardDialog::Notify( NotifyEvent& rNEvt )
if ( mpPrevBtn->IsVisible() &&
mpPrevBtn->IsEnabled() && mpPrevBtn->IsInputEnabled() )
{
- mpPrevBtn->SetPressed( TRUE );
- mpPrevBtn->SetPressed( FALSE );
+ mpPrevBtn->SetPressed( sal_True );
+ mpPrevBtn->SetPressed( sal_False );
mpPrevBtn->Click();
}
- return TRUE;
+ return sal_True;
}
}
else
@@ -472,11 +472,11 @@ long WizardDialog::Notify( NotifyEvent& rNEvt )
if ( mpNextBtn->IsVisible() &&
mpNextBtn->IsEnabled() && mpNextBtn->IsInputEnabled() )
{
- mpNextBtn->SetPressed( TRUE );
- mpNextBtn->SetPressed( FALSE );
+ mpNextBtn->SetPressed( sal_True );
+ mpNextBtn->SetPressed( sal_False );
mpNextBtn->Click();
}
- return TRUE;
+ return sal_True;
}
}
}
@@ -499,43 +499,43 @@ long WizardDialog::DeactivatePage()
if ( maDeactivateHdl.IsSet() )
return maDeactivateHdl.Call( this );
else
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
-BOOL WizardDialog::ShowNextPage()
+sal_Bool WizardDialog::ShowNextPage()
{
return ShowPage( mnCurLevel+1 );
}
// -----------------------------------------------------------------------
-BOOL WizardDialog::ShowPrevPage()
+sal_Bool WizardDialog::ShowPrevPage()
{
if ( !mnCurLevel )
- return FALSE;
+ return sal_False;
return ShowPage( mnCurLevel-1 );
}
// -----------------------------------------------------------------------
-BOOL WizardDialog::ShowPage( USHORT nLevel )
+sal_Bool WizardDialog::ShowPage( sal_uInt16 nLevel )
{
if ( DeactivatePage() )
{
mnCurLevel = nLevel;
ActivatePage();
ImplShowTabPage( ImplGetPage( mnCurLevel ) );
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
// -----------------------------------------------------------------------
-BOOL WizardDialog::Finnish( long nResult )
+sal_Bool WizardDialog::Finnish( long nResult )
{
if ( DeactivatePage() )
{
@@ -546,10 +546,10 @@ BOOL WizardDialog::Finnish( long nResult )
EndDialog( nResult );
else if ( GetStyle() & WB_CLOSEABLE )
Close();
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
// -----------------------------------------------------------------------
@@ -600,9 +600,9 @@ void WizardDialog::RemovePage( TabPage* pPage )
// -----------------------------------------------------------------------
-void WizardDialog::SetPage( USHORT nLevel, TabPage* pPage )
+void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage )
{
- USHORT nTempLevel = 0;
+ sal_uInt16 nTempLevel = 0;
ImplWizPageData* pPageData = mpFirstPage;
while ( pPageData )
{
@@ -623,9 +623,9 @@ void WizardDialog::SetPage( USHORT nLevel, TabPage* pPage )
// -----------------------------------------------------------------------
-TabPage* WizardDialog::GetPage( USHORT nLevel ) const
+TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const
{
- USHORT nTempLevel = 0;
+ sal_uInt16 nTempLevel = 0;
ImplWizPageData* pPageData = mpFirstPage;
while ( pPageData )
{
@@ -686,7 +686,7 @@ void WizardDialog::RemoveButton( Button* pButton )
// -----------------------------------------------------------------------
-void WizardDialog::ShowButtonFixedLine( BOOL bVisible )
+void WizardDialog::ShowButtonFixedLine( sal_Bool bVisible )
{
if ( !mpFixedLine )
{
@@ -701,7 +701,7 @@ void WizardDialog::ShowButtonFixedLine( BOOL bVisible )
// -----------------------------------------------------------------------
-BOOL WizardDialog::IsButtonFixedLineVisible()
+sal_Bool WizardDialog::IsButtonFixedLineVisible()
{
return (mpFixedLine && mpFixedLine->IsVisible());
}
generated by cgit (git 2.34.1) at 2025-01-31 01:22:05 +0000