diff options
Diffstat (limited to 'sd/source/ui/dlg/morphdlg.cxx')
| -rw-r--r-- | sd/source/ui/dlg/morphdlg.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 78b52dcfe915..0b4510b0a3ee 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -54,11 +54,11 @@ namespace sd { /******************************************************************************/ -#define FADE_STEP "FadeSteps" -#define FADE_ATTRIB "FadeAttributes" -#define FADE_ORIENT "FadeOrientation" -#define FADE_TRUE "true" -#define FADE_FALSE "false" +#define FADE_STEP "FadeSteps" +#define FADE_ATTRIB "FadeAttributes" +#define FADE_ORIENT "FadeOrientation" +#define FADE_TRUE "true" +#define FADE_FALSE "false" /******************************************************************************/ @@ -84,17 +84,17 @@ MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* FreeResource(); LoadSettings(); - SfxItemPool* pPool = (SfxItemPool*) pObj1->GetObjectItemPool(); - SfxItemSet aSet1( *pPool ); - SfxItemSet aSet2( *pPool ); + SfxItemPool* pPool = (SfxItemPool*) pObj1->GetObjectItemPool(); + SfxItemSet aSet1( *pPool ); + SfxItemSet aSet2( *pPool ); aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); - const XLineStyle eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue(); - const XLineStyle eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue(); - const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); - const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XLineStyle eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue(); + const XLineStyle eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue(); + const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); if ( ( ( eLineStyle1 == XLINE_NONE ) || ( eLineStyle2 == XLINE_NONE ) ) && ( ( eFillStyle1 != XFILL_SOLID ) || ( eFillStyle2 != XFILL_SOLID ) ) ) @@ -123,11 +123,11 @@ MorphDlg::~MorphDlg() void MorphDlg::LoadSettings() { - SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), + SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( + RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), SD_OPTION_LOAD ) ); - UINT16 nSteps; - BOOL bOrient, bAttrib; + UINT16 nSteps; + BOOL bOrient, bAttrib; if( xIStm.Is() ) { @@ -150,8 +150,8 @@ void MorphDlg::LoadSettings() void MorphDlg::SaveSettings() const { - SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), + SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( + RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), SD_OPTION_STORE ) ); if( xOStm.Is() ) |