cui/uiconfig/ui/slantcornertabpage.ui | 48 +++++++++++++++----------- sd/source/ui/dlg/navigatr.cxx | 10 ++--- sd/source/ui/func/fuprlout.cxx | 5 +- sd/source/ui/view/ViewShellBase.cxx | 9 ++-- svx/source/fmcomp/gridcell.cxx | 8 +--- svx/source/form/navigatortree.cxx | 7 ++- svx/source/svdraw/svdobj.cxx | 4 -- sw/source/core/undo/undraw.cxx | 62 ++++++++++++++++++---------------- sw/source/filter/xml/xmlexpit.cxx | 7 +-- sw/source/filter/xml/xmlimpit.cxx | 17 +++------ sw/source/uibase/uiview/viewling.cxx | 2 - xmloff/source/forms/elementimport.cxx | 2 - 12 files changed, 92 insertions(+), 89 deletions(-)
New commits: commit dfe1e25b4a3f91a29ec7989711b3c39e166e525b Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 21:07:31 2015 +0100 coverity#735874 Dereference after null check Change-Id: I74a4a126116638aa33193f267e2f86a3c364fbae diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 2acccfd..5b8f84d 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2616,10 +2616,8 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) } else { - if(pRet && dynamic_cast<const SdrPathObj*>( pRet) != nullptr) + if (SdrPathObj *pPathObj = dynamic_cast<SdrPathObj*>(pRet)) { - SdrPathObj* pPathObj = static_cast<SdrPathObj*>(pRet); - // bezier geometry got created, even for straight edges since the given // object is a result of DoConvertToPolyObj. For conversion to contour // this is not really needed and can be reduced again AFAP commit ffbcf926cf7c661521861cdf4bcc90d5ec4dca9a Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 21:05:18 2015 +0100 coverity#735838 Dereference after null check Change-Id: I5a0a9cfdac0444beb049bf9e883ffced25500950 diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 16665d1..ab74fae 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -93,10 +93,9 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) /* if we are on a master page, the changes apply for all pages and notes- pages who are using the relevant layout */ bool bOnMaster = false; - if( mpViewShell && dynamic_cast< const DrawViewShell *>( mpViewShell ) != nullptr) + if (DrawViewShell *pShell = dynamic_cast<DrawViewShell*>(mpViewShell)) { - EditMode eEditMode = - static_cast<DrawViewShell*>(mpViewShell)->GetEditMode(); + EditMode eEditMode = pShell->GetEditMode(); if (eEditMode == EM_MASTERPAGE) bOnMaster = true; } commit 979651c21a26a7995c88071d0a26162aa711b31f Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 21:02:42 2015 +0100 coverity#1326118 Constant expression result Change-Id: I3a5786650e0724f6b6015153df7275851471626c diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 41f0971..fec7bd2 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -944,7 +944,7 @@ namespace xmloff // we have exactly 2 properties where this type class is allowed: OSL_ENSURE( _rPropValue.Name != PROPERTY_EFFECTIVE_VALUE - || _rPropValue.Name != PROPERTY_EFFECTIVE_DEFAULT, + && _rPropValue.Name != PROPERTY_EFFECTIVE_DEFAULT, "OControlImport::implTranslateValueProperty: invalid property type/name combination!"); // Both properties are allowed to have a double or a string value, commit f353e7baaace4e0bce3dbd1d440dc5be9ac35298 Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:59:12 2015 +0100 coverity#1326205 Unchecked dynamic_cast Change-Id: I1fe77d041a281b14d6af15f25bd06ac78420c608 diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 3f8c2c3..4fa7078 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1270,12 +1270,13 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) ViewShell* pCenterViewShell = FrameworkHelper::Instance(mrBase)->GetViewShell( FrameworkHelper::msCenterPaneURL).get(); bool bMasterPageMode (false); - if (pCenterViewShell!=NULL && dynamic_cast< DrawViewShell *>( pCenterViewShell ) != nullptr) - if (dynamic_cast< DrawViewShell *>( pCenterViewShell )->GetEditMode() - == EM_MASTERPAGE) + if (DrawViewShell* pShell = dynamic_cast<DrawViewShell*>(pCenterViewShell)) + { + if (pShell->GetEditMode() == EM_MASTERPAGE) { bMasterPageMode = true; } + } bState &= !bMasterPageMode; break; commit 8d4088c23b83de1a418014ea5957a0dc3efed7e4 Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:58:04 2015 +0100 coverity#1326204 Unchecked dynamic_cast Change-Id: I39c942e2ce35283761e3b8daa1ae41986a170ca8 diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 26aa8fa..3f8c2c3 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -689,7 +689,7 @@ void ViewShellBase::ReadUserDataSequence ( case ViewShell::ST_HANDOUT: { OUString sViewURL; - switch (dynamic_cast<DrawViewShell*>( pShell)->GetPageKind() ) + switch (dynamic_cast<DrawViewShell&>(*pShell).GetPageKind()) { default: case PK_STANDARD: commit c458fbad3ed7d5cdea6b2f1c28d98ecec2d3b10e Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:56:17 2015 +0100 coverity#1326210 Unchecked dynamic_cast Change-Id: I729af592a74aff7c40a5ae5311d8c5aff2ddee04 diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index b354ecb..9ab92b1 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -260,18 +260,16 @@ void DbGridColumn::impl_toggleScriptManager_nothrow( bool _bAttach ) } } - void DbGridColumn::UpdateFromField(const DbGridRow* pRow, const Reference< XNumberFormatter >& xFormatter) { - if (m_pCell && dynamic_cast<const FmXFilterCell*>( m_pCell) != nullptr) - dynamic_cast<FmXFilterCell*>( m_pCell)->Update( ); + if (FmXFilterCell* pCell = dynamic_cast<FmXFilterCell*>(m_pCell)) + pCell->Update(); else if (pRow && pRow->IsValid() && m_nFieldPos >= 0 && m_pCell && pRow->HasField(m_nFieldPos)) { - dynamic_cast<FmXDataCell*>( m_pCell)->UpdateFromField( pRow->GetField( m_nFieldPos ).getColumn(), xFormatter ); + dynamic_cast<FmXDataCell&>(*m_pCell).UpdateFromField( pRow->GetField( m_nFieldPos ).getColumn(), xFormatter ); } } - bool DbGridColumn::Commit() { bool bResult = true; commit 5c90069d93ac45e359718a9186ff2366043f43ed Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:54:28 2015 +0100 coverity#1326211 Unchecked dynamic_cast Change-Id: I09892b8e17aacf32db51764d8fd766603a8542e1 diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index b390066..5af021c 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -871,9 +871,8 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, { if( eState >= SfxItemState::DEFAULT && nSId == SID_NAVIGATOR_STATE ) { - const SfxUInt32Item* pStateItem = dynamic_cast< const SfxUInt32Item* >( pItem ); - DBG_ASSERT( pStateItem, "SfxUInt16Item expected"); - sal_uInt32 nState = pStateItem->GetValue(); + const SfxUInt32Item& rStateItem = dynamic_cast<const SfxUInt32Item&>(*pItem); + sal_uInt32 nState = rStateItem.GetValue(); // pen if( nState & NAVBTN_PEN_DISABLED && @@ -955,9 +954,8 @@ void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId, NavDocInfo* pInfo = pNavigatorWin->GetDocInfo(); if( pInfo && pInfo->IsActive() ) { - const SfxStringItem* pStateItem = dynamic_cast<const SfxStringItem*>( pItem ); - DBG_ASSERT( pStateItem, "SfxStringItem expected"); - OUString aPageName = pStateItem->GetValue(); + const SfxStringItem& rStateItem = dynamic_cast<const SfxStringItem&>(*pItem); + OUString aPageName = rStateItem.GetValue(); if( !pNavigatorWin->maTlbObjects->HasSelectedChildren( aPageName ) ) { commit 95ddc77f197124d1792ead85e81546b6fc68285f Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:52:00 2015 +0100 coverity#1326228 Unchecked dynamic_cast Change-Id: Idcbf27362e13d9f8a71db17c38e93b24fb1fbfc0 diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index a7b65e0..1e61266 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -839,15 +839,14 @@ bool SvXMLExportItemMapper::QueryXMLValue( case RES_BREAK: { - const SvxFormatBreakItem* pFormatBreak = dynamic_cast<const SvxFormatBreakItem*>( &rItem ); - OSL_ENSURE( pFormatBreak != NULL, "Wrong Which-ID" ); + const SvxFormatBreakItem& rFormatBreak = dynamic_cast<const SvxFormatBreakItem&>(rItem); unsigned int eEnum = 0; switch( nMemberId ) { case MID_BREAK_BEFORE: - switch( pFormatBreak->GetValue() ) + switch (rFormatBreak.GetValue()) { case SVX_BREAK_COLUMN_BEFORE: eEnum = 1; @@ -863,7 +862,7 @@ bool SvXMLExportItemMapper::QueryXMLValue( } break; case MID_BREAK_AFTER: - switch( pFormatBreak->GetValue() ) + switch (rFormatBreak.GetValue()) { case SVX_BREAK_COLUMN_AFTER: eEnum = 1; commit 216297f06ba0153017382eed7bfe2cc571ea67a1 Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:50:53 2015 +0100 coverity#1326250 Unchecked dynamic_cast Change-Id: I0c2cf72d7e4f736e2e2c3b8b5def920ee79747fe diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 61e9302..d68c979 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -590,9 +590,7 @@ bool SvXMLImportItemMapper::PutXMLValue( case RES_BREAK: { - SvxFormatBreakItem* pFormatBreak = dynamic_cast<SvxFormatBreakItem*>( &rItem ); - OSL_ENSURE( pFormatBreak != NULL, "Wrong Which-ID" ); - + SvxFormatBreakItem& rFormatBreak = dynamic_cast<SvxFormatBreakItem&>(rItem); sal_uInt16 eEnum; if( !SvXMLUnitConverter::convertEnum( eEnum, rValue, psXML_BreakType ) ) @@ -600,7 +598,7 @@ bool SvXMLImportItemMapper::PutXMLValue( if( eEnum == 0 ) { - pFormatBreak->SetValue( SVX_BREAK_NONE ); + rFormatBreak.SetValue( SVX_BREAK_NONE ); bOk = true; } else @@ -608,12 +606,12 @@ bool SvXMLImportItemMapper::PutXMLValue( switch( nMemberId ) { case MID_BREAK_BEFORE: - pFormatBreak->SetValue( static_cast< sal_uInt16 >((eEnum == 1) ? + rFormatBreak.SetValue( static_cast< sal_uInt16 >((eEnum == 1) ? SVX_BREAK_COLUMN_BEFORE : SVX_BREAK_PAGE_BEFORE) ); break; case MID_BREAK_AFTER: - pFormatBreak->SetValue( static_cast< sal_uInt16 >((eEnum == 1) ? + rFormatBreak.SetValue( static_cast< sal_uInt16 >((eEnum == 1) ? SVX_BREAK_COLUMN_AFTER : SVX_BREAK_PAGE_AFTER) ); break; commit 432fe1f30c1c28b0fb51022533e4b93276c640ce Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:49:54 2015 +0100 coverity#1326251 Unchecked dynamic_cast Change-Id: Iabdc2f4e0b7af49650e07a9035a425f96cd035c7 diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 58b5d27..61e9302 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -625,19 +625,18 @@ bool SvXMLImportItemMapper::PutXMLValue( case RES_KEEP: { - SvxFormatKeepItem* pFormatKeep = dynamic_cast<SvxFormatKeepItem*>( &rItem ); - OSL_ENSURE( pFormatKeep != NULL, "Wrong Which-ID" ); + SvxFormatKeepItem& rFormatKeep = dynamic_cast<SvxFormatKeepItem&>(rItem); if( IsXMLToken( rValue, XML_ALWAYS ) || IsXMLToken( rValue, XML_TRUE ) ) { - pFormatKeep->SetValue( true ); + rFormatKeep.SetValue( true ); bOk = true; } else if( IsXMLToken( rValue, XML_AUTO ) || IsXMLToken( rValue, XML_FALSE ) ) { - pFormatKeep->SetValue( false ); + rFormatKeep.SetValue( false ); bOk = true; } } commit 9381ca578de26aa75bb0d4439221c3439cf99616 Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:48:27 2015 +0100 Related: tdf#94814 some cleanup of static_cast following dynamic_cast to the same type Change-Id: I4d125b7669a89b96785cb60f967352dce5e2e720 diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index acb4b26..e9dcd74 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -241,13 +241,14 @@ void SwUndoDrawGroup::UndoImpl(::sw::UndoRedoContext &) pContact->ConnectToLayout(); // #i45718# - follow-up of #i35635# move object to visible layer pContact->MoveObjToVisibleLayer( pObj ); + + SwDrawFrameFormat* pDrawFrameFormat = dynamic_cast<SwDrawFrameFormat*>(rSave.pFormat); + // #i45952# - notify that position attributes are already set - OSL_ENSURE( dynamic_cast< const SwDrawFrameFormat *>( rSave.pFormat ) != nullptr, - "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" ); - if ( dynamic_cast< const SwDrawFrameFormat *>( rSave.pFormat ) != nullptr ) - { - static_cast<SwDrawFrameFormat*>(rSave.pFormat)->PosAttrSet(); - } + OSL_ENSURE(pDrawFrameFormat, + "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object"); + if (pDrawFrameFormat) + pDrawFrameFormat->PosAttrSet(); } } @@ -288,13 +289,14 @@ void SwUndoDrawGroup::RedoImpl(::sw::UndoRedoContext &) pContact->ConnectToLayout(); // #i45718# - follow-up of #i35635# move object to visible layer pContact->MoveObjToVisibleLayer( pObjArr->pObj ); + + SwDrawFrameFormat* pDrawFrameFormat = dynamic_cast<SwDrawFrameFormat*>(pObjArr->pFormat); + // #i45952# - notify that position attributes are already set - OSL_ENSURE( dynamic_cast< const SwDrawFrameFormat *>( pObjArr->pFormat ) != nullptr, - "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" ); - if ( dynamic_cast< const SwDrawFrameFormat *>( pObjArr->pFormat ) != nullptr ) - { - static_cast<SwDrawFrameFormat*>(pObjArr->pFormat)->PosAttrSet(); - } + OSL_ENSURE(pDrawFrameFormat, + "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object"); + if (pDrawFrameFormat) + pDrawFrameFormat->PosAttrSet(); } void SwUndoDrawGroup::AddObj( sal_uInt16 nPos, SwDrawFrameFormat* pFormat, SdrObject* pObj ) @@ -386,13 +388,14 @@ void SwUndoDrawUnGroup::UndoImpl(::sw::UndoRedoContext & rContext) pContact->ConnectToLayout(); // #i45718# - follow-up of #i35635# move object to visible layer pContact->MoveObjToVisibleLayer( pObjArr->pObj ); + + SwDrawFrameFormat* pDrawFrameFormat = dynamic_cast<SwDrawFrameFormat*>(pObjArr->pFormat); + // #i45952# - notify that position attributes are already set - OSL_ENSURE( dynamic_cast< const SwDrawFrameFormat *>( pObjArr->pFormat ) != nullptr, - "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" ); - if ( dynamic_cast< const SwDrawFrameFormat *>( pObjArr->pFormat ) != nullptr ) - { - static_cast<SwDrawFrameFormat*>(pObjArr->pFormat)->PosAttrSet(); - } + OSL_ENSURE(pDrawFrameFormat, + "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object"); + if (pDrawFrameFormat) + pDrawFrameFormat->PosAttrSet(); } void SwUndoDrawUnGroup::RedoImpl(::sw::UndoRedoContext &) @@ -425,13 +428,13 @@ void SwUndoDrawUnGroup::RedoImpl(::sw::UndoRedoContext &) ::lcl_RestoreAnchor( rSave.pFormat, rSave.nNodeIdx ); rFlyFormats.push_back( rSave.pFormat ); + SwDrawFrameFormat* pDrawFrameFormat = dynamic_cast<SwDrawFrameFormat*>(rSave.pFormat); + // #i45952# - notify that position attributes are already set - OSL_ENSURE( dynamic_cast< const SwDrawFrameFormat *>( rSave.pFormat ) != nullptr, + OSL_ENSURE(pDrawFrameFormat, "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" ); - if ( dynamic_cast< const SwDrawFrameFormat *>( rSave.pFormat ) != nullptr ) - { - static_cast<SwDrawFrameFormat*>(rSave.pFormat)->PosAttrSet(); - } + if (pDrawFrameFormat) + pDrawFrameFormat->PosAttrSet(); } } @@ -525,13 +528,14 @@ void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext) pContact->_Changed( *pObj, SDRUSERCALL_INSERTED, NULL ); // #i45718# - follow-up of #i35635# move object to visible layer pContact->MoveObjToVisibleLayer( pObj ); + + SwDrawFrameFormat* pDrawFrameFormat = dynamic_cast<SwDrawFrameFormat*>(rSave.pFormat); + // #i45952# - notify that position attributes are already set - OSL_ENSURE( dynamic_cast< const SwDrawFrameFormat *>( rSave.pFormat ) != nullptr, - "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" ); - if ( dynamic_cast< const SwDrawFrameFormat *>( rSave.pFormat ) != nullptr ) - { - static_cast<SwDrawFrameFormat*>(rSave.pFormat)->PosAttrSet(); - } + OSL_ENSURE(pDrawFrameFormat, + "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object"); + if (pDrawFrameFormat) + pDrawFrameFormat->PosAttrSet(); } rContext.SetSelections(0, pMarkLst); } commit 74615356b36aeefc9046c53d05f4919e9fae6a87 Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:39:15 2015 +0100 coverity#1326550 Dereference before null check Change-Id: I27ddcc842f109eb3defbae425babbb9d98e83c04 diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 584c571..2d76041 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -651,7 +651,7 @@ bool SwView::ExecSpellPopup(const Point& rPt) // This makes it possible to suggest spelling corrections for // wrong words independent of the spell-checking idle job. if (pNode && pNode->IsWrongDirty() && - dynamic_cast< const SwCrsrShell *>( m_pWrtShell ) != nullptr && !pCrsrShell->IsTableMode() && + !pCrsrShell->IsTableMode() && !pCrsr->HasMark() && !pCrsr->IsMultiSelection()) { SwContentFrm *pFrm = pCrsr->GetContentNode()->getLayoutFrm( commit 505e194b1be2e21070c7a93214e719634556f8c9 Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 20:35:39 2015 +0100 coverity#1326499 Resource leak Change-Id: I561e8f7ff472d7d2578e30145024405e74088ffc diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 7861e3fa..6411f12 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1339,6 +1339,10 @@ namespace svxform if (!xNewForm.is()) return; + Reference< XPropertySet > xPropertySet(xNewForm, UNO_QUERY); + if (!xPropertySet.is()) + return; + FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, pParentFormData ); @@ -1346,9 +1350,6 @@ namespace svxform OUString aName = GenerateName(pNewFormData); pNewFormData->SetText(aName); - Reference< XPropertySet > xPropertySet(xNewForm, UNO_QUERY); - if (!xPropertySet.is()) - return; try { xPropertySet->setPropertyValue( FM_PROP_NAME, makeAny(aName) ); commit bc16de624e1f2b4b6132eea2f36bc6f8cedcef5a Author: Caolán McNamara <[email protected]> Date: Tue Oct 13 15:40:04 2015 +0100 add another size group Change-Id: Iecf7d7de7693432d99dd7d38ad2034a7dbfd4e48 diff --git a/cui/uiconfig/ui/slantcornertabpage.ui b/cui/uiconfig/ui/slantcornertabpage.ui index 27814a5..2751144 100644 --- a/cui/uiconfig/ui/slantcornertabpage.ui +++ b/cui/uiconfig/ui/slantcornertabpage.ui @@ -2,6 +2,17 @@ <!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> + <object class="GtkAdjustment" id="adjustmentRADIUS"> + <property name="upper">500</property> + <property name="step_increment">10</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustmentSLANT"> + <property name="lower">-89</property> + <property name="upper">89</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkGrid" id="SlantAndCornerRadius"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -381,6 +392,18 @@ </packing> </child> </object> + <object class="GtkSizeGroup" id="sizegroup1"> + <widgets> + <widget name="FT_RADIUS"/> + <widget name="FT_ANGLE"/> + </widgets> + </object> + <object class="GtkSizeGroup" id="sizegroup2"> + <widgets> + <widget name="MTR_FLD_RADIUS:0.00cm"/> + <widget name="MTR_FLD_ANGLE:0.00degrees"/> + </widgets> + </object> <object class="GtkSizeGroup" id="sizegroup3"> <widgets> <widget name="label5"/> @@ -395,27 +418,12 @@ <widget name="label7"/> </widgets> </object> - <object class="GtkAdjustment" id="adjustmentRADIUS"> - <property name="upper">500</property> - <property name="step_increment">10</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustmentSLANT"> - <property name="lower">-89</property> - <property name="upper">89</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkSizeGroup" id="sizegroup1"> - <widgets> - <widget name="FT_RADIUS"/> - <widget name="FT_ANGLE"/> - </widgets> - </object> - <object class="GtkSizeGroup" id="sizegroup2"> + <object class="GtkSizeGroup" id="sizegroup5"> <widgets> - <widget name="MTR_FLD_RADIUS:0.00cm"/> - <widget name="MTR_FLD_ANGLE:0.00degrees"/> + <widget name="controlx1:0.00cm"/> + <widget name="controly1:0.00cm"/> + <widget name="controlx2:0.00cm"/> + <widget name="controly2:0.00cm"/> </widgets> </object> </interface>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
