summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-10-29 19:03:24 +0100
committerEike Rathke <erack@redhat.com>2013-10-29 19:15:02 +0100
commit8276cc057a1caf2e282093fcd90ac7b5a2c1c844 (patch)
treebfd4b1b3c92ac8538a6b18c900b3f88cc8f2d1fa
parent2f29e544932633a01162ecb80e50872eabdd2bc1 (diff)
Revert "Related: fdo#63546 bundle both changes together as one undo"
This reverts commit c4da31d33bcd00230153929bba3165f5257aabde. Conflicts: sc/inc/globstr.hrc sc/source/ui/view/formatsh.cxx Change-Id: If74872b89dff88f1f1fc7fac1a7b6224f3763d26
-rw-r--r--sc/inc/globstr.hrc3
-rw-r--r--sc/source/ui/src/globstr.src8
-rw-r--r--sc/source/ui/view/formatsh.cxx7
3 files changed, 0 insertions, 18 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 9c064fb01599..688d5896d376 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -668,9 +668,6 @@
#define STR_INVALIDINPUT 542
#define STR_INVALIDCONDITION 543
-#define STR_UNDO_L2R 544
-#define STR_UNDO_R2L 545
-
#define STR_FUN_TEXT_SELECTION_COUNT 546
#define STR_QUERYREMOVE 547
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index acab6b0dc528..a19f2c8c8f5a 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1784,14 +1784,6 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = "Insert Current Time";
};
- String STR_UNDO_L2R
- {
- Text [ en-US ] = "Left-to-right" ;
- };
- String STR_UNDO_R2L
- {
- Text [ en-US ] = "Right-to-left" ;
- };
String STR_MANAGE_NAMES
{
Text [ en-US ] = "Manage Names...";
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index b2116179538f..39d8fc6bcfd7 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2606,12 +2606,6 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest& rReq )
{
SvxFrameDirection eDirection = ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT ) ?
FRMDIR_HORI_LEFT_TOP : FRMDIR_HORI_RIGHT_TOP;
-
- OUString aUndo = ScGlobal::GetRscString( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT ?
- STR_UNDO_L2R : STR_UNDO_R2L );
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
-
pTabViewShell->ApplyAttr( SvxFrameDirectionItem( eDirection, ATTR_WRITINGDIR ) );
const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
@@ -2636,7 +2630,6 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest& rReq )
ExecuteSlot( rReq, GetInterface() );
}
- pDocSh->GetUndoManager()->LeaveListAction();
}
break;
}