Bug 101554

Created attachment 10127 [details]
koffice patch to build on amd64 w/ gcc4

Any chance of this patch being applied soon? amd64 and gcc4 are both becoming more common.

Thanks!

Sorry, I CCed the wrong person but KDE Bugs is dead right now for me, so I 
will have to change it later.

I am not the author of this filter but I find replacing DWORD by long curious.
(DWORD is 32 bits and as far as I know long is 64 bits on an AMD 64).

Have a nice day! 

Pls apply the patch, we had to apply something similar in SUSE too. The patch is correct.

On Sunday 05 June 2005 12:06, Lukas Tinkl wrote:
(...)
> ------- Additional Comments From lukas kde org  2005-06-05 12:06 -------
> Pls apply the patch, we had to apply something similar in SUSE too. The
> patch is correct.


Good then I don't mind, but I have not any KOffice SVN source currently, o 
somebody else must do it. Sorry!

Have a nice day!

SVN commit 422528 by dfaure:

build on amd64 w/ gcc4, patch by "debian kde maintainers" - thanks!
BUG:101554


 M  +5 -5      kword/mswrite/structures_generated.cpp  
 M  +1 -1      olefilters/winword97/msword.cc  
 M  +2 -2      olefilters/winword97/properties.cc  


--- branches/koffice/1.4/koffice/filters/kword/mswrite/structures_generated.cpp #422527:422528
@@ -93,7 +93,7 @@
 		if (!Verify (Error::InvalidFormat, m_magic2 == 0xAB00, DWord (m_magic2))) return false;
 		for (int i = 0; i < 4; i++)
 		{
-			if (!Verify (Error::InvalidFormat, m_zero2 [i] == 0, DWord (m_zero2))) return false;
+                       if (!Verify (Error::InvalidFormat, m_zero2 [i] == 0, long (m_zero2))) return false;
 		}
 		if (!Verify (Error::InvalidFormat, m_numCharBytesPlus128 >= 128, DWord (m_numCharBytesPlus128))) return false;
 		// m_pageParaInfo will not be checked
@@ -104,7 +104,7 @@
 		// m_pageFontTable will not be checked
 		for (int i = 0; i < 33; i++)
 		{
-			if (!Verify (Error::Warn, m_zero3 [i] == 0, DWord (m_zero3))) return false;
+                       if (!Verify (Error::Warn, m_zero3 [i] == 0, long (m_zero3))) return false;
 		}
 		if (!Verify (Error::InvalidFormat, m_numPages > 0, DWord (m_numPages))) return false;
 		return true;
@@ -1243,7 +1243,7 @@
 		// m_lineSpacing will not be checked
 		for (int i = 0; i < 2; i++)
 		{
-			if (!Verify (Error::Warn, m_zero [i] == 0, DWord (m_zero))) return false;
+                       if (!Verify (Error::Warn, m_zero [i] == 0, long (m_zero))) return false;
 		}
 		// m_headerOrFooter will not be checked
 		// m_isNotNormalParagraph will not be checked
@@ -1252,7 +1252,7 @@
 		if (!Verify (Error::Warn, m_zero2 == 0, DWord (m_zero2))) return false;
 		for (int i = 0; i < 5; i++)
 		{
-			if (!Verify (Error::Warn, m_zero3 [i] == 0, DWord (m_zero3))) return false;
+                       if (!Verify (Error::Warn, m_zero3 [i] == 0, long (m_zero3))) return false;
 		}
 		for (int i = 0; i < 14; i++)
 		{
@@ -1493,7 +1493,7 @@
 		// m_totalBytes will not be checked
 		for (int i = 0; i < 2; i++)
 		{
-			if (!Verify (Error::Warn, m_zero [i] == 0, DWord (m_zero))) return false;
+                       if (!Verify (Error::Warn, m_zero [i] == 0, long (m_zero))) return false;
 		}
 		// m_actualImageOffset will not be checked
 		return true;
--- branches/koffice/1.4/koffice/filters/olefilters/winword97/msword.cc #422527:422528
@@ -1613,7 +1613,7 @@
     // The grupx reader code has to know about the alignment of the STD. We
     // choose to store this in a convenient field.
 
-    out->fScratch = ((int)in & 1);
+    out->fScratch = ((long)in & 1);
 
     // If the baseInFile is less than 10, then the style name is not stored in unicode!
 
--- branches/koffice/1.4/koffice/filters/olefilters/winword97/properties.cc #422527:422528
@@ -1089,7 +1089,7 @@
         // Align to an even-byte offset *within* the STD. The alignment
         // of the STD was stored in fScratch.
 
-        if (((int)grpprl & 1) ^ style.fScratch)
+        if (((long)grpprl & 1) ^ style.fScratch)
             grpprl++;
         grpprl += MsWordGenerated::read(grpprl, &cbUpx);
         if (cbUpx)
@@ -1112,7 +1112,7 @@
         // Align to an even-byte offset *within* the STD. The alignment
         // of the STD was stored in fScratch.
 
-        if (((int)grpprl & 1) ^ style.fScratch)
+        if (((long)grpprl & 1) ^ style.fScratch)
             grpprl++;
         grpprl += MsWordGenerated::read(grpprl, &cbUpx);
         if (cbUpx)