diff options
Diffstat (limited to 'sd/source/ui/slidesorter/controller/SlsClipboard.cxx')
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index afdf1339107e..ec3ea1d2e435 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -35,6 +35,7 @@ #include "model/SlsPageDescriptor.hxx" #include "model/SlsPageEnumerationProvider.hxx" #include "view/SlideSorterView.hxx" +#include "view/SlsResource.hrc" #include "view/SlsTheme.hxx" #include "controller/SlideSorterController.hxx" #include "controller/SlsInsertionIndicatorHandler.hxx" @@ -120,17 +121,16 @@ class Clipboard::UndoContext public: UndoContext ( SdDrawDocument* pDocument, - const ::boost::shared_ptr<ViewShell>& rpMainViewShell, - const ::boost::shared_ptr<view::Theme>& rpTheme) + const ::boost::shared_ptr<ViewShell>& rpMainViewShell) : mpDocument(pDocument), mpMainViewShell(rpMainViewShell) { if (mpDocument!=NULL && mpDocument->IsUndoEnabled()) { if (mpMainViewShell && mpMainViewShell->GetShellType() == ViewShell::ST_DRAW) - mpDocument->BegUndo(rpTheme->GetString(view::Theme::String_DragAndDropPages)); + mpDocument->BegUndo(String(SdResId(STRING_DRAG_AND_DROP_PAGES))); else - mpDocument->BegUndo(rpTheme->GetString(view::Theme::String_DragAndDropSlides)); + mpDocument->BegUndo(String(SdResId(STRING_DRAG_AND_DROP_SLIDES))); } } @@ -714,8 +714,7 @@ sal_Int8 Clipboard::ExecuteDrop ( // Handle a general drop operation. mpUndoContext.reset(new UndoContext ( mrSlideSorter.GetModel().GetDocument(), - mrSlideSorter.GetViewShell()->GetViewShellBase().GetMainViewShell(), - mrSlideSorter.GetTheme())); + mrSlideSorter.GetViewShell()->GetViewShellBase().GetMainViewShell())); mpSelectionObserverContext.reset(new SelectionObserver::Context(mrSlideSorter)); HandlePageDrop(*pDragTransferable); |