cui/source/dialogs/cuires.src | 5 +++++ cui/source/dialogs/insdlg.cxx | 4 ++-- cui/source/dialogs/svuidlg.hrc | 2 -- cui/source/dialogs/svuidlg.src | 5 ----- cui/source/inc/cuires.hrc | 1 + sw/sdi/swriter.sdi | 4 ++-- vcl/inc/vcl/dialog.hxx | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-)
New commits: commit 750daab570b813167c342b0e4183d5cf4762458c Author: Caolán McNamara <[email protected]> Date: Fri Oct 26 23:38:21 2012 +0100 Resolves: fdo#52353 navigation buttons disabled in read-only mode Change-Id: Ib60ae077be6a179568e6ccd8454e572c22c35e7e diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 8fb9339..3f2941b 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -10302,7 +10302,7 @@ SfxVoidItem NavigateBack FN_NAVIGATION_BACK FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, - ReadOnlyDoc = FALSE, + ReadOnlyDoc = TRUE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -10327,7 +10327,7 @@ SfxVoidItem NavigateForward FN_NAVIGATION_FORWARD FastCall = FALSE, HasCoreId = FALSE, HasDialog = FALSE, - ReadOnlyDoc = FALSE, + ReadOnlyDoc = TRUE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, commit 570b59edac31d1a86ebbb042602f5a9781c19ef9 Author: Caolán McNamara <[email protected]> Date: Fri Oct 26 22:53:59 2012 +0100 fix fractured comment Change-Id: Ib4227a74232b1ba6ca48d037340c4a7441ab08e7 diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 22ca609..b0e69c4 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -35,8 +35,8 @@ #include <vcl/syswin.hxx> #include <vcl/timer.hxx> -// parameter to pass to the dialogue constructor if really no parent is wanted -// whereas NULL chooses the deafult dialogue parent +// parameter to pass to the dialog constructor if really no parent is wanted +// whereas NULL chooses the default dialog parent #define DIALOG_NO_PARENT ((Window*)0xffffffff) // ---------- commit f72004dc283dce45649e5807a6345a5d08b79a21 Author: Caolán McNamara <[email protected]> Date: Fri Oct 26 20:58:15 2012 +0100 chop last string out into generic .src Change-Id: I958f6e80813a4e056b09225b16cea9ea2a3450ac diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src index 6b7e8fc..91c0f5e 100644 --- a/cui/source/dialogs/cuires.src +++ b/cui/source/dialogs/cuires.src @@ -14,4 +14,9 @@ String RID_SVXSTR_ERR_TEXTNOTFOUND Text [ en-US ] = "No alternatives found." ; }; +String RID_SVXSTR_SELECT_FILE_IFRAME +{ + Text [ en-US ] = "Select File for Floating Frame" ; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 83cd8d0..9b0529e 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -53,7 +53,7 @@ #include <svl/ownlist.hxx> #include <comphelper/seqstream.hxx> -#include "svuidlg.hrc" +#include "cuires.hrc" #include <osl/file.hxx> @@ -768,7 +768,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG ) ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0, String() ); // set the title - aFileDlg.SetTitle( OUString( String( CUI_RES( MD_INSERT_OBJECT_IFRAME ) ) ) ); + aFileDlg.SetTitle(CUI_RESSTR(RID_SVXSTR_SELECT_FILE_IFRAME)); // show the dialog if ( aFileDlg.Execute() == ERRCODE_NONE ) diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc index d473d6f..da1dd14 100644 --- a/cui/source/dialogs/svuidlg.hrc +++ b/cui/source/dialogs/svuidlg.hrc @@ -82,5 +82,3 @@ #define GB_CLASS 14 #define ED_APPLET_OPTIONS 20 #define GB_APPLET_OPTIONS 21 - -#define MD_INSERT_OBJECT_IFRAME 32011 diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index d8cd5ea..310653e 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -392,8 +392,3 @@ Control TB_LINKS TabStop = TRUE ; ClipChildren = TRUE ; }; - -String MD_INSERT_OBJECT_IFRAME -{ - Text [ en-US ] = "Select File for Floating Frame" ; -}; diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 0345486..8a0c560 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -417,6 +417,7 @@ #define RID_SVXSTR_EVENT_CONTENTCHANGED (RID_SVX_START + 1194) #define RID_SVXSTR_ERR_TEXTNOTFOUND (RID_SVX_START + 1195) +#define RID_SVXSTR_SELECT_FILE_IFRAME (RID_SVX_START + 1196) #define RID_SVXDLG_CERTPATH (RID_SVX_START + 1198)
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
