Kaydet (Commit) 6fc2bd00 authored tarafından Thorsten Behrens's avatar Thorsten Behrens

Fixup whitespace changes, remove commented code.

This is a light touchup of 2ef9df8a

Change-Id: Icfaf6fb0111c85b5f78010b16bdda0e237419323
üst 52c5d1a7
...@@ -571,9 +571,7 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -571,9 +571,7 @@ sal_Bool ImplSdPPTImport::Import()
SfxStyleSheet* pSheet; SfxStyleSheet* pSheet;
if ( nMasterNum == 1 ) if ( nMasterNum == 1 )
{ {
// standardsheet // standardsheet
pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ); pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS );
if ( pSheet ) if ( pSheet )
{ {
...@@ -621,7 +619,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -621,7 +619,6 @@ sal_Bool ImplSdPPTImport::Import()
// set stylesheets // set stylesheets
if ( pPage->GetPageKind() == PK_STANDARD ) if ( pPage->GetPageKind() == PK_STANDARD )
{ {
sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE; sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE;
...@@ -635,7 +632,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -635,7 +632,6 @@ sal_Bool ImplSdPPTImport::Import()
} }
// titelstylesheet // titelstylesheet
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ); pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
if ( pSheet ) if ( pSheet )
{ {
...@@ -648,7 +644,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -648,7 +644,6 @@ sal_Bool ImplSdPPTImport::Import()
} }
// outlinerstylesheet // outlinerstylesheet
sal_uInt16 nLevel; sal_uInt16 nLevel;
PPTParagraphObj* pParagraphs[ 9 ]; PPTParagraphObj* pParagraphs[ 9 ];
PPTParagraphObj* pPreviousPara = NULL; PPTParagraphObj* pPreviousPara = NULL;
...@@ -676,7 +671,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -676,7 +671,6 @@ sal_Bool ImplSdPPTImport::Import()
for ( nLevel = 0; nLevel < 9; delete pParagraphs[ nLevel++ ] ) ; for ( nLevel = 0; nLevel < 9; delete pParagraphs[ nLevel++ ] ) ;
// subtitle stylesheet // subtitle stylesheet
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ); pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT );
if ( pSheet ) if ( pSheet )
{ {
...@@ -712,7 +706,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -712,7 +706,6 @@ sal_Bool ImplSdPPTImport::Import()
SetPageNum( i, PPT_MASTERPAGE ); SetPageNum( i, PPT_MASTERPAGE );
// importing master page objects // importing master page objects
PptSlidePersistList* pList = GetPageList( eAktPageKind ); PptSlidePersistList* pList = GetPageList( eAktPageKind );
PptSlidePersistEntry* pPersist = ( pList && ( nAktPageNum < pList->size() ) ) PptSlidePersistEntry* pPersist = ( pList && ( nAktPageNum < pList->size() ) )
? (*pList)[ nAktPageNum ] : NULL; ? (*pList)[ nAktPageNum ] : NULL;
...@@ -831,7 +824,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -831,7 +824,6 @@ sal_Bool ImplSdPPTImport::Import()
// background object // background object
pObj = pMPage->GetObj( 0 ); pObj = pMPage->GetObj( 0 );
if ( pObj && pObj->GetObjIdentifier() == OBJ_RECT ) if ( pObj && pObj->GetObjIdentifier() == OBJ_RECT )
{ {
...@@ -869,7 +861,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -869,7 +861,6 @@ sal_Bool ImplSdPPTImport::Import()
} }
// importing slide pages // importing slide pages
{ {
sal_uInt32 nFPosMerk = rStCtrl.Tell(); sal_uInt32 nFPosMerk = rStCtrl.Tell();
PptPageKind ePageKind = eAktPageKind; PptPageKind ePageKind = eAktPageKind;
...@@ -1040,7 +1031,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -1040,7 +1031,6 @@ sal_Bool ImplSdPPTImport::Import()
} }
// create handout and note pages // create handout and note pages
bOk = mpDoc->CreateMissingNotesAndHandoutPages(); bOk = mpDoc->CreateMissingNotesAndHandoutPages();
if ( bOk ) if ( bOk )
{ {
...@@ -1048,7 +1038,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -1048,7 +1038,6 @@ sal_Bool ImplSdPPTImport::Import()
{ {
// set AutoLayout // set AutoLayout
SetPageNum( i, PPT_SLIDEPAGE ); SetPageNum( i, PPT_SLIDEPAGE );
SdPage* pPage = mpDoc->GetSdPage( i, PK_STANDARD ); SdPage* pPage = mpDoc->GetSdPage( i, PK_STANDARD );
AutoLayout eAutoLayout = AUTOLAYOUT_NONE; AutoLayout eAutoLayout = AUTOLAYOUT_NONE;
...@@ -1167,7 +1156,6 @@ sal_Bool ImplSdPPTImport::Import() ...@@ -1167,7 +1156,6 @@ sal_Bool ImplSdPPTImport::Import()
} }
// handout master page: auto layout // handout master page: auto layout
SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT ); SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT );
pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True ); pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True );
} }
......
...@@ -385,13 +385,10 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) ...@@ -385,13 +385,10 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
} }
else if( p == m_pBtnRemove ) else if( p == m_pBtnRemove )
{ {
// sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos();
SvTreeListEntry* pEntry = m_pLbCustomPages->FirstSelected(); SvTreeListEntry* pEntry = m_pLbCustomPages->FirstSelected();
if( pEntry ) if( pEntry )
{ {
sal_uLong nPos = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry ); sal_uLong nPos = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry );
// rpCustomShow->Remove( nPos );
// aLbCustomPages.RemoveEntry( nPos );
m_pLbCustomPages->GetModel()->Remove( m_pLbCustomPages->GetModel()->GetEntryAtAbsPos( nPos ) ); m_pLbCustomPages->GetModel()->Remove( m_pLbCustomPages->GetModel()->GetEntryAtAbsPos( nPos ) );
bModified = sal_True; bModified = sal_True;
...@@ -399,8 +396,6 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) ...@@ -399,8 +396,6 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
} }
else if( p == m_pEdtName ) else if( p == m_pEdtName )
{ {
// rpCustomShow->SetName( aEdtName.GetText() );
bModified = sal_True; bModified = sal_True;
} }
......
...@@ -1102,8 +1102,6 @@ DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, ...@@ -1102,8 +1102,6 @@ DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt,
// DebugSNPrintFVAList - va_list version of DebugSNPrintF. See DebugSNPrintF for more info. // DebugSNPrintFVAList - va_list version of DebugSNPrintF. See DebugSNPrintF for more info.
DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char *fmt, va_list arg) DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char *fmt, va_list arg)
{ {
static const struct DebugSNPrintF_format static const struct DebugSNPrintF_format
...@@ -1528,8 +1526,6 @@ exit: ...@@ -1528,8 +1526,6 @@ exit:
// DebugGetErrorString // DebugGetErrorString
DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *inBuffer, size_t inBufferSize ) DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *inBuffer, size_t inBufferSize )
{ {
const char * s; const char * s;
...@@ -1935,8 +1931,6 @@ DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char ...@@ -1935,8 +1931,6 @@ DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char
// DebugHexDump // DebugHexDump
DEBUG_EXPORT size_t DEBUG_EXPORT size_t
DebugHexDump( DebugHexDump(
DebugLevel inLevel, DebugLevel inLevel,
...@@ -2296,8 +2290,6 @@ DebugHexDump( ...@@ -2296,8 +2290,6 @@ DebugHexDump(
// DebugNumVersionToString // DebugNumVersionToString
static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) static char * DebugNumVersionToString( uint32_t inVersion, char *inString )
{ {
char * s; char * s;
...@@ -2361,8 +2353,6 @@ static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) ...@@ -2361,8 +2353,6 @@ static char * DebugNumVersionToString( uint32_t inVersion, char *inString )
// DebugTaskLevel // DebugTaskLevel
DEBUG_EXPORT uint32_t DebugTaskLevel( void ) DEBUG_EXPORT uint32_t DebugTaskLevel( void )
{ {
uint32_t level; uint32_t level;
...@@ -2382,8 +2372,6 @@ DEBUG_EXPORT uint32_t DebugTaskLevel( void ) ...@@ -2382,8 +2372,6 @@ DEBUG_EXPORT uint32_t DebugTaskLevel( void )
#if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE )
// DebugWinEnableConsole // DebugWinEnableConsole
#pragma warning( disable:4311 ) #pragma warning( disable:4311 )
static void DebugWinEnableConsole( void ) static void DebugWinEnableConsole( void )
...@@ -2468,8 +2456,6 @@ exit: ...@@ -2468,8 +2456,6 @@ exit:
#if ( TARGET_OS_WIN32 ) #if ( TARGET_OS_WIN32 )
// DebugWinCharToTCharString // DebugWinCharToTCharString
static TCHAR * static TCHAR *
DebugWinCharToTCharString( DebugWinCharToTCharString(
const char * inCharString, const char * inCharString,
...@@ -2518,8 +2504,6 @@ DebugWinCharToTCharString( ...@@ -2518,8 +2504,6 @@ DebugWinCharToTCharString(
// DebugServicesTest // DebugServicesTest
DEBUG_EXPORT OSStatus DebugServicesTest( void ) DEBUG_EXPORT OSStatus DebugServicesTest( void )
{ {
OSStatus err; OSStatus err;
......
...@@ -184,8 +184,6 @@ bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::X ...@@ -184,8 +184,6 @@ bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::X
// SlideShowView // SlideShowView
SlideShowView::SlideShowView( ShowWindow& rOutputWindow, SlideShowView::SlideShowView( ShowWindow& rOutputWindow,
SdDrawDocument* pDoc, SdDrawDocument* pDoc,
AnimationMode eAnimationMode, AnimationMode eAnimationMode,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment