summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-05-10 15:55:49 +0000
committerKurt Zenker <kz@openoffice.org>2007-05-10 15:55:49 +0000
commit965c781e1fb2609a555a25af831de01b7723ec5f (patch)
tree4d48bb0b5123a3325acafa19c67918efaff73b82
parentb8bcf3e2d78ea9c70ec088e7cb7d46a9af83773a (diff)
INTEGRATION: CWS pchfix04 (1.21.34); FILE MERGED
2007/04/26 05:03:50 hjs 1.21.34.2: RESYNC: (1.21-1.22); FILE MERGED 2007/02/05 08:35:30 os 1.21.34.1: #i73604# usage of ITEMID_* removed
-rw-r--r--sc/source/ui/docshell/docsh2.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 766f53024f1d..0837422c25db 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: docsh2.cxx,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: vg $ $Date: 2007-02-27 13:07:12 $
+ * last change: $Author: kz $ $Date: 2007-05-10 16:55:49 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -145,12 +145,12 @@ void ScDocShell::InitItems()
ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
if (pDrawLayer)
{
- PutItem( SvxColorTableItem ( pDrawLayer->GetColorTable() ) );
- PutItem( SvxGradientListItem( pDrawLayer->GetGradientList() ) );
- PutItem( SvxHatchListItem ( pDrawLayer->GetHatchList() ) );
- PutItem( SvxBitmapListItem ( pDrawLayer->GetBitmapList() ) );
- PutItem( SvxDashListItem ( pDrawLayer->GetDashList() ) );
- PutItem( SvxLineEndListItem ( pDrawLayer->GetLineEndList() ) );
+ PutItem( SvxColorTableItem ( pDrawLayer->GetColorTable(), SID_COLOR_TABLE ) );
+ PutItem( SvxGradientListItem( pDrawLayer->GetGradientList(), SID_GRADIENT_LIST ) );
+ PutItem( SvxHatchListItem ( pDrawLayer->GetHatchList(), SID_HATCH_LIST ) );
+ PutItem( SvxBitmapListItem ( pDrawLayer->GetBitmapList(), SID_BITMAP_LIST ) );
+ PutItem( SvxDashListItem ( pDrawLayer->GetDashList(), SID_DASH_LIST ) );
+ PutItem( SvxLineEndListItem ( pDrawLayer->GetLineEndList(), SID_LINEEND_LIST ) );
// andere Anpassungen nach dem Anlegen des DrawLayers
@@ -162,7 +162,7 @@ void ScDocShell::InitItems()
else
{
// always use global color table instead of local copy
- PutItem( SvxColorTableItem( XColorTable::GetStdColorTable() ) );
+ PutItem( SvxColorTableItem( XColorTable::GetStdColorTable(), SID_COLOR_TABLE ) );
}
if ( !aDocument.GetForbiddenCharacters().isValid() ||