summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/dlg')
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx54
-rw-r--r--sd/source/ui/dlg/animobjs.cxx50
-rw-r--r--sd/source/ui/dlg/diactrl.cxx6
-rw-r--r--sd/source/ui/dlg/dlgchar.cxx2
-rw-r--r--sd/source/ui/dlg/dlgctrls.cxx2
-rw-r--r--sd/source/ui/dlg/filedlg.cxx28
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx50
-rw-r--r--sd/source/ui/dlg/morphdlg.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx26
-rw-r--r--sd/source/ui/dlg/prltempl.cxx8
-rw-r--r--sd/source/ui/dlg/prntopts.cxx12
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx18
-rw-r--r--sd/source/ui/dlg/tabtempl.cxx4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx38
-rw-r--r--sd/source/ui/dlg/tpoption.cxx34
15 files changed, 167 insertions, 167 deletions
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index b3d80e3393f0..eda2615eaa3a 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -34,37 +34,37 @@ using namespace ::com::sun::star;
namespace sd {
-//------------------------------------------------------------------------------
+
// struct ClientBoxEntry
-//------------------------------------------------------------------------------
+
ClientBoxEntry::ClientBoxEntry( ClientInfo* pClientInfo ) :
m_bActive( false ),
m_pClientInfo( pClientInfo )
{
}
-//------------------------------------------------------------------------------
+
ClientBoxEntry::~ClientBoxEntry()
{}
-//------------------------------------------------------------------------------
+
// ClientRemovedListener
-//------------------------------------------------------------------------------
+
void ClientRemovedListener::disposing( lang::EventObject const & rEvt )
throw ( uno::RuntimeException )
{
(void) rEvt;
}
-//------------------------------------------------------------------------------
+
ClientRemovedListener::~ClientRemovedListener()
{
}
-//------------------------------------------------------------------------------
+
// ClientBox
-//------------------------------------------------------------------------------
+
ClientBox::ClientBox( Window* pParent, WinBits nStyle ) :
Control( pParent, nStyle ),
m_bHasScrollBar( false ),
@@ -126,7 +126,7 @@ Size ClientBox::GetOptimalSize() const
return LogicToPixel(Size(200, 140), MAP_APPFONT);
}
-//------------------------------------------------------------------------------
+
ClientBox::~ClientBox()
{
if ( ! m_bInDelete )
@@ -146,7 +146,7 @@ ClientBox::~ClientBox()
m_xRemoveListener.clear();
}
-//------------------------------------------------------------------------------
+
// Title + description
void ClientBox::CalcActiveHeight( const long nPos )
{
@@ -179,7 +179,7 @@ void ClientBox::CalcActiveHeight( const long nPos )
m_nActiveHeight = aTextHeight + 2;
}
-//------------------------------------------------------------------------------
+
Rectangle ClientBox::GetEntryRect( const long nPos ) const
{
const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -201,7 +201,7 @@ Rectangle ClientBox::GetEntryRect( const long nPos ) const
return Rectangle( aPos, aSize );
}
-//------------------------------------------------------------------------------
+
void ClientBox::DeleteRemoved()
{
const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -224,7 +224,7 @@ long ClientBox::GetActiveEntryIndex()
return -1;
}
-//------------------------------------------------------------------------------
+
//This function may be called with nPos < 0
void ClientBox::selectEntry( const long nPos )
{
@@ -269,7 +269,7 @@ void ClientBox::selectEntry( const long nPos )
guard.clear();
}
-// -----------------------------------------------------------------------
+
void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -377,7 +377,7 @@ void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry )
DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
}
-// -----------------------------------------------------------------------
+
void ClientBox::RecalcAll()
{
if ( m_bHasActive )
@@ -428,13 +428,13 @@ void ClientBox::RecalcAll()
m_bNeedsRecalc = false;
}
-// -----------------------------------------------------------------------
+
bool ClientBox::HandleTabKey( bool )
{
return false;
}
-// -----------------------------------------------------------------------
+
bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode )
{
if ( m_vEntries.empty() )
@@ -479,7 +479,7 @@ bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode )
return true;
}
-// -----------------------------------------------------------------------
+
void ClientBox::Paint( const Rectangle &/*rPaintRect*/ )
{
if ( !m_bInDelete )
@@ -506,7 +506,7 @@ void ClientBox::Paint( const Rectangle &/*rPaintRect*/ )
}
}
-// -----------------------------------------------------------------------
+
long ClientBox::GetTotalHeight() const
{
long nHeight = m_vEntries.size() * m_nStdHeight;
@@ -519,7 +519,7 @@ long ClientBox::GetTotalHeight() const
return nHeight;
}
-// -----------------------------------------------------------------------
+
void ClientBox::SetupScrollBar()
{
const Size aSize = GetOutputSizePixel();
@@ -552,13 +552,13 @@ void ClientBox::SetupScrollBar()
m_bHasScrollBar = bNeedsScrollBar;
}
-// -----------------------------------------------------------------------
+
void ClientBox::Resize()
{
RecalcAll();
}
-//------------------------------------------------------------------------------
+
long ClientBox::PointToPos( const Point& rPos )
{
long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight;
@@ -579,7 +579,7 @@ OUString ClientBox::getPin()
return OUString::number( m_aPinBox.GetValue() );
}
-//------------------------------------------------------------------------------
+
void ClientBox::MouseButtonDown( const MouseEvent& rMEvt )
{
long nPos = PointToPos( rMEvt.GetPosPixel() );
@@ -593,7 +593,7 @@ void ClientBox::MouseButtonDown( const MouseEvent& rMEvt )
}
}
-//------------------------------------------------------------------------------
+
bool ClientBox::Notify( NotifyEvent& rNEvt )
{
if ( !m_bInDelete )
@@ -638,7 +638,7 @@ bool ClientBox::Notify( NotifyEvent& rNEvt )
}
-//------------------------------------------------------------------------------
+
long ClientBox::addEntry( ClientInfo* pClientInfo )
{
long nPos = 0;
@@ -700,7 +700,7 @@ long ClientBox::addEntry( ClientInfo* pClientInfo )
return nPos;
}
-// -----------------------------------------------------------------------
+
void ClientBox::DoScroll( long nDelta )
{
m_nTopIndex += nDelta;
@@ -713,7 +713,7 @@ void ClientBox::DoScroll( long nDelta )
m_aScrollBar.SetPosPixel( aNewSBPt );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( ClientBox, ScrollHdl, ScrollBar*, pScrBar )
{
DoScroll( pScrBar->GetDelta() );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index b81471c1c584..2651d367deb0 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -67,13 +67,13 @@ SdDisplay::SdDisplay( Window* pWin, SdResId Id ) :
SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) );
}
-// -----------------------------------------------------------------------
+
SdDisplay::~SdDisplay()
{
}
-// -----------------------------------------------------------------------
+
void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx )
{
@@ -89,7 +89,7 @@ void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx )
}
}
-// -----------------------------------------------------------------------
+
void SdDisplay::Paint( const Rectangle& )
{
@@ -107,7 +107,7 @@ void SdDisplay::Paint( const Rectangle& )
aBitmapEx.Draw( this, aPt, aBmpSize );
}
-// -----------------------------------------------------------------------
+
void SdDisplay::SetScale( const Fraction& rFrac )
{
@@ -217,7 +217,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
aBtnRemoveAll.SetAccessibleRelationMemberOf( &aGrpBitmap );
}
-// -----------------------------------------------------------------------
+
AnimationWindow::~AnimationWindow()
{
@@ -235,7 +235,7 @@ AnimationWindow::~AnimationWindow()
delete pMyDoc;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl)
{
@@ -245,7 +245,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl)
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl)
{
@@ -253,7 +253,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl)
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
{
@@ -374,7 +374,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl)
{
@@ -385,7 +385,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl)
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p )
{
@@ -411,7 +411,7 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p )
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn )
{
@@ -425,7 +425,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn )
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
{
@@ -502,7 +502,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl)
{
@@ -514,7 +514,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl)
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl)
{
@@ -532,7 +532,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl)
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl)
{
@@ -545,7 +545,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl)
return( 0L );
}
-// -----------------------------------------------------------------------
+
void AnimationWindow::UpdateControl(bool const bDisableCtrls)
{
@@ -649,7 +649,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
ClickRbtHdl( NULL );
}
-// -----------------------------------------------------------------------
+
void AnimationWindow::ResetAttrs()
{
@@ -661,7 +661,7 @@ void AnimationWindow::ResetAttrs()
UpdateControl();
}
-// -----------------------------------------------------------------------
+
void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime,
SfxProgress* pProgress ) const
@@ -682,7 +682,7 @@ void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime,
}
}
-// -----------------------------------------------------------------------
+
Fraction AnimationWindow::GetScale()
{
@@ -709,7 +709,7 @@ Fraction AnimationWindow::GetScale()
return( aFrac );
}
-// -----------------------------------------------------------------------
+
void AnimationWindow::Resize()
{
@@ -809,7 +809,7 @@ void AnimationWindow::Resize()
SfxDockingWindow::Resize();
}
-// -----------------------------------------------------------------------
+
bool AnimationWindow::Close()
{
@@ -830,14 +830,14 @@ bool AnimationWindow::Close()
}
}
-// -----------------------------------------------------------------------
+
void AnimationWindow::FillInfo( SfxChildWinInfo& rInfo ) const
{
SfxDockingWindow::FillInfo( rInfo ) ;
}
-// -----------------------------------------------------------------------
+
void AnimationWindow::AddObj (::sd::View& rView )
{
@@ -1020,7 +1020,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
}
}
-// -----------------------------------------------------------------------
+
void AnimationWindow::CreateAnimObj (::sd::View& rView )
{
@@ -1269,7 +1269,7 @@ AnimationControllerItem::AnimationControllerItem(
{
}
-// -----------------------------------------------------------------------
+
void AnimationControllerItem::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pItem )
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index f6b0988476a7..553553994ee8 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -69,13 +69,13 @@ SdPagesField::SdPagesField( Window* pParent,
Show();
}
-// -----------------------------------------------------------------------
+
SdPagesField::~SdPagesField()
{
}
-// -----------------------------------------------------------------------
+
void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem )
{
@@ -92,7 +92,7 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem )
SetText( OUString() );
}
-// -----------------------------------------------------------------------
+
void SdPagesField::Modify()
{
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 05f76fc49d3e..da4dced8eece 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -48,7 +48,7 @@ SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr,
mnCharPosition = AddTabPage( "RID_SVXPAGE_CHAR_POSITION", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 );
}
-// -----------------------------------------------------------------------
+
void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
index fd21be04ffd9..84c1d34a0712 100644
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ b/sd/source/ui/dlg/dlgctrls.cxx
@@ -67,7 +67,7 @@ void FadeEffectLB::Fill()
}
-// -----------------------------------------------------------------------------
+
void FadeEffectLB::applySelected( SdPage* pSlide ) const
{
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 24afe3c4c86a..92a785c5cdd5 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -43,9 +43,9 @@
#include <vcl/graphicfilter.hxx>
-// --------------------------------------------------------------------
+
// ----------- SdFileDialog_Imp ---------------------------
-// --------------------------------------------------------------------
+
class SdFileDialog_Imp : public sfx2::FileDialogHelper
{
private:
@@ -76,7 +76,7 @@ public:
virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
};
-// ------------------------------------------------------------------------
+
void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent )
{
SolarMutexGuard aGuard;
@@ -99,7 +99,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil
}
}
-// ------------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl)
{
maUpdateTimer.Stop();
@@ -167,7 +167,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl)
return 0;
}
-// ------------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl)
{
SolarMutexGuard aGuard;
@@ -224,7 +224,7 @@ void SdFileDialog_Imp::CheckSelectionState()
}
}
-//-----------------------------------------------------------------------------
+
SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType,
sal_Bool bUsableSelection ) :
FileDialogHelper( nDialogType, 0 ),
@@ -273,14 +273,14 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType,
}
-// ------------------------------------------------------------------------
+
SdFileDialog_Imp::~SdFileDialog_Imp()
{
if( mnPlaySoundEvent )
Application::RemoveUserEvent( mnPlaySoundEvent );
}
-// ------------------------------------------------------------------------
+
ErrCode SdFileDialog_Imp::Execute()
{
// make sure selection checkbox is disabled if
@@ -289,9 +289,9 @@ ErrCode SdFileDialog_Imp::Execute()
return FileDialogHelper::Execute();
}
-// --------------------------------------------------------------------
+
// ----------- SdOpenSoundFileDialog -----------------------
-// --------------------------------------------------------------------
+
// these are simple forwarders
SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
@@ -323,24 +323,24 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
#endif
}
-// ------------------------------------------------------------------------
+
SdOpenSoundFileDialog::~SdOpenSoundFileDialog()
{
}
-// ------------------------------------------------------------------------
+
ErrCode SdOpenSoundFileDialog::Execute()
{
return mpImpl->Execute();
}
-// ------------------------------------------------------------------------
+
OUString SdOpenSoundFileDialog::GetPath() const
{
return mpImpl->GetPath();
}
-// ------------------------------------------------------------------------
+
void SdOpenSoundFileDialog::SetPath( const OUString& rPath )
{
mpImpl->SetDisplayDirectory( rPath );
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index b499e3f9f7bc..e3efd3676396 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -251,7 +251,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent
mpNotesHandoutsTabPage->init( maNotesHandoutSettings, false );
}
-// -----------------------------------------------------------------------
+
HeaderFooterDialog::~HeaderFooterDialog()
{
@@ -259,7 +259,7 @@ HeaderFooterDialog::~HeaderFooterDialog()
delete mpNotesHandoutsTabPage;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl )
{
@@ -272,14 +272,14 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl )
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(HeaderFooterDialog, DeactivatePageHdl)
{
return sal_True;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl)
{
@@ -287,7 +287,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl)
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl)
{
@@ -295,7 +295,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl)
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl)
{
@@ -303,7 +303,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl)
return 0;
}
-// -----------------------------------------------------------------------
+
short HeaderFooterDialog::Execute()
{
@@ -313,7 +313,7 @@ short HeaderFooterDialog::Execute()
return nRet;
}
-// -----------------------------------------------------------------------
+
void HeaderFooterDialog::ApplyToAll()
{
@@ -322,7 +322,7 @@ void HeaderFooterDialog::ApplyToAll()
EndDialog(1);
}
-// -----------------------------------------------------------------------
+
void HeaderFooterDialog::Apply()
{
@@ -331,14 +331,14 @@ void HeaderFooterDialog::Apply()
EndDialog(1);
}
-// -----------------------------------------------------------------------
+
void HeaderFooterDialog::Cancel()
{
EndDialog();
}
-// -----------------------------------------------------------------------
+
void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
{
@@ -418,7 +418,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager()->AddUndoAction(pUndoGroup);
}
-// -----------------------------------------------------------------------
+
void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings )
{
@@ -489,13 +489,13 @@ HeaderFooterTabPage::HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window*
FillFormatList(SVXDATEFORMAT_A);
}
-// -----------------------------------------------------------------------
+
HeaderFooterTabPage::~HeaderFooterTabPage()
{
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl)
{
@@ -505,7 +505,7 @@ IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl)
return 0L;
}
-// -----------------------------------------------------------------------
+
void HeaderFooterTabPage::FillFormatList( int eFormat )
{
@@ -532,7 +532,7 @@ void HeaderFooterTabPage::FillFormatList( int eFormat )
}
}
-// -----------------------------------------------------------------------
+
void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNotOnTitle )
{
@@ -568,7 +568,7 @@ void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNot
update();
}
-// -----------------------------------------------------------------------
+
void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle )
{
@@ -591,7 +591,7 @@ void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOn
rNotOnTitle = mpCBNotOnTitle->IsChecked();
}
-// -----------------------------------------------------------------------
+
void HeaderFooterTabPage::update()
{
@@ -612,7 +612,7 @@ void HeaderFooterTabPage::update()
mpCTPreview->update( aSettings );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl)
{
@@ -621,7 +621,7 @@ IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl)
return 0;
}
-// -----------------------------------------------------------------------
+
void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet )
{
@@ -654,7 +654,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo
}
}
-// -----------------------------------------------------------------------
+
void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage )
{
@@ -739,7 +739,7 @@ PresLayoutPreview::PresLayoutPreview( ::Window* pParent )
{
}
-// -----------------------------------------------------------------------
+
extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makePresLayoutPreview( ::Window *pParent, VclBuilder::stringmap & )
{
@@ -755,7 +755,7 @@ Size PresLayoutPreview::GetOptimalSize() const
return LogicToPixel(Size(80, 80), MAP_APPFONT);
}
-// -----------------------------------------------------------------------
+
void PresLayoutPreview::init( SdPage *pMaster )
{
@@ -769,7 +769,7 @@ void PresLayoutPreview::update( HeaderFooterSettings& rSettings )
Invalidate();
}
-// -----------------------------------------------------------------------
+
void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisible, bool bDotted /* = false*/ )
{
@@ -816,7 +816,7 @@ void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisib
}
}
-// -----------------------------------------------------------------------
+
void PresLayoutPreview::Paint( const Rectangle& )
{
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index af3a252f66ef..b0b5b4928d1e 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -89,7 +89,7 @@ void MorphDlg::LoadSettings()
m_pCbxAttributes->Check( bAttrib );
}
-// -----------------------------------------------------------------------------
+
void MorphDlg::SaveSettings() const
{
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 71781cbe8425..66a3ca0aa9f9 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -150,7 +150,7 @@ SdNavigatorWin::SdNavigatorWin(
rUpdateRequest();
}
-// -----------------------------------------------------------------------
+
SdNavigatorWin::~SdNavigatorWin()
{
@@ -158,7 +158,7 @@ SdNavigatorWin::~SdNavigatorWin()
delete mpPageNameCtrlItem;
}
-// -----------------------------------------------------------------------
+
//when object is marked , fresh the corresponding entry tree .
void SdNavigatorWin::FreshTree( const SdDrawDocument* pDoc )
@@ -304,7 +304,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl)
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdNavigatorWin, ClickToolboxHdl)
@@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickToolboxHdl)
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
{
@@ -390,7 +390,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
return 0;
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl)
{
@@ -428,7 +428,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl)
return( 0L );
}
-// -----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl)
{
@@ -559,7 +559,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu )
return 0;
}
-// -----------------------------------------------------------------------
+
void SdNavigatorWin::Resize()
{
@@ -598,7 +598,7 @@ void SdNavigatorWin::Resize()
Window::Resize();
}
-// -----------------------------------------------------------------------
+
bool SdNavigatorWin::InsertFile(const OUString& rFileName)
{
@@ -675,7 +675,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName)
return true;
}
-// -----------------------------------------------------------------------
+
void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName )
{
@@ -744,7 +744,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName )
maLbDocs.SelectEntryPos( nPos );
}
-//------------------------------------------------------------------------
+
sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage )
{
@@ -763,7 +763,7 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool b
return( 0 );
}
-//------------------------------------------------------------------------
+
NavDocInfo* SdNavigatorWin::GetDocInfo()
{
@@ -889,7 +889,7 @@ SdNavigatorControllerItem::SdNavigatorControllerItem(
{
}
-// -----------------------------------------------------------------------
+
void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pItem )
@@ -974,7 +974,7 @@ SdPageNameControllerItem::SdPageNameControllerItem(
{
}
-// -----------------------------------------------------------------------
+
void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pItem )
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index d83df4d4ed77..d0c8c2a84432 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -221,14 +221,14 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
nHatchingListState = CT_NONE;
}
-// -----------------------------------------------------------------------
+
SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg()
{
delete pOutSet;
}
-// -----------------------------------------------------------------------
+
void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
@@ -299,8 +299,8 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const
return SfxTabDialog::GetOutputItemSet();
}
-// ---------------------------------------------------------------------
-// ---------------------------------------------------------------------
+
+
sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const
{
switch( ePO )
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 2e999f64d373..f9cec00e5f76 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -72,13 +72,13 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) :
m_pCbxBack->SetAccessibleRelationLabeledBy( m_pRbtBooklet );
}
-// -----------------------------------------------------------------------
+
SdPrintOptions::~SdPrintOptions()
{
}
-// -----------------------------------------------------------------------
+
sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs )
{
@@ -131,7 +131,7 @@ sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs )
return( sal_False );
}
-// -----------------------------------------------------------------------
+
void SdPrintOptions::Reset( const SfxItemSet& rAttrs )
{
@@ -188,7 +188,7 @@ void SdPrintOptions::Reset( const SfxItemSet& rAttrs )
ClickBookletHdl( NULL );
}
-// -----------------------------------------------------------------------
+
SfxTabPage* SdPrintOptions::Create( Window* pWindow,
const SfxItemSet& rOutAttrs )
@@ -196,7 +196,7 @@ SfxTabPage* SdPrintOptions::Create( Window* pWindow,
return( new SdPrintOptions( pWindow, rOutAttrs ) );
}
-//-----------------------------------------------------------------------
+
IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx )
{
@@ -208,7 +208,7 @@ IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx )
return 0;
}
-//-----------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl)
{
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 1c1ffb06ea14..7dd1477c935a 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -82,9 +82,9 @@ sal_Bool SdPageObjsTLB::IsInDrag()
sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MAX_UINT32;
-// -----------------------------------------
+
// - SdPageObjsTLB::SdPageObjsTransferable -
-// -----------------------------------------
+
SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable(
SdPageObjsTLB& rParent,
@@ -114,7 +114,7 @@ SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable()
{
}
-// -----------------------------------------------------------------------------
+
void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats()
{
@@ -123,7 +123,7 @@ void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats()
AddFormat(GetListBoxDropFormatId());
}
-// -----------------------------------------------------------------------------
+
sal_Bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
{
@@ -143,7 +143,7 @@ sal_Bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star:
}
}
-// -----------------------------------------------------------------------------
+
void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction )
{
@@ -151,21 +151,21 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction )
SdTransferable::DragFinished(nDropAction);
}
-// -----------------------------------------------------------------------------
+
::sd::DrawDocShell& SdPageObjsTLB::SdPageObjsTransferable::GetDocShell() const
{
return mrDocShell;
}
-// -----------------------------------------------------------------------------
+
NavigatorDragType SdPageObjsTLB::SdPageObjsTransferable::GetDragType() const
{
return meDragType;
}
-// -----------------------------------------------------------------------------
+
sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException )
{
@@ -192,7 +192,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdPageObjsTLB::SdPageObjsTran
return theSdPageObjsTLBUnoTunnelId::get().getSeq();
}
-// -----------------------------------------------------------------------------
+
SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData )
throw()
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index 70782416ea29..1cd52db0578b 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -108,7 +108,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent,
nHatchingListState = CT_NONE;
}
-// -----------------------------------------------------------------------
+
void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
@@ -175,7 +175,7 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
}
-// -----------------------------------------------------------------------
+
const SfxItemSet* SdTabTemplateDlg::GetRefreshedSet()
{
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 919b9db24d0f..602fc58b7e6a 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -140,13 +140,13 @@ SdTPAction::SdTPAction(Window* pWindow, const SfxItemSet& rInAttrs)
ClickActionHdl( this );
}
-// -----------------------------------------------------------------------
+
SdTPAction::~SdTPAction()
{
}
-// -----------------------------------------------------------------------
+
void SdTPAction::SetView( const ::sd::View* pSdView )
{
@@ -171,7 +171,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
}
}
-// -----------------------------------------------------------------------
+
void SdTPAction::Construct()
{
@@ -263,7 +263,7 @@ void SdTPAction::Construct()
}
-// -----------------------------------------------------------------------
+
sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs )
{
@@ -308,7 +308,7 @@ sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs )
return( bModified );
}
-//------------------------------------------------------------------------
+
void SdTPAction::Reset( const SfxItemSet& rAttrs )
{
@@ -357,13 +357,13 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs )
m_pEdtSound->SaveValue();
}
-// -----------------------------------------------------------------------
+
void SdTPAction::ActivatePage( const SfxItemSet& )
{
}
-// -----------------------------------------------------------------------
+
int SdTPAction::DeactivatePage( SfxItemSet* pPageSet )
{
@@ -373,7 +373,7 @@ int SdTPAction::DeactivatePage( SfxItemSet* pPageSet )
return( LEAVE_PAGE );
}
-// -----------------------------------------------------------------------
+
SfxTabPage* SdTPAction::Create( Window* pWindow,
const SfxItemSet& rAttrs )
@@ -381,7 +381,7 @@ SfxTabPage* SdTPAction::Create( Window* pWindow,
return( new SdTPAction( pWindow, rAttrs ) );
}
-//------------------------------------------------------------------------
+
void SdTPAction::UpdateTree()
{
@@ -393,7 +393,7 @@ void SdTPAction::UpdateTree()
}
}
-//------------------------------------------------------------------------
+
void SdTPAction::OpenFileDialog()
{
@@ -474,7 +474,7 @@ void SdTPAction::OpenFileDialog()
}
}
-//------------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl)
{
@@ -483,7 +483,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl)
return( 0L );
}
-//------------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
{
@@ -660,7 +660,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
return( 0L );
}
-//------------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl)
{
@@ -668,7 +668,7 @@ IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl)
return( 0L );
}
-//------------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
{
@@ -718,7 +718,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
return( 0L );
}
-//------------------------------------------------------------------------
+
presentation::ClickAction SdTPAction::GetActualClickAction()
{
@@ -730,7 +730,7 @@ presentation::ClickAction SdTPAction::GetActualClickAction()
return( eCA );
}
-//------------------------------------------------------------------------
+
void SdTPAction::SetActualClickAction( presentation::ClickAction eCA )
{
@@ -741,7 +741,7 @@ void SdTPAction::SetActualClickAction( presentation::ClickAction eCA )
m_pLbAction->SelectEntryPos( pIter-maCurrentActions.begin() );
}
-//------------------------------------------------------------------------
+
void SdTPAction::SetEditText( OUString const & rStr )
{
@@ -804,7 +804,7 @@ void SdTPAction::SetEditText( OUString const & rStr )
}
}
-//------------------------------------------------------------------------
+
OUString SdTPAction::GetEditText( sal_Bool bFullDocDestination )
{
@@ -871,7 +871,7 @@ OUString SdTPAction::GetEditText( sal_Bool bFullDocDestination )
return( aStr );
}
-//------------------------------------------------------------------------
+
sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA )
{
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 22097b8063aa..afd3547087a3 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -52,13 +52,13 @@ SdTpOptionsSnap::SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs )
pSnapFrames->Show();
}
-// -----------------------------------------------------------------------
+
SdTpOptionsSnap::~SdTpOptionsSnap()
{
}
-// -----------------------------------------------------------------------
+
sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs )
{
@@ -83,7 +83,7 @@ sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs )
return( sal_True );
}
-// -----------------------------------------------------------------------
+
void SdTpOptionsSnap::Reset( const SfxItemSet& rAttrs )
{
@@ -106,7 +106,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet& rAttrs )
pCbxRotate->GetClickHdl().Call(0);
}
-// -----------------------------------------------------------------------
+
SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow,
const SfxItemSet& rAttrs )
@@ -129,13 +129,13 @@ SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet& rIn
get( m_pCbxMoveOutline, "moveoutline");
}
-// -----------------------------------------------------------------------
+
SdTpOptionsContents::~SdTpOptionsContents()
{
}
-// -----------------------------------------------------------------------
+
sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs )
{
@@ -159,7 +159,7 @@ sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs )
return( bModified );
}
-// -----------------------------------------------------------------------
+
void SdTpOptionsContents::Reset( const SfxItemSet& rAttrs )
{
@@ -180,7 +180,7 @@ void SdTpOptionsContents::Reset( const SfxItemSet& rAttrs )
m_pCbxHandlesBezier->SaveValue();
}
-// -----------------------------------------------------------------------
+
SfxTabPage* SdTpOptionsContents::Create( Window* pWindow,
const SfxItemSet& rAttrs )
@@ -289,12 +289,12 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
m_pCbScale->InsertEntry( GetScale( aTable[i], 1 ) );
}
-// -----------------------------------------------------------------------
+
SdTpOptionsMisc::~SdTpOptionsMisc()
{
}
-// -----------------------------------------------------------------------
+
void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
{
// We have to call SaveValue again since it can happen that the value
@@ -339,7 +339,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
}
}
-// -----------------------------------------------------------------------
+
int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
{
@@ -363,7 +363,7 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
return( LEAVE_PAGE );
}
-// -----------------------------------------------------------------------
+
sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
{
@@ -432,7 +432,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
return( bModified );
}
-// -----------------------------------------------------------------------
+
void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
{
@@ -512,14 +512,14 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
UpdateCompatibilityControls ();
}
-// -----------------------------------------------------------------------
+
SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow,
const SfxItemSet& rAttrs )
{
return( new SdTpOptionsMisc( pWindow, rAttrs ) );
}
-//------------------------------------------------------------------------
+
IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl)
{
@@ -569,14 +569,14 @@ void SdTpOptionsMisc::SetDrawMode()
m_pCbxUsePrinterMetrics->SetPosPixel (m_pCbxCompatibility->GetPosPixel());
}
-// -----------------------------------------------------------------------
+
OUString SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY )
{
return OUString::number(nX) + OUString(TOKEN) + OUString::number(nY);
}
-// -----------------------------------------------------------------------
+
sal_Bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY )
{