[Libreoffice-commits] core.git: writerfilter/source

[Jan Holesovsky]

 writerfilter/source/ooxml/OOXMLParserState.cxx |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit cfbd50c957e9ab12ee843f9239561ed741f5a3e2
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Jun 20 10:28:29 2014 +0200

    writerfilter: Minor cleanup in OOXMLParserState.
    
    Change-Id: Ib715d2794c9a6f036ad809641fb0dda2d10a1968

diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 87644aa..eae35fa 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -122,8 +122,7 @@ void OOXMLParserState::resolveCharacterProperties(Stream & rStream)
     }
 }
 
-void OOXMLParserState::setCharacterProperties
-(OOXMLPropertySet::Pointer_t pProps)
+void OOXMLParserState::setCharacterProperties(OOXMLPropertySet::Pointer_t pProps)
 {
     if (mpCharacterProps.get() == NULL)
         mpCharacterProps = pProps;
@@ -131,8 +130,7 @@ void OOXMLParserState::setCharacterProperties
         mpCharacterProps->add(pProps);
 }
 
-void OOXMLParserState::setCellProperties
-(OOXMLPropertySet::Pointer_t pProps)
+void OOXMLParserState::setCellProperties(OOXMLPropertySet::Pointer_t pProps)
 {
     if (!mCellProps.empty())
     {
@@ -145,8 +143,7 @@ void OOXMLParserState::setCellProperties
     }
 }
 
-void OOXMLParserState::setRowProperties
-(OOXMLPropertySet::Pointer_t pProps)
+void OOXMLParserState::setRowProperties(OOXMLPropertySet::Pointer_t pProps)
 {
     if (!mRowProps.empty())
     {
@@ -202,8 +199,7 @@ void OOXMLParserState::resolveTableProperties(Stream & rStream)
     }
 }
 
-void OOXMLParserState::setTableProperties
-(OOXMLPropertySet::Pointer_t pProps)
+void OOXMLParserState::setTableProperties(OOXMLPropertySet::Pointer_t pProps)
 {
     if (!mTableProps.empty())
     {
@@ -240,8 +236,8 @@ void OOXMLParserState::incContextCount()
 
 void OOXMLParserState::startTxbxContent()
 {
-    if( inTxbxContent )
-        SAL_WARN( "writerfilter", "Nested w:txbxContent" );
+    SAL_WARN_IF(inTxbxContent, "writerfilter", "Nested w:txbxContent");
+
     inTxbxContent = true;
     // Do not save and reset section group state, it'd cause a new page.
 //    savedInSectionGroup = mbInSectionGroup;