[Libreoffice-commits] .: svl/source xmloff/source
Muthu Subramanian
sumuthu at kemper.freedesktop.org
Tue Aug 23 02:46:25 PDT 2011
svl/source/items/style.cxx | 2 +-
xmloff/source/draw/ximpstyl.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8542444fd5e38c60de37d21fd5248e2934d02e81
Author: Muthu Subramanian <sumuthu at novell.com>
Date: Tue Aug 23 15:31:50 2011 +0530
Code review fixes.
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index be5c51e..1250451 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -283,7 +283,7 @@ sal_Bool SfxStyleSheetBase::SetParent( const XubString& rName )
if( aName.Len() )
while(pIter)
{
- if(pIter->GetName() == aName && aName != rName)
+ if(pIter->GetName() == aName)
return sal_False;
pIter = rPool.Find(pIter->GetParent(), nFamily);
}
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 6ffd56c..a22ed8a 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1445,7 +1445,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc
{
const SvXMLStyleContext* pStyle = GetStyle(a);
- if(pStyle && pStyle->GetName().getLength() && (nFamily == pStyle->GetFamily())) try
+ if(pStyle && pStyle->GetDisplayName().getLength() && (nFamily == pStyle->GetFamily())) try
{
OUString aStyleName(pStyle->GetDisplayName());
if( nPrefLen )
More information about the Libreoffice-commits
mailing list