sw/UIConfig_swriter.mk | 1 sw/inc/globals.hrc | 3 sw/inc/helpid.h | 1 sw/source/ui/config/optcomp.cxx | 133 ++++++++++++---------------------------- sw/source/ui/config/optcomp.src | 1 sw/source/ui/inc/optcomp.hxx | 12 +-- 6 files changed, 49 insertions(+), 102 deletions(-)
New commits: commit 0f9802be44a5fbd883b16f0b0f11d43e4b29f48c Author: Caolán McNamara <caol...@redhat.com> Date: Fri Aug 23 11:52:50 2013 +0100 convert compat options to .ui Change-Id: Ie9aed180500d9fbcdfce1caa1ac8349eabf836cd diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 9daa0a3..e718dc9 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -133,6 +133,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/numberingnamedialog \ sw/uiconfig/swriter/ui/objectdialog \ sw/uiconfig/swriter/ui/optcomparison \ + sw/uiconfig/swriter/ui/optcompatpage \ sw/uiconfig/swriter/ui/optfonttabpage \ sw/uiconfig/swriter/ui/optformataidspage \ sw/uiconfig/swriter/ui/optgeneralpage \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index e8c86d2..88ff694 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -144,7 +144,6 @@ #define HID_ADD_STYLES_TLB "SW_HID_ADD_STYLES_TLB" #define HID_OLE_CHECKLB "SW_HID_OLE_CHECKLB" -#define HID_OPTCOMPATIBILITY_PAGE "SW_HID_OPTCOMPATIBILITY_PAGE" #define HID_COMPATIBILITY_OPTIONS_BOX "SW_HID_COMPATIBILITY_OPTIONS_BOX" #define HID_PROPERTYPANEL_WRAP_SECTION "SW_HID_PROPERTYPANEL_WRAP_SECTION" diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 9184d93..aaab82f 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -43,7 +43,6 @@ using namespace ::std; #define DEFAULT_ENTRY COMPATIBILITY_DEFAULT_NAME #define USER_ENTRY "_user" -#define BUTTON_BORDER 2 // struct CompatibilityItem ---------------------------------------------- @@ -100,67 +99,44 @@ struct SwCompatibilityOptPage_Impl // class SwCompatibilityOptPage ------------------------------------------ -SwCompatibilityOptPage::SwCompatibilityOptPage( Window* pParent, const SfxItemSet& rSet ) : - - SfxTabPage( pParent, SW_RES( TP_OPTCOMPATIBILITY_PAGE ), rSet ), - - m_aMainFL ( this, SW_RES( FL_MAIN ) ), - m_aFormattingFT ( this, SW_RES( FT_FORMATTING ) ), - m_aFormattingLB ( this, SW_RES( LB_FORMATTING ) ), - m_aOptionsFT ( this, SW_RES( FT_OPTIONS ) ), - m_aOptionsLB ( this, SW_RES( LB_OPTIONS ) ), - m_aResetPB ( this, SW_RES( PB_RESET ) ), - m_aDefaultPB ( this, SW_RES( PB_DEFAULT ) ), - m_sUserEntry ( SW_RES( STR_USERENTRY ) ), - m_pWrtShell ( NULL ), - m_pImpl ( new SwCompatibilityOptPage_Impl ), - m_nSavedOptions ( 0 ) - +SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet& rSet) + : SfxTabPage(pParent, "OptCompatPage", + "modules/swriter/ui/optcompatpage.ui", rSet) + , m_pWrtShell(NULL) + , m_pImpl(new SwCompatibilityOptPage_Impl) + , m_nSavedOptions(0) { - // init options strings with local resource ids -> so do it before FreeResource() - for ( sal_uInt16 nResId = STR_COMP_OPTIONS_START; nResId < STR_COMP_OPTIONS_END; ++nResId ) + get(m_pMain, "compatframe"); + get(m_pFormattingLB, "format"); + get(m_pOptionsLB, "options"); + get(m_pDefaultPB, "default"); + + for (sal_uInt16 nId = COPT_USE_PRINTERDEVICE; nId <= COPT_EXPAND_WORDSPACE; ++nId) { - String sEntry = String( SW_RES( nResId ) ); - if ( STR_TAB_ALIGNMENT == nResId || - STR_LINE_SPACING == nResId || - STR_USE_OBJPOSITIONING == nResId || - STR_USE_OURTEXTWRAPPING == nResId ) + String sEntry = m_pFormattingLB->GetEntry(nId); + if ( STR_TAB_ALIGNMENT == nId || + STR_LINE_SPACING == nId || + STR_USE_OBJPOSITIONING == nId || + STR_USE_OURTEXTWRAPPING == nId ) ReplaceFormatName( sEntry ); - SvTreeListEntry* pEntry = m_aOptionsLB.SvTreeListBox::InsertEntry( sEntry ); + SvTreeListEntry* pEntry = m_pOptionsLB->SvTreeListBox::InsertEntry( sEntry ); if ( pEntry ) { - m_aOptionsLB.SetCheckButtonState( pEntry, SV_BUTTON_UNCHECKED ); - pEntry->SetUserData( (void*)(sal_uLong)nResId ); + m_pOptionsLB->SetCheckButtonState( pEntry, SV_BUTTON_UNCHECKED ); } } - m_aOptionsLB.SetStyle( m_aOptionsLB.GetStyle() | WB_HSCROLL | WB_HIDESELECTION ); - m_aOptionsLB.SetHighlightRange(); + m_sUserEntry = m_pFormattingLB->GetEntry(m_pFormattingLB->GetEntryCount()-1); - FreeResource(); + m_pFormattingLB->Clear(); + + m_pOptionsLB->SetStyle( m_pOptionsLB->GetStyle() | WB_HSCROLL | WB_HIDESELECTION ); + m_pOptionsLB->SetHighlightRange(); InitControls( rSet ); // set handler - m_aFormattingLB.SetSelectHdl( LINK( this, SwCompatibilityOptPage, SelectHdl ) ); - m_aDefaultPB.SetClickHdl( LINK( this, SwCompatibilityOptPage, UseAsDefaultHdl ) ); - - // hide some controls, will be implemented later!!! - m_aFormattingFT.Hide(); - m_aFormattingLB.Hide(); - m_aResetPB.Hide(); - // so move and resize the other controls - Point aMovePnt = m_aFormattingFT.GetPosPixel(); - Point aNewPnt = m_aOptionsFT.GetPosPixel(); - aNewPnt.Y() = aMovePnt.Y(); - m_aOptionsFT.SetPosPixel( aNewPnt ); - aMovePnt = m_aFormattingLB.GetPosPixel(); - aNewPnt = m_aOptionsLB.GetPosPixel(); - long nDelta = aNewPnt.Y() - aMovePnt.Y(); - aNewPnt.Y() = aMovePnt.Y(); - m_aOptionsLB.SetPosPixel( aNewPnt ); - Size aNewSz = m_aOptionsLB.GetSizePixel(); - aNewSz.Height() += nDelta; - m_aOptionsLB.SetSizePixel( aNewSz ); + m_pFormattingLB->SetSelectHdl( LINK( this, SwCompatibilityOptPage, SelectHdl ) ); + m_pDefaultPB->SetClickHdl( LINK( this, SwCompatibilityOptPage, UseAsDefaultHdl ) ); } SwCompatibilityOptPage::~SwCompatibilityOptPage() @@ -254,17 +230,10 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) } else { - m_aMainFL.Disable(); - m_aFormattingFT.Disable(); - m_aFormattingLB.Disable(); - m_aOptionsFT.Disable(); - m_aOptionsLB.Disable(); - m_aResetPB.Disable(); - m_aDefaultPB.Disable(); + m_pMain->Disable(); } - String sText = m_aMainFL.GetText(); - sText.SearchAndReplace( OUString("%DOCNAME"), sDocTitle ); - m_aMainFL.SetText( sText ); + const OUString& rText = m_pMain->get_label(); + m_pMain->set_label(rText.replaceAll("%DOCNAME", sDocTitle)); // loading file formats Sequence< Sequence< PropertyValue > > aList = m_aConfigItem.GetList(); @@ -342,38 +311,22 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) if ( sNewEntry.Len() == 0 ) sNewEntry = sName; - sal_uInt16 nPos = m_aFormattingLB.InsertEntry( sNewEntry ); + sal_uInt16 nPos = m_pFormattingLB->InsertEntry( sNewEntry ); sal_uLong nOptions = convertBools2Ulong_Impl( bUsePrtMetrics, bAddSpacing, bAddSpacingAtPages, bUseOurTabStops, bNoExtLeading, bUseLineSpacing, bAddTableSpacing, bUseObjPos, bUseOurTextWrapping, bConsiderWrappingStyle, bExpandWordSpace ); - m_aFormattingLB.SetEntryData( nPos, (void*)(sal_IntPtr)nOptions ); + m_pFormattingLB->SetEntryData( nPos, (void*)(sal_IntPtr)nOptions ); } - m_aFormattingLB.SetDropDownLineCount( m_aFormattingLB.GetEntryCount() ); - - // check if the default button text is not too wide otherwise we have to stretch the button - // and move its position and the position of the reset button - long nTxtWidth = m_aDefaultPB.GetTextWidth( m_aDefaultPB.GetText() ); - Size aBtnSz = m_aDefaultPB.GetSizePixel(); - if ( nTxtWidth > aBtnSz.Width() ) - { - long nDelta = nTxtWidth - aBtnSz.Width() + 2 * BUTTON_BORDER; - aBtnSz.Width() += nDelta; - Point aBtnPnt = m_aDefaultPB.GetPosPixel(); - aBtnPnt.X() -= nDelta; - m_aDefaultPB.SetPosSizePixel( aBtnPnt, aBtnSz ); - aBtnPnt = m_aResetPB.GetPosPixel(); - aBtnPnt.X() -= 2 * nDelta; - m_aResetPB.SetPosSizePixel( aBtnPnt, aBtnSz ); - } + m_pFormattingLB->SetDropDownLineCount( m_pFormattingLB->GetEntryCount() ); } IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl) { - sal_uInt16 nPos = m_aFormattingLB.GetSelectEntryPos(); - sal_uLong nOptions = (sal_uLong)(void*)m_aFormattingLB.GetEntryData( nPos ); + sal_uInt16 nPos = m_pFormattingLB->GetSelectEntryPos(); + sal_uLong nOptions = (sal_uLong)(void*)m_pFormattingLB->GetEntryData( nPos ); SetCurrentOptions( nOptions ); return 0; @@ -390,10 +343,10 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl) { if ( pItem->m_bIsDefault ) { - sal_uInt16 nCount = static_cast< sal_uInt16 >( m_aOptionsLB.GetEntryCount() ); + sal_uInt16 nCount = static_cast< sal_uInt16 >( m_pOptionsLB->GetEntryCount() ); for ( sal_uInt16 i = 0; i < nCount; ++i ) { - bool bChecked = ( m_aOptionsLB.IsChecked(i) != sal_False ); + bool bChecked = ( m_pOptionsLB->IsChecked(i) != sal_False ); CompatibilityOptions eOption = static_cast< CompatibilityOptions >(i); switch ( eOption ) { @@ -426,12 +379,12 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl) void SwCompatibilityOptPage::SetCurrentOptions( sal_uLong nOptions ) { - sal_uLong nCount = m_aOptionsLB.GetEntryCount(); + sal_uLong nCount = m_pOptionsLB->GetEntryCount(); OSL_ENSURE( nCount <= 32, "SwCompatibilityOptPage::Reset(): entry overflow" ); for ( sal_uInt16 i = 0; i < nCount; ++i ) { sal_Bool bChecked = ( ( nOptions & 0x00000001 ) == 0x00000001 ); - m_aOptionsLB.CheckEntryPos( i, bChecked ); + m_pOptionsLB->CheckEntryPos( i, bChecked ); nOptions = nOptions >> 1; } } @@ -483,7 +436,7 @@ sal_Bool SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) if ( m_pWrtShell ) { sal_uLong nSavedOptions = m_nSavedOptions; - sal_uLong nCount = m_aOptionsLB.GetEntryCount(); + sal_uLong nCount = m_pOptionsLB->GetEntryCount(); OSL_ENSURE( nCount <= 32, "SwCompatibilityOptPage::Reset(): entry overflow" ); bool bSetParaSpaceMax = false; @@ -491,7 +444,7 @@ sal_Bool SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) for ( sal_uInt16 i = 0; i < nCount; ++i ) { CompatibilityOptions nOption = static_cast< CompatibilityOptions >(i); - sal_Bool bChecked = m_aOptionsLB.IsChecked(i); + sal_Bool bChecked = m_pOptionsLB->IsChecked(i); sal_Bool bSavedChecked = ( ( nSavedOptions & 0x00000001 ) == 0x00000001 ); if ( bChecked != bSavedChecked ) { @@ -549,8 +502,8 @@ sal_Bool SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) if ( bSetParaSpaceMax ) { - m_pWrtShell->SetParaSpaceMax( m_aOptionsLB.IsChecked( (sal_uInt16)COPT_ADD_SPACING ) ); - m_pWrtShell->SetParaSpaceMaxAtPages( m_aOptionsLB.IsChecked( (sal_uInt16)COPT_ADD_SPACING_AT_PAGES ) ); + m_pWrtShell->SetParaSpaceMax( m_pOptionsLB->IsChecked( (sal_uInt16)COPT_ADD_SPACING ) ); + m_pWrtShell->SetParaSpaceMaxAtPages( m_pOptionsLB->IsChecked( (sal_uInt16)COPT_ADD_SPACING_AT_PAGES ) ); bModified = sal_True; } } @@ -563,7 +516,7 @@ sal_Bool SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) void SwCompatibilityOptPage::Reset( const SfxItemSet& ) { - m_aOptionsLB.SelectEntryPos( 0 ); + m_pOptionsLB->SelectEntryPos( 0 ); sal_uLong nOptions = GetDocumentOptions(); SetCurrentOptions( nOptions ); diff --git a/sw/source/ui/config/optcomp.src b/sw/source/ui/config/optcomp.src index 3743af1..bb43e6e 100644 --- a/sw/source/ui/config/optcomp.src +++ b/sw/source/ui/config/optcomp.src @@ -25,7 +25,6 @@ TabPage TP_OPTCOMPATIBILITY_PAGE { - HelpID = HID_OPTCOMPATIBILITY_PAGE ; Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Hide = TRUE ; FixedLine FL_MAIN diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx index 8adcb11..c6fd91c 100644 --- a/sw/source/ui/inc/optcomp.hxx +++ b/sw/source/ui/inc/optcomp.hxx @@ -21,6 +21,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> +#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <unotools/compatibility.hxx> #include <svx/checklbx.hxx> @@ -33,13 +34,10 @@ class SwCompatibilityOptPage : public SfxTabPage { private: // controls - FixedLine m_aMainFL; - FixedText m_aFormattingFT; - ListBox m_aFormattingLB; - FixedText m_aOptionsFT; - SvxCheckListBox m_aOptionsLB; - PushButton m_aResetPB; - PushButton m_aDefaultPB; + VclFrame* m_pMain; + ListBox* m_pFormattingLB; + SvxCheckListBox* m_pOptionsLB; + PushButton* m_pDefaultPB; // config item SvtCompatibilityOptions m_aConfigItem; // text of the user entry commit a93730b578443afe992f064a43b95f46b40801e7 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Aug 23 11:46:55 2013 +0100 drop unused TP ids Change-Id: I8de5aa646fc2c31d1e0a1ebe8ae9263d55c52ef6 diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index 122514e..c0580cc 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -130,8 +130,6 @@ #define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45) #define TP_STD_FONT (RC_GLOBALS_BEGIN + 47) -#define TP_NUMBER (RC_GLOBALS_BEGIN + 57) - #define TP_OPTSHDWCRSR (RC_GLOBALS_BEGIN + 70) @@ -144,7 +142,6 @@ #define TP_TOX_STYLES (RC_GLOBALS_BEGIN + 92) #define DLG_ADD_IDX_STYLES (RC_GLOBALS_BEGIN + 94) #define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103) -#define TP_MAILCONFIG (RC_GLOBALS_BEGIN + 104) //maximum: RC_GLOBALS_BEGIN + 120
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits