incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1378069 - in /incubator/ooo/trunk/main/sw/source/core: draw/dcontact.cxx unocore/unoframe.cxx
Date Tue, 28 Aug 2012 10:31:50 GMT
Author: orw
Date: Tue Aug 28 10:31:49 2012
New Revision: 1378069

URL: http://svn.apache.org/viewvc?rev=1378069&view=rev
Log:
some minor changes in module sw to avoid warning from compiler under windows/cygwin environment

Modified:
    incubator/ooo/trunk/main/sw/source/core/draw/dcontact.cxx
    incubator/ooo/trunk/main/sw/source/core/unocore/unoframe.cxx

Modified: incubator/ooo/trunk/main/sw/source/core/draw/dcontact.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/draw/dcontact.cxx?rev=1378069&r1=1378068&r2=1378069&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/draw/dcontact.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/draw/dcontact.cxx Tue Aug 28 10:31:49 2012
@@ -1505,12 +1505,15 @@ void SwDrawContact::_Changed( const SdrO
                     // of as-character anchored object
                     if ( bAnchoredAsChar )
                     {
-						//-->Modified for i119654,2012.6.8                        
-						SwFrm *pAnchorFrame = NULL;
-                        if ( pAnchoredDrawObj && ( pAnchorFrame = 
-								const_cast<SwAnchoredDrawObject*>( pAnchoredDrawObj )->AnchorFrm() ) )
-							pAnchorFrame->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
-						//<--
+                        //-->Modified for i119654,2012.6.8                        
+                        SwFrm* pAnchorFrame = pAnchoredDrawObj
+                                              ? const_cast<SwAnchoredDrawObject*>(
pAnchoredDrawObj )->AnchorFrm()
+                                              : NULL;
+                        if ( pAnchorFrame )
+                        {
+                            pAnchorFrame->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
+                        }
+                        //<--
                     }
                     // <--
                 }

Modified: incubator/ooo/trunk/main/sw/source/core/unocore/unoframe.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/unocore/unoframe.cxx?rev=1378069&r1=1378068&r2=1378069&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/unocore/unoframe.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/unocore/unoframe.cxx Tue Aug 28 10:31:49 2012
@@ -652,27 +652,32 @@ sal_Bool 	SwGraphicProperties_Impl::AnyT
     GetProperty(RES_GRFATR_MIRRORGRF, MID_MIRROR_HORZ_ODD_PAGES, pHOddMirror);
     GetProperty(RES_GRFATR_MIRRORGRF, MID_MIRROR_VERT, pVMirror);
 
-	if ( pStyle )
-	{
-		rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet(*pStyle) );
+    if ( pStyle )
+    {
+        rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet(*pStyle) );
         const :: SfxItemSet *pItemSet = &xStyle->GetItemSet();
-		//Begin Bug 119922
-    		sal_Bool bOasis = sal_False;
-		SfxMedium* pMedium = NULL;
-		const SfxFilter * pFilter = NULL;		
-		if ( ( pMedium = pDoc->GetDocShell()->GetMedium() ) &&
-				( pFilter = pMedium->GetFilter() ) )
-			bOasis = pFilter->GetVersion() > SOFFICE_FILEFORMAT_60;	
-		bRet = FillBaseProperties( rFrmSet, *pItemSet, rSizeFound, bOasis );
-		//End Bug 119922
-		lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
-	}
-	else
-	{
+        //Begin Bug 119922
+        sal_Bool bOasis = sal_False;
+        {
+            const SfxMedium* pMedium = pDoc->GetDocShell()->GetMedium();
+            const SfxFilter * pFilter = pMedium
+                ? pMedium->GetFilter()
+                : NULL;
+            if ( pMedium && pFilter )
+            {
+                bOasis = pFilter->GetVersion() > SOFFICE_FILEFORMAT_60;
+            }
+        }
+        bRet = FillBaseProperties( rFrmSet, *pItemSet, rSizeFound, bOasis );
+        //End Bug 119922
+        lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
+    }
+    else
+    {
         const :: SfxItemSet *pItemSet = &pDoc->GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC
)->GetAttrSet();
-    	bRet = FillBaseProperties(rFrmSet, *pItemSet, rSizeFound);
-		lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
-	}
+        bRet = FillBaseProperties(rFrmSet, *pItemSet, rSizeFound);
+        lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
+    }
 
 
     static const :: sal_uInt16 nIDs[] =



Mime
View raw message