diff options
author | Povilas Kanapickas <povilas.kanapickas@gmail.com> | 2010-10-18 15:37:46 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-18 15:37:46 +0100 |
commit | 628d36ff1efc0bbfb9f387e240adda2277067ce8 (patch) | |
tree | 0ccd139bd325d7728291d2017cbefb72d925a05b /sd | |
parent | 6fdcfcc10dd6d46bc3c954d0a18a39161f04a221 (diff) |
remove non-compiled code
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 24 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationmanagerimpl.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/OutlineView.hxx | 5 | ||||
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/view/drviews7.cxx | 16 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 25 |
6 files changed, 3 insertions, 85 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index dd4913456a3e..a6a1ae2051fb 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -973,30 +973,6 @@ IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener, } return 0; } -#if 0 -OUString AnnotationManagerImpl::GetHelpText( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ) -{ - OUString sRet; - if( xAnnotation.is() ) - { - OUString sAuthor( xAnnotation->getAuthor() ); - if( sAuthor.getLength() != 0 ) - { - sRet += sAuthor; - } - sRet += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) ); - - sRet += getAnnotationDateTimeString( xAnnotation ); - sRet += OUString( RTL_CONSTASCII_USTRINGPARAM( "]\n" ) ); - - Reference< XText > xText( xAnnotation->getTextRange() ); - if( xText.is() ) - sRet += xText->getString(); - } - - return sRet; -} -#endif void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu /* = false */ ) { diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 70b95c2a509b..a3e2eaa8b5ac 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -99,9 +99,7 @@ public: void onTagDeselected( AnnotationTag& rTag ); void onSelectionChanged(); -#if 0 - rtl::OUString GetHelpText( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); -#endif + void addListener(); void removeListener(); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 78481294bf94..b7b18b162bf7 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -161,11 +161,6 @@ public: cursor position. */ void IgnoreCurrentPageChanges (bool bIgnore); - -#if 0 - sal_Int32 GetPageNumberWidthPixel(); -#endif - void InvalidateSlideNumberArea(); /** creates and inserts an empty slide for the given paragraph. */ diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index eab0ba8ca293..1165b5bb3c2e 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -2258,12 +2258,6 @@ private: // if CutPage is set then do not move it, otherwise move the // scaled page to printable area - #if 0 - if (bCutPage) - aMap.SetOrigin(Point(-aPageOffset.X(), -aPageOffset.Y())); - else - aMap.SetOrigin(Point(0,0)); - #endif maPrinterPages.push_back( ::boost::shared_ptr<PrinterPage>( new RegularPrinterPage( @@ -2288,13 +2282,9 @@ private: rInfo.maPageSize.Width() - rPage.GetLftBorder() - rPage.GetRgtBorder()); const long nPageHeight ( rInfo.maPageSize.Height() - rPage.GetUppBorder() - rPage.GetLwrBorder()); - #if 0 - Point aOrigin ( - nPageWidth < rInfo.maPrintSize.Width() ? -aPageOffset.X() : 0, - nPageHeight < rInfo.maPrintSize.Height() ? -aPageOffset.Y() : 0); - #else + Point aOrigin ( 0, 0 ); - #endif + for (Point aPageOrigin = aOrigin; -aPageOrigin.Y()<nPageHeight; aPageOrigin.Y() -= rInfo.maPrintSize.Height()) diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index a3edbb52e7ed..b6b151ba0bee 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1350,22 +1350,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } } - // #i102735# discussed with CL: removed for performance reasons - #if 0 - if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_SOUND ) || - SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_VIDEO ) ) - { - /////////////////////////////////////////////////////////////////////// - // Menuoption : Insert->Object->Sound and Insert->Object->Video - // diable, if there isn't installed any appropriate plugin - // - if (!SvxPluginFileDlg::IsAvailable (SID_INSERT_SOUND)) - rSet.DisableItem (SID_INSERT_SOUND); - if (!SvxPluginFileDlg::IsAvailable (SID_INSERT_VIDEO)) - rSet.DisableItem (SID_INSERT_VIDEO); - } - #endif - /////////////////////////////////////////////////////////////////////// // Menuoption: Change->Convert->To Bitmap, Change->Convert->To Metafile // disable, if there only Bitmap or Metafiles marked diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 01ef59943853..fab725a31d58 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -2041,31 +2041,6 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) return 0; } -#if 0 -sal_Int32 OutlineView::GetPageNumberWidthPixel() -{ - Window* pActWin = mpOutlineViewShell->GetActiveWindow(); - if( pActWin ) - { - Font aOldFont( pActWin->GetFont() ); - pActWin->SetFont( maPageNumberFont ); - Size aSize( pActWin->GetTextWidth( String( RTL_CONSTASCII_USTRINGPARAM("X" ) ) ), 0 ); - sal_Int32 nWidth = pActWin->LogicToPixel( aSize ).Width() * 5; - - const String aBulletStr( sal_Unicode( 0xE011 ) ); - pActWin->SetFont( maBulletFont); - - aSize.Width() = pActWin->GetTextWidth(aBulletStr); - nWidth += pActWin->LogicToPixel( aSize ).Width(); - - pActWin->SetFont( aOldFont ); - - mnPageNumberWidthPixel = nWidth; - } - return mnPageNumberWidthPixel; -} -#endif - // -------------------------------------------------------------------- void OutlineView::UpdateParagraph( USHORT nPara ) |