From f0de9e167e289ab7dc33e57f077c1f04ec7c68c8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:38:41 -0600 Subject: Remove additional unneeded tq method conversions --- filters/olefilters/powerpoint97/powerpoint.cc | 4 ++-- filters/olefilters/powerpoint97/pptSlide.h | 2 +- filters/olefilters/powerpoint97/pptxml.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'filters/olefilters/powerpoint97') diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc index b53acfc5..bb85f84d 100644 --- a/filters/olefilters/powerpoint97/powerpoint.cc +++ b/filters/olefilters/powerpoint97/powerpoint.cc @@ -819,7 +819,7 @@ void Powerpoint::opSlidePersistAtom( struct { TQ_UINT32 psrReference; // Logical reference to the slide persist object. - TQ_UINT32 flags; // If bit 3 set then slide contains tqshapes other than placeholders. + TQ_UINT32 flags; // If bit 3 set then slide contains shapes other than placeholders. TQ_INT32 numberTexts; // Number of placeholder texts stored with the persist object. TQ_INT32 slideId; // Unique slide identifier, used for OLE link monikers for example. TQ_UINT32 reserved; @@ -1056,7 +1056,7 @@ void Powerpoint::opTextHeaderAtom( // 1 Body // 2 Notes // 3 Not Used - // 4 Other (Text in a tqshape) + // 4 Other (Text in a shape) // 5 Center body (subtitle in title slide) // 6 Center title (title in title slide) // 7 Half body (body in two-column slide) diff --git a/filters/olefilters/powerpoint97/pptSlide.h b/filters/olefilters/powerpoint97/pptSlide.h index 026e2ef1..78e9cb0a 100644 --- a/filters/olefilters/powerpoint97/pptSlide.h +++ b/filters/olefilters/powerpoint97/pptSlide.h @@ -34,7 +34,7 @@ DESCRIPTION #define BODY_TEXT 1 //body #define NOTES_TEXT 2 //notes #define NOTUSED_TEXT 3 //not used -#define OTHER_TEXT 4 //other(test in tqshape) +#define OTHER_TEXT 4 //other(test in shape) #define CENTER_BODY_TEXT 5 //center body(subtitle in title slide) #define CENTER_TITLE_TEXT 6 //center title(title in title slide) #define HALF_BODY_TEXT 7 //half body(body in two-column slide) diff --git a/filters/olefilters/powerpoint97/pptxml.cc b/filters/olefilters/powerpoint97/pptxml.cc index 96a03567..270cc30f 100644 --- a/filters/olefilters/powerpoint97/pptxml.cc +++ b/filters/olefilters/powerpoint97/pptxml.cc @@ -143,7 +143,7 @@ void PptXml::gotDrawing( ourKey = "vectorGraphic" + TQString::number(id) + "." + type; if (type == "msod") { - filterArgs = "tqshape-id="; + filterArgs = "shape-id="; filterArgs += TQString::number(id); filterArgs += ";delay-stream="; filterArgs += TQString::number(0); -- cgit v1.2.1