diff options
author | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 06:29:02 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 06:29:02 +0000 |
commit | 8867fcb1cd7d8ec4932c59d8bba2524258a5fb06 (patch) | |
tree | 94b597ffea4a95664f759c59f6377daefe191b67 /svx/source/dialog/dlgctrl.cxx | |
parent | INTEGRATION: CWS residcleanup (1.11.230); FILE MERGED (diff) | |
download | core-8867fcb1cd7d8ec4932c59d8bba2524258a5fb06.tar.gz core-8867fcb1cd7d8ec4932c59d8bba2524258a5fb06.zip |
INTEGRATION: CWS residcleanup (1.29.26); FILE MERGED
2007/02/20 19:38:29 pl 1.29.26.1: #i74635# get rid of global ResMgr
Diffstat (limited to 'svx/source/dialog/dlgctrl.cxx')
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index c79e95368f49..60477c2174b9 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dlgctrl.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: rt $ $Date: 2007-01-29 14:54:32 $ + * last change: $Author: rt $ $Date: 2007-04-26 07:29:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -679,7 +679,7 @@ void SvxRectCtl::Reset() /************************************************************************* |* -|* Gibt den aktuell ausgewaehlten RECT_POINT zurück +|* Gibt den aktuell ausgewaehlten RECT_POINT zur�ck |* \************************************************************************/ @@ -690,7 +690,7 @@ RECT_POINT SvxRectCtl::GetActualRP() const /************************************************************************* |* -|* Gibt den aktuell ausgewaehlten RECT_POINT zurück +|* Gibt den aktuell ausgewaehlten RECT_POINT zur�ck |* \************************************************************************/ @@ -1748,13 +1748,12 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr void FillTypeLB::Fill() { - ResMgr* pMgr = DIALOG_MGR(); SetUpdateMode( FALSE ); - InsertEntry( String( ResId( RID_SVXSTR_INVISIBLE, pMgr ) ) ); - InsertEntry( String( ResId( RID_SVXSTR_COLOR, pMgr ) ) ); - InsertEntry( String( ResId( RID_SVXSTR_GRADIENT, pMgr ) ) ); - InsertEntry( String( ResId( RID_SVXSTR_HATCH, pMgr ) ) ); - InsertEntry( String( ResId( RID_SVXSTR_BITMAP, pMgr ) ) ); + InsertEntry( String( SVX_RES( RID_SVXSTR_INVISIBLE ) ) ); + InsertEntry( String( SVX_RES( RID_SVXSTR_COLOR ) ) ); + InsertEntry( String( SVX_RES( RID_SVXSTR_GRADIENT ) ) ); + InsertEntry( String( SVX_RES( RID_SVXSTR_HATCH ) ) ); + InsertEntry( String( SVX_RES( RID_SVXSTR_BITMAP ) ) ); SetUpdateMode( TRUE ); } |