diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-05 10:53:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-05 10:54:22 +0100 |
| commit | a234cec9f67ff9eae21e1fe1030ec2d2442a51f9 (patch) | |
| tree | bd4dfd8e6aae148bffae4adf5ee0ac579765f5ea /sw | |
| parent | c0eb401571fc835da8a083f12b44666e73bc33e1 (diff) | |
disentangle WW8Read_xstz variants
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 41df2b0da259..604a81170b69 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2169,13 +2169,13 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, *pDataStream >> hps; // xstzName - sTitle = WW8Read_xstz(*pDataStream, 0, true); + sTitle = read_LEuInt16_BeltAndBracesString(*pDataStream); if (nWhich == WW8_CT_EDIT) { // Field is a textbox // Default text // xstzTextDef - sDefault = WW8Read_xstz(*pDataStream, 0, true); + sDefault = read_LEuInt16_BeltAndBracesString(*pDataStream); } else { @@ -2191,14 +2191,14 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, } } // xstzTextFormat - sFormatting = WW8Read_xstz(*pDataStream, 0, true); + sFormatting = read_LEuInt16_BeltAndBracesString(*pDataStream); // xstzHelpText - sHelp = WW8Read_xstz(*pDataStream, 0, true); + sHelp = read_LEuInt16_BeltAndBracesString(*pDataStream); // xstzStatText - sToolTip = WW8Read_xstz(*pDataStream, 0, true); + sToolTip = read_LEuInt16_BeltAndBracesString(*pDataStream); - String sEntryMacro = WW8Read_xstz(*pDataStream, 0, true); - String sExitMcr = WW8Read_xstz(*pDataStream, 0, true); + String sEntryMacro = read_LEuInt16_BeltAndBracesString(*pDataStream); + String sExitMcr = read_LEuInt16_BeltAndBracesString(*pDataStream); if (nWhich == WW8_CT_DROPDOWN) { |