diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-05 08:52:15 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-05 08:56:52 +0200 |
commit | d9cf110dae8030c93c4cc7909b30c779b523359f (patch) | |
tree | 6052278a786391544e2d51da43a496b6932b1828 /cui/source | |
parent | 54c08da6c7d9f8fc28ac6c5fd15fdfbe8b0cfc03 (diff) |
Bye bye ODMA
SUSE has no interest in it any longer, and I doubt anybody else has
either.
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/options/optgdlg.cxx | 46 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hrc | 1 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hxx | 1 | ||||
-rw-r--r-- | cui/source/options/optgdlg.src | 24 |
4 files changed, 9 insertions, 63 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 2e4308785ea2..098b550982c7 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -192,7 +192,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ), aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ), aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ), - aODMADlgCB ( this, CUI_RES( CB_ODMADLG ) ), aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ), aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ), aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ), @@ -216,33 +215,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aPrintDlgCB.Hide(); #endif -#ifdef WNT - aFileDlgCB.SetToggleHdl( LINK( this, OfaMiscTabPage, OnFileDlgToggled ) ); -#else - aODMADlgCB.Hide(); -#endif - - if (!aODMADlgCB.IsVisible()) - { - // rearrange the following controls - Point aNewPos = aPrintDlgFL.GetPosPixel(); - long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y(); - - Window* pWins[] = - { - &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, - &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT - }; - Window** pCurrent = pWins; - const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); - for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) - { - aNewPos = (*pCurrent)->GetPosPixel(); - aNewPos.Y() -= nDelta; - (*pCurrent)->SetPosPixel( aNewPos ); - } - } - if ( !aFileDlgCB.IsVisible() ) { // rearrange the following controls @@ -316,14 +288,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aHelpAgentResetBtn.SetClickHdl( LINK( this, OfaMiscTabPage, HelpAgentResetHdl_Impl ) ); } -#ifdef WNT -IMPL_LINK_NOARG(OfaMiscTabPage, OnFileDlgToggled) -{ - aODMADlgCB.Enable( !aFileDlgCB.IsChecked() ); - return 0; -} -#endif - // ----------------------------------------------------------------------- OfaMiscTabPage::~OfaMiscTabPage() @@ -368,13 +332,6 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) bModified = sal_True; } - if ( aODMADlgCB.IsChecked() != aODMADlgCB.GetSavedValue() ) - { - SvtMiscOptions aMiscOpt; - aMiscOpt.SetTryODMADialog( aODMADlgCB.IsChecked() ); - bModified = sal_True; - } - if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() ) { SvtPrintWarningOptions aPrintOptions; @@ -423,9 +380,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) aSaveAlwaysCB.Check( aMiscOpt.IsSaveAlwaysAllowed() ); aSaveAlwaysCB.SaveValue(); - aODMADlgCB.Check( aMiscOpt.TryODMADialog() ); - aODMADlgCB.SaveValue(); - SvtPrintWarningOptions aPrintOptions; aDocStatusCB.Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed()); aDocStatusCB.SaveValue(); diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 47b244602f97..fbf3c32086c0 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -186,7 +186,6 @@ #define FT_GRAPHICOBJECTTIME_UNIT 58 #define FL_DOCSTATUS 60 #define CB_DOCSTATUS 61 -#define CB_ODMADLG 62 #define CB_SAVE_ALWAYS 74 #endif // #ifndef _SVX_OPTGDLG_HRC diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index a9074eefeae8..718344ba45b3 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -45,7 +45,6 @@ private: FixedLine aFileDlgFL; ReadOnlyImage aFileDlgROImage; CheckBox aFileDlgCB; - CheckBox aODMADlgCB; FixedLine aPrintDlgFL; CheckBox aPrintDlgCB; diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 89f71244828a..9ed740d09332 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -85,52 +85,46 @@ TabPage OFA_TP_MISC Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Use %PRODUCTNAME dialogs"; }; - CheckBox CB_ODMADLG - { - Pos = MAP_APPFONT( COL1, ROW6 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "Show ODMA DMS dialogs first"; - }; FixedLine FL_PRINTDLG { - Pos = MAP_APPFONT( COL0, ROW7 ); + Pos = MAP_APPFONT( COL0, ROW6 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Print dialogs"; }; CheckBox CB_PRINTDLG { - Pos = MAP_APPFONT( COL1, ROW8 ); + Pos = MAP_APPFONT( COL1, ROW7 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Use %PRODUCTNAME ~dialogs"; }; FixedLine FL_DOCSTATUS { - Pos = MAP_APPFONT( COL0, ROW9 ); + Pos = MAP_APPFONT( COL0, ROW8 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Document status"; }; CheckBox CB_DOCSTATUS { HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS"; - Pos = MAP_APPFONT( COL1, ROW10 ); + Pos = MAP_APPFONT( COL1, ROW9 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Printing sets \"document modified\" status"; }; CheckBox CB_SAVE_ALWAYS { - Pos = MAP_APPFONT( COL1, ROW11 ); + Pos = MAP_APPFONT( COL1, ROW10 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Allow to save document even when the document is not modified"; }; FixedLine FL_TWOFIGURE { - Pos = MAP_APPFONT( COL0, ROW12 ); + Pos = MAP_APPFONT( COL0, ROW11 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Year (two digits)" ; }; FixedText FT_INTERPRET { - Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); + Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Interpret as years between"; }; @@ -138,7 +132,7 @@ TabPage OFA_TP_MISC { HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE"; Border = TRUE ; - Pos = MAP_APPFONT( COL4, ROW13 ); + Pos = MAP_APPFONT( COL4, ROW12 ); Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Minimum = 1583 ; Maximum = 9857 ; @@ -147,7 +141,7 @@ TabPage OFA_TP_MISC }; FixedText FT_TOYEAR { - Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); + Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "and " ; }; |