[Libreoffice-commits] .: 2 commits - sd/sdi sd/source

[Caolán McNamara]

 sd/sdi/_drvwsh.sdi                                   |    5 +++
 sd/source/ui/inc/DrawViewShell.hxx                   |    3 +
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx |    1 
 sd/source/ui/view/drviewsa.cxx                       |    1 
 sd/source/ui/view/drviewse.cxx                       |   29 +++++++++++++++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit 7a4a8d03a270ccdaa85b53b71ccd9d01cb54a4ae
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 21 12:24:01 2011 +0000

    unused variable

diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 9ad32b5..e0378d8 100755
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -619,7 +619,6 @@ sal_Int8 Clipboard::AcceptDrop (
             }
 
             // Show the insertion marker and the substitution for a drop.
-            Point aPosition = pTargetWindow->PixelToLogic (rEvent.maPosPixel);
             SelectionFunction* pSelectionFunction = dynamic_cast<SelectionFunction*>(
                 mrSlideSorter.GetViewShell()->GetCurrentFunction().get());
             if (pSelectionFunction != NULL)
commit 7a9bf535350a965e8d2d34de5fd1821872b6dfe4
Author: Bálint Dózsa <dozsabalint at gmail.com>
Date:   Thu Mar 17 15:53:50 2011 +0100

    FIX BUG 32559 - draw

diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 6f17ad5..a307b45 100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2154,6 +2154,11 @@ interface DrawView
         ExecMethod = FuSupport ;
         StateMethod = GetCtrlState ;
     ]
+    SID_TRANSLITERATE_ROTATE_CASE // ole : no, status : ?
+    [
+        ExecMethod = FuSupportRotate ;
+        StateMethod = GetCtrlState ;
+    ]
     SID_TRANSLITERATE_LOWER // ole : no, status : ?
     [
         ExecMethod = FuSupport ;
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 90fc0e1..52e7456 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -72,6 +72,8 @@ class DrawViewShell
     : public ViewShell,
       public SfxListener
 {
+    sal_uInt32  nF3ShiftCounter;
+
 public:
     static const int SLOTARRAY_COUNT = 24;
 
@@ -218,6 +220,7 @@ public:
     void	        FuTemporary(SfxRequest& rReq);
     void	        FuPermanent(SfxRequest& rReq);
     void	        FuSupport(SfxRequest& rReq);
+    void                FuSupportRotate(SfxRequest& rReq);
     void	        FuTable(SfxRequest& rReq);
 
     void	        AttrExec (SfxRequest& rReq);
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 86e9a61..f651396 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -141,6 +141,7 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
 : ViewShell (pFrame, pParentWindow, rViewShellBase)
 , maTabControl(this, pParentWindow)
 , mbIsInSwitchPage(false)
+, nF3ShiftCounter(0)
 {
     if (pFrameViewArgument != NULL)
         mpFrameView = pFrameViewArgument;
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index c4f66dd..534aa4f 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1485,6 +1485,35 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
     }
 }
 
+void DrawViewShell::FuSupportRotate(SfxRequest &rReq)
+{
+    using namespace ::com::sun::star::i18n;
+    {
+        sal_uInt32 nMode = 0;
+        OutlinerView* pOLV = GetView()->GetTextEditOutlinerView();
+
+        if( rReq.GetSlot() == SID_TRANSLITERATE_ROTATE_CASE ) {
+            switch ( nF3ShiftCounter ) {
+                case 0:
+                    nMode = TransliterationModulesExtra::TITLE_CASE;
+                    break;
+                case 1:
+                    nMode = TransliterationModules_LOWERCASE_UPPERCASE;
+                    break;
+                case 2:
+                    nMode = TransliterationModules_UPPERCASE_LOWERCASE;
+                    nF3ShiftCounter = -1;
+                    break;
+            }
+
+            if ( nMode )
+                pOLV->TransliterateText( nMode );
+
+            nF3ShiftCounter++;
+        }
+    }
+}
+
 /*************************************************************************
 |*
 |* URL-Feld einfuegen