diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-12-22 13:12:23 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-12-23 09:38:25 +0000 |
commit | 22328a224df4619218b88205838307f70612207e (patch) | |
tree | 251c9aaf8ab1b1db5cf80af9c8644d6cacd6d897 /sd | |
parent | 2351fd5d489fde281e8d1ef97af747149a29c247 (diff) |
New saving behavior
Changes in this commit:
- AlwaysAllowSave config is gone. Saving is always permitted, unless in
a read only document. Also changed the behavior in dbaccess to match
sfx2.
- The toolbar save button is always enabled, to always give access to
the dropdown. That's the case even in a read only document, except
that it changes to DROPDOWNONLY, and the save as command icon+tooltip.
In table/query designers we still disable the button in read only state.
- When the document is modified, the toolbar button gets a special icon
to indicate that.
TODO:
- Icons for the document modified state are still missing. I added some
fake links to Tango's links.txt in order to test the new behavior.
These links shouldn't stay as-is in a production version!
Change-Id: I56c169bf48b78faaf53c2989ce8624f8297ffb6e
Reviewed-on: https://gerrit.libreoffice.org/20839
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 4 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/toolbar/standardbar.xml | 2 | ||||
-rw-r--r-- | sd/uiconfig/simpress/toolbar/standardbar.xml | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e301986eb25c..6e23890be488 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -60,7 +60,6 @@ #include <editeng/unolingu.hxx> #include <svx/svdpagv.hxx> #include <svtools/unoimap.hxx> -#include <svtools/miscopt.hxx> #include <svx/unoshape.hxx> #include <editeng/unonrule.hxx> #include <editeng/eeitem.hxx> @@ -2386,9 +2385,6 @@ void SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs // by the tile being rerendered - which is wasteful and ugly). pViewShell->GetDrawView()->SetSwapAsynchron(false); } - // tdf#93154: in tiled rendering LO doesn't always detect changes - SvtMiscOptions aMiscOpt; - aMiscOpt.SetSaveAlwaysAllowed(true); } void SdXImpressDocument::registerCallback(LibreOfficeKitCallback pCallback, void* pData) diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml index e9a5fdcf7c64..6894887743a7 100644 --- a/sd/uiconfig/sdraw/toolbar/standardbar.xml +++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml @@ -24,7 +24,7 @@ <toolbar:toolbaritem xlink:href=".uno:Open"/> <toolbar:toolbaritem xlink:href=".uno:OpenRemote" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/> - <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="5502"/> + <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="5502" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:visible="false" toolbar:helpid="5331"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312" toolbar:visible="false"/> diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml index 4ab079c67be9..64a42e8a567f 100644 --- a/sd/uiconfig/simpress/toolbar/standardbar.xml +++ b/sd/uiconfig/simpress/toolbar/standardbar.xml @@ -24,7 +24,7 @@ <toolbar:toolbaritem xlink:href=".uno:Open"/> <toolbar:toolbaritem xlink:href=".uno:OpenRemote" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Save"/> - <toolbar:toolbaritem xlink:href=".uno:SaveAs"/> + <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/> |