incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1386501 [10/10] - in /incubator/ooo/branches/writer001: ./ ext_libraries/ratscan/ ext_sources/ main/ main/autodoc/source/display/html/ main/basegfx/inc/basegfx/numeric/ main/basegfx/source/numeric/ main/basegfx/source/tools/ main/basic/sou...
Date Mon, 17 Sep 2012 08:06:23 GMT
Modified: incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.cxx (original)
+++ incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.cxx Mon
Sep 17 08:06:09 2012
@@ -566,7 +566,7 @@ uno::Reference< text::XTextColumns > Sec
         uno::Reference< beans::XPropertySet > xColumnPropSet( xColumns, uno::UNO_QUERY_THROW
);
         if( !m_bEvenlySpaced &&
                 (sal_Int32(m_aColWidth.size()) == (m_nColumnCount + 1 )) &&
-                (sal_Int32(m_aColDistance.size()) == m_nColumnCount))
+                ((sal_Int32(m_aColDistance.size()) == m_nColumnCount) || (sal_Int32(m_aColDistance.size())
== m_nColumnCount + 1)) )
         {
             //the column width in word is an absolute value, in OOo it's relative
             //the distances are both absolute
@@ -945,22 +945,22 @@ void SectionPropertyMap::CloseSectionGro
         if(nRubyHeight < 0 )
             nRubyHeight = 0;
         operator[]( PropertyDefinition( PROP_GRID_RUBY_HEIGHT, false )) = uno::makeAny( nRubyHeight
);
-
-        sal_Int16 nGridMode = text::TextGridMode::NONE;
         
-        switch (m_nGridType)
+        // #i119558#, force to set document as standard page mode,
+        // refer to ww8 import process function "SwWW8ImplReader::SetDocumentGrid"
+        try
         {
-            case NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_lines:
-                nGridMode = text::TextGridMode::LINES;
-                break;
-            case NS_ooxml::LN_Value_wordprocessingml_ST_DocGrid_linesAndChars:
-                nGridMode = text::TextGridMode::LINES_AND_CHARS;
-                break;
-            default:
-                break;
+            uno::Reference< beans::XPropertySet > xDocProperties;
+            xDocProperties = uno::Reference< beans::XPropertySet >( rDM_Impl.GetTextDocument(),
uno::UNO_QUERY_THROW );
+            sal_Bool bSquaredPageMode = sal_False;
+            operator[]( PropertyDefinition( PROP_GRID_STANDARD_MODE, false )) = uno::makeAny(
!bSquaredPageMode );
+            xDocProperties->setPropertyValue( rtl::OUString::createFromAscii("DefaultPageMode"),
uno::makeAny( bSquaredPageMode ));
+        }
+        catch (const uno::Exception& rEx)
+        {
+            OSL_ENSURE( false, "Exception in SectionPropertyMap::CloseSectionGroup");
+            (void)rEx;
         }
-        
-        operator[](PropertyDefinition(PROP_GRID_MODE, false)) = uno::makeAny(nGridMode);
         
         _ApplyProperties( xFollowPageStyle );
 

Modified: incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.hxx (original)
+++ incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/PropertyMap.hxx Mon
Sep 17 08:06:09 2012
@@ -417,6 +417,8 @@ class StyleSheetPropertyMap : public Pro
     sal_Int16               mnListLevel;
 
     sal_Int16               mnOutlineLevel;
+    
+    sal_Int32               mnNumId;
 public: 
     explicit StyleSheetPropertyMap();
     ~StyleSheetPropertyMap();
@@ -497,6 +499,9 @@ public: 
         if ( nLevel < WW_OUTLINE_MAX )
             mnOutlineLevel = nLevel; 
     }
+    
+    sal_Int32   GetNumId() const               { return mnNumId; }
+    void        SetNumId(sal_Int32 nId)        { mnNumId = nId; }
 };
 /*-- 27.12.2007 12:38:06---------------------------------------------------
 

Modified: incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.cxx
(original)
+++ incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.cxx
Mon Sep 17 08:06:09 2012
@@ -221,7 +221,19 @@ void lcl_mergeProps( PropertyMapPtr pToF
     pToFill->insert( pToAdd );
 }
 
-PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask )
+void TableStyleSheetEntry::MergePropertiesFromMask(const short nBit, const sal_Int32 nMask,

+                                                   const TblStyleType nStyleId,
+                                                   PropertyMapPtr pToFill)
+{
+    TblStylePrs::iterator pIt = m_aStyles.find( nStyleId );
+
+    short nTestBit = 1 << nBit;
+    sal_Int32 nBitMask = sal_Int32( nTestBit );
+    if ( ( nMask & nBitMask ) && ( pIt != m_aStyles.end( ) ) )
+        lcl_mergeProps( pToFill, pIt->second, nStyleId );
+}
+
+PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( const sal_Int32 nMask )
 {
     // Order from right to left
     static TblStyleType aBitsOrder[] = 
@@ -243,21 +255,22 @@ PropertyMapPtr TableStyleSheetEntry::Get
 
     // Get the properties applying according to the mask
     PropertyMapPtr pProps( new PropertyMap( ) );
-    short nBit = 0;
+    short nBit = 4;
     do
     {
-        TblStyleType nStyleId = aBitsOrder[nBit];
-        TblStylePrs::iterator pIt = m_aStyles.find( nStyleId );
-
-        short nTestBit = 1 << nBit;
-        sal_Int32 nBitMask = sal_Int32( nTestBit );
-        if ( ( nMask & nBitMask ) && ( pIt != m_aStyles.end( ) ) )
-            lcl_mergeProps( pProps, pIt->second, nStyleId );
-
+        MergePropertiesFromMask(nBit, nMask, aBitsOrder[nBit], pProps);
         nBit++;
     }
     while ( nBit < 13 );
 
+    nBit = 0;
+    do
+    {
+        MergePropertiesFromMask(nBit, nMask, aBitsOrder[nBit], pProps);
+        nBit++;
+    }
+    while ( nBit < 4 );         // nw/ne/sw/se overwrite others
+
     return pProps;
 }
 
@@ -543,9 +556,13 @@ void StyleSheetTable::lcl_sprm(Sprm & rS
         case NS_ooxml::LN_CT_Style_personalReply:
         case NS_ooxml::LN_CT_Style_rsid:
         case NS_ooxml::LN_CT_Style_trPr:
-        case NS_ooxml::LN_CT_Style_tcPr:
             /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         break;
+        case NS_ooxml::LN_CT_Style_tcPr:
+        {
+            resolveSprmProps(rSprm);
+        }
+        break;
         case NS_ooxml::LN_CT_Style_tblPr: //contains table properties
         case NS_ooxml::LN_CT_Style_tblStylePr: //contains  to table properties
 

Modified: incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.hxx
(original)
+++ incubator/ooo/branches/writer001/main/writerfilter/source/dmapper/StyleSheetTable.hxx
Mon Sep 17 08:06:09 2012
@@ -145,7 +145,9 @@ public:
     virtual ~TableStyleSheetEntry( );
 
 protected:
-    PropertyMapPtr GetLocalPropertiesFromMask( sal_Int32 nMask );
+    PropertyMapPtr GetLocalPropertiesFromMask( const sal_Int32 nMask );
+    void           MergePropertiesFromMask(const short nBit, const sal_Int32 nMask, 
+                                           const TblStyleType nStyleId, PropertyMapPtr pToFill);
 };
 typedef boost::shared_ptr<TableStyleSheetEntry> TableStyleSheetEntryPtr;
 

Modified: incubator/ooo/branches/writer001/main/xmloff/source/draw/XMLNumberStyles.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/xmloff/source/draw/XMLNumberStyles.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/xmloff/source/draw/XMLNumberStyles.cxx (original)
+++ incubator/ooo/branches/writer001/main/xmloff/source/draw/XMLNumberStyles.cxx Mon Sep 17
08:06:09 2012
@@ -502,7 +502,7 @@ private:
 	sal_Bool mbTextual;
 	sal_Bool mbDecimal02;
 	OUString maText;
-	SvXMLImportContext* mpSlaveContext;
+	boost::shared_ptr< SvXMLImportContext > mpSlaveContext;
 
 public:
 	TYPEINFO();

Modified: incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
(original)
+++ incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
Mon Sep 17 08:06:09 2012
@@ -122,7 +122,7 @@ void traceTrustStatus(DWORD err)
     }
 }
 
-SecurityEnvironment_MSCryptImpl :: SecurityEnvironment_MSCryptImpl( const Reference< XMultiServiceFactory
>& aFactory ) : m_hProv( NULL ) , m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore(
NULL ), m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( aFactory ),
m_bEnableDefault( sal_False ) {
+SecurityEnvironment_MSCryptImpl :: SecurityEnvironment_MSCryptImpl( const Reference< XMultiServiceFactory
>& aFactory ) : m_hProv( NULL ) , m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore(
NULL ), m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( aFactory ),
m_bEnableDefault( sal_False ), m_hMySystemStore(NULL), m_hRootSystemStore(NULL), m_hTrustSystemStore(NULL),
m_hCaSystemStore(NULL){
 
 }
 
@@ -148,6 +148,27 @@ SecurityEnvironment_MSCryptImpl :: ~Secu
 		m_hKeyStore = NULL ;
 	}
 
+	//i120675, close the store handles 
+	if( m_hMySystemStore != NULL ) {
+		CertCloseStore( m_hMySystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hMySystemStore = NULL ;
+	}
+
+	if( m_hRootSystemStore != NULL ) {
+		CertCloseStore( m_hRootSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hRootSystemStore = NULL ;
+	}
+
+	if( m_hTrustSystemStore != NULL ) {
+		CertCloseStore( m_hTrustSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hTrustSystemStore = NULL ;
+	}
+
+	if( m_hCaSystemStore != NULL ) {
+		CertCloseStore( m_hCaSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hCaSystemStore = NULL ;
+	}
+
 	if( !m_tSymKeyList.empty()  ) {
 		std::list< HCRYPTKEY >::iterator symKeyIt ;
 
@@ -1260,40 +1281,42 @@ xmlSecKeysMngrPtr SecurityEnvironment_MS
 	 * Adopt system default certificate store.
 	 */
 	if( defaultEnabled() ) {
-		HCERTSTORE hSystemStore ;
-
 		//Add system key store into the keys manager.
-		hSystemStore = CertOpenSystemStore( 0, "MY" ) ;
-		if( hSystemStore != NULL ) {
-			if( xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore( pKeysMngr, hSystemStore ) < 0 ) {
-				CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hMySystemStore = CertOpenSystemStore( 0, "MY" ) ;
+		if( m_hMySystemStore != NULL ) {
+			if( xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore( pKeysMngr, m_hMySystemStore ) < 0 )
{
+				CertCloseStore( m_hMySystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+				m_hMySystemStore = NULL;
 				throw RuntimeException() ;
 			}
 		}
 
 		//Add system root store into the keys manager.
-		hSystemStore = CertOpenSystemStore( 0, "Root" ) ;
-		if( hSystemStore != NULL ) {
-			if( xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore( pKeysMngr, hSystemStore ) < 0 )
{
-				CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hRootSystemStore = CertOpenSystemStore( 0, "Root" ) ;
+		if( m_hRootSystemStore != NULL ) {
+			if( xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore( pKeysMngr, m_hRootSystemStore ) <
0 ) {
+				CertCloseStore( m_hRootSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+				m_hRootSystemStore = NULL;
 				throw RuntimeException() ;
 			}
 		}
 
 		//Add system trusted store into the keys manager.
-		hSystemStore = CertOpenSystemStore( 0, "Trust" ) ;
-		if( hSystemStore != NULL ) {
-			if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, hSystemStore ) < 0
) {
-				CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hTrustSystemStore = CertOpenSystemStore( 0, "Trust" ) ;
+		if( m_hTrustSystemStore != NULL ) {
+			if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, m_hTrustSystemStore )
< 0 ) {
+				CertCloseStore( m_hTrustSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+				m_hTrustSystemStore = NULL;
 				throw RuntimeException() ;
 			}
 		}
 
 		//Add system CA store into the keys manager.
-		hSystemStore = CertOpenSystemStore( 0, "CA" ) ;
-		if( hSystemStore != NULL ) {
-			if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, hSystemStore ) < 0
) {
-				CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hCaSystemStore = CertOpenSystemStore( 0, "CA" ) ;
+		if( m_hCaSystemStore != NULL ) {
+			if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, m_hCaSystemStore ) <
0 ) {
+				CertCloseStore( m_hCaSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+				m_hCaSystemStore = NULL;
 				throw RuntimeException() ;
 			}
 		}

Modified: incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
(original)
+++ incubator/ooo/branches/writer001/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
Mon Sep 17 08:06:09 2012
@@ -75,7 +75,13 @@ class SecurityEnvironment_MSCryptImpl : 
 
 		//Certiticate store
 		HCERTSTORE							m_hCertStore ;
-
+		
+		// i120675, save the store handles
+		HCERTSTORE 							m_hMySystemStore;
+		HCERTSTORE 							m_hRootSystemStore;
+		HCERTSTORE 							m_hTrustSystemStore;
+		HCERTSTORE 							m_hCaSystemStore;
+		
 		//Enable default system cryptography setting
 		sal_Bool							m_bEnableDefault ;
 

Modified: incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/README.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/README.txt?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/README.txt (original)
+++ incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/README.txt Mon Sep 17
08:06:09 2012
@@ -11,8 +11,9 @@ java -jar httpserv/dist/httpserv.jar --a
 portnumber: an arbitrary port number to which the server should listen.
 
 httpserv looks for the requested file relativ to the current directory. For
-example, you are in a directory which contains the index.html. From there
-you run httpserv.jar:
+example, you are in
+$(SRC_ROOT)/xmlsecurity/$(INPATH)/httpserv/dist/javadoc,
+a directory which contains the index.html. From there you run httpserv.jar:
 
 java -jar <path_to_wherever_it_is>/httpserv.jar --accept 8000
 

Modified: incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/build.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/build.xml?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/build.xml (original)
+++ incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/build.xml Mon
Sep 17 08:06:09 2012
@@ -91,4 +91,9 @@
     nbproject/build-impl.xml file. 
 
     -->
+    <!-- Import the environment as properties to make them available in project.properties
+    -->
+    <target name="-pre-init">
+      <property environment="env" />
+    </target>
 </project>

Modified: incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties
(original)
+++ incubator/ooo/branches/writer001/main/xmlsecurity/test_docs/tools/httpserv/nbproject/project.properties
Mon Sep 17 08:06:09 2012
@@ -39,7 +39,7 @@ debug.classpath=\
 debug.test.classpath=\
     ${run.test.classpath}
 # This directory is removed when the project is cleaned:
-dist.dir=dist
+dist.dir=../../../${env.INPATH}/misc/httpserv
 dist.jar=${dist.dir}/httpserv.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 excludes=

Propchange: incubator/ooo/branches/writer001/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 17 08:06:09 2012
@@ -0,0 +1,7 @@
+/incubator/ooo/branches/AOO34/main/test:1346776-1346777,1347535,1348052,1350569,1352456,1369110,1371068
+/incubator/ooo/branches/AOO34/test:1346776-1346777,1347535,1348052,1350569,1352456,1369110,1371068
+/incubator/ooo/branches/alg/linecap/main/test:1226811-1232461
+/incubator/ooo/branches/alg/linecap/test:1226811-1232461
+/incubator/ooo/branches/alg/svgreplacement/main/test:1205420-1220782
+/incubator/ooo/branches/alg/svgreplacement/test:1205420-1220782
+/incubator/ooo/trunk/test:1353792-1374969,1379248-1386490

Propchange: incubator/ooo/branches/writer001/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
  Merged /incubator/ooo/branches/alg/linecap/main/test/testcommon/source/org/openoffice/test/vcl:r1226811-1232461
  Merged /incubator/ooo/branches/AOO34/main/test/testcommon/source/org/openoffice/test/vcl:r1346776-1346777,1347535,1348052,1350569,1352456,1369110,1371068
  Merged /incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/vcl:r1379248-1386490
  Merged /incubator/ooo/branches/alg/svgreplacement/main/test/testcommon/source/org/openoffice/test/vcl:r1205420-1220782



Mime
View raw message