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

INTEGRATION: CWS pchfix04 (1.38.74); FILE MERGED

2007/02/05 12:13:58 os 1.38.74.1: #i73604# usage of ITEMID_* removed
üst 1cd16fb2
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: treeopt.cxx,v $ * $RCSfile: treeopt.cxx,v $
* *
* $Revision: 1.39 $ * $Revision: 1.40 $
* *
* last change: $Author: rt $ $Date: 2007-04-26 07:47:47 $ * last change: $Author: kz $ $Date: 2007-05-10 14:45:24 $
* *
* 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.
...@@ -214,11 +214,11 @@ ...@@ -214,11 +214,11 @@
#include <langitem.hxx> #include <langitem.hxx>
#endif #endif
#ifndef _SVX_OPTITEMS_HXX #ifndef _SVX_OPTITEMS_HXX
#define ITEMID_SPELLCHECK SID_ATTR_SPELL
#define ITEMID_HYPHENREGION SID_ATTR_HYPHENREGION
#include <optitems.hxx> #include <optitems.hxx>
#endif #endif
#define ITEMID_COLOR_TABLE SID_COLOR_TABLE
#ifndef _SVX_DRAWITEM_HXX #ifndef _SVX_DRAWITEM_HXX
#include <drawitem.hxx> #include <drawitem.hxx>
#endif #endif
...@@ -2022,7 +2022,7 @@ short OfaTreeOptionsDialog::Execute() ...@@ -2022,7 +2022,7 @@ short OfaTreeOptionsDialog::Execute()
if( _pColorTab && if( _pColorTab &&
_pColorTab->GetPath() == GetColorTable()->GetPath() && _pColorTab->GetPath() == GetColorTable()->GetPath() &&
_pColorTab->GetName() == GetColorTable()->GetName() ) _pColorTab->GetName() == GetColorTable()->GetName() )
SfxObjectShell::Current()->PutItem( SvxColorTableItem( GetColorTable() ) ); SfxObjectShell::Current()->PutItem( SvxColorTableItem( GetColorTable(), 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