Author: zhengfan
Date: Tue Mar 26 04:13:02 2013
New Revision: 1460968
URL: http://svn.apache.org/r1460968
Log:
i121798: For implementation of Text Properties Panel, in AOO Sidebar branch.
Modified:
openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi
openoffice/branches/sidebar/main/sd/sdi/outlnvsh.sdi
openoffice/branches/sidebar/main/sd/source/ui/func/fuchar.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/drviews8.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/outlnvs2.cxx
Modified: openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi?rev=1460968&r1=1460967&r2=1460968&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi (original)
+++ openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi Tue Mar 26 04:13:02 2013
@@ -272,6 +272,11 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+ SID_CHAR_DLG_EFFECT // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetMenuState ;
+ ]
/* -> SVX
SID_PARA_DLG // ole : no, status : ?
[
Modified: openoffice/branches/sidebar/main/sd/sdi/outlnvsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/sdi/outlnvsh.sdi?rev=1460968&r1=1460967&r2=1460968&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/outlnvsh.sdi (original)
+++ openoffice/branches/sidebar/main/sd/sdi/outlnvsh.sdi Tue Mar 26 04:13:02
2013
@@ -187,6 +187,12 @@ interface OutlineView
StateMethod = GetMenuState ;
// Cachable , HasDialog , Export ;
]
+ SID_CHAR_DLG_EFFECT // wj for sym2_1876
+ [
+ ExecMethod = FuTemporaryModify ;
+ StateMethod = GetMenuState ;
+ // Cachable , HasDialog , Export ;
+ ]
SID_SELECTALL // ole : no, status : ?
[
ExecMethod = FuTemporary ;
Modified: openoffice/branches/sidebar/main/sd/source/ui/func/fuchar.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/func/fuchar.cxx?rev=1460968&r1=1460967&r2=1460968&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/func/fuchar.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/func/fuchar.cxx Tue Mar 26
04:13:02 2013
@@ -26,7 +26,7 @@
#include "fuchar.hxx"
-
+#include <svx/dialogs.hrc>
#include <sfx2/viewfrm.hxx>
#include <editeng/editdata.hxx>
@@ -87,6 +87,10 @@ void FuChar::DoExecute( SfxRequest& rReq
SfxAbstractTabDialog* pDlg = pFact ?
pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0;
if( pDlg )
{
+ if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT)
+ {
+ pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ }
sal_uInt16 nResult = pDlg->Execute();
if( nResult == RET_OK )
Modified: openoffice/branches/sidebar/main/sd/source/ui/view/drviews8.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/view/drviews8.cxx?rev=1460968&r1=1460967&r2=1460968&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/drviews8.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/drviews8.cxx Tue Mar 26
04:13:02 2013
@@ -118,6 +118,7 @@ void DrawViewShell::FuTemp01(SfxRequest&
}
break;
+ case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG: // BASIC
{
SetCurrentFunction( FuChar::Create( this,
GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
Modified: openoffice/branches/sidebar/main/sd/source/ui/view/outlnvs2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/view/outlnvs2.cxx?rev=1460968&r1=1460967&r2=1460968&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/outlnvs2.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/outlnvs2.cxx Tue Mar 26
04:13:02 2013
@@ -394,6 +394,7 @@ void OutlineViewShell::FuTemporaryModify
}
break;
+ case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
{
SetCurrentFunction( FuChar::Create( this,
GetActiveWindow(), pOlView, GetDoc(), rReq ) );
