[Libreoffice-commits] core.git: 6 commits - editeng/source include/editeng include/svx svx/source xmloff/source

Tor Lillqvist tml at collabora.com
Sun Sep 20 06:38:30 PDT 2015


 editeng/source/editeng/impedit3.cxx               |    4 +---
 editeng/source/outliner/overflowingtxt.cxx        |   10 +++++-----
 include/editeng/overflowingtxt.hxx                |    4 ++--
 include/svx/svdmodel.hxx                          |    2 +-
 svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx |    2 +-
 xmloff/source/draw/ximpshap.cxx                   |    2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 2f5cfa063e5a6cd817c7cfc43db522c28a31e937
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 20 16:36:27 2015 +0300

    WaE: this method can be declared static
    
    Change-Id: Ia1adfc8465e101e1e4c4bf75318c2f40d822c8ae

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index d571af7..01a8f3e 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -332,7 +332,7 @@ public:
 
     SdrOutliner&         GetChainingOutliner(const SdrTextObj* pObj=NULL) const;
     TextChain *GetTextChain() const;
-    void SetNextLinkInTextChain(SdrTextObj *pPrev, SdrTextObj *pNext);
+    static void SetNextLinkInTextChain(SdrTextObj *pPrev, SdrTextObj *pNext);
 
     // ReferenceDevice for the EditEngine
     void                 SetRefDevice(OutputDevice* pDev);
commit bdf1d60036c510a7d48afa7ec87ab60439f20020
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 20 16:30:25 2015 +0300

    WaE: C-style cast from 'const drawinglayer::primitive2d::BasePrimitive2D' ...
    
    ... to 'drawinglayer::primitive2d::SdrBlockTextPrimitive2D' (performs:
    static_cast) (BaseToDerived) [loplugin:cstylecast].
    
    Change-Id: I5f4603335591ddd90a2241b7ddd96f0a1d6b6006

diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index ac7815d..6e39be6 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -505,7 +505,7 @@ namespace drawinglayer
          {
              if(SdrTextPrimitive2D::operator==(rPrimitive))
              {
-                 const SdrBlockTextPrimitive2D& rCompare = (SdrBlockTextPrimitive2D&)rPrimitive;
+                 const SdrBlockTextPrimitive2D& rCompare = static_cast<const SdrBlockTextPrimitive2D&>(rPrimitive);
 
                  return (getTextRangeTransform() == rCompare.getTextRangeTransform());
              }
commit 59019c68943e531e43ec8873e5f8d4f8c91e64b2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 20 16:20:35 2015 +0300

    WaE: rewrite as call of rtl::OUString::isEmpty
    
    Change-Id: I0dc1a59eaeefd1a55640b94a00142b0fe6696523

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 8a067f6..df01ab6 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1760,7 +1760,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
             }
         }
 
-        if(maChainNextName != "")
+        if(!maChainNextName.isEmpty())
         {
             uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY);
             if(xPropSet.is())
commit cc3e899fabe73629b1670bc38386deb649ae81e5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 20 16:19:50 2015 +0300

    WaE: this method can be declared static
    
    Change-Id: I1b656cc53f00b866ed6e86d291149e7f1790f26f

diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index 6f2967c..995216f 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -127,7 +127,7 @@ OverflowingText::OverflowingText(TranferableText xOverflowingContent) :
 }
 
 
-ESelection OverflowingText::GetInsertionPointSel() const
+ESelection OverflowingText::GetInsertionPointSel()
 {
     assert(false && "You should never get here");
     return getLastPositionSel(NULL);
@@ -193,9 +193,9 @@ OFlowChainedText::OFlowChainedText(Outliner *pOutl, bool bIsDeepMerge)
     mbIsDeepMerge = bIsDeepMerge;
 }
 
-ESelection OFlowChainedText::GetInsertionPointSel() const
+ESelection OFlowChainedText::GetInsertionPointSel()
 {
-    return mpOverflowingTxt->GetInsertionPointSel();
+    return OverflowingText::GetInsertionPointSel();
 }
 
 ESelection OFlowChainedText::GetOverflowPointSel() const
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx
index 1b521e9..9eec07e 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -75,7 +75,7 @@ class OverflowingText
 public:
     OutlinerParaObject *JuxtaposeParaObject(Outliner *, OutlinerParaObject *);
     OutlinerParaObject *DeeplyMergeParaObject(Outliner *, OutlinerParaObject *);
-    ESelection GetInsertionPointSel() const;
+    static ESelection GetInsertionPointSel();
 
 private:
     friend class Outliner;
@@ -116,7 +116,7 @@ public:
     OutlinerParaObject *InsertOverflowingText(Outliner *, OutlinerParaObject *);
     OutlinerParaObject *RemoveOverflowingText(Outliner *);
 
-    ESelection GetInsertionPointSel() const;
+    static ESelection GetInsertionPointSel();
     ESelection GetOverflowPointSel() const;
 
     bool IsLastParaInterrupted() const;
commit 711752a98a373778aca8044406d6f08ebd2aeb9a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 20 16:18:39 2015 +0300

    WaE: rewrite as call of rtl::OUString::isEmpty
    
    Change-Id: I7c172d26707d08a438be059648f64b5b5959bacc

diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index 2b5b13a..6f2967c 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -46,7 +46,7 @@ OutlinerParaObject *TextChainingUtils::JuxtaposeParaObject(
     // Special case: if only empty text remove it at the end
     bool bOnlyOneEmptyPara = !pNextPObj ||
                              (pOutl->GetParagraphCount() == 1 &&
-                              pNextPObj->GetTextObject().GetText(0) == "");
+                              pNextPObj->GetTextObject().GetText(0).isEmpty());
 
     EditEngine &rEditEngine = const_cast<EditEngine &>(pOutl->GetEditEngine());
 
commit 0212c7195918675b763cb8f02cee646f78497589
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 20 16:12:55 2015 +0300

    WaE: implicit conversion of literal of type 'int' to 'bool'
    
    Change-Id: I9b81f552d24c75eb08e383868293909d584850d2

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index aef05f5..0427a23 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4670,9 +4670,7 @@ void ImpEditEngine::ImplUpdateOverflowingLineNum(sal_uInt32 nPaperHeight,
         }
     }
 
-    assert(0); // You should never get here
-
+    assert(false && "You should never get here");
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index 0993e37..2b5b13a 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -129,7 +129,7 @@ OverflowingText::OverflowingText(TranferableText xOverflowingContent) :
 
 ESelection OverflowingText::GetInsertionPointSel() const
 {
-    assert(0);
+    assert(false && "You should never get here");
     return getLastPositionSel(NULL);
 }
 


More information about the Libreoffice-commits mailing list