From koffice-devel  Fri Nov 08 07:33:20 2002
From: John Hughes <johughes () shaw ! ca>
Date: Fri, 08 Nov 2002 07:33:20 +0000
To: koffice-devel
Subject: teeny weeny patcheroonie
X-MARC-Message: https://marc.info/?l=koffice-devel&m=103691376903875
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Boundary_(ID_YCaEttSxDehO0/2aLgH2+w)"


--Boundary_(ID_YCaEttSxDehO0/2aLgH2+w)
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline

It seems someone's commit borked, and had a belch in karbon_part_iface.cc...

Also made svgpathparser.cc more gcc-3.2 friendly.
-- 
Later,

-John

--Boundary_(ID_YCaEttSxDehO0/2aLgH2+w)
Content-type: text/x-diff; charset=us-ascii; name=karbon-fix.11-10-02.patch
Content-transfer-encoding: 7BIT
Content-disposition: attachment; filename=karbon-fix.11-10-02.patch

? modules
? tools/.vtool.cc.swp
Index: karbon_part_iface.cc
===================================================================
RCS file: /home/kde/koffice/karbon/karbon_part_iface.cc,v
retrieving revision 1.14
diff -u -3 -p -r1.14 karbon_part_iface.cc
--- karbon_part_iface.cc	27 Oct 2002 11:29:56 -0000	1.14
+++ karbon_part_iface.cc	10 Nov 2002 07:27:48 -0000
@@ -78,15 +78,17 @@ QString KarbonPartIface::unitName() cons
 
 int KarbonPartIface::nbLayer() const
 {
+	//m_part->setBackupFile( _b);
 	return m_part->document().layers().count();
 }
 
 DCOPRef KarbonPartIface::activeLayer()
 {
+	//return m_part->backupFile();
 	if( !m_part->document().activeLayer() )
 		return DCOPRef();
 
 	return DCOPRef( kapp->dcopClient()->appId(),
-					m_part->document().activeLayer()->dcopObject()->objId() );
+	m_part->document().activeLayer()->dcopObject()->objId() );
 }
 
Index: core/svgpathparser.cc
===================================================================
RCS file: /home/kde/koffice/karbon/core/svgpathparser.cc,v
retrieving revision 1.3
diff -u -3 -p -r1.3 svgpathparser.cc
--- core/svgpathparser.cc	22 Oct 2002 17:52:50 -0000	1.3
+++ core/svgpathparser.cc	10 Nov 2002 07:27:49 -0000
@@ -77,7 +77,7 @@ SVGPathParser::getCoord( const char *ptr
 		}
     }
 	number = integer + decimal;
-	number *= sign * pow(10, expsign * exponent);
+	number *= sign * pow((double)10, (double)(expsign * exponent));
 
 	// skip the following space
 	if(*ptr == ' ')
Index: dialogs/vconfiguredlg.cc
===================================================================
RCS file: /home/kde/koffice/karbon/dialogs/vconfiguredlg.cc,v
retrieving revision 1.12
diff -u -3 -p -r1.12 vconfiguredlg.cc
--- dialogs/vconfiguredlg.cc	28 Oct 2002 16:34:23 -0000	1.12
+++ dialogs/vconfiguredlg.cc	10 Nov 2002 07:27:49 -0000
@@ -377,7 +377,7 @@ void VConfigDefaultPage::apply()
 	if( state != m_oldBackupFile )
 	{
 		m_config->writeEntry( "BackupFile", state );
-		m_view->part()->setBackupFile( state );
+	//	m_view->part()->setBackupFile( state );
 		m_oldBackupFile = state;
 	}
 }

--Boundary_(ID_YCaEttSxDehO0/2aLgH2+w)--
_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel