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

[Miklos Vajna]

 sw/source/filter/ww8/docxsdrexport.cxx    |   16 +++-------------
 sw/source/filter/ww8/docxsdrexport.hxx    |    2 --
 writerfilter/source/dmapper/SdtHelper.cxx |    4 ++--
 3 files changed, 5 insertions(+), 17 deletions(-)

New commits:
commit 2736674aa1eca906ba5f726e47279266cce2149e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Mar 18 14:32:43 2014 +0100

    sw: not used getter / setter methods
    
    Change-Id: Id357ee22d041cd191d06b0dc2dbf162312a4df0a

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 72f5724..be0baa1 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -572,7 +572,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrmFmt*
                  * was originally a Locked Canvas and is now inside a Text Frame.
                  */
 
-                bLockedCanvas = getIsInDMLTextFrame();
+                bLockedCanvas = m_pImpl->m_bIsInDMLTextFrame;
                 break;
             }
         }
@@ -1027,7 +1027,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFr
 
 void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId)
 {
-    setIsInDMLTextFrame(true);
+    m_pImpl->m_bIsInDMLTextFrame = true;
     sax_fastparser::FSHelperPtr pFS = m_pImpl->m_pSerializer;
     const SwFrmFmt& rFrmFmt = pParentFrame->GetFrmFmt();
     const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
@@ -1189,7 +1189,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId)
     }
 
     endDMLAnchorInline(&rFrmFmt);
-    setIsInDMLTextFrame(false);
+    m_pImpl->m_bIsInDMLTextFrame = false;
 }
 
 void DocxSdrExport::writeVMLTextFrame(sw::Frame* pParentFrame)
@@ -1315,14 +1315,4 @@ bool DocxSdrExport::checkFrameBtlr(SwNode* pStartNode, sax_fastparser::FastAttri
     return false;
 }
 
-bool DocxSdrExport::getIsInDMLTextFrame()
-{
-    return m_pImpl->m_bIsInDMLTextFrame;
-}
-
-void DocxSdrExport::setIsInDMLTextFrame(bool bIsInDMLTextFrame)
-{
-    m_pImpl->m_bIsInDMLTextFrame = bIsInDMLTextFrame;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index 73c981f..dced28c 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -90,8 +90,6 @@ public:
                           com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutStream, const OUString& sGrabBagProperyName);
     /// Writes text frame in DML format.
     void writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId);
-    bool getIsInDMLTextFrame();
-    void setIsInDMLTextFrame(bool bIsInDMLTextFrame);
     /// Writes text frame in VML format.
     void writeVMLTextFrame(sw::Frame* pParentFrame);
     /// Undo the text direction mangling done by the frame btLr handler in writerfilter::dmapper::DomainMapper::lcl_startCharacterGroup()
commit e584d38f75db115edf5e07e479665336ea7a4d54
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Mar 18 14:30:44 2014 +0100

    writerfilter: fix indentation in SdtHelper
    
    Change-Id: I00773d4ac74d09aba9c75daf547eb1a16885ddde

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index af30b74..32691d9 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -190,7 +190,7 @@ bool SdtHelper::hasElements()
 
 void SdtHelper::appendToInteropGrabBag(const OUString& rName, const css::uno::Any& rValue)
 {
-    if(isInteropGrabBagEnabled())
+    if (isInteropGrabBagEnabled())
     {
         sal_Int32 nLength = m_aGrabBag.getLength();
         m_aGrabBag.realloc(nLength + 1);
@@ -202,7 +202,7 @@ void SdtHelper::appendToInteropGrabBag(const OUString& rName, const css::uno::An
 beans::PropertyValue SdtHelper::getInteropGrabBagAndClear()
 {
     beans::PropertyValue aProp;
-    if(isInteropGrabBagEnabled())
+    if (isInteropGrabBagEnabled())
     {
         aProp.Name = m_sGrabBagName;
         aProp.Value = uno::Any(m_aGrabBag);