Hi,
Attached is a patch that adds support for importing docvariable fields
from microsoft word documents. The variables themselves are already
converted correctly, so this patch only ties the field to the existing
custom document information.
Please consider this patch for inclusion.
I declare that this and my further patches are under LGPLv3+ / MPL license.
With Regards,
Kenneth Aafløy
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 949ddd9..7eb9f52 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -965,7 +965,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
0,
0,
0,
- 0,
+ &SwWW8ImplReader::Read_F_DocInfo, // 64 - DOCVARIABLE
0,
0,
&SwWW8ImplReader::Read_F_IncludePicture, // 67
@@ -1759,6 +1759,9 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, String& rStr )
nReg = DI_SUB_TIME;
bDateTime = true;
break;
+ case 64: // DOCVARIABLE
+ nSub = DI_CUSTOM;
+ break;
}
sal_uInt32 nFormat = 0;
@@ -1784,8 +1787,32 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, String& rStr )
}
}
+ String aData;
+ // Extract DOCVARIABLE varname
+ if ( 64 == pF->nId )
+ {
+ _ReadFieldParams aReadParam( rStr );
+ long nRet;
+ while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
+ {
+ switch( nRet )
+ {
+ case -2:
+ if( !aData.Len() )
+ aData = aReadParam.GetResult();
+ break;
+ case '*':
+ //Skip over MERGEFORMAT
+ aReadParam.SkipToNextToken();
+ break;
+ }
+ }
+
+ aData = comphelper::string::remove(aData, '"');
+ }
+
SwDocInfoField aFld( (SwDocInfoFieldType*)
- rDoc.GetSysFldType( RES_DOCINFOFLD ), nSub|nReg, String(), nFormat );
+ rDoc.GetSysFldType( RES_DOCINFOFLD ), nSub|nReg, aData, nFormat );
if (bDateTime)
ForceFieldLanguage(aFld, nLang);
rDoc.InsertPoolItem(*pPaM, SwFmtFld(aFld), 0);
Context
- [Libreoffice] [PATCH] Add import of docvariable fields from word documents · Kenneth Aafløy
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.