Attachment #51660 for issue #14893

View | Details | Raw Unified | Return to issue 14893
Collapse All | Expand All

Lines 1439-1444 Link Here

(-)officecfg.clean/registry/data/org/openoffice/Office/UI/CalcCommands.xcu (+8 lines)
1439	<value xml:lang="en-US">E-mail as ~OpenDocument Spreadsheet...</value>	1439	<value xml:lang="en-US">E-mail as ~OpenDocument Spreadsheet...</value>
1440	</prop>	1440	</prop>
1441	</node>	1441	</node>
		1442	<node oor:name=".uno:ToggleSheetGrid" oor:op="replace">
		1443	<prop oor:name="Label" oor:type="xs:string">
		1444	<value xml:lang="en-US">Toggle Grid Lines for Current Sheet</value>
		1445	</prop>
		1446	<prop oor:name="Properties" oor:type="xs:int">
		1447	<value>1</value>
		1448	</prop>
		1449	</node>
1442	</node>	1450	</node>
1443	<node oor:name="Popups">	1451	<node oor:name="Popups">
1444	<node oor:name=".uno:AuditMenu" oor:op="replace">	1452	<node oor:name=".uno:AuditMenu" oor:op="replace">

Lines 162-167 class ScAutoNameCache; Link Here

(-)sc.clean/inc/document.hxx (+3 lines)
162	class ScTemporaryChartLock;	162	class ScTemporaryChartLock;
163	class ScLookupCache;	163	class ScLookupCache;
164	struct ScLookupCacheMapImpl;	164	struct ScLookupCacheMapImpl;
		165	struct ScTableViewOptions;
165		166
166	namespace com { namespace sun { namespace star {	167	namespace com { namespace sun { namespace star {
167	namespace lang {	168	namespace lang {
Lines 1703-1708 public: Link Here
1703	/// an ID unique to each document instance	1704	/// an ID unique to each document instance
1704	sal_uInt32 GetDocumentID() const;	1705	sal_uInt32 GetDocumentID() const;
1705		1706
		1707	ScTableViewOptions* GetTableViewOptions( SCTAB nTab ) const;
		1708
1706	void InvalidateStyleSheetUsage()	1709	void InvalidateStyleSheetUsage()
1707	{ bStyleSheetUsageInvalid = TRUE; }	1710	{ bStyleSheetUsageInvalid = TRUE; }
1708	void GetSortParam( ScSortParam& rParam, SCTAB nTab );	1711	void GetSortParam( ScSortParam& rParam, SCTAB nTab );

Lines 821-826 Link Here

(-)sc.clean/inc/sc.hrc (+1 lines)
821	#define FID_TAB_APPEND (TAB_POPUP_START+5)	821	#define FID_TAB_APPEND (TAB_POPUP_START+5)
822	#define FID_TAB_INDEX (TAB_POPUP_START+6)	822	#define FID_TAB_INDEX (TAB_POPUP_START+6)
823	#define FID_TAB_RTL (TAB_POPUP_START+7)	823	#define FID_TAB_RTL (TAB_POPUP_START+7)
824	#define FID_TAB_USE_R1C1 (TAB_POPUP_START+8)	824	#define FID_TAB_USE_R1C1 (TAB_POPUP_START+8)
		825	#define FID_TAB_TOGGLE_GRID (TAB_POPUP_START+9)
825		826
826	#define TAB_POPUP_END (DATA_MENU_END + 20)	827	#define TAB_POPUP_END (DATA_MENU_END + 20)
827		828

Lines 37-42 Link Here

(-)sc.clean/inc/table.hxx (+5 lines)
37	#define SC_TABLE_HXX	37	#define SC_TABLE_HXX
38		38
39	#include <vector>	39	#include <vector>
		40	#include <memory>
40		41
41	#ifndef _GEN_HXX //autogen	42	#ifndef _GEN_HXX //autogen
42	#include <tools/gen.hxx>	43	#include <tools/gen.hxx>
Lines 89-94 class ScIndexMap; Link Here
89	struct RowInfo;	90	struct RowInfo;
90	struct ScFunctionData;	91	struct ScFunctionData;
91	struct ScLineFlags;	92	struct ScLineFlags;
		93	struct ScTableViewOptions;
92	class CollatorWrapper;	94	class CollatorWrapper;
93		95
94		96
Lines 166-171 private: Link Here
166	USHORT nScenarioFlags;	168	USHORT nScenarioFlags;
167	BOOL bActiveScenario;	169	BOOL bActiveScenario;
168		170
		171	::std::auto_ptr<ScTableViewOptions> pViewOptions;
		172
169	friend class ScDocument; // fuer FillInfo	173	friend class ScDocument; // fuer FillInfo
170	friend class ScDocumentIterator;	174	friend class ScDocumentIterator;
171	friend class ScValueIterator;	175	friend class ScValueIterator;
Lines 183-188 public: Link Here
183	BOOL bColInfo = TRUE, BOOL bRowInfo = TRUE );	187	BOOL bColInfo = TRUE, BOOL bRowInfo = TRUE );
184	~ScTable();	188	~ScTable();
185		189
		190	ScTableViewOptions* GetViewOptions();
186	ScOutlineTable* GetOutlineTable() { return pOutlineTable; }	191	ScOutlineTable* GetOutlineTable() { return pOutlineTable; }
187		192
188	ULONG GetCellCount() const;	193	ULONG GetCellCount() const;

Lines 69-75 Link Here

(-)sc.clean/inc/ViewSettingsSequenceDefines.hxx (-1 / +2 lines)
69	// this are the defines for the position of the settings in the	69	// this are the defines for the position of the settings in the
70	// TableViewSettingsSequence	70	// TableViewSettingsSequence
71		71
72	#define SC_TABLE_VIEWSETTINGS_COUNT 14	72	#define SC_TABLE_VIEWSETTINGS_COUNT 15
73		73
74	#define SC_CURSOR_X 0	74	#define SC_CURSOR_X 0
75	#define SC_CURSOR_Y 1	75	#define SC_CURSOR_Y 1
Lines 85-90 Link Here
85	#define SC_TABLE_ZOOM_TYPE 11	85	#define SC_TABLE_ZOOM_TYPE 11
86	#define SC_TABLE_ZOOM_VALUE 12	86	#define SC_TABLE_ZOOM_VALUE 12
87	#define SC_TABLE_PAGE_VIEW_ZOOM_VALUE 13	87	#define SC_TABLE_PAGE_VIEW_ZOOM_VALUE 13
		88	#define SC_TABLE_SHOWGRID 14
88		89
89	#define SC_CURSORPOSITIONX "CursorPositionX"	90	#define SC_CURSORPOSITIONX "CursorPositionX"
90	#define SC_CURSORPOSITIONY "CursorPositionY"	91	#define SC_CURSORPOSITIONY "CursorPositionY"

Lines 68-73 interface TableSelection Link Here

(-)sc.clean/sdi/docsh.sdi (+1 lines)
68	FID_DELETE_TABLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]	68	FID_DELETE_TABLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
69	FID_TAB_RENAME [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]	69	FID_TAB_RENAME [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
70	FID_TAB_RTL [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]	70	FID_TAB_RTL [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
71	FID_TAB_USE_R1C1 [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]	71	FID_TAB_USE_R1C1 [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
		72	FID_TAB_TOGGLE_GRID [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
72		73
73	SID_TABLE_ACTIVATE [ ExecMethod = Execute; ]	74	SID_TABLE_ACTIVATE [ ExecMethod = Execute; ]
74	}	75	}




	GroupId = GID_FORMAT;
]

//--------------------------------------------------------------------------
SfxBoolItem ToggleSheetGrid FID_TAB_TOGGLE_GRID

[
	/* flags: */
	AutoUpdate = FALSE,
	Cachable = Cachable,
	FastCall = FALSE,
	HasCoreId = FALSE,
	HasDialog = FALSE,
	ReadOnlyDoc = TRUE,
	Toggle = FALSE,
	Container = FALSE,
	RecordAbsolute = FALSE,
	RecordPerSet;
	Synchron;

	/* config: */
	AccelConfig = TRUE,
	MenuConfig = TRUE,
	StatusBarConfig = FALSE,
	ToolBoxConfig = TRUE,
	GroupId = GID_FORMAT;
]


Lines 277-282 sal_uInt32 ScDocument::GetDocumentID() c Link Here

(-)sc.clean/source/core/data/documen2.cxx (+7 lines)
277	return nCrc;	277	return nCrc;
278	}	278	}
279		279
		280	ScTableViewOptions* ScDocument::GetTableViewOptions( SCTAB nTab ) const
		281	{
		282	if (ValidTab(nTab) && pTab[nTab])
		283	return pTab[nTab]->GetViewOptions();
		284
		285	return NULL;
		286	}
280		287
281	void ScDocument::StartChangeTracking()	288	void ScDocument::StartChangeTracking()
282	{	289	{

Lines 113-119 SLOFILES = \ Link Here

(-)sc.clean/source/core/data/makefile.mk (-1 / +2 lines)
113	$(SLO)$/table6.obj \	113	$(SLO)$/table6.obj \
114	$(SLO)$/userdat.obj \	114	$(SLO)$/userdat.obj \
115	$(SLO)$/validat.obj \	115	$(SLO)$/validat.obj \
116	$(SLO)$/postit.obj	116	$(SLO)$/postit.obj \
		117	$(SLO)$/tabviewoptions.obj
117		118
118	EXCEPTIONSFILES= \	119	EXCEPTIONSFILES= \
119	$(SLO)$/autonamecache.obj \	120	$(SLO)$/autonamecache.obj \




#include "progress.hxx"
#include "hints.hxx"		// fuer Paint-Broadcast
#include "prnsave.hxx"
#include "tabviewoptions.hxx"

// STATIC DATA -----------------------------------------------------------


	pScenarioRanges( NULL ),
	aScenarioColor( COL_LIGHTGRAY ),
	nScenarioFlags( 0 ),
	bActiveScenario( FALSE ),
    pViewOptions( NULL )
{

	if (bColInfo)

	DestroySortCollator();
}

ScTableViewOptions* ScTable::GetViewOptions()
{
    if (!pViewOptions.get())
        pViewOptions.reset(new ScTableViewOptions);
    return pViewOptions.get();
}

void ScTable::GetName( String& rName ) const
{
	rName = aName;

Lines 57-62 Link Here

(-)sc.clean/source/filter/excel/xeview.cxx (-1 / +6 lines)
57	#include "xestyle.hxx"	57	#include "xestyle.hxx"
58	#endif	58	#endif
59		59
		60	#include "tabviewoptions.hxx"
		61
60	// Workbook view settings records =============================================	62	// Workbook view settings records =============================================
61		63
62	XclExpWindow1::XclExpWindow1( const XclExpRoot& rRoot ) :	64	XclExpWindow1::XclExpWindow1( const XclExpRoot& rRoot ) :
Lines 249-259 XclExpTabViewSettings::XclExpTabViewSett Link Here
249		251
250	const ScViewOptions& rViewOpt = GetDoc().GetViewOptions();	252	const ScViewOptions& rViewOpt = GetDoc().GetViewOptions();
251	maData.mbShowFormulas = rViewOpt.GetOption( VOPT_FORMULAS );	253	maData.mbShowFormulas = rViewOpt.GetOption( VOPT_FORMULAS );
252	maData.mbShowGrid = rViewOpt.GetOption( VOPT_GRID );
253	maData.mbShowHeadings = rViewOpt.GetOption( VOPT_HEADER );	254	maData.mbShowHeadings = rViewOpt.GetOption( VOPT_HEADER );
254	maData.mbShowZeros = rViewOpt.GetOption( VOPT_NULLVALS );	255	maData.mbShowZeros = rViewOpt.GetOption( VOPT_NULLVALS );
255	maData.mbShowOutline = rViewOpt.GetOption( VOPT_OUTLINER );	256	maData.mbShowOutline = rViewOpt.GetOption( VOPT_OUTLINER );
256		257
		258	// Save per-sheet view options.
		259	const ScTableViewOptions* pTabViewOpt = GetDoc().GetTableViewOptions(nScTab);
		260	maData.mbShowGrid = pTabViewOpt->mbDisplayGrid;
		261
257	// * sheet options: cursor, selection, splits, grid color, zoom *	262	// * sheet options: cursor, selection, splits, grid color, zoom *
258		263
259	if( const ScExtTabSettings* pTabSett = GetExtDocOptions().GetTabSettings( nScTab ) )	264	if( const ScExtTabSettings* pTabSett = GetExtDocOptions().GetTabSettings( nScTab ) )

Lines 60-65 Link Here

(-)sc.clean/source/filter/excel/xiview.cxx (-1 / +7 lines)
60	#include "xistyle.hxx"	60	#include "xistyle.hxx"
61	#endif	61	#endif
62		62
		63	#include "tabviewoptions.hxx"
		64
63	// Document view settings =====================================================	65	// Document view settings =====================================================
64		66
65	XclImpDocViewSettings::XclImpDocViewSettings( const XclImpRoot& rRoot ) :	67	XclImpDocViewSettings::XclImpDocViewSettings( const XclImpRoot& rRoot ) :
Lines 295-306 void XclImpTabViewSettings::Finalize() Link Here
295	// set Excel sheet settings globally at Calc document, take settings from displayed sheet	297	// set Excel sheet settings globally at Calc document, take settings from displayed sheet
296	ScViewOptions aViewOpt( rDoc.GetViewOptions() );	298	ScViewOptions aViewOpt( rDoc.GetViewOptions() );
297	aViewOpt.SetOption( VOPT_FORMULAS, maData.mbShowFormulas );	299	aViewOpt.SetOption( VOPT_FORMULAS, maData.mbShowFormulas );
298	aViewOpt.SetOption( VOPT_GRID, maData.mbShowGrid );
299	aViewOpt.SetOption( VOPT_HEADER, maData.mbShowHeadings );	300	aViewOpt.SetOption( VOPT_HEADER, maData.mbShowHeadings );
300	aViewOpt.SetOption( VOPT_NULLVALS, maData.mbShowZeros );	301	aViewOpt.SetOption( VOPT_NULLVALS, maData.mbShowZeros );
301	aViewOpt.SetOption( VOPT_OUTLINER, maData.mbShowOutline );	302	aViewOpt.SetOption( VOPT_OUTLINER, maData.mbShowOutline );
302	rDoc.SetViewOptions( aViewOpt );	303	rDoc.SetViewOptions( aViewOpt );
303	}	304	}
		305
		306	// Store sheet view options.
		307
		308	ScTableViewOptions* pTabViewOptions = rDoc.GetTableViewOptions(nScTab);
		309	pTabViewOptions->mbDisplayGrid = maData.mbShowGrid;
304	}	310	}
305		311
306	// ============================================================================	312	// ============================================================================

Lines 79-84 Link Here

(-)sc.clean/source/ui/view/gridwin4.cxx (-1 / +8 lines)
79	#include "inputopt.hxx"	79	#include "inputopt.hxx"
80	#include "fillinfo.hxx"	80	#include "fillinfo.hxx"
81	#include "sc.hrc"	81	#include "sc.hrc"
		82	#include "tabviewoptions.hxx"
82		83
83	#ifndef _SV_VIRDEV_HXX	84	#ifndef _SV_VIRDEV_HXX
84	#include <vcl/virdev.hxx>	85	#include <vcl/virdev.hxx>
Lines 564-570 void ScGridWindow::Draw( SCCOL nX1, SCRO Link Here
564	aOutputData.SetEditObject( GetEditObject() );	565	aOutputData.SetEditObject( GetEditObject() );
565	aOutputData.SetViewShell( pViewData->GetViewShell() );	566	aOutputData.SetViewShell( pViewData->GetViewShell() );
566		567
567	BOOL bGrid = rOpts.GetOption( VOPT_GRID );	568	BOOL bGrid = rOpts.GetOption( VOPT_GRID );
		569	if (bGrid)
		570	{
		571	const ScTableViewOptions* pTabOptions = pDoc->GetTableViewOptions(nTab);
		572	bGrid = pTabOptions->mbDisplayGrid;
		573	}
		574
568	BOOL bPage = rOpts.GetOption( VOPT_PAGEBREAKS );	575	BOOL bPage = rOpts.GetOption( VOPT_PAGEBREAKS );
569		576
570	if ( eMode == SC_UPDATE_CHANGED )	577	if ( eMode == SC_UPDATE_CHANGED )

Lines 42-47 Link Here

(-)sc.clean/source/ui/view/tabvwshf.cxx (-1 / +21 lines)
42		42
43	#include "scitems.hxx"	43	#include "scitems.hxx"
44	#include <sfx2/request.hxx>	44	#include <sfx2/request.hxx>
		45	#include <sfx2/bindings.hxx>
		46	#include <sfx2/viewfrm.hxx>
45	#include <basic/sbstar.hxx>	47	#include <basic/sbstar.hxx>
46	#include <svtools/languageoptions.hxx>	48	#include <svtools/languageoptions.hxx>
47	#include <svtools/stritem.hxx>	49	#include <svtools/stritem.hxx>
Lines 59-65 Link Here
59	//CHINA001 #include "strindlg.hxx"	61	//CHINA001 #include "strindlg.hxx"
60	//CHINA001 #include "mvtabdlg.hxx"	62	//CHINA001 #include "mvtabdlg.hxx"
61	#include "docfunc.hxx"	63	#include "docfunc.hxx"
62		64	#include "tabviewoptions.hxx"
63		65
64	#include "scabstdlg.hxx" //CHINA001	66	#include "scabstdlg.hxx" //CHINA001
65		67
Lines 685-690 void ScTabViewShell::ExecuteTable( SfxRe Link Here
685	}	687	}
686	break;	688	break;
687		689
		690	case FID_TAB_TOGGLE_GRID:
		691	{
		692	ScTableViewOptions* pViewOpt = pDoc->GetTableViewOptions(nCurrentTab);
		693	pViewOpt->mbDisplayGrid = !pViewOpt->mbDisplayGrid;
		694	SfxBindings& rBindings = GetViewFrame()->GetBindings();
		695	rBindings.Invalidate( FID_TAB_TOGGLE_GRID );
		696	PaintGrid();
		697	rReq.Done();
		698	}
		699	break;
		700
688	default:	701	default:
689	DBG_ERROR("Unbekannte Message bei ViewShell");	702	DBG_ERROR("Unbekannte Message bei ViewShell");
690	break;	703	break;
Lines 800-805 void ScTabViewShell::GetStateTable( SfxI Link Here
800	rSet.Put( SfxBoolItem( nWhich, pDoc->IsLayoutRTL( nTab ) ) );	813	rSet.Put( SfxBoolItem( nWhich, pDoc->IsLayoutRTL( nTab ) ) );
801	}	814	}
802	break;	815	break;
		816
		817	case FID_TAB_TOGGLE_GRID:
		818	{
		819	const ScTableViewOptions* pTabViewOptions = pDoc->GetTableViewOptions(nTab);
		820	rSet.Put( SfxBoolItem(nWhich, pTabViewOptions->mbDisplayGrid) );
		821	}
		822	break;
803	}	823	}
804	nWhich = aIter.NextWhich();	824	nWhich = aIter.NextWhich();
805	}	825	}

Lines 73-78 Link Here

(-)sc.clean/source/ui/view/viewdata.cxx (-1 / +12 lines)
73	#include "miscuno.hxx"	73	#include "miscuno.hxx"
74	#include "unonames.hxx"	74	#include "unonames.hxx"
75	#include "inputopt.hxx"	75	#include "inputopt.hxx"
		76	#include "tabviewoptions.hxx"
76		77
77	#ifndef _XMLOFF_XMLUCONV_HXX	78	#ifndef _XMLOFF_XMLUCONV_HXX
78	#include <xmloff/xmluconv.hxx>	79	#include <xmloff/xmluconv.hxx>
Lines 137-143 ScViewDataTable::~ScViewDataTable() Link Here
137	{	138	{
138	}	139	}
139		140
140	void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSettings, const ScViewData& /rViewData/, SCTAB /nTab/)	141	void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSettings, const ScViewData& rViewData, SCTAB nTab)
141	{	142	{
142	rSettings.realloc(SC_TABLE_VIEWSETTINGS_COUNT);	143	rSettings.realloc(SC_TABLE_VIEWSETTINGS_COUNT);
143	beans::PropertyValue* pSettings = rSettings.getArray();	144	beans::PropertyValue* pSettings = rSettings.getArray();
Lines 180-185 void ScViewDataTable::WriteUserDataSeque Link Here
180	pSettings[SC_TABLE_ZOOM_VALUE].Value <<= nZoomValue;	180	pSettings[SC_TABLE_ZOOM_VALUE].Value <<= nZoomValue;
181	pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE));	181	pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE));
182	pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue;	182	pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue;
		183
		184	const ScTableViewOptions* pTabViewOpt = rViewData.GetDocument()->GetTableViewOptions(nTab);
		185	pSettings[SC_TABLE_SHOWGRID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID));
		186	pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast<sal_Bool>(pTabViewOpt->mbDisplayGrid);
183	}	187	}
184	}	188	}
Lines 287-292 void ScViewDataTable::ReadUserDataSequen Link Here
287	aPageZoomX = aPageZoomY = aZoom;	292	aPageZoomX = aPageZoomY = aZoom;
288	rHasZoom = true;	293	rHasZoom = true;
289	}	294	}
		295	else if (sName.compareToAscii(SC_UNO_SHOWGRID) == 0)
		296	{
		297	bool bShowGrid = true;
		298	aSettings[i].Value >>= bShowGrid;
		299	rViewData.GetDocument()->GetTableViewOptions(nTab)->mbDisplayGrid = bShowGrid;
		300	}
290	else if (sName.compareToAscii(SC_TABLESELECTED) == 0)	301	else if (sName.compareToAscii(SC_TABLESELECTED) == 0)
291	{	302	{
292	bool bSelected = false;	303	bool bSelected = false;

Lines 50-53 Link Here

(-)sc.clean/uiconfig/scalc/toolbar/formatobjectbar.xml (+2 lines)
50	<toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:26268" toolbar:visible="false" />	50	<toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:26268" toolbar:visible="false" />
51	<toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:26236" toolbar:visible="false" />	51	<toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:26236" toolbar:visible="false" />
52	<toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:26237" toolbar:visible="false" />	52	<toolbar:toolbaritem xlink:href=".uno:DeleteColumns" toolbar:helpid="helpid:26237" toolbar:visible="false" />
		53	<toolbar:toolbarseparator/>
		54	<toolbar:toolbaritem xlink:href=".uno:ToggleSheetGrid" toolbar:helpid="helpid:26237" toolbar:visible="true" />
53	</toolbar:toolbar>	55	</toolbar:toolbar>




/*************************************************************************
 *
 *  OpenOffice.org - a multi-platform office productivity suite
 *
 *  $RCSfile: table.hxx,v $
 *
 *  $Revision: 1.32 $
 *
 *  last change: $Author: vg $ $Date: 2007/09/21 09:22:40 $
 *
 *  The Contents of this file are made available subject to
 *  the terms of GNU Lesser General Public License Version 2.1.
 *
 *
 *    GNU Lesser General Public License Version 2.1
 *    =============================================
 *    Copyright 2008 by Sun Microsystems, Inc.
 *    901 San Antonio Road, Palo Alto, CA 94303, USA
 *
 *    This library is free software; you can redistribute it and/or
 *    modify it under the terms of the GNU Lesser General Public
 *    License version 2.1, as published by the Free Software Foundation.
 *
 *    This library 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 for more details.
 *
 *    You should have received a copy of the GNU Lesser General Public
 *    License along with this library; if not, write to the Free Software
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 *    MA  02111-1307  USA
 *
 ************************************************************************/

#ifndef SC_TAB_VIEW_OPTIONS_HXX
#define SC_TAB_VIEW_OPTIONS_HXX

/** This class stores a set of persistent sheet view options that are saved
    with the document.  This class is still work in progress, thus will
    likely grow with more options in future. */
struct ScTableViewOptions
{
    bool mbDisplayGrid;

    ScTableViewOptions();
};


#endif




/*************************************************************************
 *
 *  OpenOffice.org - a multi-platform office productivity suite
 *
 *  $RCSfile: table.hxx,v $
 *
 *  $Revision: 1.32 $
 *
 *  last change: $Author: vg $ $Date: 2007/09/21 09:22:40 $
 *
 *  The Contents of this file are made available subject to
 *  the terms of GNU Lesser General Public License Version 2.1.
 *
 *
 *    GNU Lesser General Public License Version 2.1
 *    =============================================
 *    Copyright 2008 by Sun Microsystems, Inc.
 *    901 San Antonio Road, Palo Alto, CA 94303, USA
 *
 *    This library is free software; you can redistribute it and/or
 *    modify it under the terms of the GNU Lesser General Public
 *    License version 2.1, as published by the Free Software Foundation.
 *
 *    This library 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 for more details.
 *
 *    You should have received a copy of the GNU Lesser General Public
 *    License along with this library; if not, write to the Free Software
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 *    MA  02111-1307  USA
 *
 ************************************************************************/

#include "tabviewoptions.hxx"

ScTableViewOptions::ScTableViewOptions() :
    mbDisplayGrid(true)
{
}

Return to issue 14893

Lines 7706-7708 SfxBoolItem SheetRightToLeft FID_TAB_RTL Link Here

(-)sc.clean/sdi/scalc.sdi (+25 lines)
7706	GroupId = GID_FORMAT;	7706	GroupId = GID_FORMAT;
7707	]	7707	]
7708		7708
		7709	//--------------------------------------------------------------------------
		7710	SfxBoolItem ToggleSheetGrid FID_TAB_TOGGLE_GRID
		7711
		7712	[
		7713	/* flags: */
		7714	AutoUpdate = FALSE,
		7715	Cachable = Cachable,
		7716	FastCall = FALSE,
		7717	HasCoreId = FALSE,
		7718	HasDialog = FALSE,
		7719	ReadOnlyDoc = TRUE,
		7720	Toggle = FALSE,
		7721	Container = FALSE,
		7722	RecordAbsolute = FALSE,
		7723	RecordPerSet;
		7724	Synchron;
		7725
		7726	/* config: */
		7727	AccelConfig = TRUE,
		7728	MenuConfig = TRUE,
		7729	StatusBarConfig = FALSE,
		7730	ToolBoxConfig = TRUE,
		7731	GroupId = GID_FORMAT;
		7732	]
		7733

Lines 119-124 Link Here

(-)sc.clean/source/core/data/table1.cxx (-1 / +10 lines)
119	#include "progress.hxx"	119	#include "progress.hxx"
120	#include "hints.hxx" // fuer Paint-Broadcast	120	#include "hints.hxx" // fuer Paint-Broadcast
121	#include "prnsave.hxx"	121	#include "prnsave.hxx"
		122	#include "tabviewoptions.hxx"
122		123
123	// STATIC DATA -----------------------------------------------------------	124	// STATIC DATA -----------------------------------------------------------
124		125
Lines 158-164 ScTable::ScTable( ScDocument* pDoc, SCTA Link Here
158	pScenarioRanges( NULL ),	159	pScenarioRanges( NULL ),
159	aScenarioColor( COL_LIGHTGRAY ),	160	aScenarioColor( COL_LIGHTGRAY ),
160	nScenarioFlags( 0 ),	161	nScenarioFlags( 0 ),
161	bActiveScenario( FALSE )	162	bActiveScenario( FALSE ),
		163	pViewOptions( NULL )
162	{	164	{
163		165
164	if (bColInfo)	166	if (bColInfo)
Lines 228-233 ScTable::~ScTable() Link Here
228	DestroySortCollator();	230	DestroySortCollator();
229	}	231	}
230		232
		233	ScTableViewOptions* ScTable::GetViewOptions()
		234	{
		235	if (!pViewOptions.get())
		236	pViewOptions.reset(new ScTableViewOptions);
		237	return pViewOptions.get();
		238	}
		239
231	void ScTable::GetName( String& rName ) const	240	void ScTable::GetName( String& rName ) const
232	{	241	{
233	rName = aName;	242	rName = aName;

Added Link Here

(-) (+50 lines)
1	/*************************************************************************
2	*
3	* OpenOffice.org - a multi-platform office productivity suite
4	*
5	* $RCSfile: table.hxx,v $
6	*
7	* $Revision: 1.32 $
8	*
9	* last change: $Author: vg $ $Date: 2007/09/21 09:22:40 $
10	*
11	* The Contents of this file are made available subject to
12	* the terms of GNU Lesser General Public License Version 2.1.
13	*
14	*
15	* GNU Lesser General Public License Version 2.1
16	* =============================================
17	* Copyright 2008 by Sun Microsystems, Inc.
18	* 901 San Antonio Road, Palo Alto, CA 94303, USA
19	*
20	* This library is free software; you can redistribute it and/or
21	* modify it under the terms of the GNU Lesser General Public
22	* License version 2.1, as published by the Free Software Foundation.
23	*
24	* This library is distributed in the hope that it will be useful,
25	* but WITHOUT ANY WARRANTY; without even the implied warranty of
26	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27	* Lesser General Public License for more details.
28	*
29	* You should have received a copy of the GNU Lesser General Public
30	* License along with this library; if not, write to the Free Software
31	* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
32	* MA 02111-1307 USA
33	*
34	************************************************************************/
35
36	#ifndef SC_TAB_VIEW_OPTIONS_HXX
37	#define SC_TAB_VIEW_OPTIONS_HXX
38
39	/** This class stores a set of persistent sheet view options that are saved
40	with the document. This class is still work in progress, thus will
41	likely grow with more options in future. */
42	struct ScTableViewOptions
43	{
44	bool mbDisplayGrid;
45
46	ScTableViewOptions();
47	};
48
49
50	#endif

Added Link Here

(-) (+41 lines)
1	/*************************************************************************
2	*
3	* OpenOffice.org - a multi-platform office productivity suite
4	*
5	* $RCSfile: table.hxx,v $
6	*
7	* $Revision: 1.32 $
8	*
9	* last change: $Author: vg $ $Date: 2007/09/21 09:22:40 $
10	*
11	* The Contents of this file are made available subject to
12	* the terms of GNU Lesser General Public License Version 2.1.
13	*
14	*
15	* GNU Lesser General Public License Version 2.1
16	* =============================================
17	* Copyright 2008 by Sun Microsystems, Inc.
18	* 901 San Antonio Road, Palo Alto, CA 94303, USA
19	*
20	* This library is free software; you can redistribute it and/or
21	* modify it under the terms of the GNU Lesser General Public
22	* License version 2.1, as published by the Free Software Foundation.
23	*
24	* This library is distributed in the hope that it will be useful,
25	* but WITHOUT ANY WARRANTY; without even the implied warranty of
26	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27	* Lesser General Public License for more details.
28	*
29	* You should have received a copy of the GNU Lesser General Public
30	* License along with this library; if not, write to the Free Software
31	* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
32	* MA 02111-1307 USA
33	*
34	************************************************************************/
35
36	#include "tabviewoptions.hxx"
37
38	ScTableViewOptions::ScTableViewOptions() :
39	mbDisplayGrid(true)
40	{
41	}