summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-22 21:20:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 03:38:49 +0000
commit0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch)
tree5024cba9f9ea5e3b23ea26025323f6aef39488d0 /sfx2/source/dialog
parentb81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff)
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r--sfx2/source/dialog/backingcomp.cxx40
-rw-r--r--sfx2/source/dialog/basedlgs.cxx42
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx46
-rw-r--r--sfx2/source/dialog/dockwin.cxx42
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx50
-rw-r--r--sfx2/source/dialog/itemconnect.cxx8
-rw-r--r--sfx2/source/dialog/mailmodel.cxx2
-rw-r--r--sfx2/source/dialog/mgetempl.cxx20
-rw-r--r--sfx2/source/dialog/newstyle.cxx4
-rw-r--r--sfx2/source/dialog/passwd.cxx10
-rw-r--r--sfx2/source/dialog/splitwin.cxx50
-rw-r--r--sfx2/source/dialog/styfitem.cxx12
-rw-r--r--sfx2/source/dialog/styledlg.cxx8
-rw-r--r--sfx2/source/dialog/tabdlg.cxx78
-rw-r--r--sfx2/source/dialog/taskpane.cxx130
-rw-r--r--sfx2/source/dialog/templdlg.cxx172
-rw-r--r--sfx2/source/dialog/titledockwin.cxx36
-rw-r--r--sfx2/source/dialog/tplcitem.cxx4
-rw-r--r--sfx2/source/dialog/tplpitem.cxx12
-rw-r--r--sfx2/source/dialog/versdlg.cxx2
20 files changed, 384 insertions, 384 deletions
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index e515b1483bfb..573fc5e25ef5 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -153,13 +153,13 @@ BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext
{
}
-//_______________________________________________
+
BackingComp::~BackingComp()
{
}
-//_______________________________________________
+
/** return information about supported interfaces.
@@ -213,7 +213,7 @@ css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/ const css::uno::Type&
return aResult;
}
-//_______________________________________________
+
/** increase ref count of this instance.
*/
@@ -224,7 +224,7 @@ void SAL_CALL BackingComp::acquire()
OWeakObject::acquire();
}
-//_______________________________________________
+
/** decrease ref count of this instance.
*/
@@ -235,7 +235,7 @@ void SAL_CALL BackingComp::release()
OWeakObject::release();
}
-//_______________________________________________
+
/** return collection about all supported interfaces.
@@ -285,7 +285,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes()
return pTypeCollection->getTypes();
}
-//_______________________________________________
+
/** create one unique Id for all instances of this class.
@@ -336,7 +336,7 @@ css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames()
return lNames;
}
-//_______________________________________________
+
/**
attach this component to a target frame.
@@ -465,7 +465,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
/* } SAFE */
}
-//_______________________________________________
+
/** not supported.
@@ -481,7 +481,7 @@ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< cs
return sal_False;
}
-//_______________________________________________
+
/** not supported.
@@ -497,7 +497,7 @@ css::uno::Reference< css::frame::XModel > SAL_CALL BackingComp::getModel()
return css::uno::Reference< css::frame::XModel >();
}
-//_______________________________________________
+
/** not supported.
@@ -510,7 +510,7 @@ css::uno::Any SAL_CALL BackingComp::getViewData()
return css::uno::Any();
}
-//_______________________________________________
+
/** not supported.
@@ -523,7 +523,7 @@ void SAL_CALL BackingComp::restoreViewData( /*IN*/ const css::uno::Any& )
{
}
-//_______________________________________________
+
/** returns the attached frame for this component.
@@ -542,7 +542,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame()
/* } SAFE */
}
-//_______________________________________________
+
/** ask controller for it's current working state.
@@ -564,7 +564,7 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool )
return sal_True;
}
-//_______________________________________________
+
/** callback from our window member.
@@ -600,7 +600,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
/* } SAFE */
}
-//_______________________________________________
+
/** kill this instance.
@@ -652,7 +652,7 @@ void SAL_CALL BackingComp::dispose()
/* } SAFE */
}
-//_______________________________________________
+
/** not supported.
@@ -672,7 +672,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c
static_cast< ::cppu::OWeakObject* >(this));
}
-//_______________________________________________
+
/** not supported.
@@ -687,7 +687,7 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference
{
}
-//_______________________________________________
+
/**
force initialiation for this component.
@@ -751,7 +751,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
/* } SAFE */
}
-//_______________________________________________
+
/**
*/
@@ -761,7 +761,7 @@ void SAL_CALL BackingComp::keyPressed( /*IN*/ const css::awt::KeyEvent& )
{
}
-//_______________________________________________
+
/**
*/
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 1e3f6d12f692..0fbd80feeb61 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -93,7 +93,7 @@ void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-// -----------------------------------------------------------------------
+
void SfxModalDialog::SetDialogData_Impl()
{
@@ -105,7 +105,7 @@ void SfxModalDialog::SetDialogData_Impl()
aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( aExtraData ) );
}
-// -----------------------------------------------------------------------
+
void SfxModalDialog::GetDialogData_Impl()
@@ -128,14 +128,14 @@ void SfxModalDialog::GetDialogData_Impl()
}
}
-// -----------------------------------------------------------------------
+
void SfxModalDialog::init()
{
GetDialogData_Impl();
}
-// -----------------------------------------------------------------------
+
SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId )
@@ -162,7 +162,7 @@ SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUStri
init();
}
-// -----------------------------------------------------------------------
+
SfxModalDialog::~SfxModalDialog()
@@ -183,7 +183,7 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool )
pOutputSet = new SfxAllItemSet( rPool );
}
-// -----------------------------------------------------------------------
+
void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet )
{
@@ -195,7 +195,7 @@ void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet )
}
}
-//-------------------------------------------------------------------------
+
void SfxModelessDialog::StateChanged( StateChangedType nStateChange )
{
if ( nStateChange == STATE_CHANGE_INITSHOW )
@@ -332,7 +332,7 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW)
pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl));
}
-// -----------------------------------------------------------------------
+
bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
@@ -365,7 +365,7 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
return ModelessDialog::Notify( rEvt );
}
-// -----------------------------------------------------------------------
+
SfxModelessDialog::~SfxModelessDialog()
@@ -380,7 +380,7 @@ SfxModelessDialog::~SfxModelessDialog()
delete pImp;
}
-//-------------------------------------------------------------------------
+
bool SfxModelessDialog::Close()
@@ -401,7 +401,7 @@ bool SfxModelessDialog::Close()
return true;
}
-//-------------------------------------------------------------------------
+
void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const
@@ -420,7 +420,7 @@ void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const
rInfo.nFlags |= SFX_CHILDWIN_ZOOMIN;
}
-// -----------------------------------------------------------------------
+
bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
@@ -456,7 +456,7 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
return FloatingWindow::Notify( rEvt );
}
-// -----------------------------------------------------------------------
+
SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
SfxChildWindow *pCW,
@@ -475,7 +475,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl));
}
-// -----------------------------------------------------------------------
+
SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
SfxChildWindow *pCW,
@@ -495,7 +495,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl));
}
-//-------------------------------------------------------------------------
+
bool SfxFloatingWindow::Close()
@@ -516,7 +516,7 @@ bool SfxFloatingWindow::Close()
return true;
}
-// -----------------------------------------------------------------------
+
SfxFloatingWindow::~SfxFloatingWindow()
@@ -531,7 +531,7 @@ SfxFloatingWindow::~SfxFloatingWindow()
delete pImp;
}
-//-------------------------------------------------------------------------
+
void SfxFloatingWindow::Resize()
@@ -581,7 +581,7 @@ IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl)
return 0;
}
-//-------------------------------------------------------------------------
+
void SfxFloatingWindow::StateChanged( StateChangedType nStateChange )
{
if ( nStateChange == STATE_CHANGE_INITSHOW )
@@ -609,7 +609,7 @@ void SfxFloatingWindow::Initialize(SfxChildWinInfo *pInfo)
pImp->aWinState = pInfo->aWinState;
}
-//-------------------------------------------------------------------------
+
void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const
@@ -676,7 +676,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)
return 0;
}
-// -----------------------------------------------------------------------
+
SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet,
const OString& rID, const OUString& rUIXMLDescription)
@@ -702,7 +702,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(Window* pParent, const SfxItemSet* pInSet
SetInputSet( pInSet );
}
-// -----------------------------------------------------------------------
+
SfxSingleTabDialog::~SfxSingleTabDialog()
{
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index e27c15fa072c..3288f4d82f11 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -116,7 +116,7 @@ const sal_uInt16 HI_ACTION = 4;
static const char DOCUMENT_SIGNATURE_MENU_CMD[] = "Signature";
-//------------------------------------------------------------------------
+
namespace {
OUString CreateSizeText( sal_Int64 nSize )
@@ -193,7 +193,7 @@ OUString ConvertDateTime_Impl( const OUString& rName,
}
}
-//------------------------------------------------------------------------
+
SfxDocumentInfoItem::SfxDocumentInfoItem()
: SfxStringItem()
@@ -220,7 +220,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
{
}
-//------------------------------------------------------------------------
+
SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile,
const uno::Reference<document::XDocumentProperties>& i_xDocProps,
@@ -280,7 +280,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile,
catch ( Exception& ) {}
}
-//------------------------------------------------------------------------
+
SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem )
: SfxStringItem( rItem )
@@ -315,19 +315,19 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem )
m_aCmisProperties = rItem.m_aCmisProperties;
}
-//------------------------------------------------------------------------
+
SfxDocumentInfoItem::~SfxDocumentInfoItem()
{
ClearCustomProperties();
}
-//------------------------------------------------------------------------
+
SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const
{
return new SfxDocumentInfoItem( *this );
}
-//------------------------------------------------------------------------
+
bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const
{
if (!(rItem.Type() == Type() && SfxStringItem::operator==(rItem)))
@@ -357,7 +357,7 @@ bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const
m_aCmisProperties.getLength() == rInfoItem.m_aCmisProperties.getLength();
}
-//------------------------------------------------------------------------
+
void SfxDocumentInfoItem::resetUserData(const OUString & i_rAuthor)
{
setAuthor(i_rAuthor);
@@ -373,7 +373,7 @@ void SfxDocumentInfoItem::resetUserData(const OUString & i_rAuthor)
setEditingCycles(1);
}
-//------------------------------------------------------------------------
+
void SfxDocumentInfoItem::UpdateDocumentInfo(
const uno::Reference<document::XDocumentProperties>& i_xDocProps,
bool i_bDoNotUpdateUserDefined) const
@@ -445,7 +445,7 @@ void SfxDocumentInfoItem::UpdateDocumentInfo(
}
}
-//------------------------------------------------------------------------
+
sal_Bool SfxDocumentInfoItem::IsDeleteUserData() const
{
return m_bDeleteUserData;
@@ -631,7 +631,7 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-//------------------------------------------------------------------------
+
SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet )
: SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", rItemSet)
, m_pInfoItem ( NULL )
@@ -643,13 +643,13 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rI
get(m_pCommentEd, "comments");
}
-//------------------------------------------------------------------------
+
SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItemSet)
{
return new SfxDocumentDescPage(pParent, rItemSet);
}
-//------------------------------------------------------------------------
+
sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
{
// Test whether a change is present
@@ -707,7 +707,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
return sal_True;
}
-//------------------------------------------------------------------------
+
void SfxDocumentDescPage::Reset(const SfxItemSet &rSet)
{
m_pInfoItem = &(SfxDocumentInfoItem &)rSet.Get(SID_DOCINFO);
@@ -727,7 +727,7 @@ void SfxDocumentDescPage::Reset(const SfxItemSet &rSet)
}
}
-//------------------------------------------------------------------------
+
namespace
{
OUString GetDateTimeString( sal_Int32 _nDate, sal_Int32 _nTime )
@@ -809,7 +809,7 @@ SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet)
m_pSignatureBtn->Disable();
}
-//------------------------------------------------------------------------
+
IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl)
{
@@ -923,14 +923,14 @@ void SfxDocumentPage::ImplCheckPasswordState()
m_pChangePassBtn->Disable();
}
-//------------------------------------------------------------------------
+
SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet& rItemSet )
{
return new SfxDocumentPage( pParent, rItemSet );
}
-//------------------------------------------------------------------------
+
void SfxDocumentPage::EnableUseUserData()
{
@@ -939,7 +939,7 @@ void SfxDocumentPage::EnableUseUserData()
m_pDeleteBtn->Show();
}
-//------------------------------------------------------------------------
+
sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
{
@@ -998,7 +998,7 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
return bRet;
}
-//------------------------------------------------------------------------
+
void SfxDocumentPage::Reset( const SfxItemSet& rSet )
{
@@ -1127,7 +1127,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
m_pDeleteBtn->Enable( bEnableUseUserData );
}
-//------------------------------------------------------------------------
+
SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
const SfxItemSet& rItemSet )
: SfxTabDialog(0, pParent, "DocumentPropertiesDialog",
@@ -1181,7 +1181,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
AddTabPage("security", SfxSecurityPage::Create, 0);
}
-// -----------------------------------------------------------------------
+
void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
@@ -1323,7 +1323,7 @@ IMPL_LINK_NOARG(CustomPropertiesEditButton, ClickHdl)
delete pDurationDlg;
return 1;
}
-//--------------------------------------------------------------------------
+
void CustomPropertiesYesNoButton::Resize()
{
const long nWidth = GetSizePixel().Width();
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index be4ff1b51937..8d75488c9b1d 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -433,7 +433,7 @@ friend class SfxDockingWindow;
{ eDockAlignment = eAlign; }
};
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::Resize()
@@ -483,7 +483,7 @@ void SfxDockingWindow::Resize()
}
}
-//-------------------------------------------------------------------------
+
bool SfxDockingWindow::PrepareToggleFloatingMode()
@@ -536,7 +536,7 @@ bool SfxDockingWindow::PrepareToggleFloatingMode()
return true;
}
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::ToggleFloatingMode()
@@ -623,7 +623,7 @@ void SfxDockingWindow::ToggleFloatingMode()
pWorkWin->ConfigChild_Impl( eIdent, SFX_TOGGLEFLOATMODE, pMgr->GetType() );
}
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::StartDocking()
@@ -654,7 +654,7 @@ void SfxDockingWindow::StartDocking()
}
}
-//-------------------------------------------------------------------------
+
bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
@@ -757,7 +757,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
return bFloatMode;
}
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
@@ -830,7 +830,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
SetAlignment( IsFloatingMode() ? SFX_ALIGN_NOALIGNMENT : pImp->GetDockAlignment() );
}
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::Resizing( Size& /*rSize*/ )
@@ -846,7 +846,7 @@ void SfxDockingWindow::Resizing( Size& /*rSize*/ )
}
-//-------------------------------------------------------------------------
+
SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
Window* pParent, WinBits nWinBits) :
@@ -897,7 +897,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
}
-//-------------------------------------------------------------------------
+
SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
Window* pParent, const ResId& rResId) :
@@ -948,7 +948,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
}
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
/* [Description]
@@ -1177,7 +1177,7 @@ void SfxDockingWindow::Initialize_Impl()
pImp->bConstructed = sal_True;
}
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
@@ -1222,7 +1222,7 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
rInfo.aExtraString += ")";
}
-//-------------------------------------------------------------------------
+
SfxDockingWindow::~SfxDockingWindow()
{
@@ -1241,7 +1241,7 @@ void SfxDockingWindow::ReleaseChildWindow_Impl()
pMgr=NULL;
}
-//-------------------------------------------------------------------------
+
SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& rRect)
@@ -1600,7 +1600,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
return eDockAlign;
}
-//-------------------------------------------------------------------------
+
Size SfxDockingWindow::CalcDockingSize(SfxChildAlignment eAlign)
@@ -1649,7 +1649,7 @@ Size SfxDockingWindow::CalcDockingSize(SfxChildAlignment eAlign)
return aSize;
}
-//-------------------------------------------------------------------------
+
SfxChildAlignment SfxDockingWindow::CheckAlignment(SfxChildAlignment,
SfxChildAlignment eAlign)
@@ -1665,7 +1665,7 @@ SfxChildAlignment SfxDockingWindow::CheckAlignment(SfxChildAlignment,
return eAlign;
}
-//-------------------------------------------------------------------------
+
bool SfxDockingWindow::Close()
@@ -1687,7 +1687,7 @@ bool SfxDockingWindow::Close()
return true;
}
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::Paint(const Rectangle& /*rRect*/)
@@ -1740,7 +1740,7 @@ void SfxDockingWindow::Paint(const Rectangle& /*rRect*/)
aView.DrawFrame( aRect, FRAME_DRAW_OUT );
}
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::SetMinOutputSizePixel( const Size& rSize )
@@ -1755,7 +1755,7 @@ void SfxDockingWindow::SetMinOutputSizePixel( const Size& rSize )
DockingWindow::SetMinOutputSizePixel( rSize );
}
-//-------------------------------------------------------------------------
+
Size SfxDockingWindow::GetMinOutputSizePixel() const
@@ -1768,7 +1768,7 @@ Size SfxDockingWindow::GetMinOutputSizePixel() const
return pImp->aMinSize;
}
-//-------------------------------------------------------------------------
+
bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
{
@@ -1813,7 +1813,7 @@ sal_uInt16 SfxDockingWindow::GetWinBits_Impl() const
return nBits;
}
-//-------------------------------------------------------------------------
+
void SfxDockingWindow::SetItemSize_Impl( const Size& rSize )
{
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 385f11e043d7..74dc1fc8b4e5 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -148,7 +148,7 @@ namespace sfx2
// = reading of configuration data
// =======================================================================
- //--------------------------------------------------------------------
+
void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName,
FilterClass& /* [out] */ _rClass )
{
@@ -163,7 +163,7 @@ namespace sfx2
aClassDesc.getNodeValue( sSubFiltersNodeName ) >>= _rClass.aSubFilters;
}
- //--------------------------------------------------------------------
+
struct CreateEmptyClassRememberPos : public ::std::unary_function< FilterName, void >
{
protected:
@@ -190,7 +190,7 @@ namespace sfx2
}
};
- //--------------------------------------------------------------------
+
struct ReadGlobalFilter : public ::std::unary_function< FilterName, void >
{
protected:
@@ -223,7 +223,7 @@ namespace sfx2
}
};
- //--------------------------------------------------------------------
+
void lcl_ReadGlobalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rGlobalClasses, StringArray& _rGlobalClassNames )
{
_rGlobalClasses.clear();
@@ -267,7 +267,7 @@ namespace sfx2
);
}
- //--------------------------------------------------------------------
+
struct ReadLocalFilter : public ::std::unary_function< FilterName, void >
{
protected:
@@ -293,7 +293,7 @@ namespace sfx2
}
};
- //--------------------------------------------------------------------
+
void lcl_ReadLocalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rLocalClasses )
{
_rLocalClasses.clear();
@@ -310,7 +310,7 @@ namespace sfx2
);
}
- //--------------------------------------------------------------------
+
void lcl_ReadClassification( FilterClassList& _rGlobalClasses, StringArray& _rGlobalClassNames, FilterClassList& _rLocalClasses )
{
//================================================================
@@ -336,7 +336,7 @@ namespace sfx2
// = grouping and classifying
// =======================================================================
- //--------------------------------------------------------------------
+
// a struct which adds helps remembering a reference to a class entry
struct ReferToFilterEntry : public ::std::unary_function< FilterName, void >
{
@@ -362,7 +362,7 @@ namespace sfx2
}
};
- //--------------------------------------------------------------------
+
struct FillClassGroup : public ::std::unary_function< FilterClass, void >
{
protected:
@@ -400,7 +400,7 @@ namespace sfx2
}
};
- //--------------------------------------------------------------------
+
static const sal_Unicode s_cWildcardSeparator( ';' );
//====================================================================
@@ -504,7 +504,7 @@ namespace sfx2
aWildCards.push_back( OUString( pTokenStart, pTokenLoop - pTokenStart ) );
}
- //--------------------------------------------------------------------
+
void lcl_InitGlobalClasses( GroupedFilterList& _rAllFilters, const FilterClassList& _rGlobalClasses, FilterGroupEntryReferrer& _rGlobalClassesRef )
{
// we need an extra group in our "all filters" container
@@ -527,7 +527,7 @@ namespace sfx2
// and modify the descriptor for this class accordingly
}
- //--------------------------------------------------------------------
+
typedef ::std::vector< ::std::pair< FilterGroupEntryReferrer::mapped_type, FilterGroup::iterator > >
MapGroupEntry2GroupEntry;
// this is not really a map - it's just called this way because it is used as a map
@@ -554,7 +554,7 @@ namespace sfx2
}
};
- //--------------------------------------------------------------------
+
struct CopyNonEmptyFilter : public ::std::unary_function< FilterDescriptor, void >
{
FilterGroup& rTarget;
@@ -567,7 +567,7 @@ namespace sfx2
}
};
- //--------------------------------------------------------------------
+
void lcl_GroupAndClassify( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rAllFilters )
{
_rAllFilters.clear();
@@ -728,7 +728,7 @@ namespace sfx2
rGlobalFilters.swap( aNonEmptyGlobalFilters );
}
- //--------------------------------------------------------------------
+
struct AppendFilter : public ::std::unary_function< FilterDescriptor, void >
{
protected:
@@ -763,7 +763,7 @@ namespace sfx2
// = handling for the "all files" entry
// =======================================================================
- //--------------------------------------------------------------------
+
sal_Bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName )
{
sal_Bool bHasAll = sal_False;
@@ -779,7 +779,7 @@ namespace sfx2
return bHasAll;
}
- //--------------------------------------------------------------------
+
void lcl_EnsureAllFilesEntry( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rFilters )
{
// ===============================================================
@@ -800,7 +800,7 @@ namespace sfx2
// = filling an XFilterManager
// =======================================================================
- //--------------------------------------------------------------------
+
struct AppendFilterGroup : public ::std::unary_function< FilterGroup, void >
{
protected:
@@ -864,7 +864,7 @@ namespace sfx2
}
};
- //--------------------------------------------------------------------
+
TSortedFilterList::TSortedFilterList(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >& xFilterList)
: m_nIterator(0)
{
@@ -883,21 +883,21 @@ namespace sfx2
}
}
- //--------------------------------------------------------------------
+
const SfxFilter* TSortedFilterList::First()
{
m_nIterator = 0;
return impl_getFilter(m_nIterator);
}
- //--------------------------------------------------------------------
+
const SfxFilter* TSortedFilterList::Next()
{
++m_nIterator;
return impl_getFilter(m_nIterator);
}
- //--------------------------------------------------------------------
+
const SfxFilter* TSortedFilterList::impl_getFilter(sal_Int32 nIndex)
{
if (nIndex<0 || nIndex>=(sal_Int32)m_lFilters.size())
@@ -908,7 +908,7 @@ namespace sfx2
return SfxFilter::GetFilterByName(sFilterName);
}
- //--------------------------------------------------------------------
+
void appendFiltersForSave( TSortedFilterList& _rFilterMatcher,
const Reference< XFilterManager >& _rxFilterManager,
OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl,
@@ -971,7 +971,7 @@ namespace sfx2
OUString aWildcard;
};
- //--------------------------------------------------------------------
+
void appendExportFilters( TSortedFilterList& _rFilterMatcher,
const Reference< XFilterManager >& _rxFilterManager,
OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl )
@@ -1130,7 +1130,7 @@ namespace sfx2
}
}
- //--------------------------------------------------------------------
+
void appendFiltersForOpen( TSortedFilterList& _rFilterMatcher,
const Reference< XFilterManager >& _rxFilterManager,
OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl )
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index 444245b5f12c..aae7b16c2771 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -40,7 +40,7 @@ TriState lclConvertToTriState( bool bKnown, bool bIsKnownFlag, bool bIsUnknownFl
} // namespace
-// ----------------------------------------------------------------------------
+
sal_uInt16 ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
{
@@ -105,7 +105,7 @@ void DummyWindowWrapper::SetControlValue( void* )
{
}
-// ----------------------------------------------------------------------------
+
CheckBoxWrapper::CheckBoxWrapper( CheckBox& rCheckBox ) :
SingleControlWrapperType( rCheckBox )
@@ -133,7 +133,7 @@ void CheckBoxWrapper::SetControlValue( sal_Bool bValue )
GetControl().Check( bValue );
}
-// ----------------------------------------------------------------------------
+
ColorListBoxWrapper::ColorListBoxWrapper(ColorListBox & rListBox):
SingleControlWrapper< ColorListBox, Color >(rListBox)
@@ -327,7 +327,7 @@ bool ItemConnectionArrayImpl::FillItemSet( SfxItemSet& rDestSet, const SfxItemSe
return bChanged;
}
-// ----------------------------------------------------------------------------
+
ItemConnectionArray::ItemConnectionArray() :
mxImpl( new ItemConnectionArrayImpl )
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 1b51bd5f2a41..587d9a8f0903 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -74,7 +74,7 @@
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase1.hxx>
-// --------------------------------------------------------------
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 63abb278453e..f33ce5000f3e 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -230,7 +230,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemS
m_pAutoCB->Show();
}
-//-------------------------------------------------------------------------
+
SfxManageStyleSheetPage::~SfxManageStyleSheetPage()
@@ -248,7 +248,7 @@ SfxManageStyleSheetPage::~SfxManageStyleSheetPage()
}
-//-------------------------------------------------------------------------
+
void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
const OUString& rNew )
@@ -276,7 +276,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
}
}
-//-------------------------------------------------------------------------
+
void SfxManageStyleSheetPage::SetDescriptionText_Impl()
@@ -314,7 +314,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl()
m_pDescFt->SetText( pStyle->GetDescription( eUnit ) );
}
-//-------------------------------------------------------------------------
+
IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
@@ -329,7 +329,7 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
}
IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
-//-------------------------------------------------------------------------
+
IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
@@ -350,7 +350,7 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
}
IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
-//-------------------------------------------------------------------------
+
sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
@@ -397,7 +397,7 @@ sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
return bModified;
}
-//-------------------------------------------------------------------------
+
void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
@@ -466,7 +466,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
}
}
-//-------------------------------------------------------------------------
+
SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent,
const SfxItemSet &rAttrSet )
@@ -484,7 +484,7 @@ SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent,
return new SfxManageStyleSheetPage( pParent, rAttrSet );
}
-//-------------------------------------------------------------------------
+
void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
@@ -515,7 +515,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
m_pAutoCB->SaveValue();
}
-//-------------------------------------------------------------------------
+
int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 062b86f44df8..c8fd34ab0d5c 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -49,7 +49,7 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
{
@@ -86,7 +86,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool
}
}
-// -----------------------------------------------------------------------
+
SfxNewStyleDlg::~SfxNewStyleDlg()
{
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 14b4221e6cd6..c1d47d5d1e8c 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -27,7 +27,7 @@
#include "dialog.hrc"
-// -----------------------------------------------------------------------
+
IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
{
@@ -61,7 +61,7 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
}
IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit)
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
{
@@ -124,7 +124,7 @@ SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const OUString* pGroupText
SetPasswdText();
}
-// -----------------------------------------------------------------------
+
void SfxPasswordDialog::SetPasswdText( )
{
@@ -139,7 +139,7 @@ void SfxPasswordDialog::SetPasswdText( )
}
}
-// -----------------------------------------------------------------------
+
void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen )
{
@@ -153,7 +153,7 @@ void SfxPasswordDialog::ShowMinLengthText(bool bShow)
mpMinLengthFT->Show(bShow);
}
-// -----------------------------------------------------------------------
+
short SfxPasswordDialog::Execute()
{
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 2b9847da4f63..7f975fe3436e 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -190,7 +190,7 @@ void SfxEmptySplitWin_Impl::FadeIn()
pOwner->SaveConfig_Impl();
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
@@ -203,7 +203,7 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt )
SplitWindow::MouseMove( rMEvt );
}
-//-------------------------------------------------------------------------
+
SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
SfxWorkWindow *pW, sal_Bool bWithButtons, WinBits nBits )
@@ -317,7 +317,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
pEmptyWin->SetAutoHideState( !bPinned );
}
-//-------------------------------------------------------------------------
+
SfxSplitWindow::~SfxSplitWindow()
{
@@ -373,7 +373,7 @@ void SfxSplitWindow::SaveConfig_Impl()
aWinOpt.SetUserItem( USERITEM_NAME, makeAny( aWinData.makeStringAndClear() ) );
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::StartSplit()
{
@@ -402,7 +402,7 @@ void SfxSplitWindow::StartSplit()
SetMaxSizePixel( nSize );
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::SplitResize()
{
@@ -415,7 +415,7 @@ void SfxSplitWindow::SplitResize()
pWorkWin->ArrangeAutoHideWindows( this );
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::Split()
{
@@ -467,7 +467,7 @@ void SfxSplitWindow::Split()
SaveConfig_Impl();
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize)
@@ -559,7 +559,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
SaveConfig_Impl();
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSave)
{
@@ -589,7 +589,7 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSa
SaveConfig_Impl();
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
@@ -613,7 +613,7 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
InsertWindow( pDockWin, rSize, nLine, nPos, bNewLine );
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize,
sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
@@ -683,7 +683,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
SaveConfig_Impl();
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
const Size& rSize,
@@ -815,7 +815,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
}
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide )
@@ -879,7 +879,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide )
bLocked = sal_False;
};
-//-------------------------------------------------------------------------
+
sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
sal_uInt16& rLine, sal_uInt16& rPos ) const
@@ -899,7 +899,7 @@ sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
return sal_True;
}
-//-------------------------------------------------------------------------
+
sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos,
sal_uInt16& rLine, sal_uInt16& rPos ) const
@@ -920,7 +920,7 @@ sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos,
return sal_True;
}
-//-------------------------------------------------------------------------
+
sal_uInt16 SfxSplitWindow::GetLineCount() const
@@ -932,7 +932,7 @@ sal_uInt16 SfxSplitWindow::GetLineCount() const
return GetItemCount( 0 );
}
-//-------------------------------------------------------------------------
+
long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const
@@ -945,7 +945,7 @@ long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const
return GetItemSize( nId );
}
-//-------------------------------------------------------------------------
+
sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const
@@ -958,7 +958,7 @@ sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const
return GetItemCount( nId );
}
-//-------------------------------------------------------------------------
+
sal_uInt16 SfxSplitWindow::GetWindowCount() const
@@ -970,14 +970,14 @@ sal_uInt16 SfxSplitWindow::GetWindowCount() const
return GetItemCount( 0 );
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::Command( const CommandEvent& rCEvt )
{
SplitWindow::Command( rCEvt );
}
-//-------------------------------------------------------------------------
+
IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
{
@@ -1050,7 +1050,7 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
return 0L;
}
-//-------------------------------------------------------------------------
+
sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const
{
@@ -1091,7 +1091,7 @@ sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const
return sal_False;
}
-//-------------------------------------------------------------------------
+
SplitWindow* SfxSplitWindow::GetSplitWindow()
{
@@ -1100,7 +1100,7 @@ SplitWindow* SfxSplitWindow::GetSplitWindow()
return this;
}
-//-------------------------------------------------------------------------
+
sal_Bool SfxSplitWindow::IsFadeIn() const
{
return pEmptyWin->bFadeIn;
@@ -1111,7 +1111,7 @@ sal_Bool SfxSplitWindow::IsAutoHide( sal_Bool bSelf ) const
return bSelf ? pEmptyWin->bAutoHide && !pEmptyWin->bEndAutoHide : pEmptyWin->bAutoHide;
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn )
{
@@ -1166,7 +1166,7 @@ void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn )
pEmptyWin->SetAutoHideState( !bPinned );
}
-//-------------------------------------------------------------------------
+
void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn )
{
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 88213917984d..9da42533ac16 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -21,7 +21,7 @@
#include <svtools/localresaccess.hxx>
#include <tools/debug.hxx>
-// -----------------------------------------------------------------------
+
class SfxStyleFamilyItem_Impl
{
@@ -29,7 +29,7 @@ class SfxStyleFamilyItem_Impl
Image aImage;
};
-// -----------------------------------------------------------------------
+
// Implementierung des Resource-Konstruktors
@@ -80,7 +80,7 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) :
aImage = Image(aBitmap);
}
-// -----------------------------------------------------------------------
+
// Destructor; releases the internal data
@@ -91,7 +91,7 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem()
aFilterList.clear();
}
-// -----------------------------------------------------------------------
+
// Implementation of the resource constructor
@@ -112,7 +112,7 @@ SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) :
updateImages( rResId );
}
-// -----------------------------------------------------------------------
+
// Destructor; releases the internal data
@@ -124,7 +124,7 @@ SfxStyleFamilies::~SfxStyleFamilies()
}
-// -----------------------------------------------------------------------
+
sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId )
{
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 1cc80b135d5d..09c84ee20520 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -68,7 +68,7 @@ SfxStyleDialog::SfxStyleDialog
GetCancelButton().SetClickHdl( LINK(this, SfxStyleDialog, CancelHdl) );
}
-// -----------------------------------------------------------------------
+
SfxStyleDialog::~SfxStyleDialog()
@@ -84,7 +84,7 @@ SfxStyleDialog::~SfxStyleDialog()
delete GetInputSetImpl();
}
-// -----------------------------------------------------------------------
+
const SfxItemSet* SfxStyleDialog::GetRefreshedSet()
@@ -98,7 +98,7 @@ const SfxItemSet* SfxStyleDialog::GetRefreshedSet()
return GetInputSetImpl();
}
-// -----------------------------------------------------------------------
+
short SfxStyleDialog::Ok()
@@ -112,7 +112,7 @@ short SfxStyleDialog::Ok()
return RET_OK;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 22d5f8585021..844fcb226db0 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -239,7 +239,7 @@ SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIX
{
}
-// -----------------------------------------------------------------------
+
SfxTabPage::~SfxTabPage()
@@ -252,14 +252,14 @@ SfxTabPage::~SfxTabPage()
delete pImpl;
}
-// -----------------------------------------------------------------------
+
sal_Bool SfxTabPage::FillItemSet( SfxItemSet& rSet )
{
return pImpl->maItemConn.DoFillItemSet( rSet, GetItemSet() );
}
-// -----------------------------------------------------------------------
+
void SfxTabPage::Reset( const SfxItemSet& rSet )
{
@@ -267,7 +267,7 @@ void SfxTabPage::Reset( const SfxItemSet& rSet )
pImpl->maItemConn.DoReset( rSet );
}
-// -----------------------------------------------------------------------
+
void SfxTabPage::ActivatePage( const SfxItemSet& )
@@ -281,7 +281,7 @@ void SfxTabPage::ActivatePage( const SfxItemSet& )
{
}
-// -----------------------------------------------------------------------
+
int SfxTabPage::DeactivatePage( SfxItemSet* )
@@ -304,7 +304,7 @@ int SfxTabPage::DeactivatePage( SfxItemSet* )
return LEAVE_PAGE;
}
-// -----------------------------------------------------------------------
+
void SfxTabPage::FillUserData()
@@ -318,14 +318,14 @@ void SfxTabPage::FillUserData()
{
}
-// -----------------------------------------------------------------------
+
sal_Bool SfxTabPage::IsReadOnly() const
{
return sal_False;
}
-// -----------------------------------------------------------------------
+
const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep )
@@ -346,7 +346,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot
return pItem;
}
-// -----------------------------------------------------------------------
+
const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
sal_uInt16 nSlot, sal_Bool bDeep )
@@ -376,7 +376,7 @@ void SfxTabPage::PageCreated( SfxAllItemSet /*aSet*/ )
DBG_ASSERT(false, "SfxTabPage::PageCreated should not be called");
}
-// -----------------------------------------------------------------------
+
void SfxTabPage::AddItemConnection( sfx::ItemConnectionBase* pConnection )
{
@@ -388,7 +388,7 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const
return dynamic_cast<SfxTabDialog*>(GetParentDialog());
}
-// -----------------------------------------------------------------------
+
SfxTabDialog::SfxTabDialog
(
@@ -414,7 +414,7 @@ SfxTabDialog::SfxTabDialog
Init_Impl( bFmt, NULL, NULL );
}
-// -----------------------------------------------------------------------
+
SfxTabDialog::SfxTabDialog
@@ -446,7 +446,7 @@ SfxTabDialog::SfxTabDialog
DBG_WARNING( "Please use the Construtor with the ViewFrame" );
}
-// -----------------------------------------------------------------------
+
SfxTabDialog::~SfxTabDialog()
{
@@ -502,7 +502,7 @@ SfxTabDialog::~SfxTabDialog()
delete m_pBox;
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const OUString* pUserButtonText, const ResId *pResId )
@@ -626,7 +626,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const OUString* pUserButtonText
}
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::RemoveResetButton()
{
@@ -634,7 +634,7 @@ void SfxTabDialog::RemoveResetButton()
pImpl->bHideResetBtn = sal_True;
}
-// -----------------------------------------------------------------------
+
short SfxTabDialog::Execute()
{
@@ -644,7 +644,7 @@ short SfxTabDialog::Execute()
return TabDialog::Execute();
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl )
{
@@ -654,7 +654,7 @@ void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl )
TabDialog::StartExecuteModal( rEndDialogHdl );
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::Start( sal_Bool bShow )
{
@@ -668,7 +668,7 @@ void SfxTabDialog::Start( sal_Bool bShow )
GrabFocusToFirstControl();
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::SetApplyHandler(const Link& _rHdl)
{
@@ -677,7 +677,7 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl)
m_pApplyBtn->SetClickHdl( _rHdl );
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::Start_Impl()
{
@@ -757,7 +757,7 @@ sal_uInt16 SfxTabDialog::AddTabPage
return nPageId;
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::AddTabPage
@@ -783,7 +783,7 @@ void SfxTabDialog::AddTabPage
new Data_Impl( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ) );
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
@@ -829,7 +829,7 @@ void SfxTabDialog::RemoveTabPage(const OString &rName)
RemoveTabPage(m_pTabCtrl->GetPageId(rName));
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::PageCreated
@@ -847,7 +847,7 @@ void SfxTabDialog::PageCreated
{
}
-// -----------------------------------------------------------------------
+
SfxItemSet* SfxTabDialog::GetInputSetImpl()
@@ -861,7 +861,7 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl()
return (SfxItemSet*)pSet;
}
-// -----------------------------------------------------------------------
+
SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const
@@ -887,7 +887,7 @@ void SfxTabDialog::SavePosAndId()
aDlgOpt.SetPageID( m_pTabCtrl->GetCurPageId() );
}
-// -----------------------------------------------------------------------
+
short SfxTabDialog::Ok()
@@ -956,7 +956,7 @@ short SfxTabDialog::Ok()
return bModified ? RET_OK : RET_CANCEL;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SfxTabDialog, CancelHdl)
{
@@ -964,7 +964,7 @@ IMPL_LINK_NOARG(SfxTabDialog, CancelHdl)
return 0;
}
-// -----------------------------------------------------------------------
+
SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
@@ -979,7 +979,7 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
return new SfxAllItemSet( SFX_APP()->GetPool() );
}
-// -----------------------------------------------------------------------
+
const SfxItemSet* SfxTabDialog::GetRefreshedSet()
@@ -995,7 +995,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet()
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SfxTabDialog, OkHdl)
@@ -1029,7 +1029,7 @@ bool SfxTabDialog::Apply()
return bApplied;
}
-// -----------------------------------------------------------------------
+
bool SfxTabDialog::PrepareLeaveCurrentPage()
{
@@ -1065,7 +1065,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage()
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SfxTabDialog, UserHdl)
@@ -1091,7 +1091,7 @@ IMPL_LINK_NOARG(SfxTabDialog, UserHdl)
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SfxTabDialog, ResetHdl)
@@ -1118,7 +1118,7 @@ IMPL_LINK_NOARG(SfxTabDialog, ResetHdl)
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl)
@@ -1195,7 +1195,7 @@ IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl)
return 1;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
@@ -1277,7 +1277,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
@@ -1362,7 +1362,7 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
return sal_False;
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::ShowPage( sal_uInt16 nId )
@@ -1376,7 +1376,7 @@ void SfxTabDialog::ShowPage( sal_uInt16 nId )
ActivatePageHdl( m_pTabCtrl );
}
-// -----------------------------------------------------------------------
+
const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
@@ -1444,7 +1444,7 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
return pRanges;
}
-// -----------------------------------------------------------------------
+
void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet )
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 48db4d06e10b..63ddd9598f33 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -94,7 +94,7 @@ namespace sfx2
//==================================================================================================================
namespace
{
- //--------------------------------------------------------------------------------------------------------------
+
::utl::OConfigurationTreeRoot lcl_getModuleUIElementStatesConfig( const OUString& i_rModuleIdentifier,
const OUString& i_rResourceURL = OUString() )
{
@@ -122,7 +122,7 @@ namespace sfx2
return ::utl::OConfigurationTreeRoot( xContext, aPathComposer.makeStringAndClear(), false );
}
- //--------------------------------------------------------------------------------------------------------------
+
OUString lcl_identifyModule( const Reference< XFrame >& i_rDocumentFrame )
{
OUString sModuleName;
@@ -139,7 +139,7 @@ namespace sfx2
return sModuleName;
}
- //--------------------------------------------------------------------------------------------------------------
+
Reference< XFrame > lcl_getFrame( const SfxBindings* i_pBindings )
{
const SfxViewFrame* pViewFrame = i_pBindings->GetDispatcher()->GetFrame();
@@ -148,14 +148,14 @@ namespace sfx2
return xFrame;
}
- //--------------------------------------------------------------------------------------------------------------
+
OUString lcl_getPanelHelpURL( const ::utl::OConfigurationNode& i_rPanelConfigNode )
{
const OUString sHelpURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "HelpURL" ) ) );
return sHelpURL;
}
- //--------------------------------------------------------------------------------------------------------------
+
Image lcl_getPanelImage( const Reference< XFrame >& i_rDocFrame, const ::utl::OConfigurationNode& i_rPanelConfigNode )
{
const OUString sImageURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "ImageURL" ) ) );
@@ -199,7 +199,7 @@ namespace sfx2
//==================================================================================================================
//= TaskPaneDockingWindow
//==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
+
TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, Window* i_pParent, WinBits i_nBits )
:TitledDockingWindow( i_pBindings, &i_rWrapper, i_pParent, i_nBits )
,m_aTaskPane( GetContentWindow(), lcl_getFrame( i_pBindings ) )
@@ -209,20 +209,20 @@ namespace sfx2
SetText( SfxResId( SID_TASKPANE ).toString() );
}
- //------------------------------------------------------------------------------------------------------------------
+
void TaskPaneDockingWindow::ActivateToolPanel( const OUString& i_rPanelURL )
{
m_aPaneController.ActivateToolPanel( i_rPanelURL );
}
- //------------------------------------------------------------------------------------------------------------------
+
void TaskPaneDockingWindow::GetFocus()
{
TitledDockingWindow::GetFocus();
m_aTaskPane.GrabFocus();
}
- //------------------------------------------------------------------------------------------------------------------
+
void TaskPaneDockingWindow::onLayoutDone()
{
m_aTaskPane.SetPosSizePixel( Point(), GetContentWindow().GetOutputSizePixel() );
@@ -231,10 +231,10 @@ namespace sfx2
//==================================================================================================================
//= TaskPaneWrapper
//==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
+
SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE );
- //------------------------------------------------------------------------------------------------------------------
+
TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo )
:SfxChildWindow( i_pParent, i_nId )
{
@@ -251,7 +251,7 @@ namespace sfx2
pWindow->Show();
}
- //------------------------------------------------------------------------------------------------------------------
+
void TaskPaneWrapper::ActivateToolPanel( const OUString& i_rPanelURL )
{
TaskPaneDockingWindow* pDockingWindow = dynamic_cast< TaskPaneDockingWindow* >( GetWindow() );
@@ -331,7 +331,7 @@ namespace sfx2
bool m_bAttemptedCreation;
};
- //------------------------------------------------------------------------------------------------------------------
+
CustomToolPanel::CustomToolPanel( const ::utl::OConfigurationNode& i_rPanelWindowState, const Reference< XFrame >& i_rFrame )
:m_sUIName( ::comphelper::getString( i_rPanelWindowState.getNodeValue( "UIName" ) ) )
,m_aPanelImage( lcl_getPanelImage( i_rFrame, i_rPanelWindowState ) )
@@ -344,12 +344,12 @@ namespace sfx2
{
}
- //------------------------------------------------------------------------------------------------------------------
+
CustomToolPanel::~CustomToolPanel()
{
}
- //------------------------------------------------------------------------------------------------------------------
+
bool CustomToolPanel::impl_ensureToolPanelWindow( Window& i_rPanelParentWindow )
{
if ( m_bAttemptedCreation )
@@ -377,7 +377,7 @@ namespace sfx2
return m_aCustomPanel.is();
}
- //------------------------------------------------------------------------------------------------------------------
+
void CustomToolPanel::impl_updatePanelConfig( const bool i_bVisible ) const
{
::utl::OConfigurationTreeRoot aConfig( ::comphelper::getProcessComponentContext(), m_sPanelConfigPath, true );
@@ -386,13 +386,13 @@ namespace sfx2
aConfig.commit();
}
- //------------------------------------------------------------------------------------------------------------------
+
OUString CustomToolPanel::GetDisplayName() const
{
return m_sUIName;
}
- //------------------------------------------------------------------------------------------------------------------
+
Image CustomToolPanel::GetImage() const
{
return m_aPanelImage;
@@ -407,13 +407,13 @@ namespace sfx2
return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
}
- //------------------------------------------------------------------------------------------------------------------
+
OString CustomToolPanel::GetHelpID() const
{
return lcl_getHelpId( m_aPanelHelpURL );
}
- //------------------------------------------------------------------------------------------------------------------
+
void CustomToolPanel::Activate( Window& i_rParentWindow )
{
ENSURE_OR_RETURN_VOID( impl_ensureToolPanelWindow( i_rParentWindow ), "no panel to activate!" );
@@ -426,7 +426,7 @@ namespace sfx2
impl_updatePanelConfig( true );
}
- //------------------------------------------------------------------------------------------------------------------
+
void CustomToolPanel::Deactivate()
{
ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel to deactivate!" );
@@ -437,7 +437,7 @@ namespace sfx2
impl_updatePanelConfig( false );
}
- //------------------------------------------------------------------------------------------------------------------
+
void CustomToolPanel::SetSizePixel( const Size& i_rPanelWindowSize )
{
ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel/window to position!" );
@@ -453,7 +453,7 @@ namespace sfx2
}
}
- //------------------------------------------------------------------------------------------------------------------
+
void CustomToolPanel::GrabFocus()
{
ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel/window to focus!" );
@@ -461,7 +461,7 @@ namespace sfx2
m_aCustomPanel.getPanelWindow()->setFocus();
}
- //------------------------------------------------------------------------------------------------------------------
+
void CustomToolPanel::Dispose()
{
if ( !m_bAttemptedCreation )
@@ -480,7 +480,7 @@ namespace sfx2
}
}
- //------------------------------------------------------------------------------------------------------------------
+
Reference< XAccessible > CustomToolPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible )
{
ENSURE_OR_RETURN( m_aCustomPanel.is(), "no panel to ask!", NULL );
@@ -550,32 +550,32 @@ namespace sfx2
::svt::ToolPanelDeck m_aPanelDeck;
};
- //------------------------------------------------------------------------------------------------------------------
+
void ModuleTaskPane_Impl::OnResize()
{
m_aPanelDeck.SetPosSizePixel( Point(), m_rAntiImpl.GetOutputSizePixel() );
}
- //------------------------------------------------------------------------------------------------------------------
+
void ModuleTaskPane_Impl::OnGetFocus()
{
m_aPanelDeck.GrabFocus();
}
- //------------------------------------------------------------------------------------------------------------------
+
IMPL_LINK( ModuleTaskPane_Impl, OnActivatePanel, void*, i_pArg )
{
m_aPanelDeck.ActivatePanel( reinterpret_cast< size_t >( i_pArg ) );
return 1L;
}
- //------------------------------------------------------------------------------------------------------------------
+
bool ModuleTaskPane_Impl::impl_isToolPanelResource( const OUString& i_rResourceURL )
{
return i_rResourceURL.startsWith( "private:resource/toolpanel/" );
}
- //------------------------------------------------------------------------------------------------------------------
+
void ModuleTaskPane_Impl::impl_initFromConfiguration( const IToolPanelCompare* i_pPanelCompare )
{
const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( m_sModuleIdentifier ) );
@@ -634,7 +634,7 @@ namespace sfx2
}
}
- //------------------------------------------------------------------------------------------------------------------
+
bool ModuleTaskPane_Impl::ModuleHasToolPanels( const OUString& i_rModuleIdentifier )
{
const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( i_rModuleIdentifier ) );
@@ -653,7 +653,7 @@ namespace sfx2
return false;
}
- //------------------------------------------------------------------------------------------------------------------
+
::boost::optional< size_t > ModuleTaskPane_Impl::GetPanelPos( const OUString& i_rResourceURL )
{
::boost::optional< size_t > aPanelPos;
@@ -676,7 +676,7 @@ namespace sfx2
return aPanelPos;
}
- //------------------------------------------------------------------------------------------------------------------
+
OUString ModuleTaskPane_Impl::GetPanelResourceURL( const size_t i_nPanelPos ) const
{
ENSURE_OR_RETURN( i_nPanelPos < m_aPanelDeck.GetPanelCount(), "ModuleTaskPane_Impl::GetPanelResourceURL: illegal panel position!", OUString() );
@@ -686,7 +686,7 @@ namespace sfx2
return pCustomPanel->GetResourceURL();
}
- //------------------------------------------------------------------------------------------------------------------
+
void ModuleTaskPane_Impl::SetDrawersLayout()
{
const ::svt::PDeckLayouter pLayouter( m_aPanelDeck.GetLayouter() );
@@ -697,7 +697,7 @@ namespace sfx2
m_aPanelDeck.SetLayouter( new ::svt::DrawerDeckLayouter( m_aPanelDeck, m_aPanelDeck ) );
}
- //------------------------------------------------------------------------------------------------------------------
+
void ModuleTaskPane_Impl::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent )
{
::svt::PDeckLayouter pLayouter( m_aPanelDeck.GetLayouter() );
@@ -722,63 +722,63 @@ namespace sfx2
//==================================================================================================================
//= ModuleTaskPane
//==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
+
ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame )
:Window( &i_rParentWindow, WB_DIALOGCONTROL )
,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, NULL ) )
{
}
- //------------------------------------------------------------------------------------------------------------------
+
ModuleTaskPane::~ModuleTaskPane()
{
}
- //------------------------------------------------------------------------------------------------------------------
+
bool ModuleTaskPane::ModuleHasToolPanels( const Reference< XFrame >& i_rDocumentFrame )
{
return ModuleTaskPane_Impl::ModuleHasToolPanels( lcl_identifyModule( i_rDocumentFrame ) );
}
- //------------------------------------------------------------------------------------------------------------------
+
void ModuleTaskPane::Resize()
{
Window::Resize();
m_pImpl->OnResize();
}
- //------------------------------------------------------------------------------------------------------------------
+
void ModuleTaskPane::GetFocus()
{
Window::GetFocus();
m_pImpl->OnGetFocus();
}
- //------------------------------------------------------------------------------------------------------------------
+
::svt::ToolPanelDeck& ModuleTaskPane::GetPanelDeck()
{
return m_pImpl->GetPanelDeck();
}
- //------------------------------------------------------------------------------------------------------------------
+
const ::svt::ToolPanelDeck& ModuleTaskPane::GetPanelDeck() const
{
return m_pImpl->GetPanelDeck();
}
- //------------------------------------------------------------------------------------------------------------------
+
::boost::optional< size_t > ModuleTaskPane::GetPanelPos( const OUString& i_rResourceURL )
{
return m_pImpl->GetPanelPos( i_rResourceURL );
}
- //------------------------------------------------------------------------------------------------------------------
+
void ModuleTaskPane::SetDrawersLayout()
{
m_pImpl->SetDrawersLayout();
}
- //------------------------------------------------------------------------------------------------------------------
+
void ModuleTaskPane::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent )
{
m_pImpl->SetTabsLayout( i_eTabAlignment, i_eTabContent );
@@ -906,7 +906,7 @@ namespace sfx2
OUString m_sDefaultTitle;
};
- //------------------------------------------------------------------------------------------------------------------
+
TaskPaneController_Impl::TaskPaneController_Impl( ModuleTaskPane& i_rTaskPane, TitledDockingWindow& i_rDockingWindow )
:m_rTaskPane( i_rTaskPane )
,m_rDockingWindow( i_rDockingWindow )
@@ -937,7 +937,7 @@ namespace sfx2
SetDefaultTitle( SfxResId( STR_SFX_TASKS ).toString() );
}
- //------------------------------------------------------------------------------------------------------------------
+
TaskPaneController_Impl::~TaskPaneController_Impl()
{
m_rTaskPane.GetPanelDeck().RemoveListener( *this );
@@ -955,14 +955,14 @@ namespace sfx2
m_aPanelRepository.clear();
}
- // -----------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::SetDefaultTitle( const OUString& i_rTitle )
{
m_sDefaultTitle = i_rTitle;
impl_updateDockingWindowTitle();
}
- //------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::ActivateToolPanel( const OUString& i_rPanelURL )
{
::boost::optional< size_t > aPanelPos( m_rTaskPane.GetPanelPos( i_rPanelURL ) );
@@ -979,7 +979,7 @@ namespace sfx2
}
}
- // -----------------------------------------------------------------------------------------------------------------
+
IMPL_LINK( TaskPaneController_Impl, DockingChanged, TitledDockingWindow*, i_pDockingWindow )
{
ENSURE_OR_RETURN( i_pDockingWindow && &m_rDockingWindow, "TaskPaneController_Impl::DockingChanged: where does this come from?", 0L );
@@ -991,7 +991,7 @@ namespace sfx2
return 1L;
}
- // -----------------------------------------------------------------------------------------------------------------
+
IMPL_LINK( TaskPaneController_Impl, OnToolboxClicked, ToolBox*, i_pToolBox )
{
if ( i_pToolBox->GetCurItemId() == m_nViewMenuID )
@@ -1012,7 +1012,7 @@ namespace sfx2
return 0;
}
- // ---------------------------------------------------------------------------------------------------------------------
+
IMPL_LINK( TaskPaneController_Impl, OnMenuItemSelected, Menu*, i_pMenu )
{
ENSURE_OR_RETURN( i_pMenu, "TaskPaneController_Impl::OnMenuItemSelected: illegal menu!", 0L );
@@ -1047,7 +1047,7 @@ namespace sfx2
return 1L;
}
- // ---------------------------------------------------------------------------------------------------------------------
+
size_t TaskPaneController_Impl::impl_getLogicalPanelIndex( const size_t i_nVisibleIndex )
{
size_t nLogicalIndex = 0;
@@ -1065,7 +1065,7 @@ namespace sfx2
return nLogicalIndex;
}
- // ---------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
{
if ( m_bTogglingPanelVisibility )
@@ -1075,7 +1075,7 @@ namespace sfx2
m_aPanelRepository.insert( m_aPanelRepository.begin() + nLogicalIndex, PanelDescriptor( i_pPanel ) );
}
- // ---------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::PanelRemoved( const size_t i_nPosition )
{
if ( m_bTogglingPanelVisibility )
@@ -1085,7 +1085,7 @@ namespace sfx2
m_aPanelRepository.erase( m_aPanelRepository.begin() + nLogicalIndex );
}
- // ---------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
{
if ( impl_getLayout() == LAYOUT_DRAWERS )
@@ -1097,14 +1097,14 @@ namespace sfx2
(void)i_rNewActive;
}
- // ---------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
{
// not interested in
(void)i_rNewLayouter;
}
- // ---------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::Dying()
{
OSL_FAIL( "TaskPaneController_Impl::Dying: unexpected call!" );
@@ -1112,7 +1112,7 @@ namespace sfx2
// as listener from the panel deck, this method here should never be called.
}
- // ---------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::impl_togglePanelVisibility( const size_t i_nLogicalPanelIndex )
{
ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanelRepository.size(), "illegal index" );
@@ -1147,7 +1147,7 @@ namespace sfx2
m_rTaskPane.GetPanelDeck().ActivatePanel( *aActivatePanel );
}
- // ---------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::impl_setLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce )
{
if ( !i_bForce && ( m_eCurrentLayout == i_eLayout ) )
@@ -1176,7 +1176,7 @@ namespace sfx2
impl_updateDockingWindowTitle();
}
- // ---------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController_Impl::impl_updateDockingWindowTitle()
{
::boost::optional< size_t > aActivePanel( m_rTaskPane.GetPanelDeck().GetActivePanel() );
@@ -1200,7 +1200,7 @@ namespace sfx2
}
}
- // ---------------------------------------------------------------------------------------------------------------------
+
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< PopupMenu > TaskPaneController_Impl::impl_createPopupMenu() const
{
@@ -1255,18 +1255,18 @@ namespace sfx2
//==================================================================================================================
//= TaskPaneController
//==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
+
TaskPaneController::TaskPaneController( ModuleTaskPane& i_rTaskPane, TitledDockingWindow& i_rDockingWindow )
:m_pImpl( new TaskPaneController_Impl( i_rTaskPane, i_rDockingWindow ) )
{
}
- //------------------------------------------------------------------------------------------------------------------
+
TaskPaneController::~TaskPaneController()
{
}
- //------------------------------------------------------------------------------------------------------------------
+
void TaskPaneController::ActivateToolPanel( const OUString& i_rPanelURL )
{
m_pImpl->ActivateToolPanel( i_rPanelURL );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index fbb51f8844b5..c5feb4f0e755 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -92,7 +92,7 @@ TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl);
SFX_IMPL_DOCKINGWINDOW_WITHID(SfxTemplateDialogWrapper, SID_STYLE_DESIGNER)
-//-------------------------------------------------------------------------
+
class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable
{
@@ -147,7 +147,7 @@ SfxTemplateDialog::SfxTemplateDialog
pImpl->updateNonFamilyImages();
}
-//-------------------------------------------------------------------------
+
SfxTemplateDialog::~SfxTemplateDialog()
{
@@ -167,7 +167,7 @@ void SfxTemplateDialog::SetParagraphFamily()
pImpl->SetAutomaticFilter();
}
-// ------------------------------------------------------------------------
+
void SfxTemplateDialog::DataChanged( const DataChangedEvent& _rDCEvt )
{
@@ -181,14 +181,14 @@ void SfxTemplateDialog::DataChanged( const DataChangedEvent& _rDCEvt )
SfxDockingWindow::DataChanged( _rDCEvt );
}
-//-------------------------------------------------------------------------
+
void SfxTemplateDialog::Update()
{
pImpl->Update();
}
-//-------------------------------------------------------------------------
+
void SfxTemplateDialog::Resize()
{
@@ -198,7 +198,7 @@ void SfxTemplateDialog::Resize()
}
-//-------------------------------------------------------------------------
+
SfxChildAlignment SfxTemplateDialog::CheckAlignment(SfxChildAlignment eActAlign,SfxChildAlignment eAlign)
{
@@ -225,7 +225,7 @@ SfxChildAlignment SfxTemplateDialog::CheckAlignment(SfxChildAlignment eActAlign,
}
}
-//-------------------------------------------------------------------------
+
void DropListBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
{
@@ -259,7 +259,7 @@ sal_Int8 DropListBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
return SvTreeListBox::AcceptDrop( rEvt );
}
-//-------------------------------------------------------------------------
+
sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
@@ -329,7 +329,7 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt )
}
-//-------------------------------------------------------------------------
+
SfxActionListBox::SfxActionListBox
@@ -350,7 +350,7 @@ SfxActionListBox::SfxActionListBox
EnableContextMenuHandling();
}
-//-------------------------------------------------------------------------
+
PopupMenu* SfxActionListBox::CreateContextMenu( void )
{
@@ -363,7 +363,7 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
return pDialog->CreateContextMenu();
}
-//-------------------------------------------------------------------------
+
SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd,
sal_uInt16 nId, SfxBindings *p, SfxChildWinInfo *pInfo) :
@@ -505,7 +505,7 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange )
DockingWindow::StateChanged( nStateChange );
}
-//-------------------------------------------------------------------------
+
void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries_t& rEntries) const
{
@@ -536,7 +536,7 @@ sal_Bool StyleTreeListBox_Impl::DoubleClickHdl()
return sal_False;
}
-//-------------------------------------------------------------------------
+
void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt )
@@ -549,7 +549,7 @@ void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt )
SvTreeListBox::Command(rCEvt);
}
-//-------------------------------------------------------------------------
+
bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
{
@@ -572,7 +572,7 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
return nRet;
}
-//-------------------------------------------------------------------------
+
sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
@@ -601,7 +601,7 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget,
return bRet? (sal_Bool)2: sal_False;
}
-//-------------------------------------------------------------------------
+
bool StyleTreeListBox_Impl::ExpandingHdl()
@@ -618,7 +618,7 @@ bool StyleTreeListBox_Impl::ExpandingHdl()
return true;
}
-//-------------------------------------------------------------------------
+
void StyleTreeListBox_Impl::ExpandedHdl()
@@ -638,7 +638,7 @@ void StyleTreeListBox_Impl::ExpandedHdl()
pCurEntry = 0;
}
-//-------------------------------------------------------------------------
+
StyleTreeListBox_Impl::StyleTreeListBox_Impl(
SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle) :
@@ -653,7 +653,7 @@ StyleTreeListBox_Impl::StyleTreeListBox_Impl(
EnableContextMenuHandling();
}
-//-------------------------------------------------------------------------
+
class StyleTreeArr_Impl;
@@ -693,14 +693,14 @@ sal_uIntPtr StyleTree_Impl::Count()
return pChildren ? pChildren->size() : 0L;
}
-//-------------------------------------------------------------------------
+
StyleTree_Impl::~StyleTree_Impl()
{
delete pChildren;
}
-//-------------------------------------------------------------------------
+
void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
{
@@ -713,7 +713,7 @@ void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
pChildren->insert( pChildren->begin() + (sal_uInt16)lPos, pIns );
}
-//-------------------------------------------------------------------------
+
StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
{
@@ -757,7 +757,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
return rArr;
}
-//-------------------------------------------------------------------------
+
inline sal_Bool IsExpanded_Impl( const ExpandedEntries_t& rEntries,
@@ -785,7 +785,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox,
return pNewEntry;
}
-//-------------------------------------------------------------------------
+
// Constructor
SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window* pW, bool ) :
@@ -836,7 +836,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Win
aFmtLb.SetFont( aFont );
}
-//-------------------------------------------------------------------------
+
sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId)
{
@@ -844,7 +844,7 @@ sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId)
return SfxFamilyIdToNId(pItem->GetFamily())-1;
}
-//-------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable)
{
@@ -853,7 +853,7 @@ void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable)
EnableItem( SID_STYLE_UPDATE_BY_EXAMPLE, bEnable);
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::ReadResource()
{
@@ -953,7 +953,7 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
pModule = pCurObjShell ? pCurObjShell->GetModule() : NULL;
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::ClearResource()
{
@@ -979,7 +979,7 @@ void SfxCommonTemplateDialog_Impl::impl_setDeletionWatcher(DeletionWatcher* pNew
m_pDeletionWatcher = pNewWatcher;
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::Initialize()
{
@@ -1001,7 +1001,7 @@ void SfxCommonTemplateDialog_Impl::Initialize()
aFmtLb.Show();
}
-//-------------------------------------------------------------------------
+
SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
{
@@ -1027,7 +1027,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
m_pDeletionWatcher->signal();
}
-//-------------------------------------------------------------------------
+
sal_uInt16 SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
{
@@ -1059,7 +1059,7 @@ void SfxCommonTemplateDialog_Impl::SetAutomaticFilter()
}
}
-//-------------------------------------------------------------------------
+
// Helper function: Access to the current family item
const SfxStyleFamilyItem *SfxCommonTemplateDialog_Impl::GetFamilyItem_Impl() const
{
@@ -1083,7 +1083,7 @@ SfxStyleSheetBase *SfxCommonTemplateDialog_Impl::GetSelectedStyle() const
return pStyleSheetPool->Find( aTemplName, pItem->GetFamily(), SFXSTYLEBIT_ALL );
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr)
{
@@ -1158,7 +1158,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr)
}
}
-//-------------------------------------------------------------------------
+
OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
{
@@ -1178,7 +1178,7 @@ OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
return aRet;
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable )
{
@@ -1196,7 +1196,7 @@ void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable )
bTreeDrag = bEnable;
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::FillTreeBox()
{
@@ -1250,7 +1250,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
}
}
-//-------------------------------------------------------------------------
+
sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
{
return pTreeBox? pTreeBox->FirstSelected() != 0:
@@ -1258,7 +1258,7 @@ sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
}
-//-------------------------------------------------------------------------
+
// internal: Refresh the display
// nFlags: what we should update.
@@ -1403,7 +1403,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
}
}
-//-------------------------------------------------------------------------
+
// Updated display: Watering the house
void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
@@ -1444,7 +1444,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
pBindings->LeaveRegistrations();
}
-//-------------------------------------------------------------------------
+
// Item with the status of a Family is copied and noted
// (is updated when all states have also been updated.)
@@ -1462,7 +1462,7 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const Sfx
bUpdateFamily = sal_True;
}
-//-------------------------------------------------------------------------
+
// Notice from SfxBindings that the update is completed. Pushes out the update
// of the display.
@@ -1564,7 +1564,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
EnableNew( bCanNew );
}
-//-------------------------------------------------------------------------
+
IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
{
@@ -1594,7 +1594,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
// tap update
@@ -1689,7 +1689,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
}
-//-------------------------------------------------------------------------
+
// Other filters; can be switched by the users or as a result of new or
// editing, if the current document has been assigned a different filter.
void SfxCommonTemplateDialog_Impl::FilterSelect(
@@ -1715,7 +1715,7 @@ void SfxCommonTemplateDialog_Impl::FilterSelect(
}
}
-//-------------------------------------------------------------------------
+
// Internal: Perform functions through the Dispatcher
sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
@@ -1781,7 +1781,7 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
return sal_True;
}
-//-------------------------------------------------------------------------
+
// Handler der Listbox der Filter
void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
@@ -1843,7 +1843,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
return 0;
}
-//-------------------------------------------------------------------------
+
// Select-Handler for the Toolbox
void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
@@ -1861,7 +1861,7 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
}
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
{
@@ -1940,7 +1940,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
}
}
-//-------------------------------------------------------------------------
+
static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModMgr, SfxObjectShell* i_pObjSh )
{
@@ -1965,7 +1965,7 @@ static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModM
return sIdentifier;
}
-//-------------------------------------------------------------------------
+
sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell* i_pObjSh )
{
@@ -1984,7 +1984,7 @@ sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell*
return nFilter;
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* i_pObjSh, sal_Int32 i_nFilter )
{
@@ -2008,7 +2008,7 @@ SfxObjectShell* SfxCommonTemplateDialog_Impl::SaveSelection()
return pDocShell;
}
-//-------------------------------------------------------------------------
+
IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox )
{
@@ -2020,7 +2020,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox
return ret;
}
-//-------------------------------------------------------------------------
+
// Handler for the New-Buttons
void SfxCommonTemplateDialog_Impl::NewHdl(void *)
@@ -2058,7 +2058,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
}
}
-//-------------------------------------------------------------------------
+
// Handler for the edit-Buttons
void SfxCommonTemplateDialog_Impl::EditHdl(void *)
@@ -2083,7 +2083,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
}
}
-//-------------------------------------------------------------------------
+
// Handler for the Delete-Buttons
void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
@@ -2193,7 +2193,7 @@ void SfxCommonTemplateDialog_Impl::ShowHdl(void *)
}
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::EnableDelete()
{
@@ -2227,7 +2227,7 @@ void SfxCommonTemplateDialog_Impl::EnableDelete()
}
}
-//-------------------------------------------------------------------------
+
// After selecting a focused item if possible again on the app window
void SfxCommonTemplateDialog_Impl::ResetFocus()
{
@@ -2241,7 +2241,7 @@ void SfxCommonTemplateDialog_Impl::ResetFocus()
}
}
-//-------------------------------------------------------------------------
+
// Doppelclick on a style sheet in the ListBox is applied.
IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
@@ -2261,7 +2261,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
return 0;
}
-//-------------------------------------------------------------------------
+
// Selection of a template during the Watercan-Status
IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox )
@@ -2310,7 +2310,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
return 0;
}
-//-------------------------------------------------------------------------
+
IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
{
@@ -2333,7 +2333,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
return sal_True;
}
-// -----------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin )
{
@@ -2345,7 +2345,7 @@ void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, W
delete pMenu;
}
-// -----------------------------------------------------------------------
+
SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
{
@@ -2356,7 +2356,7 @@ SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
return pFamilyItem->GetFamily();
}
-// -----------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, sal_Bool bEnable)
{
@@ -2374,7 +2374,7 @@ void SfxCommonTemplateDialog_Impl::PrepareDeleteAction()
{
}
-// -----------------------------------------------------------------------
+
PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
{
@@ -2395,7 +2395,7 @@ PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
return pMenu;
}
-// ------------------------------------------------------------------------
+
SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
@@ -2440,14 +2440,14 @@ void SfxTemplateDialog_Impl::Initialize (void)
m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT );
}
-// ------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
{
m_aActionTbL.EnableItem( nId, bEnable );
}
-//-------------------------------------------------------------------------
+
// Insert element into dropdown filter "Frame Styles", "List Styles", etc.
void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamilyItem *pItem)
@@ -2466,7 +2466,7 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamil
m_aActionTbL.SetHelpId( nId, sHelpId );
}
-// ------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
{
@@ -2475,7 +2475,7 @@ void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
TIB_DROPDOWNONLY|m_aActionTbR.GetItemBits( SID_STYLE_NEW_BY_EXAMPLE ));
}
-// ------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::updateFamilyImages()
{
if ( !m_pStyleFamiliesId )
@@ -2495,20 +2495,20 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
}
}
-// ------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::updateNonFamilyImages()
{
m_aActionTbR.SetImageList( ImageList( SfxResId( DLG_STYLE_DESIGNER ) ) );
}
-// ------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::ClearFamilyList()
{
m_aActionTbL.Clear();
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::InvalidateBindings()
{
@@ -2524,13 +2524,13 @@ void SfxCommonTemplateDialog_Impl::InvalidateBindings()
pBindings->Update( SID_STYLE_DRAGHIERARCHIE );
}
-//-------------------------------------------------------------------------
+
SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl()
{
}
-//-------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::LoadedFamilies()
{
@@ -2538,7 +2538,7 @@ void SfxTemplateDialog_Impl::LoadedFamilies()
Resize();
}
-//-------------------------------------------------------------------------
+
// Overloaded Resize-Handler ( StarView )
// The size of the Listboxen is adjusted
@@ -2611,7 +2611,7 @@ void SfxTemplateDialog_Impl::Resize()
pTreeBox->SetSizePixel(aFmtSize);
}
-// -----------------------------------------------------------------------
+
Size SfxTemplateDialog_Impl::GetMinOutputSizePixel()
@@ -2630,7 +2630,7 @@ Size SfxTemplateDialog_Impl::GetMinOutputSizePixel()
return Size(0,0);
}
-//-------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt )
{
@@ -2643,7 +2643,7 @@ void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt )
}
}
-//-------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck)
{
@@ -2660,7 +2660,7 @@ void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck)
}
}
-//-------------------------------------------------------------------------
+
void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck)
{
@@ -2675,7 +2675,7 @@ void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck)
}
}
-//-------------------------------------------------------------------------
+
sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
{
@@ -2688,7 +2688,7 @@ sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
}
}
-//-------------------------------------------------------------------------
+
IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
{
@@ -2698,7 +2698,7 @@ IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox
}
IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
-//-------------------------------------------------------------------------
+
static OUString lcl_GetLabel(uno::Any& rAny)
{
OUString sRet;
@@ -2716,7 +2716,7 @@ static OUString lcl_GetLabel(uno::Any& rAny)
}
return sRet;
}
-//-------------------------------------------------------------------------
+
IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
{
@@ -2726,7 +2726,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
ActionSelect(nEntry);
return 0;
}
-//-------------------------------------------------------------------------
+
IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
{
const sal_uInt16 nEntry = pBox->GetCurItemId();
@@ -2778,14 +2778,14 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
}
return 0;
}
-//-------------------------------------------------------------------------
+
IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu)
{
sal_uInt16 nMenuId = pMenu->GetCurItemId();
ActionSelect(nMenuId);
return 0;
}
-//-------------------------------------------------------------------------
+
void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId )
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index dacebcabddb5..1499ca0a28eb 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -35,7 +35,7 @@ namespace sfx2
//==================================================================================================================
//= TitledDockingWindow
//==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
+
TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent,
WinBits i_nStyle )
:SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_nStyle )
@@ -49,7 +49,7 @@ namespace sfx2
impl_construct();
}
- //------------------------------------------------------------------------------------------------------------------
+
TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent,
const ResId& i_rResId )
:SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_rResId )
@@ -62,7 +62,7 @@ namespace sfx2
impl_construct();
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::impl_construct()
{
SetBackground( Wallpaper() );
@@ -76,19 +76,19 @@ namespace sfx2
m_aContentWindow.Show();
}
- //------------------------------------------------------------------------------------------------------------------
+
TitledDockingWindow::~TitledDockingWindow()
{
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::SetTitle( const OUString& i_rTitle )
{
m_sTitle = i_rTitle;
Invalidate();
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::SetText( const OUString& i_rText )
{
SfxDockingWindow::SetText( i_rText );
@@ -97,26 +97,26 @@ namespace sfx2
Invalidate();
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::Resize()
{
SfxDockingWindow::Resize();
impl_scheduleLayout();
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::onLayoutDone()
{
// not interested in
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::impl_scheduleLayout()
{
m_bLayoutPending = true;
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::impl_layout()
{
m_bLayoutPending = false;
@@ -153,7 +153,7 @@ namespace sfx2
onLayoutDone();
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::Paint( const Rectangle& i_rArea )
{
if ( m_bLayoutPending )
@@ -220,13 +220,13 @@ namespace sfx2
Pop();
}
- //------------------------------------------------------------------------------------------------------------------
+
OUString TitledDockingWindow::impl_getTitle() const
{
return !m_sTitle.isEmpty() ? m_sTitle : GetText();
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::impl_resetToolBox()
{
m_aToolbox.Clear();
@@ -237,7 +237,7 @@ namespace sfx2
m_aToolbox.ShowItem( 1 );
}
- //------------------------------------------------------------------------------------------------------------------
+
sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback )
{
// Add the menu before the closer button.
@@ -256,7 +256,7 @@ namespace sfx2
return nItemId;
}
- //------------------------------------------------------------------------------------------------------------------
+
IMPL_LINK( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox )
{
const sal_uInt16 nId = pToolBox->GetCurItemId();
@@ -278,7 +278,7 @@ namespace sfx2
return 0;
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::StateChanged( StateChangedType i_nType )
{
switch ( i_nType )
@@ -290,7 +290,7 @@ namespace sfx2
SfxDockingWindow::StateChanged( i_nType );
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, sal_Bool i_bFloatMode )
{
SfxDockingWindow::EndDocking( i_rRect, i_bFloatMode );
@@ -299,7 +299,7 @@ namespace sfx2
m_aEndDockingHdl.Call( this );
}
- //------------------------------------------------------------------------------------------------------------------
+
void TitledDockingWindow::DataChanged( const DataChangedEvent& i_rDataChangedEvent )
{
SfxDockingWindow::DataChanged( i_rDataChangedEvent );
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 38d77b15eb9d..de100e37bc23 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -44,14 +44,14 @@ SfxTemplateControllerItem::SfxTemplateControllerItem(
nUserEventId(0)
{
}
-// -----------------------------------------------------------------------
+
SfxTemplateControllerItem::~SfxTemplateControllerItem()
{
if(nUserEventId)
Application::RemoveUserEvent(nUserEventId);
}
-// -----------------------------------------------------------------------
+
// Notice about change of status, is propagated through the Controller
// passed on by the constructor
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index f34844c1ef18..58b7ce855a55 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -42,7 +42,7 @@ SfxTemplateItem::SfxTemplateItem
{
}
-//-------------------------------------------------------------------------
+
// copy constuctor
SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) :
@@ -53,7 +53,7 @@ SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) :
{
}
-//-------------------------------------------------------------------------
+
// op ==
@@ -63,14 +63,14 @@ bool SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const
aStyle == ( (const SfxTemplateItem&)rCmp ).aStyle );
}
-//-------------------------------------------------------------------------
+
SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const
{
return new SfxTemplateItem(*this);
}
-//-------------------------------------------------------------------------
+
bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
::com::sun::star::frame::status::Template aTemplate;
@@ -82,7 +82,7 @@ bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nM
return true;
}
-//-------------------------------------------------------------------------
+
bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
::com::sun::star::frame::status::Template aTemplate;
@@ -97,7 +97,7 @@ bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
return false;
}
-//-------------------------------------------------------------------------
+
sal_uInt8 SfxTemplateItem::GetFlagCount() const
{
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 44164b417533..04f1f0a1aef5 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -151,7 +151,7 @@ SfxVersionTableDtor& SfxVersionTableDtor::operator=( const SfxVersionTableDtor&
return *this;
}
-//----------------------------------------------------------------
+
SfxVersionInfo::SfxVersionInfo()
: aCreationDate( DateTime::EMPTY )
{