[Libreoffice-commits] .: 2 commits - sw/inc sw/source

[Cédric Bosdonnat]

 sw/inc/crsrsh.hxx                            |    2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |   10 +++++++---
 sw/source/ui/dbui/dbinsdlg.cxx               |    2 +-
 sw/source/ui/dialog/swdlgfact.cxx            |    2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 96fe8b21e0fca5fce5586f707e545ecb1a07d2a0
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon Dec 6 15:33:20 2010 +0100

    CT_Ind start/end properties for OOXML ISO version

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0ba6baa..2e4658e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2588,8 +2588,10 @@ void DocxAttributeOutput::NumberingLevel( BYTE nLevel,
                 FSEND );
         m_pSerializer->endElementNS( XML_w, XML_tabs );
     }
+
+    sal_Int32 nToken = ecmaDialect ? XML_left : XML_start;
     m_pSerializer->singleElementNS( XML_w, XML_ind,
-            FSNS( XML_w, XML_left ), OString::valueOf( sal_Int32( nIndentAt ) ).getStr(),
+            FSNS( XML_w, nToken ), OString::valueOf( sal_Int32( nIndentAt ) ).getStr(),
             FSNS( XML_w, XML_hanging ), OString::valueOf( sal_Int32( -nFirstLineIndex ) ).getStr(),
             FSEND );
     m_pSerializer->endElementNS( XML_w, XML_pPr );
@@ -3482,6 +3484,8 @@ void DocxAttributeOutput::FormatPaperBin( const SvxPaperBinItem& )
 
 void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
 {
+    bool bEcma = m_rExport.GetFilter().getVersion( ) == oox::core::ECMA_DIALECT;
+
     if ( m_rExport.bOutFlyFrmAttrs )
     {
         if ( !m_pFlyAttrList )
@@ -3515,8 +3519,8 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
     {
         FastAttributeList *pLRSpaceAttrList = m_pSerializer->createAttrList();
 
-        pLRSpaceAttrList->add( FSNS( XML_w, XML_left ), OString::valueOf( (sal_Int32) rLRSpace.GetTxtLeft() ) );
-        pLRSpaceAttrList->add( FSNS( XML_w, XML_right ), OString::valueOf( (sal_Int32) rLRSpace.GetRight() ) );
+        pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_left : XML_start ) ), OString::valueOf( (sal_Int32) rLRSpace.GetTxtLeft() ) );
+        pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_right : XML_end ) ), OString::valueOf( (sal_Int32) rLRSpace.GetRight() ) );
 
         sal_Int32 nFirstLineAdjustment = rLRSpace.GetTxtFirstLineOfst();
         if (nFirstLineAdjustment > 0)
commit 4afecb2f8f1ce9a55c47a08f2e437103870c0735
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon Dec 6 14:57:53 2010 +0100

    Reapearing DGB_UTIL things removed

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 65da399..d4f1c6a 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -109,7 +109,7 @@ struct SwContentAtPos
         SW_CONTENT_CHECK    = 0x0400,
         SW_SMARTTAG         = 0x0800,
         SW_FORMCTRL         = 0x1000
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         ,SW_CURR_ATTRS      = 0x4000        // only for debugging
         ,SW_TABLEBOXVALUE   = 0x8000        // only for debugging
 #endif
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 49be8b5..f766b41 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1180,7 +1180,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                     }
                 }
                 catch(Exception&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                             aExcept
 #endif
                 )
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 8ec3942..1319a7d 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -583,7 +583,7 @@ long AbstractMailMergeWizard_Impl::GetResult()
     return pDlg->GetResult();
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, pDialog )
 #else
 IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, EMPTYARG )