diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-12-23 10:01:58 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-12-23 10:01:58 +0100 |
| commit | b44240f655f3f5974a91911b7ec5e5652910a73e (patch) | |
| tree | f3b02c278e52118fcb13169cc29e1bf5dedeabdd /sd/source/ui/view/viewshe3.cxx | |
| parent | 3d789e3277b61891e38b549588213e7a80a94637 (diff) | |
| parent | 0bafb5a5e88a430440cb7a3ea42d787c6d1dcd79 (diff) | |
undoapi: merged after pulling DEV300_m96. Most probably still not buildable:A number of changes which happened in the CWS need to be redone due to the new build system
Diffstat (limited to 'sd/source/ui/view/viewshe3.cxx')
| -rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 729ba1575696..ab4b9e6732f5 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -34,8 +34,9 @@ #include "GraphicViewShellBase.hxx" #include <sfx2/viewfrm.hxx> +#include <svtools/svtools.hrc> #include <com/sun/star/lang/Locale.hpp> - +#include <svtools/svtdata.hxx> #include <utility> #include <vector> @@ -165,7 +166,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { // #87229# Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff. - String aTmp(ResId(STR_UNDO, *SFX_APP()->GetSfxResManager())); + String aTmp( SvtResId( STR_UNDO ) ); aTmp += pUndoManager->GetUndoActionComment(0); rSet.Put(SfxStringItem(SID_UNDO, aTmp)); } @@ -193,7 +194,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { // #87229# Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff. - String aTmp(ResId(STR_REDO, *SFX_APP()->GetSfxResManager())); + String aTmp(SvtResId(STR_REDO)); aTmp += pUndoManager->GetRedoActionComment(0); rSet.Put(SfxStringItem(SID_REDO, aTmp)); } |