#84808# fixed: hidden text, hidden paragraph, conditional field now display

correctly on load
(attributes added)
fixed: update forced for certain fields on loading in organizer mode/styles only mode

3 files changed, 26 insertions, 7 deletions

diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index dfbfaba8d483..1bb9ebd6b930 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtflde.hxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: dvo $ $Date: 2001-03-09 14:10:57 $
+ *  last change: $Author: dvo $ $Date: 2001-03-23 16:30:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -442,7 +442,7 @@ private:
     // property names
     const ::rtl::OUString sPropertyContent;
     const ::rtl::OUString sPropertyIsFixed;
-    const ::rtl::OUString sPropertyAuthorFullname;
+    const ::rtl::OUString sPropertyFullName;
     const ::rtl::OUString sPropertyFieldSubType;
     const ::rtl::OUString sPropertyHint;
     const ::rtl::OUString sPropertyPlaceholder;
@@ -500,6 +500,8 @@ private:
     const ::rtl::OUString sPropertyDate;
     const ::rtl::OUString sPropertyMeasureKind;
     const ::rtl::OUString sPropertyInstanceName;
+    const ::rtl::OUString sPropertyIsHidden;
+    const ::rtl::OUString sPropertyIsConditionTrue;
 
     const ::rtl::OUString sEmpty;
 
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 574274a10141..dc9c0b92435d 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtfldi.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: cl $ $Date: 2001-02-01 19:10:54 $
+ *  last change: $Author: dvo $ $Date: 2001-03-23 16:30:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -159,6 +159,8 @@ enum XMLTextFieldAttrTokens
     XML_TOK_TEXTFIELD_STRING_VALUE_IF_TRUE,
     XML_TOK_TEXTFIELD_STRING_VALUE_IF_FALSE,
     XML_TOK_TEXTFIELD_REVISION,
+    XML_TOK_TEXTFIELD_IS_HIDDEN,
+    XML_TOK_TEXTFIELD_CURRENT_VALUE,
 
     XML_TOK_TEXTFIELD_REFERENCE_FORMAT,
     XML_TOK_TEXTFIELD_REF_NAME,
@@ -185,6 +187,7 @@ enum XMLTextFieldAttrTokens
 class XMLTextFieldImportContext : public SvXMLImportContext
 {
     const ::rtl::OUString sServicePrefix;
+    const ::rtl::OUString sIsFixed;
 
     // data members
     ::rtl::OUStringBuffer sContentBuffer;   /// collect character data
@@ -254,6 +257,12 @@ protected:
     sal_Bool CreateField(::com::sun::star::uno::Reference<
                          ::com::sun::star::beans::XPropertySet> & xField,
                          const ::rtl::OUString& sServiceName);
+
+    /// force an update of the field's value
+    /// call update on optional XUptadeable interface; (disable Fixed property)
+    void ForceUpdate(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::beans::XPropertySet> & rPropertySet);
 };
 
 
@@ -783,8 +792,10 @@ protected:
 class XMLHiddenParagraphImportContext : public XMLTextFieldImportContext
 {
     const ::rtl::OUString sPropertyCondition;
+    const ::rtl::OUString sPropertyIsHidden;
 
     ::rtl::OUString sCondition;
+    sal_Bool bIsHidden;
 
 public:
 
@@ -815,6 +826,7 @@ class XMLConditionalTextImportContext : public XMLTextFieldImportContext
     const ::rtl::OUString sPropertyCondition;
     const ::rtl::OUString sPropertyTrueContent;
     const ::rtl::OUString sPropertyFalseContent;
+    const ::rtl::OUString sPropertyIsConditionTrue;
 
     ::rtl::OUString sCondition;
     ::rtl::OUString sTrueContent;
@@ -823,6 +835,7 @@ class XMLConditionalTextImportContext : public XMLTextFieldImportContext
     sal_Bool bConditionOK;
     sal_Bool bTrueOK;
     sal_Bool bFalseOK;
+    sal_Bool bCurrentValue;
 
 public:
 
@@ -852,12 +865,14 @@ class XMLHiddenTextImportContext : public XMLTextFieldImportContext
 {
     const ::rtl::OUString sPropertyCondition;
     const ::rtl::OUString sPropertyContent;
+    const ::rtl::OUString sPropertyIsHidden;
 
     ::rtl::OUString sCondition;
     ::rtl::OUString sString;
 
     sal_Bool bConditionOK;
     sal_Bool bStringOK;
+    sal_Bool bIsHidden;
 
 public:
 
diff --git a/xmloff/inc/xmlkywd.hxx b/xmloff/inc/xmlkywd.hxx
index 46cba4b9331d..b208f9b9aa55 100644
--- a/xmloff/inc/xmlkywd.hxx
+++ b/xmloff/inc/xmlkywd.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlkywd.hxx,v $
  *
- *  $Revision: 1.134 $
+ *  $Revision: 1.135 $
  *
- *  last change: $Author: mtg $ $Date: 2001-03-23 13:37:23 $
+ *  last change: $Author: dvo $ $Date: 2001-03-23 16:30:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -475,6 +475,7 @@ XML_CONSTASCII_ACTION( sXML_currency, "currency");
 XML_CONSTASCII_ACTION( sXML_currency_style, "currency-style" );
 XML_CONSTASCII_ACTION( sXML_currency_symbol, "currency-symbol" );
 XML_CONSTASCII_ACTION( sXML_current, "current" );
+XML_CONSTASCII_ACTION( sXML_current_value, "current-value" );
 XML_CONSTASCII_ACTION( sXML_cursor_position, "cursor-position" );
 XML_CONSTASCII_ACTION( sXML_cursor_position_x, "cursor-position-x" );
 XML_CONSTASCII_ACTION( sXML_cursor_position_y, "cursor-position-y" );
@@ -917,6 +918,7 @@ XML_CONSTASCII_ACTION( sXML_into_english_number, "into-english-number" );
 XML_CONSTASCII_ACTION( sXML_inverse, "inverse" );
 XML_CONSTASCII_ACTION( sXML_is_active, "is-active");
 XML_CONSTASCII_ACTION( sXML_is_data_layout_field, "is-data-layout-field");
+XML_CONSTASCII_ACTION( sXML_is_hidden, "is-hidden" );
 XML_CONSTASCII_ACTION( sXML_is_selection, "is-selection");
 XML_CONSTASCII_ACTION( sXML_isbn, "isbn" );
 XML_CONSTASCII_ACTION( sXML_italic, "italic" );