diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
| commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
| tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/dlg/morphdlg.cxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/dlg/morphdlg.cxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/dlg/morphdlg.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 1e3a1c8c9205..bf618ce7671a 100644..100755 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -98,8 +98,8 @@ void MorphDlg::LoadSettings() SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), SD_OPTION_LOAD ) ); - UINT16 nSteps; - BOOL bOrient, bAttrib; + sal_uInt16 nSteps; + sal_Bool bOrient, bAttrib; if( xIStm.Is() ) { @@ -110,7 +110,7 @@ void MorphDlg::LoadSettings() else { nSteps = 16; - bOrient = bAttrib = TRUE; + bOrient = bAttrib = sal_True; } aMtfSteps.SetValue( nSteps ); @@ -130,7 +130,7 @@ void MorphDlg::SaveSettings() const { SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 ); - *xOStm << (UINT16) aMtfSteps.GetValue() + *xOStm << (sal_uInt16) aMtfSteps.GetValue() << aCbxOrientation.IsChecked() << aCbxAttributes.IsChecked(); } |