summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/optgdlg.cxx83
-rw-r--r--cui/source/options/optgdlg.hxx7
2 files changed, 90 insertions, 0 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index d66fc7474bfb..fb8919fe34a9 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -68,6 +68,7 @@
#include <unotools/searchopt.hxx>
#include <sal/macros.h>
#include <officecfg/Office/Common.hxx>
+#include <comphelper/configuration.hxx>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -102,6 +103,81 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::util;
using namespace ::utl;
+namespace svt {
+
+class OpenGLCfg
+{
+private:
+ bool mbUseOpenGL;
+ bool mbForceOpenGL;
+ bool mbModified;
+
+public:
+ OpenGLCfg();
+ ~OpenGLCfg();
+
+ bool useOpenGL() const;
+ bool forceOpenGL() const;
+
+ void setUseOpenGL(bool bOpenGL);
+ void setForceOpenGL(bool bOpenGL);
+
+ void reset();
+};
+
+OpenGLCfg::OpenGLCfg():
+ mbModified(false)
+{
+ reset();
+}
+
+void OpenGLCfg::reset()
+{
+ mbUseOpenGL = officecfg::Office::Common::VCL::UseOpenGL::get();
+ mbForceOpenGL = officecfg::Office::Common::VCL::ForceOpenGL::get();
+}
+
+OpenGLCfg::~OpenGLCfg()
+{
+ if (mbModified)
+ {
+ boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
+ officecfg::Office::Common::VCL::UseOpenGL::set(mbUseOpenGL, batch);
+ officecfg::Office::Common::VCL::ForceOpenGL::set(mbForceOpenGL, batch);
+
+ }
+}
+
+bool OpenGLCfg::useOpenGL() const
+{
+ return mbUseOpenGL;
+}
+
+bool OpenGLCfg::forceOpenGL() const
+{
+ return mbForceOpenGL;
+}
+
+void OpenGLCfg::setUseOpenGL(bool bOpenGL)
+{
+ if (bOpenGL != mbUseOpenGL)
+ {
+ mbUseOpenGL = bOpenGL;
+ mbModified = true;
+ }
+}
+
+void OpenGLCfg::setForceOpenGL(bool bOpenGL)
+{
+ if (mbForceOpenGL != bOpenGL)
+ {
+ mbForceOpenGL = bOpenGL;
+ mbModified = true;
+ }
+}
+
+}
+
// class OfaMiscTabPage --------------------------------------------------
int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ )
@@ -556,6 +632,7 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
, pAppearanceCfg(new SvtTabAppearanceCfg)
, pCanvasSettings(new CanvasSettings)
, mpDrawinglayerOpt(new SvtOptionsDrawinglayer)
+ , mpOpenGLConfig(new svt::OpenGLCfg)
{
get(m_pWindowSizeMF, "windowsize");
get(m_pIconSizeLB, "iconsize");
@@ -803,6 +880,9 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
}
}
+ mpOpenGLConfig->setUseOpenGL(m_pUseOpenGL->IsChecked());
+ mpOpenGLConfig->setForceOpenGL(m_pForceOpenGL->IsChecked());
+
// #i97672#
if(m_pSelectionCB->IsEnabled())
{
@@ -870,6 +950,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
void OfaViewTabPage::Reset( const SfxItemSet* )
{
SvtMiscOptions aMiscOptions;
+ mpOpenGLConfig->reset();
if( aMiscOptions.GetSymbolsSize() != SFX_SYMBOLS_SIZE_AUTO )
nSizeLB_InitialSelection = ( aMiscOptions.AreCurrentSymbolsLarge() )? 2 : 1;
@@ -945,6 +1026,8 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
m_pUseAntiAliase->SaveValue();
}
+ m_pUseOpenGL->Check(mpOpenGLConfig->useOpenGL());
+ m_pForceOpenGL->Check(mpOpenGLConfig->forceOpenGL());
{
// #i97672# Selection
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 18e42978818c..8e4aee7bb684 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -25,6 +25,8 @@
#include <sfx2/tabdlg.hxx>
#include <svx/langbox.hxx>
+#include <boost/scoped_ptr.hpp>
+
// predeclarations
class CanvasSettings;
class SvtOptionsDrawinglayer;
@@ -32,6 +34,10 @@ namespace vcl {
class IconThemeInfo;
}
+namespace svt {
+ class OpenGLCfg;
+}
+
// class OfaMiscTabPage --------------------------------------------------
class OfaMiscTabPage : public SfxTabPage
@@ -114,6 +120,7 @@ private:
SvtTabAppearanceCfg* pAppearanceCfg;
CanvasSettings* pCanvasSettings;
SvtOptionsDrawinglayer* mpDrawinglayerOpt;
+ boost::scoped_ptr<svt::OpenGLCfg> mpOpenGLConfig;
std::vector<vcl::IconThemeInfo> mInstalledIconThemes;