diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-17 21:58:45 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-17 22:02:56 +0000 |
commit | ba9da7f098a32813d9e8c30982c6bcf64ed0c2ff (patch) | |
tree | 506121d48888b598c42b86fc05dcea15a3fc3bd1 /sdext/source | |
parent | Let BOOST_SYSTEM_LIB be found in --with-system-boost --with-boost=... case (diff) | |
download | core-ba9da7f098a32813d9e8c30982c6bcf64ed0c2ff.tar.gz core-ba9da7f098a32813d9e8c30982c6bcf64ed0c2ff.zip |
coverity#984041 Uninitialized scalar variable
Change-Id: Ia726b08717d26b439f46f95dedfdb30e27e8499e
Diffstat (limited to 'sdext/source')
-rw-r--r-- | sdext/source/presenter/PresenterScreen.cxx | 20 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterScreen.hxx | 8 |
2 files changed, 16 insertions, 12 deletions
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 1ac293386d3f..202888710519 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -396,14 +396,14 @@ void PresenterScreen::InitializePresenterScreen (void) mpPresenterController->GetWindowManager()->RestoreViewMode(); } - catch (RuntimeException&) + catch (const RuntimeException&) { xCC->restoreConfiguration(mxSavedConfiguration); } xCC->unlock(); } } - catch (Exception&) + catch (const Exception&) { } } @@ -501,7 +501,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber ( return -1; } } - catch (beans::UnknownPropertyException&) + catch (const beans::UnknownPropertyException&) { OSL_ASSERT(false); // For some reason we can not access the screen number. Use @@ -608,7 +608,7 @@ void PresenterScreen::SetupPaneFactory (const Reference<XComponentContext>& rxCo mxController, mpPresenterController); } - catch (RuntimeException&) + catch (const RuntimeException&) { OSL_ASSERT(false); } @@ -624,7 +624,7 @@ void PresenterScreen::SetupViewFactory (const Reference<XComponentContext>& rxCo mxController, mpPresenterController); } - catch (RuntimeException&) + catch (const RuntimeException&) { OSL_ASSERT(false); } @@ -647,7 +647,7 @@ void PresenterScreen::SetupConfiguration ( OUString("Presenter/CurrentLayout")) >>= sLayoutName; ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId); } - catch (RuntimeException&) + catch (const RuntimeException&) { } } @@ -701,7 +701,7 @@ void PresenterScreen::ProcessLayout ( rxContext, rxAnchorId)); } - catch (RuntimeException&) + catch (const RuntimeException&) { } } @@ -726,7 +726,7 @@ void PresenterScreen::ProcessViewDescriptions ( aProperties, ::boost::bind(&PresenterScreen::ProcessViewDescription, this, _1, _2)); } - catch (RuntimeException&) + catch (const RuntimeException&) { OSL_ASSERT(false); } @@ -798,8 +798,8 @@ void PresenterScreen::ProcessViewDescription ( if (aViewDescriptor.msAccessibleTitle.isEmpty()) aViewDescriptor.msAccessibleTitle = aViewDescriptor.msTitle; maViewDescriptors[sViewURL] = aViewDescriptor; - } - catch (Exception&) + } + catch (const Exception&) { OSL_ASSERT(false); } diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 16a3e05ccb2c..2538fea31219 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -145,9 +145,13 @@ private: class ViewDescriptor { public: - ::rtl::OUString msTitle; - ::rtl::OUString msAccessibleTitle; + OUString msTitle; + OUString msAccessibleTitle; bool mbIsOpaque; + ViewDescriptor() + : mbIsOpaque(false) + { + } }; typedef ::std::map<rtl::OUString,ViewDescriptor> ViewDescriptorContainer; ViewDescriptorContainer maViewDescriptors; |