diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-04 21:22:26 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-05 10:14:48 +0100 |
commit | a0d627639d24056337174dec65a5defba88a41f3 (patch) | |
tree | 2d81c4ea25e7d2ffa44284b0239a735a6a38fbf7 /sd | |
parent | 3271f2d87d8e3caca464964c03115cd3da37a138 (diff) |
fix use of local resource string ids in global context
possibly a regression since 227113bbf16f2feda4d3e41bb9aff7dc100ede17
Take the opportunity to give them more useful names while I'm at it
Change-Id: I175b656ac611b78ebaa21b53778085113632095e
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/app/strings.src | 30 | ||||
-rw-r--r-- | sd/source/ui/inc/strings.hrc | 12 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/inc/view/SlsResource.hrc | 8 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 9 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsResource.src | 31 |
6 files changed, 44 insertions, 47 deletions
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 1bc40bfc72a3..75b2339a90d8 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1269,3 +1269,33 @@ String STR_INSERT_MOVIE { Text [ en-US ] = "Insert Movie"; }; + +String STRING_DRAG_AND_DROP_PAGES +{ + Text [ en-US ] = "Drag and Drop Pages" ; +}; + +String STRING_DRAG_AND_DROP_SLIDES +{ + Text [ en-US ] = "Drag and Drop Slides" ; +}; + +String STRING_START_SLIDESHOW +{ + Text [ en-US ] = "Start Slide Show" ; +}; + +String STRING_HIDE_SLIDE +{ + Text [ en-US ] = "Hide Slide" ; +}; + +String STRING_SHOW_SLIDE +{ + Text [ en-US ] = "Show Slide" ; +}; + +String STRING_DUPLICATE_SLIDE +{ + Text [ en-US ] = "Duplicate Slide" ; +}; diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index e199431da591..a3b36b9ec312 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -500,9 +500,6 @@ #define STR_NAVIGATOR_SHOW_NAMED_SHAPES (RID_APP_START+718) #define STR_NAVIGATOR_SHOW_ALL_SHAPES (RID_APP_START+719) #define STR_NAVIGATOR_SHAPE_BASE_NAME (RID_APP_START+720) -//IAccessibility2 Implementation 2009----- -#define STR_ACC_DIALOG_DESC (RID_APP_START + 730) -//-----IAccessibility2 Implementation 2009 #define STR_RESET_LAYOUT (RID_APP_START+721) #define STR_INSERT_TABLE (RID_APP_START+722) @@ -510,6 +507,15 @@ #define STR_INSERT_PICTURE (RID_APP_START+724) #define STR_INSERT_MOVIE (RID_APP_START+725) +#define STRING_DRAG_AND_DROP_PAGES (RID_APP_START+726) +#define STRING_DRAG_AND_DROP_SLIDES (RID_APP_START+727) +#define STRING_START_SLIDESHOW (RID_APP_START+728) +#define STRING_HIDE_SLIDE (RID_APP_START+729) +#define STRING_SHOW_SLIDE (RID_APP_START+730) +#define STRING_DUPLICATE_SLIDE (RID_APP_START+731) + +#define STR_ACC_DIALOG_DESC (RID_APP_START+732) + /****************************************************************************** * The ids in glob.hrc start at RID_APP_START+750! ******************************************************************************/ diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 0ff1eb0339a0..a41d5d0e3f08 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -35,7 +35,6 @@ #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" diff --git a/sd/source/ui/slidesorter/inc/view/SlsResource.hrc b/sd/source/ui/slidesorter/inc/view/SlsResource.hrc index 2b85a37d35dc..be4f7322567d 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsResource.hrc +++ b/sd/source/ui/slidesorter/inc/view/SlsResource.hrc @@ -100,12 +100,4 @@ #define IMAGE_HIDE_SLIDE_OVERLAY 92 #define IMAGE_FOCUS_BORDER 93 -#define STRING_DRAG_AND_DROP_PAGES 101 -#define STRING_DRAG_AND_DROP_SLIDES 102 - -#define STRING_COMMAND1 110 -#define STRING_COMMAND2_A 111 -#define STRING_COMMAND2_B 112 -#define STRING_COMMAND3 113 - #endif diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index 42150b56ae0e..3ed33d8a3b4b 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -43,6 +43,7 @@ #include "controller/SlsAnimator.hxx" #include "controller/SlsAnimationFunction.hxx" #include "app.hrc" +#include "strings.hrc" #include "drawdoc.hxx" #include "sdmod.hxx" #include "optsitem.hxx" @@ -1064,7 +1065,7 @@ UnhideButton::UnhideButton (SlideSorter& rSlideSorter) rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2BMediumHover), rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2BSmall), rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2BSmallHover), - String(SdResId(STRING_COMMAND2_B))) + String(SdResId(STRING_SHOW_SLIDE))) { } @@ -1096,7 +1097,7 @@ StartShowButton::StartShowButton (SlideSorter& rSlideSorter) rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command1MediumHover), rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command1Small), rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command1SmallHover), - String(SdResId(STRING_COMMAND1))) + String(SdResId(STRING_START_SLIDESHOW))) { } @@ -1162,7 +1163,7 @@ HideButton::HideButton (SlideSorter& rSlideSorter) rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2MediumHover), rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2Small), rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2SmallHover), - String(SdResId(STRING_COMMAND2_A))) + String(SdResId(STRING_HIDE_SLIDE))) { } @@ -1194,7 +1195,7 @@ DuplicateButton::DuplicateButton (SlideSorter& rSlideSorter) rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command3MediumHover), rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command3Small), rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command3SmallHover), - String(SdResId(STRING_COMMAND3))) + String(SdResId(STRING_DUPLICATE_SLIDE))) { } diff --git a/sd/source/ui/slidesorter/view/SlsResource.src b/sd/source/ui/slidesorter/view/SlsResource.src index 13f6cd08c775..16cb3b9d3025 100644 --- a/sd/source/ui/slidesorter/view/SlsResource.src +++ b/sd/source/ui/slidesorter/view/SlsResource.src @@ -280,35 +280,4 @@ Resource RID_SLIDESORTER_ICONS { ImageBitmap = Bitmap { File = "slide_sorter_focus_border.png" ; }; }; - - - String STRING_DRAG_AND_DROP_PAGES - { - Text [ en-US ] = "Drag and Drop Pages" ; - }; - - String STRING_DRAG_AND_DROP_SLIDES - { - Text [ en-US ] = "Drag and Drop Slides" ; - }; - - String STRING_COMMAND1 - { - Text [ en-US ] = "Start Slide Show" ; - }; - - String STRING_COMMAND2_A - { - Text [ en-US ] = "Hide Slide" ; - }; - - String STRING_COMMAND2_B - { - Text [ en-US ] = "Show Slide" ; - }; - - String STRING_COMMAND3 - { - Text [ en-US ] = "Duplicate Slide" ; - }; }; |