diff --git a/ChangeLog b/ChangeLog
index 7b722867d..734bd83f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-24  Brian Matherly  <brian@gramps-project.org>
+	* src/docgen/ODFDoc.py (rotate_text, init): fix rotated text location and 
+	  remove background color to improve the fanchart display (#0001072)
+
 2007-06-24  Alex Roitman  <shura@gramps-project.org>
 	* src/GrampsDb/_GrampsBSDDB.py (load): Typo.
 	* src/DbLoader.py (read_file): Fix error reporting.
diff --git a/src/docgen/ODFDoc.py b/src/docgen/ODFDoc.py
index c15472eff..0d712a768 100644
--- a/src/docgen/ODFDoc.py
+++ b/src/docgen/ODFDoc.py
@@ -210,6 +210,20 @@ class ODFDoc(BaseDoc.BaseDoc):
             self.cntnt.write('/>\n')
             self.cntnt.write('</style:style>\n')
 
+        # Graphic style for items with a clear background
+        self.cntnt.write('<style:style style:name="clear" ')
+        self.cntnt.write('style:family="graphic">\n')
+        self.cntnt.write('\t<style:graphic-properties draw:stroke="none" ')
+        self.cntnt.write('draw:fill="none" draw:shadow="hidden" ')
+        self.cntnt.write('style:run-through="background" ')
+        self.cntnt.write('style:vertical-pos="from-top" ')
+        self.cntnt.write('style:vertical-rel="paragraph" ')
+        self.cntnt.write('style:horizontal-pos="from-left" ')
+        self.cntnt.write('style:horizontal-rel="paragraph" ')
+        self.cntnt.write('draw:wrap-influence-on-position="once-concurrent" ')
+        self.cntnt.write('style:flow-with-text="false"/>')
+        self.cntnt.write('</style:style>\n')
+        
         for style_name in self.style_list.keys():
             style = self.style_list[style_name]
 
@@ -970,28 +984,25 @@ class ODFDoc(BaseDoc.BaseDoc):
         size = font.get_size()
 
         height = size*(len(text))
-        oneline = (size/72.0)*2.54
         width = 0
         for line in text:
             width = max(width,FontScale.string_width(font,line))
-        wcm = (width/72.0)*2.54*1.2
-        hcm = (height/72.0)*2.54*1.2
+        wcm = ReportUtils.pt2cm(width)
+        hcm = ReportUtils.pt2cm(height)
 
-        rangle = -((pi/180.0) * angle)
+        rangle = (pi/180.0) * angle
 
         self.cntnt.write('<draw:frame text:anchor-type="paragraph" ')
         self.cntnt.write('draw:z-index="2" ')
-        self.cntnt.write('draw:style-name="%s" ' % style)
-        self.cntnt.write('svg:height="%.2fpt" ' % hcm)
-        self.cntnt.write('fo:height="%.2fpt" ' % hcm)
+        self.cntnt.write('draw:style-name="clear" ')
+        self.cntnt.write('svg:height="%.2fcm" ' % hcm)
         self.cntnt.write('svg:width="%.2fcm" ' % wcm)
-        self.cntnt.write('fo:width="%.2fcm" ' % wcm)
         self.cntnt.write('draw:transform="')
-        self.cntnt.write('rotate (%.8f) ' % rangle)
-        xloc = x-((wcm/2.0)*cos(-rangle))
-        yloc = y-((hcm)*sin(-rangle))-oneline
+        self.cntnt.write('rotate (%.8f) ' % -rangle)
+        xloc = x-((wcm/2.0)*cos(rangle))+((hcm/2.0)*sin(rangle))
+        yloc = y-((hcm/2.0)*cos(rangle))-((wcm/2.0)*sin(rangle))
         self.cntnt.write('translate (%.3fcm %.3fcm)"' % (xloc,yloc))
-        self.cntnt.write('> ')
+        self.cntnt.write('>')
         self.cntnt.write('<draw:text-box>')
         self.cntnt.write('<text:p text:style-name="X%s"> ' % pname)