diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-12-22 13:12:23 +0200 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2016-01-12 12:46:31 -0600 |
commit | 677197b3459df2c89be32595e0cb1b8b3e144c69 (patch) | |
tree | 370561ff6bb70aa54052d1cf95081792f894de19 /svtools | |
parent | feebc5953fb416c5dc8cdf8c7e924a9ff9c70f17 (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.
Reviewed-on: https://gerrit.libreoffice.org/20839
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit 22328a224df4619218b88205838307f70612207e)
loplugin:unreffun
(cherry picked from commit ea708936c4684668f9aefc3ce9ec2001dbd4bdf2)
Change-Id: I56c169bf48b78faaf53c2989ce8624f8297ffb6e
Tango: Update Save icons and support “savemodified” status
Change-Id: I03589895437907b9048542f07128801577fe62dc
(cherry picked from commit a7198d38f0294ab5db04a7f4457565ea8b2c32f1)
Reviewed-on: https://gerrit.libreoffice.org/21260
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/config/miscopt.cxx | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 5df1acf4a7a0..fb2a3160856e 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -58,12 +58,10 @@ using namespace ::com::sun::star; #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 6 #define PROPERTYNAME_DISABLEUICUSTOMIZATION "DisableUICustomization" #define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 7 -#define PROPERTYNAME_ALWAYSALLOWSAVE "AlwaysAllowSave" -#define PROPERTYHANDLE_ALWAYSALLOWSAVE 8 #define PROPERTYNAME_EXPERIMENTALMODE "ExperimentalMode" -#define PROPERTYHANDLE_EXPERIMENTALMODE 9 +#define PROPERTYHANDLE_EXPERIMENTALMODE 8 #define PROPERTYNAME_MACRORECORDERMODE "MacroRecorderMode" -#define PROPERTYHANDLE_MACRORECORDERMODE 10 +#define PROPERTYHANDLE_MACRORECORDERMODE 9 #define VCL_TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) // from <vcl/toolbox.hxx> @@ -85,7 +83,6 @@ private: bool m_bShowLinkWarningDialog; bool m_bIsShowLinkWarningDialogRO; bool m_bDisableUICustomization; - bool m_bAlwaysAllowSave; bool m_bExperimentalMode; bool m_bMacroRecorderMode; bool m_bIconThemeWasSetAutomatically; @@ -131,12 +128,6 @@ public: inline bool DisableUICustomization() const { return m_bDisableUICustomization; } - inline void SetSaveAlwaysAllowed( bool bSet ) - { m_bAlwaysAllowSave = bSet; SetModified(); } - - inline bool IsSaveAlwaysAllowed() const - { return m_bAlwaysAllowSave; } - inline void SetExperimentalMode( bool bSet ) { m_bExperimentalMode = bSet; SetModified(); } @@ -241,7 +232,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() , m_bIsUseSystemPrintDialogRO( false ) , m_bShowLinkWarningDialog( true ) , m_bIsShowLinkWarningDialogRO( false ) - , m_bAlwaysAllowSave( false ) , m_bExperimentalMode( false ) , m_bMacroRecorderMode( false ) , m_bIconThemeWasSetAutomatically( false ) @@ -343,12 +333,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" ); break; } - case PROPERTYHANDLE_ALWAYSALLOWSAVE : - { - if( !(seqValues[nProperty] >>= m_bAlwaysAllowSave) ) - OSL_FAIL("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); - break; - } case PROPERTYHANDLE_EXPERIMENTALMODE : { if( !(seqValues[nProperty] >>= m_bExperimentalMode) ) @@ -461,12 +445,6 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" ); } break; - case PROPERTYHANDLE_ALWAYSALLOWSAVE: - { - if( !(seqValues[nProperty] >>= m_bAlwaysAllowSave) ) - OSL_FAIL("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); - } - break; } } } @@ -624,11 +602,6 @@ void SvtMiscOptions_Impl::ImplCommit() seqValues[nProperty] <<= m_bDisableUICustomization; break; } - case PROPERTYHANDLE_ALWAYSALLOWSAVE : - { - seqValues[nProperty] <<= m_bAlwaysAllowSave; - break; - } case PROPERTYHANDLE_EXPERIMENTALMODE : { seqValues[nProperty] <<= m_bExperimentalMode; @@ -661,7 +634,6 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames() OUString(PROPERTYNAME_USESYSTEMPRINTDIALOG), OUString(PROPERTYNAME_SHOWLINKWARNINGDIALOG), OUString(PROPERTYNAME_DISABLEUICUSTOMIZATION), - OUString(PROPERTYNAME_ALWAYSALLOWSAVE), OUString(PROPERTYNAME_EXPERIMENTALMODE), OUString(PROPERTYNAME_MACRORECORDERMODE) }; @@ -821,16 +793,6 @@ bool SvtMiscOptions::IsShowLinkWarningDialogReadOnly() const return m_pDataContainer->IsShowLinkWarningDialogReadOnly(); } -void SvtMiscOptions::SetSaveAlwaysAllowed( bool bSet ) -{ - m_pDataContainer->SetSaveAlwaysAllowed( bSet ); -} - -bool SvtMiscOptions::IsSaveAlwaysAllowed() const -{ - return m_pDataContainer->IsSaveAlwaysAllowed(); -} - void SvtMiscOptions::SetExperimentalMode( bool bSet ) { m_pDataContainer->SetExperimentalMode( bSet ); |