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

coverity#984041 Uninitialized scalar variable

Change-Id: Ia726b08717d26b439f46f95dedfdb30e27e8499e
üst 3743cdbb
...@@ -396,14 +396,14 @@ void PresenterScreen::InitializePresenterScreen (void) ...@@ -396,14 +396,14 @@ void PresenterScreen::InitializePresenterScreen (void)
mpPresenterController->GetWindowManager()->RestoreViewMode(); mpPresenterController->GetWindowManager()->RestoreViewMode();
} }
catch (RuntimeException&) catch (const RuntimeException&)
{ {
xCC->restoreConfiguration(mxSavedConfiguration); xCC->restoreConfiguration(mxSavedConfiguration);
} }
xCC->unlock(); xCC->unlock();
} }
} }
catch (Exception&) catch (const Exception&)
{ {
} }
} }
...@@ -501,7 +501,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber ( ...@@ -501,7 +501,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber (
return -1; return -1;
} }
} }
catch (beans::UnknownPropertyException&) catch (const beans::UnknownPropertyException&)
{ {
OSL_ASSERT(false); OSL_ASSERT(false);
// For some reason we can not access the screen number. Use // For some reason we can not access the screen number. Use
...@@ -608,7 +608,7 @@ void PresenterScreen::SetupPaneFactory (const Reference<XComponentContext>& rxCo ...@@ -608,7 +608,7 @@ void PresenterScreen::SetupPaneFactory (const Reference<XComponentContext>& rxCo
mxController, mxController,
mpPresenterController); mpPresenterController);
} }
catch (RuntimeException&) catch (const RuntimeException&)
{ {
OSL_ASSERT(false); OSL_ASSERT(false);
} }
...@@ -624,7 +624,7 @@ void PresenterScreen::SetupViewFactory (const Reference<XComponentContext>& rxCo ...@@ -624,7 +624,7 @@ void PresenterScreen::SetupViewFactory (const Reference<XComponentContext>& rxCo
mxController, mxController,
mpPresenterController); mpPresenterController);
} }
catch (RuntimeException&) catch (const RuntimeException&)
{ {
OSL_ASSERT(false); OSL_ASSERT(false);
} }
...@@ -647,7 +647,7 @@ void PresenterScreen::SetupConfiguration ( ...@@ -647,7 +647,7 @@ void PresenterScreen::SetupConfiguration (
OUString("Presenter/CurrentLayout")) >>= sLayoutName; OUString("Presenter/CurrentLayout")) >>= sLayoutName;
ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId); ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId);
} }
catch (RuntimeException&) catch (const RuntimeException&)
{ {
} }
} }
...@@ -701,7 +701,7 @@ void PresenterScreen::ProcessLayout ( ...@@ -701,7 +701,7 @@ void PresenterScreen::ProcessLayout (
rxContext, rxContext,
rxAnchorId)); rxAnchorId));
} }
catch (RuntimeException&) catch (const RuntimeException&)
{ {
} }
} }
...@@ -726,7 +726,7 @@ void PresenterScreen::ProcessViewDescriptions ( ...@@ -726,7 +726,7 @@ void PresenterScreen::ProcessViewDescriptions (
aProperties, aProperties,
::boost::bind(&PresenterScreen::ProcessViewDescription, this, _1, _2)); ::boost::bind(&PresenterScreen::ProcessViewDescription, this, _1, _2));
} }
catch (RuntimeException&) catch (const RuntimeException&)
{ {
OSL_ASSERT(false); OSL_ASSERT(false);
} }
...@@ -798,8 +798,8 @@ void PresenterScreen::ProcessViewDescription ( ...@@ -798,8 +798,8 @@ void PresenterScreen::ProcessViewDescription (
if (aViewDescriptor.msAccessibleTitle.isEmpty()) if (aViewDescriptor.msAccessibleTitle.isEmpty())
aViewDescriptor.msAccessibleTitle = aViewDescriptor.msTitle; aViewDescriptor.msAccessibleTitle = aViewDescriptor.msTitle;
maViewDescriptors[sViewURL] = aViewDescriptor; maViewDescriptors[sViewURL] = aViewDescriptor;
} }
catch (Exception&) catch (const Exception&)
{ {
OSL_ASSERT(false); OSL_ASSERT(false);
} }
......
...@@ -145,9 +145,13 @@ private: ...@@ -145,9 +145,13 @@ private:
class ViewDescriptor class ViewDescriptor
{ {
public: public:
::rtl::OUString msTitle; OUString msTitle;
::rtl::OUString msAccessibleTitle; OUString msAccessibleTitle;
bool mbIsOpaque; bool mbIsOpaque;
ViewDescriptor()
: mbIsOpaque(false)
{
}
}; };
typedef ::std::map<rtl::OUString,ViewDescriptor> ViewDescriptorContainer; typedef ::std::map<rtl::OUString,ViewDescriptor> ViewDescriptorContainer;
ViewDescriptorContainer maViewDescriptors; ViewDescriptorContainer maViewDescriptors;
......
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