You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/03/14 21:00:20 UTC
svn commit: r1456629 [1/3] - in /openoffice/branches/sidebar/main:
default_images/sw/res/sidebar/ default_images/sw/res/sidebar/pageproppanel/
officecfg/registry/data/org/openoffice/Office/UI/ sw/ sw/inc/ sw/sdi/
sw/source/core/doc/ sw/source/ui/app/ s...
Author: orw
Date: Thu Mar 14 20:00:19 2013
New Revision: 1456629
URL: http://svn.apache.org/r1456629
Log:
#121793# - new sidebar panel for page style's properties in Writer
Added:
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.png (with props)
openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png (with props)
openoffice/branches/sidebar/main/sw/inc/SwPanelFactory.hxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.cxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.hxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageMarginControl.cxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageMarginControl.hxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageOrientationControl.cxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageOrientationControl.hxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hrc
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.src
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageSizeControl.cxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageSizeControl.hxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PropertyPanel.hrc
openoffice/branches/sidebar/main/sw/source/ui/sidebar/SwPanelFactory.cxx
Modified:
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
openoffice/branches/sidebar/main/sw/AllLangResTarget_sw.mk
openoffice/branches/sidebar/main/sw/Library_sw.mk
openoffice/branches/sidebar/main/sw/inc/cmdid.h
openoffice/branches/sidebar/main/sw/inc/docsh.hxx
openoffice/branches/sidebar/main/sw/inc/helpid.h
openoffice/branches/sidebar/main/sw/inc/rcid.hrc
openoffice/branches/sidebar/main/sw/inc/swabstdlg.hxx
openoffice/branches/sidebar/main/sw/sdi/_basesh.sdi
openoffice/branches/sidebar/main/sw/sdi/_viewsh.sdi
openoffice/branches/sidebar/main/sw/sdi/swriter.sdi
openoffice/branches/sidebar/main/sw/source/core/doc/docdesc.cxx
openoffice/branches/sidebar/main/sw/source/ui/app/docst.cxx
openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.cxx
openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.hxx
openoffice/branches/sidebar/main/sw/source/ui/fmtui/tmpdlg.cxx
openoffice/branches/sidebar/main/sw/source/ui/inc/tmpdlg.hxx
openoffice/branches/sidebar/main/sw/source/ui/shells/basesh.cxx
openoffice/branches/sidebar/main/sw/source/ui/uiview/viewtab.cxx
openoffice/branches/sidebar/main/sw/source/ui/uno/unofreg.cxx
openoffice/branches/sidebar/main/sw/util/sw.component
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png?rev=1456629&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu (original)
+++ openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu Thu Mar 14 20:00:19 2013
@@ -109,6 +109,20 @@
<value>org.openoffice.comp.Draw.framework.SidebarFactory</value>
</prop>
</node>
+ <node oor:name="SwPanelFactory" oor:op="replace">
+ <prop oor:name="Type">
+ <value>toolpanel</value>
+ </prop>
+ <prop oor:name="Name">
+ <value>SwPanelFactory</value>
+ </prop>
+ <prop oor:name="Module">
+ <value></value>
+ </prop>
+ <prop oor:name="FactoryImplementation">
+ <value>org.apache.openoffice.comp.sw.sidebar.SwPanelFactory</value>
+ </prop>
+ </node>
</node>
</node>
</oor:component-data>
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=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/sidebar/main/sw/AllLangResTarget_sw.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/AllLangResTarget_sw.mk?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/AllLangResTarget_sw.mk (original)
+++ openoffice/branches/sidebar/main/sw/AllLangResTarget_sw.mk Thu Mar 14 20:00:19 2013
@@ -156,6 +156,7 @@ $(eval $(call gb_SrsTarget_add_files,sw/
sw/source/ui/ribbar/tbxanchr.src \
sw/source/ui/ribbar/workctrl.src \
sw/source/ui/shells/shells.src \
+ sw/source/ui/sidebar/PagePropertyPanel.src \
sw/source/ui/smartmenu/stmenu.src \
sw/source/ui/table/chartins.src \
sw/source/ui/table/colwd.src \
Modified: openoffice/branches/sidebar/main/sw/Library_sw.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/Library_sw.mk?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/Library_sw.mk (original)
+++ openoffice/branches/sidebar/main/sw/Library_sw.mk Thu Mar 14 20:00:19 2013
@@ -646,6 +646,12 @@ $(eval $(call gb_Library_add_exception_o
sw/source/ui/shells/txtattr \
sw/source/ui/shells/txtcrsr \
sw/source/ui/shells/txtnum \
+ sw/source/ui/sidebar/PageOrientationControl \
+ sw/source/ui/sidebar/PageMarginControl \
+ sw/source/ui/sidebar/PageSizeControl \
+ sw/source/ui/sidebar/PageColumnControl \
+ sw/source/ui/sidebar/PagePropertyPanel \
+ sw/source/ui/sidebar/SwPanelFactory \
sw/source/ui/smartmenu/stmenu \
sw/source/ui/table/chartins \
sw/source/ui/table/swtablerep \
Added: openoffice/branches/sidebar/main/sw/inc/SwPanelFactory.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/inc/SwPanelFactory.hxx?rev=1456629&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/sw/inc/SwPanelFactory.hxx (added)
+++ openoffice/branches/sidebar/main/sw/inc/SwPanelFactory.hxx Thu Mar 14 20:00:19 2013
@@ -0,0 +1,74 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef SW_SIDEBAR_PANEL_FACTORY_HXX
+#define SW_SIDEBAR_PANEL_FACTORY_HXX
+
+#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include <com/sun/star/ui/XUIElementFactory.hpp>
+
+#include <boost/noncopyable.hpp>
+
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+
+namespace sw { namespace sidebar {
+
+namespace
+{
+ typedef ::cppu::WeakComponentImplHelper1 <
+ css::ui::XUIElementFactory
+ > PanelFactoryInterfaceBase;
+}
+
+
+class SwPanelFactory
+ : private ::boost::noncopyable,
+ private ::cppu::BaseMutex,
+ public PanelFactoryInterfaceBase
+{
+public:
+ static ::rtl::OUString SAL_CALL getImplementationName(void);
+ static cssu::Reference<cssu::XInterface> SAL_CALL createInstance(
+ const cssu::Reference<css::lang::XMultiServiceFactory>& rxFactory);
+ static cssu::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(void);
+
+ SwPanelFactory(void);
+ virtual ~SwPanelFactory(void);
+
+ // XUIElementFactory
+ cssu::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
+ const ::rtl::OUString& rsResourceURL,
+ const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
+ throw(
+ css::container::NoSuchElementException,
+ css::lang::IllegalArgumentException,
+ cssu::RuntimeException );
+};
+
+
+} } // end of namespace sw::sidebar
+
+#endif
Modified: openoffice/branches/sidebar/main/sw/inc/cmdid.h
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/inc/cmdid.h?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/inc/cmdid.h (original)
+++ openoffice/branches/sidebar/main/sw/inc/cmdid.h Thu Mar 14 20:00:19 2013
@@ -64,6 +64,7 @@ Achtung: Ab sofort sind in diesem File k
#define FN_EXTRA2 (SID_SW_START + 2200)
#define FN_PARAM2 (SID_SW_START + 2400)
#define FN_NOTES (SID_SW_START + 2500)
+#define FN_SIDEBAR (SID_SW_START + 2550)
/* More accurately, this range should be from FN_EXTRA2 to FN_PARAM2-1, but
* FN_NUMBER_NEWSTART comes from FN_FORMAT2, and FN_PARAM_LINK_DISPLAY_NAME
@@ -480,7 +481,7 @@ Achtung: Ab sofort sind in diesem File k
#define FN_SET_WIDOW (FN_FORMAT + 36) /* Widows */
#define FN_SET_ORPHAN (FN_FORMAT + 37) /* Orphans */
-
+#define FN_FORMAT_PAGE_SETTING_DLG (FN_FORMAT + 42) /* */
#define FN_REGISTER_COLLECTION (FN_FORMAT + 43) /* Referenzvorlage an der Seite */
#define FN_REGISTER_MODE (FN_FORMAT + 44) /* Registermodus an/aus */
#define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* Zahlenformat in Tabelle */
@@ -1258,11 +1259,11 @@ Achtung: Ab sofort sind in diesem File k
#define FN_IID_COLRIGHT (FN_FRAME + 17)
#define FN_SET_FRM_ALT_NAME (FN_FRAME + 18)
-// --> OD 2009-07-13 #i73249#
#define FN_UNO_TITLE (FN_FRAME + 19)
#define FN_UNO_DESCRIPTION (FN_FRAME + 20)
-// <--
+#define FN_SIDEBAR_PROPERTY (FN_SIDEBAR)
+#define SID_ATTR_SWPAGE_COLUMN (FN_SIDEBAR_PROPERTY + 0)
//Member-Ids fuer Fill/SetVariable an Items
#define MID_STYLE 0xe0
Modified: openoffice/branches/sidebar/main/sw/inc/docsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/inc/docsh.hxx?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/inc/docsh.hxx (original)
+++ openoffice/branches/sidebar/main/sw/inc/docsh.hxx Thu Mar 14 20:00:19 2013
@@ -104,12 +104,21 @@ class SW_DLLPUBLIC SwDocShell: public Sf
// OLE-Geraffel
SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16);
- // Methoden fuer StyleSheets
- SW_DLLPRIVATE sal_uInt16 Edit( const String &rName, const String& rParent, sal_uInt16 nFamily,
- sal_uInt16 nMask, sal_Bool bNew,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bBasic = sal_False );
+ // Methoden fuer StyleSheets
+
+ // @param nSlot
+ // Only used for nFamily == SFX_STYLE_FAMILY_PAGE. Identifies optional Slot by which the edit is triggered.
+ // Used to activate certain dialog pane
+ SW_DLLPRIVATE sal_uInt16 Edit(
+ const String &rName,
+ const String& rParent,
+ const sal_uInt16 nFamily,
+ sal_uInt16 nMask,
+ const sal_Bool bNew,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ const sal_Bool bBasic = sal_False );
+
SW_DLLPRIVATE sal_uInt16 Delete(const String &rName, sal_uInt16 nFamily);
SW_DLLPRIVATE sal_uInt16 ApplyStyles(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0,
sal_uInt16 nMode = 0 );
@@ -245,10 +254,13 @@ public:
void _LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrentDocument );
- // Seitenvorlagedialog anzeigen, ggf. auf Spaltenpage
- void FormatPage( const String& rPage,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0 );
+ // Show page style format dialog
+ // @param nSlot
+ // Identifies slot by which the dialog is triggered. Used to activate certain dialog pane
+ void FormatPage(
+ const String& rPage,
+ const sal_uInt16 nSlot,
+ SwWrtShell& rActShell );
// --> OD 2006-11-07 #i59688#
// linked graphics are now loaded on demand.
Modified: openoffice/branches/sidebar/main/sw/inc/helpid.h
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/inc/helpid.h?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/inc/helpid.h (original)
+++ openoffice/branches/sidebar/main/sw/inc/helpid.h Thu Mar 14 20:00:19 2013
@@ -343,6 +343,27 @@
#define HID_AUTOPILOT_PREV "SW_HID_AUTOPILOT_PREV"
#define HID_AUTOPILOT_OK "SW_HID_AUTOPILOT_OK"
+// sw::sidebar::PagePropertyPanel
+#define HID_SWPAGE_ORIENTATION "HID_SWPAGE_ORIENTATION"
+#define HID_SWPAGE_TBI_ORIENTATION "HID_SWPAGE_TBI_ORIENTATION"
+#define HID_SWPAGE_MARGIN "HID_SWPAGE_MARGIN"
+#define HID_SWPAGE_TBI_MARGIN "HID_SWPAGE_TBI_MARGIN"
+#define HID_SWPAGE_SIZE "HID_SWPAGE_SIZE"
+#define HID_SWPAGE_TBI_SIZE "HID_SWPAGE_TBI_SIZE"
+#define HID_SWPAGE_COLUMN "HID_SWPAGE_COLUMN"
+#define HID_SWPAGE_TBI_COLUMN "HID_SWPAGE_TBI_COLUMN"
+#define HID_SWPAGE_LEFT_MARGIN "HID_SWPAGE_LEFT_MARGIN"
+#define HID_SWPAGE_RIGHT_MARGIN "HID_SWPAGE_RIGHT_MARGIN"
+#define HID_SWPAGE_TOP_MARGIN "HID_SWPAGE_TOP_MARGIN"
+#define HID_SWPAGE_BOTTOM_MARGIN "HID_SWPAGE_BOTTOM_MARGIN"
+#define HID_SWPAGE_SIZE_MORE "HID_SWPAGE_SIZE_MORE"
+#define HID_SWPAGE_COLUMN_MORE "HID_SWPAGE_COLUMN_MORE"
+#define HID_SWPAGE_VS_ORIENTATION "HID_SWPAGE_VS_ORIENTATION"
+#define HID_SWPAGE_VS_MARGIN "HID_SWPAGE_VS_MARGIN"
+#define HID_SWPAGE_VS_SIZE "HID_SWPAGE_VS_SIZE"
+#define HID_SWPAGE_VS_COLUMN "HID_SWPAGE_VS_COLUMN"
+#define HID_PROPERTYPANEL_SWPAGE_SECTION "HID_PROPERTYPANEL_SWPAGE_SECTION"
+
// HelpIds fuers Menue *****************************************************
#define HID_MN_SUB_TBLROW "SW_HID_MN_SUB_TBLROW"
Modified: openoffice/branches/sidebar/main/sw/inc/rcid.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/inc/rcid.hrc?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/inc/rcid.hrc (original)
+++ openoffice/branches/sidebar/main/sw/inc/rcid.hrc Thu Mar 14 20:00:19 2013
@@ -74,6 +74,7 @@
#define RC_UNDO (RC_BASE + 3750)
#define RC_SMARTTAG (RC_BASE + 3950) // SMARTTAGS
#define RC_UNOCORE (RC_BASE + 4050)
+#define RC_PROPERTYPANEL (RC_BASE + 4070)
#define RC_ANNOTATION (RC_BASE + 4150)
/*--------------------------------------------------------------------
@@ -264,4 +265,7 @@
#define RC_UNOCORE_BEGIN RC_UNOCORE
#define RC_UNOCORE_END (RC_UNOCORE + 10)
+// property panel
+#define RC_PROPERTYPANEL_BEGIN RC_PROPERTYPANEL
+#define RC_PROPERTYPANEL_END (RC_PROPERTYPANEL + 10)
#endif
Modified: openoffice/branches/sidebar/main/sw/inc/swabstdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/inc/swabstdlg.hxx?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/inc/swabstdlg.hxx (original)
+++ openoffice/branches/sidebar/main/sw/inc/swabstdlg.hxx Thu Mar 14 20:00:19 2013
@@ -420,14 +420,17 @@ public:
sal_Bool bFmt = sal_False,
sal_uInt16 nDefPage = 0,
const String* pFmtStr = 0) = 0; //add for SwFrmDlg
- virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
- Window* pParent,
- SfxStyleSheetBase& rBase,
- sal_uInt16 nRegion,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bNew = sal_False ) = 0; //add for SwTemplateDlg
- virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
+ // @param nSlot
+ // Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
+ // Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
+ virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+ Window* pParent,
+ SfxStyleSheetBase& rBase,
+ sal_uInt16 nRegion,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ sal_Bool bNew = sal_False ) = 0; //add for SwTemplateDlg
+ virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg
Modified: openoffice/branches/sidebar/main/sw/sdi/_basesh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_basesh.sdi?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_basesh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_basesh.sdi Thu Mar 14 20:00:19 2013
@@ -237,17 +237,23 @@ interface BaseTextSelection
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_FORMAT_PAGE_DLG // status(final|play)
- [
- ExecMethod = ExecDlg ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
+ FN_FORMAT_PAGE_DLG // status(final|play)
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
- FN_FORMAT_PAGE_COLUMN_DLG // status(final|play)
- [
- ExecMethod = ExecDlg ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
+ FN_FORMAT_PAGE_COLUMN_DLG // status(final|play)
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
+ FN_FORMAT_PAGE_SETTING_DLG
+ [
+ ExecMethod = ExecDlg ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
FN_CONVERT_TABLE_TO_TEXT
[
Modified: openoffice/branches/sidebar/main/sw/sdi/_viewsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_viewsh.sdi?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_viewsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_viewsh.sdi Thu Mar 14 20:00:19 2013
@@ -404,6 +404,12 @@ interface BaseTextEditView
ExecMethod = Execute ;
StateMethod = GetState ;
]
+ SID_ATTR_SWPAGE_COLUMN
+ [
+ ExecMethod = ExecTabWin ;
+ StateMethod = StateTabWin ;
+ ]
+
SID_THESAURUS // status(final|play)
[
ExecMethod = ExecLingu ;
Modified: openoffice/branches/sidebar/main/sw/sdi/swriter.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/swriter.sdi?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/swriter.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/swriter.sdi Thu Mar 14 20:00:19 2013
@@ -6349,6 +6349,30 @@ SfxVoidItem PageDialog FN_FORMAT_PAGE_DL
GroupId = GID_FORMAT;
]
+SfxVoidItem PageSettingDialog FN_FORMAT_PAGE_SETTING_DLG
+()
+[
+ /* 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;
+]
+
//--------------------------------------------------------------------------
SfxVoidItem PageDown FN_PAGEDOWN
()
@@ -10287,3 +10311,31 @@ SfxVoidItem CopyHyperlinkLocation FN_COP
ToolBoxConfig = TRUE,
GroupId = GID_EDIT;
]
+
+
+SfxInt16Item SwPageColumn SID_ATTR_SWPAGE_COLUMN
+
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = TRUE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
Modified: openoffice/branches/sidebar/main/sw/source/core/doc/docdesc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/core/doc/docdesc.cxx?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/core/doc/docdesc.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/core/doc/docdesc.cxx Thu Mar 14 20:00:19 2013
@@ -24,6 +24,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
+#include <cmdid.h>
#include <hintids.hxx>
#include <vcl/virdev.hxx>
#include <svx/svdmodel.hxx>
@@ -424,6 +425,17 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, c
{
GetIDocumentUndoRedo().DelAllUndoObj();
}
+
+ SfxBindings* pBindings = GetDocShell() ? GetDocShell()->GetDispatcher()->GetBindings() : 0;
+ if ( pBindings )
+ {
+ pBindings->Invalidate( SID_ATTR_SWPAGE_COLUMN );
+ pBindings->Invalidate( SID_ATTR_PAGE );
+ pBindings->Invalidate( SID_ATTR_PAGE_SIZE );
+ pBindings->Invalidate( SID_ATTR_LONG_ULSPACE );
+ pBindings->Invalidate( SID_ATTR_LONG_LRSPACE );
+ }
+
}
/*************************************************************************
Modified: openoffice/branches/sidebar/main/sw/source/ui/app/docst.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/app/docst.cxx?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/app/docst.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/app/docst.cxx Thu Mar 14 20:00:19 2013
@@ -283,7 +283,7 @@ void SwDocShell::ExecStyleSheet( SfxRequ
if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY,
sal_False, &pItem ))
{
- sal_uInt16 nFamily = ((const SfxUInt16Item*)pItem)->GetValue();
+ const sal_uInt16 nFamily = ((const SfxUInt16Item*)pItem)->GetValue();
String sName;
sal_uInt16 nMask = 0;
@@ -298,7 +298,7 @@ void SwDocShell::ExecStyleSheet( SfxRequ
sal_False, &pItem ))
sParent = ((const SfxStringItem*)pItem)->GetValue();
- nRet = Edit( sName, sParent, nFamily, nMask, sal_True, sal_False, 0, rReq.IsAPI() );
+ nRet = Edit( sName, sParent, nFamily, nMask, sal_True, 0, 0, rReq.IsAPI() );
}
break;
@@ -458,7 +458,7 @@ void SwDocShell::ExecStyleSheet( SfxRequ
switch(nSlot)
{
case SID_STYLE_EDIT:
- nRet = Edit(aParam, aEmptyStr, nFamily, nMask, sal_False, sal_False, pActShell );
+ nRet = Edit(aParam, aEmptyStr, nFamily, nMask, sal_False, 0, pActShell );
break;
case SID_STYLE_DELETE:
nRet = Delete(aParam, nFamily);
@@ -509,9 +509,15 @@ void SwDocShell::ExecStyleSheet( SfxRequ
--------------------------------------------------------------------*/
-sal_uInt16 SwDocShell::Edit( const String &rName, const String &rParent, sal_uInt16 nFamily, sal_uInt16 nMask,
- sal_Bool bNew, sal_Bool bColumn, SwWrtShell* pActShell,
- sal_Bool bBasic )
+sal_uInt16 SwDocShell::Edit(
+ const String &rName,
+ const String &rParent,
+ const sal_uInt16 nFamily,
+ sal_uInt16 nMask,
+ const sal_Bool bNew,
+ const sal_uInt16 nSlot,
+ SwWrtShell* pActShell,
+ const sal_Bool bBasic )
{
ASSERT(GetWrtShell(), "Keine Shell, keine Styles");
SfxStyleSheetBase *pStyle = 0;
@@ -671,14 +677,14 @@ sal_uInt16 SwDocShell::Edit( const Strin
!pCurrShell->getIDocumentDeviceAccess()->getPrinter( false ) )
pCurrShell->InitPrt( pCurrShell->getIDocumentDeviceAccess()->getPrinter( true ) );
- PutItem(SfxUInt16Item(SID_HTML_MODE, nHtmlMode));
- FieldUnit eMetric = ::GetDfltMetric(0 != (HTMLMODE_ON&nHtmlMode));
+ PutItem(SfxUInt16Item(SID_HTML_MODE, nHtmlMode));
+ FieldUnit eMetric = ::GetDfltMetric(0 != (HTMLMODE_ON&nHtmlMode));
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
- SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateTemplateDialog( DLG_TEMPLATE_BASE,
- 0, *(xTmp.get()), nFamily, bColumn,
- pActShell ? pActShell : pWrtShell, bNew);
+ 0, *(xTmp.get()), nFamily, nSlot,
+ pActShell ? pActShell : pWrtShell, bNew);
DBG_ASSERT(pDlg, "Dialogdiet fail!");
if(RET_OK == pDlg->Execute())
{
@@ -1286,9 +1292,12 @@ void SwDocShell::_LoadStyles( SfxObjectS
}
-void SwDocShell::FormatPage( const String& rPage, sal_Bool bColumn, SwWrtShell* pActShell )
+void SwDocShell::FormatPage(
+ const String& rPage,
+ const sal_uInt16 nSlot,
+ SwWrtShell& rActShell )
{
- Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, bColumn, pActShell);
+ Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, nSlot, &rActShell);
}
Bitmap SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode )
Modified: openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.cxx?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.cxx Thu Mar 14 20:00:19 2013
@@ -1295,7 +1295,7 @@ SfxAbstractTabDialog* SwAbstractDialogFa
Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
- sal_Bool bColumn,
+ const sal_uInt16 nSlot,
SwWrtShell* pActShell,
sal_Bool bNew ) //add for SwTemplateDlg
{
@@ -1303,7 +1303,7 @@ SfxAbstractTabDialog* SwAbstractDialogFa
switch ( nResId )
{
case DLG_TEMPLATE_BASE :
- pDlg = new SwTemplateDlg( pParent, rBase, nRegion, bColumn, pActShell, bNew );
+ pDlg = new SwTemplateDlg( pParent, rBase, nRegion, nSlot, pActShell, bNew );
break;
default:
break;
Modified: openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.hxx?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.hxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/dialog/swdlgfact.hxx Thu Mar 14 20:00:19 2013
@@ -498,14 +498,14 @@ public:
sal_Bool bFmt = sal_False,
sal_uInt16 nDefPage = 0,
const String* pFmtStr = 0); //add for SwFrmDlg
- virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
- Window* pParent,
- SfxStyleSheetBase& rBase,
- sal_uInt16 nRegion,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bNew = sal_False ); //add for SwTemplateDlg
- virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
+ virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+ Window* pParent,
+ SfxStyleSheetBase& rBase,
+ sal_uInt16 nRegion,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ sal_Bool bNew = sal_False ); //add for SwTemplateDlg
+ virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell); //add for SwGlossaryDlg
Modified: openoffice/branches/sidebar/main/sw/source/ui/fmtui/tmpdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/fmtui/tmpdlg.cxx?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/fmtui/tmpdlg.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/fmtui/tmpdlg.cxx Thu Mar 14 20:00:19 2013
@@ -106,7 +106,7 @@ extern SW_DLLPUBLIC SwWrtShell* GetActiv
SwTemplateDlg::SwTemplateDlg(Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
- sal_Bool bColumn,
+ const sal_uInt16 nSlot,
SwWrtShell* pActShell,
sal_Bool bNew ) :
SfxStyleDialog( pParent,
@@ -260,15 +260,6 @@ SwTemplateDlg::SwTemplateDlg(Window* p
AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
- // Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen)
-/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase.
- GetItemSet().Get(RES_FRM_SIZE));
- if( !aSize.GetWidth() )
- {
- aSize.SetWidth( DFLT_WIDTH );
- aSize.SetHeight( DFLT_HEIGHT );
- rBase.GetItemSet().Put( aSize );
- }*/
break;
}
// Seitenvorlagen
@@ -277,34 +268,40 @@ SwTemplateDlg::SwTemplateDlg(Window* p
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
- AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)),
- SvxHeaderPage::Create,
- SvxHeaderPage::GetRanges );
- AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)),
- SvxFooterPage::Create,
- SvxFooterPage::GetRanges );
- if(bColumn)
- SetCurPageId(TP_COLUMN);
+ AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)),
+ SvxHeaderPage::Create,
+ SvxHeaderPage::GetRanges );
+ AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)),
+ SvxFooterPage::Create,
+ SvxFooterPage::GetRanges );
+ if ( nSlot == FN_FORMAT_PAGE_COLUMN_DLG )
+ {
+ SetCurPageId(TP_COLUMN);
+ }
+ else if ( nSlot == FN_FORMAT_PAGE_SETTING_DLG )
+ {
+ SetCurPageId(TP_PAGE_STD);
+ }
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");
- AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)),
+ AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)),
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ),
- sal_False,
- 1 ); // nach der Verwalten-Page
- if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell()))
- {
+ sal_False,
+ 1 ); // nach der Verwalten-Page
+ if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell()))
+ {
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
- AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)),
- pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
- AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)),
- SwColumnPage::Create,
- SwColumnPage::GetRanges );
- AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)),
- SwFootNotePage::Create,
- SwFootNotePage::GetRanges );
+ AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)),
+ pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
+ AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)),
+ SwColumnPage::Create,
+ SwColumnPage::GetRanges );
+ AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)),
+ SwFootNotePage::Create,
+ SwFootNotePage::GetRanges );
AddTabPage(TP_TEXTGRID_PAGE, String(SW_RES(STR_PAGE_TEXTGRID)),
SwTextGridPage::Create,
SwTextGridPage::GetRanges );
@@ -314,9 +311,9 @@ SwTemplateDlg::SwTemplateDlg(Window* p
}
- }
- break;
- // Numerierungsvorlagen
+ }
+ break;
+ // Numerierungsvorlagen
case SFX_STYLE_FAMILY_PSEUDO:
{
AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
Modified: openoffice/branches/sidebar/main/sw/source/ui/inc/tmpdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/inc/tmpdlg.hxx?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/inc/tmpdlg.hxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/inc/tmpdlg.hxx Thu Mar 14 20:00:19 2013
@@ -35,26 +35,29 @@ class SwWrtShell;
class SwTemplateDlg: public SfxStyleDialog
{
- sal_uInt16 nType;
- sal_uInt16 nHtmlMode;
- SwWrtShell* pWrtShell;
- sal_Bool bNewStyle;
+ sal_uInt16 nType;
+ sal_uInt16 nHtmlMode;
+ SwWrtShell* pWrtShell;
+ sal_Bool bNewStyle;
- DECL_LINK( NumOptionsHdl, PushButton* );
+ DECL_LINK( NumOptionsHdl, PushButton* );
public:
- SwTemplateDlg( Window* pParent,
- SfxStyleSheetBase& rBase,
- sal_uInt16 nRegion,
- sal_Bool bColumn = sal_False,
- SwWrtShell* pActShell = 0,
- sal_Bool bNew = sal_False );
+ // @param nSlot
+ // Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
+ // Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
+ SwTemplateDlg( Window* pParent,
+ SfxStyleSheetBase& rBase,
+ sal_uInt16 nRegion,
+ const sal_uInt16 nSlot = 0,
+ SwWrtShell* pActShell = 0,
+ sal_Bool bNew = sal_False );
- ~SwTemplateDlg();
- const SfxItemSet* GetRefreshedSet();
+ ~SwTemplateDlg();
+ const SfxItemSet* GetRefreshedSet();
- virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
- virtual short Ok();
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
+ virtual short Ok();
};
Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/basesh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/basesh.cxx?rev=1456629&r1=1456628&r2=1456629&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/basesh.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/basesh.cxx Thu Mar 14 20:00:19 2013
@@ -2450,26 +2450,28 @@ void SwBaseShell::ExecDlg(SfxRequest &rR
if(pArgs)
pArgs->GetItemState( GetPool().GetWhich(nSlot), sal_False, &pItem );
- switch ( nSlot )
- {
- case FN_FORMAT_PAGE_COLUMN_DLG:
- case FN_FORMAT_PAGE_DLG:
- {
- if( !bBackground )
- {
- const sal_uInt16 nCurIdx = rSh.GetCurPageDesc();
- const SwPageDesc& rPageDesc = rSh.GetPageDesc( nCurIdx );
- //temp. View, weil die Shell nach dem Dialog nicht mehr gueltig sein muss
- //z.B. Kopfzeile ausschalten
+ switch ( nSlot )
+ {
+ case FN_FORMAT_PAGE_DLG:
+ case FN_FORMAT_PAGE_COLUMN_DLG:
+ case FN_FORMAT_PAGE_SETTING_DLG:
+ {
+ if( !bBackground )
+ {
+ const sal_uInt16 nCurIdx = rSh.GetCurPageDesc();
+ const SwPageDesc& rPageDesc = rSh.GetPageDesc( nCurIdx );
+ //temp. View, weil die Shell nach dem Dialog nicht mehr gueltig sein muss
+ //z.B. Kopfzeile ausschalten
SwView& rTempView = GetView();
- rTempView.GetDocShell()->FormatPage(rPageDesc.GetName(),
- nSlot == FN_FORMAT_PAGE_COLUMN_DLG,
- &rSh );
+ rTempView.GetDocShell()->FormatPage(
+ rPageDesc.GetName(),
+ nSlot,
+ rSh );
rTempView.InvalidateRulerPos();
- }
- }
- break;
- case FN_FORMAT_BORDER_DLG:
+ }
+ }
+ break;
+ case FN_FORMAT_BORDER_DLG:
{
SfxItemSet aSet( rSh.GetAttrPool(),
RES_BOX , RES_SHADOW,
Added: openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.cxx?rev=1456629&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.cxx (added)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.cxx Thu Mar 14 20:00:19 2013
@@ -0,0 +1,113 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#include "precompiled_sw.hxx"
+
+#include "PageColumnControl.hxx"
+#include "PagePropertyPanel.hxx"
+#include "PagePropertyPanel.hrc"
+
+#include <cmdid.h>
+#include <swtypes.hxx>
+
+#include <svx/sidebar/ValueSetWithTextControl.hxx>
+
+namespace sw { namespace sidebar {
+
+PageColumnControl::PageColumnControl(
+ Window* pParent,
+ PagePropertyPanel& rPanel,
+ const sal_uInt16 nColumnType,
+ const bool bLandscape )
+ : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_COLUMN) )
+ , mpColumnValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_COLUMN) ) )
+ , maMoreButton( this, SW_RES(CB_COLUMN_MORE) )
+ , mnColumnType( nColumnType )
+ , mrPagePropPanel(rPanel)
+{
+ mpColumnValueSet->SetStyle( mpColumnValueSet->GetStyle() | WB_3DLOOK | WB_NO_DIRECTSELECT );
+ mpColumnValueSet->SetColor(GetSettings().GetStyleSettings().GetMenuColor());
+
+ if ( bLandscape )
+ {
+ mpColumnValueSet->AddItem( SW_RES(IMG_ONE_L), 0, SW_RES(STR_ONE), 0 );
+ mpColumnValueSet->AddItem( SW_RES(IMG_TWO_L), 0, SW_RES(STR_TWO), 0 );
+ mpColumnValueSet->AddItem( SW_RES(IMG_THREE_L), 0, SW_RES(STR_THREE), 0 );
+ mpColumnValueSet->AddItem( SW_RES(IMG_LEFT_L), 0, SW_RES(STR_LEFT), 0 );
+ mpColumnValueSet->AddItem( SW_RES(IMG_RIGHT_L), 0, SW_RES(STR_RIGHT), 0 );
+ }
+ else
+ {
+ mpColumnValueSet->AddItem( SW_RES(IMG_ONE), 0, SW_RES(STR_ONE), 0 );
+ mpColumnValueSet->AddItem( SW_RES(IMG_TWO), 0, SW_RES(STR_TWO), 0 );
+ mpColumnValueSet->AddItem( SW_RES(IMG_THREE), 0, SW_RES(STR_THREE), 0 );
+ mpColumnValueSet->AddItem( SW_RES(IMG_LEFT), 0, SW_RES(STR_LEFT), 0 );
+ mpColumnValueSet->AddItem( SW_RES(IMG_RIGHT), 0, SW_RES(STR_RIGHT), 0 );
+ }
+
+ mpColumnValueSet->SetNoSelection();
+ mpColumnValueSet->SetSelectHdl( LINK(this, PageColumnControl,ImplColumnHdl ) );
+ mpColumnValueSet->Show();
+ mpColumnValueSet->SelectItem( mnColumnType );
+ mpColumnValueSet->Format();
+ mpColumnValueSet->StartSelection();
+
+ maMoreButton.SetClickHdl( LINK( this, PageColumnControl, MoreButtonClickHdl_Impl ) );
+ maMoreButton.GrabFocus();
+
+ FreeResource();
+}
+
+
+PageColumnControl::~PageColumnControl(void)
+{
+ delete mpColumnValueSet;
+}
+
+
+IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl)
+{
+ mpColumnValueSet->SetNoSelection();
+ if ( pControl == mpColumnValueSet )
+ {
+ const sal_uInt32 nColumnType = mpColumnValueSet->GetSelectItemId();
+ if ( nColumnType != mnColumnType )
+ {
+ mnColumnType = nColumnType;
+ mrPagePropPanel.ExecuteColumnChange( mnColumnType );
+ }
+ }
+
+ mrPagePropPanel.ClosePageColumnPopup();
+ return 0;
+}
+
+IMPL_LINK(PageColumnControl, MoreButtonClickHdl_Impl, void *, EMPTYARG)
+{
+ mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SFX_CALLMODE_ASYNCHRON );
+
+ mrPagePropPanel.ClosePageColumnPopup();
+ return 0;
+}
+
+
+} } // end of namespace sw::sidebar
+
Added: openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.hxx?rev=1456629&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.hxx (added)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/PageColumnControl.hxx Thu Mar 14 20:00:19 2013
@@ -0,0 +1,67 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef _SW_SIDEBAR_PAGE_COLUMN_CONTROL_HXX_
+#define _SW_SIDEBAR_PAGE_COLUMN_CONTROL_HXX_
+
+#include <svx/sidebar/PopupControl.hxx>
+
+#include <vcl/image.hxx>
+#include <vcl/button.hxx>
+
+#include <vector>
+
+namespace svx { namespace sidebar {
+ class ValueSetWithTextControl;
+} }
+
+namespace sw { namespace sidebar {
+
+class PagePropertyPanel;
+
+
+class PageColumnControl
+ : public ::svx::sidebar::PopupControl
+{
+public:
+ PageColumnControl(
+ Window* pParent,
+ PagePropertyPanel& rPanel,
+ const sal_uInt16 nColumnType,
+ const bool bLandscape );
+
+ ~PageColumnControl(void);
+
+private:
+ ::svx::sidebar::ValueSetWithTextControl* mpColumnValueSet;
+ PushButton maMoreButton;
+
+ sal_uInt16 mnColumnType;
+
+ PagePropertyPanel& mrPagePropPanel;
+
+ DECL_LINK(ImplColumnHdl, void*);
+ DECL_LINK(MoreButtonClickHdl_Impl, void*);
+};
+
+} } // end of namespace sw::sidebar
+
+#endif