[Libreoffice-commits] core.git: sd/source sfx2/source

Takeshi Abe tabe at fixedpoint.jp
Tue Mar 5 17:27:43 PST 2013


 sd/source/ui/func/futempl.cxx  |    3 ---
 sfx2/source/appl/fileobj.cxx   |    5 -----
 sfx2/source/dialog/dockwin.cxx |    9 ---------
 3 files changed, 17 deletions(-)

New commits:
commit 2082dc5421a7d1e8447cddfca96df084abdc3cbc
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Mar 6 10:21:05 2013 +0900

    Remove dead code
    
    Change-Id: I922286ea88663402e813365cbf7993890d33e9de

diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 14a6035..da0c3ad 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -194,8 +194,6 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
             // Z.Z. geht immer noch der Dialog auf, um den Namen
             // der Vorlage einzugeben.
             mpView->AreObjectsMarked();
-            if( sal_True )
-            {
                 SfxStyleSheetBase *p = pSSPool->Find(aStyleName, (SfxStyleFamily) nFamily, SFXSTYLEBIT_ALL );
                 if(p)
                 {
@@ -204,7 +202,6 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                 }
                 pStyleSheet = &pSSPool->Make( aStyleName, (SfxStyleFamily) nFamily, SFXSTYLEBIT_USERDEF );
                 pStyleSheet->SetParent(String(SdResId(STR_STANDARD_STYLESHEET_NAME)));
-            }
         }
         break;
 
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 385b8b0..da4412e 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -337,11 +337,6 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
                 bDataReady = sal_True;
                 bWaitForData = sal_False;
             }
-            else if( sal_False )
-            {
-                // Set up Timer, to return back
-                pDownLoadData->aTimer.Start();
-            }
         }
     }
 
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index d1b87e6..327f76b 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1466,15 +1466,6 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
         }
         else
         {
-            if ( 0 )
-            {
-                // mouse touches outer border -> treated as floating mode
-                eDockAlign = SFX_ALIGN_NOALIGNMENT;
-                aDockingRect.SetSize( aFloatingSize );
-                rRect = aDockingRect;
-                return eDockAlign;
-            }
-
             // mouse touches inner border -> create new line
             if ( eDockAlign == GetAlignment() && pImp->pSplitWin &&
                  pImp->nLine == pImp->pSplitWin->GetLineCount()-1 && pImp->pSplitWin->GetWindowCount(pImp->nLine) == 1 )


More information about the Libreoffice-commits mailing list