From 88e21221d30b7a015dce8c3c63ff289fe650a4be Mon Sep 17 00:00:00 2001
From: Oliver Specht <os@openoffice.org>
Date: Tue, 19 Jun 2007 07:17:07 +0000
Subject: [PATCH] merge error fixed

---
 writerfilter/source/dmapper/StyleSheetTable.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 1edce95d9413..c677df2ad982 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: StyleSheetTable.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: os $ $Date: 2007-06-18 12:31:12 $
+ *  last change: $Author: os $ $Date: 2007-06-19 08:17:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -584,7 +584,6 @@ void StyleSheetTable::attribute(doctok::Id Name, doctok::Value & val)
 //        case NS_rtf::LN_LFOTABLE: break;
 //        case NS_rtf::LN_StyleSheetTable: break;
 //        case NS_rtf::LN_STYLESHEET: break;
-        break;
         case NS_ooxml::LN_CT_Style_type:
             if (nIntValue == 1)
                 *(m_pImpl->m_pCurrentEntry->pProperties) = *(m_pImpl->m_pDefaultParaProps);