You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by zh...@apache.org on 2013/03/21 21:23:21 UTC
svn commit: r1459509 [1/5] - 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...
Author: zhengfan
Date: Thu Mar 21 20:23:16 2013
New Revision: 1459509
URL: http://svn.apache.org/r1459509
Log: (empty)
Added:
openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextCenter_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextJustified_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextLeft_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextRight_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/DecreaseSpace_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/IncreaseSpace_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent2.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent3.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent4.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_Hanging.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/Outdent_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_15.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_5.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-2.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpsmall-spacing-1.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_15.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_5.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-2.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet01.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet02.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl01.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl02.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth01.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth02.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert01.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert02.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert03.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth01.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth02.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth03.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Indent_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Outdent_16x16.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing1.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing2.png (with props)
openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing3.png (with props)
openoffice/branches/sidebar/main/svtools/inc/svtools/button.hxx (with props)
openoffice/branches/sidebar/main/svtools/source/control/button.cxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextCharacterSpacingControl.hxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextUnderlineControl.cxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextUnderlineControl.hxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextUnderlinePopup.cxx (with props)
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextUnderlinePopup.hxx (with props)
Removed:
openoffice/branches/sidebar/main/default_images/svx/res/rotation.png
openoffice/branches/sidebar/main/default_images/svx/res/rotation_h.png
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextList.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextList.hxx
openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SelectionChangeHandler.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/EmptyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/EmptyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/SelectionAnalyzer.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/SelectionChangeHandler.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/debug/
openoffice/branches/sidebar/main/svx/source/sidebar/possize/
openoffice/branches/sidebar/main/svx/source/sidebar/text/SvxTextFontColorPage.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/SvxTextSpacingPage.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/SvxTextUnderlinePage.cxx
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
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextCenter_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextCenter_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextCenter_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextCenter_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextJustified_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextJustified_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextJustified_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextJustified_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextLeft_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextLeft_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextLeft_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextLeft_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextRight_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextRight_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextRight_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AlignTextRight_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/DecreaseSpace_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/DecreaseSpace_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/DecreaseSpace_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/DecreaseSpace_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/IncreaseSpace_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/IncreaseSpace_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/IncreaseSpace_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/IncreaseSpace_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent2.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent2.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent2.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent2.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent3.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent3.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent3.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent3.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent4.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent4.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent4.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent4.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_Hanging.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_Hanging.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_Hanging.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Indent_Hanging.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Outdent_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/Outdent_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Outdent_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/Outdent_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_15.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_15.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_15.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_15.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_5.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_5.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_5.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-1_5.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-2.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-2.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-2.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpselected-spacing-2.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpsmall-spacing-1.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpsmall-spacing-1.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpsmall-spacing-1.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpsmall-spacing-1.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_15.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_15.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_15.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_15.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_5.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_5.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_5.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-1_5.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-2.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-2.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-2.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/lpspacing-2.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet01.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet01.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet01.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet01.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet02.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet02.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet02.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet02.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl01.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl01.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl01.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl01.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl02.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl02.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl02.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbullet_rtl02.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth01.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth01.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth01.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth01.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth02.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth02.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth02.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_numbulleth02.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert01.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert01.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert01.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert01.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert02.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert02.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert02.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert02.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert03.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert03.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert03.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_vert03.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth01.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth01.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth01.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth01.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth02.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth02.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth02.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth02.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth03.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth03.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth03.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/para_verth03.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Indent_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Indent_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Indent_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Indent_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Outdent_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Outdent_16x16.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Outdent_16x16.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/rte_Outdent_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing1.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing1.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing1.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing1.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing2.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing2.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing2.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing2.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing3.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing3.png?rev=1459509&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing3.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/spacing3.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=1459509&r1=1459508&r2=1459509&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 Thu Mar 21 20:23:16 2013
@@ -197,7 +197,6 @@
<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>
@@ -710,12 +709,12 @@
</prop>
</node>
- <node oor:name="ParagraphPropertyPanel" oor:op="replace">
+ <node oor:name="ParaPropertyPanel" 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>ParagraphPropertyPanel</value>
+ <value>ParaPropertyPanel</value>
</prop>
<prop oor:name="DeckId" oor:type="xs:string">
<value>PropertyDeck</value>
@@ -726,14 +725,14 @@
<prop oor:name="ContextList">
<value oor:separator=";">
Calc, DrawText, visible ;
- DrawImpress, 3DObject, visible ;
+ DrawImpress, 3DObject, hidden ;
DrawImpress, Draw, hidden ;
DrawImpress, DrawText, visible ;
DrawImpress, Graphic, hidden ;
DrawImpress, Table, visible ;
DrawImpress, TextObject, visible ;
- DrawImpress, 3DObject, visible ;
- Writer, Annotation, visible ;
+ DrawImpress, 3DObject, hidden ;
+ Writer, Annotation, hidden ;
Writer, DrawText, visible ;
Writer, Table, visible ;
Writer, Text, visible ;
@@ -741,7 +740,7 @@
</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
- <value>private:resource/toolpanel/SvxPanelFactory/Debug_NotYetImplementedPanel</value>
+ <value>private:resource/toolpanel/SvxPanelFactory/ParaPropertyPanel</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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/cellsh.sdi Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/drtxtob.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/drtxtob.sdi Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/editsh.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/editsh.sdi Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob.cxx Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob1.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drtxtob1.cxx Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/inc/drtxtob.hxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/inc/drtxtob.hxx Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/editsh.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/editsh.cxx Thu Mar 21 20:23:16 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
Modified: openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi?rev=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi (original)
+++ openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/outlnvsh.sdi (original)
+++ openoffice/branches/sidebar/main/sd/sdi/outlnvsh.sdi Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/func/fuchar.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/func/fuchar.cxx Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/drviews8.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/drviews8.cxx Thu Mar 21 20:23:16 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/outlnvs2.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/outlnvs2.cxx Thu Mar 21 20:23:16 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 ) );
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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx (original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx Thu Mar 21 20:23:16 2013
@@ -239,6 +239,7 @@ 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svtools/Library_svt.mk (original)
+++ openoffice/branches/sidebar/main/svtools/Library_svt.mk Thu Mar 21 20:23:16 2013
@@ -127,6 +127,7 @@ $(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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svtools/Package_inc.mk (original)
+++ openoffice/branches/sidebar/main/svtools/Package_inc.mk Thu Mar 21 20:23:16 2013
@@ -35,6 +35,7 @@ $(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))
Added: openoffice/branches/sidebar/main/svtools/inc/svtools/button.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svtools/inc/svtools/button.hxx?rev=1459509&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svtools/inc/svtools/button.hxx (added)
+++ openoffice/branches/sidebar/main/svtools/inc/svtools/button.hxx Thu Mar 21 20:23:16 2013
@@ -0,0 +1,145 @@
+#include <vcl/button.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/bmpacc.hxx>
+#include "svtools/svtdllapi.h"
+
+namespace SidebarCustomButton
+{
+ typedef ::PushButton BitmapButtonBase;
+
+ #define GetHighContrastBkColor GetWindowColor
+ #define GetHighContrastFgColor GetWindowTextColor
+
+ template<class TPDst>
+ TPDst type_cast( ... )
+ {
+ return NULL;
+ }
+
+ template<class TPDst>
+ TPDst type_cast( const TPDst pSrc )
+ {
+ return static_cast<TPDst>( pSrc );
+ }
+
+ inline const Color GetHighContrastColor( const Color &rBkColor, const Color &rFgColor, const Color & rBlackWhiteColor )
+ {
+ typedef long double LONGDOUBLE;
+ return Color(
+ LONGDOUBLE(rBlackWhiteColor.GetRed())/255*rFgColor.GetRed() + (1-LONGDOUBLE(rBlackWhiteColor.GetRed())/255)*rBkColor.GetRed() + 0.5,
+ LONGDOUBLE(rBlackWhiteColor.GetGreen())/255*rFgColor.GetGreen() + (1-LONGDOUBLE(rBlackWhiteColor.GetGreen())/255)*rBkColor.GetGreen() + 0.5,
+ LONGDOUBLE(rBlackWhiteColor.GetBlue())/255*rFgColor.GetBlue() + (1-LONGDOUBLE(rBlackWhiteColor.GetBlue())/255)*rBkColor.GetBlue() + 0.5
+ );
+ }
+
+ #define CHKPARAM(r) if( const Bitmap *pBmp = type_cast<const Bitmap*>(&r) ){ if(m_anOrgBmp.IsEmpty()) m_anOrgBmp = *pBmp; } else if( const ResId *pResId = type_cast<const ResId*>(&r) ){ if(m_anOrgBmp.IsEmpty()) m_anOrgBmp = *pResId; }
+ #define PASS_CONSTRUCT_PARAMETER(theClass, baseClass) \
+ theClass():m_crBk(0,0,0),m_crFg(255,255,255){}\
+ template< class T1 >\
+ theClass( T1 & rt1 ):baseClass( rt1 ),m_crBk(0,0,0),m_crFg(255,255,255){CHKPARAM(rt1)}\
+ template< class T1 >\
+ theClass( const T1 & rt1 ):baseClass( rt1 ),m_crBk(0,0,0),m_crFg(255,255,255){CHKPARAM(rt1)}\
+ template< class T1, class T2 >\
+ theClass( T1 & rt1, T2 & rt2 ):baseClass( rt1, rt2 ),m_crBk(0,0,0),m_crFg(255,255,255){CHKPARAM(rt1)CHKPARAM(rt2)}\
+ template< class T1, class T2 >\
+ theClass( const T1 & rt1,const T2 & rt2 ):baseClass( rt1, rt2 ),m_crBk(0,0,0),m_crFg(255,255,255){CHKPARAM(rt1)CHKPARAM(rt2)}\
+ template< class T1, class T2, class T3 >\
+ theClass( T1 & rt1, T2 &rt2, T3 & rt3 ):baseClass( rt1, rt2, rt3 ),m_crBk(0,0,0),m_crFg(255,255,255){CHKPARAM(rt1)CHKPARAM(rt2)CHKPARAM(rt3)}\
+ template< class T1, class T2, class T3 >\
+ theClass( const T1 & rt1, const T2 &rt2, const T3 & rt3 ):baseClass( rt1, rt2, rt3 ),m_crBk(0,0,0),m_crFg(255,255,255){CHKPARAM(rt1)CHKPARAM(rt2)CHKPARAM(rt3)}
+
+ struct ImageH
+ {
+ Bitmap m_anOrgBmp;
+ Image m_anImage;
+ mutable Image m_anImageH;
+ mutable Color m_crBk,m_crFg;
+ PASS_CONSTRUCT_PARAMETER( ImageH, m_anImage )
+ operator const Image &() const;
+ operator const Image &();
+ };
+
+ struct BitmapH
+ {
+ Bitmap m_anOrgBmp;
+ mutable Bitmap m_aBmpH;
+ mutable Color m_crBk,m_crFg;
+ PASS_CONSTRUCT_PARAMETER( BitmapH, m_anOrgBmp )
+ operator const Bitmap&() const;
+ operator const Bitmap&();
+ operator Bitmap&();
+ sal_Bool IsEmpty(){ return m_anOrgBmp.IsEmpty(); }
+ void Mirror( sal_uInt64 nFlags ){ m_anOrgBmp.Mirror( nFlags ); }
+ };
+
+ struct ImageList: ::ImageList
+ {
+ ImageList( const Bitmap& rBitmap, const Color& rColor,
+ sal_uInt16 nInitSize );
+ ImageList(){}
+ };
+
+ struct ImageListH:public ImageList
+ {
+ Bitmap m_anOrgBmp;
+ mutable Color m_crBk,m_crFg;
+ PASS_CONSTRUCT_PARAMETER( ImageListH, ImageList )
+ Image GetImage( sal_uInt16 nId );
+ };
+
+
+
+ class SVT_DLLPUBLIC BitmapButton:public BitmapButtonBase
+ {
+ private:
+ ImageList m_anImgList;
+ ImageListH m_anImgList_h;
+ Point m_pt4Img;
+ Size m_szProperSizePixel;
+ Color m_crBkGround;
+ // Copy assignment is forbidden and not implemented.
+ SVT_DLLPRIVATE BitmapButton( const BitmapButton & );
+ SVT_DLLPRIVATE BitmapButton & operator= ( const BitmapButton & );
+ protected:
+ void SetPt4Img( const Point &rNewPt ){ m_pt4Img = rNewPt; Rectangle rc = GetFocusRect(); rc.SetPos( rNewPt ); SetFocusRect( rc ); }
+ const Point &GetPt4Img(){ return m_pt4Img; }
+ const Color & GetBkColor(){ return m_crBkGround; }
+ void SetBkColor( const Color & rColor ){ m_crBkGround = rColor; }
+ public:
+ BitmapButton( Window *pParent, const ResId& rResId, const Bitmap &rBmp, const Bitmap &rBmp_h );
+ //void Paint( const Rectangle &rRect );
+ virtual sal_Bool CustomDraw( sal_uInt16 nButtonStyle, ControlState nState );
+ virtual Size GetProperSizePixel(){ return m_szProperSizePixel; }
+
+ sal_Bool IsMouseIn()
+ {
+ return IsMouseOver();//Rectangle( GetPosPixel(), GetOutputSizePixel() ).IsInside( GetPointerPosPixel() );
+ }
+ };
+
+ class SVT_DLLPUBLIC HoverButton:public BitmapButton
+ {
+ Color m_defBkGround;
+ Color m_HoverBkGround;
+ Color m_HoverTxtColor;
+// Image m_defImg;
+// Image m_hImg;
+// Point m_pt4Img;
+// Size m_ImgSizePixel;
+
+ // Copy assignment is forbidden and not implemented.
+ SVT_DLLPRIVATE HoverButton( const HoverButton & );
+ SVT_DLLPRIVATE HoverButton & operator= ( const HoverButton & );
+
+ public:
+ HoverButton( Window *pParent, const ResId& rResId, const Bitmap &rBmp, const Bitmap &rBmp_h );
+ virtual Size GetProperSizePixel(){ return GetOutputSizePixel();}
+ virtual sal_Bool CustomDraw( sal_uInt16 nButtonStyle, ControlState nState );
+ void SetIcoPosX( long nX);
+ void SetDefBkColor ( const Color & rColor ){ m_defBkGround = rColor; } //User must set this color
+ void SetHoverBkColor ( const Color & rColor ){ m_HoverBkGround = rColor; }//User must set this color
+ void SetHoverTxtColor ( const Color & rColor ){ m_HoverTxtColor = rColor; }//User must set this color
+ };
+
+}
+
Propchange: openoffice/branches/sidebar/main/svtools/inc/svtools/button.hxx
------------------------------------------------------------------------------
svn:executable = *
Added: openoffice/branches/sidebar/main/svtools/source/control/button.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svtools/source/control/button.cxx?rev=1459509&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svtools/source/control/button.cxx (added)
+++ openoffice/branches/sidebar/main/svtools/source/control/button.cxx Thu Mar 21 20:23:16 2013
@@ -0,0 +1,257 @@
+#include <svtools/button.hxx>
+#include <limits>
+
+namespace SidebarCustomButton
+{
+ void GetHighContrastBmp( const Color &rBk, const Color &rFg, const Bitmap &rBmpSrc, Bitmap &rBmpDst )
+ {
+ //can not use rBmpDst=rBmpSrc
+ if ( rBmpDst.GetSizePixel() != rBmpSrc.GetSizePixel() )
+ {
+ //rBmpDst.SetEmpty();
+ rBmpDst.~Bitmap();
+ new( &rBmpDst ) Bitmap( rBmpSrc.GetSizePixel(), /*24*/rBmpSrc.GetBitCount() );
+ }
+
+ if( BitmapReadAccess* pReadAcc = const_cast<Bitmap*>(&rBmpSrc)->AcquireReadAccess() )
+ {
+ if( BitmapWriteAccess* pWriteAcc = rBmpDst.AcquireWriteAccess() )
+ {
+ const long nWidth = pReadAcc->Width();
+ const long nHeight = pReadAcc->Height();
+ sal_Bool bDstHasPalette = pWriteAcc->HasPalette();
+
+ for ( long i=0L; i<nWidth; i++ )
+ {
+ for ( long j=0L; j<nHeight; j++ )
+ {
+ //if( bDstHasPalette )
+ //{
+ // pWriteAcc->SetPixel( j, i, pReadAcc->GetPixel( j, i ) );
+ // pWriteAcc->SetPaletteColor( pReadAcc->GetPixel( j, i ).GetIndex(), GetHighContrastColor( rBk, rFg, pReadAcc->GetColor(j,i) ) );
+ //}
+ //else
+ pWriteAcc->SetPixel( j, i, GetHighContrastColor( rBk, rFg, pReadAcc->GetColor(j,i) ) );
+ }
+ }
+
+ rBmpDst.ReleaseAccess( pWriteAcc );
+ }
+
+ const_cast<Bitmap*>(&rBmpSrc)->ReleaseAccess( pReadAcc );
+ }
+ }
+
+ ImageList::ImageList( const Bitmap& rBitmap, const Color& rColor, sal_uInt16 nInitSize )
+ {
+ Size sz = rBitmap.GetSizePixel();
+
+ for ( sal_Int16 i=0; i<nInitSize; i++ )
+ {
+ Size szTmp( sz.Width()/nInitSize, sz.Height() );
+ Bitmap aBmp( szTmp, rBitmap.GetBitCount() );
+ aBmp.CopyPixel( Rectangle( Point(0,0 ), szTmp ), Rectangle( Point(szTmp.Width()*i,0 ), szTmp ), &rBitmap );
+ this->AddImage( i+1, Image( aBmp, rColor ) );
+ }
+ }
+
+ Image ImageListH::GetImage( sal_uInt16 nId )
+ {
+ const StyleSettings & rSettings = Application::GetSettings().GetStyleSettings();
+ const Color & rcrBk = rSettings.GetHighContrastBkColor();
+ const Color & rcrFg = rSettings.GetHighContrastFgColor();
+
+ if( rcrBk!=m_crBk || rcrFg!=m_crFg )
+ {
+ m_crBk = rcrBk;
+ m_crFg = rcrFg;
+
+ if( !m_anOrgBmp.IsEmpty() )
+ {
+ Bitmap aBmpTmp;
+ GetHighContrastBmp( m_crBk, m_crFg, m_anOrgBmp, aBmpTmp );
+ Bitmap aSavedBmp = m_anOrgBmp;
+ sal_uInt16 nCount = GetImageCount();
+ this->~ImageListH();
+ new( const_cast<ImageListH*>(this) ) ImageListH( aBmpTmp, GetHighContrastColor( rcrBk, rcrFg, Color(255,0,255 ) ), nCount );
+ m_crBk = rcrBk;
+ m_crFg = rcrFg;
+ m_anOrgBmp = aSavedBmp;
+ }
+ }
+
+ return ImageList::GetImage( nId );
+ }
+
+
+ BitmapH::operator const Bitmap &() const
+ {
+ if ( m_aBmpH.IsEmpty() )
+ {
+ m_aBmpH = m_anOrgBmp;
+ m_crBk = Color(0,0,0);
+ m_crFg = Color(255,255,255);
+ }
+
+ const StyleSettings & rSettings = Application::GetSettings().GetStyleSettings();
+ const Color & rcrBk = rSettings.GetHighContrastBkColor();
+ const Color & rcrFg = rSettings.GetHighContrastFgColor();
+
+ if( rcrBk!=m_crBk || rcrFg!=m_crFg )
+ {
+ m_crBk = rcrBk;
+ m_crFg = rcrFg;
+ GetHighContrastBmp( m_crBk, m_crFg, m_anOrgBmp, m_aBmpH );
+ }
+
+ return m_aBmpH;
+ }
+
+ BitmapH::operator const Bitmap&()
+ {
+ return *static_cast<const BitmapH*>(this);
+ }
+
+ BitmapH::operator Bitmap&()
+ {
+ return m_anOrgBmp;
+ }
+
+ ImageH::operator const Image&() const
+ {
+ if ( m_anImageH.GetBitmapEx().IsEmpty() )
+ {
+ m_anImageH = m_anImage;
+ m_crBk = Color(0,0,0);
+ m_crFg = Color(255,255,255);
+ }
+
+ const StyleSettings & rSettings = Application::GetSettings().GetStyleSettings();
+ const Color & rcrBk = rSettings.GetHighContrastBkColor();
+ const Color & rcrFg = rSettings.GetHighContrastFgColor();
+
+ if( rcrBk!=m_crBk || rcrFg!=m_crFg )
+ {
+ m_crBk = rcrBk;
+ m_crFg = rcrFg;
+ Bitmap aBmpTmp;
+ //not use GetHighContrastBmp( m_crBk, m_crFg, m_anImage.GetBitmap(), aBmpTmp );, will cause pWriteAcc->HasPalette() problem
+ GetHighContrastBmp( m_crBk, m_crFg, m_anOrgBmp, aBmpTmp );
+ m_anImageH = Image( aBmpTmp, GetHighContrastColor( m_crBk, m_crFg, Color(255,0,255) ) );
+ }
+
+
+ return m_anImageH;
+ }
+
+ ImageH::operator const Image &()
+ {
+ return *static_cast<const ImageH*>(this);
+ }
+
+ sal_Bool BitmapButton::CustomDraw( sal_uInt16 nButtonStyle, ControlState nState )
+ {
+
+ // PushButton::Paint( rRect );
+ Size sz = m_szProperSizePixel;
+ sal_uInt16 nId = 0U;
+
+ if( ~nState & CTRL_STATE_ENABLED )
+ nId = 4U;
+ else if ( nState & CTRL_STATE_ROLLOVER )
+ if ( nState & CTRL_STATE_PRESSED )
+ nId = 3U;
+ else
+ nId = 2u;
+ else
+ nId = 1u;
+
+ //SCTRACEA( __FUNCTION__"nId=%d", static_cast<int>(nId) );
+
+ SetFillColor( GetBkColor() );
+ SetLineColor( GetBkColor() );
+ DrawRect( Rectangle( m_pt4Img, sz ) );
+ DrawImage( m_pt4Img, sz, Application::GetSettings().GetStyleSettings().GetHighContrastMode()? m_anImgList_h.GetImage( nId ) : m_anImgList.GetImage( nId ) );
+
+ if( nState & CTRL_STATE_FOCUSED )
+ {
+ Rectangle rcFocus( m_pt4Img, sz );
+ rcFocus.Left()++, rcFocus.Top()++, rcFocus.Right()--, rcFocus.Bottom()--;
+ SetFocusRect( rcFocus );
+ ShowFocus( GetFocusRect() );
+ }
+
+ return sal_True;
+ }
+
+ BitmapButton::BitmapButton( Window *pParent, const ResId& rResId, const Bitmap &rBmp, const Bitmap & rBmp_h )
+ :BitmapButtonBase( pParent, rResId ), m_pt4Img( 0, 0 ), m_anImgList( rBmp, Color( 255, 0, 255 ), 4 ), m_anImgList_h( rBmp_h, Color( 255, 0, 255 ), 4 ),
+ m_crBkGround( COL_TRANSPARENT )
+ {
+ m_szProperSizePixel = rBmp.GetSizePixel();
+ m_szProperSizePixel.Width() /= 4;
+
+ SetFocusRect( Rectangle(Point(0,0), GetProperSizePixel() ) );
+ }
+
+ //============================= Hover Button ===============================
+//
+ HoverButton::HoverButton( Window *pParent, const ResId& rResId, const Bitmap &rBmp, const Bitmap &rBmp_h ):
+ BitmapButton( pParent,rResId, rBmp, rBmp_h)
+ {
+ }
+
+ sal_Bool HoverButton::CustomDraw( sal_uInt16 nButtonStyle, ControlState nState )
+ {
+ Size sz = GetSizePixel();
+ Rectangle rc( Point(0,0), sz );
+ Color crFillOld = GetFillColor();
+ Color crLineOld = GetLineColor();
+ sal_Bool bMouseIn = IsMouseOver();
+ Color aBkColor = bMouseIn ? m_HoverBkGround : m_defBkGround;
+ SetFillColor( aBkColor );
+ SetLineColor( m_defBkGround );
+ DrawRect( rc );
+
+ /*
+ SetLineColor( aBkColor );
+ DrawRect( Rectangle( m_pt4Img, m_ImgSizePixel ) );
+ DrawImage( m_pt4Img, m_ImgSizePixel, Application::GetSettings().GetStyleSettings().GetHighContrastMode()? m_hImg : m_defImg );*/
+ BitmapButton::CustomDraw( nButtonStyle, nState );
+
+ sz = BitmapButton::GetProperSizePixel();
+ const Point & rPt4Img = GetPt4Img();
+ long nTxtHeight = GetTextHeight();
+ Point aTxtPt( rPt4Img.X() + sz.Width() + 3, rPt4Img.Y() + sz.Height()/2 - nTxtHeight/2 - 1 );
+
+ Color crOldText = GetTextColor();
+ if( bMouseIn ) SetTextColor( m_HoverTxtColor );
+ DrawText( Rectangle(aTxtPt, Point( rPt4Img.X() + rc.getWidth() -3, aTxtPt.Y() + nTxtHeight ) ), GetText(),
+ TEXT_DRAW_ENDELLIPSIS|TEXT_DRAW_MNEMONIC|(IsEnabled()?0:TEXT_DRAW_DISABLE) ); //sym2_3092
+
+
+ if( nState & CTRL_STATE_FOCUSED )
+ {
+ Size aFocusSize = CalcMinimumSize();
+ aFocusSize.Width() += 3;
+ Rectangle rcFocus( rPt4Img, aFocusSize );
+ rcFocus.Left()++, rcFocus.Top()++, rcFocus.Right()--, rcFocus.Bottom()--;
+ SetFocusRect( rcFocus );
+ ShowFocus( GetFocusRect() );
+ }
+
+ SetTextColor( crOldText );
+ SetFillColor( crFillOld );
+ SetLineColor( crLineOld );
+ return sal_True;
+ }
+
+ void HoverButton::SetIcoPosX( long nX)
+ {
+ //long nY = (GetOutputSizePixel().Height() - m_ImgSizePixel.Height()) / 2;
+
+ long nY = (GetProperSizePixel().Height() - BitmapButton::GetProperSizePixel().Height()) / 2;
+ SetPt4Img( Point( nX, nY ) );
+ }
+
+}
Propchange: openoffice/branches/sidebar/main/svtools/source/control/button.cxx
------------------------------------------------------------------------------
svn:executable = *
Modified: openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk?rev=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk (original)
+++ openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk Thu Mar 21 20:23:16 2013
@@ -83,6 +83,7 @@ $(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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/Library_svx.mk (original)
+++ openoffice/branches/sidebar/main/svx/Library_svx.mk Thu Mar 21 20:23:16 2013
@@ -178,7 +178,14 @@ $(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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc Thu Mar 21 20:23:16 2013
@@ -396,6 +396,10 @@
#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 ------------------------------------------------------------------
@@ -977,6 +981,12 @@
#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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ValueSetWithTextControl.hxx (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ValueSetWithTextControl.hxx Thu Mar 21 20:23:16 2013
@@ -85,6 +85,15 @@ 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
@@ -99,6 +108,11 @@ 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc Thu Mar 21 20:23:16 2013
@@ -373,6 +373,8 @@
#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)
@@ -1270,6 +1272,7 @@
#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)
@@ -1280,7 +1283,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_ATTR_TRANSFORM_MATRIX + 1)
+#define SID_SVX_FIRSTFREE (SID_CHAR_DLG_EFFECT + 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/sdi/svx.sdi (original)
+++ openoffice/branches/sidebar/main/svx/sdi/svx.sdi Thu Mar 21 20:23:16 2013
@@ -3883,6 +3883,30 @@ 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
@@ -15634,6 +15658,60 @@ 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=1459509&r1=1459508&r2=1459509&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx Thu Mar 21 20:23:16 2013
@@ -22,6 +22,7 @@
#include "sidebar/PanelFactory.hxx"
#include "text/TextPropertyPanel.hxx"
+#include "paragraph/ParaPropertyPanel.hxx"
#include "area/AreaPropertyPanel.hxx"
#include "graphic/GraphicPropertyPanel.hxx"
#include "line/LinePropertyPanel.hxx"
@@ -141,6 +142,16 @@ 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);