[Libreoffice-commits] core.git: 3 commits - include/vcl sd/source vcl/source
Caolán McNamara
caolanm at redhat.com
Thu Aug 27 00:02:38 PDT 2015
include/vcl/outdev.hxx | 1
sd/source/filter/eppt/pptx-epptbase.cxx | 1
vcl/source/gdi/font.cxx | 36 --------------------------------
vcl/source/outdev/outdev.cxx | 1
4 files changed, 1 insertion(+), 38 deletions(-)
New commits:
commit b2c69e66ed6979e1bdd18577295062c25d3dabd0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 27 08:00:23 2015 +0100
coverity#738814 Uninitialized scalar field
Change-Id: I16d5772b0f8455518866cb03729e9bab95be8087
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 1d58016..0d9345e 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -153,6 +153,7 @@ PPTWriterBase::PPTWriterBase( const Reference< XModel > & rXModel,
, mbStatusIndicator(false)
, mbPresObj(false)
, mbEmptyPresObj(false)
+ , mbIsBackgroundDark(false)
, mnAngle(0)
, mnPages(0)
, mnMasterPages(0)
commit 854d0f2955f7d371b04e8bdf3ad502e709567253
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 26 16:45:56 2015 +0100
kill dubious debugging SAL_INFO
Change-Id: I983a24964f71967f1c0fdbde6dde0524d8c3456c
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index f8a1c83..e8ba5df 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -225,7 +225,6 @@ void Font::MakeUnique()
Font::Font()
{
-
static Impl_Font aStaticImplFont;
// RefCount is zero for static objects
aStaticImplFont.mnRefCount = 0;
@@ -245,7 +244,6 @@ Font::Font( const vcl::Font& rFont )
Font::Font( const OUString& rFamilyName, const Size& rSize )
{
-
mpImplFont = new Impl_Font;
mpImplFont->maFamilyName = rFamilyName;
mpImplFont->maSize = rSize;
@@ -253,7 +251,6 @@ Font::Font( const OUString& rFamilyName, const Size& rSize )
Font::Font( const OUString& rFamilyName, const OUString& rStyleName, const Size& rSize )
{
-
mpImplFont = new Impl_Font;
mpImplFont->maFamilyName= rFamilyName;
mpImplFont->maStyleName = rStyleName;
@@ -262,7 +259,6 @@ Font::Font( const OUString& rFamilyName, const OUString& rStyleName, const Size&
Font::Font( FontFamily eFamily, const Size& rSize )
{
-
mpImplFont = new Impl_Font;
mpImplFont->meFamily = eFamily;
mpImplFont->maSize = rSize;
@@ -270,7 +266,6 @@ Font::Font( FontFamily eFamily, const Size& rSize )
Font::~Font()
{
-
// decrement reference counter and delete if last reference
// if the object is not static (Refcounter==0)
if ( mpImplFont->mnRefCount )
@@ -284,7 +279,6 @@ Font::~Font()
void Font::SetColor( const Color& rColor )
{
-
if( mpImplFont->maColor != rColor )
{
MakeUnique();
@@ -294,19 +288,14 @@ void Font::SetColor( const Color& rColor )
void Font::SetFillColor( const Color& rColor )
{
-
MakeUnique();
mpImplFont->maFillColor = rColor;
if ( rColor.GetTransparency() )
mpImplFont->mbTransparent = true;
- if (GetUnderline() == UNDERLINE_SINGLE ) {
- SAL_INFO("vcl.gdi", "I'm setting a filling (from Font) of (" << rColor.GetRed() << "," << rColor.GetGreen() << "," << rColor.GetBlue() << ")");
- }
}
void Font::SetTransparent( bool bTransparent )
{
-
if( mpImplFont->mbTransparent != bTransparent )
{
MakeUnique();
@@ -316,7 +305,6 @@ void Font::SetTransparent( bool bTransparent )
void Font::SetAlign( FontAlign eAlign )
{
-
if( mpImplFont->meAlign != eAlign )
{
MakeUnique();
@@ -326,21 +314,18 @@ void Font::SetAlign( FontAlign eAlign )
void Font::SetName( const OUString& rFamilyName )
{
-
MakeUnique();
mpImplFont->maFamilyName = rFamilyName;
}
void Font::SetStyleName( const OUString& rStyleName )
{
-
MakeUnique();
mpImplFont->maStyleName = rStyleName;
}
void Font::SetSize( const Size& rSize )
{
-
if( mpImplFont->maSize != rSize )
{
MakeUnique();
@@ -350,7 +335,6 @@ void Font::SetSize( const Size& rSize )
void Font::SetFamily( FontFamily eFamily )
{
-
if( mpImplFont->meFamily != eFamily )
{
MakeUnique();
@@ -360,7 +344,6 @@ void Font::SetFamily( FontFamily eFamily )
void Font::SetCharSet( rtl_TextEncoding eCharSet )
{
-
if( mpImplFont->meCharSet != eCharSet )
{
MakeUnique();
@@ -370,7 +353,6 @@ void Font::SetCharSet( rtl_TextEncoding eCharSet )
void Font::SetLanguageTag( const LanguageTag& rLanguageTag )
{
-
if( mpImplFont->maLanguageTag != rLanguageTag )
{
MakeUnique();
@@ -380,7 +362,6 @@ void Font::SetLanguageTag( const LanguageTag& rLanguageTag )
void Font::SetCJKContextLanguageTag( const LanguageTag& rLanguageTag )
{
-
if( mpImplFont->maCJKLanguageTag != rLanguageTag )
{
MakeUnique();
@@ -390,7 +371,6 @@ void Font::SetCJKContextLanguageTag( const LanguageTag& rLanguageTag )
void Font::SetLanguage( LanguageType eLanguage )
{
-
if( mpImplFont->maLanguageTag.getLanguageType( false) != eLanguage )
{
MakeUnique();
@@ -400,7 +380,6 @@ void Font::SetLanguage( LanguageType eLanguage )
void Font::SetCJKContextLanguage( LanguageType eLanguage )
{
-
if( mpImplFont->maCJKLanguageTag.getLanguageType( false) != eLanguage )
{
MakeUnique();
@@ -410,7 +389,6 @@ void Font::SetCJKContextLanguage( LanguageType eLanguage )
void Font::SetPitch( FontPitch ePitch )
{
-
if( mpImplFont->mePitch != ePitch )
{
MakeUnique();
@@ -420,7 +398,6 @@ void Font::SetPitch( FontPitch ePitch )
void Font::SetOrientation( short nOrientation )
{
-
if( mpImplFont->mnOrientation != nOrientation )
{
MakeUnique();
@@ -430,7 +407,6 @@ void Font::SetOrientation( short nOrientation )
void Font::SetVertical( bool bVertical )
{
-
if( mpImplFont->mbVertical != bVertical )
{
MakeUnique();
@@ -440,7 +416,6 @@ void Font::SetVertical( bool bVertical )
void Font::SetKerning( FontKerning nKerning )
{
-
if( mpImplFont->mnKerning != nKerning )
{
MakeUnique();
@@ -455,7 +430,6 @@ bool Font::IsKerning() const
void Font::SetWeight( FontWeight eWeight )
{
-
if( mpImplFont->meWeight != eWeight )
{
MakeUnique();
@@ -465,7 +439,6 @@ void Font::SetWeight( FontWeight eWeight )
void Font::SetWidthType( FontWidth eWidth )
{
-
if( mpImplFont->meWidthType != eWidth )
{
MakeUnique();
@@ -475,7 +448,6 @@ void Font::SetWidthType( FontWidth eWidth )
void Font::SetItalic( FontItalic eItalic )
{
-
if( mpImplFont->meItalic != eItalic )
{
MakeUnique();
@@ -485,7 +457,6 @@ void Font::SetItalic( FontItalic eItalic )
void Font::SetOutline( bool bOutline )
{
-
if( mpImplFont->mbOutline != bOutline )
{
MakeUnique();
@@ -495,7 +466,6 @@ void Font::SetOutline( bool bOutline )
void Font::SetShadow( bool bShadow )
{
-
if( mpImplFont->mbShadow != bShadow )
{
MakeUnique();
@@ -505,7 +475,6 @@ void Font::SetShadow( bool bShadow )
void Font::SetUnderline( FontUnderline eUnderline )
{
-
if( mpImplFont->meUnderline != eUnderline )
{
MakeUnique();
@@ -515,7 +484,6 @@ void Font::SetUnderline( FontUnderline eUnderline )
void Font::SetOverline( FontUnderline eOverline )
{
-
if( mpImplFont->meOverline != eOverline )
{
MakeUnique();
@@ -525,7 +493,6 @@ void Font::SetOverline( FontUnderline eOverline )
void Font::SetStrikeout( FontStrikeout eStrikeout )
{
-
if( mpImplFont->meStrikeout != eStrikeout )
{
MakeUnique();
@@ -535,7 +502,6 @@ void Font::SetStrikeout( FontStrikeout eStrikeout )
void Font::SetRelief( FontRelief eRelief )
{
-
if( mpImplFont->meRelief != eRelief )
{
MakeUnique();
@@ -545,7 +511,6 @@ void Font::SetRelief( FontRelief eRelief )
void Font::SetEmphasisMark( FontEmphasisMark eEmphasisMark )
{
-
if( mpImplFont->meEmphasisMark != eEmphasisMark )
{
MakeUnique();
@@ -555,7 +520,6 @@ void Font::SetEmphasisMark( FontEmphasisMark eEmphasisMark )
void Font::SetWordLineMode( bool bWordLine )
{
-
if( mpImplFont->mbWordLine != bWordLine )
{
MakeUnique();
commit af2b6a0a3e354de9a149877bf8320e8a4c315a98
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 26 16:38:48 2015 +0100
mbTextBackground is unused
Change-Id: Ib3dacf63db01649992c7fe7571b54f964202fc3b
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index b116956..c8ba06a 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -435,7 +435,6 @@ private:
mutable bool mbKerning : 1;
mutable bool mbNewFont : 1;
mutable bool mbTextLines : 1;
- mutable bool mbTextBackground : 1;
mutable bool mbTextSpecial : 1;
mutable bool mbRefPoint : 1;
mutable bool mbEnableRTL : 1;
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 7ccaf32..17fa196 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -149,7 +149,6 @@ OutputDevice::OutputDevice() :
mbKerning = false;
mbNewFont = true;
mbTextLines = false;
- mbTextBackground = false;
mbTextSpecial = false;
mbRefPoint = false;
mbEnableRTL = false; // mirroring must be explicitly allowed (typically for windows only)
More information about the Libreoffice-commits
mailing list