diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index da66d7c94bc1..afb4f0d007ea 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -348,9 +348,6 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr m_pBottomMarginEdit->SetMax(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM); m_pBottomMarginEdit->SetLast(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM); - m_pPortraitBtn->SetAccessibleRelationMemberOf(m_pOrientationFT); - m_pLandscapeBtn->SetAccessibleRelationMemberOf(m_pOrientationFT); - // Get the i18n framework numberings and add them to the listbox. SvxNumOptionsTabPage::GetI18nNumbering( *m_pNumberFormatBox, ::std::numeric_limits::max()); } diff --git a/cui/uiconfig/ui/pageformatpage.ui b/cui/uiconfig/ui/pageformatpage.ui index dd12f7ef38af..2a25d38bd7a4 100644 --- a/cui/uiconfig/ui/pageformatpage.ui +++ b/cui/uiconfig/ui/pageformatpage.ui @@ -1,802 +1,8 @@ + - - - - True - False - True - 6 - 12 - - - True - False - True - 0 - none - - - True - False - True - True - 6 - 12 - - - True - False - True - True - 6 - 12 - - - True - False - True - 6 - 12 - - - True - False - 0 - _Format: - True - comboPageFormat - - - 0 - 0 - 1 - 1 - - - - - True - False - - - 1 - 0 - 1 - 1 - - - - - True - False - 0 - _Width: - True - spinWidth:0.00cm - - - 0 - 1 - 1 - 1 - - - - - True - True - start - • - True - if-valid - - - 1 - 1 - 1 - 1 - - - - - True - False - 0 - _Height: - True - spinHeight:0.00cm - - - 0 - 2 - 1 - 1 - - - - - True - True - start - • - True - - - 1 - 2 - 1 - 1 - - - - - True - False - 0 - _Orientation: - True - radiobuttonPortrait - - - 0 - 3 - 1 - 1 - - - - - _Portrait - True - True - False - center - True - 0 - True - True - radiobuttonLandscape - - - 1 - 3 - 1 - 1 - - - - - L_andscape - True - True - False - start - center - True - 0 - True - radiobuttonPortrait - - - 1 - 4 - 1 - 1 - - - - - False - True - 0 - _Text direction: - True - comboTextFlowBox - - - 0 - 5 - 1 - 1 - - - - - False - True - - - 1 - 5 - 1 - 1 - - - - - - - - 0 - 0 - 1 - 1 - - - - - True - False - True - 12 - - - True - False - 6 - 12 - - - True - False - center - center - True - True - - - 0 - 0 - 2 - 1 - - - - - True - False - True - 0 - Paper _tray: - True - comboPaperTray - - - 0 - 1 - 1 - 1 - - - - - True - False - - - 1 - 1 - 1 - 1 - - - - - - - 1 - 0 - 1 - 1 - - - - - - - - - True - False - Paper Format - - - - - - - - 0 - 0 - 1 - 1 - - - - - True - False - True - 12 - 12 - - - True - False - True - 0 - none - - - True - False - True - 6 - 12 - - - True - False - True - 6 - 12 - - - True - False - 0 - Top: - True - spinMargTop:0.00cm - - - 0 - 2 - 1 - 1 - - - - - True - False - 0 - Bottom: - True - spinMargBot:0.00cm - - - 0 - 3 - 1 - 1 - - - - - True - True - • - True - - - 1 - 0 - 1 - 1 - - - - - True - True - • - True - - - 1 - 1 - 1 - 1 - - - - - True - True - • - True - - - 1 - 2 - 1 - 1 - - - - - True - True - • - True - - - 1 - 3 - 1 - 1 - - - - - True - False - vertical - center - - - False - 0 - Right: - True - spinMargRight:0.00cm - - - False - True - 0 - - - - - False - 0 - O_uter: - True - spinMargRight:0.00cm - - - False - True - 1 - - - - - 0 - 1 - 1 - 1 - - - - - True - False - vertical - center - - - False - 0 - Left: - True - spinMargLeft:0.00cm - - - False - True - 0 - - - - - False - 0 - I_nner: - True - spinMargLeft:0.00cm - - - False - True - 1 - - - - - 0 - 0 - 1 - 1 - - - - - - - - - True - False - Margins - - - - - - - - 0 - 0 - 1 - 1 - - - - - True - False - True - 0 - none - - - True - False - True - 6 - 12 - - - True - False - 6 - 12 - - - True - False - True - 0 - _Page layout: - True - comboPageLayout - - - 0 - 0 - 1 - 1 - - - - - True - False - True - 0 - _Format: - True - comboLayoutFormat - - - 0 - 1 - 1 - 1 - - - - - Register-tr_ue - True - False - True - True - 0 - True - - - 0 - 2 - 2 - 1 - - - - - True - False - liststorePageLayout - - - 1 - 0 - 1 - 1 - - - - - True - False - liststoreNumberFormat - - - 1 - 1 - 1 - 1 - - - - - False - True - True - 0 - Table alignment: - True - checkbuttonHorz - - - 0 - 4 - 1 - 1 - - - - - Hori_zontal - True - False - True - True - 0 - True - - - 1 - 4 - 1 - 1 - - - - - _Vertical - True - False - True - True - 0 - True - - - 1 - 5 - 1 - 1 - - - - - _Fit object to paper format - True - False - True - True - none - True - 0 - True - - - 0 - 6 - 2 - 1 - - - - - True - False - 12 - - - True - False - vertical - 6 - - - False - True - 0 - Reference _Style: - True - comboRegisterStyle - - - False - True - 0 - - - - - False - True - - - False - True - 1 - - - - - - - 0 - 3 - 2 - 1 - - - - - - - - - - - - True - False - Layout Settings - - - - - - - - 1 - 0 - 1 - 1 - - - - - 0 - 1 - 1 - 1 - - - - - False - The margin settings are out of print range. - -Do you still want to apply these settings? - - - 0 - 2 - 1 - 1 - - - + + @@ -925,6 +131,733 @@ Do you still want to apply these settings? + + True + False + True + 6 + 12 + + + True + False + True + 0 + none + + + True + False + True + True + 6 + 12 + + + True + False + True + True + 6 + 12 + + + True + False + True + 6 + 12 + + + True + False + _Format: + True + comboPageFormat + 0 + + + 0 + 0 + + + + + True + False + + + 1 + 0 + + + + + True + False + _Width: + True + spinWidth:0.00cm + 0 + + + 0 + 1 + + + + + True + True + start + • + True + if-valid + + + 1 + 1 + + + + + True + False + _Height: + True + spinHeight:0.00cm + 0 + + + 0 + 2 + + + + + True + True + start + • + True + + + 1 + 2 + + + + + True + False + _Orientation: + True + radiobuttonPortrait + 0 + + + 0 + 3 + + + + + _Portrait + True + True + False + center + True + 0 + True + True + radiobuttonLandscape + + + + + + 1 + 3 + + + + + L_andscape + True + True + False + start + center + True + 0 + True + radiobuttonPortrait + + + + + + 1 + 4 + + + + + False + True + _Text direction: + True + comboTextFlowBox + 0 + + + 0 + 5 + + + + + False + True + + + 1 + 5 + + + + + + + + 0 + 0 + + + + + True + False + True + 12 + + + True + False + 6 + 12 + + + True + False + center + center + True + True + + + 0 + 0 + 2 + + + + + True + False + True + Paper _tray: + True + comboPaperTray + 0 + + + 0 + 1 + + + + + True + False + + + 1 + 1 + + + + + + + 1 + 0 + + + + + + + + + True + False + Paper Format + + + + + + + + 0 + 0 + + + + + True + False + True + 12 + 12 + + + True + False + True + 0 + none + + + True + False + True + 6 + 12 + + + True + False + True + 6 + 12 + + + True + False + Top: + True + spinMargTop:0.00cm + 0 + + + 0 + 2 + + + + + True + False + Bottom: + True + spinMargBot:0.00cm + 0 + + + 0 + 3 + + + + + True + True + • + True + + + 1 + 0 + + + + + True + True + • + True + + + 1 + 1 + + + + + True + True + • + True + + + 1 + 2 + + + + + True + True + • + True + + + 1 + 3 + + + + + True + False + center + vertical + + + False + Right: + True + spinMargRight:0.00cm + 0 + + + False + True + 0 + + + + + False + O_uter: + True + spinMargRight:0.00cm + 0 + + + False + True + 1 + + + + + 0 + 1 + + + + + True + False + center + vertical + + + False + Left: + True + spinMargLeft:0.00cm + 0 + + + False + True + 0 + + + + + False + I_nner: + True + spinMargLeft:0.00cm + 0 + + + False + True + 1 + + + + + 0 + 0 + + + + + + + + + True + False + Margins + + + + + + + + 0 + 0 + + + + + True + False + True + 0 + none + + + True + False + True + 6 + 12 + + + True + False + 6 + 12 + + + True + False + True + _Page layout: + True + comboPageLayout + 0 + + + 0 + 0 + + + + + True + False + True + _Format: + True + comboLayoutFormat + 0 + + + 0 + 1 + + + + + Register-tr_ue + True + False + True + True + 0 + True + + + 0 + 2 + 2 + + + + + True + False + liststorePageLayout + + + 1 + 0 + + + + + True + False + liststoreNumberFormat + + + 1 + 1 + + + + + False + True + True + Table alignment: + True + checkbuttonHorz + 0 + + + 0 + 4 + + + + + Hori_zontal + True + False + True + True + 0 + True + + + 1 + 4 + + + + + _Vertical + True + False + True + True + 0 + True + + + 1 + 5 + + + + + _Fit object to paper format + True + False + True + True + none + True + 0 + True + + + 0 + 6 + 2 + + + + + True + False + 12 + + + True + False + vertical + 6 + + + False + True + Reference _Style: + True + comboRegisterStyle + 0 + + + False + True + 0 + + + + + False + True + + + False + True + 1 + + + + + + + 0 + 3 + 2 + + + + + + + + + + + + True + False + Layout Settings + + + + + + + + 1 + 0 + + + + + 0 + 1 + + + + + False + The margin settings are out of print range. + +Do you still want to apply these settings? + + + 0 + 2 + + + True diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 7a65327e624a..66237014d9af 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -200,8 +200,6 @@ namespace dbp m_pExistingRadios->EnableMultiSelection(true); getDialog()->defaultButton(m_pMoveRight.get()); - - m_pExistingRadios->SetAccessibleRelationMemberOf(m_pExistingRadios); } ORadioSelectionPage::~ORadioSelectionPage() @@ -389,8 +387,6 @@ namespace dbp get(m_pOptions, "radiobuttons"); m_pOptions->SetSelectHdl(LINK(this, OOptionValuesPage, OnOptionSelected)); - - m_pOptions->SetAccessibleRelationMemberOf(m_pOptions); } OOptionValuesPage::~OOptionValuesPage() diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 0280380736da..d56141c5fc8d 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -445,7 +445,6 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) : mpIconView->SetAccessibleRelationLabeledBy(mpIconView); else mpIconView->SetAccessibleRelationLabeledBy(maInfoBar.get()); - mpIconView->SetAccessibleRelationMemberOf(mpIconView); } GalleryBrowser2::~GalleryBrowser2() @@ -750,7 +749,6 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName ) mpIconView->SetAccessibleRelationLabeledBy(mpIconView); else mpIconView->SetAccessibleRelationLabeledBy(maInfoBar.get()); - mpIconView->SetAccessibleRelationMemberOf(mpIconView); } void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 5f9737aed922..f1575fedc870 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -449,9 +449,6 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) SetExchangeSupport(); - VclFrame *pSpacing = get("spacing"); - m_pBtnNext->SetAccessibleRelationMemberOf(pSpacing->get_label_widget()); - m_pDefaultVS->SetColCount( 5 ); for (int i = 0; i < 5; ++i) diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index ef95072e5e23..ac7e0c099d44 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -96,7 +96,6 @@ SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg, rDialog.get(m_pTypeFT, "typeft"); rDialog.get(m_pTypeDCB, "typecb"); rDialog.get(m_pNewBT, "new"); - m_pNewBT->SetAccessibleRelationMemberOf(m_pFrame->get_label_widget()); rDialog.get(m_pEntryED, "entryed"); rDialog.get(m_pPhoneticFT0, "phonetic0ft"); rDialog.get(m_pPhoneticED0, "phonetic0ed"); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 3cbe02204b8d..e44175fd4798 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -103,8 +103,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent, SetExchangeSupport(); m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT))); - m_pStandardPB->SetAccessibleRelationMemberOf(m_pPositionFrame->get_label_widget()); - m_pRelativeCB->Check(); m_pAlignLB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl)); m_pAlign2LB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl)); diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui index 782f1f655c26..96f4db0adac5 100644 --- a/sw/uiconfig/swriter/ui/columnpage.ui +++ b/sw/uiconfig/swriter/ui/columnpage.ui @@ -1,5 +1,5 @@ - + @@ -131,8 +131,8 @@ True False - 1 Column: + 1 @@ -192,8 +192,8 @@ True False - 1 Width: + 1 @@ -263,8 +263,8 @@ True False - 1 Spacing: + 1 @@ -403,6 +403,9 @@ + + + 0 @@ -431,10 +434,10 @@ True False - 1 St_yle: True linestylelb + 1 0 @@ -445,10 +448,10 @@ True False - 1 _Width: True linewidthmf:0.00pt + 1 0 @@ -459,10 +462,10 @@ True False - 1 H_eight: True linewidthmf:0.00pt + 1 2 @@ -473,10 +476,10 @@ True False - 1 _Position: True lineposlb + 1 2 @@ -549,10 +552,10 @@ True False - 1 _Color: True colorlb + 1 4 @@ -625,10 +628,10 @@ True False - 1 Columns: True colsnf + 1 0 @@ -694,9 +697,9 @@ False True - 1 _Apply to: True + 1 0 @@ -718,9 +721,9 @@ False True - 1 Text _direction: True + 1 0 diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui index 37e4e0b86a89..0c21605c39d0 100644 --- a/sw/uiconfig/swriter/ui/indexentry.ui +++ b/sw/uiconfig/swriter/ui/indexentry.ui @@ -1,6 +1,7 @@ + - + 1 10 @@ -8,6 +9,22 @@ 1 10 + + True + False + start + gtk-index + + + True + False + gtk-go-back + + + True + False + gtk-go-forward + True False @@ -126,8 +143,6 @@ 0 1 - 1 - 1 @@ -142,8 +157,6 @@ 1 1 - 1 - 1 @@ -158,8 +171,6 @@ 0 0 - 1 - 1 @@ -174,8 +185,6 @@ 1 0 - 1 - 1 @@ -218,16 +227,14 @@ True False 6 - 0 Index True typecb + 0 0 0 - 1 - 1 @@ -239,8 +246,6 @@ 1 0 - 1 - 1 @@ -250,12 +255,13 @@ True New User-defined Index image1 + + + 2 0 - 1 - 1 @@ -263,16 +269,14 @@ True False 6 - 0 Entry True entryed + 0 0 1 - 1 - 1 @@ -285,7 +289,6 @@ 1 1 2 - 1 @@ -294,16 +297,14 @@ False False 6 - 0 1st key True key1cb + 0 0 2 - 1 - 1 @@ -312,16 +313,14 @@ False False 6 - 0 2nd key True key2cb + 0 0 3 - 1 - 1 @@ -329,16 +328,14 @@ True False 6 - 0 Level True levelnf + 0 0 4 - 1 - 1 @@ -353,7 +350,6 @@ 1 4 2 - 1 @@ -369,7 +365,6 @@ 0 5 3 - 1 @@ -385,7 +380,6 @@ 0 6 3 - 1 @@ -402,7 +396,6 @@ 0 7 3 - 1 @@ -419,7 +412,6 @@ 0 8 3 - 1 @@ -428,16 +420,14 @@ True 12 6 - 0 Phonetic reading True phonetic0ed + 0 3 1 - 1 - 1 @@ -446,16 +436,14 @@ True 12 6 - 0 Phonetic reading True phonetic1ed + 0 3 2 - 1 - 1 @@ -464,16 +452,14 @@ True 12 6 - 0 Phonetic reading True phonetic2ed + 0 3 3 - 1 - 1 @@ -485,8 +471,6 @@ 4 1 - 1 - 1 @@ -498,8 +482,6 @@ 4 2 - 1 - 1 @@ -511,8 +493,6 @@ 4 3 - 1 - 1 @@ -534,7 +514,6 @@ 1 2 2 - 1 @@ -557,7 +536,6 @@ 1 3 2 - 1 @@ -627,20 +605,4 @@ delete - - True - False - start - gtk-index - - - True - False - gtk-go-back - - - True - False - gtk-go-forward - diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui index 2b8d923949a5..ba59094d4740 100644 --- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui +++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui @@ -1,5 +1,5 @@ - + @@ -134,10 +134,10 @@ True False - 1 Numbering alignment: True numalignlb + 1 0 @@ -159,12 +159,12 @@ True False - 1 Minimum space between numbering and text: True right numdistmf:0.00cm + 1 0 @@ -188,10 +188,10 @@ numbering and text: True False - 1 Width of numbering: True numberingwidthmf:0.00cm + 1 0 @@ -230,10 +230,10 @@ numbering and text: True False - 1 Indent: True indentmf:0.00cm + 1 0 @@ -257,10 +257,10 @@ numbering and text: True False - 1 Indent at: True indentatmf:0.00cm + 1 0 @@ -283,10 +283,10 @@ numbering and text: True False - 1 Numbering alignment: True num2alignlb + 1 0 @@ -307,10 +307,10 @@ numbering and text: True False - 1 Aligned at: True alignedatmf:0.00cm + 1 0 @@ -333,10 +333,10 @@ numbering and text: True False - 1 at: True atmf:0.00cm + 1 0 @@ -371,10 +371,10 @@ numbering and text: True False True - 1 Numbering followed by: True numfollowedbylb + 1 0 @@ -419,6 +419,9 @@ numbering and text: True True end + + + 1