Index: cui/source/customize/cfg.cxx =================================================================== --- cui/source/customize/cfg.cxx (revision 1562449) +++ cui/source/customize/cfg.cxx (working copy) @@ -1641,6 +1641,8 @@ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_MENUS ), rSet ), bInitialised( sal_False ), pCurrentSaveInData( 0 ), + aSaveInText( this, CUI_RES( TXT_SAVEIN ) ), + aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ), aTopLevelSeparator( this, CUI_RES( GRP_MENUS ) ), aTopLevelLabel( this, CUI_RES( FT_MENUS ) ), aTopLevelListBox( this, CUI_RES( LB_MENUS ) ), @@ -1653,8 +1655,6 @@ aModifyCommandButton( this, CUI_RES( BTN_CHANGE_ENTRY ) ), aMoveUpButton( this, CUI_RES( BTN_UP ) ), aMoveDownButton( this, CUI_RES( BTN_DOWN ) ), - aSaveInText( this, CUI_RES( TXT_SAVEIN ) ), - aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ), aDescriptionLabel( this, CUI_RES( FT_DESCRIPTION ) ), aDescriptionField( this, CUI_RES( ED_DESCRIPTION ) ), pSelectorDlg( 0 ) @@ -1996,8 +1996,6 @@ return; } - Point p, newp; - Size s, news; long x, y, width, height; // x and width is same as aTopLevelListBox @@ -2007,13 +2005,9 @@ // y is same as aAddCommandsButton y = aAddCommandsButton.GetPosPixel().Y(); - // get gap between aAddCommandsButton and aContentsSeparator - p = aContentsSeparator.GetPosPixel(); - s = aContentsSeparator.GetSizePixel(); - long gap = y - ( p.Y() + s.Height() ); - - height = aSaveInListBox.GetPosPixel().Y() - y - gap; - + height = aDescriptionLabel.GetPosPixel().Y() - y - y + + aContentsSeparator.GetPosPixel().Y() + + aContentsSeparator.GetSizePixel().Height(); aContentsListBox->SetPosPixel( Point( x, y ) ); aContentsListBox->SetSizePixel( Size( width, height ) ); } Index: cui/source/customize/cfg.src =================================================================== --- cui/source/customize/cfg.src (revision 1562449) +++ cui/source/customize/cfg.src (working copy) @@ -94,7 +94,7 @@ Text [ en-US ] = "Toolbar Name" ;\ #define TEXT_SAVE_IN \ - Text [ en-US ] = "Save In" ;\ + Text [ en-US ] = "Scope" ;\ TabPage RID_SVXPAGE_MENUS { @@ -103,13 +103,13 @@ HelpId = HID_SVX_CONFIG_MENU ; FixedLine GRP_MENUS { - Pos = MAP_APPFONT ( 6 , 11 ) ; + Pos = MAP_APPFONT ( 6 , 25 ) ; Size = MAP_APPFONT ( 261 , 8 ) ; Text [ en-US ] = "%PRODUCTNAME %MODULENAME Menus" ; }; FixedText FT_MENUS { - Pos = MAP_APPFONT ( 9 , 24 ) ; + Pos = MAP_APPFONT ( 9 , 38 ) ; Size = MAP_APPFONT ( 55 , 8 ) ; TEXT_MENU }; @@ -117,14 +117,14 @@ { HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS"; Border = TRUE ; - Pos = MAP_APPFONT ( 64 , 22 ) ; + Pos = MAP_APPFONT ( 64 , 36 ) ; Size = MAP_APPFONT ( 108 , 108 ) ; DropDown = TRUE ; }; PushButton BTN_NEW { HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW"; - Pos = MAP_APPFONT ( 192 , 22 ) ; + Pos = MAP_APPFONT ( 192 , 36 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "New..." ; @@ -132,20 +132,20 @@ MenuButton BTN_CHANGE { HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE"; - Pos = MAP_APPFONT ( 192 , 39 ) ; + Pos = MAP_APPFONT ( 192 , 53 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; TEXT_MENU }; FixedLine GRP_MENU_SEPARATOR { - Pos = MAP_APPFONT ( 6 , 56 ) ; + Pos = MAP_APPFONT ( 6 , 70 ) ; Size = MAP_APPFONT ( 261 , 8 ) ; Text [ en-US ] = "Menu Content" ; }; FixedText GRP_MENU_ENTRIES { - Pos = MAP_APPFONT ( 9 , 67 ) ; + Pos = MAP_APPFONT ( 9 , 81 ) ; Size = MAP_APPFONT ( 55 , 8 ) ; Group = TRUE ; Text [ en-US ] = "Entries" ; @@ -153,15 +153,15 @@ Control BOX_ENTRIES { Border = TRUE ; - Pos = MAP_APPFONT ( 64 , 67 ) ; - Size = MAP_APPFONT ( 108 , 115 ) ; + Pos = MAP_APPFONT ( 64 , 81 ) ; + Size = MAP_APPFONT ( 108 , 120 ) ; TabStop = TRUE ; HelpId = HID_SVX_CONFIG_MENU_CONTENTS ; }; PushButton BTN_ADD_COMMANDS { HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS"; - Pos = MAP_APPFONT ( 192 , 67 ) ; + Pos = MAP_APPFONT ( 192 , 81 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "Add..." ; @@ -169,7 +169,7 @@ MenuButton BTN_CHANGE_ENTRY { HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY"; - Pos = MAP_APPFONT ( 192 , 84 ) ; + Pos = MAP_APPFONT ( 192 , 98 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "Modify" ; @@ -177,7 +177,7 @@ ImageButton BTN_UP { HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP"; - Pos = MAP_APPFONT ( 175 , 102 ) ; + Pos = MAP_APPFONT ( 175 , 116 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; Symbol = IMAGEBUTTON_ARROW_UP ; @@ -186,7 +186,7 @@ ImageButton BTN_DOWN { HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN"; - Pos = MAP_APPFONT ( 175 , 119 ) ; + Pos = MAP_APPFONT ( 175 , 133 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; Symbol = IMAGEBUTTON_ARROW_DOWN ; @@ -194,7 +194,7 @@ }; FixedText TXT_SAVEIN { - Pos = MAP_APPFONT ( 9 , 190 ) ; + Pos = MAP_APPFONT ( 9 , 11 ) ; Size = MAP_APPFONT ( 55 , 8 ) ; Group = TRUE ; TEXT_SAVE_IN @@ -203,7 +203,7 @@ { HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN"; Border = TRUE ; - Pos = MAP_APPFONT ( 64 , 188 ) ; + Pos = MAP_APPFONT ( 64 , 9 ) ; Size = MAP_APPFONT ( 108 , 53 ) ; DropDown = TRUE ; }; Index: cui/source/inc/cfg.hxx =================================================================== --- cui/source/inc/cfg.hxx (revision 1562449) +++ cui/source/inc/cfg.hxx (working copy) @@ -385,6 +385,9 @@ protected: + FixedText aSaveInText; + ListBox aSaveInListBox; + // the top section of the tab page where top level menus and toolbars // are displayed in a listbox FixedLine aTopLevelSeparator; @@ -405,9 +408,6 @@ ImageButton aMoveUpButton; ImageButton aMoveDownButton; - FixedText aSaveInText; - ListBox aSaveInListBox; - FixedText aDescriptionLabel; SvxDescriptionEdit aDescriptionField;