Modified: openoffice/branches/sidebar/main/sw/source/ui/inc/drwbassh.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/inc/drwbassh.hxx?rev=1455165&r1=1455164&r2=1455165&view=diff ============================================================================== --- openoffice/branches/sidebar/main/sw/source/ui/inc/drwbassh.hxx (original) +++ openoffice/branches/sidebar/main/sw/source/ui/inc/drwbassh.hxx Mon Mar 11 14:44:39 2013 @@ -49,6 +49,7 @@ public: void Execute(SfxRequest &); void GetState(SfxItemSet &); + void GetDrawAttrStateForIFBX( SfxItemSet& rSet ); void DisableState(SfxItemSet &rSet) { Disable(rSet);} sal_Bool Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/drawsh.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/drawsh.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff ============================================================================== --- openoffice/branches/sidebar/main/sw/source/ui/shells/drawsh.cxx (original) +++ openoffice/branches/sidebar/main/sw/source/ui/shells/drawsh.cxx Mon Mar 11 14:44:39 2013 @@ -169,9 +169,11 @@ void SwDrawShell::Execute(SfxRequest &rR break; case FN_FLIP_HORZ_GRAFIC: + case SID_FLIP_HORIZONTAL: bMirror = sal_False; /* no break */ case FN_FLIP_VERT_GRAFIC: + case SID_FLIP_VERTICAL: rSh.MirrorSelection( bMirror ); break; @@ -346,11 +348,13 @@ void SwDrawShell::GetState(SfxItemSet& r break; case FN_FLIP_HORZ_GRAFIC: + case SID_FLIP_HORIZONTAL: if ( !pSdrView->IsMirrorAllowed() || bProtected ) rSet.DisableItem( nWhich ); break; case FN_FLIP_VERT_GRAFIC: + case SID_FLIP_VERTICAL: if ( !pSdrView->IsMirrorAllowed() || bProtected ) rSet.DisableItem( nWhich ); break; Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/drwbassh.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/drwbassh.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff ============================================================================== --- openoffice/branches/sidebar/main/sw/source/ui/shells/drwbassh.cxx (original) +++ openoffice/branches/sidebar/main/sw/source/ui/shells/drwbassh.cxx Mon Mar 11 14:44:39 2013 @@ -382,6 +382,10 @@ void SwDrawBaseShell::Execute(SfxRequest } } + else + { + pSdrView->SetGeoAttrToMarked( *pArgs ); + } } } break; @@ -770,9 +774,19 @@ void SwDrawBaseShell::GetState(SfxItemSe } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ + +void SwDrawBaseShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet ) +{ + SwWrtShell *pSh = &GetShell(); + SdrView* pSdrView = pSh->GetDrawView(); + const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); + if( rMarkList.GetMark(0) != 0 ) + { + SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();//OST_IFBX@WL2 + SfxItemSet aNewAttr(pSdrView->GetGeoAttrFromMarked()); + rSet.Put(aNewAttr,false); + } +} sal_Bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich) @@ -990,7 +1004,3 @@ IMPL_LINK(SwDrawBaseShell, ValidatePosit pValidation->nHeight = pValidation->nMaxHeight; return 0; } - - - - Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/grfsh.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/grfsh.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff ============================================================================== --- openoffice/branches/sidebar/main/sw/source/ui/shells/grfsh.cxx (original) +++ openoffice/branches/sidebar/main/sw/source/ui/shells/grfsh.cxx Mon Mar 11 14:44:39 2013 @@ -381,12 +381,14 @@ void SwGrfShell::ExecAttr( SfxRequest &r { case FN_FLIP_VERT_GRAFIC: case FN_FLIP_HORZ_GRAFIC: + case SID_FLIP_VERTICAL: + case SID_FLIP_HORIZONTAL: { GetShell().GetCurAttr( aGrfSet ); SwMirrorGrf aMirror( (SwMirrorGrf&)aGrfSet.Get( RES_GRFATR_MIRRORGRF ) ); sal_uInt16 nMirror = aMirror.GetValue(); - if( FN_FLIP_VERT_GRAFIC == nSlot ) + if( FN_FLIP_VERT_GRAFIC == nSlot || nSlot==SID_FLIP_VERTICAL ) switch( nMirror ) { case RES_MIRROR_GRAPH_DONT: nMirror = RES_MIRROR_GRAPH_VERT; Modified: openoffice/branches/sidebar/main/sw/source/ui/wrtsh/wrtsh3.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/wrtsh/wrtsh3.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff ============================================================================== --- openoffice/branches/sidebar/main/sw/source/ui/wrtsh/wrtsh3.cxx (original) +++ openoffice/branches/sidebar/main/sw/source/ui/wrtsh/wrtsh3.cxx Mon Mar 11 14:44:39 2013 @@ -127,39 +127,12 @@ void SwWrtShell::DrawSelChanged( ) { static sal_uInt16 __READONLY_DATA aInval[] = { - SID_ATTR_TRANSFORM_POS_X, // ( SID_SVX_START + 88 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_POS_Y, // ( SID_SVX_START + 89 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_WIDTH, // ( SID_SVX_START + 90 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_HEIGHT, // ( SID_SVX_START + 91 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_ROT_X, // ( SID_SVX_START + 93 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_ROT_Y, // ( SID_SVX_START + 94 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_ANGLE, // ( SID_SVX_START + 95 ) // for TransformationPropertyPanel - SID_ATTR_FILL_STYLE, // ( SID_SVX_START + 164 ) - SID_ATTR_FILL_COLOR, // ( SID_SVX_START + 165 ) - SID_ATTR_FILL_GRADIENT, // ( SID_SVX_START + 166 ) // for AreaPropertyPanel - SID_ATTR_FILL_HATCH, // ( SID_SVX_START + 167 ) // for AreaPropertyPanel - SID_ATTR_FILL_BITMAP, // ( SID_SVX_START + 168 ) // for AreaPropertyPanel - SID_ATTR_LINE_STYLE, // ( SID_SVX_START + 169 ) - SID_ATTR_LINE_DASH, // ( SID_SVX_START + 170 ) // for LinePropertyPanel - SID_ATTR_LINE_WIDTH, // ( SID_SVX_START + 171 ) - SID_ATTR_LINE_COLOR, // ( SID_SVX_START + 172 ) - SID_ATTR_LINE_START, // ( SID_SVX_START + 173 ) // for LinePropertyPanel - SID_ATTR_LINE_END, // ( SID_SVX_START + 174 ) // for LinePropertyPanel - SID_COLOR_TABLE, // ( SID_SVX_START + 179 ) // for AreaPropertyPanel - SID_GRADIENT_LIST, // ( SID_SVX_START + 180 ) // for AreaPropertyPanel - SID_HATCH_LIST, // ( SID_SVX_START + 181 ) // for AreaPropertyPanel - SID_BITMAP_LIST, // ( SID_SVX_START + 182 ) // for AreaPropertyPanel - SID_LINEEND_LIST, // ( SID_SVX_START + 184 ) // for LinePropertyPanel - SID_ATTR_TRANSFORM_PROTECT_POS, // ( SID_SVX_START + 236 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_PROTECT_SIZE, // ( SID_SVX_START + 237 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_AUTOWIDTH, // ( SID_SVX_START + 310 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_AUTOHEIGHT, // ( SID_SVX_START + 311 ) // for TransformationPropertyPanel - SID_ATTR_TRANSFORM_ANCHOR, // ( SID_SVX_START + 318 ) // for TransformationPropertyPanel - SID_ATTR_FILL_TRANSPARENCE, // (SID_SVX_START+1105) - SID_ATTR_FILL_FLOATTRANSPARENCE, // (SID_SVX_START+1106) - SID_ATTR_LINE_TRANSPARENCE, // (SID_SVX_START+1107) - SID_ATTR_LINE_JOINT, // (SID_SVX_START+1110) - SID_ATTR_LINE_CAP, // (SID_SVX_START+1111) + SID_ATTR_FILL_STYLE, SID_ATTR_FILL_COLOR, SID_ATTR_LINE_STYLE, + SID_ATTR_LINE_WIDTH, SID_ATTR_LINE_COLOR, + /*AF: these may be needed for the sidebar. + SID_SVX_AREA_TRANSPARENCY, SID_SVX_AREA_TRANSP_GRADIENT, + SID_SVX_AREA_TRANS_TYPE, + */ 0 };
