From 63ec5317c74d46f2c8d4027a6571402caf262ed5 Mon Sep 17 00:00:00 2001 From: Thomas Benisch Date: Tue, 8 Sep 2009 13:05:14 +0000 Subject: #i12587# Inserting/editing arbitrary text objects in chart --- chart2/source/controller/dialogs/ResourceIds.hrc | 178 ++++++++++----------- .../controller/dialogs/dlg_ShapeParagraph.cxx | 170 ++++++++++---------- .../controller/dialogs/dlg_ShapeParagraph.src | 140 ++++++++-------- 3 files changed, 244 insertions(+), 244 deletions(-) (limited to 'chart2/source/controller/dialogs') diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index a9a4b1611bb6..43123a42a59e 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -1,89 +1,89 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ResourceIds.hrc,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CHART2_RESOURCE_IDS_HRC -#define _CHART2_RESOURCE_IDS_HRC - -//----------------------------------------------------------------------------- -//for strings see Strings.hrc - -//----------------------------------------------------------------------------- -//for Bimaps see Bimaps.hrc and Bimaps_HC.hrc - -//----------------------------------------------------------------------------- -//Dialog Ids: -#define DLG_DIAGRAM_TYPE 743 -#define DLG_CHART_WIZARD 902 -#define DLG_DATA_SOURCE 901 -#define DLG_AXIS_OR_GRID 839 -#define DLG_DATA_DESCR 836 -#define DLG_LEGEND 835 -#define DLG_TITLE 834 -#define DLG_3D_VIEW 752 -#define DLG_OBJECT_PROPERTIES 903 -#define DLG_SPLINE_PROPERTIES 904 -#define DLG_DATA_TRENDLINE 841 -#define DLG_DATA_YERRORBAR 842 -#define DLG_SHAPE_FONT 921 -#define DLG_SHAPE_PARAGRAPH 922 - -//----------------------------------------------------------------------------- -//TabPage Ids: -#define TP_LEGEND_POS 900 -#define TP_DATA_DESCR 901 -#define TP_ALIGNMENT 902 -//#define TP_SYMBOL 906 -#define TP_LAYOUT 907 -#define TP_OPTIONS 908 -#define TP_POLAROPTIONS 909 -#define TP_AXIS_LABEL 920 -#define TP_SCALE 903 -#define TP_AXIS_POSITIONS 904 -#define TP_CHARTTYPE 910 -#define TP_RANGECHOOSER 911 -#define TP_WIZARD_TITLEANDOBJECTS 912 -#define TP_LOCATION 913 -#define TP_DATA_SOURCE 914 - -#define TP_3D_SCENEGEOMETRY 915 -#define TP_3D_SCENEAPPEARANCE 916 -#define TP_3D_SCENEILLUMINATION 917 - -#define TP_TRENDLINE 918 -#define TP_YERRORBAR 919 - -//----------------------------------------------------------------------------- -//listbox Ids: -#define LB_BAR_GEOMETRY 1000 -#define LB_TEXT_SEPARATOR 1001 - -//----------------------------------------------------------------------------- - -#endif +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: ResourceIds.hrc,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CHART2_RESOURCE_IDS_HRC +#define _CHART2_RESOURCE_IDS_HRC + +//----------------------------------------------------------------------------- +//for strings see Strings.hrc + +//----------------------------------------------------------------------------- +//for Bimaps see Bimaps.hrc and Bimaps_HC.hrc + +//----------------------------------------------------------------------------- +//Dialog Ids: +#define DLG_DIAGRAM_TYPE 743 +#define DLG_CHART_WIZARD 902 +#define DLG_DATA_SOURCE 901 +#define DLG_AXIS_OR_GRID 839 +#define DLG_DATA_DESCR 836 +#define DLG_LEGEND 835 +#define DLG_TITLE 834 +#define DLG_3D_VIEW 752 +#define DLG_OBJECT_PROPERTIES 903 +#define DLG_SPLINE_PROPERTIES 904 +#define DLG_DATA_TRENDLINE 841 +#define DLG_DATA_YERRORBAR 842 +#define DLG_SHAPE_FONT 921 +#define DLG_SHAPE_PARAGRAPH 922 + +//----------------------------------------------------------------------------- +//TabPage Ids: +#define TP_LEGEND_POS 900 +#define TP_DATA_DESCR 901 +#define TP_ALIGNMENT 902 +//#define TP_SYMBOL 906 +#define TP_LAYOUT 907 +#define TP_OPTIONS 908 +#define TP_POLAROPTIONS 909 +#define TP_AXIS_LABEL 920 +#define TP_SCALE 903 +#define TP_AXIS_POSITIONS 904 +#define TP_CHARTTYPE 910 +#define TP_RANGECHOOSER 911 +#define TP_WIZARD_TITLEANDOBJECTS 912 +#define TP_LOCATION 913 +#define TP_DATA_SOURCE 914 + +#define TP_3D_SCENEGEOMETRY 915 +#define TP_3D_SCENEAPPEARANCE 916 +#define TP_3D_SCENEILLUMINATION 917 + +#define TP_TRENDLINE 918 +#define TP_YERRORBAR 919 + +//----------------------------------------------------------------------------- +//listbox Ids: +#define LB_BAR_GEOMETRY 1000 +#define LB_TEXT_SEPARATOR 1001 + +//----------------------------------------------------------------------------- + +#endif diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index 4e56aca25563..d57adca58e7c 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -1,79 +1,79 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dlg_ShapeFont.cxx,v $ - * $Revision: 1.0 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_chart2.hxx" - -#include "dlg_ShapeParagraph.hxx" -#include "ResId.hxx" -#include "ResourceIds.hrc" - -#include -#include -#include -#include - -using ::com::sun::star::uno::Reference; -using namespace ::com::sun::star; - -//............................................................................. -namespace chart -{ -//............................................................................. - -ShapeParagraphDialog::ShapeParagraphDialog( Window* pParent, const SfxItemSet* pAttr ) - :SfxTabDialog( pParent, SchResId( DLG_SHAPE_PARAGRAPH ), pAttr ) -{ - FreeResource(); - - SvtCJKOptions aCJKOptions; - - AddTabPage( RID_SVXPAGE_STD_PARAGRAPH ); - AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH ); - if ( aCJKOptions.IsAsianTypographyEnabled() ) - { - AddTabPage( RID_SVXPAGE_PARA_ASIAN ); - } - else - { - RemoveTabPage( RID_SVXPAGE_PARA_ASIAN ); - } - AddTabPage( RID_SVXPAGE_TABULATOR ); -} - -ShapeParagraphDialog::~ShapeParagraphDialog() -{ -} - -void ShapeParagraphDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) -{ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: dlg_ShapeFont.cxx,v $ + * $Revision: 1.0 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_chart2.hxx" + +#include "dlg_ShapeParagraph.hxx" +#include "ResId.hxx" +#include "ResourceIds.hrc" + +#include +#include +#include +#include + +using ::com::sun::star::uno::Reference; +using namespace ::com::sun::star; + +//............................................................................. +namespace chart +{ +//............................................................................. + +ShapeParagraphDialog::ShapeParagraphDialog( Window* pParent, const SfxItemSet* pAttr ) + :SfxTabDialog( pParent, SchResId( DLG_SHAPE_PARAGRAPH ), pAttr ) +{ + FreeResource(); + + SvtCJKOptions aCJKOptions; + + AddTabPage( RID_SVXPAGE_STD_PARAGRAPH ); + AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH ); + if ( aCJKOptions.IsAsianTypographyEnabled() ) + { + AddTabPage( RID_SVXPAGE_PARA_ASIAN ); + } + else + { + RemoveTabPage( RID_SVXPAGE_PARA_ASIAN ); + } + AddTabPage( RID_SVXPAGE_TABULATOR ); +} + +ShapeParagraphDialog::~ShapeParagraphDialog() +{ +} + +void ShapeParagraphDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) +{ SfxAllItemSet aSet( *( GetInputSetImpl()->GetPool() ) ); switch ( nId ) { @@ -84,13 +84,13 @@ void ShapeParagraphDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) rPage.PageCreated( aSet ); } break; - default: - { - } - break; + default: + { + } + break; } -} - -//............................................................................. -} //namespace chart -//............................................................................. +} + +//............................................................................. +} //namespace chart +//............................................................................. diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.src b/chart2/source/controller/dialogs/dlg_ShapeParagraph.src index d927c643666d..b8f0bd92d706 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.src +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.src @@ -1,70 +1,70 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dlg_ShapeFont.src,v $ - * $Revision: 1.0 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include "ResourceIds.hrc" -#include - -TabDialog DLG_SHAPE_PARAGRAPH -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 289 , 176 ) ; - Text [ en-US ] = "Paragraph" ; - Moveable = TRUE ; - Closeable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 3 , 3 ) ; - Size = MAP_APPFONT ( 260 , 135 ) ; - PageList = - { - PageItem - { - Identifier = RID_SVXPAGE_STD_PARAGRAPH ; - Text [ en-US ] = "Indents & Spacing"; - }; - PageItem - { - Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ; - Text [ en-US ] = "Alignment"; - }; - PageItem - { - Identifier = RID_SVXPAGE_PARA_ASIAN ; - Text [ en-US ] = "Asian Typography"; - }; - PageItem - { - Identifier = RID_SVXPAGE_TABULATOR ; - Text [ en-US ] = "Tab"; - }; - }; - }; -}; +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: dlg_ShapeFont.src,v $ + * $Revision: 1.0 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#include "ResourceIds.hrc" +#include + +TabDialog DLG_SHAPE_PARAGRAPH +{ + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 289 , 176 ) ; + Text [ en-US ] = "Paragraph" ; + Moveable = TRUE ; + Closeable = TRUE ; + TabControl 1 + { + OutputSize = TRUE ; + Pos = MAP_APPFONT ( 3 , 3 ) ; + Size = MAP_APPFONT ( 260 , 135 ) ; + PageList = + { + PageItem + { + Identifier = RID_SVXPAGE_STD_PARAGRAPH ; + Text [ en-US ] = "Indents & Spacing"; + }; + PageItem + { + Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ; + Text [ en-US ] = "Alignment"; + }; + PageItem + { + Identifier = RID_SVXPAGE_PARA_ASIAN ; + Text [ en-US ] = "Asian Typography"; + }; + PageItem + { + Identifier = RID_SVXPAGE_TABULATOR ; + Text [ en-US ] = "Tab"; + }; + }; + }; +}; -- cgit