[Libreoffice-commits] core.git: basctl/inc basctl/source include/sfx2 include/svx sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/source starmath/inc starmath/source svx/source sw/source

2017-05-31 Thread Caolán McNamara 
 basctl/inc/basidesh.hrc|2 
 basctl/source/basicide/basidesh.src|4 
 include/sfx2/dispatch.hxx  |3 
 include/sfx2/objface.hxx   |7 -
 include/sfx2/toolbarids.hxx|   76 ++
 include/svx/fmresids.hrc   |8 -
 sc/inc/sc.hrc  |8 -
 sc/source/ui/app/scmod.cxx |2 
 sc/source/ui/drawfunc/chartsh.cxx  |2 
 sc/source/ui/drawfunc/drawsh.cxx   |2 
 sc/source/ui/drawfunc/drformsh.cxx |2 
 sc/source/ui/drawfunc/drtxtob.cxx  |2 
 sc/source/ui/drawfunc/graphsh.cxx  |2 
 sc/source/ui/drawfunc/mediash.cxx  |2 
 sc/source/ui/drawfunc/oleobjsh.cxx |2 
 sc/source/ui/view/cellsh.cxx   |2 
 sc/source/ui/view/formatsh.cxx |2 
 sc/source/ui/view/prevwsh.cxx  |2 
 sc/source/ui/view/tabvwsh.cxx  |2 
 sd/inc/helpids.h   |6 -
 sd/source/ui/app/strings.src   |   45 
 sd/source/ui/app/toolbox.src   |5 
 sd/source/ui/func/futext.cxx   |4 
 sd/source/ui/inc/ShellFactory.hxx  |5 
 sd/source/ui/inc/ToolBarManager.hxx|   28 ++---
 sd/source/ui/inc/cfgids.hxx|   14 --
 sd/source/ui/inc/strings.hrc   |   20 ---
 sd/source/ui/view/FormShellManager.cxx |6 -
 sd/source/ui/view/ToolBarManager.cxx   |   47 +
 sd/source/ui/view/ViewShellManager.cxx |2 
 sd/source/ui/view/drviews7.cxx |2 
 sd/source/ui/view/outlnvsh.cxx |4 
 sd/source/ui/view/presvish.cxx |8 -
 sd/source/ui/view/viewshel.cxx |   14 +-
 sfx2/inc/app.hrc   |3 
 sfx2/source/appl/workwin.cxx   |  170 -
 sfx2/source/appl/workwin.hrc   |   91 -
 sfx2/source/control/dispatch.cxx   |   24 ++--
 sfx2/source/control/objface.cxx|   24 ++--
 sfx2/source/inc/workwin.hxx|7 -
 sfx2/source/view/viewfrm.cxx   |4 
 starmath/inc/starmath.hrc  |2 
 starmath/source/view.cxx   |2 
 svx/source/form/fmshell.cxx|   12 +-
 svx/source/toolbars/extrusionbar.cxx   |2 
 svx/source/toolbars/fontworkbar.cxx|2 
 sw/source/ui/web/web.src   |   11 --
 sw/source/uibase/app/apphdl.cxx|2 
 sw/source/uibase/config/barcfg.cxx |4 
 sw/source/uibase/inc/barcfg.hxx|3 
 sw/source/uibase/inc/shells.hrc|   18 ---
 sw/source/uibase/inc/web.hrc   |5 
 sw/source/uibase/shells/annotsh.cxx|2 
 sw/source/uibase/shells/beziersh.cxx   |2 
 sw/source/uibase/shells/drawsh.cxx |2 
 sw/source/uibase/shells/drformsh.cxx   |2 
 sw/source/uibase/shells/drwtxtsh.cxx   |2 
 sw/source/uibase/shells/frmsh.cxx  |2 
 sw/source/uibase/shells/grfsh.cxx  |2 
 sw/source/uibase/shells/listsh.cxx |2 
 sw/source/uibase/shells/mediash.cxx|2 
 sw/source/uibase/shells/olesh.cxx  |2 
 sw/source/uibase/shells/tabsh.cxx  |2 
 sw/source/uibase/shells/textsh.cxx |2 
 sw/source/uibase/uiview/pview.cxx  |2 
 sw/source/uibase/uiview/srcview.cxx|2 
 sw/source/uibase/uiview/view.cxx   |6 -
 sw/source/uibase/uiview/view.hrc   |1 
 sw/source/uibase/uiview/view.src   |8 -
 sw/source/uibase/uiview/view0.cxx  |2 
 sw/source/uibase/web/wformsh.cxx   |2 
 sw/source/uibase/web/wfrmsh.cxx|2 
 sw/source/uibase/web/wgrfsh.cxx|2 
 sw/source/uibase/web/wlistsh.cxx   |2 
 sw/source/uibase/web/wolesh.cxx|2 
 sw/source/uibase/web/wtabsh.cxx|2 
 sw/source/uibase/web/wtextsh.cxx   |2 
 sw/source/uibase/web/wview.cxx |8 -
 78 files changed, 317 insertions(+), 478 deletions(-)

New commits:
commit 490e9dbade4f9d69cab4b1ec435944c9b4d2f6c2
Author: Caolán McNamara 
Date:   Tue May 30 16:50:18 2017 +0100

disambiguate dual use of toolbar ids

for toolbar title string resource and identifier (for config)

Change-Id: I2657c3cbb586a62d8075db7cb43cc064b2030f28
Reviewed-on: https://gerrit.libreoffice.org/38274
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 60a2f0fa903e..1c58557dddcc 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -22,8 +22,6 @@
 
 #include 
 
-#define RID_BASICIDE_OBJECTBAR  ( RID_BASICIDE_START +  0 )
-
 #define RID_STR_SEARCHALLMODULES( RID_BASICIDE_START +  1 )
 #define RID_STR_SEARCHFROMSTART ( RID_BASICIDE_START +  2 )
 #define RID_STR_NOMODULE( RID_BASICIDE_START +  3 )
diff --git a/basctl/source/basicide/basidesh.src

[Libreoffice-commits] core.git: basctl/inc basctl/source include/sfx2

2014-05-22 Thread Jan Holesovsky 
 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 7aa79223d73a97c6530894a8feea51e9820b14cb
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.
   */
-voidAppendInfoBar( const OUString sId, const 
OUString sMessage, std::vector PushButton*  aButtons );
+voidAppendInfoBar( const OUString sId, const 
OUString sMessage, std::vector PushButton*  aButtons = std::vector 
PushButton* () );
 voidRemoveInfoBar( 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