summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorKatarina Behrens <bubli@bubli.org>2013-08-21 18:49:26 +0200
committerKatarina Behrens <bubli@bubli.org>2013-08-21 18:52:29 +0200
commit8abfe7d06b998ca42a3f22667a7aeadb0826b9b3 (patch)
tree6944fe5eb4759a7ffb4a5ac46b58d0f126c402d5 /sd
parent99438adf527478119d9efe9a04e1dc4069860154 (diff)
Feeble attempt to fix build on Android (with -Werror=shadow)
Change-Id: I13f443eafa0264030cfa550365b699e1bdae9452
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index e9149d47ff7f..1699901da385 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -458,7 +458,7 @@ SlideTransitionPane::SlideTransitionPane(
get(mpPB_SLIDE_SHOW, "slide_show");
get(mpCB_AUTO_PREVIEW, "auto_preview");
- String maSTR_NO_TRANSITION( SdResId(STR_SLIDETRANSITION_NONE) );
+ maSTR_NO_TRANSITION( SD_RESSTR( STR_SLIDETRANSITION_NONE ) );
mpLB_SLIDE_TRANSITIONS->set_width_request(mpLB_SLIDE_TRANSITIONS->approximate_char_width() * 16);
mpLB_SLIDE_TRANSITIONS->set_height_request(mpLB_SLIDE_TRANSITIONS->GetTextHeight() * 16);