sw/inc/pagedesc.hxx                |   13 ++++---------
 sw/source/core/layout/pagedesc.cxx |    4 ++--
 sw/source/core/layout/paintfrm.cxx |    4 ++--
 sw/source/ui/misc/pgfnote.cxx      |    6 +++---
 sw/source/uibase/utlui/uiitems.cxx |    2 +-
 5 files changed, 12 insertions(+), 17 deletions(-)

New commits:
commit 3a3f223f5a931680fb0543ee732dd5e800d6850b
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Feb 16 10:19:58 2017 +0000

    hazard a de->en translation
    
    Change-Id: I82df46b8fa9d31b393bf3ddecbfb92128680b258

diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 6f27e4c..70e109c 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -265,10 +265,10 @@ bool SwFootNotePage::FillItemSet(SfxItemSet *rSet)
     // Separator color
     rFootnoteInfo.SetLineColor( m_pLineColorBox->GetSelectEntryColor() );
 
-        // Position
+    // Position
     
rFootnoteInfo.SetAdj((css::text::HorizontalAdjust)m_pLinePosBox->GetSelectEntryPos());
 
-        // Breite
+    // Width
     rFootnoteInfo.SetWidth(Fraction( static_cast< long 
>(m_pLineLengthEdit->GetValue()), 100));
 
     const SfxPoolItem* pOldItem;
commit 0d9ad65f689a975747903b226baa0132d057f523
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Feb 16 10:15:15 2017 +0000

    replace SwFootnoteAdj with css::text::HorizontalAdjust
    
    to ensure the retention of the values the code depends on
    
    Change-Id: I3baafc1ee66481518aec5928585464c8a214be16

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 9b9378f..c259e37 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -27,6 +27,7 @@
 #include <editeng/numitem.hxx>
 #include <editeng/borderline.hxx>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
+#include <com/sun/star/text/HorizontalAdjust.hpp>
 #include <o3tl/typed_flags_set.hxx>
 
 #include <boost/multi_index_container.hpp>
@@ -42,12 +43,6 @@ class SwTextFormatColl;
 class SwNode;
 class SwPageDescs;
 
-/// Separator line adjustment.
-enum class SwFootnoteAdj
-{
-    Left = 0, Center = 1, Right = 2
-};
-
 /// Footnote information.
 class SW_DLLPUBLIC SwPageFootnoteInfo
 {
@@ -57,7 +52,7 @@ private:
     editeng::SvxBorderStyle m_eLineStyle;  ///< Style of the separator line
     Color       m_LineColor;    ///< color of the separator line
     Fraction    m_Width;        ///< percentage width of the separator line.
-    SwFootnoteAdj    m_eAdjust;      ///< line adjustment.
+    css::text::HorizontalAdjust m_eAdjust;      ///< line adjustment.
     SwTwips     m_nTopDist;     ///< distance between body and separator.
     SwTwips     m_nBottomDist;  ///< distance between separator and first 
footnote
 
@@ -67,7 +62,7 @@ public:
     const Color& GetLineColor() const   { return m_LineColor;}
     editeng::SvxBorderStyle  GetLineStyle() const { return m_eLineStyle; }
     const Fraction& GetWidth() const    { return m_Width; }
-    SwFootnoteAdj    GetAdj() const          { return m_eAdjust; }
+    css::text::HorizontalAdjust GetAdj() const { return m_eAdjust; }
     SwTwips     GetTopDist() const      { return m_nTopDist; }
     SwTwips     GetBottomDist() const   { return m_nBottomDist; }
 
@@ -76,7 +71,7 @@ public:
     void SetLineStyle(editeng::SvxBorderStyle const eSet) {m_eLineStyle = 
eSet;}
     void SetLineColor(const Color& rCol)    { m_LineColor = rCol;}
     void SetWidth(const Fraction & rNew)    { m_Width = rNew; }
-    void SetAdj(SwFootnoteAdj const eNew)   { m_eAdjust = eNew; }
+    void SetAdj(css::text::HorizontalAdjust const eNew)   { m_eAdjust = eNew; }
     void SetTopDist   (SwTwips const nNew)  { m_nTopDist = nNew; }
     void SetBottomDist(SwTwips const nNew)  { m_nBottomDist = nNew; }
 
diff --git a/sw/source/core/layout/pagedesc.cxx 
b/sw/source/core/layout/pagedesc.cxx
index 556a382..14a0914 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -383,8 +383,8 @@ SwPageFootnoteInfo::SwPageFootnoteInfo()
     , m_nBottomDist( 57 )
 {
     m_eAdjust = FRMDIR_HORI_RIGHT_TOP == 
GetDefaultFrameDirection(GetAppLanguage()) ?
-           SwFootnoteAdj::Right :
-           SwFootnoteAdj::Left;
+           css::text::HorizontalAdjust_RIGHT :
+           css::text::HorizontalAdjust_LEFT;
 }
 
 SwPageFootnoteInfo::SwPageFootnoteInfo( const SwPageFootnoteInfo &rCpy )
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 51ed713..e11c009 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5573,9 +5573,9 @@ void SwFootnoteContFrame::PaintLine( const SwRect& rRect,
     SwTwips nX = aRectFnSet.GetPrtLeft(*this);
     switch ( rInf.GetAdj() )
     {
-        case SwFootnoteAdj::Right:
+        case css::text::HorizontalAdjust_RIGHT:
             nX += nPrtWidth - nWidth; break;
-        case SwFootnoteAdj::Left:
+        case css::text::HorizontalAdjust_LEFT:
             /* do nothing */; break;
         default:
             SAL_WARN("sw.core", "New adjustment for footnote lines?");
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 44f6d03..6f27e4c 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -266,7 +266,7 @@ bool SwFootNotePage::FillItemSet(SfxItemSet *rSet)
     rFootnoteInfo.SetLineColor( m_pLineColorBox->GetSelectEntryColor() );
 
         // Position
-    rFootnoteInfo.SetAdj((SwFootnoteAdj)m_pLinePosBox->GetSelectEntryPos());
+    
rFootnoteInfo.SetAdj((css::text::HorizontalAdjust)m_pLinePosBox->GetSelectEntryPos());
 
         // Breite
     rFootnoteInfo.SetWidth(Fraction( static_cast< long 
>(m_pLineLengthEdit->GetValue()), 100));
diff --git a/sw/source/uibase/utlui/uiitems.cxx 
b/sw/source/uibase/utlui/uiitems.cxx
index 579085a..c8dd123 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -166,7 +166,7 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal, 
sal_uInt8 nMemberId)
             sal_Int16 nSet = 0;
             rVal >>= nSet;
             if(nSet >= 0 && nSet < 3) //text::HorizontalAdjust
-                aFootnoteInfo.SetAdj((SwFootnoteAdj)nSet);
+                aFootnoteInfo.SetAdj((css::text::HorizontalAdjust)nSet);
             else
                 bRet = false;
         }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to