diff options
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 12 | ||||
| -rw-r--r-- | sd/source/ui/dlg/custsdlg.cxx | 5 | ||||
| -rwxr-xr-x | sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c | 16 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 2 |
4 files changed, 0 insertions, 35 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 605d22ed4221..b6f1c665d347 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -571,9 +571,7 @@ sal_Bool ImplSdPPTImport::Import() SfxStyleSheet* pSheet; if ( nMasterNum == 1 ) { - // standardsheet - pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ); if ( pSheet ) { @@ -621,7 +619,6 @@ sal_Bool ImplSdPPTImport::Import() // set stylesheets - if ( pPage->GetPageKind() == PK_STANDARD ) { sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE; @@ -635,7 +632,6 @@ sal_Bool ImplSdPPTImport::Import() } // titelstylesheet - pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ); if ( pSheet ) { @@ -648,7 +644,6 @@ sal_Bool ImplSdPPTImport::Import() } // outlinerstylesheet - sal_uInt16 nLevel; PPTParagraphObj* pParagraphs[ 9 ]; PPTParagraphObj* pPreviousPara = NULL; @@ -676,7 +671,6 @@ sal_Bool ImplSdPPTImport::Import() for ( nLevel = 0; nLevel < 9; delete pParagraphs[ nLevel++ ] ) ; // subtitle stylesheet - pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ); if ( pSheet ) { @@ -712,7 +706,6 @@ sal_Bool ImplSdPPTImport::Import() SetPageNum( i, PPT_MASTERPAGE ); // importing master page objects - PptSlidePersistList* pList = GetPageList( eAktPageKind ); PptSlidePersistEntry* pPersist = ( pList && ( nAktPageNum < pList->size() ) ) ? (*pList)[ nAktPageNum ] : NULL; @@ -831,7 +824,6 @@ sal_Bool ImplSdPPTImport::Import() // background object - pObj = pMPage->GetObj( 0 ); if ( pObj && pObj->GetObjIdentifier() == OBJ_RECT ) { @@ -869,7 +861,6 @@ sal_Bool ImplSdPPTImport::Import() } // importing slide pages - { sal_uInt32 nFPosMerk = rStCtrl.Tell(); PptPageKind ePageKind = eAktPageKind; @@ -1040,7 +1031,6 @@ sal_Bool ImplSdPPTImport::Import() } // create handout and note pages - bOk = mpDoc->CreateMissingNotesAndHandoutPages(); if ( bOk ) { @@ -1048,7 +1038,6 @@ sal_Bool ImplSdPPTImport::Import() { // set AutoLayout - SetPageNum( i, PPT_SLIDEPAGE ); SdPage* pPage = mpDoc->GetSdPage( i, PK_STANDARD ); AutoLayout eAutoLayout = AUTOLAYOUT_NONE; @@ -1167,7 +1156,6 @@ sal_Bool ImplSdPPTImport::Import() } // handout master page: auto layout - SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT ); pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True ); } diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 19a6bac34d49..8c7f54da43b2 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -385,13 +385,10 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) } else if( p == m_pBtnRemove ) { - // sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos(); SvTreeListEntry* pEntry = m_pLbCustomPages->FirstSelected(); if( pEntry ) { sal_uLong nPos = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry ); - // rpCustomShow->Remove( nPos ); - // aLbCustomPages.RemoveEntry( nPos ); m_pLbCustomPages->GetModel()->Remove( m_pLbCustomPages->GetModel()->GetEntryAtAbsPos( nPos ) ); bModified = sal_True; @@ -399,8 +396,6 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) } else if( p == m_pEdtName ) { - // rpCustomShow->SetName( aEdtName.GetText() ); - bModified = sal_True; } diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c index 6e397c805235..a2e3b580286b 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c @@ -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. - - DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char *fmt, va_list arg) { static const struct DebugSNPrintF_format @@ -1528,8 +1526,6 @@ exit: // DebugGetErrorString - - DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *inBuffer, size_t inBufferSize ) { const char * s; @@ -1935,8 +1931,6 @@ DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char // DebugHexDump - - DEBUG_EXPORT size_t DebugHexDump( DebugLevel inLevel, @@ -2296,8 +2290,6 @@ DebugHexDump( // DebugNumVersionToString - - static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) { char * s; @@ -2361,8 +2353,6 @@ static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) // DebugTaskLevel - - DEBUG_EXPORT uint32_t DebugTaskLevel( void ) { uint32_t level; @@ -2382,8 +2372,6 @@ DEBUG_EXPORT uint32_t DebugTaskLevel( void ) #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) // DebugWinEnableConsole - - #pragma warning( disable:4311 ) static void DebugWinEnableConsole( void ) @@ -2468,8 +2456,6 @@ exit: #if ( TARGET_OS_WIN32 ) // DebugWinCharToTCharString - - static TCHAR * DebugWinCharToTCharString( const char * inCharString, @@ -2518,8 +2504,6 @@ DebugWinCharToTCharString( // DebugServicesTest - - DEBUG_EXPORT OSStatus DebugServicesTest( void ) { OSStatus err; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 48a782585c50..b56ee18e4c20 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -184,8 +184,6 @@ bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::X // SlideShowView - - SlideShowView::SlideShowView( ShowWindow& rOutputWindow, SdDrawDocument* pDoc, AnimationMode eAnimationMode, |