[Libreoffice-commits] .: sw/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Jan 26 01:28:50 PST 2011


 sw/source/filter/ww1/w1sprm.cxx |   27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

New commits:
commit aaa142512395d5d792013deb73bf9eef0b4cc19e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 26 09:22:05 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 1b58e4a..11a66f9 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -584,32 +584,17 @@ void Ww1SingleSprmPpc::Start(
         return;									// nicht
 
     RndStdIds eAnchor;			// Bindung
-    sal_Int16 eHRel;        // Seite oder Seitenrand
-    sal_Int16 eVRel;        // Seite oder Seitenrand
-
-    switch ( ( nPpc & 0x30 ) >> 4 ){		// Y - Bindung bestimmt Sw-Bindung
-    case 0: eAnchor = FLY_AT_PARA;          // Vert Margin
-            eVRel = text::RelOrientation::PRINT_AREA;
 
+    switch ( ( nPpc & 0x30 ) >> 4 )     // Y - Bindung bestimmt Sw-Bindung
+    {
+        case 0:
+            eAnchor = FLY_AT_PARA;      // Vert Margin
             break;
-
-    default:eAnchor = FLY_AT_PAGE;          // Vert Page oder unknown
-            eVRel = text::RelOrientation::FRAME;
+        default:
+            eAnchor = FLY_AT_PAGE;      // Vert Page oder unknown
             break;							// 2=Vert. Paragraph, 3=Use Default
     }
 
-    switch ( ( nPpc & 0xc0 ) >> 6 ){        // X - Bindung -> Koordinatentransformation
-    case 0: 								// Hor. Spalte
-    case 1: 								// Hor. Absatz
-            eHRel = text::RelOrientation::PRINT_AREA;
-
-            break;
-
-    default:
-            eHRel = text::RelOrientation::FRAME;
-            break;
-    }
-
     if( !rOut.IsInFly() && rMan.IsInStyle() ){
         rOut.BeginFly( eAnchor );			// Starte StyleFly
     }else{


More information about the Libreoffice-commits mailing list