diff options
Diffstat (limited to 'sd/source/ui/app')
31 files changed, 293 insertions, 293 deletions
diff --git a/sd/source/ui/app/_app.hrc b/sd/source/ui/app/_app.hrc index 3bbaaf9f4557..7b3eaa023175 100644 --- a/sd/source/ui/app/_app.hrc +++ b/sd/source/ui/app/_app.hrc @@ -1,7 +1,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 diff --git a/sd/source/ui/app/accel_tmpl.src b/sd/source/ui/app/accel_tmpl.src index 467c5e2ae466..5afada2dd5fc 100644 --- a/sd/source/ui/app/accel_tmpl.src +++ b/sd/source/ui/app/accel_tmpl.src @@ -1,7 +1,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 @@ -57,7 +57,7 @@ Accelerator SD_ACCELERATOR AI_COPYOBJECTS AI_LEAVE_GROUP AI_ATTR_TRANSFORM - // AI_NAVIGATOR + // AI_NAVIGATOR AI_SD_NAVIGATOR AI_SPELLING AI_THESAURUS diff --git a/sd/source/ui/app/accelids_tmpl.src b/sd/source/ui/app/accelids_tmpl.src index 0a3c33c0bb38..a96008c1d862 100644 --- a/sd/source/ui/app/accelids_tmpl.src +++ b/sd/source/ui/app/accelids_tmpl.src @@ -1,7 +1,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 diff --git a/sd/source/ui/app/app.src b/sd/source/ui/app/app.src index 94945be2c3ce..4433082781a7 100644 --- a/sd/source/ui/app/app.src +++ b/sd/source/ui/app/app.src @@ -1,7 +1,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 diff --git a/sd/source/ui/app/menu_tmpl.src b/sd/source/ui/app/menu_tmpl.src index d4c6e2774024..24b7df31bd28 100644 --- a/sd/source/ui/app/menu_tmpl.src +++ b/sd/source/ui/app/menu_tmpl.src @@ -1,7 +1,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 @@ -31,7 +31,7 @@ #include "menuids2.src" #endif -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET +#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET /*The application menu bar resource has become obsolete. You can now find the menu bar definition at: diff --git a/sd/source/ui/app/menuids2_tmpl.src b/sd/source/ui/app/menuids2_tmpl.src index 21d906bfedf0..0913a74cb585 100755 --- a/sd/source/ui/app/menuids2_tmpl.src +++ b/sd/source/ui/app/menuids2_tmpl.src @@ -1,7 +1,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 @@ -28,23 +28,23 @@ #ifndef _MENUIDS2_SRC #define _MENUIDS2_SRC -#define MI(x) MenuItem { x }; +#define MI(x) MenuItem { x }; #define SEPARATOR MenuItem { Separator = TRUE; }; // SubMenu-IDs -#define MN_SUB_VIEW 91 -#define MN_SUB_TOOLBAR 92 -#define MN_SUB_GRAPHIC 93 -#define MN_SUB_SPELLING 94 -#define MN_SUB_TEMPLATES 95 -#define MN_SUB_POSITION 96 -#define MN_SUB_MASTERPAGE 97 -#define MN_SUB_SEND 98 -#define MN_SUB_FIELD 99 -#define MN_SUB_OUTPUT_QUALITY 100 -#define MN_SUB_PREVIEW_OUTPUT_QUALITY 101 -#define MN_SUB_GROUP 102 -#define MN_TEMPLATES 103 -#define MN_SUB_MASTER_LAYOUTS 104 +#define MN_SUB_VIEW 91 +#define MN_SUB_TOOLBAR 92 +#define MN_SUB_GRAPHIC 93 +#define MN_SUB_SPELLING 94 +#define MN_SUB_TEMPLATES 95 +#define MN_SUB_POSITION 96 +#define MN_SUB_MASTERPAGE 97 +#define MN_SUB_SEND 98 +#define MN_SUB_FIELD 99 +#define MN_SUB_OUTPUT_QUALITY 100 +#define MN_SUB_PREVIEW_OUTPUT_QUALITY 101 +#define MN_SUB_GROUP 102 +#define MN_TEMPLATES 103 +#define MN_SUB_MASTER_LAYOUTS 104 // Windowmenu-ID (wird in globlmn.hrc gebraucht) #ifndef MN_WIN @@ -113,7 +113,7 @@ HelpID = 20 ; \ Command = ".uno:EditMenu"; \ Text [ en-US ] = "~Edit" ; \ - + #define MN_PASTE2 \ MenuItem\ {\ @@ -169,7 +169,7 @@ HelpID = 23 ; \ Command = ".uno:ViewMenu" ; \ Text [ en-US ] = "~View" ; \ - + #define MN_TOGGLETOOLBAR \ MenuItem\ {\ @@ -396,7 +396,7 @@ HelpID = 21 ; \ Command = ".uno:InsertMenu" ; \ Text [ en-US ] = "~Insert" ; \ - + #define MN_INSERTPAGE \ MenuItem\ {\ @@ -773,7 +773,7 @@ HelpID = 24 ; \ Command = ".uno:ModifyMenu" ; \ Text [ en-US ] = "~Modify" ; \ - + #define MN_MOREFRONT \ MenuItem\ {\ diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src index 09a90fdc0649..a7935fe2c67c 100644 --- a/sd/source/ui/app/menuids3_tmpl.src +++ b/sd/source/ui/app/menuids3_tmpl.src @@ -1,7 +1,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 diff --git a/sd/source/ui/app/menuids4_tmpl.src b/sd/source/ui/app/menuids4_tmpl.src index 9b077db8f22f..5cd541b0243e 100644 --- a/sd/source/ui/app/menuids4_tmpl.src +++ b/sd/source/ui/app/menuids4_tmpl.src @@ -1,7 +1,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 @@ -46,7 +46,7 @@ };\ };\ }; -#endif // _MENUIDS4_SRC +#endif // _MENUIDS4_SRC diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src index 4f05a49ad2b4..f9b1a3e980b2 100644 --- a/sd/source/ui/app/menuids_tmpl.src +++ b/sd/source/ui/app/menuids_tmpl.src @@ -1,7 +1,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 @@ -1279,7 +1279,7 @@ Identifier = DUMMY + 7 ; \ Command = ".uno:LayerMenu" ; \ Text [ en-US ] = "La~yer"; \ - SubMenu = Menu \ + SubMenu = Menu \ {\ ItemList = \ {\ diff --git a/sd/source/ui/app/menuportal_tmpl.src b/sd/source/ui/app/menuportal_tmpl.src index 29d7c6da1e4a..cdc1a705e011 100644 --- a/sd/source/ui/app/menuportal_tmpl.src +++ b/sd/source/ui/app/menuportal_tmpl.src @@ -1,7 +1,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 @@ -32,7 +32,7 @@ #include "menuids2.src" #endif -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET +#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET Menu SD_MENU_PORTAL { @@ -297,13 +297,13 @@ Menu SD_MENU_PORTAL MNSUB_POSITION MNSUB_OBJECT_ALIGN MN_DISTRIBUTE - + //-#i68101#---------------------- SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP //-#i68101#---------------------- - + SEPARATOR MN_GROUP MN_UNGROUP @@ -341,7 +341,7 @@ Menu SD_MENU_PORTAL MN_HIDE_SLIDE SEPARATOR MN_ANIMATION_OBJECTS -// MN_EFFECT_WIN +// MN_EFFECT_WIN MN_ANIMATION_EFFECTS }; }; diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 6c0402aea096..e5c4cf2e70ee 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.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 @@ -51,8 +51,8 @@ using namespace ::com::sun::star::uno; // ----------------- SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rSubTree ) : - ConfigItem ( rSubTree ), - mrParent ( rParent ) + ConfigItem ( rSubTree ), + mrParent ( rParent ) { } @@ -76,7 +76,7 @@ void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& // ----------------------------------------------------------------------------- -Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) +Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) { return ConfigItem::GetProperties( rNames ); } @@ -100,10 +100,10 @@ void SdOptionsItem::SetModified() // -------------------- SdOptionsGeneric::SdOptionsGeneric( USHORT nConfigId, const OUString& rSubTree ) : - maSubTree ( rSubTree ), - mpCfgItem ( NULL ), - mnConfigId ( nConfigId ), - mbInit ( rSubTree.getLength() == 0 ) + maSubTree ( rSubTree ), + mpCfgItem ( NULL ), + mnConfigId ( nConfigId ), + mbInit ( rSubTree.getLength() == 0 ) { } @@ -113,13 +113,13 @@ void SdOptionsGeneric::Init() const { if( !mbInit ) { - SdOptionsGeneric* pThis = const_cast<SdOptionsGeneric*>(this); + SdOptionsGeneric* pThis = const_cast<SdOptionsGeneric*>(this); if( !mpCfgItem ) pThis->mpCfgItem = new SdOptionsItem( *this, maSubTree ); - const Sequence< OUString > aNames( GetPropertyNames() ); - const Sequence< Any > aValues = mpCfgItem->GetProperties( aNames ); + const Sequence< OUString > aNames( GetPropertyNames() ); + const Sequence< Any > aValues = mpCfgItem->GetProperties( aNames ); if( aNames.getLength() && ( aValues.getLength() == aNames.getLength() ) ) { @@ -146,8 +146,8 @@ SdOptionsGeneric::~SdOptionsGeneric() void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const { - const Sequence< OUString > aNames( GetPropertyNames() ); - Sequence< Any > aValues( aNames.getLength() ); + const Sequence< OUString > aNames( GetPropertyNames() ); + Sequence< Any > aValues( aNames.getLength() ); if( aNames.getLength() && ( aValues.getLength() == aNames.getLength() ) ) { @@ -164,13 +164,13 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const { - ULONG nCount; - const char** ppPropNames; + ULONG nCount; + const char** ppPropNames; GetPropNameArray( ppPropNames, nCount ); Sequence< OUString > aNames( nCount ); - OUString* pNames = aNames.getArray(); + OUString* pNames = aNames.getArray(); for( ULONG i = 0; i < nCount; i++ ) pNames[ i ] = OUString::createFromAscii( ppPropNames[ i ] ); @@ -214,7 +214,7 @@ SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) : bHandlesBezier( FALSE ), bHelplines( TRUE ), nMetric((UINT16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)), - nDefTab( 1250 ) + nDefTab( 1250 ) { EnableModify( TRUE ); } @@ -223,7 +223,7 @@ SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) : BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const { - return( IsRulerVisible() == rOpt.IsRulerVisible() && + return( IsRulerVisible() == rOpt.IsRulerVisible() && IsMoveOutline() == rOpt.IsMoveOutline() && IsDragStripes() == rOpt.IsDragStripes() && IsHandlesBezier() == rOpt.IsHandlesBezier() && @@ -303,16 +303,16 @@ BOOL SdOptionsLayout::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsLayout ( 0, FALSE ) { } // ---------------------------------------------------------------------- SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) -: SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsLayout ( 0, FALSE ) { if( pOpts ) { @@ -437,8 +437,8 @@ BOOL SdOptionsContents::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsContentsItem::SdOptionsContentsItem(USHORT _nWhich, SdOptions*, ::sd::FrameView*) -: SfxPoolItem ( _nWhich ) -, maOptionsContents ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsContents ( 0, FALSE ) { } @@ -513,7 +513,7 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) : BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const { - return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && + return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && IsMarkedHitMovesAlways() == rOpt.IsMarkedHitMovesAlways() && IsMoveOnlyDragging() == rOpt.IsMoveOnlyDragging() && IsCrookNoContortion() == rOpt.IsCrookNoContortion() && @@ -602,7 +602,7 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues ) if( pValues[6].hasValue() ) SetBigHandles( *(sal_Bool*) pValues[ 6 ].getValue() ); if( pValues[7].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*) pValues[ 7 ].getValue() ); if( pValues[8].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 8 ].getValue() ); - // if( pValues[9].hasValue() ) SetPreviewQuality( FRound( *(double*) pValues[ 9 ].getValue() ) ); + // if( pValues[9].hasValue() ) SetPreviewQuality( FRound( *(double*) pValues[ 9 ].getValue() ) ); if( pValues[10].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 10 ].getValue() ); if( pValues[11].hasValue() ) SetSolidMarkHdl( *(sal_Bool*) pValues[ 11 ].getValue() ); // #97016# @@ -623,7 +623,7 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues ) if( pValues[18].hasValue() ) SetSummationOfParagraphs( *(sal_Bool*) pValues[ 18 ].getValue() ); // #90356# - if( pValues[19].hasValue() ) + if( pValues[19].hasValue() ) SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 19 ].getValue() ); if( pValues[20].hasValue() ) @@ -667,7 +667,7 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const pValues[ 13 ] <<= GetDefaultObjectSizeHeight(); pValues[ 14 ] <<= GetPrinterIndependentLayout(); pValues[ 15 ] <<= (sal_Bool)IsShowComments(); - + // just for Impress if( GetConfigId() == SDCFG_IMPRESS ) { @@ -695,16 +695,16 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsMisc ( 0, FALSE ) { } // ---------------------------------------------------------------------- SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) -: SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsMisc ( 0, FALSE ) { if( pOpts ) { @@ -822,9 +822,9 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const \************************************************************************/ SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - B2U( "Office.Draw/Snap" ) : + SdOptionsGeneric( nConfigId, bUseConfig ? + ( ( SDCFG_DRAW == nConfigId ) ? + B2U( "Office.Draw/Snap" ) : B2U( "Office.Impress/Snap" ) ) : OUString() ), bSnapHelplines( TRUE ), @@ -846,7 +846,7 @@ SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) : BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const { - return( IsSnapHelplines() == rOpt.IsSnapHelplines() && + return( IsSnapHelplines() == rOpt.IsSnapHelplines() && IsSnapBorder() == rOpt.IsSnapBorder() && IsSnapFrame() == rOpt.IsSnapFrame() && IsSnapPoints() == rOpt.IsSnapPoints() && @@ -875,7 +875,7 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con "Position/RotatingValue", "Position/PointReduction" }; - + rCount = 10; ppNames = aPropNames; } @@ -884,16 +884,16 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con BOOL SdOptionsSnap::ReadData( const Any* pValues ) { - if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() ); - if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1 ].getValue() ); - if( pValues[2].hasValue() ) SetSnapFrame( *(sal_Bool*) pValues[ 2 ].getValue() ); - if( pValues[3].hasValue() ) SetSnapPoints( *(sal_Bool*) pValues[ 3 ].getValue() ); - if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4 ].getValue() ); - if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5 ].getValue() ); - if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6 ].getValue() ); - if( pValues[7].hasValue() ) SetSnapArea( (INT16) *(sal_Int32*) pValues[ 7 ].getValue() ); - if( pValues[8].hasValue() ) SetAngle( (INT16) *(sal_Int32*) pValues[ 8 ].getValue() ); - if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (INT16) *(sal_Int32*) pValues[ 9 ].getValue() ); + if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() ); + if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1 ].getValue() ); + if( pValues[2].hasValue() ) SetSnapFrame( *(sal_Bool*) pValues[ 2 ].getValue() ); + if( pValues[3].hasValue() ) SetSnapPoints( *(sal_Bool*) pValues[ 3 ].getValue() ); + if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4 ].getValue() ); + if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5 ].getValue() ); + if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6 ].getValue() ); + if( pValues[7].hasValue() ) SetSnapArea( (INT16) *(sal_Int32*) pValues[ 7 ].getValue() ); + if( pValues[8].hasValue() ) SetAngle( (INT16) *(sal_Int32*) pValues[ 8 ].getValue() ); + if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (INT16) *(sal_Int32*) pValues[ 9 ].getValue() ); return TRUE; } @@ -902,16 +902,16 @@ BOOL SdOptionsSnap::ReadData( const Any* pValues ) BOOL SdOptionsSnap::WriteData( Any* pValues ) const { - pValues[ 0 ] <<= IsSnapHelplines(); - pValues[ 1 ] <<= IsSnapBorder(); - pValues[ 2 ] <<= IsSnapFrame(); - pValues[ 3 ] <<= IsSnapPoints(); - pValues[ 4 ] <<= IsOrtho(); - pValues[ 5 ] <<= IsBigOrtho(); - pValues[ 6 ] <<= IsRotate(); - pValues[ 7 ] <<= (sal_Int32) GetSnapArea(); - pValues[ 8 ] <<= (sal_Int32) GetAngle(); - pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle(); + pValues[ 0 ] <<= IsSnapHelplines(); + pValues[ 1 ] <<= IsSnapBorder(); + pValues[ 2 ] <<= IsSnapFrame(); + pValues[ 3 ] <<= IsSnapPoints(); + pValues[ 4 ] <<= IsOrtho(); + pValues[ 5 ] <<= IsBigOrtho(); + pValues[ 6 ] <<= IsRotate(); + pValues[ 7 ] <<= (sal_Int32) GetSnapArea(); + pValues[ 8 ] <<= (sal_Int32) GetAngle(); + pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle(); return TRUE; } @@ -923,16 +923,16 @@ BOOL SdOptionsSnap::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsSnap ( 0, FALSE ) { } // ---------------------------------------------------------------------- SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) -: SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsSnap ( 0, FALSE ) { if( pView ) { @@ -1005,12 +1005,12 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const \************************************************************************/ SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) : - SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId ) ) ? - B2U( "Office.Draw/Zoom" ) : + SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId ) ) ? + B2U( "Office.Draw/Zoom" ) : OUString() ), nX( 1 ), nY( 1 ) - + { EnableModify( TRUE ); } @@ -1024,7 +1024,7 @@ BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const GetScale( nX1, nY1 ); rOpt.GetScale( nX2, nY2 ); - return( ( nX1 == nX2 ) && + return( ( nX1 == nX2 ) && ( nY1 == nY2 ) ); } @@ -1037,7 +1037,7 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con "ScaleX", "ScaleY" }; - + rCount = ( GetConfigId() == SDCFG_DRAW ) ? 2 : 0; ppNames = aPropNames; } @@ -1048,9 +1048,9 @@ BOOL SdOptionsZoom::ReadData( const Any* pValues ) { INT32 x = 1, y = 1; - if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue() ); - if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue() ); - + if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue() ); + if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue() ); + SetScale( x, y ); return TRUE; @@ -1064,8 +1064,8 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const GetScale( x, y ); - pValues[ 0 ] <<= (sal_Int32) x; - pValues[ 1 ] <<= (sal_Int32) y; + pValues[ 0 ] <<= (sal_Int32) x; + pValues[ 1 ] <<= (sal_Int32) y; return TRUE; } @@ -1077,9 +1077,9 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsGrid::SdOptionsGrid( USHORT nConfigId, BOOL bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - B2U( "Office.Draw/Grid" ) : + SdOptionsGeneric( nConfigId, bUseConfig ? + ( ( SDCFG_DRAW == nConfigId ) ? + B2U( "Office.Draw/Grid" ) : B2U( "Office.Impress/Grid" ) ) : OUString() ) { @@ -1116,7 +1116,7 @@ void SdOptionsGrid::SetDefaults() BOOL SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const { - return( GetFldDrawX() == rOpt.GetFldDrawX() && + return( GetFldDrawX() == rOpt.GetFldDrawX() && GetFldDivisionX() == rOpt.GetFldDivisionX() && GetFldDrawY() == rOpt.GetFldDrawY() && GetFldDivisionY() == rOpt.GetFldDivisionY() && @@ -1172,27 +1172,27 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con BOOL SdOptionsGrid::ReadData( const Any* pValues ) { - if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() ); - if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1 ].getValue() ); + if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() ); + if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1 ].getValue() ); if( pValues[2].hasValue() ) { const UINT32 nDivX = FRound( *(double*) pValues[ 2 ].getValue() ); - SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) ); + SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) ); } if( pValues[3].hasValue() ) { const UINT32 nDivY = FRound( *(double*) pValues[ 3 ].getValue() ); - SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) ); + SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) ); } - if( pValues[4].hasValue() ) SetFldSnapX( *(sal_Int32*) pValues[ 4 ].getValue() ); - if( pValues[5].hasValue() ) SetFldSnapY( *(sal_Int32*) pValues[ 5 ].getValue() ); - if( pValues[6].hasValue() ) SetUseGridSnap( *(sal_Bool*) pValues[ 6 ].getValue() ); - if( pValues[7].hasValue() ) SetSynchronize( *(sal_Bool*) pValues[ 7 ].getValue() ); - if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8 ].getValue() ); - if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9 ].getValue() ); + if( pValues[4].hasValue() ) SetFldSnapX( *(sal_Int32*) pValues[ 4 ].getValue() ); + if( pValues[5].hasValue() ) SetFldSnapY( *(sal_Int32*) pValues[ 5 ].getValue() ); + if( pValues[6].hasValue() ) SetUseGridSnap( *(sal_Bool*) pValues[ 6 ].getValue() ); + if( pValues[7].hasValue() ) SetSynchronize( *(sal_Bool*) pValues[ 7 ].getValue() ); + if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8 ].getValue() ); + if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9 ].getValue() ); return TRUE; } @@ -1201,16 +1201,16 @@ BOOL SdOptionsGrid::ReadData( const Any* pValues ) BOOL SdOptionsGrid::WriteData( Any* pValues ) const { - pValues[ 0 ] <<= (sal_Int32) GetFldDrawX(); - pValues[ 1 ] <<= (sal_Int32) GetFldDrawY(); + pValues[ 0 ] <<= (sal_Int32) GetFldDrawX(); + pValues[ 1 ] <<= (sal_Int32) GetFldDrawY(); pValues[ 2 ] <<= ( GetFldDivisionX() ? ( (double) GetFldDrawX() / GetFldDivisionX() - 1.0 ) : (double) 0 ); pValues[ 3 ] <<= ( GetFldDivisionY() ? ( (double) GetFldDrawY() / GetFldDivisionY() - 1.0 ) : (double) 0 ); - pValues[ 4 ] <<= (sal_Int32) GetFldSnapX(); - pValues[ 5 ] <<= (sal_Int32) GetFldSnapY(); - pValues[ 6 ] <<= IsUseGridSnap(); - pValues[ 7 ] <<= IsSynchronize(); - pValues[ 8 ] <<= IsGridVisible(); - pValues[ 9 ] <<= IsEqualGrid(); + pValues[ 4 ] <<= (sal_Int32) GetFldSnapX(); + pValues[ 5 ] <<= (sal_Int32) GetFldSnapY(); + pValues[ 6 ] <<= IsUseGridSnap(); + pValues[ 7 ] <<= IsSynchronize(); + pValues[ 8 ] <<= IsGridVisible(); + pValues[ 9 ] <<= IsEqualGrid(); return TRUE; } @@ -1274,9 +1274,9 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const \************************************************************************/ SdOptionsPrint::SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - B2U( "Office.Draw/Print" ) : + SdOptionsGeneric( nConfigId, bUseConfig ? + ( ( SDCFG_DRAW == nConfigId ) ? + B2U( "Office.Draw/Print" ) : B2U( "Office.Impress/Print" ) ) : OUString() ), bDraw( TRUE ), @@ -1395,25 +1395,25 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, ULONG& rCount ) co BOOL SdOptionsPrint::ReadData( const Any* pValues ) { - if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() ); - if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1 ].getValue() ); - if( pValues[2].hasValue() ) SetPagename( *(sal_Bool*) pValues[ 2 ].getValue() ); - if( pValues[3].hasValue() ) SetHiddenPages( *(sal_Bool*) pValues[ 3 ].getValue() ); - if( pValues[4].hasValue() ) SetPagesize( *(sal_Bool*) pValues[ 4 ].getValue() ); - if( pValues[5].hasValue() ) SetPagetile( *(sal_Bool*) pValues[ 5 ].getValue() ); - if( pValues[6].hasValue() ) SetBooklet( *(sal_Bool*) pValues[ 6 ].getValue() ); - if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7 ].getValue() ); - if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8 ].getValue() ); - if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9 ].getValue() ); - if( pValues[10].hasValue() ) SetOutputQuality( (UINT16) *(sal_Int32*) pValues[ 10 ].getValue() ); - if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11 ].getValue() ); + if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() ); + if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1 ].getValue() ); + if( pValues[2].hasValue() ) SetPagename( *(sal_Bool*) pValues[ 2 ].getValue() ); + if( pValues[3].hasValue() ) SetHiddenPages( *(sal_Bool*) pValues[ 3 ].getValue() ); + if( pValues[4].hasValue() ) SetPagesize( *(sal_Bool*) pValues[ 4 ].getValue() ); + if( pValues[5].hasValue() ) SetPagetile( *(sal_Bool*) pValues[ 5 ].getValue() ); + if( pValues[6].hasValue() ) SetBooklet( *(sal_Bool*) pValues[ 6 ].getValue() ); + if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7 ].getValue() ); + if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8 ].getValue() ); + if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9 ].getValue() ); + if( pValues[10].hasValue() ) SetOutputQuality( (UINT16) *(sal_Int32*) pValues[ 10 ].getValue() ); + if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11 ].getValue() ); // just for impress if( GetConfigId() == SDCFG_IMPRESS ) { - if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12 ].getValue() ); - if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() ); - if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() ); + if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12 ].getValue() ); + if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() ); + if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() ); if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() ); if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[16].getValue() ); } @@ -1425,25 +1425,25 @@ BOOL SdOptionsPrint::ReadData( const Any* pValues ) BOOL SdOptionsPrint::WriteData( Any* pValues ) const { - pValues[ 0 ] <<= IsDate(); - pValues[ 1 ] <<= IsTime(); + pValues[ 0 ] <<= IsDate(); + pValues[ 1 ] <<= IsTime(); pValues[ 2 ] <<= IsPagename(); pValues[ 3 ] <<= IsHiddenPages(); - pValues[ 4 ] <<= IsPagesize(); + pValues[ 4 ] <<= IsPagesize(); pValues[ 5 ] <<= IsPagetile(); pValues[ 6 ] <<= IsBooklet(); - pValues[ 7 ] <<= IsFrontPage(); - pValues[ 8 ] <<= IsBackPage(); + pValues[ 7 ] <<= IsFrontPage(); + pValues[ 8 ] <<= IsBackPage(); pValues[ 9 ] <<= IsPaperbin(); - pValues[ 10 ] <<= (sal_Int32) GetOutputQuality(); + pValues[ 10 ] <<= (sal_Int32) GetOutputQuality(); pValues[ 11 ] <<= IsDraw(); - + // just for impress if( GetConfigId() == SDCFG_IMPRESS ) { - pValues[ 12 ] <<= IsNotes(); - pValues[ 13 ] <<= IsHandout(); - pValues[ 14 ] <<= IsOutline(); + pValues[ 12 ] <<= IsNotes(); + pValues[ 13 ] <<= IsHandout(); + pValues[ 14 ] <<= IsOutline(); pValues[ 15 ] <<= IsHandoutHorizontal(); pValues[ 16 ] <<= GetHandoutPages(); } @@ -1458,16 +1458,16 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsPrint ( 0, FALSE ) { } // ---------------------------------------------------------------------- SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* ) -: SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsPrint ( 0, FALSE ) { if( pOpts ) { diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src index 54d25c998ff5..9bd30474750a 100644 --- a/sd/source/ui/app/popup.src +++ b/sd/source/ui/app/popup.src @@ -1,7 +1,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 @@ -36,7 +36,7 @@ #include <svx/globlmn.hrc> #endif -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET +#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET Menu RID_DRAW_TEXTOBJ_INSIDE_POPUP { @@ -367,7 +367,7 @@ Menu RID_MASTERPAGE_POPUP MN_TRANSFORM SEPARATOR MN_CHAR_PARAGRAPH - // MN_PRESENTATIONOBJECT + // MN_PRESENTATIONOBJECT SEPARATOR MN_POSITION }; diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src index 46efadeb031d..68095711a336 100644 --- a/sd/source/ui/app/popup2_tmpl.src +++ b/sd/source/ui/app/popup2_tmpl.src @@ -1,7 +1,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 @@ -207,7 +207,7 @@ SEPARATOR MN_STYLEDT SEPARATOR - + }; }; @@ -245,8 +245,8 @@ MN_EFFECT MN_ACTION #endif -// SEPARATOR -// MN_STYLEDT +// SEPARATOR +// MN_STYLEDT }; }; @@ -285,8 +285,8 @@ MN_EFFECT MN_ACTION #endif -// SEPARATOR -// MN_STYLEDT +// SEPARATOR +// MN_STYLEDT }; }; @@ -560,7 +560,7 @@ MN_SLIDE_MENU #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP MN_PAGE_MENU -#endif +#endif SEPARATOR MN_CAPTUREPOINT SEPARATOR @@ -741,7 +741,7 @@ MN_OBJECT_ALIGN MN_DISTRIBUTE MN_BREAK - + //-#i68101#---------------------- SEPARATOR MN_OBJECT_TITLE_DESCRIPTION diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 0901e53df0ed..2996640ee558 100755 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -1,7 +1,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 @@ -426,7 +426,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER { < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ; }; - }; + }; }; #define STYLE_IMAGE_LISTEF \ IdList = \ @@ -435,13 +435,13 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; \ IdCount = 2; - ImageList 1 // == BMP_COLOR_NORMAL + 1 + ImageList 1 // == BMP_COLOR_NORMAL + 1 { Prefix = "sf"; MaskColor = IMAGE_MASK_STDCOLOR; STYLE_IMAGE_LISTEF }; - ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1 + ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1 { Prefix = "sfh"; MaskColor = IMAGE_MASK_STDCOLOR_HC; diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index cdc396b2093a..9eaf8338c2de 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.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 diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx index d43c7a8a7651..e7d9a5052f97 100644 --- a/sd/source/ui/app/sddll1.cxx +++ b/sd/source/ui/app/sddll1.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 diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 3738bceaac37..7b9316dcfb0f 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.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 @@ -152,7 +152,7 @@ void SdDLL::RegisterControllers() SvxStyleToolBoxControl::RegisterControl(0, pMod); SvxFontNameToolBoxControl::RegisterControl(0, pMod); -// SvxFontHeightToolBoxControl::RegisterControl(0, pMod); +// SvxFontHeightToolBoxControl::RegisterControl(0, pMod); SvxFontColorToolBoxControl::RegisterControl(0, pMod); SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod ); @@ -208,8 +208,8 @@ void SdDLL::RegisterControllers() SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); SvxSubToolBoxControl::RegisterControl(SID_OPTIMIZE_TABLE, pMod); -// SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); -// SdLayoutControl::RegisterControl( SID_INSERTPAGE, pMod ); +// SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); +// SdLayoutControl::RegisterControl( SID_INSERTPAGE, pMod ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index fe4d0f07ec45..ab7a2347c1ec 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.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 @@ -98,7 +98,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) bWaterCan(FALSE), mpResourceContainer(new ::sd::SdGlobalResourceContainer()) { - SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarDraw" ) ) ); // Nicht uebersetzen! + SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarDraw" ) ) ); // Nicht uebersetzen! pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM); pSearchItem->SetAppFlag(SVX_SEARCHAPP_DRAW); StartListening( *SFX_APP() ); @@ -273,13 +273,13 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType) SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode ) { - ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); - SvStorageStreamRef xStm; + ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); + SvStorageStreamRef xStm; if( pDocSh ) { - DocumentType eType = pDocSh->GetDoc()->GetDocumentType(); - String aStmName; + DocumentType eType = pDocSh->GetDoc()->GetDocumentType(); + String aStmName; if( !xOptionStorage.Is() ) { diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index adcf6e8589e6..cbb099f2a6c3 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.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 @@ -152,7 +152,7 @@ void SdModule::Execute(SfxRequest& rReq) FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue(); switch( eUnit ) { - case FUNIT_MM: // nur die Einheiten, die auch im Dialog stehen + case FUNIT_MM: // nur die Einheiten, die auch im Dialog stehen case FUNIT_CM: case FUNIT_INCH: case FUNIT_PICA: @@ -440,7 +440,7 @@ void SdModule::GetState(SfxItemSet& rItemSet) if ( !bOnce ) { ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current()); - if( pDocShell ) // Impress or Draw ? + if( pDocShell ) // Impress or Draw ? { ::sd::ViewShell* pViewShell = pDocShell->GetViewShell(); @@ -598,7 +598,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) std::auto_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( NULL, !bNewDocDirect ) : 0 ); // Open the Pilot - if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK ) + if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK ) { const String aDocPath( pPilotDlg->GetDocPath()); const sal_Bool bIsDocEmpty = pPilotDlg->IsDocEmpty(); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 840ef72d5a6b..14cf206bb2b9 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.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 @@ -404,7 +404,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) DBG_ERROR("sd::SdModule::CalcFieldValueHdl(), unknown field type!"); } - if( aRepresentation.Len() == 0 ) // TODO: Edit engine doesn't handle empty fields? + if( aRepresentation.Len() == 0 ) // TODO: Edit engine doesn't handle empty fields? aRepresentation += sal_Unicode( ' ' ); pInfo->SetRepresentation( aRepresentation ); } @@ -420,7 +420,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) |* virt. Methoden fuer Optionendialog |* \************************************************************************/ -SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) +SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) { ::sd::FrameView* pFrameView = NULL; ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); @@ -453,7 +453,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) SfxItemPool& rPool = GetPool(); rPool.SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); - SfxItemSet* pRet = new SfxItemSet( rPool, + SfxItemSet* pRet = new SfxItemSet( rPool, SID_ATTR_METRIC, SID_ATTR_METRIC, SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, @@ -549,7 +549,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) } void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) { - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = NULL; BOOL bNewDefTab = FALSE; BOOL bNewPrintOptions = FALSE; BOOL bMiscOptions = FALSE; @@ -656,9 +656,9 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) } SfxItemSet aPrintSet( GetPool(), - SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, - SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, - ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, + SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, + ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, 0 ); // Drucken @@ -671,7 +671,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // PrintOptionsSet setzen SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT, pOptions ); SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC ); - USHORT nFlags = 0; + USHORT nFlags = 0; nFlags = (aPrintItem.GetOptionsPrint().IsWarningSize() ? SFX_PRINTER_CHG_SIZE : 0) | (aPrintItem.GetOptionsPrint().IsWarningOrientation() ? SFX_PRINTER_CHG_ORIENTATION : 0); @@ -773,14 +773,14 @@ SfxTabPage* SdModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS { case SID_SD_TP_CONTENTS: case SID_SI_TP_CONTENTS: - { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsContentsTabPageCreatorFunc(); + { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsContentsTabPageCreatorFunc(); if( fnCreatePage ) pRet = (*fnCreatePage)( pParent, rSet ); } break; case SID_SD_TP_SNAP: case SID_SI_TP_SNAP: - { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsSnapTabPageCreatorFunc(); + { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsSnapTabPageCreatorFunc(); if( fnCreatePage ) pRet = (*fnCreatePage)( pParent, rSet ); } diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index e757f10bcd16..73e578cd060b 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.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 @@ -53,8 +53,8 @@ \************************************************************************/ SdFieldPopup::SdFieldPopup( const SvxFieldData* pInField, LanguageType eLanguage ) : - PopupMenu (), - pField ( pInField ) + PopupMenu (), + pField ( pInField ) { Fill( eLanguage ); } @@ -93,24 +93,24 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) else CheckItem( 2 ); - //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt + //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt InsertItem( nID++, String( SdResId( STR_STANDARD_SMALL ) ), nStyle ); InsertItem( nID++, String( SdResId( STR_STANDARD_BIG ) ), nStyle ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); - aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 + aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 + aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 + aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); CheckItem( (USHORT) ( pDateField->GetFormat() ) + 1 ); // - 2 + 3 ! @@ -125,27 +125,27 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) else CheckItem( 2 ); - //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt + //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt InsertItem( nID++, String( SdResId( STR_STANDARD_NORMAL ) ), nStyle ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - //SVXTIMEFORMAT_AM_HM, // 01:49 PM - //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM - //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM + //SVXTIMEFORMAT_AM_HM, // 01:49 PM + //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM + //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM CheckItem( (USHORT) ( pTimeField->GetFormat() ) + 1 ); // - 2 + 3 ! } @@ -200,7 +200,7 @@ SvxFieldData* SdFieldPopup::GetField() if( pField->ISA( SvxDateField ) ) { const SvxDateField* pDateField = (const SvxDateField*) pField; - SvxDateType eType; + SvxDateType eType; SvxDateFormat eFormat; USHORT i; @@ -233,7 +233,7 @@ SvxFieldData* SdFieldPopup::GetField() else if( pField->ISA( SvxExtTimeField ) ) { const SvxExtTimeField* pTimeField = (const SvxExtTimeField*) pField; - SvxTimeType eType; + SvxTimeType eType; SvxTimeFormat eFormat; USHORT i; @@ -267,7 +267,7 @@ SvxFieldData* SdFieldPopup::GetField() else if( pField->ISA( SvxExtFileField ) ) { const SvxExtFileField* pFileField = (const SvxExtFileField*) pField; - SvxFileType eType; + SvxFileType eType; SvxFileFormat eFormat; USHORT i; @@ -307,7 +307,7 @@ SvxFieldData* SdFieldPopup::GetField() else if( pField->ISA( SvxAuthorField ) ) { const SvxAuthorField* pAuthorField = (const SvxAuthorField*) pField; - SvxAuthorType eType; + SvxAuthorType eType; SvxAuthorFormat eFormat; USHORT i; diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx index 7b8f773167da..3d5d7574c838 100644 --- a/sd/source/ui/app/sdresid.cxx +++ b/sd/source/ui/app/sdresid.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 diff --git a/sd/source/ui/app/sdstring.src b/sd/source/ui/app/sdstring.src index 1b520fb140a8..d9d399aa31ee 100644 --- a/sd/source/ui/app/sdstring.src +++ b/sd/source/ui/app/sdstring.src @@ -1,7 +1,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 diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 3fd510215cdb..981e1c9cfdc7 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.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 @@ -92,33 +92,33 @@ using namespace ::com::sun::star::datatransfer::clipboard; // - Defines - // ----------- -#define SDTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 -#define SDTRANSFER_OBJECTTYPE_DRAWOLE 0x00000002 +#define SDTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 +#define SDTRANSFER_OBJECTTYPE_DRAWOLE 0x00000002 // ------------------ // - SdTransferable - // ------------------ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, BOOL bInitOnGetData ) -: mpPageDocShell( NULL ) -, mpOLEDataHelper( NULL ) -, mpObjDesc( NULL ) -, mpSdView( pWorkView ) -, mpSdViewIntern( pWorkView ) -, mpSdDrawDocument( NULL ) -, mpSdDrawDocumentIntern( NULL ) -, mpSourceDoc( pSrcDoc ) -, mpVDev( NULL ) -, mpBookmark( NULL ) -, mpGraphic( NULL ) -, mpImageMap( NULL ) -, mbInternalMove( FALSE ) -, mbOwnDocument( FALSE ) -, mbOwnView( FALSE ) -, mbLateInit( bInitOnGetData ) -, mbPageTransferable( FALSE ) -, mbPageTransferablePersistent( FALSE ) -, mbIsUnoObj( false ) +: mpPageDocShell( NULL ) +, mpOLEDataHelper( NULL ) +, mpObjDesc( NULL ) +, mpSdView( pWorkView ) +, mpSdViewIntern( pWorkView ) +, mpSdDrawDocument( NULL ) +, mpSdDrawDocumentIntern( NULL ) +, mpSourceDoc( pSrcDoc ) +, mpVDev( NULL ) +, mpBookmark( NULL ) +, mpGraphic( NULL ) +, mpImageMap( NULL ) +, mbInternalMove( FALSE ) +, mbOwnDocument( FALSE ) +, mbOwnView( FALSE ) +, mbLateInit( bInitOnGetData ) +, mbPageTransferable( FALSE ) +, mbPageTransferablePersistent( FALSE ) +, mbIsUnoObj( false ) { if( mpSourceDoc ) StartListening( *mpSourceDoc ); @@ -224,8 +224,8 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) if( !xPropSet.is() ) return; - ::com::sun::star::form::FormButtonType eButtonType; - Any aTmp( xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ) ) ) ); + ::com::sun::star::form::FormButtonType eButtonType; + Any aTmp( xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ) ) ) ); if( aTmp >>= eButtonType ) { @@ -260,7 +260,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) } } - SdIMapInfo* pInfo = static_cast< SdDrawDocument* >( pObj->GetModel() )->GetIMapInfo( static_cast< SdrObject* >( pObj ) ); + SdIMapInfo* pInfo = static_cast< SdDrawDocument* >( pObj->GetModel() )->GetIMapInfo( static_cast< SdrObject* >( pObj ) ); if( pInfo ) mpImageMap = new ImageMap( pInfo->GetImageMap() ); @@ -313,13 +313,13 @@ void SdTransferable::CreateData() } // Groesse der Source-Seite uebernehmen - SdrPageView* pPgView = mpSdView->GetSdrPageView(); - SdPage* pOldPage = (SdPage*) pPgView->GetPage(); - SdrModel* pOldModel = mpSdView->GetModel(); - SdStyleSheetPool* pOldStylePool = (SdStyleSheetPool*) pOldModel->GetStyleSheetPool(); - SdStyleSheetPool* pNewStylePool = (SdStyleSheetPool*) mpSdDrawDocumentIntern->GetStyleSheetPool(); - SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); - String aOldLayoutName( pOldPage->GetLayoutName() ); + SdrPageView* pPgView = mpSdView->GetSdrPageView(); + SdPage* pOldPage = (SdPage*) pPgView->GetPage(); + SdrModel* pOldModel = mpSdView->GetModel(); + SdStyleSheetPool* pOldStylePool = (SdStyleSheetPool*) pOldModel->GetStyleSheetPool(); + SdStyleSheetPool* pNewStylePool = (SdStyleSheetPool*) mpSdDrawDocumentIntern->GetStyleSheetPool(); + SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); + String aOldLayoutName( pOldPage->GetLayoutName() ); pPage->SetSize( pOldPage->GetSize() ); pPage->SetLayoutName( aOldLayoutName ); @@ -336,12 +336,12 @@ void SdTransferable::CreateData() mpSdDrawDocumentIntern && mpSdViewIntern && mpSdDrawDocumentIntern->GetPageCount() ) { - SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); + SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); if( 1 == mpSdDrawDocumentIntern->GetPageCount() ) { - Point aOrigin( ( maVisArea = mpSdViewIntern->GetAllMarkedRect() ).TopLeft() ); - Size aVector( -aOrigin.X(), -aOrigin.Y() ); + Point aOrigin( ( maVisArea = mpSdViewIntern->GetAllMarkedRect() ).TopLeft() ); + Size aVector( -aOrigin.X(), -aOrigin.Y() ); for( ULONG nObj = 0, nObjCount = pPage->GetObjCount(); nObj < nObjCount; nObj++ ) { @@ -421,8 +421,8 @@ void SdTransferable::AddSupportedFormats() { AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); - DataFlavorExVector aVector( mpOLEDataHelper->GetDataFlavorExVector() ); - DataFlavorExVector::iterator aIter( aVector.begin() ), aEnd( aVector.end() ); + DataFlavorExVector aVector( mpOLEDataHelper->GetDataFlavorExVector() ); + DataFlavorExVector::iterator aIter( aVector.begin() ), aEnd( aVector.end() ); while( aIter != aEnd ) AddFormat( *aIter++ ); @@ -476,8 +476,8 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) if (SD_MOD()==NULL) return sal_False; - sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); - sal_Bool bOK = sal_False; + sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); + sal_Bool bOK = sal_False; CreateData(); @@ -866,7 +866,7 @@ sal_Bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& if( pTableObj ) { SvMemoryStream aMemStm( 65535, 65535 ); - sdr::table::SdrTableObj::ExportAsRTF( aMemStm, *pTableObj ); + sdr::table::SdrTableObj::ExportAsRTF( aMemStm, *pTableObj ); return SetAny( Any( Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ) ), rFlavor ); } } diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index bb1199fdd352..1ba0df667e1d 100755 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1,7 +1,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 @@ -1237,7 +1237,7 @@ String RID_ANNOTATIONS_START }; String STR_RESET_LAYOUT { - Text[ en-US ] = "Reset Slide Layout"; + Text[ en-US ] = "Reset Slide Layout"; }; String STR_INSERT_TABLE diff --git a/sd/source/ui/app/tbx_ww.src b/sd/source/ui/app/tbx_ww.src index 67e62be0f1be..91336d5a93ef 100644 --- a/sd/source/ui/app/tbx_ww.src +++ b/sd/source/ui/app/tbx_ww.src @@ -1,7 +1,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 diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src index 90fd733434a7..4da4f604034d 100644 --- a/sd/source/ui/app/tbxids_tmpl.src +++ b/sd/source/ui/app/tbxids_tmpl.src @@ -1,7 +1,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 diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 4d2855cfb831..6effd23482d9 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.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 @@ -38,7 +38,7 @@ #include <sfx2/imagemgr.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> - + #include "sddll.hxx" #include "GraphicDocShell.hxx" @@ -62,11 +62,11 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxControl, TbxImageItem ) SdPopupWindowTbx::SdPopupWindowTbx( USHORT nId, WindowAlign eAlign, SdResId aRIdWin, SdResId aRIdTbx, SfxBindings& rBindings ) : - SfxPopupWindow ( nId, aRIdWin, rBindings ), + SfxPopupWindow ( nId, aRIdWin, rBindings ), aTbx ( this, GetBindings(), aRIdTbx ), aSdResIdWin ( aRIdWin ), aSdResIdTbx ( aRIdTbx ), - eTbxAlign ( eAlign ) + eTbxAlign ( eAlign ) { aTbx.UseDefault(); aSelectLink = aTbx.GetToolBox().GetSelectHdl(); @@ -78,7 +78,7 @@ SdPopupWindowTbx::SdPopupWindowTbx( USHORT nId, WindowAlign eAlign, { if ( aSdResIdWin.GetId() != RID_TEXT ) aTbx.GetToolBox().SetAlign( WINDOWALIGN_LEFT ); - + SetText( String() ); } @@ -178,7 +178,7 @@ IMPL_LINK( SdPopupWindowTbx, TbxSelectHdl, ToolBox*, pBox) if ( pBox->GetModifier() & KEY_MOD1 ) { - // #99013# if selected with control key, return focus to current view + // #99013# if selected with control key, return focus to current view Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); @@ -215,7 +215,7 @@ SfxPopupWindowType SdTbxControl::GetPopupWindowType() const |* \************************************************************************/ -SfxPopupWindow* SdTbxControl::CreatePopupWindow() +SfxPopupWindow* SdTbxControl::CreatePopupWindow() { SfxPopupWindow *pWin = NULL; rtl::OUString aToolBarResStr; @@ -271,10 +271,10 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow() aToolBarResStr = aTbxResName.makeStringAndClear(); break; } - + if ( aToolBarResStr.getLength() > 0 ) createAndPositionSubToolBar( aToolBarResStr ); - + return( pWin ); } @@ -304,7 +304,7 @@ void SdTbxControl::StateChanged( USHORT nSId, { rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( nImage )); - Image aImage = GetImage( m_xFrame, + Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages(), GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() ); diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 427b639ba56f..be9994227cc2 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.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 @@ -53,10 +53,10 @@ class TemplatePopup_Impl : public PopupMenu public: TemplatePopup_Impl(); - USHORT GetCurId() const { return nCurId; } + USHORT GetCurId() const { return nCurId; } private: - USHORT nCurId; + USHORT nCurId; virtual void Select(); }; @@ -132,13 +132,13 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) TemplatePopup_Impl aPop; { const USHORT nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD); - + USHORT nCount = 0; for( USHORT nPage = 0; nPage < nMasterCount; ++nPage ) { SdPage* pMaster = pDoc->GetMasterSdPage(nPage, PK_STANDARD); if( pMaster ) - aPop.InsertItem( ++nCount, pMaster->GetName() ); + aPop.InsertItem( ++nCount, pMaster->GetName() ); } aPop.Execute( &GetStatusBar(), rCEvt.GetMousePosPixel()); diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src index a3446a2c58b4..945bb0b0aae9 100644 --- a/sd/source/ui/app/toolbox.src +++ b/sd/source/ui/app/toolbox.src @@ -1,7 +1,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 diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src index d5033cef9127..c2122678f6b9 100644 --- a/sd/source/ui/app/toolbox2_tmpl.src +++ b/sd/source/ui/app/toolbox2_tmpl.src @@ -1,7 +1,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 |