Kaydet (Commit) 4dcfcf72 authored tarafından Kurt Zenker's avatar Kurt Zenker

INTEGRATION: CWS pchfix04 (1.8.84); FILE MERGED

2007/04/25 18:49:59 hjs 1.8.84.2: RESYNC: (1.8-1.9); FILE MERGED
2007/02/05 12:13:56 os 1.8.84.1: #i73604# usage of ITEMID_* removed
üst 0009ad9b
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: tabarea.cxx,v $ * $RCSfile: tabarea.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: vg $ $Date: 2007-04-11 17:04:41 $ * last change: $Author: kz $ $Date: 2007-05-10 14:42:20 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -69,10 +69,10 @@ ...@@ -69,10 +69,10 @@
#include "dialogs.hrc" #include "dialogs.hrc"
#define ITEMID_COLOR_TABLE SID_COLOR_TABLE
#define ITEMID_GRADIENT_LIST SID_GRADIENT_LIST
#define ITEMID_HATCH_LIST SID_HATCH_LIST
#define ITEMID_BITMAP_LIST SID_BITMAP_LIST
#include "xtable.hxx" #include "xtable.hxx"
#include "globl3d.hxx" #include "globl3d.hxx"
...@@ -156,28 +156,28 @@ void SvxAreaTabDialog::SavePalettes() ...@@ -156,28 +156,28 @@ void SvxAreaTabDialog::SavePalettes()
if(mbDeleteColorTable) if(mbDeleteColorTable)
delete mpDrawModel->GetColorTable(); delete mpDrawModel->GetColorTable();
mpDrawModel->SetColorTable( mpNewColorTab ); mpDrawModel->SetColorTable( mpNewColorTab );
SfxObjectShell::Current()->PutItem( SvxColorTableItem( mpNewColorTab ) ); SfxObjectShell::Current()->PutItem( SvxColorTableItem( mpNewColorTab, SID_COLOR_TABLE ) );
mpColorTab = mpDrawModel->GetColorTable(); mpColorTab = mpDrawModel->GetColorTable();
} }
if( mpNewGradientList != mpDrawModel->GetGradientList() ) if( mpNewGradientList != mpDrawModel->GetGradientList() )
{ {
delete mpDrawModel->GetGradientList(); delete mpDrawModel->GetGradientList();
mpDrawModel->SetGradientList( mpNewGradientList ); mpDrawModel->SetGradientList( mpNewGradientList );
SfxObjectShell::Current()->PutItem( SvxGradientListItem( mpNewGradientList ) ); SfxObjectShell::Current()->PutItem( SvxGradientListItem( mpNewGradientList, SID_GRADIENT_LIST ) );
mpGradientList = mpDrawModel->GetGradientList(); mpGradientList = mpDrawModel->GetGradientList();
} }
if( mpNewHatchingList != mpDrawModel->GetHatchList() ) if( mpNewHatchingList != mpDrawModel->GetHatchList() )
{ {
delete mpDrawModel->GetHatchList(); delete mpDrawModel->GetHatchList();
mpDrawModel->SetHatchList( mpNewHatchingList ); mpDrawModel->SetHatchList( mpNewHatchingList );
SfxObjectShell::Current()->PutItem( SvxHatchListItem( mpNewHatchingList ) ); SfxObjectShell::Current()->PutItem( SvxHatchListItem( mpNewHatchingList, SID_HATCH_LIST ) );
mpHatchingList = mpDrawModel->GetHatchList(); mpHatchingList = mpDrawModel->GetHatchList();
} }
if( mpNewBitmapList != mpDrawModel->GetBitmapList() ) if( mpNewBitmapList != mpDrawModel->GetBitmapList() )
{ {
delete mpDrawModel->GetBitmapList(); delete mpDrawModel->GetBitmapList();
mpDrawModel->SetBitmapList( mpNewBitmapList ); mpDrawModel->SetBitmapList( mpNewBitmapList );
SfxObjectShell::Current()->PutItem( SvxBitmapListItem( mpNewBitmapList ) ); SfxObjectShell::Current()->PutItem( SvxBitmapListItem( mpNewBitmapList, SID_BITMAP_LIST ) );
mpBitmapList = mpDrawModel->GetBitmapList(); mpBitmapList = mpDrawModel->GetBitmapList();
} }
...@@ -191,7 +191,7 @@ void SvxAreaTabDialog::SavePalettes() ...@@ -191,7 +191,7 @@ void SvxAreaTabDialog::SavePalettes()
mpHatchingList->Save(); mpHatchingList->Save();
// ToolBoxControls werden benachrichtigt: // ToolBoxControls werden benachrichtigt:
SfxObjectShell::Current()->PutItem( SvxHatchListItem( mpHatchingList ) ); SfxObjectShell::Current()->PutItem( SvxHatchListItem( mpHatchingList, SID_HATCH_LIST ) );
} }
if( mnBitmapListState & CT_MODIFIED ) if( mnBitmapListState & CT_MODIFIED )
...@@ -200,7 +200,7 @@ void SvxAreaTabDialog::SavePalettes() ...@@ -200,7 +200,7 @@ void SvxAreaTabDialog::SavePalettes()
mpBitmapList->Save(); mpBitmapList->Save();
// ToolBoxControls werden benachrichtigt: // ToolBoxControls werden benachrichtigt:
SfxObjectShell::Current()->PutItem( SvxBitmapListItem( mpBitmapList ) ); SfxObjectShell::Current()->PutItem( SvxBitmapListItem( mpBitmapList, SID_BITMAP_LIST ) );
} }
if( mnGradientListState & CT_MODIFIED ) if( mnGradientListState & CT_MODIFIED )
...@@ -208,7 +208,7 @@ void SvxAreaTabDialog::SavePalettes() ...@@ -208,7 +208,7 @@ void SvxAreaTabDialog::SavePalettes()
mpGradientList->SetPath( aPath ); mpGradientList->SetPath( aPath );
mpGradientList->Save(); mpGradientList->Save();
// ToolBoxControls werden benachrichtigt: // ToolBoxControls werden benachrichtigt:
SfxObjectShell::Current()->PutItem( SvxGradientListItem( mpGradientList ) ); SfxObjectShell::Current()->PutItem( SvxGradientListItem( mpGradientList, SID_GRADIENT_LIST ) );
} }
if( mnColorTableState & CT_MODIFIED ) if( mnColorTableState & CT_MODIFIED )
...@@ -217,7 +217,7 @@ void SvxAreaTabDialog::SavePalettes() ...@@ -217,7 +217,7 @@ void SvxAreaTabDialog::SavePalettes()
mpColorTab->Save(); mpColorTab->Save();
// ToolBoxControls werden benachrichtigt: // ToolBoxControls werden benachrichtigt:
SfxObjectShell::Current()->PutItem( SvxColorTableItem( mpColorTab ) ); SfxObjectShell::Current()->PutItem( SvxColorTableItem( mpColorTab, SID_COLOR_TABLE ) );
} }
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment