Cheers,
Wol
>From 804f503777bff780d82226f37843f3b614a5d5f7 Mon Sep 17 00:00:00 2001
From: Wol <anth...@youngman.org.uk>
Date: Mon, 29 Nov 2010 15:10:42 +0000
Subject: [PATCH] More deleted comments
../../../dbaccess/source/core/misc/0001-More-translations-and-comment-deletion-for-Base.patch
---
reportdesign/source/ui/misc/FunctionHelper.cxx | 11 ++----
reportdesign/source/ui/misc/UITools.cxx | 36 ++++++--------------
reportdesign/source/ui/misc/Undo.cxx | 2 +-
.../source/ui/misc/statusbarcontroller.cxx | 4 +-
4 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx
b/reportdesign/source/ui/misc/FunctionHelper.cxx
index d653ef9..b1535d6 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -58,7 +58,7 @@ sal_Unicode FunctionManager::getSingleToken(const
formula::IFunctionManager::ETo
return sal_Unicode('{');
case eArrayClose:
return sal_Unicode('}');
- } // switch(_eToken)
+ }
return 0;
}
//
-----------------------------------------------------------------------------
@@ -93,11 +93,6 @@ const formula::IFunctionDescription*
FunctionManager::getFunctionByName(const ::
//
-----------------------------------------------------------------------------
void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const
formula::IFunctionDescription*>& /*_rLastRUFunctions*/) const
{
- //const sal_uInt32 nCount = getCount();
- //for(sal_uInt32 i = 0 ; i < nCount ; ++i)
- //{
- // const formula::IFunctionCategory* pCategory = getCategory(
- //}
}
//
-----------------------------------------------------------------------------
::boost::shared_ptr< FunctionDescription > FunctionManager::get(const
uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription)
const
@@ -118,9 +113,9 @@ void
FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula
m_aCategoryIndex.push_back( aCategoryFind );
}
aFunctionFind =
m_aFunctions.insert(TFunctionsMap::value_type(sFunctionName,::boost::shared_ptr<FunctionDescription>(new
FunctionDescription(aCategoryFind->second.get(),_xFunctionDescription)))).first;
- } // if ( aFind == m_aFunctions.end() )
+ }
pDesc = aFunctionFind->second;
- } // if ( _xFunctionDescription.is() )
+ }
return pDesc;
}
//
-----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/misc/UITools.cxx
b/reportdesign/source/ui/misc/UITools.cxx
index ba963d9..ae81de8 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -175,14 +175,14 @@ void adjustSectionName(const uno::Reference<
report::XGroup >& _xGroup,sal_Int32
::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPHEADER));
sName += ::rtl::OUString::valueOf(_nPos);
_xGroup->getHeader()->setName(sName);
- } // if ( _xGroup->getHeaderOn() )
+ }
if ( _xGroup->getFooterOn() &&
!_xGroup->getFooter()->getName().getLength() )
{
::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER));
sName += ::rtl::OUString::valueOf(_nPos);
_xGroup->getFooter()->setName(sName);
- } // if ( _xGroup->getHeaderOn() )
+ }
}
//
-----------------------------------------------------------------------------
::rtl::Reference< comphelper::OPropertyChangeMultiplexer>
addStyleListener(const uno::Reference< report::XReportDefinition >&
_xReportDefinition,::comphelper::OPropertyChangeListener* _pListener)
@@ -261,7 +261,7 @@ namespace
case COMPLEX:
aLocale = _rxReportControlFormat->getCharLocaleComplex();
break;
- } // switch(_nWhich)
+ }
_rItemSet.Put(SvxLanguageItem(MsLangId::convertLocaleToLanguageWithFallback(aLocale),_nLanguage));
@@ -288,7 +288,7 @@ namespace
pClone->PutValue(_xShape->getPropertyValue(aIt->sName),
aIt->nMemberId);
_rItemSet.Put(*pClone, aIt->nWID);
}
- } // if ( xInfo->hasPropertyByName(sPropertyName) )
+ }
++aIt;
}
}
@@ -319,11 +319,11 @@ namespace
catch(uno::Exception&)
{ // shapes have a bug so we ignore this one.
}
- } // if ( pItem )
+ }
}
}
++aIt;
- } // while ( pPropertyMap->pName )
+ }
}
//
-------------------------------------------------------------------------
void lcl_CharPropertiesToItems( const
uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
@@ -353,7 +353,6 @@ namespace
_rItemSet.Put(aUnderLineItem);
_rItemSet.Put(SvxKerningItem(_rxReportControlFormat->getCharKerning(),ITEMID_KERNING));
_rItemSet.Put(SvxEmphasisMarkItem(static_cast<FontEmphasisMark>(_rxReportControlFormat->getCharEmphasis()),ITEMID_EMPHASISMARK));
- //_rItemSet.Put(SvxTwoLinesItem());
_rItemSet.Put(SvxCharReliefItem(static_cast<FontRelief>(_rxReportControlFormat->getCharRelief()),ITEMID_CHARRELIEF));
_rItemSet.Put(SvxColorItem(::Color(_rxReportControlFormat->getCharColor()),ITEMID_COLOR));
_rItemSet.Put(SvxCharRotateItem(_rxReportControlFormat->getCharRotation(),sal_False,ITEMID_CHARROTATE));
@@ -362,11 +361,9 @@ namespace
SvxHorJustifyItem aHorJustifyItem(ITEMID_HORJUSTIFY);
aHorJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_PARAADJUST),MID_HORJUST_ADJUST);
_rItemSet.Put(aHorJustifyItem);
-
//_rItemSet.Put(SfxInt32Item(ITEMID_DEGREES,_rxReportControlFormat->getCharRotation()));
SvxVerJustifyItem aVerJustifyItem(ITEMID_VERJUSTIFY);
aVerJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_VERTICALALIGN),MID_HORJUST_ADJUST);
_rItemSet.Put(aVerJustifyItem);
-
//_rItemSet.Put(SfxInt32Item(ITEMID_IDENT,_rxReportControlFormat->getCharRotation()));
uno::Reference< report::XShape>
xShape(_rxReportControlFormat,uno::UNO_QUERY);
if ( !xShape.is() )
@@ -398,7 +395,7 @@ namespace
aNewFont.SetFamily(pFontItem->GetFamily());
aNewFont.SetPitch(pFontItem->GetPitch());
aNewFont.SetCharSet(pFontItem->GetCharSet());
- } // if ( SFX_ITEM_SET == _rItemSet.GetItemState(
ITEMID_FONT,sal_True,&pItem) && pItem->ISA(SvxFontItem))
+ }
if ( SFX_ITEM_SET == _rItemSet.GetItemState(
_nFontHeight,sal_True,&pItem) && pItem->ISA(SvxFontHeightItem))
{
const SvxFontHeightItem* pFontItem = static_cast<const
SvxFontHeightItem*>(pItem);
@@ -544,7 +541,7 @@ namespace
{
const SvxCaseMapItem* pFontItem = static_cast<const
SvxCaseMapItem*>(pItem);
lcl_pushBack( _out_rProperties, PROPERTY_CHARCASEMAP,
uno::makeAny( pFontItem->GetValue() ) );
- } // if ( SFX_ITEM_SET == _rItemSet.GetItemState(
ITEMID_CASEMAP,sal_True,&pItem) && pItem->ISA(SvxCaseMapItem))
+ }
struct Items {
USHORT nWhich;
::rtl::OUString sPropertyName;
@@ -561,7 +558,7 @@ namespace
lang::Locale aCharLocale;
MsLangId::convertLanguageToLocale( pFontItem->GetLanguage(),
aCharLocale );
lcl_pushBack( _out_rProperties, pItems[k].sPropertyName,
uno::makeAny( aCharLocale ) );
- } // if ( SFX_ITEM_SET == _rItemSet.GetItemState(
ITEMID_LANGUAGE,sal_True,&pItem) && pItem->ISA(SvxLanguageItem))
+ }
}
if ( SFX_ITEM_SET == _rItemSet.GetItemState(
ITEMID_ESCAPEMENT,sal_True,&pItem) && pItem->ISA(SvxEscapementItem))
{
@@ -641,7 +638,6 @@ bool openCharDialog( const
uno::Reference<report::XReportControlFormat >& _rxRep
{ SID_ATTR_CHAR_SCALEWIDTH, SFX_ITEM_POOLABLE },
{ SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE },
{ SID_ATTR_CHAR_HIDDEN, SFX_ITEM_POOLABLE },
- //{ SID_ATTR_BRUSH_CHAR, SFX_ITEM_POOLABLE },
{ SID_ATTR_BRUSH, SFX_ITEM_POOLABLE },
{ SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE },
{ SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE },
@@ -761,12 +757,6 @@ bool openAreaDialog( const uno::Reference<report::XShape
>& _xShape,const uno::R
Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
- //static USHORT pRanges[] =
- //{
- // XATTR_START,XATTR_END,
- // 0
- //};
-
bool bSuccess = false;
try
{
@@ -813,14 +803,14 @@ void applyCharacterSettings( const uno::Reference<
report::XReportControlFormat
aAwtFont.Name = ::rtl::OUString(); // hack to
_rxReportControlFormat->setFontDescriptor( aAwtFont );
_rxReportControlFormat->setCharFontName( sTemp );
- } // if ( aSettings.get( "Font" ) >>= aAwtFont )
+ }
if ( aSettings.get( "FontAsian" ) >>= aAwtFont )
{
::rtl::OUString sTemp = aAwtFont.Name;
aAwtFont.Name = ::rtl::OUString(); // hack to
_rxReportControlFormat->setFontDescriptorAsian( aAwtFont );
_rxReportControlFormat->setCharFontNameAsian( sTemp );
- } // if ( aSettings.get( "Font" ) >>= aAwtFont )
+ }
if ( aSettings.get( "FontComplex" ) >>= aAwtFont )
{
::rtl::OUString sTemp = aAwtFont.Name;
@@ -1002,9 +992,6 @@ void correctOverlapping(SdrObject*
_pControl,OReportSection& _aReportSection,boo
{
OSectionView& rSectionView = _aReportSection.getSectionView();
uno::Reference< report::XReportComponent>
xComponent(_pControl->getUnoShape(),uno::UNO_QUERY);
- // Rectangle
aRet(VCLPoint(xComponent->getPosition()),VCLSize(xComponent->getSize()));
- // aRet.setHeight(aRet.getHeight() + 1);
- // aRet.setWidth(aRet.getWidth() + 1);
Rectangle aRect = getRectangleFromControl(_pControl);
bool bOverlapping = true;
@@ -1040,7 +1027,6 @@ bool openDialogFormula_nothrow( ::rtl::OUString&
_in_out_rFormula
OSL_PRECOND( _xInspectorWindow.is(), "openDialogFormula_nothrow: invalid
parameters!" );
if ( !_xInspectorWindow.is() )
return false;
- // _out_rFormula = ::rtl::OUString();
bool bSuccess = false;
::dbtools::SQLExceptionInfo aErrorInfo;
uno::Reference< awt::XWindow > xInspectorWindow;
diff --git a/reportdesign/source/ui/misc/Undo.cxx
b/reportdesign/source/ui/misc/Undo.cxx
index b665118..e76b3a9 100644
--- a/reportdesign/source/ui/misc/Undo.cxx
+++ b/reportdesign/source/ui/misc/Undo.cxx
@@ -70,7 +70,7 @@ namespace
_xSection->remove(xShape);
--nCount;
}
- } // if ( _xSection.is() )
+ }
}
//----------------------------------------------------------------------------
void lcl_insertElements(const uno::Reference< report::XSection >&
_xSection,const ::std::vector< uno::Reference< drawing::XShape> >& _aControls)
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx
b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index a823017..f6c26ac 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -113,7 +113,7 @@ void SAL_CALL OStatusbarController::initialize( const
Sequence< Any >& _rArgumen
if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") )
{
m_pController = TStatusbarHelper::createFromQuery(new
SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar));
- } // if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") )
+ }
else if ( m_aCommandURL.equalsAscii(".uno:Zoom") )
{
m_pController = TStatusbarHelper::createFromQuery(new
SvxZoomStatusBarControl(m_nSlotId = SID_ATTR_ZOOM,m_nId,*pStatusBar));
@@ -146,7 +146,7 @@ void SAL_CALL OStatusbarController::statusChanged( const
FeatureStateEvent& _aEv
aZoomSlider.PutValue(_aEvent.State);
static_cast<SvxZoomSliderControl*>(m_pController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoomSlider);
}
- } // if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") )
+ }
else if ( m_aCommandURL.equalsAscii(".uno:Zoom") )
{
Sequence< PropertyValue > aSeq;
--
1.7.2.2
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
