[Libreoffice-commits] core.git: 2 commits - i18npool/source sc/source

[Stephan Bergmann]

 i18npool/source/localedata/LocaleNode.hxx |    2 --
 i18npool/source/localedata/saxparser.cxx  |    1 -
 sc/source/ui/view/formatsh.cxx            |   10 +++++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 4e95dc3ff697dda2391147ba4c311a5a5031c560
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 29 11:29:03 2013 +0200

    Unused include
    
    Change-Id: I79c5b123abf671d51deadd56644271124420ce64

diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 27b0027..3684ace 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -23,7 +23,6 @@
 
 #include <vector>
 
-#include <com/sun/star/registry/XImplementationRegistration.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
@@ -37,7 +36,6 @@ using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::io;
 
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 60ab16b..94207d0 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -49,7 +49,6 @@ using namespace ::std;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::io;
 
commit 5a8a57703cad29ec2865390f3ced34af0e82b33f
Author: abdulmajeed ahmed <aalabdulrazzaq at kacst.edu.sa>
Date:   Sat Apr 27 12:07:59 2013 +0300

    fdo#63592 Solve context numerical problem when changing text direction
    
    when you change the text direction it should update the numerical type but it dosen't.
    this patch will get you out of edit mode before changing text direction and after finish the change it will get you in again
    
    Change-Id: I5598fd9dab823c738a812537743695ec88690a24
    Reviewed-on: https://gerrit.libreoffice.org/3629
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 5281d79..656f608 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2056,7 +2056,13 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest& rReq )
 {
     ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
     pTabViewShell->HideListBox();               // Autofilter-DropDown-Listbox
-
+    bool bEditMode = false;
+    if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) )
+    {
+        bEditMode=true;
+        SC_MOD()->InputEnterHandler();
+        pTabViewShell->UpdateInputHandler();
+    }
     sal_uInt16 nSlot = rReq.GetSlot();
     switch( nSlot )
     {
@@ -2141,6 +2147,8 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest& rReq )
         }
         break;
     }
+    if (bEditMode)
+        SC_MOD()->SetInputMode( SC_INPUT_TABLE );
 }
 
 void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet )