* src/BaseDoc.py:
* src/docgen/PSDrawDoc.py: * src/docgen/SvgDrawDoc.py: * src/docgen/PdfDoc.py: * src/docgen/OpenOfficeDoc.py: * src/docgen/GtkPrint.py: * src/docgen/LPRDoc.py: * src/docgen/ODFDoc.py: * src/plugins/StatisticsChart.py: * src/plugins/Calendar.py: * src/ReportBase/_ReportUtils.py: Remove draw_bar function svn: r8254
This commit is contained in:
@@ -1070,18 +1070,6 @@ class ODFDoc(BaseDoc.BaseDoc):
|
||||
self.cntnt.write('</draw:text-box>\n')
|
||||
self.cntnt.write('</draw:frame>\n')
|
||||
|
||||
def draw_bar(self,style,x,y,x2,y2):
|
||||
box_style = self.draw_styles[style]
|
||||
|
||||
self.cntnt.write('<draw:rect text:anchor-type="paragraph" draw:style-name="')
|
||||
self.cntnt.write(style)
|
||||
self.cntnt.write('" draw:z-index="0" ')
|
||||
self.cntnt.write('svg:width="%.2fcm" ' % float(x2-x))
|
||||
self.cntnt.write('svg:height="%.2fcm" ' % float(y2-y))
|
||||
self.cntnt.write('svg:x="%.2fcm" ' % float(x))
|
||||
self.cntnt.write('svg:y="%.2fcm">' % float(y))
|
||||
self.cntnt.write('</draw:rect>\n')
|
||||
|
||||
def draw_box(self,style,text,x,y, w, h):
|
||||
box_style = self.draw_styles[style]
|
||||
para_name = box_style.get_paragraph_style()
|
||||
@@ -1120,11 +1108,11 @@ class ODFDoc(BaseDoc.BaseDoc):
|
||||
pstyle = self.style_list[para_name]
|
||||
font = pstyle.get_font()
|
||||
|
||||
size = 1.2*(FontScale.string_width(font,text)/72.0) * 2.54
|
||||
size = (FontScale.string_width(font,text)/72.0) * 2.54
|
||||
|
||||
self.cntnt.write('<draw:frame text:anchor-type="paragraph" ')
|
||||
self.cntnt.write('draw:style-name="%s" ' % style)
|
||||
self.cntnt.write('draw:z-index="0" ')
|
||||
self.cntnt.write('draw:z-index="2" ')
|
||||
self.cntnt.write('svg:width="%.2fcm" ' % size)
|
||||
self.cntnt.write('svg:height="%.2fpt" ' % font.get_size())
|
||||
|
||||
|
||||
Reference in New Issue
Block a user