[Libreoffice-commits] .: sd/source

[Michael Meeks]

 sd/source/ui/annotations/annotationmanager.cxx     |   24 --------------------
 sd/source/ui/annotations/annotationmanagerimpl.hxx |    4 ---
 sd/source/ui/inc/OutlineView.hxx                   |    5 ----
 sd/source/ui/view/DocumentRenderer.cxx             |   14 +----------
 sd/source/ui/view/drviews7.cxx                     |   16 -------------
 sd/source/ui/view/outlview.cxx                     |   25 ---------------------
 6 files changed, 3 insertions(+), 85 deletions(-)

New commits:
commit 9b83ffe1c64035d0f04d2da43ee0b62a7f1cbad1
Author: Povilas Kanapickas <povilas.kanapickas at gmail.com>
Date:   Mon Oct 18 15:37:46 2010 +0100

    remove non-compiled code

diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index f51f3c4..64e1046 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 06e57d7..657d016 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 5f96a5b..38a1e7f 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 61c1467..15461c0 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 0b7bb90..e59525a 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 4462aa1..626d65b 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 )