Kaydet (Commit) f489bbfd authored tarafından Caolán McNamara's avatar Caolán McNamara

silence some unique_ptr warnings

Change-Id: Ibf3a8d00e8b91be79117d9c060b4cb2a7bafe651
üst 49345008
......@@ -120,7 +120,7 @@ private:
public:
OpenGLCfg();
~OpenGLCfg() COVERITY_NOEXCEPT_FALSE;
~OpenGLCfg();
bool useOpenGL() const;
bool forceOpenGL() const;
......@@ -144,16 +144,22 @@ void OpenGLCfg::reset()
mbModified = false;
}
OpenGLCfg::~OpenGLCfg() COVERITY_NOEXCEPT_FALSE
OpenGLCfg::~OpenGLCfg()
{
if (mbModified)
{
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
if (!officecfg::Office::Common::VCL::UseOpenGL::isReadOnly())
officecfg::Office::Common::VCL::UseOpenGL::set(mbUseOpenGL, batch);
if (!officecfg::Office::Common::VCL::ForceOpenGL::isReadOnly())
officecfg::Office::Common::VCL::ForceOpenGL::set(mbForceOpenGL, batch);
batch->commit();
try
{
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
if (!officecfg::Office::Common::VCL::UseOpenGL::isReadOnly())
officecfg::Office::Common::VCL::UseOpenGL::set(mbUseOpenGL, batch);
if (!officecfg::Office::Common::VCL::ForceOpenGL::isReadOnly())
officecfg::Office::Common::VCL::ForceOpenGL::set(mbForceOpenGL, batch);
batch->commit();
}
catch (...)
{
}
}
}
......
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