Author: zhengfan
Date: Tue Mar 26 04:12:36 2013
New Revision: 1460967
URL: http://svn.apache.org/r1460967
Log:
i121798: For implementation of Text Properties Panel, in AOO Sidebar branch.
Modified:
openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi
openoffice/branches/sidebar/main/sc/sdi/drtxtob.sdi
openoffice/branches/sidebar/main/sc/sdi/editsh.sdi
openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob.cxx
openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob1.cxx
openoffice/branches/sidebar/main/sc/source/ui/inc/drtxtob.hxx
openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx
openoffice/branches/sidebar/main/sc/source/ui/view/editsh.cxx
Modified: openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi?rev=1460967&r1=1460966&r2=1460967&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi Tue Mar 26 04:12:36 2013
@@ -89,6 +89,7 @@ interface CellSelection
SID_SELECT_SCENARIO [ ExecMethod = ExecuteEdit; StateMethod
= GetState; ]
FID_CELL_FORMAT [ ExecMethod = Execute; StateMethod =
GetBlockState; ]
SID_ENABLE_HYPHENATION [ ExecMethod = Execute; StateMethod =
GetBlockState; ]
+ SID_CHAR_DLG_EFFECT [ ExecMethod = Execute;]
FID_ROW_HEIGHT [ ExecMethod = Execute; StateMethod =
GetState; ]
FID_ROW_OPT_HEIGHT [ ExecMethod = Execute; StateMethod =
GetState; ]
FID_ROW_HIDE [ ExecMethod = Execute; StateMethod =
GetState; ]
Modified: openoffice/branches/sidebar/main/sc/sdi/drtxtob.sdi
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/sdi/drtxtob.sdi?rev=1460967&r1=1460966&r2=1460967&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/drtxtob.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/drtxtob.sdi Tue Mar 26 04:12:36 2013
@@ -89,6 +89,7 @@ interface TableDrawText
SID_SET_SUPER_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod
= GetAttrState; Export = FALSE; ]
SID_SET_SUB_SCRIPT [ ExecMethod = ExecuteAttr;
StateMethod = GetAttrState; Export = FALSE; ]
SID_CHAR_DLG [ ExecMethod = ExecuteAttr;
StateMethod = GetAttrState; Export = FALSE; ]
+ SID_CHAR_DLG_EFFECT [ ExecMethod = ExecuteAttr;
StateMethod = GetAttrState; Export = FALSE; ]
SID_PARA_DLG [ ExecMethod = ExecuteAttr;
StateMethod = GetAttrState; Export = FALSE; ]
// ---- FontWork:
SID_FONTWORK [ ExecMethod = ExecuteExtra; StateMethod = GetState;
Export = FALSE; ]
Modified: openoffice/branches/sidebar/main/sc/sdi/editsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/sdi/editsh.sdi?rev=1460967&r1=1460966&r2=1460967&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/editsh.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/editsh.sdi Tue Mar 26 04:12:36 2013
@@ -71,6 +71,7 @@ interface TableText
SID_SET_SUB_SCRIPT [ ExecMethod = ExecuteAttr;
StateMethod = GetAttrState; Export = FALSE; ]
SID_CELL_FORMAT_RESET [ ExecMethod = Execute; StateMethod = GetState;
Export = FALSE; ]
SID_CHAR_DLG [ ExecMethod = Execute; StateMethod =
GetState; Export = FALSE; ]
+ SID_CHAR_DLG_EFFECT [ ExecMethod = Execute; StateMethod =
GetState; Export = FALSE; ]
SID_TOGGLE_REL [ ExecMethod = Execute; StateMethod =
GetState; Export = FALSE; ]
SID_HYPERLINK_SETLINK [ ExecMethod = Execute; Export = FALSE; ]
Modified: openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob.cxx?rev=1460967&r1=1460966&r2=1460967&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob.cxx
(original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob.cxx Tue Mar
26 04:12:36 2013
@@ -733,10 +733,11 @@ void __EXPORT ScDrawTextObjectBar::Execu
}
break;
+ case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
// Dialog-Button
case SID_ATTR_CHAR_FONT:
// Controller nicht angezeigt
case SID_ATTR_CHAR_FONTHEIGHT:
- bDone = ExecuteCharDlg( aEditAttr, aNewAttr );
+ bDone = ExecuteCharDlg( aEditAttr, aNewAttr ,
nSlot);
break;
case SID_PARA_DLG:
Modified: openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob1.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob1.cxx?rev=1460967&r1=1460966&r2=1460967&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob1.cxx
(original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob1.cxx Tue Mar
26 04:12:36 2013
@@ -53,7 +53,7 @@
//------------------------------------------------------------------------
sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
-
SfxItemSet& rOutSet )
+
SfxItemSet& rOutSet , sal_uInt16 nSlot)
{
//CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(),
//CHINA001 &rArgs,
@@ -65,6 +65,10 @@ sal_Bool ScDrawTextObjectBar::ExecuteCha
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg(
pViewData->GetDialogParent(), &rArgs,
pViewData->GetSfxDocShell(),RID_SCDLG_CHAR );
DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ if (nSlot == SID_CHAR_DLG_EFFECT)
+ {
+ pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ }
sal_Bool bRet = ( pDlg->Execute() == RET_OK );
if ( bRet )
Modified: openoffice/branches/sidebar/main/sc/source/ui/inc/drtxtob.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/inc/drtxtob.hxx?rev=1460967&r1=1460966&r2=1460967&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/inc/drtxtob.hxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/inc/drtxtob.hxx Tue Mar 26
04:12:36 2013
@@ -65,7 +65,7 @@ public:
void GetAttrState( SfxItemSet& rSet );
void ExecuteToggle( SfxRequest &rReq );
- sal_Bool ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
+ sal_Bool ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet ,
sal_uInt16 nSlot);
sal_Bool ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
void ExecuteExtra( SfxRequest &rReq );
Modified: openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx?rev=1460967&r1=1460966&r2=1460967&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx Tue Mar 26
04:12:36 2013
@@ -360,6 +360,10 @@ void ScCellShell::Execute( SfxRequest& r
pTabViewShell->ExecuteCellFormatDlg( rReq, TP_ALIGNMENT
);
break;
+ case SID_CHAR_DLG_EFFECT:
+ pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONTEFF );
+ break;
+
case SID_OPENDLG_SOLVE:
{
sal_uInt16 nId =
ScSolverDlgWrapper::GetChildWindowId();
Modified: openoffice/branches/sidebar/main/sc/source/ui/view/editsh.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/view/editsh.cxx?rev=1460967&r1=1460966&r2=1460967&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/editsh.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/editsh.cxx Tue Mar 26
04:12:36 2013
@@ -455,6 +455,7 @@ void ScEditShell::Execute( SfxRequest& r
}
break;
+ case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
{
SfxItemSet aAttrs( pTableView->GetAttribs() );
@@ -468,6 +469,10 @@ void ScEditShell::Execute( SfxRequest& r
SfxAbstractTabDialog* pDlg =
pFact->CreateScCharDlg( pViewData->GetDialogParent(), &aAttrs,
pObjSh, RID_SCDLG_CHAR
);
DBG_ASSERT(pDlg, "Dialog create
fail!");//CHINA001
+ if (nSlot == SID_CHAR_DLG_EFFECT)
+ {
+
pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ }
short nRet = pDlg->Execute();
// pDlg is needed below
