diff options
author | Tomaž Vajngerl <quikee@gmail.com> | 2012-07-01 16:46:25 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2012-07-01 17:47:50 +0200 |
commit | 982db7bc6b82185202fb1a31ab29398b68c75073 (patch) | |
tree | 313b92b7ef7e8a7b8114e08e98bd5cb322729950 | |
parent | 8c1aafe8c20b6de8e13b4ce0eb34bb1b1f04fc0f (diff) |
Move "save graphic" dialog title to svx.
Change-Id: I1200e66f010525d989bed801240de6813ddf751c
-rw-r--r-- | sd/source/ui/app/strings.src | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/strings.hrc | 16 | ||||
-rw-r--r-- | svx/AllLangResTarget_svx.mk | 3 | ||||
-rw-r--r-- | svx/inc/svx/dialogs.hrc | 6 | ||||
-rw-r--r-- | svx/source/core/graphichelper.cxx | 6 | ||||
-rw-r--r-- | svx/source/core/graphichelper.src | 24 | ||||
-rw-r--r-- | sw/source/ui/docvw/docvw.hrc | 1 | ||||
-rw-r--r-- | sw/source/ui/docvw/docvw.src | 4 |
8 files changed, 40 insertions, 24 deletions
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 75b2339a90d8..fde9c9b4f6a0 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1069,10 +1069,6 @@ String STR_TITLE_RENAMESLIDE { Text [ en-US ] = "Rename Slide"; }; -String STR_TITLE_SAVE_AS_PICTURE -{ - Text [ en-US ] = "Save as Picture"; -}; String STR_DESC_RENAMESLIDE { Text [ en-US ] = "Name"; diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index 7adefbf7f241..7ac678471698 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -397,7 +397,7 @@ #define STR_TASKPANEL_LAYOUT_MENU_TITLE (RID_APP_START+713) #define STR_GRAPHICS_STYLE_FAMILY (RID_APP_START+715) -#define STR_TITLE_SAVE_AS_PICTURE (RID_APP_START+716) +// free #define STR_CELL_STYLE_FAMILY (RID_APP_START+717) #define STR_NAVIGATOR_SHOW_NAMED_SHAPES (RID_APP_START+718) @@ -410,14 +410,14 @@ #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 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) +#define STR_ACC_DIALOG_DESC (RID_APP_START+732) /****************************************************************************** * The ids in glob.hrc start at RID_APP_START+750! diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index cf152d7151bc..cae5703fae06 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -56,6 +56,7 @@ $(eval $(call gb_SrsTarget_set_include,svx/res,\ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/accessibility/accessibility.src \ + svx/source/core/graphichelper.src \ svx/source/dialog/bmpmask.src \ svx/source/dialog/contdlg.src \ svx/source/dialog/ctredlin.src \ diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index f95678ec73f9..fce189b7bba7 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -136,7 +136,7 @@ #define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210) #define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212) #define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) -#define RID_SW_TP_COMPARISON_OPT (RID_OFA_START + 257) +#define RID_SW_TP_COMPARISON_OPT (RID_OFA_START + 257) #define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240) #define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242) #define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243) @@ -237,7 +237,6 @@ #define RID_SVXBMP_FONTWORK_FORM11 (RID_SVX_START + 104) #define RID_SVXBMP_FONTWORK_FORM12 (RID_SVX_START + 105) - #define RID_SVXCTRL_COLOR (RID_SVX_START + 117) // for Toolbox-Control style @@ -867,7 +866,8 @@ #define RID_SVXSTR_ACCESSIBILITY_START (RID_SVX_START + 860) // RID_SVXSTR_ACCESSIBILITY_END (RID_SVX_START + 950) -// 984: free +#define RID_SVXSTR_EXPORT_GRAPHIC_TITLE (RID_SVX_START + 984) + #define RID_SVXFLOAT_EXTRUSION_DIRECTION (RID_SVX_START + 985) #define RID_SVX_EXTRUSION_BAR (RID_SVX_START + 986) diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index faec3b27970d..3e73c99a1d0a 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -33,6 +33,8 @@ #include <sfx2/docfile.hxx> #include <svx/xoutbmp.hxx> #include <sfx2/filedlghelper.hxx> +#include <svx/dialmgr.hxx> +#include <svx/dialogs.hrc> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> @@ -85,10 +87,8 @@ String GraphicHelper::ExportGraphic( const Graphic &rGraphic, const String &rGrf // fish out the graphic's name String aName = rGrfName; - printf("Name: %s\n", aName.GetBuffer()); - //aDlgHelper.SetTitle( SW_RESSTR(STR_EXPORT_GRAFIK_TITLE)); - aDlgHelper.SetTitle( String("Title") ); + aDlgHelper.SetTitle( SVX_RESSTR(RID_SVXSTR_EXPORT_GRAPHIC_TITLE)); aDlgHelper.SetDisplayDirectory( aPath.GetMainURL(INetURLObject::DECODE_TO_IURI) ); INetURLObject aURL; aURL.SetSmartURL( aName ); diff --git a/svx/source/core/graphichelper.src b/svx/source/core/graphichelper.src new file mode 100644 index 000000000000..44b881014ae2 --- /dev/null +++ b/svx/source/core/graphichelper.src @@ -0,0 +1,24 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <svx/dialogs.hrc> + +String RID_SVXSTR_EXPORT_GRAPHIC_TITLE +{ + Text [ en-US ] = "Graphics Export" ; +}; diff --git a/sw/source/ui/docvw/docvw.hrc b/sw/source/ui/docvw/docvw.hrc index 25571d905bad..f137d2ae11ed 100644 --- a/sw/source/ui/docvw/docvw.hrc +++ b/sw/source/ui/docvw/docvw.hrc @@ -48,7 +48,6 @@ #define MN_READONLY_BACKGROUNDTOGALLERY (RC_DOCVW_BEGIN + 60) -#define STR_EXPORT_GRAFIK_TITLE (RC_DOCVW_BEGIN + 1) #define STR_CHAIN_OK (RC_DOCVW_BEGIN + 2) #define STR_CHAIN_NOT_EMPTY (RC_DOCVW_BEGIN + 3) #define STR_CHAIN_IS_IN_CHAIN (RC_DOCVW_BEGIN + 4) diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/ui/docvw/docvw.src index 67873069a959..9ea90f7e038e 100644 --- a/sw/source/ui/docvw/docvw.src +++ b/sw/source/ui/docvw/docvw.src @@ -199,10 +199,6 @@ Menu MN_READONLY_POPUP }; }; }; -String STR_EXPORT_GRAFIK_TITLE -{ - Text [ en-US ] = "Graphics Export" ; -}; String STR_CHAIN_OK { Text [ en-US ] = "Click the left mouse button to link the frames." ; |