sd/inc/glob.hrc | 1 - sd/source/core/glob.src | 36 +++++++++++++++++++++++++++++++++++- sd/source/ui/view/ViewShellBase.cxx | 2 +- sfx2/inc/sfx2/objface.hxx | 4 ++-- sw/source/ui/inc/shells.hrc | 4 ---- sw/source/ui/shells/shells.src | 8 ++++++++ 6 files changed, 46 insertions(+), 9 deletions(-)
New commits: commit ac07fe981912dfd435e571ae42d4c1980fd1cfe7 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Nov 28 11:16:14 2011 +0000 add defined but missing SfxInterface strings diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src index 5d736a5..a3c5436 100644 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.src @@ -346,10 +346,44 @@ String STR_MEDIAOBJECTBARSHELL String STR_TABLEOBJECTBARSHELL { - Text [ de ] = "Tabelle" ; Text [ en-US ] = "Table" ; }; +String STR_SLIDESORTERVIEWSHELL +{ + Text [ en-US ] = "Slide Sorter" ; +}; + +String STR_TOOL_PANEL_SHELL +{ + Text [ en-US ] = "Tool Panel" ; +}; + +String STR_LEFT_IMPRESS_PANE_SHELL +{ + Text [ en-US ] = "Slides" ; +}; + +String STR_LEFT_DRAW_PANE_SHELL +{ + Text [ en-US ] = "Pages" ; +}; + +String STR_TASKPANEVIEWSHELL +{ + Text [ en-US ] = "Tasks" ; +}; + +String STR_MASTERPAGESSELECTOR +{ + Text [ en-US ] = "Master Pages" ; +}; + +String STR_TASKPANELAYOUTMENU +{ + Text [ en-US ] = "Layout" ; +}; + String STR_POWERPOINT_IMPORT { Text [ en-US ] = "PowerPoint Import"; diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc index 569dba2..6c3e409 100644 --- a/sw/source/ui/inc/shells.hrc +++ b/sw/source/ui/inc/shells.hrc @@ -94,10 +94,6 @@ #define STR_REDLINE_EDIT (RC_SHELLS_BEGIN + 56) #define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57) -// #i68101# no longer needed -// #define STR_NAME_SHAPE_LABEL (RC_SHELLS_BEGIN + 58) -// #define STR_NAME_SHAPE_DIALOG (RC_SHELLS_BEGIN + 59) - #define RID_MODULE_TOOLBOX (RC_SHELLS_BEGIN + 60) #define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61) diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index ad275b5..ee1f6ec 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -205,6 +205,14 @@ String STR_SHELLNAME_DRAW_TEXT { Text [ en-US ] = "Draw text" ; }; +String STR_SHELLNAME_MEDIA +{ + Text [ en-US ] = "Media" ; +}; +String STR_SHELLNAME_NAVIGATION +{ + Text [ en-US ] = "Navigation" ; +}; //Strings fuer Gallery/Hintergrund String STR_SWBG_PARAGRAPH { commit 55c5ea43a59e505297fb6fa20b77aaa28f7c67bc Author: Caolán McNamara <caol...@redhat.com> Date: Mon Nov 28 10:49:36 2011 +0000 there is no STR_VIEWSHELLBASE string diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 89b2b67..4de2609 100755 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -125,7 +125,6 @@ #define STR_SAVE_DOC RID_GLOB_START+100 #define STR_PREVIEWVIEWSHELL RID_GLOB_START+101 #define RID_SD_ERRHDL RID_GLOB_START+102 -#define STR_VIEWSHELLBASE RID_GLOB_START+103 #define STR_3DOBJECTBARSHELL RID_GLOB_START+104 #define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105 #define STR_SLIDESORTERVIEWSHELL RID_GLOB_START+106 diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 3f7094d..94ed8ff 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -261,7 +261,7 @@ void ViewShellBase::InitFactory() -SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(STR_VIEWSHELLBASE)) +SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0)) { } commit 5d0051ac3733db9f04dd459db46212f70a9c07e9 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Nov 28 10:11:54 2011 +0000 SfxInterfaces may legally have no translatable ui name diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index 7e43c19..c4d38f2 100644 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -80,9 +80,9 @@ public: const SfxSlot* GetSlot( const String& rCommand ) const; const char* GetClassName() const { return pName; } - int HasName() const { return 0 != aNameResId.GetId(); } + bool HasName() const { return 0 != aNameResId.GetId(); } rtl::OUString GetName() const - { return String(aNameResId); } + { return HasName() ? ResId::toString(aNameResId) : rtl::OUString(); } ResMgr* GetResMgr() const { return aNameResId.GetResMgr(); }
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits