[Libreoffice-commits] core.git: 18 commits - basic/source connectivity/source dbaccess/source include/drawinglayer include/osl lingucomponent/source sc/source sd/source sfx2/source svtools/source svx/source sw/source xmloff/source
David Tardon
dtardon at redhat.com
Sun Mar 1 09:55:04 PST 2015
basic/source/classes/sbxmod.cxx | 4 +-
connectivity/source/drivers/firebird/Driver.cxx | 2 -
dbaccess/source/ui/querydesign/querycontroller.cxx | 2 -
include/drawinglayer/primitive2d/svggradientprimitive2d.hxx | 4 +-
include/osl/profile.hxx | 2 -
lingucomponent/source/languageguessing/guess.cxx | 11 +++---
sc/source/core/tool/address.cxx | 4 +-
sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 2 -
sd/source/filter/eppt/epptso.cxx | 4 +-
sd/source/filter/eppt/pptx-epptbase.cxx | 2 -
sd/source/filter/eppt/pptx-text.cxx | 14 ++++----
sfx2/source/sidebar/Theme.cxx | 4 +-
svtools/source/control/tabbar.cxx | 10 ++----
svx/source/svdraw/polypolygoneditor.cxx | 12 +++----
sw/source/core/unocore/unotbl.cxx | 2 -
sw/source/ui/dialog/uiregionsw.cxx | 2 -
xmloff/source/forms/elementexport.cxx | 19 +++++-------
xmloff/source/transform/EventOOoTContext.cxx | 2 -
18 files changed, 49 insertions(+), 53 deletions(-)
New commits:
commit 115b78837e9a4206603fc5dbc7da68f65ba08a4b
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 17:07:37 2015 +0100
mismatched new[]/delete
Change-Id: Ie3987480800cb07fcb18adb9fa4a5b190c1d45b5
diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index a4c9e72..f14a09a 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -100,7 +100,7 @@ namespace osl {
}
pStrings[ nItems ] = NULL;
sal_uInt32 nRet = osl_readProfileIdent(profile, rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nDefault);
- delete pStrings;
+ delete[] pStrings;
return nRet;
}
commit 79143802420796074cebc07d133f75458205bd1a
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 17:06:38 2015 +0100
use initializer list here too
Change-Id: I30e4374dc44a58cb1b7315e3d7bfbed99c77030a
diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx
index 9c16750..833d603 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -40,10 +40,10 @@
using namespace std;
Guess::Guess()
+ : language_str(DEFAULT_LANGUAGE)
+ , country_str(DEFAULT_COUNTRY)
+ , encoding_str(DEFAULT_ENCODING)
{
- language_str = DEFAULT_LANGUAGE;
- country_str = DEFAULT_COUNTRY;
- encoding_str = DEFAULT_ENCODING;
}
/*
commit c6ad44c180667d27b79781e9cf0b6db0eb9053dd
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 17:06:10 2015 +0100
initialize members
Change-Id: I907fdbb4ca12a25fbfa99c6fa345c3c07aea0833
diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx
index 63c11a5..9c16750 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -52,9 +52,10 @@ Guess::Guess()
*
*/
Guess::Guess(const char * guess_str)
+ : language_str(DEFAULT_LANGUAGE)
+ , country_str(DEFAULT_COUNTRY)
+ , encoding_str(DEFAULT_ENCODING)
{
- Guess();
-
string lang;
string country;
string enc;
commit e133edad085699001619b55524c4c1ef0d587679
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 17:02:11 2015 +0100
fix comparison
Change-Id: Ia3b0278ce8bcc3558a238e0048e3f177e5e1e681
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index f5f1018..5aa6a51 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1590,7 +1590,7 @@ sal_uInt16 ScRange::ParseCols( const OUString& rStr, ScDocument* pDoc,
break;
case formula::FormulaGrammar::CONV_XL_R1C1:
- if ((p[0] == 'C' || p[0] != 'c') &&
+ if ((p[0] == 'C' || p[0] == 'c') &&
NULL != (p = lcl_r1c1_get_col( p, rDetails, &aStart, &ignored )))
{
if( p[0] == ':')
@@ -1649,7 +1649,7 @@ sal_uInt16 ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
break;
case formula::FormulaGrammar::CONV_XL_R1C1:
- if ((p[0] == 'R' || p[0] != 'r') &&
+ if ((p[0] == 'R' || p[0] == 'r') &&
NULL != (p = lcl_r1c1_get_row( p, rDetails, &aStart, &ignored )))
{
if( p[0] == ':')
commit 04814fcc3bd1045d76b27c225aa7baf892ac3410
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:54:57 2015 +0100
likely intent
Change-Id: I2372ddec8e82eb99206661469843d7837d2bf6d1
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 05fdd84..09595a7 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1769,7 +1769,7 @@ void SbModule::GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache)
{
SbiSymDef* pSymDef = pPool->Get(i);
//std::cerr << "i: " << i << ", type: " << pSymDef->GetType() << "; name:" << pSymDef->GetName() << std::endl;
- if( (pSymDef->GetType() != SbxEMPTY) || (pSymDef->GetType() != SbxNULL) )
+ if( (pSymDef->GetType() != SbxEMPTY) && (pSymDef->GetType() != SbxNULL) )
aCache.InsertGlobalVar( pSymDef->GetName(), pParser->aGblStrings.Find(pSymDef->GetTypeId()) );
SbiSymPool& pChildPool = pSymDef->GetPool();
@@ -1777,7 +1777,7 @@ void SbModule::GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache)
{
SbiSymDef* pChildSymDef = pChildPool.Get(j);
//std::cerr << "j: " << j << ", type: " << pChildSymDef->GetType() << "; name:" << pChildSymDef->GetName() << std::endl;
- if( (pChildSymDef->GetType() != SbxEMPTY) || (pChildSymDef->GetType() != SbxNULL) )
+ if( (pChildSymDef->GetType() != SbxEMPTY) && (pChildSymDef->GetType() != SbxNULL) )
aCache.InsertLocalVar( pSymDef->GetName(), pChildSymDef->GetName(), pParser->aGblStrings.Find(pChildSymDef->GetTypeId()) );
}
}
commit b005064ba45255ff9229a3060e6cba2cfbf4e588
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:47:36 2015 +0100
avoid NULL ptr deref.
Change-Id: I913e967aa59808077e346b955b136d8faf4b749b
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 22d715f..d1221bd 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -290,7 +290,7 @@ namespace
{
Reference< XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY);
vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
- if( pWindow || pWindow->HasChildPathFocus() )
+ if( pWindow && pWindow->HasChildPathFocus() )
{
pWindow->GrabFocusToDocument();
}
commit 0d66044eb60dbe0ff241fbf1e8303cef8ce1953b
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:45:13 2015 +0100
avoid NULL ptr deref.
Change-Id: I7b86bd672af36209555487b08263d8d323bd1cc5
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index 3e65370..d0b0be1 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -154,7 +154,7 @@ void ScPivotLayoutTreeListData::PushDataFieldNames(vector<ScDPName>& rDataFieldN
ScDPLabelData* pLabelData = mpParent->GetLabelData(nColumn);
- if (pLabelData == NULL && pLabelData->maName.isEmpty())
+ if (pLabelData == NULL || pLabelData->maName.isEmpty())
continue;
OUString sLayoutName = pLabelData->maLayoutName;
commit 6e69d9b8661073131274fc2d6a4499a696dd7b3b
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:42:15 2015 +0100
make this a bit less cryptic
Change-Id: I800735cf4dd10af8e6cd2e2581b18bcb71eb2872
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 61f7ae2..2f0f375 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -172,8 +172,14 @@ namespace xmloff
else if (sServiceName == SERVICE_PERSISTENT_COMPONENT_##name) \
sToWriteServiceName = SERVICE_##name
- if (false)
- ;
+ if (sServiceName == SERVICE_PERSISTENT_COMPONENT_EDIT)
+ {
+ // special handling for the edit field: we have two controls using this as persistence service name
+ sToWriteServiceName = SERVICE_EDIT;
+ Reference< XServiceInfo > xSI(m_xProps, UNO_QUERY);
+ if (xSI.is() && xSI->supportsService(SERVICE_FORMATTEDFIELD))
+ sToWriteServiceName = SERVICE_FORMATTEDFIELD;
+ }
CHECK_N_TRANSLATE( FORM );
CHECK_N_TRANSLATE( LISTBOX );
CHECK_N_TRANSLATE( COMBOBOX );
@@ -193,14 +199,6 @@ namespace xmloff
CHECK_N_TRANSLATE( HIDDENCONTROL );
CHECK_N_TRANSLATE( IMAGECONTROL );
CHECK_N_TRANSLATE( FORMATTEDFIELD );
- else if (sServiceName == SERVICE_PERSISTENT_COMPONENT_EDIT)
- {
- // special handling for the edit field: we have two controls using this as persistence service name
- sToWriteServiceName = SERVICE_EDIT;
- Reference< XServiceInfo > xSI(m_xProps, UNO_QUERY);
- if (xSI.is() && xSI->supportsService(SERVICE_FORMATTEDFIELD))
- sToWriteServiceName = SERVICE_FORMATTEDFIELD;
- }
#if OSL_DEBUG_LEVEL > 0
Reference< XServiceInfo > xSI(m_xProps, UNO_QUERY);
OSL_ENSURE(xSI.is() && xSI->supportsService(sToWriteServiceName),
commit 0821dd79b705a8ae247e33f656388fb57edc212f
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:41:49 2015 +0100
remove duplicate line
Change-Id: I80239379cfba8fa9d13554a693f0aa3e8610ef55
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index ed8abb9..61f7ae2 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -175,7 +175,6 @@ namespace xmloff
if (false)
;
CHECK_N_TRANSLATE( FORM );
- CHECK_N_TRANSLATE( FORM );
CHECK_N_TRANSLATE( LISTBOX );
CHECK_N_TRANSLATE( COMBOBOX );
CHECK_N_TRANSLATE( RADIOBUTTON );
commit f138cf2c25c3ad5e9eec4e9682347e340618f839
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:38:46 2015 +0100
condition is always true because of wrongly placed )
Change-Id: Id5f2c623375419daa4433fc2f925921e6013846f
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 0fafe1d..ad85bc0 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -990,7 +990,7 @@ bool PPTWriter::ImplGetText()
{
mnTextSize = mXText->getString().getLength();
::com::sun::star::uno::Any aAny;
- if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ) ), sal_True )
+ if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ), sal_True ) )
aAny >>= mbFontIndependentLineSpacing;
}
return ( mnTextSize != 0 );
@@ -3674,7 +3674,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
mnTextSize = mXText->getString().getLength();
::com::sun::star::uno::Any aAny;
- if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ) ), sal_True )
+ if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ), sal_True ) )
aAny >>= mbFontIndependentLineSpacing;
EscherPropertyContainer aPropOptSp;
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 2cb8998..d97930d 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -439,7 +439,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference
{
::com::sun::star::uno::Any aAny;
sal_Int32 nLayout = 20;
- if ( GetPropertyValue( aAny, rXPropSet, OUString( "Layout" ) ), sal_True )
+ if ( GetPropertyValue( aAny, rXPropSet, OUString( "Layout" ), sal_True ) )
aAny >>= nLayout;
DBG(printf("GetLayoutOffset %" SAL_PRIdINT32 "\n", nLayout));
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 06f21bb..d906f81 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -515,13 +515,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
OUString aFieldKind( aXTextField->getPresentation( sal_True ) );
if ( aFieldKind == "Date" )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) )
{
bool bBool = false;
aAny >>= bBool;
if ( !bBool ) // Fixed DateFields does not exist in PPT
{
- if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ), sal_True ) )
{
nFormat = *(sal_Int32*)aAny.getValue();
switch ( nFormat )
@@ -543,7 +543,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
}
else if ( aFieldKind == "URL" )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "URL" ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "URL" ), sal_True ) )
rURL = *(OUString*)aAny.getValue();
nRetValue = 4 << 28;
}
@@ -557,13 +557,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
}
else if ( aFieldKind == "Time" )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) )
{
bool bBool = false;
aAny >>= bBool;
if ( !bBool )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) )
{
nFormat = *(sal_Int32*)aAny.getValue();
nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000;
@@ -581,13 +581,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
}
else if ( aFieldKind == "ExtTime" )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) )
{
bool bBool = false;
aAny >>= bBool;
if ( !bBool )
{
- if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ) ), sal_True )
+ if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ), sal_True ) )
{
nFormat = *(sal_Int32*)aAny.getValue();
switch ( nFormat )
commit 2c5acc396c2561da9892e5f58aff5694301d1ba2
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:33:11 2015 +0100
fix index
Change-Id: Ib006c35b6924974faaeb88d10d33d76b27cf0e96
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 767feee..0a65ea9 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -135,7 +135,7 @@ Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (Ru
{
Sequence< OUString > aSNS( 2 );
aSNS[0] = "com.sun.star.sdbc.Driver";
- aSNS[0] = "com.sun.star.sdbcx.Driver";
+ aSNS[1] = "com.sun.star.sdbcx.Driver";
return aSNS;
}
commit a6db8e23afc05f413ff1098b401c5a5754160113
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:32:30 2015 +0100
fix index
Change-Id: I2eb918b2590841cc541a3cec3be7731423653a63
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index b8b16fa..b8dc755 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3733,7 +3733,7 @@ uno::Sequence< OUString > SwXTextTable::getSupportedServiceNames(void) throw( un
pArr[0] = "com.sun.star.document.LinkTarget";
pArr[1] = "com.sun.star.text.TextTable";
pArr[2] = "com.sun.star.text.TextContent";
- pArr[2] = "com.sun.star.text.TextSortable";
+ pArr[3] = "com.sun.star.text.TextSortable";
return aRet;
}
commit 7a1e6d73dc865ac3600edf908832a37e2debc2aa
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:26:03 2015 +0100
i assume this is what is wanted
Change-Id: I619c57b07ccde25257f7848bd2bdf55ac78c9171
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index 48ce63c..eb3d10e 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -76,7 +76,7 @@ XMLTransformerOOoEventMap_Impl::XMLTransformerOOoEventMap_Impl(
{
if( pInit )
AddMap( pInit );
- if( pInit )
+ if( pInit2 )
AddMap( pInit2 );
}
commit 2e8fccad27af4e4ee52081e84e10b0e2e55692eb
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:24:12 2015 +0100
initialize iterator at construction
Change-Id: I8ec59c89b3b8d44b99d3e1296fe217a1630607b4
diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx
index 594c2ae..8e91c77 100644
--- a/svx/source/svdraw/polypolygoneditor.cxx
+++ b/svx/source/svdraw/polypolygoneditor.cxx
@@ -35,8 +35,8 @@ bool PolyPolygonEditor::DeletePoints( const std::set< sal_uInt16 >& rAbsPoints )
{
bool bPolyPolyChanged = false;
- std::set< sal_uInt16 >::const_reverse_iterator aIter;( rAbsPoints.rbegin() );
- for( aIter = rAbsPoints.rbegin(); aIter != rAbsPoints.rend(); ++aIter )
+ std::set< sal_uInt16 >::const_reverse_iterator aIter( rAbsPoints.rbegin() );
+ for( ; aIter != rAbsPoints.rend(); ++aIter )
{
sal_uInt32 nPoly, nPnt;
if( GetRelativePolyPoint(maPolyPolygon,(*aIter), nPoly, nPnt) )
@@ -66,8 +66,8 @@ bool PolyPolygonEditor::SetSegmentsKind(SdrPathSegmentKind eKind, const std::set
{
bool bPolyPolyChanged = false;
- std::set< sal_uInt16 >::const_reverse_iterator aIter;( rAbsPoints.rbegin() );
- for( aIter = rAbsPoints.rbegin(); aIter != rAbsPoints.rend(); ++aIter )
+ std::set< sal_uInt16 >::const_reverse_iterator aIter( rAbsPoints.rbegin() );
+ for( ; aIter != rAbsPoints.rend(); ++aIter )
{
sal_uInt32 nPolyNum, nPntNum;
@@ -126,8 +126,8 @@ bool PolyPolygonEditor::SetPointsSmooth( basegfx::B2VectorContinuity eFlags, con
{
bool bPolyPolygonChanged(false);
- std::set< sal_uInt16 >::const_reverse_iterator aIter;( rAbsPoints.rbegin() );
- for( aIter = rAbsPoints.rbegin(); aIter != rAbsPoints.rend(); ++aIter )
+ std::set< sal_uInt16 >::const_reverse_iterator aIter( rAbsPoints.rbegin() );
+ for( ; aIter != rAbsPoints.rend(); ++aIter )
{
sal_uInt32 nPolyNum, nPntNum;
commit 3f18467049cf0843730335c6bb0a09aa1df189f6
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:21:16 2015 +0100
fix end condition
Change-Id: I420d873ebafd459cedaee62bdc623599b4c767f7
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index ecf9f93..25a16f9 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -118,7 +118,7 @@ static void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, Combo
lcl_FillList( rSh, rSubRegions, pAvailNames, 0 );
IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess();
for( IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getBookmarksBegin();
- ppMark != pMarkAccess->getBookmarksBegin();
+ ppMark != pMarkAccess->getBookmarksEnd();
++ppMark)
{
const ::sw::mark::IMark* pBkmk = ppMark->get();
commit d170afda29bf4557df568732b1feba47f2c9439f
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:17:56 2015 +0100
fix loop
Change-Id: I152f7bd7f528d0c485c11ba5e31e8678744a97fb
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index e091ccb..d4e13fa 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -397,8 +397,8 @@ void SAL_CALL Theme::disposing (void)
for (ChangeListeners::const_iterator
iContainer(maChangeListeners.begin()),
iContainerEnd(maChangeListeners.end());
- iContainerEnd!=iContainerEnd;
- ++iContainerEnd)
+ iContainer != iContainerEnd;
+ ++iContainer)
{
for (ChangeListenerContainer::const_iterator
iListener(iContainer->second.begin()),
commit d70ab9974d161ff1acc2543f04a6c9431e8dff43
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:14:58 2015 +0100
fix self-assignment
Change-Id: Id4c5ac26ac33ba87407127586fb1961b9fb24967
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index a3d14ae..f53b326 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -34,6 +34,7 @@
#include <svtools/svtresid.hxx>
#include <svtools/svtools.hrc>
#include <limits>
+#include <utility>
namespace {
#define TABBAR_DRAG_SCROLLOFF 5
@@ -558,12 +559,9 @@ void TabBar::ImplGetColors( Color& rFaceColor, Color& rFaceTextColor,
// as the selected tabs should appear in 3D
if ( mnWinStyle & WB_3DTAB )
{
- Color aTempColor = rFaceColor;
- rFaceColor = rSelectColor;
- rSelectColor = aTempColor;
- aTempColor = rFaceTextColor;
- rFaceTextColor = rSelectTextColor;
- rSelectTextColor = rFaceTextColor;
+ using std::swap;
+ swap(rFaceColor, rSelectColor);
+ swap(rFaceTextColor, rSelectTextColor);
}
}
commit a59848c9999f655342db4c67e3dc390cc083e511
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 1 16:11:26 2015 +0100
really compare to the other instance
Change-Id: I8cef7d7d41ee4ca22a23aad4fa6c9a5b73822275
diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
index 8c3b32a..2bc6e54 100644
--- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
@@ -58,8 +58,8 @@ namespace drawinglayer
bool operator==(const SvgGradientEntry& rCompare) const
{
return (getOffset() == rCompare.getOffset()
- && getColor() == getColor()
- && getOpacity() == getOpacity());
+ && getColor() == rCompare.getColor()
+ && getOpacity() == rCompare.getOpacity());
}
bool operator<(const SvgGradientEntry& rCompare) const
More information about the Libreoffice-commits
mailing list