openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1543812 - /openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
Date Wed, 20 Nov 2013 13:32:31 GMT
Author: orw
Date: Wed Nov 20 13:32:30 2013
New Revision: 1543812

URL: http://svn.apache.org/r1543812
Log:
123578: revert part of changes made for bug 119620 as page styles for only left or only right
pages does not make sense for imported Microsoft Word documents as Microsoft Word does not
support such a feature.


Modified:
    openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx?rev=1543812&r1=1543811&r2=1543812&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx Wed Nov 20 13:32:30 2013
@@ -3882,26 +3882,6 @@ void wwSectionManager::SetUseOn(wwSectio
         rSection.mpTitlePage->WriteUseOn(
             (UseOnPage) (eUseBase | nsUseOnPage::PD_HEADERSHARE | nsUseOnPage::PD_FOOTERSHARE));
     }
-
-	if( nsUseOnPage::PD_MIRROR != (UseOnPage)(eUse & nsUseOnPage::PD_MIRROR) )
-	{
-		if( rSection.maSep.bkc == 3 )
-		{
-			if( rSection.mpPage )
-				rSection.mpPage->SetUseOn( nsUseOnPage::PD_LEFT );
-			if( rSection.mpTitlePage )
-				rSection.mpTitlePage->SetUseOn( nsUseOnPage::PD_LEFT );
-		}
-		else if( rSection.maSep.bkc == 4 )
-		{
-			if( rSection.mpPage )
-				rSection.mpPage->SetUseOn( nsUseOnPage::PD_RIGHT );
-			if( rSection.mpTitlePage )
-				rSection.mpTitlePage->SetUseOn( nsUseOnPage::PD_RIGHT );
-		}
-		
-	}
-    
 }
 
 //Set the page descriptor on this node, handle the different cases for a text
@@ -3981,17 +3961,17 @@ SwFmtPageDesc wwSectionManager::SetSwFmt
     //Set page before hd/ft
     const wwSection *pPrevious = 0;
 
-	mySegIter aPrev = rIter;
-	while( aPrev!= rStart )
-	{
-		aPrev--;
-		pPrevious = &(*(aPrev));
-		if( aPrev->IsContinous())
-			continue;
-		else{
-			break;
-		}
-	}
+    mySegIter aPrev = rIter;
+    while( aPrev!= rStart )
+    {
+        aPrev--;
+        pPrevious = &(*(aPrev));
+        if( aPrev->IsContinous())
+            continue;
+        else{
+            break;
+        }
+    }
 
     SetHdFt(*rIter, std::distance(rStart, rIter), pPrevious);
     SetUseOn(*rIter);



Mime
View raw message