[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 6 commits - configmgr/qa include/sfx2 officecfg/registry sc/uiconfig sd/uiconfig sfx2/source sw/uiconfig
Stephan Bergmann
sbergman at redhat.com
Fri Feb 6 12:53:43 PST 2015
configmgr/qa/unit/data.xcd | 2
include/sfx2/sfx.hrc | 4 -
include/sfx2/viewfrm.hxx | 3
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 2
sc/uiconfig/scalc/menubar/menubar.xml | 2
sc/uiconfig/scalc/toolbar/standardbar.xml | 2
sc/uiconfig/scalc/toolbar/viewerbar.xml | 1
sd/uiconfig/sdraw/menubar/menubar.xml | 2
sd/uiconfig/sdraw/toolbar/standardbar.xml | 2
sd/uiconfig/sdraw/toolbar/viewerbar.xml | 1
sd/uiconfig/simpress/menubar/menubar.xml | 2
sfx2/source/doc/objserv.cxx | 1
sfx2/source/view/view.src | 12 ++-
sfx2/source/view/viewfrm.cxx | 37 +++++++++-
sw/uiconfig/sglobal/menubar/menubar.xml | 2
sw/uiconfig/sglobal/toolbar/standardbar.xml | 2
sw/uiconfig/sglobal/toolbar/viewerbar.xml | 1
sw/uiconfig/sweb/menubar/menubar.xml | 2
sw/uiconfig/sweb/toolbar/standardbar.xml | 2
sw/uiconfig/sweb/toolbar/viewerbar.xml | 1
sw/uiconfig/swform/menubar/menubar.xml | 2
sw/uiconfig/swform/toolbar/standardbar.xml | 2
sw/uiconfig/swform/toolbar/viewerbar.xml | 1
sw/uiconfig/swreport/menubar/menubar.xml | 2
sw/uiconfig/swreport/toolbar/standardbar.xml | 2
sw/uiconfig/swreport/toolbar/viewerbar.xml | 1
sw/uiconfig/swriter/menubar/menubar.xml | 2
sw/uiconfig/swriter/toolbar/standardbar.xml | 2
sw/uiconfig/swriter/toolbar/viewerbar.xml | 1
sw/uiconfig/swxform/menubar/menubar.xml | 2
sw/uiconfig/swxform/toolbar/standardbar.xml | 2
sw/uiconfig/swxform/toolbar/viewerbar.xml | 1
32 files changed, 70 insertions(+), 33 deletions(-)
New commits:
commit 0f5dcfc6c8909b29b5b589abc209f5fbbdcdadec
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 19 11:00:58 2015 +0100
Re fdo#80538: Remove read-only infobar after "Save As..."
...on a doc in r/o mode, which will switch to the newly saved document in r/w
mode. Was missing from c6270de939d5ee51b61dc4ac02c52f1d9b5b1e47 "fdo#80538 Show
an infobar when document is in read-only mode."
Change-Id: Ie17f4213f989cb4b9d3f7fc114392ec6f516a965
(cherry picked from commit 02f76dec4c54ec7fb28729941c7044307058665a)
Reviewed-on: https://gerrit.libreoffice.org/14012
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 9dc181c..1d0c6cf 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -731,6 +731,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
if ( nId == SID_SAVEASDOC && nErrorCode == ERRCODE_NONE )
{
+ GetFrame()->RemoveInfoBar("readonly");
SetReadOnlyUI(false);
}
commit a86f6be7d9602025877fdc95e3d6f81008aa1dc4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 2 11:26:34 2014 +0100
widget leak on filling non-existing infobar in help
Window () with live children destroyed: PushButton (Edit document)
Change-Id: I2aa05f59f08cfa78ba895933ef298908a9cbb675
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9f79c20..39dcc20 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3356,6 +3356,14 @@ void SfxViewFrame::AppendInfoBar( const OUString& sId, const OUString& sMessage,
pInfoBars->appendInfoBar( sId, sMessage, aButtons );
ShowChildWindow( nId );
}
+ else
+ {
+ SAL_WARN( "sfx.view", "No consumer for InfoBar buttons, so deleting them instead" );
+ for (std::vector< PushButton* >::iterator it = aButtons.begin(); it != aButtons.end(); ++it)
+ {
+ delete *it;
+ }
+ }
}
void SfxViewFrame::RemoveInfoBar( const OUString& sId )
commit 4dbc1aaf31d231d7d9dd63ac393c5e176c9db268
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Sun Aug 31 21:48:12 2014 +0200
fdo#83302 don't display read-only infobar for Base form in normal mode
Change-Id: I03c32883dbf8421824069efea2318e67c8dc4313
Reviewed-on: https://gerrit.libreoffice.org/11231
Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 84ddb88..9f79c20 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1350,7 +1350,13 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
SfxBindings& rBind = GetBindings();
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
- if ( !xObjSh->IsReadOnly() )
+ const SfxViewShell *pVSh;
+ const SfxShell *pFSh;
+ if ( !xObjSh->IsReadOnly() ||
+ ( xObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED &&
+ (pVSh = xObjSh->GetViewShell()) &&
+ (pFSh = pVSh->GetFormShell()) &&
+ !pFSh->IsDesignMode()))
{
// In contrast to above (TITLE_CHANGED) does the UI not
// have to be updated because it was not obstructed
commit 16708bb3260069b9805f2e5864bd06d4fcceecb3
Author: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Date: Sun Aug 31 22:37:47 2014 +0200
fdo#83311 Fix infobar for documents with read-only property
Change-Id: Ic813ab3eb74a088b60b4dc3dcd56e7b19683190c
Reviewed-on: https://gerrit.libreoffice.org/11220
Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 4014167..84ddb88 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -403,6 +403,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
pSh->SetModifyPasswordEntered();
}
+ // Remove infobar if document was read-only (after password check)
+ RemoveInfoBar("readonly");
+
nOpenMode = pSh->IsOriginallyReadOnlyMedium() ? SFX_STREAM_READONLY : SFX_STREAM_READWRITE;
// if only the view was in the readonly mode then there is no need to do the reload
@@ -416,7 +419,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
return;
}
- RemoveInfoBar("readonly");
+
pSh->SetReadOnlyUI( false );
}
commit add80f5cce7d5d222b20e8c0237072a6a3601437
Author: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Date: Fri Aug 29 00:35:07 2014 +0200
fdo#80538 Show an infobar when document is in read-only mode
and remove the Edit icon from the toolbar
Reviewed-on: https://gerrit.libreoffice.org/11182
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
Conflicts:
include/sfx2/sfx.hrc
include/sfx2/viewfrm.hxx
Change-Id: I27d9506bd0fb76b3f1ad056a9866f7744674a3e2
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 0497f52..865912c 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -155,7 +155,9 @@
#define STR_PASSWD_MIN_LEN (RID_SFX_START+124)
#define STR_NONCHECKEDOUT_DOCUMENT (RID_SFX_START+125)
#define BT_CHECKOUT (RID_SFX_START+126)
-#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+127)
+#define BT_READONLY_EDIT (RID_SFX_START+127)
+#define STR_READONLY_DOCUMENT (RID_SFX_START+128)
+#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+129)
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
#define SFX_THUMBNAIL_TEXT (RID_SFX_START+158)
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index af55515..f2b0704 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -79,9 +79,8 @@ private:
protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
-#ifndef _SFX_HXX
+ DECL_LINK( SwitchReadOnlyHandler, void * );
SAL_DLLPRIVATE void KillDispatcher_Impl();
-#endif
virtual ~SfxViewFrame();
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml
index 5368218..84c9f16 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
<toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Print"/>
diff --git a/sc/uiconfig/scalc/toolbar/viewerbar.xml b/sc/uiconfig/scalc/toolbar/viewerbar.xml
index a371876..926e465 100644
--- a/sc/uiconfig/scalc/toolbar/viewerbar.xml
+++ b/sc/uiconfig/scalc/toolbar/viewerbar.xml
@@ -20,7 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 8c4ca8e..ea3dc66 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
<toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Print"/>
diff --git a/sd/uiconfig/sdraw/toolbar/viewerbar.xml b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
index a371876..926e465 100644
--- a/sd/uiconfig/sdraw/toolbar/viewerbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
@@ -20,7 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index eb2de4e..8063941 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -92,7 +92,11 @@ String STR_REPAIREDDOCUMENT
String STR_NONCHECKEDOUT_DOCUMENT
{
- Text [ en-US ] = "Document is not checked out on server" ;
+ Text [ en-US ] = "This document is not checked out on the server." ;
+};
+String STR_READONLY_DOCUMENT
+{
+ Text [ en-US ] = "This document is opened in read-only mode." ;
};
PushButton BT_CHECKOUT
@@ -101,5 +105,11 @@ PushButton BT_CHECKOUT
Size = MAP_APPFONT( 30 , 0 );
Text[ en-US ] = "Check out";
};
+PushButton BT_READONLY_EDIT
+{
+ Pos = MAP_APPFONT( 0 , 0 );
+ Size = MAP_APPFONT( 70 , 0 );
+ Text[ en-US ] = "Edit document";
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9cb15a0..4014167 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -416,6 +416,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
return;
}
+ RemoveInfoBar("readonly");
pSh->SetReadOnlyUI( false );
}
@@ -1250,7 +1251,6 @@ const SvBorder& SfxViewFrame::GetBorderPixelImpl
void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
-
if( IsDowning_Impl())
return;
@@ -1272,7 +1272,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
SfxDispatcher *pDispat = GetDispatcher();
bool bWasReadOnly = pDispat->GetReadOnly_Impl();
bool bIsReadOnly = xObjSh->IsReadOnly();
- if ( !bWasReadOnly != !bIsReadOnly )
+ if ( bWasReadOnly != bIsReadOnly )
{
// Then also TITLE_CHANGED
UpdateTitle();
@@ -1360,6 +1360,14 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
// because each document has its own SfxBindings.
//GetDispatcher()->GetBindings()->InvalidateAll(true);
}
+ else
+ {
+ std::vector< PushButton* > aButtons;
+ PushButton* pBtn = new PushButton( &GetWindow(), SfxResId(BT_READONLY_EDIT));
+ pBtn->SetClickHdl(LINK(this, SfxViewFrame, SwitchReadOnlyHandler));
+ aButtons.push_back( pBtn );
+ AppendInfoBar("readonly", SfxResId(STR_READONLY_DOCUMENT), aButtons);
+ }
break;
}
@@ -1374,6 +1382,12 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
}
}
+IMPL_LINK_NOARG(SfxViewFrame, SwitchReadOnlyHandler)
+{
+ GetDispatcher()->Execute(SID_EDITDOC);
+ return 0;
+}
+
void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh )
{
diff --git a/sw/uiconfig/sglobal/toolbar/standardbar.xml b/sw/uiconfig/sglobal/toolbar/standardbar.xml
index e3379f8..cfe7083 100644
--- a/sw/uiconfig/sglobal/toolbar/standardbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
<toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Print"/>
diff --git a/sw/uiconfig/sglobal/toolbar/viewerbar.xml b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
index a371876..926e465 100644
--- a/sw/uiconfig/sglobal/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
@@ -20,7 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml b/sw/uiconfig/sweb/toolbar/standardbar.xml
index 77bba2c..3479000 100644
--- a/sw/uiconfig/sweb/toolbar/standardbar.xml
+++ b/sw/uiconfig/sweb/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
<toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Print"/>
diff --git a/sw/uiconfig/sweb/toolbar/viewerbar.xml b/sw/uiconfig/sweb/toolbar/viewerbar.xml
index a371876..926e465 100644
--- a/sw/uiconfig/sweb/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sweb/toolbar/viewerbar.xml
@@ -20,7 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
diff --git a/sw/uiconfig/swform/toolbar/standardbar.xml b/sw/uiconfig/swform/toolbar/standardbar.xml
index e3379f8..cfe7083 100644
--- a/sw/uiconfig/swform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swform/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
<toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Print"/>
diff --git a/sw/uiconfig/swform/toolbar/viewerbar.xml b/sw/uiconfig/swform/toolbar/viewerbar.xml
index a371876..926e465 100644
--- a/sw/uiconfig/swform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swform/toolbar/viewerbar.xml
@@ -20,7 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
diff --git a/sw/uiconfig/swreport/toolbar/standardbar.xml b/sw/uiconfig/swreport/toolbar/standardbar.xml
index e3379f8..cfe7083 100644
--- a/sw/uiconfig/swreport/toolbar/standardbar.xml
+++ b/sw/uiconfig/swreport/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
<toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Print"/>
diff --git a/sw/uiconfig/swreport/toolbar/viewerbar.xml b/sw/uiconfig/swreport/toolbar/viewerbar.xml
index a371876..926e465 100644
--- a/sw/uiconfig/swreport/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swreport/toolbar/viewerbar.xml
@@ -20,7 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml
index d78bb4f..362a13b 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
<toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Print"/>
diff --git a/sw/uiconfig/swriter/toolbar/viewerbar.xml b/sw/uiconfig/swriter/toolbar/viewerbar.xml
index a371876..926e465 100644
--- a/sw/uiconfig/swriter/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swriter/toolbar/viewerbar.xml
@@ -20,7 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
diff --git a/sw/uiconfig/swxform/toolbar/standardbar.xml b/sw/uiconfig/swxform/toolbar/standardbar.xml
index 57df68b..3243121 100644
--- a/sw/uiconfig/swxform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swxform/toolbar/standardbar.xml
@@ -26,8 +26,6 @@
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false" toolbar:helpid="5502"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
<toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Print"/>
diff --git a/sw/uiconfig/swxform/toolbar/viewerbar.xml b/sw/uiconfig/swxform/toolbar/viewerbar.xml
index a371876..926e465 100644
--- a/sw/uiconfig/swxform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swxform/toolbar/viewerbar.xml
@@ -20,7 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
commit 14afffdd80774efcf185a538b22e95ffcd85b117
Author: Joren De Cuyper <jorendc at libreoffice.org>
Date: Fri Jul 11 01:15:04 2014 +0200
fdo#80536 UI: Menu entry for 'Edit File' -> 'Edit Mode'
In this commit not only a menu entry is created, also the name is changed
from 'Edit File' to 'Edit Mode'.
Change-Id: Icd7998307cb0337dd2ee95b298452557ab37375b
Reviewed-on: https://gerrit.libreoffice.org/10211
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index d82baec..da8707e 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -2391,7 +2391,7 @@
</node>
<node oor:name=".uno:EditDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Edit File</value>
+ <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Ed~it Mode</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 1c3af1c..4a913bb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2423,7 +2423,7 @@
</node>
<node oor:name=".uno:EditDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Edit File</value>
+ <value xml:lang="en-US">Ed~it Mode</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 5118318..2cac34a 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -130,6 +130,8 @@
<menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:EditDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index d59c641..d0c088a 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -92,6 +92,8 @@
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
<menu:menuitem menu:id=".uno:EditHyperlink"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:EditDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index b9c9af6..e2e9d38 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -93,6 +93,8 @@
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
<menu:menuitem menu:id=".uno:EditHyperlink"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:EditDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index d5736a5..fabc234 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -122,6 +122,8 @@
<menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:EditDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index ee78c24..7a6a9b4 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -92,6 +92,8 @@
<menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:EditDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index ddf914f..c7fd139 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -121,6 +121,8 @@
<menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:EditDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index fab0914..b78bdee 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -122,6 +122,8 @@
<menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:EditDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index b26b980..29d4efa 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -126,6 +126,8 @@
<menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:EditDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index ec9f631..5a67b92 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -123,6 +123,8 @@
<menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:EditDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
More information about the Libreoffice-commits
mailing list