You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/03/11 15:44:41 UTC
svn commit: r1455165 [1/3] - in /openoffice/branches/sidebar/main:
chart2/source/controller/drawinglayer/ default_images/svx/res/
officecfg/registry/data/org/openoffice/Office/UI/ sc/sdi/
sc/source/ui/drawfunc/ sc/source/ui/inc/ sc/source/ui/view/ sd/s...
Author: af
Date: Mon Mar 11 14:44:39 2013
New Revision: 1455165
URL: http://svn.apache.org/r1455165
Log:
121420: Fixed some sidebar panels.
Added:
openoffice/branches/sidebar/main/default_images/svx/res/rotation.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/rotation_h.png (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/possize/
openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc
openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.src
openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControl.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControl.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.hxx
openoffice/branches/sidebar/main/sw/sdi/sidebar.sdi
Removed:
openoffice/branches/sidebar/main/svx/source/sidebar/transform/
Modified:
openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi
openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx
openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh2.cxx
openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh5.cxx
openoffice/branches/sidebar/main/sc/source/ui/inc/drawsh.hxx
openoffice/branches/sidebar/main/sc/source/ui/view/gridwin.cxx
openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi
openoffice/branches/sidebar/main/sd/source/ui/func/futext.cxx
openoffice/branches/sidebar/main/sd/source/ui/inc/DrawViewShell.hxx
openoffice/branches/sidebar/main/sd/source/ui/view/drviews7.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/drviewsc.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarToolBox.cxx
openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk
openoffice/branches/sidebar/main/svx/Library_svx.mk
openoffice/branches/sidebar/main/svx/inc/svx/dialcontrol.hxx
openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
openoffice/branches/sidebar/main/svx/inc/svx/svdedtv.hxx
openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc
openoffice/branches/sidebar/main/svx/sdi/svx.sdi
openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi
openoffice/branches/sidebar/main/svx/source/dialog/dialcontrol.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/svdraw/svdedtv1.cxx
openoffice/branches/sidebar/main/sw/sdi/_frmsh.sdi
openoffice/branches/sidebar/main/sw/sdi/_grfsh.sdi
openoffice/branches/sidebar/main/sw/sdi/drawsh.sdi
openoffice/branches/sidebar/main/sw/sdi/drwbassh.sdi
openoffice/branches/sidebar/main/sw/sdi/swslots.sdi
openoffice/branches/sidebar/main/sw/sdi/wdrwbase.sdi
openoffice/branches/sidebar/main/sw/source/ui/inc/drwbassh.hxx
openoffice/branches/sidebar/main/sw/source/ui/shells/drawsh.cxx
openoffice/branches/sidebar/main/sw/source/ui/shells/drwbassh.cxx
openoffice/branches/sidebar/main/sw/source/ui/shells/grfsh.cxx
openoffice/branches/sidebar/main/sw/source/ui/wrtsh/wrtsh3.cxx
Modified: openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx (original)
+++ openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx Mon Mar 11 14:44:39 2013
@@ -338,7 +338,6 @@ SfxItemSet DrawViewWrapper::getPositionA
{
SfxItemSet aFullSet( GetModel()->GetItemPool(),
SID_ATTR_TRANSFORM_POS_X, SID_ATTR_TRANSFORM_ANGLE,
- SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL, SID_ATTR_TRANSFORM_MIRROR_VERTICAL,
SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_AUTOHEIGHT,
SDRATTR_ECKENRADIUS, SDRATTR_ECKENRADIUS,
SID_ATTR_METRIC, SID_ATTR_METRIC,
Added: openoffice/branches/sidebar/main/default_images/svx/res/rotation.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/rotation.png?rev=1455165&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/rotation.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/rotation.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/rotation_h.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/rotation_h.png?rev=1455165&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/rotation_h.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/rotation_h.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi Mon Mar 11 14:44:39 2013
@@ -98,21 +98,18 @@ interface TableDraw
SID_ATTRIBUTES_LINE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
SID_ATTR_TRANSFORM [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
- // use same as SID_ATTR_LINEEND_STYLE
- SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_MIRROR_VERTICAL [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_POS_X [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_POS_Y [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_WIDTH [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_HEIGHT [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_ANGLE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_ROT_X [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_ROT_Y [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_PROTECT_POS [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_PROTECT_SIZE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_AUTOWIDTH [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_AUTOHEIGHT [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_TRANSFORM_MATRIX [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ // For the sidebar
+ SID_ATTR_TRANSFORM_WIDTH [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_HEIGHT [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_POS_X [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_POS_Y [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_ANGLE [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_ROT_X [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_ROT_Y [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_PROTECT_POS [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_PROTECT_SIZE [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_AUTOWIDTH [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_AUTOHEIGHT [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
// ---- Ausrichtungs - Funktionen:
//! PseudoSlots gibt Aerger mit Referenz-Dialogen ???
@@ -187,6 +184,8 @@ interface TableDraw
]
*/
SID_MIRROR_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
+ SID_FLIP_HORIZONTAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
+ SID_FLIP_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
SID_ANCHOR_PAGE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ]
SID_ANCHOR_TOGGLE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
SID_ANCHOR_CELL [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ]
Modified: openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx Mon Mar 11 14:44:39 2013
@@ -58,6 +58,8 @@
#include <svx/dialogs.hrc>
#include <svx/drawitem.hxx>
#include <svx/xtable.hxx>
+#include "tabvwsh.hxx"
+#include <sfx2/bindings.hxx>
#define ScDrawShell
#include "scslots.hxx"
@@ -247,6 +249,7 @@ void ScDrawShell::ExecDrawAttr( SfxReque
#endif
case SID_ATTR_TRANSFORM:
+ {
{
if ( pView->AreObjectsMarked() )
{
@@ -314,8 +317,21 @@ void ScDrawShell::ExecDrawAttr( SfxReque
pView->SetGeoAttrToMarked( *pArgs );
}
}
- break;
+ ScTabViewShell* pViewShell = pViewData->GetViewShell();
+ SfxBindings& rBindings=pViewShell->GetViewFrame()->GetBindings();
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_WIDTH);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_HEIGHT);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ANGLE);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_Y);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOWIDTH);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOHEIGHT);
+ break;
+ }
+
default:
break;
}
Modified: openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh2.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh2.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh2.cxx Mon Mar 11 14:44:39 2013
@@ -138,6 +138,8 @@ void ScDrawShell::GetDrawFuncState( SfxI
{
rSet.DisableItem( SID_MIRROR_HORIZONTAL );
rSet.DisableItem( SID_MIRROR_VERTICAL );
+ rSet.DisableItem( SID_FLIP_HORIZONTAL );
+ rSet.DisableItem( SID_FLIP_VERTICAL );
}
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
@@ -392,4 +394,14 @@ sal_Bool ScDrawShell::AreAllObjectsOnLay
return bResult;
}
-
+void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet )
+{
+ ScDrawView* pView = pViewData->GetScDrawView();
+ const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
+
+ if( rMarkList.GetMark(0) != 0 )
+ {
+ SfxItemSet aNewAttr(pView->GetGeoAttrFromMarked());
+ rSet.Put(aNewAttr, sal_False);
+ }
+}
Modified: openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh5.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh5.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh5.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh5.cxx Mon Mar 11 14:44:39 2013
@@ -325,10 +325,14 @@ void ScDrawShell::ExecDrawFunc( SfxReque
break;
case SID_MIRROR_HORIZONTAL:
+ case SID_FLIP_HORIZONTAL:
pView->MirrorAllMarkedHorizontal();
+ rBindings.Invalidate( SID_ATTR_TRANSFORM_ANGLE );
break;
case SID_MIRROR_VERTICAL:
+ case SID_FLIP_VERTICAL:
pView->MirrorAllMarkedVertical();
+ rBindings.Invalidate( SID_ATTR_TRANSFORM_ANGLE );
break;
case SID_OBJECT_ALIGN_LEFT:
Modified: openoffice/branches/sidebar/main/sc/source/ui/inc/drawsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/inc/drawsh.hxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/inc/drawsh.hxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/inc/drawsh.hxx Mon Mar 11 14:44:39 2013
@@ -81,6 +81,8 @@ public:
ScDrawView* GetDrawView();
sal_Bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark);
+
+ void GetDrawAttrStateForIFBX( SfxItemSet& rSet );
};
Modified: openoffice/branches/sidebar/main/sc/source/ui/view/gridwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/view/gridwin.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/gridwin.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/gridwin.cxx Mon Mar 11 14:44:39 2013
@@ -1903,7 +1903,20 @@ void __EXPORT ScGridWindow::MouseButtonU
}
if (DrawMouseButtonUp(rMEvt)) // includes format paint brush handling for drawing objects
- return;
+ {
+ ScTabViewShell* pViewShell = pViewData->GetViewShell();
+ SfxBindings& rBindings=pViewShell->GetViewFrame()->GetBindings();
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_WIDTH);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_HEIGHT);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ANGLE);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_Y);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOWIDTH);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOHEIGHT);
+ return;
+ }
rMark.SetMarking(sal_False);
@@ -3077,8 +3090,21 @@ void __EXPORT ScGridWindow::KeyInput(con
if (pViewData->GetDocShell()->GetProgress())
return;
- if (DrawKeyInput(rKEvt))
+ if (DrawKeyInput(rKEvt))
+ {
+ const KeyCode& rKeyCode = rKEvt.GetKeyCode();
+ if (rKeyCode.GetCode() == KEY_DOWN
+ || rKeyCode.GetCode() == KEY_UP
+ || rKeyCode.GetCode() == KEY_LEFT
+ || rKeyCode.GetCode() == KEY_RIGHT)
+ {
+ ScTabViewShell* pViewShell = pViewData->GetViewShell();
+ SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
+ }
return;
+ }
if (!pViewData->GetView()->IsDrawSelMode() && !DrawHasMarkedObj()) // keine Eingaben im Zeichenmodus
{ //! DrawShell abfragen !!!
Modified: openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi (original)
+++ openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi Mon Mar 11 14:44:39 2013
@@ -212,21 +212,59 @@ interface DrawView
StateMethod = GetMenuState ;
]
- // use same as SID_ATTR_LINEEND_STYLE
- SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_MIRROR_VERTICAL [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_POS_X [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_POS_Y [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_WIDTH [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_HEIGHT [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_ANGLE [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_ROT_X [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_ROT_Y [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_PROTECT_POS [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_PROTECT_SIZE [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_AUTOWIDTH [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_AUTOHEIGHT [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
- SID_ATTR_TRANSFORM_MATRIX [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_WIDTH // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_HEIGHT // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_POS_X // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_POS_Y // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_ANGLE
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_ROT_X
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_ROT_Y
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_PROTECT_POS
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_PROTECT_SIZE
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_AUTOWIDTH
+ [
+ StateMethod = GetDrawAttrState ;
+ ]
+ SID_ATTR_TRANSFORM_AUTOHEIGHT
+ [
+ StateMethod = GetDrawAttrState ;
+ ]
/// !?
SID_CHAR_DLG // ole : no, status : ?
@@ -1697,11 +1735,21 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+ SID_FLIP_HORIZONTAL
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetMenuState ;
+ ]
SID_VERTICAL // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+ SID_FLIP_VERTICAL
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetMenuState ;
+ ]
SID_ATTR_FILL_SHADOW // ole : no, status : ?
[
ExecMethod = FuTemporary ;
Modified: openoffice/branches/sidebar/main/sd/source/ui/func/futext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/func/futext.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/func/futext.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/func/futext.cxx Mon Mar 11 14:44:39 2013
@@ -106,13 +106,24 @@ static sal_uInt16 SidArray[] = {
SID_ATTR_PARA_LINESPACE_15, // 10035
SID_ATTR_PARA_LINESPACE_20, // 10036
SID_ATTR_PARA_LRSPACE, // 10043
+ SID_ATTR_TRANSFORM_POS_X, // 10088
+ SID_ATTR_TRANSFORM_POS_Y, // 10089
+ SID_ATTR_TRANSFORM_WIDTH, // 10090
+ SID_ATTR_TRANSFORM_HEIGHT,// 10091
+ SID_ATTR_TRANSFORM_ROT_X, // 10093
+ SID_ATTR_TRANSFORM_ROT_Y, // 10094
+ SID_ATTR_TRANSFORM_ANGLE, // 10095 //Added
SID_OUTLINE_UP, // 10150
SID_OUTLINE_DOWN, // 10151
SID_OUTLINE_LEFT, // 10152
SID_OUTLINE_RIGHT, // 10153
+ SID_ATTR_TRANSFORM_PROTECT_POS,// 10236
+ SID_ATTR_TRANSFORM_PROTECT_SIZE,// 10237 //Added
SID_FORMTEXT_STYLE, // 10257
SID_SET_SUPER_SCRIPT, // 10294
SID_SET_SUB_SCRIPT, // 10295
+ SID_ATTR_TRANSFORM_AUTOWIDTH,// 10310
+ SID_ATTR_TRANSFORM_AUTOHEIGHT,// 10311 //Added
SID_HYPERLINK_GETLINK, // 10361
SID_CHARMAP, // 10503
SID_TEXTDIRECTION_LEFT_TO_RIGHT, // 10907
Modified: openoffice/branches/sidebar/main/sd/source/ui/inc/DrawViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/inc/DrawViewShell.hxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/inc/DrawViewShell.hxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/inc/DrawViewShell.hxx Mon Mar 11 14:44:39 2013
@@ -164,6 +164,7 @@ public:
void ExecCtrl(SfxRequest& rReq);
void GetCtrlState(SfxItemSet& rSet);
+ void GetDrawAttrState(SfxItemSet& rSet);
void GetMenuState(SfxItemSet& rSet);
void GetTableMenuState(SfxItemSet& rSet);
/** Set the items of the given item set that are related to
Modified: openoffice/branches/sidebar/main/sd/source/ui/view/drviews7.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/view/drviews7.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/drviews7.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/drviews7.cxx Mon Mar 11 14:44:39 2013
@@ -206,6 +206,20 @@ IMPL_LINK( DrawViewShell, ClipboardChang
return 0;
}
+
+
+
+void DrawViewShell::GetDrawAttrState(SfxItemSet& rSet)
+{
+ const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
+
+ SfxItemSet aSet( mpDrawView->GetGeoAttrFromMarked() );
+ rSet.Put(aSet,sal_False);
+}
+
+
+
+
/*************************************************************************
|*
|* Status (Enabled/Disabled) von Menue-SfxSlots setzen
@@ -512,6 +526,8 @@ void DrawViewShell::GetMenuState( SfxIte
{
rSet.DisableItem( SID_HORIZONTAL );
rSet.DisableItem( SID_VERTICAL );
+ rSet.DisableItem( SID_FLIP_HORIZONTAL );
+ rSet.DisableItem( SID_FLIP_VERTICAL );
}
if( !mpDrawView->IsMirrorAllowed() )
Modified: openoffice/branches/sidebar/main/sd/source/ui/view/drviewsc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/view/drviewsc.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/drviewsc.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/drviewsc.cxx Mon Mar 11 14:44:39 2013
@@ -472,14 +472,16 @@ void DrawViewShell::FuTemp03(SfxRequest&
break;
case SID_HORIZONTAL: // BASIC
+ case SID_FLIP_HORIZONTAL:
{
- mpDrawView->MirrorAllMarkedHorizontal();
+ mpDrawView->MirrorAllMarkedHorizontal();
Cancel();
rReq.Done ();
}
break;
case SID_VERTICAL: // BASIC
+ case SID_FLIP_VERTICAL:
{
mpDrawView->MirrorAllMarkedVertical();
Cancel();
Modified: openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx Mon Mar 11 14:44:39 2013
@@ -538,6 +538,8 @@ void DrawViewShell::GetMenuStateSel( Sfx
rSet.DisableItem( SID_COPYOBJECTS );
rSet.DisableItem( SID_HORIZONTAL );
rSet.DisableItem( SID_VERTICAL );
+ rSet.DisableItem( SID_FLIP_HORIZONTAL );
+ rSet.DisableItem( SID_FLIP_VERTICAL );
rSet.DisableItem( SID_GROUP );
rSet.DisableItem( SID_UNGROUP );
rSet.DisableItem( SID_NAME_GROUP );
Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarToolBox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarToolBox.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarToolBox.cxx (original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarToolBox.cxx Mon Mar 11 14:44:39 2013
@@ -88,10 +88,6 @@ void SidebarToolBox::Paint (const Rectan
{
ToolBox::Paint(rRect);
- OSL_TRACE("paint ToolBox at %d,%d",
- GetPosPixel().X(),
- GetPosPixel().Y());
-
if (Theme::GetBoolean(Theme::Bool_UseToolBoxItemSeparator))
{
const sal_Int32 nSeparatorY ((GetSizePixel().Height() - maItemSeparator.GetSizePixel().Height())/2);
Modified: openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk (original)
+++ openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk Mon Mar 11 14:44:39 2013
@@ -80,7 +80,7 @@ $(eval $(call gb_SrsTarget_add_files,svx
svx/source/sidebar/area/AreaPropertyPanel.src \
svx/source/sidebar/graphic/GraphicPropertyPanel.src \
svx/source/sidebar/line/LinePropertyPanel.src \
- svx/source/sidebar/transform/TransformationPropertyPanel.src \
+ svx/source/sidebar/possize/PosSizePropertyPanel.src \
svx/source/sidebar/text/TextPropertyPanel.src \
svx/source/stbctrls/stbctrls.src \
svx/source/svdraw/svdstr.src \
Modified: openoffice/branches/sidebar/main/svx/Library_svx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/Library_svx.mk?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/Library_svx.mk (original)
+++ openoffice/branches/sidebar/main/svx/Library_svx.mk Mon Mar 11 14:44:39 2013
@@ -185,7 +185,9 @@ $(eval $(call gb_Library_add_exception_o
svx/source/sidebar/line/LineWidthControl \
svx/source/sidebar/line/LineWidthValueSet \
svx/source/sidebar/line/LineWidthPopup \
- svx/source/sidebar/transform/TransformationPropertyPanel \
+ svx/source/sidebar/possize/PosSizePropertyPanel \
+ svx/source/sidebar/possize/SidebarDialControl \
+ svx/source/sidebar/possize/SidebarDialControlBmp \
svx/source/sidebar/tools/ColorControl \
svx/source/sidebar/tools/ColorPopup \
svx/source/sidebar/tools/PopupControl \
Modified: openoffice/branches/sidebar/main/svx/inc/svx/dialcontrol.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/dialcontrol.hxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/dialcontrol.hxx (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/dialcontrol.hxx Mon Mar 11 14:44:39 2013
@@ -29,13 +29,42 @@
#include <sfx2/itemconnect.hxx>
#include "svx/svxdllapi.h"
+#include <boost/scoped_ptr.hpp>
+
class NumericField;
namespace svx {
// ============================================================================
-struct DialControl_Impl;
+class DialControlBmp : public VirtualDevice
+{
+public:
+ explicit DialControlBmp( Window& rParent );
+
+ void InitBitmap( const Size& rSize, const Font& rFont );
+ void CopyBackground( const DialControlBmp& rSrc );
+ void DrawBackground( const Size& rSize, bool bEnabled );
+ virtual void DrawBackground();
+ virtual void DrawElements( const String& rText, sal_Int32 nAngle );
+
+protected:
+ Rectangle maRect;
+ bool mbEnabled;
+
+private:
+ const Color& GetBackgroundColor() const;
+ const Color& GetTextColor() const;
+ const Color& GetScaleLineColor() const;
+ const Color& GetButtonLineColor() const;
+ const Color& GetButtonFillColor( bool bMain ) const;
+
+ void Init( const Size& rSize );
+
+ Window& mrParent;
+ long mnCenterX;
+ long mnCenterY;
+};
/** This control allows to input a rotation angle, visualized by a dial.
@@ -90,20 +119,42 @@ public:
/** Returns the current modify handler. */
const Link& GetModifyHdl() const;
-private:
+protected:
+ struct DialControl_Impl
+ {
+ ::boost::scoped_ptr<DialControlBmp> mpBmpEnabled;
+ ::boost::scoped_ptr<DialControlBmp> mpBmpDisabled;
+ ::boost::scoped_ptr<DialControlBmp> mpBmpBuffered;
+ Link maModifyHdl;
+ NumericField* mpLinkField;
+ Size maWinSize;
+ Font maWinFont;
+ sal_Int32 mnAngle;
+ sal_Int32 mnOldAngle;
+ long mnCenterX;
+ long mnCenterY;
+ bool mbNoRot;
+
+ explicit DialControl_Impl( Window& rParent );
+ void Init( const Size& rWinSize, const Font& rWinFont );
+ };
+ std::auto_ptr< DialControl_Impl > mpImpl;
+
+ virtual void HandleMouseEvent( const Point& rPos, bool bInitial );
+ virtual void HandleEscapeEvent();
+
+ void SetRotation( sal_Int32 nAngle, bool bBroadcast );
+
void Init( const Size& rWinSize, const Font& rWinFont );
void Init( const Size& rWinSize );
+
+private:
void InvalidateControl();
- void ImplSetRotation( sal_Int32 nAngle, bool bBroadcast );
void ImplSetFieldLink( const Link& rLink );
- void HandleMouseEvent( const Point& rPos, bool bInitial );
- void HandleEscapeEvent();
DECL_LINK( LinkedFieldModifyHdl, NumericField* );
-
- std::auto_ptr< DialControl_Impl > mpImpl;
};
// ============================================================================
Modified: openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc Mon Mar 11 14:44:39 2013
@@ -392,7 +392,7 @@
#define RID_POPUPPANEL_LINEPAGE_STYLE (RID_SVX_START + 297)
#define RID_POPUPPANEL_LINEPAGE_WIDTH (RID_SVX_START + 298)
-#define RID_SIDEBAR_TRANSFORMATION_PANEL (RID_SVX_START + 299)
+#define RID_SIDEBAR_POSSIZE_PANEL (RID_SVX_START + 299)
#define RID_SIDEBAR_GRAPHIC_PANEL (RID_SVX_START + 300)
// !!! please update RID_SVX_FIRSTFREE !!! see line 46
Modified: openoffice/branches/sidebar/main/svx/inc/svx/svdedtv.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/svdedtv.hxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/svdedtv.hxx (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/svdedtv.hxx Mon Mar 11 14:44:39 2013
@@ -243,6 +243,7 @@ public:
void SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy=sal_False);
void MoveMarkedObj(const Size& rSiz, bool bCopy=false);
void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
+ void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bCopy, const bool bWdh, const bool bHgt);
long GetMarkedObjRotate() const;
void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false);
void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false);
Modified: openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc Mon Mar 11 14:44:39 2013
@@ -1264,8 +1264,8 @@
#define SID_ATTR_FILL_TRANSPARENCE (SID_SVX_START+1105)
#define SID_ATTR_FILL_FLOATTRANSPARENCE (SID_SVX_START+1106)
#define SID_ATTR_LINE_TRANSPARENCE (SID_SVX_START+1107)
-#define SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL (SID_SVX_START+1108)
-#define SID_ATTR_TRANSFORM_MIRROR_VERTICAL (SID_SVX_START+1109)
+#define SID_FLIP_HORIZONTAL (SID_SVX_START+1108)
+#define SID_FLIP_VERTICAL (SID_SVX_START+1109)
#define SID_ATTR_LINE_JOINT (SID_SVX_START+1110)
#define SID_ATTR_LINE_CAP (SID_SVX_START+1111)
#define SID_ATTR_TRANSFORM_MATRIX (SID_SVX_START+1112)
Modified: openoffice/branches/sidebar/main/svx/sdi/svx.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/sdi/svx.sdi?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/sdi/svx.sdi (original)
+++ openoffice/branches/sidebar/main/svx/sdi/svx.sdi Mon Mar 11 14:44:39 2013
@@ -15215,57 +15215,6 @@ SfxUInt16Item LineTransparence SID_ATTR_
//--------------------------------------------------------------------------
-SfxBoolItem MirrorObjectHorizontal SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
-]
-
-//--------------------------------------------------------------------------
-
-SfxBoolItem MirrorObjectVertical SID_ATTR_TRANSFORM_MIRROR_VERTICAL
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
-]
//--------------------------------------------------------------------------
@@ -15610,7 +15559,7 @@ SfxBoolItem ProtectSize SID_ATTR_TRANSFO
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
+SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -15631,13 +15580,40 @@ SfxBoolItem SvxAutoWidth SID_ATTR_TRANSF
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_SPECIAL;
+ ToolBoxConfig = TRUE,
+ GroupId = GID_EDIT;
]
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
+SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_EDIT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
[
/* flags: */
AutoUpdate = TRUE,
@@ -15664,7 +15640,7 @@ SfxBoolItem SvxAutoHeight SID_ATTR_TRANS
//--------------------------------------------------------------------------
-AffineMatrixItem SvxTransFormMatrix SID_ATTR_TRANSFORM_MATRIX
+SfxBoolItem SvxAutoHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
[
/* flags: */
AutoUpdate = TRUE,
Modified: openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi (original)
+++ openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi Mon Mar 11 14:44:39 2013
@@ -182,18 +182,4 @@ item INT32 XFormTextShadowYValItem; // S
item XFillGradient XFillFloatTransparenceItem; // XFillGradient
-struct AffineMatrix2D
-{
-// com::sun::star::geometry::AffineMatrix2D
-// found no way to define doubles in *.sdi, so commenting out for now
-
-// double m00 MID_AFFINEMATRIX2D_M00;
-// double m01 MID_AFFINEMATRIX2D_M01;
-// double m02 MID_AFFINEMATRIX2D_M02;
-// double m10 MID_AFFINEMATRIX2D_M10;
-// double m11 MID_AFFINEMATRIX2D_M11;
-// double m12 MID_AFFINEMATRIX2D_M12;
-};
-item AffineMatrix2D AffineMatrixItem;
-
// eof
Modified: openoffice/branches/sidebar/main/svx/source/dialog/dialcontrol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/dialog/dialcontrol.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/dialog/dialcontrol.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/dialog/dialcontrol.cxx Mon Mar 11 14:44:39 2013
@@ -24,7 +24,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
#include "svx/dialcontrol.hxx"
-
+#include "bmpmask.hrc"
+#include <svx/dialmgr.hxx>
+#include <tools/rcid.h>
#include <math.h>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
@@ -40,39 +42,13 @@ const long DIAL_OUTER_WIDTH = 8;
// ============================================================================
-class DialControlBmp : public VirtualDevice
-{
-public:
- explicit DialControlBmp( Window& rParent );
-
- void InitBitmap( const Size& rSize, const Font& rFont );
- void CopyBackground( const DialControlBmp& rSrc );
- void DrawBackground( const Size& rSize, bool bEnabled );
- void DrawElements( const String& rText, sal_Int32 nAngle );
-
-private:
- const Color& GetBackgroundColor() const;
- const Color& GetTextColor() const;
- const Color& GetScaleLineColor() const;
- const Color& GetButtonLineColor() const;
- const Color& GetButtonFillColor( bool bMain ) const;
-
- void Init( const Size& rSize );
- void DrawBackground();
-
- Window& mrParent;
- Rectangle maRect;
- long mnCenterX;
- long mnCenterY;
- bool mbEnabled;
-};
// ----------------------------------------------------------------------------
DialControlBmp::DialControlBmp( Window& rParent ) :
VirtualDevice( rParent, 0, 0 ),
- mrParent( rParent ),
- mbEnabled( true )
+ mbEnabled( true ),
+ mrParent( rParent )
{
EnableRTL( sal_False );
}
@@ -232,40 +208,23 @@ void DialControlBmp::DrawBackground()
maRect.Right() - DIAL_OUTER_WIDTH, maRect.Bottom() - DIAL_OUTER_WIDTH ) );
}
-// ============================================================================
-struct DialControl_Impl
-{
- DialControlBmp maBmpEnabled;
- DialControlBmp maBmpDisabled;
- DialControlBmp maBmpBuffered;
- Link maModifyHdl;
- NumericField* mpLinkField;
- Size maWinSize;
- Font maWinFont;
- sal_Int32 mnAngle;
- sal_Int32 mnOldAngle;
- long mnCenterX;
- long mnCenterY;
- bool mbNoRot;
-
- explicit DialControl_Impl( Window& rParent );
- void Init( const Size& rWinSize, const Font& rWinFont );
-};
+
// ----------------------------------------------------------------------------
-DialControl_Impl::DialControl_Impl( Window& rParent ) :
- maBmpEnabled( rParent ),
- maBmpDisabled( rParent ),
- maBmpBuffered( rParent ),
+DialControl::DialControl_Impl::DialControl_Impl (
+ Window& rParent ) :
+ mpBmpEnabled(new DialControlBmp(rParent)),
+ mpBmpDisabled(new DialControlBmp(rParent)),
+ mpBmpBuffered(new DialControlBmp(rParent)),
mpLinkField( 0 ),
mnAngle( 0 ),
mbNoRot( false )
{
}
-void DialControl_Impl::Init( const Size& rWinSize, const Font& rWinFont )
+void DialControl::DialControl_Impl::Init( const Size& rWinSize, const Font& rWinFont )
{
// "(x - 1) | 1" creates odd value <= x, to have a well-defined center pixel position
maWinSize = Size( (rWinSize.Width() - 1) | 1, (rWinSize.Height() - 1) | 1 );
@@ -275,9 +234,9 @@ void DialControl_Impl::Init( const Size&
mnCenterY = maWinSize.Height() / 2;
maWinFont.SetTransparent( sal_True );
- maBmpEnabled.DrawBackground( maWinSize, true );
- maBmpDisabled.DrawBackground( maWinSize, false );
- maBmpBuffered.InitBitmap( maWinSize, maWinFont );
+ mpBmpEnabled->DrawBackground( maWinSize, true );
+ mpBmpDisabled->DrawBackground( maWinSize, false );
+ mpBmpBuffered->InitBitmap( maWinSize, maWinFont );
}
// ============================================================================
@@ -313,7 +272,7 @@ DialControl::~DialControl()
void DialControl::Paint( const Rectangle& )
{
Point aPos;
- DrawBitmapEx( aPos, mpImpl->maBmpBuffered.GetBitmapEx( aPos, mpImpl->maWinSize ) );
+ DrawBitmapEx( aPos, mpImpl->mpBmpBuffered->GetBitmapEx( aPos, mpImpl->maWinSize ) );
}
void DialControl::StateChanged( StateChangedType nStateChange )
@@ -414,7 +373,7 @@ sal_Int32 DialControl::GetRotation() con
void DialControl::SetRotation( sal_Int32 nAngle )
{
- ImplSetRotation( nAngle, false );
+ SetRotation( nAngle, false );
}
void DialControl::SetLinkedField( NumericField* pField )
@@ -461,13 +420,13 @@ void DialControl::Init( const Size& rWin
void DialControl::InvalidateControl()
{
- mpImpl->maBmpBuffered.CopyBackground( IsEnabled() ? mpImpl->maBmpEnabled : mpImpl->maBmpDisabled );
+ mpImpl->mpBmpBuffered->CopyBackground( IsEnabled() ? *mpImpl->mpBmpEnabled : *mpImpl->mpBmpDisabled );
if( !mpImpl->mbNoRot )
- mpImpl->maBmpBuffered.DrawElements( GetText(), mpImpl->mnAngle );
+ mpImpl->mpBmpBuffered->DrawElements( GetText(), mpImpl->mnAngle );
Invalidate();
}
-void DialControl::ImplSetRotation( sal_Int32 nAngle, bool bBroadcast )
+void DialControl::SetRotation( sal_Int32 nAngle, bool bBroadcast )
{
bool bOldSel = mpImpl->mbNoRot;
mpImpl->mbNoRot = false;
@@ -512,7 +471,7 @@ void DialControl::HandleMouseEvent( cons
nAngle = 36000 - nAngle;
if( bInitial ) // round to entire 15 degrees
nAngle = ((nAngle + 750) / 1500) * 1500;
- ImplSetRotation( nAngle, true );
+ SetRotation( nAngle, true );
}
}
@@ -521,7 +480,7 @@ void DialControl::HandleEscapeEvent()
if( IsMouseCaptured() )
{
ReleaseMouse();
- ImplSetRotation( mpImpl->mnOldAngle, true );
+ SetRotation( mpImpl->mnOldAngle, true );
if( mpImpl->mpLinkField )
mpImpl->mpLinkField->GrabFocus();
}
@@ -530,7 +489,7 @@ void DialControl::HandleEscapeEvent()
IMPL_LINK( DialControl, LinkedFieldModifyHdl, NumericField*, pField )
{
if( pField )
- ImplSetRotation( static_cast< sal_Int32 >( pField->GetValue() * 100 ), false );
+ SetRotation( static_cast< sal_Int32 >( pField->GetValue() * 100 ), false );
return 0;
}
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx Mon Mar 11 14:44:39 2013
@@ -25,7 +25,7 @@
#include "area/AreaPropertyPanel.hxx"
#include "graphic/GraphicPropertyPanel.hxx"
#include "line/LinePropertyPanel.hxx"
-#include "transform/TransformationPropertyPanel.hxx"
+#include "possize/PosSizePropertyPanel.hxx"
#include "gallery/GalleryControl.hxx"
#include "ColorPanel.hxx"
#include <sfx2/sidebar/SidebarPanelBase.hxx>
@@ -169,14 +169,14 @@ Reference<ui::XUIElement> SAL_CALL Panel
::boost::bind(&LinePropertyPanel::ShowMenu, pPanel),
ui::LayoutSize(-1,-1,-1));
}
- else if (DoesResourceEndWith("/TransformationPropertyPanel"))
+ else if (DoesResourceEndWith("/PosSizePropertyPanel"))
{
- TransformationPropertyPanel* pPanel = TransformationPropertyPanel::Create(pParentWindow, xFrame, pBindings);
+ PosSizePropertyPanel* pPanel = PosSizePropertyPanel::Create(pParentWindow, xFrame, pBindings);
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
pPanel,
- ::boost::bind(&TransformationPropertyPanel::ShowMenu, pPanel),
+ ::boost::bind(&PosSizePropertyPanel::ShowMenu, pPanel),
ui::LayoutSize(-1,-1,-1));
}
else if (DoesResourceEndWith("/GalleryPanel"))
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx?rev=1455165&r1=1455164&r2=1455165&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx Mon Mar 11 14:44:39 2013
@@ -64,82 +64,79 @@ const sal_Int32 AreaPropertyPanel::DEFAU
const sal_Int32 AreaPropertyPanel::DEFAULT_BORDER = 0;
-
AreaPropertyPanel::AreaPropertyPanel(
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
-: Control(
- pParent,
- SVX_RES(RID_SIDEBAR_AREA_PANEL)),
- meLastXFS(-1),
- maLastColor(Color(COL_DEFAULT_SHAPE_FILLING)),
- mnLastPosGradient(0),
- mnLastPosHatch(0),
- mnLastPosBitmap(0),
- mnLastTransSolid(50),
- maGradientLinear(),
- maGradientAxial(),
- maGradientRadial(),
- maGradientElliptical(),
- maGradientSquare(),
- maGradientRect(),
- mpColorTextFT(new FixedText(this, SVX_RES(FT_COLOR_LIST))),
- mpLbFillType(new SvxFillTypeBox(this)),
- mpLbFillAttr(new SvxFillAttrBox(this)),
- mpToolBoxColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpToolBoxColorBackground.get(), SVX_RES(TB_COLOR))),
- mpTrspTextFT(new FixedText(this, SVX_RES(FL_TRSP_TEXT))),
- mpLBTransType(new ListBox(this, SVX_RES(LB_TRGR_TYPES))),
- mpMTRTransparent(new MetricField(this, SVX_RES(MTR_TRANSPARENT))),
- mpBTNGradientBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpBTNGradient(sfx2::sidebar::ControlFactory::CreateToolBox(mpBTNGradientBackground.get(), SVX_RES(BTN_GRADIENT))),
- mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, TBI_COLOR, mpToolBoxColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)),
- mpStyleItem(),
- mpColorItem(),
- mpFillGradientItem(),
- mpHatchItem(),
- mpBitmapItem(),
- mpColorTableItem(),
- mpGradientListItem(),
- mpHatchListItem(),
- mpBitmapListItem(),
- maStyleControl(SID_ATTR_FILL_STYLE, *pBindings, *this),
- maColorControl(SID_ATTR_FILL_COLOR, *pBindings, *this),
- maGradientControl(SID_ATTR_FILL_GRADIENT, *pBindings, *this),
- maHatchControl(SID_ATTR_FILL_HATCH, *pBindings, *this),
- maBitmapControl(SID_ATTR_FILL_BITMAP, *pBindings, *this),
- maColorTableControl(SID_COLOR_TABLE, *pBindings, *this),
- maGradientListControl(SID_GRADIENT_LIST, *pBindings, *this),
- maHatchListControl(SID_HATCH_LIST, *pBindings, *this),
- maBitmapListControl(SID_BITMAP_LIST, *pBindings, *this),
- maFillTransparenceController(SID_ATTR_FILL_TRANSPARENCE, *pBindings, *this),
- maFillFloatTransparenceController(SID_ATTR_FILL_FLOATTRANSPARENCE, *pBindings, *this),
- maImgAxial(SVX_RES(IMG_AXIAL)),
- maImgElli(SVX_RES(IMG_ELLI)),
- maImgQuad(SVX_RES(IMG_QUAD)),
- maImgRadial(SVX_RES(IMG_RADIAL)),
- maImgSquare(SVX_RES(IMG_SQUARE)),
- maImgLinear(SVX_RES(IMG_LINEAR)),
- maImgColor(SVX_RES(IMG_COLOR)),
- maImgAxialH(SVX_RES(IMG_AXIAL_H)),
- maImgElliH(SVX_RES(IMG_ELLI_H)),
- maImgQuadH(SVX_RES(IMG_QUAD_H)),
- maImgRadialH(SVX_RES(IMG_RADIAL_H)),
- maImgSquareH(SVX_RES(IMG_SQUARE_H)),
- maImgLinearH(SVX_RES(IMG_LINEAR_H)),
- maImgColorH(SVX_RES(IMG_COLOR_H)),
- msHelpFillType(SVX_RES(STR_HELP_TYPE)),
- msHelpFillAttr(SVX_RES(STR_HELP_ATTR)),
- maTrGrPopup(this, ::boost::bind(&AreaPropertyPanel::CreateTransparencyGradientControl, this, _1)),
- maColorPopup(this, ::boost::bind(&AreaPropertyPanel::CreateColorPopupControl, this, _1)),
- mpFloatTransparenceItem(),
- mpTransparanceItem(),
- mxFrame(rxFrame),
- maContext(),
- mpBindings(pBindings),
- mbTBShow(true),
- mbColorAvail(true)
+ : Control(pParent, SVX_RES(RID_SIDEBAR_AREA_PANEL)),
+ meLastXFS(-1),
+ maLastColor(Color(COL_DEFAULT_SHAPE_FILLING)),
+ mnLastPosGradient(0),
+ mnLastPosHatch(0),
+ mnLastPosBitmap(0),
+ mnLastTransSolid(50),
+ maGradientLinear(),
+ maGradientAxial(),
+ maGradientRadial(),
+ maGradientElliptical(),
+ maGradientSquare(),
+ maGradientRect(),
+ mpColorTextFT(new FixedText(this, SVX_RES(FT_COLOR_LIST))),
+ mpLbFillType(new SvxFillTypeBox(this)),
+ mpLbFillAttr(new SvxFillAttrBox(this)),
+ mpToolBoxColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+ mpToolBoxColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpToolBoxColorBackground.get(), SVX_RES(TB_COLOR))),
+ mpTrspTextFT(new FixedText(this, SVX_RES(FL_TRSP_TEXT))),
+ mpLBTransType(new ListBox(this, SVX_RES(LB_TRGR_TYPES))),
+ mpMTRTransparent(new MetricField(this, SVX_RES(MTR_TRANSPARENT))),
+ mpBTNGradientBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+ mpBTNGradient(sfx2::sidebar::ControlFactory::CreateToolBox(mpBTNGradientBackground.get(), SVX_RES(BTN_GRADIENT))),
+ mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, TBI_COLOR, mpToolBoxColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)),
+ mpStyleItem(),
+ mpColorItem(),
+ mpFillGradientItem(),
+ mpHatchItem(),
+ mpBitmapItem(),
+ mpColorTableItem(),
+ mpGradientListItem(),
+ mpHatchListItem(),
+ mpBitmapListItem(),
+ maStyleControl(SID_ATTR_FILL_STYLE, *pBindings, *this),
+ maColorControl(SID_ATTR_FILL_COLOR, *pBindings, *this),
+ maGradientControl(SID_ATTR_FILL_GRADIENT, *pBindings, *this),
+ maHatchControl(SID_ATTR_FILL_HATCH, *pBindings, *this),
+ maBitmapControl(SID_ATTR_FILL_BITMAP, *pBindings, *this),
+ maColorTableControl(SID_COLOR_TABLE, *pBindings, *this),
+ maGradientListControl(SID_GRADIENT_LIST, *pBindings, *this),
+ maHatchListControl(SID_HATCH_LIST, *pBindings, *this),
+ maBitmapListControl(SID_BITMAP_LIST, *pBindings, *this),
+ maFillTransparenceController(SID_ATTR_FILL_TRANSPARENCE, *pBindings, *this),
+ maFillFloatTransparenceController(SID_ATTR_FILL_FLOATTRANSPARENCE, *pBindings, *this),
+ maImgAxial(SVX_RES(IMG_AXIAL)),
+ maImgElli(SVX_RES(IMG_ELLI)),
+ maImgQuad(SVX_RES(IMG_QUAD)),
+ maImgRadial(SVX_RES(IMG_RADIAL)),
+ maImgSquare(SVX_RES(IMG_SQUARE)),
+ maImgLinear(SVX_RES(IMG_LINEAR)),
+ maImgColor(SVX_RES(IMG_COLOR)),
+ maImgAxialH(SVX_RES(IMG_AXIAL_H)),
+ maImgElliH(SVX_RES(IMG_ELLI_H)),
+ maImgQuadH(SVX_RES(IMG_QUAD_H)),
+ maImgRadialH(SVX_RES(IMG_RADIAL_H)),
+ maImgSquareH(SVX_RES(IMG_SQUARE_H)),
+ maImgLinearH(SVX_RES(IMG_LINEAR_H)),
+ maImgColorH(SVX_RES(IMG_COLOR_H)),
+ msHelpFillType(SVX_RES(STR_HELP_TYPE)),
+ msHelpFillAttr(SVX_RES(STR_HELP_ATTR)),
+ maTrGrPopup(this, ::boost::bind(&AreaPropertyPanel::CreateTransparencyGradientControl, this, _1)),
+ maColorPopup(this, ::boost::bind(&AreaPropertyPanel::CreateColorPopupControl, this, _1)),
+ mpFloatTransparenceItem(),
+ mpTransparanceItem(),
+ mxFrame(rxFrame),
+ maContext(),
+ mpBindings(pBindings),
+ mbTBShow(true),
+ mbColorAvail(true)
{
Initialize();
FreeResource();