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 /cui/source | |
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 'cui/source')
-rw-r--r-- | cui/source/options/optgdlg.cxx | 11 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hxx | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index dfb517f93667..52fc00c996a0 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -273,7 +273,6 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pFileDlgROImage, "lockimage"); get(m_pPrintDlgCB, "printdlg"); get(m_pDocStatusCB, "docstatus"); - get(m_pSaveAlwaysCB, "savealways"); get(m_pYearFrame, "yearframe"); get(m_pYearValueField, "year"); get(m_pToYearFT, "toyear"); @@ -309,7 +308,6 @@ void OfaMiscTabPage::dispose() m_pFileDlgCB.clear(); m_pPrintDlgCB.clear(); m_pDocStatusCB.clear(); - m_pSaveAlwaysCB.clear(); m_pYearFrame.clear(); m_pYearValueField.clear(); m_pToYearFT.clear(); @@ -352,13 +350,6 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) bModified = true; } - if ( m_pSaveAlwaysCB->IsValueChangedFromSaved() ) - { - SvtMiscOptions aMiscOpt; - aMiscOpt.SetSaveAlwaysAllowed( m_pSaveAlwaysCB->IsChecked() ); - bModified = true; - } - const SfxUInt16Item* pUInt16Item = dynamic_cast< const SfxUInt16Item* >( GetOldItem( *rSet, SID_ATTR_YEAR2000 ) ); sal_uInt16 nNum = (sal_uInt16)m_pYearValueField->GetText().toInt32(); if ( pUInt16Item && pUInt16Item->GetValue() != nNum ) @@ -389,8 +380,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) m_pFileDlgCB->SaveValue(); m_pPrintDlgCB->Check( !aMiscOpt.UseSystemPrintDialog() ); m_pPrintDlgCB->SaveValue(); - m_pSaveAlwaysCB->Check( aMiscOpt.IsSaveAlwaysAllowed() ); - m_pSaveAlwaysCB->SaveValue(); SvtPrintWarningOptions aPrintOptions; m_pDocStatusCB->Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed()); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 6bd50151566e..e3274d1b9f99 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -48,7 +48,6 @@ private: VclPtr<CheckBox> m_pPrintDlgCB; VclPtr<CheckBox> m_pDocStatusCB; - VclPtr<CheckBox> m_pSaveAlwaysCB; VclPtr<VclContainer> m_pYearFrame; VclPtr<NumericField> m_pYearValueField; |