#87040#: Page number is not required for styles

2 files changed, 6 insertions, 11 deletions

diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index e1cd3bb6477e..31add8873cfc 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtexppr.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: mib $ $Date: 2001-03-23 16:30:35 $
+ *  last change: $Author: mib $ $Date: 2001-05-16 08:37:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -427,7 +427,6 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 
     // anchor
     XMLPropertyState* pAnchorTypeState = NULL;
-    XMLPropertyState* pAnchorPageNumberState = NULL;
 
     // horizontal position and relation
     XMLPropertyState* pHoriOrientState = NULL;
@@ -502,7 +501,6 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         case CTF_WRAP_CONTOUR_MODE:     pWrapContourModeState = propertie; break;
         case CTF_WRAP_PARAGRAPH_ONLY:   pWrapParagraphOnlyState = propertie; break;
         case CTF_ANCHORTYPE:            pAnchorTypeState = propertie; break;
-        case CTF_ANCHORPAGENUMBER:      pAnchorPageNumberState = propertie; bNeedsAnchor = sal_True; break;
 
         case CTF_HORIZONTALPOS:             pHoriOrientState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_HORIZONTALPOS_MIRRORED:    pHoriOrientMirroredState = propertie; bNeedsAnchor = sal_True; break;
@@ -833,9 +831,6 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         aAny >>= eAnchor;
     }
 
-    if( pAnchorPageNumberState && TextContentAnchorType_AT_PAGE != eAnchor )
-        pAnchorPageNumberState->mnIndex = -1;
-
     if( pHoriOrientState && pHoriOrientMirroredState )
     {
         if( pHoriOrientMirrorState &&
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index a8a74495370d..e71623deda81 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtprmap.cxx,v $
  *
- *  $Revision: 1.48 $
+ *  $Revision: 1.49 $
  *
- *  last change: $Author: mib $ $Date: 2001-05-10 10:09:49 $
+ *  last change: $Author: mib $ $Date: 2001-05-16 08:37:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -514,7 +514,7 @@ XMLPropertyMapEntry aXMLFramePropMap[] =
     // RES_ANCHOR
     // moved to here because it is not used for automatic styles
     M_ED( "AnchorType",         TEXT,   anchor_type,            XML_TYPE_TEXT_ANCHOR_TYPE, CTF_ANCHORTYPE ),
-    M_ED( "AnchorPageNo",       TEXT,   anchor_page_number,     XML_TYPE_NUMBER16, CTF_ANCHORPAGENUMBER ),
+    // AnchorPage number is not required for styles!
     M_ED( "HoriOrientPosition", SVG,    x,        XML_TYPE_MEASURE, 0 ),
     M_ED( "VertOrientPosition", SVG,    y,        XML_TYPE_MEASURE, 0 ),
     // ***** The map for automatic styles starts here *****
@@ -741,7 +741,7 @@ XMLPropertyMapEntry *lcl_txtprmap_getMap( sal_uInt16 nType )
         pMap = aXMLFramePropMap;
         break;
     case TEXT_PROP_MAP_AUTO_FRAME:
-        pMap = &(aXMLFramePropMap[11]);
+        pMap = &(aXMLFramePropMap[10]);
         DBG_ASSERT( pMap->msXMLName == sXML_margin_left, "frame map changed" );
         break;
     case TEXT_PROP_MAP_SHAPE: