diff options
| author | Kai Ahrens <ka@openoffice.org> | 2000-11-10 13:47:42 +0000 |
|---|---|---|
| committer | Kai Ahrens <ka@openoffice.org> | 2000-11-10 13:47:42 +0000 |
| commit | 6f041631c1c17fdfa41498871c2d707ddde7b5a9 (patch) | |
| tree | 196d6b587b9064184833a52b32ccb94b76f5701a /goodies/source/base3d | |
| parent | f2346ebbac4c8ade98b1eefbfc8b3ffa5f3f56ff (diff) | |
removed SfxIniManager
Diffstat (limited to 'goodies/source/base3d')
| -rw-r--r-- | goodies/source/base3d/b3dopngl.cxx | 18 | ||||
| -rw-r--r-- | goodies/source/base3d/base3d.cxx | 24 |
2 files changed, 15 insertions, 27 deletions
diff --git a/goodies/source/base3d/b3dopngl.cxx b/goodies/source/base3d/b3dopngl.cxx index e5feb7f41a60..359a463d6243 100644 --- a/goodies/source/base3d/b3dopngl.cxx +++ b/goodies/source/base3d/b3dopngl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: b3dopngl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:30:10 $ + * last change: $Author: ka $ $Date: 2000-11-10 14:47:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,10 @@ #include <tools/debug.hxx> #endif +#ifndef INCLUDED_SVTOOLS_OPTIONS3D_HXX +#include <svtools/options3d.hxx> +#endif + #ifndef _B3D_B3DOPNGL_HXX #include "b3dopngl.hxx" #endif @@ -87,10 +91,6 @@ #include "b3dgeom.hxx" #endif -#ifndef _SFXINIMGR_HXX -#include <svtools/iniman.hxx> -#endif - /************************************************************************* |* |* Konstruktor Base3DOpenGL @@ -136,11 +136,7 @@ Base3DOpenGL::Base3DOpenGL(OutputDevice* pOutDev) } SetContextIsValid(aOpenGL.IsValid()); CalcInternPhongDivideSize(); - - // read bForceToSinglePrimitiveOutput-flag from .ini - String aTmp = SfxIniManager::Get()->Get(SFX_KEY_3D_OPENGL_FASTER); - bForceToSinglePrimitiveOutput = - (aTmp.Len() && aTmp.GetChar(0) == sal_Unicode('0')); + bForceToSinglePrimitiveOutput = SvtOptions3D().IsOpenGL_Faster(); } /************************************************************************* diff --git a/goodies/source/base3d/base3d.cxx b/goodies/source/base3d/base3d.cxx index 6a45cb2fb01d..f2e93995c12d 100644 --- a/goodies/source/base3d/base3d.cxx +++ b/goodies/source/base3d/base3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: base3d.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:30:10 $ + * last change: $Author: ka $ $Date: 2000-11-10 14:47:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,10 @@ * ************************************************************************/ +#ifndef INCLUDED_SVTOOLS_OPTIONS3D_HXX +#include <svtools/options3d.hxx> +#endif + #ifndef _B3D_BASE3D_HXX #include "base3d.hxx" #endif @@ -103,10 +107,6 @@ #include <svtools/iniprop.hxx> #endif -#ifndef _SFXINIMGR_HXX -#include <svtools/iniman.hxx> -#endif - /************************************************************************* |* |* Konstruktor B3dGlobalData @@ -238,11 +238,7 @@ Base3D* Base3D::Create(OutputDevice* pOutDev, BOOL bForcePrinter) { // Versuchen, einen OpenGL Kontext zu bekommen? Teste das // globale Flag aus der .INI - BOOL bUseOpenGL = FALSE; - String aTmp = SfxIniManager::Get()->Get( SFX_KEY_3D_OPENGL ); - - if(aTmp.Len() && aTmp.GetChar(0) != sal_Unicode('0')) - bUseOpenGL = TRUE; + BOOL bUseOpenGL = SvtOptions3D().IsOpenGL(); if((bUseOpenGL && pRetval->GetBase3DType() != BASE3D_TYPE_OPENGL) || (!bUseOpenGL && pRetval->GetBase3DType() == BASE3D_TYPE_OPENGL)) @@ -306,11 +302,7 @@ Base3D* Base3D::CreateScreenRenderer(OutputDevice* pOutDev) // Versuchen, einen OpenGL Kontext zu bekommen? Teste das // globale Flag aus der .INI - BOOL bUseOpenGL = FALSE; - String aTmp = SfxIniManager::Get()->Get( SFX_KEY_3D_OPENGL ); - - if(aTmp.Len() && aTmp.GetChar(0) != sal_Unicode('0')) - bUseOpenGL = TRUE; + BOOL bUseOpenGL = SvtOptions3D().IsOpenGL(); // Versuchen, einen OpenGL Kontext zu bekommen if(bUseOpenGL) |