[Libreoffice-commits] core.git: 2 commits - basegfx/source sdext/source
Caolán McNamara
caolanm at redhat.com
Sun Feb 17 14:03:21 PST 2013
basegfx/source/polygon/b2dpolygontools.cxx | 2 +-
sdext/source/presenter/PresenterScreen.cxx | 20 ++++++++++----------
sdext/source/presenter/PresenterScreen.hxx | 8 ++++++--
3 files changed, 17 insertions(+), 13 deletions(-)
New commits:
commit d100aaaeacdf99363069319e5936eae9ff21cce9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 17 22:02:03 2013 +0000
coverity#984038 Uninitialized scalar variable
Change-Id: I6c460ea0ca039ccc8d62bb7a7005832fb809f369
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index 926ff90..56176e5 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -2451,7 +2451,7 @@ namespace basegfx
const sal_uInt32 nNextIndex((a + 1) % nPointCount);
aBezier.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
double fEdgeDist;
- double fNewCut;
+ double fNewCut(0.0);
bool bEdgeIsCurve(false);
if(rCandidate.areControlPointsUsed())
commit ba9da7f098a32813d9e8c30982c6bcf64ed0c2ff
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 17 21:58:45 2013 +0000
coverity#984041 Uninitialized scalar variable
Change-Id: Ia726b08717d26b439f46f95dedfdb30e27e8499e
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 1ac2933..2028887 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 16a3e05..2538fea 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;
More information about the Libreoffice-commits
mailing list