Author: zhengfan
Date: Tue Mar 26 04:13:35 2013
New Revision: 1460969
URL: http://svn.apache.org/r1460969
Log:
i121798: For implementation of Text Properties Panel, in AOO Sidebar branch.
Modified:
openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi
openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi
openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi
openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx
openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx
openoffice/branches/sidebar/main/sw/source/ui/shells/textsh1.cxx
Modified: openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi?rev=1460969&r1=1460968&r2=1460969&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi Tue Mar 26 04:13:35
2013
@@ -206,6 +206,13 @@ interface _Annotation
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
+ SID_CHAR_DLG_EFFECT
+ [
+ ExecMethod = Exec ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
SID_ATTR_CHAR_WEIGHT // api:
[
Modified: openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi?rev=1460969&r1=1460968&r2=1460969&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi Tue Mar 26 04:13:35 2013
@@ -1446,6 +1446,12 @@ interface BaseText
ExecMethod = Execute ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
+ SID_CHAR_DLG_EFFECT
+ [
+ ExecMethod = Execute ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
SID_CHAR_DLG_FOR_PARAGRAPH
[
ExecMethod = Execute ;
Modified: openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi?rev=1460969&r1=1460968&r2=1460969&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi Tue Mar 26 04:13:35
2013
@@ -299,6 +299,13 @@ interface TextDrawText
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
+ SID_CHAR_DLG_EFFECT
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
SID_CHAR_DLG_FOR_PARAGRAPH
[
ExecMethod = Execute ;
Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx?rev=1460969&r1=1460968&r2=1460969&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx Tue Mar 26
04:13:35 2013
@@ -428,6 +428,7 @@ void SwAnnotationShell::Exec( SfxRequest
delete pDialog;
}
break;
+ case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
{
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -452,6 +453,10 @@ void SwAnnotationShell::Exec( SfxRequest
SfxAbstractTabDialog* pDlg =
pFact->CreateSwCharDlg( rView.GetWindow(), rView, aDlgAttr, DLG_CHAR,0,
sal_True );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ if (nSlot == SID_CHAR_DLG_EFFECT)
+ {
+ pDlg->SetCurPageId(TP_CHAR_EXT);
+ }
sal_uInt16 nRet = pDlg->Execute();
if(RET_OK == nRet )
{
Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx?rev=1460969&r1=1460968&r2=1460969&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx Tue Mar
26 04:13:35 2013
@@ -286,6 +286,7 @@ void SwDrawTextShell::Execute( SfxReques
}
break;
+ case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
case SID_CHAR_DLG_FOR_PARAGRAPH:
{
@@ -317,6 +318,10 @@ void SwDrawTextShell::Execute( SfxReques
SfxAbstractTabDialog* pDlg = pFact->CreateSwCharDlg(
pView->GetWindow(), *pView, aDlgAttr, DLG_CHAR,0, sal_True );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
+ if (nSlot == SID_CHAR_DLG_EFFECT)
+ {
+ pDlg->SetCurPageId(TP_CHAR_EXT);
+ }
sal_uInt16 nRet = pDlg->Execute();
if(RET_OK == nRet )
{
Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/textsh1.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/textsh1.cxx?rev=1460969&r1=1460968&r2=1460969&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/textsh1.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/textsh1.cxx Tue Mar 26
04:13:35 2013
@@ -185,6 +185,10 @@ void lcl_CharDialog( SwWrtShell &rWrtSh,
if( FN_INSERT_HYPERLINK == nSlot )
pDlg->SetCurPageId(TP_CHAR_URL);
}
+ if (nSlot == SID_CHAR_DLG_EFFECT)
+ {
+ pDlg->SetCurPageId(TP_CHAR_EXT);
+ }
const SfxItemSet* pSet = NULL;
if ( !bUseDialog )
@@ -838,6 +842,7 @@ void SwTextShell::Execute(SfxRequest &rR
// intentionally no break
}
case SID_CHAR_DLG:
+ case SID_CHAR_DLG_EFFECT:
{
lcl_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq );
}
