[Libreoffice-commits] .: 3 commits - sc/source

[Caolán McNamara]

 sc/source/filter/xml/XMLExportDDELinks.hxx |    2 +-
 sc/source/ui/inc/autostyl.hxx              |    2 +-
 sc/source/ui/inc/cellsh.hxx                |    3 ++-
 sc/source/ui/view/cellsh.cxx               |    3 +--
 sc/source/ui/view/cellsh1.cxx              |   26 ++------------------------
 5 files changed, 7 insertions(+), 29 deletions(-)

New commits:
commit 9682514911fb2e3d99962dbd35d68849b87bdde6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 30 09:35:03 2011 +0100

    WaE: struct vs class

diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index 3705b85..eac8749 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -38,7 +38,7 @@
 class ScDocShell;
 class ScRange;
 class ScAutoStyleData;
-class ScAutoStyleInitData;
+struct ScAutoStyleInitData;
 
 class ScAutoStyleList
 {
commit 98f686b0a41877e4656cbff6c92fe4df07e29f24
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 30 09:20:16 2011 +0100

    WaE: struct vs class

diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx
index 2dacb5a..2b69ccb 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.hxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.hxx
@@ -33,7 +33,7 @@
 
 class String;
 class ScXMLExport;
-class ScMatrixValue;
+struct ScMatrixValue;
 
 class ScXMLExportDDELinks
 {
commit 6c7472604e2246a0073d08c52a864b92a4899c98
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 29 21:08:44 2011 +0100

    centralize caserotate

diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 685a3fb..721b891 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -33,6 +33,7 @@
 #include "shellids.hxx"
 #include <sfx2/module.hxx>
 #include <svx/svdmark.hxx>
+#include <unotools/caserotate.hxx>
 #include <tools/link.hxx>
 #include "formatsh.hxx"
 #include "address.hxx"
@@ -72,7 +73,7 @@ private:
     DECL_LINK( ClipboardChanged, TransferableDataHelper* );
     DECL_LINK( DialogClosed, AbstractScLinkedAreaDlg* );
 
-    sal_uInt32  nF3ShiftCounter;
+    RotateTransliteration m_aRotateCase;
 
 public:
 
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 53be26f..5d6c875 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -86,8 +86,7 @@ SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell , ScResId(SCSTR_CELLSHELL) )
 ScCellShell::ScCellShell(ScViewData* pData) :
     ScFormatShell(pData),
     pImpl( new CellShell_Impl() ),
-    bPastePossible(false),
-    nF3ShiftCounter(0)
+    bPastePossible(false)
 {
     SetHelpId(HID_SCSHELL_CELLSH);
     SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Cell")));
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 792edca..3f462b7 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2094,30 +2094,8 @@ void ScCellShell::ExecuteTrans( SfxRequest& rReq )
 
 void ScCellShell::ExecuteRotateTrans( SfxRequest& rReq )
 {
-    using namespace ::com::sun::star::i18n;
-    {
-        sal_uInt32 nMode = 0;
-
-        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 )
-                GetViewData()->GetView()->TransliterateText( nMode );
-
-            nF3ShiftCounter++;
-        }
-    }
+    if( rReq.GetSlot() == SID_TRANSLITERATE_ROTATE_CASE )
+        GetViewData()->GetView()->TransliterateText( m_aRotateCase.getNextMode() );
 }
 
 void ScCellShell::ExecuteExternalSource(