summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xmloff/inc/txtfldi.hxx5
-rw-r--r--xmloff/source/text/txtfldi.cxx26
-rw-r--r--xmloff/source/text/txtparai.cxx6
-rw-r--r--xmloff/source/text/txtvfldi.cxx11
4 files changed, 29 insertions, 19 deletions
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 8bd474ffb423..6abd2b00d21f 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtfldi.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: dvo $ $Date: 2000-11-30 16:46:16 $
+ * last change: $Author: dvo $ $Date: 2000-12-19 12:47:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1261,6 +1261,7 @@ class XMLUrlFieldImportContext : public XMLTextFieldImportContext
const ::rtl::OUString sPropertyURL;
const ::rtl::OUString sPropertyTargetFrame;
+ const ::rtl::OUString sPropertyRepresentation;
::rtl::OUString sURL;
::rtl::OUString sFrame;
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index d2340de173ef..e9bed84e1149 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtfldi.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: dvo $ $Date: 2000-12-12 18:30:35 $
+ * last change: $Author: dvo $ $Date: 2000-12-19 12:47:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -325,6 +325,7 @@ const sal_Char sAPI_dde_command_file[] = "DDECommandFile";
const sal_Char sAPI_dde_command_element[] = "DDECommandElement";
// sAPI_url: also used as service name
const sal_Char sAPI_target_frame[] = "TargetFrame";
+const sal_Char sAPI_representation[] = "Representation";
const sal_Char sAPI_true[] = "TRUE";
@@ -415,8 +416,8 @@ void XMLTextFieldImportContext::StartElement(
const Reference<XAttributeList> & xAttrList)
{
// process attributes
- sal_Int32 nLength = xAttrList->getLength();
- for(sal_Int32 i=0; i<nLength; i++) {
+ sal_Int16 nLength = xAttrList->getLength();
+ for(sal_Int16 i=0; i<nLength; i++) {
OUString sLocalName;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
@@ -1054,7 +1055,7 @@ void XMLPageNumberImportContext::ProcessAttribute(
sal_Int32 nTmp;
if (SvXMLUnitConverter::convertNumber(nTmp, sAttrValue))
{
- nPageAdjust = nTmp;
+ nPageAdjust = (sal_Int16)nTmp;
}
break;
}
@@ -1263,7 +1264,7 @@ void XMLTimeFieldImportContext::ProcessAttribute(
if (SvXMLUnitConverter::convertTime(fTmp, sAttrValue))
{
// convert to minutes
- nAdjust = SolarMath::ApproxFloor(fTmp * 60 * 24);
+ nAdjust = (sal_Int16)SolarMath::ApproxFloor(fTmp * 60 * 24);
}
break;
}
@@ -2836,8 +2837,8 @@ void XMLDdeFieldDeclImportContext::StartElement(
sal_Bool bCommandItemOK = sal_False;
// process attributes
- sal_Int32 nLength = xAttrList->getLength();
- for(sal_Int32 i=0; i<nLength; i++)
+ sal_Int16 nLength = xAttrList->getLength();
+ for(sal_Int16 i=0; i<nLength; i++)
{
OUString sLocalName;
@@ -3053,6 +3054,8 @@ XMLUrlFieldImportContext::XMLUrlFieldImportContext(
nPrfx, sLocalName),
sPropertyURL(RTL_CONSTASCII_USTRINGPARAM(sAPI_url)),
sPropertyTargetFrame(RTL_CONSTASCII_USTRINGPARAM(sAPI_target_frame)),
+ sPropertyRepresentation(RTL_CONSTASCII_USTRINGPARAM(
+ sAPI_representation)),
bFrameOK(sal_False)
{
}
@@ -3090,6 +3093,9 @@ void XMLUrlFieldImportContext::PrepareField(
aAny <<= sFrame;
xPropertySet->setPropertyValue(sPropertyTargetFrame, aAny);
}
+
+ aAny <<= GetContent();
+ xPropertySet->setPropertyValue(sPropertyRepresentation, aAny);
}
@@ -3153,8 +3159,8 @@ void XMLBibliographyFieldImportContext::StartElement(
const Reference<XAttributeList> & xAttrList)
{
// iterate over attributes
- sal_Int32 nLength = xAttrList->getLength();
- for(sal_Int32 i=0; i<nLength; i++) {
+ sal_Int16 nLength = xAttrList->getLength();
+ for(sal_Int16 i=0; i<nLength; i++) {
OUString sLocalName;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 317e7e5a9010..566658b4fff0 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtparai.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: mib $ $Date: 2000-12-13 09:36:23 $
+ * last change: $Author: dvo $ $Date: 2000-12-19 12:47:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1486,6 +1486,8 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
pContext = new XMLUrlFieldImportContext( rImport,
*rImport.GetTextImport().get(),
nPrefix, rLocalName);
+ //whitespace handling like other fields
+ rIgnoreLeadingSpace = sal_False;
}
break;
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 9d4f49e10c52..388c86f34bc0 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtvfldi.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: dvo $ $Date: 2000-11-10 15:24:58 $
+ * last change: $Author: dvo $ $Date: 2000-12-19 12:47:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -832,8 +832,8 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
// TODO: check validity (need name!)
// parse attributes
- sal_Int32 nLength = xAttrList->getLength();
- for(sal_Int32 i=0; i<nLength; i++) {
+ sal_Int16 nLength = xAttrList->getLength();
+ for(sal_Int16 i=0; i<nLength; i++) {
OUString sLocalName;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
@@ -861,7 +861,8 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
break;
}
case XML_TOK_TEXTFIELD_NUMBERING_SEPARATOR:
- cSeparationChar = xAttrList->getValueByIndex(i).toChar();
+ cSeparationChar =
+ (sal_Char)xAttrList->getValueByIndex(i).toChar();
break;
default:
generated by cgit (git 2.34.1) at 2025-02-24 03:47:09 +0000