Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index



From 6915ac8753f91b31fd0cafe87088ae266c3cba3c Mon Sep 17 00:00:00 2001
From: Antoine Proulx <proulx.antoine@gmail.com>
Date: Sat, 29 Jan 2011 22:07:45 -0500
Subject: [PATCH] Removed dead code

---
 sw/source/filter/rtf/swparrtf.cxx |   46 ++++---------------------------------
 1 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index c24524d..a1ac52a 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -1249,44 +1249,9 @@ void SwRTFParser::ReadDrawingObject()
         aAnchor.SetAnchor( pPam->GetPoint() );
         aFlySet.Put( aAnchor );
 
-        /*
-        text::RelOrientation::FRAME,          // Absatz inkl. Raender
-        text::RelOrientation::PRINT_AREA,     // Absatz ohne Raender
-        text::RelOrientation::CHAR,       // an einem Zeichen
-        text::RelOrientation::PAGE_LEFT,  // im linken Seitenrand
-        text::RelOrientation::PAGE_RIGHT,   // im rechten Seitenrand
-        text::RelOrientation::FRAME_LEFT,   // im linken Absatzrand
-        text::RelOrientation::FRAME_RIGHT,  // im rechten Absatzrand
-        text::RelOrientation::PAGE_FRAME, // Seite inkl. Raender, bei seitengeb. identisch mit 
text::RelOrientation::FRAME
-        text::RelOrientation::PAGE_PRINT_AREA,    // Seite ohne Raender, bei seitengeb. identisch 
mit text::RelOrientation::PRTAREA
-        // OD 11.11.2003 #i22341#
-        text::RelOrientation::TEXT_LINE,  // vertical relative to top of text line, only for 
to-character
-                        // anchored objects.
-
-
-            text::HoriOrientation::NONE,      //Der Wert in nYPos gibt die RelPos direkt an.
-        text::HoriOrientation::RIGHT,     //Der Rest ist fuer automatische Ausrichtung.
-        text::HoriOrientation::CENTER,
-        text::HoriOrientation::LEFT,
-        text::HoriOrientation::INSIDE,
-        text::HoriOrientation::OUTSIDE,
-        text::HoriOrientation::FULL,          //Spezialwert fuer Tabellen
-        text::HoriOrientation::LEFT_AND_WIDTH  //Auch fuer Tabellen
-        */
         SwFmtHoriOrient aHori( 0, text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME );
         aFlySet.Put( aHori );
-        /*
-        text::VertOrientation::NONE,  //Der Wert in nYPos gibt die RelPos direkt an.
-        text::VertOrientation::TOP,   //Der Rest ist fuer automatische Ausrichtung.
-        text::VertOrientation::CENTER,
-        text::VertOrientation::BOTTOM,
-        text::VertOrientation::CHAR_TOP,      //Ausrichtung _nur_ fuer Zeichengebundene Rahmen
-        text::VertOrientation::CHAR_CENTER,   //wie der Name jew. sagt wird der RefPoint des 
Rahmens
-        text::VertOrientation::CHAR_BOTTOM,   //entsprechend auf die Oberkante, Mitte oder 
Unterkante
-        text::VertOrientation::LINE_TOP,      //der Zeile gesetzt. Der Rahmen richtet sich  dann
-        text::VertOrientation::LINE_CENTER,   //entsprechend aus.
-        text::VertOrientation::LINE_BOTTOM
-        */
+
         SwFmtVertOrient aVert( 0, text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME );
         aFlySet.Put( aVert );
 
@@ -1497,7 +1462,6 @@ void SwRTFParser::ReadShapeObject()
               rOutliner.Read(aStream, String::CreateFromAscii(""), EE_FORMAT_RTF);
               OutlinerParaObject* pParaObject=rOutliner.CreateParaObject();
               pStroke->NbcSetOutlinerParaObject(pParaObject);
-              //delete pParaObject;
               rOutliner.Clear();
             }
             if (txflTextFlow==2) {
@@ -3848,10 +3812,10 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
         if( !nPos )
         {
             pColl = pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false );
-            if(nOutlineLevel < MAXLEVEL )                                                      
//->add by zhaojianwei
+            if(nOutlineLevel < MAXLEVEL )
                 pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel );
             else
-                pColl->DeleteAssignmentToListLevelOfOutlineStyle();    //<-end,zhaojianwei
+                pColl->DeleteAssignmentToListLevelOfOutlineStyle();
             return pColl;
         }
 
@@ -3875,10 +3839,10 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
 
     if (!rbCollExist)
     {
-        if(nOutlineLevel < MAXLEVEL)                                           //->add by 
zhaojianwei
+        if(nOutlineLevel < MAXLEVEL)
             pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel );
         else
-            pColl->DeleteAssignmentToListLevelOfOutlineStyle();        //<-end,zhaojianwei
+            pColl->DeleteAssignmentToListLevelOfOutlineStyle();
     }
 
     return pColl;
-- 
1.7.1


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.