diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-09-03 10:13:07 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-03 13:08:22 +0000 |
| commit | 2564c5bbe4acd3f29530b056cef3f6e8ecb6194c (patch) | |
| tree | 52bd2e53f4bba6bddc3d6bdfd93fb98161ca1480 /sw/source/filter/ww8/ww8par3.cxx | |
| parent | cbfe56c3bc7ae849f8ea9825445f5e2c5dc4dc00 (diff) | |
String to OUString
Change-Id: I41bda1a4d37bff782a51d07e36d471df2d6b421b
Reviewed-on: https://gerrit.libreoffice.org/5776
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter/ww8/ww8par3.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 068bca9ee619..fea72bf588c9 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -94,7 +94,7 @@ using namespace sw::mark; //----------------------------------------- //cmc, OCX i.e. word 97 form controls -eF_ResT SwWW8ImplReader::Read_F_OCX( WW8FieldDesc*, String& ) +eF_ResT SwWW8ImplReader::Read_F_OCX( WW8FieldDesc*, OUString& ) { if( bObj && nPicLocFc ) nObjLocFc = nPicLocFc; @@ -102,11 +102,11 @@ eF_ResT SwWW8ImplReader::Read_F_OCX( WW8FieldDesc*, String& ) return FLD_TEXT; } -eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr ) +eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr ) { WW8FormulaEditBox aFormula(*this); - if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1))) { + if (rStr[pF->nLCode-1]==0x01) { ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_EDIT); } @@ -167,22 +167,24 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr ) } } -eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr ) +eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr ) { WW8FormulaCheckBox aFormula(*this); if (!pFormImpl) pFormImpl = new SwMSConvertControls(mpDocShell, pPaM); - if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1))) + if (rStr[pF->nLCode-1]==0x01) ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_CHECKBOX); const SvtFilterOptions& rOpt = SvtFilterOptions::Get(); sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields(); - if (!bUseEnhFields) { - pFormImpl->InsertFormula(aFormula); - return FLD_OK; - } else { + if (!bUseEnhFields) + { + pFormImpl->InsertFormula(aFormula); + return FLD_OK; + } + String aBookmarkName; WW8PLCFx_Book* pB = pPlcxMan->GetBook(); if (pB!=NULL) { @@ -222,14 +224,13 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr ) } } return FLD_OK; - } } -eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr) +eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr) { WW8FormulaListBox aFormula(*this); - if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1))) + if (rStr[pF->nLCode-1]==0x01) ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_DROPDOWN); const SvtFilterOptions& rOpt = SvtFilterOptions::Get(); @@ -298,7 +299,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr) } } -eF_ResT SwWW8ImplReader::Read_F_HTMLControl(WW8FieldDesc*, String&) +eF_ResT SwWW8ImplReader::Read_F_HTMLControl(WW8FieldDesc*, OUString&) { if( bObj && nPicLocFc ) nObjLocFc = nPicLocFc; |