#i137142# default page style name is 'Standard'

3 files changed, 12 insertions, 11 deletions

diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index 5fcbe3ea36d6..85eb73d310b8 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: PropertyIds.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: os $ $Date: 2007-02-05 13:47:58 $
+ *  last change: $Author: os $ $Date: 2007-03-08 09:19:16 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -278,7 +278,7 @@ const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const
             case PROP_TEXT                   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text")); break;
             case PROP_CREATE_FROM_OUTLINE    :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromOutline")); break;
             case PROP_CREATE_FROM_MARKS      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromMarks")); break;
-//            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
+            case PROP_STANDARD               :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); break;
 //            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
 //            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
 //            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index fe55933ae60c..9d3dbb7c3d6e 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: PropertyIds.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: os $ $Date: 2007-02-05 13:47:58 $
+ *  last change: $Author: os $ $Date: 2007-03-08 09:19:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -220,7 +220,7 @@ enum PropertyIds
 /*178*/ ,PROP_TEXT
 /*179*/ ,PROP_CREATE_FROM_OUTLINE
 /*180*/ ,PROP_CREATE_FROM_MARKS
-///*181*/ ,PROP_
+/*181*/ ,PROP_STANDARD
 ///*182*/ ,PROP_
 ///*183*/ ,PROP_
 ///*184*/ ,PROP_
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 409d2f8d9ee7..5d6479138245 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: PropertyMap.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2007-02-21 13:35:17 $
+ *  last change: $Author: os $ $Date: 2007-03-08 09:19:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -222,7 +222,7 @@ SectionPropertyMap::SectionPropertyMap(bool bIsFirstSection) :
     {
         PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
         m_sFirstPageStyleName = rPropNameSupplier.GetName( PROP_FIRST_PAGE );
-        m_sFollowPageStyleName = rPropNameSupplier.GetName( PROP_DEFAULT );
+        m_sFollowPageStyleName = rPropNameSupplier.GetName( PROP_STANDARD );
     }
 }
 /*-- 24.07.2006 08:29:02---------------------------------------------------
@@ -799,9 +799,10 @@ void SectionPropertyMap::_ApplyProperties( uno::Reference< beans::XPropertySet >
     PropertyMap::iterator aMapIter = begin();
     try
     {
-        for( ; aMapIter != end(); ++aMapIter )
+        while( aMapIter != end())
         {
-                xStyle->setPropertyValue( aMapIter->first, aMapIter->second );
+            xStyle->setPropertyValue( aMapIter->first, aMapIter->second );
+            ++aMapIter;
         }
     }
     catch( const uno::Exception& )