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

[Caolán McNamara]

 cui/source/tabpages/tpbitmap.cxx   |    2 +-
 sw/source/core/unocore/unosett.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6d812e114f1fac014da82955a73b44212b2c6022
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 6 20:39:54 2016 +0100

    cosmetic, substitute text::HoriOrientation::NONE for 0
    
    Change-Id: I793597b65a8bacac2cab67ece70b42478c793aad

diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 7fc5d1e..40c7e39 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -240,7 +240,7 @@ static SwPageDesc* lcl_GetPageDesc(SwDoc* pDoc, const uno::Any& aValue)
 // Numbering
 const unsigned short aSvxToUnoAdjust[] =
 {
-    text::HoriOrientation::LEFT,    //3
+    text::HoriOrientation::LEFT,   //3
     text::HoriOrientation::RIGHT,  //1
     USHRT_MAX,
     text::HoriOrientation::CENTER, //2
@@ -1677,9 +1677,9 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
                 {
                     sal_Int16 nValue = text::HoriOrientation::NONE;
                     pProp->Value >>= nValue;
-                    if(nValue > 0 &&
+                    if (nValue > text::HoriOrientation::NONE &&
                         nValue <= text::HoriOrientation::LEFT &&
-                            USHRT_MAX != aUnoToSvxAdjust[nValue])
+                        USHRT_MAX != aUnoToSvxAdjust[nValue])
                     {
                         aFormat.SetNumAdjust((SvxAdjust)aUnoToSvxAdjust[nValue]);
                     }
commit 318394abef910649d8ef4db39a0f4c469c03d3cf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 6 21:50:13 2016 +0100

    wrong ScopedVclPtrInstance creation
    
    Change-Id: I524f507bc5720704460d94bb52f99cb7792703e9

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index f00310b..2f37ff9 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -829,7 +829,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl, Button*, void)
         }
         else
             // graphic couldn't be loaded
-            ScopedVclPtrInstance<MessageDialog>::Create( GetParentDialog()
+            ScopedVclPtrInstance<MessageDialog>( GetParentDialog()
                           ,"NoLoadedFileDialog"
                           ,"cui/ui/querynoloadedfiledialog.ui")->Execute();
     }