[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source sw/source

[Tsutomu Uchino]

 sd/source/ui/slidesorter/controller/SlsListener.cxx |    5 -----
 sw/source/core/text/inftxt.hxx                      |    1 -
 sw/source/core/text/portxt.cxx                      |   10 ++++++++++
 3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit eacf6ec741dcc66f07e0b7b2a3a402d2f3c670fa
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Mon Jan 20 12:03:42 2014 +0000

    #i122221# fix slide selected in Slide Pane with Page Up
    
    The comment in the removed part says to call SelectPage to make
    the slide visible. But the following NotifyCurrentSlideChange method
    calls SelectPage for the page makes it visible if the pane is not updated yet.

diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 64965d4..dfe9ccf 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -501,11 +501,6 @@ void SAL_CALL Listener::propertyChange (
                     String(RTL_CONSTASCII_USTRINGPARAM("Number")));
                 sal_Int32 nCurrentPage = 0;
                 aPageNumber >>= nCurrentPage;
-                // The selection is already set but we call SelectPage()
-                // nevertheless in order to make the new current page the
-                // last recently selected page of the PageSelector.  This is
-                // used when making the selection visible.
-                mrController.GetPageSelector().SelectPage(nCurrentPage-1);
                 mrController.GetCurrentSlideManager()->NotifyCurrentSlideChange(nCurrentPage-1);
             }
             catch (beans::UnknownPropertyException aEvent)
commit 14e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Mon Jan 20 10:57:12 2014 +0000

    124039: <SwTxtInputFldPortion::Format(..)> - assure correct line break for multi-lined Input Fields

diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 3594f3d..11f3a21 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -608,7 +608,6 @@ public:
     inline void Right( const SwTwips nNew ) { nRight = nNew; }
     inline SwTwips First() const { return nFirst; }
     inline void First( const SwTwips nNew ) { nFirst = nNew; }
-    inline SwTwips CurrLeft() const { return (nLineStart ? nLeft : nFirst); }
     inline KSHORT RealWidth() const { return nRealWidth; }
     inline void RealWidth( const KSHORT nNew ) { nRealWidth = nNew; }
     inline KSHORT ForcedLeftMargin() const { return nForcedLeftMargin; }
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 487ebf3..f881fe3 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -747,6 +747,12 @@ sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf )
         }
         else
         {
+            const xub_StrLen nFormerLineStart = rInf.GetLineStart();
+            if ( !mbContainsInputFieldStart )
+            {
+                rInf.SetLineStart( 0 );
+            }
+
             bRet = SwTxtPortion::Format( rInf );
 
             if ( mbContainsInputFieldEnd )
@@ -763,6 +769,10 @@ sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf )
                 // adjust portion length accordingly
                 SetLen( GetLen() + 1 );
             }
+            else
+            {
+                rInf.SetLineStart( nFormerLineStart );
+            }
         }
     }