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/22 14:59:28 UTC
svn commit: r1459778 - in /openoffice/branches/sidebar/main:
default_images/svx/res/ default_images/svx/res/symphony/
default_images/sw/res/sidebar/
officecfg/registry/data/org/openoffice/Office/UI/ sc/sdi/
sc/source/ui/drawfunc/ sc/source/ui/inc/ sc/s...
Author: af
Date: Fri Mar 22 13:59:26 2013
New Revision: 1459778
URL: http://svn.apache.org/r1459778
Log:
Temporarily reverting revisions 1459519, 1459510, 1459509 to allow clean re-application.
Added:
openoffice/branches/sidebar/main/default_images/svx/res/rotation.png
- copied unchanged from r1459508, openoffice/branches/sidebar/main/default_images/svx/res/rotation.png
openoffice/branches/sidebar/main/default_images/svx/res/rotation_h.png
- copied unchanged from r1459508, openoffice/branches/sidebar/main/default_images/svx/res/rotation_h.png
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/
- copied from r1459508, openoffice/branches/sidebar/main/default_images/sw/res/sidebar/
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextList.cxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextList.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextList.hxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextList.hxx
openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SelectionChangeHandler.hxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SelectionChangeHandler.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/EmptyPanel.cxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/svx/source/sidebar/EmptyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/EmptyPanel.hxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/svx/source/sidebar/EmptyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/SelectionAnalyzer.cxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/svx/source/sidebar/SelectionAnalyzer.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/SelectionChangeHandler.cxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/svx/source/sidebar/SelectionChangeHandler.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/debug/
- copied from r1459508, openoffice/branches/sidebar/main/svx/source/sidebar/debug/
openoffice/branches/sidebar/main/svx/source/sidebar/possize/
- copied from r1459508, openoffice/branches/sidebar/main/svx/source/sidebar/possize/
openoffice/branches/sidebar/main/svx/source/sidebar/text/SvxTextFontColorPage.cxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/svx/source/sidebar/text/SvxTextFontColorPage.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/SvxTextSpacingPage.cxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/svx/source/sidebar/text/SvxTextSpacingPage.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/SvxTextUnderlinePage.cxx
- copied unchanged from r1459508, openoffice/branches/sidebar/main/svx/source/sidebar/text/SvxTextUnderlinePage.cxx
Removed:
openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextCenter_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextJustified_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextLeft_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextRight_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/DecreaseSpace_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/IncreaseSpace_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent2.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent3.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent4.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_Hanging.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Outdent_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_15.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_5.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-2.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpsmall-spacing-1.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_15.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_5.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-2.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet01.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet02.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl01.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl02.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth01.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth02.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert01.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert02.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert03.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth01.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth02.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth03.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Indent_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Outdent_16x16.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing1.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing2.png
openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing3.png
openoffice/branches/sidebar/main/svtools/inc/svtools/button.hxx
openoffice/branches/sidebar/main/svtools/source/control/button.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextUnderlineControl.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextUnderlineControl.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextUnderlinePopup.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextUnderlinePopup.hxx
Modified:
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
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
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
openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx
openoffice/branches/sidebar/main/svtools/Library_svt.mk
openoffice/branches/sidebar/main/svtools/Package_inc.mk
openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk
openoffice/branches/sidebar/main/svx/Library_svx.mk
openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ValueSetWithTextControl.hxx
openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc
openoffice/branches/sidebar/main/svx/sdi/svx.sdi
openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hrc
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.src
openoffice/branches/sidebar/main/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
openoffice/branches/sidebar/main/svx/source/svdraw/svdopath.cxx
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
openoffice/branches/sidebar/main/vcl/inc/vcl/button.hxx
openoffice/branches/sidebar/main/vcl/source/control/button.cxx
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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu (original)
+++ openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu Fri Mar 22 13:59:26 2013
@@ -197,6 +197,7 @@
<value>10</value>
</prop>
</node>
+
<node oor:name="PagePropertyPanel" oor:op="replace">
<prop oor:name="Title" oor:type="xs:string">
<value xml:lang="en-US">Page</value>
@@ -709,12 +710,12 @@
</prop>
</node>
- <node oor:name="ParaPropertyPanel" oor:op="replace">
+ <node oor:name="ParagraphPropertyPanel" oor:op="replace">
<prop oor:name="Title" oor:type="xs:string">
<value xml:lang="en-US">Paragraph</value>
</prop>
<prop oor:name="Id" oor:type="xs:string">
- <value>ParaPropertyPanel</value>
+ <value>ParagraphPropertyPanel</value>
</prop>
<prop oor:name="DeckId" oor:type="xs:string">
<value>PropertyDeck</value>
@@ -725,14 +726,14 @@
<prop oor:name="ContextList">
<value oor:separator=";">
Calc, DrawText, visible ;
- DrawImpress, 3DObject, hidden ;
+ DrawImpress, 3DObject, visible ;
DrawImpress, Draw, hidden ;
DrawImpress, DrawText, visible ;
DrawImpress, Graphic, hidden ;
DrawImpress, Table, visible ;
DrawImpress, TextObject, visible ;
- DrawImpress, 3DObject, hidden ;
- Writer, Annotation, hidden ;
+ DrawImpress, 3DObject, visible ;
+ Writer, Annotation, visible ;
Writer, DrawText, visible ;
Writer, Table, visible ;
Writer, Text, visible ;
@@ -740,7 +741,7 @@
</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
- <value>private:resource/toolpanel/SvxPanelFactory/ParaPropertyPanel</value>
+ <value>private:resource/toolpanel/SvxPanelFactory/Debug_NotYetImplementedPanel</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
<value>200</value>
Modified: openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi Fri Mar 22 13:59:26 2013
@@ -89,7 +89,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/drtxtob.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/drtxtob.sdi Fri Mar 22 13:59:26 2013
@@ -89,7 +89,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/editsh.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/editsh.sdi Fri Mar 22 13:59:26 2013
@@ -71,7 +71,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob.cxx Fri Mar 22 13:59:26 2013
@@ -733,11 +733,10 @@ 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 , nSlot);
+ bDone = ExecuteCharDlg( aEditAttr, aNewAttr );
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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob1.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob1.cxx Fri Mar 22 13:59:26 2013
@@ -53,7 +53,7 @@
//------------------------------------------------------------------------
sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
- SfxItemSet& rOutSet , sal_uInt16 nSlot)
+ SfxItemSet& rOutSet )
{
//CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(),
//CHINA001 &rArgs,
@@ -65,10 +65,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/inc/drtxtob.hxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/inc/drtxtob.hxx Fri Mar 22 13:59:26 2013
@@ -65,7 +65,7 @@ public:
void GetAttrState( SfxItemSet& rSet );
void ExecuteToggle( SfxRequest &rReq );
- sal_Bool ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet , sal_uInt16 nSlot);
+ sal_Bool ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx Fri Mar 22 13:59:26 2013
@@ -360,10 +360,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/editsh.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/editsh.cxx Fri Mar 22 13:59:26 2013
@@ -455,7 +455,6 @@ void ScEditShell::Execute( SfxRequest& r
}
break;
- case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
{
SfxItemSet aAttrs( pTableView->GetAttribs() );
@@ -469,10 +468,6 @@ 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
Modified: openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi (original)
+++ openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi Fri Mar 22 13:59:26 2013
@@ -272,11 +272,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/outlnvsh.sdi (original)
+++ openoffice/branches/sidebar/main/sd/sdi/outlnvsh.sdi Fri Mar 22 13:59:26 2013
@@ -187,12 +187,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/func/fuchar.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/func/fuchar.cxx Fri Mar 22 13:59:26 2013
@@ -26,7 +26,7 @@
#include "fuchar.hxx"
-#include <svx/dialogs.hrc>
+
#include <sfx2/viewfrm.hxx>
#include <editeng/editdata.hxx>
@@ -87,10 +87,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/drviews8.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/drviews8.cxx Fri Mar 22 13:59:26 2013
@@ -118,7 +118,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/outlnvs2.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/outlnvs2.cxx Fri Mar 22 13:59:26 2013
@@ -394,7 +394,6 @@ void OutlineViewShell::FuTemporaryModify
}
break;
- case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
{
SetCurrentFunction( FuChar::Create( this, GetActiveWindow(), pOlView, GetDoc(), rReq ) );
Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx (original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx Fri Mar 22 13:59:26 2013
@@ -239,7 +239,6 @@ Reference<ui::XSidebarPanel> Panel::GetP
-
void Panel::PrintWindowTree (void)
{
#ifdef DEBUG
Modified: openoffice/branches/sidebar/main/svtools/Library_svt.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svtools/Library_svt.mk?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svtools/Library_svt.mk (original)
+++ openoffice/branches/sidebar/main/svtools/Library_svt.mk Fri Mar 22 13:59:26 2013
@@ -127,7 +127,6 @@ $(eval $(call gb_Library_add_exception_o
svtools/source/contnr/tooltiplbox \
svtools/source/contnr/treelist \
svtools/source/control/asynclink \
- svtools/source/control/button \
svtools/source/control/calendar \
svtools/source/control/collatorres \
svtools/source/control/ctrlbox \
Modified: openoffice/branches/sidebar/main/svtools/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svtools/Package_inc.mk?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svtools/Package_inc.mk (original)
+++ openoffice/branches/sidebar/main/svtools/Package_inc.mk Fri Mar 22 13:59:26 2013
@@ -35,7 +35,6 @@ $(eval $(call gb_Package_add_file,svtool
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/button.hxx,svtools/button.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx))
Modified: openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk (original)
+++ openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk Fri Mar 22 13:59:26 2013
@@ -83,7 +83,6 @@ $(eval $(call gb_SrsTarget_add_files,svx
svx/source/sidebar/line/LinePropertyPanel.src \
svx/source/sidebar/possize/PosSizePropertyPanel.src \
svx/source/sidebar/text/TextPropertyPanel.src \
- svx/source/sidebar/paragraph/ParaPropertyPanel.src \
svx/source/stbctrls/stbctrls.src \
svx/source/svdraw/svdstr.src \
svx/source/table/table.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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/Library_svx.mk (original)
+++ openoffice/branches/sidebar/main/svx/Library_svx.mk Fri Mar 22 13:59:26 2013
@@ -178,14 +178,7 @@ $(eval $(call gb_Library_add_exception_o
svx/source/sidebar/debug/ContextPanel \
svx/source/sidebar/debug/NotYetImplementedPanel \
svx/source/sidebar/text/SvxSBFontNameBox \
- svx/source/sidebar/text/TextCharacterSpacingControl \
- svx/source/sidebar/text/TextCharacterSpacingPopup \
- svx/source/sidebar/text/TextUnderlineControl \
- svx/source/sidebar/text/TextUnderlinePopup \
svx/source/sidebar/text/TextPropertyPanel \
- svx/source/sidebar/paragraph/ParaLineSpacingControl \
- svx/source/sidebar/paragraph/ParaLineSpacingPopup \
- svx/source/sidebar/paragraph/ParaPropertyPanel \
svx/source/sidebar/area/AreaPropertyPanel \
svx/source/sidebar/area/AreaTransparencyGradientControl \
svx/source/sidebar/area/AreaTransparencyGradientPopup \
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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc Fri Mar 22 13:59:26 2013
@@ -396,10 +396,6 @@
#define RID_SIDEBAR_GRAPHIC_PANEL (RID_SVX_START + 300)
#define RID_SIDEBAR_EMPTY_PANEL (RID_SVX_START + 301)
-#define RID_SIDEBAR_PARA_PANEL (RID_SVX_START + 302)
-#define RID_POPUPPANEL_PARAPAGE_LINESPACING (RID_SVX_START + 303)
-#define RID_POPUPPANEL_PARAPAGE_BULLETS (RID_SVX_START + 304)
-#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 305)
// !!! please update RID_SVX_FIRSTFREE !!! see line 46
// Strings ------------------------------------------------------------------
@@ -981,12 +977,6 @@
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//?
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//?
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//?
-#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS (RID_SVX_START + 1172)
-#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_0 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 0)
-#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_1 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 1)
-#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_2 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 2)
-#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_3 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 3)
-#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_4 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 4)
#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 1190)
Modified: openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ValueSetWithTextControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ValueSetWithTextControl.hxx?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ValueSetWithTextControl.hxx (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ValueSetWithTextControl.hxx Fri Mar 22 13:59:26 2013
@@ -85,15 +85,6 @@ public:
const XubString* pItemHelpText );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
- void SetSelItem(sal_uInt16 nSel);
- sal_uInt16 GetSelItem()
-{
- return 0;
-}
- void InsertCustom(Image imgEnable, Image imgDisable, XubString str);
- void SetCustomTip(XubString str, sal_Bool bRealTip = sal_False);
- void SetDefaultTip(XubString* pStrList, sal_Bool bRealTip=sal_False);
- void SetCusEnable(bool bEnable);
private:
struct ValueSetWithTextItem
@@ -108,11 +99,6 @@ private:
const tControlType meControlType;
tItemList maItems;
- bool bHaveCus;
- Image imgCusEnable;
- Image imgCusDisable;
- XubString strLastCustom;
- bool bCusEnable;
};
} } // end of namespace svx::sidebar
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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc Fri Mar 22 13:59:26 2013
@@ -373,8 +373,6 @@
#define FN_NUM_BULLET_OFF (FN_EDIT + 37) /* Numerierung aus */
#define FN_NUM_BULLET_ON (FN_EDIT + 38) /* Numerierung mit Bullets an */
#define FN_NUM_NUMBERING_ON (FN_EDIT + 44) /* Numerierung an */
-#define FN_BUL_NUM_RULE_INDEX (FN_EDIT + 120) /* Achieving num rule index */
-#define FN_NUM_NUM_RULE_INDEX (FN_EDIT + 121)
#define FN_INSERT (SID_SW_START + 300)
#define FN_DELETE_BOOKMARK (FN_INSERT + 1)
@@ -1272,7 +1270,6 @@
#define SID_ATTR_LINE_CAP (SID_SVX_START+1111)
#define SID_ATTR_TRANSFORM_MATRIX (SID_SVX_START+1112)
-#define SID_CHAR_DLG_EFFECT (SID_SVX_START+1113)
//#define SID_SVX_AREA_TRANS_TYPE (SID_SVX_START+1105)
//#define SID_SVX_AREA_TRANSPARENCY (SID_SVX_START+1106)
//#define SID_SVX_AREA_TRANSP_GRADIENT (SID_SVX_START+1107)
@@ -1283,7 +1280,7 @@
//#define SID_FLIP_VERTICAL (SID_SVX_START+1110)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE (SID_CHAR_DLG_EFFECT + 1)
+#define SID_SVX_FIRSTFREE (SID_ATTR_TRANSFORM_MATRIX + 1)
// --------------------------------------------------------------------------
// Overflow check for slot IDs
Modified: openoffice/branches/sidebar/main/svx/sdi/svx.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/sdi/svx.sdi?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/sdi/svx.sdi (original)
+++ openoffice/branches/sidebar/main/svx/sdi/svx.sdi Fri Mar 22 13:59:26 2013
@@ -3883,30 +3883,6 @@ SfxVoidItem FontDialog SID_CHAR_DLG
GroupId = GID_FORMAT;
]
-SfxVoidItem FontDialogEff SID_CHAR_DLG_EFFECT
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerItem;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_FORMAT;
-]
-
//--------------------------------------------------------------------------
SvxFontHeightItem FontHeight SID_ATTR_CHAR_FONTHEIGHT
@@ -15658,60 +15634,6 @@ SfxBoolItem SvxAutoWidth SID_ATTR_TRANSF
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
-]
-
-//--------------------------------------------------------------------------
-
-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,
- 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 = FALSE,
GroupId = GID_SPECIAL;
]
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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx Fri Mar 22 13:59:26 2013
@@ -22,7 +22,6 @@
#include "sidebar/PanelFactory.hxx"
#include "text/TextPropertyPanel.hxx"
-#include "paragraph/ParaPropertyPanel.hxx"
#include "area/AreaPropertyPanel.hxx"
#include "graphic/GraphicPropertyPanel.hxx"
#include "line/LinePropertyPanel.hxx"
@@ -142,16 +141,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
pPanel,
ui::LayoutSize(-1,-1,-1));
}
- if (DoesResourceEndWith("/ParaPropertyPanel"))
- {
- ParaPropertyPanel* pPanel = ParaPropertyPanel::Create(pParentWindow, xFrame, pBindings);
- xElement = sfx2::sidebar::SidebarPanelBase::Create(
- rsResourceURL,
- xFrame,
- pPanel,
- //::boost::bind(&ParaPropertyPanel::ShowMenu, pPanel),
- ui::LayoutSize(-1,-1,-1));
- }
else if (DoesResourceEndWith("/AreaPropertyPanel"))
{
AreaPropertyPanel* pPanel = AreaPropertyPanel::Create(pParentWindow, xFrame, pBindings);
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx Fri Mar 22 13:59:26 2013
@@ -52,17 +52,6 @@
#include <vcl/gradient.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
-#include "TextCharacterSpacingControl.hxx"
-#include "TextCharacterSpacingPopup.hxx"
-#include "TextUnderlineControl.hxx"
-#include "TextUnderlinePopup.hxx"
-//#include "SvxTextUnderlinePage.hxx"
-//#include "SvxTextFontColorPage.hxx"
-#include "sidebar/ColorControl.hxx"
-#include "svx/sidebar/PopupContainer.hxx"
-
-
-#include <boost/bind.hpp>
using namespace css;
using namespace cssu;
@@ -80,58 +69,21 @@ namespace svx { namespace sidebar {
#define SIZE_CONTROL_WIDTH 80
#define CONTROL_COMBOX_HEIGHT 20
#define CONTROL_HEIGHT_5X 120
-
-
+#define SIDEBAR_SPACE_NORMAL 0
+#define SIDEBAR_SPACE_EXPAND 1
+#define SIDEBAR_SPACE_CONDENSED 2
+#define SIDEBAR_SPACING_GLOBAL_VALUE String("PopupPanal_Spacing", 18, RTL_TEXTENCODING_ASCII_US)
#define TEXT_SECTIONPAGE_HEIGHT_S SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + ( TOOLBOX_ITEM_HEIGHT + 2 ) + CONTROL_SPACING_VERTICAL * 1 + SECTIONPAGE_MARGIN_VERTICAL_BOT
#define TEXT_SECTIONPAGE_HEIGHT SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + ( TOOLBOX_ITEM_HEIGHT + 2 ) * 2 + CONTROL_SPACING_VERTICAL * 2 + SECTIONPAGE_MARGIN_VERTICAL_BOT
//
-
+#define SPACING_NOCUSTOM 0
+#define SPACING_CLOSE_BY_CLICK_ICON -1
+#define SPACING_CLOSE_BY_CUS_EDIT 1
//end
-PopupControl* TextPropertyPanel::CreateCharacterSpacingControl (PopupContainer* pParent)
-{
- return new TextCharacterSpacingControl(pParent, *this);
-}
-PopupControl* TextPropertyPanel::CreateUnderlinePopupControl (PopupContainer* pParent)
-{
- return new TextUnderlineControl(pParent, *this);
-}
-PopupControl* TextPropertyPanel::CreateFontColorPopupControl (PopupContainer* pParent)
-{
- return new ColorControl(
- pParent,
- mpBindings,
- SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
- SVX_RES(VS_FONT_COLOR),
- ::boost::bind(&TextPropertyPanel::GetFontColor, this),
- ::boost::bind(&TextPropertyPanel::SetFontColor, this, _1,_2),
- pParent,
- 0);
-}
-PopupControl* TextPropertyPanel::CreateBrushColorPopupControl (PopupContainer* pParent)
-{
- return new ColorControl(
- pParent,
- mpBindings,
- SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
- SVX_RES(VS_FONT_COLOR),
- ::boost::bind(&TextPropertyPanel::GetBrushColor, this),
- ::boost::bind(&TextPropertyPanel::SetBrushColor, this, _1,_2),
- pParent,
- 0);
-}
-
-long TextPropertyPanel::GetSelFontSize()
-{
- long nH = 240;
- SfxMapUnit eUnit = maSpacingControl.GetCoreMetric();
- if (mpHeightItem)
- nH = LogicToLogic( mpHeightItem->GetHeight(), (MapUnit)eUnit, MAP_TWIP );
- return nH;
-}
TextPropertyPanel* TextPropertyPanel::Create (
@@ -153,10 +105,7 @@ TextPropertyPanel* TextPropertyPanel::Cr
}
-::sfx2::sidebar::ControllerItem& TextPropertyPanel::GetSpaceController()
-{
- return maSpacingControl;
-}
+
TextPropertyPanel::TextPropertyPanel (
Window* pParent,
@@ -193,10 +142,6 @@ TextPropertyPanel::TextPropertyPanel (
mpToolBoxHighlight(ControlFactory::CreateToolBox(
mpToolBoxHighlightBackground.get(),
SVX_RES(TB_HIGHLIGHT))),
- maCharSpacePopup(this, ::boost::bind(&TextPropertyPanel::CreateCharacterSpacingControl, this, _1)),
- maFontColorPopup(this, ::boost::bind(&TextPropertyPanel::CreateFontColorPopupControl, this, _1)),
- maBrushColorPopup(this, ::boost::bind(&TextPropertyPanel::CreateBrushColorPopupControl, this, _1)),
- maUnderlinePopup(this, ::boost::bind(&TextPropertyPanel::CreateUnderlinePopupControl, this, _1)),
mpFontColorUpdater(),
mpHighlightUpdater(),
@@ -245,6 +190,14 @@ TextPropertyPanel::TextPropertyPanel (
mpFontList (NULL),
mbMustDelete (false),
mbFocusOnFontSizeCtrl(false),
+ /*AF
+ mpFloatWinUnderline(NULL),
+ mpPageUnderline(NULL),
+ mpFloatWinFontColor(NULL),
+ mpPageFontColor(NULL),
+ mpFloatWinSpacing(NULL),
+ mpPageSpacing(NULL)
+ */
mxFrame(rxFrame),
maContext(),
mpBindings(pBindings)
@@ -303,10 +256,6 @@ Image TextPropertyPanel::GetIcon (const
}
-void TextPropertyPanel::SetSpacing(long nKern)
-{
- mlKerning = nKern;
-}
void TextPropertyPanel::HandleContextChange (
@@ -400,10 +349,7 @@ void TextPropertyPanel::HandleContextCha
}
}
-SfxBindings* TextPropertyPanel::GetBindings()
-{
- return mpBindings;
-}
+
void TextPropertyPanel::DataChanged (const DataChangedEvent& rEvent)
@@ -446,17 +392,17 @@ void TextPropertyPanel::Initialize (void
InitToolBoxHighlight();
#ifdef HAS_IA2
- mpFontNameBox->SetAccRelationLabeledBy(&mpFontNameBox);
- mpFontNameBox->SetMpSubEditAccLableBy(&mpFontNameBox);
+ mpFontNameBox->SetAccRelationLabeledBy(&maFontNameBox);
+ mpFontNameBox->SetMpSubEditAccLableBy(&maFontNameBox);
maFontSizeBox.SetAccRelationLabeledBy(&maFontSizeBox);
maFontSizeBox.SetMpSubEditAccLableBy(&maFontSizeBox);
- mpToolBoxFont.SetAccRelationLabeledBy(&mpToolBoxFont);
- mpToolBoxIncDec.SetAccRelationLabeledBy(&mpToolBoxIncDec);
- mpToolBoxFontColor.SetAccRelationLabeledBy(&mpToolBoxFontColor);
- mpToolBoxScript.SetAccRelationLabeledBy(&mpToolBoxScript);
- mpToolBoxScriptSw.SetAccRelationLabeledBy(&mpToolBoxScriptSw);
- mpToolBoxSpacing.SetAccRelationLabeledBy(&mpToolBoxSpacing);
- mpToolBoxHighlight.SetAccRelationLabeledBy(&mpToolBoxHighlight);
+ maToolBoxFont.SetAccRelationLabeledBy(&maToolBoxFont);
+ maToolBoxIncDec.SetAccRelationLabeledBy(&maToolBoxIncDec);
+ maToolBoxFontColor.SetAccRelationLabeledBy(&maToolBoxFontColor);
+ maToolBoxScript.SetAccRelationLabeledBy(&maToolBoxScript);
+ maToolBoxScriptSw.SetAccRelationLabeledBy(&maToolBoxScriptSw);
+ maToolBoxSpacing.SetAccRelationLabeledBy(&maToolBoxSpacing);
+ maToolBoxHighlight.SetAccRelationLabeledBy(&maToolBoxHighlight);
#endif
//init state
@@ -518,15 +464,7 @@ void TextPropertyPanel::Initialize (void
//end
}
-void TextPropertyPanel::EndSpacingPopupMode (void)
-{
- maCharSpacePopup.Hide();
-}
-void TextPropertyPanel::EndUnderlinePopupMode (void)
-{
- maUnderlinePopup.Hide();
-}
void TextPropertyPanel::InitToolBoxFont()
@@ -943,18 +881,30 @@ IMPL_LINK(TextPropertyPanel, ToolboxIncD
+
IMPL_LINK(TextPropertyPanel, ToolBoxUnderlineClickHdl, ToolBox*, pToolBox)
{
const sal_uInt16 nId = pToolBox->GetCurItemId();
- OSL_ASSERT(nId == TBI_UNDERLINE);
if(nId == TBI_UNDERLINE)
{
pToolBox->SetItemDown( nId, true );
- maUnderlinePopup.Rearrange(meUnderline);
- maUnderlinePopup.Show(*pToolBox);
+ /**AF
+ SvxTextUnderlinePage* pUnderlinePage = GetUnderlinePage();
+ Size aFloatSz = pUnderlinePage->GetOutputSizePixel();
+ GetUnderlineFloatWin()->SetSizePixel( aFloatSz );
+
+ Point aPos = mpToolBoxFont->GetPosPixel();
+ aPos = OutputToScreenPixel( aPos );
+ Size aSize = mpToolBoxFont->GetSizePixel();
+ Rectangle aRect( aPos, aSize );
+
+ GetUnderlineFloatWin()->StartPopupMode( aRect, FLOATWIN_POPUPMODE_NOFOCUSCLOSE|FLOATWIN_POPUPMODE_DOWN );
+ GetUnderlineFloatWin()->SetPopupModeFlags(GetUnderlineFloatWin()->GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
+ pUnderlinePage->SetUnderlineSelect(meUnderline);
+ */
}
- return 0L;
+ return 0;
}
@@ -969,9 +919,23 @@ IMPL_LINK(TextPropertyPanel, ToolBoxFont
pToolBox->SetItemDown( nId, true );
- //pToolBox->SetItemDown( nId, true );
- maFontColorPopup.Show(*pToolBox);
- maFontColorPopup.SetCurrentColor(maColor, mbColorAvailable);
+ /*AF
+ SvxTextFontColorPage* pFontColorPage = GetFontColorPage();
+
+ Size aFloatSz = pFontColorPage->GetOutputSizePixel();
+ GetFontColorFloatWin()->SetSizePixel( aFloatSz );
+
+ Point aPos = mpToolBoxFontColor->GetPosPixel();
+ aPos = OutputToScreenPixel( aPos );
+ Size aSize = mpToolBoxFontColor->GetSizePixel();
+ Rectangle aRect( aPos, aSize );
+
+ GetFontColorFloatWin()->StartPopupMode( aRect, FLOATWIN_POPUPMODE_NOFOCUSCLOSE|FLOATWIN_POPUPMODE_DOWN );
+ GetFontColorFloatWin()->SetPopupModeFlags(GetFontColorFloatWin()->GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
+
+ pFontColorPage->GetFocus();
+ pFontColorPage->SetCurColorSelect(maColor, mbColorAvailable);
+ */
}
return 0;
}
@@ -1051,27 +1015,57 @@ IMPL_LINK(TextPropertyPanel, ToolBoxHigh
meColorType = BACK_COLOR;
pToolBox->SetItemDown( nId, true );
- maBrushColorPopup.Show(*pToolBox);
- maBrushColorPopup.SetCurrentColor(maBackColor, mbBackColorAvailable);
+ /*AF
+ SvxTextFontColorPage* pFontColorPage = GetFontColorPage();
+
+ Size aFloatSz = pFontColorPage->GetOutputSizePixel();
+ GetFontColorFloatWin()->SetSizePixel( aFloatSz );
+
+ Point aPos = mpToolBoxHighlight->GetPosPixel();
+ aPos = OutputToScreenPixel( aPos );
+ Size aSize = mpToolBoxHighlight->GetSizePixel();
+ Rectangle aRect( aPos, aSize );
+
+ GetFontColorFloatWin()->StartPopupMode( aRect, FLOATWIN_POPUPMODE_NOFOCUSCLOSE|FLOATWIN_POPUPMODE_DOWN );
+ GetFontColorFloatWin()->SetPopupModeFlags(GetFontColorFloatWin()->GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
+
+ pFontColorPage->GetFocus();
+ pFontColorPage->SetCurColorSelect(maBackColor,
+ mbBackColorAvailable);
+ */
}
return 0;
}
+
IMPL_LINK(TextPropertyPanel, SpacingClickHdl, ToolBox*, pToolBox)
{
const sal_uInt16 nId = pToolBox->GetCurItemId();
- OSL_ASSERT(nId == TBI_SPACING);
if(nId == TBI_SPACING)
{
pToolBox->SetItemDown( nId, true );
- maCharSpacePopup.Rearrange(mbKernLBAvailable,mbKernAvailable,mlKerning);
- maCharSpacePopup.Show(*pToolBox);
+ /*AF
+ SvxTextSpacingPage* pSpacingPage = GetSpacingPage();
+ pSpacingPage->SetControlState(mbKernLBAvailable,mbKernAvailable,mlKerning);
+
+ Size aFloatSz = pSpacingPage->GetOutputSizePixel();
+ GetSpacingFloatWin()->SetSizePixel( aFloatSz );
+
+ Point aPos = mpToolBoxSpacing->GetPosPixel();
+ aPos = OutputToScreenPixel( aPos );
+ Size aSize = mpToolBoxSpacing->GetSizePixel();
+ Rectangle aRect( aPos, aSize );
+
+ GetSpacingFloatWin()->StartPopupMode( aRect, FLOATWIN_POPUPMODE_NOFOCUSCLOSE|FLOATWIN_POPUPMODE_DOWN );
+ GetSpacingFloatWin()->SetPopupModeFlags(GetSpacingFloatWin()->GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
+ pSpacingPage->GetFocus();
+ */
}
- return 0L;
+ return 0;
}
@@ -1085,19 +1079,24 @@ IMPL_LINK( TextPropertyPanel, ImplPopupM
-/*IMPL_LINK( TextPropertyPanel, ImplSpacingPopupModeEndHdl, FloatingWindow*, EMPTYARG )
+IMPL_LINK( TextPropertyPanel, ImplSpacingPopupModeEndHdl, FloatingWindow*, EMPTYARG )
{
- if( maCharSpacePopup.GetLastCustomState() == SPACING_CLOSE_BY_CUS_EDIT)
+ /*AF
+ if(mpPageSpacing)
{
- SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE );
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Spacing") );
- aSeq[0].Value <<= ::rtl::OUString( String::CreateFromInt32( maCharSpacePopup.GetLastCustomValue() ));
- aWinOpt.SetUserData( aSeq );
+ if( mpPageSpacing->GetLastCustomState() == SPACING_CLOSE_BY_CUS_EDIT)
+ {
+ SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE );
+ ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
+ aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Spacing") );
+ aSeq[0].Value <<= ::rtl::OUString( String::CreateFromInt32( mpPageSpacing->GetLastCustomValue() ));
+ aWinOpt.SetUserData( aSeq );
+ }
}
+ */
return 0;
-}*/
+}
@@ -1301,8 +1300,8 @@ void TextPropertyPanel::NotifyItemUpdate
case SID_ATTR_CHAR_COLOR:
if( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxColorItem))
{
- const SvxColorItem* pItem = (const SvxColorItem*)pState;
- maColor = pItem->GetValue();
+ const SvxBrushItem* pItem = (const SvxBrushItem*)pState;
+ maColor = pItem->GetColor();
mbColorAvailable = true;
if (mpFontColorUpdater)
mpFontColorUpdater->Update(maColor);
@@ -1575,44 +1574,6 @@ void TextPropertyPanel::UpdateFontScrip
}
}
-Color TextPropertyPanel::GetFontColor (void) const
-{
- return maColor;
-}
-
-void TextPropertyPanel::SetFontColor (
- const String& rsColorName,
- const Color aColor)
-{
- SvxColorItem aColorItem(aColor, SID_ATTR_CHAR_COLOR);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_COLOR, SFX_CALLMODE_RECORD, &aColorItem, 0L);
- maColor = aColor;
-}
-
-Color TextPropertyPanel::GetBrushColor (void) const
-{
- return maBackColor;
-}
-
-void TextPropertyPanel::SetBrushColor (
- const String& rsColorName,
- const Color aColor)
-{
- SvxBrushItem aBrushItem(aColor, SID_ATTR_BRUSH_CHAR);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_BRUSH_CHAR, SFX_CALLMODE_RECORD, &aBrushItem, 0L);
- maBackColor = aColor;
-}
-
-Color& TextPropertyPanel::GetUnderlineColor()
-{
- return meUnderlineColor;
-}
-
-void TextPropertyPanel::SetUnderline(FontUnderline eUnderline)
-{
- meUnderline = eUnderline;
-}
-
/*
USHORT TextPropertyPanel::GetCurrColorType()
{
@@ -1632,7 +1593,10 @@ SfxPropertyPageController TextPropertyPa
}
//add
-
+Color& TextPropertyPanel::GetUnderlineColor()
+{
+ return meUnderlineColor;
+}
//add end
void TextPropertyPanel::SetBackColor(Color aCol)
{
@@ -1642,7 +1606,10 @@ void TextPropertyPanel::SetColor(Color a
{
maColor = aCol;
}
-
+void TextPropertyPanel::SetUnderline(FontUnderline eUnderline)
+{
+ meUnderline = eUnderline;
+}
void TextPropertyPanel::SetSpacing(long nKern)
{
mlKerning = nKern;
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hrc?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hrc (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hrc Fri Mar 22 13:59:26 2013
@@ -26,8 +26,7 @@
#define CUSTOM_WIDTH VS_SPACING_WIDTH - 8
#define CUSTOM_X POPUPPANEL_MARGIN_LARGE + OFFSET_X + 1
#define CUSTOM_Y OFFSET_Y + POPUPPANEL_MARGIN_SMALL * 3 + 15 * 6 + TEXT_HEIGHT
-#define VS_UNDERLINE_WIDTH 57
-#define VS_UNDERLINE_HEIGHT 12 * 10
+
//#define FT_TEST 1
#define CB_SBFONT_FONT 2
#define MB_SBFONT_FONTSIZE 3
@@ -82,11 +81,15 @@
#define IMG_SPACING_D 71
+#define STR_QH_BOLD 72
+#define STR_QH_ITALIC 73
+#define STR_QH_UNDERLINE 74
+
//popup window underline
#define VS_UNDERLINE 1
#define PB_OPTIONS 2
-#define BMP_UNDERLINE_MORE 3
-#define BMP_UNDERLINE_MORE_H 4
+// #define BMP_UNDERLINE_MORE 3
+// #define BMP_UNDERLINE_MORE_H 4
#define IMG_SINGLE 10
#define IMG_DOUBLE 11
@@ -177,9 +180,6 @@
#define STR_CUSTOM_C_TIP 72
#define STR_CUSTOM_E_TIP 73
#define STR_PT 74
-#define STR_QH_BOLD 75
-#define STR_QH_ITALIC 76
-#define STR_QH_UNDERLINE 77
//help ids
#define HID_COMBO_FONT_NAME "SVX_HID_COMBO_FONT_NAME"
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx Fri Mar 22 13:59:26 2013
@@ -35,10 +35,7 @@
#include <com/sun/star/ui/XUIElement.hpp>
#include <boost/scoped_ptr.hpp>
-#include "TextCharacterSpacingPopup.hxx"
-#include "TextUnderlinePopup.hxx"
-#include "sidebar/ColorPopup.hxx"
-#include <vcl/vclenum.hxx>
+
class FloatingWindow;
class ToolBox;
@@ -46,12 +43,10 @@ class ToolBox;
namespace svx { namespace sidebar {
class SvxSBFontNameBox;
-class PopupControl;
-class PopupContainer;
class TextPropertyPanel
: public Control,
- public ::sfx2::sidebar::IContextChangeReceiver,
+ public ::sfx2::sidebar::IContextChangeReceiver,
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
@@ -61,26 +56,13 @@ public:
SfxBindings* pBindings);
virtual void DataChanged (const DataChangedEvent& rEvent);
- SfxBindings* GetBindings();
- ::sfx2::sidebar::ControllerItem& GetSpaceController();
- long GetSelFontSize();
- void SetSpacing(long nKern);
- void EndSpacingPopupMode (void);
- void EndUnderlinePopupMode (void);
- Color GetFontColor (void) const;
- void SetFontColor (const String& rsColorName,const Color aColor);
- Color GetBrushColor (void) const;
- void SetBrushColor (const String& rsColorName,const Color aColor);
- void SetUnderline(FontUnderline eUnderline);
- Color& GetUnderlineColor();
- void SetDefaultUnderline(FontUnderline eUnderline);
- //
+ // void SetDefaultUnderline(FontUnderline eUnderline);
// USHORT GetCurrColorType();
// void SetBackColor(Color aCol);
// void SetColor(Color aCol);
- //
+ // void SetUnderline(FontUnderline eUnderline);
// void SetSpacing(long nKern);
/*
@@ -96,11 +78,9 @@ public:
// long GetSelFontSize();
// SfxPropertyPageController GetSpaceController();
// ToolBox* GetSpacingTB(); //removed
- // //
+ // Color& GetUnderlineColor(); //
// void FontListChanged();
-
-
enum ColorType
{
FONT_COLOR = 1,
@@ -205,10 +185,6 @@ private:
const FontList* mpFontList;
bool mbMustDelete;
bool mbFocusOnFontSizeCtrl;
- TextCharacterSpacingPopup maCharSpacePopup;
- TextUnderlinePopup maUnderlinePopup;
- ColorPopup maFontColorPopup;
- ColorPopup maBrushColorPopup;
cssu::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
@@ -218,17 +194,7 @@ private:
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
- virtual ~TextPropertyPanel (void);
-
-
- PopupControl* CreateCharacterSpacingControl (PopupContainer* pParent);
- DECL_LINK(SpacingClickHdl, ToolBox*);
- PopupControl* CreateFontColorPopupControl (PopupContainer* pParent);
- PopupControl* CreateBrushColorPopupControl (PopupContainer* pParent);
- PopupControl* CreateUnderlinePopupControl (PopupContainer* pParent);
- DECL_LINK(ToolBoxFontColorDropHdl, ToolBox *); //for new color picker
- DECL_LINK(ToolBoxHighlightDropHdl, ToolBox *);
- DECL_LINK(ToolBoxUnderlineClickHdl, ToolBox* );
+ virtual ~TextPropertyPanel (void);
void Initialize (void);
void SetupIcons (void);
@@ -265,11 +231,14 @@ private:
DECL_LINK(FontSizeLoseFocus, FontSizeBox *);
DECL_LINK(ToolboxFontSelectHandler, ToolBox *);
DECL_LINK(ToolboxIncDecSelectHdl, ToolBox *);
+ DECL_LINK(ToolBoxUnderlineClickHdl, ToolBox* );
DECL_LINK(ImplPopupModeEndHdl, FloatingWindow* );
+ DECL_LINK(ImplSpacingPopupModeEndHdl, FloatingWindow* ); //
+ DECL_LINK(ToolBoxFontColorDropHdl, ToolBox *);
DECL_LINK(ToolBoxSwScriptSelectHdl, ToolBox *);
DECL_LINK(ToolBoxScriptSelectHdl, ToolBox *);
-
-
+ DECL_LINK(SpacingClickHdl, ToolBox*);
+ DECL_LINK(ToolBoxHighlightDropHdl, ToolBox *);
void TextStyleChanged();
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.src?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.src (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.src Fri Mar 22 13:59:26 2013
@@ -388,14 +388,14 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLIN
DialogControl = TRUE;
Border = FALSE;
- Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_UNDERLINE_WIDTH, 13+ VS_UNDERLINE_HEIGHT + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE);
+ Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH , 13 + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE);
Control VS_UNDERLINE
{
// HelpID = HID_UNDERLINE_VS ;
HelpID = HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS;
Hide = TRUE ;
Pos = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y );
- Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH ,VS_UNDERLINE_HEIGHT);
+ Size = MAP_APPFONT ( 97 , 12 * 10);
TabStop = TRUE ;
Text = "Underline";
};
@@ -403,8 +403,8 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLIN
PushButton PB_OPTIONS
{
HelpID = HID_UNDERLINE_BTN;
- Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y + VS_UNDERLINE_HEIGHT );
- Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH, 13 );
+ Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_LARGE , POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y );
+ Size = MAP_APPFONT ( POPUPPANEL_MARGIN_HORIZONTAL * 2 , 13 );
TabStop = TRUE;
Text [ en-US ] = "~More Options...";
};
@@ -536,14 +536,14 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLIN
};
// //more button bmps
- Bitmap BMP_UNDERLINE_MORE
- {
- File = "symphony/__morebutton.bmp";
- };
- Bitmap BMP_UNDERLINE_MORE_H
- {
- File = "symphony/__morebutton_h.bmp";
- };
+// Bitmap BMP_UNDERLINE_MORE
+// {
+// File = "symphony/morebutton.bmp";
+// };
+// Bitmap BMP_UNDERLINE_MORE_H
+// {
+// File = "symphony/morebutton_h.bmp";
+// };
//tips
String STR_SINGLE
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/tools/ValueSetWithTextControl.cxx?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/tools/ValueSetWithTextControl.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/tools/ValueSetWithTextControl.cxx Fri Mar 22 13:59:26 2013
@@ -34,8 +34,6 @@ ValueSetWithTextControl::ValueSetWithTex
: ValueSet( pParent, rResId )
, meControlType( eControlType )
, maItems()
- , bHaveCus(false)
- , bCusEnable(false)
{
SetColCount( 1 );
}
@@ -45,58 +43,6 @@ ValueSetWithTextControl::~ValueSetWithTe
{
}
-void ValueSetWithTextControl::InsertCustom(Image imgEnable, Image imgDisable, XubString str)
-{
- bHaveCus = true;
- imgCusEnable = imgEnable;
- imgCusDisable = imgDisable;
- strLastCustom = str;
- InsertItem(maItems.size() + 1);
-}
-
-void ValueSetWithTextControl::SetDefaultTip(XubString* pStrList, sal_Bool bRealTip)
-{
- for(sal_uInt16 i=1; i <= maItems.size(); i++)
- {
- //if (bRealTip)
- // SetItemHelpText(i, pStrList[i-1]);
- //else
- SetItemText(i, pStrList[i-1]);
- }
-}
-
-void ValueSetWithTextControl::SetCustomTip(XubString str, sal_Bool bRealTip)
-{
- if(bHaveCus)
- {
- //if (bRealTip)
- // SetItemHelpText(GetItemCount() + 1 , str);
- //else
- SetItemText(maItems.size()+ 1 , str);
- }
-}
-
-void ValueSetWithTextControl::SetCusEnable(bool bEnable)
-{
- bCusEnable = bEnable;
-}
-
-void ValueSetWithTextControl::SetSelItem(sal_uInt16 nSel)
-{
- //nSelItem = nSel;
- //add by wj for sym2_5397
- if(nSel == 0)
- {
- SelectItem(1);
- SetNoSelection();
- }
- else
- {
- SelectItem(nSel);
- GrabFocus();
- }
-}
-
void ValueSetWithTextControl::AddItem(
const Image& rItemImage,
@@ -185,34 +131,7 @@ void ValueSetWithTextControl::UserDraw(
aSize.Height() = (nRectHeight*4)/9;
aFont.SetSize( aSize );
}
- if(nItemId == (maItems.size() + 1) && bHaveCus)
- {
- //Point aStrStart(aBLPos.X() + imgCusEnable.GetSizePixel().Width() + 20 , aBLPos.Y() + nRectHeight/6);
- Rectangle aStrRect = aRect;
- aStrRect.Top() += nRectHeight/6;
- aStrRect.Bottom() -= nRectHeight/6;
- aStrRect.Left() += imgCusEnable.GetSizePixel().Width() + 20;
-
- pDev->SetFillColor( COL_TRANSPARENT );
- pDev->DrawRect(aRect);
-
- if(bCusEnable)
- {
- Point aImgStart(aBLPos.X() + 5, aBLPos.Y() + ( nRectHeight - imgCusEnable.GetSizePixel().Height() ) / 2);
- pDev->DrawImage(aImgStart, imgCusEnable);
- aFont.SetColor(GetSettings().GetStyleSettings().GetFieldTextColor()); //GetSettings().GetStyleSettings().GetHighContrastMode() ? COL_WHITE : COL_BLACKadd for sym2_7246 for high contrast
- }
- else
- {
- Point aImgStart(aBLPos.X() + 5, aBLPos.Y() + ( nRectHeight - imgCusDisable.GetSizePixel().Height() ) / 2);
- pDev->DrawImage(aImgStart, imgCusDisable);
- //Color aCol(155,155,155);
- aFont.SetColor(GetSettings().GetStyleSettings().GetDisableColor());
- }
- pDev->SetFont(aFont);
- pDev->DrawText(aStrRect, strLastCustom, TEXT_DRAW_ENDELLIPSIS); //add by wj for sym2_4049
- }
- else
+
{
//draw backgroud
if ( GetSelectItemId() == nItemId )
Modified: openoffice/branches/sidebar/main/svx/source/svdraw/svdopath.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/svdraw/svdopath.cxx?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/svdraw/svdopath.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/svdraw/svdopath.cxx Fri Mar 22 13:59:26 2013
@@ -1038,8 +1038,8 @@ String ImpPathForDragAndCreate::getSpeci
}
// dx=0.00 dy=0.00 // Beide Seiten Bezier
- // dx=0.00 dy=0.00 l=0.00 0.00? // Anfang oder Ende oder eine Seite Bezier bzw. Hebel
- // dx=0.00 dy=0.00 l=0.00 0.00?/ l=0.00 0.00? // Mittendrin
+ // dx=0.00 dy=0.00 l=0.00 0.00ø // Anfang oder Ende oder eine Seite Bezier bzw. Hebel
+ // dx=0.00 dy=0.00 l=0.00 0.00ø / l=0.00 0.00ø // Mittendrin
XubString aMetr;
Point aBeg(rDrag.GetStart());
Point aNow(rDrag.GetNow());
Modified: openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi Fri Mar 22 13:59:26 2013
@@ -206,13 +206,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi Fri Mar 22 13:59:26 2013
@@ -1446,12 +1446,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi Fri Mar 22 13:59:26 2013
@@ -299,13 +299,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx Fri Mar 22 13:59:26 2013
@@ -428,7 +428,6 @@ void SwAnnotationShell::Exec( SfxRequest
delete pDialog;
}
break;
- case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
{
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -453,10 +452,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx Fri Mar 22 13:59:26 2013
@@ -286,7 +286,6 @@ void SwDrawTextShell::Execute( SfxReques
}
break;
- case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
case SID_CHAR_DLG_FOR_PARAGRAPH:
{
@@ -318,10 +317,6 @@ 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=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/textsh1.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/textsh1.cxx Fri Mar 22 13:59:26 2013
@@ -185,10 +185,6 @@ 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 )
@@ -842,7 +838,6 @@ void SwTextShell::Execute(SfxRequest &rR
// intentionally no break
}
case SID_CHAR_DLG:
- case SID_CHAR_DLG_EFFECT:
{
lcl_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq );
}
Modified: openoffice/branches/sidebar/main/vcl/inc/vcl/button.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/vcl/inc/vcl/button.hxx?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/vcl/inc/vcl/button.hxx (original)
+++ openoffice/branches/sidebar/main/vcl/inc/vcl/button.hxx Fri Mar 22 13:59:26 2013
@@ -204,9 +204,6 @@ public:
void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
const Link& GetToggleHdl() const { return maToggleHdl; }
-
- virtual sal_Bool CustomDraw( sal_uInt16 nButtonStyle, ControlState nState );
-
};
inline void PushButton::Check( sal_Bool bCheck )
Modified: openoffice/branches/sidebar/main/vcl/source/control/button.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/vcl/source/control/button.cxx?rev=1459778&r1=1459777&r2=1459778&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/vcl/source/control/button.cxx (original)
+++ openoffice/branches/sidebar/main/vcl/source/control/button.cxx Fri Mar 22 13:59:26 2013
@@ -1131,17 +1131,6 @@ void PushButton::ImplDrawPushButton( boo
}
sal_Bool bDropDown = ( IsSymbol() && (GetSymbol()==SYMBOL_SPIN_DOWN) && !GetText().Len() );
- ControlState nState = 0;
-
- if ( mbPressed ) nState |= CTRL_STATE_PRESSED;
- if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED ) nState |= CTRL_STATE_PRESSED;
- if ( HasFocus() ) nState |= CTRL_STATE_FOCUSED;
- if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT ) nState |= CTRL_STATE_DEFAULT;
- if ( Window::IsEnabled() ) nState |= CTRL_STATE_ENABLED;
-
- if ( IsMouseOver() && aInRect.IsInside( GetPointerPosPixel() ) )
- nState |= CTRL_STATE_ROLLOVER;
- if( CustomDraw( nButtonStyle, nState ) ) return;
if( bDropDown && (aCtrlType == CTRL_COMBOBOX || aCtrlType == CTRL_LISTBOX ) )
{
@@ -4265,10 +4254,6 @@ TriStateBox::~TriStateBox()
}
// =======================================================================
-sal_Bool PushButton::CustomDraw( sal_uInt16 nButtonStyle, ControlState nState )
-{
- return sal_False;
-}
DisclosureButton::DisclosureButton( Window* pParent, WinBits ) :
CheckBox( pParent, WB_NOBORDER )