basctl/inc/basidesh.hrc | 1 +
basctl/source/basicide/basidesh.cxx | 10 +++++++++-
basctl/source/basicide/basidesh.src | 4 ++++
include/sfx2/viewfrm.hxx | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 694fff63b50ec5c7f5e052e8969f9e94651b3a9a
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu May 22 17:29:56 2014 +0200
bnc#467278: Introduce a warning that changes to VBA macros cannot be saved.
As an InfoBar, so hopefully not annoying...
Change-Id: I5d4e79273edc03829fdab2d6d5a291576c954e4b
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 4fee05a..d6cf84d 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -61,6 +61,7 @@
#define RID_STR_OPEN ( RID_BASICIDE_START + 20 )
#define RID_STR_SAVE ( RID_BASICIDE_START + 21 )
#define RID_STR_RUNTIMEERROR ( RID_BASICIDE_START + 22 )
+#define RID_STR_CANNOTSAVEVBA ( RID_BASICIDE_START + 23 )
#define RID_STR_STDDIALOGNAME ( RID_BASICIDE_START + 24 )
#define RID_STR_STDMODULENAME ( RID_BASICIDE_START + 27 )
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index cad57f7..f66f8ca 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -37,6 +37,7 @@
#include <sfx2/app.hxx>
#include <sfx2/dinfdlg.hxx>
#include <sfx2/dispatch.hxx>
+#include <sfx2/infobar.hxx>
#include <sfx2/minfitem.hxx>
#include <sfx2/objface.hxx>
#include <svl/aeitem.hxx>
@@ -140,8 +141,8 @@ SFX_IMPL_INTERFACE(basctl_Shell, SfxViewShell,
IDEResId(RID_STR_IDENAME))
void basctl_Shell::InitInterface_Impl()
{
GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG);
-
GetStaticInterface()->RegisterChildWindow(SID_SHOW_PROPERTYBROWSER, false,
BASICIDE_UI_FEATURE_SHOW_BROWSER);
+
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()->RegisterPopupMenu(IDEResId(RID_POPUP_DLGED));
}
@@ -253,7 +254,14 @@ Shell::~Shell()
void Shell::onDocumentCreated( const ScriptDocument& /*_rDocument*/ )
{
if (pCurWin)
+ {
pCurWin->OnNewDocument();
+
+ // for VBA documents, show a warning that we can save them only in ODF
+ if (pCurWin->GetDocument().isInVBAMode())
+ GetViewFrame()->AppendInfoBar("vba_save",
IDE_RESSTR(RID_STR_CANNOTSAVEVBA));
+ }
+
UpdateWindows();
}
diff --git a/basctl/source/basicide/basidesh.src
b/basctl/source/basicide/basidesh.src
index 70d6423..3875f5b 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -216,6 +216,10 @@ String RID_STR_CANNOTCLOSE
{
Text [ en-US ] = "The window cannot be closed while BASIC is running." ;
};
+String RID_STR_CANNOTSAVEVBA
+{
+ Text [ en-US ] = "You are editing a VBA macro. Changes can be saved only
in OpenDocument Format." ;
+};
String RID_STR_REPLACESTDLIB
{
Text [ en-US ] = "The default library cannot be replaced." ;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 09ec9b5..af55515 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -194,7 +194,7 @@ public:
The buttons will be added from Right to Left at the right of the info
bar. The parent, size
and position of each button will be changed: only the width will
remain unchanged.
*/
- void AppendInfoBar( const OUString& sId, const
OUString& sMessage, std::vector< PushButton* > aButtons );
+ void AppendInfoBar( const OUString& sId, const
OUString& sMessage, std::vector< PushButton* > aButtons = std::vector<
PushButton* >() );
void RemoveInfoBar( const OUString& sId );
SAL_DLLPRIVATE void SetDowning_Impl();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
